diff --git a/.gitignore b/.gitignore index c87c691a4af7f6c50a681db4a373b100e84c7558..52512506d7ea2d862997249c9557810148623e3a 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,15 @@ Externals/ # coan output files that are created when cleaning out switches coan_out_* +/COMPLEXITY +/res +/tv +/wmops +/Workspace_msvc/renderer.args.json +/Workspace_msvc/encoder.args.json +/Workspace_msvc/decoder.args.json +/scripts/mem_analysis_enc_VBR_5k9.csv +/scripts/mem_analysis_enc_STEREO_sw.png +/scripts/mem_analysis_enc_STEREO_sw.csv +/scripts/mem_analysis_enc_STEREO_16k4_DTX.csv +*.pwv diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 082cf40cabd6767be5826b29792b879619d7e3c6..ea7344210a5234091b5ed814aec7dd838f2bb52f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,7 @@ variables: LTV_DIR: "/usr/local/ltv" BUILD_OUTPUT: "build_output.txt" EVS_BE_TEST_DIR: "/usr/local/be_2_evs_test" + EVS_BE_WIN_TEST_DIR: "C:/Users/gitlab-runner/testvec" SANITIZER_TESTS: "CLANG1 CLANG2" OUT_FORMATS_CHANNEL_BASED: "stereo mono 5_1 5_1_2 5_1_4 7_1 7_1_4" OUT_FORMATS_SCENE_BASED: "FOA HOA2 HOA3" @@ -12,8 +13,6 @@ variables: 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: @@ -314,7 +313,7 @@ codec-smoke-test: extends: - .test-job-linux-needs-testv-dir - .rules-merge-request - timeout: "5 minutes" + timeout: "10 minutes" stage: test needs: ["build-codec-linux-cmake"] script: @@ -327,6 +326,7 @@ codec-smoke-test: - 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" + expire_in: 1 week paths: - smoke_test_output.txt - smoke_test_output_plc.txt @@ -351,6 +351,7 @@ codec-msan: - if [ $run_errors != 0 ] ; then echo "Run errors in self_test.py with Clang memory-sanitizer"; exit 1; fi artifacts: name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results" + expire_in: 1 week paths: - scripts/ref/logs/ - test_output.txt @@ -373,6 +374,7 @@ codec-asan: - if [ $run_errors != 0 ] ; then echo "Run errors in self_test.py with Clang address-sanitizer"; exit 1; fi artifacts: name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results" + expire_in: 1 week paths: - scripts/ref/logs/ - test_output.txt @@ -390,6 +392,7 @@ renderer-smoke-test: - 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" + expire_in: 1 week when: always paths: - report-junit.xml @@ -413,6 +416,7 @@ renderer-asan: artifacts: name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results" + expire_in: 1 week when: always paths: - report-junit.xml @@ -436,6 +440,7 @@ renderer-msan: artifacts: name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results" + expire_in: 1 week when: always paths: - report-junit.xml @@ -489,6 +494,7 @@ renderer-pytest-on-merge-request: - 123 artifacts: name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results" + expire_in: 2 week when: always paths: - report-junit.xml @@ -539,6 +545,7 @@ ivas-pytest-on-merge-request: - 123 artifacts: name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results" + expire_in: 2 week when: always paths: - report-junit.xml @@ -585,6 +592,7 @@ evs-pytest-on-merge-request: - 123 artifacts: name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results" + expire_in: 2 week when: always paths: - report-junit-evs.xml @@ -643,6 +651,7 @@ clang-format-check: - exit $format_problems artifacts: + expire_in: 2 days paths: - tmp-formatting-fix/ when: on_failure @@ -653,6 +662,30 @@ clang-format-check: # Test jobs for main branch # --------------------------------------------------------------- +# check bitexactness to EVS windows binaries +be-2-evs-windows: + extends: + - .rules-main-push + tags: + - ivas-windows + stage: test + needs: ["build-codec-windows-msbuild"] + timeout: "20 minutes" # To be revisited + script: + - *print-common-info-windows + + - $winoutdata = $null + - MSBuild.exe .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Release | tee -variable winoutdata + - $winoutdata | Out-File $BUILD_OUTPUT -Encoding Utf8 + + # copy over to never change the testvector dir + - cp -r $EVS_BE_WIN_TEST_DIR ./evs_be_win_test + - cp IVAS_cod.exe ./evs_be_win_test/bin/IVAS_cod.exe + - cp IVAS_dec.exe ./evs_be_win_test/bin/IVAS_dec.exe + + - cd evs_be_win_test + - python ../ci/run_evs_be_win_test.py + # check bitexactness to EVS be-2-evs-linux: extends: @@ -751,6 +784,7 @@ codec-comparison-on-main-push: - 123 artifacts: name: "main-push--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results" + expire_in: 2 week when: always paths: - report-junit.xml @@ -772,6 +806,7 @@ codec-comparison-on-main-push: - sanitizer_test_main artifacts: name: "$CI_JOB_NAME--main--sha-$CI_COMMIT_SHORT_SHA" + expire_in: 1 week when: always paths: - ep_015.g192 @@ -783,13 +818,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 @@ -799,7 +834,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 @@ -809,7 +845,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 @@ -819,7 +856,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 @@ -829,7 +867,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 @@ -839,7 +878,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 @@ -849,7 +889,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 @@ -859,7 +900,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 @@ -1028,6 +1070,7 @@ coverage-test-on-main-scheduled: stage: test artifacts: name: "$CI_JOB_NAME--$CI_COMMIT_REF_NAME--sha-$CI_COMMIT_SHA" + expire_in: 1 week paths: - $CI_JOB_NAME-public @@ -1058,7 +1101,7 @@ complexity-ism-in-binaural-out: - *complexity-measurements-setup - in_format=ISM - out_format=BINAURAL - - bash ci/complexity_measurements/getWmops.sh "ISM1 ISM2 ISM3 ISM4" "$out_format" + - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" - *complexity-measurements-prepare-artifacts complexity-sba-hoa3-in-hoa3-out: diff --git a/Workspace_msvc/lib_com.vcxproj b/Workspace_msvc/lib_com.vcxproj index 23aa2ae3f0b6722871f7f9d2c37b27e41f46862f..bfe36b1f4812b8e44a7cb32fca8793c1b443c962 100644 --- a/Workspace_msvc/lib_com.vcxproj +++ b/Workspace_msvc/lib_com.vcxproj @@ -78,7 +78,7 @@ Disabled - ..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;%(AdditionalIncludeDirectories) + ..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_util;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions) EnableFastChecks diff --git a/Workspace_msvc/lib_debug.vcxproj b/Workspace_msvc/lib_debug.vcxproj index 3b648fae048920ae06aa709785d4b49d2e58d710..9b7b5806615c336f40e3f5850ded7b2c2d4103ec 100644 --- a/Workspace_msvc/lib_debug.vcxproj +++ b/Workspace_msvc/lib_debug.vcxproj @@ -73,7 +73,7 @@ Disabled - ..\lib_com;..\lib_debug;%(AdditionalIncludeDirectories) + ..\lib_com;..\lib_debug;..\lib_util;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions) false diff --git a/Workspace_msvc/lib_dec.vcxproj b/Workspace_msvc/lib_dec.vcxproj index e1c0f9ead1e80039fb23607500d3580bece6215c..760621d7a40ce2113110aed02262c1d0f8f40ff9 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_rend;%(AdditionalIncludeDirectories) + ..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;..\lib_rend;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions) EnableFastChecks @@ -282,6 +282,7 @@ + @@ -290,6 +291,7 @@ + diff --git a/Workspace_msvc/lib_dec.vcxproj.filters b/Workspace_msvc/lib_dec.vcxproj.filters index d1dedc413cef958bb637b92972c2b95ef1656319..6284884920f332ea486df52e269e1eb51e5ef8f3 100644 --- a/Workspace_msvc/lib_dec.vcxproj.filters +++ b/Workspace_msvc/lib_dec.vcxproj.filters @@ -518,6 +518,12 @@ dec_ivas_c + + dec_ivas_c + + + dec_ivas_c + diff --git a/Workspace_msvc/lib_enc.vcxproj b/Workspace_msvc/lib_enc.vcxproj index 15f0d535745d95fec1fd22eb4d139f5ca5e8d06f..d9f8e974f0a9fbb885386ff137db1a0b8ef49c0c 100644 --- a/Workspace_msvc/lib_enc.vcxproj +++ b/Workspace_msvc/lib_enc.vcxproj @@ -89,7 +89,7 @@ Disabled - ..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;%(AdditionalIncludeDirectories) + ..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_util;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions) EnableFastChecks @@ -213,6 +213,7 @@ + diff --git a/Workspace_msvc/lib_enc.vcxproj.filters b/Workspace_msvc/lib_enc.vcxproj.filters index 21941038ec37e6a53cc81c9c3c915e69cbe0ac5f..b3970764c0f9218533e6f7e63c8f1d270540c0e1 100644 --- a/Workspace_msvc/lib_enc.vcxproj.filters +++ b/Workspace_msvc/lib_enc.vcxproj.filters @@ -587,6 +587,9 @@ enc_ivas_c + + enc_ivas_c + diff --git a/Workspace_msvc/lib_rend.vcxproj b/Workspace_msvc/lib_rend.vcxproj index 865652649a8a320ff0769bd83170528445da8ab3..4bd0ca9a93af1b4580271f339f0670bdc1a26bac 100644 --- a/Workspace_msvc/lib_rend.vcxproj +++ b/Workspace_msvc/lib_rend.vcxproj @@ -89,7 +89,7 @@ Disabled - ..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;%(AdditionalIncludeDirectories) + ..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions) EnableFastChecks diff --git a/Workspace_msvc/lib_util.vcxproj b/Workspace_msvc/lib_util.vcxproj index 5b5e5f30ccdc3697e60b72e2b74750fe06e90598..72ff2dfe6182abfbe7d1a6783c324a3958d398a6 100644 --- a/Workspace_msvc/lib_util.vcxproj +++ b/Workspace_msvc/lib_util.vcxproj @@ -158,6 +158,7 @@ + @@ -183,6 +184,7 @@ + diff --git a/apps/decoder.c b/apps/decoder.c index d2260713c28f0b618033d3d2229c77794147b1dc..197f90b8d0d5152c152906f96d46aadbd60ddfda 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -45,6 +45,9 @@ #include "vector3_pair_file_reader.h" #include "jbm_file_writer.h" #include "evs_rtp_payload.h" +#ifdef VARIABLE_SPEED_DECODING +#include "tsm_scale_file_reader.h" +#endif #ifdef DEBUGGING #include "debug.h" #endif @@ -76,6 +79,14 @@ static #define IVAS_PUBLIC_ORIENT_TRK_REF_VEC ( 3 ) #define IVAS_PUBLIC_ORIENT_TRK_REF_VEC_LEV ( 4 ) +#ifdef VARIABLE_SPEED_DECODING +#define VARIABLE_SPEED_FETCH_FRAMESIZE_MS 20 +#endif +#ifdef JBM_TSM_ON_TCS +#define JBM_FRONTEND_FETCH_FRAMESIZE_MS 20 +#define FRAME_SIZE_NS 20000000L +#endif + typedef struct { char *inputBitstreamFilename; @@ -106,9 +117,11 @@ typedef struct bool customLsOutputEnabled; char *customLsSetupFilename; int16_t orientation_tracking; - float no_diegetic_pan; + int16_t Opt_non_diegetic_pan; + float non_diegetic_pan_gain; bool renderConfigEnabled; char *renderConfigFilename; + IVAS_DEC_COMPLEXITY_LEVEL complexityLevel; #ifdef DEBUGGING IVAS_DEC_FORCED_REND_MODE forcedRendMode; @@ -116,6 +129,20 @@ typedef struct FILE *agcBitstream; /* temporary */ #endif +#endif +#ifdef DEBUG_JBM_CMD_OPTION + bool noBadFrameDelay; +#endif +#ifdef VARIABLE_SPEED_DECODING + bool variableSpeedMode; + bool tsmScaleFileEnabled; + char *tsmScaleFileName; + uint16_t tsmScale; +#endif +#ifdef JBM_TSM_ON_TCS +#ifdef DEBUG_JBM_CMD_OPTION + uint16_t frontendFetchSizeMs; +#endif #endif } DecArguments; @@ -129,6 +156,9 @@ 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, HeadRotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf ); static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec ); +#ifdef VARIABLE_SPEED_DECODING +static ivas_error decodeVariableSpeed( DecArguments arg, BS_READER_HANDLE hBsReader, HeadRotFileReader *headRotReader, HeadRotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec ); +#endif #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 ); @@ -190,7 +220,11 @@ int main( * Open decoder handle *------------------------------------------------------------------------------------------*/ - if ( ( error = IVAS_DEC_Open( &hIvasDec, arg.decMode, arg.orientation_tracking, arg.no_diegetic_pan ) ) != IVAS_ERR_OK ) +#ifdef FIX_439_OTR_PARAMS + if ( ( error = IVAS_DEC_Open( &hIvasDec, arg.decMode ) ) != IVAS_ERR_OK ) +#else + if ( ( error = IVAS_DEC_Open( &hIvasDec, arg.decMode, arg.orientation_tracking ) ) != IVAS_ERR_OK ) +#endif { fprintf( stderr, "Open failed: %s\n", IVAS_DEC_GetErrorMessage( error ) ); goto cleanup; @@ -355,7 +389,11 @@ int main( * Configure the decoder *------------------------------------------------------------------------------------------*/ - if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.renderConfigEnabled ) ) != IVAS_ERR_OK ) +#ifdef FIX_439_OTR_PARAMS + if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.orientation_tracking, arg.renderConfigEnabled, arg.Opt_non_diegetic_pan, arg.non_diegetic_pan_gain ) ) != IVAS_ERR_OK ) +#else + if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.renderConfigEnabled, arg.Opt_non_diegetic_pan, arg.non_diegetic_pan_gain ) ) != IVAS_ERR_OK ) +#endif { fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) ); goto cleanup; @@ -514,7 +552,11 @@ int main( if ( arg.hrtfReaderEnabled ) { +#ifdef UPDATE_SBA_FILTER + IVAS_DEC_HRTF_HANDLE hHrtfTD = NULL; +#else IVAS_DEC_HRTF_HANDLE hHrtfTD; +#endif IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD ); @@ -525,7 +567,11 @@ int main( } +#ifdef UPDATE_SBA_FILTER + IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF = NULL; +#else IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF; +#endif IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF ); if ( ( error = create_SetOfHRTF_from_binary( hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK ) @@ -533,14 +579,22 @@ int main( fprintf( stderr, "\nError in loading HRTF binary file %s for CRend \n\n", arg.hrtfCRendFileName ); goto cleanup; } +#ifdef UPDATE_SBA_FILTER + IVAS_DEC_HRTF_FASTCONV_HANDLE hHrtfFastConv = NULL; +#else IVAS_DEC_HRTF_FASTCONV_HANDLE hHrtfFastConv; +#endif 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 ); } +#ifdef UPDATE_SBA_FILTER + IVAS_DEC_HRTF_PARAMBIN_HANDLE hHrtfParambin = NULL; +#else IVAS_DEC_HRTF_PARAMBIN_HANDLE hHrtfParambin; +#endif IVAS_DEC_GetHrtfParamBinHandle( hIvasDec, &hHrtfParambin ); if ( ( error = load_parambin_HRTF_from_binary( hHrtfParambin, hrtfReader ) ) != IVAS_ERR_OK ) @@ -555,8 +609,15 @@ int main( if ( arg.voipMode ) { - +#ifdef JBM_TSM_ON_TCS + if ( ( error = IVAS_DEC_EnableVoIP( hIvasDec, IVAS_DEC_VOIP_MODE_VOIP, 100, 60, arg.inputFormat ) ) != IVAS_ERR_OK ) +#else +#ifdef VARIABLE_SPEED_DECODING + if ( ( error = IVAS_DEC_EnableVoIP( hIvasDec, IVAS_DEC_VOIP_MODE_VOIP, 100, 60, arg.inputFormat ) ) != IVAS_ERR_OK ) +#else if ( ( error = IVAS_DEC_EnableVoIP( hIvasDec, 60, arg.inputFormat ) ) != IVAS_ERR_OK ) +#endif +#endif { fprintf( stderr, "\nCould not enable VOIP: %s\n\n", IVAS_DEC_GetErrorMessage( error ) ); goto cleanup; @@ -564,6 +625,17 @@ int main( error = decodeVoIP( arg, hBsReader, hIvasDec ); } +#ifdef VARIABLE_SPEED_DECODING + else if ( arg.variableSpeedMode ) + { + if ( ( error = IVAS_DEC_EnableVoIP( hIvasDec, IVAS_DEC_VOIP_MODE_VARIABLE_SPEED, arg.tsmScale, 60, arg.inputFormat ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nCould not enable Variable Play Speed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) ); + goto cleanup; + } + error = decodeVariableSpeed( arg, hBsReader, headRotReader, refRotReader, referenceVectorReader, hIvasDec ); + } +#endif else { error = decodeG192( arg, hBsReader, headRotReader, refRotReader, referenceVectorReader, hIvasDec, pcmBuf ); @@ -611,10 +683,18 @@ cleanup: if ( arg.hrtfReaderEnabled ) { +#ifdef UPDATE_SBA_FILTER + IVAS_DEC_HRTF_HANDLE hHrtfTD = NULL; +#else IVAS_DEC_HRTF_HANDLE hHrtfTD; +#endif IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD ); dealloc_HRTF_binary( hHrtfTD ); +#ifdef UPDATE_SBA_FILTER + IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF = NULL; +#else IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF; +#endif IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF ); destroy_SetOfHRTF( hSetOfHRTF ); } @@ -757,6 +837,7 @@ static bool parseCmdlIVAS_dec( arg->quietModeEnabled = false; arg->delayCompensationEnabled = true; arg->voipMode = false; + arg->complexityLevel = IVAS_DEC_COMPLEXITY_LEVEL_THREE; arg->enableHeadRotation = false; arg->headrotTrajFileName = NULL; @@ -787,7 +868,22 @@ static bool parseCmdlIVAS_dec( arg->renderConfigFilename = NULL; arg->inputFormat = IVAS_DEC_INPUT_FORMAT_G192; - arg->no_diegetic_pan = 0.f; + arg->Opt_non_diegetic_pan = 0; + arg->non_diegetic_pan_gain = 0.f; +#ifdef VARIABLE_SPEED_DECODING + arg->variableSpeedMode = 0; + arg->tsmScale = 100; + arg->tsmScaleFileEnabled = false; + arg->tsmScaleFileName = NULL; +#endif +#ifdef JBM_TSM_ON_TCS +#ifdef DEBUG_JBM_CMD_OPTION + arg->frontendFetchSizeMs = JBM_FRONTEND_FETCH_FRAMESIZE_MS; +#endif +#endif +#ifdef DEBUG_JBM_CMD_OPTION + arg->noBadFrameDelay = false; +#endif /*-----------------------------------------------------------------* * Initialization @@ -914,6 +1010,62 @@ static bool parseCmdlIVAS_dec( #endif /* #ifdef DEBUG_MODE_INFO_TWEAK */ #endif /* #ifdef DEBUG_MODE_INFO */ #endif /* #ifdef DEBUGGING */ +#ifdef DEBUG_JBM_CMD_OPTION + else if ( strcmp( argv_to_upper, "-VOIP_NO_BAD_FRAME" ) == 0 ) + { + arg->noBadFrameDelay = true; + i++; + } +#endif +#ifdef VARIABLE_SPEED_DECODING + + else if ( strcmp( argv_to_upper, "-VS" ) == 0 ) + { + i++; + int tmp = 100; + arg->variableSpeedMode = true; + if ( i < argc - 3 ) + { + if ( !is_digits_only( argv[i] ) ) + { + arg->tsmScaleFileEnabled = true; + arg->tsmScaleFileName = argv[i]; + i++; + } + + else + { + if ( ( sscanf( argv[i], "%d", &tmp ) > 0 ) ) + { + i++; + } + } + arg->tsmScale = (uint16_t) tmp; + } + } +#endif +#ifdef JBM_TSM_ON_TCS +#ifdef DEBUG_JBM_CMD_OPTION + else if ( strcmp( argv_to_upper, "-VOIP_FRAMESIZE" ) == 0 ) + { + i++; + int tmp; + if ( i < argc - 3 ) + { + if ( !is_digits_only( argv[i] ) ) + { + return false; + } + + if ( sscanf( argv[i], "%d", &tmp ) > 0 ) + { + i++; + } + arg->frontendFetchSizeMs = (uint16_t) tmp; + } + } +#endif +#endif else if ( strcmp( argv_to_upper, "-MIME" ) == 0 ) { @@ -1013,44 +1165,55 @@ static bool parseCmdlIVAS_dec( } i += 2; } - else if ( strcmp( argv_to_upper, "-NO_DIEGETIC_PAN" ) == 0 ) + else if ( strcmp( argv_to_upper, "-NON_DIEGETIC_PAN" ) == 0 ) { i++; - - if ( argc - i <= 4 || argv[i][0] == '-' ) - { - fprintf( stderr, "Error: Argument for panning option not specified!\n\n" ); - usage_dec(); - return false; - } - + arg->Opt_non_diegetic_pan = 1; 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, "CENTER" ) == 0 ) || ( strchr( argv_to_upper, 'C' ) != NULL ) ) { - arg->no_diegetic_pan = 0.f; + arg->non_diegetic_pan_gain = 0.f; } else if ( ( strcmp( argv_to_upper, "LEFT" ) == 0 ) || ( strchr( argv_to_upper, 'L' ) != NULL ) ) { - arg->no_diegetic_pan = -1.f; + arg->non_diegetic_pan_gain = 1.f; } else if ( ( strcmp( argv_to_upper, "RIGHT" ) == 0 ) || ( strchr( argv_to_upper, 'R' ) != NULL ) ) { - arg->no_diegetic_pan = 1.f; + arg->non_diegetic_pan_gain = -1.f; } else { - arg->no_diegetic_pan = (float) atof( argv_to_upper ); + arg->non_diegetic_pan_gain = (float) atof( argv_to_upper ) / 90.f; - if ( arg->no_diegetic_pan > 1.0f || arg->no_diegetic_pan < -1.0f ) + if ( arg->non_diegetic_pan_gain > 1.0f || arg->non_diegetic_pan_gain < -1.0f ) { - fprintf( stderr, "Error: Incorrect value for panning option argument specified: %s\n\n", argv[i] ); + fprintf( stderr, "Error: Incorrect value for panning gain value specified: %s\n\n", argv[i] ); usage_dec(); return false; } } i++; } + else if ( strcmp( argv_to_upper, "-LEVEL" ) == 0 ) + { + int16_t level; + + ++i; + level = (int16_t) atoi( argv[i++] ); + if ( level < IVAS_DEC_COMPLEXITY_LEVEL_ONE || level > IVAS_DEC_COMPLEXITY_LEVEL_THREE ) + { + fprintf( stdout, "Invalid complexity level specified.\n" ); + usage_dec(); + return false; + } + else if ( level == IVAS_DEC_COMPLEXITY_LEVEL_ONE || level == IVAS_DEC_COMPLEXITY_LEVEL_TWO ) + { + fprintf( stdout, "Complexity levels 1 and 2 will be defined after characterisation - default to level 3 (full functionality).\n" ); + } + } /*-----------------------------------------------------------------* * Option not recognized @@ -1079,11 +1242,21 @@ static bool parseCmdlIVAS_dec( arg->customLsSetupFilename = argv[i]; } i++; + if ( ( arg->Opt_non_diegetic_pan ) && ( arg->outputFormat != IVAS_DEC_OUTPUT_STEREO ) ) + { + fprintf( stderr, "Error: non-diegetic panning is supported in stereo only\n\n" ); + usage_dec(); + return false; + } } else { arg->outputFormat = IVAS_DEC_OUTPUT_MONO; arg->decMode = IVAS_DEC_MODE_EVS; + if ( ( arg->Opt_non_diegetic_pan ) ) + { + arg->outputFormat = IVAS_DEC_OUTPUT_STEREO; + } } /*-----------------------------------------------------------------* @@ -1166,6 +1339,18 @@ static void usage_dec( void ) fprintf( stdout, "-VOIP : VoIP mode: RTP in G192\n" ); fprintf( stdout, "-VOIP_hf_only=0 : VoIP mode: EVS RTP Payload Format hf_only=0 in rtpdump\n" ); fprintf( stdout, "-VOIP_hf_only=1 : VoIP mode: EVS RTP Payload Format hf_only=1 in rtpdump\n" ); +#ifdef DEBUG_JBM_CMD_OPTION + fprintf( stdout, "-VOIP_no_bad_frame : VoIP mode: do not put out bad frames in the beginning as silence \n" ); +#endif +#ifdef VARIABLE_SPEED_DECODING + fprintf( stdout, "-VS fac : Varaible Speed mode: change speed of playout fac as integer in percent. fac<100 faster, fac>100 slower\n" ); +#endif +#ifdef JBM_TSM_ON_TCS +#ifdef DEBUG_JBM_CMD_OPTION + fprintf( stdout, "-VOIP_framesize : VoIP mode: acoustic frontend fetch frame size (must be multiples of 5!)\n" ); +#endif + +#endif fprintf( stdout, " The decoder may read rtpdump files containing TS26.445 Annex A.2.2\n" ); fprintf( stdout, " EVS RTP Payload Format. The SDP parameter hf_only is required.\n" ); fprintf( stdout, " Reading RFC4867 AMR/AMR-WB RTP payload format is not supported.\n" ); @@ -1191,8 +1376,8 @@ static void usage_dec( void ) 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, "-non_diegetic_pan P : panning mono non-diegetic sound to stereo with paning P, -90<= P <=90,\n" ); + fprintf( stdout, " left or l or 90->left, right or r or -90->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 @@ -1202,6 +1387,8 @@ static void usage_dec( void ) fprintf( stdout, " containing FEC pattern (short values of 0 (good) or 1 (bad))\n" ); 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" ); + fprintf( stdout, "-level level : Complexity level, level = (1, 2, 3), will be defined after characterisation. \n" ); + fprintf( stdout, " Currently, all values default to level 3 (full functionality).\n" ); #endif #ifdef DEBUG_MODE_INFO #ifdef DEBUG_MODE_INFO_TWEAK @@ -1353,24 +1540,15 @@ static ivas_error initOnFirstGoodFrame( /* If outputting MASA, open output file and write metadata for initial bad frames */ else if ( *pBsFormat == IVAS_DEC_BS_MASA ) { -#ifdef FIX_350_MASA_DELAY_COMP if ( ( error = MasaFileWriter_open( arg.outputWavFilename, arg.delayCompensationEnabled, ppMasaWriter ) ) != IVAS_ERR_OK ) -#else - if ( ( error = MasaFileWriter_open( arg.outputWavFilename, ppMasaWriter ) ) != IVAS_ERR_OK ) -#endif { 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. */ -#ifdef FIX_350_MASA_DELAY_COMP MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta = NULL; if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta ) ) != IVAS_ERR_OK ) -#else - IVAS_MASA_QMETADATA_HANDLE qMetadata = NULL; - if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &qMetadata ) ) != IVAS_ERR_OK ) -#endif { fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) ); return error; @@ -1378,11 +1556,7 @@ static ivas_error initOnFirstGoodFrame( for ( int16_t j = 0; j < numInitialBadFrames; ++j ) { -#ifdef FIX_350_MASA_DELAY_COMP if ( ( error = MasaFileWriter_writeFrame( *ppMasaWriter, hMasaExtOutMeta ) ) != IVAS_ERR_OK ) -#else - if ( ( error = MasaFileWriter_writeFrame( *ppMasaWriter, qMetadata ) ) != IVAS_ERR_OK ) -#endif { fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( *ppMasaWriter ) ); return error; @@ -1429,7 +1603,7 @@ static ivas_error decodeG192( ivas_error error = IVAS_ERR_UNKNOWN; uint16_t numObj = 0; IVAS_DEC_BS_FORMAT bsFormat = IVAS_DEC_BS_UNKOWN; - IVAS_POSITION Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES]; + IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES]; IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS]; for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i ) @@ -1593,7 +1767,6 @@ static ivas_error decodeG192( } } - /* Write current frame */ if ( decodedGoodFrame ) { @@ -1642,23 +1815,14 @@ static ivas_error decodeG192( } else if ( bsFormat == IVAS_DEC_BS_MASA ) { -#ifdef FIX_350_MASA_DELAY_COMP MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta; if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta ) ) != IVAS_ERR_OK ) -#else - IVAS_MASA_QMETADATA_HANDLE qMetadata; - if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &qMetadata ) ) != IVAS_ERR_OK ) -#endif { fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) ); goto cleanup; } -#ifdef FIX_350_MASA_DELAY_COMP if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMasaExtOutMeta ) ) != IVAS_ERR_OK ) -#else - if ( ( error = MasaFileWriter_writeFrame( masaWriter, qMetadata ) ) != IVAS_ERR_OK ) -#endif { fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( masaWriter ) ); goto cleanup; @@ -1688,6 +1852,7 @@ static ivas_error decodeG192( *------------------------------------------------------------------------------------------*/ 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 ) ); @@ -1875,8 +2040,13 @@ static ivas_error decodeVoIP( uint32_t nextPacketRcvTime_ms = 0; uint32_t systemTime_ms = 0; +#ifdef JBM_TSM_ON_TCS + uint32_t systemTimeInc_ms = (uint32_t) JBM_FRONTEND_FETCH_FRAMESIZE_MS; + int32_t nFramesWritten = 0; +#endif int32_t nFramesFed = 0; + uint8_t au[( IVAS_MAX_BITS_PER_FRAME + 7 ) >> 3]; int16_t auSize; uint16_t rtpSequenceNumber; @@ -2009,10 +2179,27 @@ static ivas_error decodeVoIP( * Main receiving/decoding loop *------------------------------------------------------------------------------------------*/ +#ifdef JBM_TSM_ON_TCS +#ifdef DEBUG_JBM_CMD_OPTION + systemTimeInc_ms = arg.frontendFetchSizeMs; +#endif +#endif + while ( 1 ) { int16_t nOutSamples = 0; - +#if defined( JBM_TSM_ON_TCS ) || defined( VARIABLE_SPEED_DECODING ) + uint16_t nSamplesAvailableNext = 0; +#endif +#ifdef JBM_TSM_ON_TCS +#ifdef DEBUG_JBM_CMD_OPTION + nOutSamples = (int16_t) ( arg.output_Fs / 1000 * arg.frontendFetchSizeMs ); +#else + nOutSamples = (int16_t) ( arg.output_Fs / 1000 * JBM_FRONTEND_FETCH_FRAMESIZE_MS ); +#endif +#else + nOutSamples = (int16_t) ( arg.output_Fs / 50 ); +#endif /* read all packets with a receive time smaller than the system time */ while ( nextPacketRcvTime_ms <= systemTime_ms ) { @@ -2056,15 +2243,24 @@ static ivas_error decodeVoIP( /* we are finished when all packets have been received and jitter buffer is empty */ /* also stop when the input file contains less than two frames, because JBM cannot calculate a delay value and won't start decoding */ +#ifdef JBM_TSM_ON_TCS + /* last clause should make sure that for BE tests we end up with the same number of samples...*/ + if ( nextPacketRcvTime_ms == (uint32_t) ( -1 ) && ( IVAS_DEC_VoIP_IsEmpty( hIvasDec, nOutSamples ) || nFramesFed < 2 ) ) +#else if ( nextPacketRcvTime_ms == (uint32_t) ( -1 ) && ( IVAS_DEC_VoIP_IsEmpty( hIvasDec ) || nFramesFed < 2 ) ) +#endif { break; } - nOutSamples = (int16_t) ( arg.output_Fs / 50 ); /* decode and get samples */ - if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, pcmBuf, systemTime_ms + if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, + pcmBuf, systemTime_ms +#if defined( JBM_TSM_ON_TCS ) || defined( VARIABLE_SPEED_DECODING ) + , + &nSamplesAvailableNext +#endif #ifdef SUPPORT_JBM_TRACEFILE , writeJbmTraceFileFrameWrapper, @@ -2126,7 +2322,11 @@ static ivas_error decodeVoIP( goto cleanup; } } +#ifdef DEBUG_JBM_CMD_OPTION + else if ( arg.noBadFrameDelay == false ) +#else else +#endif { ++numInitialBadFrames; } @@ -2149,6 +2349,55 @@ static ivas_error decodeVoIP( { delayNumSamples -= nOutSamples; } + +#ifdef JBM_TSM_ON_TCS + /* Write ISM metadata to external file(s) */ + if ( decodedGoodFrame && arg.outputFormat == IVAS_DEC_OUTPUT_EXT ) + { + int16_t i; + + 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 ) + { + IVAS_ISM_METADATA IsmMetadata; + + if ( ( error = IVAS_DEC_GetObjectMetadata( hIvasDec, &IsmMetadata, 0, 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; + } + } + } + else if ( bsFormat == IVAS_DEC_BS_MASA ) + { + 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, hMasaExtOutMeta ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( masaWriter ) ); + goto cleanup; + } + } + } +#endif } if ( !arg.quietModeEnabled ) @@ -2157,7 +2406,12 @@ static ivas_error decodeVoIP( } frame++; +#ifdef JBM_TSM_ON_TCS + systemTime_ms += systemTimeInc_ms; + nFramesWritten++; +#else systemTime_ms += 20; +#endif #ifdef WMOPS update_mem(); @@ -2215,6 +2469,547 @@ cleanup: } +#ifdef VARIABLE_SPEED_DECODING +/*---------------------------------------------------------------------* + * decodeVariableSpeed() + * + * Read G.192 or decode with variable Speed + *---------------------------------------------------------------------*/ + +static ivas_error decodeVariableSpeed( + DecArguments arg, + BS_READER_HANDLE hBsReader, + HeadRotFileReader *headRotReader, + HeadRotFileReader *refRotReader, + Vector3PairFileReader *referenceVectorReader, + IVAS_DEC_HANDLE hIvasDec ) + +{ + 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]; + 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; + uint16_t nSamplesAvailableNext; + int16_t pcmBuf[MAX_OUTPUT_PCM_BUFFER_SIZE]; +#ifdef SUPPORT_JBM_TRACEFILE + JbmTraceFileWriter *jbmTraceWriter = NULL; +#endif + TsmScaleFileReader *tsmScaleFileReader = NULL; + IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS]; + IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES]; + int16_t scale; + for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i ) + { + ismWriters[i] = NULL; + } + + /*------------------------------------------------------------------------------------------* + * Open TSM scale file + *------------------------------------------------------------------------------------------*/ + + if ( arg.tsmScaleFileEnabled ) + { + if ( ( tsmScaleFileReader = TsmScaleFileReader_open( arg.tsmScaleFileName ) ) == NULL ) + { + fprintf( stderr, "\nError: Can't open TSM scale file %s \n\n", arg.tsmScaleFileName ); + goto cleanup; + } + } + + 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 + nSamplesAvailableNext = 0; + nOutSamples = (int16_t) ( arg.output_Fs / 1000 * VARIABLE_SPEED_FETCH_FRAMESIZE_MS ); + /*------------------------------------------------------------------------------------------* + * 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 not enough samples availble */ + + /* 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 ) + { + IVAS_QUATERNION Quaternions[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES]; + + for ( i = 0; i < IVAS_MAX_PARAM_SPATIAL_SUBFRAMES; i++ ) + { + 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, Pos ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nIVAS_DEC_FeedHeadTrackData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) ); + goto cleanup; + } + } + + /* decode and get samples */ + do + { + error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, + pcmBuf, 0, + &nSamplesAvailableNext +#ifdef SUPPORT_JBM_TRACEFILE + , + writeJbmTraceFileFrameWrapper, + jbmTraceWriter +#endif + ); + if ( error != IVAS_ERR_OK && error != IVAS_ERR_VS_FRAME_NEEDED ) + + { + fprintf( stderr, "\nError in IVAS_DEC_VoIP_GetSamples: %s\n", IVAS_DEC_GetErrorMessage( error ) ); + goto cleanup; + } + if ( error == IVAS_ERR_VS_FRAME_NEEDED ) + { + if ( arg.tsmScaleFileEnabled ) + { + if ( ( error = TsmScaleFileReader_readScale( tsmScaleFileReader, &scale ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError: input bitstream file couldn't be read: %s \n\n", arg.inputBitstreamFilename ); + goto cleanup; + } + IVAS_DEC_VoIP_SetScale( hIvasDec, scale ); + } + + 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 ) + { + bfi = 1; + } + else + { + bfi = 0; + } + } +#endif + + /* Feed into decoder */ + if ( ( error = IVAS_DEC_FeedFrame_Serial( hIvasDec, bit_stream, num_bits, bfi ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError: could not feed frame to decoder: %s\n\n", IVAS_DEC_GetErrorMessage( error ) ); + goto cleanup; + } + error = IVAS_ERR_VS_FRAME_NEEDED; + } + } while ( error != IVAS_ERR_OK ); + + if ( error == IVAS_ERR_END_OF_FILE ) + { + break; + } + + /* Continue checking for first good frame until it is found */ + if ( !decodedGoodFrame ) + { + if ( ( error = IVAS_DEC_HasDecodedFirstGoodFrame( hIvasDec, &decodedGoodFrame ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError in IVAS_DEC_HasDecodedFirstGoodFrame, code: %d\n", error ); + goto cleanup; + } + + /* Once good frame decoded, catch up */ + if ( decodedGoodFrame ) + { + error = initOnFirstGoodFrame( + hIvasDec, + arg, + numInitialBadFrames, + nOutSamples, + delayNumSamples_orig, + &delayNumSamples, + &delayTimeScale, + &bsFormat, + &afWriter, + &masaWriter, + ismWriters, + &nOutChannels, + &numObj ); + if ( error != IVAS_ERR_OK ) + { + goto cleanup; + } + } + else + { + ++numInitialBadFrames; + } + } + + + /* Write current frame */ + if ( decodedGoodFrame ) + { + if ( delayNumSamples < nOutSamples ) + { + 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; + } + } + + /* Write ISm metadata to external file(s) */ + if ( decodedGoodFrame && arg.outputFormat == IVAS_DEC_OUTPUT_EXT ) + { + 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 ) + { + IVAS_ISM_METADATA IsmMetadata; + + if ( ( error = IVAS_DEC_GetObjectMetadata( hIvasDec, &IsmMetadata, 0, 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; + } + } + } + else if ( bsFormat == IVAS_DEC_BS_MASA ) + { + 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, hMasaExtOutMeta ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( masaWriter ) ); + goto cleanup; + } + } + } + + frame++; + if ( !arg.quietModeEnabled ) + { + fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame ); +#ifdef DEBUGGING + if ( IVAS_DEC_GetBerDetectFlag( hIvasDec ) ) + { + fprintf( stdout, "\n Decoding error: BER detected in frame %d !!!!!\n", frame - 1 ); + } +#endif + } +#ifdef WMOPS + update_wmops(); +#ifdef MEM_COUNT_DETAILS + export_mem( "mem_analysis.csv" ); +#endif +#endif + } + + + /*------------------------------------------------------------------------------------------* + * Flush what is still left in the VoIP Buffers.... + *------------------------------------------------------------------------------------------*/ + while ( nSamplesAvailableNext > 0 ) + { + int16_t nSamplesFlushed; + + /* Feed into decoder */ + + /* 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 ) + { + IVAS_QUATERNION Quaternions[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES]; + + for ( i = 0; i < IVAS_MAX_PARAM_SPATIAL_SUBFRAMES; i++ ) + { + 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, Pos ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nIVAS_DEC_FeedHeadTrackData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) ); + goto cleanup; + } + } + + /* decode and get samples */ + if ( ( error = IVAS_DEC_VoIP_Flush( hIvasDec, nOutSamples, + pcmBuf, + &nSamplesAvailableNext, + &nSamplesFlushed ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError in IVAS_DEC_VoIP_Flush: %s\n", IVAS_DEC_GetErrorMessage( error ) ); + goto cleanup; + } + + + /* Write current frame */ + + if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, nSamplesFlushed * nOutChannels ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nOutput audio file writer error\n" ); + goto cleanup; + } + + + /* Write ISm metadata to external file(s) */ + if ( decodedGoodFrame && arg.outputFormat == IVAS_DEC_OUTPUT_EXT ) + { + 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 ) + { + IVAS_ISM_METADATA IsmMetadata; + + if ( ( error = IVAS_DEC_GetObjectMetadata( hIvasDec, &IsmMetadata, 0, 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; + } + } + } + else if ( bsFormat == IVAS_DEC_BS_MASA ) + { + 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, hMasaExtOutMeta ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( masaWriter ) ); + goto cleanup; + } + } + } + + frame++; + if ( !arg.quietModeEnabled ) + { + fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame ); +#ifdef DEBUGGING + if ( IVAS_DEC_GetBerDetectFlag( hIvasDec ) ) + { + fprintf( stdout, "\n Decoding error: BER detected in frame %d !!!!!\n", frame - 1 ); + } +#endif + } + } + /*------------------------------------------------------------------------------------------* + * Printouts after decoding has finished + *------------------------------------------------------------------------------------------*/ + + if ( !arg.quietModeEnabled ) + { + 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) */ + if ( arg.outputFormat == IVAS_DEC_OUTPUT_EXT ) + { + if ( bsFormat == IVAS_DEC_BS_OBJ ) + { + for ( i = 0; i < numObj; i++ ) + { + fprintf( stdout, "\nOutput metadata file: %s", IsmFileWriter_getFilePath( ismWriters[i] ) ); + } + fprintf( stdout, "\n" ); + } + else if ( bsFormat == IVAS_DEC_BS_MASA ) + { + fprintf( stdout, "\nOutput metadata file: %s\n", MasaFileWriter_getFilePath( masaWriter ) ); + } + } + + /* add zeros at the end to have equal length of synthesized signals */ + 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; + } + + /*------------------------------------------------------------------------------------------* + * Close files and deallocate resources + *------------------------------------------------------------------------------------------*/ + + decodingFailed = false; /* This will stay set to true if cleanup is reached via a goto due to an error */ + +cleanup: + + AudioFileWriter_close( &afWriter ); + MasaFileWriter_close( &masaWriter ); + TsmScaleFileReader_close( &tsmScaleFileReader ); + for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; i++ ) + { + IsmFileWriter_close( &ismWriters[i] ); + } + + if ( decodingFailed && error == IVAS_ERR_OK ) + { + return IVAS_ERR_UNKNOWN; + } + + return error; +} + +#endif + #ifdef DEBUGGING /*---------------------------------------------------------------------* * parseForcedRendModeDec() diff --git a/apps/encoder.c b/apps/encoder.c index aae2e1e88e1766814bff4987d2b6aab8156d59a8..df7c0915d4f6b5f1306d69b25b011cdc75ece738 100644 --- a/apps/encoder.c +++ b/apps/encoder.c @@ -111,6 +111,7 @@ typedef struct IVAS_ENC_CHANNEL_AWARE_CONFIG caConfig; const char *ca_config_file; bool mimeOutput; + IVAS_ENC_COMPLEXITY_LEVEL complexityLevel; #ifdef DEBUGGING IVAS_ENC_FORCED_MODE forcedMode; @@ -878,6 +879,7 @@ static void initArgStruct( EncArguments *arg ) arg->ca_config_file = NULL; arg->mimeOutput = false; arg->ism_extended_metadata = false; + arg->complexityLevel = IVAS_ENC_COMPLEXITY_LEVEL_THREE; #ifdef DEBUGGING arg->forcedMode = IVAS_ENC_FORCE_UNFORCED; @@ -1130,18 +1132,18 @@ static bool parseCmdlIVAS_enc( { strncpy( stmp, argv[i], sizeof( stmp ) ); stmp[sizeof( stmp ) - 1] = '\0'; - to_upper( argv[i] ); - if ( strcmp( argv[i], "LO" ) == 0 ) + to_upper( stmp ); + if ( strcmp( stmp, "LO" ) == 0 ) { arg->caConfig.fec_indicator = IVAS_ENC_FEC_LO; } - else if ( strcmp( argv[i], "HI" ) == 0 ) + else if ( strcmp( stmp, "HI" ) == 0 ) { arg->caConfig.fec_indicator = IVAS_ENC_FEC_HI; } else { - arg->ca_config_file = stmp; + arg->ca_config_file = argv[i]; } i++; @@ -1177,6 +1179,30 @@ static bool parseCmdlIVAS_enc( ++i; } + + /*-----------------------------------------------------------------* + * Complexity Level + *-----------------------------------------------------------------*/ + + /* actual parsing of level will be implemented after characterization */ + else if ( strcmp( argv_to_upper, "-LEVEL" ) == 0 ) + { + int16_t level; + + ++i; + level = (int16_t) atoi( argv[i++] ); + if ( level < IVAS_ENC_COMPLEXITY_LEVEL_ONE || level > IVAS_ENC_COMPLEXITY_LEVEL_THREE ) + { + fprintf( stdout, "Invalid complexity level specified.\n" ); + usage_enc(); + return false; + } + else if ( level == IVAS_ENC_COMPLEXITY_LEVEL_ONE || level == IVAS_ENC_COMPLEXITY_LEVEL_TWO ) + { + fprintf( stdout, "Complexity levels 1 and 2 will be defined after characterisation - default to level 3 (full functionality).\n" ); + } + } + /*-----------------------------------------------------------------* * IVAS Formats *-----------------------------------------------------------------*/ @@ -1648,18 +1674,17 @@ static void usage_enc( void ) fprintf( stdout, "Options:\n" ); fprintf( stdout, "--------\n" ); 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, "-stereo : Stereo format \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, " where positive (+) indicates extended metadata (only 64 kbps and up) \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 Channels File : MASA format \n" ); - fprintf( stdout, " where Channels specifies the number of input/transport channels (1 or 2): \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 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" ); @@ -1685,6 +1710,8 @@ static void usage_enc( void ) fprintf( stdout, " default output bitstream file format is G.192\n" ); fprintf( stdout, "-bypass mode : SBA PCA by-pass, mode = (1, 2), 1 = PCA off, 2 = signal adaptive, default is 1\n" ); + fprintf( stdout, "-level level : Complexity level, level = (1, 2, 3), will be defined after characterisation. \n" ); + fprintf( stdout, " Currently, all values default to level 3 (full functionality).\n" ); #ifdef DEBUGGING fprintf( stdout, "-force T : Force specific mode, T = (speech, music, ACELP, GSC, TCX, HQ),\n" ); fprintf( stdout, " alternatively, T can be a text file where each line contains \"nb_frames T\"\n" ); diff --git a/apps/renderer.c b/apps/renderer.c index 726eeb237b13c1e6f6f7b3c9b391b17373e213d0..3ed5d4996e9fb6fcfc6ec21a70808f390d0d9278 100644 --- a/apps/renderer.c +++ b/apps/renderer.c @@ -135,8 +135,13 @@ typedef struct char referenceRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH]; char customHrtfFilePath[RENDERER_MAX_CLI_ARG_LENGTH]; char renderConfigFilePath[RENDERER_MAX_CLI_ARG_LENGTH]; +#ifdef FIX_439_OTR_PARAMS + int8_t orientation_tracking; +#else int8_t orientationTracking; - float noDiegeticPan; +#endif + int16_t nonDiegeticPan; + float nonDiegeticPanGain; bool delayCompensationEnabled; bool quietModeEnabled; bool sceneDescriptionInput; @@ -160,7 +165,7 @@ typedef enum CmdLnOptionId_refRotFile, CmdLnOptionId_customHrtfFile, CmdLnOptionId_renderConfigFile, - CmdLnOptionId_noDiegeticPan, + CmdLnOptionId_nonDiegeticPan, CmdLnOptionId_orientationTracking, CmdlnOptionId_lfePosition, CmdlnOptionId_lfeMatrix, @@ -234,10 +239,10 @@ static const CmdLnParser_Option cliOptions[] = { .description = "Binaural renderer configuration file (only for BINAURAL and BINAURAL_ROOM outputs)", }, { - .id = CmdLnOptionId_noDiegeticPan, - .match = "no_diegetic_pan", + .id = CmdLnOptionId_nonDiegeticPan, + .match = "non_diegetic_pan", .matchShort = "ndp", - .description = "Panning mono no diegetic sound to stereo -1<= pan <= 1\nleft or l or 1->left, right or r or -1->right, center or c or 0 ->middle\n(todo: implementation)", + .description = "Panning mono non diegetic sound to stereo -90<= pan <= 90\nleft or l or 90->left, right or r or -90->right, center or c or 0 ->middle\n(todo: implementation)", }, { .id = CmdLnOptionId_orientationTracking, @@ -536,7 +541,7 @@ int main( int32_t delayTimeScale = 0; int16_t i, numChannels; ivas_error error = IVAS_ERR_OK; - IVAS_POSITION Pos[RENDERER_HEAD_POSITIONS_PER_FRAME]; + IVAS_VECTOR3 Pos[RENDERER_HEAD_POSITIONS_PER_FRAME]; #ifdef WMOPS reset_wmops(); @@ -551,6 +556,19 @@ int main( CmdlnArgs args = parseCmdlnArgs( argc, argv ); + if ( args.nonDiegeticPan && !( ( args.inConfig.numAudioObjects == 0 && args.inConfig.multiChannelBuses[0].audioConfig == IVAS_REND_AUDIO_CONFIG_MONO ) || + ( args.inConfig.numAudioObjects > 0 && args.inConfig.audioObjects[0].audioConfig == IVAS_REND_AUDIO_CONFIG_OBJECT && args.inConfig.numAudioObjects == 1 ) ) ) + { + fprintf( stderr, "\ninvalid configuration - non-diegetic panning requires mono or ISM1 input\n" ); + exit( -1 ); + } + + if ( args.nonDiegeticPan && args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_STEREO ) + { + fprintf( stderr, "\ninvalid configuration - non-diegetic panning requires stereo output\n" ); + exit( -1 ); + } + positionProvider = IsmPositionProvider_open(); convert_backslash( args.inputFilePath ); @@ -645,9 +663,6 @@ int main( fprintf( stderr, "Sampling rate must be specified on command line when using raw PCM input\n" ); exit( -1 ); } -#ifndef FIX_389_EXT_REND_PCM_SR - args.sampleRate = inFileSampleRate; -#endif break; default: fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) ); @@ -668,18 +683,14 @@ int main( IVAS_REND_InputId sbaIds[RENDERER_MAX_SBA_INPUTS] = { 0 }; IVAS_REND_InputId masaIds[RENDERER_MAX_MASA_INPUTS] = { 0 }; - if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig ) ) != IVAS_ERR_OK ) + if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, args.nonDiegeticPan, args.nonDiegeticPanGain ) ) != IVAS_ERR_OK ) { fprintf( stderr, "Error opening renderer handle: %s\n", ivas_error_to_string( error ) ); exit( -1 ); } /* === Configure === */ -#ifdef FIX_392_LATE_REVERB if ( ( error = IVAS_REND_InitConfig( hIvasRend, args.outConfig.audioConfig ) ) != IVAS_ERR_OK ) -#else - if ( ( error = IVAS_REND_InitConfig( hIvasRend, ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) || ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL ) ) ) != IVAS_ERR_OK ) -#endif { fprintf( stderr, "Error in Renderer Config Init\n" ); exit( -1 ); @@ -715,7 +726,11 @@ int main( } } +#ifdef FIX_439_OTR_PARAMS + if ( ( error = IVAS_REND_SetOrientationTrackingMode( hIvasRend, args.orientation_tracking ) ) != IVAS_ERR_OK ) +#else if ( ( error = IVAS_REND_SetOrientationTrackingMode( hIvasRend, args.orientationTracking ) ) != IVAS_ERR_OK ) +#endif { return error; } @@ -971,12 +986,8 @@ int main( } else { -#ifdef FIX_379_EXT_METADATA error = IVAS_REND_SetHeadRotation( hIvasRend, NULL, NULL ); if ( ( error != IVAS_ERR_OK ) && ( error != IVAS_ERR_INVALID_OUTPUT_FORMAT ) ) // VE: TBC -#else - if ( ( ( error = IVAS_REND_SetHeadRotation( hIvasRend, NULL, NULL ) ) != IVAS_ERR_OK ) && ( IVAS_REND_SetHeadRotation( hIvasRend, NULL, NULL ) != IVAS_ERR_INVALID_OUTPUT_FORMAT ) ) // VE: TBC -#endif { fprintf( stderr, "Error setting Head Rotation: %s\n", ivas_error_to_string( error ) ); exit( -1 ); @@ -1347,61 +1358,85 @@ static bool parseOutConfig( static bool parseDiegeticPan( char *value, - float *noDiegeticPan ) + float *nonDiegeticPan ) { to_upper( value ); if ( ( strcmp( value, "CENTER" ) == 0 ) || ( strchr( value, 'C' ) != NULL ) ) { - *noDiegeticPan = 0.f; + *nonDiegeticPan = 0.f; } else if ( ( strcmp( value, "LEFT" ) == 0 ) || ( strchr( value, 'L' ) != NULL ) ) { - *noDiegeticPan = -1.f; + *nonDiegeticPan = 1.f; } else if ( ( strcmp( value, "RIGHT" ) == 0 ) || ( strchr( value, 'R' ) != NULL ) ) { - *noDiegeticPan = 1.f; + *nonDiegeticPan = -1.f; } else { - *noDiegeticPan = (float) atof( value ); + *nonDiegeticPan = (float) atof( value ) / 90.f; - if ( *noDiegeticPan > 1.0f || *noDiegeticPan < -1.0f ) + if ( *nonDiegeticPan > 1.0f || *nonDiegeticPan < -1.0f ) { fprintf( stderr, "Error: Incorrect value for panning option argument specified!\n\n" ); return false; } } - return false; + return true; } static bool parseOrientationTracking( char *value, - int8_t *tracking_type ) +#ifdef FIX_439_OTR_PARAMS + int8_t *orientation_tracking +#else + int8_t *tracking_type +#endif +) { - to_upper( value ); if ( strcmp( value, "NONE" ) == 0 ) { +#ifdef FIX_439_OTR_PARAMS + *orientation_tracking = HEAD_ORIENT_TRK_NONE; +#else *tracking_type = IVAS_ORIENT_TRK_NONE; +#endif } else if ( strcmp( value, "REF" ) == 0 ) { +#ifdef FIX_439_OTR_PARAMS + *orientation_tracking = HEAD_ORIENT_TRK_REF; +#else *tracking_type = IVAS_ORIENT_TRK_REF; +#endif } else if ( strcmp( value, "AVG" ) == 0 ) { +#ifdef FIX_439_OTR_PARAMS + *orientation_tracking = HEAD_ORIENT_TRK_AVG; +#else *tracking_type = IVAS_ORIENT_TRK_AVG; +#endif } else if ( strcmp( value, "REF_VEC" ) == 0 ) { +#ifdef FIX_439_OTR_PARAMS + *orientation_tracking = HEAD_ORIENT_TRK_REF_VEC; +#else *tracking_type = IVAS_ORIENT_TRK_REF_VEC; +#endif } else if ( strcmp( value, "REF_VEC_LEV" ) == 0 ) { +#ifdef FIX_439_OTR_PARAMS + *orientation_tracking = HEAD_ORIENT_TRK_REF_VEC_LEV; +#else *tracking_type = IVAS_ORIENT_TRK_REF_VEC_LEV; +#endif } else { @@ -1625,8 +1660,13 @@ static CmdlnArgs defaultArgs( clearString( args.customHrtfFilePath ); clearString( args.renderConfigFilePath ); +#ifdef FIX_439_OTR_PARAMS + args.orientation_tracking = HEAD_ORIENT_TRK_NONE; +#else args.orientationTracking = IVAS_ORIENT_TRK_NONE; - args.noDiegeticPan = 0.0f; +#endif + args.nonDiegeticPan = 0; + args.nonDiegeticPanGain = 0.f; args.delayCompensationEnabled = true; args.quietModeEnabled = false; @@ -1716,17 +1756,22 @@ static void parseOption( assert( numOptionValues == 1 ); strncpy( args->renderConfigFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 ); break; - case CmdLnOptionId_noDiegeticPan: + case CmdLnOptionId_nonDiegeticPan: assert( numOptionValues == 1 ); - if ( !parseDiegeticPan( optionValues[0], &args->noDiegeticPan ) ) + if ( !parseDiegeticPan( optionValues[0], &args->nonDiegeticPanGain ) ) { fprintf( stderr, "Unknown option for diegetic panning: %s\n", optionValues[0] ); exit( -1 ); } + args->nonDiegeticPan = 1; break; case CmdLnOptionId_orientationTracking: assert( numOptionValues == 1 ); +#ifdef FIX_439_OTR_PARAMS + if ( !parseOrientationTracking( optionValues[0], &args->orientation_tracking ) ) +#else if ( !parseOrientationTracking( optionValues[0], &args->orientationTracking ) ) +#endif { fprintf( stderr, "Unknown option for orientation tracking: %s\n", optionValues[0] ); exit( -1 ); @@ -1798,7 +1843,7 @@ IsmPositionProvider *IsmPositionProvider_open( IsmPositionProvider *ipp; uint16_t i; - ipp = (IsmPositionProvider *) malloc_( sizeof( IsmPositionProvider ) ); + ipp = (IsmPositionProvider *) malloc( sizeof( IsmPositionProvider ) ); ipp->frameCounter = 0; ipp->numObjects = 0; @@ -1833,6 +1878,7 @@ void getMetadataFromFileReader( objectMetadataBuffer->positions[objIdx].radius = ismMetadata.radius; objectMetadataBuffer->positions[objIdx].yaw = ismMetadata.yaw; objectMetadataBuffer->positions[objIdx].pitch = ismMetadata.pitch; + objectMetadataBuffer->positions[objIdx].non_diegetic_flag = ismMetadata.non_diegetic_flag; return; } @@ -1890,6 +1936,7 @@ static void IsmPositionProvider_getNextFrame( objectMetadataBuffer->positions[objIdx].radius = 1.0f; objectMetadataBuffer->positions[objIdx].yaw = 0.0f; objectMetadataBuffer->positions[objIdx].pitch = 0.0f; + objectMetadataBuffer->positions[objIdx].non_diegetic_flag = 0; } /* Wrap azimuth to lie within (-180, 180] range */ @@ -2151,13 +2198,14 @@ static void parseObjectPosition( { char *endptr; int16_t read_values; - float meta_prm[7] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f }; + float meta_prm[8] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f }; + readNextMetadataChunk( line, "," ); *positionDuration = (uint16_t) strtol( line, &endptr, 10 ); readNextMetadataChunk( line, "\n" ); - 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] ); + read_values = (int16_t) sscanf( line, "%f,%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], &meta_prm[7] ); if ( read_values < 2 ) { @@ -2170,6 +2218,7 @@ static void parseObjectPosition( position->radius = meta_prm[2]; position->yaw = meta_prm[5]; position->pitch = meta_prm[6]; + position->non_diegetic_flag = (int16_t) meta_prm[7]; return; } @@ -2193,8 +2242,8 @@ static void parseIsm( if ( parseUint32( line, &numberOfObjectPositionsToRead ) == 0 ) { positionProvider->numPositions[idx] = numberOfObjectPositionsToRead; - positionProvider->positions[idx] = malloc_( numberOfObjectPositionsToRead * sizeof( IVAS_REND_AudioObjectPosition ) ); - positionProvider->positionDurations[idx] = 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 ) { diff --git a/ci/run_evs_be_win_test.py b/ci/run_evs_be_win_test.py new file mode 100644 index 0000000000000000000000000000000000000000..f1bcd7f3a4e7e69634878431d56a29be111642b3 --- /dev/null +++ b/ci/run_evs_be_win_test.py @@ -0,0 +1,149 @@ +""" + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. 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. +""" + +from multiprocessing import Pool +import argparse +import subprocess +import os +import shutil +import sys + + +def run_condition(eval_cmd, diff_cmd, id_count): + """ Run ENC or DEC command string and compare output with EVS test vectors. """ + + cmd = subprocess.run(eval_cmd.split(), capture_output=True, text=True, check=True) + + # diff + diff_success = 1 + if ';' in diff_cmd: + diff_cmd1, diff_cmd2 = diff_cmd.split(';') + cmd1 = subprocess.run(diff_cmd1.split(), capture_output=True, text=True, check=True) + cmd2 = subprocess.run(diff_cmd2.split(), capture_output=True, text=True, check=True) + diff_success = cmd1.returncode + cmd2.returncode + else: + cmd = subprocess.run(diff_cmd.split(), capture_output=True, text=True, check=True) + diff_success = cmd.returncode + if diff_success == 0: + return None + else: + return f'[{str(id_count).rjust(3)}] FAIL: {" ".join(eval_cmd)}\n {diff_cmd}\n' + + +def environment_is_correct(paths): + """ + Check that the folder with the test resources is set up correctly: + - all Readme files there + - EVS binaries available in bin/ + - testv and switchPaths folder exist - Content is not checked, though + """ + ret = True + + for pth in paths: + if not os.path.exists(pth): + print(f"Environment setup is incorrect - {pth} not found.") + ret = False + + return ret + + +if __name__ == '__main__': + parser = argparse.ArgumentParser( + description='Run 26.444 test with parallel processes ') + parser.add_argument('-p', type=int, default=os.cpu_count(), + help='Number of processes (default cpu_count)') + parser.add_argument('-test_dir', type=str, default='./', + help='testvec directory from 26.444)') + parser.add_argument('-enc_bin', type=str, default='./bin/IVAS_cod.exe', + help='Encoder binary (default ./bin/IVAS_cod.exe)') + parser.add_argument('-dec_bin', type=str, default='./bin/IVAS_dec.exe', + help='Decoder binary (default ./bin/IVAS_dec.exe)') + + args = parser.parse_args() + test_vec_dir = args.test_dir + processes = args.p + enc_bin = args.enc_bin + dec_bin = args.dec_bin + + README_FILES = ['Readme_AMRWB_IO_dec.txt', 'Readme_AMRWB_IO_enc.txt', 'Readme_EVS_dec.txt', + 'Readme_EVS_enc.txt', 'Readme_JBM_dec.txt'] + + scripts = [os.path.join(test_vec_dir, script) for script in README_FILES] + + if not environment_is_correct([f'{test_vec_dir}/testv'] + scripts + [enc_bin, dec_bin]): + sys.exit(1) + + pool = Pool(processes) + results = [] + id_count = 0 + + for script in scripts: + with open(script) as file: + tmp_dir = None + eval_cmd = None + diff_cmd = '' + for line in file: + if line.startswith('TMP='): + assert tmp_dir is None + tmp_dir = line.split('"')[1] + if os.path.exists(tmp_dir): + shutil.rmtree(tmp_dir) + os.makedirs(tmp_dir) + line = line if tmp_dir is None else line.replace( + '$TMP/', f'{tmp_dir}/') + if '$CUT_DEC_BIN' in line: + eval_cmd = dec_bin + ' -q ' + ' '.join(line.split()[1:]) + if '$CUT_ENC_BIN' in line: + eval_cmd = enc_bin + ' -q ' + ' '.join(line.split()[1:]) + if '$DIFF_BIN' in line: + if 'Readme_JBM_dec.txt' in script: + if '-w' not in line.split()[1]: + diff_cmd = 'FC.exe ' + ' '.join(line.split()[1:]).replace('/', '\\').replace('\n', '/n') + continue + diff_cmd += '; FC.exe ' + ' '.join(line.split()[1:]).replace('/', '\\').replace('\n', '/n').replace('-w', '/W') + else: + diff_cmd = 'FC.exe ' + ' '.join(line.split()[1:]).replace('/', '\\').replace('\n', '/n') + results.append(pool.apply_async( + run_condition, args=(eval_cmd, diff_cmd, id_count))) + id_count = id_count + 1 + print('Total number of conditions for', '"' + + os.path.basename(script) + '": ' + str(id_count - 1)) + + results = [r.get() for r in results if r.get()] + if results: + print(f'\n{len(results)} test conditions failed:') + print('\n'.join(results)) + with open('failed.txt', 'w') as f: + print(f'\n{len(results)} test conditions failed:', file=f) + print('\n'.join(results), file=f) + sys.exit(1) + else: + print('\n *** All tests passed! ***') + sys.exit(0) diff --git a/ci/run_scheduled_sanitizer_test.py b/ci/run_scheduled_sanitizer_test.py index aa6f2636a44848c9505034aac8f2511961bfc66a..9886de42916bddbd7fea609c28b87978016742cd 100755 --- a/ci/run_scheduled_sanitizer_test.py +++ b/ci/run_scheduled_sanitizer_test.py @@ -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/smoke_test.sh b/ci/smoke_test.sh index 2062ff5080ff142aefd158454b14ab349387f3c0..b1b9e024b46711fc7b8ced20dfb3d1f1b19b3144 100755 --- a/ci/smoke_test.sh +++ b/ci/smoke_test.sh @@ -55,6 +55,7 @@ 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 @@ -62,7 +63,7 @@ if [ $BUILD -eq 1 ];then make clean # Replace free -> free_, malloc -> malloc_, calloc -> calloc_ - ./scripts/prepare_mem_dryrun.py + python3 ./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 @@ -74,27 +75,40 @@ if [ $BUILD -eq 1 ];then fi # run all modes vanilla-fashion -./scripts/runIvasCodec.py -p $cfg -U 1 $WORKERS | tee smoke_test_output.txt +# 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) +echo "\n======================= 1. non-ism modes no FEC =======================\n\n" +./scripts/runIvasCodec.py -m $non_ism_modes -p $cfg -U 1 $WORKERS | tee smoke_test_output.txt +echo "\n======================= 2. ism modes no FEC =======================\n\n" +./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 +echo "\n======================= 3. all modes with FEC =======================\n\n" ./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) +modes_with_ext_out=$(./scripts/runIvasCodec.py -l | grep 'MASA\|ISM' | grep -v ISM+) +echo "\n======================= 4. JBM, modes with no EXT =======================\n\n" ./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 +echo "\n======================= 5. JBM, modes with EXT =======================\n\n" +./scripts/runIvasCodec.py -m $modes_with_ext_out -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" +echo "\n======================= 6. binaural out with HRTF files - WB =======================\n\n" 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 +echo "\n======================= 7. binaural out with HRTF files - SWB =======================\n\n" 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 +echo "\n======================= 8. binaural out with HRTF files - FB =======================\n\n" 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/bits_alloc.c b/lib_com/bits_alloc.c index 41acc25b48329646c859750c26c8ff86a9f049a4..5ae9cb84d02ca54dcb42c640e33ab79da1cf4182 100644 --- a/lib_com/bits_alloc.c +++ b/lib_com/bits_alloc.c @@ -536,6 +536,7 @@ ivas_error config_acelp1( 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 active_cnt, /* i : Active frame counter */ 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 */ @@ -753,12 +754,11 @@ 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 ) ) { @@ -1314,7 +1314,6 @@ ivas_error config_acelp1( { if ( idchan > 0 && element_mode == IVAS_CPE_TD ) { -#ifdef LSF_RE_USE_SECONDARY_CHANNEL if ( !tdm_lp_reuse_flag ) { acelp_cfg->lsf_bits += bits; /* increase LSF Q bits */ @@ -1323,6 +1322,7 @@ ivas_error config_acelp1( else { int16_t nb_prm = 4; + if ( tdm_low_rate_mode == 1 ) { nb_prm = 2; @@ -1343,33 +1343,6 @@ ivas_error config_acelp1( bits -= allocate_unused( core_brate, coder_type, bits, 1, 0, LSFPRM, &acelp_cfg->lsf_bits ); } } -#else - int16_t nb_prm = 4; - - if ( tdm_low_rate_mode == 1 ) - { - nb_prm = 2; - } - - /* First add remaining bits on gains */ - if ( !( *uc_two_stage_flag ) ) - { - bits -= allocate_unused( core_brate, coder_type, bits, nb_prm, 0, GAINSPRM, acelp_cfg->gains_mode ); - } - - /* Then, Increase pitch bit budget */ - if ( tdm_Pitch_reuse_flag == 0 && bits > 0 ) - { - bits -= allocate_unused( core_brate, coder_type, bits, nb_prm, 0, PITCHPRM, acelp_cfg->pitch_bits ); - } - - /* Increase mid-lsf bit budget */ - if ( tdm_lp_reuse_flag == 0 && bits > 0 ) - { - bits -= allocate_unused( core_brate, coder_type, bits, 1, 0, MID_LSFSPRM, &acelp_cfg->mid_lsf_bits ); - bits -= allocate_unused( core_brate, coder_type, bits, 1, 0, LSFPRM, &acelp_cfg->lsf_bits ); - } -#endif #ifdef DEBUGGING if ( idchan > 0 && bits > 0 && ( coder_type > UNVOICED || tdm_low_rate_mode == 0 ) ) { diff --git a/lib_com/bitstream.c b/lib_com/bitstream.c index f8e70061bfa51ca2f6915e002341c99736bfe67e..d2aae93ed416c50f8086b2b43b62f32b1c7e9de6 100644 --- a/lib_com/bitstream.c +++ b/lib_com/bitstream.c @@ -62,6 +62,11 @@ FILE *FEC_pattern = NULL; /* FEC pattern file (for simulation of FEC) */ #endif +#ifdef IND_LIST_DYN +#define STEP_MAX_NUM_INDICES 100 /* increase the maximum number of allowed indices in the list by this amount */ +#endif + +#ifndef IND_LIST_DYN /*-------------------------------------------------------------------* * pack_bit() * @@ -113,106 +118,855 @@ static Word16 unpack_bit( ( *pt )++; } - return bit; + return bit; +} +#endif + +/*-------------------------------------------------------------------* + * rate2AMRWB_IOmode() + * + * lookup AMRWB IO mode + *-------------------------------------------------------------------*/ + +static Word16 rate2AMRWB_IOmode( + Word32 brate /* i : bitrate */ +) +{ + switch ( brate ) + { + /* EVS AMR-WB IO modes */ + case SID_1k75: + return AMRWB_IO_SID; + case ACELP_6k60: + return AMRWB_IO_6600; + case ACELP_8k85: + return AMRWB_IO_8850; + case ACELP_12k65: + return AMRWB_IO_1265; + case ACELP_14k25: + return AMRWB_IO_1425; + case ACELP_15k85: + return AMRWB_IO_1585; + case ACELP_18k25: + return AMRWB_IO_1825; + case ACELP_19k85: + return AMRWB_IO_1985; + case ACELP_23k05: + return AMRWB_IO_2305; + case ACELP_23k85: + return AMRWB_IO_2385; + default: + break; + } + + return -1; +} + +/*-------------------------------------------------------------------* + * rate2EVSmode() + * + * lookup EVS mode + *-------------------------------------------------------------------*/ +Word16 rate2EVSmode( + const Word32 brate, /* i : bitrate */ + int16_t *is_amr_wb /* o : (flag) does the bitrate belong to AMR-WB? Can be NULL */ +) +{ + if ( is_amr_wb != NULL ) + { + *is_amr_wb = 0; + } + + switch ( brate ) + { + /* EVS Primary modes */ + case FRAME_NO_DATA: + return NO_DATA_RECEIVED; + case SID_2k40: + return PRIMARY_SID; + case PPP_NELP_2k80: + return PRIMARY_2800; + case ACELP_7k20: + return PRIMARY_7200; + case ACELP_8k00: + return PRIMARY_8000; + case ACELP_9k60: + return PRIMARY_9600; + case ACELP_13k20: + return PRIMARY_13200; + case ACELP_16k40: + return PRIMARY_16400; + case ACELP_24k40: + return PRIMARY_24400; + case ACELP_32k: + return PRIMARY_32000; + case ACELP_48k: + return PRIMARY_48000; + case ACELP_64k: + return PRIMARY_64000; + case HQ_96k: + return PRIMARY_96000; + case HQ_128k: + return PRIMARY_128000; + default: + break; + } + + if ( is_amr_wb != NULL ) + { + *is_amr_wb = 1; + } + + return rate2AMRWB_IOmode( brate ); +} + +#ifdef IND_LIST_DYN +/*-------------------------------------------------------------------* + * ind_list_realloc() + * + * Re-allocate the list of indices + *-------------------------------------------------------------------*/ + +ivas_error ind_list_realloc( + BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */ + int16_t max_num_indices /* i : new maximum number of allowed indices in the list */ +) +{ + int16_t i, ind_list_pos; + INDICE_HANDLE new_ind_list; + + /* allocate new buffer of indices */ + if ( ( new_ind_list = (INDICE_HANDLE) malloc( max_num_indices * sizeof( Indice ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for buffer of indices!\n" ) ); + } + + /* move indices from the old list to the new list */ + for ( i = 0; i < min( max_num_indices, *( hBstr->ivas_max_num_indices ) ); i++ ) + { + if ( ( *hBstr->ivas_ind_list_zero )[i].nb_bits > -1 ) + { + new_ind_list[i].id = ( *hBstr->ivas_ind_list_zero )[i].id; + new_ind_list[i].value = ( *hBstr->ivas_ind_list_zero )[i].value; + } + new_ind_list[i].nb_bits = ( *hBstr->ivas_ind_list_zero )[i].nb_bits; + } + + /* reset nb_bits of all other indices to -1 */ + for ( ; i < max_num_indices; i++ ) + { + new_ind_list[i].nb_bits = -1; + } + + /* get the current position inside the old list */ + ind_list_pos = (int16_t) ( hBstr->ind_list - ( *hBstr->ivas_ind_list_zero ) ); + + /* free the old list */ + free( ( *hBstr->ivas_ind_list_zero ) ); + + /* set pointers in the new list */ + hBstr->ind_list = &new_ind_list[ind_list_pos]; + *( hBstr->ivas_ind_list_zero ) = new_ind_list; + + /* set the new maximum number of indices */ + *( hBstr->ivas_max_num_indices ) = max_num_indices; + + return IVAS_ERR_OK; +} + + +/*-----------------------------------------------------------------------* + * get_ivas_max_num_indices() + * + * Get the maximum allowed number of indices in the encoder + *-----------------------------------------------------------------------*/ + +int16_t get_ivas_max_num_indices( /* o : maximum number of indices */ + const IVAS_FORMAT ivas_format, /* i : IVAS format */ + const int32_t ivas_total_brate /* i : IVAS total bitrate */ +) +{ + if ( ivas_format == STEREO_FORMAT ) + { + if ( ivas_total_brate <= IVAS_16k4 ) + { + return 300; + } + else if ( ivas_total_brate <= IVAS_24k4 ) + { + return 400; + } + else if ( ivas_total_brate <= IVAS_32k ) + { + return 450; + } + else if ( ivas_total_brate <= IVAS_48k ) + { + return 650; + } + else if ( ivas_total_brate <= IVAS_80k ) + { + return 750; + } + else if ( ivas_total_brate <= IVAS_128k ) + { + return 850; + } + else if ( ivas_total_brate <= IVAS_192k ) + { + return 950; + } + else if ( ivas_total_brate <= IVAS_256k ) + { + return 1350; + } + else + { + return 1650; + } + } + else if ( ivas_format == ISM_FORMAT || ivas_format == MONO_FORMAT ) + { + if ( ivas_total_brate <= IVAS_16k4 ) + { + return 250; + } + else if ( ivas_total_brate <= IVAS_24k4 ) + { + return 350; + } + else if ( ivas_total_brate <= IVAS_32k ) + { + return 450; + } + else if ( ivas_total_brate <= IVAS_48k ) + { + return 550; + } + else if ( ivas_total_brate <= IVAS_64k ) + { + return 620; + } + else if ( ivas_total_brate <= IVAS_80k ) + { + return 670; + } + else if ( ivas_total_brate <= IVAS_96k ) + { + return 780; + } + else if ( ivas_total_brate <= IVAS_128k ) + { + return 880; + } + else if ( ivas_total_brate <= IVAS_192k ) + { + return 950; + } + else if ( ivas_total_brate <= IVAS_256k ) + { + return 1100; + } + else if ( ivas_total_brate <= IVAS_384k ) + { + return 1300; + } + else + { + return 1650; + } + } + else if ( ivas_format == SBA_FORMAT ) + { + if ( ivas_total_brate <= IVAS_16k4 ) + { + return 250; + } + else if ( ivas_total_brate <= IVAS_24k4 ) + { + return 350; + } + else if ( ivas_total_brate <= IVAS_32k ) + { + return 400; + } + else if ( ivas_total_brate <= IVAS_48k ) + { + return 650; + } + else if ( ivas_total_brate <= IVAS_80k ) + { + return 750; + } + else if ( ivas_total_brate <= IVAS_128k ) + { + return 1020; + } + else if ( ivas_total_brate <= IVAS_160k ) + { + return 1160; + } + else if ( ivas_total_brate <= IVAS_192k ) + { + return 1220; + } + else if ( ivas_total_brate <= IVAS_256k ) + { + return 1300; + } + else if ( ivas_total_brate <= IVAS_384k ) + { + return 1720; + } + else + { + return 2000; + } + } + else if ( ivas_format == MASA_FORMAT ) + { + if ( ivas_total_brate <= IVAS_16k4 ) + { + return 300; + } + else if ( ivas_total_brate <= IVAS_32k ) + { + return 400; + } + else if ( ivas_total_brate <= IVAS_48k ) + { + return 650; + } + else if ( ivas_total_brate <= IVAS_80k ) + { + return 750; + } + else if ( ivas_total_brate <= IVAS_160k ) + { + return 850; + } + else if ( ivas_total_brate <= IVAS_192k ) + { + return 950; + } + else if ( ivas_total_brate <= IVAS_256k ) + { + return 1150; + } + else if ( ivas_total_brate <= IVAS_384k ) + { + return 1450; + } + else + { + return 1650; + } + } + else if ( ivas_format == MC_FORMAT ) + { + if ( ivas_total_brate <= IVAS_16k4 ) + { + return 250; + } + else if ( ivas_total_brate <= IVAS_24k4 ) + { + return 350; + } + else if ( ivas_total_brate <= IVAS_32k ) + { + return 400; + } + else if ( ivas_total_brate <= IVAS_48k ) + { + return 650; + } + else if ( ivas_total_brate <= IVAS_64k ) + { + return 750; + } + else if ( ivas_total_brate <= IVAS_80k ) + { + return 850; + } + else if ( ivas_total_brate <= IVAS_128k ) + { + return 1150; + } + else if ( ivas_total_brate <= IVAS_160k ) + { + return 1420; + } + else if ( ivas_total_brate <= IVAS_256k ) + { + return 2120; + } + else if ( ivas_total_brate <= IVAS_384k ) + { + return 2250; + } + else + { + return 2450; + } + } + + return 2450; +} + +/*-----------------------------------------------------------------------* + * get_core_max_num_indices() + * + * Get the maximum allowed number of indices in the core coder + *-----------------------------------------------------------------------*/ + +int16_t get_core_max_num_indices( /* o : maximum number of indices */ + const int16_t core, /* i : core */ + const int32_t total_brate /* i : total bitrate */ +) +{ + /* set the maximum number of indices in the core coder */ + if ( core == ACELP_CORE || core == AMR_WB_CORE ) + { + if ( total_brate <= 9600 ) + { + return 60; + } + else if ( total_brate <= IVAS_13k2 ) + { + return 70; + } + else if ( total_brate <= IVAS_16k4 ) + { + return 80; + } + else if ( total_brate <= IVAS_24k4 ) + { + return 100; + } + else if ( total_brate <= IVAS_32k ) + { + return 180; + } + else if ( total_brate <= IVAS_48k ) + { + return 340; + } + else if ( total_brate <= IVAS_80k ) + { + return 450; + } + else if ( total_brate <= IVAS_96k ) + { + return 500; + } + else if ( total_brate <= IVAS_128k ) + { + return 550; + } + else if ( total_brate <= IVAS_160k ) + { + return 600; + } + else if ( total_brate <= IVAS_192k ) + { + return 650; + } + else if ( total_brate <= IVAS_256k ) + { + return 700; + } + else + { + return 800; + } + } + else if ( core == TCX_20_CORE || core == TCX_10_CORE ) + { + if ( total_brate <= 9600 ) + { + return 100; + } + else if ( total_brate <= IVAS_13k2 ) + { + return 150; + } + else if ( total_brate <= IVAS_16k4 ) + { + return 200; + } + else if ( total_brate <= IVAS_24k4 ) + { + return 310; + } + else if ( total_brate <= IVAS_32k ) + { + return 330; + } + else if ( total_brate <= IVAS_48k ) + { + return 340; + } + else if ( total_brate <= IVAS_80k ) + { + return 380; + } + else if ( total_brate <= IVAS_96k ) + { + return 400; + } + else if ( total_brate <= IVAS_128k ) + { + return 460; + } + else if ( total_brate <= IVAS_160k ) + { + return 470; + } + else if ( total_brate <= IVAS_192k ) + { + return 570; + } + else if ( total_brate <= IVAS_256k ) + { + return 680; + } + else + { + return 800; + } + } + else if ( core == HQ_CORE ) + { + if ( total_brate <= 9600 ) + { + return 100; + } + else if ( total_brate <= IVAS_16k4 ) + { + return 200; + } + else if ( total_brate <= IVAS_24k4 ) + { + return 240; + } + else if ( total_brate <= IVAS_32k ) + { + return 300; + } + else if ( total_brate <= IVAS_48k ) + { + return 380; + } + else if ( total_brate <= IVAS_96k ) + { + return 400; + } + else if ( total_brate <= IVAS_128k ) + { + return 450; + } + else if ( total_brate <= IVAS_160k ) + { + return 550; + } + else if ( total_brate <= IVAS_192k ) + { + return 600; + } + else if ( total_brate <= IVAS_256k ) + { + return 700; + } + else + { + return 800; + } + } + else + { + return 50; + } +} + +/*-----------------------------------------------------------------------* + * get_BWE_max_num_indices() + * + * Get the maximum number of indices in the BWE + *-----------------------------------------------------------------------*/ + +int16_t get_BWE_max_num_indices( /* o : maximum number of indices */ + const int32_t extl_brate /* i : extensiona layer bitrate */ +) +{ + /* set the maximum number of indices in the BWE */ + if ( extl_brate < SWB_BWE_16k ) + { + return 30; + } + else + { + return 150; + } +} + + +/*-----------------------------------------------------------------------* + * get_ivas_max_num_indices_metadata() + * + * Set the maximum allowed number of metadata indices in the list + *-----------------------------------------------------------------------*/ + +int16_t get_ivas_max_num_indices_metadata( /* o : maximum number of indices */ + const IVAS_FORMAT ivas_format, /* i : IVAS format */ + const int32_t ivas_total_brate /* i : IVAS total bitrate */ +) +{ + /* set the maximum required number of metadata indices */ + if ( ivas_format == MONO_FORMAT ) + { + return 0; + } + else if ( ivas_format == STEREO_FORMAT ) + { + if ( ivas_total_brate <= IVAS_16k4 ) + { + return 60; + } + else + { + return 80; + } + } + else if ( ivas_format == ISM_FORMAT ) + { + if ( ivas_total_brate <= IVAS_16k4 ) + { + return 20; + } + else if ( ivas_total_brate <= IVAS_32k ) + { + return 65; + } + else + { + return 80; + } + } + else if ( ivas_format == SBA_FORMAT ) + { + if ( ivas_total_brate <= IVAS_16k4 ) + { + return 100; + } + else if ( ivas_total_brate <= IVAS_24k4 ) + { + return 200; + } + else if ( ivas_total_brate <= IVAS_32k ) + { + return 300; + } + else if ( ivas_total_brate <= IVAS_192k ) + { + return 500; + } + else if ( ivas_total_brate <= IVAS_256k ) + { + return 1000; + } + else if ( ivas_total_brate <= IVAS_384k ) + { + return 1500; + } + else + { + return 2000; + } + } + else if ( ivas_format == MASA_FORMAT ) + { + if ( ivas_total_brate <= IVAS_16k4 ) + { + return 80; + } + else if ( ivas_total_brate <= IVAS_32k ) + { + return 110; + } + else if ( ivas_total_brate <= IVAS_48k ) + { + return 180; + } + else if ( ivas_total_brate <= IVAS_96k ) + { + return 200; + } + else if ( ivas_total_brate <= IVAS_128k ) + { + return 250; + } + else if ( ivas_total_brate <= IVAS_160k ) + { + return 320; + } + else if ( ivas_total_brate <= IVAS_192k ) + { + return 430; + } + else if ( ivas_total_brate <= IVAS_256k ) + { + return 600; + } + else if ( ivas_total_brate <= IVAS_384k ) + { + return 1000; + } + else + { + return 1500; + } + } + else if ( ivas_format == MC_FORMAT ) + { + if ( ivas_total_brate <= IVAS_13k2 ) + { + return 80; + } + else if ( ivas_total_brate <= IVAS_24k4 ) + { + return 100; + } + else if ( ivas_total_brate <= IVAS_64k ) + { + return 200; + } + else if ( ivas_total_brate <= IVAS_96k ) + { + return 220; + } + else + { + return 300; + } + } + + return 50; } /*-------------------------------------------------------------------* - * rate2AMRWB_IOmode() + * move_indices() * - * lookup AMRWB IO mode + * Move indices inside the buffer or among two buffers *-------------------------------------------------------------------*/ -static Word16 rate2AMRWB_IOmode( - Word32 brate /* i : bitrate */ +ivas_error move_indices( + INDICE_HANDLE old_ind_list, /* i/o: old location of indices */ + INDICE_HANDLE new_ind_list, /* i/o: new location of indices */ + const int16_t nb_indices /* i : number of moved indices */ ) { - switch ( brate ) + int16_t i; + ivas_error error; + + error = IVAS_ERR_OK; + + if ( new_ind_list < old_ind_list ) { - /* EVS AMR-WB IO modes */ - case SID_1k75: - return AMRWB_IO_SID; - case ACELP_6k60: - return AMRWB_IO_6600; - case ACELP_8k85: - return AMRWB_IO_8850; - case ACELP_12k65: - return AMRWB_IO_1265; - case ACELP_14k25: - return AMRWB_IO_1425; - case ACELP_15k85: - return AMRWB_IO_1585; - case ACELP_18k25: - return AMRWB_IO_1825; - case ACELP_19k85: - return AMRWB_IO_1985; - case ACELP_23k05: - return AMRWB_IO_2305; - case ACELP_23k85: - return AMRWB_IO_2385; - default: - break; + for ( i = 0; i < nb_indices; i++ ) + { + new_ind_list[i].id = old_ind_list[i].id; + new_ind_list[i].value = old_ind_list[i].value; + new_ind_list[i].nb_bits = old_ind_list[i].nb_bits; + + old_ind_list[i].nb_bits = -1; + } } + else if ( new_ind_list > old_ind_list ) + { + for ( i = nb_indices - 1; i >= 0; i-- ) + { + new_ind_list[i].id = old_ind_list[i].id; + new_ind_list[i].value = old_ind_list[i].value; + new_ind_list[i].nb_bits = old_ind_list[i].nb_bits; - return -1; + old_ind_list[i].nb_bits = -1; + } + } + + return error; } +#endif + +#ifdef IND_LIST_DYN /*-------------------------------------------------------------------* - * rate2EVSmode() + * check_ind_list_limits() * - * lookup EVS mode + * Check, if the maximum number of indices has been reached -> reallocate + * Check, if we will not overwrite an existing indice -> adjust the location *-------------------------------------------------------------------*/ -Word16 rate2EVSmode( - const Word32 brate, /* i : bitrate */ - int16_t *is_amr_wb /* o : (flag) does the bitrate belong to AMR-WB? Can be NULL */ + +ivas_error check_ind_list_limits( + BSTR_ENC_HANDLE hBstr /* i/o: encoder bitstream handle */ ) { - if ( is_amr_wb != NULL ) - { - *is_amr_wb = 0; - } + Indice *ivas_ind_list_zero, *ivas_ind_list_last; + ivas_error error; - switch ( brate ) + error = IVAS_ERR_OK; + ivas_ind_list_zero = *( hBstr->ivas_ind_list_zero ); + + /* check, if the maximum number of indices has been reached and re-allocate the buffer */ + /* the re-allocation can be avoided by increasing the limits in get_ivas_max_num_indices() or get_ivas_max_num_indices_metadata() */ + if ( ( &hBstr->ind_list[hBstr->nb_ind_tot] - ivas_ind_list_zero ) >= *( hBstr->ivas_max_num_indices ) ) { - /* EVS Primary modes */ - case FRAME_NO_DATA: - return NO_DATA_RECEIVED; - case SID_2k40: - return PRIMARY_SID; - case PPP_NELP_2k80: - return PRIMARY_2800; - case ACELP_7k20: - return PRIMARY_7200; - case ACELP_8k00: - return PRIMARY_8000; - case ACELP_9k60: - return PRIMARY_9600; - case ACELP_13k20: - return PRIMARY_13200; - case ACELP_16k40: - return PRIMARY_16400; - case ACELP_24k40: - return PRIMARY_24400; - case ACELP_32k: - return PRIMARY_32000; - case ACELP_48k: - return PRIMARY_48000; - case ACELP_64k: - return PRIMARY_64000; - case HQ_96k: - return PRIMARY_96000; - case HQ_128k: - return PRIMARY_128000; - default: - break; +#ifdef DEBUGGING + /* TODO: replace with the warning message below before the finalization of the IVAS codec */ + /* fprintf( stderr, "Warning: The maximum number of indices %d has been exceeded in frame %d! Increase the limits in get_ivas_max_num_indices() or get_max_num_indices_metadata().\n", *( hBstr->ivas_max_num_indices ), frame ); */ + assert( 0 && "The maximum number of indices has been exceeded! Increase the limits in get_ivas_max_num_indices() or get_max_num_indices_metadata()." ); +#endif + + /* reallocate the buffer of indices with increased limit */ + ind_list_realloc( hBstr, *( hBstr->ivas_max_num_indices ) + STEP_MAX_NUM_INDICES ); } - if ( is_amr_wb != NULL ) + /* check, if we will not overwrite an existing indice */ + if ( hBstr->ind_list[hBstr->nb_ind_tot].nb_bits > 0 ) { - *is_amr_wb = 1; + if ( hBstr->nb_ind_tot == 0 ) + { +#ifdef DEBUGGING + fprintf( stderr, "Warning: Trying to overwrite an existing indice ID = %d in frame %d!\n", hBstr->ind_list[hBstr->nb_ind_tot].id, frame ); +#endif + /* move the pointer to the next available empty slot */ + ivas_ind_list_last = &ivas_ind_list_zero[*( hBstr->ivas_max_num_indices )]; + while ( hBstr->ind_list[0].nb_bits > 0 && hBstr->ind_list < ivas_ind_list_last ) + { + hBstr->ind_list++; + } + + if ( hBstr->ind_list >= ivas_ind_list_last ) + { +#ifdef DEBUGGING + /* TODO: replace with the warning message below before the finalization of the IVAS codec */ + /* fprintf( stderr, "Warning: The maximum number of indices %d has been exceeded in frame %d! Increase the limits in get_ivas_max_num_indices() or get_max_num_indices_metadata().\n", *( hBstr->ivas_max_num_indices ), frame ); */ + assert( 0 && "The maximum number of indices has been exceeded! Increase the limits in get_ivas_max_num_indices() or get_max_num_indices_metadata()." ); +#endif + + /* no available empty slot -> need to re-allocate the buffer */ + ind_list_realloc( hBstr, *( hBstr->ivas_max_num_indices ) + STEP_MAX_NUM_INDICES ); + } + } + else + { + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Buffer of indices corrupted in frame %d! Attempt to overwrite indice ID = %d (value: %d, bits: %d)!\n", frame, hBstr->ind_list[hBstr->nb_ind_tot].id, hBstr->ind_list[hBstr->nb_ind_tot].value, hBstr->ind_list[hBstr->nb_ind_tot].nb_bits ); + } } - return rate2AMRWB_IOmode( brate ); + return error; } +#endif + /*-------------------------------------------------------------------* * push_indice() @@ -237,6 +991,9 @@ ivas_error push_indice( ) { int16_t i; +#ifdef IND_LIST_DYN + int16_t j; +#endif ivas_error error; error = IVAS_ERR_OK; @@ -250,6 +1007,7 @@ ivas_error push_indice( return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Indice ID = %d with value %d exceeds the range of %d bits (frame %d) !\n", id, value, nb_bits, frame ); } +#ifndef IND_LIST_DYN #if 0 /* mul, 2020-11-19: to be de-activated until proper solution found */ if ( nb_bits < 1 ) @@ -257,18 +1015,45 @@ ivas_error push_indice( return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, " Trying to push indice ID = %d with value %d that has %d bits (frame %d) !\n", id, value, nb_bits, frame ); } else +#endif #endif if ( nb_bits > 16 ) { return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Indice ID = %d with value %d is trying to allocate %d bits which exceeds 16 bits (frame %d) !\n", id, value, nb_bits, frame ); } +#ifndef IND_LIST_DYN if ( id >= MAX_NUM_INDICES ) { return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Indice ID = %d exceeds the total number of indices: %d (frame %d) !\n", id, MAX_NUM_INDICES, frame ); } #endif +#endif + +#ifdef IND_LIST_DYN + /* check the limits of the list of indices */ + error = check_ind_list_limits( hBstr ); +#endif + +#ifdef IND_LIST_DYN + /* find the location in the list of indices based on ID */ + i = hBstr->nb_ind_tot; + while ( i > 0 && id < hBstr->ind_list[i - 1].id ) + { + i--; + } + /* shift indices, if the new ID is to be written somewhere inside the list */ + if ( i < hBstr->nb_ind_tot ) + { + for ( j = hBstr->nb_ind_tot; j > i; j-- ) + { + hBstr->ind_list[j].id = hBstr->ind_list[j - 1].id; + hBstr->ind_list[j].nb_bits = hBstr->ind_list[j - 1].nb_bits; + hBstr->ind_list[j].value = hBstr->ind_list[j - 1].value; + } + } +#else if ( hBstr->last_ind == id ) { /* indice with the same name as the previous one */ @@ -283,21 +1068,31 @@ ivas_error push_indice( i++; } } +#endif +#ifndef IND_LIST_DYN #ifdef DEBUGGING if ( hBstr->ind_list[i].nb_bits > 0 ) { return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Indice ID = %d with value %d is trying to re-write an existing indice (frame %d) !\n", id, value, frame ); } +#endif #endif /* store the new indice in the list */ +#ifdef IND_LIST_DYN + hBstr->ind_list[i].id = id; +#endif hBstr->ind_list[i].value = value; hBstr->ind_list[i].nb_bits = nb_bits; /* updates */ +#ifdef IND_LIST_DYN + hBstr->nb_ind_tot++; +#else hBstr->next_ind = i + 1; hBstr->last_ind = id; +#endif hBstr->nb_bits_tot += nb_bits; return error; @@ -324,6 +1119,9 @@ ivas_error push_next_indice( #endif ) { +#ifdef IND_LIST_DYN + int16_t prev_id; +#endif ivas_error error; error = IVAS_ERR_OK; @@ -342,6 +1140,7 @@ ivas_error push_next_indice( return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Indice with value %d is trying to allocate %d bits which exceeds 16 bits !\n", value, nb_bits ); } +#ifndef IND_LIST_DYN if ( hBstr->next_ind >= MAX_NUM_INDICES ) { return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Total number of indices exceeded: %d !\n", MAX_NUM_INDICES ); @@ -352,16 +1151,43 @@ ivas_error push_next_indice( return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Indice with value %d is trying to re-write an existing indice (frame %d) !\n", value, frame ); } #endif +#endif + +#ifdef IND_LIST_DYN + /* check the limits of the list of indices */ + error = check_ind_list_limits( hBstr ); +#endif + +#ifdef IND_LIST_DYN + /* get the id of the previous indice -> it will be re-used */ + if ( hBstr->nb_ind_tot > 0 ) + { + prev_id = hBstr->ind_list[hBstr->nb_ind_tot - 1].id; + } + else + { + prev_id = 0; + } +#endif /* store the values in the list */ +#ifdef IND_LIST_DYN + hBstr->ind_list[hBstr->nb_ind_tot].id = prev_id; + hBstr->ind_list[hBstr->nb_ind_tot].value = value; + hBstr->ind_list[hBstr->nb_ind_tot].nb_bits = nb_bits; +#else hBstr->ind_list[hBstr->next_ind].value = value; hBstr->ind_list[hBstr->next_ind].nb_bits = nb_bits; - hBstr->next_ind++; +#endif - /* update the total number of bits already written */ + /* updates */ +#ifdef IND_LIST_DYN + hBstr->nb_ind_tot++; +#else + hBstr->next_ind++; +#endif hBstr->nb_bits_tot += nb_bits; - return error; } @@ -389,39 +1215,161 @@ void push_next_bits( uint16_t code; int16_t i, nb_bits_m15; Indice *ptr; +#ifdef IND_LIST_DYN + int16_t prev_id; +#endif #ifdef DEBUG_BS_READ_WRITE printf( "%s: %d: %d\n", func, line, nb_bits ); #endif + +#ifdef IND_LIST_DYN + ptr = &hBstr->ind_list[hBstr->nb_ind_tot]; + + /* get the id of the previous indice -> will be re-used */ + if ( hBstr->nb_ind_tot > 0 ) + { + prev_id = hBstr->ind_list[hBstr->nb_ind_tot - 1].id; + } + else + { + prev_id = 0; + } +#else ptr = &hBstr->ind_list[hBstr->next_ind]; +#endif nb_bits_m15 = nb_bits - 15; for ( i = 0; i < nb_bits_m15; i += 16 ) { code = (uint16_t) ( ( bits[i] << 15 ) | ( ( bits[i + 1] << 14 ) | ( ( bits[i + 2] << 13 ) | ( ( bits[i + 3] << 12 ) | ( ( bits[i + 4] << 11 ) | ( ( bits[i + 5] << 10 ) | ( ( bits[i + 6] << 9 ) | ( ( bits[i + 7] << 8 ) | ( ( bits[i + 8] << 7 ) | ( ( bits[i + 9] << 6 ) | ( ( bits[i + 10] << 5 ) | ( ( bits[i + 11] << 4 ) | ( ( bits[i + 12] << 3 ) | ( ( bits[i + 13] << 2 ) | ( ( bits[i + 14] << 1 ) | bits[i + 15] ) ) ) ) ) ) ) ) ) ) ) ) ) ) ); +#ifdef IND_LIST_DYN + /* check the limits of the list of indices */ + check_ind_list_limits( hBstr ); + ptr = &hBstr->ind_list[hBstr->nb_ind_tot]; +#endif + ptr->value = code; #ifdef DEBUG_BS_READ_WRITE printf( "code: %d\n", code ); #endif ptr->nb_bits = 16; +#ifdef IND_LIST_DYN + ptr->id = prev_id; + hBstr->nb_ind_tot++; +#endif ++ptr; } + for ( ; i < nb_bits; ++i ) { +#ifdef IND_LIST_DYN + /* check the limits of the list of indices */ + check_ind_list_limits( hBstr ); + ptr = &hBstr->ind_list[hBstr->nb_ind_tot]; +#endif + ptr->value = bits[i]; #ifdef DEBUG_BS_READ_WRITE printf( "value: %d\n", ptr->value ); #endif ptr->nb_bits = 1; +#ifdef IND_LIST_DYN + ptr->id = prev_id; + hBstr->nb_ind_tot++; +#endif ++ptr; } + +#ifndef IND_LIST_DYN hBstr->next_ind = (int16_t) ( ptr - hBstr->ind_list ); +#endif hBstr->nb_bits_tot = hBstr->nb_bits_tot + nb_bits; return; } +#ifdef IND_LIST_DYN +/*-------------------------------------------------------------------* + * find_indice() + * + * Find indice based on its id + *-------------------------------------------------------------------*/ + +/*! r: result: index of the indice in the list, -1 if not found */ +int16_t find_indice( + BSTR_ENC_HANDLE hBstr, /* i : encoder bitstream handle */ + int16_t id, /* i : ID of the indice */ + uint16_t *value, /* o : value of the quantized indice */ + int16_t *nb_bits /* o : number of bits used to quantize the indice */ +) +{ + int16_t i; + + for ( i = 0; i < hBstr->nb_ind_tot; i++ ) + { + if ( hBstr->ind_list[i].id == id && hBstr->ind_list[i].nb_bits > 0 ) + { + *value = hBstr->ind_list[i].value; + *nb_bits = hBstr->ind_list[i].nb_bits; + return i; + } + } + + return -1; +} + +/*-------------------------------------------------------------------* + * delete_indice() + * + * Delete indice based on its id (note, that nb_ind_tot and nb_bits_tot are updated) + *-------------------------------------------------------------------*/ + +/*! r: number of deleted indices */ +uint16_t delete_indice( + BSTR_ENC_HANDLE hBstr, /* i : encoder bitstream handle */ + int16_t id /* i : ID of the indice */ +) +{ + int16_t i, j; + + j = 0; + for ( i = 0; i < hBstr->nb_ind_tot; i++ ) + { + if ( hBstr->ind_list[i].id == id ) + { + hBstr->nb_bits_tot -= hBstr->ind_list[i].nb_bits; + continue; + } + + if ( j < i ) + { + /* shift the indice left */ + hBstr->ind_list[j].id = hBstr->ind_list[i].id; + hBstr->ind_list[j].value = hBstr->ind_list[i].value; + hBstr->ind_list[j].nb_bits = hBstr->ind_list[i].nb_bits; + } + + j++; + } + + hBstr->nb_ind_tot = j; +#ifndef IND_LIST_DYN + hBstr->next_ind = j; +#endif + + for ( ; j < i; j++ ) + { + /* reset the shifted indices at the end of the list */ + hBstr->ind_list[j].nb_bits = -1; + } + + return i - j; +} +#endif + + /*-------------------------------------------------------------------* * get_next_indice() * @@ -638,8 +1586,12 @@ void reset_indices_enc( int16_t i; hBstr->nb_bits_tot = 0; +#ifdef IND_LIST_DYN + hBstr->nb_ind_tot = 0; +#else hBstr->next_ind = 0; hBstr->last_ind = -1; +#endif for ( i = 0; i < max_num_indices; i++ ) { @@ -670,7 +1622,11 @@ void reset_indices_dec( *-------------------------------------------------------------------*/ static int16_t write_indices_to_stream( +#ifdef IND_LIST_DYN + Indice *ind_list, +#else Indice *ind_list_metadata, +#endif uint16_t **pt_stream, const int16_t inc, const int16_t num_indices ) @@ -684,8 +1640,13 @@ static int16_t write_indices_to_stream( for ( i = 0; i < num_indices; i++ ) { +#ifdef IND_LIST_DYN + value = ind_list[i].value; + nb_bits = ind_list[i].nb_bits; +#else value = ind_list_metadata[i].value; nb_bits = ind_list_metadata[i].nb_bits; +#endif if ( nb_bits > 0 ) { @@ -717,6 +1678,10 @@ static int16_t write_indices_to_stream( { /* fprintf( stderr, "Warning: %s: nb_bits == 0!\n", __func__ ); */ } + else + { + /* fprintf( stderr, "Warning: %s: nb_bits == %d!\n", __func__, nb_bits ); */ + } #endif } #ifdef ENABLE_BITRATE_VERIFICATION @@ -745,6 +1710,10 @@ static ivas_error write_indices_element( uint16_t *pt_stream_backup; uint16_t *pt_stream_end; int16_t nb_bits_tot_metadata; +#ifdef IND_LIST_DYN + int16_t nb_ind_tot_metadata; +#endif + Indice *ind_list_metadata; int16_t n, n_channels; #ifdef ENABLE_BITRATE_VERIFICATION @@ -755,6 +1724,9 @@ static ivas_error write_indices_element( error = IVAS_ERR_OK; ind_list_metadata = NULL; +#ifdef IND_LIST_DYN + nb_ind_tot_metadata = 0; +#endif if ( st_ivas->hEncoderConfig->ivas_format == MONO_FORMAT ) { @@ -772,6 +1744,9 @@ static ivas_error write_indices_element( { nb_bits_tot_metadata = st_ivas->hSCE[element_id]->hMetaData->nb_bits_tot; ind_list_metadata = st_ivas->hSCE[element_id]->hMetaData->ind_list; +#ifdef IND_LIST_DYN + nb_ind_tot_metadata = st_ivas->hSCE[element_id]->hMetaData->nb_ind_tot; +#endif } } else if ( !is_SCE && st_ivas->hCPE[element_id] != NULL ) @@ -782,6 +1757,9 @@ static ivas_error write_indices_element( { nb_bits_tot_metadata = st_ivas->hCPE[element_id]->hMetaData->nb_bits_tot; ind_list_metadata = st_ivas->hCPE[element_id]->hMetaData->ind_list; +#ifdef IND_LIST_DYN + nb_ind_tot_metadata = st_ivas->hCPE[element_id]->hMetaData->nb_ind_tot; +#endif } } #ifdef DEBUGGING @@ -822,7 +1800,13 @@ static ivas_error write_indices_element( #ifdef ENABLE_BITRATE_VERIFICATION total_nb_bits = #endif - write_indices_to_stream( ind_list_metadata, &pt_stream_loc, -1, MAX_BITS_METADATA ); + write_indices_to_stream( ind_list_metadata, &pt_stream_loc, -1, +#ifdef IND_LIST_DYN + nb_ind_tot_metadata +#else + MAX_BITS_METADATA +#endif + ); #ifdef ENABLE_BITRATE_VERIFICATION if ( total_nb_bits != nb_bits_tot_metadata ) @@ -833,17 +1817,16 @@ static ivas_error write_indices_element( /* restore previous pointer position */ pt_stream_loc = pt_stream_backup; } -#ifndef ISSUE_24_CLEANUP_MCT_LFE - /* 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; - } -#endif #ifdef ENABLE_BITRATE_VERIFICATION total_nb_bits = #endif - write_indices_to_stream( sts[n]->hBstr->ind_list, &pt_stream_loc, 1, MAX_NUM_INDICES ); + write_indices_to_stream( sts[n]->hBstr->ind_list, &pt_stream_loc, 1, +#ifdef IND_LIST_DYN + sts[n]->hBstr->nb_ind_tot +#else + MAX_NUM_INDICES +#endif + ); #ifdef ENABLE_BITRATE_VERIFICATION if ( total_nb_bits != sts[n]->hBstr->nb_bits_tot ) @@ -866,21 +1849,41 @@ static ivas_error write_indices_element( { if ( st_ivas->hSCE[element_id]->hMetaData != NULL ) { +#ifdef IND_LIST_DYN + reset_indices_enc( st_ivas->hSCE[element_id]->hMetaData, st_ivas->hSCE[element_id]->hMetaData->nb_ind_tot ); +#else reset_indices_enc( st_ivas->hSCE[element_id]->hMetaData, MAX_BITS_METADATA ); +#endif } - reset_indices_enc( sts[0]->hBstr, MAX_NUM_INDICES ); + reset_indices_enc( sts[0]->hBstr, +#ifdef IND_LIST_DYN + sts[0]->hBstr->nb_ind_tot +#else + MAX_NUM_INDICES +#endif + ); } else { if ( st_ivas->hCPE[element_id]->hMetaData != NULL ) { +#ifdef IND_LIST_DYN + reset_indices_enc( st_ivas->hCPE[element_id]->hMetaData, st_ivas->hCPE[element_id]->hMetaData->nb_ind_tot ); +#else reset_indices_enc( st_ivas->hCPE[element_id]->hMetaData, MAX_BITS_METADATA ); +#endif } for ( n = 0; n < n_channels; n++ ) { - reset_indices_enc( sts[n]->hBstr, MAX_NUM_INDICES ); + reset_indices_enc( sts[n]->hBstr, +#ifdef IND_LIST_DYN + sts[n]->hBstr->nb_ind_tot +#else + MAX_NUM_INDICES +#endif + ); } } @@ -927,6 +1930,7 @@ ivas_error write_indices_ivas( { sts = st_ivas->hSCE[n]->hCoreCoder; i += sts[0]->hBstr->nb_bits_tot; + if ( st_ivas->hSCE[n]->hMetaData != NULL ) { i += st_ivas->hSCE[n]->hMetaData->nb_bits_tot; @@ -940,6 +1944,7 @@ ivas_error write_indices_ivas( { i += sts[ch]->hBstr->nb_bits_tot; } + if ( st_ivas->hCPE[n]->hMetaData != NULL ) { i += st_ivas->hCPE[n]->hMetaData->nb_bits_tot; @@ -957,6 +1962,7 @@ ivas_error write_indices_ivas( return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Bitstream write size mismatch! Actual bitrate: %ld vs. Reference bitrate: %d\n", i * 50L, ivas_total_brate ); } #endif + /*-----------------------------------------------------------------* * Encode Payload *-----------------------------------------------------------------*/ @@ -976,7 +1982,7 @@ ivas_error write_indices_ivas( return error; } - +#ifndef IND_LIST_DYN /*-------------------------------------------------------------------* * indices_to_serial_generic() * @@ -1026,6 +2032,7 @@ void indices_to_serial_generic( return; } +#endif /*---------------------------------------------------------------------* * convertSerialToBytestream( ) @@ -1808,7 +2815,7 @@ ivas_error preview_indices( if ( bit_stream[2] == 0 ) { st_ivas->ivas_format = SBA_FORMAT; - st_ivas->sba_mode = ivas_sba_mode_select( total_brate ); + st_ivas->sba_mode = ivas_sba_mode_select(); } else { @@ -1921,7 +2928,7 @@ ivas_error preview_indices( k = IVAS_FORMAT_SIGNALING_NBITS; if ( st_ivas->ivas_format == MASA_FORMAT ) { - k = IVAS_FORMAT_SIGNALING_NBITS_SBA; + k = IVAS_FORMAT_SIGNALING_NBITS_EXTENDED; } if ( total_brate < MIN_BRATE_MDCT_STEREO ) @@ -1961,9 +2968,9 @@ ivas_error preview_indices( else if ( st_ivas->ivas_format == SBA_FORMAT ) { /* Read SBA planar flag and SBA order */ - st_ivas->sba_planar = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA] == 1 ); - st_ivas->sba_order = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 2] == 1 ); - st_ivas->sba_order += 2 * ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 1] == 1 ); + st_ivas->sba_planar = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED] == 1 ); + st_ivas->sba_order = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + 2] == 1 ); + st_ivas->sba_order += 2 * ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + 1] == 1 ); st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( total_brate, st_ivas->sba_order ); @@ -2113,12 +3120,12 @@ ivas_error read_indices( } /* AMRWB 26.173 G.192 file reader (read_serial) does not declare/use SID_BAD ft, - it declares every bad synch marked frame initially as a lost_speech frame, - and then the RXDTX handler CNG state decides the decoding mode CNG/SPEECH. - While In the AMRWB ETSI/3GPP format eid a CRC error in a detected SID_UPDATE frames triggers SID_BAD. + it declares every bad synch marked frame initially as a lost_speech frame, + and then the RXDTX handler CNG state decides the decoding mode CNG/SPEECH. + While In the AMRWB ETSI/3GPP format eid a CRC error in a detected SID_UPDATE frames triggers SID_BAD. - Here we inhibit use of the SID-length info, even though it is available in the G.192 file format after STL/EID-XOR . - */ + Here we inhibit use of the SID-length info, even though it is available in the G.192 file format after STL/EID-XOR . + */ if ( sid_upd_bad ) { sid_upd_bad = 0; @@ -2130,10 +3137,10 @@ ivas_error read_indices( { g192_sid_first = 1; /* SID_FIRST detected for previous AMRWB/AMRWBIO active frames only */ /* It is not possible to perfectly simulate rate switching conditions EVS->AMRWBIO where: - the very first SID_FIRST detection is based on a past EVS active frame - and a good length 0 "SID_FIRST"(NO_DATA) frame is sent in AMRWBIO, - due to the one frame state memory in the AMRWB legacy G.192 SID_FIRST encoding - */ + the very first SID_FIRST detection is based on a past EVS active frame + and a good length 0 "SID_FIRST"(NO_DATA) frame is sent in AMRWBIO, + due to the one frame state memory in the AMRWB legacy G.192 SID_FIRST encoding + */ } speech_bad = 0; @@ -2149,7 +3156,7 @@ ivas_error read_indices( } /* Do not allow decoder to enter CNG-synthesis for any instantly received GOOD+LENGTH==0 frame - as this frame was never transmitted, one can not know it is good and has a a length of zero ) */ + as this frame was never transmitted, one can not know it is good and has a a length of zero ) */ if ( *CNG != 0 ) { /* We were in CNG synthesis */ @@ -2347,7 +3354,7 @@ static Word32 read_indices_mime_handle_dtx( /* Now modify bfi flag for the decoder's SPEECH/CNG synthesis logic */ /* in SPEECH synthesis, make sure to activate speech PLC for a received NO_DATA frame, - no_data frames may be injected by the network or by the dejitter buffer */ + no_data frames may be injected by the network or by the dejitter buffer */ /* modify bfi_flag to stay/move into the correct decoder PLC section */ if ( ( *CNG == 0 ) && ( no_data != 0 ) ) { @@ -2367,10 +3374,10 @@ static Word32 read_indices_mime_handle_dtx( /* now bfi, total_brate are set by RX-DTX handler:: - bfi==0, total_brate!=0 CNG or speech pending bitrate - bfi==0, total_brate==0 CNG will continue or start(sid_first, sid_bad) - bfi==1, total_brate!=0 speech PLC - bfi==1, total_brate==0 , speech PLC */ + bfi==0, total_brate!=0 CNG or speech pending bitrate + bfi==0, total_brate==0 CNG will continue or start(sid_first, sid_bad) + bfi==1, total_brate!=0 speech PLC + bfi==1, total_brate==0 , speech PLC */ /* handle available AMRWB/AMRWBIO MIME header ToC rate-info at startup */ if ( ( st->bfi == 1 && st->ini_frame == 0 ) && ( ( amrwb_rfc4867_flag != 0 ) || ( amrwb_rfc4867_flag == 0 && isAMRWB_IOmode != 0 ) ) ) /*AMRWB ToC */ diff --git a/lib_com/cnst.h b/lib_com/cnst.h index db1dc3d8982a768eff807f35d083dbabeae15f58..d518dff0df3cce6bdc2ac6b56907403c49643e27 100644 --- a/lib_com/cnst.h +++ b/lib_com/cnst.h @@ -294,9 +294,7 @@ enum IND_ISF_1_2, IND_ISF_1_3, IND_ISF_1_4, -#ifdef LSF_RE_USE_SECONDARY_CHANNEL IND_IC_LSF_PRED, -#endif IND_GSC_ATTACK, IND_GSC_SWB_SPEECH, IND_NOISE_LEVEL, @@ -449,7 +447,9 @@ enum IND_STEREO_2ND_CODER_T, IND_UNUSED, +#ifndef IND_LIST_DYN MAX_NUM_INDICES = IND_UNUSED + 772 /* Total 2640 in line with MAX_BITS_METADATA */ +#endif }; /*----------------------------------------------------------------------------------* @@ -1391,6 +1391,23 @@ enum #define NPARTCLDFB 10 #define NPART_SHAPING 62 +#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; + + #define MSSUBFRLEN 12 #define MSNUMSUBFR 6 #define MSBUFLEN 5 @@ -1415,7 +1432,8 @@ enum #define CHEAP_NORM_SIZE 161 #define CNA_MAX_BRATE ACELP_13k20 -#define MAX_CNA_NBANDS 12 + +#define CNA_INIT_NBANDS 6 #define GAIN_Q_OFFSET_EVS 60.f #define GAIN_Q_OFFSET_IVAS 45.f @@ -1513,7 +1531,8 @@ 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 */ +#define THR_P2A_HIGH 95.0f /* higher threshold to detect strongly peaky signals at low bitrates*/ +#define THR_P2A 80.0f /* lower threshold to detect strongly peaky signals at higher bitrates */ /*----------------------------------------------------------------------------------* * LD music post-filter constants @@ -2119,7 +2138,7 @@ enum #define IGF_GRID_LB_SHORT 2 /* constants for IGFSCFDecoder and IGFSCFEncoder */ -#define IGF_CTX_OFFSET 3 /* offset added to make the context values nonnegative, for array indexing */ +#define IGF_CTX_OFFSET 3 /* offset added to make the context values non negative, for array indexing */ #define IGF_CTX_COUNT ( 2 * IGF_CTX_OFFSET + 1 ) /* number of contexts for the AC statistical model */ #define IGF_MIN_ENC_SEPARATE -12 /* minimum residual value coded separately, without escape coding */ #define IGF_MAX_ENC_SEPARATE +12 /* maximum residual value coded separately, without escape coding */ diff --git a/lib_com/common_api_types.h b/lib_com/common_api_types.h index 3e012a6f99685c080760cade2d1e15a90874970a..33ddc9e881d865970af564c2b21c974af44c6844 100644 --- a/lib_com/common_api_types.h +++ b/lib_com/common_api_types.h @@ -80,6 +80,7 @@ typedef struct _IVAS_ISM_METADATA float gainFactor; float yaw; float pitch; + int16_t non_diegetic_flag; } IVAS_ISM_METADATA; typedef struct @@ -93,18 +94,19 @@ typedef struct float x, y, z; } IVAS_VECTOR3; -typedef struct +#ifdef FIX_439_OTR_PARAMS +typedef enum { - float x, y, z; - -} IVAS_POSITION; + HEAD_ORIENT_TRK_NONE, + HEAD_ORIENT_TRK_REF, + HEAD_ORIENT_TRK_AVG, + HEAD_ORIENT_TRK_REF_VEC, + HEAD_ORIENT_TRK_REF_VEC_LEV +} HEAD_ORIENT_TRK_T; +#endif typedef struct ivas_masa_metadata_frame_struct *IVAS_MASA_METADATA_HANDLE; -#ifdef FIX_350_MASA_DELAY_COMP typedef struct ivas_masa_decoder_ext_out_meta_struct *MASA_DECODER_EXT_OUT_META_HANDLE; -#else -typedef struct ivas_masa_qmetadata_frame_struct *IVAS_MASA_QMETADATA_HANDLE; -#endif typedef struct TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_HANDLE; typedef struct ivas_hrtfs_crend_structure *IVAS_DEC_HRTF_CREND_HANDLE; @@ -127,6 +129,7 @@ typedef struct float radius; float yaw; float pitch; + int16_t non_diegetic_flag; } IVAS_REND_AudioObjectPosition; typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG diff --git a/lib_com/core_com_config.c b/lib_com/core_com_config.c index d138fe1a1ed28c2dc77f12c855af07457a843319..7f9b385c3f3d38c569307a13f15032c0dcb62582 100644 --- a/lib_com/core_com_config.c +++ b/lib_com/core_com_config.c @@ -250,32 +250,21 @@ 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 */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - const MCT_CHAN_MODE mct_chan_mode /* i : MCT channel mode */ -#endif ) { int16_t tnsAllowed = 0; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( igf ) { -#endif - 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; } -#ifndef ISSUE_24_CLEANUP_MCT_LFE } -#endif + else if ( total_brate > HQ_32k ) + { + tnsAllowed = 1; + } return tnsAllowed; } @@ -419,20 +408,10 @@ int16_t getIgfPresent( 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 */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - const int16_t mct_chan_mode /* i : MCT channel mode */ -#endif ) { int16_t igfPresent = 0; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - return igfPresent; - } -#endif if ( bwidth == SWB ) { @@ -820,12 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - const MCT_CHAN_MODE mct_chan_mode /* i : MDCT channel mode */ -#endif -) + const int16_t MCT_flag ) { int16_t i; int16_t mdctWindowLength; @@ -855,20 +829,9 @@ void init_tcx_cfg( /* set number of coded lines */ hTcxCfg->tcx_coded_lines = getNumTcxCodedLines( bwidth ); -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - hTcxCfg->tcx_coded_lines = MCT_LFE_MAX_LINE; - } -#endif /* TNS in TCX */ hTcxCfg->pCurrentTnsConfig = NULL; - hTcxCfg->fIsTNSAllowed = getTnsAllowed( total_brate, igf, element_mode -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - mct_chan_mode -#endif - ); + hTcxCfg->fIsTNSAllowed = getTnsAllowed( total_brate, igf, element_mode ); if ( hTcxCfg->fIsTNSAllowed ) { diff --git a/lib_com/delay_comp.c b/lib_com/delay_comp.c index b96798815e46592f6a4bf3194e248c1145b7bc30..518a28aba7891a99013151f77d36ebfdcb544980 100644 --- a/lib_com/delay_comp.c +++ b/lib_com/delay_comp.c @@ -69,7 +69,12 @@ int32_t get_delay( { delay = IVAS_ENC_DELAY_NS; -#ifdef FIX_350_MASA_DELAY_COMP +#ifdef FIX_356_ISM_METADATA_SYNC + if ( ivas_format == ISM_FORMAT || ivas_format == MASA_FORMAT ) + { + delay = 0; /* All delay is compensated in the decoder with MASA/ISM */ + } +#else if ( ivas_format == MASA_FORMAT ) { delay = 0; /* All delay is compensated in the decoder with MASA */ @@ -106,8 +111,12 @@ int32_t get_delay( delay += IVAS_FB_DEC_DELAY_NS; } - -#ifdef FIX_350_MASA_DELAY_COMP +#ifdef FIX_356_ISM_METADATA_SYNC + if ( ivas_format == ISM_FORMAT || ivas_format == MASA_FORMAT ) + { + delay += IVAS_ENC_DELAY_NS; /* Compensate also the encoder delay in the decoder with ISM/MASA */ + } +#else if ( ivas_format == MASA_FORMAT ) { 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 ed55a45b063d596dea4b6d4968633533c8c3e177..10a31d94c079da17168d2a3c79591fadc728f47b 100644 --- a/lib_com/disclaimer.c +++ b/lib_com/disclaimer.c @@ -55,3 +55,5 @@ int16_t print_disclaimer( FILE *fPtr ) return 0; } + +#undef WMC_TOOL_SKIP diff --git a/lib_com/fd_cng_com.c b/lib_com/fd_cng_com.c index f2dbf746b6f18d5e6b9fc07aaa570384733702be..99ae9894f44a26c5b29d70b3cb5e8bc4497f39ce 100644 --- a/lib_com/fd_cng_com.c +++ b/lib_com/fd_cng_com.c @@ -940,6 +940,74 @@ void SynthesisSTFT( return; } +#ifdef JBM_TSM_ON_TCS +/*------------------------------------------------------------------- + * SynthesisSTFT_dirac() + * + * STFT synthesis filterbank + *-------------------------------------------------------------------*/ + +void SynthesisSTFT_dirac( + float *fftBuffer, /* i : FFT bins */ + float *timeDomainOutput, + float *olapBuffer, + const float *olapWin, + const int16_t samples_out, + HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */ +) +{ + int16_t i; + float buf[M + 1 + 320], tmp; + + /* Perform IFFT */ + RFFTN( fftBuffer, hFdCngCom->fftSineTab, hFdCngCom->fftlen, 1 ); + + /* Handle overlap in P/S domain for stereo */ + mvr2r( olapBuffer + hFdCngCom->frameSize, olapBuffer, hFdCngCom->frameSize ); + set_f( olapBuffer + hFdCngCom->frameSize, 0.0f, hFdCngCom->frameSize ); /*olapBuffer, fftBuffer, olapWin*/ + + + for ( i = hFdCngCom->frameSize / 4; i < 3 * hFdCngCom->frameSize / 4; i++ ) + { + olapBuffer[i] += fftBuffer[i] * olapWin[i - hFdCngCom->frameSize / 4]; + } + for ( ; i < 5 * hFdCngCom->frameSize / 4; i++ ) + { + olapBuffer[i] = fftBuffer[i]; + } + + for ( ; i < 7 * hFdCngCom->frameSize / 4; i++ ) + { + olapBuffer[i] = fftBuffer[i]; + } + + for ( ; i < hFdCngCom->fftlen; i++ ) + { + olapBuffer[i] = 0; + } + + /* Get time-domain signal */ + v_multc( olapBuffer + hFdCngCom->frameSize / 4, (float) ( hFdCngCom->fftlen / 2 ), timeDomainOutput, samples_out ); + + /* Get excitation */ + v_multc( olapBuffer + hFdCngCom->frameSize / 4 - ( M + 1 ), (float) ( hFdCngCom->fftlen / 2 ), buf, M + 1 + hFdCngCom->frameSize ); + tmp = buf[0]; + preemph( buf + 1, PREEMPH_FAC, M + hFdCngCom->frameSize, &tmp ); + residu( hFdCngCom->A_cng, M, buf + 1 + M, hFdCngCom->exc_cng, hFdCngCom->frameSize ); + + /* update and window olapBuf if we have a output frame that is shorter than the default frame size...*/ + if ( samples_out < hFdCngCom->frameSize ) + { + mvr2r( olapBuffer + samples_out, olapBuffer + hFdCngCom->frameSize, 3 * hFdCngCom->frameSize / 4 ); + } + for ( i = 5 * hFdCngCom->frameSize / 4; i < 7 * hFdCngCom->frameSize / 4; i++ ) + { + olapBuffer[i] *= olapWin[i - 3 * hFdCngCom->frameSize / 4]; + } + + return; +} +#endif /*------------------------------------------------------------------- * mhvals() diff --git a/lib_com/hq_tools.c b/lib_com/hq_tools.c index 1d89d0314597493852e85af60f0e57247410d33c..0008cb957ce7b5a85d8c0b50478b02995f5f7eeb 100644 --- a/lib_com/hq_tools.c +++ b/lib_com/hq_tools.c @@ -1290,7 +1290,6 @@ int16_t calc_nor_delta_hf( ynrm[i] += delta; add_bits_denv += bitsforDelta; - temp_num++; } } diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h old mode 100644 new mode 100755 index 0b326ba8a58421e11ac8d21f8ac332e27195955f..28aa855801093db1178328eb33cf3477820ed65b --- a/lib_com/ivas_cnst.h +++ b/lib_com/ivas_cnst.h @@ -78,7 +78,7 @@ typedef enum *----------------------------------------------------------------------------------*/ #define IVAS_FORMAT_SIGNALING_NBITS 2 /* number of bits for signaling the IVAS format */ -#define IVAS_FORMAT_SIGNALING_NBITS_SBA ( IVAS_FORMAT_SIGNALING_NBITS + 1 ) +#define IVAS_FORMAT_SIGNALING_NBITS_EXTENDED ( IVAS_FORMAT_SIGNALING_NBITS + 1 ) /*----------------------------------------------------------------------------------* @@ -152,7 +152,8 @@ typedef enum RENDERER_MCMASA_MONO_STEREO, RENDERER_PARAM_ISM, RENDERER_BINAURAL_MIXER_CONV, - RENDERER_BINAURAL_MIXER_CONV_ROOM + RENDERER_BINAURAL_MIXER_CONV_ROOM, + RENDERER_NON_DIEGETIC_DOWNMIX } RENDERER_TYPE; @@ -166,18 +167,28 @@ typedef enum #define HEAD_ROTATION_HOA_ORDER 3 /* HOA 3rd order */ #define MAX_CICP_CHANNELS 16 /* max channels for loudspeaker layouts (16 for custom layouts)*/ #define MAX_OUTPUT_CHANNELS 16 /* Maximum number of output channels (HOA 3rd order) */ +#define MAX_OUTPUT_CHANNELS_IN_DIEGETIC_PAN 2 /* Maximum number of output channels with non diegetic panning */ #define BINAURAL_CHANNELS 2 /* number of channels for binaural output configuration */ #define CPE_CHANNELS 2 /* number of CPE (stereo) channels */ #define FOA_CHANNELS 4 /* number of FOA channels */ +#define HOA2_CHANNELS 9 + #define MAX_NUM_OBJECTS 4 /* max. number of audio objects */ #define MAX_SCE MAX_NUM_OBJECTS /* max. number of SCEs */ #define MAX_CPE ( MAX_TRANSPORT_CHANNELS / CPE_CHANNELS ) /* max. number of CPEs */ #define MAX_BITS_METADATA 2640 /* max. bit-budget of metadata, one channel */ /* IVAS_fmToDo: to be confirmed for final value once mature */ +#ifndef IND_LIST_DYN #define MAX_NUM_METADATA max( 2, MAX_NUM_OBJECTS ) /* number of max. metadata (now only 2 for DirAC) */ - +#endif +#ifdef IND_LIST_DYN +#define MIN_NUM_IND 10 /* minimum number of indices in the core coder */ +#define MAX_NUM_IND_LFE 100 /* maximum number of indices in the LFE encoder */ +#define MAX_NUM_IND_TEMP_LIST 10 /* maximum number of indices in the temporary list */ +#define MAX_IND_TDM_TMP 10 /* maximum number of indices in the temporary list of TD stereo spatial parameters */ +#endif #define IVAS_ENC_DELAY_NS ACELP_LOOK_NS #define IVAS_DEC_DELAY_NS 3250000L /* 3.25 ms: IVAS decoder delay (without renderer delay) */ @@ -192,6 +203,25 @@ typedef enum #define IVAS_NUM_SUPPORTED_FS 3 /* number of supported sampling-rates in IVAS */ +#ifdef JBM_TSM_ON_TCS +#define CLDFB_SLOT_NS 1250000L /* 1.25ms: CLDFB slot length */ +#define MAX_JBM_SUBFRAMES_5MS 8 +#define DEFAULT_JBM_SUBFRAMES_5MS 4 +#define JBM_CLDFB_SLOTS_IN_SUBFRAME 4 +#define MAX_JBM_CLDFB_TIMESLOTS 32 +#define DEFAULT_JBM_CLDFB_TIMESLOTS 16 +#define MAX_JBM_L_FRAME48k 1920 +#define MAX_JBM_L_FRAME_NS 40000000L +#define MAX_SPAR_INTERNAL_CHANNELS IVAS_SPAR_MAX_CH +#define MAX_CLDFB_DIGEST_CHANNELS 4 +typedef enum +{ + TC_BUFFER_MODE_NONE = 0, + TC_BUFFER_MODE_RENDERER, + TC_BUFFER_MODE_BUFFER +} TC_BUFFER_MODE; +#endif + /*----------------------------------------------------------------------------------* * IVAS Bitrates *----------------------------------------------------------------------------------*/ @@ -324,10 +354,9 @@ typedef enum #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_METADATA_IS_NDP_BITS 1 #define ISM_EXTENDED_METADATA_BITS 1 -#ifdef FIX_379_EXT_METADATA #define ISM_METADATA_RS_MAX_FRAMES 5 /* Number of frames with opposite extended metadata flags before switching */ -#endif /* Parametric ISM */ #define MAX_PARAM_ISM_NBANDS 11 @@ -343,12 +372,7 @@ typedef enum #define PARAM_ISM_HYS_BUF_SIZE 10 /* ISM DTX */ -#ifdef DISCRETE_ISM_DTX_CNG #define ISM_DTX_COH_SCA_BITS 4 -#else -#define PARAM_ISM_DTX_COH_SCA_BITS 4 -#endif -#ifdef DISCRETE_ISM_DTX_CNG #define ISM_DTX_AZI_BITS_HIGH 8 #define ISM_DTX_ELE_BITS_HIGH 7 #define ISM_Q_STEP_HIGH (ISM_Q_STEP / 2) @@ -357,10 +381,6 @@ typedef enum #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) -#else -#define PARAM_ISM_DTX_AZI_BITS 5 -#define PARAM_ISM_DTX_ELE_BITS 4 -#endif typedef enum @@ -376,23 +396,16 @@ enum { IND_ISM_NUM_OBJECTS, IND_ISM_EXTENDED_FLAG = IND_ISM_NUM_OBJECTS + MAX_NUM_OBJECTS, -#ifdef FIX_379_EXT_METADATA + IND_ISM_EXTENDED_NDP_FLAG, IND_ISM_METADATA_FLAG, -#else - IND_ISM_METADATA_FLAG = IND_ISM_EXTENDED_FLAG + MAX_NUM_OBJECTS, /* EN2VE: Is this not supposed to be in the loop part below, since it is one per ISM? */ -#endif IND_ISM_VAD_FLAG = IND_ISM_METADATA_FLAG + MAX_NUM_OBJECTS, -#ifdef DISCRETE_ISM_DTX_CNG IND_ISM_NOISY_SPEECH_FLAG = IND_ISM_VAD_FLAG + MAX_NUM_OBJECTS, IND_ISM_SCE_ID_DTX, -#else - IND_ISM_SCE_ID_DTX = IND_ISM_VAD_FLAG + MAX_NUM_OBJECTS, - IND_ISM_NOISY_SPEECH_FLAG, -#endif IND_ISM_DTX_COH_SCA, /* ------------- loop for objects -------------- */ TAG_ISM_LOOP_START = IND_ISM_DTX_COH_SCA + MAX_NUM_OBJECTS, + IND_ISM_NDP_FLAG = TAG_ISM_LOOP_START, 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, @@ -811,11 +824,7 @@ enum fea_names #define TDM_LP_REUSE_BITS 1 /* number of bits to code LP reuse flag for secondary channel */ #define TDM_LR_CONTENT_BITS 1 /* number of bits to code flag when the content is LR or not */ #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 */ -#endif -#endif +#define TDM_IC_LSF_PRED_BITS 1 /* number of bits to code the inter channel LSF prediction mode */ /*----------------------------------------------------------------------------------* @@ -849,10 +858,21 @@ enum fea_names #define SNS_LOW_BR_MODE -1 #define SNS_NPTS 16 /* Number of downsampled SNS parameters */ +#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 +#define SNS_CDBKS_BITS_4_FRAC 12 +#define SNS_MEANS_BITS_4_FRAC 14 #define MDCT_ST_PLC_FADEOUT_MIN_NOISE_NRG 0.001f #define MDCT_ST_PLC_FADEOUT_MAX_CONC_FRAME 2 * FRAMES_PER_SEC #define MDCT_ST_PLC_FADEOUT_TO_ZERO_LEN 20 +#ifdef FIX_MDCT_ST_PLC_FADEOUT_DELAY +#define MDCT_ST_PLC_FADEOUT_DELAY_4_LSP_FADE 3 +#endif typedef enum { EQUAL_CORES, @@ -880,6 +900,7 @@ typedef enum { // VE: this should be renamed to e.g. N_SPATIAL_SUBFRAMES #define MAX_PARAM_SPATIAL_SUBFRAMES 4 /* Maximum number of subframes for parameteric spatial coding */ #define L_SPATIAL_SUBFR_48k (L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES) +#define CLDFB_SLOTS_PER_SUBFRAME ( CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES ) /* Number of CLDFB slots per subframe */ /*----------------------------------------------------------------------------------* @@ -910,7 +931,7 @@ typedef enum * DirAC Constants *----------------------------------------------------------------------------------*/ -#define DIRAC_MAX_ANA_CHANS FOA_CHANNELS /* Maximum number of channels for DirAC analysis */ +#define DIRAC_MAX_ANA_CHANS 11 /* Maximum number of channels for DirAC analysis */ #define DIRAC_NUM_DIMS 3 /* number of directions to estimate (X,Y,Z) */ #define DIRAC_MAX_NBANDS 12 /* Maximum number of frequency bands for the DirAC Side Parameter decoding */ @@ -924,6 +945,9 @@ typedef enum #define DIRAC_NO_FB_BANDS_MAX MDFT_FB_BANDS_240 #define DELAY_DIRAC_ENC_CMP_NS_PARAM_ISM ( IVAS_ENC_DELAY_NS + IVAS_DEC_DELAY_NS ) /* == 12 ms */ +#define DIRAC_HO_NUMSECTORS 2 +#define NUM_ANA_SECTORS 2 + /* DirAC renderer setup */ typedef enum @@ -961,10 +985,8 @@ 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) */ -#ifdef FIX_350_MASA_DELAY_COMP #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 */ -#endif #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 @@ -984,7 +1006,10 @@ typedef enum #define SPAR_CONFIG_BW FB -#define IVAS_SPAR_MAX_CH (FOA_CHANNELS + 2 * ( IVAS_MAX_SBA_ORDER - 1 )) /* FOA + planar HOA */ +#define IVAS_SPAR_MAX_CH ((( IVAS_MAX_SBA_ORDER ) * ( IVAS_MAX_SBA_ORDER )) + 2) /* HOA2 + pHOA3*/ +#define IVAS_HBR_MAX_DECOR_CHS (2) + +#define IVAS_SPAR_MAX_FB_IN_CHAN 11 #define IVAS_SPAR_P_LOWERTRI ((IVAS_SPAR_MAX_CH - 1) * (IVAS_SPAR_MAX_CH - 2)) >> 1 #define IVAS_SPAR_MAX_C_COEFF (IVAS_SPAR_MAX_CH - IVAS_SPAR_MAX_DMX_CHS) * ( IVAS_SPAR_MAX_DMX_CHS - 1) @@ -996,10 +1021,15 @@ typedef enum /* AGC constants */ #define AGC_BITS_PER_CH 3 #define AGC_EMAX 0 +#ifdef ARITH_HUFF_CODER_CHANGES +#define AGC_SIGNALLING_BITS 1 +#define IVAS_SPAR_ARITH_OVERSHOOT_BITS (16) +#endif /* Common SPAR metadata constants */ #define IVAS_ACTIVEW_DM_F_SCALE 0.5f #define IVAS_ACTIVEW_DM_F_SCALE_DTX 0.25f +#define IVAS_ACTIVEW_DM_F_SCALE_VLBR 0.25f #define IVAS_SPAR_FOA_DFLT_FREQ_PER_CHAN 24000 #define MAX_QUANT_STRATS 3 @@ -1032,7 +1062,7 @@ typedef enum DECX_COEFF } ivas_coeffs_type_t; -#define IVAS_SPAR_BR_TABLE_LEN 18 +#define IVAS_SPAR_BR_TABLE_LEN 20 /* TD decorr */ // VE: not all 16CH are currently supported -> t be revisited later enum @@ -1136,9 +1166,6 @@ enum #define MASA_MAXIMUM_DIRECTIONS 2 #define MASA_MAX_TRANSPORT_CHANNELS 2 -#ifndef FIX_350_MASA_DELAY_COMP -#define MASA_ENC_DELAY_SLOTS 7 -#endif #define MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS 5 @@ -1157,6 +1184,9 @@ enum #define MASA_DIRECTION_MAX_BITS 11 #define MASA_NO_INDEX 32767 #define MASA_BITS_ER 3 +#ifdef HR_METADATA +#define MASA_BITS_ER_HR 4 +#endif #define MASA_MIN_BITS_TF 4 #define MASA_LIMIT_2D 2 #define MASA_NO_CV_COH 8 @@ -1175,6 +1205,15 @@ enum #define MASA_COH_LIMIT_2IDX 144 /* limit for sum of values across components for having two joint indexes */ #define QMETADATA_MAX_NO_DIRECTIONS 2 #define MASA_MAX_BITS 1300 /* max. bit-budget for MASA metadata */ + +#ifdef HR_METADATA +#define MASA_MAX_BITS_HR 2000 /* max. bit-budget for MASA metadata in HR mode*/ +#define HR_MASA_ER_LEVELS 16 +#endif +#ifdef FIX_HBR_MASAMETA +#define MAX_REDUCED_NBANDS 18 /* max number of subbands that is less than the default value 24 */ +#endif + #define LIMIT_ER_ELEVATION_ENC 4 #define LIMIT_ER_SIMPLE_ENC 6 #define LIMIT_USE_COMMON 3 @@ -1186,7 +1225,9 @@ enum #define MASA_ANGLE_TOLERANCE 0.5f #define MASA_LIMIT_NO_BANDS_SUR_COH 8 #define MINIMUM_BIT_BUDGET_NORMAL_META 100 +#define DIFF_DFRATIO_2BIT_LIMIT_IDX_HODIRAC 4 #define DIFF_DFRATIO_2BIT_LIMIT_IDX 3 + #define DIFF_DFRATIO_1BIT_LIMIT_IDX 6 #define DIFF_EC_HUFF_BAND_LIMIT 8 #define DIFF_EC_HUFF_GR0_LIMIT 8 @@ -1203,7 +1244,12 @@ enum #define MASA_STEREO_MIN_BITRATE IVAS_24k4 #define MASA_BIT_REDUCT_PARAM 10 -#define MASA_MAXIMUM_TWO_DIR_BANDS 18 +#ifdef HR_METADATA +#define MASA_MAXIMUM_TWO_DIR_BANDS 24 +#define NBITS_HR_COH 4 +#else +#define MASA_MAXIMUM_TWO_DIR_BANDS 18 +#endif typedef enum { MASA_STEREO_NOT_DEFINED, @@ -1211,13 +1257,11 @@ typedef enum MASA_STEREO_DOWNMIX } MASA_TRANSPORT_SIGNAL_TYPE; -#ifdef FIX_382_MASA_META_FRAMING_ASYNC typedef enum { MASA_FRAME_1SF, MASA_FRAME_4SF } MASA_FRAME_MODE; -#endif /*----------------------------------------------------------------------------------* * Multichannel format @@ -1231,7 +1275,8 @@ typedef enum MC_MODE_NONE, MC_MODE_MCT, MC_MODE_PARAMMC, - MC_MODE_MCMASA + MC_MODE_MCMASA, + MC_MODE_PARAMUPMIX } MC_MODE; typedef enum @@ -1283,26 +1328,62 @@ typedef enum #define NBBITS_MCT_RATIO 4 #define BITRATE_MCT_RATIO_RANGE ( 1 << NBBITS_MCT_RATIO ) /* Range of the coded bitrate distribution ratio */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE -#define LFE_BITS 180 -#define MCT_LFE_MAX_LINE 24 -#endif #define MCT_NUM_BLOCK_DATA_BITS 4 -#ifndef ISSUE_24_CLEANUP_MCT_LFE typedef enum { MCT_CHAN_MODE_REGULAR, - MCT_CHAN_MODE_LFE, MCT_CHAN_MODE_IGNORE } MCT_CHAN_MODE; -#else -typedef enum + +/*----------------------------------------------------------------------------------* + * MC Param-Upmix Mode Constants + *----------------------------------------------------------------------------------*/ +#define MC_PARAMUPMIX_MAX_TRANSPORT_CHANS 8 +#define MC_PARAMUPMIX_MAX_INPUT_CHANS 12 +#define MC_PARAMUPMIX_MAX_BITS 1024 /* Maximum number of bits for the MC Param-Upmix metadata */ +#define MC_PARAMUPMIX_COMBINATIONS 4 /* number of sets of 2 channels combined */ +#define MC_PARAMUPMIX_NCH 2 /* number of channels to combine into 1 */ +#define MC_PARAMUPMIX_MIN_CLDFB 8 + +typedef struct { + const int32_t *value; + const uint16_t *length; +} HUFF_TAB; + +typedef struct { + int32_t value[81]; + unsigned short length[81]; +} HUFF_ELEMENTS; + +typedef struct { + HUFF_ELEMENTS df0; + HUFF_ELEMENTS df; + HUFF_ELEMENTS dt; +} HUFF_TABLE; + +typedef enum { + ALPHA, + BETA +} PAR_TYPE; + +typedef enum { + FINE, + COARSE +} QUANT_TYPE; + +typedef struct { + int16_t nquant; + int16_t offset; + float data[35]; +} ACPL_QUANT_TABLE; + +typedef struct { - MCT_CHAN_MODE_REGULAR, - MCT_CHAN_MODE_IGNORE -} MCT_CHAN_MODE; -#endif + const int16_t (*alpha[2])[2]; + const int16_t (*beta[2])[2]; +} HUFF_NODE_TABLE; + /*----------------------------------------------------------------------------------* * Parametric MC Constants @@ -1320,7 +1401,11 @@ typedef enum #define PARAM_MC_REG_GHAT (0.001f) /* Regularization factor for mixing matrix calculation */ #define PARAM_MC_MAX_PARAMETER_BANDS 20 /* Maximum number of parameter bands */ #define PARAM_MC_MAX_PARAMETER_BANDS_RES 14 /* Maximum number of parameter bands with decorrelation */ +#ifdef JBM_TSM_ON_TCS +#define PARAM_MC_MAX_NSLOTS MAX_JBM_CLDFB_TIMESLOTS /* Maximum number of CLDFB slots in a frame */ +#else #define PARAM_MC_MAX_NSLOTS 16 /* Maximum number of CLDFB slots in a frame */ +#endif #define PARAM_MC_MAX_NSLOTS_IN_SUBFRAME 4 /* Maximum number of CLDFB slots in a subframe */ #define PARAM_MC_NSUBFRAMES_DEC 4 /* Number of subframes for the synthesis in the decoder */ #define PARAM_MC_MAX_BANDS_IN_PARAMETER_BAND 30 /* Maximum number of CLDFB frequency bands within a parameter band */ @@ -1351,6 +1436,7 @@ 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 +#define PARAM_MC_CLDFB_TO_MDFT_FAC 2 /*----------------------------------------------------------------------------------* * LFE Coding Constants @@ -1426,7 +1512,11 @@ typedef enum #define BINAURAL_MAXBANDS 60 /* Max number of bands */ #define BINAURAL_CONVBANDS 50 /* Bands upto which convolution is performed */ +#ifdef UPDATE_SBA_FILTER +#define BINAURAL_NTAPS 5 +#else #define BINAURAL_NTAPS 7 +#endif #define BINAURAL_NTAPS_MAX 96 #define HRTF_SH_ORDER 3 @@ -1444,7 +1534,13 @@ 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 */ +#ifdef UPDATE_SBA_FILTER + BINAURAL_INPUT_AUDIO_CONFIG_HOA3, /* HOA3 */ + BINAURAL_INPUT_AUDIO_CONFIG_HOA2, /* HOA2 */ + BINAURAL_INPUT_AUDIO_CONFIG_FOA, /* FOA */ +#else BINAURAL_INPUT_AUDIO_CONFIG_HOA, /* FOA, HOA2, HOA3 */ +#endif BINAURAL_INPUT_AUDIO_CONFIG_UNDEFINED /* Not used */ } BINAURAL_INPUT_AUDIO_CONFIG; @@ -1471,7 +1567,7 @@ typedef enum #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) -#define MAX_ANGULAR_STEP (1.0f) +#define MAX_ANGULAR_STEP (0.01f) #define MAX_ANGULAR_STEP_INV ( 1.0f / MAX_ANGULAR_STEP ) #define MAX_INTERPOLATION_STEPS 12 @@ -1492,7 +1588,8 @@ typedef enum typedef enum { TDREND_PLAYSTATUS_INITIAL, - TDREND_PLAYSTATUS_PLAYING + TDREND_PLAYSTATUS_PLAYING, + TDREND_PLAYSTATUS_PLAYING_NON_DIEGETIC } TDREND_PlayStatus_t; typedef enum @@ -1515,6 +1612,7 @@ typedef enum } SFX_OpMode_t; +#ifndef FIX_439_OTR_PARAMS /*----------------------------------------------------------------------------------* * Orientation tracking constants *----------------------------------------------------------------------------------*/ @@ -1535,7 +1633,7 @@ typedef enum 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; - +#endif /*----------------------------------------------------------------------------------* * Reverberator constants @@ -1561,6 +1659,7 @@ typedef enum #define IVAS_320_PT_LEN 320 #define IVAS_240_PT_LEN 240 #define IVAS_160_PT_LEN 160 +#define IVAS_120_PT_LEN 120 #define IVAS_80_PT_LEN 80 #define IVAS_40_PT_LEN 40 @@ -1664,11 +1763,17 @@ typedef enum #define IVAS_16K_12BANDS_ACTIVE_BANDS 10 #define SPAR_DIRAC_SPLIT_START_BAND 8 +#define DIRAC_TO_SPAR_HBR_PRED_CHS (FOA_CHANNELS - 1) #define SPAR_DTX_BANDS 2 #define DIRAC_DTX_BANDS 2 #define SPAR_DIRAC_DTX_BANDS ( SPAR_DTX_BANDS + DIRAC_DTX_BANDS ) #define CLDFB_PAR_WEIGHT_START_BAND 7 +#ifdef ARITH_HUFF_CODER_CHANGES +#define QUANT_STRAT_0 0 +#define QUANT_STRAT_2 2 +#endif + /*----------------------------------------------------------------------------------* * Limiter constants diff --git a/lib_com/ivas_cov_smooth.c b/lib_com/ivas_cov_smooth.c index 35ce6b85465eca6da931f068f4dbeb384f25fe1f..1860e6ac70cad5a82a3a76290368f46b027d6c41 100644 --- a/lib_com/ivas_cov_smooth.c +++ b/lib_com/ivas_cov_smooth.c @@ -51,24 +51,36 @@ static void ivas_set_up_cov_smoothing( ivas_filterbank_t *pFb, const float max_update_rate, const int16_t min_pool_size, - const int16_t nchan_inp /* i : number of input channels */ -) + const int32_t ivas_total_brate ) { int16_t j, k; - - if ( nchan_inp <= FOA_CHANNELS ) + if ( ivas_total_brate < IVAS_24k4 ) { for ( j = 0; j < pFb->filterbank_num_bands; j++ ) { 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 < pFb->fb_bin_to_band.pFb_active_bins_per_band[j]; k++ ) + for ( k = 0; k < active_bins; k++ ) { - update_factor += pFb->fb_bin_to_band.pFb_bin_to_band[j][k]; + update_factor += p_bin_to_band[k]; } hCovState->pSmoothing_factor[j] = update_factor / min_pool_size; + 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; if ( hCovState->pSmoothing_factor[j] > max_update_rate ) { @@ -77,7 +89,6 @@ static void ivas_set_up_cov_smoothing( } } else - { for ( j = 0; j < pFb->filterbank_num_bands; j++ ) { float update_factor; @@ -97,7 +108,6 @@ static void ivas_set_up_cov_smoothing( hCovState->pSmoothing_factor[j] = max_update_rate; } } - } hCovState->prior_bank_idx = -1; return; @@ -115,6 +125,8 @@ 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 */ + , + const int32_t ivas_total_brate /* i : IVAS total bitrate */ ) { ivas_cov_smooth_state_t *hCovState; @@ -142,8 +154,8 @@ 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, - nchan_inp ); + + ivas_set_up_cov_smoothing( hCovState, pFb, cov_smooth_cfg->max_update_rate, cov_smooth_cfg->min_pool_size, ivas_total_brate ); *hCovState_out = hCovState; diff --git a/lib_com/ivas_dirac_com.c b/lib_com/ivas_dirac_com.c index 01f133a3b7f2fc2d6bd0c5e24ef94419c0dca733..95d122ba790d0c26b31856a58ddef9f0d39e2c81 100644 --- a/lib_com/ivas_dirac_com.c +++ b/lib_com/ivas_dirac_com.c @@ -48,6 +48,30 @@ static uint16_t deindex_sph_idx_general( const int16_t idx_sph, const int16_t no_bits, float *theta_dec, float *phi_dec, uint16_t *p_id_phi, const MC_LS_SETUP mc_format ); + +/*------------------------------------------------------------------------- + * ivas_get_hodirac_flag() + * + * Return flag for HO-DirAC method at high bitrates + *------------------------------------------------------------------------*/ + +/*! r: HO-DirAC flag */ +int16_t ivas_get_hodirac_flag( + const int32_t ivas_total_brate, /* i : IVAS total bitrate */ + const int16_t sba_order /* i : Ambisonic (SBA) order */ +) +{ + if ( sba_order > 1 && ivas_total_brate > IVAS_256k ) + { + return 1; + } + else + { + return 0; + } +} + + /*------------------------------------------------------------------------- * ivas_dirac_sba_config() * @@ -71,8 +95,10 @@ ivas_error ivas_dirac_config( int16_t spar_dirac_split_band; IVAS_FB_MIXER_HANDLE hFbMdft; SBA_MODE sba_mode; + int16_t *dirac_to_spar_md_bands; + error = IVAS_ERR_OK; if ( enc_dec == ENC ) @@ -128,7 +154,13 @@ ivas_error ivas_dirac_config( if ( sba_mode == SBA_MODE_SPAR ) { hConfig->nbands = IVAS_MAX_NUM_BANDS; + spar_dirac_split_band = min( IVAS_MAX_NUM_BANDS, SPAR_DIRAC_SPLIT_START_BAND ); + + if ( ivas_get_hodirac_flag( ivas_total_brate, sba_order ) ) + { + spar_dirac_split_band = 0; + } } else { @@ -137,7 +169,7 @@ ivas_error ivas_dirac_config( } hConfig->enc_param_start_band = 0; hConfig->dec_param_estim = FALSE; - + hConfig->dec_param_estim_old = hConfig->dec_param_estim; if ( ivas_format == SBA_FORMAT ) /* skip for MASA decoder */ { if ( ( error = ivas_dirac_sba_config( hQMetaData, nchan_transport, nSCE, nCPE, element_mode, ivas_total_brate, sba_order, sba_mode, hConfig->nbands - spar_dirac_split_band ) ) != IVAS_ERR_OK ) @@ -162,6 +194,15 @@ ivas_error ivas_dirac_config( { hConfig->enc_param_start_band = spar_dirac_split_band; } + + if ( ivas_get_hodirac_flag( ivas_total_brate, sba_order ) ) + { + hConfig->dec_param_estim = FALSE; + hConfig->enc_param_start_band = 0; + + set_c( (int8_t *) hQMetaData->twoDirBands, (int8_t) 1, hQMetaData->q_direction[0].cfg.nbands ); + hQMetaData->numTwoDirBands = (uint8_t) hQMetaData->q_direction[0].cfg.nbands; + } } else { @@ -174,13 +215,11 @@ ivas_error ivas_dirac_config( if ( sba_mode == SBA_MODE_SPAR ) { - ivas_dirac_config_bands( band_grouping, IVAS_MAX_NUM_BANDS, (int16_t) ( Fs * INV_CLDFB_BANDWIDTH + 0.5f ), - dirac_to_spar_md_bands, hQMetaData->useLowerBandRes, hConfig->enc_param_start_band, hFbMdft ); + ivas_dirac_config_bands( band_grouping, IVAS_MAX_NUM_BANDS, (int16_t) ( Fs * INV_CLDFB_BANDWIDTH + 0.5f ), dirac_to_spar_md_bands, hQMetaData->useLowerBandRes, hConfig->enc_param_start_band, hFbMdft ); } else { - ivas_dirac_config_bands( band_grouping, hConfig->nbands, (int16_t) ( Fs * INV_CLDFB_BANDWIDTH + 0.5f ), - NULL, 0, 0, hFbMdft ); + ivas_dirac_config_bands( band_grouping, hConfig->nbands, (int16_t) ( Fs * INV_CLDFB_BANDWIDTH + 0.5f ), NULL, 0, 0, hFbMdft ); } return error; @@ -259,9 +298,10 @@ void ivas_dirac_config_bands( { band_grouping[reduced_band] = max_band; } - for ( band = enc_param_start_band + 1; band < DIRAC_MAX_NBANDS; band++ ) + 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[band] = dirac_to_spar_md_bands[band - 1]; + 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 @@ -289,6 +329,70 @@ void ivas_dirac_config_bands( return; } +#ifdef ARITH_HUFF_CODER_CHANGES +void ivas_get_dirac_sba_max_md_bits( + const int32_t sba_total_brate, + int16_t *bits_frame_nominal, + int16_t *metadata_max_bits, + int16_t *qmetadata_max_bit_req, + int16_t nbands ) +{ + if ( sba_total_brate <= IVAS_13k2 ) + { + *bits_frame_nominal = ACELP_9k60 / FRAMES_PER_SEC; + *metadata_max_bits = 70; + } + else if ( sba_total_brate <= IVAS_16k4 ) + { + *bits_frame_nominal = ACELP_13k20 / FRAMES_PER_SEC; + *metadata_max_bits = 80; + } + else if ( sba_total_brate <= IVAS_24k4 ) + { + *bits_frame_nominal = ACELP_16k40 / FRAMES_PER_SEC; + *metadata_max_bits = 103; + } + else if ( sba_total_brate <= IVAS_32k ) + { + *bits_frame_nominal = ACELP_32k / FRAMES_PER_SEC; + *metadata_max_bits = 214; + } + else if ( sba_total_brate <= IVAS_48k ) + { + *bits_frame_nominal = IVAS_48k / FRAMES_PER_SEC; + *metadata_max_bits = 240; + } + else if ( sba_total_brate <= IVAS_64k ) + { + *bits_frame_nominal = IVAS_64k / FRAMES_PER_SEC; + *metadata_max_bits = 200; + } + else if ( sba_total_brate <= IVAS_80k ) + { + *bits_frame_nominal = IVAS_80k / FRAMES_PER_SEC; + *metadata_max_bits = 200; + } + else if ( sba_total_brate <= IVAS_96k ) + { + *bits_frame_nominal = IVAS_96k / FRAMES_PER_SEC; + *metadata_max_bits = 200; + } + else if ( sba_total_brate <= IVAS_128k ) + { + *bits_frame_nominal = IVAS_128k / FRAMES_PER_SEC; + *metadata_max_bits = 250; + } + else + { + *bits_frame_nominal = (int16_t) ( sba_total_brate / FRAMES_PER_SEC ); + *metadata_max_bits = MAX16B; /* no limit */ + } + *metadata_max_bits = (int16_t) ceilf( (float) *metadata_max_bits * nbands / 5 ); + *qmetadata_max_bit_req = QMETADATA_MAXBIT_REQ_SBA >> 1; + + return; +} +#endif /*------------------------------------------------------------------------- * ivas_dirac_sba_config() @@ -311,10 +415,12 @@ ivas_error ivas_dirac_sba_config( int16_t i; int16_t nbands_wb; int16_t nbands_coded; + int16_t hodirac_flag; ivas_error error; error = IVAS_ERR_OK; hQMetaData->is_masa_ivas_format = 0; + hodirac_flag = ivas_get_hodirac_flag( sba_total_brate, sba_order ); if ( sba_mode == SBA_MODE_SPAR ) { @@ -351,14 +457,48 @@ ivas_error ivas_dirac_sba_config( else { hQMetaData->useLowerBandRes = 0; - nbands_coded = nbands - 1; /* always combine the last two bands */ + if ( hodirac_flag == 0 ) + { + nbands_coded = nbands - 1; /* always combine the last two bands */ + } } - if ( ( error = ivas_qmetadata_allocate_memory( hQMetaData, nbands_coded, 1, 0 ) ) != IVAS_ERR_OK ) { - return error; - } + int16_t no_dirs = 1; + if ( hodirac_flag ) + { + no_dirs = 2; + } + if ( ( error = ivas_qmetadata_allocate_memory( hQMetaData, nbands_coded, no_dirs, 0 ) ) != IVAS_ERR_OK ) + { + return error; + } +#if !defined( FIX_DTX_428 ) + { + int16_t dir, j; + for ( dir = 0; dir < hQMetaData->no_directions; dir++ ) + { + for ( j = 0; j < nbands_coded; j++ ) + { + for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ ) + { + hQMetaData->q_direction[dir].band_data[j].energy_ratio_index[i] = 0; + hQMetaData->q_direction[dir].band_data[j].energy_ratio_index_mod[i] = 0; + } + } + } + } +#endif + } +#ifdef ARITH_HUFF_CODER_CHANGES + ivas_get_dirac_sba_max_md_bits( + sba_total_brate, + &hQMetaData->bits_frame_nominal, + &hQMetaData->metadata_max_bits, + &hQMetaData->qmetadata_max_bit_req, + hQMetaData->q_direction[0].cfg.nbands ); +#else if ( sba_total_brate <= IVAS_13k2 ) { hQMetaData->bits_frame_nominal = ACELP_9k60 / FRAMES_PER_SEC; @@ -412,6 +552,7 @@ ivas_error ivas_dirac_sba_config( hQMetaData->metadata_max_bits = (int16_t) ceilf( (float) hQMetaData->metadata_max_bits * hQMetaData->q_direction[0].cfg.nbands / 5 ); hQMetaData->qmetadata_max_bit_req = QMETADATA_MAXBIT_REQ_SBA >> 1; +#endif return error; } @@ -449,11 +590,17 @@ ivas_error ivas_dirac_sba_config( } if ( sba_total_brate >= IVAS_96k ) { - if ( ( error = ivas_qmetadata_allocate_memory( hQMetaData, 6, 1, 0 ) ) != IVAS_ERR_OK ) { - return error; + int16_t no_dirs = 1; + if ( hodirac_flag ) + { + no_dirs = 2; + } + if ( ( error = ivas_qmetadata_allocate_memory( hQMetaData, 6, no_dirs, 0 ) ) != IVAS_ERR_OK ) + { + return error; + } } - nbands_wb = 4; } else @@ -481,7 +628,15 @@ ivas_error ivas_dirac_sba_config( for ( i = 0; i < hQMetaData->no_directions; i++ ) { hQMetaData->q_direction[i].cfg.search_effort = 1; - hQMetaData->q_direction[i].cfg.start_band = nbands_wb; + + if ( hodirac_flag ) + { + hQMetaData->q_direction[i].cfg.start_band = 0; + } + else + { + hQMetaData->q_direction[i].cfg.start_band = nbands_wb; + } } *element_mode = IVAS_CPE_MDCT; @@ -785,6 +940,241 @@ void deindex_spherical_component( } +/*---------------------------------------------------------------- + * calculate_hodirac_sector_parameters() + * + * + *-----------------------------------------------------------------*/ + +void calculate_hodirac_sector_parameters( +#ifdef FIX_485_STATIC_BUFFERS + DIRAC_ENC_HANDLE hDirAC, /* i : DirAC handle */ +#endif + float RealBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], /* i : signal vector (L+1)^2 x N_bins, real part */ + float ImagBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], /* i : signal vector, imaginary part */ + const float beta, /* i : forgetting factor for average filtering */ + const int16_t *band_grouping, /* i : indices of band groups */ + const int16_t N_bands, /* i : number of bands (groups) */ + const int16_t enc_param_start_band, /* i : first band to process */ + float *azi, /* o : array of sector azimuth angles, flat */ + float *ele, /* o : array of sector elevation angles, flat */ + float *diff, /* o : array of sector diffuseness values, flat */ + float *ene /* o : array of sector energy values, flat */ +) +{ + int16_t i_sec, i_bin, i_band; + float p_real, p_imag, normI, energy, tmp_diff; + float sec_I_vec_x[NUM_ANA_SECTORS]; + float sec_I_vec_y[NUM_ANA_SECTORS]; + float sec_I_vec_z[NUM_ANA_SECTORS]; + +#ifndef FIX_485_STATIC_BUFFERS + static int16_t firstrun_sector_params = 1; + + static float sec_I_vec_smth_x[NUM_ANA_SECTORS][IVAS_MAX_NUM_BANDS]; + static float sec_I_vec_smth_y[NUM_ANA_SECTORS][IVAS_MAX_NUM_BANDS]; + static float sec_I_vec_smth_z[NUM_ANA_SECTORS][IVAS_MAX_NUM_BANDS]; + + static float energy_smth[NUM_ANA_SECTORS][IVAS_MAX_NUM_BANDS]; + static float azi_prev[NUM_ANA_SECTORS * IVAS_MAX_NUM_BANDS]; + static float ele_prev[NUM_ANA_SECTORS * IVAS_MAX_NUM_BANDS]; +#endif + + for ( i_sec = 0; i_sec < NUM_ANA_SECTORS; i_sec++ ) + { + + float *p_sec_I_vec_x = &sec_I_vec_x[i_sec]; + float *p_sec_I_vec_y = &sec_I_vec_y[i_sec]; + float *p_sec_I_vec_z = &sec_I_vec_z[i_sec]; + + const float *p_c_weights = c_weights; + + float *p_ImagBuffer_0 = ImagBuffer[0]; + float *p_ImagBuffer_1 = ImagBuffer[1]; + float *p_ImagBuffer_2 = ImagBuffer[2]; + float *p_ImagBuffer_3 = ImagBuffer[3]; + float *p_ImagBuffer_4 = ImagBuffer[4]; + float *p_ImagBuffer_5 = ImagBuffer[5]; + float *p_ImagBuffer_6 = ImagBuffer[6]; + float *p_ImagBuffer_8 = ImagBuffer[8]; + + float *p_RealBuffer_0 = RealBuffer[0]; + float *p_RealBuffer_1 = RealBuffer[1]; + float *p_RealBuffer_2 = RealBuffer[2]; + float *p_RealBuffer_3 = RealBuffer[3]; + float *p_RealBuffer_4 = RealBuffer[4]; + float *p_RealBuffer_5 = RealBuffer[5]; + float *p_RealBuffer_6 = RealBuffer[6]; + float *p_RealBuffer_8 = RealBuffer[8]; + + for ( i_band = enc_param_start_band; i_band < N_bands; i_band++ ) + { + float *p_azi = &azi[i_sec * N_bands + i_band]; + float *p_ele = &ele[i_sec * N_bands + i_band]; + float *p_ene = &ene[i_sec * N_bands + i_band]; + + float *p_diff = &diff[i_sec * N_bands + i_band]; +#ifdef FIX_485_STATIC_BUFFERS + float *p_azi_prev = &hDirAC->azi_prev[i_sec * N_bands + i_band]; + float *p_ele_prev = &hDirAC->ele_prev[i_sec * N_bands + i_band]; + + float *p_energy_smth = &hDirAC->energy_smth[i_sec][i_band]; + float *p_sec_I_vec_smth_x = &hDirAC->sec_I_vec_smth_x[i_sec][i_band]; + float *p_sec_I_vec_smth_y = &hDirAC->sec_I_vec_smth_y[i_sec][i_band]; + float *p_sec_I_vec_smth_z = &hDirAC->sec_I_vec_smth_z[i_sec][i_band]; +#else + float *p_azi_prev = &azi_prev[i_sec * N_bands + i_band]; + float *p_ele_prev = &ele_prev[i_sec * N_bands + i_band]; + + float *p_energy_smth = &energy_smth[i_sec][i_band]; + float *p_sec_I_vec_smth_x = &sec_I_vec_smth_x[i_sec][i_band]; + float *p_sec_I_vec_smth_y = &sec_I_vec_smth_y[i_sec][i_band]; + float *p_sec_I_vec_smth_z = &sec_I_vec_smth_z[i_sec][i_band]; +#endif + *p_sec_I_vec_x = 0.f; + *p_sec_I_vec_y = 0.f; + *p_sec_I_vec_z = 0.f; + energy = 0.f; + + if ( i_sec == 0 ) + { + for ( i_bin = band_grouping[i_band]; i_bin < band_grouping[i_band + 1]; i_bin++ ) + { + float w = *( p_c_weights++ ); + float sec_w_imag, sec_x_imag, sec_y_imag, sec_z_imag; + float sec_w_real, sec_x_real, sec_y_real, sec_z_real; + + sec_w_imag = 1.772454f * *( p_ImagBuffer_0 ) + 1.772454f * *( p_ImagBuffer_1 ); + sec_x_imag = 1.772454f * *( p_ImagBuffer_3++ ) + 1.023326f * *( p_ImagBuffer_4++ ); + sec_y_imag = 0.590818f * *( p_ImagBuffer_0++ ) + 1.772454f * *( p_ImagBuffer_1++ ) - 0.590817f * *( p_ImagBuffer_6++ ) - 1.023326f * *( p_ImagBuffer_8++ ); + sec_z_imag = 1.772454f * *( p_ImagBuffer_2++ ) + 1.023326f * *( p_ImagBuffer_5++ ); + + sec_w_real = 1.772454f * *( p_RealBuffer_0 ) + 1.772454f * *( p_RealBuffer_1 ); + sec_x_real = 1.772454f * *( p_RealBuffer_3++ ) + 1.023326f * *( p_RealBuffer_4++ ); + sec_y_real = 0.590818f * *( p_RealBuffer_0++ ) + 1.772454f * *( p_RealBuffer_1++ ) - 0.590817f * *( p_RealBuffer_6++ ) - 1.023326f * *( p_RealBuffer_8++ ); + sec_z_real = 1.772454f * *( p_RealBuffer_2++ ) + 1.023326f * *( p_RealBuffer_5++ ); + + p_real = sec_w_real * w; + p_imag = sec_w_imag * w; + + *p_sec_I_vec_x += p_real * sec_x_real + p_imag * sec_x_imag; + *p_sec_I_vec_y += p_real * sec_y_real + p_imag * sec_y_imag; + *p_sec_I_vec_z += p_real * sec_z_real + p_imag * sec_z_imag; + + energy += 0.5f * ( p_real * p_real + p_imag * p_imag + sec_x_real * sec_x_real + sec_x_imag * sec_x_imag + + sec_y_real * sec_y_real + sec_y_imag * sec_y_imag + + sec_z_real * sec_z_real + sec_z_imag * sec_z_imag ); + } + } + else + { + for ( i_bin = band_grouping[i_band]; i_bin < band_grouping[i_band + 1]; i_bin++ ) + { + float w = *( p_c_weights++ ); + float sec_w_imag, sec_x_imag, sec_y_imag, sec_z_imag; + float sec_w_real, sec_x_real, sec_y_real, sec_z_real; + + sec_w_imag = 1.772454f * *(p_ImagBuffer_0) -1.772454f * *( p_ImagBuffer_1 ); + sec_x_imag = 1.772454f * *( p_ImagBuffer_3++ ) - 1.023326f * *( p_ImagBuffer_4++ ); + sec_y_imag = -0.590818f * *( p_ImagBuffer_0++ ) + 1.772454f * *( p_ImagBuffer_1++ ) + 0.590817f * *( p_ImagBuffer_6++ ) + 1.023326f * *( p_ImagBuffer_8++ ); + sec_z_imag = 1.772454f * *( p_ImagBuffer_2++ ) - 1.023326f * *( p_ImagBuffer_5++ ); + + sec_w_real = 1.772454f * *(p_RealBuffer_0) -1.772454f * *( p_RealBuffer_1 ); + sec_x_real = 1.772454f * *( p_RealBuffer_3++ ) - 1.023326f * *( p_RealBuffer_4++ ); + sec_y_real = -0.590818f * *( p_RealBuffer_0++ ) + 1.772454f * *( p_RealBuffer_1++ ) + 0.590817f * *( p_RealBuffer_6++ ) + 1.023326f * *( p_RealBuffer_8++ ); + sec_z_real = 1.772454f * *( p_RealBuffer_2++ ) - 1.023326f * *( p_RealBuffer_5++ ); + + p_real = sec_w_real * w; + p_imag = sec_w_imag * w; + + *p_sec_I_vec_x += p_real * sec_x_real + p_imag * sec_x_imag; + *p_sec_I_vec_y += p_real * sec_y_real + p_imag * sec_y_imag; + *p_sec_I_vec_z += p_real * sec_z_real + p_imag * sec_z_imag; + + energy += 0.5f * ( p_real * p_real + p_imag * p_imag + sec_x_real * sec_x_real + sec_x_imag * sec_x_imag + + sec_y_real * sec_y_real + sec_y_imag * sec_y_imag + + sec_z_real * sec_z_real + sec_z_imag * sec_z_imag ); + } + } +#ifdef FIX_485_STATIC_BUFFERS + if ( hDirAC->firstrun_sector_params ) +#else + if ( firstrun_sector_params ) +#endif + { + *p_sec_I_vec_smth_x = *p_sec_I_vec_x; + *p_sec_I_vec_smth_y = *p_sec_I_vec_y; + *p_sec_I_vec_smth_z = *p_sec_I_vec_z; + *p_energy_smth = energy; + } + else + { + float w = ( 1.0f - beta ); + *p_sec_I_vec_smth_x = w * *p_sec_I_vec_x + beta * *p_sec_I_vec_smth_x; + *p_sec_I_vec_smth_y = w * *p_sec_I_vec_y + beta * *p_sec_I_vec_smth_y; + *p_sec_I_vec_smth_z = w * *p_sec_I_vec_z + beta * *p_sec_I_vec_smth_z; + *p_energy_smth = w * energy + beta * *p_energy_smth; + } + + if ( energy < EPSILON ) + { + *p_azi = 0.f; + *p_ele = 0.f; + *p_ene = 0.f; + *p_diff = 1.f; + } + else + { + normI = sqrtf( *p_sec_I_vec_smth_x * *p_sec_I_vec_smth_x + + *p_sec_I_vec_smth_y * *p_sec_I_vec_smth_y + + *p_sec_I_vec_smth_z * *p_sec_I_vec_smth_z ); + *p_azi = atan2f( *p_sec_I_vec_smth_y, *p_sec_I_vec_smth_x ) * _180_OVER_PI; + *p_ele = asinf( *p_sec_I_vec_smth_z / ( normI + EPSILON ) ) * _180_OVER_PI; + *p_ene = *p_energy_smth; + *p_diff = 1.f - normI / ( *p_energy_smth + EPSILON ); + } + + tmp_diff = *p_diff; + + if ( tmp_diff < 0.0f ) + { + *p_diff = 0.f; + } + if ( tmp_diff > 0.5f ) + { +#ifdef FIX_485_STATIC_BUFFERS + if ( hDirAC->firstrun_sector_params ) +#else + if ( firstrun_sector_params ) +#endif + { + *p_azi = 0.f; + *p_ele = 0.f; + } + else + { + *p_azi = 2.f * ( 1.f - tmp_diff ) * *p_azi + ( 2.f * tmp_diff - 1.f ) * *p_azi_prev; + *p_ele = 2.f * ( 1.f - tmp_diff ) * *p_ele + ( 2.f * tmp_diff - 1.f ) * *p_ele_prev; + } + } + else + { + *p_azi_prev = *p_azi; + *p_ele_prev = *p_ele; + } + } + } + +#ifdef FIX_485_STATIC_BUFFERS + hDirAC->firstrun_sector_params = 0; +#else + firstrun_sector_params = 0; +#endif + + return; +} + + /*-----------------------------------------------------------------------* * Local functions *-----------------------------------------------------------------------*/ @@ -796,7 +1186,7 @@ void deindex_spherical_component( * deindex the spherical index for more than 2 bits for the spherical grid *----------------------------------------------------------------------*/ -/* !r: decoded elevation index */ +/*! r: decoded elevation index */ static uint16_t deindex_sph_idx_general( const int16_t idx_sph, /* i : spherical index */ const int16_t no_bits, /* i : number of bits in the spherical grid*/ diff --git a/lib_com/ivas_error.h b/lib_com/ivas_error.h index 9438ad44a1d309ca433de3e9a420f441e2245dad..b50d8a679cb93ce29dcde823480af5f199d72c1d 100644 --- a/lib_com/ivas_error.h +++ b/lib_com/ivas_error.h @@ -56,7 +56,7 @@ typedef enum IVAS_ERR_INVALID_SAMPLING_RATE, IVAS_ERR_NOT_CONFIGURED, IVAS_ERR_INVALID_STEREO_MODE, - IVAS_ERR_INVALID_CICP_INDEX, + IVAS_ERR_INVALID_CICP_INDEX, /* ToDo: rename, CICP not used in IVAS anymore */ IVAS_ERR_INVALID_BITRATE, IVAS_ERR_INVALID_MASA_CONFIG, IVAS_ERR_TOO_MANY_INPUTS, @@ -72,21 +72,22 @@ typedef enum IVAS_ERR_INVALID_SPAR_CONFIG, IVAS_ERR_WRONG_PARAMS, IVAS_ERR_INIT_ERROR, - IVAS_ERR_DECODER_ERROR, IVAS_ERR_WRONG_MODE, IVAS_ERR_INVALID_OUTPUT_FORMAT, IVAS_ERR_HEAD_ROTATION_NOT_SUPPORTED, IVAS_ERR_INVALID_HRTF, IVAS_ERR_INVALID_INPUT_FORMAT, - IVAS_ERR_INVALID_INDEX, + IVAS_ERR_INVALID_INDEX, /* ToDo: should be merged with IVAS_ERR_INDEX_OUT_OF_BOUNDS */ 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 VARIABLE_SPEED_DECODING + IVAS_ERR_VS_FRAME_NEEDED, +#endif #ifdef DEBUGGING IVAS_ERR_INVALID_FORCE_MODE, #ifdef DEBUG_AGC_ENCODER_CMD_OPTION @@ -128,7 +129,7 @@ typedef enum * renderer (lib_rend only) * *----------------------------------------*/ - IVAS_ERR_NUM_CHANNELS_UNKNOWN, + IVAS_ERR_NUM_CHANNELS_UNKNOWN = 0x6000, IVAS_ERR_INVALID_CUSTOM_LS_LAYOUT, IVAS_ERR_INVALID_INPUT_ID, IVAS_ERR_WRONG_NUM_CHANNELS, @@ -179,6 +180,64 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) return "Parse error"; case IVAS_ERR_END_OF_FILE: return "End of file"; + case IVAS_ERR_WRONG_PARAMS: + return "Wrong function parameters"; + case IVAS_ERR_INVALID_BANDWIDTH: + return "Invalid bandwidth"; + case IVAS_ERR_INVALID_DTX_UPDATE_RATE: + return "Invalid DTX update rate"; + case IVAS_ERR_NOT_CONFIGURED: + return "Handle has not been configured"; + case IVAS_ERR_INVALID_STEREO_MODE: + return "Invalid stereo mode"; + case IVAS_ERR_INVALID_CICP_INDEX: + return "Invalid speaker layout"; + case IVAS_ERR_INVALID_BITRATE: + return "Invalid bitrate"; + case IVAS_ERR_INVALID_MASA_CONFIG: + return "Invalid MASA config"; + case IVAS_ERR_TOO_MANY_INPUTS: + return "Too many object inputs provided"; + case IVAS_ERR_INDEX_OUT_OF_BOUNDS: + return "Index out of bounds"; + case IVAS_ERR_RECONFIGURE_NOT_SUPPORTED: + return "Reconfigure not supported"; + case IVAS_ERR_INVALID_FEC_OFFSET: + return "Invalid FEC offset"; + case IVAS_ERR_INVALID_INPUT_BUFFER_SIZE: + return "Invalid input buffer size"; + case IVAS_ERR_DTX_NOT_SUPPORTED: + return "DTX is not supported in this IVAS format and element mode"; + case IVAS_ERR_UNEXPECTED_NULL_POINTER: + return "Unexpected NULL pointer"; + case IVAS_ERR_METADATA_NOT_EXPECTED: + return "Metadata input not expected for current configuration"; +#ifdef DEBUGGING + case IVAS_ERR_INVALID_FORCE_MODE: + return "Invalid force mode"; +#endif + case IVAS_ERR_NOT_IMPLEMENTED: + return "Not implemented"; + case IVAS_ERR_ISM_FILE_READER_INVALID_METADATA_FORMAT: + return "Invalid metadata file format"; + case IVAS_ERR_ISM_INVALID_METADATA_VALUE: + return "Invalid metadata value provided"; + case IVAS_ERR_NOT_SUPPORTED_OPTION: + return "Option not supported in this set-up"; + case IVAS_ERR_INIT_ERROR: + return "Initialization error"; + case IVAS_ERR_INVALID_BITSTREAM: + return "Invalid bitstream"; + case IVAS_ERR_WRONG_MODE: + return "Wrong mode"; + case IVAS_ERR_HEAD_ROTATION_NOT_SUPPORTED: + return "Head rotation not supported"; + case IVAS_ERR_INVALID_HRTF: + return "Unsupported HRTF filter set"; + case IVAS_ERR_INVALID_INPUT_FORMAT: + return "Invalid format of input bitstream"; + case IVAS_ERR_INVALID_INDEX: + return "Invalid index"; default: break; } diff --git a/lib_com/ivas_error_utils.h b/lib_com/ivas_error_utils.h index 034369656bc8e54c703e986e3479a514eafa1c2b..b9a6b3f872443e35368c4d802054d6f47eaafc42 100644 --- a/lib_com/ivas_error_utils.h +++ b/lib_com/ivas_error_utils.h @@ -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 3e0d68049a882a32013c749048d986c11953b09f..3d0b6255c9395ad982f29f39228f60e098c2f90d 100644 --- a/lib_com/ivas_fb_mixer.c +++ b/lib_com/ivas_fb_mixer.c @@ -99,13 +99,15 @@ static int16_t ivas_get_num_bands( *---------------------------------------------------------------------*/ ivas_error ivas_fb_set_cfg( - IVAS_FB_CFG **pFb_cfg_out, /* o : FB config. handle */ - const int16_t ivas_format, /* i : IVAS format */ - const SBA_MODE sba_mode, /* i : SBA mode */ - const int16_t num_in_chans, /* i : number of FB input channels */ - const int16_t num_out_chans, /* i : number of FB output channels*/ - const int16_t active_w_mixing, /* i : active_w_mixing flag */ - const int32_t sampling_rate /* i : sampling rate */ + IVAS_FB_CFG **pFb_cfg_out, /* o : FB config. handle */ + const int16_t ivas_format, /* i : IVAS format */ + const SBA_MODE sba_mode, /* i : SBA mode */ + const int16_t num_in_chans, /* i : number of FB input channels */ + const int16_t num_out_chans, /* i : number of FB output channels */ + const int16_t active_w_mixing, /* i : active_w_mixing flag */ + const int32_t sampling_rate /* i : sampling rate */ + , + const int16_t nchan_fb_in /* i : number of dirAC analysis channels*/ ) { IVAS_FB_CFG *pFb_cfg; @@ -117,6 +119,7 @@ ivas_error ivas_fb_set_cfg( pFb_cfg->num_in_chans = num_in_chans; pFb_cfg->num_out_chans = num_out_chans; + pFb_cfg->nchan_fb_in = nchan_fb_in; pFb_cfg->pcm_offset = 0; /* note: in SPAR decoder, this parameter is overwritten later */ pFb_cfg->active_w_mixing = active_w_mixing; @@ -156,7 +159,7 @@ 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 ); - pFb_cfg->prior_input_length = NS2SA( sampling_rate, DELAY_DIRAC_ENC_CMP_NS ) + 3 * NS2SA( sampling_rate, PARAM_MC_SLOT_ENC_NS ); + pFb_cfg->prior_input_length = NS2SA( sampling_rate, DELAY_DIRAC_ENC_CMP_NS ) + NS2SA( sampling_rate, PARAM_MC_SLOT_ENC_NS ); } *pFb_cfg_out = pFb_cfg; @@ -215,11 +218,11 @@ ivas_error ivas_FB_mixer_open( } else if ( fb_cfg->active_w_mixing ) { - num_chs_alloc = fb_cfg->num_in_chans; + num_chs_alloc = max( fb_cfg->num_in_chans, fb_cfg->nchan_fb_in ); } else { - num_chs_alloc = fb_cfg->num_out_chans; + num_chs_alloc = 1; /* only W channel processed for predicting YZX */ } for ( i = 0; i < num_chs_alloc; i++ ) @@ -251,7 +254,7 @@ ivas_error ivas_FB_mixer_open( } else { - num_chs_alloc = fb_cfg->num_in_chans; + num_chs_alloc = max( fb_cfg->num_in_chans, fb_cfg->nchan_fb_in ); } for ( i = 0; i < num_chs_alloc; i++ ) @@ -266,8 +269,7 @@ ivas_error ivas_FB_mixer_open( if ( ( fb_cfg->active_w_mixing != -1 ) && ( fb_cfg->num_out_chans > 0 ) ) { float *pTemp_mem; - - if ( ( pTemp_mem = (float *) 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 * max( fb_cfg->num_in_chans, fb_cfg->nchan_fb_in ) * IVAS_MAX_NUM_BANDS ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer" ); } @@ -378,11 +380,11 @@ void ivas_FB_mixer_close( } else if ( fb_cfg->active_w_mixing ) { - num_chs_alloc = fb_cfg->num_in_chans; + num_chs_alloc = max( fb_cfg->num_in_chans, fb_cfg->nchan_fb_in ); } else { - num_chs_alloc = fb_cfg->num_out_chans; + num_chs_alloc = 1; /* only W channel processed for predicting YZX */ } if ( hFbMixer != NULL ) @@ -407,8 +409,10 @@ void ivas_FB_mixer_close( } else { - num_chs_alloc = fb_cfg->num_in_chans; + num_chs_alloc = max( fb_cfg->num_in_chans, fb_cfg->nchan_fb_in ); } + + for ( i = 0; i < num_chs_alloc; i++ ) { free( hFbMixer->ppFilterbank_prior_input[i] ); @@ -486,7 +490,8 @@ void ivas_fb_mixer_pcm_ingest( float pcm_in[][L_FRAME48k], /* i : input audio channels */ float **ppOut_pcm, /* o : output audio channels */ const int16_t frame_len /* i : frame length */ -) + , + const int16_t HOA_md_ind[IVAS_SPAR_MAX_CH] ) { int16_t i; int16_t num_chs_ingest; @@ -498,13 +503,13 @@ void ivas_fb_mixer_pcm_ingest( } else { - num_chs_ingest = fb_cfg->num_out_chans; + num_chs_ingest = 1; /* forward Filterbank MDFT only on W */ } for ( i = 0; i < fb_cfg->num_in_chans; i++ ) { mvr2r( &hFbMixer->ppFilterbank_prior_input[i][fb_cfg->prior_input_length - frame_len], ppOut_pcm[i], frame_len ); - mvr2r( pcm_in[i], &ppOut_pcm[i][frame_len], frame_len ); + mvr2r( pcm_in[HOA_md_ind[i]], &ppOut_pcm[i][frame_len], frame_len ); } for ( i = 0; i < num_chs_ingest; i++ ) @@ -523,14 +528,18 @@ void ivas_fb_mixer_pcm_ingest( *-----------------------------------------------------------------------------------------*/ void ivas_fb_mixer_update_prior_input( - IVAS_FB_MIXER_HANDLE hFbMixer, /* i/o: FB mixer handle */ - float *pcm_in[], /* i : input audio channels */ - const int16_t length /* i : length of time slot */ + IVAS_FB_MIXER_HANDLE hFbMixer, /* i/o: FB mixer handle */ + float *pcm_in[], /* i : input audio channels */ + const int16_t length /* i : length of time slot */ + , + const int16_t nchan_fb_in /* i : number of analysis channels */ ) { int16_t i; - for ( i = 0; i < hFbMixer->fb_cfg->num_in_chans; i++ ) + for ( i = 0; i < + nchan_fb_in; + i++ ) { mvr2r( &hFbMixer->ppFilterbank_prior_input[i][length], hFbMixer->ppFilterbank_prior_input[i], hFbMixer->fb_cfg->prior_input_length - length ); mvr2r( pcm_in[i], &hFbMixer->ppFilterbank_prior_input[i][hFbMixer->fb_cfg->prior_input_length - length], length ); @@ -553,6 +562,8 @@ void ivas_fb_mixer_get_windowed_fr( float *frame_f_imag[], /* o : imag freq domain values */ const int16_t length, /* i : number of new samples in time slot */ const int16_t mdft_len /* i : MDFT frame length */ + , + const int16_t nchan_fb_in /* i : number of analysis channels */ ) { int16_t ch_idx, j, offset, rev_offset; @@ -567,7 +578,9 @@ void ivas_fb_mixer_get_windowed_fr( rev_offset = (int16_t) ( 2 * mdft_len - hFbMixer->ana_window_offset ); set_zero( fr_in_block, offset ); - for ( ch_idx = 0; ch_idx < hFbMixer->fb_cfg->num_in_chans; ch_idx++ ) + for ( ch_idx = 0; ch_idx < + nchan_fb_in; + ch_idx++ ) { mvr2r( &hFbMixer->ppFilterbank_prior_input[ch_idx][offset + hFbMixer->fb_cfg->windowed_fr_offset], &fr_in_block[offset], n_old_samples - offset ); mvr2r( pcm_in[ch_idx], &fr_in_block[n_old_samples], n_new_samples ); @@ -692,6 +705,7 @@ void ivas_fb_mixer_process( { int16_t start_offset = pFb->fb_consts.pFilterbank_bins_start_offset[i]; int16_t num_bins = pFb->fb_consts.pFilterbank_bins_per_band[i]; + float mixer_const = hFbMixer->prior_mixer[ch][j][i]; pFilterbank_bin_to_band_re = pFb->fb_consts.ppFilterbank_FRs[0][i]; @@ -764,7 +778,6 @@ void ivas_fb_mixer_get_in_out_mapping( for ( i = 1; i < fb_cfg->num_out_chans; i++ ) { in_out_mixer_map[i][0] = 1; - in_out_mixer_map[i][order[i]] = 1; } } } diff --git a/lib_com/ivas_ism_com.c b/lib_com/ivas_ism_com.c index 297e2cfb45b3724438270d7fcf69bb85f52cb77b..a28fb77d20ed6fa9c379ac903dca440a83a46a23 100644 --- a/lib_com/ivas_ism_com.c +++ b/lib_com/ivas_ism_com.c @@ -88,15 +88,16 @@ static void bitbudget_to_brate( *-------------------------------------------------------------------*/ ivas_error ivas_ism_config( - 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 */ + 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 ism_extended_metadata_flag, /* i : extended metadata flag */ + 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; @@ -135,6 +136,11 @@ ivas_error ivas_ism_config( if ( ism_total_brate >= ISM_EXTENDED_METADATA_BRATE ) { nb_bits_metadata[0] += ISM_EXTENDED_METADATA_BITS; + + if ( ism_extended_metadata_flag ) + { + nb_bits_metadata[0] += ISM_METADATA_IS_NDP_BITS; + } } nb_bits_metadata[0] += n_ISms * ISM_METADATA_FLAG_BITS + nchan_ism; @@ -337,6 +343,8 @@ void ivas_ism_reset_metadata( hIsmMeta->yaw = 0.0f; hIsmMeta->pitch = 0.0f; hIsmMeta->radius = 1.0f; + hIsmMeta->ism_metadata_flag = 0; + hIsmMeta->non_diegetic_flag = 0; return; } @@ -352,7 +360,6 @@ void ivas_ism_reset_metadata_API( ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle */ ) { - hIsmMeta->ism_metadata_flag = 0; ivas_ism_reset_metadata( hIsmMeta ); return; @@ -454,23 +461,13 @@ float ism_dequant_meta( * ---------------------------------------------------------------*/ void ivas_param_ism_config( - PARAM_ISM_CONFIG_HANDLE hParamIsm /* i/o: IVAS Param ISM Config Structure */ -#ifdef NCHAN_ISM_PARAMETER - , - const int16_t nchan_obj /* i : number of ISM channels */ -#endif + PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i/o: IVAS Param ISM Config Structure */ + const int16_t nchan_obj /* i : number of ISM channels */ ) { -#ifdef NCHAN_ISM_PARAMETER int16_t i; hParamIsm->nbands = MAX_PARAM_ISM_NBANDS; -#else - int16_t i, num_obj; - - hParamIsm->nbands = MAX_PARAM_ISM_NBANDS; - num_obj = hParamIsm->num_obj; -#endif for ( i = 0; i < hParamIsm->nbands; i++ ) { @@ -478,11 +475,7 @@ void ivas_param_ism_config( } /* for elevation zero compute the max azi quantization indices */ -#ifdef NCHAN_ISM_PARAMETER for ( i = 0; i < nchan_obj; i++ ) -#else - for ( i = 0; i < num_obj; i++ ) -#endif { hParamIsm->last_az_diff[i] = 0; hParamIsm->last_az_sgn[i] = 1; @@ -551,7 +544,6 @@ void ivas_ism_metadata_close( } -#ifdef DISCRETE_ISM_DTX_CNG /*-------------------------------------------------------------------* * update_last_metadata() * @@ -613,4 +605,3 @@ void ivas_get_ism_sid_quan_bitbudget( return; } -#endif diff --git a/lib_com/ivas_masa_com.c b/lib_com/ivas_masa_com.c index 3a53b2c682446dd6d53e9b05cc8c16e24d7f0fc3..22caa5d2cf177e64ef47ef671831b4e9b32bb657 100644 --- a/lib_com/ivas_masa_com.c +++ b/lib_com/ivas_masa_com.c @@ -49,7 +49,20 @@ *---------------------------------------------------------------*/ #define MASA_EXTRA_BAND_META_BITS 40 -#define MASA_SMALL_INC_META_BITS 10 + +#define MASA_SMALL_INC_META_BITS 10 + + +#ifdef HR_METADATA +/*--------------------------------------------------------------- + * Local prototypes + *---------------------------------------------------------------*/ + +static int16_t quantize_theta_masa( float x, const int16_t no_cb, float *xhat ); + +static int16_t quantize_phi_masa( float phi, const int16_t flag_delta, float *phi_hat, const int16_t n ); + +#endif /*--------------------------------------------------------------- @@ -313,22 +326,31 @@ void masa_sample_rate_band_correction( MASA_CODEC_CONFIG *config, /* i/o: MASA codec config */ 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 */ -#ifdef FIX_350_MASA_DELAY_COMP - , - MASA_DECODER_EXT_OUT_META_HANDLE hExtOutMeta /* i/o: MASA decoder metadata ext out buffer */ +#ifdef FIX_HBR_MASAMETA + const uint8_t maxBand, /* i : max band */ + uint8_t is_encoder, /* i: signals if called at encoder */ +#else + const int32_t sampling_rate, /* i : Sampling rate */ #endif + MASA_DECODER_EXT_OUT_META_HANDLE hExtOutMeta /* i/o: MASA decoder metadata ext out buffer */ ) { uint8_t band, sf; +#ifdef FIX_HBR_MASAMETA + int16_t highBand; +#else int16_t maxBin, highBand, maxBand; +#endif uint8_t numBands48k; +#ifndef FIX_HBR_MASAMETA if ( sampling_rate == 48000 ) { return; } +#endif +#ifndef FIX_HBR_MASAMETA /* Find maximum band usable at this sample rate */ maxBin = (int16_t) ( CLDFB_NO_CHANNELS_MAX * sampling_rate / 48000 ); maxBand = 0; @@ -337,7 +359,7 @@ void masa_sample_rate_band_correction( maxBand++; } maxBand--; - +#endif numBands48k = config->numCodingBands; for ( band = 1; band < config->numCodingBands + 1; band++ ) @@ -348,6 +370,19 @@ void masa_sample_rate_band_correction( { config->numCodingBands = band; hQMetaData->numCodingBands = band; +#ifdef FIX_HBR_MASAMETA + if ( is_encoder ) + { + if ( hQMetaData->q_direction->cfg.nbands > band ) + { + hQMetaData->q_direction->cfg.nbands = band; + } + if ( hQMetaData->no_directions == 2 && hQMetaData->q_direction[1].cfg.nbands > band ) + { + hQMetaData->q_direction[1].cfg.nbands = band; + } + } +#endif band_mapping[band] = maxBand; break; } @@ -390,13 +425,16 @@ void masa_sample_rate_band_correction( hQMetaData->twoDirBands[band] = 0; } } -#ifdef FIX_350_MASA_DELAY_COMP if ( hExtOutMeta != NULL ) { /* in decoder, zero the EXT out MASA meta buffer */ for ( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ ) { +#ifdef FIX_HBR_MASAMETA + for ( band = hQMetaData->numCodingBands; band < MASA_FREQUENCY_BANDS; band++ ) +#else for ( band = config->numCodingBands; band < MASA_FREQUENCY_BANDS; band++ ) +#endif { hExtOutMeta->directionIndex[0][sf][band] = SPH_IDX_FRONT; hExtOutMeta->directToTotalRatio[0][sf][band] = 0u; @@ -411,7 +449,358 @@ void masa_sample_rate_band_correction( } } } -#endif return; } + + +#ifdef HR_METADATA +/*------------------------------------------------------------------------- + * index_theta_phi_16() + * + * + *------------------------------------------------------------------------*/ + +/*! r: output index for direction */ +uint16_t index_theta_phi_16( + float *p_theta, /* i/o: input elevation to be indexed */ + float *p_phi, /* i/o: input azimuth to be indexed */ + const SPHERICAL_GRID_DATA *gridData /* i : generated grid data */ +) +{ + float abs_theta; + int16_t sign_th, id_phi, id_th; + uint16_t idx_sph; + uint16_t cum_n; + float theta_hat, phi_hat; + float theta, phi; + + theta = *p_theta; + phi = *p_phi; + phi_hat = 0; + theta_hat = 0; + phi = phi + 180; + + if ( theta < 0 ) + { + abs_theta = -theta; + sign_th = -1; + } + else + { + abs_theta = theta; + sign_th = 1; + } + + id_th = quantize_theta_masa( abs_theta, gridData->no_theta, &theta_hat ); + if ( gridData->no_theta > 1 ) + { + if ( gridData->no_phi[id_th] > 1 ) + { + id_phi = quantize_phi_masa( phi, ( id_th % 2 == 1 ), &phi_hat, gridData->no_phi[id_th] ); + } + else + { + id_phi = 0; + phi_hat = 180; + } + } + else + { + id_phi = quantize_phi_masa( phi, ( id_th % 2 == 1 ), &phi_hat, gridData->no_phi[id_th] ); + } + *p_theta = sign_th * theta_hat; + *p_phi = phi_hat - 180; + + /* Starting from Equator, alternating positive and negative */ + if ( id_th == 0 ) + { + idx_sph = id_phi; + } + else + { + if ( id_th == gridData->no_theta - 1 ) + { + idx_sph = 65534 + ( sign_th < 0 ); + } + else + { + theta = MASA_ANGLE_AT_EQUATOR * (float) ( id_th + 0.5f ); + if ( id_th == 1 ) + { + cum_n = 2 * (uint16_t) ceilf( MASA_NTOT2_FAC * ( sinf( theta ) - MASA_ASIN_OFFSET ) ); + } + else + { + cum_n = 2 * (uint16_t) roundf( MASA_NTOT2_FAC * ( sinf( theta ) - MASA_ASIN_OFFSET ) ); + } + + cum_n += gridData->no_phi[0]; + + if ( sign_th > 0 ) + { + cum_n -= 2 * gridData->no_phi[id_th]; + } + else + { + cum_n -= gridData->no_phi[id_th]; + } + idx_sph = cum_n + id_phi; + } + } + + return idx_sph; +} + + +/*------------------------------------------------------------------------- + * quantize_phi_masa() + * + * + *------------------------------------------------------------------------*/ + +/*! r: output index */ +static int16_t quantize_theta_masa( + float x, /* i : theta value to be quantized */ + const int16_t no_cb, /* i : number of codewords */ + float *xhat /* o : quantized value */ +) +{ + int16_t imin; + float diff1, diff2; + + imin = (int16_t) ( x * MASA_INV_ANGLE_AT_EQUATOR_DEG + 0.5f ); + + if ( imin >= no_cb - 1 ) + { + imin = no_cb - 1; + diff1 = x - 90; + diff2 = x - MASA_ANGLE_AT_EQUATOR_DEG * ( imin - 1 ); + if ( fabsf( diff1 ) > fabsf( diff2 ) ) + { + imin--; + *xhat = imin * MASA_ANGLE_AT_EQUATOR_DEG; + } + else + { + *xhat = 90; + } + } + else + { + *xhat = imin * MASA_ANGLE_AT_EQUATOR_DEG; + } + + return imin; +} + + +/*------------------------------------------------------------------------- + * quantize_phi_masa() + * + * + *------------------------------------------------------------------------*/ + +/*! r: index azimuth */ +static int16_t quantize_phi_masa( + float phi, /* i : azimuth value */ + const int16_t flag_delta, /* i : flag indicating if the azimuth codebook is translated or not */ + float *phi_hat, /* o : quantized azimuth */ + const int16_t n /* i : azimuth codebook size */ +) +{ + int16_t id_phi; + float dd; + float delta_phi; + + delta_phi = 360.0f / (float) n; + + if ( n == 1 ) + { + *phi_hat = 0; + + return 0; + } + + if ( flag_delta == 1 ) + { + dd = delta_phi / 2.0f; + } + else + { + dd = 0; + } + + id_phi = (int16_t) ( ( phi - dd + delta_phi / 2.0f ) / (float) delta_phi ); + + if ( id_phi == n ) + { + id_phi = 0; + } + + if ( id_phi == -1 ) + { + id_phi = n - 1; + } + + *phi_hat = id_phi * delta_phi + dd; + + return id_phi; +} + + +/*------------------------------------------------------------------------- + * deindex_sph_idx() + * + * deindex the MASA metadata from the input metadata file + *------------------------------------------------------------------------*/ + +void deindex_sph_idx( + const uint16_t sphIndex, /* i : Spherical index */ + const SPHERICAL_GRID_DATA *gridData, /* i : Prepared spherical grid */ + float *theta, /* o : Elevation */ + float *phi /* o : Azimuth */ +) +{ + float ba_crt, del_crt, div_crt, a4_crt; + float estim; + int32_t base_low, base_up; + int16_t n_crt; + int16_t id_th; + int16_t sign_theta; + int16_t id_phi; + int16_t no_th = gridData->no_theta; + const int16_t *n = gridData->no_phi; + const float ba[3] = { + 2.137991118026424e+02f, + 1.244854404591542e+02f, + 1.228408647140870e+02f, + }; + const float del[3] = { 7.998262115303199e+05f, 1.300883976959332e+06f, 1.424072242426373e+06f }; + const float div[3] = { -0.237662341081474f, -0.100938185496887f, -0.092050209205032f }; + const float a4[3] = { -8.415300425381099f, -19.814106922515204f, -21.727272727270197f }; + const uint16_t limit_index1 = 64964, limit_index2 = 47870; + + if ( sphIndex >= limit_index1 ) + { + ba_crt = ba[2]; + div_crt = div[2]; + a4_crt = a4[2]; + del_crt = del[2]; + } + else if ( sphIndex >= limit_index2 ) + { + ba_crt = ba[1]; + div_crt = div[1]; + a4_crt = a4[1]; + del_crt = del[1]; + } + else + { + ba_crt = ba[0]; + div_crt = div[0]; + a4_crt = a4[0]; + del_crt = del[0]; + } + estim = ba_crt + div_crt * sqrtf( del_crt + a4_crt * sphIndex ); + + if ( estim > MASA_NO_CIRCLES ) + { + estim = MASA_NO_CIRCLES; + } + + assert( estim > 0 ); + id_th = (int16_t) roundf( estim ) - 1; + if ( id_th < 0 ) + { + id_th = 0; + } + + if ( id_th == 0 ) + { + base_low = 0; + base_up = n[0]; + } + else + { + estim = MASA_ANGLE_AT_EQUATOR * (float) ( id_th - 0.5f ); + base_low = n[0]; + if ( id_th >= 2 ) + { + if ( id_th == 2 ) + { + base_low += 2 * (int16_t) ceilf( MASA_NTOT2_FAC * ( sinf( estim ) - MASA_ASIN_OFFSET ) ); + } + else + { + base_low += 2 * (int16_t) roundf( MASA_NTOT2_FAC * ( sinf( estim ) - MASA_ASIN_OFFSET ) ); + } + } + base_up = base_low + 2 * n[id_th]; + } + + sign_theta = 1; + + n_crt = n[id_th]; + if ( sphIndex < base_low ) + { + id_th--; + n_crt = n[id_th]; + if ( id_th == 0 ) + { + base_low = 0; + base_up = n_crt; + } + else + { + base_up = base_low; + base_low -= 2 * n[id_th]; + } + assert( sphIndex >= base_low ); + } + else if ( sphIndex >= base_up ) + { + id_th++; + n_crt = n[id_th]; + base_low = base_up; + base_up += 2 * n_crt; + assert( sphIndex < base_up ); + } + + id_phi = (int16_t) ( sphIndex - base_low ); + if ( sphIndex - base_low >= n_crt ) + { + id_phi -= n_crt; + sign_theta = -1; + } + + if ( id_th == 0 ) + { + *theta = 0.f; + *phi = (float) sphIndex * 360 / (float) n_crt - 180; + } + else + { + if ( id_th == no_th - 1 ) + { + id_phi = 0; + *phi = -180; + *theta = 90 * (float) sign_theta; + } + else + { + *theta = id_th * MASA_ANGLE_AT_EQUATOR_DEG * (float) sign_theta; + if ( id_th % 2 == 0 ) + { + *phi = (float) id_phi * 360 / (float) n_crt - 180; + } + else + { + *phi = ( (float) id_phi + 0.5f ) * 360 / (float) n_crt - 180; + } + } + } + + return; +} +#endif diff --git a/lib_com/ivas_mc_com.c b/lib_com/ivas_mc_com.c index 027b68768668a713263e85509179d2a48df6ff0a..0001f39704e1eaebe67b02524461d5a2284b832f 100644 --- a/lib_com/ivas_mc_com.c +++ b/lib_com/ivas_mc_com.c @@ -103,10 +103,14 @@ MC_MODE ivas_mc_mode_select( { mc_mode = MC_MODE_MCMASA; } - else if ( total_brate < IVAS_192k ) + else if ( total_brate < IVAS_160k ) { mc_mode = MC_MODE_PARAMMC; } + else if ( total_brate < IVAS_192k ) + { + mc_mode = MC_MODE_PARAMUPMIX; + } break; default: assert( 0 && "LS Setup not supported or defined for MC mode!\n" ); diff --git a/lib_com/ivas_mct_com.c b/lib_com/ivas_mct_com.c index 5a6eafed5be5d31471155dbc1311509a506c7a51..97c5f5dd8c982fda7ff0b57fc6507869fb957d94 100644 --- a/lib_com/ivas_mct_com.c +++ b/lib_com/ivas_mct_com.c @@ -66,13 +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]; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - int16_t num_lfe; - int16_t lfe_channel; - - num_lfe = 0; - lfe_channel = -1; -#endif min_bits_tot = 0; for ( i = 0; i < nchan; i++ ) @@ -87,22 +80,11 @@ void splitAvailableBitsMCT( mct_chan_mode[i] = ( (Decoder_State *) sts[i] )->mct_chan_mode; core[i] = ( (Decoder_State *) sts[i] )->core; } -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( mct_chan_mode[i] == MCT_CHAN_MODE_LFE ) - { - num_lfe++; - lfe_channel = i; - assert( lfe_channel == LFE_CHANNEL ); - } -#endif } for ( i = 0; i < nchan; i++ ) { if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - mct_chan_mode[i] != MCT_CHAN_MODE_LFE && -#endif mct_chan_mode[i] != MCT_CHAN_MODE_IGNORE ) { min_chan_bits[i] = 0; @@ -136,9 +118,6 @@ void splitAvailableBitsMCT( } if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - mct_chan_mode[i] != MCT_CHAN_MODE_LFE && -#endif mct_chan_mode[i] != MCT_CHAN_MODE_IGNORE ) { assert( split_ratio[i] >= 1 && split_ratio[i] < BITRATE_MCT_RATIO_RANGE ); @@ -174,9 +153,6 @@ void splitAvailableBitsMCT( } if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - mct_chan_mode[i] != MCT_CHAN_MODE_LFE && -#endif mct_chan_mode[i] != MCT_CHAN_MODE_IGNORE ) { *bits_frame_channel -= diff * split_ratio[i] / BITRATE_MCT_RATIO_RANGE; diff --git a/lib_com/ivas_mdft_imdft.c b/lib_com/ivas_mdft_imdft.c index e6f276575e1bc9672abd30b6be0c414e2bd9498d..ad9d19a9107824ed92f8da3e6d5f965b34464bda 100644 --- a/lib_com/ivas_mdft_imdft.c +++ b/lib_com/ivas_mdft_imdft.c @@ -82,6 +82,9 @@ static void ivas_get_mdft_twid_factors( case IVAS_160_PT_LEN: *ppTwid = &ivas_mdft_coeff_cos_twid_160[0]; break; + case IVAS_120_PT_LEN: + *ppTwid = &ivas_mdft_coeff_cos_twid_120[0]; + break; case IVAS_80_PT_LEN: *ppTwid = &ivas_mdft_coeff_cos_twid_80[0]; break; diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h old mode 100755 new mode 100644 index 2e7bc2799c5a0d968b07b5e7be44a73c78f10758..9b6871695e56d46bd1beea1d76c54e10aac37b2e --- a/lib_com/ivas_prot.h +++ b/lib_com/ivas_prot.h @@ -114,6 +114,10 @@ ivas_error ivas_spar_md_enc_init ivas_error ivas_sba_enc_reconfigure( Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */ ); +#ifdef ARITH_HUFF_CODER_CHANGES +int16_t ivas_sba_get_max_md_bits( + Encoder_Struct *st_ivas ); +#endif void destroy_sce_enc( SCE_ENC_HANDLE hSCE /* i/o: SCE encoder structure */ @@ -251,20 +255,35 @@ ivas_error ivas_compute_core_buffers( /*! r: number of clipped samples */ uint32_t ivas_syn_output( - float synth[][L_FRAME48k], /* i/o: float synthesis signal */ +#ifdef JBM_TSM_ON_TCS + float *synth[], /* i/o: float synthesis signal */ +#else + float synth[][L_FRAME48k], /* i/o: float synthesis signal */ +#endif const int16_t output_frame, /* i : output frame length (one channel) */ const int16_t n_channels, /* i : number of output channels */ int16_t *synth_out /* o : integer 16 bits synthesis signal */ ); +#ifdef JBM_TSM_ON_TCS +void ivas_syn_output_f( + float *synth[], /* i/o: float synthesis signal */ + const int16_t output_frame, /* i : output frame length (one channel) */ + const int16_t n_channels, /* i : number of output channels */ + float *synth_out /* o : integer 16 bits synthesis signal */ + ); +#endif + void ivas_initialize_handles_enc( Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */ ); ivas_error ivas_init_encoder( - Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */ - Indice ind_list[][MAX_NUM_INDICES], /* i : indices list */ - Indice ind_list_metadata[][MAX_BITS_METADATA] /* i : indices list metadata */ + Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */ +#ifndef IND_LIST_DYN + ,Indice ind_list[][MAX_NUM_INDICES] /* i : indices list */ + ,Indice ind_list_metadata[][MAX_BITS_METADATA] /* i : indices list metadata */ +#endif ); void destroy_core_enc( @@ -299,6 +318,11 @@ ivas_error ivas_dec( ivas_error ivas_dec_setup( Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ + #ifdef JBM_TSM_ON_TCS + , + uint16_t *nSamplesRendered, /* o : number of samples flushed from the previous frame (JBM) */ + int16_t *data /* o : flushed PCM samples */ +#endif ); ivas_error create_sce_dec( @@ -501,9 +525,6 @@ void stereo_tcx_core_dec( STEREO_CNG_DEC_HANDLE hStereoCng, /* i : Stereo CNG handle */ const int16_t nchan_out, /* i : number of output channels */ const IVAS_FORMAT ivas_format /* i : IVAS format */ -#ifndef DISCRETE_ISM_DTX_CNG - ,const ISM_MODE ism_mode /* i : ISM mode (only needed if format is ISM) */ -#endif ); void stereo_tcx_init_dec( @@ -640,6 +661,11 @@ ivas_error ivas_mc_enc_config( ivas_error ivas_mc_dec_config( Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ const int16_t idx /* i : LS config. index */ + #ifdef JBM_TSM_ON_TCS + , + uint16_t *nSamplesRendered, /* o : samples flushed from last frame (JBM) */ + int16_t *data /* o : flushed samples (JBM) */ +#endif ); /*! r: MC format mode (MCT, McMASA, ParamMC) */ @@ -739,6 +765,104 @@ void dtx_read_padding_bits( const int16_t num_bits ); +#ifdef JBM_TSM_ON_TCS +/*----------------------------------------------------------------------------------* + * JBM prototypes + *----------------------------------------------------------------------------------*/ + +ivas_error ivas_jbm_dec_tc( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + float *data /* o : output synthesis signal */ +); + +ivas_error ivas_jbm_dec_render( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + const uint16_t nSamplesAsked, /* i : number of samples wanted */ + uint16_t *nSamplesRendered, /* o : number of samples rendered */ + uint16_t *nSamplesAvailableNext, /* o : number of samples still available in the rendering pipeline */ + int16_t *data /* o : output synthesis signal */ +); + +ivas_error ivas_jbm_dec_flush_renderer( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + const int16_t tc_granularity_new, /* i : new renderer granularity */ + const RENDERER_TYPE renderer_type_old, /* i : old renderer type */ + const AUDIO_CONFIG intern_config_old, /* i : old internal config */ + const IVAS_OUTPUT_SETUP_HANDLE hIntSetupOld, /* i : old internal output setup */ + const MC_MODE mc_mode_old, /* i : old MC mode */ + const ISM_MODE ism_mode_old, /* i : old ISM mode */ + uint16_t *nSamplesRendered, /* o : number of samples flushed */ + int16_t *data /* o : rendered samples */ +); + +ivas_error ivas_jbm_dec_feed_tc_to_renderer( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + const int16_t nSamplesForRendering, /* i: : number of TC samples available for rendering */ + int16_t *nSamplesResidual, /* o: : number of samples not fitting into the renderer grid and buffer for the next call*/ + float *data /* i/o: transport channels/output synthesis signal */ +); + +ivas_error ivas_jbm_dec_set_discard_samples( + Decoder_Struct *st_ivas /* i/o: main IVAS decoder structre */ +); + +void ivas_jbm_dec_get_adapted_linear_interpolator( + const int16_t default_interp_length, /* i : default length of the (full-frame) interpolator */ + const int16_t interp_length, /* i : length of the interpolator to be created */ + float *interpolator /* o : the interpolator */ +); + +void ivas_jbm_dec_get_adapted_subframes( + const int16_t nCldfbTs, /* i : number of time slots in the current frame */ + int16_t *subframe_nbslots, /* i/o: subframe grid */ + int16_t *nb_subframes /* i/o: number of subframes in the frame */ +); + +void ivas_jbm_dec_get_md_map( + const int16_t default_len, /* i : default frame length in metadata slots */ + const int16_t len, /* i : length of the modfied frames in metadata slots */ + const int16_t subframe_len, /* i : default length of a subframe */ + const int16_t offset, /* i : current read offset into the md buffer */ + const int16_t buf_len, /* i : length of the metadata buffer */ + int16_t *map /* o : metadata index map */ +); + +int16_t ivas_jbm_dec_get_num_tc_channels( Decoder_Struct *st_ivas ); /* i : IVAS decoder handle */ + +TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode( + Decoder_Struct *st_ivas /* i : IVAS decoder handle */ +); + +int16_t ivas_jbm_dec_get_render_granularity( /* o : render granularity */ + const RENDERER_TYPE rendererType, /* i : renderer type */ + const int32_t output_Fs /* i : sampling rate */ +); + +ivas_error ivas_jbm_dec_tc_buffer_open( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + const TC_BUFFER_MODE tc_buffer_mode, /* i : buffer mode */ + const int16_t nchan_transport_jbm, /* i : number of real transport channels */ + const int16_t nchan_transport_internal, /* i : number of totally buffered channels */ + const int16_t nchan_full, /* i : nubmer of channels to fully store */ + const int16_t n_samples_granularity /* i : granularity of the renderer/buffer */ +); + +ivas_error ivas_jbm_dec_tc_buffer_reconfigure( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + const TC_BUFFER_MODE tc_buffer_mode, /* i : new buffer mode */ + const int16_t nchan_transport_jbm, /* i : new number of real transport channels */ + const int16_t nchan_transport_internal, /* i : new number of totally buffered channels */ + const int16_t nchan_full, /* i : new number of channels to fully store */ + const int16_t n_samples_granularity /* i : new granularity of the renderer/buffer */ +); + +void ivas_jbm_dec_tc_buffer_close( + DECODER_TC_BUFFER_HANDLE *phTcBuffer /* i/o: TC buffer handle */ +); +void ivas_jbm_dec_td_renderers_adapt_subframes( + Decoder_Struct *st_ivas +); +#endif /*----------------------------------------------------------------------------------* * ISM prototypes @@ -749,6 +873,7 @@ ivas_error ivas_ism_config( 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 ism_extended_metadata_flag, /* i : extended metadata flag */ 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 */ @@ -789,7 +914,8 @@ ivas_error ivas_set_ism_metadata( const float elevation, /* i : elevation value */ const float radius_meta, /* i : radius */ const float yaw, /* i : yaw */ - const float pitch /* i : pitch */ + const float pitch, /* i : pitch */ + const int16_t non_diegetic_flag /* i : non-diegetic object flag */ ); ivas_error ivas_ism_metadata_enc_create( @@ -813,9 +939,7 @@ ivas_error ivas_ism_enc( ivas_error ivas_ism_metadata_enc( const int32_t ism_total_brate, /* i : ISM total bitrate */ -#ifdef NCHAN_ISM_PARAMETER const int16_t nchan_ism, /* i : number of ISM channels */ -#endif 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 */ @@ -829,25 +953,17 @@ ivas_error ivas_ism_metadata_enc( ivas_error ivas_ism_metadata_dec( const int32_t ism_total_brate, /* i : ISM total bitrate */ -#ifdef NCHAN_ISM_PARAMETER const int16_t nchan_ism, /* i : number of ISM channels */ -#endif 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 */ -#ifdef DISCRETE_ISM_DTX_CNG ISM_DTX_DATA_DEC hISMDTX, /* i/o: ISM DTX structure */ -#endif -#ifdef FIX_379_EXT_METADATA 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 */ -#else - const PARAM_ISM_CONFIG_HANDLE hParamIsm /* i : Param ISM Config Handle */ -#endif ); @@ -888,10 +1004,8 @@ void ivas_param_ism_stereo_dmx( void ivas_param_ism_config( PARAM_ISM_CONFIG_HANDLE hParamIsm /* i/o: IVAS Param ISM Config Structure */ -#ifdef NCHAN_ISM_PARAMETER , const int16_t nchan_ism /* i : number of ISM channels */ -#endif ); ivas_error ivas_ism_enc_config( @@ -900,12 +1014,12 @@ ivas_error ivas_ism_enc_config( ivas_error ivas_ism_dec_config( Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ -#ifdef DISCRETE_ISM_DTX_CNG , const ISM_MODE last_ism_mode /* i/o: last ISM mode */ -#endif -#ifndef NCHAN_ISM_PARAMETER - ,const int16_t num_obj /* i : number of objects in the bitstream */ +#ifdef JBM_TSM_ON_TCS + , + uint16_t *nSamplesRendered, /* o : number of samples flushed on renderer change */ + int16_t *data /* o : flushed PCM samples */ #endif ); @@ -923,6 +1037,26 @@ void ivas_param_ism_dec( float output_f[][L_FRAME48k] /* i/o: synthesized core-coder transport channels/DirAC output */ ); +#ifdef JBM_TSM_ON_TCS +void ivas_ism_dec_digest_tc( + Decoder_Struct *st_ivas +); + +void ivas_param_ism_dec_digest_tc( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + const uint16_t nCldfbSlots, /* i : number of CLFBS slots in the transport channels */ + float *transport_channels_f[] /* i : synthesized core-coder transport channels/DirAC output */ +); + +void ivas_param_ism_dec_render( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + const uint16_t nSamplesAsked, /* i : number of CLDFB slots requested */ + uint16_t *nSamplesRendered, /* o : number of CLDFB slots rendered */ + uint16_t *nSamplesAvailable, /* o : number of CLDFB slots still to render */ + float *output_f[] /* o : rendered time signal */ +); +#endif + void ivas_param_ism_params_to_masa_param_mapping( Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ ); @@ -936,7 +1070,6 @@ ivas_error ivas_ism_dtx_open( Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */ ); -#ifdef DISCRETE_ISM_DTX_CNG /*! r: indication of DTX frame */ int16_t ivas_ism_dtx_enc( ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */ @@ -949,20 +1082,12 @@ int16_t ivas_ism_dtx_enc( int16_t md_diff_flag[], /* o : metadata differential flag */ int16_t *sid_flag /* o : indication of SID frame */ ); -#else -/*! r: indication of DTX frame */ -int16_t ivas_ism_dtx_enc( - Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */ - int16_t *sid_flag /* o : indication of SID frame */ -); -#endif 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 */ ); -#ifdef DISCRETE_ISM_DTX_CNG 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 */ @@ -975,19 +1100,7 @@ void ivas_ism_metadata_sid_enc( BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */ int16_t nb_bits_metadata[] /* o : number of metadata bits */ ); -#else -void ivas_param_ism_metadata_dtx_enc( - BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */ - ISM_METADATA_HANDLE hIsmMeta[], /* i : ISM metadata handles */ - ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */ - PARAM_ISM_CONFIG_HANDLE hParamIsm /* i : Param ISM Enc Handle */ -#ifdef NCHAN_ISM_PARAMETER - ,const int16_t nchan_ism /* i : number of ISM channels */ -#endif -); -#endif -#ifdef DISCRETE_ISM_DTX_CNG 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 */ @@ -1000,11 +1113,6 @@ void ivas_ism_metadata_sid_dec( ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ int16_t nb_bits_metadata[] /* o : number of metadata bits */ ); -#else -void ivas_param_ism_metadata_dtx_dec( - Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ -); -#endif void ivas_ism_get_sce_id_dtx( ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */ @@ -1024,7 +1132,6 @@ void ivas_ism_coh_estim_dtx_enc( const int16_t input_frame /* i : input frame length */ ); -#ifdef DISCRETE_ISM_DTX_CNG void update_last_metadata( const int16_t nchan_ism, /* i : number of objects */ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ @@ -1040,7 +1147,6 @@ void ivas_get_ism_sid_quan_bitbudget( 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 */ ); -#endif /*----------------------------------------------------------------------------------* @@ -1211,13 +1317,15 @@ void stereo_dft_dec( 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 */ -#ifdef SBA2MONO const int16_t sba_mono_flag, /* i : signal mono output for SBA DirAC */ -#endif 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 */ +#ifdef FIX_STEREO_474 + , + const int16_t num_md_sub_frames /* i: number of MD subframes */ +#endif ); void stereo_dft_res_ecu( @@ -1451,6 +1559,10 @@ int16_t read_BS_adapt_GR_sg( void stereo_dft_hybrid_ITD_flag( STEREO_DFT_CONFIG_DATA_HANDLE hConfig, /* o : DFT stereo configuration */ const int32_t input_Fs /* i : CPE element sampling rate */ +#ifdef HYBRID_ITD_MAX + , + const int16_t hybrid_itd_max /* i : flag for hybrid ITD for very large ITDs */ +#endif ); void stereo_dft_enc_compute_itd( @@ -1965,25 +2077,21 @@ void tdm_low_rate_dec( const float *lsf_new /* i : ISFs at the end of the frame */ ); -#ifdef LSF_RE_USE_SECONDARY_CHANNEL 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 void first_VQstages( const float *const *cb, @@ -2233,9 +2341,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 */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - const int16_t isLFE, /* i : is LFE */ -#endif const int16_t sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */ ); @@ -2444,6 +2549,21 @@ void sns_shape_spectrum( const int16_t L_frame /* i : frame length */ ); +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 +); + void sns_avq_cod( const float *sns, /* i : Input sns vectors */ const float *snsmid, /* i : Input mid-sns vectors */ @@ -2451,12 +2571,14 @@ void sns_avq_cod( float *snsmid_q, /* o : Quantized mid-LFS vectors */ int16_t *index, /* o : Quantization indices */ const int16_t core, /* i : core */ + const int16_t L_frame, const int16_t low_brate_mode /* i : flag low bit operating mode */ ); void sns_avq_cod_stereo( const float *snsl, /* i : Input sns vector (left channel) */ const float *snsr, /* i : Input sns vector (right channel) */ + const int16_t L_frame, 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) */ @@ -2465,13 +2587,15 @@ void sns_avq_cod_stereo( void sns_avq_dec( int16_t *index, /* i : Quantization indices */ - float *SNS_Q, /* o : Quantized SNS vectors */ + float SNS_Q[NB_DIV][M], /* o : Quantized SNS vectors */ + const int16_t L_frame, const int16_t numlpc /* i : Number of sets of lpc */ ); void sns_avq_dec_stereo( int16_t *indexl, /* i : Quantization indices (left channel) */ int16_t *indexr, /* i : Quantization indices (right channe) */ + const int16_t L_frame, float *SNS_Ql, /* o : Quantized SNS vectors (left channel) */ float *SNS_Qr /* o : Quantized SNS vectors (right channe) */ ); @@ -2675,7 +2799,11 @@ float sumAbs( void mvc2c( const uint8_t x[], /* i : input vector */ uint8_t y[], /* o : output vector */ +#ifdef FIX_XXX_JBM_FIFO_BUFFER + const int32_t n +#else const int16_t n /* i : vector size */ +#endif ); /*! r: the dot product x'*A*A'*x */ @@ -2800,9 +2928,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 */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - int16_t *LFE_off, /* o : flag if LFE has content */ -#endif const int16_t mct_on, /* i : flag mct block (1) or stereo (0) */ const int16_t nChannels /* i : total number of coded channels */ ); @@ -2820,9 +2945,6 @@ void ivas_mct_core_enc( void ivas_mdct_quant_coder( CPE_ENC_HANDLE hCPE, /* i/o: Encoder CPE handle */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - const int16_t LFE_off, /* i : flag if LFE has content */ -#endif 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 */ @@ -2873,9 +2995,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 */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - int16_t *LFE_off, /* o : flag if LFE has content */ -#endif 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) */ @@ -2895,9 +3014,6 @@ void ivas_mct_side_bits( void ivas_mdct_core_invQ( CPE_DEC_HANDLE hCPE, /* i/o: CPE handle */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - const int16_t LFE_off, /* i : flag if LFE content */ -#endif 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 */ @@ -2915,18 +3031,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 */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - const int16_t LFE_off, /* i : flag if LFE content */ -#endif 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 */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - const int16_t LFE_off, /* i : flag if LFE has content */ -#endif 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 */ @@ -2984,8 +3094,33 @@ void mdct_read_IGF_bits( ivas_error ivas_qmetadata_enc_encode( BSTR_ENC_HANDLE hMetaData, /* i/o: metadata bitstream handle */ IVAS_QMETADATA *hQMetaData /* i/o: q_metadata handle */ + , + const int16_t hodirac_flag /* i : flag to indicate HO-DirAC mode */ +); + +#ifdef HR_METADATA +ivas_error ivas_qmetadata_enc_encode_hr_384_512( + BSTR_ENC_HANDLE hMetaData, /* i/o: metadata bitstream handle */ + IVAS_QMETADATA *hQMetaData, /* i/o: metadata handle */ + const int16_t bits_sph_idx, + const int16_t bits_sp_coh ); +void deindex_sph_idx( + const uint16_t sphIndex, /* i : Spherical index */ + const SPHERICAL_GRID_DATA *gridData, /* i : Prepared spherical grid */ + float *theta, /* o : Elevation */ + float *phi /* o : Azimuth */ +); + +/*! r: output index for direction */ +uint16_t index_theta_phi_16( + float * p_theta, /* i/o: input elevation to be indexed */ + float * p_phi, /* i/o: input azimuth to be indexed */ + const SPHERICAL_GRID_DATA *gridData /* i : generated grid data */ +); +#endif + void reset_metadata_spatial( const IVAS_FORMAT ivas_format, /* i : IVAS format */ BSTR_ENC_HANDLE hMetaData, /* i/o: Metadata bitstream handle */ @@ -3010,7 +3145,25 @@ int16_t ivas_qmetadata_dec_decode( IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */ uint16_t *bitstream, /* i : bitstream */ int16_t *index /* i/o: bitstream position */ + , + const int16_t hodirac_flag /* i : flag to indicate HO-DirAC mode */ +); + +#ifdef HR_METADATA +/*! r: number of bits read */ +int16_t ivas_qmetadata_dec_decode_hr_384_512( + IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: hQMetaData handle */ + uint16_t *bitstream, /* i : bitstream */ + int16_t *index, /* i/o: bitstream position */ + const SPHERICAL_GRID_DATA *sph_grid16, /* i: spherical grid for deindexing */ + const int16_t bits_sph_idx, + const int16_t bits_sp_coh +#ifdef FIX_HBR_MASAMETA + , + uint8_t ncoding_bands_config +#endif ); +#endif /*! r: number of bits read */ int16_t ivas_qmetadata_dec_sid_decode( @@ -3029,6 +3182,7 @@ void ivas_qmetadata_to_dirac( MASA_DECODER_HANDLE hMasa, /* i : MASA decoder structure */ const int32_t ivas_total_brate, /* i : IVAS total bitrate */ const SBA_MODE sba_mode, /* i : SBA mode */ + const int16_t hodirac_flag, /* i : flag to indicate HO-DirAC mode */ int16_t *dirac_to_spar_md_bands /* o : DirAC->SPAR MD bands */ ); @@ -3050,11 +3204,13 @@ void ivas_qmetadata_close( void restore_metadata_buffer( BSTR_ENC_HANDLE hMetaData, const int16_t next_ind_start, +#ifndef IND_LIST_DYN const int16_t last_ind_start, +#endif const int16_t bit_pos_start ); -/* !r: codeword index */ +/*! r: codeword index */ int16_t masa_sq( const float in, /* i : input value */ const float *threshold, /* i : partition */ @@ -3086,9 +3242,13 @@ void quantize_direction_frame( IVAS_QDIRECTION *q_direction, /* i/o: quantized direction structure */ float azimuth_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES], float elevation_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES] +#ifdef HR_METADATA + , + const int16_t hrmasa_flag /* i : flag indicating high-rate MASA MD coding*/ +#endif ); -/* !r: quantized spherical index */ +/*! r: quantized spherical index */ uint16_t quantize_direction( const float theta, /* i : input elevation value */ float phi, /* i : input azimuth value */ @@ -3108,7 +3268,7 @@ int16_t quantize_direction2D( const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */ ); -/* !r :companded azimuth value */ +/*! r :companded azimuth value */ float companding_azimuth( const float azi, /* i : input azimuth value */ const MC_LS_SETUP mc_format, /* i : input channel format */ @@ -3116,14 +3276,14 @@ float companding_azimuth( const int16_t direction /* i : direction of companding (direct or inverse)*/ ); -/* !r: index azimuth */ +/*! r: index azimuth */ int16_t quantize_phi_chan_lbr( const float phi, /* i : azimuth value */ float *phi_hat, /* o : quantized azimuth */ const int16_t n /* i : azimuth codebook size */ ); -/* !r: index azimuth */ +/*! r: index azimuth */ int16_t quantize_phi_chan_compand( float phi, /* i : azimuth value */ float *phi_hat, /* o : quantized azimuth */ @@ -3147,7 +3307,7 @@ void small_requantize_direction_frame( int16_t *diff /* i/o: number of bits to be reduced */ ); -/*!r : index azimuth */ +/*! r: index azimuth */ int16_t quantize_phi( float phi, /* i : azimuth value */ const int16_t flag_delta, /* i : flag indicating if the azimuth codebook is translated or not */ @@ -3224,7 +3384,10 @@ void ivas_dirac_param_est_enc( float **pp_fr_real, float **pp_fr_imag, const int16_t input_frame, - const SBA_MODE sba_mode + const SBA_MODE sba_mode + , + const int16_t hodirac_flag, + const int16_t nchan_fb_in ); @@ -3234,7 +3397,7 @@ void ivas_dirac_param_est_enc( /*! r: SBA format mode */ SBA_MODE ivas_sba_mode_select( - const int32_t ivas_total_brate /* i : IVAS total bitrate */ + void ); void ivas_sba_config( @@ -3248,16 +3411,24 @@ void ivas_sba_config( int16_t *element_mode /* o : element mode of the core coder */ ); -#ifdef FIX_386_CORECODER_RECONFIG 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 */ ); +#ifdef JBM_TSM_ON_TCS +ivas_error ivas_sba_digest_tc( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + const int16_t nchan_transport, /* i : number of transport channels */ + const int16_t nCldfbSlots, /* i : number of CLDFB slots */ + const int16_t nSamplesForRendering, /* i : number of samples provided */ + float *data[] /* i : transport channel samples */ + ); +#endif + void ivas_init_dec_get_num_cldfb_instances( Decoder_Struct *st_ivas, /* i : IVAS decoder structure */ int16_t *numCldfbAnalyses, /* o : number of CLDFB analysis instances */ @@ -3292,12 +3463,22 @@ int16_t ivas_sba_get_nchan( /*! r: number of ambisonics metadata channels */ int16_t ivas_sba_get_nchan_metadata( const int16_t sba_order /* i : Ambisonic (SBA) order */ + , + const int32_t ivas_total_brate +); + +void ivas_sba_get_spar_hoa_ch_ind( + const int16_t num_md_chs, /* i : number of MD channels */ + const int32_t ivas_total_brate, /* i : IVAS total bitrate */ + int16_t HOA_md_ind[IVAS_SPAR_MAX_CH] ); /*! r: flag indicating to code SPAR HOA MD for all bands */ -int16_t ivas_sba_get_spar_hoa_md_flag( +void ivas_sba_get_spar_hoa_md_flag( const int16_t sba_order, /* i : Ambisonic (SBA) order */ - const int32_t ivas_total_brate /* i : IVAS total bitrate */ + const int32_t ivas_total_brate, /* i : IVAS total bitrate */ + int16_t *spar_hoa_md_flag, + int16_t *spar_hoa_dirac2spar_md_flag ); void ivas_sba_zero_vert_comp( @@ -3330,17 +3511,25 @@ void ivas_sba_dirac_stereo_config( STEREO_DFT_CONFIG_DATA_HANDLE hConfig /* o : DFT stereo configuration */ ); -#ifdef SBA2MONO +/*! r: HO-DirAC flag */ +int16_t ivas_get_hodirac_flag( + const int32_t ivas_total_brate, /* i : IVAS total bitrate */ + const int16_t sba_order /* i : Ambisonic (SBA) order */ +); + int16_t ivas_get_sba_dirac_stereo_flag( Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ ); -#endif 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 */ +#ifdef FIX_STEREO_474 + , + const int16_t num_md_sub_frames /* i : number of subframes in mixing matrix */ +#endif ); void ivas_sba2mc_cldfb( @@ -3349,6 +3538,9 @@ void ivas_sba2mc_cldfb( 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 */ +#ifdef JBM_TSM_ON_TCS + const int16_t nb_timeslots, /* i : number of time slots to process */ +#endif const float *hoa_dec_mtx /* i : HOA decoding mtx */ ); @@ -3396,6 +3588,15 @@ void ivas_dirac_config_bands( IVAS_FB_MIXER_HANDLE hFbMdft ); +#ifdef ARITH_HUFF_CODER_CHANGES +void ivas_get_dirac_sba_max_md_bits( + const int32_t sba_total_brate, + int16_t *bits_frame_nominal, + int16_t *metadata_max_bits, + int16_t *qmetadata_max_bit_req, + int16_t nbands ); +#endif + ivas_error ivas_dirac_sba_config( IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */ int16_t *nchan_transport, /* o : number of transport channel needed for MASA format */ @@ -3412,6 +3613,11 @@ ivas_error ivas_dirac_dec_open( Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ ); +ivas_error ivas_dirac_allocate_parameters( + DIRAC_DEC_HANDLE hDirAC, /* i/o: decoder DirAC handle */ + const int16_t params_flag /* i : set of parameters flag */ +); + ivas_error ivas_dirac_dec_config( Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ const DIRAC_CONFIG_FLAG flag_configopen /* i/ : Flag determining if we open or reconfigure the DirAC decoder */ @@ -3421,6 +3627,11 @@ void ivas_dirac_dec_close( DIRAC_DEC_HANDLE *hDirAC /* i/o: decoder DirAC handle */ ); +void ivas_dirac_deallocate_parameters( + DIRAC_DEC_HANDLE hDirAC, /* i/o: decoder DirAC handle */ + const int16_t params_flag /* i : set of parameters flag */ +); + void ivas_dirac_dec_read_BS( const int32_t ivas_total_brate, /* i : IVAS total bitrate */ Decoder_State *st, /* i/o: decoder Core state structure */ @@ -3428,21 +3639,73 @@ void ivas_dirac_dec_read_BS( IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q metadata */ int16_t *nb_bits, /* o : number of bits read */ const SBA_MODE sba_mode, /* i : SBA mode */ + const int16_t hodirac_flag, /* i : flag to indicate HO-DirAC mode */ int16_t *dirac_to_spar_md_bands /* o : DirAC->SPAR MD bands */ ); +#ifdef JBM_TSM_ON_TCS +void generate_masking_noise_lb_dirac( + HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */ + float *tdBuffer, /* i/o: time-domain signal, if NULL no LB-CNA */ + const int16_t nCldfbTs, /* i : number of CLDFB slots that will be rendered */ + const int16_t cna_flag /* i : CNA flag for LB and HB */ +); + +void ivas_dirac_dec_set_md_map( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + int16_t nCldfbTs ); + +void ivas_dirac_dec( + 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 */ +); +#endif + +#ifdef JBM_TSM_ON_TCS +void ivas_dirac_dec_render( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + const int16_t nchan_transport, /* i : number of transport channels */ + const uint16_t nSamplesAsked, /* i : number of CLDFB slots requested */ + uint16_t *nSamplesRendered, /* o : number of CLDFB slots rendered */ + uint16_t *nSamplesAvailable, /* o : number of CLDFB slots still to render */ + float *output_f[] /* o : rendered time signal */ +); +#endif + +#ifndef JBM_TSM_ON_TCS void ivas_dirac_dec( +#else +void ivas_dirac_dec_render_sf( +#endif Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - float output_f[][L_FRAME48k], /* i/o: synthesized core-coder transport channels/DirAC output */ +#ifdef JBM_TSM_ON_TCS + float *output_f[], /* i/o: synthesized core-coder transport channels/DirAC output */ +#else + float output_f[][L_FRAME48k], /* i/o: synthesized core-coder transport channels/DirAC output */ +#endif const int16_t nchan_transport, /* i : number of transport channels */ float *pppQMfFrame_ts_re[IVAS_MAX_FB_MIXER_IN_CH][CLDFB_NO_COL_MAX], - float *pppQMfFrame_ts_im[IVAS_MAX_FB_MIXER_IN_CH][CLDFB_NO_COL_MAX], + float *pppQMfFrame_ts_im[IVAS_MAX_FB_MIXER_IN_CH][CLDFB_NO_COL_MAX] +#ifndef JBM_TSM_ON_TCS + , const int16_t i_sf +#endif ); -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 */ +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 */ +); + +/*! 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 computeDiffuseness_mdft( @@ -3519,17 +3782,20 @@ void ivas_dirac_dec_decorr_close( HANDLE_DIRAC_DECORR_STATE *ph_dirac_decorr_state ); - 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 */ const int32_t output_Fs /* i : output sampling rate */ + , + const int16_t hodirac_flag /* i : flag to indicate HO-DirAC mode */ ); void ivas_dirac_dec_output_synthesis_init( DIRAC_DEC_HANDLE hDirAC, /* i/o: DirAC handle */ const int16_t nchan_out_woLFE /* i : number of output audio channels without LFE */ + , + const int16_t hodirac_flag /* i : flag to indicate HO-DirAC mode */ ); void ivas_dirac_dec_output_synthesis_close( @@ -3539,12 +3805,25 @@ void ivas_dirac_dec_output_synthesis_close( void ivas_dirac_dec_output_synthesis_process_slot( const float *reference_power, /* i : Estimated power */ const float *onset, /* i : onset filter */ +#ifdef JBM_TSM_ON_TCS + const int16_t *azimuth, + const int16_t *elevation, + const float *diffuseness, +#endif DIRAC_DEC_HANDLE hDirAC, /* i/o: DirAC handle */ +#ifdef JBM_TSM_ON_TCS + const int16_t sh_rot_max_order, +#endif 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 */ +#if defined( JBM_TSM_ON_TCS ) + , + const int16_t index_slot +#endif + , + const int16_t hodirac_flag ); void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd( @@ -3552,13 +3831,25 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd( float ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],/* i : LS signals */ DIRAC_DEC_HANDLE hDirAC, /* i/o: DirAC handle */ const int16_t nchan_transport, /* i : number of transport channels */ +#ifdef JBM_TSM_ON_TCS + const int16_t nbslots, /* i : number of slots to process */ +#endif const float *onset_filter + , +#ifdef JBM_TSM_ON_TCS + const int16_t md_idx, +#endif + const int16_t hodirac_flag /* i : flag to indicate HO-DirAC mode */ ); void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls( - float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],/* i : LS signals */ - float ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],/* i : LS signals */ - DIRAC_DEC_HANDLE hDirAC, /* i/o: DirAC handle */ + float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],/* i : LS signals */ + float ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],/* i : LS signals */ + DIRAC_DEC_HANDLE hDirAC, /* i/o: DirAC handle */ +#ifdef JBM_TSM_ON_TCS + const int16_t nbslots, /* i : number of slots to process */ + const int16_t diff_md_idx, /* i : md slot idx of diffuseness to use */ +#endif float *reference_power_smooth, float qualityBasedSmFactor ); @@ -3597,11 +3888,15 @@ 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 */ +#ifdef JBM_TSM_ON_TCS + const int16_t *azimuth, + const int16_t *elevation, + const int16_t md_idx, +#endif const float *surCohRatio, const int16_t shd_rot_max_order, /* i : split-order rotation method */ - const float *p_Rmat /* i : rotation matrix */ + const float *p_Rmat, /* i : rotation matrix */ + const int16_t hodirac_flag /* i : flag to indicate HO-DirAC mode */ ); void ivas_dirac_dec_get_frequency_axis( @@ -3609,6 +3904,63 @@ void ivas_dirac_dec_get_frequency_axis( const int32_t output_Fs, /* i : sampling frequency */ const int16_t num_freq_bands ); /* i : number of frequency bands */ +void calculate_hodirac_sector_parameters( +#ifdef FIX_485_STATIC_BUFFERS + DIRAC_ENC_HANDLE hDirAC, +#endif + float RealBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX],/* i : signal vector (L+1)^2 x N_bins, real part */ + float ImagBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX],/* i : signal vector, imaginary part */ + const float beta, /* i : forgetting factor for average filtering */ + const int16_t *band_grouping, /* i : indices of band groups */ + const int16_t N_bands, /* i : number of bands (groups) */ + const int16_t enc_param_start_band, /* i : first band to process */ + float *azi, /* o : array of sector azimuth angles, flat */ + float *ele, /* o : array of sector elevation angles, flat */ + float *diff, /* o : array of sector diffuseness values, flat */ + float *ene /* o : array of sector energy values, flat */ +); + +void ivas_mc_paramupmix_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 */ +); + +ivas_error ivas_mc_paramupmix_enc_open( + Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */ +); + +void ivas_mc_paramupmix_enc_close( + MC_PARAMUPMIX_ENC_HANDLE *hMCParamUpmix, /* i/o: MC Param-Upmix encoder handle */ + const int32_t sampling_rate +); + +void ivas_mc_paramupmix_dec( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + float output_f[][L_FRAME48k] /* i/o: synthesized core-coder transport channels/DirAC output */ +); + +int16_t ivas_mc_paramupmix_getNumTransportChannels( + void +); + +ivas_error ivas_mc_paramupmix_dec_open( + Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ +); + +void ivas_mc_paramupmix_dec_close( + MC_PARAMUPMIX_DEC_HANDLE *hMCParamUpmix_out /* i/o: Parametric MC decoder handle */ +); + +void ivas_mc_paramupmix_dec_read_BS( + const int32_t ivas_total_brate, /* i : IVAS total bitrate */ + Decoder_State *st, /* i/o: decoder state structure */ + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix, /* i/o: decoder MC Param-Upmix handle */ + int16_t *nb_bits /* o : number of bits written */ +); + void ivas_param_mc_metadata_open( const MC_LS_SETUP mc_ls_setup, /* i : MC ls setup */ const int16_t lfe_index, /* i : channel index of LFE */ @@ -3676,9 +4028,29 @@ void ivas_param_mc_dec_read_BS( int16_t *nb_bits /* o : number of bits written */ ); +#ifdef JBM_TSM_ON_TCS +void ivas_param_mc_dec_digest_tc( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + const uint8_t nCldfbSlots, /* i : number of CLFBS slots in the transport channels */ + float *transport_channels_f[] /* i : synthesized core-coder transport channels/DirAC output */ +); + +void ivas_param_mc_dec_render( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + const uint16_t nSamplesAsked, /* i : number of CLDFB slots requested */ + uint16_t *nSamplesRendered, /* o : number of CLDFB slots rendered */ + uint16_t *nSamplesAvailable, /* o : number of CLDFB slots still to render */ + float *output_f[] /* o : rendered time signal */ +); +#endif + void ivas_param_mc_dec( Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ - float output_f[][L_FRAME48k] /* i/o: synthesized core-coder transport channels/DirAC output */ +#ifdef JBM_TSM_ON_TCS + float *output_f[] /* i/o: synthesized core-coder transport channels/DirAC output */ +#else + float output_f[][L_FRAME48k] /* i/o: synthesized core-coder transport channels/DirAC output */ +#endif ); void ivas_param_mc_default_icc_map( @@ -3787,7 +4159,7 @@ int16_t computeMixingMatricesResidual( float *mixing_matrix /* o : resulting residual mixing matrix */ ); -/* !r: error or success */ +/*! r: error or success */ int16_t svd( float InputMatrix[][MAX_OUTPUT_CHANNELS], /* i : matrix to be decomposed (M) */ float singularVectors_Left[][MAX_OUTPUT_CHANNELS], /* o : left singular vectors (U) */ @@ -3809,6 +4181,12 @@ ivas_error ivas_dirac_dec_output_synthesis_cov_open( const float *proto_matrix /* i : the prototype (upmix) matrix (only used if mode == 1) */ ); +#ifdef JBM_TSM_ON_TCS +void ivas_dirac_dec_output_synthesis_get_interpolator( + DIRAC_OUTPUT_SYNTHESIS_PARAMS *h_dirac_output_synthesis_params, /* i/o: handle for the covariance synthesis parameters */ + const uint16_t interp_length ); +#endif + void ivas_dirac_dec_output_synthesis_cov_init( DIRAC_OUTPUT_SYNTHESIS_COV_STATE *h_dirac_output_synthesis_state, /* i/o: pointer to the state of the covariance synthesis */ const int16_t nchan_in, /* i : number of input (tranport) channels */ @@ -3823,27 +4201,45 @@ void ivas_dirac_dec_output_synthesis_cov_close( ); void ivas_dirac_dec_output_synthesis_cov_param_mc_collect_slot( - float RealBuffer[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS][CLDFB_NO_CHANNELS_MAX], /* i : input channel filter bank samples (real part) */ - float ImagBuffer[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS][CLDFB_NO_CHANNELS_MAX], /* i : input channel filter bank samples (imaginary part */ - float cx[PARAM_MC_MAX_PARAMETER_BANDS][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], /* o : accumulated input covariance (real part) */ - float cx_imag[PARAM_MC_MAX_PARAMETER_BANDS][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], /* o : accumulated input covariance (imaginary part) */ - PARAM_MC_DEC_HANDLE hParamMC, /* i : handle to Parametric MC state */ - const int16_t nchan_in, /* i : number of input channels */ - const int16_t idx_slot /* i : index of the slot to be added to the input covariance */ -); - +#ifdef JBM_TSM_ON_TCS + float *RealBuffer, /* i : input channel filter bank samples (real part) */ + float *ImagBuffer, /* i : input channel filter bank samples (imaginary part */ +#else + float RealBuffer[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS][CLDFB_NO_CHANNELS_MAX], /* i : input channel filter bank samples (real part) */ + float ImagBuffer[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS][CLDFB_NO_CHANNELS_MAX], /* i : input channel filter bank samples (imaginary part */ +#endif + float cx[PARAM_MC_MAX_PARAMETER_BANDS][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], /* o : accumulated input covariance (real part) */ + float cx_imag[PARAM_MC_MAX_PARAMETER_BANDS][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], /* o : accumulated input covariance (imaginary part) */ + PARAM_MC_DEC_HANDLE hParamMC, /* i : handle to Parametric MC state */ + const int16_t nchan_in /* i : number of input channels */ +#ifndef JBM_TSM_ON_TCS + , + const int16_t idx_slot /* i : index of the slot to be added to the input covariance */ +#endif +); + void ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot( - float Cldfb_RealBuffer_in[][PARAM_MC_MAX_NSLOTS][CLDFB_NO_CHANNELS_MAX], /* i : input channel filter bank samples (real part) */ - float Cldfb_ImagBuffer_in[][PARAM_MC_MAX_NSLOTS][CLDFB_NO_CHANNELS_MAX], /* i : input channel filter bank samples (imaginary part) */ - float Cldfb_RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o : output channel filter bank samples (real part) */ - float Cldfb_ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o : output channel filter bank samples (imaginary part) */ - float mixing_matrix[PARAM_MC_MAX_PARAMETER_BANDS][MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS], /* i : parameter band wise mixing matrices (direct part) */ - float mixing_matrix_res[PARAM_MC_MAX_PARAMETER_BANDS_RES][MAX_CICP_CHANNELS * MAX_CICP_CHANNELS], /* i : parameter band wise mixing matrices (residual part) */ - const uint16_t slot_idx_sfr, /* i : time slot index for the current slot within the current subframe */ - const uint16_t slot_idx_tot, /* i : time slot index for the current slot within the frame */ - const int16_t nX, /* i : number of input channels */ - const int16_t nY, /* i : number of output channels */ - PARAM_MC_DEC_HANDLE hMetadataPMC /* i : handle to the Parametric MC decoder state */ +#ifdef JBM_TSM_ON_TCS + float *Cldfb_RealBuffer_in, /* i : input channel filter bank samples (real part) */ + float *Cldfb_ImagBuffer_in, /* i : input channel filter bank samples (imaginary part) */ +#else + float Cldfb_RealBuffer_in[PARAM_MC_MAX_TRANSPORT_CHANS][PARAM_MC_MAX_NSLOTS][CLDFB_NO_CHANNELS_MAX], /* i : CLDFB samples of the transport channels (real part) */ + float Cldfb_ImagBuffer_in[PARAM_MC_MAX_TRANSPORT_CHANS][PARAM_MC_MAX_NSLOTS][CLDFB_NO_CHANNELS_MAX], /* i : CLDFB samples of the transport channels (imaginary part) */ +#endif + float Cldfb_RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o : output channel filter bank samples (real part) */ + float Cldfb_ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o : output channel filter bank samples (imaginary part) */ +#ifdef JBM_TSM_ON_TCS + float *mixing_matrix[], /* i : parameter band wise mixing matrices (direct part) */ + float *mixing_matrix_res[], /* i : parameter band wise mixing matrices (residual part) */ +#else + float mixing_matrix[PARAM_MC_MAX_PARAMETER_BANDS][MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS], /* i : parameter band wise mixing matrices (direct part) */ + float mixing_matrix_res[PARAM_MC_MAX_PARAMETER_BANDS_RES][MAX_CICP_CHANNELS * MAX_CICP_CHANNELS], /* i : parameter band wise mixing matrices (residual part) */ +#endif + const uint16_t slot_idx_sfr, /* i : time slot index for the current slot within the current subframe */ + const uint16_t slot_idx_tot, /* i : time slot index for the current slot within the frame */ + const int16_t nX, /* i : number of input channels */ + const int16_t nY, /* i : number of output channels */ + PARAM_MC_DEC_HANDLE hParamMC /* i : handle to the Parametric MC decoder state */ ); int16_t computeMixingMatricesISM( @@ -3927,7 +4323,11 @@ void ivas_sba_upmixer_renderer( ); ivas_error ivas_sba_linear_renderer( +#ifdef JBM_TSM_ON_TCS + float *output_f[], /* i/o: synthesized core-coder transport channels/DirAC output */ +#else float output_f[][L_FRAME48k], /* i/o: synthesized core-coder transport channels/DirAC output */ +#endif 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 */ @@ -3943,6 +4343,14 @@ void ivas_sba_mix_matrix_determiner( const int16_t output_frame /* i : output frame length */ ); +#ifdef JBM_TSM_ON_TCS +void ivas_sba_prototype_renderer_sf( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder struct */ + float inRe[][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i : Input audio in CLDFB domain, real */ + float inIm[][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX] /* i : Input audio in CLDFB domain, imag */ +); +#endif + /* AGC */ /*! r: AGC enable flag */ int16_t ivas_agc_enc_get_flag( @@ -4021,7 +4429,7 @@ int16_t ivas_get_bw_idx_from_sample_rate( const int32_t sampling_rate /* i : sampling rate */ ); -/* !r: config. table index */ +/*! r: config. table index */ int16_t ivas_get_spar_table_idx( const int32_t ivas_total_brate, /* i : IVAS total bitrate */ const int16_t sba_order, /* i : IVAS SBA order */ @@ -4039,7 +4447,14 @@ int16_t ivas_get_sba_num_TCs( void ivas_spar_set_bitrate_config( ivas_spar_md_com_cfg *pSpar_md_cfg, /* i/o: SPAR MD config. handle */ const int16_t table_idx, /* i : config. table index */ - const int16_t num_bands /* i : number of bands */ + const int16_t num_bands /* i : number of bands */ +#ifdef ARITH_HUFF_CODER_CHANGES + , + const int16_t dirac2spar_md_flag, + const int16_t enc_flag, + const int16_t pca_flag, + const int16_t agc_flag +#endif ); void ivas_spar_bitrate_dist( @@ -4093,12 +4508,57 @@ void ivas_spar_get_cldfb_gains( const DECODER_CONFIG_HANDLE hDecoderConfig ); -/* !r: 1 if prediction residual channel */ +/*! r: 1 if prediction residual channel */ int16_t ivas_is_res_channel( const int16_t ch, /* i : ch index in WYZX ordering */ const int16_t nchan_transport /* i : number of transport channels (1-4) */ ); +#ifdef JBM_TSM_ON_TCS +void ivas_spar_dec_agc_pca( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + float output[][L_FRAME48k], /* i/o: input/output audio channels */ + const int16_t output_frame /* i : output frame length */ +); + +void ivas_spar_dec_set_render_map( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + int16_t nCldfbTs +); + +void ivas_spar_dec_set_render_params( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + const int16_t n_cldfb_slots /* i : number of cldfb slots in this frame */ +); + +void ivas_spar_dec_digest_tc( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + const int16_t nchan_transport, /* i : number of transport channels */ + const int16_t nCldfbSlots, /* i : number of CLDFB slots */ + const int16_t nSamplesForRendering /* i : number of samples provided */ +); + +ivas_error ivas_sba_dec_digest_tc( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + const int16_t nCldfbSlots, /* i : number of CLDFB slots */ + const int16_t nSamplesForRendering /* i : number of samples provided */ +); + +void ivas_sba_dec_render( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + const uint16_t nSamplesAsked, /* i : number of CLDFB slots requested */ + uint16_t *nSamplesRendered, /* o : number of CLDFB slots rendered */ + uint16_t *nSamplesAvailable, /* o : number of CLDFB slots still to render */ + float *output_f[] /* o : rendered time signal */ +); + +void ivas_spar_dec_upmixer_sf( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + float *output[], /* o : output audio channels */ + const int16_t nchan_internal /* i : number of internal channels */ +); +#endif + void ivas_spar_dec_upmixer( Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ float output[][L_FRAME48k], /* i/o: input/output audio channels */ @@ -4126,6 +4586,8 @@ 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 */ + , + float *prior_mixer[IVAS_MAX_FB_MIXER_OUT_CH][IVAS_MAX_SPAR_FB_MIXER_IN_CH] /* i : prior mixer_matrix */ ); void ivas_compute_spar_params( @@ -4139,6 +4601,7 @@ void ivas_compute_spar_params( const int16_t num_ch, const int16_t bands_bw, const int16_t active_w, + const int16_t active_w_vlbr, ivas_spar_md_com_cfg *hSparCfg, ivas_spar_md_t *hSparMd, float *pWscale, @@ -4182,8 +4645,15 @@ void ivas_get_spar_md_from_dirac( const int16_t order, const int16_t dtx_vad, float Wscale_d[IVAS_MAX_NUM_BANDS] + , + const uint8_t useLowerRes, + const int16_t active_w_vlbr ); +int16_t ivas_get_spar_dec_md_num_subframes( + const int16_t sba_order, /* i : Ambisonic (SBA) order */ + const int32_t ivas_total_brate ); + 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 */ @@ -4225,6 +4695,8 @@ 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 */ + , + const int16_t bw /* i : band joining factor */ ); void ivas_spar_update_md_hist( @@ -4234,11 +4706,15 @@ void ivas_spar_update_md_hist( void ivas_spar_smooth_md_dtx( ivas_spar_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle */ const int16_t num_bands_out /* i : number of output bands */ + , + const int16_t num_md_sub_frames /* i : number of metadata subframes */ ); void ivas_spar_setup_md_smoothing( ivas_spar_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle */ const int16_t num_bands_out /* i : number of output bands */ + , + const int16_t num_md_sub_frames /* i : number of metadata subframes */ ); void ivas_spar_dec_gen_umx_mat( @@ -4246,6 +4722,8 @@ void ivas_spar_dec_gen_umx_mat( const int16_t nchan_transport, /* i : number of transport channels */ const int16_t num_bands_out, /* i : number of output bands */ const int16_t bfi /* i : bad frame indicator */ + , + const int16_t num_md_sub_frames ); /* Covariance module */ @@ -4254,6 +4732,8 @@ 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 */ + , + const int32_t ivas_total_brate /* i : IVAS total bitrate */ ); void ivas_spar_covar_enc_close( @@ -4273,6 +4753,8 @@ void ivas_enc_cov_handler_process( const int16_t nchan_inp, const int16_t dtx_vad, const int16_t transient_det[2] + , + const int16_t HOA_md_ind[IVAS_SPAR_MAX_CH] ); ivas_error ivas_spar_covar_smooth_enc_open( @@ -4280,6 +4762,8 @@ 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 */ + , + const int32_t ivas_total_brate /* i : IVAS total bitrate */ ); void ivas_spar_covar_smooth_enc_close( @@ -4336,11 +4820,21 @@ void ivas_td_decorr_dec_close( void ivas_td_decorr_process( ivas_td_decorr_state_t *hTdDecorr, /* i/o: SPAR Covar. decoder handle */ +#ifdef JBM_TSM_ON_TCS + float *pcm_in[], /* i : input audio channels */ +#else float pcm_in[][L_FRAME48k], /* i : input audio channels */ +#endif float **ppOut_pcm, /* o : output audio channels */ const int16_t output_frame /* i : output frame length */ ); +void ivas_td_decorr_APD_iir_filter( + ivas_td_decorr_APD_filt_state_t *filter_state, + float *pIn_out, + const int16_t num_APD_sections, + const int16_t length +); #define IVAS_CMULT_FLOAT( in1_re, in1_im, in2_re, in2_im, out1_re, out1_im ) \ out1_re = ( in1_re * in2_re ) - ( in1_im * in2_im ); MAC(1); MULT(1); \ @@ -4476,7 +4970,16 @@ int16_t ivas_get_bits_to_encode( void ivas_huffman_encode( ivas_huffman_cfg_t *huff_cfg, int16_t in, int16_t *hcode, int16_t *hlen ); void ivas_spar_huff_coeffs_com_init( ivas_huff_coeffs_t *pHuff_coeffs, ivas_spar_md_com_cfg *pSpar_cfg, const int16_t table_idx, const int16_t enc_dec ); void ivas_spar_arith_coeffs_com_init( ivas_arith_coeffs_t *pArith_coeffs, ivas_spar_md_com_cfg *pSpar_cfg, const int16_t table_idx, const int16_t enc_dec ); -void ivas_arith_encode_cmplx_cell_array(ivas_arith_t *pArith_re, ivas_arith_t *pArith_re_diff, const int16_t *pDo_diff, const int16_t nB, int16_t *pSymbol_re, int16_t *pSymbol_old_re, ivas_cell_dim_t *pCell_dims, BSTR_ENC_HANDLE hMetaData, const int16_t any_diff); +#ifdef ARITH_HUFF_CODER_CHANGES +int16_t ivas_arith_encode_cmplx_cell_array( +#else +void ivas_arith_encode_cmplx_cell_array( +#endif +ivas_arith_t *pArith_re, ivas_arith_t *pArith_re_diff, const int16_t *pDo_diff, const int16_t nB, int16_t *pSymbol_re, int16_t *pSymbol_old_re, ivas_cell_dim_t *pCell_dims, BSTR_ENC_HANDLE hMetaData, const int16_t any_diff +#ifdef ARITH_HUFF_CODER_CHANGES + , int32_t wc_strat_arith +#endif +); ivas_error ivas_huffman_decode( ivas_huffman_cfg_t *huff_cfg, Decoder_State *st0, int16_t *dec_out ); void ivas_arith_decode_cmplx_cell_array( ivas_arith_t *pArith_re, ivas_arith_t *pArith_re_diff, Decoder_State *st0, ivas_cell_dim_t *pCell_dims, int16_t *pDo_diff, const int16_t nB, int16_t *pSymbol_re, int16_t *pSymbol_re_old ); @@ -4568,11 +5071,6 @@ ivas_error ivas_masa_enc_open( void ivas_masa_enc_close( MASA_ENCODER_HANDLE *hMasa /* i/o: MASA metadata structure */ - #ifndef FIX_350_MASA_DELAY_COMP - , - const int16_t nchan_transport, /* i : Number of transport channels */ - const IVAS_FORMAT ivas_format /* i : IVAS format */ - #endif ); void ivas_masa_enc_reconfigure( @@ -4637,6 +5135,8 @@ void masa_compensate_two_dir_energy_ratio_index( const int16_t ratio_index_2, /* i : Input ratio for direction 2 */ int16_t *ratio_index_mod1, /* o : Output modified ratio for direction 1 */ int16_t *ratio_index_mod2 /* o : Output modified ratio for direction 2 */ + , + const int16_t hodirac_flag /* i : flag to indicate HO-DirAC mode */ ); void ivas_set_qmetadata_maxbit_req( @@ -4644,19 +5144,27 @@ void ivas_set_qmetadata_maxbit_req( const IVAS_FORMAT ivas_format /* i : IVAS format */ ); +/*! r: Bits to be used for quantizing distribution ratio of direct-to-total ratios */ +int16_t ivas_get_df_ratio_bits_hodirac( + const int16_t index_diff /* i : Index of quantized diffuse-to-total ratio */ +); + /*! r: Bits to be used for quantizing distribution ratio of direct-to-total ratios */ int16_t ivas_get_df_ratio_bits( - int16_t index_diff /* i : Index of quantized diffuse-to-total ratio */ + const int16_t index_diff /* i : Index of quantized diffuse-to-total ratio */ ); void masa_sample_rate_band_correction( MASA_CODEC_CONFIG *config, /* i/o: MASA codec config */ 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 */ -#ifdef FIX_350_MASA_DELAY_COMP - , MASA_DECODER_EXT_OUT_META_HANDLE hExtOutMeta /* i/o: MASA decoder metadata ext out buffer */ +#ifdef FIX_HBR_MASAMETA + const uint8_t maxBand, /* i : max band */ + uint8_t is_encoder, /* i: signals if called at encoder */ +#else + const int32_t sampling_rate, /* i : sampling rate */ #endif + MASA_DECODER_EXT_OUT_META_HANDLE hExtOutMeta /* i/o: MASA decoder metadata ext out buffer */ ); void invdct4_transform( @@ -4678,12 +5186,14 @@ void ivas_masa_prerender( const int16_t output_frame /* i : output frame length per channel */ ); +#ifdef JBM_TSM_ON_TCS +#endif + void ivas_spar_param_to_masa_param_mapping( - 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 */ + Decoder_Struct *st_ivas, /* i/o: IVAS decoder struct */ + float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i : Input audio in CLDFB domain, real */ + float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i : Input audio in CLDFB domain, imag */ + const int16_t subframe /* i : Subframe to map */ ); @@ -4702,12 +5212,28 @@ void ivas_binRenderer_close( #ifdef DEBUGGING void ivas_binaural_cldfb( Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ +#ifdef JBM_TSM_ON_TCS + float *output_f[] /* i/o: synthesized core-coder transport channels/DirAC output */ +#else float output_f[][L_FRAME48k] /* i/o: synthesized core-coder transport channels/DirAC output */ +#endif ); + +#ifdef JBM_TSM_ON_TCS +void ivas_binaural_cldfb_sf( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + const int16_t n_samples_to_render, + float *output_f[] /* i/o: synthesized core-coder transport channels/DirAC output */ +); +#endif + #endif void ivas_binRenderer( BINAURAL_RENDERER_HANDLE hBinRenderer, /* i/o: fastconv binaural renderer handle */ HEAD_TRACK_DATA_HANDLE hHeadTrackData, /* i/o: head track handle */ +#ifdef JBM_TSM_ON_TCS + const int16_t numTimeSlots, /* i: : number of time slots to process */ +#endif float Cldfb_RealBuffer_Binaural[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o : Binaural signals */ float Cldfb_ImagBuffer_Binaural[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o : Binaural signals */ float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i : LS signals */ @@ -4717,7 +5243,12 @@ void ivas_binRenderer( void ivas_binaural_add_LFE( Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ int16_t output_frame, /* i : length of input frame */ +#ifdef JBM_TSM_ON_TCS + float *input_f[], /* i : transport channels */ + float *output_f[] /* o : synthesized core-coder transport channels/DirAC output */ +#else float output_f[][L_FRAME48k] /* i/o: synthesized core-coder transport channels/DirAC output */ +#endif ); @@ -4731,10 +5262,22 @@ ivas_error ivas_ism_renderer_open( void ivas_ism_render( Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ +#ifdef JBM_TSM_ON_TCS + float *output_f[], /* i/o: core-coder transport channels/object output */ +#else float output_f[][L_FRAME48k], /* i/o: core-coder transport channels/object output */ +#endif const int16_t output_frame /* i : output frame length per channel */ ); +#ifdef JBM_TSM_ON_TCS +void ivas_ism_render_sf( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + float *output_f[], /* i/o: core-coder transport channels/object output */ + const int16_t n_samples_to_render /* i : output frame length per channel */ +); +#endif + void ivas_ism_get_stereo_gains( const float azimuth, /* i : object azimuth */ const float elevation, /* i : object elevation */ @@ -4744,14 +5287,23 @@ void ivas_ism_get_stereo_gains( 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) */ +#ifdef JBM_TSM_ON_TCS + float *in_buffer_td[], /* i : MC signals (on input) and the HOA3 (on output) */ + float *buffer_td[], /* o : MC signals (on input) and the HOA3 (on output) */ +#else + float buffer_td[][L_FRAME48k], /* i/o: MC signals (on input) and the HOA3 (on output) */ +#endif 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 */ +#ifdef JBM_TSM_ON_TCS + float *buffer_td[], /* i/o: TD signal buffers */ +#else + float buffer_td[][L_FRAME48k], /* i/o: TD signal buffers */ +#endif 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 */ @@ -4759,7 +5311,17 @@ void ivas_ism2sba( const int16_t sba_order /* i : SBA order */ ); - +#ifdef JBM_TSM_ON_TCS +void ivas_ism2sba_sf( + float *buffer_in[], /* i : TC buffer */ + float *buffer_out[], /* o : TD signal buffers */ + ISM_RENDERER_HANDLE hIsmRendererData, /* i/o: renderer data */ + const int16_t num_objects, /* i : number of objects */ + const int16_t n_samples_to_render, /* i : output frame length per channel */ + const int16_t offset, /* i : offset for the interpolatr */ + const int16_t sba_order /* i : Ambisonic (SBA) order */ +); +#endif /*----------------------------------------------------------------------------------* * Amplitude Panning VBAP prototypes *----------------------------------------------------------------------------------*/ @@ -4807,10 +5369,17 @@ void ivas_ls_setup_conversion_close( LSSETUP_CONVERSION_HANDLE *hLsSetUpConversion /* i/o: LS converter handle */ ); + void ivas_ls_setup_conversion( Decoder_Struct *st_ivas, /* i : IVAS decoder structure */ + const int16_t input_chans, /* i : number of input channels to the renderer */ const int16_t output_frame, /* i : frame length */ - float output[][L_FRAME48k] /* i/o: LS input/output synthesis signal */ +#ifdef JBM_TSM_ON_TCS + float *input[], /* i : LS input/output synthesis signal */ + float *output[] /* i/o: LS input/output synthesis signal */ +#else + float output[][L_FRAME48k] /* i/o: LS input/output synthesis signal */ +#endif ); void ivas_ls_setup_conversion_process_mdct( @@ -4825,6 +5394,9 @@ void ivas_ls_setup_conversion_process_mdct_param_mc( void ivas_lssetupconversion_process_param_mc( Decoder_Struct *st_ivas, /* i/o: LS setup conversion renderer handle */ +#ifdef JBM_TSM_ON_TCS + int16_t num_timeslots, /* i : number of time slots to process */ +#endif float Cldfb_RealBuffer_InOut[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i/o: LS signals */ float Cldfb_ImagBuffer_InOut[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i/o: LS signals */ int16_t channel_active[MAX_CICP_CHANNELS] /* i : bitmap indicating which output channels are active */ @@ -4944,6 +5516,8 @@ void computeReferencePower_enc( const int16_t enc_param_start_band, /* i : first band to process */ const int16_t num_freq_bands, /* i : Number of frequency bands */ const SBA_MODE sba_mode /* i : SBA mode */ + , + const int16_t nchan_ana /* i : number of analysis channels */ ); ivas_error ivas_mono_dmx_renderer_open( @@ -5051,10 +5625,21 @@ ivas_error ivas_td_binaural_open( 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 */ +#ifdef JBM_TSM_ON_TCS + float *output[], /* i/o: SCE channels / Binaural synthesis */ +#else + float output[][L_FRAME48k], /* i/o: SCE channels / Binaural synthesis */ +#endif const int16_t output_frame /* i : output frame length */ ); +#ifdef JBM_TSM_ON_TCS +void ObjRenderIVASSubframe( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + float *output[], /* i/o: SCE channels / Binaural synthesis */ + const int16_t output_frame /* i : output frame length */ +); +#endif /*----------------------------------------------------------------------------------* * Filter-bank (FB) Mixer @@ -5068,6 +5653,8 @@ ivas_error ivas_fb_set_cfg( const int16_t num_out_chans, /* i : number of FB output channels */ const int16_t active_w_mixing, /* i : active_w_mixing flag */ const int32_t sampling_Fs /* i : sampling rate */ + , + const int16_t nachan_dirac_ana /* i : number of DirAR analysis channels */ ); ivas_error ivas_FB_mixer_open( @@ -5088,6 +5675,8 @@ void ivas_fb_mixer_pcm_ingest( float pcm_in[][L_FRAME48k], /* i : input audio channels */ float **ppOut_pcm, /* o : output audio channels */ const int16_t frame_length /* i : frame length */ + , + const int16_t HOA_md_ind[IVAS_SPAR_MAX_CH] ); void ivas_dirac_enc_spar_delay_synchro( @@ -5100,6 +5689,8 @@ void ivas_fb_mixer_update_prior_input( IVAS_FB_MIXER_HANDLE hFbMixer, /* i/o: FB mixer handle */ float *pcm_in[], /* i : input audio channels */ const int16_t length /* i : length of time slot */ + , + const int16_t nchan_fb_in /* i : number of analysis channels */ ); void ivas_fb_mixer_get_windowed_fr( @@ -5109,6 +5700,8 @@ void ivas_fb_mixer_get_windowed_fr( float *frame_f_imag[], /* o : imag freq domain values */ const int16_t length, /* i : number of new samples in time slot */ const int16_t mdft_len /* i : MDFT frame length */ + , + const int16_t nchan_fb_in /* i : number of analysis channels */ ); void ivas_fb_mixer_process( @@ -5127,7 +5720,7 @@ void ivas_fb_mixer_get_in_out_mapping( int16_t in_out_mixer_map[IVAS_MAX_FB_MIXER_OUT_CH][IVAS_MAX_SPAR_FB_MIXER_IN_CH] /* i/o: mixing mapping */ ); -/* !r: number of spectral bands */ +/*! r: number of spectral bands */ int16_t ivas_get_num_bands_from_bw_idx( const int16_t bwidth /* i : audio bandwidth */ ); diff --git a/lib_com/ivas_qmetadata_com.c b/lib_com/ivas_qmetadata_com.c index 0f2491bad3545e1dcfe9a785d208aa1f702f3eb1..26dbb10df141b59d6a2eb4bcb186a72d1488bcb1 100644 --- a/lib_com/ivas_qmetadata_com.c +++ b/lib_com/ivas_qmetadata_com.c @@ -263,7 +263,7 @@ void ivas_qmetadata_close( * scalar quantization using partition *------------------------------------------------------------------------*/ -/* r: codeword index */ +/*! r: codeword index */ int16_t masa_sq( const float in, /* i : input value */ const float *threshold, /* i : partition */ @@ -508,24 +508,31 @@ void masa_compensate_two_dir_energy_ratio_index( const int16_t ratio_index_2, /* i : Input ratio for direction 2 */ int16_t *ratio_index_mod1, /* o : Output modified ratio for direction 1 */ int16_t *ratio_index_mod2 /* o : Output modified ratio for direction 2 */ + , + const int16_t hodirac_flag /* i : flag to indicate HO-DirAC mode */ ) { - float ratio1, ratio2, ratioSum; + float ratio1, ratio2; + float ratioSum; ratio1 = 1.0f - diffuseness_reconstructions[ratio_index_1]; ratio2 = 1.0f - diffuseness_reconstructions[ratio_index_2]; - ratioSum = ratio1 + ratio2; - if ( ratio1 >= ratio2 ) + if ( !hodirac_flag ) { - ratio2 = ratio2 / ratio1 * ratioSum; - ratio1 = ratioSum; - } - else - { - ratio1 = ratio1 / ratio2 * ratioSum; - ratio2 = ratioSum; + ratioSum = ratio1 + ratio2; + if ( ratio1 >= ratio2 ) + { + ratio2 = ratio2 / ratio1 * ratioSum; + ratio1 = ratioSum; + } + else + { + ratio1 = ratio1 / ratio2 * ratioSum; + ratio2 = ratioSum; + } } + *ratio_index_mod1 = masa_sq( 1.0f - ratio1, diffuseness_thresholds, DIRAC_DIFFUSE_LEVELS ); *ratio_index_mod2 = masa_sq( 1.0f - ratio2, diffuseness_thresholds, DIRAC_DIFFUSE_LEVELS ); @@ -610,6 +617,35 @@ void ivas_qmetadata_direction_vector_to_azimuth_elevation( } +/*------------------------------------------------------------------------- + * ivas_get_df_ratio_bits_hodirac() + * + * + *------------------------------------------------------------------------*/ + +/*! r: bits to be used for quantizing ratio of ratios */ +int16_t ivas_get_df_ratio_bits_hodirac( + const int16_t index_diff /* i : index of quantized diffuse-to-total ratio */ +) +{ + int16_t dfRatio_bits; + + if ( index_diff >= DIFF_DFRATIO_1BIT_LIMIT_IDX ) + { + dfRatio_bits = 1; + } + else if ( index_diff >= DIFF_DFRATIO_2BIT_LIMIT_IDX_HODIRAC ) + { + dfRatio_bits = 2; + } + else + { + dfRatio_bits = 3; + } + + return dfRatio_bits; +} + /*--------------------------------------------------------------- * ivas_get_df_ratio_bits() * @@ -620,7 +656,7 @@ void ivas_qmetadata_direction_vector_to_azimuth_elevation( /*! r: bits to be used for quantizing ratio of ratios */ int16_t ivas_get_df_ratio_bits( - int16_t index_diff /* i : index of quantized diffuse-to-total ratio */ + const int16_t index_diff /* i : index of quantized diffuse-to-total ratio */ ) { int16_t dfRatio_bits; diff --git a/lib_com/ivas_qspherical_com.c b/lib_com/ivas_qspherical_com.c index 039dea53eb97d18f2537058c841560ae1a90719a..874f66d05910606c7197034c36e8aef9491c628b 100644 --- a/lib_com/ivas_qspherical_com.c +++ b/lib_com/ivas_qspherical_com.c @@ -71,7 +71,7 @@ uint16_t ivas_qmetadata_reorder_generic( * Returns the original value of the array "folded" by ReorderGeneric *------------------------------------------------------------------------*/ -/* !r: "Unfolded" value, positive or negative depending on the value of the input */ +/*! r: "Unfolded" value, positive or negative depending on the value of the input */ int16_t ivas_qmetadata_dereorder_generic( const uint16_t uns_value /* i : unsigned value result of ReorderGeneric */ ) @@ -234,7 +234,7 @@ void small_reduction_direction( * Input phi expected to be an angle in degree between 0 and 360. *-----------------------------------------------------------------------*/ -/* !r: index azimuth */ +/*! r: index azimuth */ int16_t quantize_phi( float phi, /* i : azimuth value */ const int16_t flag_delta, /* i : flag indicating if the azimuth codebook is translated or not */ @@ -401,7 +401,7 @@ float companding_azimuth( * Input phi expected to be an angle in degree between 0 and 360. *-----------------------------------------------------------------------*/ -/* !r: index azimuth */ +/*! r: index azimuth */ int16_t quantize_phi_chan_lbr( const float phi, /* i : azimuth value */ float *phi_hat, /* o : quantized azimuth */ @@ -445,7 +445,7 @@ int16_t quantize_phi_chan_lbr( * Input phi expected to be an angle in degree between 0 and 360. *-----------------------------------------------------------------------*/ -/* !r: index azimuth */ +/*! r: index azimuth */ int16_t quantize_phi_chan_compand( float phi, /* i : azimuth value */ float *phi_hat, /* o : quantized azimuth */ diff --git a/lib_com/ivas_rom_com.c b/lib_com/ivas_rom_com.c index f04538c4790ca72f0a52ecd09c9cf9ecf9c4269e..9f67c602f6aaf3d2994aee41aeefdc48a3941d04 100644 --- a/lib_com/ivas_rom_com.c +++ b/lib_com/ivas_rom_com.c @@ -628,7 +628,6 @@ const float tdm_den_ratio_tabl[TDM_NQ+1] = /* 1.0f/(2*LR_ratio*LR_ratio-2*LR_ra 1.2088f, 1.1429f, 1.0902f, 1.0501f, 1.0221f, 1.0000f, 1.0000f, 1.0000f }; -#ifdef LSF_RE_USE_SECONDARY_CHANNEL const int16_t tdm_bit_allc_tbl[5][6] = { /* IC -- UC -- GC -- TM --AC */ @@ -638,21 +637,8 @@ const int16_t tdm_bit_allc_tbl[5][6] = { 1650, 6050, 0, 10000, 0, 10000 }, /* IVAS_32k */ { 1650, 6050, 0, 13000, 0, 14000 } /* IVAS_48k */ }; -#else -const int16_t tdm_bit_allc_tbl[5][6] = -{ - /* IC -- UC -- GC -- TM --AC */ - { 1600, 3450, 0, 4400, 0, 5000 }, /* IVAS_13k2 */ - { 1600, 3450, 0, 5000, 0, 5000 }, /* IVAS_16k4 */ - { 1600, 3450, 0, 6000, 0, 5000 }, /* IVAS_24k4 */ - { 1600, 6000, 0, 10000, 0, 10000 }, /* IVAS_32k */ - { 1600, 6000, 0, 13000, 0, 14000 } /* IVAS_48k */ -}; -#endif -#ifdef LSF_RE_USE_SECONDARY_CHANNEL /* LSFs Intra-frame prediction tables */ -#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE const float tdm_LSF_MEAN_RE_USE_OUT[M] = { 301.292f, 521.300f, 870.818f, 1340.278f, 1712.099f, 2091.456f, 2488.523f, 2841.096f, 3196.565f, 3593.040f, 3958.366f, 4293.334f, 4710.319f, 5118.806f, 5546.761f, 5918.579f, @@ -669,10 +655,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] = { @@ -693,7 +679,6 @@ const float tdm_RE_USE_adaptive_beta_prd_diag_3[15 + 16 + 15] = 0.2043f, 0.6317f, 0.0543f, 0.1767f, 0.5396f, }; -#endif const float tdm_LSF_MEAN_PRED_QNT[M] = { @@ -729,7 +714,6 @@ const float tdm_PRED_QNT_fixed_beta_prd_diag_3[15 + 16 + 15] = 0.1709f, 0.6372f, 0.1060f, 0.1193f, 0.6574f, }; -#endif const int16_t fast_FCB_bits_2sfr[] = {8, 14, 18, 20, 24, 128/*stop value*/}; @@ -893,7 +877,7 @@ const int16_t DirAC_block_grouping_5ms_MDFT[MAX_PARAM_SPATIAL_SUBFRAMES + 1] = 0, 1, 2, 3, 4 }; - +const float c_weights[DIRAC_NO_FB_BANDS_MAX] = { 9.962447e-02f, 9.627997e-01f, 9.926667e-01f, 9.981028e-01f, 9.996648e-01f, 1.000000e+00f, 9.997692e-01f, 9.992002e-01f, 9.983890e-01f, 9.973818e-01f, 9.962037e-01f, 9.948692e-01f, 9.933876e-01f, 9.917654e-01f, 9.900073e-01f, 9.881169e-01f, 9.860975e-01f, 9.839516e-01f, 9.816818e-01f, 9.792906e-01f, 9.767801e-01f, 9.741527e-01f, 9.714106e-01f, 9.685560e-01f, 9.655913e-01f, 9.625187e-01f, 9.593406e-01f, 9.560594e-01f, 9.526774e-01f, 9.491970e-01f, 9.456208e-01f, 9.419512e-01f, 9.381908e-01f, 9.343420e-01f, 9.304075e-01f, 9.263898e-01f, 9.222915e-01f, 9.181152e-01f, 9.138636e-01f, 9.095392e-01f, 9.051447e-01f, 9.006827e-01f, 8.961559e-01f, 8.915668e-01f, 8.869181e-01f, 8.822123e-01f, 8.774521e-01f, 8.726400e-01f, 8.677785e-01f, 8.628702e-01f, 8.579176e-01f, 8.529231e-01f, 8.478893e-01f, 8.428184e-01f, 8.377130e-01f, 8.325753e-01f, 8.274077e-01f, 8.222124e-01f, 8.169917e-01f, 8.117478e-01f, 8.064829e-01f, 8.011990e-01f, 7.958982e-01f, 7.905827e-01f, 7.852543e-01f, 7.799150e-01f, 7.745667e-01f, 7.692112e-01f, 7.638505e-01f, 7.584861e-01f, 7.531199e-01f, 7.477535e-01f, 7.423885e-01f, 7.370265e-01f, 7.316691e-01f, 7.263176e-01f, 7.209736e-01f, 7.156384e-01f, 7.103134e-01f, 7.049999e-01f, 6.996990e-01f, 6.944121e-01f, 6.891403e-01f, 6.838847e-01f, 6.786464e-01f, 6.734265e-01f, 6.682258e-01f, 6.630455e-01f, 6.578863e-01f, 6.527492e-01f, 6.476350e-01f, 6.425445e-01f, 6.374784e-01f, 6.324376e-01f, 6.274226e-01f, 6.224341e-01f, 6.174729e-01f, 6.125393e-01f, 6.076341e-01f, 6.027577e-01f, 5.979106e-01f, 5.930932e-01f, 5.883061e-01f, 5.835497e-01f, 5.788242e-01f, 5.741301e-01f, 5.694676e-01f, 5.648372e-01f, 5.602390e-01f, 5.556734e-01f, 5.511404e-01f, 5.466405e-01f, 5.421737e-01f, 5.377402e-01f, 5.333402e-01f, 5.289738e-01f, 5.246411e-01f, 5.203422e-01f, 5.160771e-01f, 5.118460e-01f, 5.076489e-01f, 5.034858e-01f, 4.993567e-01f, 4.952616e-01f, 4.912005e-01f, 4.871734e-01f, 4.831802e-01f, 4.792209e-01f, 4.752955e-01f, 4.714037e-01f, 4.675457e-01f, 4.637212e-01f, 4.599302e-01f, 4.561725e-01f, 4.524481e-01f, 4.487567e-01f, 4.450983e-01f, 4.414728e-01f, 4.378799e-01f, 4.343195e-01f, 4.307915e-01f, 4.272956e-01f, 4.238318e-01f, 4.203997e-01f, 4.169993e-01f, 4.136303e-01f, 4.102926e-01f, 4.069859e-01f, 4.037101e-01f, 4.004649e-01f, 3.972501e-01f, 3.940655e-01f, 3.909109e-01f, 3.877861e-01f, 3.846909e-01f, 3.816250e-01f, 3.785882e-01f, 3.755803e-01f, 3.726010e-01f, 3.696501e-01f, 3.667275e-01f, 3.638328e-01f, 3.609658e-01f, 3.581263e-01f, 3.553141e-01f, 3.525289e-01f, 3.497705e-01f, 3.470387e-01f, 3.443331e-01f, 3.416537e-01f, 3.390001e-01f, 3.363720e-01f, 3.337694e-01f, 3.311919e-01f, 3.286393e-01f, 3.261114e-01f, 3.236079e-01f, 3.211286e-01f, 3.186733e-01f, 3.162418e-01f, 3.138337e-01f, 3.114490e-01f, 3.090872e-01f, 3.067484e-01f, 3.044321e-01f, 3.021382e-01f, 2.998664e-01f, 2.976166e-01f, 2.953885e-01f, 2.931819e-01f, 2.909966e-01f, 2.888323e-01f, 2.866889e-01f, 2.845661e-01f, 2.824637e-01f, 2.803816e-01f, 2.783194e-01f, 2.762770e-01f, 2.742543e-01f, 2.722509e-01f, 2.702667e-01f, 2.683014e-01f, 2.663550e-01f, 2.644271e-01f, 2.625177e-01f, 2.606264e-01f, 2.587531e-01f, 2.568977e-01f, 2.550599e-01f, 2.532395e-01f, 2.514364e-01f, 2.496503e-01f, 2.478811e-01f, 2.461287e-01f, 2.443928e-01f, 2.426732e-01f, 2.409698e-01f, 2.392824e-01f, 2.376109e-01f, 2.359550e-01f, 2.343146e-01f, 2.326895e-01f, 2.310797e-01f, 2.294848e-01f, 2.279047e-01f, 2.263394e-01f, 2.247886e-01f, 2.232521e-01f, 2.217299e-01f, 2.202217e-01f, 2.187274e-01f, 2.172469e-01f, 2.157800e-01f, 2.143266e-01f, 2.128865e-01f, 2.114596e-01f, 2.100457e-01f, 2.086447e-01f, 2.072564e-01f, 2.058808e-01f }; /*----------------------------------------------------------------------* * SPAR ROM tables @@ -903,6 +887,21 @@ 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 */ + { 13200, 0, SBA_FOA_ORDER, FB, 24000, 1, WYXZ, 1, 0, +#ifdef FIX_487_LOWRATE_SBA_TUNING_FIX + { { 10000, 8150, 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 FIX_487_LOWRATE_SBA_TUNING_FIX + { { 13200, 11350, 16350 } }, +#else + { { 13200, 11500, 16350 } }, +#endif + { { 15, 1, 5, 1 },{ 15, 1, 3, 1 },{ 7, 1, 3, 1 } }, 0, 0, 0 }, { 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 }, @@ -936,7 +935,13 @@ const ivas_spar_br_table_t ivas_spar_br_table_consts[IVAS_SPAR_BR_TABLE_LEN] = { { 31, 11, 11, 1 },{ 1, 1, 1, 1 },{ 1, 1, 1, 1 } }, 1, 2, 0 }, { 256000, 0, SBA_HOA3_ORDER, FB, 24000, 4, WYXZ, 0, 0,{ { 76300, 73550, 112000 },{ 59350, 57200, 56000 },{ 42400, 40850, 48000 },{ 25450, 24500, 40000 } }, - { { 31, 11, 11, 1 },{ 1, 1, 1, 1 },{ 31, 1, 1, 1 } }, 1, 2, 0 }, + { { 31, 11, 11, 1 },{ 1, 1, 1, 1 }, +#ifdef ARITH_HUFF_CODER_CHANGES + { 1, 1, 1, 1 } +#else + { 31, 1, 1, 1 } +#endif + }, 1, 2, 0 }, { 384000, 0, SBA_FOA_ORDER, FB, 24000, 4, WYXZ, 0, 0,{ { 128000, 128000, 128000 },{ 100000, 100000, 128000 },{ 79850, 79850, 104000 },{ 66600, 66600, 104000 } }, // not yet optimized { { 31, 1, 1, 1 },{ 1, 1, 1, 1 },{ 1, 1, 1, 1 } }, 1, 2, 0 }, @@ -950,10 +955,10 @@ const ivas_spar_br_table_t ivas_spar_br_table_consts[IVAS_SPAR_BR_TABLE_LEN] = { 512000, 0, SBA_FOA_ORDER, FB, 24000, 4, WYXZ, 0, 0,{ { 128000, 128000, 128000 },{ 128000, 128000, 128000 },{ 128000, 128000, 128000 }, {118450, 118450, 128000 } }, // not yet optimized { { 31, 1, 1, 1 },{ 1, 1, 1, 1 },{ 1, 1, 1, 1 } }, 1, 2, 0 }, - { 512000, 0, SBA_HOA2_ORDER, FB, 24000, 4, WYXZ, 0, 0,{ { 128000, 128000, 128000 },{ 128000, 128000, 128000 },{ 128000, 128000, 128000 },{ 97700, 93300, 128000 } }, // not yet optimized + { 512000, 0, SBA_HOA2_ORDER, FB, 24000, 4, WYXZ, 0, 0,{ { 124000, 124000, 128000 },{ 124000, 124000, 128000 },{ 125200, 118450, 128000 },{ 76300, 73000, 128000 } }, // not yet optimized { { 31, 11, 11, 1 },{ 1, 1, 1, 1 },{ 1, 1, 1, 1 } }, 1, 2, 0 }, - { 512000, 0, SBA_HOA3_ORDER, FB, 24000, 4, WYXZ, 0, 0,{ { 128000, 128000, 128000 },{ 128000, 128000, 128000 },{ 127200, 122550, 128000 },{ 76300, 73550, 128000 } }, // not yet optimized + { 512000, 0, SBA_HOA3_ORDER, FB, 24000, 4, WYXZ, 0, 0,{ { 118000, 118000, 128000 },{ 118000, 118000, 128000 },{ 117200, 109250, 128000 },{ 72300, 69000, 128000 } }, // not yet optimized { { 31, 11, 11, 1 },{ 1, 1, 1, 1 },{ 1, 1, 1, 1 } }, 1, 2, 0 }, }; @@ -1471,11 +1476,13 @@ const int16_t dtx_pr_real_q_levels[3][3] = { { 9,9,9 },{ 9,7,9 },{ 9,5,7 } }; const int16_t pr_pr_idx_pairs[3][3][2] = { { { 0, 0 },{ 0, 0 },{ 0, 0 } },{ { 0, 0 },{ 0, 0 },{ 0, 0 } },{ { 0, 0 },{ 1, 3 },{ 0, 0 } } }; const int16_t pr_pd_idx_pairs[3][3][2] = { { { 1, 1 },{ 2, 2 },{ 3, 3 } },{ { 1, 1 },{ 3, 2 },{ 2, 0 } },{ { 2, 1 },{ 0, 0 },{ 0, 0 } } }; -const int16_t remix_order_set[1][IVAS_SPAR_MAX_CH] = { /* WYZX --> WYXZ... */ - { 0, 1, 3, 2, 4, 5, 6, 7} +const int16_t remix_order_set[1][DIRAC_MAX_ANA_CHANS] = { /* WYZX --> WYXZ... */ + { 0, 1, 3, 2, 4, 5, 6, 7, 8, 9, 10 } }; -const int16_t keep_planar[IVAS_SPAR_MAX_CH - IVAS_SPAR_MAX_DMX_CHS] = { 1, 1, 1, 1 }; -const int16_t HOA_keep_ind[IVAS_SPAR_MAX_CH] = {0, 1, 2, 3, 4, 8, 9, 15}; +const int16_t keep_planar[IVAS_SPAR_MAX_CH - IVAS_SPAR_MAX_DMX_CHS] = { 1, 1, 1, 1, 1, 1 }; +const int16_t HOA_keep_ind[IVAS_SPAR_MAX_FB_IN_CHAN] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 15}; +const int16_t HOA_keep_ind_spar[IVAS_SPAR_MAX_CH] = {0, 1, 2, 3, 4, 8, 9, 10, 10, 10, 10}; +const int16_t HOA_keep_ind_spar512[IVAS_SPAR_MAX_CH] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; /*----------------------------------------------------------------------* @@ -2531,7 +2538,48 @@ const uint16_t ivas_param_mc_sym_freq_ild_delta_combined_48_16bits[2 * PARAM_MC_ /*----------------------------------------------------------------------------------* * MASA ROM tables *----------------------------------------------------------------------------------*/ - +#ifdef HR_METADATA + +const float diffuseness_reconstructions_hr[HR_MASA_ER_LEVELS] = +{ + 0.00f, + 0.0142822265625f, + 0.030029296875f, + 0.052001953125f, + 0.07708740234375f, + 0.10528564453125f, + 0.14483642578125f, + 0.19573974609375f, + 0.26568603515625f, + 0.35467529296875f, + 0.436279296875f, + 0.510498046875f, + 0.5943603515625f, + 0.6878662109375f, + 0.80096435546875f, + 0.93365478515625f +}; +const float diffuseness_thresholds_hr[HR_MASA_ER_LEVELS + 1] = +{ + 0.0f, + 0.009521484375f, + 0.01904296875f, + 0.0410156250f, + 0.06298828125f, + 0.0911865234375f, + 0.119384765625f, + 0.1702880859375f, + 0.22119140625f, + 0.3101806640625f, + 0.399169921875f, + 0.473388671875f, + 0.547607421875f, + 0.641113281250f, + 0.734619140625f, + 0.8673095703125f, + 2.0f /* out-of-range large value to make searching easier */ +}; +#endif const int16_t bits_direction_masa[DIRAC_DIFFUSE_LEVELS] = { 11, @@ -2544,6 +2592,7 @@ const int16_t bits_direction_masa[DIRAC_DIFFUSE_LEVELS] = 3 }; + const float coherence_cb0_masa[DIRAC_DIFFUSE_LEVELS * 2 * MASA_NO_CV_COH] = { /* this is the same */ @@ -2726,7 +2775,11 @@ const uint8_t masa_joined_nbands[IVAS_NUM_ACTIVE_BRATES] = const uint8_t masa_twodir_bands[IVAS_NUM_ACTIVE_BRATES] = { +#ifdef HR_METADATA + 0, 0, 0, 0, 0, 1, 1, 1, 3, 4, 6, 6, 9, 24 +#else 0, 0, 0, 0, 0, 1, 1, 1, 3, 4, 6, 6, 9, 12 +#endif }; const uint8_t masa_twodir_bands_joined[IVAS_NUM_ACTIVE_BRATES] = @@ -3980,6 +4033,28 @@ const float ivas_cos_twiddle_160[IVAS_160_PT_LEN >> 1] = 0.0760120586092433f, 0.0564205163668375f, 0.0368072229413588f, 0.0171797396307788f }; +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 +}; + const float ivas_sin_twiddle_80[IVAS_80_PT_LEN >> 1] = { -0.00490871880799799f, -0.0441642771270674f, -0.0833517373318975f, -0.122410675199216f, @@ -5530,5 +5605,843 @@ const int16_t ivas_num_active_bands[FB - WB + 1] = IVAS_16K_12BANDS_ACTIVE_BANDS, IVAS_FB_BANDS_12, IVAS_FB_BANDS_12 }; +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 }; + +/* pre-rounded codebook vectors for singed Q4.12 represantation */ +const float ivas_sns_cdbk_tcx20_stage1[ 128 * 16 ] = { + -1.8305664f, -2.0878906f, -0.9638672f, 2.8059082f, 2.668213f, 1.1638184f, 1.390625f, 1.217041f, 1.3850098f, 0.44555664f, -0.47045898f, -0.5307617f, -0.810791f, -1.1647949f, -1.4560547f, -1.7612305f, + -2.5979004f, -3.3308105f, -1.8554688f, -0.3605957f, 1.6828613f, 2.5871582f, 0.98168945f, 0.22436523f, -0.13110352f, 0.16699219f, 1.5004883f, 0.3293457f, 0.33569336f, 1.1591797f, 0.1796875f, -0.8718262f, + 1.982666f, 2.2011719f, 1.1525879f, 0.8093262f, 0.86499023f, 1.1618652f, 1.2888184f, 1.3618164f, 1.0827637f, 0.83251953f, 0.12011719f, -0.7182617f, -2.1948242f, -3.0500488f, -3.3571777f, -3.53833f, + 0.15771484f, 1.1040039f, 0.39282227f, -0.6479492f, -1.0939941f, -1.0437012f, -1.2055664f, -1.1469727f, -0.998291f, -0.37768555f, 0.3486328f, 1.081543f, 1.2700195f, 1.2143555f, 0.8371582f, 0.107666016f, + 0.24438477f, -0.70751953f, -1.1660156f, -1.1777344f, -0.24536133f, 0.39624023f, 1.112793f, 1.232666f, 1.3540039f, 1.088623f, 0.9001465f, 0.9003906f, -0.030761719f, -0.83740234f, -1.2800293f, -1.7849121f, + -0.91918945f, -0.18603516f, -0.7397461f, -1.5285645f, -1.7453613f, -1.2680664f, -0.9445801f, 0.2434082f, 1.3000488f, 1.6604004f, 1.2814941f, 1.0026855f, 0.71484375f, 0.56347656f, 0.47509766f, 0.09008789f, + 2.4824219f, 1.4541016f, 0.91064453f, 0.6765137f, 0.5678711f, 0.6965332f, 0.7609863f, 0.70410156f, 0.36108398f, -0.032470703f, -0.69140625f, -1.1281738f, -1.4833984f, -1.5556641f, -1.7043457f, -2.0187988f, + 2.41333f, 1.4936523f, 0.9902344f, 0.9104004f, 0.7211914f, 0.5522461f, 0.09326172f, -0.21655273f, -0.49560547f, -0.4873047f, -0.7363281f, -0.9211426f, -1.0041504f, -0.9875488f, -1.0681152f, -1.2578125f, + -0.814209f, 1.2546387f, 1.6965332f, 1.420166f, 0.99560547f, 1.1420898f, 1.0039062f, 0.9289551f, 0.6604004f, 0.22485352f, -0.6530762f, -1.2009277f, -1.2949219f, -1.3759766f, -1.7175293f, -2.2705078f, + -1.3979492f, 0.18896484f, 0.34814453f, -0.052001953f, -0.38623047f, -0.25878906f, -0.3371582f, -0.109375f, -0.08227539f, 0.07495117f, -0.019042969f, 0.1184082f, 0.30566406f, 0.5102539f, 0.6755371f, 0.4206543f, + 1.0683594f, 1.9543457f, 2.1296387f, 2.071045f, 1.5754395f, 1.1333008f, 0.4248047f, -0.19799805f, -0.84350586f, -1.079834f, -1.3415527f, -1.3908691f, -1.3967285f, -1.3078613f, -1.3322754f, -1.4663086f, + 2.3891602f, 2.5097656f, 1.144043f, 0.36572266f, -0.16894531f, -0.23388672f, 0.26879883f, 0.7692871f, 0.54589844f, 0.5180664f, -0.26879883f, -0.92211914f, -1.2089844f, -1.4658203f, -1.9033203f, -2.338623f, + -1.3549805f, 1.3427734f, 1.5871582f, 1.9365234f, 0.58935547f, 0.4892578f, -0.17675781f, -0.19458008f, 0.11352539f, 0.01928711f, 0.30419922f, -0.23291016f, -2.1499023f, -1.2368164f, -0.20922852f, -0.8269043f, + 0.8769531f, -1.5319824f, -1.6025391f, -1.3833008f, -0.57299805f, -0.8847656f, -0.90600586f, -0.986084f, -1.1860352f, -1.3520508f, -1.2216797f, -0.49902344f, 1.5070801f, 4.0805664f, 2.208496f, 3.4538574f, + 4.114258f, 3.3249512f, 2.2033691f, 1.0500488f, 0.14770508f, -0.36547852f, -0.748291f, -0.8503418f, -1.0917969f, -1.0305176f, -1.1955566f, -1.2768555f, -1.1767578f, -1.0061035f, -0.9506836f, -1.1477051f, + 0.7878418f, 2.513916f, 1.0112305f, -0.767334f, -1.3525391f, -0.86865234f, 0.42456055f, 1.4470215f, 1.2680664f, 1.1574707f, -0.41333008f, -0.92993164f, -0.9226074f, -0.92285156f, -0.80859375f, -1.6242676f, + -2.2216797f, -1.2346191f, -0.4008789f, 0.59765625f, -0.49389648f, 1.1911621f, 0.032470703f, 1.3654785f, 0.43139648f, 1.2021484f, 1.6652832f, 0.58862305f, -0.29541016f, -0.99560547f, -1.0366211f, -0.39526367f, + -1.8601074f, -2.9248047f, 0.14648438f, 0.61157227f, 0.6274414f, -1.3579102f, 0.48095703f, -0.4399414f, 0.57006836f, 1.1831055f, -1.1950684f, 0.828125f, 1.2575684f, 1.5888672f, 0.5510254f, -0.06762695f, + 2.1816406f, 2.8918457f, 2.9243164f, 2.5839844f, 2.2548828f, 1.7543945f, 0.92626953f, 0.45751953f, -0.17285156f, -0.9650879f, -1.7875977f, -2.3608398f, -2.6245117f, -2.6313477f, -2.6652832f, -2.767334f, + 2.0964355f, 0.20458984f, -1.2553711f, -2.0012207f, -1.9951172f, -1.407959f, -1.0788574f, -0.47460938f, -0.01928711f, 0.45239258f, 0.73779297f, 0.9333496f, 1.0112305f, 1.1274414f, 0.90893555f, 0.7597656f, + -1.2897949f, 0.13867188f, 0.4831543f, 0.6274414f, 0.5175781f, 0.54541016f, 0.46826172f, 0.548584f, 0.39135742f, 0.4975586f, 0.38671875f, -0.022705078f, -0.36083984f, -0.8190918f, -1.0593262f, -1.0527344f, + 0.80029297f, 0.57250977f, 0.068359375f, -0.70996094f, -1.0571289f, -0.92041016f, -0.74121094f, -0.3017578f, 0.1850586f, 0.7922363f, 0.76171875f, 0.55859375f, 0.39135742f, 0.22363281f, -0.09790039f, -0.5253906f, + 4.5966797f, 2.5993652f, 0.8737793f, -0.9536133f, -0.07006836f, 2.6501465f, 1.3757324f, -0.8967285f, -1.6777344f, -1.2912598f, -0.5917969f, -1.3334961f, -1.4775391f, -0.6760254f, -1.0019531f, -2.1257324f, + -1.0061035f, 0.67407227f, 0.9157715f, 0.9851074f, 0.78564453f, -0.009277344f, -0.40039062f, -0.12524414f, -0.18310547f, -0.0029296875f, -0.38989258f, -0.40820312f, -0.37158203f, -0.15551758f, 0.010253906f, -0.3178711f, + -1.3325195f, 0.7138672f, 1.6359863f, 2.2177734f, 1.659668f, 1.9414062f, 1.0874023f, 1.3305664f, 1.4523926f, 1.2883301f, -0.56225586f, -2.0280762f, -2.8566895f, -2.5690918f, -2.1638184f, -1.8144531f, + 0.0925293f, 1.5366211f, 2.095459f, 1.9145508f, 1.4782715f, 0.8676758f, -0.34643555f, -0.21826172f, -1.1254883f, -1.1550293f, -0.92211914f, -0.5473633f, -0.89868164f, -0.77441406f, -0.8112793f, -1.1855469f, + 2.2070312f, 3.5219727f, 1.9643555f, 0.5649414f, -0.021728516f, 0.14941406f, 0.15991211f, 0.21850586f, -1.1708984f, -1.1306152f, -0.32299805f, -0.064453125f, -1.4772949f, -1.6064453f, -1.3984375f, -1.5932617f, + 2.5195312f, 2.3515625f, 1.3063965f, 0.20825195f, -0.609375f, -1.088623f, -1.3623047f, -1.2600098f, -1.3369141f, -1.0693359f, -0.8010254f, -0.42773438f, -0.15234375f, 0.44799805f, 0.5998535f, 0.6743164f, + 1.5209961f, 1.0463867f, 0.74560547f, 0.51342773f, 0.34448242f, 0.21533203f, -0.028320312f, -0.084228516f, 0.08618164f, 0.12475586f, -0.3557129f, -0.5698242f, -0.63012695f, -0.6933594f, -0.9638672f, -1.2717285f, + -0.5739746f, -0.20629883f, -0.9890137f, -1.8708496f, -1.9855957f, -1.6159668f, -1.6103516f, -1.3623047f, -0.9399414f, -0.067871094f, 0.9128418f, 1.7995605f, 2.1074219f, 2.2941895f, 2.331787f, 1.7766113f, + 3.6323242f, 1.9743652f, 0.3935547f, -0.6862793f, -1.1130371f, -1.0187988f, -0.8935547f, -0.5998535f, -0.4345703f, -0.2290039f, -0.26416016f, -0.21484375f, -0.13208008f, 0.009765625f, -0.16601562f, -0.2578125f, + -0.0871582f, 1.651123f, 1.8327637f, 0.54125977f, 0.23999023f, 1.421875f, 0.79663086f, 1.309082f, 0.98217773f, 1.2548828f, -1.8842773f, -1.8806152f, -1.5390625f, -1.3496094f, -1.2785645f, -2.0100098f, + -2.2109375f, -0.70288086f, 1.1103516f, 2.2207031f, 2.3356934f, 2.010498f, 1.638916f, 1.4345703f, 1.0351562f, 0.5690918f, -0.11035156f, -0.88256836f, -1.5859375f, -2.0117188f, -2.31958f, -2.5310059f, + -1.6091309f, -2.519287f, -2.4504395f, 0.26660156f, 2.321289f, 2.5898438f, 3.5390625f, -1.0505371f, -1.2543945f, -0.27734375f, 0.94873047f, 1.3859863f, 0.7109375f, -1.0185547f, -1.2666016f, -0.31689453f, + 0.94433594f, 2.465332f, 2.668457f, 1.9997559f, 1.2949219f, 1.0178223f, 0.888916f, 0.7038574f, 0.29248047f, -0.050048828f, -0.77001953f, -1.4472656f, -2.0839844f, -2.5202637f, -2.6381836f, -2.7663574f, + -0.14160156f, -0.3083496f, -0.5864258f, -1.2387695f, -1.4682617f, -1.1057129f, -0.7817383f, -0.5292969f, -0.06323242f, 0.54003906f, 0.8947754f, 1.3034668f, 1.3681641f, 1.1462402f, 0.7866211f, 0.18408203f, + 0.40478516f, -0.94018555f, -1.2241211f, -1.1057129f, -0.43066406f, -0.07324219f, 2.0061035f, 4.0029297f, 0.48828125f, 0.20117188f, 0.16235352f, -0.4182129f, -0.7751465f, -0.74072266f, -0.7463379f, -0.81152344f, + -2.7770996f, -2.1079102f, -1.5097656f, -1.515625f, -1.0080566f, -0.036621094f, 0.3708496f, 1.060791f, 1.3742676f, 1.2963867f, 0.9782715f, 1.0876465f, 0.9584961f, 0.8691406f, 0.7578125f, 0.20092773f, + 1.8244629f, 2.9589844f, 2.7573242f, 1.1542969f, 0.87109375f, 1.3430176f, 0.9003906f, 0.8564453f, 0.41308594f, -0.40551758f, -2.0913086f, -2.3833008f, -2.1589355f, -1.9533691f, -1.9741211f, -2.1125488f, + 2.1027832f, 1.2624512f, 1.0627441f, 0.8051758f, 0.22583008f, -0.12939453f, -0.3996582f, -0.54052734f, -0.74975586f, -0.7180176f, -0.7895508f, -0.7229004f, -0.6113281f, -0.2956543f, -0.21484375f, -0.28710938f, + 0.15161133f, 2.585205f, 1.7568359f, 0.9177246f, 0.37329102f, -0.16088867f, -0.4633789f, -0.21801758f, -0.09277344f, -0.021484375f, -0.22631836f, -0.42382812f, -0.66625977f, -0.8803711f, -1.0666504f, -1.5649414f, + -2.6091309f, -1.9162598f, -1.4050293f, -1.5510254f, -1.4436035f, -0.76904297f, -0.6994629f, -0.28881836f, -0.09326172f, 0.4140625f, 0.6401367f, 1.267334f, 1.7597656f, 2.1586914f, 2.4848633f, 2.0510254f, + -0.08935547f, 1.982666f, 2.4018555f, 1.3012695f, 0.122802734f, 0.8886719f, 1.3410645f, 1.0705566f, 0.115234375f, -0.2043457f, -0.97094727f, -2.4370117f, -2.147705f, -1.3283691f, -0.74731445f, -1.298584f, + 2.5476074f, 0.140625f, -0.8376465f, -1.244873f, -1.2324219f, -0.7644043f, -0.34521484f, 0.3581543f, 0.60839844f, 0.5698242f, 0.3034668f, 0.06274414f, 0.27563477f, 0.35498047f, -0.28588867f, -0.5109863f, + -0.5878906f, 1.0141602f, 1.5241699f, 1.2287598f, 0.76123047f, 0.6047363f, 0.2199707f, 0.21044922f, 0.15185547f, 0.15307617f, -0.115478516f, -0.46313477f, -0.689209f, -0.9284668f, -1.3129883f, -1.770752f, + 1.4040527f, -0.9628906f, -1.3322754f, -0.79785156f, 0.06591797f, -0.045166016f, -0.33520508f, -0.6257324f, -0.91748047f, -0.9824219f, -0.9892578f, -0.84472656f, -0.66137695f, -0.057861328f, 2.248291f, 4.8339844f, + 2.727539f, 3.736084f, 3.4023438f, 2.6699219f, 1.3686523f, 0.091308594f, -0.7897949f, -1.1069336f, -1.4260254f, -1.4335938f, -1.5388184f, -1.5930176f, -1.5603027f, -1.5078125f, -1.473877f, -1.565918f, + 1.2629395f, 2.5461426f, 1.8774414f, -0.051513672f, -1.0480957f, -0.94873047f, -0.40551758f, 0.21875f, 0.01977539f, -0.1484375f, -0.44140625f, -0.5810547f, -0.5349121f, -0.4650879f, -0.51831055f, -0.7819824f, + -2.1455078f, -0.25683594f, 1.3151855f, 1.635498f, 1.4401855f, 0.89624023f, 0.8405762f, 0.9350586f, 0.9802246f, 0.67041016f, -0.13085938f, -0.59521484f, -0.9729004f, -1.145752f, -1.4951172f, -1.9714355f, + -2.1291504f, -2.1418457f, -0.46704102f, 0.73291016f, 1.2219238f, -0.27856445f, -0.30517578f, 1.1865234f, 0.87231445f, -0.060791016f, 0.060058594f, 0.43701172f, 0.79174805f, 0.9128418f, -0.046142578f, -0.7866211f, + 3.130127f, 2.7661133f, 1.8110352f, 1.4995117f, 1.095459f, 0.8935547f, 0.8383789f, 0.5913086f, 0.21923828f, -0.1965332f, -0.982666f, -1.7121582f, -2.2011719f, -2.409912f, -2.5390625f, -2.803711f, + 1.5769043f, 0.34960938f, -0.17211914f, -0.4428711f, -0.62597656f, -0.57055664f, -0.6516113f, -0.43676758f, -0.38208008f, -0.18725586f, -0.16992188f, -0.0034179688f, 0.15356445f, 0.39404297f, 0.56396484f, 0.60424805f, + 0.12768555f, 0.2109375f, 0.16137695f, 0.063964844f, 0.13012695f, 0.39526367f, 0.5834961f, 0.62353516f, 0.50683594f, 0.37402344f, 0.060546875f, -0.13232422f, -0.37719727f, -0.6010742f, -0.8376465f, -1.2895508f, + 0.6723633f, 1.9140625f, 0.3737793f, -1.2988281f, -1.7912598f, -1.2351074f, -0.44628906f, 0.5895996f, 0.6838379f, 0.58935547f, 0.22460938f, -0.013183594f, -0.16479492f, 0.072021484f, 0.14501953f, -0.3149414f, + 4.0183105f, 2.2834473f, 1.317627f, 1.2583008f, 1.5627441f, 0.9851074f, 0.12817383f, -0.2944336f, -0.65527344f, -0.9675293f, -1.3979492f, -1.5356445f, -1.5737305f, -1.5908203f, -1.6887207f, -1.8493652f, + 0.8132324f, 0.6748047f, 0.44433594f, 0.35375977f, 0.09863281f, 0.048095703f, -0.15063477f, -0.12646484f, -0.18432617f, -0.15258789f, -0.30517578f, -0.29101562f, -0.31201172f, -0.23876953f, -0.26635742f, -0.40551758f, + 0.29345703f, 2.6530762f, 3.4177246f, 2.5812988f, 2.1159668f, 1.3947754f, 0.9523926f, 0.41479492f, -0.15844727f, -0.9025879f, -1.5444336f, -1.9780273f, -2.2106934f, -2.2788086f, -2.3234863f, -2.4267578f, + 0.75805664f, 2.5563965f, 2.8410645f, 2.2597656f, 0.3876953f, -1.067627f, -1.425293f, -0.795166f, -0.6105957f, -0.66381836f, -0.9675293f, -1.0371094f, -0.88916016f, -0.5444336f, -0.19042969f, -0.6118164f, + 1.7177734f, 3.0668945f, 3.2519531f, 2.4799805f, 0.7363281f, -0.8156738f, -0.8125f, 0.1430664f, 0.34375f, -0.27563477f, -1.4462891f, -1.4350586f, -1.4143066f, -1.6706543f, -1.8481445f, -2.0212402f, + 2.756836f, 1.090332f, 0.61572266f, 0.1928711f, -0.34521484f, -0.47509766f, -0.36767578f, -0.0637207f, 0.14233398f, 0.19580078f, -0.16015625f, -0.43286133f, -0.6472168f, -0.5493164f, -0.80737305f, -1.1452637f, + 1.0544434f, 1.0671387f, 1.1149902f, 1.1230469f, 0.78637695f, 0.64282227f, 0.4868164f, 0.3413086f, 0.13769531f, -0.13085938f, -0.64990234f, -0.89453125f, -1.074707f, -1.114502f, -1.3056641f, -1.5842285f, + -1.8156738f, -1.3222656f, -1.4528809f, -1.8908691f, -1.8740234f, -1.1118164f, -1.1750488f, -0.5734863f, 0.16308594f, 1.5822754f, 2.0114746f, 1.8625488f, 1.6049805f, 1.5942383f, 1.5368652f, 0.8605957f, + 3.2451172f, 2.7807617f, 1.2692871f, 0.5222168f, 0.119384766f, -0.06616211f, -0.15722656f, -0.10424805f, -0.27197266f, -0.45263672f, -0.83618164f, -1.1611328f, -1.333252f, -1.2722168f, -1.2016602f, -1.0800781f, + 0.17333984f, 2.4299316f, 2.3254395f, 1.3701172f, 0.47509766f, 0.72216797f, 0.072753906f, -0.037597656f, -0.41845703f, -0.8137207f, -1.5649414f, -2.4125977f, -1.3486328f, -0.53027344f, -0.10546875f, -0.33740234f, + -2.5983887f, -1.9645996f, -0.5678711f, 0.48999023f, 0.86743164f, 0.62158203f, 1.189209f, 1.3269043f, 1.182373f, 1.0024414f, 0.54785156f, 0.25634766f, -0.12133789f, -0.44140625f, -0.7026367f, -1.0881348f, + 0.071777344f, -2.279541f, -2.057373f, -0.25512695f, 2.2199707f, 2.541748f, 0.8342285f, 0.7907715f, 0.5048828f, -0.1303711f, 0.2631836f, -0.37036133f, -0.5187988f, -0.42285156f, -0.66845703f, -0.52368164f, + 1.3261719f, 3.1193848f, 2.583496f, 0.6767578f, -0.022460938f, 0.5214844f, 0.6105957f, 1.0021973f, 0.66845703f, 0.8640137f, -0.37353516f, -2.0703125f, -2.3225098f, -2.136963f, -2.057129f, -2.3894043f, + 1.4580078f, 2.0153809f, 1.0583496f, -0.12792969f, -0.6064453f, -0.7011719f, -0.96118164f, -0.8588867f, -0.7414551f, -0.18896484f, 0.1550293f, 0.46166992f, 0.3881836f, 0.16113281f, -0.37109375f, -1.140625f, + 1.6044922f, 0.8898926f, -0.053222656f, -0.26611328f, 0.084228516f, 0.5666504f, 0.9013672f, 1.1362305f, 1.1520996f, 0.74243164f, 0.5168457f, 0.11206055f, -0.8305664f, -1.7199707f, -2.109375f, -2.7270508f, + -1.3208008f, -0.083984375f, -0.24169922f, -0.95043945f, -1.2331543f, -0.564209f, -0.018798828f, 0.95654297f, 1.142334f, 1.1772461f, 0.8063965f, 0.43359375f, 0.08227539f, 0.07446289f, 0.099853516f, -0.359375f, + 2.0480957f, 2.739746f, 2.1257324f, 1.1525879f, 0.7644043f, 0.5031738f, 0.2758789f, 0.19311523f, -0.08642578f, -0.15893555f, -0.89990234f, -1.2700195f, -1.5583496f, -1.791748f, -1.9023438f, -2.135254f, + 2.2700195f, 2.2856445f, 1.5393066f, 0.77563477f, 0.23632812f, -0.017578125f, -0.23071289f, -0.19995117f, -0.26342773f, -0.17700195f, -0.5046387f, -0.6687012f, -0.8383789f, -1.057373f, -1.3330078f, -1.8166504f, + 0.66015625f, 1.6772461f, 1.604248f, 1.5366211f, 1.1013184f, 0.8173828f, 0.5605469f, 0.7155762f, 0.5270996f, 0.23291016f, -0.37719727f, -0.8352051f, -1.3342285f, -1.7580566f, -2.2695312f, -2.8588867f, + 0.21484375f, -0.44580078f, -0.85253906f, -1.0334473f, -0.95043945f, -0.592041f, -0.47558594f, -0.20092773f, -0.06323242f, 0.16040039f, 0.24414062f, 0.5144043f, 0.70947266f, 0.8796387f, 0.9663086f, 0.92529297f, + -0.047851562f, 1.6748047f, 2.0949707f, 2.3344727f, 1.7766113f, 1.7685547f, 0.35913086f, 0.47509766f, -0.055664062f, -0.08251953f, -0.76049805f, -1.8425293f, -2.8457031f, -2.4018555f, -1.144043f, -1.3034668f, + 2.0942383f, 1.1809082f, 0.54345703f, 0.18408203f, -0.44360352f, -0.5373535f, 0.12182617f, 0.7114258f, 0.8088379f, 0.7709961f, -0.12866211f, -1.1555176f, -1.4138184f, -1.0009766f, -0.83081055f, -0.90478516f, + -1.0332031f, 1.6005859f, 0.46875f, 1.6149902f, -0.23095703f, 1.0908203f, 0.068359375f, 0.5266113f, 0.18701172f, -0.12792969f, -0.22509766f, -0.4819336f, -0.5058594f, -0.390625f, -1.2128906f, -1.3486328f, + 1.7792969f, 0.7167969f, -0.40039062f, -1.1201172f, -1.5458984f, -1.5344238f, -1.5107422f, -1.3601074f, -1.2751465f, -0.93847656f, -0.40795898f, 0.49145508f, 1.2475586f, 2.0236816f, 2.0373535f, 1.7973633f, + 2.8059082f, 2.769043f, 1.6977539f, 0.44458008f, -0.41308594f, -0.6376953f, -0.80566406f, -0.81030273f, -0.93115234f, -0.66845703f, -0.7155762f, -0.6870117f, -0.6052246f, -0.46142578f, -0.41967773f, -0.56225586f, + 1.9963379f, 2.9060059f, 1.5930176f, -0.34716797f, -0.7993164f, 0.061279297f, 1.0302734f, 1.1359863f, 0.7434082f, -0.07397461f, -1.3549805f, -1.2399902f, -1.2802734f, -1.2973633f, -1.4362793f, -1.6364746f, + -2.3041992f, -0.73999023f, 0.11791992f, 0.3215332f, 0.45092773f, 0.45751953f, 0.7368164f, 0.7216797f, 0.19238281f, 0.75439453f, 0.17822266f, -0.46679688f, -0.41210938f, 0.029785156f, 0.20996094f, -0.24829102f, + -0.9016113f, -1.2150879f, -0.13208008f, 0.7023926f, 0.81225586f, -0.57055664f, -1.0405273f, -0.5344238f, 0.1706543f, 0.579834f, 0.80810547f, 0.4790039f, 0.3671875f, 0.24829102f, 0.32202148f, -0.095214844f, + 1.4807129f, 1.8234863f, 1.7661133f, 2.5449219f, 2.6020508f, 1.9316406f, 1.3154297f, 1.1328125f, 0.5263672f, -0.17895508f, -1.1706543f, -2.199707f, -2.7531738f, -2.8725586f, -2.9294434f, -3.0187988f, + 2.6689453f, 0.5949707f, -0.45043945f, -0.7963867f, -0.91625977f, -0.90722656f, -0.98413086f, -0.8354492f, -0.6953125f, -0.3955078f, -0.2849121f, 0.04296875f, 0.43066406f, 0.7241211f, 0.81591797f, 0.9880371f, + -0.15112305f, -0.33618164f, -0.3256836f, -0.111083984f, -0.048339844f, 0.08129883f, 0.068115234f, 0.17138672f, 0.20385742f, 0.2590332f, 0.123291016f, 0.11621094f, 0.03100586f, 0.06201172f, 0.06591797f, -0.2097168f, + 1.2731934f, 0.29223633f, -0.14038086f, -0.29956055f, -0.6376953f, -0.56762695f, -0.15844727f, 0.46020508f, 0.6569824f, 0.68188477f, 0.28393555f, -0.18676758f, -0.43164062f, -0.3347168f, -0.38256836f, -0.5083008f, + 4.678711f, 2.80542f, 1.126709f, -0.48461914f, -0.8273926f, 0.7895508f, 2.3266602f, 0.4375f, -1.6252441f, -1.8422852f, -1.4978027f, -0.8730469f, -1.3171387f, -1.671875f, -1.0270996f, -0.998291f, + -1.3620605f, 0.63916016f, 1.1337891f, 0.3178711f, 0.06591797f, 1.0673828f, 0.91503906f, 0.4387207f, -0.18359375f, -0.22875977f, -0.6660156f, -0.69799805f, -0.17236328f, -0.21118164f, -0.24951172f, -0.8066406f, + -0.44873047f, 1.4709473f, 2.5039062f, 2.7050781f, 1.9462891f, 0.3642578f, -0.30078125f, 0.6467285f, 0.9680176f, 0.9716797f, -1.498291f, -1.8183594f, -1.8544922f, -1.847168f, -1.605957f, -2.2028809f, + 0.47460938f, 1.574707f, 1.7148438f, 2.1083984f, 1.7241211f, 0.44189453f, -0.40551758f, -0.18847656f, 0.13232422f, -0.0031738281f, -0.79467773f, -1.1843262f, -1.2902832f, -1.2416992f, -1.3430176f, -1.7194824f, + 1.9831543f, 3.927246f, 2.9868164f, 1.2749023f, 0.265625f, 0.02734375f, 0.079833984f, 0.47070312f, -0.7956543f, -1.2663574f, -1.638916f, -1.8222656f, -1.3908691f, -1.4194336f, -1.3027344f, -1.3791504f, + 0.2097168f, 1.8005371f, 1.479248f, 0.62109375f, 0.091552734f, -0.38549805f, -0.93530273f, -0.923584f, -0.91259766f, -0.6557617f, -0.5842285f, -0.27563477f, 0.007080078f, 0.25585938f, 0.25219727f, -0.044677734f, + 0.51293945f, 1.0280762f, 0.84033203f, 0.62841797f, 0.5317383f, 0.5251465f, 0.26953125f, 0.09423828f, 0.032958984f, -0.052734375f, -0.48999023f, -0.6513672f, -0.6411133f, -0.6369629f, -0.84375f, -1.1477051f, + -1.2319336f, -0.08203125f, -0.23632812f, -0.8339844f, -1.0866699f, -0.88793945f, -1.0917969f, -0.83251953f, -0.79467773f, -0.45751953f, -0.25830078f, 0.43041992f, 1.1853027f, 1.7946777f, 2.3452148f, 2.0378418f, + 4.881592f, 2.1987305f, 0.6430664f, -0.15478516f, -0.36206055f, -0.4753418f, -0.5410156f, -0.1965332f, -0.072753906f, -0.10888672f, -0.5263672f, -0.8588867f, -0.94506836f, -0.99487305f, -1.1523438f, -1.3347168f, + -0.5546875f, 2.1118164f, 2.2026367f, 0.70703125f, -0.21142578f, 0.8679199f, 1.1367188f, 1.012207f, 0.9904785f, 1.2463379f, 0.21801758f, -1.9433594f, -2.9155273f, -2.2661133f, -0.97631836f, -1.6257324f, + -0.80908203f, 1.0163574f, 1.546875f, 2.0847168f, 1.9309082f, 1.6364746f, 1.057373f, 1.1618652f, 0.76049805f, 0.29858398f, -0.46484375f, -1.0957031f, -1.6264648f, -2.0043945f, -2.5080566f, -2.9853516f, + -0.29760742f, -1.7080078f, -1.5229492f, 1.3574219f, 4.701172f, 1.6962891f, 4.1030273f, -0.4194336f, -1.0739746f, -1.0820312f, 0.4255371f, -1.0825195f, -1.3613281f, -1.1777344f, -1.3232422f, -1.2341309f, + 1.7912598f, 1.7314453f, 1.8457031f, 2.1989746f, 1.9145508f, 1.0024414f, 0.51538086f, 0.44506836f, -0.075683594f, -0.5439453f, -1.1616211f, -1.5820312f, -1.8642578f, -1.9123535f, -2.0385742f, -2.2666016f, + -0.03100586f, -1.7485352f, -1.767334f, -1.9833984f, -1.4570312f, -0.84716797f, -0.50390625f, 0.040771484f, 0.43554688f, 0.62402344f, 0.9133301f, 1.4772949f, 1.7192383f, 1.2922363f, 0.80029297f, 1.0356445f, + -1.1809082f, -2.032959f, -2.0617676f, -1.9443359f, -1.6447754f, -0.8874512f, 3.0722656f, 2.6242676f, 2.3166504f, 3.4455566f, 1.090332f, -0.19970703f, -0.23510742f, -0.6906738f, -0.40576172f, -1.2653809f, + -2.2512207f, -1.9179688f, -2.1035156f, -2.3461914f, -2.14917f, -1.1347656f, -0.56689453f, 0.8166504f, 1.857666f, 2.114502f, 1.755127f, 1.9160156f, 1.6611328f, 1.1904297f, 0.8239746f, 0.33398438f, + 0.8227539f, 2.0544434f, 2.3171387f, 0.90234375f, 0.515625f, 1.0241699f, 0.6188965f, 0.296875f, -0.171875f, -0.6345215f, -1.2004395f, -1.1652832f, -1.1635742f, -1.2021484f, -1.3903809f, -1.6240234f, + 1.2287598f, 1.5820312f, 1.2756348f, 0.6843262f, 0.33911133f, 0.09472656f, -0.26733398f, -0.4711914f, -0.3137207f, -0.19116211f, -0.56884766f, -0.67944336f, -0.5612793f, -0.55444336f, -0.69506836f, -0.90234375f, + 1.5776367f, 2.6791992f, 2.3059082f, 1.375f, 0.7619629f, 0.08251953f, -0.6166992f, -0.8574219f, -1.0148926f, -1.0390625f, -1.0976562f, -0.8730469f, -0.7844238f, -0.7331543f, -0.7426758f, -1.0231934f, + -2.173584f, -1.3400879f, -0.8208008f, -0.95996094f, -0.6999512f, -0.010253906f, -0.19384766f, 0.25561523f, 0.3786621f, 0.72998047f, 0.4699707f, 0.4416504f, 0.49975586f, 0.9416504f, 1.4606934f, 1.0205078f, + -0.2631836f, 1.3510742f, 1.3837891f, 2.0864258f, 1.8503418f, 1.8864746f, 0.8581543f, 0.5866699f, 0.103759766f, -0.9616699f, -1.8740234f, -2.5600586f, -1.1362305f, -0.9301758f, -1.4404297f, -0.94091797f, + 2.7443848f, 0.5695801f, -0.21679688f, -0.6513672f, -0.14672852f, 0.5019531f, 0.23754883f, -0.19091797f, -0.27685547f, -0.15332031f, -0.31201172f, -0.35742188f, -0.2529297f, -0.25024414f, -0.62646484f, -0.61816406f, + 0.045898438f, 0.24243164f, 0.36865234f, 0.9145508f, 0.96777344f, 1.0041504f, 0.9550781f, 0.9213867f, 0.7089844f, 0.4296875f, -0.1328125f, -0.5522461f, -0.9333496f, -1.2285156f, -1.607666f, -2.1037598f, + 4.209961f, 1.2607422f, -0.85791016f, -1.416748f, -1.4013672f, -0.8574219f, -1.0410156f, -1.4523926f, -1.7346191f, -1.7731934f, -1.5373535f, -1.026123f, 0.8515625f, 0.21533203f, 2.2263184f, 4.3342285f, + 4.5341797f, 4.130371f, 2.7658691f, 2.1801758f, 0.90478516f, 0.5617676f, -0.1303711f, -1.1745605f, -1.5371094f, -1.5292969f, -1.6901855f, -1.7126465f, -1.7119141f, -1.7536621f, -1.8623047f, -1.9750977f, + 0.6777344f, 2.2624512f, 1.1889648f, -0.5876465f, -0.81347656f, 0.38916016f, 0.11694336f, 0.15283203f, -0.5698242f, -0.5168457f, -0.41845703f, -0.3544922f, -0.46191406f, -0.24804688f, -0.14038086f, -0.6772461f, + -1.3227539f, -0.38085938f, 0.23852539f, 0.76123047f, 1.0078125f, 1.1433105f, 0.9753418f, 0.7734375f, 0.32373047f, 0.08959961f, -0.19482422f, -0.43603516f, -0.5715332f, -0.6135254f, -0.7351074f, -1.0581055f, + -1.3225098f, -1.4675293f, -1.3000488f, -0.59375f, 0.022705078f, 0.57299805f, 0.5710449f, 0.36547852f, 0.5119629f, 0.77685547f, 0.623291f, 0.43408203f, 0.41210938f, 0.5258789f, 0.2434082f, -0.37597656f, + 2.3742676f, 3.3117676f, 3.0449219f, 2.4208984f, 1.2329102f, 0.63793945f, 0.32666016f, 0.15161133f, -0.25610352f, -1.0283203f, -1.7250977f, -1.9707031f, -2.0761719f, -2.1174316f, -2.1105957f, -2.2165527f, + 0.87109375f, 0.5085449f, 0.19018555f, -0.10913086f, -0.36328125f, -0.3725586f, -0.4946289f, -0.38671875f, -0.38183594f, -0.21801758f, -0.2331543f, -0.088378906f, 0.0234375f, 0.24194336f, 0.40649414f, 0.40600586f, + 1.0517578f, 0.5126953f, 0.23608398f, 0.31835938f, 0.3605957f, 0.39941406f, 0.38012695f, 0.50390625f, 0.54541016f, 0.37329102f, -0.24731445f, -0.5891113f, -0.6791992f, -0.7324219f, -1.0258789f, -1.407959f, + -0.66625977f, 1.7709961f, 1.2971191f, 0.15283203f, -1.0664062f, -0.7583008f, 0.16821289f, 0.5007324f, 0.35058594f, 0.14086914f, 0.5217285f, -0.13452148f, -1.2158203f, -0.34375f, 0.033447266f, -0.751709f, + 3.684082f, 3.3139648f, 2.0878906f, 1.1911621f, 0.607666f, 0.1472168f, 0.15258789f, 0.10083008f, -0.2355957f, -0.45239258f, -1.2746582f, -1.7348633f, -1.8305664f, -1.8266602f, -1.8925781f, -2.03833f, + 0.5786133f, 0.7692871f, 0.4777832f, 0.05493164f, -0.12597656f, -0.08227539f, -0.095703125f, 0.05444336f, 0.19848633f, 0.3190918f, 0.030273438f, -0.06738281f, -0.17138672f, -0.2854004f, -0.59375f, -1.0615234f, + -0.98413086f, 1.059082f, 2.3671875f, 2.3381348f, 2.529541f, 2.1052246f, 1.887207f, 1.2434082f, 0.54956055f, -0.12646484f, -0.9199219f, -1.6921387f, -2.3168945f, -2.5715332f, -2.6733398f, -2.7949219f, + 2.5153809f, 3.854248f, 2.8759766f, 1.9558105f, -0.30126953f, -1.3845215f, -1.4958496f, -1.2636719f, -1.1201172f, -0.84887695f, -1.1677246f, -0.63061523f, -0.4970703f, -0.76904297f, -0.72998047f, -0.9926758f, + 0.4025879f, 2.572998f, 3.1643066f, 2.5009766f, 1.3688965f, -0.08691406f, -0.63500977f, -0.119140625f, 0.0073242188f, -0.5070801f, -0.7023926f, -2.0339355f, -2.0788574f, -1.8864746f, -0.9301758f, -1.0368652f, + 2.1965332f, 1.2878418f, 0.50878906f, -0.119140625f, -0.49267578f, -0.6008301f, -0.75219727f, -0.56518555f, -0.5427246f, -0.4038086f, -0.43408203f, -0.28198242f, -0.13745117f, 0.06958008f, 0.14331055f, 0.1237793f, + 0.5012207f, 2.1748047f, 1.7189941f, 0.1274414f, -0.2644043f, 0.46875f, 0.37963867f, 0.7302246f, 0.23413086f, 0.41845703f, -0.7944336f, -0.8984375f, -0.6816406f, -1.0744629f, -1.190918f, -1.8496094f, + -2.3083496f, -2.19458f, -2.2111816f, -2.4804688f, -2.3293457f, -1.651123f, -1.3820801f, -0.78125f, -0.14477539f, 0.8547363f, 1.6848145f, 2.4699707f, 2.5429688f, 2.793457f, 2.9118652f, 2.2253418f, + 1.7553711f, 2.8996582f, 1.9260254f, 0.40551758f, -0.0234375f, 0.44506836f, 0.31152344f, 0.1809082f, -0.47607422f, -0.4807129f, -1.204834f, -1.3293457f, -1.2412109f, -1.0134277f, -0.89501953f, -1.2602539f, + 0.2253418f, 2.2539062f, 2.265625f, 0.57128906f, -0.7661133f, -0.6245117f, 0.21313477f, 1.2248535f, 0.8737793f, -0.12524414f, -0.9609375f, -2.416504f, -1.1223145f, -0.70532227f, -0.31469727f, -0.592041f, +}; +const float ivas_sns_cdbk_tcx20_stage2[ 64 * 16 ] = { + -1.1569824f, -0.4765625f, 0.008056641f, 0.47802734f, 0.38330078f, -0.075683594f, -0.3737793f, -0.29516602f, -0.1352539f, 0.012939453f, 0.22241211f, 0.375f, 0.31689453f, 0.20874023f, 0.2541504f, 0.25439453f, + -0.40600586f, -0.22070312f, -0.04272461f, 0.15893555f, -0.25195312f, -0.6623535f, -0.27172852f, 0.28735352f, 0.35742188f, 0.20166016f, 0.052246094f, -0.3647461f, -0.4506836f, 0.1862793f, 0.66796875f, 0.7585449f, + 0.02734375f, -0.2097168f, -0.39819336f, -0.54296875f, -0.46850586f, -0.25146484f, -0.26953125f, -0.07495117f, 0.375f, 0.9343262f, 0.91625977f, 0.4267578f, 0.026123047f, -0.15576172f, -0.11425781f, -0.22021484f, + 0.011230469f, 0.37573242f, 0.8432617f, 0.7006836f, 0.5830078f, -0.49658203f, -0.84155273f, -0.46069336f, -0.16894531f, -0.006591797f, -0.075683594f, -0.2253418f, -0.2097168f, -0.12719727f, 0.006591797f, 0.092041016f, + 0.42382812f, 0.19360352f, 0.076171875f, 0.44091797f, 0.11401367f, -0.39819336f, -0.12207031f, 0.34960938f, 0.51660156f, -0.024902344f, -0.5324707f, -0.068359375f, 0.5083008f, -0.06591797f, -0.68359375f, -0.7277832f, + -0.12182617f, 0.15332031f, 0.3022461f, 0.23754883f, 0.2722168f, 0.8046875f, 0.76831055f, 0.28808594f, -0.05493164f, -0.29711914f, -0.45629883f, -0.42944336f, -0.42871094f, -0.4416504f, -0.35107422f, -0.24536133f, + -0.19873047f, -0.010253906f, -0.030517578f, -0.041748047f, 0.052490234f, 0.07446289f, 0.026123047f, -0.026611328f, 0.18579102f, 0.22485352f, 0.1965332f, 0.1538086f, 0.044677734f, -0.111328125f, -0.24853516f, -0.29052734f, + 0.7648926f, 0.47973633f, 0.31347656f, 0.1496582f, 0.23242188f, 0.16918945f, 0.05859375f, -0.12548828f, -0.18017578f, -0.19555664f, -0.17138672f, -0.19165039f, -0.23510742f, -0.3330078f, -0.37939453f, -0.3564453f, + -0.6201172f, -0.2915039f, -0.15234375f, 0.15966797f, 0.41430664f, 0.61206055f, 0.4453125f, 0.19360352f, -0.107666016f, -0.40429688f, -0.10424805f, 0.40649414f, 0.37817383f, -0.012939453f, -0.3857422f, -0.53100586f, + -0.6376953f, -0.01953125f, 0.32958984f, -0.27905273f, -0.21191406f, 0.8327637f, 0.28515625f, -0.31225586f, -0.4375f, -0.34204102f, -0.010498047f, 0.0546875f, 0.099365234f, 0.114746094f, 0.22973633f, 0.30444336f, + -0.76538086f, -0.5390625f, -0.38330078f, -0.39501953f, -0.21923828f, 0.19311523f, 0.1899414f, -0.08642578f, -0.044921875f, 0.13500977f, 0.4543457f, 0.6777344f, 0.5891113f, 0.30078125f, 0.04321289f, -0.14990234f, + 0.34838867f, -0.21826172f, 0.018066406f, 0.06689453f, 0.40063477f, 0.34570312f, -0.548584f, -0.86035156f, -0.24023438f, 0.60668945f, 0.22363281f, -0.05053711f, 0.13916016f, 0.02709961f, -0.07470703f, -0.18383789f, + 0.13842773f, 0.05444336f, 0.20629883f, -0.11450195f, -0.77563477f, -0.57543945f, 0.7011719f, 0.20117188f, -0.33984375f, 0.18481445f, 0.38232422f, -0.2097168f, -0.040771484f, 0.13476562f, 0.0769043f, -0.024658203f, + -0.24829102f, -0.47998047f, -0.7248535f, -0.64575195f, -0.2529297f, 0.43725586f, 0.6335449f, 0.6464844f, 0.53930664f, 0.33398438f, 0.13891602f, 0.30639648f, 0.3293457f, -0.07446289f, -0.3918457f, -0.54711914f, + -0.043945312f, -0.5168457f, -0.3779297f, 0.67089844f, 0.2548828f, -0.4663086f, -0.5402832f, -0.22338867f, 0.092285156f, 0.016845703f, 0.24780273f, 0.46850586f, 0.49902344f, 0.2734375f, -0.0925293f, -0.26245117f, + 0.014892578f, 0.3540039f, 0.35229492f, -0.13085938f, -0.49829102f, -0.52563477f, -0.05883789f, 0.024658203f, -0.29492188f, -0.4638672f, -0.17333984f, 0.3791504f, 0.47314453f, 0.29516602f, 0.19165039f, 0.060791016f, + -0.21264648f, -0.875f, -0.82958984f, -0.5048828f, -0.31835938f, -0.1430664f, 0.19580078f, 0.29174805f, 0.28637695f, 0.15356445f, 0.16894531f, 0.2241211f, 0.27734375f, 0.31835938f, 0.4091797f, 0.55810547f, + -1.2670898f, 0.016845703f, 0.36254883f, 0.65893555f, 0.59814453f, 0.49389648f, 0.18041992f, 0.1821289f, 0.15942383f, -0.016357422f, -0.18847656f, -0.36547852f, -0.3413086f, -0.2553711f, -0.14868164f, -0.06958008f, + 0.10644531f, 0.7878418f, 0.09643555f, -0.5786133f, -0.40966797f, 0.07055664f, 0.39819336f, 0.31030273f, 0.10986328f, 0.14013672f, 0.2680664f, 0.32861328f, 0.04296875f, -0.39648438f, -0.6052246f, -0.66967773f, + -0.49658203f, 0.26416016f, 0.657959f, 0.41137695f, 0.28881836f, 0.22338867f, 0.15527344f, -0.08325195f, -0.118652344f, 0.08544922f, 0.2841797f, 0.15258789f, -0.18554688f, -0.48388672f, -0.5810547f, -0.5734863f, + 0.22314453f, 0.37402344f, 0.2163086f, -0.5078125f, -0.95703125f, -1.1442871f, -0.35302734f, 0.68359375f, 0.67089844f, 0.31811523f, 0.12792969f, -0.15478516f, -0.0026855469f, 0.18237305f, 0.16870117f, 0.15429688f, + 0.26464844f, -0.11401367f, -0.106933594f, 0.26538086f, 0.51660156f, 0.5373535f, 0.35888672f, 0.16870117f, 0.20825195f, 0.2409668f, 0.14013672f, -0.0546875f, -0.3334961f, -0.58691406f, -0.74243164f, -0.7624512f, + 0.73779297f, -0.14477539f, -0.37646484f, -0.1003418f, 0.1027832f, 0.14160156f, 0.06738281f, -0.05444336f, -0.016357422f, -0.0234375f, -0.022216797f, -0.049316406f, -0.061035156f, -0.10864258f, -0.09057617f, -0.0017089844f, + 1.0466309f, 0.6826172f, 0.1315918f, -0.21020508f, -0.104003906f, -0.21191406f, -0.3256836f, -0.4729004f, -0.59765625f, -0.50805664f, -0.2043457f, 0.033935547f, 0.115722656f, 0.09423828f, 0.18017578f, 0.34960938f, + -0.9074707f, -0.25634766f, 0.14331055f, 0.03515625f, -0.076171875f, -0.1340332f, -0.0073242188f, 0.20922852f, 0.40063477f, 0.5883789f, 0.64868164f, 0.50024414f, 0.19238281f, -0.22338867f, -0.47998047f, -0.6333008f, + 0.40429688f, 0.021972656f, 0.059814453f, 0.5866699f, 1.2155762f, 0.35351562f, -0.17480469f, -0.0703125f, -0.09448242f, -0.24975586f, -0.39672852f, -0.3347168f, -0.3479004f, -0.38671875f, -0.36743164f, -0.21948242f, + 0.71850586f, -0.052246094f, -0.3918457f, -0.13745117f, 0.13793945f, 0.20458984f, 0.13623047f, -0.15039062f, -0.22436523f, -0.2446289f, 0.12158203f, 0.58496094f, 0.5527344f, -0.028320312f, -0.60180664f, -0.6254883f, + 0.007080078f, 0.32910156f, 0.41210938f, 0.033203125f, -0.2097168f, -0.06665039f, -0.15307617f, 0.020507812f, 0.33203125f, 0.8874512f, 0.7089844f, -0.4128418f, -0.71484375f, -0.4958496f, -0.29223633f, -0.38476562f, + -0.84765625f, 0.3466797f, 0.107910156f, -0.3659668f, -0.48583984f, -0.41552734f, -0.38232422f, -0.26953125f, 0.019042969f, 0.25219727f, 0.40039062f, 0.3984375f, 0.38427734f, 0.29785156f, 0.29589844f, 0.26391602f, + 0.47680664f, -0.0056152344f, -0.15307617f, -0.33764648f, -0.30737305f, 0.24511719f, 0.8847656f, 0.61035156f, -0.32861328f, -0.6430664f, -0.43823242f, -0.1899414f, -0.12475586f, -0.084228516f, 0.111328125f, 0.28393555f, + 1.0576172f, -0.23535156f, -0.9638672f, -0.84716797f, 0.3137207f, 1.1804199f, 0.7871094f, 0.14257812f, -0.018798828f, -0.21801758f, -0.20703125f, -0.11816406f, -0.10449219f, -0.16210938f, -0.3491211f, -0.25708008f, + -0.028564453f, -0.43652344f, -0.20336914f, 0.13623047f, 0.17822266f, 0.2175293f, -0.026367188f, -0.4050293f, -0.6472168f, -0.670166f, -0.26391602f, 0.3864746f, 0.685791f, 0.53808594f, 0.29077148f, 0.24853516f, + -0.32836914f, -0.09106445f, -0.11254883f, -0.34277344f, -0.5786133f, -0.5319824f, -0.45410156f, -0.34716797f, -0.2163086f, -0.1862793f, -0.09448242f, 0.14550781f, 0.32739258f, 0.6513672f, 1.0861816f, 1.0732422f, + 0.17163086f, 0.26391602f, 0.19165039f, 0.028320312f, -0.05517578f, 0.14355469f, 0.09057617f, 0.03125f, -0.20532227f, -0.36889648f, -0.58569336f, -0.7468262f, -0.75634766f, -0.04272461f, 0.84814453f, 0.9921875f, + 0.61376953f, -0.18969727f, -0.4868164f, -0.45410156f, -0.42089844f, -0.39868164f, -0.34399414f, -0.25610352f, -0.104003906f, 0.11791992f, 0.3408203f, 0.4416504f, 0.40942383f, 0.31689453f, 0.22802734f, 0.18603516f, + -0.5876465f, 0.19213867f, 0.30737305f, 0.46264648f, 0.37817383f, 0.08276367f, -0.36279297f, -0.51904297f, -0.53125f, -0.42382812f, -0.27075195f, -0.15063477f, -0.026611328f, 0.21655273f, 0.5439453f, 0.6879883f, + -0.5786133f, -0.046875f, 0.0390625f, -0.026123047f, 0.034423828f, -0.28442383f, -0.5217285f, 0.07299805f, 0.7167969f, 0.84106445f, -0.34570312f, -0.3466797f, 0.25512695f, 0.31958008f, 0.12207031f, -0.2512207f, + -0.19604492f, 0.11645508f, 0.17895508f, 0.2697754f, 0.4050293f, 0.2927246f, 0.09667969f, -0.12817383f, -0.14550781f, -0.1706543f, -0.16308594f, -0.13354492f, -0.11376953f, -0.14282227f, -0.12866211f, -0.037353516f, + -0.2084961f, -0.2878418f, -0.23657227f, -0.11816406f, 0.016357422f, 0.059326172f, 0.067871094f, -0.033447266f, -0.013427734f, 0.0029296875f, 0.068603516f, 0.12548828f, 0.14624023f, 0.11279297f, 0.11254883f, 0.18530273f, + -0.13549805f, 1.1516113f, 0.5197754f, -0.064453125f, -0.2409668f, -0.1274414f, -0.021484375f, -0.07104492f, -0.095458984f, -0.11987305f, -0.12573242f, -0.18701172f, -0.20874023f, -0.21459961f, -0.08081055f, 0.021484375f, + -0.33520508f, -0.6520996f, -0.2927246f, 0.8496094f, 0.6022949f, 0.35229492f, 0.1484375f, 0.06347656f, -0.13232422f, -0.390625f, -0.41137695f, -0.27294922f, -0.1694336f, -0.027832031f, 0.18310547f, 0.48510742f, + 0.22802734f, 0.8112793f, 0.25610352f, -0.5793457f, 0.18774414f, 0.74902344f, 0.122802734f, -0.38842773f, -0.57714844f, -0.842041f, -0.97314453f, -0.74975586f, 0.20605469f, 1.4348145f, 0.22973633f, -0.115722656f, + -0.103759766f, 0.055664062f, -0.29663086f, -0.3864746f, -0.36743164f, -0.38549805f, -0.22802734f, -0.19311523f, -0.11816406f, -0.11645508f, 0.2578125f, 1.0197754f, 1.0957031f, 0.7624512f, -0.19189453f, -0.8034668f, + 0.31860352f, -0.32495117f, -0.25756836f, 0.4501953f, 0.74731445f, 0.26293945f, -0.5578613f, -0.6347656f, 0.056152344f, 1.1223145f, 0.27783203f, -0.8347168f, -0.96850586f, -0.2019043f, 0.5266113f, 0.018798828f, + 0.2434082f, 0.05126953f, -0.16088867f, -0.2434082f, -0.15234375f, 0.037353516f, 0.06982422f, -0.015136719f, -0.607666f, 0.14428711f, 0.94433594f, 0.37109375f, -0.3083496f, -0.34765625f, -0.12060547f, 0.09448242f, + 0.13427734f, 0.47021484f, -0.4387207f, -0.8562012f, -0.6101074f, -0.10913086f, 0.1430664f, 0.18334961f, 0.103759766f, -0.034423828f, -0.06738281f, 0.036376953f, 0.12670898f, 0.18603516f, 0.33496094f, 0.39697266f, + 1.0314941f, -0.5073242f, 0.050048828f, 0.31860352f, -0.055908203f, -0.6105957f, -0.31860352f, -0.056396484f, 0.072753906f, 0.056884766f, -0.053466797f, -0.06933594f, -0.08666992f, -0.038330078f, 0.047851562f, 0.21875f, + 0.47192383f, 0.58447266f, 0.6154785f, -0.078125f, -0.6315918f, -0.92626953f, -0.89501953f, -0.46069336f, -0.14819336f, -0.03125f, 0.046142578f, 0.14086914f, 0.12646484f, 0.25390625f, 0.47753906f, 0.4543457f, + -1.1186523f, -0.5427246f, -0.36108398f, -0.13378906f, -0.0048828125f, 0.2939453f, 0.45581055f, 0.3972168f, 0.2421875f, -0.18725586f, -0.576416f, -0.25805664f, 0.115722656f, 0.517334f, 0.6699219f, 0.4909668f, + -0.8635254f, -0.1977539f, -0.067871094f, -0.060058594f, 0.08251953f, 0.5378418f, 0.0007324219f, -0.067871094f, -0.0053710938f, 0.513916f, 0.42993164f, -0.3544922f, -0.6711426f, -0.15454102f, 0.5522461f, 0.3256836f, + 0.62231445f, 0.44702148f, 0.3725586f, 0.15454102f, -0.13916016f, -0.40576172f, -0.49829102f, -0.3881836f, -0.13867188f, 0.2355957f, 0.5095215f, 0.3972168f, 0.0793457f, -0.22802734f, -0.44213867f, -0.5776367f, + -0.64086914f, 0.17944336f, 1.0073242f, 0.46972656f, -0.33007812f, -0.33569336f, -0.016357422f, -0.064208984f, -0.08105469f, -0.14916992f, -0.05444336f, 0.016845703f, -0.010009766f, -0.08911133f, -0.012207031f, 0.10961914f, + 0.47485352f, -0.13232422f, 0.21044922f, 0.36645508f, -0.11303711f, -0.8552246f, -0.7819824f, 0.8149414f, 1.0595703f, -0.46044922f, -0.359375f, -0.04296875f, -0.21948242f, -0.24584961f, 0.037353516f, 0.24707031f, + 0.28710938f, -0.68530273f, 0.22631836f, 0.119384766f, -0.17114258f, -0.29833984f, 0.33618164f, 0.49438477f, 0.4248047f, 0.171875f, 0.20385742f, 0.08935547f, -0.20922852f, -0.38671875f, -0.3569336f, -0.24584961f, + 0.33544922f, 0.27172852f, 0.040283203f, -0.072509766f, -0.008544922f, -0.095458984f, -0.19897461f, -0.2980957f, -0.17480469f, -0.12133789f, -0.060791016f, 0.012451172f, 0.087890625f, 0.059814453f, 0.068115234f, 0.1550293f, + 1.1574707f, 0.5593262f, -0.16137695f, -0.44140625f, -0.38305664f, -0.24731445f, -0.0056152344f, 0.10961914f, 0.21948242f, 0.22314453f, -0.0036621094f, -0.20166016f, -0.27416992f, -0.28295898f, -0.21240234f, -0.055419922f, + -0.75561523f, -0.84399414f, -0.079589844f, 0.29614258f, 0.24389648f, 0.3671875f, 0.5605469f, 0.3630371f, 0.26220703f, 0.17895508f, 0.06274414f, -0.052734375f, -0.14526367f, -0.21069336f, -0.1550293f, -0.091796875f, + 0.32055664f, 0.47436523f, 0.56640625f, 0.517334f, 0.42260742f, 0.2890625f, 0.12719727f, -0.23291016f, -0.5283203f, -0.7036133f, -0.6333008f, -0.40454102f, -0.23364258f, -0.1628418f, -0.011962891f, 0.19335938f, + -0.05493164f, 0.5136719f, 0.30395508f, 0.49072266f, 0.3581543f, -0.09301758f, -0.38183594f, -0.4338379f, -0.57299805f, -0.4794922f, -0.17651367f, 0.42651367f, 0.56103516f, 0.28149414f, -0.22875977f, -0.51416016f, + 0.2709961f, -0.26635742f, -0.44995117f, -0.079589844f, 0.21728516f, 0.43017578f, 0.4206543f, 0.47827148f, 0.58691406f, 0.27612305f, -0.26391602f, -0.65771484f, -0.67944336f, -0.3935547f, -0.11791992f, 0.2277832f, + -0.80078125f, 0.18066406f, 0.12036133f, -0.39575195f, -0.60009766f, -0.13134766f, 0.77685547f, 0.5834961f, 0.4248047f, 0.15820312f, 0.08520508f, -0.060058594f, -0.1652832f, -0.17700195f, -0.0234375f, 0.023925781f, + 0.28100586f, 0.4013672f, 0.5695801f, 0.1394043f, -0.20532227f, -0.18286133f, 0.40698242f, 0.703125f, 0.54907227f, 0.09301758f, -0.47631836f, -0.62597656f, -0.4975586f, -0.39160156f, -0.41259766f, -0.3515625f, + 0.3227539f, -1.0678711f, -1.1435547f, 0.068603516f, 0.7546387f, 0.38745117f, 0.09008789f, -0.0007324219f, -0.12792969f, 0.076416016f, 0.24853516f, 0.28735352f, 0.076660156f, -0.041748047f, -0.01977539f, 0.08911133f, + 0.6101074f, -0.22070312f, -0.5324707f, -0.119384766f, 0.10473633f, 0.16333008f, -0.15112305f, -0.34472656f, -0.39746094f, -0.43652344f, -0.23876953f, 0.0017089844f, 0.056152344f, 0.22973633f, 0.50024414f, 0.7751465f, +}; +const float ivas_sns_cdbk_tcx20_stage3[ 32 * 16 ] = { + -0.12109375f, -0.32348633f, -0.25976562f, 0.21435547f, 0.4814453f, 0.14819336f, -0.22363281f, -0.31030273f, -0.13256836f, 0.10107422f, 0.33276367f, 0.32495117f, 0.16577148f, -0.079833984f, -0.16210938f, -0.15527344f, + 0.088378906f, -0.0146484375f, -0.13378906f, -0.29003906f, 0.873291f, -0.3125f, -0.19384766f, 0.19311523f, -0.09863281f, 0.052734375f, -0.13110352f, -0.021972656f, -0.07861328f, -0.01977539f, -0.07373047f, 0.1616211f, + -0.115722656f, 0.28100586f, 0.2697754f, -0.10522461f, -0.107910156f, -0.2866211f, -0.36694336f, -0.33862305f, -0.15844727f, 0.01928711f, 0.17382812f, 0.21118164f, 0.2697754f, 0.17260742f, 0.07299805f, 0.009033203f, + 0.08154297f, 0.037841797f, -0.25878906f, -0.30444336f, -0.064208984f, 0.1303711f, 0.36669922f, 0.39916992f, 0.3400879f, 0.14331055f, -0.01171875f, -0.12060547f, -0.17041016f, -0.23071289f, -0.20825195f, -0.13012695f, + -0.024902344f, -0.6298828f, 0.7861328f, -0.010986328f, -0.12695312f, -0.08618164f, 0.022705078f, 0.049316406f, 0.004638672f, -0.13647461f, -0.09863281f, 0.0f, 0.06518555f, 0.014404297f, 0.060546875f, 0.111083984f, + -0.39404297f, 0.16821289f, 0.28564453f, -0.08666992f, -0.16088867f, 0.052246094f, 0.26000977f, 0.057128906f, -0.050048828f, -0.07836914f, 0.016601562f, 0.05883789f, 0.07373047f, -0.03955078f, -0.08520508f, -0.07763672f, + 0.011962891f, -0.114990234f, -0.10229492f, -0.07080078f, 0.009765625f, -0.03125f, -0.15600586f, -0.014892578f, 0.10546875f, -0.040283203f, -0.48095703f, -0.2783203f, 0.5905762f, 0.66137695f, 0.13842773f, -0.22802734f, + 0.48706055f, 0.18286133f, -0.20678711f, -0.17651367f, -0.19750977f, -0.3178711f, -0.2524414f, 0.0087890625f, 0.2866211f, 0.25708008f, 0.18969727f, 0.11694336f, 0.049316406f, -0.05517578f, -0.17700195f, -0.19482422f, + 0.122802734f, -0.09667969f, 0.05444336f, 0.17358398f, 0.22924805f, 0.35229492f, 0.40307617f, 0.031982422f, -0.16064453f, -0.14819336f, -0.103027344f, -0.088134766f, -0.13623047f, -0.23510742f, -0.2434082f, -0.15600586f, + -0.5810547f, -0.0146484375f, -0.43432617f, -0.07397461f, 0.30444336f, 0.36035156f, 0.19213867f, 0.12890625f, 0.13061523f, 0.031982422f, -0.024902344f, -0.059326172f, -0.048583984f, -0.030517578f, 0.03149414f, 0.087646484f, + -0.1171875f, 0.016357422f, 0.15234375f, 0.38916016f, 0.2783203f, -0.007080078f, -0.07373047f, -0.2055664f, -0.30004883f, -0.35839844f, -0.23388672f, -0.033935547f, 0.08520508f, 0.10913086f, 0.125f, 0.17480469f, + -0.107666016f, 0.06274414f, -0.0048828125f, 0.12792969f, -0.023925781f, -0.2199707f, -0.084228516f, 0.34399414f, 0.22753906f, -0.39697266f, -0.32421875f, 0.48779297f, 0.43554688f, -0.15429688f, -0.22436523f, -0.14550781f, + 0.0031738281f, -0.03955078f, 0.06738281f, -0.017822266f, -0.2644043f, 0.30493164f, 0.30200195f, -0.32495117f, -0.5007324f, 0.15478516f, 0.60961914f, 0.15527344f, -0.1899414f, -0.14526367f, 0.017822266f, -0.1315918f, + 0.036621094f, -0.11669922f, -0.33691406f, -0.5373535f, -0.13598633f, 0.3046875f, 0.3215332f, -0.10620117f, -0.1640625f, -0.08569336f, 0.012451172f, 0.10839844f, 0.20117188f, 0.17553711f, 0.15258789f, 0.16967773f, + -0.4362793f, -0.47265625f, -0.16870117f, -0.111083984f, -0.1772461f, -0.1430664f, 0.015136719f, 0.12719727f, 0.13647461f, 0.12988281f, 0.19238281f, 0.22827148f, 0.23266602f, 0.17504883f, 0.14453125f, 0.12768555f, + -0.07495117f, 0.19604492f, 0.13110352f, -0.10131836f, -0.0078125f, -0.18847656f, -0.048828125f, 0.33862305f, 0.2578125f, -0.17089844f, -0.40698242f, -0.28857422f, -0.048339844f, 0.048828125f, 0.14916992f, 0.21459961f, + -0.27734375f, -0.072509766f, 0.26049805f, 0.39038086f, 0.2277832f, 0.020751953f, -0.12109375f, -0.080322266f, 0.171875f, 0.36743164f, 0.107421875f, -0.19311523f, -0.22607422f, -0.20654297f, -0.19799805f, -0.17041016f, + 0.1352539f, 0.40039062f, -0.15649414f, -0.25341797f, 0.31054688f, 0.5410156f, -0.32958984f, -0.42871094f, 0.14794922f, 0.17333984f, -0.17871094f, -0.23730469f, -0.026611328f, -0.013427734f, -0.046142578f, -0.037841797f, + -0.30395508f, 0.12841797f, 0.20825195f, -0.119628906f, -0.3317871f, -0.3190918f, -0.11206055f, 0.10205078f, 0.32470703f, 0.36254883f, 0.2626953f, 0.016113281f, -0.12890625f, -0.16479492f, -0.005126953f, 0.080566406f, + 0.34375f, 0.35888672f, 0.4765625f, 0.13623047f, -0.115722656f, -0.053222656f, 0.080566406f, -0.012207031f, -0.022216797f, -0.09863281f, -0.080566406f, -0.13574219f, -0.18383789f, -0.26123047f, -0.2578125f, -0.17504883f, + 0.01171875f, -0.015625f, 0.2680664f, -0.23461914f, -0.35717773f, 0.6381836f, -0.30664062f, 0.08129883f, -0.05493164f, 0.10058594f, -0.026855469f, -0.10180664f, -0.013671875f, -0.06347656f, 0.00048828125f, 0.07446289f, + -0.1015625f, 0.05053711f, 0.092285156f, 0.038330078f, -0.03491211f, 0.16479492f, 0.0859375f, 0.0036621094f, -0.15454102f, -0.09106445f, 0.026367188f, -0.23950195f, -0.43676758f, -0.27783203f, 0.21850586f, 0.6555176f, + -0.16064453f, 0.032958984f, 0.08325195f, 0.052978516f, -0.041748047f, 0.08959961f, 0.16552734f, 0.057373047f, -0.08154297f, 0.21362305f, 0.048583984f, -0.7026367f, -0.27685547f, 0.51000977f, 0.27197266f, -0.26245117f, + 0.62109375f, 0.00390625f, 0.08081055f, 0.16748047f, 0.08276367f, -0.11254883f, -0.20825195f, -0.3076172f, -0.24926758f, -0.15332031f, 0.0007324219f, 0.087646484f, 0.11303711f, 0.022705078f, -0.068847656f, -0.080322266f, + 0.40844727f, -0.390625f, -0.35473633f, 0.21777344f, 0.21972656f, -0.0107421875f, 0.111328125f, 0.21459961f, 0.1430664f, -0.08935547f, -0.19165039f, -0.2368164f, -0.1340332f, -0.034179688f, 0.030761719f, 0.09667969f, + -0.2199707f, 0.8208008f, -0.32104492f, 0.118896484f, -0.006591797f, -0.1328125f, 0.0078125f, -0.013183594f, -0.05493164f, -0.024414062f, 0.06542969f, -0.0014648438f, -0.055664062f, -0.06762695f, -0.07055664f, -0.044677734f, + -0.14770508f, -0.16967773f, -0.1105957f, 0.6333008f, -0.4025879f, -0.3515625f, 0.29736328f, 0.0859375f, 0.024414062f, -0.07128906f, 0.010253906f, 0.0007324219f, -0.021728516f, 0.01977539f, 0.083496094f, 0.12060547f, + -0.06738281f, 0.030517578f, 0.019042969f, 0.16308594f, 0.16796875f, 0.037109375f, 0.059326172f, 0.07397461f, 0.03540039f, 0.05517578f, 0.06982422f, 0.061523438f, 0.1940918f, 0.20605469f, -0.3178711f, -0.7878418f, + 0.1274414f, -0.040771484f, -0.21704102f, -0.025634766f, 0.012451172f, -0.033203125f, -0.15771484f, 0.052001953f, -0.19165039f, -0.26342773f, 0.032226562f, 0.7976074f, -0.4807129f, -0.21582031f, 0.36499023f, 0.2397461f, + 0.46044922f, 0.21435547f, 0.0847168f, -0.24414062f, -0.49902344f, -0.16577148f, 0.30151367f, 0.049560547f, -0.07470703f, -0.21459961f, -0.13256836f, -0.009277344f, 0.06665039f, 0.029052734f, 0.0390625f, 0.095214844f, + 0.17895508f, -0.31396484f, -0.033203125f, -0.02734375f, -0.0637207f, -0.11791992f, -0.03466797f, 0.0061035156f, 0.07324219f, 0.072753906f, 0.14916992f, 0.13671875f, 0.12524414f, 0.017333984f, -0.08178711f, -0.08618164f, + 0.13330078f, -0.15893555f, -0.22045898f, -0.032226562f, -0.07739258f, -0.25463867f, -0.32299805f, -0.2614746f, 0.039794922f, 0.18554688f, 0.1262207f, -0.04321289f, -0.010498047f, 0.13330078f, 0.31860352f, 0.44506836f, +}; +const float ivas_sns_cdbk_tcx20_stage4[ 32 * 16 ] = { + -0.0056152344f, -0.03955078f, 0.071777344f, 0.26879883f, 0.44140625f, -0.08203125f, -0.20092773f, -0.009277344f, 0.05810547f, -0.06347656f, -0.07910156f, -0.05126953f, -0.07006836f, -0.068847656f, -0.07885742f, -0.09082031f, + -0.011962891f, -0.060302734f, 0.011962891f, 0.049804688f, -0.044677734f, 0.037841797f, 0.099121094f, 0.06274414f, 0.022216797f, -0.09057617f, 0.00390625f, 0.38452148f, 0.1027832f, -0.5292969f, -0.3269043f, 0.28881836f, + -0.3557129f, 0.3815918f, 0.10839844f, 0.08203125f, 0.03149414f, -0.0024414062f, -0.0036621094f, -0.02758789f, -0.03125f, -0.096191406f, -0.09326172f, -0.103515625f, -0.07006836f, 0.008056641f, 0.06616211f, 0.10644531f, + 0.038330078f, 0.022460938f, -0.22070312f, 0.529541f, -0.3540039f, 0.29907227f, -0.16235352f, -0.03955078f, 0.053222656f, -0.07348633f, -0.051513672f, 0.021484375f, 0.04638672f, 0.029541016f, -0.052001953f, -0.08618164f, + 0.075927734f, -0.19604492f, 0.046875f, -0.00048828125f, -0.052978516f, -0.03491211f, 0.19067383f, 0.08520508f, -0.16113281f, -0.29785156f, -0.22558594f, -0.07006836f, 0.053955078f, 0.1550293f, 0.19042969f, 0.2409668f, + 0.08227539f, 0.26464844f, -0.15332031f, -0.140625f, -0.0068359375f, 0.060302734f, -0.05126953f, -0.23339844f, -0.28442383f, -0.14160156f, 0.0793457f, 0.23828125f, 0.20678711f, 0.09716797f, 0.014892578f, -0.032470703f, + 0.20581055f, -0.19702148f, 0.053466797f, 0.026855469f, -0.011962891f, -0.04663086f, -0.11254883f, 0.060058594f, 0.33984375f, 0.33447266f, -0.14257812f, -0.37719727f, -0.21850586f, 0.016845703f, 0.08325195f, -0.013916016f, + 0.34375f, -0.38623047f, -0.06542969f, -0.07348633f, -0.107421875f, 0.037353516f, 0.14477539f, 0.01586914f, 0.0026855469f, 0.08959961f, 0.19433594f, 0.1027832f, -0.03149414f, -0.060058594f, -0.1003418f, -0.10668945f, + 0.12841797f, 0.01953125f, 0.16333008f, 0.22827148f, -0.16015625f, -0.42016602f, -0.19067383f, 0.08642578f, 0.08520508f, -0.022705078f, 0.011230469f, 0.013671875f, -0.0034179688f, 0.019042969f, -0.005859375f, 0.047851562f, + 0.02734375f, 0.008056641f, -0.07470703f, 0.114990234f, 0.0021972656f, -0.41796875f, 0.5605469f, -0.28735352f, 0.022949219f, -0.07739258f, -0.028808594f, 0.1928711f, 0.056152344f, 0.0053710938f, -0.048583984f, -0.055419922f, + -0.037109375f, 0.12939453f, -0.38671875f, -0.095214844f, 0.0021972656f, -0.012451172f, 0.19677734f, 0.2578125f, 0.12670898f, -0.10180664f, -0.087890625f, 0.009521484f, 0.1418457f, 0.14526367f, -0.076660156f, -0.21166992f, + 0.29711914f, 0.06616211f, -0.375f, -0.080566406f, 0.1484375f, -0.0007324219f, -0.020996094f, 0.013427734f, -0.014160156f, -0.11279297f, -0.08081055f, -0.056152344f, -0.13769531f, -0.060546875f, 0.10595703f, 0.30810547f, + -0.025146484f, 0.023925781f, -0.02758789f, -0.0009765625f, 0.08178711f, -0.13452148f, -0.022949219f, 0.6875f, -0.39794922f, -0.123046875f, 0.06738281f, 0.04345703f, -0.053955078f, -0.0146484375f, -0.045410156f, -0.05810547f, + 0.0146484375f, 0.041748047f, -0.024902344f, 0.005126953f, -0.079589844f, -0.04638672f, -0.028320312f, 0.021972656f, -0.11450195f, -0.118896484f, -0.041748047f, -0.001953125f, -0.2783203f, 0.33154297f, 0.64575195f, -0.32543945f, + -0.13989258f, -0.020019531f, 0.3137207f, -0.53271484f, 0.3154297f, 0.037353516f, -0.04272461f, -0.059326172f, -0.05444336f, -0.009765625f, -0.0073242188f, 0.015380859f, 0.0769043f, 0.08251953f, 0.01171875f, 0.013427734f, + -0.049804688f, 0.022949219f, -0.08227539f, -0.08544922f, 0.012451172f, 0.015380859f, -0.2241211f, 0.15625f, -0.19750977f, 0.5703125f, -0.3684082f, 0.072753906f, 0.4711914f, -0.35888672f, 0.14697266f, -0.10205078f, + -0.17138672f, -0.19067383f, -0.21411133f, -0.030517578f, 0.09667969f, -0.087402344f, -0.09643555f, 0.017089844f, 0.08666992f, 0.041503906f, 0.05908203f, 0.034179688f, 0.08129883f, 0.12841797f, 0.12011719f, 0.12548828f, + -0.044921875f, 0.0061035156f, 0.037841797f, 0.017089844f, 0.064453125f, 0.008300781f, -0.20532227f, -0.025146484f, 0.07397461f, 0.06225586f, -0.15991211f, -0.27612305f, 0.44873047f, 0.14111328f, -0.40893555f, 0.26049805f, + -0.14941406f, 0.17773438f, 0.022949219f, -0.125f, 0.00048828125f, 0.19018555f, 0.03857422f, -0.039794922f, 0.09448242f, 0.20214844f, 0.22436523f, 0.111572266f, -0.08081055f, -0.16992188f, -0.25146484f, -0.24633789f, + -0.09350586f, 0.028076172f, -0.04272461f, 0.05419922f, 0.01586914f, -0.16870117f, -0.30395508f, -0.17285156f, 0.0690918f, 0.30541992f, 0.23266602f, -0.09082031f, 0.1340332f, 0.3449707f, 0.036621094f, -0.3486328f, + -0.20019531f, -0.10449219f, 0.041992188f, 0.09350586f, 0.010253906f, 0.04711914f, 0.26342773f, 0.23852539f, 0.13598633f, -0.04296875f, -0.063964844f, -0.13769531f, -0.18164062f, -0.10083008f, -0.033691406f, 0.03491211f, + 0.14648438f, 0.02758789f, 0.33984375f, -0.005126953f, -0.09887695f, 0.04272461f, -0.18652344f, -0.33129883f, -0.14208984f, 0.040039062f, 0.036376953f, -0.072509766f, -0.119628906f, -0.0017089844f, 0.09448242f, 0.23046875f, + 0.23852539f, 0.26513672f, 0.034179688f, 0.04272461f, 0.05053711f, 0.03466797f, 0.12182617f, 0.03930664f, -0.018066406f, -0.095947266f, -0.107666016f, -0.16040039f, -0.17211914f, -0.12524414f, -0.09716797f, -0.05078125f, + -0.08178711f, -0.05126953f, -0.20507812f, 0.115478516f, 0.14453125f, -0.010986328f, -0.16357422f, -0.05102539f, 0.037597656f, 0.24365234f, 0.38452148f, 0.05444336f, -0.40283203f, -0.21972656f, 0.0793457f, 0.12695312f, + -0.2548828f, -0.28222656f, 0.19628906f, 0.2890625f, 0.047851562f, -0.034179688f, 0.012451172f, -0.1159668f, -0.20947266f, -0.08154297f, 0.13427734f, 0.16333008f, 0.07885742f, 0.05078125f, 0.013427734f, -0.0078125f, + -0.067871094f, 0.02368164f, -0.010986328f, -0.037109375f, -0.19140625f, 0.118896484f, -0.020019531f, -0.3955078f, 0.5673828f, -0.02758789f, -0.23950195f, 0.103759766f, -0.04736328f, 0.029785156f, 0.07495117f, 0.118896484f, + 0.095214844f, -0.0078125f, 0.36035156f, -0.075927734f, -0.20385742f, 0.0625f, 0.15332031f, 0.044921875f, 0.0041503906f, -0.13793945f, -0.1472168f, 0.015136719f, 0.17504883f, 0.1105957f, -0.14648438f, -0.30151367f, + 0.063964844f, -0.0234375f, 0.07739258f, -0.24169922f, 0.041015625f, 0.18823242f, -0.43701172f, 0.25976562f, 0.25097656f, -0.37182617f, 0.040771484f, 0.2590332f, 0.0036621094f, -0.044677734f, -0.03173828f, -0.03466797f, + 0.025390625f, 0.09301758f, 0.11328125f, -0.027832031f, -0.0087890625f, -0.0703125f, 0.028320312f, -0.052734375f, -0.1953125f, -0.32617188f, 0.67871094f, -0.07397461f, -0.15039062f, -0.0703125f, -0.02758789f, 0.064697266f, + -0.049560547f, 0.15551758f, -0.016113281f, -0.27661133f, -0.30371094f, -0.13427734f, 0.08203125f, 0.09814453f, 0.07495117f, 0.038330078f, 0.055664062f, -0.00390625f, -0.018554688f, 0.0390625f, 0.10620117f, 0.15283203f, + -0.04321289f, -0.18408203f, -0.045654297f, -0.05029297f, 0.21191406f, 0.5300293f, 0.09716797f, -0.12866211f, -0.09423828f, -0.08666992f, -0.087890625f, -0.09643555f, -0.045166016f, 0.021972656f, -0.013183594f, 0.014160156f, + -0.0017089844f, -0.014160156f, -0.048339844f, -0.037109375f, -0.0949707f, -0.005859375f, 0.48388672f, -0.17480469f, -0.19140625f, 0.5727539f, -0.18920898f, -0.26391602f, 0.0048828125f, 0.067871094f, -0.045654297f, -0.06201172f, +}; + +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 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 ] = { + 1.0144043f, 1.1826172f, 0.3269043f, -0.6411133f, -1.2163086f, -1.1411133f, -1.1525879f, -0.8898926f, -0.19604492f, 0.7402344f, 1.1782227f, 1.0830078f, 0.78222656f, 0.26953125f, -0.33203125f, -1.0080566f, + -0.38916016f, -0.31347656f, -1.1826172f, -2.036621f, -2.086914f, -1.8569336f, -1.637207f, -1.3156738f, -0.4182129f, 0.50634766f, 1.2770996f, 1.3771973f, 1.8566895f, 2.3503418f, 2.3015137f, 1.5678711f, + 0.43652344f, 1.8859863f, 2.8059082f, 2.2385254f, 1.5480957f, 0.14331055f, 0.07299805f, -1.1218262f, -1.1103516f, -0.7336426f, -0.4194336f, -0.89624023f, -1.0429688f, -0.79785156f, -1.204834f, -1.8046875f, + 1.5612793f, 0.9321289f, 0.58740234f, 0.46313477f, 0.21899414f, 0.0625f, -0.16918945f, -0.34423828f, -0.44726562f, -0.61035156f, -0.6398926f, -0.57177734f, -0.38500977f, -0.25927734f, -0.20898438f, -0.18945312f, + 1.0131836f, 1.9333496f, 0.8395996f, -0.4963379f, -0.66015625f, -0.38012695f, 0.056396484f, 0.31201172f, 0.810791f, 0.66674805f, -0.022705078f, -0.7980957f, -0.9230957f, -0.63134766f, -0.68530273f, -1.034668f, + -0.842041f, -0.08642578f, 0.49243164f, 0.5827637f, 1.1630859f, 1.3693848f, 0.7233887f, 0.2705078f, 0.34692383f, 0.0068359375f, -0.2319336f, -0.33032227f, -0.5895996f, -0.67626953f, -0.9953613f, -1.2033691f, + 2.0810547f, 1.8205566f, 1.1000977f, 0.47216797f, 0.08251953f, -0.48510742f, -0.67285156f, -0.55322266f, -0.4777832f, -0.546875f, -0.579834f, -0.5891113f, -0.5119629f, -0.4255371f, -0.32910156f, -0.38500977f, + 1.730957f, 1.3063965f, 0.53466797f, 0.23144531f, 0.04248047f, 0.0036621094f, 0.0949707f, 0.15942383f, 0.1977539f, 0.19946289f, 0.21899414f, 0.064697266f, -0.43408203f, -0.94750977f, -1.5297852f, -1.8735352f, + 1.6611328f, 2.8601074f, 1.7668457f, -0.12988281f, -0.27978516f, 1.199707f, 1.4865723f, 1.220459f, 0.61865234f, -1.2509766f, -1.5700684f, -1.3425293f, -1.3532715f, -1.3083496f, -1.5671387f, -2.0112305f, + 1.8820801f, 0.6086426f, -0.52319336f, -1.5842285f, -1.2685547f, -0.9067383f, -0.6323242f, -0.203125f, -0.25878906f, 0.091796875f, 0.18286133f, 1.2060547f, 1.0129395f, -0.049560547f, -0.1274414f, 0.5698242f, + 0.60498047f, 1.1367188f, 1.5297852f, 1.9936523f, 1.9726562f, 1.9311523f, 1.7668457f, 1.3752441f, 0.939209f, 0.020019531f, -0.72558594f, -1.3706055f, -2.269043f, -2.7990723f, -3.010254f, -3.0957031f, + -0.9187012f, 0.107177734f, 0.32495117f, -0.051513672f, -0.2746582f, 0.2043457f, 0.8605957f, 0.30737305f, 0.064208984f, -0.1743164f, -0.5998535f, -0.7624512f, -0.10864258f, 0.49975586f, 0.40283203f, 0.118896484f, + 1.0822754f, 0.7507324f, 0.47460938f, 0.00390625f, -0.28881836f, -0.5131836f, -0.62158203f, -0.6550293f, -0.59228516f, -0.42895508f, -0.17675781f, 0.061035156f, 0.119140625f, 0.037109375f, 0.24267578f, 0.5046387f, + -2.3117676f, -1.2453613f, -0.7062988f, -0.83813477f, -0.5036621f, 0.040039062f, 0.6281738f, 0.93115234f, 0.826416f, 0.3791504f, 0.19970703f, -0.023925781f, 0.35913086f, 0.953125f, 0.87280273f, 0.43969727f, + 3.8930664f, 4.2009277f, 3.1296387f, 2.685791f, 2.1108398f, 2.032959f, 0.046142578f, -1.3862305f, -1.6176758f, -1.9997559f, -2.130371f, -2.1767578f, -2.213623f, -2.2236328f, -2.1501465f, -2.201416f, + -1.3452148f, -0.43041992f, 0.38720703f, 1.0549316f, 1.4541016f, 1.6882324f, 1.3688965f, 0.44335938f, -0.037109375f, -0.23144531f, -0.5349121f, -0.7902832f, -0.81152344f, -0.73876953f, -0.6965332f, -0.78027344f, + 2.1210938f, 2.654541f, 2.0202637f, 1.1313477f, 0.42333984f, -0.13598633f, -0.31591797f, -0.38500977f, -0.37548828f, -0.7619629f, -0.9873047f, -1.046875f, -0.9699707f, -0.99975586f, -1.0686035f, -1.3034668f, + 2.0297852f, 0.09301758f, -1.026123f, -1.6860352f, -0.5925293f, 0.7067871f, 1.1433105f, -0.31152344f, -0.8725586f, -0.37524414f, 0.09326172f, -0.4165039f, -0.375f, -0.32592773f, 0.65185547f, 1.2634277f, + 0.49169922f, 1.6848145f, 1.8188477f, 2.048584f, 1.3818359f, 1.3059082f, 0.8100586f, 0.15429688f, -0.40161133f, -1.7539062f, -2.8208008f, -1.5043945f, -0.54663086f, -0.9963379f, -0.7890625f, -0.8833008f, + 0.60131836f, 1.9431152f, 1.1845703f, -0.50927734f, -0.51708984f, 0.7182617f, 0.6542969f, 0.06665039f, -0.48120117f, -0.9313965f, -1.0275879f, -0.9108887f, -0.48168945f, 0.055664062f, 0.17333984f, -0.5378418f, + 0.5378418f, 0.47216797f, 0.17480469f, -0.3022461f, -0.19726562f, -0.030517578f, -0.008544922f, 0.009277344f, -0.033935547f, -0.022705078f, 0.20629883f, 0.45239258f, 0.18237305f, -0.14233398f, -0.50561523f, -0.7922363f, + -2.0576172f, -2.215088f, -1.0456543f, -0.07910156f, 1.4833984f, 1.3276367f, -0.119140625f, -0.638916f, -0.06713867f, 0.8666992f, -0.25634766f, -0.041503906f, 1.1413574f, 1.0339355f, 0.5041504f, 0.16333008f, + 2.7668457f, 2.9187012f, 1.6850586f, 0.47216797f, -0.3696289f, -0.70288086f, -0.7890625f, -1.034668f, -0.8354492f, -0.69262695f, -0.6418457f, -0.70751953f, -0.6467285f, -0.49682617f, -0.49023438f, -0.43530273f, + 0.104003906f, 0.9812012f, 1.1506348f, 0.9128418f, 0.81933594f, 0.8522949f, 0.7446289f, 0.46069336f, 0.31347656f, -0.06542969f, -0.49536133f, -0.85302734f, -1.0515137f, -1.0839844f, -1.2729492f, -1.5166016f, + 0.5107422f, 1.4162598f, 2.0109863f, 2.331787f, 1.6552734f, 0.8979492f, 0.6035156f, 0.2487793f, 0.26049805f, -0.26416016f, -0.7624512f, -1.2497559f, -1.8212891f, -1.807373f, -1.8876953f, -2.1430664f, + 0.23461914f, 0.3942871f, -0.2163086f, -1.0683594f, -1.3544922f, -1.2963867f, -1.2163086f, -1.192627f, -0.8947754f, -0.36083984f, 0.29248047f, 0.6989746f, 1.1608887f, 1.6723633f, 1.8217773f, 1.324707f, + 3.0012207f, 3.3725586f, 2.8825684f, 2.7036133f, 2.4111328f, 2.5178223f, 1.418457f, 0.048583984f, -0.7297363f, -1.8293457f, -2.4519043f, -2.5717773f, -2.6826172f, -2.7434082f, -2.6733398f, -2.673584f, + 0.061035156f, 0.7324219f, 1.2775879f, 0.8625488f, 0.2524414f, 0.092285156f, -0.13500977f, -0.41674805f, -0.52075195f, -0.7026367f, -0.69262695f, -0.5744629f, -0.4494629f, -0.08886719f, 0.17211914f, 0.1303711f, + 2.1413574f, 1.7810059f, 0.7092285f, -0.37304688f, -0.6828613f, -0.54296875f, -0.5942383f, -0.9050293f, -0.97558594f, -0.8232422f, -0.6015625f, -0.57128906f, 0.021484375f, 0.59887695f, 0.5192871f, 0.29882812f, + -1.3076172f, -0.99609375f, -0.7758789f, -0.83374023f, -0.8322754f, -0.72924805f, -0.5461426f, -0.1652832f, 0.4482422f, 1.0227051f, 1.440918f, 1.338623f, 0.89331055f, 0.6164551f, 0.42700195f, -0.0009765625f, + 2.084961f, 3.2036133f, 2.5375977f, 0.7463379f, 0.24682617f, 0.7133789f, 0.46118164f, -0.16430664f, -0.31347656f, -1.1755371f, -1.5986328f, -1.6252441f, -1.3684082f, -1.1738281f, -1.1335449f, -1.440918f, + -0.22070312f, 0.74121094f, 0.9091797f, 0.25f, 0.15161133f, 0.5371094f, 0.74902344f, 1.0612793f, 1.1540527f, 0.22924805f, -0.74438477f, -1.1445312f, -1.0881348f, -0.7956543f, -0.7746582f, -1.0144043f, + 1.8095703f, 2.084961f, 0.859375f, -0.22167969f, -0.49951172f, -0.58496094f, -0.548584f, -0.35595703f, -0.23828125f, 0.018066406f, -0.119384766f, 0.16845703f, 0.03491211f, -0.8540039f, -1.0222168f, -0.53027344f, + -2.2055664f, -2.6103516f, -2.4230957f, -2.2021484f, -0.9482422f, 1.682373f, 2.345459f, 2.1347656f, 1.9140625f, 1.019043f, 0.6623535f, 0.62719727f, 0.85546875f, 0.8095703f, -0.23144531f, -1.4296875f, + 3.0585938f, 3.8530273f, 2.633789f, 0.8532715f, -0.09008789f, -0.52685547f, -0.60375977f, -0.7915039f, -0.861084f, -1.2512207f, -1.3881836f, -1.3081055f, -1.1264648f, -0.88378906f, -0.6906738f, -0.8774414f, + 0.91845703f, 1.7211914f, 0.89575195f, -0.07543945f, -0.3798828f, -0.49023438f, -0.5810547f, -0.57666016f, -0.4921875f, -0.36206055f, -0.23706055f, -0.22924805f, -0.15600586f, 0.03100586f, 0.0703125f, -0.057128906f, + 1.3344727f, 1.2441406f, 0.20483398f, -1.0561523f, -1.0715332f, -0.12084961f, 0.96728516f, 1.5930176f, 1.1330566f, 0.115722656f, -0.45532227f, -0.44140625f, -0.5053711f, -0.8222656f, -0.96972656f, -1.1499023f, + -1.8754883f, -2.5437012f, -2.1186523f, 0.6845703f, 1.7653809f, 3.8078613f, 1.5759277f, -0.59228516f, -0.22167969f, 0.5510254f, 1.770752f, 1.2670898f, -0.85180664f, -1.3605957f, -1.5881348f, -0.27026367f, + 2.5178223f, 2.0725098f, 1.2094727f, 0.30126953f, -0.29370117f, -0.095947266f, 0.45141602f, 0.4663086f, 0.22338867f, -0.5546875f, -1.3134766f, -1.3378906f, -0.842041f, -0.87231445f, -1.0029297f, -0.92944336f, + 2.199707f, 1.7602539f, 1.2255859f, 0.74243164f, 0.45288086f, 0.3161621f, 0.076660156f, -0.23266602f, -0.5065918f, -0.6386719f, -0.6906738f, -0.6977539f, -0.798584f, -0.9692383f, -1.0688477f, -1.1706543f, + 0.3564453f, 1.670166f, 2.1064453f, 0.765625f, 0.767334f, 1.4802246f, 1.4580078f, 0.8364258f, 0.5427246f, -1.2788086f, -1.7922363f, -1.552002f, -1.4414062f, -0.9494629f, -1.151123f, -1.8183594f, + 0.35375977f, -0.44604492f, -1.1108398f, -1.5837402f, -1.3947754f, -0.6669922f, -0.16113281f, 0.10571289f, 0.3190918f, 0.5788574f, 0.6821289f, 0.7907715f, 0.7709961f, 0.59375f, 0.5800781f, 0.58813477f, + 1.2800293f, 2.3510742f, 2.9519043f, 2.9152832f, 2.5854492f, 1.7675781f, 1.0688477f, 0.4387207f, -0.19555664f, -1.513916f, -2.340332f, -2.5202637f, -2.3115234f, -2.1765137f, -2.1308594f, -2.1696777f, + -1.6928711f, -0.26049805f, 0.19189453f, -0.04711914f, 0.061279297f, 0.15258789f, 0.17089844f, 0.10205078f, 0.08691406f, 0.076660156f, 0.039794922f, 0.025878906f, 0.0014648438f, 0.265625f, 0.46240234f, 0.3630371f, + 1.4794922f, 0.9511719f, 0.1184082f, -0.7175293f, -1.15625f, -0.8388672f, 0.068847656f, 0.49609375f, 0.45629883f, -0.12768555f, -0.79907227f, -0.7434082f, -0.20336914f, -0.00390625f, 0.27514648f, 0.74438477f, + -1.628418f, -0.46142578f, 0.087402344f, -0.056152344f, 0.10913086f, 0.58813477f, 0.9543457f, 1.532959f, 1.3303223f, 0.35180664f, -0.21435547f, -0.49267578f, -0.5546875f, -0.34765625f, -0.4658203f, -0.7324219f, + 2.887207f, 4.0615234f, 3.1860352f, 1.532959f, 0.4165039f, 0.19067383f, 0.57055664f, -0.7878418f, -1.2619629f, -1.8005371f, -1.6381836f, -1.4213867f, -1.5876465f, -1.5568848f, -1.2424316f, -1.548584f, + 0.1184082f, 0.16186523f, 0.17089844f, 0.52856445f, 0.48364258f, 0.23583984f, 0.091796875f, 0.4477539f, 0.56103516f, 0.3972168f, 0.27197266f, 0.17138672f, -0.1850586f, -0.74194336f, -1.204834f, -1.5085449f, + 3.7294922f, 2.5002441f, 1.5256348f, 0.701416f, 0.19116211f, 0.07861328f, 0.24267578f, 0.4243164f, 0.23217773f, -0.4404297f, -1.0891113f, -1.3295898f, -1.3798828f, -1.6437988f, -1.8586426f, -1.8840332f, + -1.0793457f, -0.54956055f, -0.53271484f, -0.8959961f, -0.7878418f, -0.50390625f, -0.45898438f, -0.45410156f, -0.14868164f, 0.07495117f, 0.30126953f, 0.5197754f, 0.8623047f, 1.3652344f, 1.3466797f, 0.9406738f, + 0.8203125f, 1.934082f, 2.6530762f, 2.293457f, 1.5932617f, 0.25708008f, 0.46289062f, 0.7038574f, 0.39990234f, -1.3444824f, -1.871582f, -1.7602539f, -1.8720703f, -1.1584473f, -1.3552246f, -1.7556152f, + 0.6022949f, 1.5651855f, 2.024414f, 1.043457f, 0.5551758f, 0.29516602f, -0.059326172f, -0.29589844f, -0.28930664f, -0.6899414f, -0.87158203f, -0.8222656f, -0.8574219f, -0.74438477f, -0.65722656f, -0.7980957f, + 0.7392578f, 1.7915039f, 1.7841797f, 1.0437012f, 0.2434082f, -0.5f, -0.76123047f, -0.9995117f, -0.77856445f, -0.61450195f, -0.4025879f, -0.36132812f, -0.16894531f, 0.123046875f, -0.3190918f, -0.8190918f, + -3.3479004f, -2.8823242f, -1.7409668f, -0.01928711f, 1.5759277f, 1.565918f, -0.14379883f, -1.1428223f, -0.46923828f, 1.5456543f, 0.080566406f, 0.15551758f, 1.5246582f, 1.2470703f, 1.1359863f, 0.9152832f, + 3.6564941f, 2.3999023f, 1.4855957f, 0.71728516f, 0.45483398f, 0.25854492f, -0.13500977f, -0.5534668f, -0.7763672f, -1.0727539f, -1.2416992f, -1.2087402f, -1.0163574f, -1.0344238f, -0.97924805f, -0.9543457f, + -0.26391602f, 0.7937012f, 1.5644531f, 1.7453613f, 1.2094727f, 1.2302246f, 1.0932617f, 1.0627441f, 1.1040039f, 0.16601562f, -1.6494141f, -2.2905273f, -1.9121094f, -1.423584f, -0.94140625f, -1.487793f, + 1.7485352f, 1.9509277f, 1.1413574f, 0.23828125f, 0.20532227f, 0.71972656f, 1.0627441f, 0.84375f, 0.6599121f, 0.11010742f, -0.41723633f, -1.0415039f, -1.4494629f, -1.7270508f, -1.9189453f, -2.126709f, + 1.7670898f, -0.14770508f, -0.9782715f, 0.0007324219f, 2.0344238f, 0.28637695f, -0.53125f, -1.2973633f, -1.4816895f, -1.2402344f, -1.1208496f, -1.1516113f, -0.68237305f, -0.05883789f, 1.3154297f, 3.286377f, + 2.586914f, 3.0708008f, 3.369629f, 2.663086f, 1.8154297f, 0.54467773f, 0.5966797f, 0.45703125f, -0.5554199f, -1.7521973f, -2.234375f, -2.2390137f, -2.147461f, -2.0239258f, -2.0800781f, -2.0722656f, + -0.17993164f, 0.5961914f, 0.1184082f, -0.6855469f, -0.8725586f, -0.7883301f, -0.72094727f, -0.5744629f, -0.20922852f, 0.171875f, 0.41430664f, 0.54711914f, 0.49438477f, 0.564209f, 0.64819336f, 0.4765625f, + 2.9692383f, 1.6333008f, 0.5463867f, -0.6401367f, -1.1271973f, -1.4199219f, -1.4353027f, -1.2783203f, -1.0517578f, -0.7229004f, -0.4267578f, -0.39233398f, 0.44873047f, 0.67211914f, 0.89453125f, 1.3300781f, + -0.7512207f, 0.11035156f, 0.47998047f, -0.0949707f, -0.30981445f, 0.028808594f, 0.04272461f, 0.25756836f, 0.88378906f, 1.1179199f, 0.33569336f, -0.30126953f, -0.36132812f, -0.29223633f, -0.4194336f, -0.7260742f, + 3.871582f, 3.6723633f, 2.5690918f, 1.3596191f, 1.0322266f, 1.0532227f, 0.7524414f, 0.15966797f, -0.42114258f, -1.3811035f, -1.967041f, -2.2060547f, -2.1699219f, -2.125f, -2.0786133f, -2.121582f, + 0.41601562f, 0.4086914f, 0.12915039f, 0.44995117f, 1.0292969f, 1.5f, 1.4731445f, 1.0021973f, 0.53149414f, -0.10473633f, -0.49121094f, -0.6335449f, -1.0283203f, -1.3818359f, -1.5666504f, -1.7338867f, + 1.0354004f, 0.7351074f, -0.04321289f, -0.86328125f, -1.1411133f, -0.89990234f, -0.3876953f, 0.2421875f, 0.7763672f, 0.7036133f, 0.4814453f, 0.25952148f, 0.16503906f, -0.0925293f, -0.35668945f, -0.6142578f, + -2.5014648f, -2.2893066f, -2.4162598f, -2.5559082f, -2.2287598f, -1.3945312f, -0.8725586f, -0.30419922f, 0.30200195f, 1.078125f, 1.8603516f, 1.8320312f, 2.2028809f, 2.7680664f, 2.5114746f, 2.0083008f, + 1.4338379f, 2.6071777f, 2.8693848f, 1.9367676f, 1.357666f, 0.54052734f, 0.0073242188f, -0.39257812f, -0.7956543f, -1.501709f, -1.6374512f, -1.4631348f, -1.3227539f, -1.2058105f, -1.0966797f, -1.3371582f, + 0.41577148f, 0.41992188f, 0.01171875f, -0.041748047f, 0.022460938f, 0.24536133f, 0.36010742f, 0.3203125f, 0.16088867f, -0.055664062f, -0.23950195f, -0.4645996f, -0.37817383f, -0.17480469f, -0.19140625f, -0.4104004f, + 0.1303711f, 1.1894531f, 0.9506836f, -0.5930176f, -1.2092285f, -0.53027344f, 0.7734375f, 0.6401367f, 0.54956055f, 0.3388672f, -0.5241699f, -0.9995117f, -0.2709961f, 0.33789062f, -0.091552734f, -0.69140625f, + -2.5305176f, -1.4348145f, -0.14941406f, 0.8322754f, 1.2192383f, 1.2817383f, 0.94140625f, 0.5319824f, 0.37402344f, 0.31469727f, 0.23120117f, 0.010498047f, -0.21533203f, -0.3239746f, -0.45751953f, -0.6254883f, + 1.7978516f, 2.154541f, 1.6486816f, 0.77490234f, 0.38378906f, 0.24902344f, -0.34985352f, -0.9355469f, -1.130127f, -1.3525391f, -1.317627f, -1.0749512f, -0.7229004f, -0.31201172f, 0.06225586f, 0.12475586f, + 0.8828125f, 0.72802734f, 0.59594727f, 0.3737793f, 0.5258789f, 0.72753906f, 0.43017578f, 0.18725586f, 0.06640625f, -0.23266602f, -0.42578125f, -0.50512695f, -0.5432129f, -0.6281738f, -0.92529297f, -1.2570801f, + 1.46875f, 2.616455f, 2.7822266f, 1.1652832f, 0.45581055f, 1.2355957f, 1.2653809f, 0.935791f, 0.5776367f, -0.87597656f, -2.5498047f, -2.6628418f, -2.2028809f, -1.3466797f, -0.9621582f, -1.9025879f, + 1.5563965f, 0.4855957f, -0.31933594f, -0.8959961f, -1.0634766f, -1.0183105f, -0.9716797f, -0.8378906f, -0.4987793f, -0.14331055f, 0.14428711f, 0.31445312f, 0.6821289f, 0.88623047f, 0.87890625f, 0.8005371f, + 1.9968262f, 2.7993164f, 2.0898438f, 0.9248047f, 0.85009766f, 1.4089355f, 1.6706543f, 1.3681641f, 1.1982422f, 0.33544922f, -0.95288086f, -2.145996f, -2.8188477f, -2.941162f, -2.8947754f, -2.8886719f, + -0.75439453f, 0.16137695f, 0.33740234f, -0.19702148f, 0.5197754f, 1.2861328f, 0.42236328f, -0.20092773f, -0.11743164f, -0.69018555f, -1.1972656f, -0.7453613f, -0.053466797f, 0.39208984f, 0.7512207f, 0.08544922f, + 2.1848145f, 1.0153809f, 0.14331055f, -0.6489258f, -0.71435547f, -0.55566406f, -0.40966797f, -0.25634766f, -0.08081055f, -0.01586914f, -0.0053710938f, -0.09667969f, -0.12231445f, -0.03466797f, -0.11303711f, -0.2902832f, + -1.2324219f, -0.42993164f, -0.30273438f, -0.8486328f, -0.9147949f, -0.7001953f, 0.03955078f, 0.7734375f, 0.99438477f, 0.46484375f, 0.13891602f, 0.11425781f, 0.41381836f, 0.7363281f, 0.6113281f, 0.14208984f, + 3.2854004f, 4.0998535f, 3.8623047f, 2.496582f, 1.4880371f, -0.044189453f, -0.55981445f, -1.1950684f, -1.519043f, -1.6992188f, -1.7475586f, -1.7741699f, -1.7507324f, -1.697998f, -1.6628418f, -1.5812988f, + -0.28393555f, 0.36254883f, 0.7150879f, 1.1523438f, 1.5422363f, 1.6831055f, 0.8269043f, -0.0107421875f, -0.48364258f, -0.6828613f, -0.78930664f, -0.6608887f, -0.6298828f, -0.8183594f, -0.8984375f, -1.0241699f, + 2.4472656f, 3.3598633f, 2.1152344f, 0.58740234f, 0.088134766f, 0.080566406f, 0.12768555f, -0.83447266f, -0.66308594f, 0.3178711f, -0.046875f, -1.7287598f, -1.8405762f, -1.4956055f, -1.1696777f, -1.3449707f, + 0.053955078f, -0.54907227f, -0.64941406f, -0.40527344f, -0.1496582f, -0.067871094f, -0.1328125f, -0.15991211f, 0.044677734f, 0.25585938f, 0.31835938f, 0.16113281f, 0.25756836f, 0.36523438f, 0.30444336f, 0.3527832f, + 0.20654297f, 1.2531738f, 1.6928711f, 2.6262207f, 2.7858887f, 2.2766113f, 1.0957031f, 0.32495117f, -0.79711914f, -1.7229004f, -2.0270996f, -1.2214355f, -1.1369629f, -2.0170898f, -1.7719727f, -1.5671387f, + 2.3149414f, 2.991455f, 1.5952148f, -0.14819336f, -0.6477051f, -0.16430664f, 0.07470703f, -0.28759766f, -0.4309082f, -0.782959f, -0.9194336f, -0.9182129f, -0.76708984f, -0.43164062f, -0.51586914f, -0.96240234f, + -0.13427734f, 0.3479004f, 0.4909668f, 0.038330078f, -0.26342773f, -0.3449707f, -0.41430664f, -0.3930664f, -0.16748047f, 0.009521484f, 0.1977539f, 0.0703125f, 0.20703125f, 0.43969727f, 0.24658203f, -0.33032227f, + -2.4680176f, -2.8671875f, -1.8813477f, 0.0925293f, 2.0136719f, 1.6013184f, 0.009277344f, -0.20214844f, 0.53344727f, 1.6809082f, 0.20605469f, 0.18408203f, 1.1643066f, 0.7697754f, -0.21728516f, -0.6196289f, + 3.2966309f, 3.043457f, 1.8188477f, 0.35595703f, -0.5317383f, -1.1340332f, -1.4089355f, -1.5368652f, -1.5805664f, -1.4577637f, -1.1005859f, -0.7077637f, 0.3149414f, 0.13671875f, 0.09887695f, 0.39257812f, + 1.1394043f, 2.0166016f, 1.6103516f, 0.43041992f, 0.8642578f, 1.6750488f, 0.87231445f, -0.23657227f, -1.2756348f, -1.3154297f, -1.0163574f, -0.611084f, -0.8654785f, -0.96191406f, -0.888916f, -1.4370117f, + 1.2382812f, 2.4553223f, 2.6896973f, 1.0947266f, 0.8881836f, 0.6599121f, 0.5114746f, 0.54296875f, 0.5046387f, -0.7314453f, -1.0595703f, -1.0734863f, -1.7263184f, -1.8920898f, -1.9853516f, -2.1169434f, + 1.7275391f, 1.0910645f, 0.24316406f, -1.076416f, -1.8234863f, -2.0952148f, -1.9289551f, -1.7150879f, -1.1884766f, -0.40429688f, 0.6279297f, 1.0185547f, 1.0893555f, 1.3093262f, 1.5356445f, 1.5893555f, + 2.8112793f, 3.1445312f, 2.5549316f, 0.8642578f, 0.45751953f, 1.5227051f, 1.6352539f, 0.92749023f, -0.56347656f, -1.8974609f, -2.1052246f, -2.085205f, -1.9211426f, -1.7441406f, -1.8710938f, -1.7302246f, + 0.46118164f, 0.93188477f, 0.859375f, 0.25732422f, -0.083496094f, -0.11010742f, -0.5197754f, -0.7607422f, -0.90966797f, -1.2976074f, -1.0537109f, -0.685791f, 0.013183594f, 0.83984375f, 1.1577148f, 0.9003906f, + 3.130371f, 1.8466797f, 0.7558594f, -0.33569336f, -0.7277832f, -0.85498047f, -0.7219238f, -0.6804199f, -0.5666504f, -0.50097656f, -0.49169922f, -0.2824707f, -0.16015625f, -0.3659668f, -0.2529297f, 0.20898438f, + -1.7817383f, -0.7636719f, -0.35620117f, -0.9194336f, -0.89990234f, -0.30371094f, 0.16333008f, 0.53393555f, 1.2219238f, 1.6164551f, 1.0964355f, 0.36914062f, 0.19091797f, 0.19116211f, -0.06689453f, -0.2919922f, + 2.9470215f, 2.9702148f, 2.4978027f, 1.8425293f, 1.1940918f, 0.48754883f, 0.040771484f, -0.4560547f, -0.71777344f, -1.255127f, -1.7084961f, -1.8168945f, -1.6584473f, -1.5026855f, -1.380127f, -1.4846191f, + -0.42797852f, 0.39672852f, 1.0322266f, 0.8232422f, 0.57055664f, 0.99194336f, 1.0778809f, 0.47460938f, 0.11987305f, -0.65625f, -1.3706055f, -1.3859863f, -0.93652344f, -0.296875f, -0.060302734f, -0.35253906f, + 3.0546875f, 1.5651855f, 0.72753906f, 0.024658203f, -0.087646484f, -0.13623047f, -0.22338867f, -0.051513672f, -0.01977539f, -0.13867188f, -0.29052734f, -0.4897461f, -0.6779785f, -0.89501953f, -1.0483398f, -1.3132324f, + -2.329834f, -1.6538086f, -1.5170898f, -1.8430176f, -1.7233887f, -0.94091797f, -0.39746094f, 0.51293945f, 1.3725586f, 1.703125f, 1.6044922f, 1.3227539f, 1.2766113f, 1.1901855f, 0.91308594f, 0.5095215f, + 2.1574707f, 3.0603027f, 2.765625f, 1.7712402f, 0.6225586f, -0.6166992f, -1.060791f, -1.5693359f, -1.4384766f, -1.7651367f, -1.7729492f, -1.0949707f, -0.46020508f, -0.0690918f, -0.05444336f, -0.47509766f, + 2.2287598f, 2.074707f, 1.065918f, 0.068603516f, -0.88061523f, -1.3867188f, -1.3818359f, -1.2768555f, -0.8725586f, -0.45751953f, -0.083984375f, -0.022460938f, 0.36108398f, 0.47192383f, 0.12597656f, -0.03466797f, + 1.2832031f, 2.3029785f, 1.6501465f, -0.19360352f, -0.94384766f, -0.11206055f, 1.2709961f, 1.0712891f, 0.9008789f, -0.6833496f, -1.9458008f, -1.3894043f, -0.7553711f, -0.17016602f, -0.6489258f, -1.637207f, + -0.5410156f, -1.4377441f, -0.87109375f, 0.72143555f, 2.3781738f, 1.8154297f, 0.05834961f, -0.24487305f, 0.27124023f, 1.1665039f, -0.2692871f, -0.24609375f, 0.4802246f, -0.34033203f, -1.2138672f, -1.7270508f, + 2.6340332f, 1.8164062f, 0.6784668f, -0.16235352f, -0.64208984f, -0.7529297f, -0.32080078f, 0.12548828f, 0.14257812f, -0.51123047f, -1.1225586f, -1.2424316f, -0.41625977f, -0.21459961f, -0.12768555f, 0.115722656f, + 1.6694336f, 1.4055176f, 1.2404785f, 1.4047852f, 1.1928711f, 0.6352539f, 0.19091797f, 0.040527344f, -0.056884766f, -0.5456543f, -0.94018555f, -1.1928711f, -1.1975098f, -1.208252f, -1.2277832f, -1.4104004f, + 0.92211914f, 2.1171875f, 1.9343262f, 0.67529297f, 0.21362305f, 0.7409668f, 0.51538086f, 0.0625f, -0.16113281f, -0.91918945f, -1.6809082f, -1.9360352f, -1.3974609f, -0.3359375f, 0.015625f, -0.7668457f, + 0.25463867f, 0.27246094f, -0.6647949f, -1.6083984f, -1.6931152f, -1.6413574f, -1.2963867f, 0.03149414f, 1.244873f, 0.9958496f, 0.88183594f, 0.7229004f, 0.6281738f, 1.152832f, 0.7297363f, -0.010498047f, + 0.27026367f, 1.5710449f, 2.415039f, 2.5617676f, 2.4665527f, 2.0825195f, 1.2067871f, 1.4360352f, 1.3601074f, -0.64990234f, -2.3432617f, -2.7763672f, -2.7404785f, -2.4682617f, -2.0534668f, -2.338623f, + -1.222168f, -0.23828125f, 0.42578125f, 0.41064453f, 0.033203125f, -0.22485352f, -0.31201172f, -0.5358887f, -0.5847168f, -0.4008789f, 0.018066406f, 0.2524414f, 0.36035156f, 0.55249023f, 0.7241211f, 0.74121094f, + 1.2573242f, 1.1115723f, 0.8808594f, 0.30810547f, -0.3330078f, -0.22290039f, 0.3894043f, 0.5810547f, 0.515625f, -0.11450195f, -0.8071289f, -0.9470215f, -0.68603516f, -0.69140625f, -0.68188477f, -0.5600586f, + -0.8679199f, -0.78100586f, -0.484375f, -0.22045898f, 0.21899414f, 0.6074219f, 0.4650879f, 0.6303711f, 0.52783203f, 0.1328125f, 0.10913086f, 0.28027344f, 0.15795898f, -0.02734375f, -0.22827148f, -0.52075195f, + 4.7766113f, 4.218994f, 2.694336f, 1.4052734f, 0.46484375f, 0.12695312f, -0.52441406f, -1.1826172f, -1.3425293f, -1.4343262f, -1.5407715f, -1.5932617f, -1.5834961f, -1.5500488f, -1.4814453f, -1.4541016f, + -1.1142578f, 0.16772461f, 1.0881348f, 0.9880371f, 0.6081543f, 0.39868164f, 0.22387695f, 0.01953125f, 0.011230469f, 0.06982422f, -0.13208008f, -0.43896484f, -0.5744629f, -0.34423828f, -0.4321289f, -0.5390625f, + 2.583496f, 2.133545f, 1.5522461f, 1.1113281f, 1.237793f, 1.3144531f, 0.93115234f, 0.35742188f, -0.20263672f, -0.76342773f, -1.1687012f, -1.4487305f, -1.6181641f, -1.8156738f, -2.0007324f, -2.203125f, + -2.0124512f, -1.4799805f, -1.4538574f, -1.4958496f, -1.1079102f, -0.4272461f, -0.17285156f, 0.080322266f, 0.3112793f, 0.5344238f, 0.6477051f, 0.64208984f, 1.0615234f, 1.8166504f, 1.7543945f, 1.3015137f, + 0.86035156f, 1.9960938f, 2.592041f, 2.7302246f, 2.2209473f, 1.1103516f, 0.720459f, -0.033691406f, -0.48901367f, -1.1772461f, -2.2160645f, -2.621338f, -2.5187988f, -1.5297852f, -0.41210938f, -1.2324219f, + -0.0390625f, 0.7182617f, 1.293457f, 1.6416016f, 1.7243652f, 0.44335938f, -0.36767578f, -0.62646484f, -0.14038086f, -0.39379883f, -1.5004883f, -1.2729492f, -0.65112305f, -0.21801758f, -0.15991211f, -0.45117188f, + 0.4506836f, 1.1796875f, 1.0358887f, 0.4663086f, 0.12597656f, -0.20898438f, -0.2524414f, -0.18115234f, -0.17993164f, -0.23266602f, -0.12768555f, -0.010009766f, -0.23925781f, -0.46972656f, -0.58251953f, -0.7739258f, + -3.7177734f, -3.4355469f, -1.828125f, 0.23046875f, 1.5246582f, 1.4841309f, 0.20214844f, -0.1538086f, 0.41015625f, 1.4714355f, 0.095214844f, 0.12524414f, 1.3300781f, 1.3466797f, 0.51538086f, 0.40014648f, + 4.776123f, 2.9377441f, 1.6135254f, 0.27954102f, -0.32666016f, -0.5793457f, -0.78466797f, -0.77001953f, -0.76538086f, -0.8562012f, -0.86694336f, -0.8532715f, -0.77905273f, -0.9621582f, -1.0119629f, -1.0510254f, + -0.8840332f, -0.5324707f, 0.2368164f, 2.0664062f, 2.5444336f, 1.9240723f, 1.4997559f, 1.230957f, 0.736084f, 0.2121582f, -0.61987305f, -0.9506836f, -1.2260742f, -1.7910156f, -2.0410156f, -2.4060059f, + 1.1203613f, 2.241455f, 1.5061035f, 0.26416016f, 0.083496094f, 0.087646484f, 0.00390625f, 0.03100586f, 0.08154297f, -0.39648438f, -0.56689453f, -0.62158203f, -0.7219238f, -0.796875f, -0.9807129f, -1.3356934f, + 0.8803711f, -0.5605469f, -0.89404297f, -1.1616211f, -0.9255371f, -1.3374023f, -1.1962891f, -1.2824707f, -1.3156738f, -1.2546387f, -1.0393066f, -0.041015625f, 1.5158691f, 1.6071777f, 2.4050293f, 4.5998535f, + 2.1367188f, 3.0183105f, 2.89917f, 2.105713f, 1.6914062f, 1.2595215f, 1.072998f, 0.5095215f, 0.26293945f, -0.62719727f, -1.6728516f, -2.331543f, -2.5375977f, -2.6152344f, -2.5966797f, -2.5751953f, + 0.45410156f, 0.56274414f, -0.091552734f, -0.82177734f, -0.8930664f, -0.40722656f, 0.024902344f, 0.008056641f, -0.09692383f, -0.19360352f, -0.25634766f, -0.25048828f, 0.14941406f, 0.73461914f, 0.7668457f, 0.31030273f, + 0.8791504f, 1.3742676f, 0.6760254f, -0.22192383f, -0.8535156f, -1.0957031f, -1.0690918f, -1.1728516f, -0.9848633f, -0.6647949f, -0.11669922f, 0.06738281f, 0.6196289f, 1.0905762f, 0.9074707f, 0.5654297f, + -0.26635742f, -0.29956055f, -0.8881836f, -1.2294922f, -0.69311523f, 0.011230469f, 0.5498047f, 0.9824219f, 1.184082f, 1.0895996f, 0.5878906f, 0.06738281f, -0.08911133f, -0.05029297f, -0.27319336f, -0.68359375f, + 3.256836f, 3.5593262f, 2.2746582f, 1.1318359f, 0.3149414f, -0.02368164f, 0.27172852f, -0.19335938f, -0.48779297f, -0.9663086f, -0.9187012f, -1.0222168f, -1.512207f, -1.6816406f, -1.8964844f, -2.1069336f, + -0.057617188f, -0.45092773f, -0.9638672f, -0.72143555f, 0.20703125f, 1.4692383f, 1.921875f, 1.6833496f, 1.3933105f, 0.6699219f, 0.17333984f, -0.43798828f, -0.9772949f, -1.1477051f, -1.3552246f, -1.4057617f, +}; +const float ivas_sns_cdbk_tcx10_stage2[ 32 * 16 ] = { + 0.30615234f, 0.48828125f, -0.02709961f, -0.47680664f, -0.5300293f, -0.25463867f, -0.13305664f, -0.14941406f, -0.14819336f, 0.08666992f, 0.28833008f, 0.27514648f, 0.099365234f, -0.017578125f, 0.033203125f, 0.15893555f, + 0.40942383f, -0.044189453f, -0.088378906f, 0.38720703f, 0.5151367f, 0.42236328f, 0.34960938f, 0.2680664f, 0.037597656f, -0.19970703f, -0.31054688f, -0.32617188f, -0.38452148f, -0.38085938f, -0.38598633f, -0.2692871f, + -0.16040039f, -0.37548828f, -0.41479492f, -0.1237793f, 0.25708008f, 0.29589844f, 0.045410156f, -0.04345703f, -0.11450195f, -0.2019043f, 0.032470703f, 0.5847168f, 1.074707f, 0.3178711f, -0.43847656f, -0.73535156f, + -0.72021484f, 0.0859375f, 0.36450195f, 0.07739258f, -0.03857422f, -0.020263672f, 0.2277832f, 0.23657227f, -0.061523438f, -0.6010742f, -0.5341797f, -0.014160156f, 0.3154297f, 0.35327148f, 0.27368164f, 0.05517578f, + 0.17041016f, -0.1340332f, -0.17480469f, -0.16430664f, -0.15039062f, -0.16210938f, 0.20776367f, 0.78881836f, 0.8288574f, 0.2783203f, -0.099609375f, -0.26513672f, -0.29541016f, -0.31860352f, -0.3034668f, -0.20629883f, + 0.66967773f, 0.6286621f, 0.5107422f, 0.36791992f, 0.0949707f, -0.26904297f, -0.43603516f, -0.5292969f, -0.50219727f, -0.28881836f, -0.08081055f, 0.07861328f, -0.040771484f, -0.15014648f, -0.076416016f, 0.022705078f, + -0.14648438f, -0.46923828f, -0.43554688f, -0.11254883f, 0.021728516f, -0.06274414f, -0.10620117f, -0.23876953f, -0.34277344f, -0.21069336f, 0.010009766f, 0.26293945f, 0.36938477f, 0.4560547f, 0.5004883f, 0.5041504f, + -0.6381836f, -0.37841797f, -0.12036133f, 0.46875f, 0.6027832f, 0.40478516f, 0.3227539f, 0.2175293f, 0.029296875f, 0.009521484f, 0.091552734f, 0.014160156f, -0.19921875f, -0.27270508f, -0.3071289f, -0.24560547f, + 1.0043945f, 0.034423828f, -0.36523438f, -0.1628418f, -0.17504883f, -0.16357422f, 0.01977539f, 0.041992188f, -0.092041016f, -0.12548828f, -0.1381836f, -0.15527344f, -0.13720703f, -0.041992188f, 0.11791992f, 0.33789062f, + -0.29882812f, -0.056640625f, 0.22631836f, 0.35375977f, 0.40576172f, 0.053466797f, -0.33154297f, -0.58374023f, -0.59887695f, -0.13867188f, 0.35302734f, 0.4267578f, 0.12548828f, -0.052490234f, 0.022949219f, 0.09301758f, + -0.62060547f, -0.6557617f, -0.3918457f, -0.23461914f, -0.10498047f, -0.024169922f, 0.10473633f, 0.2746582f, 0.33642578f, 0.2866211f, 0.2980957f, 0.35498047f, 0.22167969f, 0.06298828f, 0.0036621094f, 0.087890625f, + -0.24169922f, 0.39331055f, 0.45410156f, -0.013671875f, -0.028076172f, 0.032226562f, -0.03491211f, 0.13916016f, 0.57006836f, 0.30078125f, -0.028564453f, -0.08300781f, -0.23266602f, -0.25585938f, -0.40356445f, -0.56762695f, + -0.25463867f, 0.20141602f, 0.13623047f, 0.021972656f, 0.018798828f, 0.35424805f, 0.30541992f, -0.043945312f, -0.032226562f, 0.4873047f, 0.2692871f, -0.57910156f, -0.86279297f, -0.46435547f, 0.21459961f, 0.2277832f, + 0.10083008f, -0.0048828125f, 0.15429688f, 0.58935547f, 0.58325195f, 0.15014648f, -0.1394043f, -0.30566406f, -0.39794922f, -0.42016602f, -0.4350586f, -0.49121094f, -0.24169922f, 0.07788086f, 0.3359375f, 0.4440918f, + -0.8688965f, -0.12646484f, 0.37768555f, 0.3232422f, -0.09790039f, -0.3017578f, -0.11328125f, 0.06982422f, 0.10864258f, 0.10180664f, 0.019042969f, -0.020751953f, -0.025878906f, 0.01977539f, 0.15820312f, 0.37646484f, + 0.04272461f, 0.020996094f, 0.31860352f, 0.23291016f, -0.33081055f, -0.80322266f, -0.73657227f, -0.34106445f, 0.011962891f, 0.27807617f, 0.45922852f, 0.49145508f, 0.3022461f, 0.14160156f, -0.017333984f, -0.07055664f, + -0.33544922f, 0.075683594f, -0.29907227f, -0.7363281f, -0.6525879f, -0.17797852f, 0.36279297f, 0.41870117f, 0.25170898f, 0.10473633f, 0.030273438f, -0.11254883f, 0.026855469f, 0.3503418f, 0.42382812f, 0.26904297f, + 0.3544922f, 0.67529297f, 0.38671875f, 0.009521484f, -0.040771484f, 0.08984375f, 0.2446289f, 0.16455078f, -0.17333984f, -0.4404297f, -0.46533203f, -0.40039062f, -0.28222656f, -0.1875f, -0.036865234f, 0.10205078f, + 0.4255371f, 0.16113281f, -0.11669922f, -0.16040039f, -0.14379883f, -0.2055664f, -0.0769043f, -0.055419922f, -0.19677734f, -0.44921875f, -0.3100586f, 0.10839844f, 0.5698242f, 0.5554199f, 0.11328125f, -0.21850586f, + -0.2980957f, -0.51660156f, -0.51000977f, -0.23046875f, 0.24658203f, 0.49682617f, 0.44580078f, 0.4501953f, 0.15917969f, -0.25317383f, -0.34301758f, -0.25146484f, -0.045898438f, 0.07885742f, 0.19018555f, 0.38085938f, + 0.32836914f, 0.41186523f, 0.40966797f, 0.23071289f, -0.27294922f, -0.7373047f, -0.33129883f, 0.2084961f, 0.29248047f, 0.023925781f, -0.22290039f, -0.2241211f, -0.10595703f, -0.109375f, -0.049072266f, 0.14770508f, + -0.17578125f, 0.35791016f, 0.71240234f, 0.55444336f, 0.37963867f, 0.25317383f, 0.0007324219f, -0.17456055f, -0.19921875f, -0.18261719f, -0.1381836f, -0.13476562f, -0.2697754f, -0.36523438f, -0.3803711f, -0.23730469f, + 0.18774414f, -0.33813477f, -0.40356445f, -0.16430664f, -0.35253906f, -0.5744629f, -0.40454102f, 0.03930664f, 0.28295898f, 0.24194336f, 0.11450195f, -0.011962891f, 0.15576172f, 0.29174805f, 0.39453125f, 0.5402832f, + 0.22485352f, -0.44970703f, -0.048583984f, 0.5905762f, 0.5395508f, -0.08300781f, -0.50219727f, -0.24121094f, 0.2331543f, 0.15942383f, -0.044433594f, 0.043701172f, -0.01928711f, -0.19824219f, -0.17260742f, -0.03173828f, + 0.86157227f, 0.21875f, 0.039794922f, 0.023925781f, -0.0925293f, -0.16845703f, -0.11669922f, 0.080322266f, 0.061279297f, 0.123535156f, 0.23388672f, 0.23022461f, 0.0056152344f, -0.33666992f, -0.5786133f, -0.5854492f, + 0.5175781f, 0.14453125f, -0.21850586f, -0.46777344f, 0.28515625f, 0.9855957f, 0.04296875f, -0.60424805f, -0.40625f, 0.07104492f, -0.0793457f, -0.111083984f, 0.017333984f, 0.021728516f, -0.1381836f, -0.060791016f, + 0.48950195f, -0.4885254f, -0.7644043f, -0.43164062f, -0.08203125f, 0.11401367f, 0.2331543f, 0.1472168f, 0.03540039f, 0.18945312f, 0.30737305f, 0.25976562f, 0.095458984f, -0.0234375f, -0.07739258f, -0.00390625f, + -0.111816406f, 0.22485352f, 0.00048828125f, -0.32177734f, -0.1508789f, 0.43017578f, 0.7011719f, 0.35229492f, -0.12060547f, -0.23291016f, 0.15258789f, 0.19702148f, -0.064208984f, -0.21606445f, -0.3857422f, -0.4543457f, + -0.22290039f, -0.33740234f, 0.068359375f, 0.09277344f, 0.04638672f, 0.21899414f, -0.03564453f, 0.036621094f, 0.6125488f, 0.5058594f, -0.4128418f, -0.69140625f, -0.5534668f, 0.16235352f, 0.54418945f, -0.034179688f, + -0.013916016f, 0.41259766f, 0.28393555f, -0.13085938f, -0.35058594f, -0.3713379f, -0.2619629f, -0.2854004f, -0.36401367f, -0.41210938f, -0.30444336f, -0.16552734f, 0.076416016f, 0.40722656f, 0.72143555f, 0.75878906f, + -0.78149414f, 0.05517578f, 0.09863281f, -0.35083008f, -0.29174805f, 0.1352539f, 0.10620117f, -0.3515625f, -0.27514648f, 0.15917969f, 0.34326172f, 0.2626953f, 0.39916992f, 0.42089844f, 0.20947266f, -0.1394043f, + -0.20361328f, -0.21557617f, -0.16308594f, -0.041748047f, -0.111083984f, -0.057617188f, 0.0390625f, 0.013183594f, 0.17358398f, 0.74902344f, 0.9448242f, 0.4477539f, -0.09423828f, -0.32739258f, -0.50634766f, -0.6467285f, +}; +const float ivas_sns_cdbk_tcx10_stage3[ 8 * 16 ] = { + 0.15209961f, -0.12768555f, 0.09375f, -0.083496094f, -0.25390625f, 0.12524414f, 0.2993164f, -0.09863281f, -0.34814453f, -0.2434082f, -0.11254883f, -0.060058594f, 0.032470703f, 0.15527344f, 0.23413086f, 0.2355957f, + -0.16235352f, -0.111083984f, -0.3173828f, -0.25634766f, 0.13842773f, 0.29858398f, 0.10498047f, 0.11743164f, 0.26611328f, 0.05444336f, -0.1459961f, -0.19238281f, 0.041748047f, 0.2097168f, 0.07421875f, -0.12011719f, + -0.05078125f, 0.14770508f, -0.1003418f, -0.32104492f, -0.17504883f, -0.18652344f, -0.27148438f, -0.07788086f, 0.0036621094f, -0.04296875f, 0.10131836f, 0.34985352f, 0.3083496f, 0.10107422f, 0.0769043f, 0.13696289f, + -0.19140625f, -0.030273438f, 0.22509766f, 0.079589844f, -0.27148438f, -0.19604492f, 0.27929688f, 0.3503418f, 0.10424805f, 0.0061035156f, 0.06542969f, 0.11669922f, 0.036865234f, -0.1303711f, -0.22705078f, -0.21655273f, + 0.26538086f, -0.20825195f, -0.25073242f, 0.119628906f, 0.27270508f, 0.17797852f, -0.0024414062f, -0.12768555f, -0.22802734f, 0.0075683594f, 0.2133789f, 0.19482422f, 0.045898438f, -0.1184082f, -0.17797852f, -0.18383789f, + 0.2565918f, 0.24658203f, 0.1015625f, -0.029296875f, -0.14355469f, -0.13989258f, -0.20751953f, -0.19677734f, 0.17504883f, 0.41601562f, 0.13085938f, -0.20532227f, -0.16235352f, 0.040771484f, -0.037353516f, -0.24511719f, + -0.0871582f, 0.022949219f, 0.00048828125f, 0.07397461f, 0.14379883f, 0.067871094f, 0.0036621094f, 0.1171875f, 0.087402344f, 0.0012207031f, -0.075927734f, -0.11352539f, -0.31420898f, -0.38916016f, -0.022949219f, 0.484375f, + -0.1821289f, 0.060058594f, 0.24780273f, 0.41674805f, 0.2890625f, -0.1472168f, -0.20581055f, -0.083984375f, -0.060302734f, -0.19921875f, -0.17651367f, -0.08984375f, 0.011230469f, 0.13110352f, 0.080078125f, -0.09106445f, +}; + +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 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_cdbks_side_tcx20_stage1[ 32 * 16 ] = { + -0.11376953f, -0.06591797f, 0.041992188f, 0.044677734f, 0.17871094f, -0.02758789f, -0.32592773f, -0.21069336f, -0.049072266f, 0.0126953125f, 0.012939453f, 0.015136719f, 0.08203125f, 0.12670898f, 0.12695312f, 0.15112305f, + -0.017089844f, 0.09326172f, 0.2355957f, 0.2241211f, 0.107421875f, 0.05029297f, 0.039794922f, -0.0073242188f, -0.048339844f, -0.0871582f, -0.08520508f, -0.12060547f, -0.111572266f, -0.10620117f, -0.08911133f, -0.078125f, + -0.26635742f, 0.27368164f, 0.4543457f, 0.1821289f, 0.6513672f, 0.18066406f, 0.14575195f, -0.008056641f, 0.2631836f, -0.045898438f, -0.52001953f, -0.1628418f, 0.038330078f, -0.31811523f, -0.4321289f, -0.43603516f, + -0.044189453f, -0.10449219f, -0.091796875f, -0.10620117f, -0.09423828f, 0.09326172f, 0.2697754f, 0.16577148f, 0.06201172f, 0.010986328f, 0.021728516f, -0.023925781f, -0.036621094f, -0.03930664f, -0.04345703f, -0.03930664f, + 0.4099121f, 0.06323242f, -0.021972656f, -0.014404297f, -0.013916016f, -0.018554688f, -0.052246094f, -0.051757812f, -0.03173828f, -0.03491211f, -0.02758789f, -0.05859375f, -0.045410156f, -0.042236328f, -0.038085938f, -0.021484375f, + 0.0024414062f, 0.030761719f, 0.020263672f, 0.013671875f, -0.009033203f, 0.012939453f, 0.009521484f, -0.030273438f, -0.048339844f, -0.022216797f, 0.011962891f, -0.017333984f, -0.011474609f, -0.0007324219f, 0.011962891f, 0.025634766f, + 0.17358398f, 0.22387695f, 0.19702148f, -0.019042969f, -0.27514648f, -0.5378418f, -0.30688477f, -0.03540039f, 0.0007324219f, -0.049560547f, 0.07519531f, 0.052246094f, 0.12670898f, 0.16308594f, 0.12133789f, 0.09033203f, + -0.32006836f, -0.29125977f, -0.24731445f, -0.17797852f, -0.140625f, -0.10595703f, -0.12670898f, -0.10864258f, -0.08618164f, -0.07421875f, 0.030517578f, 0.15917969f, 0.24975586f, 0.31518555f, 0.40893555f, 0.5151367f, + -0.49658203f, -0.033691406f, 0.083740234f, 0.04272461f, 0.03466797f, 0.053955078f, 0.03466797f, 0.02368164f, 0.037597656f, 0.03173828f, 0.028320312f, 0.00024414062f, 0.028564453f, 0.030761719f, 0.044189453f, 0.055419922f, + -0.040527344f, 0.022460938f, 0.009765625f, 0.036865234f, 0.055664062f, 0.046875f, 0.032470703f, 0.08105469f, 0.095703125f, 0.04296875f, -0.0087890625f, -0.064697266f, -0.057373047f, -0.04711914f, -0.09765625f, -0.107666016f, + 0.27148438f, 0.3696289f, 0.39672852f, 0.38427734f, 0.30151367f, 0.21655273f, 0.15551758f, 0.12133789f, -0.008056641f, -0.12792969f, -0.22973633f, -0.39111328f, -0.4465332f, -0.46826172f, -0.35986328f, -0.18530273f, + -0.3166504f, -0.2758789f, -0.22290039f, -0.1850586f, -0.15771484f, -0.1184082f, -0.04638672f, 0.032470703f, 0.10961914f, 0.16821289f, 0.20336914f, 0.1665039f, 0.20019531f, 0.19970703f, 0.14233398f, 0.1003418f, + -0.028076172f, -0.02734375f, -0.06665039f, -0.099365234f, -0.10522461f, -0.10546875f, -0.056884766f, 0.017333984f, 0.061523438f, 0.07836914f, 0.087890625f, 0.051513672f, 0.05419922f, 0.051757812f, 0.04272461f, 0.043945312f, + -0.14404297f, -0.3088379f, -0.07885742f, 0.053222656f, 0.064208984f, 0.032226562f, 0.057617188f, 0.05810547f, 0.05126953f, 0.041748047f, 0.053955078f, 0.015136719f, 0.028808594f, 0.033691406f, 0.0234375f, 0.018554688f, + 0.49609375f, 0.45263672f, 0.2915039f, 0.15649414f, 0.052246094f, 0.017578125f, -0.050048828f, -0.06640625f, -0.10839844f, -0.15063477f, -0.17138672f, -0.20532227f, -0.18432617f, -0.17553711f, -0.19213867f, -0.16235352f, + -0.0056152344f, -0.030761719f, -0.092285156f, -0.1262207f, -0.15917969f, -0.12011719f, -0.1105957f, -0.13354492f, -0.12915039f, -0.09863281f, 0.017578125f, 0.12866211f, 0.21850586f, 0.24853516f, 0.1875f, 0.20532227f, + -0.011230469f, -0.061035156f, -0.032226562f, 0.18139648f, 0.068359375f, -0.13916016f, -0.1015625f, 0.0017089844f, -0.004638672f, 0.009765625f, 0.03149414f, -0.0068359375f, 0.0043945312f, 0.023925781f, 0.017333984f, 0.018066406f, + -0.045166016f, -0.05493164f, -0.04296875f, 0.053710938f, 0.2121582f, 0.25195312f, 0.08911133f, -0.034179688f, -0.049560547f, -0.06225586f, -0.061523438f, -0.07836914f, -0.052490234f, -0.044189453f, -0.046142578f, -0.03540039f, + 0.08129883f, 0.20532227f, 0.04296875f, 0.11010742f, 0.3720703f, 0.4272461f, 0.31884766f, 0.19335938f, 0.015625f, -0.17895508f, -0.20214844f, -0.38330078f, -0.2487793f, -0.20581055f, -0.24560547f, -0.30297852f, + -0.40112305f, -0.2043457f, -0.048828125f, 0.018798828f, -0.080322266f, 0.016113281f, 0.13427734f, 0.2734375f, 0.3503418f, 0.35766602f, 0.19165039f, -0.056884766f, -0.11645508f, -0.1574707f, -0.14990234f, -0.12719727f, + 0.2763672f, 0.27905273f, 0.2241211f, 0.035888672f, -0.10253906f, -0.061523438f, -0.08544922f, -0.19848633f, -0.25634766f, -0.22729492f, -0.20019531f, -0.12548828f, -0.0026855469f, 0.08178711f, 0.14819336f, 0.21411133f, + -0.11425781f, -0.068603516f, 0.2446289f, -0.0031738281f, -0.04321289f, -0.033203125f, 0.024414062f, -0.0036621094f, -0.022460938f, 0.0017089844f, 0.018554688f, -0.014892578f, -0.010253906f, 0.0021972656f, 0.0068359375f, 0.015380859f, + 0.080322266f, 0.23852539f, 0.16894531f, 0.029052734f, -0.043701172f, -0.10571289f, -0.07788086f, -0.037109375f, -0.0063476562f, -0.025878906f, -0.036865234f, -0.06347656f, -0.04321289f, -0.03173828f, -0.032470703f, -0.012451172f, + -0.072265625f, -0.17602539f, -0.29736328f, -0.35253906f, -0.34814453f, -0.25732422f, -0.2097168f, -0.1850586f, -0.11230469f, -0.052978516f, 0.09643555f, 0.3071289f, 0.3930664f, 0.56689453f, 0.40625f, 0.2939453f, + -0.24194336f, -0.11010742f, -0.05102539f, 0.03930664f, -0.061523438f, -0.018554688f, 0.010986328f, 0.04296875f, -0.21557617f, -0.01928711f, 0.009277344f, 0.048095703f, 0.26342773f, 0.36791992f, 0.13232422f, -0.19604492f, + 0.16210938f, 0.16381836f, 0.14404297f, 0.1081543f, 0.08959961f, 0.11450195f, 0.11743164f, 0.11645508f, 0.13110352f, 0.11303711f, 0.021240234f, -0.15844727f, -0.21166992f, -0.27368164f, -0.33813477f, -0.29956055f, + -0.14624023f, 0.068603516f, 0.24731445f, 0.38916016f, 0.31860352f, 0.27416992f, 0.19165039f, 0.13793945f, 0.06958008f, -0.018798828f, -0.1159668f, -0.2849121f, -0.3581543f, -0.3803711f, -0.25952148f, -0.1328125f, + -0.64819336f, -0.5800781f, -0.15527344f, -0.07104492f, -0.08300781f, 0.009765625f, 0.10620117f, 0.10571289f, 0.13989258f, 0.12988281f, 0.1743164f, 0.18408203f, 0.09375f, 0.12524414f, 0.20678711f, 0.26220703f, + 0.07836914f, 0.16430664f, -0.014404297f, -0.20898438f, -0.08984375f, 0.04296875f, 0.06713867f, 0.0075683594f, -0.037109375f, -0.029296875f, -0.020019531f, -0.03173828f, 0.0036621094f, 0.016113281f, 0.015380859f, 0.035888672f, + -0.02368164f, -0.14282227f, -0.36645508f, -0.11279297f, 0.042236328f, 0.14086914f, 0.041503906f, 0.009277344f, 0.039794922f, 0.055419922f, 0.061523438f, 0.040771484f, 0.056152344f, 0.064208984f, 0.052490234f, 0.041503906f, + 0.23120117f, 0.21533203f, 0.16748047f, 0.15649414f, 0.1262207f, 0.10498047f, 0.08691406f, 0.020019531f, -0.03466797f, -0.12841797f, -0.18579102f, -0.29492188f, -0.2705078f, -0.17236328f, -0.06933594f, 0.04736328f, + -0.19580078f, -0.14624023f, -0.11303711f, -0.055908203f, -0.052001953f, -0.009033203f, 0.022949219f, -0.0068359375f, -0.032470703f, 0.0017089844f, 0.045410156f, 0.025146484f, 0.039794922f, 0.07543945f, 0.1574707f, 0.24267578f, +}; + +const float ivas_sns_cdbks_side_tcx20_stage2[ 32 * 16 ] = { + -0.013916016f, 0.0007324219f, 0.017089844f, 0.005859375f, 0.056152344f, -0.08178711f, -0.2927246f, 0.00390625f, 0.140625f, 0.03881836f, 0.010498047f, 0.038330078f, 0.042236328f, 0.020751953f, 0.005859375f, 0.0075683594f, + -0.07104492f, -0.10253906f, 0.038085938f, 0.091552734f, 0.118896484f, 0.13476562f, 0.05078125f, -0.111328125f, -0.13842773f, -0.20727539f, -0.25732422f, -0.15063477f, 0.032470703f, 0.08129883f, 0.17578125f, 0.31469727f, + 0.0715332f, 0.029052734f, 0.01953125f, 0.008056641f, 0.0234375f, 0.020751953f, 0.032226562f, 0.021972656f, 0.03466797f, 0.017822266f, -0.037841797f, -0.14038086f, -0.21679688f, -0.11035156f, 0.057617188f, 0.16845703f, + -0.1081543f, -0.02734375f, -0.08251953f, -0.08227539f, -0.07910156f, 0.049804688f, 0.10253906f, 0.23876953f, 0.25683594f, 0.03173828f, -0.15820312f, -0.14648438f, -0.008056641f, -0.00048828125f, -0.014404297f, 0.02734375f, + -0.022705078f, 0.028076172f, 0.14111328f, -0.06762695f, -0.07348633f, 0.16259766f, -0.0073242188f, -0.06567383f, -0.028564453f, -0.0107421875f, -0.023925781f, 0.0126953125f, -0.005859375f, -0.006591797f, -0.014160156f, -0.018066406f, + -0.09741211f, -0.092041016f, -0.061523438f, -0.011962891f, 0.006591797f, 0.041748047f, 0.008300781f, -0.017578125f, -0.08520508f, -0.12573242f, -0.06298828f, 0.13696289f, 0.25195312f, 0.15332031f, 0.001953125f, -0.04663086f, + -0.20239258f, 0.2705078f, 0.059326172f, 0.0041503906f, 0.022216797f, -0.009765625f, -0.026611328f, -0.02734375f, -0.032714844f, -0.016845703f, -0.025878906f, -0.0014648438f, -0.0075683594f, -0.009521484f, 0.004638672f, -0.0009765625f, + 0.064453125f, -0.26708984f, 0.122802734f, 0.025634766f, -0.0063476562f, 0.0043945312f, 0.008544922f, -0.0017089844f, 0.0061035156f, -0.007080078f, -0.018798828f, 0.011962891f, 0.008544922f, 0.010009766f, 0.020263672f, 0.018310547f, + -0.0007324219f, -0.037597656f, -0.036376953f, -0.015625f, 0.0056152344f, -0.0056152344f, -0.0029296875f, 0.032714844f, 0.047607422f, 0.019042969f, -0.010498047f, 0.017578125f, 0.0126953125f, 0.0043945312f, -0.013427734f, -0.016845703f, + 0.06933594f, 0.052978516f, 0.061035156f, 0.13378906f, 0.13427734f, 0.0053710938f, -0.099365234f, -0.18334961f, -0.21850586f, -0.083496094f, 0.020263672f, 0.05883789f, 0.013427734f, 0.011474609f, 0.01953125f, 0.0041503906f, + 0.0036621094f, -0.05053711f, -0.005126953f, 0.19091797f, -0.18798828f, -0.0546875f, 0.00048828125f, -0.021728516f, -0.001953125f, 0.0017089844f, 0.0041503906f, 0.024902344f, 0.022216797f, 0.02758789f, 0.02709961f, 0.01928711f, + 0.024658203f, -0.0041503906f, -0.026611328f, -0.0859375f, -0.06323242f, -0.068603516f, -0.07495117f, -0.050048828f, -0.061035156f, -0.0061035156f, 0.056396484f, 0.088378906f, 0.05883789f, 0.06738281f, 0.07763672f, 0.06738281f, + 0.13696289f, 0.08496094f, 0.07104492f, 0.046875f, 0.024658203f, 0.0048828125f, -0.0107421875f, -0.006591797f, 0.014160156f, -0.0073242188f, -0.041503906f, -0.02709961f, -0.041503906f, -0.060791016f, -0.09277344f, -0.095214844f, + -0.16772461f, 0.06665039f, 0.1821289f, 0.07397461f, -0.020019531f, 0.055419922f, 0.0390625f, -0.12011719f, -0.107910156f, 0.123291016f, 0.37939453f, 0.032714844f, -0.16137695f, -0.15234375f, -0.10546875f, -0.11743164f, + -0.013183594f, -0.011230469f, -0.037353516f, 0.0026855469f, -0.04638672f, -0.24438477f, 0.099853516f, 0.1105957f, 0.008544922f, 0.010253906f, 0.013183594f, 0.03857422f, 0.016601562f, 0.014892578f, 0.01928711f, 0.018066406f, + 0.044189453f, 0.07763672f, -0.03491211f, -0.18359375f, 0.15722656f, 0.061279297f, -0.029541016f, -0.018798828f, -0.023925781f, 0.0007324219f, -0.010498047f, 0.0087890625f, -0.0056152344f, -0.009277344f, -0.014892578f, -0.018798828f, + 0.13696289f, 0.011230469f, -0.033447266f, -0.017333984f, -0.07763672f, -0.122558594f, -0.076416016f, -0.017333984f, 0.14257812f, 0.21313477f, 0.14575195f, 0.032226562f, -0.083740234f, -0.12036133f, -0.076171875f, -0.057373047f, + 0.029541016f, -0.12231445f, -0.2475586f, 0.0949707f, 0.18896484f, 0.026123047f, 0.012939453f, 0.030029297f, 0.009033203f, -0.009277344f, -0.025634766f, 0.0087890625f, -0.0024414062f, -0.0017089844f, 0.0087890625f, -0.00024414062f, + -0.03857422f, -0.03881836f, -0.08886719f, -0.068847656f, 0.022216797f, 0.10229492f, 0.12841797f, 0.083984375f, 0.06567383f, 0.08178711f, 0.075927734f, 0.040039062f, -0.047851562f, -0.09448242f, -0.103515625f, -0.119140625f, + 0.009277344f, 0.046875f, 0.08178711f, 0.037597656f, 0.0063476562f, -0.038330078f, -0.01171875f, 0.28222656f, 0.027832031f, -0.25195312f, -0.12817383f, 0.01586914f, 0.011474609f, -0.014404297f, -0.044189453f, -0.030761719f, + 0.0637207f, 0.12426758f, 0.095458984f, -0.13378906f, -0.26293945f, -0.06323242f, 0.033203125f, 0.06591797f, 0.048583984f, 0.026367188f, 0.005859375f, 0.01977539f, -0.0029296875f, -0.005859375f, -0.0007324219f, -0.013183594f, + -0.016845703f, -0.052246094f, -0.057373047f, 0.008056641f, -0.01171875f, -0.068847656f, -0.0859375f, -0.016357422f, -0.012207031f, 0.046875f, 0.18164062f, 0.2692871f, 0.13476562f, -0.024414062f, -0.1274414f, -0.16723633f, + -0.021972656f, -0.053955078f, -0.022705078f, -0.00048828125f, 0.072021484f, 0.083496094f, 0.056640625f, -0.014892578f, 0.028320312f, 0.09399414f, 0.061279297f, -0.48779297f, -0.018554688f, 0.1550293f, 0.05859375f, 0.0107421875f, + 0.38476562f, -0.049316406f, -0.0793457f, -0.025146484f, -0.02319336f, -0.020751953f, 0.026855469f, -0.00048828125f, -0.052490234f, -0.033935547f, -0.04638672f, -0.0107421875f, -0.018066406f, -0.022216797f, -0.016113281f, -0.013427734f, + -0.23852539f, -0.064941406f, -0.018066406f, -0.0034179688f, 0.040283203f, 0.01928711f, 0.018310547f, 0.030761719f, 0.030029297f, 0.028564453f, 0.010253906f, 0.037109375f, 0.021484375f, 0.03491211f, 0.03515625f, 0.018798828f, + 0.03857422f, 0.028808594f, 0.025878906f, 0.04321289f, 0.03491211f, -0.021972656f, -0.03466797f, -0.01953125f, -0.02368164f, -0.095214844f, -0.13891602f, -0.032714844f, 0.013671875f, 0.05883789f, 0.064697266f, 0.057861328f, + -0.014892578f, 0.014892578f, 0.0126953125f, 0.045410156f, 0.0073242188f, 0.08300781f, 0.17797852f, 0.030761719f, -0.11743164f, -0.071777344f, -0.048095703f, -0.007080078f, -0.016113281f, -0.024414062f, -0.033203125f, -0.03881836f, + 0.0690918f, -0.049072266f, -0.23413086f, -0.3227539f, -0.15258789f, -0.028320312f, 0.05883789f, 0.055908203f, 0.08618164f, 0.08203125f, 0.052246094f, 0.0546875f, 0.022216797f, 0.07885742f, 0.13061523f, 0.095947266f, + -0.13452148f, -0.026855469f, 0.107177734f, 0.16040039f, 0.13305664f, 0.043701172f, 0.0087890625f, 0.020019531f, 0.040039062f, 0.017578125f, -0.030029297f, -0.024902344f, -0.067871094f, -0.08666992f, -0.076416016f, -0.083740234f, + -0.01953125f, -0.059814453f, -0.061279297f, 0.008056641f, 0.031982422f, 0.08203125f, -0.045166016f, -0.25561523f, -0.02758789f, 0.10522461f, 0.06274414f, 0.046875f, 0.029052734f, 0.03173828f, 0.04248047f, 0.028564453f, + -0.050048828f, 0.084472656f, 0.27172852f, 0.053222656f, -0.063964844f, -0.12988281f, -0.07299805f, -0.051757812f, -0.036621094f, -0.0014648438f, -0.0009765625f, 0.021728516f, 0.009033203f, -0.0007324219f, -0.013183594f, -0.018554688f, + 0.0847168f, 0.18920898f, -0.1796875f, -0.01586914f, -0.017822266f, -0.021728516f, 0.006591797f, -0.0075683594f, -0.019042969f, -0.0107421875f, -0.0146484375f, 0.014160156f, 0.0034179688f, -0.0056152344f, -0.0036621094f, -0.0017089844f, +}; + +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_cdbks_side_tcx10_stage1[ 32 * 16 ] = { + -0.23950195f, -0.203125f, -0.17822266f, -0.1315918f, -0.123291016f, -0.095947266f, -0.106933594f, -0.16552734f, -0.14941406f, -0.075683594f, 0.026367188f, 0.1015625f, 0.17041016f, 0.2770996f, 0.37890625f, 0.5148926f, + 0.12890625f, 0.20825195f, 0.22924805f, 0.2998047f, 0.24267578f, 0.14477539f, 0.07861328f, 0.024658203f, -0.076171875f, -0.18432617f, -0.26660156f, -0.33251953f, -0.2758789f, -0.13964844f, -0.030517578f, -0.05126953f, + -0.14160156f, -0.13305664f, -0.111816406f, -0.037353516f, -0.038085938f, 0.051513672f, 0.07348633f, 0.0073242188f, 0.044921875f, -0.0234375f, -0.123291016f, -0.01171875f, 0.28100586f, 0.24194336f, 0.0703125f, -0.1496582f, + 0.053466797f, 0.122802734f, 0.1394043f, 0.099853516f, 0.078125f, 0.018554688f, 0.034423828f, 0.103759766f, 0.06542969f, -0.030273438f, -0.09887695f, -0.099609375f, -0.060058594f, -0.119628906f, -0.18237305f, -0.12451172f, + -0.04345703f, -0.033447266f, -0.06665039f, -0.06518555f, -0.048828125f, -0.11645508f, -0.2055664f, -0.20263672f, -0.15576172f, -0.0009765625f, 0.103759766f, 0.21191406f, 0.24414062f, 0.14526367f, 0.09863281f, 0.13476562f, + 0.05810547f, 0.22558594f, 0.10180664f, -0.08618164f, -0.07470703f, 0.052246094f, 0.052490234f, -0.042236328f, -0.07055664f, -0.037109375f, -0.024169922f, -0.03149414f, -0.031982422f, -0.040527344f, -0.038085938f, -0.013183594f, + 0.020019531f, -0.033447266f, -0.14550781f, -0.42089844f, -0.19604492f, 0.038085938f, 0.026611328f, 0.016357422f, 0.038330078f, 0.057861328f, 0.06762695f, 0.08081055f, 0.091308594f, 0.10180664f, 0.11987305f, 0.13720703f, + 0.13671875f, 0.30566406f, 0.4716797f, 0.54785156f, 0.39819336f, 0.27075195f, 0.17602539f, 0.092041016f, -0.013183594f, -0.17163086f, -0.3166504f, -0.42138672f, -0.53271484f, -0.45898438f, -0.27416992f, -0.21044922f, + -0.38989258f, -0.37597656f, -0.3696289f, -0.2915039f, -0.26098633f, -0.19921875f, -0.15136719f, -0.09057617f, -0.040771484f, 0.13354492f, 0.30126953f, 0.3857422f, 0.40649414f, 0.31103516f, 0.30004883f, 0.3317871f, + 0.35107422f, 0.5229492f, 0.41870117f, 0.14355469f, -0.037597656f, -0.13134766f, -0.18383789f, -0.18066406f, -0.15771484f, -0.17480469f, -0.17041016f, -0.15209961f, -0.08251953f, -0.06616211f, -0.064453125f, -0.03466797f, + -0.66845703f, -0.31030273f, -0.21435547f, -0.11987305f, -0.103271484f, 0.080322266f, 0.21801758f, 0.20874023f, 0.1015625f, 0.032958984f, -0.043945312f, 0.078125f, 0.07324219f, 0.07763672f, 0.20727539f, 0.38208008f, + -0.17163086f, -0.1171875f, -0.03491211f, 0.060302734f, 0.1809082f, 0.33666992f, 0.3955078f, 0.27172852f, 0.12841797f, -0.036865234f, -0.17163086f, -0.21289062f, -0.20800781f, -0.17333984f, -0.125f, -0.12231445f, + -0.1875f, -0.3996582f, -0.017822266f, 0.10058594f, 0.057617188f, 0.028320312f, 0.05493164f, 0.04272461f, 0.041503906f, 0.046875f, 0.041748047f, 0.0546875f, 0.06201172f, 0.03149414f, 0.013427734f, 0.028564453f, + 0.34814453f, 0.234375f, -0.05493164f, -0.1821289f, -0.2878418f, -0.31176758f, -0.28100586f, -0.19824219f, -0.15673828f, -0.08251953f, 0.030273438f, 0.13647461f, 0.2211914f, 0.20776367f, 0.16455078f, 0.21240234f, + -0.057861328f, -0.10571289f, 0.08984375f, 0.30444336f, 0.18945312f, 0.14770508f, 0.09082031f, -0.020996094f, -0.053466797f, -0.044433594f, -0.07128906f, -0.08886719f, -0.079833984f, -0.0859375f, -0.09790039f, -0.1159668f, + 0.17626953f, 0.26049805f, 0.2175293f, 0.21020508f, 0.20141602f, 0.27734375f, 0.21606445f, -0.0012207031f, -0.010986328f, -0.11694336f, -0.2331543f, -0.15844727f, -0.08081055f, -0.08886719f, -0.35717773f, -0.5114746f, + -0.38134766f, -0.4855957f, -0.35986328f, -0.16137695f, -0.026123047f, 0.009033203f, -0.0126953125f, 0.040283203f, 0.095458984f, 0.15454102f, 0.16333008f, 0.19140625f, 0.21142578f, 0.203125f, 0.17993164f, 0.1784668f, + 0.05834961f, 0.06298828f, 0.041015625f, 0.031982422f, 0.07910156f, 0.06713867f, -0.028808594f, -0.05053711f, -0.024902344f, -0.17822266f, -0.3227539f, -0.1665039f, -0.0053710938f, 0.05517578f, 0.119384766f, 0.26123047f, + 0.047851562f, -0.042236328f, -0.24145508f, -0.038330078f, 0.052734375f, 0.068603516f, 0.05810547f, 0.011962891f, -0.013916016f, -0.010986328f, 0.020019531f, 0.02758789f, 0.03100586f, 0.02319336f, 0.014160156f, -0.008056641f, + -0.0036621094f, 0.0014648438f, 0.013671875f, 0.0f, 0.021240234f, 0.033447266f, 0.014892578f, 0.004638672f, 0.056884766f, 0.13427734f, 0.08691406f, -0.005126953f, -0.072753906f, -0.095214844f, -0.10961914f, -0.08105469f, + -0.15966797f, -0.110839844f, -0.13012695f, -0.071777344f, -0.064941406f, -0.056396484f, -0.046142578f, -0.012207031f, 0.048583984f, 0.036865234f, -0.00048828125f, -0.024414062f, -0.012939453f, 0.092041016f, 0.21435547f, 0.29858398f, + 0.55981445f, 0.15820312f, -0.012451172f, -0.04321289f, -0.05810547f, -0.014892578f, -0.021484375f, -0.038330078f, -0.033691406f, -0.037597656f, -0.0690918f, -0.076416016f, -0.0637207f, -0.064697266f, -0.0847168f, -0.099853516f, + -0.039794922f, -0.032714844f, -0.030273438f, -0.051513672f, -0.03564453f, -0.041015625f, -0.0390625f, 0.017822266f, 0.051513672f, 0.013916016f, -0.044677734f, -0.061035156f, -0.012207031f, 0.07299805f, 0.123291016f, 0.10888672f, + 0.45117188f, 0.46704102f, 0.38916016f, 0.23242188f, 0.16430664f, 0.1809082f, 0.20922852f, 0.033935547f, -0.13720703f, -0.2758789f, -0.39941406f, -0.3840332f, -0.31054688f, -0.28466797f, -0.28955078f, -0.04663086f, + -0.088134766f, -0.22973633f, -0.4194336f, -0.49487305f, -0.4038086f, -0.27734375f, -0.2253418f, -0.1315918f, -0.044677734f, 0.12036133f, 0.24951172f, 0.31103516f, 0.52124023f, 0.484375f, 0.32739258f, 0.30126953f, + 0.33203125f, 0.29614258f, 0.1796875f, 0.06689453f, 0.100097656f, 0.13867188f, 0.03491211f, -0.032714844f, -0.12060547f, -0.2097168f, -0.29638672f, -0.20898438f, -0.08227539f, -0.16821289f, -0.16015625f, 0.13134766f, + -0.44189453f, 0.017578125f, 0.07397461f, 0.033447266f, 0.044189453f, 0.04711914f, 0.030273438f, 0.040771484f, 0.041015625f, 0.022949219f, 0.004638672f, 0.018798828f, 0.028564453f, 0.018798828f, -0.00048828125f, 0.020751953f, + -0.36621094f, -0.23388672f, -0.08178711f, -0.015136719f, -0.049072266f, 0.07910156f, 0.23120117f, 0.28320312f, 0.38378906f, 0.29223633f, 0.099365234f, -0.0087890625f, -0.09814453f, -0.16455078f, -0.18945312f, -0.16186523f, + -0.17041016f, -0.18359375f, -0.19018555f, -0.15820312f, -0.20239258f, -0.21875f, -0.13110352f, 0.010009766f, 0.12011719f, 0.25097656f, 0.25024414f, 0.2055664f, 0.14526367f, 0.13964844f, 0.103759766f, 0.029052734f, + 0.06982422f, 0.072265625f, 0.18261719f, 0.025390625f, -0.2475586f, -0.2861328f, -0.111572266f, -0.037109375f, 0.0036621094f, 0.031982422f, 0.043945312f, 0.057373047f, 0.078125f, 0.072021484f, 0.028564453f, 0.016357422f, + 0.07836914f, 0.13549805f, 0.1743164f, 0.15478516f, 0.12573242f, -0.009521484f, -0.1508789f, -0.1965332f, -0.19604492f, -0.103027344f, -0.045898438f, -0.026123047f, 0.020263672f, 0.023925781f, 0.013183594f, 0.0014648438f, + 0.25341797f, 0.22558594f, 0.2241211f, 0.17114258f, 0.18164062f, 0.16894531f, 0.16503906f, 0.20239258f, 0.17041016f, 0.025878906f, -0.16625977f, -0.24121094f, -0.31982422f, -0.4008789f, -0.38256836f, -0.27783203f, +}; + +const float ivas_sns_cdbks_side_tcx10_stage2[ 8 * 16 ] = { + -0.13989258f, -0.024658203f, 0.12670898f, 0.027832031f, 0.06689453f, 0.12817383f, 0.07495117f, -0.01977539f, -0.05834961f, -0.07543945f, -0.06542969f, -0.0546875f, -0.04345703f, -0.0063476562f, 0.034179688f, 0.029541016f, + -0.06713867f, -0.11450195f, -0.09790039f, -0.091308594f, -0.12182617f, -0.010009766f, 0.10986328f, 0.115478516f, 0.060058594f, 0.038085938f, 0.020507812f, 0.017333984f, 0.024169922f, 0.028320312f, 0.038330078f, 0.05053711f, + 0.05517578f, 0.030517578f, 0.0390625f, 0.05810547f, 0.021484375f, 0.032470703f, 0.040039062f, -0.0087890625f, -0.055908203f, -0.023925781f, 0.037109375f, 0.06347656f, 0.02709961f, -0.07373047f, -0.1274414f, -0.115234375f, + 0.11206055f, 0.2006836f, 0.045410156f, -0.10839844f, -0.1418457f, -0.08520508f, -0.032470703f, 0.033935547f, 0.044189453f, 0.006591797f, -0.012451172f, -0.018554688f, -0.013427734f, -0.010498047f, -0.0078125f, -0.012207031f, + -0.041748047f, -0.07373047f, -0.14819336f, 0.021240234f, 0.16015625f, 0.119140625f, 0.055908203f, 0.08081055f, 0.12548828f, 0.05419922f, -0.030761719f, -0.040771484f, -0.060302734f, -0.07128906f, -0.07763672f, -0.072509766f, + -0.07446289f, -0.041259766f, -0.040527344f, -0.068603516f, -0.042236328f, -0.03857422f, -0.05126953f, -0.08886719f, -0.055419922f, 0.036865234f, 0.09033203f, 0.06689453f, 0.08911133f, 0.13110352f, 0.08129883f, 0.0053710938f, + -0.052978516f, 0.033691406f, 0.16015625f, 0.171875f, 0.024658203f, -0.1328125f, -0.1394043f, -0.041992188f, 0.0068359375f, 0.020263672f, 0.008544922f, 0.0014648438f, -0.011474609f, -0.030273438f, -0.022460938f, 0.00390625f, + 0.20898438f, -0.011230469f, -0.08496094f, -0.010986328f, 0.032958984f, -0.013183594f, -0.057861328f, -0.07104492f, -0.06689453f, -0.056396484f, -0.047851562f, -0.03491211f, -0.011962891f, 0.032714844f, 0.08178711f, 0.11035156f, +}; + +const float *const ivas_sns_cdbks_side_tcx10[SNS_MSVQ_NSTAGES_SIDE] = { ivas_sns_cdbks_side_tcx10_stage1, ivas_sns_cdbks_side_tcx10_stage2 }; + +const int16_t sns_1st_cdbk[2][2][8 * 32] = { + { /* split 1 */ + { /* TCX 20 */ + -10900, -11064, -10637, -10471, -9051, -6381, -4688, -2438, + -2119, -5087, -6702, -8118, -7586, -6343, -4828, -3406, + 2004, -3443, -4289, -3757, -3234, -2952, -2313, -1781, + 1749, 5598, 3916, 732, -1472, -2964, -3275, -2332, + -11978, -14369, -5600, -545, 981, -929, -57, 1903, + 1745, 391, 202, 115, 256, -291, -862, -1637, + -4052, 2059, 4709, 6768, 5595, 1975, -1723, -1218, + 2093, 7263, 8679, 7576, 3701, -2438, -4389, -2686, + -7120, -6279, -5715, -5520, -4752, -3125, -1856, -438, + 8131, -2543, -6285, -6723, -5588, -4321, -3264, -2164, + -653, -1301, -660, 608, 1598, 1805, 1698, 760, + 4882, 9309, 6333, 1734, 284, 364, 560, 1015, + -7686, -5737, -3443, -1642, 245, 1531, 1827, 1769, + -1468, 3782, 144, -5130, -6883, -5165, -1497, 2072, + -12937, -8429, -2619, 2894, 5004, 4710, 4627, 3740, + 3198, 3928, 4358, 4554, 3887, 2844, 1299, 129, + -13828, -12296, -9364, -7918, -5571, -1909, 307, 2047, + -4314, -1211, -559, -1061, -1928, -2228, -2359, -1902, + -309, -3224, -3404, -1895, -743, -59, 757, 908, + 10914, 5865, 1599, -386, -1392, -2285, -2236, -2042, + -11825, -16241, -11402, -3627, 6556, 8953, 6421, 1546, + 6102, 777, -301, 536, 902, 541, 210, -429, + -3052, 3997, 5389, 1842, -344, 1556, 2667, 2428, + 11788, 10894, 7448, 5423, 2372, -677, -2385, -3839, + -45, -7602, -8923, -7179, -3273, 65, 4500, 6726, + 5895, 626, -1610, -2598, -3240, -3540, -2930, -2156, + -971, 461, 1494, 4907, 5859, 5199, 3678, 2502, + 10766, 5297, 1844, 1236, 2498, 3503, 2846, 838, + -7816, -1212, 891, 2387, 1317, 2225, 1859, 1602, + 2376, 5357, 2088, -2719, -3419, -420, 2431, 2943, + -8383, -795, 4351, 7026, 7460, 7191, 5262, 3796, + 1522, 6283, 8714, 8222, 7434, 5768, 3586, 1499, + }, + { /* TCX 10 */ + -15596, -16321, -10264, -1002, 5955, 5543, -29, -1688, + 17, -3794, -6207, -7356, -6998, -6081, -4453, -2448, + -12543, -11530, -10186, -8817, -7083, -4440, -1946, 892, + 5198, 2751, -274, -2574, -4561, -6087, -5944, -4600, + -683, -2640, -2753, -1195, -239, -217, -286, 90, + -1400, -1146, -1853, -2845, -3456, -3788, -3171, -1969, + -1835, 392, 1725, 1209, -392, -1640, -2001, -1608, + 5770, 7707, 5210, 2112, -382, -2088, -2634, -3007, + -10766, -8101, -5137, -3754, -1881, 331, 2339, 3679, + -2637, -4640, -5811, -5651, -3790, -1359, 913, 1893, + -7793, -4768, -1762, -545, -717, -837, -441, -75, + 4030, 1770, 467, 379, 10, -1330, -2398, -2290, + -9395, -6952, -2494, 2022, 4753, 5614, 4443, 2642, + -1486, 1748, 859, -2586, -3368, -638, 2761, 3269, + -2408, 306, 3633, 6567, 5950, 2474, -621, -1421, + 5478, 7986, 9498, 8165, 5477, 1244, -523, -1586, + -13564, -14673, -10597, -5504, 1575, 8248, 7662, 4025, + 4978, -682, -3586, -4305, -3703, -3001, -2227, -1278, + -8002, -6831, -5558, -4868, -4243, -3393, -2486, -1110, + 11485, 5472, 1645, -533, -1792, -2814, -3169, -2706, + 1617, 421, 232, 1382, 2162, 2017, 1318, 744, + 3677, 5212, 1990, -1514, -2894, -2441, -451, 592, + 731, 4295, 5860, 3756, 1991, 1437, 869, 127, + 12736, 11722, 7768, 4682, 1574, -744, -1989, -3131, + -3490, -4269, -3681, -1531, 1111, 3327, 4138, 3815, + 7344, 1400, -1302, -1502, -1015, 57, 1212, 1498, + -4836, -1881, 1071, 2055, 2114, 2465, 2093, 1458, + 8569, 5879, 3654, 2879, 2530, 1703, 781, -233, + -3709, -990, 2338, 6227, 7083, 7102, 5657, 3401, + 3389, 6392, 5267, 1011, 275, 3519, 5236, 4339, + 599, 3752, 6943, 9211, 8152, 5568, 3337, 1838, + 9885, 9591, 7905, 8068, 7929, 7421, 4234, 757, + } + }, + { /* split 2 */ + { /* TCX 20 */ + -178, -3476, -5982, -7081, -7548, -7440, -6859, -5798, + -3596, -3670, -1501, 770, 812, -286, -2001, -3377, + -3998, -5191, -4988, -4421, -3889, -3571, -2738, -1969, + -2981, -2687, -1501, -83, 1136, 2377, 3248, 4105, + 1842, -41, -1972, -4282, -6779, -8405, -8674, -7835, + -259, 571, 2124, 3344, 2959, 1407, -750, -2523, + -524, -1956, -2855, -3202, -3939, -4666, -4907, -4782, + -5110, -4768, -3017, -663, 4188, 9210, 16602, 21081, + 4373, 4846, -603, -6495, -7289, -5540, -4749, -5527, + -1448, -1043, -619, -105, 356, 362, 542, 857, + 1373, -752, -5334, -6244, -3001, -932, -1040, -3125, + -2403, -1397, 612, 2449, 3920, 5231, 6819, 8581, + 2183, 1211, -111, -1084, -2836, -4977, -6701, -7284, + -751, 1255, 3408, 6474, 7503, 7026, 5413, 4464, + 935, 850, 589, 353, 160, -434, -939, -931, + 268, 2284, 3884, 5423, 6680, 7996, 9244, 9472, + 1075, 113, -1289, -4457, -7512, -5930, -1799, -571, + -3689, -4254, -3755, -2995, -1581, -135, 1049, 1589, + -1166, -1752, -1790, -1897, -1927, -1831, -1359, -805, + -1494, -735, 635, 1993, 2909, 3546, 4226, 4956, + 4435, 4299, 4269, 1328, -3731, -7621, -9319, -9170, + 1358, 2227, 3873, 4469, 4692, 4057, 2601, 1608, + 813, 398, -499, -666, -1286, -2271, -3316, -4025, + -3300, -1255, 2181, 6431, 10002, 12760, 13549, 12584, + 3714, 4180, 484, -2905, -2864, -1359, -1256, -2477, + 308, 868, 1373, 1629, 1793, 1834, 1814, 1746, + 1472, 798, -282, -1935, -1818, 320, 2221, 2914, + 2281, 3240, 2988, 1400, 2383, 4072, 5667, 6675, + 2672, 2678, 2874, 2096, -226, -2301, -3861, -4534, + 4988, 7231, 7641, 7731, 7061, 6447, 5411, 3513, + 3978, 4156, 4126, 2896, 1469, 759, 368, -68, + -264, 4210, 8534, 11008, 11606, 11888, 11072, 8949, + }, + { /* TCX 10 */ + -2852, -6158, -7231, -7830, -8012, -7922, -7556, -6706, + -3911, -5340, -5053, -4741, -4805, -4484, -3727, -3037, + -966, -1461, -1694, -2427, -3081, -3037, -2547, -2230, + -3455, -3315, -2451, -836, 1383, 3196, 3720, 3379, + 3052, 281, -3351, -6866, -9051, -9586, -8983, -8236, + -748, -4465, -4314, -2251, 29, -40, -3963, -6195, + 200, 1293, 2535, 2803, 1603, -186, -1397, -1697, + -1707, -265, 2196, 5295, 5894, 4216, 3440, 3826, + -237, -2133, -2279, -3149, -4377, -5638, -6520, -6764, + -2407, -2049, -1246, -664, -521, -430, -349, -211, + 3874, 1335, -1501, -2055, -1268, -990, -1852, -2871, + -1883, -1845, -1681, -484, 384, 2035, 5839, 9597, + 275, 380, 1048, 424, -1146, -3012, -4431, -5104, + -1699, -484, 756, 1261, 1279, 1377, 1975, 2590, + 2139, 4502, 3645, 4975, 6491, 5972, 5012, 4346, + -3821, -2581, -433, 2667, 6436, 10038, 11311, 8783, + 2359, -2689, -6604, -7039, -5992, -4268, -3711, -4840, + -2776, -4251, -4539, -3672, -2494, -1055, 280, 695, + 491, 866, 822, -44, -1009, -1165, -831, -538, + -1024, 91, 786, 1295, 2433, 3910, 4975, 5403, + 3117, 2590, 2337, -667, -4580, -8147, -9400, -9523, + -103, -630, -831, 669, 3062, 3398, 549, -1690, + 2113, 3467, 4279, 5047, 5344, 3361, 127, -2313, + -1199, 1153, 2914, 3688, 4260, 5421, 7471, 8831, + 2815, 2184, 316, -3058, -5596, -5564, -4343, -3793, + 922, 126, -1414, -1731, -1007, 359, 2029, 3088, + 4889, 4619, 2537, 1114, 950, 946, 799, 419, + -4271, -3750, -3359, -484, 1448, 4106, 10487, 20479, + 3818, 4687, 4064, 2212, -172, -2287, -3535, -4041, + 884, 2456, 3394, 2925, 2182, 2323, 2583, 2507, + 4767, 8057, 8263, 6461, 5003, 4055, 2923, 1845, + 19, 3813, 6926, 8432, 10141, 10850, 9692, 8383, + } + } +}; +const int16_t sns_1st_means_16k[2][16] = { + { /* TCX 20 */ + 14210, 19017, 14362, 9309, 5385, 2674, 1055, -211, -1407, -3059, -4393, -8597, -11180, -11756, -12131, -13281, + }, + { /* TCX 10*/ + 12018, 15915, 11089, 6015, 847, -705, -539, -1548, -893, -2163, -1806, -4189, -7017, -8670, -8874, -9480, + } +}; +const int16_t sns_1st_means_25k6[2][16] = { + { /* TCX 20 */ + 14973, 20323, 16461, 9554, 4017, 3103, 1602, 1694, -221, -1401, -6817, -10071, -11503, -11805, -13158, -16749, + }, + { /* TCX 10 */ + 15560, 19489, 14623, 5595, 2084, 1699, 775, -1312, -2195, -6101, -9078, -9465, -7825, -6603, -7281, -9960, + } +}; +const int16_t sns_1st_means_32k[2][16] = { + { /* TCX 20 */ + 15041, 20603, 16969, 10289, 4973, 4283, 3003, 3316, 1684, -259, -6614, -9535, -10363, -11834, -16625, -24930, + }, + { /* TCX 10 */ + 16510, 20660, 16025, 7224, 3921, 3868, 2623, 742, -1316, -6269, -8284, -7288, -6380, -8410, -13351, -20277, + } +}; + +ACPL_QUANT_TABLE alpha_quant_table[] = +{ + { /* Alfa Fine */ + 33, /* nquant */ + 16, /* offset */ + { -2.000000e+000f, -1.809375e+000f, -1.637500e+000f, -1.484375e+000f, -1.350000e+000f, -1.234375e+000f, -1.137500e+000f, -1.059375e+000f, -1.000000e+000f, -9.406250e-001f, + -8.625000e-001f, -7.656250e-001f, -6.500000e-001f, -5.156250e-001f, -3.625000e-001f, -1.906250e-001f, +0.000000e+000f, +1.906250e-001f, +3.625000e-001f, +5.156250e-001f, + +6.500000e-001f, +7.656250e-001f, +8.625000e-001f, +9.406250e-001f, +1.000000e+000f, +1.059375e+000f, +1.137500e+000f, +1.234375e+000f, +1.350000e+000f, +1.484375e+000f, + +1.637500e+000f, +1.809375e+000f, +2.000000e+000f } /* data */ + }, /* End Alfa Fine */ + { /* Alfa Coarse */ + 17, /* nquant */ + 8, /* offset */ + { -2.000000e+000f, -1.637500e+000f, -1.350000e+000f, -1.137500e+000f, -1.000000e+000f, -8.625000e-001f, -6.500000e-001f, -3.625000e-001f, +0.000000e+000f, +3.625000e-001f, + +6.500000e-001f, +8.625000e-001f, +1.000000e+000f, +1.137500e+000f, +1.350000e+000f, +1.637500e+000f, +2.000000e+000f } /* data */ + } /* End Alfa Coarse */ +}; + +ACPL_QUANT_TABLE beta_quant_table[2][9] = +{ + { + { /* Beta Fine #1 */ + 9, /* nquant */ + 0, /* offset */ + { +0.000000e+000f, +2.375000e-001f, +5.500000e-001f, +9.375000e-001f, +1.400000e+000f, +1.937500e+000f, +2.550000e+000f, +3.237500e+000f, +4.000000e+000f } /* data */ + }, /* End Beta Fine #1 */ + { /* Beta Fine #2 */ + 9, /* nquant */ + 0, /* offset */ + { +0.000000e+000f, +2.035449e-001f, +4.713672e-001f, +8.034668e-001f, +1.199844e+000f, +1.660498e+000f, +2.185430e+000f, +2.774639e+000f, +3.428125e+000f } /* data */ + }, /* End Beta Fine #2 */ + { /* Beta Fine #3 */ + 9, /* nquant */ + 0, /* offset */ + { +0.000000e+000f, +1.729297e-001f, +4.004688e-001f, +6.826172e-001f, +1.019375e+000f, +1.410742e+000f, +1.856719e+000f, +2.357305e+000f, +2.912500e+000f } /* data */ + }, /* End Beta Fine #3 */ + { /* Beta Fine #4 */ + 9, /* nquant */ + 0, /* offset */ + { +0.000000e+000f, +1.456543e-001f, +3.373047e-001f, +5.749512e-001f, +8.585938e-001f, +1.188232e+000f, +1.563867e+000f, +1.985498e+000f, +2.453125e+000f } /* data */ + }, /* End Beta Fine #4 */ + { /* Beta Fine #5 */ + 9, /* nquant */ + 0, /* offset */ + { +0.000000e+000f, +1.217188e-001f, +2.818750e-001f, +4.804688e-001f, +7.175000e-001f, +9.929688e-001f, +1.306875e+000f, +1.659219e+000f, +2.050000e+000f } /* data */ + }, /* End Beta Fine #5 */ + { /* Beta Fine #6 */ + 9, /* nquant */ + 0, /* offset */ + { +0.000000e+000f, +1.011230e-001f, +2.341797e-001f, +3.991699e-001f, +5.960938e-001f, +8.249512e-001f, +1.085742e+000f, +1.378467e+000f, +1.703125e+000f } /* data */ + }, /* End Beta Fine #6 */ + { /* Beta Fine #7 */ + 9, /* nquant */ + 0, /* offset */ + { +0.000000e+000f, +8.386719e-002f, +1.942188e-001f, +3.310547e-001f, +4.943750e-001f, +6.841797e-001f, +9.004688e-001f, +1.143242e+000f, +1.412500e+000f } /* data */ + }, /* End Beta Fine #7 */ + { /* Beta Fine #8 */ + 9, /* nquant */ + 0, /* offset */ + { +0.000000e+000f, +6.995117e-002f, +1.619922e-001f, +2.761230e-001f, +4.123438e-001f, +5.706543e-001f, +7.510547e-001f, +9.535449e-001f, +1.178125e+000f } /* data */ + }, /* End Beta Fine #8 */ + { /* Beta Fine #9 */ + 9, /* nquant */ + 0, /* offset */ + { +0.000000e+000f, +5.937500e-002f, +1.375000e-001f, +2.343750e-001f, +3.500000e-001f, +4.843750e-001f, +6.375000e-001f, +8.093750e-001f, +1.000000e+000f } /* data */ + } /* End Beta Fine #9 */ + }, + { + { /* Beta Coarse #1 */ + 5, /* nquant */ + 0, /* offset */ + { +0.000000e+000f, +5.500000e-001f, +1.400000e+000f, +2.550000e+000f, +4.000000e+000f } /* data */ + }, /* End Beta Coarse #1 */ + { /* Beta Coarse #2 */ + 5, /* nquant */ + 0, /* offset */ + { +0.000000e+000f, +4.004688e-001f, +1.019375e+000f, +1.856719e+000f, +2.912500e+000f } /* data */ + }, /* End Beta Coarse #2 */ + { /* Beta Coarse #3 */ + 5, /* nquant */ + 0, /* offset */ + { +0.000000e+000f, +2.818750e-001f, +7.175000e-001f, +1.306875e+000f, +2.050000e+000f } /* data */ + }, /* End Beta Coarse #3 */ + { /* Beta Coarse #4 */ + 5, /* nquant */ + 0, /* offset */ + { +0.000000e+000f, +1.942188e-001f, +4.943750e-001f, +9.004688e-001f, +1.412500e+000f } /* data */ + }, /* End Beta Coarse #4 */ + { /* Beta Coarse #5 */ + 5, /* nquant */ + 0, /* offset */ + { +0.000000e+000f, +1.375000e-001f, +3.500000e-001f, +6.375000e-001f, +1.000000e+000f } /* data */ + } /* End Beta Coarse #5 */ + } +}; /* clang-format on */ diff --git a/lib_com/ivas_rom_com.h b/lib_com/ivas_rom_com.h index a095c9e4b48846d125154bbd3d6cba22e7a49549..a6437565c995239d1d71d7fcb6b76dcbfe0e1398 100644 --- a/lib_com/ivas_rom_com.h +++ b/lib_com/ivas_rom_com.h @@ -108,26 +108,22 @@ extern const float tdm_ratio_tabl[]; extern const float tdm_den_ratio_tabl[]; extern const int16_t tdm_bit_allc_tbl[5][6]; -#ifdef LSF_RE_USE_SECONDARY_CHANNEL /* LSFs Intra-frame prediction tables */ -#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE 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 extern const float tdm_LSF_MEAN_PRED_QNT_OUT[M]; extern const float tdm_LSF_MEAN_PRED_QNT_IN[M]; extern const float tdm_LSF_MEAN_PRED_QNT[M]; extern const float tdm_PRED_QNT_fixed_beta_prd_diag_3[15 + 16 + 15]; -#endif extern const int16_t fast_FCB_bits_2sfr[]; extern const int16_t fast_FCB_rates_2sfr[]; @@ -165,6 +161,13 @@ extern const int16_t DirAC_band_grouping_5[5 + 1]; extern const int16_t DirAC_block_grouping[MAX_PARAM_SPATIAL_SUBFRAMES + 1]; extern const int16_t DirAC_block_grouping_5ms_MDFT[MAX_PARAM_SPATIAL_SUBFRAMES + 1]; +extern const float c_weights[DIRAC_NO_FB_BANDS_MAX]; + +extern const float w_nm[NUM_ANA_SECTORS][9]; +extern const float x_nm[NUM_ANA_SECTORS][9]; +extern const float y_nm[NUM_ANA_SECTORS][9]; +extern const float z_nm[NUM_ANA_SECTORS][9]; + /*------------------------------------------------------------------------------------------* * SPAR ROM tables *------------------------------------------------------------------------------------------*/ @@ -176,9 +179,11 @@ extern const ivas_huff_models_t ivas_huff_pred_r_consts[TOTAL_PRED_QUANT_STRATS_ extern const ivas_huff_models_t ivas_huff_drct_r_consts[TOTAL_DRCT_QUANT_STRATS]; extern const ivas_huff_models_t ivas_huff_decd_r_consts[TOTAL_DECD_QUANT_STRATS]; extern const ivas_spar_br_table_t ivas_spar_br_table_consts[IVAS_SPAR_BR_TABLE_LEN]; -extern const int16_t remix_order_set[1][IVAS_SPAR_MAX_CH]; +extern const int16_t remix_order_set[1][DIRAC_MAX_ANA_CHANS]; extern const int16_t keep_planar[IVAS_SPAR_MAX_CH - FOA_CHANNELS]; -extern const int16_t HOA_keep_ind[IVAS_SPAR_MAX_CH]; +extern const int16_t HOA_keep_ind[IVAS_SPAR_MAX_FB_IN_CHAN]; +extern const int16_t HOA_keep_ind_spar[IVAS_SPAR_MAX_CH]; +extern const int16_t HOA_keep_ind_spar512[IVAS_SPAR_MAX_CH]; extern const float dtx_pd_real_min_max[2]; extern const int16_t dtx_pd_real_q_levels[3][3]; @@ -293,6 +298,11 @@ extern const uint8_t masa_joined_nbands[]; extern const uint8_t masa_twodir_bands[]; extern const uint8_t masa_twodir_bands_joined[]; +#ifdef HR_METADATA +extern const float diffuseness_reconstructions_hr[HR_MASA_ER_LEVELS]; +extern const float diffuseness_thresholds_hr[HR_MASA_ER_LEVELS + 1]; +#endif + /* Multi-channel input and output setups */ extern const float ls_azimuth_CICP2[2]; extern const float ls_elevation_CICP2[2]; @@ -318,7 +328,6 @@ 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 +373,7 @@ 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]; +extern const float ivas_mdft_coeff_cos_twid_120[IVAS_120_PT_LEN + 1]; 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 +410,33 @@ 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]; +/*------------------------------------------------------------------------------------------* + * 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 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 *const ivas_sns_cdbks_side_tcx10[]; + +extern ACPL_QUANT_TABLE alpha_quant_table[]; +extern ACPL_QUANT_TABLE beta_quant_table[2][9]; + +/* means and codebooks for the split VQ in the 2-stage SNS VQ */ +extern const int16_t sns_1st_cdbk[2][2][8 * 32]; +extern const int16_t sns_1st_means_16k[2][16]; +extern const int16_t sns_1st_means_25k6[2][16]; +extern const int16_t sns_1st_means_32k[2][16]; /* IVAS_ROM_COM_H */ #endif diff --git a/lib_com/ivas_sba_config.c b/lib_com/ivas_sba_config.c index 44131d5bd237793d65aa0c9124e3c777ac6c9625..e7a448315f43ef827f94e165106f77c728c140e6 100644 --- a/lib_com/ivas_sba_config.c +++ b/lib_com/ivas_sba_config.c @@ -54,22 +54,9 @@ *-------------------------------------------------------------------*/ /*! r: SBA format mode */ -SBA_MODE ivas_sba_mode_select( - const int32_t ivas_total_brate /* i : IVAS total bitrate */ -) +SBA_MODE ivas_sba_mode_select() { - SBA_MODE sba_mode; - - if ( ivas_total_brate == IVAS_13k2 || ivas_total_brate == IVAS_16k4 ) - { - sba_mode = SBA_MODE_DIRAC; - } - else - { - sba_mode = SBA_MODE_SPAR; - } - - return sba_mode; + return SBA_MODE_SPAR; } /*-------------------------------------------------------------------* * ivas_sba_config() @@ -235,7 +222,8 @@ int16_t ivas_sba_get_nchan( /*! r: number of ambisonics metadata channels */ int16_t ivas_sba_get_nchan_metadata( const int16_t sba_order /* i : Ambisonic (SBA) order */ -) + , + const int32_t ivas_total_brate ) { int16_t nb_channels; @@ -245,8 +233,17 @@ int16_t ivas_sba_get_nchan_metadata( } else { - /* FOA + planar HOA */ - nb_channels = FOA_CHANNELS + 2 * ( sba_order - 1 ); + if ( ivas_total_brate >= IVAS_512k ) + { + nb_channels = ( SBA_HOA2_ORDER + 1 ) * ( SBA_HOA2_ORDER + 1 ); + nb_channels += 2; + nb_channels = min( nb_channels, ( sba_order + 1 ) * ( sba_order + 1 ) ); + } + else + { + /* FOA + planar HOA */ + nb_channels = FOA_CHANNELS + 2 * ( sba_order - 1 ); + } } return ( nb_channels ); @@ -259,25 +256,58 @@ int16_t ivas_sba_get_nchan_metadata( *-------------------------------------------------------------------*/ /*! r: flag indicating to code SPAR HOA MD for all bands */ -int16_t ivas_sba_get_spar_hoa_md_flag( - const int16_t sba_order, /* i : Ambisonic (SBA) order */ - const int32_t ivas_total_brate /* i : IVAS total bitrate */ -) +void ivas_sba_get_spar_hoa_ch_ind( + const int16_t num_md_chs, /* i : number of MD channels */ + const int32_t ivas_total_brate, /* i : IVAS total bitrate */ + int16_t HOA_md_ind[IVAS_SPAR_MAX_CH] ) { - int16_t spar_hoa_md_flag = 0; + int16_t ch; + const int16_t *hoa_ind; + if ( ivas_total_brate >= IVAS_512k ) + { + hoa_ind = HOA_keep_ind_spar512; + } + else + { + hoa_ind = HOA_keep_ind_spar; + } + for ( ch = 0; ch < num_md_chs; ch++ ) + { + HOA_md_ind[ch] = hoa_ind[ch]; + } + + return; +} + +void ivas_sba_get_spar_hoa_md_flag( + const int16_t sba_order, /* i : Ambisonic (SBA) order */ + const int32_t ivas_total_brate, /* i : IVAS total bitrate */ + int16_t *spar_hoa_md_flag, + int16_t *spar_hoa_dirac2spar_md_flag ) +{ if ( sba_order > 1 && ivas_total_brate >= IVAS_256k ) { - spar_hoa_md_flag = 1; + *spar_hoa_md_flag = 1; } else { - spar_hoa_md_flag = 0; + *spar_hoa_md_flag = 0; } - return spar_hoa_md_flag; + if ( sba_order > 1 && ivas_total_brate >= IVAS_512k ) + { + *spar_hoa_dirac2spar_md_flag = 0; + } + else + { + *spar_hoa_dirac2spar_md_flag = 1; + } + + return; } + /*-------------------------------------------------------------------* * ivas_sba_zero_vert_comp() * diff --git a/lib_com/ivas_sns_com.c b/lib_com/ivas_sns_com.c index e4515a98547ce096ec8f1ebcbb46b2a1ce0a0f7d..da7b37e8c55f2ecfecc5f0439968cf315b39772e 100644 --- a/lib_com/ivas_sns_com.c +++ b/lib_com/ivas_sns_com.c @@ -36,6 +36,7 @@ #include "prot.h" #include "ivas_prot.h" #include "rom_com.h" +#include "ivas_rom_com.h" #include #include #ifdef DEBUGGING @@ -118,30 +119,20 @@ void sns_compute_scf( xs[FDNS_NPTS - 1] = 0.75f * x[FDNS_NPTS - 1] + 0.25f * x[FDNS_NPTS - 2]; /* Pre-emphasis */ - if ( L_frame == L_FRAME16k ) + switch ( L_frame ) { - tilt = 18.f; - } - else if ( L_frame == L_SPEC16k_EXT ) - { - tilt = 20.f; - } - else if ( L_frame == L_FRAME25_6k ) - { - tilt = 22.f; - } - else if ( L_frame == L_FRAME32k ) - { - tilt = 26.f; - } - else if ( L_frame == L_SPEC32k_EXT ) - { - tilt = 30.f; - } - else - { - tilt = 0.f; - assert( 0 && "illegal frame length in sns_compute_scf" ); + case L_FRAME16k: + tilt = 19.f; + break; + case L_FRAME25_6k: + tilt = 22.f; + break; + case L_FRAME32k: + tilt = 23.5f; + break; + default: + tilt = 0.f; + assert( !"illegal frame length in sns_compute_scf" ); } for ( i = 0; i < FDNS_NPTS; i++ ) diff --git a/lib_com/ivas_spar_com.c b/lib_com/ivas_spar_com.c index cb6ff23fc011ccfe3ca4364a1b38bb2a4143f6e0..c25a88e5cb464e3f5c094d187941af3a4f324db0 100644 --- a/lib_com/ivas_spar_com.c +++ b/lib_com/ivas_spar_com.c @@ -61,6 +61,7 @@ #define IVAS_ACTIVEW_DM_F ( 1.0f ) #define IVAS_ACTIVEW_DM_F_DTX ( 0.25f ) +#define IVAS_ACTIVEW_DM_F_VLBR ( 0.25f ) #define IVAS_LIN_ACTIVEW_QUAD_ACTIVEW_THRESH ( 3.0f ) #define IVAS_P_NORM_SCALING ( 1.0f ) @@ -76,11 +77,11 @@ *------------------------------------------------------------------------------------------*/ -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, const int16_t active_w_vlbr, 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, const int16_t active_w_vlbr, 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 +339,7 @@ void ivas_spar_config( { ivas_total_brate = IVAS_32k; } - - assert( ivas_total_brate == IVAS_32k || ivas_total_brate == IVAS_24k4 ); + assert( ivas_total_brate == IVAS_32k || ivas_total_brate == IVAS_24k4 || ivas_total_brate == IVAS_16k4 || ivas_total_brate == IVAS_13k2 ); if ( ivas_total_brate == IVAS_32k ) { *core_nominal_brate = ACELP_24k40; @@ -348,6 +348,14 @@ void ivas_spar_config( { *core_nominal_brate = ACELP_16k40; } + else if ( ivas_total_brate == IVAS_16k4 ) + { + *core_nominal_brate = ACELP_13k20; + } + else if ( ivas_total_brate == IVAS_13k2 ) + { + *core_nominal_brate = ACELP_9k60; + } } return; @@ -360,7 +368,7 @@ void ivas_spar_config( * Get SPAR table index *-----------------------------------------------------------------------------------------*/ -/* !r: config. table index */ +/*! r: config. table index */ int16_t ivas_get_spar_table_idx( const int32_t ivas_total_brate, /* i : IVAS total bitrate */ const int16_t sba_order, /* i : Ambisonic (SBA) order */ @@ -427,7 +435,7 @@ int16_t ivas_get_sba_num_TCs( { nchan_transport = 1; } - else if ( ivas_sba_mode_select( ivas_total_brate ) == SBA_MODE_DIRAC ) + else if ( ivas_sba_mode_select() == SBA_MODE_DIRAC ) { nchan_transport = 1; } @@ -456,6 +464,7 @@ static void ivas_get_pred_coeffs( const int16_t start_band, const int16_t end_band, const int16_t active_w, + const int16_t active_w_vlbr, const int16_t dtx_vad, const int16_t from_dirac ) { @@ -546,7 +555,7 @@ static void ivas_get_pred_coeffs( } else { - dm_f_local = IVAS_ACTIVEW_DM_F; + dm_f_local = ( active_w_vlbr ) ? IVAS_ACTIVEW_DM_F_VLBR : IVAS_ACTIVEW_DM_F; } for ( b = start_band; b < end_band; b++ ) @@ -645,6 +654,7 @@ static void ivas_get_Wscaling_factor( const int16_t *pNum_dmx, const int16_t bands_bw, const int16_t active_w, + const int16_t active_w_vlbr, float *pWscale ) { int16_t b, ch; @@ -657,7 +667,7 @@ static void ivas_get_Wscaling_factor( } else { - dm_f_local = IVAS_ACTIVEW_DM_F_SCALE; + dm_f_local = ( active_w_vlbr ) ? IVAS_ACTIVEW_DM_F_SCALE_VLBR : IVAS_ACTIVEW_DM_F_SCALE; } for ( b = start_band; b < end_band; b++ ) @@ -1538,6 +1548,7 @@ void ivas_compute_spar_params( const int16_t num_ch, const int16_t bands_bw, const int16_t active_w, + const int16_t active_w_vlbr, ivas_spar_md_com_cfg *hSparCfg, ivas_spar_md_t *hSparMd, float *pWscale, @@ -1546,7 +1557,9 @@ 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, + active_w_vlbr, + dtx_vad, from_dirac ); #ifdef SPAR_HOA_DBG /*fprintf(stderr, "\n\n Prediction Coefficients:\n"); @@ -1578,7 +1591,9 @@ 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, + active_w_vlbr, + pWscale ); for ( b = start_band; b < end_band; b++ ) { @@ -1648,7 +1663,9 @@ 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], + const uint8_t useLowerRes, + const int16_t active_w_vlbr ) { int16_t num_ch, band, i, j; int16_t block, ch; @@ -1662,14 +1679,21 @@ void ivas_get_spar_md_from_dirac( float **ppMixer_mat[IVAS_MAX_FB_MIXER_OUT_CH]; float *pMixer_mat[IVAS_MAX_FB_MIXER_OUT_CH][IVAS_MAX_SPAR_FB_MIXER_IN_CH]; float en_ratio_fac, diff_norm_order1, diff_norm_order2, diff_norm_order3; + int16_t ndm, foa_ch, hoa2_ch; float P_dir_fact[IVAS_SPAR_MAX_CH - 1]; const int16_t *remix_order; remix_order = remix_order_set[hSpar_md_cfg->remix_unmix_order]; - num_ch = ivas_sba_get_nchan_metadata( order ); - hoa2_ch = ivas_sba_get_nchan_metadata( SBA_HOA2_ORDER ); + num_ch = ivas_sba_get_nchan_metadata( order, + IVAS_256k /*dummy value as order is always 1 in this function*/ + ); + + hoa2_ch = ivas_sba_get_nchan_metadata( SBA_HOA2_ORDER, + IVAS_256k /*dummy value as order is always 1 in this function*/ + ); + foa_ch = FOA_CHANNELS; diff_norm_order1 = 3.0f; diff_norm_order2 = 5.0f; @@ -1684,7 +1708,7 @@ void ivas_get_spar_md_from_dirac( ppMixer_mat[i] = pMixer_mat[i]; } - if ( start_band >= 6 && hSpar_md_cfg->nchan_transport <= 2 && ( dtx_vad == 1 ) ) + 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 ) ) ) { float P_norm[3]; int16_t idx; @@ -1739,10 +1763,15 @@ void ivas_get_spar_md_from_dirac( /*SPAR from DirAC*/ set_f( response_avg, 0.0f, MAX_OUTPUT_CHANNELS ); + if ( n_ts > 1 ) { ivas_dirac_dec_get_response( (int16_t) azi_dirac[band][i_ts], (int16_t) ele_dirac[band][i_ts], response_avg, order ); } + else if ( useLowerRes ) + { + ivas_dirac_dec_get_response( (int16_t) azi_dirac[band][0], (int16_t) ele_dirac[band][0], response_avg, order ); + } else { for ( block = 0; block < MAX_PARAM_SPATIAL_SUBFRAMES; block++ ) @@ -1809,64 +1838,69 @@ void ivas_get_spar_md_from_dirac( { response_avg[i] = response_avg[HOA_keep_ind[i]]; } + en_ratio_fac = ( 1.0f - diffuseness[band] ); - for ( i = 0; i < num_ch; i++ ) { - for ( j = 0; j < num_ch; j++ ) + for ( i = 0; i < num_ch; i++ ) { - if ( i == j ) + for ( j = 0; j < num_ch; j++ ) { - if ( i == 0 ) + if ( i == j ) { - cov_real_dirac[i][i][band] = 1.0f; - } - else - { - cov_real_dirac[i][j][band] = en_ratio_fac * response_avg[i] * response_avg[j]; - if ( hSpar_md_cfg->nchan_transport <= 2 ) + if ( i == 0 ) + { + cov_real_dirac[i][i][band] = 1.0f; + } + else { - cov_real_dirac[i][j][band] *= en_ratio_fac; - if ( ( i >= ndm ) && ( dtx_vad == 1 ) ) + cov_real_dirac[i][j][band] = en_ratio_fac * response_avg[i] * response_avg[j]; + + if ( hSpar_md_cfg->nchan_transport <= 2 ) { - cov_real_dirac[i][j][band] += ( 1.0f - ( en_ratio_fac * en_ratio_fac ) ) * P_dir_fact[i - ndm]; + + cov_real_dirac[i][j][band] *= en_ratio_fac; + if ( ( i >= ndm ) && ( dtx_vad == 1 ) ) + { + cov_real_dirac[i][j][band] += ( 1.0f - ( en_ratio_fac * en_ratio_fac ) ) * P_dir_fact[i - ndm]; + } + else + { + if ( i < foa_ch ) + { + cov_real_dirac[i][j][band] += ( 1.0f - ( en_ratio_fac * en_ratio_fac ) ) / diff_norm_order1; + } + else if ( i < hoa2_ch ) + { + cov_real_dirac[i][j][band] += ( 1.0f - ( en_ratio_fac * en_ratio_fac ) ) / diff_norm_order2; + } + else + { + cov_real_dirac[i][j][band] += ( 1.0f - ( en_ratio_fac * en_ratio_fac ) ) / diff_norm_order3; + } + } } else { if ( i < foa_ch ) { - cov_real_dirac[i][j][band] += ( 1.0f - ( en_ratio_fac * en_ratio_fac ) ) / diff_norm_order1; + cov_real_dirac[i][j][band] += ( 1.0f - en_ratio_fac ) / diff_norm_order1; } else if ( i < hoa2_ch ) { - cov_real_dirac[i][j][band] += ( 1.0f - ( en_ratio_fac * en_ratio_fac ) ) / diff_norm_order2; + cov_real_dirac[i][j][band] += ( 1.0f - en_ratio_fac ) / diff_norm_order2; } else { - cov_real_dirac[i][j][band] += ( 1.0f - ( en_ratio_fac * en_ratio_fac ) ) / diff_norm_order3; + cov_real_dirac[i][j][band] += ( 1.0f - en_ratio_fac ) / diff_norm_order3; } } } - else - { - if ( i < foa_ch ) - { - cov_real_dirac[i][j][band] += ( 1.0f - en_ratio_fac ) / diff_norm_order1; - } - else if ( i < hoa2_ch ) - { - cov_real_dirac[i][j][band] += ( 1.0f - en_ratio_fac ) / diff_norm_order2; - } - else - { - cov_real_dirac[i][j][band] += ( 1.0f - en_ratio_fac ) / diff_norm_order3; - } - } } - } - else - { - cov_real_dirac[i][j][band] = en_ratio_fac * response_avg[i] * response_avg[j]; + else + { + cov_real_dirac[i][j][band] = en_ratio_fac * response_avg[i] * response_avg[j]; + } } } } @@ -1880,7 +1914,7 @@ void ivas_get_spar_md_from_dirac( } } -#ifdef DEBUG_SPAR_WRITE_OUT_COV +#ifdef DEBUG_SBA_MD_DUMP { static FILE *fid = 0; int16_t k = 0; @@ -1905,7 +1939,9 @@ 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, + active_w_vlbr, + hSpar_md_cfg, hSpar_md, Wscale, 1 ); if ( mixer_mat != NULL ) { @@ -2094,12 +2130,27 @@ void ivas_spar_set_bitrate_config( ivas_spar_md_com_cfg *pSpar_md_cfg, /* i/o: SPAR MD config. handle */ const int16_t table_idx, /* i : config. table index */ const int16_t num_bands /* i : number of bands */ +#ifdef ARITH_HUFF_CODER_CHANGES + , + const int16_t dirac2spar_md_flag, + const int16_t enc_flag, + const int16_t pca_flag, + const int16_t agc_flag +#endif ) { int32_t ivas_total_brate; int16_t i, total_bits, max_bits, code, length; int16_t sba_order; int16_t md_coding_bits_header; +#ifdef ARITH_HUFF_CODER_CHANGES + int16_t agc_bits, pca_bits, num_PR_bits_dirac_bands; + int16_t bits_PR, bits_C, bits_P; + int16_t wc_coarse_strat; + int16_t n_input, n_dmx, n_dec; + int16_t quant_strat; + int16_t bands_bw; +#endif pSpar_md_cfg->nchan_transport = ivas_spar_br_table_consts[table_idx].nchan_transport; for ( i = 0; i < pSpar_md_cfg->nchan_transport; i++ ) @@ -2131,13 +2182,23 @@ void ivas_spar_set_bitrate_config( max_bits += (int16_t) ( ivas_spar_br_table_consts[table_idx].core_brs[i][1] / FRAMES_PER_SEC ); } - pSpar_md_cfg->tgt_bits_per_blk = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC ) - IVAS_FORMAT_SIGNALING_NBITS_SBA - SBA_PLANAR_BITS - SBA_ORDER_BITS - length - total_bits; - pSpar_md_cfg->max_bits_per_blk = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC ) - IVAS_FORMAT_SIGNALING_NBITS_SBA - SBA_PLANAR_BITS - SBA_ORDER_BITS - length - max_bits; + pSpar_md_cfg->tgt_bits_per_blk = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC ) - IVAS_FORMAT_SIGNALING_NBITS_EXTENDED - SBA_PLANAR_BITS - SBA_ORDER_BITS - length - total_bits; + pSpar_md_cfg->max_bits_per_blk = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC ) - IVAS_FORMAT_SIGNALING_NBITS_EXTENDED - SBA_PLANAR_BITS - SBA_ORDER_BITS - length - max_bits; md_coding_bits_header = SPAR_NUM_CODING_STRAT_BITS + pSpar_md_cfg->quant_strat_bits; pSpar_md_cfg->tgt_bits_per_blk -= md_coding_bits_header; pSpar_md_cfg->max_bits_per_blk -= md_coding_bits_header; +#ifdef ARITH_HUFF_CODER_CHANGES + if ( ivas_total_brate < IVAS_24k4 ) + { + bands_bw = 2; + } + else + { + bands_bw = 1; + } +#endif pSpar_md_cfg->tgt_bits_per_blk = (int16_t) ceilf( ( 1.0f * pSpar_md_cfg->tgt_bits_per_blk * num_bands ) / IVAS_MAX_NUM_BANDS ); pSpar_md_cfg->max_bits_per_blk = (int16_t) ceilf( ( 1.0f * pSpar_md_cfg->max_bits_per_blk * num_bands ) / IVAS_MAX_NUM_BANDS ); @@ -2145,6 +2206,74 @@ void ivas_spar_set_bitrate_config( pSpar_md_cfg->tgt_bits_per_blk += md_coding_bits_header; pSpar_md_cfg->max_bits_per_blk += md_coding_bits_header; +#ifdef ARITH_HUFF_CODER_CHANGES + if ( enc_flag ) + { + /*calculate the actual worst case bits*/ + if ( ivas_total_brate >= BRATE_SPAR_Q_STRAT ) + { + quant_strat = QUANT_STRAT_0; + } + else + { + quant_strat = QUANT_STRAT_2; + } + + num_PR_bits_dirac_bands = ( dirac2spar_md_flag == 1 ) ? num_bands - SPAR_DIRAC_SPLIT_START_BAND : 0; + num_PR_bits_dirac_bands /= bands_bw; + num_PR_bits_dirac_bands = max( 0, num_PR_bits_dirac_bands ); + num_PR_bits_dirac_bands *= DIRAC_TO_SPAR_HBR_PRED_CHS; + + n_input = ivas_sba_get_nchan_metadata( sba_order, ivas_total_brate ); + n_dmx = ivas_spar_br_table_consts[table_idx].nchan_transport; + n_dec = n_input - n_dmx; + bits_PR = (int16_t) ceilf( log2f( ivas_spar_br_table_consts[table_idx].q_lvls[quant_strat][0] ) ); + num_PR_bits_dirac_bands *= bits_PR; + bits_PR = bits_PR * ( n_input - 1 ); + bits_C = (int16_t) ceilf( log2f( ivas_spar_br_table_consts[table_idx].q_lvls[quant_strat][1] ) ) * ( ( n_dmx - 1 ) * n_dec ); + bits_P = (int16_t) ceilf( log2f( ivas_spar_br_table_consts[table_idx].q_lvls[quant_strat][2] ) ) * ( n_dec ); + wc_coarse_strat = bits_PR + bits_C + bits_P; + wc_coarse_strat *= num_bands; + wc_coarse_strat /= bands_bw; + wc_coarse_strat -= num_PR_bits_dirac_bands; + wc_coarse_strat += md_coding_bits_header; + + if ( pSpar_md_cfg->max_bits_per_blk < wc_coarse_strat ) + { + assert( 0 ); + } + + if ( agc_flag ) + { + if ( pSpar_md_cfg->nchan_transport == 1 ) + { + agc_bits = AGC_BITS_PER_CH; + } + else + { + agc_bits = AGC_BITS_PER_CH * pSpar_md_cfg->nchan_transport + AGC_SIGNALLING_BITS; + } + } + else + { + agc_bits = AGC_SIGNALLING_BITS; + } + + if ( ivas_total_brate == PCA_BRATE && sba_order == SBA_FOA_ORDER ) + { + pca_bits = 1; + if ( pca_flag ) + { + pca_bits += IVAS_PCA_QBITS + IVAS_PCA_QBITS - 1; + } + } + else + { + pca_bits = 0; + } + pSpar_md_cfg->max_md_bits_spar = pSpar_md_cfg->max_bits_per_blk + agc_bits + pca_bits; + } +#endif return; } diff --git a/lib_com/ivas_stat_com.h b/lib_com/ivas_stat_com.h index 041a589ee3895ad58bd43132559a1ff3e966d14d..d7239087d9ae121b5e521dcc679fac7bf210e2d2 100644 --- a/lib_com/ivas_stat_com.h +++ b/lib_com/ivas_stat_com.h @@ -43,24 +43,16 @@ /*----------------------------------------------------------------------------------* * Declaration of ISM common (encoder & decoder) structure *----------------------------------------------------------------------------------*/ -#ifdef FIX_379_ANGLE + 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; -#else -typedef struct -{ - 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 */ } ISM_METADATA_ANGLE, *ISM_METADATA_ANGLE_HANDLE; -#endif + /* ISM metadata handle (storage for one frame of read ISM metadata) */ typedef struct { @@ -68,25 +60,26 @@ typedef struct int16_t last_ism_metadata_flag; /* last frame ism_metadata_flag */ float azimuth; /* azimuth value read from the input metadata file */ - float elevation; /* azimuth value read from the input metadata file */ - float radius; - float yaw; /* azimuth orientation value read from the input metadata file */ - float pitch; /* elevation orientation value read from the input metadata file */ -#ifdef FIX_379_ANGLE + float elevation; /* elevation value read from the input metadata file */ + float radius; /* radius value read from the input metadata file */ + float yaw; /* yaw value read from the input metadata file */ + float pitch; /* pitch value read from the input metadata file */ + + int16_t non_diegetic_flag; /* Non-diegetic (non-headtracked) object flag */ + ISM_METADATA_ANGLE position_angle; /* Angle structs for azimuth and elevation */ ISM_METADATA_ANGLE orientation_angle; /* Angle structs for yaw and pitch */ -#else - ISM_METADATA_ANGLE angle[2]; /* Angle structs for [0] azimuth/elevation and [1] yaw/pitch */ -#endif - int16_t last_radius_idx; /* last frame index of coded radius */ - int16_t radius_diff_cnt; /* FEC counter of consecutive differentially radius coded frames */ + int16_t last_radius_idx; /* last frame index of coded radius */ + int16_t radius_diff_cnt; /* FEC counter of consecutive differentially radius coded frames */ -#ifdef DISCRETE_ISM_DTX_CNG 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 */ -#endif + + 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 */ + float last_true_radius; /* last true Q radius value */ } ISM_METADATA_FRAME, *ISM_METADATA_HANDLE; @@ -160,9 +153,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]; -#ifndef NCHAN_ISM_PARAMETER - int16_t num_obj; -#endif int16_t azi_index[MAX_NUM_OBJECTS]; int16_t ele_index[MAX_NUM_OBJECTS]; @@ -177,6 +167,7 @@ typedef struct ivas_param_ism_data_structure int16_t flag_noisy_speech; int16_t noisy_speech_buffer[PARAM_ISM_HYS_BUF_SIZE]; + int16_t flag_equal_energy; } PARAM_ISM_CONFIG_DATA, *PARAM_ISM_CONFIG_HANDLE; @@ -189,6 +180,7 @@ typedef struct ivas_dirac_config_data_struct { int16_t enc_param_start_band; int16_t dec_param_estim; + int16_t dec_param_estim_old; int16_t nbands; } DIRAC_CONFIG_DATA, *DIRAC_CONFIG_DATA_HANDLE; @@ -271,6 +263,9 @@ typedef struct ivas_spar_md_com_cfg int16_t agc_bits_ch_idx; int16_t planarCP; int16_t num_umx_chs; +#ifdef ARITH_HUFF_CODER_CHANGES + int16_t max_md_bits_spar; +#endif } ivas_spar_md_com_cfg; @@ -355,7 +350,7 @@ typedef struct ivas_agc_chan_data_t typedef struct ivas_agc_com_state_t { float *winFunc; - int16_t in_delay; + int16_t in_delay; /* TODO: JBM check if this needs to be adjusted in the dec */ uint16_t absEmin; uint16_t betaE; uint16_t maxAttExp; @@ -435,6 +430,9 @@ typedef struct ivas_masa_directional_spatial_meta_struct float elevation[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]; float energy_ratio[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]; float spread_coherence[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]; +#ifdef HR_METADATA + uint16_t spherical_index[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]; +#endif } MASA_DIRECTIONAL_SPATIAL_META; @@ -479,6 +477,9 @@ typedef struct int16_t nbands; int16_t nblocks; int16_t start_band; +#ifdef FIX_HBR_MASAMETA + uint8_t inactiveBands; +#endif int16_t search_effort; MC_LS_SETUP mc_ls_setup; @@ -510,7 +511,6 @@ typedef struct ivas_qdirection_band_coherence_data_struct uint8_t spread_coherence[MAX_PARAM_SPATIAL_SUBFRAMES]; uint16_t spread_coherence_dct0_index; uint16_t spread_coherence_dct1_index; - } IVAS_QDIRECTION_BAND_COHERENCE_DATA; typedef struct ivas_surround_coherence_band_data_struct @@ -710,6 +710,10 @@ typedef struct ivas_td_decorr_state_t int16_t num_apd_sections; int16_t ducking_flag; +#ifdef JBM_TSM_ON_TCS + int16_t offset; +#endif + } ivas_td_decorr_state_t; @@ -722,6 +726,7 @@ typedef struct ivas_fb_mixer_cfg_t int16_t fb_latency; int16_t num_in_chans; int16_t num_out_chans; + int16_t nchan_fb_in; int16_t pcm_offset; int16_t fade_len; /* this sets the stride length; no delay is introduced */ int16_t prior_input_length; diff --git a/lib_com/ivas_stereo_td_bit_alloc.c b/lib_com/ivas_stereo_td_bit_alloc.c index 8b93558b219ea63fce4c737e2436d6221ff40ad0..dee56c5dff17f6b34fb245fcf8beb729603e6b09 100644 --- a/lib_com/ivas_stereo_td_bit_alloc.c +++ b/lib_com/ivas_stereo_td_bit_alloc.c @@ -478,7 +478,6 @@ void td_stereo_param_updt( } -#ifdef LSF_RE_USE_SECONDARY_CHANNEL /*-------------------------------------------------------------------* * tdm_SCh_LSF_intra_pred_zero_bits() * @@ -487,7 +486,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 +496,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 +510,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 +521,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 +562,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 +588,43 @@ 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_SCh, tdm_LSF_MEAN_PRED_QNT_IN, tdm_LSF_MEAN_PRED_QNT_OUT, tdm_PRED_QNT_fixed_beta_prd_diag_3 ); + + 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_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]; - 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 ); + /* 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; } -#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE /*-------------------------------------------------------------------* * tdm_SCh_LSF_intra_pred_one_bit_enc() * @@ -604,29 +632,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 +662,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 +688,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,10 +721,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; } -#endif - -#endif diff --git a/lib_com/ivas_td_decorr.c b/lib_com/ivas_td_decorr.c index 23620b3b2db5dc6db7e83828c615efef98faba5e..9285e23a227a86f3e3b649f263901a8cfe3378f4 100644 --- a/lib_com/ivas_td_decorr.c +++ b/lib_com/ivas_td_decorr.c @@ -87,12 +87,107 @@ static const float ivas_three_pow_frac[IVAS_MAX_DECORR_APD_SECTIONS] = { }; +#define IVAS_TDET_DUCK_MULT_FAC_PARA_BIN ( 2.0f ) +#define IVAS_TDET_DUCK_MULT_FAC_PARA_BIN_LOW_BR ( 3.0f ) + /*------------------------------------------------------------------------------------------* * 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 ); + + +/*------------------------------------------------------------------------- + * ivas_td_decorr_reconfig_dec() + * + * Allocate and initialize time domain decorrelator handle + *------------------------------------------------------------------------*/ + +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; +} /*------------------------------------------------------------------------- @@ -127,7 +222,9 @@ ivas_error ivas_td_decorr_dec_open( return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR COV decoder" ); } set_f( hTdDecorr_loc->look_ahead_buf, 0, (int16_t) ( output_Fs * IVAS_DECORR_PARM_LOOKAHEAD_TAU ) ); - +#ifdef JBM_TSM_ON_TCS + hTdDecorr_loc->offset = (int16_t) ( output_Fs * IVAS_DECORR_PARM_LOOKAHEAD_TAU ); +#endif 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++ ) @@ -275,7 +372,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 +392,7 @@ static ivas_error ivas_td_decorr_init( } } - return IVAS_ERR_OK; + return; } @@ -304,8 +401,7 @@ static ivas_error ivas_td_decorr_init( * * APD IIR filter *-----------------------------------------------------------------------------------------*/ - -static void ivas_td_decorr_APD_iir_filter( +void ivas_td_decorr_APD_iir_filter( ivas_td_decorr_APD_filt_state_t *filter_state, float *pIn_out, const int16_t num_APD_sections, @@ -375,20 +471,32 @@ static void ivas_td_decorr_APD_sections( void ivas_td_decorr_process( ivas_td_decorr_state_t *hTdDecorr, /* i/o: SPAR Covar. decoder handle */ - float pcm_in[][L_FRAME48k], /* i : input audio channels */ - float **ppOut_pcm, /* o : output audio channels */ - const int16_t output_frame /* i : output frame length */ +#ifdef JBM_TSM_ON_TCS + float *pcm_in[], +#else + float pcm_in[][L_FRAME48k], /* i : input audio channels */ +#endif + float **ppOut_pcm, /* o : output audio channels */ + const int16_t output_frame /* i : output frame length */ ) { int16_t i, j; +#ifndef JBM_TSM_ON_TCS int16_t offset; +#endif float in_duck_gain[L_FRAME48k], out_duck_gain[L_FRAME48k]; +#ifndef JBM_TSM_ON_TCS offset = (int16_t) ( output_frame * FRAMES_PER_SEC * IVAS_DECORR_PARM_LOOKAHEAD_TAU ); +#endif /* Look-ahead delay */ mvr2r( pcm_in[0], ppOut_pcm[0], output_frame ); +#ifdef JBM_TSM_ON_TCS + delay_signal( ppOut_pcm[0], output_frame, hTdDecorr->look_ahead_buf, hTdDecorr->offset ); +#else delay_signal( ppOut_pcm[0], output_frame, hTdDecorr->look_ahead_buf, offset ); +#endif /* In ducking gains */ if ( hTdDecorr->ducking_flag ) diff --git a/lib_com/ivas_tools.c b/lib_com/ivas_tools.c index b75c08379121fbeab38909b5b787ca0fec8a31e2..ce4abafeb5d8cda10fa6ff720e89e7a1322c2e32 100644 --- a/lib_com/ivas_tools.c +++ b/lib_com/ivas_tools.c @@ -75,10 +75,18 @@ float sumAbs( void mvc2c( const uint8_t x[], /* i : input vector */ uint8_t y[], /* o : output vector */ - const int16_t n /* i : vector size */ +#ifdef FIX_XXX_JBM_FIFO_BUFFER + const int32_t n +#else + const int16_t n /* i : vector size */ +#endif ) { +#ifdef FIX_XXX_JBM_FIFO_BUFFER + int32_t i; +#else int16_t i; +#endif if ( n <= 0 ) { @@ -114,14 +122,22 @@ void mvc2c( /*! r: number of clipped samples */ uint32_t ivas_syn_output( - float synth[][L_FRAME48k], /* i/o: float synthesis signal */ +#ifdef JBM_TSM_ON_TCS + float *synth[], /* i/o: float synthesis signal */ +#else + float synth[][L_FRAME48k], /* i/o: float synthesis signal */ +#endif const int16_t output_frame, /* i : output frame length (one channel) */ const int16_t n_channels, /* i : number of output channels */ int16_t *synth_out /* o : integer 16 bits synthesis signal */ ) { int16_t i, n; +#ifdef JBM_TSM_ON_TCS + int16_t synth_loc[MAX_JBM_L_FRAME48k]; +#else int16_t synth_loc[L_FRAME48k]; +#endif uint32_t noClipping = 0; /*-----------------------------------------------------------------* @@ -147,6 +163,40 @@ uint32_t ivas_syn_output( return noClipping; } +#ifdef JBM_TSM_ON_TCS +/*-------------------------------------------------------------------* + * ivas_syn_output_f() + * + * Output ivas synthesis signal with compensation for saturation + * returns number of clipped samples + *-------------------------------------------------------------------*/ + +/*! r: number of clipped samples */ +void ivas_syn_output_f( + float *synth[], /* i/o: float synthesis signal */ + const int16_t output_frame, /* i : output frame length (one channel) */ + const int16_t n_channels, /* i : number of output channels */ + float *synth_out /* o : integer 16 bits synthesis signal */ +) +{ + int16_t i, n; + + /*-----------------------------------------------------------------* + * float to integer conversion with saturation control + *-----------------------------------------------------------------*/ + + for ( n = 0; n < n_channels; n++ ) + { + for ( i = 0; i < output_frame; i++ ) + { + synth_out[i * n_channels + n] = synth[n][i]; + } + } + + return; +} +#endif + /*-------------------------------------------------------------------* * mvr2r_inc() * diff --git a/lib_com/lsf_tools.c b/lib_com/lsf_tools.c index 19321e21d9bcea526d92d3f0fc6cebc6be6c87f2..02a735e80c0baf8914c90526bd7fde29581f5dd8 100644 --- a/lib_com/lsf_tools.c +++ b/lib_com/lsf_tools.c @@ -2027,6 +2027,62 @@ int16_t tcxlpc_get_cdk( return cdk; } +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 ); +} + + /*--------------------------------------------------------------------------* * msvq_dec() * @@ -2035,15 +2091,17 @@ int16_t tcxlpc_get_cdk( void msvq_dec( - const float *const *cb, /* i : Codebook (indexed cb[*stages][levels][p]) */ - const int16_t dims[], /* i : Dimension of each codebook stage (NULL: full dim.) */ - const int16_t offs[], /* i : Starting dimension of each codebook stage (NULL: 0) */ - const int16_t stages, /* i : Number of stages */ - 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) */ + const float *const *cb, /* i : Codebook (indexed cb[*stages][levels][p]) */ + const int16_t dims[], /* i : Dimension of each codebook stage (NULL: full dim.) */ + const int16_t offs[], /* i : Starting dimension of each codebook stage (NULL: 0) */ + const int16_t stages, /* i : Number of stages */ + const int16_t N, /* i : Vector dimension */ + const int16_t maxN, /* i : Codebook dimension */ + const int16_t Idx[], /* i : Indices */ + const int16_t applyIDCT_flag, /* i : applyIDCT flag */ + const float *invTrfMatrix, /* i: matrix for IDCT synthesis */ + float *uq, /* o : quantized vector */ + Word16 *uq_ind /* o : quantized vector (fixed point) */ ) { int16_t i, n, maxn, start; @@ -2079,9 +2137,17 @@ void msvq_dec( start = 0; } -#define WMC_TOOL_SKIP - v_add( uq + start, cb[i] + Idx[i] * maxn, uq + start, n ); + 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 ) @@ -2358,3 +2424,193 @@ void a2isf( return; } + +/*-------------------------------------------------------------------* + * 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 + } + } +} diff --git a/lib_com/options.h b/lib_com/options.h index a906d00c705c6c8c2144f14619e3af61a0f3f2c4..6d45fd9eb59f69da2069611207f57e5c64ecb018 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -64,7 +64,7 @@ /*#define DEBUG_MODE_TCX*/ /* output most important TCX core parameters to the subdirectory "res/" */ /*#define DEBUG_MODE_DFT*/ /* output most important DFT stereo parameters to the subdirectory "res/" */ /*#define DEBUG_MODE_TD*/ /* output most important TD stereo parameters to the subdirectory "res/ */ -//#define DEBUG_MODE_DIRAC /* output most important DIRAC parameters to the subdirectory "res/" */ +/*#define DEBUG_MODE_DIRAC*/ /* output most important DIRAC parameters to the subdirectory "res/" */ /*#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/" */ @@ -83,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*/ @@ -112,8 +112,9 @@ /*#define TDREND_HRTF_TABLE_METHODS*/ /* Enable HRTF lookup from tables, for testing & evaluation. Supply file in table format to use. Note that a suitable HR filter lookup method should be written if the filters sample point grids are not in the formats. */ /*#define TDREND_STANDALONE*/ /* Used when renderer is built in standalone form, without IVAS encoding/decoding (see scripts/object_renderer_standalone). This is just here to ensure this is cleaned out by prepare_instrumentation.sh */ -/*#define DEBUG_SBA*/ /* debug DIRAC/SPAR in-out */ +/*#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 */ @@ -124,7 +125,8 @@ #endif /*#define SPAR_HOA_DBG*/ /* SPAR HOA debug statements */ /*#define DEBUG_BINAURAL_FILTER_DESIGN*/ /* debugging of Crend binaural filter design */ -#define DEBUG_AGC_ENCODER_CMD_OPTION /* Ability to force enable or disable AGC behaviour in DIRAC/SPAR via command line option */ +//#define DEBUG_AGC_ENCODER_CMD_OPTION /* Ability to force enable or disable AGC behaviour in DIRAC/SPAR via command line option */ +#define DEBUG_JBM_CMD_OPTION /* ability for telling the decoder the frontend fetch size and to not delay compensate for bad frames at the beginning */ #endif /* #################### End DEBUGGING switches ############################ */ @@ -132,49 +134,83 @@ /* ################# Start DEVELOPMENT switches ######################## */ #define BASOP_NOGLOB /* Disable global symbols in BASOPs, Overflow/Carry in BASOPs disabled, additional BASOPs in case of Overflow */ -#define BITSTREAM_INDICES_MEMORY /* Don't count memory for bitstream Indice at the encoder - it is a temporary solution for development only */ +#define IND_LIST_DYN /* VA: Issue 18: Dynamic allocation of ind_list[] and ind_list_metadata[] based on # of transport channels */ -#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 */ +#ifndef IND_LIST_DYN +#define BITSTREAM_INDICES_MEMORY /* Don't count memory for bitstream Indice at the encoder - it is a temporary solution for development only */ #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_103_RA_PARAMS_PARAM_BIN_REND /* Issue 103: Digest room acoustics parameters for Parametric Binaural Renderer*/ -/*#define SBA_HPF_TUNING_DEC*/ - -#define FIX_350_MASA_DELAY_COMP /* Nokia: Issue 350: MASA audio/meta delay compensation */ -#define FIX_MDCT_BASED_BWD /* FhG: fixes for BWD for issues with reaction to transients for MDCT-stereo and MCT */ -#define DISCRETE_ISM_DTX_CNG /* FhG/VA: contribution 15 - DTX/CNG for (discrete) ISM */ -#define NCHAN_ISM_PARAMETER /* VA: make 'nchan_ism' parameter part of st_ivas/hEncoderConfig */ #define FIX_BINAURAL_DELAY_PRECISION #define USE_SYMETRIC_HRIR_FILTERS #define FIX_CREND_BRIR_REVERB #define FIX_CREND_WITH_REVERB -#define FIX_382_MASA_META_FRAMING_ASYNC /* Nokia: Issue 382: detect potential MASA metadata framing offset */ -#define FIX_386_CORECODER_RECONFIG /* VA: Issue 386: Resolve ToDo comments in CoreCoder reconfig. */ +#define USE_HRIR_128_METH5_IRC_53_Q10_SYML_ITRP1_48000 /* Dolby (Orange, FhG) : Contribution 36 - SBA HRIR update */ +#define UPDATE_SBA_FILTER /* Dolby (Orange, FhG) : Contribution 36 - SBA HRIR update */ + +/*#define FIX_XXX_JBM_FIFO_BUFFER */ /* FhG: prevent wraparound of a length identifier in cause of large frames and many channels*/ +#define HR_METADATA /* Nok: Contribution #45: encode directional MASA metadata with more bits at 384k and 512k */ + +#define SBA_TD_RESIDUAL /* Dlb : Issue 426: SBA encoder complexity optimization */ + +#define FIX_357_DTX_32K /* Eri: issue 357 - Forced LP-CNG at 32k */ +#define FIX_435_ISM_MERGE_BUG /* Eri: Merge bug fix for ISM NULL metadata and tcx_only cases */ +#define FIX_355_REFACTOR_PARAMBIN_TO_5MS /* Nokia: Fixes issue 355 by refactoring parametric binauralizer code to 5 ms mode */ +#define FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING /* Eri: Fix incorrect use of stack variable used for channel aware config file */ +#define COMBINED_FORMAT_SIGNALING /* VA: Introduce a signaling bit for combined format coding */ + +#define FIX_356_ISM_METADATA_SYNC /* Eri: issue 356: Metadata out-of-synch for -no_delay_comp */ +#define FIX_446_STEREO_DMX_CRASH /* FhG: fix discrepancy with EVS code that could cause crashes in rare cases */ -#define SBA2MONO /* FhG: Issue 365: Adapt processing of SBA mono output to be in line with stereo output (less delay, lower complexity) */ -#define FIX_379_EXT_METADATA /* Eri: Extended metadata issues */ -#define FIX_379_ANGLE /* Eri: Extended metadata issues related to angle structure */ +#define FIX_386_CORECODER_RECONFIG_2 /* VA: Issue 386: Resolve remaining ToDo comments in CoreCoder reconfig. */ +#define FIX_439_OTR_PARAMS /* Philips: Issue 439: orientation tracking parameter aspects. */ -#define NOKIA_PARAMBIN_REQULARIZATION /* Nokia: Contribution - Configured reqularization factor for parametric binauralizer. */ -#define NOKIA_ADAPTIVE_BINAURAL_PROTOS /* Nokia: Contribution 28: Adaptive binaural prototypes */ -#define NOKIA_ADAPTIVE_BINAURAL_PROTOS_OPT /* Nokia: enable adaptive binaural prototype complexity optimizations */ +#define FIX_440_PARAM_ISM_DIR_NOISE /* FhG: Issue 440: Fix directional background noise becoming diffuse in ParamISM */ -#define FIX_389_EXT_REND_PCM_SR /* Nokia: Issue 389: Fix assignment of sample rate with PCM input. */ -#define FIX_390_EXT_REND_MASA_META_COPY /* Nokia: Issue 390: Fixes MASA metadata copying to renderer. */ -#define FIX_392_LATE_REVERB /* DLB : Issue 392: keep late reverb by default off when output config is not BINAURAL_ROOM*/ +#define LBR_SBA_DIRAC_FIX /* DLB: Bug fix for DirAC at low bitrates */ -#define FIX_ISM_DTX_CLICKS /* FhG: fix for clicks in ISM DTX for inactive to active TCX transitions */ +#define FIX_445_SNS_BUGFIXES /* FhG: bug fix for spectral tilt in SNS computation + necessary update of codebooks and converison to fixedpoint-compatible tables */ +#define FIX_447_PARAMBIN_MASA_REGU_FAC /* Nokia: Issue 447: Fix issue by adjusting regularization factor minimum value. */ +#define FIX_441_SBA_PARAMBIN_GAINS /* Nokia: Fix issue 441 by changing gains in SBA path of parametric binauralizer */ -#define ISSUE_24_CLEANUP_MCT_LFE /* Issue 24: Cleanup LFE path withing MCT */ +#define MC_PARAMUPMIX_MODE /* Dlb: Contribution 39: Multichannel Parametric Upmix */ +#define FIX_469_BRSWITCH_PUPMIX /* Dlb: Fix issue 469 for Param Upmix bitrate switching */ +#define HODIRAC /* FhG: Contribution 32: Sector-based HO-DirAC method for SBA at high bitrates */ +#define DIRAC_ALLOC_HARM /* VA: harmonize DirAC parameters allocation/deallocation */ + + +#define COMPLEXITY_LEVEL_INDICATION + +#define FIX_439_OTR_PARAMS /* Philips: Issue 439: orientation tracking parameter aspects. */ + +#define ARITH_HUFF_CODER_CHANGES /* DLB: Optimization of metadata memory for Huffman and arithmetic coders */ + +#define FIX_463_TD_RENDERER_DIRECTIVITY_RESET /* Eri: Remove unintentional reset of directivity pattern */ +#define FIX_642 /* FhG: Fix for issue 642, buggy DoA-array access in DirAC head rotation*/ +#define FIX_443_FD_CNG_INIT /* FhG: correct bitrate value for FD-CNG init */ +#define VARIABLE_SPEED_DECODING /* FhG: variable speed decoding employing the JBM functioniality */ +#define JBM_TSM_ON_TCS /* FhG: run the TSM part of JBM on the TCs instead of the final output pcm waveforms */ +#define FIX_DTX_428 /* FhG: fix for issue 428, crash with DTX and bitrate switching */ +#define FIX_STEREO_474 /* FhG fix for issue 574, crash with SBA to stereo output at 512 kbps */ +#define FIX_MDCT_ST_PLC_FADEOUT_DELAY +#define FIX_DIRAC_LS_SYNTHESIS_CONFIG_479 /* FhG: fix for issue 479, broken LS output with DirAC at high BRs */ +#define HYBRID_ITD_MAX /* FhG: Improvement for DFT-stereo for cases with large ITDs */ +#define FIX_462_HRTF_FILE_BR_SWITCH_MEM_ERR /* Eri: Fix for issue 462: Use-of-uninitialized memory in external HRTF deallocation in decoder together with BR switching */ +#define FIX_487_LOWRATE_SBA_TUNING_FIX /* Dlb: TUning fix for low bitrate cases to match theoretical longest SPAR MD bitstream */ +#define FIX_490_MASA_2TC_LBR_DTX /* Nokia: Fixes issue 490 by correcting condition. */ + +#define FIX_HBR_MASAMETA /* Nokia: Fixes to HBR MASA metadata at 384 and 512 kbps. Addresses issues 438 and 477 as well. */ +#define FIX_482_DUMMYDEC_INIT /* Nokia: fix issue #428: missing inits for dummyDec in IVAS_rend */ +#define FIX_468_16KHZ_PUPMIX /* Dlb: Fix issue 468 for Param Upmix at 16kHz sampling rate */ + +#define FIX_485_STATIC_BUFFERS /* FhG: move static buffers in DirAC parameter estimator to the DirAC struct */ /* ################## End DEVELOPMENT switches ######################### */ /* clang-format on */ + #endif diff --git a/lib_com/prot.h b/lib_com/prot.h index 65846708efb7b3d9dfb6e7fb2c665299a3a223ad..e6f371c468148a17d0d23a7be80ee575ed20a52a 100644 --- a/lib_com/prot.h +++ b/lib_com/prot.h @@ -177,7 +177,11 @@ float sum2_f( void set_c( int8_t y[], /* i/o: Vector to set */ const int8_t a, /* i : Value to set the vector to */ - const int16_t N /* i : Lenght of the vector */ +#ifdef JBM_TSM_ON_TCS + const int32_t N /* i : Length of the vector */ +#else + const int16_t N /* i : Length of the vector */ +#endif ); void set_s( @@ -515,6 +519,54 @@ void push_next_bits( #endif ); +#ifdef IND_LIST_DYN +int16_t get_ivas_max_num_indices( /* o : maximum number of indices */ + const IVAS_FORMAT ivas_format, /* i : IVAS format */ + const int32_t ivas_total_brate /* i : IVAS total bitrate */ +); + +int16_t get_core_max_num_indices( /* o : maximum number of indices */ + const int16_t core, /* i : core */ + const int32_t total_brate /* i : total bitrate */ +); + +int16_t get_BWE_max_num_indices( /* o : maximum number of indices */ + const int32_t extl_brate /* i : extensiona layer bitrate */ +); + +int16_t get_ivas_max_num_indices_metadata( /* o : maximum number of indices for metadata */ + const IVAS_FORMAT ivas_format, /* i : IVAS format */ + const int32_t ivas_total_brate /* i : IVAS total bitrate */ +); + +ivas_error ind_list_realloc( + BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */ + int16_t max_num_indices /* i : new maximum number of allowed indices in the list */ +); + +ivas_error check_ind_list_limits( + BSTR_ENC_HANDLE hBstr /* i/o: encoder bitstream handle */ +); + +ivas_error move_indices( + INDICE_HANDLE old_ind_list, /* i/o: old location of indices */ + INDICE_HANDLE new_ind_list, /* i/o: new location of indices */ + const int16_t nb_indices /* i : number of moved indices */ +); + +int16_t find_indice( /* o : index of the indice in the list, -1 if not found */ + BSTR_ENC_HANDLE hBstr, /* i : encoder bitstream handle */ + int16_t id, /* i : ID of the indice */ + uint16_t *value, /* o : value of the quantized indice */ + int16_t *nb_bits /* o : number of bits used to quantize the indice */ +); + +uint16_t delete_indice( /* o : number of deleted indices */ + BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */ + int16_t id /* i : ID of the indice */ +); +#endif + /*! r: value of the indice */ #ifdef DEBUG_BS_READ_WRITE #define get_next_indice( ... ) get_next_indice_( __VA_ARGS__, __LINE__, __func__ ) @@ -613,12 +665,14 @@ Decoder_State **reset_elements( ); +#ifndef IND_LIST_DYN void indices_to_serial_generic( const Indice *ind_list, /* i : indices list */ const Word16 num_indices, /* i : number of indices to write */ UWord8 *pFrame, /* o : byte array with bit packet and byte aligned coded speech data */ Word16 *pFrame_size /* o : size of the binary encoded access unit [bits] */ ); +#endif void convertSerialToBytestream( const uint16_t *const serial, /* i : input serial bitstream with values 0 and 1 */ @@ -2219,8 +2273,12 @@ void read_next_force( int32_t *force_profile_cnt /* i/o: counter of frames for force switching profile file */ ); #endif + ivas_error init_encoder( - Encoder_State *st, /* i/o: state structure */ + Encoder_State *st, /* i/o: state structure */ +#ifdef IND_LIST_DYN + Encoder_Struct *st_ivas, /* i/o: encoder state structure */ +#endif 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 */ @@ -2323,7 +2381,6 @@ 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 */ ); @@ -3022,10 +3079,8 @@ void lsf_enc( float *Aq, /* o : quantized A(z) for 4 subframes */ const int16_t tdm_low_rate_mode, /* i : secondary channel low rate mode flag */ const int16_t GSC_IVAS_mode /* i : GSC IVAS mode */ -#ifdef LSF_RE_USE_SECONDARY_CHANNEL , const float tdm_lsfQ_PCh[M] /* i : Q LSFs for primary channel */ -#endif ); void isf_enc_amr_wb( @@ -3823,10 +3878,8 @@ void bw_detect( const float signal_in[], /* i : input signal */ float *spectrum, /* i : MDCT spectrum */ const float *enerBuffer /* i : energy buffer */ -#ifdef FIX_MDCT_BASED_BWD , const int16_t mct_on /* i : flag MCT mode */ -#endif ); @@ -4502,6 +4555,8 @@ 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 */ + , + const int16_t read_sid_info /* i : read SID info flag */ ); void bass_psfilter_init( @@ -4582,10 +4637,8 @@ void lsf_dec( float *lsp_new, /* o : de-quantized LSP vector */ float *lsp_mid, /* o : de-quantized mid-frame LSP vector */ const int16_t tdm_low_rate_mode /* i : secondary channel low rate mode flag */ -#ifdef LSF_RE_USE_SECONDARY_CHANNEL , const float tdm_lsfQ_PCh[M] /* i : Q LSFs for primary channel */ -#endif ); void isf_dec_amr_wb( @@ -5856,13 +5909,11 @@ void core_switching_post_enc( ); ivas_error core_switching_post_dec( - Decoder_State *st, /* i/o: decoder state structure */ - 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 */ -#ifdef FIX_ISM_DTX_CLICKS - const IVAS_FORMAT ivas_format, /* i : IVAS format */ -#endif + Decoder_State *st, /* i/o: decoder state structure */ + 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 */ @@ -7154,10 +7205,6 @@ void WindowSignal( 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 */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - const int16_t isLfe /* i : LFE flag */ -#endif ); void HBAutocorrelation( @@ -7311,10 +7358,6 @@ void tcx_get_windows( int16_t *right_overlap, /* o : right overlap length */ const float **right_win, /* o : right overlap window */ const int16_t fullband /* i : fullband flag */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - const int16_t isLfe /* i : LFE flag */ -#endif ); void tcx_windowing_analysis( @@ -8066,23 +8109,98 @@ void msvq_enc( const int16_t *levels, /* i : Number of levels in each stage */ const int16_t maxC, /* i : Tree search size (number of candidates kept from */ /* one stage to the next == M-best) */ - const int16_t stages, /* i : Number of stages */ - const float w[], /* i : Weights */ - const int16_t N, /* i : Vector dimension */ - const int16_t maxN, /* i : Codebook dimension */ - int16_t Idx[] /* o : Indices */ + const int16_t stages, /* i : Number of stages */ + const float w[], /* i : Weights */ + const int16_t N, /* i : Vector dimension */ + const int16_t maxN, /* i : Codebook dimension */ + const int16_t applyDCT_flag, /* i : applyDCT flag */ + float *invTrfMatrix, /* i:/o expanded synthesis matrix */ + int16_t Idx[] /* o : Indices */ ); void msvq_dec( - const float *const *cb, /* i : Codebook (indexed cb[*stages][levels][p]) */ - const int16_t dims[], /* i : Dimension of each codebook stage (NULL: full dim.) */ - const int16_t offs[], /* i : Starting dimension of each codebook stage (NULL: 0) */ - const int16_t stages, /* i : Number of stages */ - 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) */ + const float *const *cb, /* i : Codebook (indexed cb[*stages][levels][p]) */ + const int16_t dims[], /* i : Dimension of each codebook stage (NULL: full dim.) */ + const int16_t offs[], /* i : Starting dimension of each codebook stage (NULL: 0) */ + const int16_t stages, /* i : Number of stages */ + const int16_t N, /* i : Vector dimension */ + const int16_t maxN, /* i : Codebook dimension */ + const int16_t Idx[], /* i : Indices */ + const int16_t applyIDCT_flag, /* i : applyIDCT flag */ + const float *invTrfMatrix, /* i: synthesis matrix */ + float *uq, /* o : quantized vector */ + Word16 *uq_ind /* o : quantized vector (fixed point) */ +); + + +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 */ + +int16_t msvq_stage1_dct_search( /* o : (p_max , best candidate sofar ) */ + const float *u, /* i : target */ + const int16_t N, /* i : target length and IDCT synthesis length */ + const int16_t maxC_st1, /* i : number of final stage 1 candidates to provide */ + const DCTTYPE dcttype, /* e.g. DCT_T2_16_XX, DCT_T2_24_XX; */ + const int16_t max_dct_trunc, /* i: maximum of truncation lenghts */ + float *invTrfMatrix, /* i : IDCT synthesis matrix for dim N */ + const float *midQ_truncQ, /* i: midQ vector */ + const float *dct_invScaleF, /* i: global inv scale factors*/ + const float *dct_scaleF, /* i: global scale factors*/ + const Word16 n_segm, /* i: number of segments */ + const Word16 *cols_per_segment, /* i: remaining length per segment */ + const Word16 *trunc_dct_cols_per_segment, /* i: trunc length per segment */ + const Word16 *entries_per_segment, /* i: number of rows per segment */ + const Word16 *cum_entries_per_segment, /* i: number of cumulative entries */ + const Word8 *const W8Qx_dct_sections[], /*i: Word8(byte) segment table ptrs */ + const Word16 *col_syn_shift[], /*i: columnwise syn shift tables */ + const Word8 *segm_neighbour_fwd, /*i: circular neighbour list fwd */ + const Word8 *segm_neighbour_rev, /*i: circular neighbour list reverse */ + const Word16 npost_check, /*i: number of neigbours to check , should be even */ + float *st1_mse_ptr, /*i: dynRAM buffer for MSEs */ + int16_t *indices_st1_local, /*o: selected cand indices */ + float *st1_syn_vec_ptr, /*i/o: buffer for IDCT24 synthesis */ + float *dist1_ptr /*o: resulting stage 1 MSEs in DCT-N domain */ +); + +int16_t msvq_stage1_dct_recalc_candidates_fdcng_wb( + /* o : (updated p_max) */ + const float *st1_syn_vec_ptr, /* i : IDCT24 synthesis vectors */ + const float *u, /* i : target signal */ + const int16_t maxC_st1, /* i : number of candidates in stage1 */ + float *dist_ptr /* i/o: updated MSE vector for stage1 */ ); void PulseResynchronization( @@ -8214,26 +8332,21 @@ void lsf_end_enc( int16_t *lpc_param, int16_t *no_stages, int16_t *bits_param_lpc, - const int16_t coder_type_raw -#ifdef LSF_RE_USE_SECONDARY_CHANNEL - , + const int16_t coder_type_raw, const float tdm_lsfQ_PCh[M] /* i : Q LSFs for primary channel */ -#endif ); 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 -#ifdef LSF_RE_USE_SECONDARY_CHANNEL + 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 */ , const float tdm_lsfQ_PCh[M] /* i : Q LSFs for primary channel */ -#endif ); ivas_error find_pred_mode( @@ -8555,6 +8668,17 @@ void generate_masking_noise_mdct( HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */ ); +#ifdef JBM_TSM_ON_TCS +void SynthesisSTFT_dirac( + float *fftBuffer, /* i : FFT bins */ + float *timeDomainOutput, + float *olapBuffer, + const float *olapWin, + const int16_t samples_out, + HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */ +); +#endif + void generate_masking_noise_dirac( HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */ HANDLE_CLDFB_FILTER_BANK h_cldfb, /* i : filterbank state */ @@ -8994,6 +9118,7 @@ ivas_error config_acelp1( 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 active_cnt, /* i : Active frame counter */ 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 */ @@ -9505,10 +9630,6 @@ void TonalMDCTConceal_Detect( const float pitchLag, /*IN */ int16_t *umIndices, /*OUT*/ const PsychoacousticParameters *psychParamsCurrent /*IN*/ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - const int16_t isLfe -#endif ); void TonalMDCTConceal_Apply( @@ -9644,10 +9765,6 @@ 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 */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - const MCT_CHAN_MODE mct_chan_mode /* i : MCT channel mode */ -#endif ); int16_t getCtxHm( @@ -9690,10 +9807,6 @@ int16_t getIgfPresent( 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 */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - const int16_t mct_chan_mode /* i : MCT channel mode */ -#endif ); int16_t getCnaPresent( @@ -9991,8 +10104,4 @@ void init_tcx_cfg( const int16_t element_mode, const int16_t ini_frame, const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0) */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - const MCT_CHAN_MODE mct_chan_mode /* i : MCT channel mode */ -#endif ); diff --git a/lib_com/rom_com.c b/lib_com/rom_com.c index b0c0c61978cd93adcbd9db91a0c0bf6768d711cb..e4b8ec9db90d6e036d74a6910cc82c7aa7347412 100644 --- a/lib_com/rom_com.c +++ b/lib_com/rom_com.c @@ -6036,138 +6036,297 @@ 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 }; -const float cdk_37bits_1_ivas[3072] = -{ - 33.94763184f , 23.04196358f , 19.02036476f , 15.61426640f , 9.84622097f , 6.74968624f , 8.78495407f , 6.55844116f , 6.41478300f , 3.65438509f , 2.53205872f , 0.20947371f , -3.68736625f , -6.96642828f , -8.93218231f , -10.77195358f , -14.39207268f , -19.83006287f , -25.90260124f , -30.72169685f , -32.16821671f , -35.03061295f , -35.84580231f , -35.98442459f , - 23.05311012f , 15.34062386f , 11.67077923f , 9.03463936f , 7.33119154f , 6.01164532f , 4.86430264f , 3.36793089f , 2.00524712f , 1.02420747f , -0.28395364f , -1.14369977f , -2.29296756f , -3.49234462f , -4.55691099f , -5.82124615f , -7.01340151f , -8.19280529f , -9.51517677f , -11.88930511f , -12.41490746f , -13.91690540f , -15.41597271f , -17.46363640f , - 6.34591007f , 5.83291101f , 1.82374179f , 1.64918160f , 2.46284771f , 3.21434593f , 4.79773092f , 6.78620768f , 7.17590570f , 7.29561472f , 6.46074152f , 4.26570177f , 0.29191878f , -5.68994617f , -8.93541527f , -12.17100811f , -15.95464516f , -19.82475090f , -28.43348694f , -31.13560677f , -30.82723999f , -33.92724228f , -37.10982895f , -39.15046310f , - -1.97859216f , -1.29728901f , -0.68513793f , -0.59703761f , -0.19596121f , -0.48437589f , 0.41912374f , 0.32082281f , 0.42840490f , 0.33297276f , 0.00419650f , 0.25515109f , 0.07341246f , -0.05156118f , -0.17369615f , -0.39090252f , -0.53758574f , -0.97013980f , -1.37499487f , -2.59367585f , -2.67291665f , -3.56308174f , -5.09242105f , -7.33598137f , - 44.73780441f , 32.42730713f , 26.58676720f , 20.32800293f , 15.91747665f , 11.15012264f , 7.68650007f , 10.27048969f , 9.52919579f , 5.18821383f , 1.79746056f , -0.50318158f , -4.92894411f , -9.36254311f , -14.76678371f , -15.57420921f , -16.40379715f , -19.38558006f , -24.47130203f , -28.18117905f , -26.27810097f , -28.22804451f , -30.44338608f , -33.63451004f , - 27.92958260f , 17.48978424f , 9.02943993f , 2.00556946f , 0.77582097f , 1.75702107f , 2.96648121f , 4.17692900f , 5.20950508f , 4.89404440f , 3.14809656f , 2.02777839f , 0.06399647f , -2.44093847f , -5.23348236f , -7.73788691f , -9.60736561f , -11.49096489f , -12.88784599f , -14.62041187f , -14.05591011f , -13.97139835f , -13.55158806f , -12.38661575f , - 4.40041780f , 6.02715492f , 8.63421249f , 11.23643303f , 10.21946526f , 7.12535143f , 3.97593451f , 1.47885716f , -0.34547061f , -2.21350408f , -3.58581519f , -3.49226046f , 1.64697266f , -0.80884248f , -6.61078739f , -0.83386075f , -6.55604124f , -8.50729084f , -13.99620533f , -22.11815453f , -23.36925316f , -25.26130867f , -27.82377815f , -31.91535187f , - -0.31119800f , -0.22902243f , -0.18182723f , -0.17193857f , -0.22133952f , -0.25048682f , -0.19776741f , -0.20502391f , -0.15689729f , -0.08497809f , -0.04383328f , 0.10558389f , 0.22994623f , 0.27078405f , 0.26461646f , 0.21337126f , 0.07602444f , -0.07640435f , -0.08624625f , -0.01901877f , -0.37278932f , -0.55278486f , -0.50081939f , -0.57718313f , - 11.09673309f , 12.25163174f , 11.92947292f , 11.36766434f , 10.26155853f , 10.59420109f , 11.28228855f , 9.29032898f , 7.86474180f , 5.81516743f , 3.32581139f , 0.59270757f , -2.99105382f , -7.64252663f , -12.32353687f , -16.56275558f , -19.50693130f , -21.39342690f , -23.04017448f , -26.55841255f , -27.89498329f , -29.63920593f , -31.31513977f , -34.91411972f , - 14.63949299f , 9.97996807f , 7.52127123f , 6.06751871f , 4.64821386f , 3.74143553f , 3.04003358f , 2.11276221f , 1.27838099f , 0.61896890f , -0.12750353f , -0.75742245f , -1.50008225f , -2.24619722f , -2.86748576f , -3.65039921f , -4.29070568f , -5.12242794f , -6.06238365f , -7.87343836f , -7.91463709f , -9.02013016f , -10.03069305f , -11.15602875f , - 6.92497873f , 3.86428881f , 3.33403730f , 3.50285769f , 5.03133297f , 5.47784615f , 5.12933731f , 4.11465311f , 3.29701447f , 2.28059053f , 0.75228900f , -0.37691337f , -1.86169589f , -3.51180482f , -5.11985493f , -6.74894667f , -8.46384716f , -10.43132973f , -12.40718174f , -14.97575378f , -15.92234325f , -14.67680931f , -16.35786247f , -21.92259026f , - 9.03859520f , 6.23588181f , 4.69891214f , 3.76419306f , 2.91222286f , 2.25166726f , 2.02948308f , 1.35998511f , 0.74028724f , 0.50349784f , -0.12927644f , -0.45801210f , -0.88480383f , -1.52290273f , -1.84748936f , -2.22180009f , -2.73286033f , -3.21036029f , -3.73283100f , -5.33005810f , -4.96555710f , -5.72577906f , -6.40969419f , -7.14143419f , - 38.57890320f , 31.23274040f , 23.27908325f , 16.41319847f , 12.96908092f , 11.89987564f , 11.08193970f , 10.02814865f , 9.20901966f , 5.84658241f , 1.48919916f , -2.57032323f , -7.26163483f , -11.23550892f , -13.34285927f , -13.96859360f , -14.14492226f , -14.77427292f , -15.53306389f , -16.79932404f , -15.12855816f , -14.29256630f , -13.92473507f , -13.23437977f , - 23.30056572f , 13.31616783f , 10.53007698f , 7.97990513f , 7.58186388f , 6.05487776f , 6.38700247f , 4.46871328f , 3.73780274f , 1.15311646f , -0.16795112f , -1.00963080f , -2.99656630f , -4.04802418f , -5.87744474f , -7.26942492f , -8.01433468f , -8.85430908f , -8.93447399f , -10.80081940f , -10.03588772f , -9.56312180f , -9.49805927f , -9.08203316f , - 27.72716713f , 15.70166302f , 12.12497234f , 9.82916641f , 8.54480648f , 7.48498583f , 6.46852112f , 4.42398930f , 2.79946446f , 1.41388083f , -0.10821334f , -0.99111170f , -2.64519501f , -4.05361032f , -6.13559484f , -7.88495255f , -9.31697083f , -11.29918480f , -13.29217148f , -15.89776802f , -16.73270416f , -15.78193951f , -16.71963501f , -20.72499275f , - 0.09654448f , 0.05992651f , 0.07271793f , 0.06090590f , -0.01909172f , -0.02661837f , 0.00184859f , 0.00821958f , 0.01826876f , 0.00751956f , -0.02172063f , 0.03389538f , -0.00261579f , 0.00331171f , -0.00514964f , 0.00147764f , 0.00065488f , 0.01022588f , 0.00899184f , 0.02156001f , 0.01748813f , 0.01100880f , 0.01848303f , -0.00200717f , - 35.99007034f , 24.20862198f , 19.41031075f , 16.17420769f , 10.83719921f , 7.76013374f , 9.00250912f , 6.69725418f , 5.31352282f , 3.62490821f , 2.61681867f , 0.34085435f , -3.79527760f , -7.07614565f , -9.08049870f , -11.36665630f , -14.87462139f , -21.07974815f , -27.34793472f , -31.39986610f , -32.07981873f , -27.78803635f , -28.28388596f , -28.39242935f , - 13.10489750f , 20.89344025f , 21.64855194f , 15.43504715f , 10.25371075f , 3.34968066f , 1.78396285f , 0.43690255f , 0.33645880f , 2.18413949f , 0.30379224f , 2.14339352f , 2.11168623f , -3.22490501f , -5.35176468f , -6.71944952f , -7.60760832f , -7.25716639f , -9.25983143f , -10.88946342f , -12.36510563f , -14.32815361f , -16.37483597f , -19.41078377f , - 6.47920799f , 6.26157904f , 4.08267021f , 3.55930829f , 4.81190968f , 5.21526289f , 6.64490366f , 6.17979145f , 5.88209581f , 5.32573366f , 4.89284468f , 2.50707030f , -1.80236220f , -4.32998514f , -7.66879225f , -12.10674191f , -15.55172729f , -17.02550125f , -22.69219017f , -24.15981102f , -21.53298187f , -24.35451317f , -30.13893318f , -32.50536728f , - -1.27988362f , -1.28642356f , -0.84176970f , -0.75768483f , -0.62176520f , -0.62706548f , -0.67682666f , -0.86569685f , -0.75184637f , -0.68499511f , -0.73107177f , -0.44849658f , 0.61550426f , 3.18549967f , 2.15541792f , 0.41898161f , -0.96763957f , -2.28376174f , -2.21816230f , -1.44123793f , -1.10070240f , -1.48757422f , -1.94006848f , -2.04375577f , - 44.99568176f , 33.17905807f , 28.70528412f , 24.13981819f , 16.39375496f , 12.74631882f , 12.26308346f , 7.28386831f , 3.65083528f , 1.09594464f , -0.70640332f , -0.90420610f , -5.15652418f , -8.39927197f , -9.75838566f , -12.33563995f , -16.17337418f , -20.72145081f , -21.89005280f , -22.08177948f , -22.01576805f , -28.49225616f , -28.58443069f , -28.66851044f , - 27.27372360f , 16.82239342f , 9.52775478f , 4.54592752f , 2.38096476f , 1.92719686f , 2.83496809f , 3.88023591f , 4.84239244f , 4.33260632f , 2.40358329f , 1.26160026f , -0.59154904f , -2.84664989f , -5.20095921f , -7.12129021f , -8.10309982f , -9.32675076f , -10.37824821f , -12.16980839f , -11.58549690f , -11.62355518f , -11.35874844f , -10.43139648f , - 16.01709366f , 12.10370731f , 10.30418873f , 9.84315491f , 9.04705238f , 8.59515572f , 8.13945866f , 5.33055639f , 3.59784794f , 2.10469317f , 0.74735385f , -0.35173890f , -3.04881167f , -5.32683229f , -7.84610510f , -9.60193539f , -11.38669300f , -12.69159031f , -15.22157860f , -17.92496300f , -18.30335999f , -19.30245590f , -20.96332741f , -29.99128151f , - -1.49891376f , -0.94159925f , -1.59718812f , -2.73734355f , -4.95862293f , -5.62506247f , -3.84028316f , -1.86409163f , -1.10922730f , -0.37675977f , 0.54625863f , 1.08458769f , 2.59583378f , 4.74187803f , 4.85828352f , 2.72942448f , 1.21778154f , 0.61253220f , -0.12000842f , -0.42560402f , -0.47587356f , -0.59399730f , -0.54576296f , -0.64007539f , - 27.21817589f , 25.04722404f , 19.98665237f , 18.40707970f , 15.35737038f , 12.12910748f , 10.67379093f , 8.65770626f , 6.83053064f , 4.53696156f , 1.99311268f , -2.65666389f , -5.61365652f , -8.72017097f , -11.54872608f , -14.03052521f , -17.60883713f , -18.92860985f , -19.26733208f , -21.02047348f , -20.41023064f , -24.96704483f , -27.28151131f , -32.13149261f , - 16.58616257f , 6.07702732f , 3.20051527f , 2.19352865f , 1.25951850f , 0.52847487f , 0.36339840f , 1.22322381f , 1.40252435f , 0.78051162f , -0.14960484f , -0.19245568f , 0.80768329f , -0.03997936f , -0.45896211f , -1.94675004f , -3.57758331f , -4.74786758f , -6.30557394f , -7.96810246f , -7.85797882f , -8.40102768f , -8.70696068f , -14.50718975f , - 5.83877993f , 8.64909840f , 10.36191940f , 10.75121212f , 10.87299442f , 9.20523739f , 6.57943916f , 2.45789552f , 0.32793057f , -0.19492692f , -0.50667870f , -0.82865268f , -3.29967546f , -5.41881037f , -5.00245380f , -7.02534580f , -7.16695213f , -10.07062340f , -13.29201317f , -15.16228962f , -14.82801533f , -13.98322010f , -16.56229019f , -25.20559120f , - 6.31290579f , 4.29846334f , 3.09123778f , 2.35388660f , 2.08894801f , 1.51627553f , 1.61039710f , 1.01586986f , 0.50589812f , 0.34378609f , -0.11773424f , -0.29939151f , -0.59060657f , -1.10041618f , -1.30399191f , -1.66196144f , -2.00707245f , -2.30241942f , -2.72166705f , -4.15126562f , -3.61430144f , -4.17390060f , -4.64368582f , -5.19181061f , - 45.07491302f , 31.96612358f , 24.59359169f , 15.32010937f , 11.66156387f , 10.47190285f , 8.21482182f , 6.91866159f , 6.46052694f , 2.31078482f , -0.97819418f , -3.39280653f , -5.75906181f , -7.82967377f , -8.74781990f , -9.47419548f , -9.85650921f , -10.05874729f , -10.25747013f , -11.21096134f , -9.55652142f , -8.75567627f , -8.43642902f , -7.74934912f , - 29.56493187f , 22.29573250f , 13.46729183f , 9.18490410f , 7.02603865f , 5.38271475f , 3.58497858f , 2.35314894f , 2.17064548f , 0.43121719f , -0.60757560f , -1.00088501f , -1.82668996f , -2.00680733f , -4.21636438f , -5.02670193f , -6.26371956f , -6.65761995f , -7.37742567f , -9.00110912f , -9.04595757f , -10.59253120f , -12.24499798f , -13.79708004f , - 18.81605339f , 15.10544109f , 13.69033337f , 12.55228615f , 12.10694313f , 9.87893867f , 7.45830679f , 3.83573604f , 1.58222044f , 0.19975230f , -0.48743680f , -1.03465378f , -3.26008105f , -6.03337908f , -6.72951269f , -8.16258240f , -9.35424900f , -11.36496258f , -14.10615826f , -16.52154922f , -15.71789932f , -14.28701687f , -15.86503506f , -21.98985291f , - 0.58833683f , 1.93554544f , 1.01621759f , 0.17751050f , 1.44273913f , 1.63168383f , 0.87785423f , 0.63285774f , 0.44776136f , 0.05703505f , -0.13712768f , 0.28278413f , -0.80131322f , -0.86604142f , -1.59806752f , -0.93005019f , -1.04011548f , -0.89366192f , -0.64847207f , -0.61214101f , -0.55340266f , -0.16991313f , -0.15702423f , -0.17067310f , - 39.23077011f , 28.73466682f , 25.17003059f , 18.13150215f , 12.30397224f , 10.44106960f , 8.78819275f , 7.09760094f , 4.76503944f , 3.22303295f , 1.15491402f , -0.03009734f , -3.15244532f , -7.48607492f , -9.52877903f , -12.40654850f , -15.16987514f , -18.84217262f , -22.60379219f , -26.15986252f , -28.55947685f , -31.27477455f , -36.50263596f , -45.15930557f , - 17.17733002f , 11.81043625f , 8.99961948f , 7.02285528f , 5.70868826f , 4.43369055f , 3.63820124f , 2.49104285f , 1.49823487f , 0.74478340f , -0.16968371f , -0.91984361f , -1.82045591f , -2.59034872f , -3.43512726f , -4.35373259f , -5.22545052f , -6.16511250f , -7.18896103f , -9.18914032f , -9.45307922f , -10.67428303f , -11.84619045f , -13.22418404f , - -0.55165589f , 0.54447228f , -1.45378113f , 0.62164629f , 1.57039273f , 1.95998776f , 2.55171132f , 3.54153609f , 4.37655210f , 5.13829708f , 4.63276052f , 3.44003415f , 1.41755366f , -1.65012610f , -4.90518045f , -8.74811363f , -13.32540989f , -16.67502213f , -25.04341888f , -28.74816895f , -26.61729050f , -30.89074135f , -36.89068222f , -40.54713821f , - 0.52585047f , 0.25778684f , -0.68478346f , -0.63753521f , -0.85982674f , -0.45736870f , -0.39972550f , 0.19919159f , 0.21982291f , -0.21426015f , -0.17481731f , -0.30233619f , 0.35445356f , 0.53019482f , 0.62357306f , 0.10003661f , 0.38106197f , 0.59916449f , 0.29353949f , 0.19449981f , -2.91975641f , -2.99291539f , -3.24024558f , -3.85247374f , - 47.57529449f , 35.40103149f , 28.51466560f , 21.36822510f , 16.31501770f , 12.05416298f , 8.92814922f , 10.24798870f , 9.38683319f , 5.06438446f , 1.55697119f , -0.90166509f , -5.27530479f , -10.13637447f , -14.91060257f , -15.56597614f , -16.76358414f , -19.75214577f , -22.57003212f , -24.67880249f , -22.22905731f , -23.92941093f , -26.02715302f , -29.14421463f , - 32.45030594f , 18.47647858f , 10.55478764f , 2.66163707f , 0.48469192f , 0.89728785f , 2.66320086f , 4.46394491f , 5.75276375f , 5.15140963f , 3.30917573f , 2.07156634f , 0.32162985f , -2.37937927f , -5.25204325f , -7.75560665f , -9.72864151f , -11.49621296f , -12.90788174f , -14.53592110f , -14.00264931f , -13.90744686f , -13.50663280f , -12.31781673f , - 15.12892532f , 10.85012150f , 9.24257946f , 7.17304945f , 5.39838934f , 4.54048777f , 4.45172882f , 4.02888584f , 4.08525467f , 3.34242988f , 1.18552935f , 0.14054979f , -1.31041145f , -4.10797310f , -6.60405207f , -7.35080433f , -7.80001211f , -10.14729309f , -14.88454437f , -18.54398346f , -20.49944305f , -23.77704430f , -28.38242531f , -32.21464920f , - -0.70120311f , -0.36598748f , -0.27498749f , -0.18644568f , -0.13108316f , -0.05633634f , -0.12568842f , -0.05810567f , 0.00805399f , 0.04813070f , 0.01124786f , 0.06457995f , 0.05968979f , 0.04663355f , 0.04679099f , 0.04774757f , 0.03833918f , -0.06331048f , -0.10397947f , 0.00857244f , 0.29188818f , 0.54560822f , 0.49374610f , -0.00754885f , - 24.01022911f , 20.44940186f , 18.33339310f , 13.47519684f , 11.34601212f , 10.42150116f , 9.00321579f , 7.93997908f , 7.78757143f , 4.54246807f , 3.10096765f , -1.79380953f , -4.57441616f , -8.99514294f , -11.16653728f , -12.33127975f , -15.28052711f , -18.40486145f , -21.08405685f , -23.96353531f , -24.15535736f , -27.96574211f , -31.00701714f , -35.18267441f , - 10.95846939f , 7.75293112f , 5.94634438f , 4.67962313f , 3.86481786f , 3.06800008f , 2.68010044f , 1.77875984f , 1.08723342f , 0.60881591f , -0.11699903f , -0.66425866f , -1.27388847f , -1.93990111f , -2.43955994f , -3.04650831f , -3.60661364f , -4.21451235f , -4.87673521f , -6.57435703f , -6.46493149f , -7.41116762f , -8.24285698f , -8.84710217f , - 16.32924080f , 6.70306444f , 4.40889025f , 4.39005423f , 5.66961336f , 5.49213505f , 5.14747572f , 4.57054806f , 3.82850742f , 2.47304583f , 0.96936250f , -0.07546291f , -1.78923011f , -3.94788241f , -5.62404537f , -7.41395044f , -9.30011559f , -11.32884693f , -13.38846397f , -15.90376568f , -16.61722183f , -15.37379074f , -16.91991615f , -22.64369392f , - 20.29391861f , 10.14759159f , 7.41714382f , 5.43669033f , 4.22476673f , 3.05457902f , 2.12789893f , 1.46166980f , 0.68013304f , 0.10416872f , -0.62377477f , -0.69513589f , -1.11597610f , -1.73416364f , -2.00164723f , -2.48846936f , -2.99404836f , -3.36779451f , -4.50076723f , -6.23718977f , -6.32519245f , -7.00517225f , -7.63285732f , -8.34685898f , - 44.62683868f , 33.65060043f , 28.74439240f , 23.09117126f , 16.70447159f , 13.63468075f , 10.38835239f , 5.27151346f , 3.37364483f , 0.80086398f , -1.61115754f , -1.84962809f , -4.63047361f , -7.54744434f , -8.66370773f , -11.56917572f , -14.30193806f , -18.52358246f , -19.55438995f , -20.00398636f , -19.80403900f , -20.08826447f , -20.32636070f , -20.57789421f , - 25.43884087f , 14.71314049f , 10.84564495f , 7.29425287f , 5.99180174f , 4.52135897f , 4.43509150f , 2.96715736f , 2.20721149f , 0.85104460f , -0.42902783f , -1.01505911f , -1.67976689f , -3.03431702f , -4.04744673f , -5.05236149f , -5.71568680f , -7.14737368f , -7.96077490f , -9.41807270f , -8.88839054f , -8.62583065f , -8.43768692f , -8.79677773f , - 33.08629990f , 21.98393631f , 16.71452332f , 13.11685467f , 10.53023720f , 8.59362793f , 6.77428055f , 4.80111885f , 2.96947551f , 1.50105977f , -0.29485464f , -1.76483214f , -3.38473845f , -5.02232218f , -6.55174637f , -8.24214268f , -9.90916348f , -11.56876373f , -13.40682983f , -16.22795105f , -17.44435501f , -19.50963020f , -21.48133469f , -22.37619972f , - 0.14234349f , 0.00043129f , -0.46088508f , -0.47227818f , 0.19577537f , 0.57165289f , 0.14063163f , -0.08314086f , -0.17897955f , 0.26915708f , 0.29296365f , 0.25751004f , -0.29272652f , -0.35612249f , -0.45116535f , -0.22750567f , -0.13805020f , -0.08609761f , -0.08811182f , -0.00370739f , 0.04999773f , 0.10020024f , 0.12026346f , 0.12320870f , - 37.20217514f , 25.50048447f , 26.05090904f , 21.39400101f , 14.80546665f , 10.78633976f , 9.48393726f , 6.51000643f , 4.64587116f , 2.54244065f , 1.88398576f , -0.17826277f , -3.92847228f , -7.94585609f , -9.83112335f , -12.51981831f , -16.25451469f , -22.52105331f , -26.16354942f , -28.17800331f , -28.44519234f , -28.99005890f , -29.07491684f , -29.13504791f , - 22.87589455f , 20.69346428f , 16.08814049f , 12.09293556f , 8.58536339f , 6.12085295f , 5.03096294f , 2.46971536f , 1.38820446f , 0.41556263f , -0.71674269f , -1.87001503f , -1.97099841f , -3.12624931f , -4.61008024f , -5.90624523f , -5.81033182f , -7.63588858f , -9.32999802f , -11.98378181f , -13.66734123f , -15.22948647f , -17.72668266f , -22.15813255f , - 17.13776016f , 7.48015785f , 3.87183666f , 3.80275106f , 3.69309711f , 2.47135592f , 3.28866863f , 5.23638964f , 5.97343540f , 3.02334547f , 1.66290724f , 1.17763150f , 0.56503248f , -4.12660456f , -4.84892178f , -8.03931713f , -10.07701778f , -12.74638939f , -15.61114883f , -18.82812119f , -20.06874847f , -20.77385521f , -23.02597237f , -28.41068077f , - -0.68962491f , -0.67818958f , -0.47791985f , -0.18780768f , 0.07656835f , 0.29909450f , 0.36705506f , 0.60864949f , 0.66434783f , 0.54813319f , 0.31165063f , 0.41151917f , 0.27194378f , -0.09006688f , -0.59337950f , -1.27168393f , -1.60383165f , -2.03537226f , -1.01842117f , -1.12101495f , -2.20869303f , -2.13650179f , -1.40165854f , -1.00871158f , - 49.11537170f , 34.27339554f , 29.03029442f , 23.60639191f , 19.18561935f , 16.01621819f , 10.65990448f , 5.50423098f , 3.26754117f , 0.54238629f , -2.50046039f , -1.85086572f , -5.88433218f , -8.55415058f , -9.42830467f , -11.97149277f , -14.98629475f , -17.55759621f , -17.94509125f , -18.13786888f , -17.94290543f , -28.52441216f , -28.69857025f , -28.89863968f , - 32.58505249f , 18.45134735f , 10.62341118f , 4.82959938f , 2.78050184f , 2.30071044f , 2.89666629f , 3.55971622f , 4.36246777f , 3.80749893f , 2.22673583f , 1.03990865f , -0.54025501f , -2.73137355f , -4.92715406f , -6.82418060f , -7.95124388f , -9.07779884f , -9.96023846f , -11.46563911f , -10.75256252f , -10.58728790f , -10.22681522f , -9.05898476f , - 16.11109161f , 14.82219410f , 13.34882832f , 7.98469877f , 9.43520164f , 7.92174578f , 5.07156849f , 3.38034701f , 3.45362854f , 2.55894756f , 0.36423218f , -0.89059198f , -2.32811356f , -5.22609854f , -8.06139755f , -8.08888912f , -7.59058094f , -9.63050747f , -13.39019203f , -16.84990501f , -16.90269279f , -20.11418533f , -23.25974846f , -26.99926376f , - -1.15594578f , -1.16174018f , -1.02029443f , -0.85063583f , -0.73866522f , -0.75481141f , -0.86772621f , -1.00807703f , -1.13209546f , -1.11179471f , -1.20630574f , -1.01733243f , 0.24630366f , 3.09700346f , 3.12491417f , 1.54673541f , -0.17814836f , -1.87219131f , -0.85840708f , 1.11508834f , 1.62732244f , 0.97436380f , -0.19077510f , -0.80510545f , - 32.42321777f , 27.32720947f , 20.86049461f , 15.20588684f , 12.79125309f , 12.29267693f , 12.11658001f , 11.01210213f , 10.89878845f , 7.15270519f , 2.06876802f , -2.13045192f , -6.80808592f , -11.65817642f , -14.62570095f , -16.24762154f , -16.86284065f , -17.20292854f , -18.81791878f , -20.65732384f , -19.57567215f , -19.88597488f , -22.49367523f , -26.33296204f , - 25.36096573f , 13.31346798f , 8.91108418f , 5.01322508f , 3.48370409f , 2.18634796f , 2.12754703f , 1.25077868f , 0.72989434f , 0.29854974f , -0.73259068f , -0.59268522f , 0.14181496f , -0.68818730f , -1.80540454f , -2.34638786f , -4.05338144f , -5.46354723f , -7.10088396f , -9.38928127f , -8.44892311f , -9.48880005f , -9.86396503f , -10.07871723f , - 7.17678213f , 9.03277683f , 10.13266754f , 10.24296856f , 10.17098331f , 8.09959507f , 5.65843153f , 1.62803376f , -0.36960009f , -0.74838853f , -0.79447383f , -0.80214244f , -2.22858644f , -4.54312086f , -4.46352482f , -5.71911240f , -5.88809395f , -8.41744232f , -10.94176769f , -12.21683311f , -12.21341038f , -11.48782635f , -14.09292316f , -23.15090752f , - 18.21541405f , 14.70297527f , 14.13050365f , 12.94417000f , 11.81984806f , 9.76036167f , 6.53366423f , 4.50655460f , 0.83037621f , -0.42548206f , -1.35710704f , -2.34608483f , -3.56638503f , -5.17272615f , -5.63396835f , -7.03527308f , -7.91377544f , -8.77217388f , -10.20801735f , -12.21526527f , -12.12676907f , -11.62418461f , -12.46908951f , -15.99641514f , - 44.82578278f , 29.92639542f , 27.50827789f , 23.80286217f , 17.65353203f , 14.31119919f , 9.68513775f , 4.39934206f , 2.73908210f , 0.84895563f , -2.34653950f , -2.60779619f , -5.48460007f , -7.85637569f , -8.35718441f , -10.63293934f , -12.35181427f , -14.18777370f , -14.52088261f , -15.19802761f , -14.50250244f , -14.72802734f , -15.11614609f , -15.65816784f , - 22.81040764f , 18.14611626f , 15.16109562f , 7.86977768f , 8.17525578f , 4.43149519f , 3.84347200f , 1.57480264f , 0.94041783f , 0.21524446f , -0.86289990f , -1.21070933f , -2.15402818f , -2.98346281f , -3.67899656f , -4.07589436f , -4.21469736f , -4.80487633f , -5.08027840f , -6.07973146f , -5.15939760f , -4.76911354f , -4.57167721f , -4.45344400f , - 24.49489975f , 17.31044769f , 13.22760391f , 10.45895958f , 8.42623138f , 6.75540257f , 5.42271709f , 3.69801641f , 2.30738783f , 1.11391723f , -0.26593676f , -1.45248365f , -2.67149425f , -4.03488445f , -5.14615870f , -6.45010090f , -7.70261431f , -9.10985470f , -10.61737823f , -13.08172894f , -13.92179298f , -15.81127357f , -17.59627724f , -19.73897552f , - 8.98934364f , 4.76031303f , 2.62020183f , 1.48485959f , 0.28737816f , 0.05866807f , -0.01028116f , -0.07208341f , -0.13242376f , -0.04422715f , -0.09028641f , -0.04876806f , 0.10697100f , 0.04797191f , 0.01100808f , -0.07014611f , -0.04378227f , -0.04009765f , -0.17876917f , -0.72032106f , -0.11678807f , -0.05392319f , -0.07008670f , -0.21385938f , - 36.29371643f , 24.65291214f , 21.01904678f , 16.67200279f , 11.48446560f , 8.12246799f , 9.78220177f , 7.74590874f , 5.69669485f , 4.02027988f , 3.36120009f , 0.58418810f , -3.89836407f , -7.63864374f , -10.03672886f , -12.67631626f , -16.54735374f , -22.06600380f , -27.53655815f , -31.70346832f , -32.28223419f , -33.58357620f , -33.78388596f , -33.85955811f , - 20.20799255f , 13.75940609f , 10.45750713f , 8.23875809f , 6.45997095f , 5.16953897f , 4.34209776f , 2.95543051f , 1.74270713f , 0.87219697f , -0.25581297f , -1.09575856f , -2.07853103f , -3.06528211f , -3.94644260f , -5.01998711f , -6.08012724f , -7.13329268f , -8.25736523f , -10.45005131f , -10.79236698f , -12.32848263f , -13.70973110f , -15.25794792f , - 7.88285303f , 6.51488161f , 3.92537451f , 4.23367739f , 4.89059639f , 5.43539810f , 6.37946939f , 8.50651741f , 9.33964443f , 8.69559956f , 6.91200352f , 3.63401532f , -0.99519163f , -7.15117836f , -11.47043896f , -15.28446960f , -18.89196777f , -23.08573532f , -28.80813408f , -30.38180542f , -29.53565407f , -31.03279877f , -32.39319229f , -33.27596664f , - 0.40477216f , 0.24463084f , -0.76651365f , -0.71309596f , -0.87443089f , -0.30846810f , -0.39305758f , 0.23431541f , 0.22700633f , -0.23816873f , -0.20784868f , -0.32913551f , 0.34776384f , 0.50111002f , 0.59345955f , 0.10497253f , 0.34248179f , 0.54556167f , 0.25770640f , 0.16739839f , -4.25213432f , -4.33188486f , -4.59072590f , -5.18169022f , - 44.52682495f , 33.44413376f , 27.75477028f , 20.87782860f , 15.96038628f , 11.38267708f , 8.04888916f , 10.34346294f , 9.36942101f , 5.06397772f , 1.65765107f , -0.60627878f , -5.02781725f , -9.60684490f , -14.71248531f , -15.51352501f , -16.35951424f , -19.44139671f , -23.93828964f , -27.02204704f , -23.39621544f , -25.11229706f , -27.06189728f , -29.88434029f , - 30.53590775f , 18.24347496f , 10.48498344f , 3.34677172f , 1.29623032f , 1.39035857f , 2.45928121f , 3.70242572f , 4.65490055f , 4.28991556f , 2.71830440f , 1.69632769f , 0.22320883f , -2.12041640f , -4.55487108f , -6.90537930f , -8.85028553f , -10.44450092f , -11.88594723f , -13.62341404f , -13.19523811f , -13.18412113f , -12.81897163f , -11.68476582f , - 5.23515940f , 11.02192688f , 12.84599209f , 11.99070740f , 7.98806524f , 4.52272415f , 4.08583927f , 2.00564265f , -0.15996964f , -2.10115862f , -4.96646547f , -5.90554714f , 4.82052660f , 0.89168262f , -6.95808125f , 2.50679994f , -6.73005676f , -6.52649450f , -14.76829720f , -15.44077110f , -21.42759705f , -23.35196304f , -25.43357277f , -27.50794983f , - 1.84942830f , 0.77272046f , 0.24707772f , -0.08593588f , -0.23682129f , -0.24805132f , -0.09850720f , -0.04999159f , -0.00995130f , 0.02216339f , 0.08926903f , 0.20275106f , 0.22498472f , 0.26662621f , 0.16996276f , -0.06895026f , -0.26348418f , -0.41196167f , -0.47150335f , -0.43742141f , -0.53234649f , -0.56433624f , -0.59429443f , -0.65639752f , - 14.08870220f , 13.32911205f , 10.19654274f , 6.80626822f , 6.89704180f , 6.85630465f , 6.28267908f , 6.48725128f , 6.74154425f , 5.72381783f , 4.45444155f , 2.14331675f , -1.56116712f , -5.51466084f , -8.73317051f , -13.38193130f , -16.39547157f , -18.36110878f , -22.47372246f , -24.78481865f , -23.78740883f , -25.83082390f , -28.30295181f , -29.63710213f , - 12.11153984f , 11.18265629f , 8.56032085f , 6.07614088f , 4.32917595f , 3.62714767f , 2.88151503f , 0.00486909f , 0.16551718f , 0.11766627f , -1.01007175f , -1.58863187f , -0.66722620f , -1.26095092f , -2.03257895f , -2.68355250f , -1.88288093f , -2.89664102f , -3.82705688f , -5.15467978f , -5.96337652f , -7.68645287f , -9.75820160f , -14.60475540f , - 10.68691158f , 5.49249125f , 4.08632946f , 3.73180628f , 5.00127029f , 5.47980690f , 5.41938591f , 4.71624136f , 3.67419004f , 2.41826725f , 0.86259502f , -0.22994517f , -1.90842390f , -3.87555194f , -5.49712229f , -7.17735624f , -8.88335800f , -10.96466255f , -12.92337704f , -15.48291206f , -16.37232208f , -15.13042545f , -16.82096863f , -22.42011452f , - 15.85285378f , 10.13984489f , 8.02905941f , 4.50967121f , 2.95999980f , 2.60214114f , 0.53660029f , 0.86555701f , 0.22102003f , -0.33034071f , -0.07463158f , 0.21286504f , -0.93098062f , -1.75468397f , -1.58335686f , -1.24065292f , -1.48353171f , -1.76630950f , -2.04288220f , -3.12292504f , -2.45715189f , -2.74685717f , -3.16709018f , -5.91369343f , - 40.10007477f , 32.17766190f , 23.94418526f , 17.08811951f , 13.37568951f , 12.24086761f , 11.66988850f , 10.55005550f , 9.33296108f , 5.75441313f , 1.48114145f , -2.81252980f , -7.79981041f , -11.41279602f , -13.67298222f , -14.21839428f , -14.48849964f , -15.18556213f , -15.61604404f , -16.76811600f , -15.01851368f , -14.17923927f , -13.81790257f , -13.10479736f , - 24.85771179f , 14.51553345f , 11.72882080f , 8.90813828f , 8.43283081f , 6.32554102f , 6.22324610f , 3.79361701f , 4.27097321f , 0.56961524f , -1.24056125f , -1.41678429f , -3.11242867f , -4.09969568f , -5.68787241f , -6.75505066f , -7.30343008f , -8.00887489f , -7.82331944f , -9.66470909f , -8.76680851f , -8.39351845f , -8.12993431f , -7.16756201f , - 28.97707558f , 19.26215744f , 14.32650089f , 11.15691090f , 8.93038845f , 7.45748949f , 5.97504330f , 4.08204174f , 2.51096678f , 1.17593741f , -0.48250875f , -1.45828211f , -2.81734180f , -4.23465633f , -5.64280844f , -7.11844778f , -8.37782097f , -10.01226807f , -11.81233501f , -14.42724609f , -15.63475609f , -17.08984566f , -18.90253639f , -21.68543816f , - -0.37224483f , -0.21122639f , 0.15951714f , 0.02087032f , 1.22483158f , 0.00348772f , -0.18272802f , -0.44353136f , -0.08490600f , -0.11233181f , -0.16806731f , -0.22428627f , -0.01276036f , 0.06931113f , 0.01195190f , -0.11203818f , 0.03106703f , 0.26289529f , 0.23697743f , 0.22796448f , 0.04144126f , 0.09472501f , 0.14482924f , 0.17954086f , - 39.73665619f , 26.81943703f , 21.29967880f , 18.16204262f , 13.44168472f , 11.03711700f , 11.62625027f , 7.02647495f , 4.79233932f , 3.35499501f , 2.79116821f , -0.41337949f , -4.65079498f , -8.28630638f , -10.48777294f , -13.31785393f , -16.91392136f , -22.94918823f , -27.85824203f , -29.88930130f , -30.09802246f , -28.58382988f , -28.66120720f , -28.70516014f , - 19.10952950f , 22.74327850f , 23.97905540f , 21.18729591f , 11.64360809f , 6.94751596f , 4.65807104f , 0.78640783f , -0.24381419f , 1.02887869f , 0.82303244f , -0.54234630f , -0.94865251f , -1.77358091f , -5.30440760f , -8.68288422f , -8.39182663f , -8.75503826f , -11.02817535f , -13.34524441f , -13.31265545f , -13.47730160f , -16.70124626f , -23.44244576f , - 5.32545233f , 7.05786848f , 6.26387453f , 5.78526258f , 5.88421535f , 5.73053551f , 5.83421803f , 6.25754404f , 5.95633888f , 5.21652365f , 3.57697511f , 1.02363062f , -2.68831611f , -5.48803329f , -7.67456436f , -10.52217293f , -13.10689449f , -14.01679230f , -18.51670074f , -20.16453171f , -19.27928925f , -21.94375420f , -27.47334480f , -29.79807281f , - -2.60717487f , -1.83319664f , -1.31210554f , -0.76391363f , -0.20487705f , -0.30073228f , -0.07237651f , 0.09489144f , -0.11017539f , -0.08628271f , -0.06826403f , 0.06346101f , 0.18584041f , 0.16889001f , 0.13889854f , 0.14046463f , 0.05026200f , -0.19259109f , 0.12724322f , 0.05020098f , -0.06773847f , -0.35614878f , -0.63952541f , -0.86939591f , - 43.34894180f , 31.48630524f , 28.12536430f , 24.63106918f , 16.25746918f , 12.06399059f , 10.17741966f , 6.35993147f , 4.57542324f , 1.64055872f , 0.70682496f , -0.49986696f , -4.10422993f , -8.01978779f , -9.94273472f , -12.91026783f , -16.30473137f , -20.63467598f , -21.94548988f , -22.36483765f , -22.45355415f , -22.54744720f , -22.58737946f , -22.65038681f , - 30.95190620f , 18.16899109f , 9.72149658f , 4.10552931f , 2.30458689f , 2.12724614f , 2.85707808f , 4.13076019f , 5.31916714f , 4.81190920f , 3.00600863f , 1.67334628f , -0.53532135f , -3.10476613f , -5.73052549f , -7.79181433f , -9.06767464f , -10.22359562f , -11.19510365f , -12.66148758f , -12.00313091f , -11.91836929f , -11.49621868f , -10.27651405f , - 19.52749825f , 13.26932335f , 10.77497768f , 9.87707806f , 8.94397163f , 8.45470905f , 7.96926117f , 5.37859535f , 3.56771731f , 1.95985627f , 0.70804149f , -0.21590416f , -3.00161719f , -5.06863308f , -7.59307814f , -9.56244850f , -11.54047012f , -12.52976322f , -14.91271400f , -17.65096283f , -17.99032593f , -18.96465111f , -20.50286484f , -29.15997505f , - -0.41770393f , -0.57753342f , -1.20728409f , -2.88331747f , -5.34745789f , -6.08694220f , -3.71453929f , -2.12419772f , -1.18535638f , -0.59698033f , 0.42981535f , 1.32175910f , 2.83778572f , 4.84865475f , 5.04370260f , 3.07809186f , 1.49566460f , 0.65009278f , 0.04541466f , -0.15811041f , -0.29866409f , -0.41704908f , -0.46928179f , -0.48526672f , - 30.59598160f , 24.69124985f , 19.35356522f , 17.04518127f , 12.47758865f , 9.30305386f , 9.31541252f , 8.18128777f , 5.78386831f , 3.40561008f , 1.86525965f , -2.05713415f , -3.91759825f , -7.05117083f , -9.88467789f , -11.80012417f , -15.62137604f , -16.45769119f , -16.11259651f , -17.03925705f , -16.63202477f , -20.41814423f , -23.23829842f , -27.13690567f , - 22.04087639f , 9.82030296f , 6.62304544f , 3.54571700f , 2.28869224f , 1.43831360f , 1.01925826f , 0.60685647f , 0.52726758f , 0.28217983f , -0.60519862f , -0.40057555f , 0.33728161f , 0.16425660f , -0.30877599f , -1.72851086f , -3.62104511f , -5.35534239f , -7.36662674f , -9.61280251f , -9.84184837f , -9.76028061f , -10.30779839f , -12.96220016f , - 7.59925270f , 9.89327908f , 11.32660198f , 11.55432892f , 11.11032295f , 9.16942692f , 6.63248444f , 2.69755864f , 0.57976800f , 0.05171308f , -0.55509138f , -1.34203660f , -3.50475025f , -5.48786688f , -5.35051298f , -6.98438931f , -7.01662779f , -9.47507668f , -12.24847126f , -13.41042137f , -12.92720699f , -12.06966019f , -14.46927357f , -23.34392357f , - 6.96612597f , 5.00931787f , 3.76138091f , 3.18334484f , 2.03293252f , 1.34288895f , 1.58868873f , 1.00840783f , 0.40005356f , 0.06600340f , -0.13207078f , -0.20888096f , -0.49867839f , -0.91563702f , -1.39049554f , -1.52579367f , -1.76741624f , -2.06173539f , -2.48300815f , -3.86886954f , -3.38073707f , -3.92400837f , -4.47162819f , -5.09745169f , - 47.14703751f , 30.38273811f , 21.96264458f , 14.39871597f , 10.23386383f , 8.95710278f , 6.93860054f , 5.62253952f , 4.24646330f , 1.48851633f , -1.20669615f , -3.14844489f , -5.07624435f , -6.20617819f , -6.85559320f , -7.39740086f , -7.59652758f , -7.76342344f , -7.96090555f , -8.85080433f , -7.36783743f , -6.51624918f , -6.18211889f , -5.45559025f , - 33.12013626f , 16.84858894f , 12.65143013f , 8.74576950f , 7.71503162f , 5.75152826f , 5.57081461f , 3.33705091f , 2.19604564f , 0.46275416f , -1.08203483f , -1.74722302f , -2.23058796f , -3.73542142f , -4.79898882f , -5.51074600f , -5.92822361f , -7.29669523f , -7.87425613f , -9.19938278f , -8.26733780f , -7.79288721f , -7.17766953f , -6.91147518f , - 22.72534180f , 16.73917770f , 15.96501827f , 15.48456001f , 14.21817970f , 11.09321880f , 7.22196627f , 3.27875924f , 0.86349517f , -0.35276374f , -0.96022642f , -1.97590554f , -4.21987820f , -5.87952375f , -6.43021441f , -8.40103912f , -8.45606804f , -10.49744606f , -12.33858109f , -13.72036362f , -13.35521221f , -11.95208740f , -13.21454906f , -18.77292252f , - 0.89415503f , 2.55427527f , 2.19861484f , 1.76997423f , 1.68467879f , 1.11462021f , 0.72990263f , 0.68752390f , 0.55451417f , 0.46162665f , -0.10212867f , 0.08975709f , -1.02394462f , -0.74809217f , -1.54942429f , -0.89107299f , -1.00796068f , -0.70048058f , -0.53988647f , -0.51691598f , -0.45218167f , -0.00372395f , -0.01138951f , -0.04693869f , - 42.55582428f , 31.86493301f , 25.10536003f , 19.38906479f , 13.20624542f , 10.70058155f , 8.71647072f , 6.43070078f , 4.15740585f , 2.91404939f , 0.74730510f , -0.24514204f , -2.99233270f , -7.08516312f , -9.33087540f , -12.22711372f , -14.99213314f , -18.51732445f , -22.07689285f , -25.69321823f , -27.76980782f , -30.33328629f , -35.40525818f , -43.80059433f , - 17.17425156f , 15.04495525f , 13.74315548f , 9.50892258f , 6.63219738f , 3.98290706f , 2.99513650f , 0.72657228f , 0.40510508f , -0.37188929f , -0.42712122f , -0.44993770f , -0.85454285f , -2.16015244f , -2.33109641f , -3.77121162f , -4.37596750f , -5.36669207f , -5.62877464f , -7.46640444f , -6.83423185f , -7.70908165f , -7.39536428f , -11.27804089f , - 2.52714753f , 2.49289870f , -0.13784029f , -0.12163699f , 1.75517499f , 2.99553514f , 4.49444866f , 5.77764273f , 6.11328125f , 5.99628973f , 5.25506210f , 3.72307754f , 0.61337721f , -3.33252883f , -7.41996574f , -11.31843758f , -14.65295410f , -17.27932930f , -23.77917290f , -26.47192383f , -24.69055176f , -28.23755074f , -33.64114761f , -36.70846558f , - 0.26897269f , 0.29896018f , -0.59694219f , -0.58600718f , -0.59563857f , -0.14940611f , -0.22029303f , 0.11002608f , 0.09471268f , -0.08665721f , -0.04912328f , -0.19163008f , 0.17407294f , 0.29674888f , 0.32706621f , 0.06863109f , 0.22149041f , 0.41376126f , 0.17968638f , 0.12345629f , -1.91504288f , -1.83034718f , -1.79148746f , -2.04030466f , - 46.61645508f , 34.87612534f , 28.30528450f , 21.24158478f , 16.02840996f , 11.78007889f , 8.85846806f , 10.30448627f , 9.45803833f , 5.21806145f , 1.68192971f , -0.74372375f , -5.16118431f , -10.11946869f , -14.85457230f , -15.61676884f , -16.83375549f , -19.81565475f , -22.77931786f , -24.86022949f , -19.57012367f , -21.15659714f , -22.98768044f , -25.62114906f , - 33.50306320f , 20.94828606f , 11.29131508f , 3.76779723f , 1.88436973f , 2.24041677f , 3.07290483f , 3.88969660f , 4.82355642f , 4.29338741f , 2.81698418f , 1.50617039f , -0.22714122f , -2.44629383f , -5.18593407f , -7.46794319f , -9.20017433f , -10.38420296f , -11.62056923f , -13.33395100f , -12.78791428f , -12.68239403f , -12.26134491f , -11.07050896f , - 14.10636425f , 12.71654224f , 11.35340214f , 6.63278866f , 7.45038319f , 5.69565058f , 3.01491594f , 1.82628620f , 2.48782039f , 2.02510524f , 0.75415736f , -0.22476493f , -1.60228145f , -3.62377214f , -6.14920473f , -6.03494453f , -5.61935091f , -7.92571545f , -12.52105999f , -15.74191380f , -16.80817795f , -20.57492828f , -24.48945808f , -28.24258423f , - 0.19937749f , 0.12145615f , -0.77132010f , -0.71175891f , -0.93605912f , -0.31743777f , -0.29512858f , 0.09480342f , 0.14056028f , -0.12526789f , -0.09476471f , -0.30501965f , 0.25228870f , 0.52946067f , 0.56253082f , 0.14792542f , 0.34610838f , 0.49112254f , 0.26700655f , 0.18578406f , -0.02644314f , -0.05281431f , -0.03051598f , -0.05372978f , - 27.67247200f , 21.21397018f , 19.23110199f , 14.58107758f , 9.06582832f , 6.16479349f , 5.19902563f , 4.85638475f , 5.00597048f , 5.02013874f , 4.74315405f , 1.14152813f , -2.22816443f , -4.39935923f , -7.21801662f , -11.83607006f , -15.51521206f , -16.95382690f , -19.09778404f , -21.91887093f , -22.66965294f , -25.31122971f , -28.42613792f , -31.17256165f , - 11.87517643f , 8.35047531f , 6.28900909f , 4.94152260f , 3.84217644f , 2.98525238f , 2.59193397f , 1.77286649f , 1.13057005f , 0.57406390f , -0.14166087f , -0.61366737f , -1.26566494f , -1.89665902f , -2.40094352f , -3.00182557f , -3.57644248f , -4.17064571f , -4.82954073f , -6.52423048f , -6.40167952f , -7.34070396f , -8.16668510f , -8.83840561f , - 22.19146919f , 12.36240387f , 9.77023125f , 7.21114588f , 6.19833231f , 5.60523272f , 5.27842569f , 4.64398146f , 4.52219105f , 2.91414714f , 0.94011378f , 0.25184512f , -1.67108417f , -4.17819881f , -6.24735117f , -8.17109394f , -10.08654118f , -12.12491417f , -14.44429111f , -16.77396011f , -16.61188507f , -15.37945271f , -16.77342606f , -22.42259216f , - 24.26110077f , 14.98621845f , 11.37115288f , 7.53246927f , 5.87425423f , 4.31526375f , 3.63155198f , 2.21215534f , 1.20856023f , 0.27279723f , -0.83065307f , -1.13145101f , -1.61203635f , -2.64372611f , -3.19713020f , -3.79212451f , -4.30746126f , -5.19196177f , -6.05636358f , -7.64335585f , -7.13419104f , -7.34445190f , -7.59247351f , -8.24604034f , - 49.59980774f , 36.70146179f , 26.21045494f , 18.96593857f , 14.66215992f , 12.35246658f , 7.91571426f , 4.46859789f , 4.55067158f , 3.66973281f , -0.18894276f , -1.13036156f , -2.81119108f , -7.01159000f , -10.32988167f , -12.34438610f , -13.80298901f , -15.68917179f , -16.59648895f , -18.04370117f , -16.93032265f , -17.15782166f , -17.23012543f , -16.81400299f , - 26.24615288f , 16.32177734f , 12.63861752f , 8.90179348f , 7.98338699f , 5.88846350f , 5.62527227f , 3.35444164f , 2.27727008f , 0.38706595f , -1.15045261f , -1.47619927f , -2.39863658f , -3.88151002f , -5.00069237f , -5.60923672f , -5.99917269f , -7.16092062f , -7.55632973f , -8.88112926f , -7.98447180f , -7.57788992f , -7.00798178f , -6.71480894f , - 34.06352615f , 26.54057884f , 17.68980789f , 12.03931808f , 10.71124458f , 6.47080278f , 4.33683681f , 3.58446765f , 0.97453946f , 0.07721954f , -0.66921860f , -1.29634130f , -1.56973386f , -3.47828341f , -5.09566927f , -5.83764601f , -8.20822048f , -10.21011162f , -11.12835598f , -12.94603825f , -13.56561852f , -18.43250847f , -19.20955467f , -19.59786224f , - 0.95227748f , 0.58713847f , 0.31188840f , 0.27555063f , 0.34262455f , 0.30559424f , 0.15511483f , 0.24209952f , -0.01565590f , 0.27935538f , -0.07689041f , 0.16362046f , -0.12529252f , -0.41308093f , -0.45669210f , -0.33647329f , -0.06432384f , -0.04425672f , -0.05423176f , -0.09260799f , 1.18880558f , 1.71499527f , 1.66458070f , 1.84440422f , - 40.51910782f , 28.87430191f , 26.44847679f , 22.61171722f , 14.58166790f , 10.04493809f , 8.90122890f , 6.69188166f , 4.74618101f , 1.55060208f , 0.26953381f , -0.23009424f , -3.10289311f , -7.76883173f , -9.03342628f , -11.38734531f , -15.26344204f , -20.89108467f , -23.61590576f , -24.70707703f , -24.72460747f , -25.31776428f , -25.42388153f , -25.48863602f , - 21.86741066f , 19.33110237f , 16.09799957f , 12.12207603f , 7.65350389f , 5.31046820f , 4.50258398f , 3.46295428f , 1.98402655f , 0.36231637f , -0.75526041f , -2.47129464f , -1.34295225f , -2.90498233f , -4.77146578f , -5.83896399f , -5.19093323f , -5.94871426f , -6.67448521f , -9.30622387f , -10.69075203f , -13.05691051f , -14.45488358f , -18.82699394f , - 17.39302254f , 10.72895432f , 7.20909882f , 6.08006477f , 5.16837120f , 5.15259743f , 5.89495230f , 6.39498520f , 6.43017626f , 4.73164368f , 2.29907250f , 0.83655185f , -1.61507225f , -4.66745806f , -6.97347021f , -10.42446899f , -13.22788048f , -15.54260540f , -18.53327751f , -21.36825371f , -21.31904602f , -21.81181335f , -22.37908173f , -22.59859848f , - -0.01662111f , -0.25115231f , -0.21056390f , -0.29628995f , 0.14847504f , 0.01114315f , -0.00287740f , -0.02265828f , 0.20096491f , 0.01801417f , 0.01865144f , 0.08115936f , 0.06854093f , 0.03268814f , -0.06264148f , -0.19867666f , -0.29278329f , -0.48747075f , -0.51964116f , -0.52115518f , -0.62580901f , -0.67440128f , -0.64710861f , -0.70800090f , - 50.63159180f , 32.35544586f , 28.22938156f , 26.12494469f , 19.17036057f , 15.54605675f , 10.90270996f , 5.06216860f , 2.83115578f , 0.26169294f , -2.59751272f , -2.23182607f , -6.02089071f , -9.04337597f , -9.29519939f , -11.44281673f , -13.14252472f , -13.87999630f , -14.00658417f , -14.13973713f , -14.08796120f , -28.49422073f , -28.55380249f , -28.66899681f , - 32.93387222f , 21.26923561f , 12.45925331f , 7.33453608f , 4.77903414f , 2.72644329f , 2.77173924f , 3.24125862f , 4.11953831f , 3.23369288f , 1.40657330f , 0.18600486f , -0.99559313f , -2.52648664f , -4.61264372f , -6.59295559f , -7.73660517f , -8.74180222f , -9.62380314f , -10.94507694f , -10.15025043f , -10.08863640f , -9.69090939f , -8.64610767f , - 19.57560349f , 16.97666168f , 15.32033443f , 9.42695236f , 10.81062126f , 9.27347946f , 6.17076063f , 3.87660646f , 4.01463747f , 2.81778264f , -0.01208094f , -1.53821909f , -3.11120200f , -6.04038715f , -9.02472019f , -8.91995525f , -8.31732368f , -9.97514439f , -13.60401344f , -16.95523643f , -16.28038406f , -19.30029488f , -21.93006134f , -25.31139183f , - -0.42336991f , -0.69359350f , -0.79506743f , -0.19419681f , -0.43531519f , -0.60549897f , -0.57378924f , -0.71198583f , -0.67573565f , -0.92463225f , -0.75932795f , -0.88697869f , -0.09116954f , 0.78057998f , 1.43234348f , 2.25282049f , 1.19868934f , 0.34737879f , 0.56014186f , 0.85799438f , 3.28324819f , 3.73368144f , 2.45774937f , 1.97252631f , - 34.38531113f , 33.28102493f , 22.44291687f , 21.71539307f , 14.89051437f , 12.06779766f , 11.31605339f , 6.32059956f , 6.47309685f , 2.75739145f , -0.72276920f , -4.60511971f , -2.12165952f , -3.55129719f , -10.11487579f , -14.52775002f , -18.18198204f , -20.44789314f , -21.58519745f , -22.53190994f , -22.04618073f , -22.58295822f , -22.41326904f , -22.20569420f , - 28.00102234f , 14.65698147f , 10.06700230f , 6.12028360f , 4.52054358f , 2.66990614f , 2.51413369f , 1.24868000f , 1.04878569f , 0.22633910f , -1.12691772f , -1.15263200f , -0.74640560f , -1.10290110f , -2.06341290f , -2.48550367f , -3.55061507f , -4.52637577f , -6.00973654f , -8.38346672f , -7.37356853f , -8.63987446f , -9.06530762f , -8.95927715f , - 9.00067616f , 10.26587391f , 11.45584679f , 11.44188595f , 10.68400574f , 8.38729477f , 5.69343138f , 1.98902297f , 0.07958379f , -0.50896430f , -0.83697474f , -1.44278872f , -2.87292027f , -4.73982143f , -4.71389008f , -5.85515070f , -5.86282825f , -7.65532827f , -9.99789906f , -11.01864147f , -10.61325741f , -9.58348751f , -12.15856743f , -21.34374619f , - 21.37445641f , 22.85872078f , 20.62342262f , 13.71718597f , 8.38479900f , 4.66404533f , 2.74082160f , 0.35184097f , -0.49886125f , -0.66627383f , -0.80947453f , -1.35072243f , -1.72979438f , -2.81121135f , -2.55301118f , -3.12950158f , -2.59265637f , -3.53384900f , -4.62459230f , -8.21864986f , -9.64109135f , -9.61122894f , -11.18858528f , -17.21859741f , - 52.95914078f , 32.75603485f , 30.16634941f , 25.88944244f , 19.02377129f , 16.02350807f , 11.37754154f , 4.71347761f , 3.22399068f , 0.38588712f , -2.36943150f , -3.03161478f , -6.27093697f , -9.42517185f , -9.90064812f , -11.53384590f , -12.21652794f , -12.39763260f , -12.44114876f , -12.50287819f , -12.35077858f , -12.41636753f , -12.45803928f , -12.50715065f , - 28.04634666f , 16.86526871f , 13.82318878f , 9.40035915f , 8.49054623f , 4.69572687f , 4.31990623f , 2.24289536f , 1.52588129f , -0.15709598f , -1.59520829f , -0.06550518f , -1.94989491f , -3.66548038f , -4.27683449f , -4.56677961f , -4.99815702f , -5.49210978f , -5.61179161f , -6.72458935f , -5.75457907f , -5.41288614f , -5.03387022f , -3.80432510f , - 25.75157547f , 17.28746796f , 13.10127354f , 10.33002377f , 8.27671814f , 6.59895802f , 5.40835238f , 3.63577080f , 2.23206282f , 1.08383977f , -0.28453460f , -1.38477814f , -2.64369345f , -3.91356444f , -5.05506754f , -6.35320854f , -7.60085487f , -8.91501999f , -10.29950809f , -12.61900711f , -13.07838917f , -14.44057560f , -15.59240627f , -16.55293274f , - 24.60115242f , 11.35327435f , 6.30881643f , 4.50763512f , 0.50214702f , -0.71103203f , 2.54261613f , -0.67276359f , -1.09342635f , 1.93361044f , 1.37798584f , 1.15170944f , 1.77881491f , -0.16942300f , -3.11068201f , -2.93669724f , -0.59286201f , 1.04607284f , 4.16106987f , 6.48291349f , 11.32464409f , 15.29464436f , 15.33285236f , 7.41661787f , +/* 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]<tcx_mdct_window_length; - *left_win = hTcxCfg->tcx_mdct_window; - } - else - { -#endif - *left_overlap = hTcxCfg->tcx_mdct_window_length; - *left_win = hTcxCfg->tcx_aldo_window_1_trunc; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - } -#endif + *left_overlap = hTcxCfg->tcx_mdct_window_length; + *left_win = hTcxCfg->tcx_aldo_window_1_trunc; } else { @@ -129,20 +106,8 @@ void tcx_get_windows( } else if ( right_mode == FULL_OVERLAP ) { -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( isLfe ) - { - *right_overlap = hTcxCfg->tcx_mdct_window_length; - *right_win = hTcxCfg->tcx_mdct_window; - } - else - { -#endif - *right_overlap = hTcxCfg->tcx_mdct_window_delay; - *right_win = hTcxCfg->tcx_aldo_window_2; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - } -#endif + *right_overlap = hTcxCfg->tcx_mdct_window_delay; + *right_win = hTcxCfg->tcx_aldo_window_2; } else { @@ -176,20 +141,8 @@ void tcx_get_windows( } else if ( left_mode == FULL_OVERLAP ) { -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( isLfe ) - { - *left_overlap = hTcxCfg->tcx_mdct_window_lengthFB; - *left_win = hTcxCfg->tcx_mdct_windowFB; - } - else - { -#endif - *left_overlap = hTcxCfg->tcx_mdct_window_lengthFB; - *left_win = hTcxCfg->tcx_aldo_window_1_FB_trunc; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - } -#endif + *left_overlap = hTcxCfg->tcx_mdct_window_lengthFB; + *left_win = hTcxCfg->tcx_aldo_window_1_FB_trunc; } else { @@ -215,20 +168,8 @@ void tcx_get_windows( } else if ( right_mode == FULL_OVERLAP ) { -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( isLfe ) - { - *right_overlap = hTcxCfg->tcx_mdct_window_lengthFB; - *right_win = hTcxCfg->tcx_mdct_windowFB; - } - else - { -#endif - *right_overlap = hTcxCfg->tcx_mdct_window_delayFB; - *right_win = hTcxCfg->tcx_aldo_window_2_FB; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - } -#endif + *right_overlap = hTcxCfg->tcx_mdct_window_delayFB; + *right_win = hTcxCfg->tcx_aldo_window_2_FB; } else { @@ -297,10 +238,6 @@ void WindowSignal( 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 */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - const int16_t isLfe /* i : LFE flag */ -#endif ) { int16_t l, r; @@ -311,12 +248,7 @@ void WindowSignal( * Init * *-----------------------------------------------------------*/ - tcx_get_windows( hTcxCfg, left_overlap_mode, right_overlap_mode, &l, &left_win, &r, &right_win, fullband -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - isLfe -#endif - ); + tcx_get_windows( hTcxCfg, left_overlap_mode, right_overlap_mode, &l, &left_win, &r, &right_win, fullband ); /* Init lengths */ @@ -342,11 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && !isLfe -#endif - ) + if ( left_overlap_mode == FULL_OVERLAP && truncate_aldo ) { /* fade truncated ALDO window to avoid discontinuities */ if ( !fullband ) diff --git a/lib_com/tools.c b/lib_com/tools.c index db7c5a3f8e7a82c0653b81c6ba08031b6abf47a9..ab688adbb9f77cfc81f361399a4bedd55486d7a7 100644 --- a/lib_com/tools.c +++ b/lib_com/tools.c @@ -210,7 +210,11 @@ float sum2_f( void set_c( int8_t y[], /* i/o: Vector to set */ const int8_t a, /* i : Value to set the vector to */ +#ifdef JBM_TSM_ON_TCS + const int32_t N /* i : Length of the vector */ +#else const int16_t N /* i : Length of the vector */ +#endif ) { int16_t i; @@ -387,7 +391,11 @@ uint32_t mvr2s( return 0; } +#ifdef JBM_TSM_ON_TCS + if ( (void *) y <= (const void *) x ) +#else if ( (void *) y < (const void *) x ) +#endif { for ( i = 0; i < n; i++ ) { @@ -553,6 +561,7 @@ int16_t maximum_s( { if ( vec[i] > tmp ) { + ind = i; tmp = vec[i]; } } diff --git a/lib_debug/debug.c b/lib_debug/debug.c index 85e48e8bae0b71aaa6c4dfc4484b6ddbd53dd285..ce10231876d27e76b141333f2fa70423abb4430e 100644 --- a/lib_debug/debug.c +++ b/lib_debug/debug.c @@ -201,6 +201,7 @@ int16_t dbgwrite( return 0; } + /*-------------------------------------------------------------------* * dbgwrite_mat_repeat() * diff --git a/lib_debug/sba_debug.c b/lib_debug/sba_debug.c index 040cadf88774b68fad67286377ef5ad721c15ee5..73bb630b5fe54dee3600127f19cf5882c425bdbc 100644 --- a/lib_debug/sba_debug.c +++ b/lib_debug/sba_debug.c @@ -51,11 +51,11 @@ #define MAX_IN_FILE_LEN ( 1000 ) #define MAX_PLUG_IN_FILE_LEN ( MAX_IN_FILE_LEN ) #define MAX_DEBUG_TAG_LEN ( 50 ) -#define NUM_DEBUG_FILES ( 4 ) +#define NUM_DEBUG_FILES ( 5 ) #define MAX_TAG_LEN ( 200 ) WAVEFILEOUT *spar_foa_enc_wav[3]; -WAVEFILEOUT *spar_foa_dec_wav[4]; +WAVEFILEOUT *spar_foa_dec_wav[NUM_DEBUG_FILES]; float max_diff = 0; int32_t dbg_frm_num; int32_t dbg_band; @@ -202,6 +202,7 @@ void ivas_spar_dump_signal_wav( { for ( i = 0; i < no_channel; i++, k++ ) { +#if 0 if ( ppPcm ) { tmp_value = roundf( ppPcm[i][j] * PCM16_TO_FLT_FAC ); @@ -210,6 +211,16 @@ void ivas_spar_dump_signal_wav( { tmp_value = roundf( pcm_array[i][j] * PCM16_TO_FLT_FAC ); } +#else + if ( ppPcm ) + { + tmp_value = roundf( ppPcm[i][j] ); + } + else + { + tmp_value = roundf( pcm_array[i][j] ); + } +#endif if ( tmp_value > MAX16B_FLT ) { largest_value = (float) fabs( tmp_value ) > largest_value ? (float) fabs( tmp_value ) : largest_value; @@ -272,6 +283,12 @@ void ivas_close_sba_decoder_debug_files( CloseWav( spar_foa_dec_wav[3] ); } + if ( spar_foa_dec_wav[4] != NULL ) + { + UpdateWave( fs, n_ch, 16, spar_foa_dec_wav[4] ); + CloseWav( spar_foa_dec_wav[4] ); + } + return; } @@ -315,7 +332,7 @@ void ivas_open_sba_decoder_debug_files( const int16_t n_ch, const int16_t n_transport ) { - int8_t fb_wav_dump_path[4][MAX_PLUG_IN_FILE_LEN] = { "", "", "", "" }; + int8_t fb_wav_dump_path[NUM_DEBUG_FILES][MAX_PLUG_IN_FILE_LEN] = { "", "", "", "", "" }; cstrcat( (char *) fb_wav_dump_path[0], sizeof( fb_wav_dump_path[0] ), "dec_out.wav" ); spar_foa_dec_wav[0] = CreateWav( (const char *) fb_wav_dump_path[0], fs, n_ch, 32 /* const uint32_t writeWaveExt */ ); @@ -329,6 +346,9 @@ void ivas_open_sba_decoder_debug_files( cstrcat( (char *) fb_wav_dump_path[3], sizeof( fb_wav_dump_path[3] ), "cldfbSynthesis.wav" ); spar_foa_dec_wav[3] = CreateWav( (const char *) fb_wav_dump_path[3], fs, n_transport, 16 /* const uint32_t writeWaveExt */ ); + cstrcat( (char *) fb_wav_dump_path[4], sizeof( fb_wav_dump_path[4] ), "cldfbAnalysis.wav" ); + spar_foa_dec_wav[4] = CreateWav( (const char *) fb_wav_dump_path[4], fs, n_transport, 16 /* const uint32_t writeWaveExt */ ); + return; } diff --git a/lib_debug/sba_debug.h b/lib_debug/sba_debug.h index cd4fd58c11a22f39e99b8d73a6c6dd12ce7212d1..a314d1568cc2df74be82d26610a30b00e78b6866 100644 --- a/lib_debug/sba_debug.h +++ b/lib_debug/sba_debug.h @@ -41,9 +41,10 @@ #include "ivas_cnst.h" #include "tinywaveout_c.h" + #ifdef DEBUG_SBA_AUDIO_DUMP extern WAVEFILEOUT *spar_foa_enc_wav[3]; -extern WAVEFILEOUT *spar_foa_dec_wav[4]; +extern WAVEFILEOUT *spar_foa_dec_wav[5]; #endif #ifdef DEBUG_AGC diff --git a/lib_dec/acelp_core_dec.c b/lib_dec/acelp_core_dec.c index eb53379d6683c5d05f178ae3f0d2b4aef0dac910..0c073cb9fd6bb09fb77333686caef14e5bc9b08d 100644 --- a/lib_dec/acelp_core_dec.c +++ b/lib_dec/acelp_core_dec.c @@ -45,9 +45,7 @@ #include "prot.h" #include "ivas_cnst.h" #include "ivas_prot.h" -#ifdef LSF_RE_USE_SECONDARY_CHANNEL #include "ivas_rom_com.h" -#endif #include "wmc_auto.h" /*-------------------------------------------------------------------* @@ -77,6 +75,8 @@ 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 */ + , + const int16_t read_sid_info /* i : read SID info flag */ ) { float old_exc[L_EXC_DEC], *exc; /* excitation signal buffer */ @@ -512,7 +512,7 @@ ivas_error acelp_core_dec( } else { - if ( st->core_brate == SID_2k40 && st->element_mode != IVAS_CPE_MDCT && st->read_sid_info ) + if ( st->core_brate == SID_2k40 && st->element_mode != IVAS_CPE_MDCT ) { FdCng_decodeSID( st ); *sid_bw = 0; @@ -528,8 +528,8 @@ ivas_error acelp_core_dec( } ApplyFdCng( syn, NULL, realBuffer, imagBuffer, st, 0, ( st->coder_type == AUDIO && !st->GSC_noisy_speech ) ); } - if ( !st->read_sid_info ) - // if (!st->read_sid_info && st->cng_ism_flag) /* read_sid_info can only be 0 in ParamISM mode */ + + if ( !read_sid_info ) { float noise_lvl_highest; @@ -614,11 +614,11 @@ ivas_error acelp_core_dec( nb_bits = -1; } - 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 ); + 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 ); if ( st->coder_type == TRANSITION && tc_subfr < L_SUBFR && st->L_frame == L_FRAME ) /* ISfm: why is this called again after above */ { - 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 ); + 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 ); } } @@ -650,25 +650,25 @@ 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 -#endif - ); + lsf_dec( st, tc_subfr, Aq, &LSF_Q_prediction, lsf_new, lsp_new, lsp_mid, tdm_low_rate_mode, tdm_lsfQ_PCh ); } else { const float *pt_interp_2; -#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE - int16_t beta_index[1]; - - 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 ); -#else - mvr2r( tdm_lspQ_PCh, lsp_new, M ); - mvr2r( tdm_lsfQ_PCh, lsf_new, M ); -#endif + + if ( st->active_cnt != 1 ) + { + int16_t 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 ); + } + if ( st->rate_switching_reset ) { /* extrapolation in case of unstable LSF convert */ diff --git a/lib_dec/acelp_core_switch_dec.c b/lib_dec/acelp_core_switch_dec.c index 6953551452220ee793e544469e2d4f379acb1228..51d459b205e980505dd12a2d5c87795b95244c8b 100644 --- a/lib_dec/acelp_core_switch_dec.c +++ b/lib_dec/acelp_core_switch_dec.c @@ -158,7 +158,7 @@ ivas_error acelp_core_switch_dec( * Excitation decoding *----------------------------------------------------------------*/ - 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*/ ); + 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*/ ); decod_gen_voic_core_switch( st, L_frame_for_cs, 0, Aq, exc, cbrate ); diff --git a/lib_dec/cng_dec.c b/lib_dec/cng_dec.c index b780db062f4d416a2fbcf2bde7dbb15b79bd18c4..64403736c43fae6a323f248a586792506f0bac99 100644 --- a/lib_dec/cng_dec.c +++ b/lib_dec/cng_dec.c @@ -109,12 +109,7 @@ 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 diff --git a/lib_dec/core_dec_init.c b/lib_dec/core_dec_init.c index 6d6ebeef86800182fbee4d5992066fd405956581..aa8f576cec3f5b277eaf4a1c8b980e6c96f0d167 100644 --- a/lib_dec/core_dec_init.c +++ b/lib_dec/core_dec_init.c @@ -190,12 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - st->mct_chan_mode -#endif - ); + 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 { @@ -677,17 +672,9 @@ void open_decoder_LPD( st->second_last_core = -1; if ( st->hTcxCfg != NULL && -#ifndef ISSUE_24_CLEANUP_MCT_LFE - !MCT_flag && -#endif 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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - st->mct_chan_mode -#endif - ); + st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( is_init ? total_brate : st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode ); } if ( hTcxDec != NULL ) { diff --git a/lib_dec/core_dec_switch.c b/lib_dec/core_dec_switch.c index b02d0a78f5ae2ba639ec634ce3c99d389ec565af..ef0a12696f448598703f5635ee0b0510f49cec17 100644 --- a/lib_dec/core_dec_switch.c +++ b/lib_dec/core_dec_switch.c @@ -91,12 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - st->mct_chan_mode -#endif - ); + st->igf = getIgfPresent( st->element_mode, total_brate, bwidth, st->rf_flag ); if ( st->hIGFDec != NULL ) { @@ -145,12 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - st->mct_chan_mode -#endif - ); + 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 fc331a2e9feddf5613d7087db069c065ce0e6b09..9ae8550e40faf6e4db9ed51c99c883ae38eac6f4 100644 --- a/lib_dec/core_switching_dec.c +++ b/lib_dec/core_switching_dec.c @@ -552,13 +552,11 @@ ivas_error core_switching_pre_dec( *---------------------------------------------------------------------*/ ivas_error core_switching_post_dec( - Decoder_State *st, /* i/o: decoder state structure */ - 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 */ -#ifdef FIX_ISM_DTX_CLICKS - const IVAS_FORMAT ivas_format, /* i : IVAS format */ -#endif + Decoder_State *st, /* i/o: decoder state structure */ + 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 */ @@ -680,11 +678,7 @@ ivas_error core_switching_post_dec( synth[i + delay_comp] = ( synth[i + delay_comp] * i + ( tmpDelta - i ) * st->previoussynth[i + delay_comp] ) / tmpDelta; } -#ifdef FIX_ISM_DTX_CLICKS 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 ) -#else - if ( st->element_mode == IVAS_CPE_MDCT && st->last_core_brate <= SID_2k40 && st->core_brate > SID_2k40 ) -#endif { /* smooth transitions to avoid pops in car noise items */ smoothTransitionDtxToTcx( synth, output_frame, delay_comp ); diff --git a/lib_dec/dec_tcx.c b/lib_dec/dec_tcx.c index fbdd150217ff246abdd3ca4cbe898278b5ef06d2..9896d1d8c024016b4b074c4b25a73a8e5dbe503f 100644 --- a/lib_dec/dec_tcx.c +++ b/lib_dec/dec_tcx.c @@ -108,9 +108,6 @@ void decoder_tcx( 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, -#ifndef ISSUE_24_CLEANUP_MCT_LFE - 0, -#endif sba_dirac_stereo_flag ); return; @@ -339,11 +336,7 @@ void IMDCT( 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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - || st->mct_chan_mode == MCT_CHAN_MODE_LFE -#endif - ) && + if ( ( L_frameTCX == hTcxDec->L_frameTCX >> 1 ) && ( st->tcxonly ) ) { /* Mode decision in PLC @@ -363,9 +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 ) ) ) { -#ifndef ISSUE_24_CLEANUP_MCT_LFE - assert( st->mct_chan_mode != MCT_CHAN_MODE_LFE ); -#endif /* 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; @@ -403,11 +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 ) -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && st->mct_chan_mode != MCT_CHAN_MODE_LFE -#endif - ) + else if ( !bfi && ( frame_cnt == 0 ) && ( hTcxCfg->tcx_curr_overlap_mode == FULL_OVERLAP ) ) { /* special overlap attempt, two transforms, grouping into one window */ @@ -568,11 +554,7 @@ 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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - || st->mct_chan_mode == MCT_CHAN_MODE_LFE -#endif - ) && + if ( ( ( L_frameTCX == hTcxDec->L_frameTCX >> 1 ) && ( st->tcxonly ) ) || ( hTcxCfg->tcx_last_overlap_mode == TRANSITION_OVERLAP ) ) { @@ -637,11 +619,7 @@ void IMDCT( } } - if ( !aldo && ( ( ( L_frameTCX == hTcxDec->L_frameTCX >> 1 ) && frame_cnt > 0 ) || L_frameTCX != ( hTcxDec->L_frameTCX >> 1 ) ) -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && st->mct_chan_mode != MCT_CHAN_MODE_LFE -#endif - ) + 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 ); @@ -1582,11 +1560,8 @@ void decoder_tcx_imdct( const int16_t fUseTns, /* i : flag that is set if TNS data is present */ float synth[], /* i/o: synth[-M..L_frame] */ float synthFB[], - const int16_t bfi, /* i : Bad frame indicator */ - const int16_t frame_cnt, /* i : frame counter in the super frame */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - const int16_t isLFE, /* i : is LFE */ -#endif + 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 */ ) { @@ -1619,9 +1594,6 @@ void decoder_tcx_imdct( } if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - !isLFE && -#endif st->igf ) { proc = st->hIGFDec->flatteningTrigger; @@ -1721,16 +1693,8 @@ 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, -#ifndef ISSUE_24_CLEANUP_MCT_LFE - st->mct_chan_mode == MCT_CHAN_MODE_LFE ? hTcxCfg->tcx_mdct_window : hTcxCfg->tcx_aldo_window_1_trunc, -#else hTcxCfg->tcx_aldo_window_1_trunc, -#endif -#ifndef ISSUE_24_CLEANUP_MCT_LFE - st->mct_chan_mode == MCT_CHAN_MODE_LFE ? hTcxCfg->tcx_mdct_window : hTcxCfg->tcx_aldo_window_2, -#else hTcxCfg->tcx_aldo_window_2, -#endif 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 ); } @@ -1752,11 +1716,7 @@ void decoder_tcx_imdct( if ( st->element_mode != EVS_MONO ) { IMDCT( x_tmp, hTcxDec->syn_OverlFB, hTcxDec->syn_Overl_TDACFB, xn_bufFB, -#ifndef ISSUE_24_CLEANUP_MCT_LFE - 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, -#else hTcxCfg->tcx_aldo_window_1_FB_trunc, hTcxCfg->tcx_aldo_window_2_FB, -#endif 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 ); } diff --git a/lib_dec/dlpc_stoch.c b/lib_dec/dlpc_stoch.c index 1bbba46b1b2c9c18fcddd5a3eaf0123d95318d18..22a1cda26cef68a9207dd93e0a80742a8304283d 100644 --- a/lib_dec/dlpc_stoch.c +++ b/lib_dec/dlpc_stoch.c @@ -81,32 +81,17 @@ 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 -#endif - ); + lsf_end_dec( st, GENERIC, 1 - st->narrowBand /* st->bwidth */, ENDLSF_NBITS, &lsf[M], param_lpc, LSF_Q_prediction, &nb_indices, NULL ); } 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 -#endif - ); + 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, 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 ); } } diff --git a/lib_dec/er_dec_tcx.c b/lib_dec/er_dec_tcx.c index 1ce3bf2035f97aee410f014857fefa7da3b749d1..fb797f92c9da1216601ceaf646c687e71bd30cd9 100644 --- a/lib_dec/er_dec_tcx.c +++ b/lib_dec/er_dec_tcx.c @@ -551,20 +551,39 @@ void con_tcx( mvr2r( synth - M, buf, M ); mvr2r( buf, mem_syn, M ); - if ( A_cng != NULL ) { +#ifdef FIX_MDCT_ST_PLC_FADEOUT_DELAY + float alpha_delayed; + + alpha_delayed = 1.0f; + if ( st->nbLostCmpt > MDCT_ST_PLC_FADEOUT_DELAY_4_LSP_FADE ) + { + alpha_delayed = Damping_fact( st->core_ext_mode, st->nbLostCmpt - MDCT_ST_PLC_FADEOUT_DELAY_4_LSP_FADE, st->last_good, st->stab_fac, &( st->lp_gainp ), ACELP_CORE ); + } + + if ( st->plcBackgroundNoiseUpdated && alpha_delayed != 1.0f ) +#else if ( st->plcBackgroundNoiseUpdated && alpha != 1.0f ) +#endif { float lsp_local[M], lsp_fade[M], alpha_inv; +#ifdef FIX_MDCT_ST_PLC_FADEOUT_DELAY + alpha_inv = 1.0f - alpha_delayed; +#else alpha_inv = 1.0f - alpha; +#endif a2lsp_stab( A_local, lsp_local, lsp_local ); for ( i = 0; i < M; i++ ) { +#ifdef FIX_MDCT_ST_PLC_FADEOUT_DELAY + lsp_fade[i] = alpha_delayed * lsp_local[i] + alpha_inv * st->lspold_cng[i]; +#else lsp_fade[i] = alpha * lsp_local[i] + alpha_inv * st->lspold_cng[i]; +#endif } lsp2a_stab( lsp_fade, A_local, M ); diff --git a/lib_dec/er_util.c b/lib_dec/er_util.c index 75f553f1e83602560ac49cbedfb048e4710b23d9..5326f28e904ef627af30b8f7a4aa926f4a857320 100644 --- a/lib_dec/er_util.c +++ b/lib_dec/er_util.c @@ -318,12 +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 ) -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - st->mct_chan_mode == MCT_CHAN_MODE_LFE -#endif - ); + ( 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 0dbc0feafc07ebb98963d8314b762d5e20de0e76..fcc1a5ec521f74564435923ae098780dd65e02b4 100644 --- a/lib_dec/evs_dec.c +++ b/lib_dec/evs_dec.c @@ -261,7 +261,7 @@ ivas_error evs_dec( if ( st->core == ACELP_CORE ) { /* ACELP core decoder */ - 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 ) + 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 ) { return error; } @@ -276,11 +276,7 @@ ivas_error evs_dec( * Postprocessing for ACELP/MDCT core switching *---------------------------------------------------------------------*/ -#ifdef FIX_ISM_DTX_CLICKS 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 ) -#else - if ( ( error = core_switching_post_dec( st, synth, NULL, NULL, 0, output_frame, core_switching_flag, 0, -1, EVS_MONO ) ) != IVAS_ERR_OK ) -#endif { return error; } diff --git a/lib_dec/fd_cng_dec.c b/lib_dec/fd_cng_dec.c index ab9465a93a246c2251e998f544b2b28f501cc084..23fd63059c6057f72ac4fb2b9c73110f3cd7091e 100644 --- a/lib_dec/fd_cng_dec.c +++ b/lib_dec/fd_cng_dec.c @@ -158,8 +158,8 @@ void initFdCngDec( hFdCngDec->cna_ILD_LT = 0.0f; hFdCngDec->first_cna_noise_updated = 0; hFdCngDec->first_cna_noise_update_cnt = 0; - hFdCngDec->cna_nbands = 6; - mvs2s( cna_init_bands, hFdCngDec->cna_band_limits, MAX_CNA_NBANDS + 1 ); + hFdCngDec->cna_nbands = CNA_INIT_NBANDS; + mvs2s( cna_init_bands, hFdCngDec->cna_band_limits, CNA_INIT_NBANDS + 1 ); hFdCngDec->cna_act_fact = 1.0f; hFdCngDec->cna_rescale_fact = 0.0f; hFdCngDec->cna_seed = 5687; @@ -420,17 +420,6 @@ void ApplyFdCng( hFdCngCom->sid_frame_counter = 0; /* set noise estimation inactive during concealment, as no update with noise generated by concealment should be performed. */ /* set noise estimation inactive when we have bit errors, as no update with noise generated by corrupt frame (biterror) should be performed. */ -#ifndef DISCRETE_ISM_DTX_CNG - if ( concealWholeFrame == 0 && - ( timeDomainInput == NULL || - ( *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->cng_type == LP_CNG && hFdCngDec->flag_dtx_mode ) && ( is_music == 0 ) ) || - ( st->element_mode == IVAS_CPE_TD ) ) && - ( !st->BER_detect ) ) -#else if ( concealWholeFrame == 0 && ( timeDomainInput == NULL || ( *timeDomainInput( -FLT_MAX ) && @@ -440,7 +429,6 @@ void ApplyFdCng( !( st->cng_type == LP_CNG && hFdCngDec->flag_dtx_mode ) && ( is_music == 0 ) ) || ( st->element_mode == IVAS_CPE_TD ) ) && ( !st->BER_detect ) ) -#endif { /* Perform noise estimation at the decoder */ perform_noise_estimation_dec( timeDomainInput, powerSpectrum, hFdCngDec, st->element_mode, st->bwidth, L_frame, last_L_frame, st->last_core_brate, st->VAD ); @@ -978,10 +966,13 @@ void FdCng_decodeSID( float v[32]; int16_t indices[32]; HANDLE_FD_CNG_COM hFdCngCom; + float *invTrfMatrix; + float tmpRAM[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC]; - const float *const *codebooks = ( st->element_mode == EVS_MONO ) ? cdk_37bits : cdk_37bits_ivas; const float gain_q_offset = ( st->element_mode == EVS_MONO ) ? GAIN_Q_OFFSET_EVS : GAIN_Q_OFFSET_IVAS; + invTrfMatrix = (float *) tmpRAM; + hFdCngCom = ( st->hFdCngDec )->hFdCngCom; sidNoiseEst = hFdCngCom->sidNoiseEst; @@ -999,7 +990,17 @@ void FdCng_decodeSID( index = get_next_indice( st, 7 ); /* MSVQ decoder */ - msvq_dec( codebooks, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, v, NULL ); + + 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 ); + } + /* Decode gain */ gain = ( (float) index - gain_q_offset ) / 1.5f; @@ -1792,6 +1793,162 @@ void generate_stereo_masking_noise( return; } +#ifdef JBM_TSM_ON_TCS +/*------------------------------------------------------------------- + * generate_masking_noise_hf_cldfb() + * + * Generate additional comfort noise (kind of noise filling) + *-------------------------------------------------------------------*/ + +void generate_masking_noise_lb_dirac( + HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */ + float *tdBuffer, /* i/o: time-domain signal, if NULL no LB-CNA */ + const int16_t nCldfbTs, /* i : number of CLDFB slots that will be rendered */ + const int16_t cna_flag /* i : CNA flag for LB and HB */ +) +{ + int16_t i; + float *cngNoiseLevel = hFdCngCom->cngNoiseLevel; + float *fftBuffer = hFdCngCom->fftBuffer; + float *ptr_r; + float *ptr_i; + float *ptr_level; + int16_t *seed = &( hFdCngCom->seed ); + float scale; + int16_t n_samples_out, n_samples_start, n_samples_out_loop; + + push_wmops( "fd_cng_dirac" ); + + /* Init */ + scale = 0.f; + n_samples_out = hFdCngCom->frameSize / DEFAULT_JBM_CLDFB_TIMESLOTS * nCldfbTs; + n_samples_start = 0; + + + /*LB CLDFB - CNA from STFT*/ +#ifdef DEBUG_MODE_DIRAC + { + int16_t tmp_s; + tmp_s = (int16_t) ( 32768.f * 0.5f * hFdCngCom->likelihood_noisy_speech * cna_flag + 0.5f ); + dbgwrite( &tmp_s, sizeof( int16_t ), 1, hFdCngCom->frameSize / 16, "./res/ivas_dirac_likelihood_noisy.pcm" ); + } +#endif + if ( cna_flag ) + { + /* skip noise generating if level is very low, to avoid problems with possibly running into denormals */ + if ( hFdCngCom->likelihood_noisy_speech > DELTA_MASKING_NOISE ) + { + /* Compute additional CN level */ + for ( i = 0; i < 15; i++ ) + { + if ( ( hFdCngCom->CngBandwidth == scaleTable_cn_dirac[i].bwmode ) && + ( hFdCngCom->CngBitrate >= scaleTable_cn_dirac[i].bitrateFrom ) && + ( hFdCngCom->CngBitrate < scaleTable_cn_dirac[i].bitrateTo ) ) + { + break; + } + } + + scale = (float) pow( 10.f, -scaleTable_cn_dirac[i].scale / 10.f ) - 1.f; + scale *= hFdCngCom->likelihood_noisy_speech; + } + } + + /* LB CLDFB - CNA from STFT: CNA applied only in channel 0*/ + if ( cna_flag && tdBuffer != NULL ) + { + while ( n_samples_out > 0 ) + { + n_samples_out_loop = min( hFdCngCom->frameSize, n_samples_out ); + if ( scale != 0 ) + { + /*Generate LF comfort noise only at first slot, for the whole frame*/ + ptr_level = cngNoiseLevel; + + /* Generate Gaussian random noise in real and imaginary parts of the FFT bins + Amplitudes are adjusted to the estimated noise level cngNoiseLevel in each bin */ + if ( hFdCngCom->startBand == 0 ) + { + rand_gauss( &fftBuffer[0], seed ); + ptr_r = fftBuffer + 2; + fftBuffer[0] *= (float) sqrt( scale * *ptr_level ); /* DC component in FFT */ + ptr_level++; + } + else + { + fftBuffer[0] = 0.f; + set_f( fftBuffer + 2, 0.0f, 2 * ( hFdCngCom->startBand - 1 ) ); + ptr_r = fftBuffer + 2 * hFdCngCom->startBand; + } + ptr_i = ptr_r + 1; + + for ( ; ptr_level < cngNoiseLevel + hFdCngCom->stopFFTbin - hFdCngCom->startBand; ptr_level++ ) + { + /* Real part in FFT bins */ + rand_gauss( ptr_r, seed ); + ( *ptr_r ) *= (float) sqrt( ( scale * *ptr_level ) * 0.5f ); + ptr_r += 2; + /* Imaginary part in FFT bins */ + rand_gauss( ptr_i, seed ); + ( *ptr_i ) *= (float) sqrt( ( scale * *ptr_level ) * 0.5f ); + ptr_i += 2; + } + + /* Remaining FFT bins are set to zero */ + set_f( fftBuffer + 2 * hFdCngCom->stopFFTbin, 0.0f, hFdCngCom->fftlen - 2 * hFdCngCom->stopFFTbin ); + /* Nyquist frequency is discarded */ + fftBuffer[1] = 0.f; + + /* Perform STFT synthesis */ + SynthesisSTFT_dirac( fftBuffer, tdBuffer + n_samples_start, hFdCngCom->olapBufferSynth2, hFdCngCom->olapWinSyn, n_samples_out_loop, hFdCngCom ); + +#ifdef DEBUG_MODE_DIRAC + { + int16_t tmp[1000]; + + for ( i = 0; i < hFdCngCom->frameSize; i++ ) + { + tmp[i] = (int16_t) ( tdBuffer[i] + 0.5f ); + } + dbgwrite( tmp, sizeof( int16_t ), hFdCngCom->frameSize, 1, "./res/ivas_dirac_cna_fft.pcm" ); + } +#endif + } + + else + { + /* very low level case - update random seeds */ + generate_masking_noise_update_seed( hFdCngCom ); + + set_f( fftBuffer, 0.f, hFdCngCom->fftlen ); + + /* Perform STFT synthesis */ + SynthesisSTFT_dirac( fftBuffer, tdBuffer + n_samples_start, hFdCngCom->olapBufferSynth2, hFdCngCom->olapWinSyn, n_samples_out_loop, hFdCngCom ); + +#ifdef DEBUG_MODE_DIRAC + { + int16_t tmp[1000]; + + for ( i = 0; i < hFdCngCom->frameSize; i++ ) + { + tmp[i] = (int16_t) ( tdBuffer[i] + 0.5f ); + } + dbgwrite( tmp, sizeof( int16_t ), hFdCngCom->frameSize, 1, "./res/ivas_dirac_cna_fft.pcm" ); + } +#endif + } + n_samples_out -= hFdCngCom->frameSize; + n_samples_start += hFdCngCom->frameSize; + } + } + + pop_wmops(); + + return; +} + +#endif + /*------------------------------------------------------------------- * generate_masking_noise_hf_cldfb() @@ -1811,10 +1968,12 @@ void generate_masking_noise_dirac( ) { int16_t i; +#ifndef JBM_TSM_ON_TCS float *cngNoiseLevel = hFdCngCom->cngNoiseLevel; float *fftBuffer = hFdCngCom->fftBuffer; float *ptr_r; float *ptr_i; +#endif float *ptr_level; int16_t *seed = &( hFdCngCom->seed ); float scale; @@ -1861,12 +2020,12 @@ void generate_masking_noise_dirac( scale *= hFdCngCom->likelihood_noisy_speech; } } - /* LB CLDFB - CNA from STFT: CNA applied only in channel 0*/ if ( cna_flag && tdBuffer != NULL ) { if ( scale != 0 ) { +#ifndef JBM_TSM_ON_TCS /*Generate LF comfort noise only at first slot, for the whole frame*/ if ( slot_index == 0 ) { @@ -1921,12 +2080,13 @@ void generate_masking_noise_dirac( } #endif } - +#endif /* LF CLDFB*/ cldfbAnalysis_ts( &( tdBuffer[hFdCngCom->numCoreBands * slot_index] ), Cldfb_RealBuffer, Cldfb_ImagBuffer, hFdCngCom->numCoreBands, h_cldfb ); } else { +#ifndef JBM_TSM_ON_TCS if ( slot_index == 0 ) { /* very low level case - update random seeds */ @@ -1949,7 +2109,7 @@ void generate_masking_noise_dirac( } #endif } - +#endif /* LB ana CLDFB*/ cldfbAnalysis_ts( &( tdBuffer[hFdCngCom->numCoreBands * slot_index] ), Cldfb_RealBuffer, Cldfb_ImagBuffer, hFdCngCom->numCoreBands, h_cldfb ); } @@ -2004,6 +2164,12 @@ void FdCngDecodeMDCTStereoSID( int16_t indices[FD_CNG_stages_37bits]; int16_t N, i, ch, p, stages; int16_t is_out_ms; + float *invTrfMatrix; + float tmpRAM[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC]; + + + invTrfMatrix = (float *) tmpRAM; + create_IDCT_N_Matrix( invTrfMatrix, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, sizeof( tmpRAM ) / ( sizeof( float ) ) ); is_out_ms = 0; if ( hCPE->hCoreCoder[0]->cng_sba_flag ) @@ -2047,7 +2213,7 @@ void FdCngDecodeMDCTStereoSID( } /* MSVQ decoder */ - msvq_dec( cdk_37bits_ivas, NULL, NULL, stages, N, FD_CNG_maxN_37bits, indices, ms_ptr[ch], NULL ); + msvq_dec( cdk_37bits_ivas, NULL, NULL, stages, N, FD_CNG_maxN_37bits, indices, 1, invTrfMatrix, ms_ptr[ch], NULL ); } dtx_read_padding_bits( sts[1], ( IVAS_SID_5k2 - 4400 ) / FRAMES_PER_SEC ); @@ -2091,7 +2257,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( @@ -2106,6 +2272,12 @@ void FdCngDecodeDiracMDCTStereoSID( float gain[CPE_CHANNELS]; int16_t indices[FD_CNG_stages_37bits]; int16_t N, i, ch, p; + float *invTrfMatrix; + float tmpRAM[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC]; + + + invTrfMatrix = (float *) tmpRAM; /* dynamically filled */ + create_IDCT_N_Matrix( invTrfMatrix, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, sizeof( tmpRAM ) / ( sizeof( float ) ) ); for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { @@ -2128,7 +2300,7 @@ void FdCngDecodeDiracMDCTStereoSID( gain[1] = gain[0]; /* MSVQ decoder */ - msvq_dec( cdk_37bits_ivas, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, ms_ptr[0], NULL ); + msvq_dec( cdk_37bits_ivas, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, 1, invTrfMatrix, ms_ptr[0], NULL ); mvr2r( ms_ptr[0], ms_ptr[1], N ); /*inverseMS( N, ms_ptr[0], ms_ptr[1], 1.f );*/ diff --git a/lib_dec/gs_dec.c b/lib_dec/gs_dec.c index e8112c6c4da76ee0a2eb5e970a749427acd9a494..2e7fb267ab9cc29bcbf59c8dcaded51a698907b5 100644 --- a/lib_dec/gs_dec.c +++ b/lib_dec/gs_dec.c @@ -111,7 +111,7 @@ void decod_audio( } /* set bit-allocation */ - 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 ); + 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 ); /*---------------------------------------------------------------* * Decode energy dynamics diff --git a/lib_dec/init_dec.c b/lib_dec/init_dec.c index 97aa4a0fc836bf20a7ed38cf339df8a1268d307e..c9997f5782eade42665d738f97eaf86edda80139 100644 --- a/lib_dec/init_dec.c +++ b/lib_dec/init_dec.c @@ -326,11 +326,7 @@ 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 ) -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && st->mct_chan_mode != MCT_CHAN_MODE_LFE -#endif - ) + 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) malloc( sizeof( HQ_DEC_DATA ) ) ) == NULL ) { @@ -523,21 +519,10 @@ ivas_error init_decoder( } /* open synthesis for output sampling rate */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE ) - { -#endif - if ( ( error = openCldfb( &st->cldfbSyn, CLDFB_SYNTHESIS, st->output_Fs, CLDFB_PROTOTYPE_1_25MS ) ) != IVAS_ERR_OK ) - { - return error; - } -#ifndef ISSUE_24_CLEANUP_MCT_LFE - } - else + if ( ( error = openCldfb( &st->cldfbSyn, CLDFB_SYNTHESIS, st->output_Fs, CLDFB_PROTOTYPE_1_25MS ) ) != IVAS_ERR_OK ) { - st->cldfbSyn = NULL; + return error; } -#endif st->cldfbSynHB = NULL; @@ -593,11 +578,7 @@ ivas_error init_decoder( *-----------------------------------------------------------------*/ /* TCX-LTP */ - if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && st->mct_chan_mode != MCT_CHAN_MODE_LFE -#endif - ) + if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) ) { if ( ( st->hTcxLtpDec = (TCX_LTP_DEC_HANDLE) malloc( sizeof( TCX_LTP_DEC_DATA ) ) ) == NULL ) { @@ -629,11 +610,7 @@ ivas_error init_decoder( } /* TCX config. data structure */ - if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && st->mct_chan_mode != MCT_CHAN_MODE_LFE -#endif - ) + if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) ) { if ( ( st->hTcxCfg = (TCX_CONFIG_HANDLE) malloc( sizeof( TCX_config ) ) ) == NULL ) { @@ -646,11 +623,7 @@ ivas_error init_decoder( } /* Tonal MDCT concealment data structure */ - if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && st->mct_chan_mode != MCT_CHAN_MODE_LFE -#endif - ) + if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) ) { if ( ( st->hTonalMDCTConc = (TonalMDCTConcealPtr) malloc( sizeof( TonalMDCTConceal_INSTANCE ) ) ) == NULL ) { @@ -666,11 +639,7 @@ ivas_error init_decoder( * IGF *-----------------------------------------------------------------*/ - if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && st->mct_chan_mode != MCT_CHAN_MODE_LFE -#endif - ) + if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) ) { if ( ( st->hIGFDec = (IGF_DEC_INSTANCE_HANDLE) malloc( sizeof( IGFDEC_INSTANCE ) ) ) == NULL ) { @@ -733,7 +702,7 @@ ivas_error init_decoder( * FD-CNG decoder *-----------------------------------------------------------------*/ - if ( ( st->element_mode == IVAS_CPE_MDCT || idchan == 0 ) && mc_mode != MC_MODE_MCT ) + if ( ( st->element_mode == IVAS_CPE_MDCT || idchan == 0 ) && mc_mode != MC_MODE_MCT && mc_mode != MC_MODE_PARAMUPMIX ) { /* Create FD_CNG instance */ if ( ( error = createFdCngDec( &st->hFdCngDec ) ) != IVAS_ERR_OK ) @@ -763,10 +732,7 @@ ivas_error init_decoder( st->cna_dirac_flag = 0; st->cng_sba_flag = 0; st->cng_ism_flag = 0; - st->read_sid_info = 1; /* by default read the sid info from bitstream */ -#ifdef DISCRETE_ISM_DTX_CNG st->is_ism_format = 0; -#endif return error; diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c index 2db5602519dd28b45f9741760b409d062bfc4d8c..45288514ddb87fb7d92c90538bc0c65d3c8a821e 100644 --- a/lib_dec/ivas_binRenderer_internal.c +++ b/lib_dec/ivas_binRenderer_internal.c @@ -59,7 +59,10 @@ static void ivas_binRenderer_filterModule( float out_Conv_CLDFB_imag[BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o : imag part of Binaural signals */ float CLDFB_real[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i : real part of LS signals */ float CLDFB_imag[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i : imag part of LS signals */ - BINAURAL_RENDERER_HANDLE hBinRenderer /* i/o: fastconv binaural renderer handle */ +#ifdef JBM_TSM_ON_TCS + const int16_t numTimeSlots, /* i : number of time slots to process */ +#endif + BINAURAL_RENDERER_HANDLE hBinRenderer /* i/o: fastconv binaural renderer handle */ ) { int16_t bandIdx, k, chIdx, tapIdx; @@ -78,7 +81,11 @@ static void ivas_binRenderer_filterModule( filterTapsRightRealPtr = hBinRenderer->hBinRenConvModule->filterTapsRightReal[bandIdx][chIdx]; filterTapsRightImagPtr = hBinRenderer->hBinRenConvModule->filterTapsRightImag[bandIdx][chIdx]; +#ifdef JBM_TSM_ON_TCS + for ( k = 0; k < numTimeSlots; k++ ) +#else for ( k = 0; k < MAX_PARAM_SPATIAL_SUBFRAMES; k++ ) +#endif { float outRealLeft = 0.0f, outRealRight = 0.0f, outImagLeft = 0.0f, outImagRight = 0.0f; @@ -143,7 +150,11 @@ static ivas_error ivas_binRenderer_convModuleOpen( if ( !isLoudspeaker ) { +#ifdef UPDATE_SBA_FILTER + hBinRenderer->nInChannels = audioCfg2channels( input_config ); // TODO maybe an audioCfg2channels_woLFE() function? Works as long as only 1 LFE is present +#else hBinRenderer->nInChannels = 16; +#endif } else { @@ -179,7 +190,11 @@ static ivas_error ivas_binRenderer_convModuleOpen( } else { +#ifdef UPDATE_SBA_FILTER + hBinRenConvModule->numTaps = BINAURAL_NTAPS; +#else hBinRenConvModule->numTaps = 7; +#endif /* Use fixed order filtering */ bandIdx = 0; @@ -342,11 +357,42 @@ static ivas_error ivas_binRenderer_convModuleOpen( } else { +#ifdef UPDATE_SBA_FILTER + if ( input_config == AUDIO_CONFIG_HOA3 ) + { + /* HOA3 filter coefficients */ + 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]; + } + else if ( input_config == AUDIO_CONFIG_HOA2 ) + { + /* HOA2 filter coefficients */ + hBinRenConvModule->filterTapsLeftReal[bandIdx][chIdx] = hHrtf->leftHRIRReal_HOA2[bandIdx][chIdx]; + hBinRenConvModule->filterTapsLeftImag[bandIdx][chIdx] = hHrtf->leftHRIRImag_HOA2[bandIdx][chIdx]; + hBinRenConvModule->filterTapsRightReal[bandIdx][chIdx] = hHrtf->rightHRIRReal_HOA2[bandIdx][chIdx]; + hBinRenConvModule->filterTapsRightImag[bandIdx][chIdx] = hHrtf->rightHRIRImag_HOA2[bandIdx][chIdx]; + } + else if ( input_config == AUDIO_CONFIG_FOA ) + { + /* FOA filter coefficients */ + hBinRenConvModule->filterTapsLeftReal[bandIdx][chIdx] = hHrtf->leftHRIRReal_FOA[bandIdx][chIdx]; + hBinRenConvModule->filterTapsLeftImag[bandIdx][chIdx] = hHrtf->leftHRIRImag_FOA[bandIdx][chIdx]; + hBinRenConvModule->filterTapsRightReal[bandIdx][chIdx] = hHrtf->rightHRIRReal_FOA[bandIdx][chIdx]; + hBinRenConvModule->filterTapsRightImag[bandIdx][chIdx] = hHrtf->rightHRIRImag_FOA[bandIdx][chIdx]; + } + else + { + return IVAS_ERR_INVALID_INPUT_FORMAT; + } +#else /* HOA3 filter coefficients */ 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]; +#endif } } } @@ -385,16 +431,28 @@ static ivas_error ivas_binaural_hrtf_open( HrtfFastConv->FASTCONV_HRIR_latency_s = FASTCONV_HRIR_latency_s; HrtfFastConv->FASTCONV_HOA3_latency_s = FASTCONV_HOA3_latency_s; +#ifdef UPDATE_SBA_FILTER + HrtfFastConv->FASTCONV_HOA2_latency_s = FASTCONV_HOA2_latency_s; + HrtfFastConv->FASTCONV_FOA_latency_s = FASTCONV_FOA_latency_s; +#endif HrtfFastConv->FASTCONV_BRIR_latency_s = FASTCONV_BRIR_latency_s; for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) { for ( j = 0; j < HRTF_LS_CHANNELS; j++ ) { +#ifdef UPDATE_SBA_FILTER + mvr2r( leftHRIRReal[i][j], HrtfFastConv->leftHRIRReal[i][j], BINAURAL_NTAPS ); + mvr2r( leftHRIRImag[i][j], HrtfFastConv->leftHRIRImag[i][j], BINAURAL_NTAPS ); + mvr2r( rightHRIRReal[i][j], HrtfFastConv->rightHRIRReal[i][j], BINAURAL_NTAPS ); + mvr2r( rightHRIRImag[i][j], HrtfFastConv->rightHRIRImag[i][j], BINAURAL_NTAPS ); +#else 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 ); +#endif + mvr2r( leftBRIRReal[i][j], HrtfFastConv->leftBRIRReal[i][j], BINAURAL_NTAPS_MAX ); mvr2r( leftBRIRImag[i][j], HrtfFastConv->leftBRIRImag[i][j], BINAURAL_NTAPS_MAX ); @@ -402,6 +460,29 @@ static ivas_error ivas_binaural_hrtf_open( mvr2r( rightBRIRImag[i][j], HrtfFastConv->rightBRIRImag[i][j], BINAURAL_NTAPS_MAX ); } +#ifdef UPDATE_SBA_FILTER + for ( j = 0; j < HRTF_SH_CHANNELS; j++ ) + { + mvr2r( leftHRIRReal_HOA3[i][j], HrtfFastConv->leftHRIRReal_HOA3[i][j], BINAURAL_NTAPS ); + mvr2r( leftHRIRImag_HOA3[i][j], HrtfFastConv->leftHRIRImag_HOA3[i][j], BINAURAL_NTAPS ); + mvr2r( rightHRIRReal_HOA3[i][j], HrtfFastConv->rightHRIRReal_HOA3[i][j], BINAURAL_NTAPS ); + mvr2r( rightHRIRImag_HOA3[i][j], HrtfFastConv->rightHRIRImag_HOA3[i][j], BINAURAL_NTAPS ); + } + for ( j = 0; j < 9; j++ ) + { + mvr2r( leftHRIRReal_HOA2[i][j], HrtfFastConv->leftHRIRReal_HOA2[i][j], BINAURAL_NTAPS ); + mvr2r( leftHRIRImag_HOA2[i][j], HrtfFastConv->leftHRIRImag_HOA2[i][j], BINAURAL_NTAPS ); + mvr2r( rightHRIRReal_HOA2[i][j], HrtfFastConv->rightHRIRReal_HOA2[i][j], BINAURAL_NTAPS ); + mvr2r( rightHRIRImag_HOA2[i][j], HrtfFastConv->rightHRIRImag_HOA2[i][j], BINAURAL_NTAPS ); + } + for ( j = 0; j < 4; j++ ) + { + mvr2r( leftHRIRReal_FOA[i][j], HrtfFastConv->leftHRIRReal_FOA[i][j], BINAURAL_NTAPS ); + mvr2r( leftHRIRImag_FOA[i][j], HrtfFastConv->leftHRIRImag_FOA[i][j], BINAURAL_NTAPS ); + mvr2r( rightHRIRReal_FOA[i][j], HrtfFastConv->rightHRIRReal_FOA[i][j], BINAURAL_NTAPS ); + mvr2r( rightHRIRImag_FOA[i][j], HrtfFastConv->rightHRIRImag_FOA[i][j], BINAURAL_NTAPS ); + } +#else for ( j = 0; j < HRTF_SH_CHANNELS; j++ ) { mvr2r( leftHRIRReal_HOA3[i][j], HrtfFastConv->leftHRIRReal_HOA3[i][j], 7 ); @@ -409,6 +490,7 @@ static ivas_error ivas_binaural_hrtf_open( mvr2r( rightHRIRReal_HOA3[i][j], HrtfFastConv->rightHRIRReal_HOA3[i][j], 7 ); mvr2r( rightHRIRImag_HOA3[i][j], HrtfFastConv->rightHRIRImag_HOA3[i][j], 7 ); } +#endif } mvr2r( fastconvReverberationTimes, HrtfFastConv->fastconvReverberationTimes, CLDFB_NO_CHANNELS_MAX ); @@ -428,11 +510,11 @@ static ivas_error ivas_binaural_hrtf_open( static void ivas_binaural_obtain_DMX( const int16_t numTimeSlots, - BINAURAL_RENDERER_HANDLE hBinRenderer, /* i/o: fastconv binaural renderer handle */ - float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i : Contains the LS signals */ - float ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i : Contains the LS signals */ - float realDMX[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - float imagDMX[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX] ) + BINAURAL_RENDERER_HANDLE hBinRenderer, /* i/o: fastconv binaural renderer handle */ + float RealBuffer[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i : Contains the LS signals */ + float ImagBuffer[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i : Contains the LS signals */ + float realDMX[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], + float imagDMX[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX] ) { int16_t chIdx, bandIdx, k; @@ -658,7 +740,26 @@ ivas_error ivas_binRenderer_open( } else { +#ifdef UPDATE_SBA_FILTER + if ( hBinRenderer->nInChannels == 16 ) + { + st_ivas->binaural_latency_ns = (int32_t) ( st_ivas->hHrtfFastConv->FASTCONV_HOA3_latency_s * 1000000000.f ); + } + else if ( hBinRenderer->nInChannels == 9 ) + { + st_ivas->binaural_latency_ns = (int32_t) ( st_ivas->hHrtfFastConv->FASTCONV_HOA2_latency_s * 1000000000.f ); + } + else if ( hBinRenderer->nInChannels == 4 ) + { + st_ivas->binaural_latency_ns = (int32_t) ( st_ivas->hHrtfFastConv->FASTCONV_FOA_latency_s * 1000000000.f ); + } + else + { + return IVAS_ERR_INVALID_INPUT_FORMAT; + } +#else st_ivas->binaural_latency_ns = (int32_t) ( st_ivas->hHrtfFastConv->FASTCONV_HOA3_latency_s * 1000000000.f ); +#endif } } else @@ -847,9 +948,14 @@ void ivas_binRenderer_close( *-------------------------------------------------------------------------*/ void ivas_binaural_add_LFE( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - int16_t output_frame, /* i : length of input frame */ + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + int16_t output_frame, /* i : length of input frame */ +#ifdef JBM_TSM_ON_TCS + float *input_f[], /* i : transport channels */ + float *output_f[] /* o : synthesized core-coder transport channels/DirAC output */ +#else float output_f[][L_FRAME48k] /* i/o: synthesized core-coder transport channels/DirAC output */ +#endif ) { int16_t render_lfe, idx_lfe; @@ -876,10 +982,17 @@ void ivas_binaural_add_LFE( } for ( idx_lfe = 0; idx_lfe < st_ivas->hIntSetup.num_lfe; idx_lfe++ ) { +#ifdef JBM_TSM_ON_TCS + v_multc( input_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], gain, input_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], output_frame ); + /* copy LFE to left and right channels */ + v_add( output_f[0], input_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], output_f[0], output_frame ); + v_add( output_f[1], input_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], output_f[1], output_frame ); +#else v_multc( output_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], gain, output_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], output_frame ); /* copy LFE to left and right channels */ v_add( output_f[0], output_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], output_f[0], output_frame ); v_add( output_f[1], output_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], output_f[1], output_frame ); +#endif } } @@ -895,8 +1008,12 @@ void ivas_binaural_add_LFE( *-------------------------------------------------------------------------*/ void ivas_binaural_cldfb( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ +#ifdef JBM_TSM_ON_TCS + float *output_f[] /* i/o: synthesized core-coder transport channels/DirAC output */ +#else float output_f[][L_FRAME48k] /* i/o: synthesized core-coder transport channels/DirAC output */ +#endif ) { float Cldfb_RealBuffer[MAX_INTERN_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX]; @@ -939,8 +1056,11 @@ void ivas_binaural_cldfb( } /* Implement binaural rendering */ +#ifdef JBM_TSM_ON_TCS + ivas_binRenderer( st_ivas->hBinRenderer, st_ivas->hHeadTrackData, JBM_CLDFB_SLOTS_IN_SUBFRAME, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer, Cldfb_ImagBuffer ); +#else ivas_binRenderer( st_ivas->hBinRenderer, st_ivas->hHeadTrackData, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer, Cldfb_ImagBuffer ); - +#endif /* Implement CLDFB synthesis */ for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) { @@ -961,6 +1081,99 @@ void ivas_binaural_cldfb( return; } +#ifdef JBM_TSM_ON_TCS +/*-------------------------------------------------------------------------* + * ivas_binaural_cldfb() + * + * Perform CLDFB analysis, fastconv binaural rendering and CLDFB synthesis + *-------------------------------------------------------------------------*/ + +void ivas_binaural_cldfb_sf( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + const int16_t n_samples_to_render, + float *output_f[] /* i/o: synthesized core-coder transport channels/DirAC output */ +) +{ + float Cldfb_RealBuffer[MAX_INTERN_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX]; + float Cldfb_ImagBuffer[MAX_INTERN_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX]; + float Cldfb_RealBuffer_Binaural[BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX]; + float Cldfb_ImagBuffer_Binaural[BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX]; + int16_t slot_idx, subframeIdx, index_slot, idx_in, idx_lfe, maxBand, ch; + int16_t slot_size, slots_to_render, first_sf, last_sf; + int16_t slot_index_start, slot_index_start_cldfb; + + /* Implement a 5 msec loops */ + maxBand = (int16_t) ( ( CLDFB_NO_CHANNELS_MAX * st_ivas->hDecoderConfig->output_Fs ) / 48000 ); + slot_size = st_ivas->hTcBuffer->nb_subframes; + /* loop for synthesis, assume we always have to render in multiples of 5ms subframes with spills */ + slots_to_render = min( st_ivas->hTcBuffer->num_slots - st_ivas->hTcBuffer->slots_rendered, n_samples_to_render / slot_size ); + first_sf = st_ivas->hTcBuffer->subframes_rendered; + last_sf = first_sf; + slot_index_start = st_ivas->hTcBuffer->slots_rendered; + slot_index_start_cldfb = 0; + st_ivas->hTcBuffer->slots_rendered += slots_to_render; + while ( slots_to_render > 0 ) + { + slots_to_render -= st_ivas->hTcBuffer->subframe_nbslots[last_sf]; + last_sf++; + } + for ( subframeIdx = first_sf; subframeIdx < last_sf; subframeIdx++ ) + { + for ( slot_idx = 0; slot_idx < st_ivas->hTcBuffer->subframe_nbslots[subframeIdx]; slot_idx++ ) + { + index_slot = slot_index_start + slot_idx; + + /* Implement CLDFB analysis */ + idx_in = 0; + idx_lfe = 0; + + for ( ch = 0; ch < ( st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe ); ch++ ) + { + if ( ( st_ivas->hIntSetup.num_lfe > 0 ) && ( st_ivas->hIntSetup.index_lfe[idx_lfe] == ch ) ) + { + if ( idx_lfe < ( st_ivas->hIntSetup.num_lfe - 1 ) ) + { + idx_lfe++; + } + } + else + { + cldfbAnalysis_ts( &( st_ivas->hTcBuffer->tc[ch][maxBand * index_slot] ), + Cldfb_RealBuffer[idx_in][slot_idx], + Cldfb_ImagBuffer[idx_in][slot_idx], + maxBand, st_ivas->cldfbAnaDec[idx_in] ); + idx_in++; + } + } + } + + /* Implement binaural rendering */ +#ifdef JBM_TSM_ON_TCS + ivas_binRenderer( st_ivas->hBinRenderer, st_ivas->hHeadTrackData, st_ivas->hTcBuffer->subframe_nbslots[subframeIdx], Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer, Cldfb_ImagBuffer ); +#else + ivas_binRenderer( st_ivas->hBinRenderer, st_ivas->hHeadTrackData, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer, Cldfb_ImagBuffer ); +#endif + /* Implement CLDFB synthesis */ + for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) + { + float *RealBuffer[MAX_PARAM_SPATIAL_SUBFRAMES]; + float *ImagBuffer[MAX_PARAM_SPATIAL_SUBFRAMES]; + + for ( slot_idx = 0; slot_idx < st_ivas->hTcBuffer->subframe_nbslots[subframeIdx]; slot_idx++ ) + { + RealBuffer[slot_idx] = Cldfb_RealBuffer_Binaural[ch][slot_idx]; + ImagBuffer[slot_idx] = Cldfb_ImagBuffer_Binaural[ch][slot_idx]; + } + + cldfbSynthesis( RealBuffer, ImagBuffer, &( output_f[ch][slot_index_start_cldfb * maxBand] ), maxBand * st_ivas->hTcBuffer->subframe_nbslots[subframeIdx], st_ivas->cldfbSynDec[ch] ); + } + slot_index_start += st_ivas->hTcBuffer->subframe_nbslots[subframeIdx]; + slot_index_start_cldfb += st_ivas->hTcBuffer->subframe_nbslots[subframeIdx]; + } + st_ivas->hTcBuffer->subframes_rendered = last_sf; + return; +} +#endif #endif @@ -971,8 +1184,11 @@ void ivas_binaural_cldfb( *-------------------------------------------------------------------------*/ void ivas_binRenderer( - BINAURAL_RENDERER_HANDLE hBinRenderer, /* i/o: binaural renderer handle */ - HEAD_TRACK_DATA_HANDLE hHeadTrackData, /* i/o: head track handle */ + BINAURAL_RENDERER_HANDLE hBinRenderer, /* i/o: binaural renderer handle */ + HEAD_TRACK_DATA_HANDLE hHeadTrackData, /* i/o: head track handle */ +#ifdef JBM_TSM_ON_TCS + const int16_t numTimeSlots, /* i : number of time slots to render*/ +#endif float Cldfb_RealBuffer_Binaural[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o : Binaural signals */ float Cldfb_ImagBuffer_Binaural[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o : Binaural signals */ float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i : LS signals */ @@ -980,7 +1196,9 @@ void ivas_binRenderer( ) { int16_t chIdx, k; +#ifndef JBM_TSM_ON_TCS int16_t numTimeSlots = MAX_PARAM_SPATIAL_SUBFRAMES; +#endif push_wmops( "fastconv_binaural_rendering" ); @@ -1004,36 +1222,55 @@ void ivas_binRenderer( if ( hHeadTrackData->shd_rot_max_order == -1 ) { QuatToRotMat( hHeadTrackData->Quaternions[hHeadTrackData->num_quaternions++], hHeadTrackData->Rmat ); +#ifdef JBM_TSM_ON_TCS + rotateFrame_shd_cldfb( RealBuffer, ImagBuffer, hHeadTrackData->Rmat, hBinRenderer->hInputSetup->nchan_out_woLFE, numTimeSlots, 3 ); +#else rotateFrame_shd_cldfb( RealBuffer, ImagBuffer, hHeadTrackData->Rmat, hBinRenderer->hInputSetup->nchan_out_woLFE, 3 ); +#endif } else if ( hHeadTrackData->shd_rot_max_order > 0 ) { +#ifdef JBM_TSM_ON_TCS + rotateFrame_shd_cldfb( RealBuffer, ImagBuffer, hHeadTrackData->Rmat, hBinRenderer->hInputSetup->nchan_out_woLFE, numTimeSlots, hHeadTrackData->shd_rot_max_order ); +#else rotateFrame_shd_cldfb( RealBuffer, ImagBuffer, hHeadTrackData->Rmat, hBinRenderer->hInputSetup->nchan_out_woLFE, hHeadTrackData->shd_rot_max_order ); +#endif } } else { /* Rotation in SD (CICPx) */ +#ifdef JBM_TSM_ON_TCS + rotateFrame_sd_cldfb( hHeadTrackData, RealBuffer, ImagBuffer, hBinRenderer->hInputSetup, hBinRenderer->hEFAPdata, numTimeSlots, hBinRenderer->conv_band ); +#else rotateFrame_sd_cldfb( hHeadTrackData, RealBuffer, ImagBuffer, hBinRenderer->hInputSetup, hBinRenderer->hEFAPdata, hBinRenderer->conv_band ); +#endif } } /* HOA decoding to CICP19 if needed*/ if ( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 && hBinRenderer->nInChannels != 16 ) { +#ifdef JBM_TSM_ON_TCS + ivas_sba2mc_cldfb( *( hBinRenderer->hInputSetup ), RealBuffer, ImagBuffer, hBinRenderer->nInChannels, hBinRenderer->conv_band, numTimeSlots, hBinRenderer->hoa_dec_mtx ); +#else ivas_sba2mc_cldfb( *( hBinRenderer->hInputSetup ), RealBuffer, ImagBuffer, hBinRenderer->nInChannels, hBinRenderer->conv_band, hBinRenderer->hoa_dec_mtx ); +#endif } +#ifdef JBM_TSM_ON_TCS + ivas_binRenderer_filterModule( Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, RealBuffer, ImagBuffer, numTimeSlots, hBinRenderer ); +#else ivas_binRenderer_filterModule( Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, RealBuffer, ImagBuffer, hBinRenderer ); +#endif /* Obtain the binaural dmx and compute the reverb */ if ( hBinRenderer->hReverb != NULL ) { - float reverbRe[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; - float reverbIm[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; - float inRe[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; - float inIm[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; - + float reverbRe[BINAURAL_CHANNELS][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX]; + float reverbIm[BINAURAL_CHANNELS][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX]; + float inRe[BINAURAL_CHANNELS][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX]; + float inIm[BINAURAL_CHANNELS][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX]; ivas_binaural_obtain_DMX( numTimeSlots, hBinRenderer, RealBuffer, ImagBuffer, inRe, inIm ); for ( chIdx = 0; chIdx < BINAURAL_CHANNELS; chIdx++ ) @@ -1045,7 +1282,11 @@ void ivas_binRenderer( } } - ivas_binaural_reverb_processFrame( hBinRenderer->hReverb, BINAURAL_CHANNELS, inRe, inIm, reverbRe, reverbIm, 0u ); +#ifdef JBM_TSM_ON_TCS + ivas_binaural_reverb_processSubframe( hBinRenderer->hReverb, BINAURAL_CHANNELS, numTimeSlots, inRe, inIm, reverbRe, reverbIm ); +#else + ivas_binaural_reverb_processSubframe( hBinRenderer->hReverb, BINAURAL_CHANNELS, inRe, inIm, reverbRe, reverbIm ); +#endif /* Add the conv module and reverb module output */ for ( chIdx = 0; chIdx < BINAURAL_CHANNELS; chIdx++ ) diff --git a/lib_dec/ivas_core_dec.c b/lib_dec/ivas_core_dec.c index 05c1f41727e87111757dd6ca304ae100226350cc..9d6211bf8f56e6508b593c3a41feb509c85a6465 100644 --- a/lib_dec/ivas_core_dec.c +++ b/lib_dec/ivas_core_dec.c @@ -90,6 +90,7 @@ ivas_error ivas_core_dec( int16_t use_cldfb_for_dft; float *p_output_mem; int16_t flag_sec_CNA; + int16_t read_sid_info; int16_t last_element_mode; int16_t nchan_out; float *save_hb_synth; @@ -105,6 +106,7 @@ ivas_error ivas_core_dec( use_cldfb_for_dft = 0; tdm_LRTD_flag = -1; + read_sid_info = 1; /* read SID by default */ if ( hSCE != NULL ) { @@ -116,6 +118,13 @@ ivas_error ivas_core_dec( hStereoTD = NULL; p_output_mem = NULL; nchan_out = 1; + if ( st_ivas != NULL && st_ivas->ivas_format == ISM_FORMAT ) + { + if ( st_ivas->hISMDTX.sce_id_dtx != hSCE->sce_id ) + { + read_sid_info = 0; + } + } } else { @@ -332,7 +341,7 @@ ivas_error ivas_core_dec( if ( st->core == ACELP_CORE ) { /* ACELP core decoder */ - 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 ) + 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 ) { return error; } @@ -341,12 +350,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, st_ivas == NULL ? 0 : st_ivas->ivas_format -#ifndef DISCRETE_ISM_DTX_CNG - , - st_ivas == NULL ? 0 : st_ivas->ism_mode -#endif - ); + 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 ) @@ -451,11 +455,7 @@ ivas_error ivas_core_dec( mvr2r( synth[n], hSCE->save_synth, output_frame ); } -#ifdef FIX_ISM_DTX_CLICKS 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 ) -#else - 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 ) -#endif { return error; } diff --git a/lib_dec/ivas_corecoder_dec_reconfig.c b/lib_dec/ivas_corecoder_dec_reconfig.c index d2cf408dce3bafcd1208a8aaa89c1e0692e1e2fb..9d15f1bdfc34b2e98ccff7f0b8595648f67f654a 100644 --- a/lib_dec/ivas_corecoder_dec_reconfig.c +++ b/lib_dec/ivas_corecoder_dec_reconfig.c @@ -87,13 +87,8 @@ ivas_error ivas_corecoder_dec_reconfig( *-----------------------------------------------------------------*/ /* remove dummy CPE element for DFT stereo-like upmix */ -#ifdef SBA2MONO 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 ) ) ) -#else - if ( ( st_ivas->ivas_format == SBA_FORMAT && sba_dirac_stereo_flag_old && !st_ivas->sba_dirac_stereo_flag ) || - ( st_ivas->ivas_format == MC_FORMAT && last_mc_mode == MC_MODE_MCMASA && sba_dirac_stereo_flag_old && !st_ivas->sba_dirac_stereo_flag ) ) -#endif { st_ivas->hCPE[0]->hCoreCoder[0] = NULL; st_ivas->hCPE[0]->hCoreCoder[1] = NULL; @@ -151,7 +146,6 @@ ivas_error ivas_corecoder_dec_reconfig( for ( cpe_id = st_ivas->nCPE; cpe_id < nCPE_old; cpe_id++ ) { -#ifdef SBA2MONO /* 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 ) { @@ -167,7 +161,6 @@ ivas_error ivas_corecoder_dec_reconfig( } continue; } -#endif destroy_cpe_dec( st_ivas->hCPE[cpe_id] ); st_ivas->hCPE[cpe_id] = NULL; } @@ -207,13 +200,11 @@ ivas_error ivas_corecoder_dec_reconfig( return error; } } -#ifdef SBA2MONO 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; } -#endif for ( cpe_id = 0; cpe_id < nCPE_existing; cpe_id++ ) { @@ -293,7 +284,6 @@ ivas_error ivas_corecoder_dec_reconfig( 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 ) ) { -#ifdef SBA2MONO /* if at least one CPE is already available, only allocate DFT Stereo struct */ if ( st_ivas->nCPE > 0 ) { @@ -310,12 +300,6 @@ ivas_error ivas_corecoder_dec_reconfig( return error; } } -#else - if ( ( error = create_cpe_dec( st_ivas, 0, ivas_total_brate / ( st_ivas->nSCE + st_ivas->nCPE ) ) ) != IVAS_ERR_OK ) - { - return error; - } -#endif set_f( st_ivas->hCPE[0]->hStereoDft->buff_LBTCX_mem, 0, NS2SA( 16000, STEREO_DFT32MS_OVL_NS ) ); @@ -345,45 +329,10 @@ ivas_error ivas_corecoder_dec_reconfig( * Set CNA/CNG flags *-----------------------------------------------------------------*/ -#ifdef FIX_386_CORECODER_RECONFIG if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT ) { ivas_sba_set_cna_cng_flag( st_ivas ); } -#else - /// VE: this could be merged with part of ivas_init_decoder() - if ( st_ivas->ivas_format == SBA_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; - } - } - } - } -#endif /* 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 */ if ( hDecoderConfig->last_ivas_total_brate <= IVAS_SID_5k2 && st_ivas->nCPE >= 1 ) @@ -563,11 +512,7 @@ ivas_error ivas_cldfb_dec_reconfig( } /* CLDFB Interpolation weights */ -#ifdef SBA2MONO 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 ) -#else - if ( st_ivas->sba_mode == SBA_MODE_SPAR && ( numCldfbAnalyses_old != numCldfbAnalyses || numCldfbSyntheses_old != numCldfbSyntheses || nchan_transport_old != st_ivas->nchan_transport ) ) -#endif { ivas_spar_get_cldfb_gains( st_ivas->hSpar, st_ivas->cldfbAnaDec[0], st_ivas->cldfbSynDec[0], hDecoderConfig ); } diff --git a/lib_dec/ivas_cpe_dec.c b/lib_dec/ivas_cpe_dec.c index 5156aad08c16c209e9fab116858cf2b04d08e983..3717501c831a671f3a92a58a7938a7ca54974846 100755 --- a/lib_dec/ivas_cpe_dec.c +++ b/lib_dec/ivas_cpe_dec.c @@ -405,11 +405,12 @@ ivas_error ivas_cpe_dec( } else { -#ifdef SBA2MONO - stereo_dft_dec( hCPE->hStereoDft, sts[0], DFT, hCPE->input_mem[1], hCPE->hStereoCng, 0, 0, 0, 0, 0, 0 ); -#else - stereo_dft_dec( hCPE->hStereoDft, sts[0], DFT, hCPE->input_mem[1], hCPE->hStereoCng, 0, 0, 0, 0, 0 ); + stereo_dft_dec( hCPE->hStereoDft, sts[0], DFT, hCPE->input_mem[1], hCPE->hStereoCng, 0, 0, 0, 0, 0, 0 +#ifdef FIX_STEREO_474 + , + MAX_PARAM_SPATIAL_SUBFRAMES #endif + ); } /* synthesis iFFT */ @@ -691,12 +692,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; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - 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; - } -#endif if ( ( error = init_decoder( st, n, st_ivas->mc_mode ) ) != IVAS_ERR_OK ) { @@ -838,11 +833,7 @@ void destroy_cpe_dec( 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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && hCPE->hCoreCoder[1]->mct_chan_mode == MCT_CHAN_MODE_LFE -#endif - && hCPE->hCoreCoder[1]->hTcxCfg != hCPE->hCoreCoder[0]->hTcxCfg ) + if ( hCPE->hCoreCoder[1] != NULL && hCPE->hCoreCoder[1]->hTcxCfg != hCPE->hCoreCoder[0]->hTcxCfg ) { hCPE->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_IGNORE; } diff --git a/lib_dec/ivas_dec.c b/lib_dec/ivas_dec.c index b4eb783624a3e2115d73c4dda09e06d991af8799..7069e7d08f802323211d6f43aae28406273d84b3 100644 --- a/lib_dec/ivas_dec.c +++ b/lib_dec/ivas_dec.c @@ -64,7 +64,11 @@ ivas_error ivas_dec( int16_t nb_bits_metadata[MAX_SCE]; int32_t output_Fs, ivas_total_brate; AUDIO_CONFIG output_config; + float pan_left, pan_right; ivas_error error; +#ifdef JBM_TSM_ON_TCS + float *p_output[MAX_OUTPUT_CHANNELS]; +#endif error = IVAS_ERR_OK; @@ -80,7 +84,11 @@ ivas_error ivas_dec( if ( st_ivas->bfi == 0 ) { +#ifdef JBM_TSM_ON_TCS + if ( ( error = ivas_dec_setup( st_ivas, NULL, NULL ) ) != IVAS_ERR_OK ) +#else if ( ( error = ivas_dec_setup( st_ivas ) ) != IVAS_ERR_OK ) +#endif { return error; } @@ -97,6 +105,13 @@ ivas_error ivas_dec( output_frame = (int16_t) ( output_Fs / FRAMES_PER_SEC ); +#ifdef JBM_TSM_ON_TCS + for ( n = 0; n < MAX_OUTPUT_CHANNELS; n++ ) + { + p_output[n] = &output[n][0]; + } +#endif + /*----------------------------------------------------------------* * Decoding + Rendering *----------------------------------------------------------------*/ @@ -134,7 +149,11 @@ ivas_error ivas_dec( /* Rendering */ if ( st_ivas->renderer_type == RENDERER_MC ) { - ivas_ls_setup_conversion( st_ivas, output_frame, output ); +#ifdef JBM_TSM_ON_TCS + ivas_ls_setup_conversion( st_ivas, st_ivas->nchan_transport, output_frame, p_output, p_output ); +#else + ivas_ls_setup_conversion( st_ivas, st_ivas->nchan_transport, output_frame, output ); +#endif } } else if ( st_ivas->ivas_format == ISM_FORMAT ) @@ -150,73 +169,17 @@ ivas_error ivas_dec( else if ( st_ivas->ism_mode == ISM_MODE_PARAM ) { // VE: call ivas_ism_metadata_dec() with 'st_ivas' - TBD -#ifdef DISCRETE_ISM_DTX_CNG -#ifdef NCHAN_ISM_PARAMETER -#ifdef FIX_379_EXT_METADATA 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 ) -#else - 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 ) ) != IVAS_ERR_OK ) -#endif -#else -#ifdef FIX_379_EXT_METADATA - if ( ( error = 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->hISMDTX, st_ivas->hDirAC->hParamIsm, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt ) ) != IVAS_ERR_OK ) -#else - if ( ( error = 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->hISMDTX, st_ivas->hDirAC->hParamIsm ) ) != IVAS_ERR_OK ) -#endif -#endif { return error; } -#else -#ifdef NCHAN_ISM_PARAMETER -#ifdef FIX_379_EXT_METADATA - 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->hDirAC->hParamIsm, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt ); -#else - 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->hDirAC->hParamIsm ); -#endif -#else -#ifdef FIX_379_EXT_METADATA - 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, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt ); -#else - 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 ); -#endif -#endif -#endif } else /* ISM_MODE_DISC */ { -#ifdef DISCRETE_ISM_DTX_CNG -#ifdef NCHAN_ISM_PARAMETER -#ifdef FIX_379_EXT_METADATA 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 ) -#else - 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 ) ) != IVAS_ERR_OK ) -#endif -#else -#ifdef FIX_379_EXT_METADATA - if ( ( error = 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->hISMDTX, NULL, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt ) ) != IVAS_ERR_OK ) -#else - if ( ( error = 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->hISMDTX, NULL ) ) != IVAS_ERR_OK ) -#endif -#endif { return error; } -#else -#ifdef NCHAN_ISM_PARAMETER -#ifdef FIX_379_EXT_METADATA - 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, NULL, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt ); -#else - 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, NULL ); -#endif -#else -#ifdef FIX_379_EXT_METADATA - 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, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt ); -#else - 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 ); -#endif -#endif -#endif } for ( n = 0; n < st_ivas->nchan_transport; n++ ) @@ -243,6 +206,13 @@ ivas_error ivas_dec( { ivas_mono_downmix_render_passive( st_ivas, output, output_frame ); } + else if ( st_ivas->renderer_type == RENDERER_NON_DIEGETIC_DOWNMIX ) + { + pan_left = ( st_ivas->hDecoderConfig->non_diegetic_pan_gain + 1.f ) * 0.5f; + pan_right = 1.f - pan_left; + v_multc( output[0], pan_right, output[1], output_frame ); + v_multc( output[0], pan_left, output[0], output_frame ); + } else if ( st_ivas->renderer_type == RENDERER_PARAM_ISM || st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) { ivas_param_ism_dec( st_ivas, output ); @@ -250,7 +220,11 @@ ivas_error ivas_dec( if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) { /* Convert CICP19 -> Ambisonics */ +#ifdef JBM_TSM_ON_TCS + ivas_mc2sba( st_ivas->hIntSetup, p_output, p_output, output_frame, st_ivas->hOutSetup.ambisonics_order, 0.f ); +#else ivas_mc2sba( st_ivas->hIntSetup, output, output_frame, st_ivas->hOutSetup.ambisonics_order, 0.f ); +#endif } } } @@ -261,41 +235,80 @@ ivas_error ivas_dec( { ivas_mono_downmix_render_passive( st_ivas, output, output_frame ); } + else if ( st_ivas->renderer_type == RENDERER_NON_DIEGETIC_DOWNMIX ) + { + pan_left = ( st_ivas->hDecoderConfig->non_diegetic_pan_gain + 1.f ) * 0.5f; + pan_right = 1.f - pan_left; + v_multc( output[0], pan_right, output[1], output_frame ); + v_multc( output[0], pan_left, output[0], output_frame ); + } else if ( st_ivas->renderer_type == RENDERER_TD_PANNING || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) { /* Convert to CICPxx; used also for ISM->CICP19->binaural_room rendering */ +#ifdef JBM_TSM_ON_TCS + ivas_ism_render( st_ivas, p_output, output_frame ); +#else ivas_ism_render( st_ivas, output, output_frame ); +#endif } +#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 { /* Convert to Ambisonics; used also for ISM->HOA3->binaural rendering */ -#ifdef NCHAN_ISM_PARAMETER - ivas_ism2sba( output, st_ivas->hIsmRendererData, st_ivas->hIsmMetaData, st_ivas->nchan_ism, output_frame, st_ivas->hIntSetup.ambisonics_order ); +#ifdef JBM_TSM_ON_TCS + ivas_ism2sba( p_output, st_ivas->hIsmRendererData, st_ivas->hIsmMetaData, st_ivas->nchan_ism, output_frame, st_ivas->hIntSetup.ambisonics_order ); #else - 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 ); #endif } /* Binaural rendering */ if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD ) { +#ifdef JBM_TSM_ON_TCS + if ( ( ivas_td_binaural_renderer( st_ivas, p_output, output_frame ) ) != IVAS_ERR_OK ) +#else if ( ( ivas_td_binaural_renderer( st_ivas, output, output_frame ) ) != IVAS_ERR_OK ) +#endif { return error; } } else if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) { - if ( ( error = ivas_rend_crendProcess( st_ivas->hCrendWrapper, AUDIO_CONFIG_7_1_4, AUDIO_CONFIG_BINAURAL_ROOM, NULL, NULL, NULL, NULL, output, output_Fs ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_rend_crendProcess( st_ivas->hCrendWrapper, + AUDIO_CONFIG_7_1_4, + AUDIO_CONFIG_BINAURAL_ROOM, + NULL, + NULL, + NULL, + NULL, +#ifdef JBM_TSM_ON_TCS + p_output, +#else + output, +#endif + output_Fs ) ) != IVAS_ERR_OK ) { return error; } +#ifdef JBM_TSM_ON_TCS + ivas_binaural_add_LFE( st_ivas, output_frame, p_output, p_output ); +#else ivas_binaural_add_LFE( st_ivas, output_frame, output ); +#endif } #ifdef DEBUGGING else if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) { +#ifdef JBM_TSM_ON_TCS + ivas_binaural_cldfb( st_ivas, p_output ); +#else ivas_binaural_cldfb( st_ivas, output ); +#endif } #endif } @@ -311,7 +324,9 @@ ivas_error ivas_dec( if ( st_ivas->ivas_format == SBA_FORMAT ) { - ivas_dirac_dec_read_BS( ivas_total_brate, st, st_ivas->hDirAC, st_ivas->hQMetaData, &nb_bits_metadata[0], st_ivas->sba_mode, 0 ); + ivas_dirac_dec_read_BS( ivas_total_brate, st, st_ivas->hDirAC, st_ivas->hQMetaData, &nb_bits_metadata[0], st_ivas->sba_mode, + ivas_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order ), + 0 ); } else { @@ -326,7 +341,10 @@ ivas_error ivas_dec( if ( st_ivas->hQMetaData != NULL ) { st = ( st_ivas->nSCE > 0 ) ? st_ivas->hSCE[0]->hCoreCoder[0] : st_ivas->hCPE[0]->hCoreCoder[0]; - ivas_dirac_dec_read_BS( ivas_total_brate, st, st_ivas->hDirAC, st_ivas->hQMetaData, &nb_bits_metadata[0], st_ivas->sba_mode, st_ivas->hSpar->dirac_to_spar_md_bands ); + + ivas_dirac_dec_read_BS( ivas_total_brate, st, st_ivas->hDirAC, st_ivas->hQMetaData, &nb_bits_metadata[0], st_ivas->sba_mode, + ivas_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order ), + st_ivas->hSpar->dirac_to_spar_md_bands ); } if ( ( error = ivas_spar_dec( st_ivas, nb_bits_metadata ) ) != IVAS_ERR_OK ) @@ -362,24 +380,30 @@ 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" ); #endif + /* TCs remapping */ nchan_remapped = st_ivas->nchan_transport; if ( st_ivas->sba_dirac_stereo_flag ) { -#ifdef SBA2MONO nchan_remapped = nchan_out; -#else - nchan_remapped = CPE_CHANNELS; -#endif if ( st_ivas->sba_mode == SBA_MODE_SPAR ) { -#ifdef SBA2MONO 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 ) @@ -387,8 +411,8 @@ ivas_error ivas_dec( 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 ); } -#endif - ivas_spar_dec_gen_umx_mat( st_ivas->hSpar->hMdDec, st_ivas->nchan_transport, IVAS_MAX_NUM_BANDS, st_ivas->bfi ); + ivas_spar_dec_gen_umx_mat( st_ivas->hSpar->hMdDec, st_ivas->nchan_transport, IVAS_MAX_NUM_BANDS, st_ivas->bfi, + ivas_get_spar_dec_md_num_subframes( st_ivas->sba_order, st_ivas->hDecoderConfig->ivas_total_brate ) ); } ivas_sba_dirac_stereo_dec( st_ivas, output, output_frame, st_ivas->ivas_format == MC_FORMAT ); @@ -400,20 +424,7 @@ ivas_error ivas_dec( /* HP filtering */ #ifndef DEBUG_SPAR_BYPASS_EVS_CODEC -#ifdef SBA_HPF_TUNING_DEC - int16_t nchan_hp20; - if ( st_ivas->ivas_format == MASA_FORMAT ) - { - nchan_hp20 = nchan_remapped; - } - else - { - nchan_hp20 = getNumChanSynthesis( st_ivas ); - } - for ( n = 0; n < nchan_hp20; n++ ) -#else for ( n = 0; n < nchan_remapped; n++ ) -#endif { hp20( output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs ); } @@ -426,6 +437,12 @@ ivas_error ivas_dec( { ivas_sba_mix_matrix_determiner( st_ivas->hSpar, output, st_ivas->bfi, nchan_remapped, output_frame ); } +#ifdef JBM_TSM_ON_TCS + else if ( st_ivas->sba_mode == SBA_MODE_SPAR && st_ivas->renderer_type != RENDERER_DISABLE ) + { + ivas_spar_dec_agc_pca( st_ivas, output, output_frame ); + } +#endif } if ( st_ivas->ivas_format == MASA_FORMAT ) @@ -434,7 +451,16 @@ ivas_error ivas_dec( } else if ( st_ivas->ivas_format == SBA_FORMAT && ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) ) { - float gain = 0.8414f; /* Todo: Temporary gain for roughly matching the loudness. To be tuned later together with other outputs. */ + float gain; + + if ( nchan_remapped == 1 ) + { + gain = 1.4454f; + } + else + { + gain = 1.3657f; + } for ( n = 0; n < nchan_remapped; n++ ) { @@ -451,21 +477,25 @@ ivas_error ivas_dec( { if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC ) { +#ifdef JBM_TSM_ON_TCS + if ( ( error = ivas_sba_linear_renderer( p_output, output_frame, nchan_remapped, output_config, st_ivas->hOutSetup, st_ivas->hoa_dec_mtx ) ) != IVAS_ERR_OK ) +#else if ( ( error = ivas_sba_linear_renderer( output, output_frame, nchan_remapped, output_config, st_ivas->hOutSetup, st_ivas->hoa_dec_mtx ) ) != IVAS_ERR_OK ) +#endif { return error; } } else if ( st_ivas->renderer_type == RENDERER_DIRAC ) { +#ifdef JBM_TSM_ON_TCS + ivas_dirac_dec( st_ivas, output, nchan_remapped ); +#else ivas_dirac_dec( st_ivas, output, nchan_remapped, NULL, NULL, -1 ); +#endif } } -#ifdef SBA2MONO else if ( !st_ivas->sba_dirac_stereo_flag && nchan_out != 1 ) -#else - else if ( !st_ivas->sba_dirac_stereo_flag ) -#endif { ivas_sba_upmixer_renderer( st_ivas, output, output_frame ); /* Note: ivas_sba_linear_renderer() or ivas_dirac_dec() are called internally */ } @@ -477,12 +507,6 @@ ivas_error ivas_dec( /* LFE channel decoder */ if ( st_ivas->mc_mode == MC_MODE_MCT ) { -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( st_ivas->hCPE[1]->hCoreCoder[1]->hTcxCfg == NULL ) - { - st_ivas->hCPE[1]->hCoreCoder[1]->hTcxCfg = st_ivas->hCPE[1]->hCoreCoder[0]->hTcxCfg; - } -#endif ivas_lfe_dec( st_ivas->hLFE, st, output_frame, st_ivas->bfi, output_lfe_ch ); } @@ -506,35 +530,164 @@ ivas_error ivas_dec( if ( st_ivas->transport_config != st_ivas->intern_config && ( st_ivas->intern_config == AUDIO_CONFIG_FOA || st_ivas->intern_config == AUDIO_CONFIG_HOA2 || st_ivas->intern_config == AUDIO_CONFIG_HOA3 ) ) { +#ifdef JBM_TSM_ON_TCS + ivas_mc2sba( st_ivas->hTransSetup, p_output, p_output, output_frame, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE ); +#else ivas_mc2sba( st_ivas->hTransSetup, output, output_frame, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE ); +#endif } /* Rendering */ if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_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 ) ) != IVAS_ERR_OK ) + 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, +#ifdef JBM_TSM_ON_TCS + p_output, +#else + output, +#endif + output_Fs ) ) != IVAS_ERR_OK ) { return error; } +#ifdef JBM_TSM_ON_TCS + ivas_binaural_add_LFE( st_ivas, output_frame, p_output, p_output ); +#else ivas_binaural_add_LFE( st_ivas, output_frame, output ); +#endif } else if ( st_ivas->renderer_type == RENDERER_MC ) { - ivas_ls_setup_conversion( st_ivas, output_frame, output ); +#ifdef JBM_TSM_ON_TCS + ivas_ls_setup_conversion( st_ivas, st_ivas->nchan_transport, output_frame, p_output, p_output ); +#else + ivas_ls_setup_conversion( st_ivas, st_ivas->nchan_transport, output_frame, output ); +#endif } else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) { +#ifdef JBM_TSM_ON_TCS + ivas_mc2sba( st_ivas->hIntSetup, p_output, p_output, output_frame, st_ivas->hOutSetup.ambisonics_order, 0.f ); +#else ivas_mc2sba( st_ivas->hIntSetup, output, output_frame, st_ivas->hOutSetup.ambisonics_order, 0.f ); +#endif } else if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD ) { +#ifdef JBM_TSM_ON_TCS + if ( ( ivas_td_binaural_renderer( st_ivas, p_output, output_frame ) ) != IVAS_ERR_OK ) + { + return error; + } + ivas_binaural_add_LFE( st_ivas, output_frame, p_output, p_output ); +#else if ( ( ivas_td_binaural_renderer( st_ivas, output, output_frame ) ) != IVAS_ERR_OK ) { return error; } + ivas_binaural_add_LFE( st_ivas, output_frame, output ); +#endif + } + } + else if ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) + { + ivas_lfe_dec( st_ivas->hLFE, st, output_frame, st_ivas->bfi, output_lfe_ch ); + + ivas_mc_paramupmix_dec_read_BS( ivas_total_brate, st, st_ivas, st_ivas->hMCParamUpmix, &nb_bits_metadata[0] ); + if ( ( error = ivas_mct_dec( st_ivas, output, output_frame, nb_bits_metadata[0] ) ) != IVAS_ERR_OK ) + { + return error; + } + + mvr2r( output_lfe_ch, output[LFE_CHANNEL], output_frame ); + + ivas_mc_paramupmix_dec( st_ivas, output ); + + /* HP filtering */ + for ( n = 0; n < st_ivas->nchan_transport; n++ ) + { + if ( n != LFE_CHANNEL ) + { + hp20( output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs ); + } + } + + if ( st_ivas->transport_config != st_ivas->intern_config && ( st_ivas->intern_config == AUDIO_CONFIG_FOA || st_ivas->intern_config == AUDIO_CONFIG_HOA2 || st_ivas->intern_config == AUDIO_CONFIG_HOA3 ) ) + { +#ifdef JBM_TSM_ON_TCS + ivas_mc2sba( st_ivas->hTransSetup, p_output, p_output, output_frame, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE ); +#else + ivas_mc2sba( st_ivas->hTransSetup, output, output_frame, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE ); +#endif + } + + /* Rendering */ + if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) + { +#ifdef JBM_TSM_ON_TCS + 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, p_output, output_Fs ) ) != IVAS_ERR_OK ) +#else + 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 ) ) != IVAS_ERR_OK ) +#endif + { + return error; + } +#ifdef JBM_TSM_ON_TCS + ivas_binaural_add_LFE( st_ivas, output_frame, p_output, p_output ); +#else + ivas_binaural_add_LFE( st_ivas, output_frame, output ); +#endif + } + else if ( st_ivas->renderer_type == RENDERER_MC ) + { + if ( ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO ) || ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ) ) + { +#ifdef JBM_TSM_ON_TCS + ivas_ls_setup_conversion( st_ivas, audioCfg2channels( AUDIO_CONFIG_5_1_2 ), output_frame, p_output, p_output ); +#else + ivas_ls_setup_conversion( st_ivas, audioCfg2channels( AUDIO_CONFIG_5_1_2 ), output_frame, output ); +#endif + } + else + { +#ifdef JBM_TSM_ON_TCS + ivas_ls_setup_conversion( st_ivas, MC_PARAMUPMIX_MAX_INPUT_CHANS, output_frame, p_output, p_output ); +#else + ivas_ls_setup_conversion( st_ivas, MC_PARAMUPMIX_MAX_INPUT_CHANS, output_frame, output ); +#endif + } + } + else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) + { +#ifdef JBM_TSM_ON_TCS + ivas_mc2sba( st_ivas->hIntSetup, p_output, p_output, output_frame, st_ivas->hOutSetup.ambisonics_order, 0.f ); +#else + ivas_mc2sba( st_ivas->hIntSetup, output, output_frame, st_ivas->hOutSetup.ambisonics_order, 0.f ); +#endif + } + else if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD ) + { +#ifdef JBM_TSM_ON_TCS + if ( ( ivas_td_binaural_renderer( st_ivas, p_output, output_frame ) ) != IVAS_ERR_OK ) +#else + if ( ( ivas_td_binaural_renderer( st_ivas, output, output_frame ) ) != IVAS_ERR_OK ) +#endif + { + return error; + } +#ifdef JBM_TSM_ON_TCS + ivas_binaural_add_LFE( st_ivas, output_frame, p_output, p_output ); +#else ivas_binaural_add_LFE( st_ivas, output_frame, output ); +#endif } } else if ( st_ivas->mc_mode == MC_MODE_PARAMMC ) @@ -566,11 +719,19 @@ ivas_error ivas_dec( /* Rendering */ if ( output_config == AUDIO_CONFIG_MONO || output_config == AUDIO_CONFIG_STEREO ) { - ivas_ls_setup_conversion( st_ivas, output_frame, output ); +#ifdef JBM_TSM_ON_TCS + ivas_ls_setup_conversion( st_ivas, st_ivas->nchan_transport, output_frame, p_output, p_output ); +#else + ivas_ls_setup_conversion( st_ivas, st_ivas->nchan_transport, output_frame, output ); +#endif } else { +#ifdef JBM_TSM_ON_TCS + ivas_param_mc_dec( st_ivas, p_output ); +#else ivas_param_mc_dec( st_ivas, output ); +#endif } } else if ( st_ivas->mc_mode == MC_MODE_MCMASA ) @@ -652,11 +813,19 @@ ivas_error ivas_dec( } else if ( st_ivas->renderer_type == RENDERER_DIRAC || st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) /* rendering to CICPxx and Ambisonics */ { +#ifdef JBM_TSM_ON_TCS + ivas_dirac_dec( st_ivas, output, st_ivas->nchan_transport ); +#else ivas_dirac_dec( st_ivas, output, st_ivas->nchan_transport, NULL, NULL, -1 ); +#endif if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) { +#ifdef JBM_TSM_ON_TCS + ivas_mc2sba( st_ivas->hIntSetup, p_output, p_output, output_frame, st_ivas->hOutSetup.ambisonics_order, 0.f ); +#else ivas_mc2sba( st_ivas->hIntSetup, output, output_frame, st_ivas->hOutSetup.ambisonics_order, 0.f ); +#endif } else if ( st_ivas->intern_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 ) ) { @@ -679,14 +848,21 @@ ivas_error ivas_dec( * - compensation for saturation * - float to integer conversion *----------------------------------------------------------------*/ +#ifdef JBM_TSM_ON_TCS + ivas_limiter_dec( st_ivas->hLimiter, p_output, nchan_out, output_frame, st_ivas->BER_detect ); +#ifdef DEBUGGING + st_ivas->noClipping += +#endif + ivas_syn_output( p_output, output_frame, nchan_out, data ); +#else ivas_limiter_dec( st_ivas->hLimiter, output, nchan_out, output_frame, st_ivas->BER_detect ); #ifdef DEBUGGING st_ivas->noClipping += #endif ivas_syn_output( output, output_frame, nchan_out, data ); - +#endif /*----------------------------------------------------------------* * Common updates *----------------------------------------------------------------*/ diff --git a/lib_dec/ivas_dirac_dec.c b/lib_dec/ivas_dirac_dec.c index 4d3d1adb3c15e57eadfb683ec8e2a72eee0d25fe..025a876d05f14b7f388d0e4a2bb42aa79e8971ad 100644 --- a/lib_dec/ivas_dirac_dec.c +++ b/lib_dec/ivas_dirac_dec.c @@ -51,7 +51,7 @@ * Local function prototypes *-----------------------------------------------------------------------*/ -static ivas_error 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, const int16_t hodirac_flag ); static void ivas_dirac_free_mem( DIRAC_DEC_STACK_MEM_HANDLE hDirAC_mem ); @@ -65,7 +65,7 @@ static void protoSignalComputation1( float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRA static void protoSignalComputation2( 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 isloudspeaker, const int16_t slot_index, const int16_t num_freq_bands, MASA_STEREO_TYPE_DETECT *stereo_type_detect ); -static void protoSignalComputation4( 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, const float *mtx_hoa_decoder, const int16_t nchan_transport ); +static void protoSignalComputation4( 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, const float *mtx_hoa_decoder, const int16_t nchan_transport, const int16_t *sba_map_tc_ind ); static void ivas_dirac_dec_compute_diffuse_proto( DIRAC_DEC_HANDLE hDirAC, const int16_t slot_idx ); @@ -103,6 +103,144 @@ ivas_error ivas_dirac_dec_open( } +/*------------------------------------------------------------------------- + * ivas_dirac_allocate_parameters() + * + * Allocate and initialize DirAC parameters + *-------------------------------------------------------------------------*/ + +ivas_error ivas_dirac_allocate_parameters( + DIRAC_DEC_HANDLE hDirAC, /* i/o: decoder DirAC handle */ + const int16_t params_flag /* i : set of parameters flag */ +) +{ + int16_t i; + + if ( params_flag == 1 ) + { + 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++ ) + { + 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 ); + + 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 ); + + 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 ); + + 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 ); + + 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 ); + + 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 ); + } + } + else if ( params_flag == 2 ) + { + 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++ ) + { + 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 ); + + 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 ); + + 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 ); + + 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 ); + } + } + + return IVAS_ERR_OK; +} + + /*------------------------------------------------------------------------- * ivas_dirac_dec_config() * @@ -130,6 +268,7 @@ ivas_error ivas_dirac_dec_config( int32_t output_Fs, ivas_total_brate; ivas_error error; int16_t nchan_transport_orig; + int16_t hodirac_flag; DIRAC_CONFIG_FLAG flag_config; flag_config = ( flag_config_inp == DIRAC_RECONFIGURE_MODE ) ? DIRAC_RECONFIGURE : flag_config_inp; @@ -138,6 +277,7 @@ ivas_error ivas_dirac_dec_config( hDirAC = NULL; output_Fs = st_ivas->hDecoderConfig->output_Fs; ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; + hodirac_flag = ivas_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order ); if ( flag_config == DIRAC_RECONFIGURE ) { @@ -159,7 +299,10 @@ ivas_error ivas_dirac_dec_config( return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC Config\n" ) ); } nchan_transport_old = 0; - +#ifdef JBM_TSM_ON_TCS + hDirAC->hParamIsm = NULL; + hDirAC->hParamIsmRendering = NULL; +#endif st_ivas->hDirAC = hDirAC; } @@ -172,7 +315,8 @@ ivas_error ivas_dirac_dec_config( nchan_transport_orig = st_ivas->nchan_transport; if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR && !( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) ) { - st_ivas->nchan_transport = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order ); + st_ivas->nchan_transport = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order, + st_ivas->hDecoderConfig->ivas_total_brate ); } nchan_transport = st_ivas->nchan_transport; @@ -250,18 +394,47 @@ ivas_error ivas_dirac_dec_config( if ( flag_config == DIRAC_OPEN ) { hDirAC->slot_size = (int16_t) ( ( output_Fs / FRAMES_PER_SEC ) / CLDFB_NO_COL_MAX ); +#ifdef JBM_TSM_ON_TCS + set_s( hDirAC->subframe_nbslots, 0, MAX_JBM_SUBFRAMES_5MS ); + set_s( hDirAC->subframe_nbslots, JBM_CLDFB_SLOTS_IN_SUBFRAME, DEFAULT_JBM_SUBFRAMES_5MS ); + hDirAC->nb_subframes = DEFAULT_JBM_SUBFRAMES_5MS; + hDirAC->subframes_rendered = 0; + hDirAC->slots_rendered = 0; + hDirAC->num_slots = DEFAULT_JBM_SUBFRAMES_5MS * JBM_CLDFB_SLOTS_IN_SUBFRAME; +#else hDirAC->subframe_nbslots = (int16_t) ( CLDFB_NO_COL_MAX * 5.f / 20.f + 0.5f ); hDirAC->nb_subframes = CLDFB_NO_COL_MAX / hDirAC->subframe_nbslots; assert( hDirAC->nb_subframes <= MAX_PARAM_SPATIAL_SUBFRAMES ); +#endif + } + + if ( st_ivas->ivas_format == SBA_FORMAT && flag_config == DIRAC_RECONFIGURE && ( ( ivas_total_brate > IVAS_256k && st_ivas->hDecoderConfig->last_ivas_total_brate <= IVAS_256k ) || ( ivas_total_brate <= IVAS_256k && st_ivas->hDecoderConfig->last_ivas_total_brate > IVAS_256k ) ) ) + { + if ( st_ivas->hDecoderConfig->ivas_total_brate > IVAS_256k && hDirAC->azimuth2 == NULL ) + { + if ( ( error = ivas_dirac_allocate_parameters( hDirAC, 2 ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else if ( st_ivas->hDecoderConfig->ivas_total_brate <= IVAS_256k && hDirAC->azimuth2 != NULL ) + { + ivas_dirac_deallocate_parameters( hDirAC, 2 ); + } } /* band config needed only for SPAR with FOA output */ - if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_FOA && st_ivas->sba_mode == SBA_MODE_SPAR ) + if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_FOA && st_ivas->sba_mode == SBA_MODE_SPAR && !hodirac_flag ) { return IVAS_ERR_OK; } - if ( nchan_transport_orig > 2 && hDirAC->hOutSetup.is_loudspeaker_setup && st_ivas->renderer_type == RENDERER_DIRAC ) + + if ( nchan_transport_orig > 2 && hDirAC->hOutSetup.is_loudspeaker_setup && st_ivas->renderer_type == RENDERER_DIRAC +#ifdef FIX_DIRAC_LS_SYNTHESIS_CONFIG + && !hodirac_flag +#endif + ) { hDirAC->synthesisConf = DIRAC_SYNTHESIS_PSD_LS; hDirAC->panningConf = DIRAC_PANNING_VBAP; @@ -412,6 +585,15 @@ ivas_error ivas_dirac_dec_config( } set_s( hDirAC->proto_index_diff, 0, hDirAC->num_outputs_diff ); + hDirAC->sba_map_tc = sba_map_tc; + if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR ) + { + if ( st_ivas->sba_order > SBA_FOA_ORDER && ivas_total_brate >= IVAS_512k ) + { + hDirAC->sba_map_tc = sba_map_tc_512; + } + } + if ( nchan_transport == 1 ) { hDirAC->num_protos_ambi = 1; @@ -517,9 +699,9 @@ ivas_error ivas_dirac_dec_config( for ( k = 0; k < min( hDirAC->num_outputs_dir, hDirAC->num_protos_dir ); k++ ) { - if ( sba_map_tc[k] < hDirAC->num_outputs_dir ) + if ( hDirAC->sba_map_tc[k] < hDirAC->num_outputs_dir ) { - hDirAC->proto_index_dir[sba_map_tc[k]] = k; + hDirAC->proto_index_dir[hDirAC->sba_map_tc[k]] = k; } } } @@ -696,7 +878,8 @@ ivas_error ivas_dirac_dec_config( /* output synthesis */ if ( flag_config == DIRAC_OPEN ) { - if ( ( ivas_dirac_dec_output_synthesis_open( hDirAC, st_ivas->renderer_type, nchan_transport, output_Fs ) ) != IVAS_ERR_OK ) + if ( ( ivas_dirac_dec_output_synthesis_open( hDirAC, st_ivas->renderer_type, nchan_transport, output_Fs, + hodirac_flag ) ) != IVAS_ERR_OK ) { return error; } @@ -706,7 +889,8 @@ ivas_error ivas_dirac_dec_config( { ivas_dirac_dec_output_synthesis_close( hDirAC ); - if ( ( ivas_dirac_dec_output_synthesis_open( hDirAC, st_ivas->renderer_type, nchan_transport, output_Fs ) ) != IVAS_ERR_OK ) + if ( ( ivas_dirac_dec_output_synthesis_open( hDirAC, st_ivas->renderer_type, nchan_transport, output_Fs, + hodirac_flag ) ) != IVAS_ERR_OK ) { return error; } @@ -800,14 +984,16 @@ ivas_error ivas_dirac_dec_config( } /* output synthesis */ - ivas_dirac_dec_output_synthesis_init( hDirAC, nchan_out_woLFE ); + ivas_dirac_dec_output_synthesis_init( hDirAC, nchan_out_woLFE, + hodirac_flag ); /* Allocate stack memory */ if ( flag_config != DIRAC_OPEN ) { ivas_dirac_free_mem( &( hDirAC->stack_mem ) ); } - if ( ( error = ivas_dirac_alloc_mem( hDirAC, st_ivas->renderer_type, &( hDirAC->stack_mem ) ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_dirac_alloc_mem( hDirAC, st_ivas->renderer_type, &( hDirAC->stack_mem ), + hodirac_flag ) ) != IVAS_ERR_OK ) { return error; } @@ -820,23 +1006,36 @@ ivas_error ivas_dirac_dec_config( hDirAC->dirac_bs_md_write_idx = 0; hDirAC->dirac_read_idx = 0; hDirAC->spar_to_dirac_write_idx = 0; - -#ifdef FIX_350_MASA_DELAY_COMP + hDirAC->hConfig->dec_param_estim_old = hDirAC->hConfig->dec_param_estim; if ( st_ivas->mc_mode == MC_MODE_MCMASA ) { hDirAC->dirac_md_buffer_length = MAX_PARAM_SPATIAL_SUBFRAMES; +#ifdef JBM_TSM_ON_TCS + { + int16_t map_idx; + set_s( hDirAC->render_to_md_map, 0, MAX_JBM_SUBFRAMES_5MS * JBM_CLDFB_SLOTS_IN_SUBFRAME ); + for ( map_idx = 0; map_idx < DEFAULT_JBM_SUBFRAMES_5MS; map_idx++ ) + { + hDirAC->render_to_md_map[map_idx] = map_idx; + } + } +#endif } 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 - if ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->mc_mode == MC_MODE_MCMASA ) - { - hDirAC->dirac_md_buffer_length = MAX_PARAM_SPATIAL_SUBFRAMES; - } +#ifdef JBM_TSM_ON_TCS + { + int16_t map_idx; + set_s( hDirAC->render_to_md_map, 0, MAX_JBM_SUBFRAMES_5MS * JBM_CLDFB_SLOTS_IN_SUBFRAME ); + for ( map_idx = 0; map_idx < DEFAULT_JBM_SUBFRAMES_5MS; map_idx++ ) + { + hDirAC->render_to_md_map[map_idx] = map_idx; + } + } #endif + } else { int16_t num_slots_in_subfr; @@ -858,140 +1057,94 @@ ivas_error ivas_dirac_dec_config( hDirAC->dirac_read_idx = 0; hDirAC->dirac_estimator_idx = 0; } +#ifdef JBM_TSM_ON_TCS + { + int16_t map_idx; + set_s( hDirAC->render_to_md_map, 0, MAX_JBM_SUBFRAMES_5MS * JBM_CLDFB_SLOTS_IN_SUBFRAME ); + for ( map_idx = 0; map_idx < DEFAULT_JBM_CLDFB_TIMESLOTS; map_idx++ ) + { + hDirAC->render_to_md_map[map_idx] = hDirAC->dirac_read_idx + map_idx * num_slots_in_subfr / JBM_CLDFB_SLOTS_IN_SUBFRAME; + } + } +#endif } - 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 ) + if ( ( error = ivas_dirac_allocate_parameters( hDirAC, 1 ) ) != IVAS_ERR_OK ) { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + return error; } - if ( ( hDirAC->energy_ratio1 = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL ) + if ( st_ivas->ivas_format == MASA_FORMAT || ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->hDecoderConfig->ivas_total_brate > IVAS_256k ) ) { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + if ( ( error = ivas_dirac_allocate_parameters( hDirAC, 2 ) ) != IVAS_ERR_OK ) + { + return error; + } } - - if ( ( hDirAC->spreadCoherence = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL ) + else { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + hDirAC->azimuth2 = NULL; + hDirAC->elevation2 = NULL; + hDirAC->energy_ratio2 = NULL; + hDirAC->spreadCoherence2 = NULL; } - 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" ) ); - } + hDirAC->hDiffuseDist = NULL; /* Memory is allocated from stack during runtime when needed */ - for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) + hDirAC->dithering_seed = DIRAC_DITH_SEED; + st_ivas->hDirAC = hDirAC; + } + else if ( hDirAC->hConfig->dec_param_estim_old != hDirAC->hConfig->dec_param_estim ) + { + int16_t num_slots_in_subfr; + num_slots_in_subfr = hDirAC->hConfig->dec_param_estim ? CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES : 1; + if ( st_ivas->sba_mode == SBA_MODE_SPAR ) { - 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 ); - - 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 ); - - 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 ); - - 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 ); - - if ( ( hDirAC->spreadCoherence[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL ) + if ( ( hDirAC->hConfig->dec_param_estim_old != hDirAC->hConfig->dec_param_estim ) ) { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + ivas_dirac_deallocate_parameters( hDirAC, 1 ); } - set_f( hDirAC->spreadCoherence[i], 0.0f, hDirAC->num_freq_bands ); + hDirAC->dirac_md_buffer_length = ( MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_DIRAC_PARAM_DEC_SFR ) * num_slots_in_subfr; + hDirAC->dirac_bs_md_write_idx = DELAY_DIRAC_PARAM_DEC_SFR * num_slots_in_subfr; + hDirAC->spar_to_dirac_write_idx = DELAY_DIRAC_PARAM_DEC_SFR * num_slots_in_subfr; + hDirAC->dirac_read_idx = 0; + hDirAC->dirac_estimator_idx = 0; - if ( ( hDirAC->surroundingCoherence[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL ) + if ( ( error = ivas_dirac_allocate_parameters( hDirAC, 1 ) ) != IVAS_ERR_OK ) { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + return error; } - set_f( hDirAC->surroundingCoherence[i], 0.0f, hDirAC->num_freq_bands ); } - - if ( st_ivas->ivas_format == MASA_FORMAT ) + } +#ifdef JBM_TSM_ON_TCS + /* allocate transport channels*/ + if ( flag_config == DIRAC_OPEN ) + { + if ( st_ivas->hDecoderConfig->voip_active == 1 && st_ivas->hTcBuffer == NULL ) { - 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 ) + if ( st_ivas->sba_mode == SBA_MODE_DIRAC ) { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); - } + int16_t nchan_to_allocate; - for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) - { - if ( ( hDirAC->azimuth2[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ) ) == NULL ) + nchan_to_allocate = nchan_transport; + 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 ) ) ) { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + nchan_to_allocate++; /* we need a channel for the CNG in this case*/ } - set_s( hDirAC->azimuth2[i], 0, hDirAC->num_freq_bands ); - - if ( ( hDirAC->elevation2[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ) ) == NULL ) + if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC ) { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + nchan_to_allocate = 2 * BINAURAL_CHANNELS; } - set_s( hDirAC->elevation2[i], 0, hDirAC->num_freq_bands ); - - if ( ( hDirAC->energy_ratio2[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL ) + if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, nchan_transport, nchan_to_allocate, nchan_to_allocate, hDirAC->slot_size ) ) != IVAS_ERR_OK ) { - 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 ); - - 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" ) ); + return error; } - set_f( hDirAC->spreadCoherence2[i], 0.0f, hDirAC->num_freq_bands ); } } - else - { - hDirAC->azimuth2 = NULL; - hDirAC->elevation2 = NULL; - hDirAC->energy_ratio2 = NULL; - hDirAC->spreadCoherence2 = NULL; - } - - hDirAC->hDiffuseDist = NULL; /* Memory is allocated from stack during runtime when needed */ - - hDirAC->dithering_seed = DIRAC_DITH_SEED; - st_ivas->hDirAC = hDirAC; } +#endif /* JBM_TMS_ON_TCS*/ + return error; } @@ -1093,150 +1246,185 @@ void ivas_dirac_dec_close( hDirAC->buffer_energy = NULL; } - for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) + ivas_dirac_deallocate_parameters( hDirAC, 1 ); + ivas_dirac_deallocate_parameters( hDirAC, 2 ); + + if ( hDirAC->masa_stereo_type_detect != NULL ) + { + free( hDirAC->masa_stereo_type_detect ); + hDirAC->masa_stereo_type_detect = NULL; + } + + ivas_dirac_free_mem( &( hDirAC->stack_mem ) ); + + free( *hDirAC_out ); + *hDirAC_out = NULL; + + return; +} + + +/*------------------------------------------------------------------------- + * ivas_dirac_deallocate_parameters() + * + * Deallocate DirAC parameters + *-------------------------------------------------------------------------*/ + +void ivas_dirac_deallocate_parameters( + DIRAC_DEC_HANDLE hDirAC, /* i/o: decoder DirAC handle */ + const int16_t params_flag /* i : set of parameters flag */ +) +{ + int16_t i; + + if ( params_flag == 1 ) { - if ( hDirAC->azimuth[i] != NULL ) + if ( hDirAC->azimuth != NULL ) { - free( hDirAC->azimuth[i] ); - hDirAC->azimuth[i] = NULL; + for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) + { + if ( hDirAC->azimuth[i] != NULL ) + { + free( hDirAC->azimuth[i] ); + hDirAC->azimuth[i] = NULL; + } + } + + free( hDirAC->azimuth ); + hDirAC->azimuth = NULL; } - if ( hDirAC->elevation[i] != NULL ) + if ( hDirAC->elevation != NULL ) { - free( hDirAC->elevation[i] ); - hDirAC->elevation[i] = NULL; + for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) + { + if ( hDirAC->elevation[i] != NULL ) + { + free( hDirAC->elevation[i] ); + hDirAC->elevation[i] = NULL; + } + } + + free( hDirAC->elevation ); + hDirAC->elevation = NULL; } - if ( hDirAC->diffuseness_vector[i] != NULL ) + + if ( hDirAC->energy_ratio1 != NULL ) { - free( hDirAC->diffuseness_vector[i] ); - hDirAC->diffuseness_vector[i] = NULL; + for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) + { + if ( hDirAC->energy_ratio1[i] != NULL ) + { + free( hDirAC->energy_ratio1[i] ); + hDirAC->energy_ratio1[i] = NULL; + } + } + free( hDirAC->energy_ratio1 ); + hDirAC->energy_ratio1 = NULL; } - } - if ( hDirAC->azimuth != NULL ) - { - free( hDirAC->azimuth ); - hDirAC->azimuth = NULL; - } - if ( hDirAC->elevation != NULL ) - { - free( hDirAC->elevation ); - hDirAC->elevation = NULL; - } - if ( hDirAC->diffuseness_vector != NULL ) - { - free( hDirAC->diffuseness_vector ); - hDirAC->diffuseness_vector = NULL; - } - if ( hDirAC->azimuth2 != NULL ) - { - for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) + if ( hDirAC->diffuseness_vector != NULL ) { - if ( hDirAC->azimuth2[i] != NULL ) + for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) { - free( hDirAC->azimuth2[i] ); - hDirAC->azimuth2[i] = NULL; + if ( hDirAC->diffuseness_vector[i] != NULL ) + { + free( hDirAC->diffuseness_vector[i] ); + hDirAC->diffuseness_vector[i] = NULL; + } } + + free( hDirAC->diffuseness_vector ); + hDirAC->diffuseness_vector = NULL; } - free( hDirAC->azimuth2 ); - hDirAC->azimuth2 = NULL; - } - if ( hDirAC->elevation2 != NULL ) - { - for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) + if ( hDirAC->spreadCoherence != NULL ) { - if ( hDirAC->elevation2[i] != NULL ) + for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) { - free( hDirAC->elevation2[i] ); - hDirAC->elevation2[i] = NULL; + if ( hDirAC->spreadCoherence[i] != NULL ) + { + free( hDirAC->spreadCoherence[i] ); + hDirAC->spreadCoherence[i] = NULL; + } } + free( hDirAC->spreadCoherence ); + hDirAC->spreadCoherence = NULL; } - free( hDirAC->elevation2 ); - hDirAC->elevation2 = NULL; - } - if ( hDirAC->energy_ratio1 != NULL ) - { - for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) + if ( hDirAC->surroundingCoherence != NULL ) { - if ( hDirAC->energy_ratio1[i] != NULL ) + for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) { - free( hDirAC->energy_ratio1[i] ); - hDirAC->energy_ratio1[i] = NULL; + if ( hDirAC->surroundingCoherence[i] != NULL ) + { + free( hDirAC->surroundingCoherence[i] ); + hDirAC->surroundingCoherence[i] = NULL; + } } + free( hDirAC->surroundingCoherence ); + hDirAC->surroundingCoherence = NULL; } - free( hDirAC->energy_ratio1 ); - hDirAC->energy_ratio1 = NULL; } - - if ( hDirAC->energy_ratio2 != NULL ) + else if ( params_flag == 2 ) { - for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) + if ( hDirAC->azimuth2 != NULL ) { - if ( hDirAC->energy_ratio2[i] != NULL ) + for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) { - free( hDirAC->energy_ratio2[i] ); - hDirAC->energy_ratio2[i] = NULL; + if ( hDirAC->azimuth2[i] != NULL ) + { + free( hDirAC->azimuth2[i] ); + hDirAC->azimuth2[i] = NULL; + } } + free( hDirAC->azimuth2 ); + hDirAC->azimuth2 = NULL; } - free( hDirAC->energy_ratio2 ); - hDirAC->energy_ratio2 = NULL; - } - if ( hDirAC->spreadCoherence != NULL ) - { - for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) + if ( hDirAC->elevation2 != NULL ) { - if ( hDirAC->spreadCoherence[i] != NULL ) + for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) { - free( hDirAC->spreadCoherence[i] ); - hDirAC->spreadCoherence[i] = NULL; + if ( hDirAC->elevation2[i] != NULL ) + { + free( hDirAC->elevation2[i] ); + hDirAC->elevation2[i] = NULL; + } } + free( hDirAC->elevation2 ); + hDirAC->elevation2 = NULL; } - free( hDirAC->spreadCoherence ); - hDirAC->spreadCoherence = NULL; - } - if ( hDirAC->spreadCoherence2 != NULL ) - { - for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) + if ( hDirAC->energy_ratio2 != NULL ) { - if ( hDirAC->spreadCoherence2[i] != NULL ) + for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) { - free( hDirAC->spreadCoherence2[i] ); - hDirAC->spreadCoherence2[i] = NULL; + if ( hDirAC->energy_ratio2[i] != NULL ) + { + free( hDirAC->energy_ratio2[i] ); + hDirAC->energy_ratio2[i] = NULL; + } } + free( hDirAC->energy_ratio2 ); + hDirAC->energy_ratio2 = NULL; } - free( hDirAC->spreadCoherence2 ); - hDirAC->spreadCoherence2 = NULL; - } - if ( hDirAC->surroundingCoherence != NULL ) - { - for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) + if ( hDirAC->spreadCoherence2 != NULL ) { - if ( hDirAC->surroundingCoherence[i] != NULL ) + for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) { - free( hDirAC->surroundingCoherence[i] ); - hDirAC->surroundingCoherence[i] = NULL; + if ( hDirAC->spreadCoherence2[i] != NULL ) + { + free( hDirAC->spreadCoherence2[i] ); + hDirAC->spreadCoherence2[i] = NULL; + } } + free( hDirAC->spreadCoherence2 ); + hDirAC->spreadCoherence2 = NULL; } - free( hDirAC->surroundingCoherence ); - hDirAC->surroundingCoherence = NULL; } - if ( hDirAC->masa_stereo_type_detect != NULL ) - { - free( hDirAC->masa_stereo_type_detect ); - hDirAC->masa_stereo_type_detect = NULL; - } - - ivas_dirac_free_mem( &( hDirAC->stack_mem ) ); - - free( *hDirAC_out ); - *hDirAC_out = NULL; - return; } @@ -1250,9 +1438,12 @@ void ivas_dirac_dec_close( static ivas_error ivas_dirac_alloc_mem( DIRAC_DEC_HANDLE hDirAC, const RENDERER_TYPE renderer_type, - DIRAC_DEC_STACK_MEM_HANDLE hDirAC_mem ) + DIRAC_DEC_STACK_MEM_HANDLE hDirAC_mem, + const int16_t hodirac_flag ) { int16_t num_freq_bands, num_freq_bands_diff, size; + int16_t size_ho; + int16_t size_pf; int16_t num_outputs_dir, num_outputs_diff; int16_t num_protos_dir; @@ -1265,6 +1456,16 @@ static ivas_error ivas_dirac_alloc_mem( num_outputs_diff = hDirAC->num_outputs_diff; size = num_freq_bands * num_outputs_dir; + if ( hodirac_flag ) + { + size_ho = size * DIRAC_HO_NUMSECTORS; + size_pf = num_freq_bands * DIRAC_HO_NUMSECTORS; + } + else + { + size_ho = size; + size_pf = num_freq_bands; + } /* PSD related buffers */ hDirAC_mem->cy_auto_dir_smooth = NULL; @@ -1311,7 +1512,7 @@ static ivas_error ivas_dirac_alloc_mem( hDirAC->h_output_synthesis_psd_state.direct_responses_square = hDirAC_mem->direct_responses_square; /* Target and smoothed nrg factors/gains */ - if ( ( hDirAC_mem->cy_cross_dir_smooth = (float *) malloc( sizeof( float ) * size ) ) == NULL ) + if ( ( hDirAC_mem->cy_cross_dir_smooth = (float *) malloc( sizeof( float ) * size_ho ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) ); } @@ -1337,11 +1538,13 @@ static ivas_error ivas_dirac_alloc_mem( hDirAC->h_output_synthesis_psd_state.cy_auto_diff_smooth = hDirAC_mem->cy_auto_diff_smooth; /*Responses (gains/factors)*/ - if ( ( hDirAC_mem->direct_responses = (float *) malloc( sizeof( float ) * size ) ) == NULL ) + if ( ( hDirAC_mem->direct_responses = (float *) malloc( sizeof( float ) * size_ho ) ) == 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; /* Prototypes */ @@ -1378,18 +1581,19 @@ static ivas_error ivas_dirac_alloc_mem( /* Gains/power factors*/ hDirAC_mem->direct_power_factor = NULL; hDirAC_mem->diffuse_power_factor = NULL; + if ( renderer_type != RENDERER_BINAURAL_PARAMETRIC && renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM && renderer_type != RENDERER_STEREO_PARAMETRIC ) { - if ( ( hDirAC_mem->direct_power_factor = (float *) malloc( sizeof( float ) * num_freq_bands ) ) == NULL ) + if ( ( hDirAC_mem->direct_power_factor = (float *) malloc( sizeof( float ) * size_pf ) ) == 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 ) + if ( ( hDirAC_mem->diffuse_power_factor = (float *) malloc( sizeof( float ) * size_pf ) ) == 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; @@ -1506,18 +1710,18 @@ static void ivas_dirac_free_mem( *------------------------------------------------------------------------*/ void ivas_dirac_dec_read_BS( - const int32_t ivas_total_brate, /* i : IVAS total bitrate */ - Decoder_State *st, /* i/o: decoder state structure */ - DIRAC_DEC_HANDLE hDirAC, /* i/o: decoder DirAC handle */ - IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata */ - int16_t *nb_bits, /* o : number of bits read */ - const SBA_MODE sba_mode, /* i : SBA mode */ - int16_t *dirac_to_spar_md_bands /* o : DirAC->SPAR MD bands */ + const int32_t ivas_total_brate, /* i : IVAS total bitrate */ + Decoder_State *st, /* i/o: decoder state structure */ + DIRAC_DEC_HANDLE hDirAC, /* i/o: decoder DirAC handle */ + IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata */ + int16_t *nb_bits, /* o : number of bits read */ + const SBA_MODE sba_mode, /* i : SBA mode */ + const int16_t hodirac_flag, /* i : flag to indicate HO-DirAC mode */ + int16_t *dirac_to_spar_md_bands /* o : DirAC->SPAR MD bands */ ) { int16_t i, j, b, dir, orig_dirac_bands; int16_t next_bit_pos_orig; - *nb_bits = 0; if ( !st->bfi && ivas_total_brate > IVAS_SID_5k2 ) { @@ -1607,7 +1811,8 @@ void ivas_dirac_dec_read_BS( hQMetaData->q_direction[0].cfg.nblocks = MAX_PARAM_SPATIAL_SUBFRAMES; } - *nb_bits += ivas_qmetadata_dec_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ) ); + *nb_bits += ivas_qmetadata_dec_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), + hodirac_flag ); } #ifdef DEBUGGING @@ -1674,7 +1879,9 @@ void ivas_dirac_dec_read_BS( if ( hDirAC != NULL ) { - ivas_qmetadata_to_dirac( hQMetaData, hDirAC, NULL, ivas_total_brate, sba_mode, dirac_to_spar_md_bands ); + ivas_qmetadata_to_dirac( hQMetaData, hDirAC, NULL, ivas_total_brate, sba_mode, + hodirac_flag, + dirac_to_spar_md_bands ); } return; @@ -1693,6 +1900,7 @@ void ivas_qmetadata_to_dirac( MASA_DECODER_HANDLE hMasa, /* i : MASA decoder structure */ const int32_t ivas_total_brate, /* i : IVAS total bitrate */ const SBA_MODE sba_mode, /* i : SBA mode */ + const int16_t hodirac_flag, /* i : flag to indicate HO-DirAC mode */ int16_t *dirac_to_spar_md_bands /* o : DirAC->SPAR MD bands */ ) { @@ -1706,16 +1914,17 @@ void ivas_qmetadata_to_dirac( int16_t *band_mapping; int16_t *band_grouping; int16_t start_band; - int16_t nbands; - int16_t nblocks; + int16_t nbands = 0; + int16_t nblocks = 0; int16_t qBand_idx; + int16_t idx_sec = 0; + int16_t no_secs = 1; q_direction = &( hQMetaData->q_direction[0] ); hDirAC->numSimultaneousDirections = hQMetaData->no_directions; if ( hMasa != NULL && ivas_total_brate > IVAS_SID_5k2 ) { -#ifdef FIX_350_MASA_DELAY_COMP int16_t meta_write_index; band_mapping = hMasa->data.band_mapping; @@ -1752,45 +1961,10 @@ void ivas_qmetadata_to_dirac( } } } -#else - band_mapping = hMasa->data.band_mapping; - for ( band = 0; band < hMasa->config.numCodingBands; ++band ) - { - for ( b = MASA_band_grouping_24[band_mapping[band]]; b < MASA_band_grouping_24[band_mapping[band + 1]]; ++b ) - { - for ( block = 0; block < MAX_PARAM_SPATIAL_SUBFRAMES; ++block ) - { - 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]; - - if ( q_direction->coherence_band_data != NULL ) - { - hDirAC->spreadCoherence[block][b] = q_direction->coherence_band_data[band].spread_coherence[block] / 255.0f; - } - else - { - hDirAC->spreadCoherence[block][b] = 0.0f; - } - - if ( hQMetaData->surcoh_band_data != NULL ) - { - hDirAC->surroundingCoherence[block][b] = hQMetaData->surcoh_band_data[band].surround_coherence[block] / 255.0f; - } - else - { - hDirAC->surroundingCoherence[block][b] = 0.0f; - } - } - } - } -#endif if ( hQMetaData->no_directions == 2 ) { q_direction = &( hQMetaData->q_direction[1] ); -#ifdef FIX_350_MASA_DELAY_COMP for ( block = 0; block < MAX_PARAM_SPATIAL_SUBFRAMES; ++block ) { meta_write_index = ( hDirAC->dirac_bs_md_write_idx + block ) % hDirAC->dirac_md_buffer_length; @@ -1815,32 +1989,7 @@ void ivas_qmetadata_to_dirac( } } } -#else - for ( band = 0; band < hMasa->config.numCodingBands; ++band ) - { - for ( b = MASA_band_grouping_24[band_mapping[band]]; b < MASA_band_grouping_24[band_mapping[band + 1]]; ++b ) - { - for ( block = 0; block < MAX_PARAM_SPATIAL_SUBFRAMES; ++block ) - { - 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]; - - if ( q_direction->coherence_band_data != NULL ) - { - hDirAC->spreadCoherence2[block][b] = q_direction->coherence_band_data[band].spread_coherence[block] / 255.0f; - } - else - { - hDirAC->spreadCoherence2[block][b] = 0.0f; - } - } - } - } -#endif } -#ifdef FIX_350_MASA_DELAY_COMP else if ( hDirAC->azimuth2 != NULL && hDirAC->elevation2 != NULL && hDirAC->energy_ratio2 != NULL && hDirAC->spreadCoherence2 != NULL ) { /* zero out old dir2 data */ @@ -1853,15 +2002,16 @@ void ivas_qmetadata_to_dirac( set_zero( hDirAC->spreadCoherence2[meta_write_index], hDirAC->num_freq_bands ); } } -#endif } else /* SBA mode/SID/Zero frame*/ { int16_t num_slots_in_subfr; int16_t tmp_write_idx_param_band; int16_t tmp_write_idx_band; + float diffuseness_sec = 0.f; num_slots_in_subfr = hDirAC->hConfig->dec_param_estim ? CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES : 1; + /* ungroup */ seed_ptr = &hDirAC->dithering_seed; nblocks = q_direction->cfg.nblocks; @@ -1878,7 +2028,6 @@ void ivas_qmetadata_to_dirac( } else { - assert( ( hQMetaData->no_directions == 1 ) && "Only 1 direction supported in SBA mode!" ); start_band = hDirAC->hConfig->enc_param_start_band; if ( sba_mode == SBA_MODE_SPAR ) @@ -1906,128 +2055,210 @@ void ivas_qmetadata_to_dirac( { band_start = band_grouping[band]; band_end = band_grouping[band + 1]; +#ifdef JBM_TSM_ON_TCS + tmp_write_idx_param_band = hDirAC->dirac_bs_md_write_idx; + for ( block = 0; block < MAX_PARAM_SPATIAL_SUBFRAMES; block++ ) +#else for ( block = 0; block < hDirAC->nb_subframes; block++ ) +#endif { +#ifdef JBM_TSM_ON_TCS + ts_start = hDirAC->block_grouping[block]; + ts_end = hDirAC->block_grouping[block + 1]; +#endif for ( b = band_start; b < band_end; b++ ) { +#ifdef JBM_TSM_ON_TCS + tmp_write_idx_band = tmp_write_idx_param_band; +#endif hDirAC->spreadCoherence[block][b] = 0.0f; hDirAC->surroundingCoherence[block][b] = 0.0f; +#ifdef JBM_TSM_ON_TCS + if ( hDirAC->hConfig->dec_param_estim == FALSE ) + { + hDirAC->elevation[tmp_write_idx_band][b] = 0; + hDirAC->azimuth[tmp_write_idx_band][b] = 0; + hDirAC->diffuseness_vector[tmp_write_idx_band][b] = 0.f; + + hDirAC->spreadCoherence[tmp_write_idx_band][b] = 0.0f; + hDirAC->surroundingCoherence[tmp_write_idx_band][b] = 0.0f; + hDirAC->energy_ratio1[tmp_write_idx_band][b] = 0; + tmp_write_idx_band = ( tmp_write_idx_band + 1 ) % hDirAC->dirac_md_buffer_length; + } + else + { + for ( ts = ts_start; ts < ts_end; ts++ ) + { + hDirAC->elevation[tmp_write_idx_band][b] = 0; + hDirAC->azimuth[tmp_write_idx_band][b] = 0; +#if 0 + hDirAC->diffuseness_vector[tmp_write_idx_band][b] = 0.f; +#endif + hDirAC->spreadCoherence[tmp_write_idx_band][b] = 0.0f; + hDirAC->surroundingCoherence[tmp_write_idx_band][b] = 0.0f; + hDirAC->energy_ratio1[tmp_write_idx_band][b] = 0; + tmp_write_idx_band = ( tmp_write_idx_band + 1 ) % hDirAC->dirac_md_buffer_length; + } + } +#endif } } } /* Bands with spatial data transmitted */ - - for ( band = start_band; band < nbands; band++ ) + if ( hodirac_flag ) { - band_start = band_grouping[band]; - band_end = band_grouping[band + 1]; - tmp_write_idx_param_band = hDirAC->dirac_bs_md_write_idx; - - if ( sba_mode == SBA_MODE_SPAR ) - { - qBand_idx = dirac_to_spar_md_bands[band] - start_band; - } - else - { - qBand_idx = band; - } - diffuseness = 1.0f - q_direction->band_data[qBand_idx].energy_ratio[0]; -#ifdef DEBUG_MODE_DIRAC - dbgwrite( &diffuseness, sizeof( float ), 1, 1, "./res/dirac_dec_diffuseness.dat" ); -#endif - diff_idx = q_direction->band_data[qBand_idx].energy_ratio_index[0]; + no_secs = DIRAC_HO_NUMSECTORS; + } - for ( block = 0; block < hDirAC->nb_subframes; block++ ) + for ( idx_sec = 0; idx_sec < no_secs; idx_sec++ ) + { + for ( band = start_band; band < nbands; band++ ) { - int16_t block_qmetadata; - - ts_start = hDirAC->block_grouping[block]; - ts_end = hDirAC->block_grouping[block + 1]; - - block_qmetadata = min( block, nblocks - 1 ); - block_qmetadata = max( block_qmetadata, 0 ); + band_start = band_grouping[band]; + band_end = band_grouping[band + 1]; + tmp_write_idx_param_band = hDirAC->dirac_bs_md_write_idx; - if ( q_direction->band_data[qBand_idx].azimuth[block_qmetadata] < 0.f ) + if ( sba_mode == SBA_MODE_SPAR ) { - q_direction->band_data[qBand_idx].azimuth[block_qmetadata] += 360.f; + qBand_idx = dirac_to_spar_md_bands[band] - start_band; } - azimuth = q_direction->band_data[qBand_idx].azimuth[block_qmetadata]; - elevation = q_direction->band_data[qBand_idx].elevation[block_qmetadata]; + else + { + qBand_idx = band; + } + diffuseness = 1.0f - q_direction->band_data[qBand_idx].energy_ratio[0]; +#ifdef DEBUG_MODE_DIRAC + dbgwrite( &diffuseness, sizeof( float ), 1, 1, "./res/dirac_dec_diffuseness.dat" ); +#endif + diff_idx = q_direction->band_data[qBand_idx].energy_ratio_index[0]; - for ( b = band_start; b < band_end; b++ ) +#ifdef JBM_TSM_ON_TCS + for ( block = 0; block < MAX_PARAM_SPATIAL_SUBFRAMES; block++ ) +#else + for ( block = 0; block < hDirAC->nb_subframes; block++ ) +#endif { - tmp_write_idx_band = tmp_write_idx_param_band; - azi = (int16_t) ( azimuth + rand_triangular_signed( seed_ptr ) * dirac_dithering_azi_scale[diff_idx] + 0.5f ); - ele = (int16_t) ( elevation + rand_triangular_signed( seed_ptr ) * dirac_dithering_ele_scale[diff_idx] + 0.5f ); - /* limit the elevation to [-90, 90] */ - ele = min( 90, ele ); - ele = max( -90, ele ); + int16_t block_qmetadata; - if ( ivas_total_brate > IVAS_SID_5k2 && q_direction->coherence_band_data != NULL ) - { - hDirAC->spreadCoherence[tmp_write_idx_band][b] = q_direction->coherence_band_data[qBand_idx].spread_coherence[block] / 255.0f; - } - else + ts_start = hDirAC->block_grouping[block]; + ts_end = hDirAC->block_grouping[block + 1]; + + block_qmetadata = min( block, nblocks - 1 ); + block_qmetadata = max( block_qmetadata, 0 ); + + if ( q_direction[idx_sec].band_data[qBand_idx].azimuth[block_qmetadata] < 0.f ) { - hDirAC->spreadCoherence[tmp_write_idx_band][b] = 0.0f; + q_direction[idx_sec].band_data[qBand_idx].azimuth[block_qmetadata] += 360.f; } - if ( ivas_total_brate > IVAS_SID_5k2 && q_direction->coherence_band_data != NULL ) + if ( hMasa == NULL && hodirac_flag ) { - hDirAC->surroundingCoherence[tmp_write_idx_band][b] = hQMetaData->surcoh_band_data[qBand_idx].surround_coherence[0] / 255.0f; + azimuth = q_direction[idx_sec].band_data[qBand_idx].azimuth[block_qmetadata]; + elevation = q_direction[idx_sec].band_data[qBand_idx].elevation[block_qmetadata]; + diffuseness = 1.f - q_direction[0].band_data[qBand_idx].energy_ratio[block_qmetadata]; + diffuseness_sec = q_direction[1].band_data[qBand_idx].energy_ratio[block_qmetadata]; + assert( diffuseness_sec < 1.0001f && diffuseness_sec > -0.0001f ); } else { - hDirAC->surroundingCoherence[tmp_write_idx_band][b] = 0.0f; + azimuth = q_direction->band_data[qBand_idx].azimuth[block_qmetadata]; + elevation = q_direction->band_data[qBand_idx].elevation[block_qmetadata]; } - hDirAC->energy_ratio1[tmp_write_idx_band][b] = q_direction->band_data[qBand_idx].energy_ratio[0]; - - if ( hDirAC->hConfig->dec_param_estim == FALSE ) - { - hDirAC->elevation[tmp_write_idx_band][b] = ele; - hDirAC->azimuth[tmp_write_idx_band][b] = azi; - hDirAC->diffuseness_vector[tmp_write_idx_band][b] = diffuseness; - } - else + for ( b = band_start; b < band_end; b++ ) { - for ( ts = ts_start; ts < ts_end; ts++ ) + tmp_write_idx_band = tmp_write_idx_param_band; + + if ( hodirac_flag ) { - hDirAC->elevation[tmp_write_idx_band][b] = ele; - hDirAC->azimuth[tmp_write_idx_band][b] = azi; - hDirAC->diffuseness_vector[tmp_write_idx_band][b] = diffuseness; - tmp_write_idx_band = ( tmp_write_idx_band + 1 ) % hDirAC->dirac_md_buffer_length; + azi = (int16_t) ( azimuth + 0.5f ); + ele = (int16_t) ( elevation + 0.5f ); + } + else + { + azi = (int16_t) ( azimuth + rand_triangular_signed( seed_ptr ) * dirac_dithering_azi_scale[diff_idx] + 0.5f ); + ele = (int16_t) ( elevation + rand_triangular_signed( seed_ptr ) * dirac_dithering_ele_scale[diff_idx] + 0.5f ); + /* limit the elevation to [-90, 90] */ + ele = min( 90, ele ); + ele = max( -90, ele ); } - } - } /* for ( band = ...) */ - tmp_write_idx_param_band = ( tmp_write_idx_param_band + num_slots_in_subfr ) % hDirAC->dirac_md_buffer_length; - } /* for ( block =...) */ - } -#ifdef DEBUG_MODE_DIRAC - { - for ( block = 0; block < hDirAC->nb_subframes; block++ ) - { - int16_t block_qmetadata; + if ( ivas_total_brate > IVAS_SID_5k2 && q_direction->coherence_band_data != NULL ) + { + hDirAC->spreadCoherence[tmp_write_idx_band][b] = q_direction->coherence_band_data[qBand_idx].spread_coherence[block] / 255.0f; + } + else + { + hDirAC->spreadCoherence[tmp_write_idx_band][b] = 0.0f; + } - block_qmetadata = min( block, nblocks - 1 ); - block_qmetadata = max( block_qmetadata, 0 ); - for ( band = start_band; band < nbands; band++ ) - { - dbgwrite( &q_direction->band_data[band].azimuth[block_qmetadata], sizeof( float ), 1, 1, "./res/dirac_dec_azi.dat" ); - dbgwrite( &q_direction->band_data[band].elevation[block_qmetadata], sizeof( float ), 1, 1, "./res/dirac_dec_ele.dat" ); - } - } - } -#endif + if ( ivas_total_brate > IVAS_SID_5k2 && q_direction->coherence_band_data != NULL ) + { + hDirAC->surroundingCoherence[tmp_write_idx_band][b] = hQMetaData->surcoh_band_data[qBand_idx].surround_coherence[0] / 255.0f; + } + else + { + hDirAC->surroundingCoherence[tmp_write_idx_band][b] = 0.0f; + } + + hDirAC->energy_ratio1[tmp_write_idx_band][b] = q_direction->band_data[qBand_idx].energy_ratio[0]; + + if ( hDirAC->hConfig->dec_param_estim == FALSE ) + { + + hDirAC->diffuseness_vector[tmp_write_idx_band][b] = diffuseness; + + if ( hodirac_flag ) + { + if ( idx_sec == 0 ) + { + hDirAC->elevation[tmp_write_idx_band][b] = ele; + hDirAC->azimuth[tmp_write_idx_band][b] = azi; + hDirAC->energy_ratio1[tmp_write_idx_band][b] = 0.f; // not in use + } + else + { + assert( idx_sec == 1 ); + hDirAC->elevation2[tmp_write_idx_band][b] = ele; + hDirAC->azimuth2[tmp_write_idx_band][b] = azi; + hDirAC->energy_ratio2[tmp_write_idx_band][b] = 1.f - diffuseness_sec; + } + } + else + { + hDirAC->elevation[tmp_write_idx_band][b] = ele; + hDirAC->azimuth[tmp_write_idx_band][b] = azi; + } + } + else + { + for ( ts = ts_start; ts < ts_end; ts++ ) + { + hDirAC->elevation[tmp_write_idx_band][b] = ele; + hDirAC->azimuth[tmp_write_idx_band][b] = azi; + hDirAC->diffuseness_vector[tmp_write_idx_band][b] = diffuseness; + tmp_write_idx_band = ( tmp_write_idx_band + 1 ) % hDirAC->dirac_md_buffer_length; + } + } + } + + tmp_write_idx_param_band = ( tmp_write_idx_param_band + num_slots_in_subfr ) % hDirAC->dirac_md_buffer_length; + + } /* for ( block =...) */ + } /* for ( band = ...) */ + } /* for ( idx_sec = ...)*/ /* Bands not transmitted -> zeroed*/ for ( b = band_grouping[band]; b < hDirAC->num_freq_bands; b++ ) { tmp_write_idx_band = hDirAC->dirac_bs_md_write_idx; +#ifdef JBM_TSM_ON_TCS + for ( block = 0; block < MAX_PARAM_SPATIAL_SUBFRAMES; block++ ) +#else for ( block = 0; block < hDirAC->nb_subframes; block++ ) +#endif { ts_start = hDirAC->block_grouping[block]; ts_end = hDirAC->block_grouping[block + 1]; @@ -2041,6 +2272,11 @@ void ivas_qmetadata_to_dirac( hDirAC->elevation[tmp_write_idx_band][b] = 0; hDirAC->azimuth[tmp_write_idx_band][b] = 0; hDirAC->diffuseness_vector[tmp_write_idx_band][b] = 0.f; +#ifdef JBM_TSM_ON_TCS + hDirAC->spreadCoherence[tmp_write_idx_band][b] = 0.0f; + hDirAC->surroundingCoherence[tmp_write_idx_band][b] = 0.0f; + hDirAC->energy_ratio1[tmp_write_idx_band][b] = 0; +#endif tmp_write_idx_band = ( tmp_write_idx_band + 1 ) % hDirAC->dirac_md_buffer_length; } else @@ -2050,6 +2286,11 @@ void ivas_qmetadata_to_dirac( hDirAC->elevation[tmp_write_idx_band][b] = 0; hDirAC->azimuth[tmp_write_idx_band][b] = 0; hDirAC->diffuseness_vector[tmp_write_idx_band][b] = 0.f; +#ifdef JBM_TSM_ON_TCS + hDirAC->spreadCoherence[tmp_write_idx_band][b] = 0.0f; + hDirAC->surroundingCoherence[tmp_write_idx_band][b] = 0.0f; + hDirAC->energy_ratio1[tmp_write_idx_band][b] = 0; +#endif tmp_write_idx_band = ( tmp_write_idx_band + 1 ) % hDirAC->dirac_md_buffer_length; } } @@ -2071,19 +2312,222 @@ void ivas_qmetadata_to_dirac( } +#ifdef JBM_TSM_ON_TCS +/*------------------------------------------------------------------------- + * ivas_dirac_dec_set_md_map() + * + * Set metadata index mapping for DirAC + *------------------------------------------------------------------------*/ +void ivas_dirac_dec_set_md_map( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + int16_t nCldfbTs ) +{ + int16_t num_slots_in_subfr; + DIRAC_DEC_HANDLE hDirAC; + + hDirAC = st_ivas->hDirAC; +#ifdef DEBUGGING + assert( hDirAC ); +#endif + + /* adapt subframes */ + hDirAC->num_slots = nCldfbTs; + hDirAC->slots_rendered = 0; + if ( hDirAC->hParamIsm != NULL || hDirAC->hConfig->dec_param_estim == 0 ) + { + num_slots_in_subfr = CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES; + } + else + { + num_slots_in_subfr = 1; + } + hDirAC->subframes_rendered = 0; + + ivas_jbm_dec_get_adapted_subframes( nCldfbTs, hDirAC->subframe_nbslots, &hDirAC->nb_subframes ); + + /* set mapping according to dirac_read_idx */ + + set_s( hDirAC->render_to_md_map, 0, MAX_JBM_SUBFRAMES_5MS * JBM_CLDFB_SLOTS_IN_SUBFRAME ); + + if ( hDirAC->hConfig == NULL || hDirAC->hConfig->dec_param_estim == 0 ) + { + ivas_jbm_dec_get_md_map( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbTs, num_slots_in_subfr, 0, hDirAC->dirac_md_buffer_length, hDirAC->render_to_md_map ); + } + else + { + ivas_jbm_dec_get_md_map( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbTs, num_slots_in_subfr, hDirAC->dirac_read_idx, hDirAC->dirac_md_buffer_length, hDirAC->render_to_md_map ); + } + + if ( hDirAC->hConfig == NULL || hDirAC->hConfig->dec_param_estim == 0 ) + { + float tmp; + int16_t sf_idx, slot_idx, slot_idx_abs; + slot_idx_abs = 0; + for ( sf_idx = 0; sf_idx < hDirAC->nb_subframes; sf_idx++ ) + { + tmp = 0.0f; + for ( slot_idx = 0; slot_idx < hDirAC->subframe_nbslots[sf_idx]; slot_idx++ ) + { + tmp += (float) hDirAC->render_to_md_map[slot_idx_abs]; + slot_idx_abs++; + } + hDirAC->render_to_md_map[sf_idx] = ( (int16_t) roundf( tmp / (float) hDirAC->subframe_nbslots[sf_idx] ) + hDirAC->dirac_read_idx ) % hDirAC->dirac_md_buffer_length; + } + set_s( &hDirAC->render_to_md_map[hDirAC->nb_subframes], 0, MAX_JBM_SUBFRAMES_5MS * JBM_CLDFB_SLOTS_IN_SUBFRAME - hDirAC->nb_subframes ); + } + + return; +} + /*------------------------------------------------------------------------- * ivas_dirac_dec() * * DirAC decoding process *------------------------------------------------------------------------*/ +void ivas_dirac_dec( + 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 */ +) +{ + int16_t subframe_idx; + float *output_f_local[MAX_OUTPUT_CHANNELS]; + float cng_td_buffer[L_FRAME16k]; + int16_t nchan_out, n, n_samples_sf; + nchan_out = st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe; + + n_samples_sf = JBM_CLDFB_SLOTS_IN_SUBFRAME * st_ivas->hDirAC->slot_size; + + for ( n = 0; n < nchan_out; n++ ) + { + output_f_local[n] = &output_f[n][0]; + } + for ( n = 0; n < nchan_transport; n++ ) + { + st_ivas->hTcBuffer->tc[n] = output_f[n]; + } + if ( st_ivas->nchan_transport == 1 && st_ivas->hSCE[0]->hCoreCoder[0] != NULL && st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag && st_ivas->sba_mode != SBA_MODE_SPAR ) + { + Decoder_State *st = st_ivas->hSCE[0]->hCoreCoder[0]; + st_ivas->hTcBuffer->tc[nchan_transport] = &cng_td_buffer[0]; + generate_masking_noise_lb_dirac( st->hFdCngDec->hFdCngCom, st_ivas->hTcBuffer->tc[1], DEFAULT_JBM_CLDFB_TIMESLOTS, st->cna_dirac_flag && st->flag_cna ); + } + ivas_dirac_dec_set_md_map( st_ivas, DEFAULT_JBM_CLDFB_TIMESLOTS ); + for ( subframe_idx = 0; subframe_idx < MAX_PARAM_SPATIAL_SUBFRAMES; subframe_idx++ ) + { + ivas_dirac_dec_render_sf( st_ivas, output_f_local, nchan_transport, NULL, NULL ); + for ( n = 0; n < nchan_out; n++ ) + { + output_f_local[n] += n_samples_sf; + } + } + if ( st_ivas->hDirAC->hConfig->dec_param_estim == 1 ) + { + st_ivas->hDirAC->dirac_read_idx = ( st_ivas->hDirAC->dirac_read_idx + DEFAULT_JBM_CLDFB_TIMESLOTS ) % st_ivas->hDirAC->dirac_md_buffer_length; + } + else + { + st_ivas->hDirAC->dirac_read_idx = ( st_ivas->hDirAC->dirac_read_idx + DEFAULT_JBM_SUBFRAMES_5MS ) % st_ivas->hDirAC->dirac_md_buffer_length; + } + for ( n = 0; n < nchan_transport; n++ ) + { + st_ivas->hTcBuffer->tc[n] = NULL; + } + if ( st_ivas->nchan_transport == 1 && st_ivas->hSCE[0]->hCoreCoder[0] != NULL && st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag && st_ivas->sba_mode != SBA_MODE_SPAR ) + { + st_ivas->hTcBuffer->tc[nchan_transport] = NULL; + } + + return; +} + +void ivas_dirac_dec_render( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + const int16_t nchan_transport, /* i : number of transport channels */ + const uint16_t nSamplesAsked, /* i : number of CLDFB slots requested */ + uint16_t *nSamplesRendered, /* o : number of CLDFB slots rendered */ + uint16_t *nSamplesAvailable, /* o : number of CLDFB slots still to render */ + float *output_f[] /* o : rendered time signal */ +) +{ + int16_t slots_to_render, first_sf, last_sf, subframe_idx; + uint16_t slot_size, n_samples_sf, ch, nchan_intern; + DIRAC_DEC_HANDLE hDirAC; + float *output_f_local[MAX_OUTPUT_CHANNELS]; + + hDirAC = st_ivas->hDirAC; + nchan_intern = st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe; +#ifdef DEBUGGING + assert( hDirAC ); +#endif + for ( ch = 0; ch < nchan_intern; ch++ ) + { + output_f_local[ch] = output_f[ch]; + } + slot_size = NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ); + /* loop for synthesis, assume we always have to render in multiples of 5ms subframes with spills */ + slots_to_render = min( hDirAC->num_slots - hDirAC->slots_rendered, nSamplesAsked / slot_size ); + *nSamplesRendered = slots_to_render * slot_size; + first_sf = hDirAC->subframes_rendered; + last_sf = first_sf; + while ( slots_to_render > 0 ) + { + slots_to_render -= hDirAC->subframe_nbslots[last_sf]; + last_sf++; + } +#ifdef DEBUGGING + assert( slots_to_render == 0 ); +#endif + for ( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ ) + { + ivas_dirac_dec_render_sf( st_ivas, output_f_local, nchan_transport, NULL, NULL ); + n_samples_sf = hDirAC->subframe_nbslots[subframe_idx] * st_ivas->hDirAC->slot_size; + for ( ch = 0; ch < nchan_intern; ch++ ) + { + output_f_local[ch] += n_samples_sf; + } + } + if ( hDirAC->slots_rendered == hDirAC->num_slots ) + { + if ( st_ivas->hDirAC->hConfig->dec_param_estim == 1 ) + { + st_ivas->hDirAC->dirac_read_idx = ( st_ivas->hDirAC->dirac_read_idx + DEFAULT_JBM_CLDFB_TIMESLOTS ) % st_ivas->hDirAC->dirac_md_buffer_length; + } + else + { + st_ivas->hDirAC->dirac_read_idx = ( st_ivas->hDirAC->dirac_read_idx + DEFAULT_JBM_SUBFRAMES_5MS ) % st_ivas->hDirAC->dirac_md_buffer_length; + } + } + *nSamplesAvailable = ( hDirAC->num_slots - hDirAC->slots_rendered ) * slot_size; + return; +} +#endif + +/*------------------------------------------------------------------------- + * ivas_dirac_dec() + * + * DirAC decoding process + *------------------------------------------------------------------------*/ +#ifndef JBM_TSM_ON_TCS void ivas_dirac_dec( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - float output_f[][L_FRAME48k], /* i/o: synthesized core-coder transport channels/DirAC output */ +#else +void ivas_dirac_dec_render_sf( +#endif + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ +#ifdef JBM_TSM_ON_TCS + float *output_f[], /* i/o: synthesized core-coder transport channels/DirAC output */ +#else + float output_f[][L_FRAME48k], /* i/o: synthesized core-coder transport channels/DirAC output */ +#endif const int16_t nchan_transport, /* i : number of transport channels */ float *pppQMfFrame_ts_re[IVAS_MAX_FB_MIXER_IN_CH][CLDFB_NO_COL_MAX], - float *pppQMfFrame_ts_im[IVAS_MAX_FB_MIXER_IN_CH][CLDFB_NO_COL_MAX], - const int16_t i_sf ) + float *pppQMfFrame_ts_im[IVAS_MAX_FB_MIXER_IN_CH][CLDFB_NO_COL_MAX] +#ifndef JBM_TSM_ON_TCS + , + const int16_t i_sf +#endif +) { int16_t i, ch, idx_in, idx_lfe; DIRAC_DEC_HANDLE hDirAC; @@ -2091,9 +2535,15 @@ void ivas_dirac_dec( float surCohEner; float surCohRatio[CLDFB_NO_CHANNELS_MAX]; int16_t subframe_idx; +#ifndef JBM_TSM_ON_TCS int16_t sf1, sf2; +#endif int16_t slot_idx, index_slot; + int16_t hodirac_flag; float *p_Rmat; +#ifdef JBM_TSM_ON_TCS + int16_t slot_idx_start, slot_idx_start_cldfb_synth, md_idx; +#endif /*CLDFB: last output channels reserved to LFT for CICPx*/ float Cldfb_RealBuffer[MAX_OUTPUT_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX]; @@ -2102,12 +2552,23 @@ void ivas_dirac_dec( float Cldfb_ImagBuffer_Binaural[BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX]; int16_t index, num_freq_bands; +#ifdef JBM_TSM_ON_TCS + /* local copies of azi, ele, diffuseness */ + int16_t azimuth[JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX]; + int16_t elevation[JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX]; + float diffuseness_vector[JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX]; +#endif + DIRAC_DEC_STACK_MEM DirAC_mem; float *reference_power, *reference_power_smooth; float *onset_filter, *onset_filter_subframe, *p_onset_filter = NULL; uint16_t coherence_flag; +#ifndef JBM_TSM_ON_TCS push_wmops( "ivas_dirac_dec" ); +#else + push_wmops( "ivas_dirac_dec_render" ); +#endif /* Initialize aux buffers */ hDirAC = st_ivas->hDirAC; @@ -2119,6 +2580,8 @@ void ivas_dirac_dec( onset_filter = DirAC_mem.onset_filter; onset_filter_subframe = DirAC_mem.onset_filter + hDirAC->num_freq_bands; + hodirac_flag = ivas_get_hodirac_flag( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->sba_analysis_order ); + if ( st_ivas->hQMetaData != NULL && st_ivas->sba_mode != SBA_MODE_SPAR ) { coherence_flag = st_ivas->hQMetaData->coherence_flag; @@ -2147,7 +2610,7 @@ void ivas_dirac_dec( #endif /* Subframe loop */ - +#ifndef JBM_TSM_ON_TCS if ( i_sf == -1 ) { sf1 = 0; @@ -2158,629 +2621,958 @@ void ivas_dirac_dec( sf1 = i_sf; sf2 = i_sf + 1; } +#endif +#ifdef JBM_TSM_ON_TCS + slot_idx_start = hDirAC->slots_rendered; + slot_idx_start_cldfb_synth = 0; +#endif +#ifdef JBM_TSM_ON_TCS + subframe_idx = hDirAC->subframes_rendered; +#else for ( subframe_idx = sf1; subframe_idx < sf2; subframe_idx++ ) { - if ( hDirAC->synthesisConf != DIRAC_SYNTHESIS_GAIN_SHD ) +#endif +#ifdef JBM_TSM_ON_TCS + if ( hDirAC->hConfig->dec_param_estim == FALSE ) + { + md_idx = hDirAC->render_to_md_map[subframe_idx]; + } + else + { + md_idx = hDirAC->render_to_md_map[slot_idx_start]; + } +#endif +#ifdef JBM_TSM_ON_TCS + /* Another workaround for self test BE */ +#ifndef FIX_642 + if ( st_ivas->hHeadTrackData && st_ivas->hDecoderConfig->voip_active == 0 ) + { + QuatToRotMat( st_ivas->hHeadTrackData->Quaternions[st_ivas->hHeadTrackData->num_quaternions++], st_ivas->hHeadTrackData->Rmat ); + + p_Rmat = &st_ivas->hHeadTrackData->Rmat[0][0]; + + if ( st_ivas->hHeadTrackData->shd_rot_max_order == 0 ) { - set_zero( reference_power_smooth, hDirAC->num_freq_bands ); + num_freq_bands = hDirAC->band_grouping[hDirAC->hConfig->enc_param_start_band]; + for ( slot_idx = 0; slot_idx < hDirAC->subframe_nbslots[subframe_idx]; slot_idx++ ) + { + index_slot = slot_idx_start + slot_idx; + rotateAziEle_DirAC( hDirAC->azimuth[index_slot], hDirAC->elevation[index_slot], num_freq_bands, hDirAC->num_freq_bands, p_Rmat ); + } } - else + } + else + { + p_Rmat = 0; + } +#endif + + /* copy parameters into local buffers*/ + + if ( hDirAC->hConfig->dec_param_estim == TRUE ) + { + for ( slot_idx = 0; slot_idx < hDirAC->subframe_nbslots[subframe_idx]; slot_idx++ ) + { + mvs2s( hDirAC->azimuth[hDirAC->render_to_md_map[slot_idx + slot_idx_start]], azimuth[slot_idx], hDirAC->num_freq_bands ); + mvs2s( hDirAC->elevation[hDirAC->render_to_md_map[slot_idx + slot_idx_start]], elevation[slot_idx], hDirAC->num_freq_bands ); + mvr2r( hDirAC->diffuseness_vector[hDirAC->render_to_md_map[slot_idx + slot_idx_start]], diffuseness_vector[slot_idx], hDirAC->num_freq_bands ); + } + } + else + { + for ( slot_idx = 0; slot_idx < hDirAC->subframe_nbslots[subframe_idx]; slot_idx++ ) { - set_zero( onset_filter_subframe, hDirAC->num_freq_bands ); + mvs2s( hDirAC->azimuth[hDirAC->render_to_md_map[subframe_idx]], azimuth[slot_idx], hDirAC->num_freq_bands ); + mvs2s( hDirAC->elevation[hDirAC->render_to_md_map[subframe_idx]], elevation[slot_idx], hDirAC->num_freq_bands ); + mvr2r( hDirAC->diffuseness_vector[hDirAC->render_to_md_map[subframe_idx]], diffuseness_vector[slot_idx], hDirAC->num_freq_bands ); } + } + +#endif + + if ( hDirAC->synthesisConf != DIRAC_SYNTHESIS_GAIN_SHD ) + { + set_zero( reference_power_smooth, hDirAC->num_freq_bands ); + } + else + { + set_zero( onset_filter_subframe, hDirAC->num_freq_bands ); + } +#ifdef JBM_TSM_ON_TCS + if ( st_ivas->hHeadTrackData +#ifndef FIX_642 + && st_ivas->hDecoderConfig->voip_active == 1 +#endif + ) +#else if ( st_ivas->hHeadTrackData ) - { - QuatToRotMat( st_ivas->hHeadTrackData->Quaternions[st_ivas->hHeadTrackData->num_quaternions++], st_ivas->hHeadTrackData->Rmat ); +#endif + { + QuatToRotMat( st_ivas->hHeadTrackData->Quaternions[st_ivas->hHeadTrackData->num_quaternions++], st_ivas->hHeadTrackData->Rmat ); - p_Rmat = &st_ivas->hHeadTrackData->Rmat[0][0]; + p_Rmat = &st_ivas->hHeadTrackData->Rmat[0][0]; - if ( st_ivas->hHeadTrackData->shd_rot_max_order == 0 ) - { - num_freq_bands = hDirAC->band_grouping[hDirAC->hConfig->enc_param_start_band]; + if ( st_ivas->hHeadTrackData->shd_rot_max_order == 0 ) + { + num_freq_bands = hDirAC->band_grouping[hDirAC->hConfig->enc_param_start_band]; +#ifdef JBM_TSM_ON_TCS + for ( slot_idx = 0; slot_idx < hDirAC->subframe_nbslots[subframe_idx]; slot_idx++ ) +#else for ( slot_idx = 0; slot_idx < hDirAC->subframe_nbslots; slot_idx++ ) - { +#endif + { +#ifdef JBM_TSM_ON_TCS + rotateAziEle_DirAC( azimuth[slot_idx], elevation[slot_idx], num_freq_bands, hDirAC->num_freq_bands, p_Rmat ); +#else + /* note, this seems wrong since it does not take the dirac read ptr into account */ 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 ); - } +#endif } } + } +#if defined( JBM_TSM_ON_TCS ) & !defined( FIX_642 ) + else if ( !st_ivas->hHeadTrackData ) +#else else - { - p_Rmat = 0; - } +#endif + { + p_Rmat = 0; + } - if ( hDirAC->hConfig->dec_param_estim == FALSE ) + if ( hDirAC->hConfig->dec_param_estim == FALSE ) + { + + /* compute response */ + if ( hDirAC->synthesisConf != DIRAC_SYNTHESIS_GAIN_SHD ) { - /* compute response */ - if ( hDirAC->synthesisConf != DIRAC_SYNTHESIS_GAIN_SHD ) - { - ivas_dirac_dec_compute_power_factors( hDirAC->num_freq_bands, + ivas_dirac_dec_compute_power_factors( hDirAC->num_freq_bands, +#ifdef JBM_TSM_ON_TCS + diffuseness_vector[0], +#else hDirAC->diffuseness_vector[hDirAC->dirac_read_idx], - hDirAC->h_output_synthesis_psd_params.max_band_decorr, - hDirAC->h_output_synthesis_psd_state.direct_power_factor, - hDirAC->h_output_synthesis_psd_state.diffuse_power_factor ); +#endif + hDirAC->h_output_synthesis_psd_params.max_band_decorr, + hDirAC->h_output_synthesis_psd_state.direct_power_factor, + hDirAC->h_output_synthesis_psd_state.diffuse_power_factor ); - if ( coherence_flag ) + if ( coherence_flag ) + { + for ( i = 0; i < hDirAC->num_freq_bands; i++ ) { - 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]; - hDirAC->h_output_synthesis_psd_state.diffuse_power_factor[i] -= surCohEner; - hDirAC->h_output_synthesis_psd_state.direct_power_factor[i] += surCohEner; + dirEne = hDirAC->h_output_synthesis_psd_state.direct_power_factor[i]; +#ifdef JBM_TSM_ON_TCS + surCohEner = hDirAC->h_output_synthesis_psd_state.diffuse_power_factor[i] * hDirAC->surroundingCoherence[md_idx][i]; +#else + surCohEner = hDirAC->h_output_synthesis_psd_state.diffuse_power_factor[i] * hDirAC->surroundingCoherence[hDirAC->dirac_read_idx][i]; +#endif + hDirAC->h_output_synthesis_psd_state.diffuse_power_factor[i] -= surCohEner; + hDirAC->h_output_synthesis_psd_state.direct_power_factor[i] += surCohEner; - surCohRatio[i] = surCohEner / ( 1e-12f + dirEne + surCohEner ); - } - } - else - { - set_zero( surCohRatio, hDirAC->num_freq_bands ); + surCohRatio[i] = surCohEner / ( 1e-12f + dirEne + surCohEner ); } } else { - ivas_dirac_dec_compute_gain_factors( hDirAC->num_freq_bands, + set_zero( surCohRatio, hDirAC->num_freq_bands ); + } + } + else + { + ivas_dirac_dec_compute_gain_factors( hDirAC->num_freq_bands, +#ifdef JBM_TSM_ON_TCS + hDirAC->diffuseness_vector[md_idx], +#else hDirAC->diffuseness_vector[hDirAC->dirac_read_idx], - hDirAC->h_output_synthesis_psd_params.max_band_decorr, - hDirAC->h_output_synthesis_psd_state.direct_power_factor, - hDirAC->h_output_synthesis_psd_state.diffuse_power_factor ); +#endif + hDirAC->h_output_synthesis_psd_params.max_band_decorr, + hDirAC->h_output_synthesis_psd_state.direct_power_factor, + hDirAC->h_output_synthesis_psd_state.diffuse_power_factor ); - if ( coherence_flag ) + if ( coherence_flag ) + { + for ( i = 0; i < hDirAC->num_freq_bands; i++ ) { - for ( i = 0; i < hDirAC->num_freq_bands; i++ ) - { +#ifdef JBM_TSM_ON_TCS + surCohRatio[i] = hDirAC->surroundingCoherence[md_idx][i]; +#else surCohRatio[i] = hDirAC->surroundingCoherence[hDirAC->dirac_read_idx][i]; - } - } - else - { - set_zero( surCohRatio, hDirAC->num_freq_bands ); +#endif } } - - if ( st_ivas->hDecoderConfig->Opt_Headrotation && st_ivas->hHeadTrackData->shd_rot_max_order == 1 ) - { - 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 ); - } else { - ivas_dirac_dec_compute_directional_responses( hDirAC, - st_ivas->hVBAPdata, - st_ivas->hMasa, - subframe_idx, - subframe_idx, - surCohRatio, - 0, - 0 ); + set_zero( surCohRatio, hDirAC->num_freq_bands ); } } + + if ( st_ivas->hDecoderConfig->Opt_Headrotation && st_ivas->hHeadTrackData->shd_rot_max_order == 1 ) + { + ivas_dirac_dec_compute_directional_responses( hDirAC, + st_ivas->hVBAPdata, + st_ivas->hMasa, +#ifdef JBM_TSM_ON_TCS + hDirAC->azimuth[md_idx], + hDirAC->elevation[md_idx], + md_idx, +#endif + surCohRatio, + st_ivas->hHeadTrackData->shd_rot_max_order, + p_Rmat, + hodirac_flag ); + } + else + { + ivas_dirac_dec_compute_directional_responses( hDirAC, + st_ivas->hVBAPdata, + st_ivas->hMasa, +#ifdef JBM_TSM_ON_TCS + hDirAC->azimuth[md_idx], + hDirAC->elevation[md_idx], + md_idx, +#endif + surCohRatio, + 0, + NULL, + hodirac_flag ); + } + } + + +#ifdef JBM_TSM_ON_TCS + for ( slot_idx = 0; slot_idx < hDirAC->subframe_nbslots[subframe_idx]; slot_idx++ ) +#else for ( slot_idx = 0; slot_idx < hDirAC->subframe_nbslots; slot_idx++ ) +#endif + { +#ifdef JBM_TSM_ON_TCS + index_slot = slot_idx_start + slot_idx; + if ( hDirAC->hConfig->dec_param_estim == TRUE ) + { + md_idx = hDirAC->render_to_md_map[index_slot]; + } + else { + md_idx = hDirAC->render_to_md_map[subframe_idx]; + } +#else index_slot = subframe_idx * hDirAC->subframe_nbslots + slot_idx; +#endif - if ( st_ivas->sba_mode == SBA_MODE_SPAR ) + if ( st_ivas->sba_mode == SBA_MODE_SPAR ) + { + for ( ch = 0; ch < nchan_transport; ch++ ) { - for ( ch = 0; ch < nchan_transport; ch++ ) - { - mvr2r( pppQMfFrame_ts_re[ch][slot_idx], Cldfb_RealBuffer[ch][0], hDirAC->num_freq_bands ); - mvr2r( pppQMfFrame_ts_im[ch][slot_idx], Cldfb_ImagBuffer[ch][0], hDirAC->num_freq_bands ); - } + mvr2r( pppQMfFrame_ts_re[ch][slot_idx], Cldfb_RealBuffer[ch][0], hDirAC->num_freq_bands ); + mvr2r( pppQMfFrame_ts_im[ch][slot_idx], Cldfb_ImagBuffer[ch][0], hDirAC->num_freq_bands ); } - else + } + else + { + /* CLDFB Analysis*/ + for ( ch = 0; ch < nchan_transport; ch++ ) { - /* CLDFB Analysis*/ - for ( ch = 0; ch < nchan_transport; ch++ ) - { - cldfbAnalysis_ts( &( output_f[sba_map_tc[ch]][hDirAC->num_freq_bands * index_slot] ), +#ifdef JBM_TSM_ON_TCS + cldfbAnalysis_ts( &( st_ivas->hTcBuffer->tc[hDirAC->sba_map_tc[ch]][hDirAC->num_freq_bands * index_slot] ), + Cldfb_RealBuffer[ch][0], + Cldfb_ImagBuffer[ch][0], + hDirAC->num_freq_bands, + st_ivas->cldfbAnaDec[ch] ); +#else + cldfbAnalysis_ts( &( output_f[hDirAC->sba_map_tc[ch]][hDirAC->num_freq_bands * index_slot] ), Cldfb_RealBuffer[ch][0], Cldfb_ImagBuffer[ch][0], hDirAC->num_freq_bands, st_ivas->cldfbAnaDec[ch] ); - } +#endif } + } - /* CNG in DirAC, extra CLDFB ana for CNA*/ - if ( st_ivas->nchan_transport == 1 && st_ivas->hSCE[0]->hCoreCoder[0] != NULL && st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag && st_ivas->sba_mode != SBA_MODE_SPAR ) - { - Decoder_State *st = st_ivas->hSCE[0]->hCoreCoder[0]; + /* CNG in DirAC, extra CLDFB ana for CNA*/ + if ( st_ivas->nchan_transport == 1 && st_ivas->hSCE[0]->hCoreCoder[0] != NULL && st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag && st_ivas->sba_mode != SBA_MODE_SPAR ) + { + Decoder_State *st = st_ivas->hSCE[0]->hCoreCoder[0]; - generate_masking_noise_dirac( st->hFdCngDec->hFdCngCom, - st_ivas->cldfbAnaDec[1], + generate_masking_noise_dirac( st->hFdCngDec->hFdCngCom, + st_ivas->cldfbAnaDec[1], +#ifdef JBM_TSM_ON_TCS + st_ivas->hTcBuffer->tc[1], +#else &( output_f[1][L_FRAME48k - L_FRAME16k] ), - Cldfb_RealBuffer[1][0], - Cldfb_ImagBuffer[1][0], - index_slot, - st->cna_dirac_flag && st->flag_cna, - ( st->core_brate == FRAME_NO_DATA || st->core_brate == SID_2k40 ) && st->cng_type == FD_CNG && st->cng_sba_flag ); - } - - /* LFE synthesis */ - if ( st_ivas->mc_mode == MC_MODE_MCMASA && !hDirAC->hOutSetup.separateChannelEnabled && !( hDirAC->hOutSetup.output_config == AUDIO_CONFIG_LS_CUSTOM && hDirAC->hOutSetup.num_lfe == 0 ) ) - { - ivas_lfe_synth_with_cldfb( st_ivas->hMasa->hMasaLfeSynth, - Cldfb_RealBuffer, Cldfb_ImagBuffer, - Cldfb_RealBuffer[MAX_OUTPUT_CHANNELS - 1], Cldfb_ImagBuffer[MAX_OUTPUT_CHANNELS - 1], - slot_idx, +#endif + Cldfb_RealBuffer[1][0], + Cldfb_ImagBuffer[1][0], + index_slot, + st->cna_dirac_flag && st->flag_cna, + ( st->core_brate == FRAME_NO_DATA || st->core_brate == SID_2k40 ) && st->cng_type == FD_CNG && st->cng_sba_flag ); + } + + /* LFE synthesis */ + if ( st_ivas->mc_mode == MC_MODE_MCMASA && !hDirAC->hOutSetup.separateChannelEnabled && !( hDirAC->hOutSetup.output_config == AUDIO_CONFIG_LS_CUSTOM && hDirAC->hOutSetup.num_lfe == 0 ) ) + { + ivas_lfe_synth_with_cldfb( st_ivas->hMasa->hMasaLfeSynth, + Cldfb_RealBuffer, Cldfb_ImagBuffer, + Cldfb_RealBuffer[MAX_OUTPUT_CHANNELS - 1], Cldfb_ImagBuffer[MAX_OUTPUT_CHANNELS - 1], + slot_idx, +#ifdef JBM_TSM_ON_TCS + md_idx, +#else subframe_idx, - nchan_transport ); - } +#endif + nchan_transport ); + } - /*-----------------------------------------------------------------* - * protoype signal computation - *-----------------------------------------------------------------*/ + /*-----------------------------------------------------------------* + * protoype signal computation + *-----------------------------------------------------------------*/ - if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) + if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) + { + if ( st_ivas->hDecoderConfig->Opt_Headrotation && st_ivas->hHeadTrackData->shd_rot_max_order == 0 ) { - if ( st_ivas->hDecoderConfig->Opt_Headrotation && st_ivas->hHeadTrackData->shd_rot_max_order == 0 ) - { - protoSignalComputation_shd( Cldfb_RealBuffer, Cldfb_ImagBuffer, - hDirAC->h_output_synthesis_psd_state.proto_direct_buffer_f, - hDirAC->h_output_synthesis_psd_state.proto_diffuse_buffer_f, - reference_power, slot_idx, nchan_transport, - hDirAC->num_outputs_diff, - hDirAC->num_freq_bands, - p_Rmat ); - } - else - { - protoSignalComputation_shd( Cldfb_RealBuffer, Cldfb_ImagBuffer, - hDirAC->h_output_synthesis_psd_state.proto_direct_buffer_f, - hDirAC->h_output_synthesis_psd_state.proto_diffuse_buffer_f, - reference_power, slot_idx, nchan_transport, - hDirAC->num_outputs_diff, - hDirAC->num_freq_bands, - 0 ); - } + protoSignalComputation_shd( Cldfb_RealBuffer, Cldfb_ImagBuffer, + hDirAC->h_output_synthesis_psd_state.proto_direct_buffer_f, + hDirAC->h_output_synthesis_psd_state.proto_diffuse_buffer_f, + reference_power, slot_idx, nchan_transport, + hDirAC->num_outputs_diff, + hDirAC->num_freq_bands, + p_Rmat ); } - else if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_MONO ) + else { - protoSignalComputation2( Cldfb_RealBuffer, Cldfb_ImagBuffer, hDirAC->proto_frame_f, - hDirAC->h_output_synthesis_psd_state.proto_direct_buffer_f, - reference_power, hDirAC->h_output_synthesis_psd_state.proto_power_smooth, - 0, slot_idx, hDirAC->num_freq_bands, hDirAC->masa_stereo_type_detect ); + protoSignalComputation_shd( Cldfb_RealBuffer, Cldfb_ImagBuffer, + hDirAC->h_output_synthesis_psd_state.proto_direct_buffer_f, + hDirAC->h_output_synthesis_psd_state.proto_diffuse_buffer_f, + reference_power, slot_idx, nchan_transport, + hDirAC->num_outputs_diff, + hDirAC->num_freq_bands, + 0 ); } - else + } + else if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_MONO ) + { + protoSignalComputation2( Cldfb_RealBuffer, Cldfb_ImagBuffer, hDirAC->proto_frame_f, + hDirAC->h_output_synthesis_psd_state.proto_direct_buffer_f, + reference_power, hDirAC->h_output_synthesis_psd_state.proto_power_smooth, + 0, slot_idx, hDirAC->num_freq_bands, hDirAC->masa_stereo_type_detect ); + } + else + { + switch ( nchan_transport ) { - switch ( nchan_transport ) - { - case 8: - case 6: - case 4: - protoSignalComputation4( Cldfb_RealBuffer, Cldfb_ImagBuffer, - hDirAC->proto_frame_f, - hDirAC->h_output_synthesis_psd_state.proto_direct_buffer_f, - reference_power, - hDirAC->h_output_synthesis_psd_state.proto_power_smooth, - slot_idx, hDirAC->num_outputs_diff, - hDirAC->num_freq_bands, - hDirAC->hoa_decoder, - nchan_transport ); - break; - case 2: - protoSignalComputation2( Cldfb_RealBuffer, Cldfb_ImagBuffer, - hDirAC->proto_frame_f, - hDirAC->h_output_synthesis_psd_state.proto_direct_buffer_f, - reference_power, - hDirAC->h_output_synthesis_psd_state.proto_power_smooth, - hDirAC->hOutSetup.is_loudspeaker_setup, - slot_idx, - hDirAC->num_freq_bands, - hDirAC->masa_stereo_type_detect ); - break; - case 1: - protoSignalComputation1( Cldfb_RealBuffer, Cldfb_ImagBuffer, - hDirAC->proto_frame_f, - hDirAC->h_output_synthesis_psd_state.proto_direct_buffer_f, - reference_power, - hDirAC->h_output_synthesis_psd_state.proto_power_smooth, - slot_idx, - hDirAC->num_protos_diff, - hDirAC->num_freq_bands ); - break; - default: - return; - } - } - - /*-----------------------------------------------------------------* - * Compute DirAC parameters at decoder side - *-----------------------------------------------------------------*/ - - if ( hDirAC->hConfig->dec_param_estim == TRUE ) - { - hDirAC->index_buffer_intensity = ( hDirAC->index_buffer_intensity % DIRAC_NO_COL_AVG_DIFF ) + 1; /* averaging_length = 32 */ - - index = hDirAC->index_buffer_intensity; - - num_freq_bands = hDirAC->band_grouping[hDirAC->hConfig->enc_param_start_band]; - - computeIntensityVector_dec( Cldfb_RealBuffer, - Cldfb_ImagBuffer, - num_freq_bands, - hDirAC->buffer_intensity_real[0][index - 1], - hDirAC->buffer_intensity_real[1][index - 1], - hDirAC->buffer_intensity_real[2][index - 1] ); - - computeDirectionAngles( hDirAC->buffer_intensity_real[0][index - 1], - hDirAC->buffer_intensity_real[1][index - 1], - hDirAC->buffer_intensity_real[2][index - 1], + case 11: + case 8: + case 6: + case 4: + protoSignalComputation4( Cldfb_RealBuffer, Cldfb_ImagBuffer, + hDirAC->proto_frame_f, + hDirAC->h_output_synthesis_psd_state.proto_direct_buffer_f, + reference_power, + hDirAC->h_output_synthesis_psd_state.proto_power_smooth, + slot_idx, hDirAC->num_outputs_diff, + hDirAC->num_freq_bands, + hDirAC->hoa_decoder, + nchan_transport, + hDirAC->sba_map_tc ); + break; + case 2: + protoSignalComputation2( Cldfb_RealBuffer, Cldfb_ImagBuffer, + hDirAC->proto_frame_f, + hDirAC->h_output_synthesis_psd_state.proto_direct_buffer_f, + reference_power, + hDirAC->h_output_synthesis_psd_state.proto_power_smooth, + hDirAC->hOutSetup.is_loudspeaker_setup, + slot_idx, + hDirAC->num_freq_bands, + hDirAC->masa_stereo_type_detect ); + break; + case 1: + protoSignalComputation1( Cldfb_RealBuffer, Cldfb_ImagBuffer, + hDirAC->proto_frame_f, + hDirAC->h_output_synthesis_psd_state.proto_direct_buffer_f, + reference_power, + hDirAC->h_output_synthesis_psd_state.proto_power_smooth, + slot_idx, + hDirAC->num_protos_diff, + hDirAC->num_freq_bands ); + break; + default: + return; + } + } + + + /*-----------------------------------------------------------------* + * Compute DirAC parameters at decoder side + *-----------------------------------------------------------------*/ + + if ( hDirAC->hConfig->dec_param_estim == TRUE ) + { + hDirAC->index_buffer_intensity = ( hDirAC->index_buffer_intensity % DIRAC_NO_COL_AVG_DIFF ) + 1; /* averaging_length = 32 */ + + index = hDirAC->index_buffer_intensity; + + num_freq_bands = hDirAC->band_grouping[hDirAC->hConfig->enc_param_start_band]; + + computeIntensityVector_dec( Cldfb_RealBuffer, + Cldfb_ImagBuffer, num_freq_bands, + hDirAC->buffer_intensity_real[0][index - 1], + hDirAC->buffer_intensity_real[1][index - 1], + hDirAC->buffer_intensity_real[2][index - 1] ); + computeDirectionAngles( hDirAC->buffer_intensity_real[0][index - 1], + hDirAC->buffer_intensity_real[1][index - 1], + hDirAC->buffer_intensity_real[2][index - 1], + num_freq_bands, +#ifdef JBM_TSM_ON_TCS + azimuth[slot_idx], + elevation[slot_idx] +#else hDirAC->azimuth[hDirAC->dirac_estimator_idx], - hDirAC->elevation[hDirAC->dirac_estimator_idx] ); + hDirAC->elevation[hDirAC->dirac_estimator_idx] +#endif + ); - mvr2r( reference_power, &( hDirAC->buffer_energy[( index - 1 ) * num_freq_bands] ), num_freq_bands ); + mvr2r( reference_power, &( hDirAC->buffer_energy[( index - 1 ) * num_freq_bands] ), num_freq_bands ); - computeDiffuseness( hDirAC->buffer_intensity_real, - hDirAC->buffer_energy, - num_freq_bands, - hDirAC->diffuseness_vector[hDirAC->dirac_estimator_idx] ); + computeDiffuseness( hDirAC->buffer_intensity_real, + hDirAC->buffer_energy, + num_freq_bands, +#ifdef JBM_TSM_ON_TCS + diffuseness_vector[slot_idx] +#else + hDirAC->diffuseness_vector[hDirAC->dirac_estimator_idx] +#endif + ); - hDirAC->dirac_estimator_idx = ( hDirAC->dirac_estimator_idx + 1 ) % hDirAC->dirac_md_buffer_length; - } +#ifndef JBM_TSM_ON_TCS + hDirAC->dirac_estimator_idx = ( hDirAC->dirac_estimator_idx + 1 ) % hDirAC->dirac_md_buffer_length; +#endif + } #ifdef DEBUG_MODE_DIRAC - { - static FILE *fp_direction_vector = NULL, *fp_diffuseness = NULL, *fp_referencePower = NULL; + { + static FILE *fp_direction_vector = NULL, *fp_diffuseness = NULL, *fp_referencePower = NULL; - if ( fp_direction_vector == NULL ) - fp_direction_vector = fopen( "./res/dbg_direction_vector_C_dec.bin", "wb" ); - if ( fp_diffuseness == NULL ) - fp_diffuseness = fopen( "./res/dbg_diffuseness_C_dec.bin", "wb" ); - if ( fp_referencePower == NULL ) - fp_referencePower = fopen( "./res/dbg_reference_power_C_dec.bin", "wb" ); + if ( fp_direction_vector == NULL ) + fp_direction_vector = fopen( "./res/dbg_direction_vector_C_dec.bin", "wb" ); + if ( fp_diffuseness == NULL ) + fp_diffuseness = fopen( "./res/dbg_diffuseness_C_dec.bin", "wb" ); + if ( fp_referencePower == NULL ) + fp_referencePower = fopen( "./res/dbg_reference_power_C_dec.bin", "wb" ); - for ( i = 0; i < hDirAC->num_freq_bands; i++ ) - { - float radius_length; - float dv[3]; + for ( i = 0; i < hDirAC->num_freq_bands; i++ ) + { + float radius_length; + float dv[3]; - if ( hDirAC->hConfig->dec_param_estim == FALSE ) - { - radius_length = cos( hDirAC->elevation[subframe_idx][i] * PI_OVER_180 ); - dv[0] = radius_length * cos( hDirAC->azimuth[subframe_idx][i] * PI_OVER_180 ); - dv[1] = radius_length * sin( hDirAC->azimuth[subframe_idx][i] * PI_OVER_180 ); - dv[2] = sin( hDirAC->elevation[subframe_idx][i] * PI_OVER_180 ); - - fwrite( dv, sizeof( float ), 3, fp_direction_vector ); - fwrite( &( hDirAC->diffuseness_vector[0][i] ), sizeof( float ), 1, fp_diffuseness ); - if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) - { - reference_power[i] = Cldfb_RealBuffer[0][0][i] * Cldfb_RealBuffer[0][0][i] + Cldfb_ImagBuffer[0][0][i] * Cldfb_ImagBuffer[0][0][i]; - } - fwrite( &( reference_power[i] ), sizeof( float ), 1, fp_referencePower ); - } - else + if ( hDirAC->hConfig->dec_param_estim == FALSE ) + { + radius_length = cos( hDirAC->elevation[subframe_idx][i] * PI_OVER_180 ); + dv[0] = radius_length * cos( hDirAC->azimuth[subframe_idx][i] * PI_OVER_180 ); + dv[1] = radius_length * sin( hDirAC->azimuth[subframe_idx][i] * PI_OVER_180 ); + dv[2] = sin( hDirAC->elevation[subframe_idx][i] * PI_OVER_180 ); + + fwrite( dv, sizeof( float ), 3, fp_direction_vector ); + fwrite( &( hDirAC->diffuseness_vector[0][i] ), sizeof( float ), 1, fp_diffuseness ); + if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) { - radius_length = cos( hDirAC->elevation[index_slot][i] * PI_OVER_180 ); - dv[0] = radius_length * cos( hDirAC->azimuth[index_slot][i] * PI_OVER_180 ); - dv[1] = radius_length * sin( hDirAC->azimuth[index_slot][i] * PI_OVER_180 ); - dv[2] = sin( hDirAC->elevation[index_slot][i] * PI_OVER_180 ); - - fwrite( dv, sizeof( float ), 3, fp_direction_vector ); - fwrite( &( hDirAC->diffuseness_vector[index_slot][i] ), sizeof( float ), 1, fp_diffuseness ); - fwrite( &( reference_power[i] ), sizeof( float ), 1, fp_referencePower ); + reference_power[i] = Cldfb_RealBuffer[0][0][i] * Cldfb_RealBuffer[0][0][i] + Cldfb_ImagBuffer[0][0][i] * Cldfb_ImagBuffer[0][0][i]; } + fwrite( &( reference_power[i] ), sizeof( float ), 1, fp_referencePower ); + } + else + { + radius_length = cos( hDirAC->elevation[index_slot][i] * PI_OVER_180 ); + dv[0] = radius_length * cos( hDirAC->azimuth[index_slot][i] * PI_OVER_180 ); + dv[1] = radius_length * sin( hDirAC->azimuth[index_slot][i] * PI_OVER_180 ); + dv[2] = sin( hDirAC->elevation[index_slot][i] * PI_OVER_180 ); + + fwrite( dv, sizeof( float ), 3, fp_direction_vector ); + fwrite( &( hDirAC->diffuseness_vector[index_slot][i] ), sizeof( float ), 1, fp_diffuseness ); + fwrite( &( reference_power[i] ), sizeof( float ), 1, fp_referencePower ); } } + } #endif - /*-----------------------------------------------------------------* - * frequency domain decorrelation - *-----------------------------------------------------------------*/ + /*-----------------------------------------------------------------* + * frequency domain decorrelation + *-----------------------------------------------------------------*/ - if ( hDirAC->proto_signal_decorr_on == 1 ) + if ( hDirAC->proto_signal_decorr_on == 1 ) + { + /* decorrelate prototype frame */ + if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) { - /* decorrelate prototype frame */ - if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) - { - ivas_dirac_dec_decorr_process( hDirAC->num_freq_bands, - hDirAC->num_outputs_diff, - hDirAC->num_protos_diff, - hDirAC->synthesisConf, - nchan_transport, - hDirAC->h_output_synthesis_psd_state.proto_diffuse_buffer_f + slot_idx * 2 * hDirAC->num_freq_bands * hDirAC->num_outputs_diff, - hDirAC->num_protos_diff, - hDirAC->proto_index_diff, - hDirAC->h_output_synthesis_psd_state.proto_diffuse_buffer_f + slot_idx * 2 * hDirAC->num_freq_bands * hDirAC->num_outputs_diff + 2 * hDirAC->num_freq_bands * min( 4, nchan_transport ), - onset_filter, - hDirAC->h_freq_domain_decorr_ap_params, - hDirAC->h_freq_domain_decorr_ap_state ); - - v_multc( onset_filter, 0.25f, onset_filter, hDirAC->num_freq_bands ); - v_add( onset_filter, onset_filter_subframe, onset_filter_subframe, hDirAC->num_freq_bands ); - p_onset_filter = onset_filter_subframe; - } - else - { - ivas_dirac_dec_decorr_process( hDirAC->num_freq_bands, - hDirAC->num_outputs_diff, - hDirAC->num_protos_diff, - hDirAC->synthesisConf, - nchan_transport, - hDirAC->proto_frame_f, - hDirAC->num_protos_diff, - hDirAC->proto_index_diff, - DirAC_mem.frame_dec_f, - onset_filter, - hDirAC->h_freq_domain_decorr_ap_params, - hDirAC->h_freq_domain_decorr_ap_state ); - - hDirAC->proto_frame_dec_f = DirAC_mem.frame_dec_f; - p_onset_filter = onset_filter; - } + ivas_dirac_dec_decorr_process( hDirAC->num_freq_bands, + hDirAC->num_outputs_diff, + hDirAC->num_protos_diff, + hDirAC->synthesisConf, + nchan_transport, + hDirAC->h_output_synthesis_psd_state.proto_diffuse_buffer_f + slot_idx * 2 * hDirAC->num_freq_bands * hDirAC->num_outputs_diff, + hDirAC->num_protos_diff, + hDirAC->proto_index_diff, + hDirAC->h_output_synthesis_psd_state.proto_diffuse_buffer_f + slot_idx * 2 * hDirAC->num_freq_bands * hDirAC->num_outputs_diff + 2 * hDirAC->num_freq_bands * min( 4, nchan_transport ), + onset_filter, + hDirAC->h_freq_domain_decorr_ap_params, + hDirAC->h_freq_domain_decorr_ap_state ); + + v_multc( onset_filter, 0.25f, onset_filter, hDirAC->num_freq_bands ); + v_add( onset_filter, onset_filter_subframe, onset_filter_subframe, hDirAC->num_freq_bands ); + p_onset_filter = onset_filter_subframe; } else { - if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) - { - set_f( onset_filter_subframe, 1.f, hDirAC->num_freq_bands ); - p_onset_filter = onset_filter_subframe; - } - else - { - /* no frequency domain decorrelation: use prototype frame */ - hDirAC->proto_frame_dec_f = hDirAC->proto_frame_f; - p_onset_filter = NULL; - } + ivas_dirac_dec_decorr_process( hDirAC->num_freq_bands, + hDirAC->num_outputs_diff, + hDirAC->num_protos_diff, + hDirAC->synthesisConf, + nchan_transport, + hDirAC->proto_frame_f, + hDirAC->num_protos_diff, + hDirAC->proto_index_diff, + DirAC_mem.frame_dec_f, + onset_filter, + hDirAC->h_freq_domain_decorr_ap_params, + hDirAC->h_freq_domain_decorr_ap_state ); + + hDirAC->proto_frame_dec_f = DirAC_mem.frame_dec_f; + p_onset_filter = onset_filter; } - - /*-----------------------------------------------------------------* - * output synthesis - *-----------------------------------------------------------------*/ - - if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_PSD_LS || hDirAC->synthesisConf == DIRAC_SYNTHESIS_PSD_SHD ) + } + else + { + if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) + { + set_f( onset_filter_subframe, 1.f, hDirAC->num_freq_bands ); + p_onset_filter = onset_filter_subframe; + } + else { - /*Compute diffuse prototypes*/ - ivas_dirac_dec_compute_diffuse_proto( hDirAC, slot_idx ); + /* no frequency domain decorrelation: use prototype frame */ + hDirAC->proto_frame_dec_f = hDirAC->proto_frame_f; + p_onset_filter = NULL; } + } + + /*-----------------------------------------------------------------* + * output synthesis + *-----------------------------------------------------------------*/ + + if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_PSD_LS || hDirAC->synthesisConf == DIRAC_SYNTHESIS_PSD_SHD ) + { + /*Compute diffuse prototypes*/ + ivas_dirac_dec_compute_diffuse_proto( hDirAC, slot_idx ); + } + + /*Compute PSDs*/ +#ifndef JBM_TSM_ON_TCS + if ( st_ivas->hDecoderConfig->Opt_Headrotation && st_ivas->hHeadTrackData->shd_rot_max_order == 2 ) + { + ivas_dirac_dec_output_synthesis_process_slot( reference_power, + p_onset_filter, + hDirAC, + p_Rmat, + st_ivas->hVBAPdata, + hDirAC->hOutSetup, + nchan_transport, + st_ivas->sba_analysis_order > 1 && + st_ivas->hDecoderConfig->ivas_total_brate > IVAS_256k ); + } + else + { + ivas_dirac_dec_output_synthesis_process_slot( reference_power, + p_onset_filter, + hDirAC, + 0, + st_ivas->hVBAPdata, + hDirAC->hOutSetup, + nchan_transport, + st_ivas->sba_analysis_order > 1 && + st_ivas->hDecoderConfig->ivas_total_brate > IVAS_256k - /*Compute PSDs*/ - if ( st_ivas->hDecoderConfig->Opt_Headrotation && st_ivas->hHeadTrackData->shd_rot_max_order == 2 ) + ); + } +#else + if ( st_ivas->hDecoderConfig->Opt_Headrotation && st_ivas->hHeadTrackData->shd_rot_max_order > 0 ) { ivas_dirac_dec_output_synthesis_process_slot( reference_power, p_onset_filter, + azimuth[slot_idx], + elevation[slot_idx], + diffuseness_vector[slot_idx], hDirAC, + st_ivas->hHeadTrackData->shd_rot_max_order, p_Rmat, st_ivas->hVBAPdata, hDirAC->hOutSetup, nchan_transport, - index_slot ); + md_idx, + hodirac_flag + + ); } else { ivas_dirac_dec_output_synthesis_process_slot( reference_power, p_onset_filter, + azimuth[slot_idx], + elevation[slot_idx], + diffuseness_vector[slot_idx], hDirAC, 0, + 0, st_ivas->hVBAPdata, hDirAC->hOutSetup, nchan_transport, - index_slot ); - } - - if ( hDirAC->synthesisConf != DIRAC_SYNTHESIS_GAIN_SHD ) - { - v_add( reference_power, reference_power_smooth, reference_power_smooth, hDirAC->num_freq_bands ); + md_idx, + hodirac_flag ); } +#endif - if ( hDirAC->hConfig->dec_param_estim ) - { - hDirAC->dirac_read_idx = ( hDirAC->dirac_read_idx + 1 ) % hDirAC->dirac_md_buffer_length; - } + if ( hDirAC->synthesisConf != DIRAC_SYNTHESIS_GAIN_SHD ) + { + v_add( reference_power, reference_power_smooth, reference_power_smooth, hDirAC->num_freq_bands ); } - if ( hDirAC->hConfig->dec_param_estim == 0 ) +#ifndef JBM_TSM_ON_TCS + if ( hDirAC->hConfig->dec_param_estim ) { hDirAC->dirac_read_idx = ( hDirAC->dirac_read_idx + 1 ) % hDirAC->dirac_md_buffer_length; } +#endif + } +#ifndef JBM_TSM_ON_TCS + if ( hDirAC->hConfig->dec_param_estim == 0 ) + { + hDirAC->dirac_read_idx = ( hDirAC->dirac_read_idx + 1 ) % hDirAC->dirac_md_buffer_length; + } +#endif +#ifdef JBM_TSM_ON_TCS + ivas_dirac_dec_output_synthesis_get_interpolator( &hDirAC->h_output_synthesis_psd_params, hDirAC->subframe_nbslots[subframe_idx] ); - if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) + if ( hDirAC->hConfig->dec_param_estim == FALSE ) + { + md_idx = hDirAC->render_to_md_map[subframe_idx]; + } + else + { + md_idx = hDirAC->render_to_md_map[slot_idx_start]; + } + + /* Workaround for BE (should be gone when #393 is adressed and diffuseness index in the gain SHD renderer with HO-DirAC is fixed) */ + /* :TODO: remove */ + /* get the correct md index for the diffuseness in direction smoothing and HO-DirAC, it is always the first slot of the next subframe*/ + if ( slot_idx_start + hDirAC->subframe_nbslots[subframe_idx] == hDirAC->num_slots ) + { + /* we are at the end, get the next one using the normal dirac read idx...*/ + if ( st_ivas->hDirAC->hConfig->dec_param_estim == 1 ) + { + md_idx = ( hDirAC->dirac_read_idx + DEFAULT_JBM_CLDFB_TIMESLOTS ) % hDirAC->dirac_md_buffer_length; + } + else + { + md_idx = ( hDirAC->dirac_read_idx + DEFAULT_JBM_SUBFRAMES_5MS ) % hDirAC->dirac_md_buffer_length; + } + } + else + { + if ( st_ivas->hDirAC->hConfig->dec_param_estim == 1 ) { - ivas_dirac_dec_output_synthesis_process_subframe_gain_shd( Cldfb_RealBuffer, - Cldfb_ImagBuffer, - hDirAC, - nchan_transport, - p_onset_filter ); + md_idx = hDirAC->render_to_md_map[slot_idx_start + hDirAC->subframe_nbslots[subframe_idx]]; } else { - /* Determine encoding quality based additional smoothing factor */ - float qualityBasedSmFactor = 1.0f; - if ( st_ivas->hMasa != NULL ) + md_idx = hDirAC->render_to_md_map[subframe_idx + 1]; + } + } + +#endif + if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) + { + ivas_dirac_dec_output_synthesis_process_subframe_gain_shd( Cldfb_RealBuffer, + Cldfb_ImagBuffer, + hDirAC, + nchan_transport, +#ifdef JBM_TSM_ON_TCS + hDirAC->subframe_nbslots[subframe_idx], +#endif + p_onset_filter, +#ifdef JBM_TSM_ON_TCS + md_idx, +#endif + hodirac_flag ); + } + else + { + /* Determine encoding quality based additional smoothing factor */ + float qualityBasedSmFactor = 1.0f; + + if ( st_ivas->hMasa != NULL ) + { + qualityBasedSmFactor = st_ivas->hMasa->data.dir_decode_quality; + qualityBasedSmFactor *= qualityBasedSmFactor; + } +#ifdef JBM_TSM_ON_TCS + /* Workaround for BE (should be gone when #393 is adressed) */ + if ( hDirAC->hConfig->dec_param_estim == 1 ) + { + num_freq_bands = hDirAC->band_grouping[hDirAC->hConfig->enc_param_start_band]; + for ( slot_idx = 0; slot_idx < hDirAC->subframe_nbslots[subframe_idx]; slot_idx++ ) { - qualityBasedSmFactor = st_ivas->hMasa->data.dir_decode_quality; - qualityBasedSmFactor *= qualityBasedSmFactor; + mvs2s( azimuth[slot_idx], hDirAC->azimuth[hDirAC->render_to_md_map[slot_idx + slot_idx_start]], num_freq_bands ); + mvs2s( elevation[slot_idx], hDirAC->elevation[hDirAC->render_to_md_map[slot_idx + slot_idx_start]], num_freq_bands ); + mvr2r( diffuseness_vector[slot_idx], hDirAC->diffuseness_vector[hDirAC->render_to_md_map[slot_idx + slot_idx_start]], num_freq_bands ); } - - ivas_dirac_dec_output_synthesis_process_subframe_psd_ls( Cldfb_RealBuffer, - Cldfb_ImagBuffer, - hDirAC, - reference_power_smooth, - qualityBasedSmFactor ); } - /*-----------------------------------------------------------------* - * CLDFB synthesis (and binaural rendering) - *-----------------------------------------------------------------*/ +#endif + ivas_dirac_dec_output_synthesis_process_subframe_psd_ls( Cldfb_RealBuffer, + Cldfb_ImagBuffer, + hDirAC, +#ifdef JBM_TSM_ON_TCS + hDirAC->subframe_nbslots[subframe_idx], + md_idx, +#endif + reference_power_smooth, + qualityBasedSmFactor ); + } + + /*-----------------------------------------------------------------* + * CLDFB synthesis (and binaural rendering) + *-----------------------------------------------------------------*/ + +#ifdef JBM_TSM_ON_TCS + index_slot = slot_idx_start_cldfb_synth; +#else index_slot = subframe_idx * hDirAC->subframe_nbslots; +#endif - if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) - { - /* Perform binaural rendering */ - ivas_binRenderer( st_ivas->hBinRenderer, - st_ivas->hHeadTrackData, - Cldfb_RealBuffer_Binaural, - Cldfb_ImagBuffer_Binaural, - Cldfb_RealBuffer, - Cldfb_ImagBuffer ); + if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) + { + /* Perform binaural rendering */ + ivas_binRenderer( st_ivas->hBinRenderer, + st_ivas->hHeadTrackData, +#ifdef JBM_TSM_ON_TCS + hDirAC->subframe_nbslots[subframe_idx], +#endif + Cldfb_RealBuffer_Binaural, + Cldfb_ImagBuffer_Binaural, + Cldfb_RealBuffer, + Cldfb_ImagBuffer ); - /* Inverse CLDFB*/ - for ( ch = 0; ch < st_ivas->hDecoderConfig->nchan_out; ch++ ) - { - /* open CLDFB buffer up to CLDFB_NO_CHANNELS_MAX bands for 48kHz */ - float *RealBuffer[MAX_PARAM_SPATIAL_SUBFRAMES]; - float *ImagBuffer[MAX_PARAM_SPATIAL_SUBFRAMES]; + /* Inverse CLDFB*/ + for ( ch = 0; ch < st_ivas->hDecoderConfig->nchan_out; ch++ ) + { + /* open CLDFB buffer up to CLDFB_NO_CHANNELS_MAX bands for 48kHz */ + float *RealBuffer[MAX_PARAM_SPATIAL_SUBFRAMES]; + float *ImagBuffer[MAX_PARAM_SPATIAL_SUBFRAMES]; +#ifdef JBM_TSM_ON_TCS + for ( i = 0; i < hDirAC->subframe_nbslots[subframe_idx]; i++ ) +#else for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ ) - { - RealBuffer[i] = Cldfb_RealBuffer_Binaural[ch][i]; - ImagBuffer[i] = Cldfb_ImagBuffer_Binaural[ch][i]; - } +#endif + { + RealBuffer[i] = Cldfb_RealBuffer_Binaural[ch][i]; + ImagBuffer[i] = Cldfb_ImagBuffer_Binaural[ch][i]; + } +#ifdef JBM_TSM_ON_TCS + cldfbSynthesis( RealBuffer, + ImagBuffer, + &( output_f[ch][index_slot * hDirAC->num_freq_bands] ), + hDirAC->num_freq_bands * hDirAC->subframe_nbslots[subframe_idx], + st_ivas->cldfbSynDec[ch] ); +#else cldfbSynthesis( RealBuffer, ImagBuffer, &( output_f[ch][index_slot * hDirAC->num_freq_bands] ), hDirAC->num_freq_bands * hDirAC->subframe_nbslots, st_ivas->cldfbSynDec[ch] ); - } +#endif } - else if ( st_ivas->sba_mode == SBA_MODE_SPAR ) + } + else if ( st_ivas->sba_mode == SBA_MODE_SPAR ) + { + for ( ch = 0; ch < hDirAC->hOutSetup.nchan_out_woLFE; ch++ ) { - for ( ch = 0; ch < hDirAC->hOutSetup.nchan_out_woLFE; ch++ ) - { +#ifdef JBM_TSM_ON_TCS + for ( slot_idx = 0; slot_idx < hDirAC->subframe_nbslots[subframe_idx]; slot_idx++ ) +#else for ( slot_idx = 0; slot_idx < hDirAC->subframe_nbslots; slot_idx++ ) - { - mvr2r( Cldfb_RealBuffer[ch][slot_idx], pppQMfFrame_ts_re[ch][slot_idx], hDirAC->num_freq_bands ); - mvr2r( Cldfb_ImagBuffer[ch][slot_idx], pppQMfFrame_ts_im[ch][slot_idx], hDirAC->num_freq_bands ); - } +#endif + { + mvr2r( Cldfb_RealBuffer[ch][slot_idx], pppQMfFrame_ts_re[ch][slot_idx], hDirAC->num_freq_bands ); + mvr2r( Cldfb_ImagBuffer[ch][slot_idx], pppQMfFrame_ts_im[ch][slot_idx], hDirAC->num_freq_bands ); } } - else - { - float *RealBuffer[MAX_PARAM_SPATIAL_SUBFRAMES]; - float *ImagBuffer[MAX_PARAM_SPATIAL_SUBFRAMES]; - int16_t outchannels; + } + else + { + float *RealBuffer[MAX_PARAM_SPATIAL_SUBFRAMES]; + float *ImagBuffer[MAX_PARAM_SPATIAL_SUBFRAMES]; + int16_t outchannels; - idx_in = 0; - idx_lfe = 0; + idx_in = 0; + idx_lfe = 0; - outchannels = hDirAC->hOutSetup.nchan_out_woLFE + hDirAC->hOutSetup.num_lfe; - if ( hDirAC->hOutSetup.separateChannelEnabled && ( hDirAC->hOutSetup.output_config == AUDIO_CONFIG_5_1 || - hDirAC->hOutSetup.output_config == AUDIO_CONFIG_7_1 || - hDirAC->hOutSetup.output_config == AUDIO_CONFIG_5_1_2 || - hDirAC->hOutSetup.output_config == AUDIO_CONFIG_5_1_4 || - hDirAC->hOutSetup.output_config == AUDIO_CONFIG_7_1_4 || - ( hDirAC->hOutSetup.output_config == AUDIO_CONFIG_LS_CUSTOM && st_ivas->hLsSetupCustom->separate_ch_found ) ) ) - { - outchannels++; - } + outchannels = hDirAC->hOutSetup.nchan_out_woLFE + hDirAC->hOutSetup.num_lfe; + if ( hDirAC->hOutSetup.separateChannelEnabled && ( hDirAC->hOutSetup.output_config == AUDIO_CONFIG_5_1 || + hDirAC->hOutSetup.output_config == AUDIO_CONFIG_7_1 || + hDirAC->hOutSetup.output_config == AUDIO_CONFIG_5_1_2 || + hDirAC->hOutSetup.output_config == AUDIO_CONFIG_5_1_4 || + hDirAC->hOutSetup.output_config == AUDIO_CONFIG_7_1_4 || + ( hDirAC->hOutSetup.output_config == AUDIO_CONFIG_LS_CUSTOM && st_ivas->hLsSetupCustom->separate_ch_found ) ) ) + { + outchannels++; + } - if ( hDirAC->hOutSetup.separateChannelEnabled && hDirAC->hOutSetup.output_config == AUDIO_CONFIG_LS_CUSTOM ) - { - float tmp_separated[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES]; - float tmp_lfe[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES]; - const int16_t subframe_start_sample = index_slot * hDirAC->num_freq_bands; + if ( hDirAC->hOutSetup.separateChannelEnabled && hDirAC->hOutSetup.output_config == AUDIO_CONFIG_LS_CUSTOM ) + { + float tmp_separated[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES]; + float tmp_lfe[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES]; + const int16_t subframe_start_sample = index_slot * hDirAC->num_freq_bands; +#ifdef JBM_TSM_ON_TCS + const int16_t num_samples_subframe = hDirAC->num_freq_bands * hDirAC->subframe_nbslots[subframe_idx]; +#else const int16_t num_samples_subframe = hDirAC->num_freq_bands * hDirAC->subframe_nbslots; +#endif - /* Move the separated and the LFE channels to temporary variables as spatial synthesis may overwrite current channels */ - mvr2r( &( output_f[st_ivas->hOutSetup.separateChannelIndex][subframe_start_sample] ), tmp_separated, num_samples_subframe ); - mvr2r( &( output_f[LFE_CHANNEL][subframe_start_sample] ), tmp_lfe, num_samples_subframe ); + /* Move the separated and the LFE channels to temporary variables as spatial synthesis may overwrite current channels */ + mvr2r( &( output_f[st_ivas->hOutSetup.separateChannelIndex][subframe_start_sample] ), tmp_separated, num_samples_subframe ); + mvr2r( &( output_f[LFE_CHANNEL][subframe_start_sample] ), tmp_lfe, num_samples_subframe ); - for ( ch = 0; ch < outchannels; ch++ ) + for ( ch = 0; ch < outchannels; ch++ ) + { + if ( ( hDirAC->hOutSetup.num_lfe > 0 ) && ( hDirAC->hOutSetup.index_lfe[idx_lfe] == ch ) ) { - if ( ( hDirAC->hOutSetup.num_lfe > 0 ) && ( hDirAC->hOutSetup.index_lfe[idx_lfe] == ch ) ) - { - /* Move the LFE channel to the correct place */ - mvr2r( tmp_lfe, &( output_f[ch][subframe_start_sample] ), num_samples_subframe ); + /* Move the LFE channel to the correct place */ + mvr2r( tmp_lfe, &( output_f[ch][subframe_start_sample] ), num_samples_subframe ); - if ( idx_lfe < ( hDirAC->hOutSetup.num_lfe - 1 ) ) - { - idx_lfe++; - } - } - else if ( ( st_ivas->hLsSetupCustom->separate_ch_found ) && ( hDirAC->hOutSetup.separateChannelIndex == ch ) ) + if ( idx_lfe < ( hDirAC->hOutSetup.num_lfe - 1 ) ) { - /* Move the separated channel to the correct place. Thus, the separated channel is - * combined with the synthesized channels here when there is a matching channel. */ - mvr2r( tmp_separated, &( output_f[ch][subframe_start_sample] ), num_samples_subframe ); + idx_lfe++; } - else - { - /* open CLDFB buffer up to CLDFB_NO_CHANNELS_MAX bands for 48kHz */ + } + else if ( ( st_ivas->hLsSetupCustom->separate_ch_found ) && ( hDirAC->hOutSetup.separateChannelIndex == ch ) ) + { + /* Move the separated channel to the correct place. Thus, the separated channel is + * combined with the synthesized channels here when there is a matching channel. */ + mvr2r( tmp_separated, &( output_f[ch][subframe_start_sample] ), num_samples_subframe ); + } + else + { + /* open CLDFB buffer up to CLDFB_NO_CHANNELS_MAX bands for 48kHz */ +#ifdef JBM_TSM_ON_TCS + for ( i = 0; i < hDirAC->subframe_nbslots[subframe_idx]; i++ ) +#else for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ ) - { - RealBuffer[i] = Cldfb_RealBuffer[idx_in][i]; - ImagBuffer[i] = Cldfb_ImagBuffer[idx_in][i]; - } - cldfbSynthesis( RealBuffer, ImagBuffer, &( output_f[ch][subframe_start_sample] ), num_samples_subframe, st_ivas->cldfbSynDec[idx_in] ); - - if ( !st_ivas->hLsSetupCustom->separate_ch_found ) - { - /* Pan the separated channel and mix with the synthesized channels. Thus, the separated channel - * is combined with the synthesized channels here when there is no matching channel. */ - v_multc_acc( tmp_separated, st_ivas->hLsSetupCustom->separate_ch_gains[idx_in], &( output_f[ch][subframe_start_sample] ), num_samples_subframe ); - } +#endif + { + RealBuffer[i] = Cldfb_RealBuffer[idx_in][i]; + ImagBuffer[i] = Cldfb_ImagBuffer[idx_in][i]; + } + cldfbSynthesis( RealBuffer, ImagBuffer, &( output_f[ch][subframe_start_sample] ), num_samples_subframe, st_ivas->cldfbSynDec[idx_in] ); - idx_in++; + if ( !st_ivas->hLsSetupCustom->separate_ch_found ) + { + /* Pan the separated channel and mix with the synthesized channels. Thus, the separated channel + * is combined with the synthesized channels here when there is no matching channel. */ + v_multc_acc( tmp_separated, st_ivas->hLsSetupCustom->separate_ch_gains[idx_in], &( output_f[ch][subframe_start_sample] ), num_samples_subframe ); } + + idx_in++; } } - else + } + else + { + for ( ch = 0; ch < outchannels; ch++ ) { - for ( ch = 0; ch < outchannels; ch++ ) + if ( ( hDirAC->hOutSetup.num_lfe > 0 ) && ( hDirAC->hOutSetup.index_lfe[idx_lfe] == ch ) ) { - if ( ( hDirAC->hOutSetup.num_lfe > 0 ) && ( hDirAC->hOutSetup.index_lfe[idx_lfe] == ch ) ) + if ( st_ivas->mc_mode == MC_MODE_MCMASA && !hDirAC->hOutSetup.separateChannelEnabled ) { - if ( st_ivas->mc_mode == MC_MODE_MCMASA && !hDirAC->hOutSetup.separateChannelEnabled ) - { +#ifdef JBM_TSM_ON_TCS + for ( i = 0; i < hDirAC->subframe_nbslots[subframe_idx]; i++ ) +#else for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ ) - { - RealBuffer[i] = Cldfb_RealBuffer[MAX_OUTPUT_CHANNELS - 1][i]; - ImagBuffer[i] = Cldfb_ImagBuffer[MAX_OUTPUT_CHANNELS - 1][i]; - } - cldfbSynthesis( RealBuffer, ImagBuffer, &( output_f[ch][index_slot * hDirAC->num_freq_bands] ), hDirAC->num_freq_bands * hDirAC->subframe_nbslots, st_ivas->cldfbSynDec[hDirAC->hOutSetup.nchan_out_woLFE + idx_lfe] ); - } - else if ( st_ivas->mc_mode == MC_MODE_MCMASA && hDirAC->hOutSetup.separateChannelEnabled ) - { - /* LFE has been synthesized in the time domain, do nothing. */ - } - else - { - set_zero( &( output_f[ch][index_slot * hDirAC->num_freq_bands] ), hDirAC->subframe_nbslots * hDirAC->num_freq_bands ); - } - - if ( idx_lfe < ( hDirAC->hOutSetup.num_lfe - 1 ) ) +#endif { - idx_lfe++; + RealBuffer[i] = Cldfb_RealBuffer[MAX_OUTPUT_CHANNELS - 1][i]; + ImagBuffer[i] = Cldfb_ImagBuffer[MAX_OUTPUT_CHANNELS - 1][i]; } +#ifdef JBM_TSM_ON_TCS + cldfbSynthesis( RealBuffer, ImagBuffer, &( output_f[ch][index_slot * hDirAC->num_freq_bands] ), hDirAC->num_freq_bands * hDirAC->subframe_nbslots[subframe_idx], st_ivas->cldfbSynDec[hDirAC->hOutSetup.nchan_out_woLFE + idx_lfe] ); +#else + cldfbSynthesis( RealBuffer, ImagBuffer, &( output_f[ch][index_slot * hDirAC->num_freq_bands] ), hDirAC->num_freq_bands * hDirAC->subframe_nbslots, st_ivas->cldfbSynDec[hDirAC->hOutSetup.nchan_out_woLFE + idx_lfe] ); +#endif } - else if ( ( hDirAC->hOutSetup.separateChannelEnabled ) && ( hDirAC->hOutSetup.separateChannelIndex == ch ) ) + else if ( st_ivas->mc_mode == MC_MODE_MCMASA && hDirAC->hOutSetup.separateChannelEnabled ) { - /* The separated channel is already set to output_f[hOutSetup.separateChannelIndex]. Thus, the separated - * channel is combined with the synthesized channels here. */ + /* LFE has been synthesized in the time domain, do nothing. */ } else { - /* open CLDFB buffer up to CLDFB_NO_CHANNELS_MAX bands for 48kHz */ +#ifdef JBM_TSM_ON_TCS + set_zero( &( output_f[ch][index_slot * hDirAC->num_freq_bands] ), hDirAC->subframe_nbslots[subframe_idx] * hDirAC->num_freq_bands ); +#else + set_zero( &( output_f[ch][index_slot * hDirAC->num_freq_bands] ), hDirAC->subframe_nbslots * hDirAC->num_freq_bands ); +#endif + } + + if ( idx_lfe < ( hDirAC->hOutSetup.num_lfe - 1 ) ) + { + idx_lfe++; + } + } + else if ( ( hDirAC->hOutSetup.separateChannelEnabled ) && ( hDirAC->hOutSetup.separateChannelIndex == ch ) ) + { + /* The separated channel is already set to output_f[hOutSetup.separateChannelIndex]. Thus, the separated + * channel is combined with the synthesized channels here. */ + } + else + { + /* open CLDFB buffer up to CLDFB_NO_CHANNELS_MAX bands for 48kHz */ +#ifdef JBM_TSM_ON_TCS + for ( i = 0; i < hDirAC->subframe_nbslots[subframe_idx]; i++ ) +#else for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ ) - { - RealBuffer[i] = Cldfb_RealBuffer[idx_in][i]; - ImagBuffer[i] = Cldfb_ImagBuffer[idx_in][i]; - } - cldfbSynthesis( RealBuffer, ImagBuffer, &( output_f[ch][index_slot * hDirAC->num_freq_bands] ), hDirAC->num_freq_bands * hDirAC->subframe_nbslots, st_ivas->cldfbSynDec[idx_in] ); - idx_in++; +#endif + { + RealBuffer[i] = Cldfb_RealBuffer[idx_in][i]; + ImagBuffer[i] = Cldfb_ImagBuffer[idx_in][i]; } +#ifdef JBM_TSM_ON_TCS + cldfbSynthesis( RealBuffer, ImagBuffer, &( output_f[ch][index_slot * hDirAC->num_freq_bands] ), hDirAC->num_freq_bands * hDirAC->subframe_nbslots[subframe_idx], st_ivas->cldfbSynDec[idx_in] ); +#else + cldfbSynthesis( RealBuffer, ImagBuffer, &( output_f[ch][index_slot * hDirAC->num_freq_bands] ), hDirAC->num_freq_bands * hDirAC->subframe_nbslots, st_ivas->cldfbSynDec[idx_in] ); +#endif + idx_in++; } } } } +#ifdef JBM_TSM_ON_TCS + hDirAC->slots_rendered += hDirAC->subframe_nbslots[subframe_idx]; + hDirAC->subframes_rendered++; +#endif +#ifndef JBM_TSM_ON_TCS +} +#endif - pop_wmops(); +pop_wmops(); - return; +return; } @@ -3468,7 +4260,8 @@ static void protoSignalComputation4( const int16_t num_outputs_diff, const int16_t num_freq_bands, const float *mtx_hoa_decoder, - const int16_t nchan_transport ) + const int16_t nchan_transport, + const int16_t *sba_map_tc_ind ) { int16_t k, l; int16_t n; @@ -3494,8 +4287,8 @@ static void protoSignalComputation4( proto_frame_f[2 * l * num_freq_bands + 2 * k + 1] = 0.f; for ( n = 0; n < nchan_transport; n++ ) { - proto_frame_f[2 * l * num_freq_bands + 2 * k] += RealBuffer[n][0][k] * mtx_hoa_decoder[l * 16 + sba_map_tc[n]]; - proto_frame_f[2 * l * num_freq_bands + 2 * k + 1] += ImagBuffer[n][0][k] * mtx_hoa_decoder[l * 16 + sba_map_tc[n]]; + proto_frame_f[2 * l * num_freq_bands + 2 * k] += RealBuffer[n][0][k] * mtx_hoa_decoder[l * 16 + sba_map_tc_ind[n]]; + proto_frame_f[2 * l * num_freq_bands + 2 * k + 1] += ImagBuffer[n][0][k] * mtx_hoa_decoder[l * 16 + sba_map_tc_ind[n]]; } } } diff --git a/lib_dec/ivas_dirac_output_synthesis_cov.c b/lib_dec/ivas_dirac_output_synthesis_cov.c index a2fc9ee8210be12378d3175c808075fd88ebcd8d..892cfe4acbd1120a7f3d2f4b90eae08a2fa2ad76 100644 --- a/lib_dec/ivas_dirac_output_synthesis_cov.c +++ b/lib_dec/ivas_dirac_output_synthesis_cov.c @@ -104,12 +104,19 @@ ivas_error ivas_dirac_dec_output_synthesis_cov_open( 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 ); +#ifdef JBM_TSM_ON_TCS + h_dirac_output_synthesis_state->mixing_matrix[idx] = (float *) malloc( nchan_out * nchan_in * sizeof( float ) ); + set_zero( h_dirac_output_synthesis_state->mixing_matrix[idx], nchan_out * nchan_in ); +#endif } for ( ; idx < CLDFB_NO_CHANNELS_MAX; idx++ ) { h_dirac_output_synthesis_state->cx_old[idx] = NULL; h_dirac_output_synthesis_state->cy_old[idx] = NULL; h_dirac_output_synthesis_state->mixing_matrix_old[idx] = NULL; +#ifdef JBM_TSM_ON_TCS + h_dirac_output_synthesis_state->mixing_matrix[idx] = NULL; +#endif } for ( idx = 0; idx < num_param_bands_residual; idx++ ) { @@ -118,10 +125,17 @@ ivas_error ivas_dirac_dec_output_synthesis_cov_open( 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 ); +#ifdef JBM_TSM_ON_TCS + h_dirac_output_synthesis_state->mixing_matrix_res[idx] = (float *) malloc( nchan_out * nchan_out * sizeof( float ) ); + set_zero( h_dirac_output_synthesis_state->mixing_matrix_res[idx], nchan_out * nchan_out ); +#endif } for ( ; idx < CLDFB_NO_CHANNELS_MAX; idx++ ) { h_dirac_output_synthesis_state->mixing_matrix_res_old[idx] = NULL; +#ifdef JBM_TSM_ON_TCS + h_dirac_output_synthesis_state->mixing_matrix_res[idx] = NULL; +#endif } /*-----------------------------------------------------------------* @@ -144,6 +158,28 @@ ivas_error ivas_dirac_dec_output_synthesis_cov_open( return IVAS_ERR_OK; } +#ifdef JBM_TSM_ON_TCS +/*-------------------------------------------------------------------* + * ivas_dirac_dec_output_synthesis_cov_open() + * + * Sets up the state and parameters for the Covariance Synthesis + *-------------------------------------------------------------------*/ + +void ivas_dirac_dec_output_synthesis_get_interpolator( + DIRAC_OUTPUT_SYNTHESIS_PARAMS *h_dirac_output_synthesis_params, /* i/o: handle for the covariance synthesis parameters */ + const uint16_t interp_length ) +{ + int16_t idx; + + for ( idx = 1; idx <= interp_length; ++idx ) + { + h_dirac_output_synthesis_params->interpolator[idx - 1] = (float) idx / (float) interp_length; + } + + return; +} +#endif + /*-------------------------------------------------------------------* * ivas_dirac_dec_output_synthesis_cov_init() @@ -168,11 +204,17 @@ void ivas_dirac_dec_output_synthesis_cov_init( 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 ); +#ifdef JBM_TSM_ON_TCS + set_zero( h_dirac_output_synthesis_state->mixing_matrix[idx], nchan_out * nchan_in ); +#endif } for ( idx = 0; idx < n_param_bands_res; idx++ ) { set_zero( h_dirac_output_synthesis_state->mixing_matrix_res_old[idx], nchan_out * nchan_out ); +#ifdef JBM_TSM_ON_TCS + set_zero( h_dirac_output_synthesis_state->mixing_matrix_res[idx], nchan_out * nchan_out ); +#endif } return; @@ -243,6 +285,19 @@ void ivas_dirac_dec_output_synthesis_cov_close( free( h_dirac_output_synthesis_state->mixing_matrix_res_old[idx] ); h_dirac_output_synthesis_state->mixing_matrix_res_old[idx] = NULL; } +#ifdef JBM_TSM_ON_TCS + if ( h_dirac_output_synthesis_state->mixing_matrix[idx] != NULL ) + { + free( h_dirac_output_synthesis_state->mixing_matrix[idx] ); + h_dirac_output_synthesis_state->mixing_matrix[idx] = NULL; + } + + if ( h_dirac_output_synthesis_state->mixing_matrix_res[idx] != NULL ) + { + free( h_dirac_output_synthesis_state->mixing_matrix_res[idx] ); + h_dirac_output_synthesis_state->mixing_matrix_res[idx] = NULL; + } +#endif } return; @@ -256,13 +311,21 @@ void ivas_dirac_dec_output_synthesis_cov_close( *-------------------------------------------------------------------*/ void ivas_dirac_dec_output_synthesis_cov_param_mc_collect_slot( - float RealBuffer[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS][CLDFB_NO_CHANNELS_MAX], /* i : input channel filter bank samples (real part) */ - float ImagBuffer[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS][CLDFB_NO_CHANNELS_MAX], /* i : input channel filter bank samples (imaginary part */ +#ifdef JBM_TSM_ON_TCS + float *RealBuffer, /* i : input channel filter bank samples (real part) */ + float *ImagBuffer, /* i : input channel filter bank samples (imaginary part */ +#else + float RealBuffer[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS][CLDFB_NO_CHANNELS_MAX], /* i : input channel filter bank samples (real part) */ + float ImagBuffer[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS][CLDFB_NO_CHANNELS_MAX], /* i : input channel filter bank samples (imaginary part */ +#endif float cx[PARAM_MC_MAX_PARAMETER_BANDS][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], /* o : accumulated input covariance (real part) */ float cx_imag[PARAM_MC_MAX_PARAMETER_BANDS][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], /* o : accumulated input covariance (imaginary part) */ PARAM_MC_DEC_HANDLE hParamMC, /* i : handle to Parametric MC state */ - const int16_t nchan_in, /* i : number of input channels */ - const int16_t idx_slot /* i : index of the slot to be added to the input covariance */ + const int16_t nchan_in /* i : number of input channels */ +#ifndef JBM_TSM_ON_TCS + , + const int16_t idx_slot /* i : index of the slot to be added to the input covariance */ +#endif ) { int16_t param_band, band_idx, ch_idx; @@ -288,8 +351,13 @@ void ivas_dirac_dec_output_synthesis_cov_param_mc_collect_slot( int16_t band = brange[0] + band_idx; for ( ch_idx = 0; ch_idx < nchan_in; ch_idx++ ) { +#ifdef JBM_TSM_ON_TCS + real_in_buffer[band_idx + num_bands * ch_idx] = RealBuffer[ch_idx * hParamMC->num_freq_bands + band]; + imag_in_buffer[band_idx + num_bands * ch_idx] = ImagBuffer[ch_idx * hParamMC->num_freq_bands + band]; +#else real_in_buffer[band_idx + num_bands * ch_idx] = RealBuffer[ch_idx][idx_slot][band]; imag_in_buffer[band_idx + num_bands * ch_idx] = ImagBuffer[ch_idx][idx_slot][band]; +#endif } } @@ -312,17 +380,27 @@ void ivas_dirac_dec_output_synthesis_cov_param_mc_collect_slot( *-------------------------------------------------------------------*/ void ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot( - float Cldfb_RealBuffer_in[][PARAM_MC_MAX_NSLOTS][CLDFB_NO_CHANNELS_MAX], /* i : input channel filter bank samples (real part) */ - float Cldfb_ImagBuffer_in[][PARAM_MC_MAX_NSLOTS][CLDFB_NO_CHANNELS_MAX], /* i : input channel filter bank samples (imaginary part) */ - float Cldfb_RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o : output channel filter bank samples (real part) */ - float Cldfb_ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o : output channel filter bank samples (imaginary part) */ +#ifdef JBM_TSM_ON_TCS + float *Cldfb_RealBuffer_in, /* i : input channel filter bank samples (real part) */ + float *Cldfb_ImagBuffer_in, /* i : input channel filter bank samples (imaginary part) */ +#else + float Cldfb_RealBuffer_in[PARAM_MC_MAX_TRANSPORT_CHANS][PARAM_MC_MAX_NSLOTS][CLDFB_NO_CHANNELS_MAX], /* i : CLDFB samples of the transport channels (real part) */ + float Cldfb_ImagBuffer_in[PARAM_MC_MAX_TRANSPORT_CHANS][PARAM_MC_MAX_NSLOTS][CLDFB_NO_CHANNELS_MAX], /* i : CLDFB samples of the transport channels (imaginary part) */ +#endif + float Cldfb_RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o : output channel filter bank samples (real part) */ + float Cldfb_ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o : output channel filter bank samples (imaginary part) */ +#ifdef JBM_TSM_ON_TCS + float *mixing_matrix[], /* i : parameter band wise mixing matrices (direct part) */ + float *mixing_matrix_res[], /* i : parameter band wise mixing matrices (residual part) */ +#else float mixing_matrix[PARAM_MC_MAX_PARAMETER_BANDS][MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS], /* i : parameter band wise mixing matrices (direct part) */ float mixing_matrix_res[PARAM_MC_MAX_PARAMETER_BANDS_RES][MAX_CICP_CHANNELS * MAX_CICP_CHANNELS], /* i : parameter band wise mixing matrices (residual part) */ - const uint16_t slot_idx_sfr, /* i : time slot index for the current slot within the current subframe */ - const uint16_t slot_idx_tot, /* i : time slot index for the current slot within the frame */ - const int16_t nX, /* i : number of input channels */ - const int16_t nY, /* i : number of output channels */ - PARAM_MC_DEC_HANDLE hParamMC /* i : handle to the Parametric MC decoder state */ +#endif + const uint16_t slot_idx_sfr, /* i : time slot index for the current slot within the current subframe */ + const uint16_t slot_idx_tot, /* i : time slot index for the current slot within the frame */ + const int16_t nX, /* i : number of input channels */ + const int16_t nY, /* i : number of output channels */ + PARAM_MC_DEC_HANDLE hParamMC /* i : handle to the Parametric MC decoder state */ ) { int16_t param_band_idx, band, ch_idx; @@ -407,8 +485,13 @@ void ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot( /* collect input signals, still in cldfb buffers */ for ( ch_idx = 0; ch_idx < nX; ch_idx++ ) { +#ifdef JBM_TSM_ON_TCS + input_f_real[ch_idx] = Cldfb_RealBuffer_in[ch_idx * hParamMC->num_freq_bands + band]; + input_f_imag[ch_idx] = Cldfb_ImagBuffer_in[ch_idx * hParamMC->num_freq_bands + band]; +#else input_f_real[ch_idx] = Cldfb_RealBuffer_in[ch_idx][slot_idx_tot][band]; input_f_imag[ch_idx] = Cldfb_ImagBuffer_in[ch_idx][slot_idx_tot][band]; +#endif } /* apply mixing matrix */ diff --git a/lib_dec/ivas_dirac_output_synthesis_dec.c b/lib_dec/ivas_dirac_output_synthesis_dec.c index 3541bc5cfe44b7cd35728ae4bd86534e37ee5e7e..1ad87d6618dc729bc86c982f5034136c3d142aa9 100644 --- a/lib_dec/ivas_dirac_output_synthesis_dec.c +++ b/lib_dec/ivas_dirac_output_synthesis_dec.c @@ -87,13 +87,16 @@ static void normalizePanningGains( float *direct_response, const int16_t num_cha *------------------------------------------------------------------------*/ 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*/ - const int32_t output_Fs /* i : output sampling rate */ + 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 */ + const int32_t output_Fs /* i : output sampling rate */ + , + const int16_t hodirac_flag /* i : flag to indicate HO-DirAC mode */ ) { int16_t idx, ch_idx; + int16_t size; float tmp; uint16_t num_diffuse_responses; float temp_alpha_synthesis[CLDFB_NO_CHANNELS_MAX]; @@ -161,13 +164,25 @@ ivas_error ivas_dirac_dec_output_synthesis_open( } /* buffer length and interpolator */ +#ifdef JBM_TSM_ON_TCS + if ( ( dirac_output_synthesis_params->interpolator = (float *) malloc( JBM_CLDFB_SLOTS_IN_SUBFRAME * sizeof( float ) ) ) == NULL ) +#else if ( ( dirac_output_synthesis_params->interpolator = (float *) malloc( hDirAC->subframe_nbslots * sizeof( float ) ) ) == NULL ) +#endif { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) ); } /* target PSD buffers */ - if ( ( dirac_output_synthesis_state->cy_cross_dir_smooth_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_dir * sizeof( float ) ) ) == NULL ) + if ( hodirac_flag ) + { + size = hDirAC->num_freq_bands * hDirAC->num_outputs_dir * DIRAC_HO_NUMSECTORS; + } + else + { + size = hDirAC->num_freq_bands * hDirAC->num_outputs_dir; + } + if ( ( dirac_output_synthesis_state->cy_cross_dir_smooth_prev = (float *) malloc( size * sizeof( float ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) ); } @@ -204,7 +219,7 @@ ivas_error ivas_dirac_dec_output_synthesis_open( } /* direct and diffuse gain buffers */ - if ( ( dirac_output_synthesis_state->gains_dir_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_dir * sizeof( float ) ) ) == NULL ) + if ( ( dirac_output_synthesis_state->gains_dir_prev = (float *) malloc( size * sizeof( float ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) ); } @@ -272,9 +287,17 @@ ivas_error ivas_dirac_dec_output_synthesis_open( } /* compute interpolator */ +#ifdef JBM_TSM_ON_TCS + for ( idx = 1; idx <= JBM_CLDFB_SLOTS_IN_SUBFRAME; ++idx ) +#else for ( idx = 1; idx <= hDirAC->subframe_nbslots; ++idx ) +#endif { +#ifdef JBM_TSM_ON_TCS + dirac_output_synthesis_params->interpolator[idx - 1] = (float) idx / (float) JBM_CLDFB_SLOTS_IN_SUBFRAME; +#else dirac_output_synthesis_params->interpolator[idx - 1] = (float) idx / (float) hDirAC->subframe_nbslots; +#endif } /* prepare diffuse response function */ @@ -346,8 +369,12 @@ ivas_error ivas_dirac_dec_output_synthesis_open( void ivas_dirac_dec_output_synthesis_init( DIRAC_DEC_HANDLE hDirAC, /* i/o: DirAC handle */ const int16_t nchan_out_woLFE /* i : number of output audio channels without LFE */ + , + const int16_t hodirac_flag /* i : flag to indicate HO-DirAC mode */ ) { + int16_t size; + DIRAC_OUTPUT_SYNTHESIS_PARAMS *h_dirac_output_synthesis_params; DIRAC_OUTPUT_SYNTHESIS_STATE *h_dirac_output_synthesis_state; @@ -364,7 +391,16 @@ void ivas_dirac_dec_output_synthesis_init( set_zero( h_dirac_output_synthesis_state->cy_auto_dir_smooth_prev, hDirAC->num_freq_bands * hDirAC->num_outputs_dir ); } - set_zero( h_dirac_output_synthesis_state->cy_cross_dir_smooth_prev, hDirAC->num_freq_bands * hDirAC->num_outputs_dir ); + if ( hodirac_flag ) + { + size = hDirAC->num_freq_bands * hDirAC->num_outputs_dir * DIRAC_HO_NUMSECTORS; + } + else + { + size = hDirAC->num_freq_bands * hDirAC->num_outputs_dir; + } + set_zero( h_dirac_output_synthesis_state->cy_cross_dir_smooth_prev, size ); + if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) { set_zero( h_dirac_output_synthesis_state->cy_auto_diff_smooth_prev, h_dirac_output_synthesis_params->max_band_decorr * hDirAC->num_outputs_diff ); @@ -382,8 +418,7 @@ void ivas_dirac_dec_output_synthesis_init( { set_zero( h_dirac_output_synthesis_state->proto_power_smooth_prev, hDirAC->num_freq_bands * hDirAC->num_protos_dir ); } - - set_zero( h_dirac_output_synthesis_state->gains_dir_prev, hDirAC->num_freq_bands * hDirAC->num_outputs_dir ); + set_zero( h_dirac_output_synthesis_state->gains_dir_prev, size ); if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) { @@ -511,25 +546,43 @@ void ivas_dirac_dec_output_synthesis_close( *------------------------------------------------------------------------*/ void ivas_dirac_dec_output_synthesis_process_slot( - const float *reference_power, /* i : Estimated power */ - const float *onset, /* i : onset filter */ - DIRAC_DEC_HANDLE hDirAC, /* i/o: DirAC handle */ + const float *reference_power, /* i : Estimated power */ + const float *onset, /* i : onset filter */ +#ifdef JBM_TSM_ON_TCS + const int16_t *azimuth, + const int16_t *elevation, + const float *diffuseness, +#endif + DIRAC_DEC_HANDLE hDirAC, /* i/o: DirAC handle */ +#ifdef JBM_TSM_ON_TCS + const int16_t sh_rot_max_order, +#endif 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*/ +#if defined( JBM_TSM_ON_TCS ) + , + const int16_t md_idx +#endif + , + const int16_t hodirac_flag /* i : flag to indicate HO-DirAC mode */ +) { int16_t num_freq_bands, num_channels_dir; int16_t num_freq_bands_diff, num_channels_diff; int16_t ch_idx; float aux_buf[CLDFB_NO_CHANNELS_MAX]; int16_t diff_start_band; +#ifndef JBM_TSM_ON_TCS const float *diffuseness; +#endif DIRAC_OUTPUT_SYNTHESIS_PARAMS *h_dirac_output_synthesis_params; DIRAC_OUTPUT_SYNTHESIS_STATE *h_dirac_output_synthesis_state; +#ifndef JBM_TSM_ON_TCS diffuseness = hDirAC->diffuseness_vector[hDirAC->dirac_read_idx]; +#endif h_dirac_output_synthesis_params = &( hDirAC->h_output_synthesis_psd_params ); h_dirac_output_synthesis_state = &( hDirAC->h_output_synthesis_psd_state ); @@ -550,113 +603,195 @@ void ivas_dirac_dec_output_synthesis_process_slot( num_channels_dir = hOutSetup.nchan_out_woLFE; } - if ( hDirAC->hConfig->dec_param_estim == TRUE ) + if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD && hodirac_flag ) { - /* compute direct responses */ ivas_dirac_dec_compute_directional_responses( hDirAC, hVBAPdata, NULL, - index_slot, - index_slot / MAX_PARAM_SPATIAL_SUBFRAMES, NULL, +#ifdef JBM_TSM_ON_TCS + azimuth, + elevation, + md_idx, +#endif + NULL, 2, - p_Rmat ); + p_Rmat, + hodirac_flag ); + } + if ( hDirAC->hConfig->dec_param_estim == FALSE && hodirac_flag ) + { if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) { +#ifdef JBM_TSM_ON_TCS + v_multc( hDirAC->energy_ratio1[md_idx], -1.f, aux_buf, num_freq_bands ); + v_addc( aux_buf, 1.f, aux_buf, num_freq_bands ); + mvr2r( hDirAC->energy_ratio1[md_idx], + h_dirac_output_synthesis_state->direct_power_factor, + num_freq_bands ); + mvr2r( aux_buf, + h_dirac_output_synthesis_state->diffuse_power_factor, + num_freq_bands ); + + v_multc( hDirAC->energy_ratio2[md_idx], -1.f, aux_buf, num_freq_bands ); + v_addc( aux_buf, 1.f, aux_buf, num_freq_bands ); + mvr2r( hDirAC->energy_ratio2[md_idx], + &h_dirac_output_synthesis_state->direct_power_factor[hDirAC->num_freq_bands], + num_freq_bands ); + mvr2r( aux_buf, + &h_dirac_output_synthesis_state->diffuse_power_factor[hDirAC->num_freq_bands], + num_freq_bands ); +#else + v_multc( hDirAC->energy_ratio1[hDirAC->dirac_read_idx], -1.f, aux_buf, num_freq_bands ); + v_addc( aux_buf, 1.f, aux_buf, num_freq_bands ); + mvr2r( hDirAC->energy_ratio1[hDirAC->dirac_read_idx], + h_dirac_output_synthesis_state->direct_power_factor, + num_freq_bands ); + mvr2r( aux_buf, + h_dirac_output_synthesis_state->diffuse_power_factor, + num_freq_bands ); + + v_multc( hDirAC->energy_ratio2[hDirAC->dirac_read_idx], -1.f, aux_buf, num_freq_bands ); + v_addc( aux_buf, 1.f, aux_buf, num_freq_bands ); + mvr2r( hDirAC->energy_ratio2[hDirAC->dirac_read_idx], + &h_dirac_output_synthesis_state->direct_power_factor[hDirAC->num_freq_bands], + num_freq_bands ); + mvr2r( aux_buf, + &h_dirac_output_synthesis_state->diffuse_power_factor[hDirAC->num_freq_bands], + num_freq_bands ); +#endif + } + else + { +#ifdef JBM_TSM_ON_TCS ivas_dirac_dec_compute_gain_factors( num_freq_bands, - diffuseness, + hDirAC->diffuseness_vector[md_idx], h_dirac_output_synthesis_params->max_band_decorr, h_dirac_output_synthesis_state->direct_power_factor, h_dirac_output_synthesis_state->diffuse_power_factor ); +#else + ivas_dirac_dec_compute_gain_factors( num_freq_bands, + hDirAC->diffuseness_vector[hDirAC->dirac_read_idx], + h_dirac_output_synthesis_params->max_band_decorr, + h_dirac_output_synthesis_state->direct_power_factor, + h_dirac_output_synthesis_state->diffuse_power_factor ); +#endif + } + } + else // ( hDirAC->hConfig->dec_param_estim == TRUE ) + if ( hDirAC->hConfig->dec_param_estim == TRUE ) + { - v_multc( h_dirac_output_synthesis_state->direct_power_factor, - 0.25f, - h_dirac_output_synthesis_state->direct_power_factor, - num_freq_bands ); - v_multc( h_dirac_output_synthesis_state->diffuse_power_factor, - 0.25f, - h_dirac_output_synthesis_state->diffuse_power_factor, - num_freq_bands ); - + /* compute direct responses */ +#ifdef JBM_TSM_ON_TCS + ivas_dirac_dec_compute_directional_responses( hDirAC, + hVBAPdata, + NULL, + azimuth, + elevation, + md_idx, + NULL, + sh_rot_max_order, + p_Rmat, + hodirac_flag ); +#endif - /*Direct gain*/ - for ( ch_idx = 0; ch_idx < min( 4, nchan_transport ); ch_idx++ ) + if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) { - int16_t k; - if ( ch_idx != 0 ) - { - float a, b, c; + ivas_dirac_dec_compute_gain_factors( num_freq_bands, + diffuseness, + h_dirac_output_synthesis_params->max_band_decorr, + h_dirac_output_synthesis_state->direct_power_factor, + h_dirac_output_synthesis_state->diffuse_power_factor ); + - /*Directonal sound gain nrg compensation*/ - for ( k = 0; k < num_freq_bands_diff; k++ ) + v_multc( h_dirac_output_synthesis_state->direct_power_factor, + 0.25f, + h_dirac_output_synthesis_state->direct_power_factor, + num_freq_bands ); + v_multc( h_dirac_output_synthesis_state->diffuse_power_factor, + 0.25f, + h_dirac_output_synthesis_state->diffuse_power_factor, + num_freq_bands ); + + /*Direct gain*/ + for ( ch_idx = 0; ch_idx < min( 4, nchan_transport ); ch_idx++ ) + { + int16_t k; + if ( ch_idx != 0 ) { - a = h_dirac_output_synthesis_state->direct_responses[ch_idx * num_freq_bands + k]; - b = reference_power[k + num_freq_bands] / ( reference_power[k + ( ch_idx + 1 ) * num_freq_bands] + EPSILON ); - c = 1.f + ( 1.f / 6.f ) * ( h_dirac_output_synthesis_params->diffuse_compensation_factor_decorr - 1.f ); /*Diffuseness modellling nrg compensation*/ - h_dirac_output_synthesis_state->cy_cross_dir_smooth[ch_idx * num_freq_bands + k] += 0.25f * sqrtf( diffuseness[k] * c + ( ( 1.f - diffuseness[k] ) * a * a * b ) ); + float a, b, c; + + /*Directonal sound gain nrg compensation*/ + for ( k = 0; k < num_freq_bands_diff; k++ ) + { + a = h_dirac_output_synthesis_state->direct_responses[ch_idx * num_freq_bands + k]; + b = reference_power[k + num_freq_bands] / ( reference_power[k + ( ch_idx + 1 ) * num_freq_bands] + EPSILON ); + c = 1.f + ( 1.f / 6.f ) * ( h_dirac_output_synthesis_params->diffuse_compensation_factor_decorr - 1.f ); /*Diffuseness modellling nrg compensation*/ + h_dirac_output_synthesis_state->cy_cross_dir_smooth[ch_idx * num_freq_bands + k] += 0.25f * sqrtf( diffuseness[k] * c + ( ( 1.f - diffuseness[k] ) * a * a * b ) ); + } + for ( ; k < num_freq_bands; k++ ) + { + a = h_dirac_output_synthesis_state->direct_responses[ch_idx * num_freq_bands + k]; + b = reference_power[k + num_freq_bands] / ( reference_power[k + ( ch_idx + 1 ) * num_freq_bands] + EPSILON ); + c = 1.f + ( 1.f / 6.f ) * ( h_dirac_output_synthesis_params->diffuse_compensation_factor - 1.f ); /*Diffuseness modellling nrg compensation*/ + h_dirac_output_synthesis_state->cy_cross_dir_smooth[ch_idx * num_freq_bands + k] += 0.25f * sqrtf( diffuseness[k] * c + ( ( 1.f - diffuseness[k] ) * a * a * b ) ); + } } - for ( ; k < num_freq_bands; k++ ) + else { - a = h_dirac_output_synthesis_state->direct_responses[ch_idx * num_freq_bands + k]; - b = reference_power[k + num_freq_bands] / ( reference_power[k + ( ch_idx + 1 ) * num_freq_bands] + EPSILON ); - c = 1.f + ( 1.f / 6.f ) * ( h_dirac_output_synthesis_params->diffuse_compensation_factor - 1.f ); /*Diffuseness modellling nrg compensation*/ - h_dirac_output_synthesis_state->cy_cross_dir_smooth[ch_idx * num_freq_bands + k] += 0.25f * sqrtf( diffuseness[k] * c + ( ( 1.f - diffuseness[k] ) * a * a * b ) ); + /*Diffuseness modellling nrg compensation*/ + for ( k = 0; k < num_freq_bands_diff; k++ ) + { + h_dirac_output_synthesis_state->cy_cross_dir_smooth[ch_idx * num_freq_bands + k] += 0.25f * sqrtf( 1.0f + diffuseness[k] * 0.5f * ( h_dirac_output_synthesis_params->diffuse_compensation_factor_decorr - 1.f ) ); + } + for ( ; k < num_freq_bands; k++ ) + { + h_dirac_output_synthesis_state->cy_cross_dir_smooth[ch_idx * num_freq_bands + k] += 0.25f * sqrtf( 1.0f + diffuseness[k] * 0.5f * ( h_dirac_output_synthesis_params->diffuse_compensation_factor - 1.f ) ); + } } } - else + + /*Directional gain (panning)*/ + for ( ch_idx = min( 4, nchan_transport ); ch_idx < num_channels_dir; ch_idx++ ) { - /*Diffuseness modellling nrg compensation*/ - for ( k = 0; k < num_freq_bands_diff; k++ ) - { - h_dirac_output_synthesis_state->cy_cross_dir_smooth[ch_idx * num_freq_bands + k] += 0.25f * sqrtf( 1.0f + diffuseness[k] * 0.5f * ( h_dirac_output_synthesis_params->diffuse_compensation_factor_decorr - 1.f ) ); - } - for ( ; k < num_freq_bands; k++ ) - { - h_dirac_output_synthesis_state->cy_cross_dir_smooth[ch_idx * num_freq_bands + k] += 0.25f * sqrtf( 1.0f + diffuseness[k] * 0.5f * ( h_dirac_output_synthesis_params->diffuse_compensation_factor - 1.f ) ); - } + v_mult( h_dirac_output_synthesis_state->direct_power_factor, + &h_dirac_output_synthesis_state->direct_responses[ch_idx * num_freq_bands], + aux_buf, + num_freq_bands ); + + v_add( aux_buf, + &h_dirac_output_synthesis_state->cy_cross_dir_smooth[ch_idx * num_freq_bands], + &h_dirac_output_synthesis_state->cy_cross_dir_smooth[ch_idx * num_freq_bands], + num_freq_bands ); + } + + /*Diffuse gain*/ + for ( ch_idx = min( 4, nchan_transport ); ch_idx < num_channels_diff; ch_idx++ ) + { + v_multc( h_dirac_output_synthesis_state->diffuse_power_factor, + hDirAC->diffuse_response_function[ch_idx], + aux_buf, + num_freq_bands_diff ); + + v_add( aux_buf, + &h_dirac_output_synthesis_state->cy_auto_diff_smooth[ch_idx * num_freq_bands_diff], + &h_dirac_output_synthesis_state->cy_auto_diff_smooth[ch_idx * num_freq_bands_diff], + num_freq_bands_diff ); } - } - /*Directional gain (panning)*/ - for ( ch_idx = min( 4, nchan_transport ); ch_idx < num_channels_dir; ch_idx++ ) - { - v_mult( h_dirac_output_synthesis_state->direct_power_factor, - &h_dirac_output_synthesis_state->direct_responses[ch_idx * num_freq_bands], - aux_buf, - num_freq_bands ); - - v_add( aux_buf, - &h_dirac_output_synthesis_state->cy_cross_dir_smooth[ch_idx * num_freq_bands], - &h_dirac_output_synthesis_state->cy_cross_dir_smooth[ch_idx * num_freq_bands], - num_freq_bands ); - } - /*Diffuse gain*/ - for ( ch_idx = min( 4, nchan_transport ); ch_idx < num_channels_diff; ch_idx++ ) + return; + } + else { - v_multc( h_dirac_output_synthesis_state->diffuse_power_factor, - hDirAC->diffuse_response_function[ch_idx], - aux_buf, - num_freq_bands_diff ); - - v_add( aux_buf, - &h_dirac_output_synthesis_state->cy_auto_diff_smooth[ch_idx * num_freq_bands_diff], - &h_dirac_output_synthesis_state->cy_auto_diff_smooth[ch_idx * num_freq_bands_diff], - num_freq_bands_diff ); + /* compute reference and diffuse power factor for this frame */ + ivas_dirac_dec_compute_power_factors( num_freq_bands, + diffuseness, + h_dirac_output_synthesis_params->max_band_decorr, + h_dirac_output_synthesis_state->direct_power_factor, + h_dirac_output_synthesis_state->diffuse_power_factor ); } - - return; - } - else - { - /* compute reference and diffuse power factor for this frame */ - - ivas_dirac_dec_compute_power_factors( num_freq_bands, - diffuseness, - h_dirac_output_synthesis_params->max_band_decorr, - h_dirac_output_synthesis_state->direct_power_factor, - h_dirac_output_synthesis_state->diffuse_power_factor ); } - } diff_start_band = 0; if ( h_dirac_output_synthesis_params->use_onset_filters ) @@ -696,7 +831,15 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd( float ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i : LS signals */ DIRAC_DEC_HANDLE hDirAC, /* i/o: DirAC handle */ const int16_t nchan_transport, /* i : number of transport channels */ - const float *onset_filter ) +#ifdef JBM_TSM_ON_TCS + const int16_t nbslots, /* i : number of slots to process */ +#endif + const float *onset_filter, +#ifdef JBM_TSM_ON_TCS + const int16_t md_idx, +#endif + const int16_t hodirac_flag /* i : flag to indicate HO-DirAC mode */ +) { int16_t buf_idx, ch_idx, i, l; int16_t num_freq_bands, num_freq_bands_diff; @@ -715,6 +858,9 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd( DIRAC_OUTPUT_SYNTHESIS_STATE h_dirac_output_synthesis_state; int16_t nchan_transport_foa; int16_t ch_idx_diff; + float aux_buf[CLDFB_NO_CHANNELS_MAX]; + float ratio[DIRAC_HO_NUMSECTORS * CLDFB_NO_CHANNELS_MAX]; + const float *diffuseness; /* collect some often used parameters */ h_dirac_output_synthesis_params = hDirAC->h_output_synthesis_psd_params; @@ -728,11 +874,70 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd( num_channels_diff = hDirAC->num_outputs_diff; nchan_transport_foa = min( 4, nchan_transport ); +#ifdef JBM_TSM_ON_TCS + diffuseness = hDirAC->diffuseness_vector[md_idx]; +#else + diffuseness = hDirAC->diffuseness_vector[hDirAC->dirac_read_idx]; +#endif + /*-----------------------------------------------------------------* * comput target Gains *-----------------------------------------------------------------*/ - if ( hDirAC->hConfig->dec_param_estim == FALSE ) + if ( hodirac_flag ) + { + assert( hDirAC->hConfig->dec_param_estim == FALSE ); + /*Direct gain*/ + for ( ch_idx = 0; ch_idx < nchan_transport_foa; ch_idx++ ) + { + v_multc( diffuseness, + 1.f, + &h_dirac_output_synthesis_state.cy_cross_dir_smooth[ch_idx * num_freq_bands], + num_freq_bands ); + v_multc( &h_dirac_output_synthesis_state.cy_cross_dir_smooth[ch_idx * num_freq_bands], + h_dirac_output_synthesis_params.diffuse_compensation_factor - 1.f, + &h_dirac_output_synthesis_state.cy_cross_dir_smooth[ch_idx * num_freq_bands], + num_freq_bands ); + + for ( l = 0; l < num_freq_bands; l++ ) + { + h_dirac_output_synthesis_state.cy_cross_dir_smooth[ch_idx * num_freq_bands + l] = sqrtf( 1.f + h_dirac_output_synthesis_state.cy_cross_dir_smooth[ch_idx * num_freq_bands + l] ); + } + } + + /*Directional gain*/ + for ( ch_idx = nchan_transport_foa; ch_idx < num_channels_dir; ch_idx++ ) + { + for ( l = 0; l < num_freq_bands; l++ ) + { + aux_buf[l] = 1.f - diffuseness[l]; + ratio[l] = 1.f - h_dirac_output_synthesis_state.direct_power_factor[hDirAC->num_freq_bands + l]; + ratio[l + num_freq_bands] = 1.f - ratio[l]; + } + + v_mult( aux_buf, ratio, ratio, num_freq_bands ); + v_mult( aux_buf, &ratio[num_freq_bands], &ratio[num_freq_bands], num_freq_bands ); + + v_mult( ratio, + &h_dirac_output_synthesis_state.direct_responses[ch_idx * num_freq_bands], + &h_dirac_output_synthesis_state.cy_cross_dir_smooth[ch_idx * num_freq_bands], + num_freq_bands ); + v_mult( &ratio[num_freq_bands], + &h_dirac_output_synthesis_state.direct_responses[ch_idx * num_freq_bands + num_freq_bands * num_channels_dir], + &h_dirac_output_synthesis_state.cy_cross_dir_smooth[ch_idx * num_freq_bands + num_freq_bands * num_channels_dir], + num_freq_bands ); + } + + /*Diffuse gain*/ + for ( ch_idx = nchan_transport_foa; ch_idx < num_channels_diff; ch_idx++ ) + { + v_multc( h_dirac_output_synthesis_state.diffuse_power_factor, + hDirAC->diffuse_response_function[ch_idx], + &h_dirac_output_synthesis_state.cy_auto_diff_smooth[ch_idx * num_freq_bands_diff], + num_freq_bands_diff ); + } + } + else if ( hDirAC->hConfig->dec_param_estim == FALSE ) { /*Direct gain*/ for ( ch_idx = 0; ch_idx < nchan_transport_foa; ch_idx++ ) @@ -778,17 +983,35 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd( p_cy_cross_dir_smooth = h_dirac_output_synthesis_state.cy_cross_dir_smooth; p_gains_dir = h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev; - /*Direct gains*/ - for ( ch_idx = 0; ch_idx < nchan_transport_foa; ch_idx++ ) + /* Direct gains */ + if ( hodirac_flag ) { - for ( l = 0; l < num_freq_bands; l++ ) + for ( ch_idx = 0; ch_idx < nchan_transport_foa; ch_idx++ ) { - g1 = 0.3679f + onset_filter[l] * ( 0.1175f - 0.3679f ); - g2 = ( 1.f - g1 ) * *( p_gains_dir ); - g2 += g1 * ( *( p_cy_cross_dir_smooth++ ) ); - g2 = max( g2, 0.85f ); - g2 = min( g2, 1.15f ); - *( p_gains_dir++ ) = g2; + for ( l = 0; l < num_freq_bands; l++ ) + { + g1 = 0.3679f + onset_filter[l] * ( 0.1175f - 0.3679f ); + g2 = ( 1.f - g1 ) * *( p_gains_dir ); + g2 += g1 * ( *( p_cy_cross_dir_smooth++ ) ); + g2 = max( g2, 0.99f ); + g2 = min( g2, 2.0f ); + *( p_gains_dir++ ) = g2; + } + } + } + else + { + for ( ch_idx = 0; ch_idx < nchan_transport_foa; ch_idx++ ) + { + for ( l = 0; l < num_freq_bands; l++ ) + { + g1 = 0.3679f + onset_filter[l] * ( 0.1175f - 0.3679f ); + g2 = ( 1.f - g1 ) * *( p_gains_dir ); + g2 += g1 * ( *( p_cy_cross_dir_smooth++ ) ); + g2 = max( g2, 0.85f ); + g2 = min( g2, 1.15f ); + *( p_gains_dir++ ) = g2; + } } } @@ -806,6 +1029,36 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd( } } + if ( hodirac_flag ) + { + p_cy_cross_dir_smooth = h_dirac_output_synthesis_state.cy_cross_dir_smooth + num_freq_bands * num_channels_dir; + p_gains_dir = h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev + num_freq_bands * num_channels_dir; + + /*Direct gains*/ + for ( ch_idx = 0; ch_idx < nchan_transport_foa; ch_idx++ ) + { + for ( l = 0; l < num_freq_bands; l++ ) + { + p_cy_cross_dir_smooth++; + p_gains_dir++; + } + } + + /*Directional gains*/ + for ( ch_idx = nchan_transport_foa; ch_idx < num_channels_dir; ch_idx++ ) + { + for ( l = 0; l < num_freq_bands; l++ ) + { + g1 = 0.3679f + onset_filter[l] * ( 0.1175f - 0.3679f ); + g2 = ( 1.f - g1 ) * *( p_gains_dir ); + g2 += g1 * ( *( p_cy_cross_dir_smooth++ ) ); + g2 = max( g2, -DIRAC_GAIN_LIMIT ); + g2 = min( g2, DIRAC_GAIN_LIMIT ); + *( p_gains_dir++ ) = g2; + } + } + } + /*Diffuse gains*/ p_cy_auto_diff_smooth = h_dirac_output_synthesis_state.cy_auto_diff_smooth + nchan_transport_foa * num_freq_bands_diff; p_gains_diff = h_dirac_output_synthesis_state.cy_auto_diff_smooth_prev + nchan_transport_foa * num_freq_bands_diff; @@ -826,7 +1079,11 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd( * gain interpolation and output streams *-----------------------------------------------------------------*/ +#ifdef JBM_TSM_ON_TCS + for ( buf_idx = 0; buf_idx < nbslots; ++buf_idx ) +#else for ( buf_idx = 0; buf_idx < hDirAC->subframe_nbslots; ++buf_idx ) +#endif { g1 = h_dirac_output_synthesis_params.interpolator[buf_idx]; g2 = 1.f - g1; @@ -848,26 +1105,74 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd( /*Directional stream*/ for ( ch_idx = nchan_transport_foa; ch_idx < num_channels_dir; ch_idx++ ) { - p_proto = h_dirac_output_synthesis_state.proto_direct_buffer_f + - buf_idx * 2 * num_freq_bands * num_protos_dir + - proto_direct_index[ch_idx] * 2 * num_freq_bands; - if ( proto_direct_index[ch_idx] == 0 ) + if ( hodirac_flag ) { - for ( l = 0; l < num_freq_bands; l++ ) + if ( proto_direct_index[ch_idx] == 0 ) + { + float *p_proto2; + float gs1, gs2; + p_proto = h_dirac_output_synthesis_state.proto_direct_buffer_f + + buf_idx * 2 * num_freq_bands * num_protos_dir + + proto_direct_index[0] * 2 * num_freq_bands; + p_proto2 = h_dirac_output_synthesis_state.proto_direct_buffer_f + + buf_idx * 2 * num_freq_bands * num_protos_dir + + proto_direct_index[1] * 2 * num_freq_bands; + for ( l = 0; l < num_freq_bands; l++ ) + { + gs1 = g1 * ( *( p_gains_dir ) ) + g2 * ( *( p_gains_dir_prev ) ); + gs2 = g1 * ( *( p_gains_dir + num_freq_bands * num_channels_dir ) ) + g2 * ( *( p_gains_dir_prev + num_freq_bands * num_channels_dir ) ); + p_gains_dir++; + p_gains_dir_prev++; + + output_real[l * num_channels_dir + ch_idx] = 0.5f * gs1 * ( 1.772454e+00f * ( *p_proto ) + 1.023327e+00f * ( *p_proto2 ) ) + // s1 + 0.5f * gs2 * ( 1.772454e+00f * ( *p_proto ) - 1.023327e+00f * ( *p_proto2 ) ); // s2 + p_proto++; + p_proto2++; + output_imag[l * num_channels_dir + ch_idx] = 0.5f * gs1 * ( 1.772454e+00f * ( *p_proto ) + 1.023327e+00f * ( *p_proto2 ) ) + + 0.5f * gs2 * ( 1.772454e+00f * ( *p_proto ) - 1.023327e+00f * ( *p_proto2 ) ); + p_proto++; + p_proto2++; + } + } + else { - g = g1 * ( *( p_gains_dir++ ) ) + g2 * ( *( p_gains_dir_prev++ ) ); - output_real[l * num_channels_dir + ch_idx] = g * ( *( p_proto++ ) ); - output_imag[l * num_channels_dir + ch_idx] = g * ( *( p_proto++ ) ); + p_proto = h_dirac_output_synthesis_state.proto_direct_buffer_f + + buf_idx * 2 * num_freq_bands * num_protos_dir + + proto_direct_index[ch_idx] * 2 * num_freq_bands; + for ( l = 0; l < num_freq_bands; l++ ) + { + p_gains_dir++; + p_gains_dir_prev++; + + + output_real[l * num_channels_dir + ch_idx] = *( p_proto++ ); + output_imag[l * num_channels_dir + ch_idx] = *( p_proto++ ); + } } } else { - for ( l = 0; l < num_freq_bands; l++ ) + p_proto = h_dirac_output_synthesis_state.proto_direct_buffer_f + + buf_idx * 2 * num_freq_bands * num_protos_dir + + proto_direct_index[ch_idx] * 2 * num_freq_bands; + if ( proto_direct_index[ch_idx] == 0 ) + { + for ( l = 0; l < num_freq_bands; l++ ) + { + g = g1 * ( *( p_gains_dir++ ) ) + g2 * ( *( p_gains_dir_prev++ ) ); + output_real[l * num_channels_dir + ch_idx] = g * ( *( p_proto++ ) ); + output_imag[l * num_channels_dir + ch_idx] = g * ( *( p_proto++ ) ); + } + } + else { - p_gains_dir++; - p_gains_dir_prev++; - output_real[l * num_channels_dir + ch_idx] = *( p_proto++ ); - output_imag[l * num_channels_dir + ch_idx] = *( p_proto++ ); + for ( l = 0; l < num_freq_bands; l++ ) + { + p_gains_dir++; + p_gains_dir_prev++; + output_real[l * num_channels_dir + ch_idx] = *( p_proto++ ); + output_imag[l * num_channels_dir + ch_idx] = *( p_proto++ ); + } } } } @@ -885,8 +1190,8 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd( for ( l = 0; l < num_freq_bands_diff; l++ ) { g = g1 * ( *( p_gains_diff++ ) ) + g2 * ( *( p_gains_diff_prev++ ) ); - output_real[l * num_channels_dir + sba_map_tc[ch_idx]] += g * ( *( p_proto++ ) ); /* maps ch_idx 5 to 8 */ - output_imag[l * num_channels_dir + sba_map_tc[ch_idx]] += g * ( *( p_proto++ ) ); + output_real[l * num_channels_dir + hDirAC->sba_map_tc[ch_idx]] += g * ( *( p_proto++ ) ); /* maps ch_idx 5 to 8 */ + output_imag[l * num_channels_dir + hDirAC->sba_map_tc[ch_idx]] += g * ( *( p_proto++ ) ); } } else @@ -950,11 +1255,27 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd( *-----------------------------------------------------------------*/ /* store estimates for next synthesis block */ - mvr2r( h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev, h_dirac_output_synthesis_state.gains_dir_prev, num_freq_bands * num_channels_dir ); + if ( hodirac_flag ) + { + mvr2r( h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev, h_dirac_output_synthesis_state.gains_dir_prev, num_freq_bands * num_channels_dir * DIRAC_HO_NUMSECTORS ); + } + else + { + mvr2r( h_dirac_output_synthesis_state.cy_cross_dir_smooth_prev, h_dirac_output_synthesis_state.gains_dir_prev, num_freq_bands * num_channels_dir ); + } + mvr2r( h_dirac_output_synthesis_state.cy_auto_diff_smooth_prev, h_dirac_output_synthesis_state.gains_diff_prev, num_freq_bands_diff * num_channels_diff ); /* reset values */ - set_zero( h_dirac_output_synthesis_state.cy_cross_dir_smooth, num_freq_bands * num_channels_dir ); + if ( hodirac_flag ) + { + set_zero( h_dirac_output_synthesis_state.cy_cross_dir_smooth, num_freq_bands * num_channels_dir * DIRAC_HO_NUMSECTORS ); + } + else + { + set_zero( h_dirac_output_synthesis_state.cy_cross_dir_smooth, num_freq_bands * num_channels_dir ); + } + set_zero( h_dirac_output_synthesis_state.cy_auto_diff_smooth, num_freq_bands_diff * num_channels_diff ); return; @@ -971,10 +1292,15 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls( float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i : LS signals */ float ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i : LS signals */ DIRAC_DEC_HANDLE hDirAC, /* i/o: DirAC handle */ +#ifdef JBM_TSM_ON_TCS + const int16_t nbslots, /* i : number of slots to process */ + const int16_t diff_md_idx, /* i : md slot idx of diffuseness to use */ +#endif float *reference_power_smooth, float qualityBasedSmFactor ) { - int16_t buf_idx, num_freq_bands, diff_start_band; + int16_t buf_idx, num_freq_bands; + int16_t diff_start_band; int16_t k, l; int16_t nchan_out_woLFE; float *p_power_smooth_prev, *p_power_diff_smooth_prev; @@ -1016,7 +1342,6 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls( /*-----------------------------------------------------------------* * compute target PSDs *-----------------------------------------------------------------*/ - if ( hDirAC->hConfig->enc_param_start_band == 0 ) { diff_start_band = h_dirac_output_synthesis_params->use_onset_filters == 1 ? h_dirac_output_synthesis_params->max_band_decorr : 0; @@ -1044,7 +1369,6 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls( h_dirac_output_synthesis_state->diffuse_responses_square, h_dirac_output_synthesis_state->cy_auto_diff_smooth ); } - /*-----------------------------------------------------------------* * compute variables for stereo transport signal type detection *-----------------------------------------------------------------*/ @@ -1097,7 +1421,14 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls( indexFast = min( l, alphaMaxBinFast ); /* Estimate the smoothness of the directions based on the diffuseness parameter */ + /* TODO: check this, seems buggy in the case of parame estim on the decoder side, + because the pointer here points already to the following subframe, ist this intended?*/ +#ifdef JBM_TSM_ON_TCS + /* Workaround for BE */ + instDirectionSmoothness = 1.0f - hDirAC->diffuseness_vector[diff_md_idx][l]; /* Currently, all subframes have same energy ratio value. */ +#else instDirectionSmoothness = 1.0f - hDirAC->diffuseness_vector[hDirAC->dirac_read_idx][l]; /* Currently, all subframes have same energy ratio value. */ +#endif instDirectionSmoothness = min( max( instDirectionSmoothness, 0.0f ), 1.0f ); /* Average the direction smoothness parameter over time */ @@ -1241,8 +1572,11 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls( /*-----------------------------------------------------------------* * gain interpolation and output streams *-----------------------------------------------------------------*/ - +#ifdef JBM_TSM_ON_TCS + for ( buf_idx = 0; buf_idx < nbslots; ++buf_idx ) +#else for ( buf_idx = 0; buf_idx < hDirAC->subframe_nbslots; ++buf_idx ) +#endif { g1 = h_dirac_output_synthesis_params->interpolator[buf_idx]; g2 = 1.f - g1; @@ -1484,11 +1818,16 @@ 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 */ +#ifdef JBM_TSM_ON_TCS + const int16_t *azimuth, + const int16_t *elevation, + const int16_t md_idx, +#endif const float *surCohRatio, const int16_t shd_rot_max_order, /* i : split-order rotation method */ const float *p_Rmat /* i : rotation matrix */ + , + const int16_t hodirac_flag /* i : flag to indicate HO-DirAC mode */ ) { int16_t k, l; @@ -1497,7 +1836,9 @@ void ivas_dirac_dec_compute_directional_responses( float direct_response_ls[MAX_OUTPUT_CHANNELS]; float direct_response_square[MAX_OUTPUT_CHANNELS]; float *direct_response; +#ifndef JBM_TSM_ON_TCS const int16_t *azimuth, *elevation; +#endif const int16_t *azimuth2, *elevation2; float direct_response_dir2[MAX_OUTPUT_CHANNELS]; float directRatio[MASA_MAXIMUM_DIRECTIONS]; @@ -1518,13 +1859,21 @@ void ivas_dirac_dec_compute_directional_responses( } num_channels_dir = hDirAC->num_outputs_dir; +#ifdef JBM_TSM_ON_TCS + if ( hDirAC->numSimultaneousDirections == 2 ) + { + azimuth2 = hDirAC->azimuth2[md_idx]; + elevation2 = hDirAC->elevation2[md_idx]; + } +#else azimuth = hDirAC->azimuth[hDirAC->dirac_read_idx]; 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]; } +#endif codingBand = -1; assert( num_channels_dir <= MAX_OUTPUT_CHANNELS && "Number of channels is too high" ); @@ -1558,34 +1907,63 @@ void ivas_dirac_dec_compute_directional_responses( if ( hDirAC->panningConf == DIRAC_PANNING_HOA3 ) { set_f( direct_response_hoa, 1.0f, MAX_OUTPUT_CHANNELS ); + set_f( direct_response_dir2, 1.0f, MAX_OUTPUT_CHANNELS ); + if ( p_Rmat != 0 ) { ivas_dirac_dec_get_response_split_order( azimuth[k], elevation[k], direct_response_hoa, shd_rot_max_order, p_Rmat ); + + if ( hodirac_flag ) + { + ivas_dirac_dec_get_response_split_order( azimuth2[k], elevation2[k], direct_response_dir2, shd_rot_max_order, p_Rmat ); + } } else { ivas_dirac_dec_get_response( azimuth[k], elevation[k], direct_response_hoa, hDirAC->hOutSetup.ambisonics_order ); + + if ( hodirac_flag ) + { + ivas_dirac_dec_get_response( azimuth2[k], elevation2[k], direct_response_dir2, hDirAC->hOutSetup.ambisonics_order ); + } } if ( hMasa == NULL && hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) { mvr2r_inc( direct_response_hoa, 1, &hDirAC->h_output_synthesis_psd_state.direct_responses[k], hDirAC->num_freq_bands, num_channels_dir ); + + if ( hodirac_flag ) + { + mvr2r_inc( direct_response_dir2, 1, &hDirAC->h_output_synthesis_psd_state.direct_responses[k + hDirAC->num_freq_bands * num_channels_dir], hDirAC->num_freq_bands, num_channels_dir ); + } } else if ( ( ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) && ( hMasa != NULL ) ) || 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 ); - +#ifdef JBM_TSM_ON_TCS + spreadCoherencePanningHoa( azimuth[k], elevation[k], hDirAC->spreadCoherence[md_idx][k], direct_response_hoa, num_channels_dir, hDirAC->hOutSetup.ambisonics_order ); +#else + spreadCoherencePanningHoa( azimuth[k], elevation[k], hDirAC->spreadCoherence[hDirAC->dirac_read_idx][k], direct_response_hoa, num_channels_dir, hDirAC->hOutSetup.ambisonics_order ); +#endif /* 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 ); - +#ifdef JBM_TSM_ON_TCS + spreadCoherencePanningHoa( azimuth2[k], elevation2[k], hDirAC->spreadCoherence2[md_idx][k], direct_response_dir2, num_channels_dir, hDirAC->hOutSetup.ambisonics_order ); +#else + spreadCoherencePanningHoa( azimuth2[k], elevation2[k], hDirAC->spreadCoherence2[hDirAC->dirac_read_idx][k], direct_response_dir2, num_channels_dir, hDirAC->hOutSetup.ambisonics_order ); +#endif /* 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; +#ifdef JBM_TSM_ON_TCS + totalDirect = hDirAC->energy_ratio1[md_idx][k] + hDirAC->energy_ratio2[md_idx][k] + EPSILON; + directRatio[0] = hDirAC->energy_ratio1[md_idx][k] / totalDirect; + directRatio[1] = hDirAC->energy_ratio2[md_idx][k] / totalDirect; +#else + 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; +#endif for ( l = 0; l < num_channels_dir; l++ ) { direct_response_hoa[l] *= directRatio[0]; @@ -1633,20 +2011,33 @@ 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 ); +#ifdef JBM_TSM_ON_TCS + spreadCoherencePanningVbap( azimuth[k], elevation[k], hDirAC->spreadCoherence[md_idx][k], direct_response_ls, num_channels_dir, hVBAPdata ); +#else + spreadCoherencePanningVbap( azimuth[k], elevation[k], hDirAC->spreadCoherence[hDirAC->dirac_read_idx][k], direct_response_ls, num_channels_dir, hVBAPdata ); +#endif 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 ); - +#ifdef JBM_TSM_ON_TCS + spreadCoherencePanningVbap( azimuth2[k], elevation2[k], hDirAC->spreadCoherence2[md_idx][k], direct_response_dir2, num_channels_dir, hVBAPdata ); +#else + spreadCoherencePanningVbap( azimuth2[k], elevation2[k], hDirAC->spreadCoherence2[hDirAC->dirac_read_idx][k], direct_response_dir2, num_channels_dir, hVBAPdata ); +#endif 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; +#ifdef JBM_TSM_ON_TCS + totalDirect = hDirAC->energy_ratio1[md_idx][k] + hDirAC->energy_ratio2[md_idx][k] + EPSILON; + directRatio[0] = hDirAC->energy_ratio1[md_idx][k] / totalDirect; + directRatio[1] = hDirAC->energy_ratio2[md_idx][k] / totalDirect; +#else + 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; +#endif for ( l = 0; l < num_channels_dir; l++ ) { direct_response_ls[l] *= directRatio[0]; diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c old mode 100755 new mode 100644 index c0f073af4b1ffb4f3bdad13b712f84c37396aa5b..98ddbe5ec8e1b18ef076c4a66ff63e48a3c7579c --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -63,6 +63,11 @@ static ivas_error doSanityChecks_IVAS( Decoder_Struct *st_ivas ); ivas_error ivas_dec_setup( Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ +#ifdef JBM_TSM_ON_TCS + , + uint16_t *nSamplesRendered, /* o : number of samples flushed from the previous frame (JBM) */ + int16_t *data /* o : flushed PCM samples */ +#endif ) { int16_t k, idx, num_bits_read; @@ -110,25 +115,18 @@ ivas_error ivas_dec_setup( k--; } -#ifdef NCHAN_ISM_PARAMETER st_ivas->nchan_ism = nchan_ism; -#endif -#ifdef DISCRETE_ISM_DTX_CNG -#ifdef NCHAN_ISM_PARAMETER - if ( ( error = ivas_ism_dec_config( st_ivas, st_ivas->ism_mode ) ) != IVAS_ERR_OK ) -#else - if ( ( error = ivas_ism_dec_config( st_ivas, st_ivas->ism_mode, nchan_ism ) ) != IVAS_ERR_OK ) -#endif +#ifdef JBM_TSM_ON_TCS + if ( ( error = ivas_ism_dec_config( st_ivas, st_ivas->ism_mode, nSamplesRendered, data ) ) != IVAS_ERR_OK ) { return error; } #else -#ifdef NCHAN_ISM_PARAMETER - ivas_ism_dec_config( st_ivas ); -#else - ivas_ism_dec_config( st_ivas, nchan_ism ); -#endif + if ( ( error = ivas_ism_dec_config( st_ivas, st_ivas->ism_mode ) ) != IVAS_ERR_OK ) + { + return error; + } #endif } else if ( st_ivas->ivas_format == SBA_FORMAT ) @@ -203,7 +201,11 @@ ivas_error ivas_dec_setup( num_bits_read += MC_LS_SETUP_BITS; /* select MC format mode; reconfigure the MC format decoder */ +#ifdef JBM_TSM_ON_TCS + ivas_mc_dec_config( st_ivas, idx, nSamplesRendered, data ); +#else ivas_mc_dec_config( st_ivas, idx ); +#endif } /*-------------------------------------------------------------------* @@ -242,11 +244,9 @@ ivas_error ivas_dec_setup( case SID_MDCT_STEREO: st_ivas->element_mode_init = IVAS_CPE_MDCT; break; -#ifdef DISCRETE_ISM_DTX_CNG case SID_ISM: st_ivas->element_mode_init = IVAS_SCE; break; -#endif case SID_MASA_1TC: st_ivas->element_mode_init = IVAS_SCE; st_ivas->nchan_transport = 1; @@ -274,10 +274,7 @@ ivas_error ivas_dec_setup( { int16_t nchan_transport_old, nchan_transport; SBA_MODE sba_mode_old; - 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 ); + sba_mode_old = ivas_sba_mode_select(); nchan_transport_old = st_ivas->nchan_transport; nchan_transport = ( st_ivas->sid_format == SID_SBA_2TC ) ? 2 : 1; @@ -390,6 +387,18 @@ static ivas_error ivas_read_format( case 2: st_ivas->ivas_format = ISM_FORMAT; + if ( ivas_total_brate >= IVAS_24k4 ) + { + if ( st_ivas->bit_stream[*num_bits_read] ) + { + /* placeholder for combined format signaling */ + + ( *num_bits_read )++; + } + + ( *num_bits_read )++; + } + break; case 3: if ( st_ivas->bit_stream[*num_bits_read] ) @@ -399,8 +408,7 @@ static ivas_error ivas_read_format( else { st_ivas->ivas_format = SBA_FORMAT; - - st_ivas->sba_mode = ivas_sba_mode_select( ivas_total_brate ); + st_ivas->sba_mode = ivas_sba_mode_select(); } ( *num_bits_read )++; break; @@ -426,27 +434,7 @@ static ivas_error ivas_read_format( break; case SID_ISM: st_ivas->ivas_format = ISM_FORMAT; -#ifndef DISCRETE_ISM_DTX_CNG - if ( st_ivas->ism_mode == ISM_MODE_DISC ) - { - ivas_ism_dec_config( st_ivas -#ifndef NCHAN_ISM_PARAMETER - , - 1 -#endif - ); /* currently DTX supported for 1 ISM when ISM Mode is DISC_ISM */ - } - if ( st_ivas->ism_mode == ISM_MODE_PARAM ) - { - ivas_ism_dec_config( st_ivas -#ifndef NCHAN_ISM_PARAMETER - , - st_ivas->nSCE -#endif - ); /* for Param-ISM, we need to generate 2 TCs */ - } -#endif break; case SID_MULTICHANNEL: st_ivas->ivas_format = MC_FORMAT; @@ -532,28 +520,10 @@ int16_t getNumChanSynthesis( { n = CPE_CHANNELS; } -#ifdef SBA_HPF_TUNING_DEC - else if ( st_ivas->ivas_format == SBA_FORMAT ) - { - if ( st_ivas->sba_analysis_order > 1 ) - { - n = 0; - } - else - { - n = st_ivas->nchan_transport; - } - } - else if ( st_ivas->hMCT != NULL ) - { - n = st_ivas->nchan_transport; - } -#else else if ( st_ivas->hMCT != NULL || st_ivas->ivas_format == SBA_FORMAT ) { n = st_ivas->nchan_transport; } -#endif return n; } @@ -793,6 +763,12 @@ ivas_error ivas_init_decoder( if ( st_ivas->hDecoderConfig->Opt_Headrotation ) { +#ifdef FIX_439_OTR_PARAMS + if ( ( error = ivas_orient_trk_SetTrackingType( st_ivas->hHeadTrackData->OrientationTracker, st_ivas->hDecoderConfig->orientation_tracking ) ) != IVAS_ERR_OK ) + { + return error; + } +#else 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 ) @@ -832,6 +808,7 @@ ivas_error ivas_init_decoder( { return IVAS_ERR_WRONG_MODE; } +#endif } /*-----------------------------------------------------------------* @@ -888,10 +865,8 @@ 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; -#ifdef FIX_379_EXT_METADATA st_ivas->ism_extmeta_active = -1; st_ivas->ism_extmeta_cnt = 0; -#endif if ( st_ivas->ism_mode == ISM_MODE_PARAM ) { @@ -918,11 +893,11 @@ ivas_error ivas_init_decoder( reset_indices_dec( st_ivas->hSCE[sce_id]->hCoreCoder[0] ); -#ifdef DISCRETE_ISM_DTX_CNG st_ivas->hSCE[sce_id]->hCoreCoder[0]->is_ism_format = 1; -#endif } + st_ivas->hISMDTX.sce_id_dtx = 0; + 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; @@ -960,7 +935,16 @@ ivas_error ivas_init_decoder( } } - 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 ) + 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_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order ) ? IVAS_MAX_NUM_BANDS : ( IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ) ) ) != IVAS_ERR_OK ) { return error; } @@ -983,15 +967,18 @@ ivas_error ivas_init_decoder( 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 ); + if ( ivas_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order ) ) + { + st_ivas->hSpar->enc_param_start_band = 0; + + set_c( (int8_t *) st_ivas->hQMetaData->twoDirBands, (int8_t) 1, st_ivas->hQMetaData->q_direction[0].cfg.nbands ); + st_ivas->hQMetaData->numTwoDirBands = (uint8_t) st_ivas->hQMetaData->q_direction[0].cfg.nbands; + } 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 ); } -#ifdef SBA2MONO st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas ); -#else - st_ivas->sba_dirac_stereo_flag = ( output_config == AUDIO_CONFIG_STEREO ); -#endif } else /* SBA_MODE_DIRAC */ { @@ -1000,11 +987,7 @@ ivas_error ivas_init_decoder( return error; } -#ifdef SBA2MONO st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas ); -#else - st_ivas->sba_dirac_stereo_flag = ( st_ivas->nchan_transport == 1 && output_config == AUDIO_CONFIG_STEREO ); -#endif } } @@ -1041,11 +1024,7 @@ ivas_error ivas_init_decoder( } /* create CPE element for DFT Stereo like upmix */ -#ifdef SBA2MONO if ( st_ivas->sba_dirac_stereo_flag && st_ivas->nCPE == 0 ) -#else - if ( st_ivas->sba_dirac_stereo_flag && st_ivas->nchan_transport == 1 ) -#endif { if ( ( error = create_cpe_dec( st_ivas, cpe_id, ivas_total_brate / ( st_ivas->nSCE + st_ivas->nCPE ) ) ) != IVAS_ERR_OK ) { @@ -1065,28 +1044,7 @@ ivas_error ivas_init_decoder( } /* set CNA/CNG flags */ -#ifdef FIX_386_CORECODER_RECONFIG ivas_sba_set_cna_cng_flag( st_ivas ); -#else - 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; - } - } -#endif } else if ( st_ivas->ivas_format == MC_FORMAT ) { @@ -1125,6 +1083,46 @@ ivas_error ivas_init_decoder( return error; } } + else if ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) + { + /* init EFAP for custom LS setup */ + if ( output_config == AUDIO_CONFIG_LS_CUSTOM ) + { + if ( ( error = efap_init_data( &( st_ivas->hEFAPdata ), st_ivas->hLsSetupCustom->ls_azimuth, st_ivas->hLsSetupCustom->ls_elevation, st_ivas->hLsSetupCustom->num_spk, EFAP_MODE_EFAP ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + st_ivas->nSCE = 0; + st_ivas->nCPE = MC_PARAMUPMIX_MAX_TRANSPORT_CHANS / 2; + st_ivas->nchan_transport = MC_PARAMUPMIX_MAX_TRANSPORT_CHANS; + + if ( ( error = ivas_mc_paramupmix_dec_open( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + + st_ivas->element_mode_init = IVAS_CPE_MDCT; + + 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 - 1 ) * CPE_CHANNELS ) ) ) != IVAS_ERR_OK ) + { + return error; + } + + for ( n = 0; n < CPE_CHANNELS; n++ ) + { + reset_indices_dec( st_ivas->hCPE[cpe_id]->hCoreCoder[n] ); + } + } + + if ( ( error = create_mct_dec( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + } else if ( st_ivas->mc_mode == MC_MODE_PARAMMC ) { /* init EFAP for custom LS setup */ @@ -1178,11 +1176,7 @@ ivas_error ivas_init_decoder( return error; } -#ifdef SBA2MONO st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas ); -#else - st_ivas->sba_dirac_stereo_flag = ( st_ivas->nchan_transport == 1 && output_config == AUDIO_CONFIG_STEREO ); -#endif if ( st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_MCMASA_MONO_STEREO ) { @@ -1319,6 +1313,7 @@ ivas_error ivas_init_decoder( } else if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD ) { + if ( ( error = ivas_td_binaural_open( st_ivas ) ) != IVAS_ERR_OK ) { return error; @@ -1331,6 +1326,19 @@ ivas_error ivas_init_decoder( return error; } } +#ifdef JBM_TSM_ON_TCS + if ( st_ivas->hDecoderConfig->voip_active ) + { + int16_t granularity; + int16_t n_channels_transport_jbm; + granularity = NS2SA( st_ivas->hDecoderConfig->output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES ); + n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels( st_ivas ); + if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, granularity ) ) != IVAS_ERR_OK ) + { + return error; + } + } +#endif } else if ( st_ivas->renderer_type == RENDERER_MC ) { @@ -1363,11 +1371,25 @@ ivas_error ivas_init_decoder( } st_ivas->binaural_latency_ns = st_ivas->hCrendWrapper->binaural_latency_ns; +#ifdef JBM_TSM_ON_TCS + if ( st_ivas->hDecoderConfig->voip_active ) + { + int16_t granularity; + int16_t n_channels_transport_jbm; + granularity = NS2SA( st_ivas->hDecoderConfig->output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES ); + n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels( st_ivas ); + if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, granularity ) ) != IVAS_ERR_OK ) + { + return error; + } + } +#endif } if ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_DISC && ( st_ivas->renderer_type == RENDERER_TD_PANNING || + st_ivas->renderer_type == RENDERER_NON_DIEGETIC_DOWNMIX || st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM || @@ -1382,8 +1404,7 @@ ivas_error ivas_init_decoder( /*-----------------------------------------------------------------* * LFE handles for rendering after rendering to adjust LFE delay to binaural filter delay *-----------------------------------------------------------------*/ - - if ( st_ivas->mc_mode == MC_MODE_MCT ) + if ( st_ivas->mc_mode == MC_MODE_MCT || st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) { binauralization_delay_ns = st_ivas->binaural_latency_ns; if ( st_ivas->hBinRenderer != NULL ) @@ -1404,14 +1425,6 @@ ivas_error ivas_init_decoder( return error; } -#ifndef ISSUE_24_CLEANUP_MCT_LFE - /* 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]; -#endif set_zero( st_ivas->hLFE->prevsynth_buf, LFE_PLC_BUFLEN ); set_zero( st_ivas->hLFE->prior_out_buffer, L_FRAME48k ); } @@ -1447,11 +1460,7 @@ ivas_error ivas_init_decoder( } /* CLDFB Interpolation weights */ -#ifdef SBA2MONO 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 ) -#else - if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR && !st_ivas->sba_dirac_stereo_flag ) -#endif { ivas_spar_get_cldfb_gains( st_ivas->hSpar, st_ivas->cldfbAnaDec[0], st_ivas->cldfbSynDec[0], hDecoderConfig ); } @@ -1465,9 +1474,32 @@ ivas_error ivas_init_decoder( return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Failed to open limiter handle" ); } +#ifdef JBM_TSM_ON_TCS + if ( st_ivas->hDecoderConfig->voip_active && st_ivas->hTcBuffer == NULL ) + { + /* no module has yet open the TC buffer, open a default one */ + int16_t n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels( st_ivas ); + if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, ivas_jbm_dec_get_tc_buffer_mode( st_ivas ), n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK ) + { + return error; + } + } + if ( st_ivas->hTcBuffer == NULL ) + { + /* we need the handle anyway, but without the buffer*/ + if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_NONE, 0, 0, 0, 1 ) ) != IVAS_ERR_OK ) + { + return error; + } + } +#endif + return error; } +#ifdef JBM_TSM_ON_TCS + +#endif /*------------------------------------------------------------------------- * destroy_core_dec() @@ -1571,11 +1603,7 @@ void destroy_core_dec( hCoreCoder->hTcxDec = NULL; } - if ( hCoreCoder->hTcxCfg != NULL -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && hCoreCoder->mct_chan_mode != MCT_CHAN_MODE_LFE -#endif - ) + if ( hCoreCoder->hTcxCfg != NULL ) { free( hCoreCoder->hTcxCfg ); hCoreCoder->hTcxCfg = NULL; @@ -1665,6 +1693,7 @@ void ivas_initialize_handles_dec( st_ivas->hMasa = NULL; st_ivas->hQMetaData = NULL; st_ivas->hMCT = NULL; + st_ivas->hMCParamUpmix = NULL; st_ivas->hParamMC = NULL; st_ivas->hLFE = NULL; @@ -1689,6 +1718,10 @@ void ivas_initialize_handles_dec( st_ivas->hLsSetupCustom = NULL; st_ivas->hRenderConfig = NULL; +#ifdef JBM_TSM_ON_TCS + st_ivas->hTcBuffer = NULL; +#endif + return; } @@ -1766,6 +1799,9 @@ void ivas_destroy_dec( /* ISM renderer handle */ if ( st_ivas->hIsmRendererData != NULL ) { +#ifdef JBM_TSM_ON_TCS + free( st_ivas->hIsmRendererData->interpolator ); +#endif free( st_ivas->hIsmRendererData ); st_ivas->hIsmRendererData = NULL; } @@ -1802,6 +1838,9 @@ void ivas_destroy_dec( /* LFE handle */ ivas_lfe_dec_close( &( st_ivas->hLFE ) ); + /* Param-Upmix MC handle */ + ivas_mc_paramupmix_dec_close( &( st_ivas->hMCParamUpmix ) ); + /* Parametric MC handle */ ivas_param_mc_dec_close( &st_ivas->hParamMC ); @@ -1876,6 +1915,10 @@ void ivas_destroy_dec( st_ivas->hDecoderConfig = NULL; } +#ifdef JBM_TSM_ON_TCS + ivas_jbm_dec_tc_buffer_close( &st_ivas->hTcBuffer ); +#endif + /* main IVAS handle */ free( st_ivas ); @@ -1884,7 +1927,7 @@ void ivas_destroy_dec( /*-------------------------------------------------------------------* - * ivas_init_dec_get_num_cldfb_analyses() + * ivas_init_dec_get_num_cldfb_instances() * * Return number of CLDFB analysis & synthesis instances *-------------------------------------------------------------------*/ @@ -1919,6 +1962,7 @@ void ivas_init_dec_get_num_cldfb_instances( *numCldfbAnalyses += 2; } break; + case RENDERER_NON_DIEGETIC_DOWNMIX: case RENDERER_MONO_DOWNMIX: if ( st_ivas->ivas_format == ISM_FORMAT ) { @@ -2046,6 +2090,11 @@ void ivas_init_dec_get_num_cldfb_instances( default: assert( 0 && "Renderer not handled for CLDFB reservation." ); } + if ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX && st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_MONO && st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_STEREO ) + { + *numCldfbAnalyses = max( MC_PARAMUPMIX_MIN_CLDFB, *numCldfbAnalyses ); + *numCldfbSyntheses = max( MC_PARAMUPMIX_MIN_CLDFB, *numCldfbSyntheses ); + } return; } @@ -2080,6 +2129,12 @@ static ivas_error doSanityChecks_IVAS( assert( st_ivas->ivas_format != UNDEFINED_FORMAT && "\n IVAS format undefined" ); assert( st_ivas->ivas_format != MONO_FORMAT && "\n Wrong IVAS format: MONO" ); + /* Verify output configuration compatible with non-diegetic panning */ + if ( st_ivas->hDecoderConfig->Opt_non_diegetic_pan && ( st_ivas->ivas_format != MONO_FORMAT ) && ( st_ivas->transport_config != AUDIO_CONFIG_ISM1 ) ) + { + return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Error: Non-diegetic panning not supported in this IVAS format" ); + } + /* Verify stereo output configuration */ if ( st_ivas->ivas_format == STEREO_FORMAT ) { @@ -2129,7 +2184,7 @@ static ivas_error doSanityChecks_IVAS( } #ifdef DEBUGGING - 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 ) ) ) + 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 && st_ivas->mc_mode != MC_MODE_PARAMUPMIX ) ) ) ) { return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Incorrect output configuration: Time Domain object renderer not supported in this configuration" ); } diff --git a/lib_dec/ivas_ism_dec.c b/lib_dec/ivas_ism_dec.c index e6571e83d9370369c73086286d6f7e0b145a9255..34645b07df8fd4fe711edcfc7c073f0dc5675597 100644 --- a/lib_dec/ivas_ism_dec.c +++ b/lib_dec/ivas_ism_dec.c @@ -32,6 +32,9 @@ #include #include "options.h" +#ifdef JBM_TSM_ON_TCS +#include "prot.h" +#endif #include "ivas_prot.h" #include "ivas_prot_rend.h" #ifdef DEBUGGING @@ -39,7 +42,6 @@ #endif #include "wmc_auto.h" - /*-------------------------------------------------------------------------* * ivas_ism_bitrate_switching() * @@ -50,26 +52,40 @@ 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 */ -#ifndef NCHAN_ISM_PARAMETER +#ifdef JBM_TSM_ON_TCS , - const int16_t num_obj /* i : number of objects in the bitstream */ + uint16_t *nSamplesRendered, + int16_t *data #endif ) { ivas_error error; int32_t element_brate_tmp[MAX_NUM_OBJECTS]; int16_t nSCE_old, nCPE_old; + int16_t numCldfbAnalyses_old, numCldfbSyntheses_old, ism_mode; + +#ifdef JBM_TSM_ON_TCS + TC_BUFFER_MODE tc_buffer_mode_new; + int16_t tc_nchan_tc_new; + int16_t tc_nchan_allocate_new; + int16_t tc_granularity_new; + AUDIO_CONFIG intern_config_old; + IVAS_OUTPUT_SETUP hIntSetupOld; + RENDERER_TYPE renderer_type_old; +#endif error = IVAS_ERR_OK; nCPE_old = st_ivas->nCPE; nSCE_old = st_ivas->nSCE; -#ifdef NCHAN_ISM_PARAMETER - 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 ) -#else - if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, num_obj, NULL, NULL, NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK ) -#endif + /* 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; + + if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->nchan_ism, NULL, 0, NULL, NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK ) { return error; } @@ -94,6 +110,14 @@ static ivas_error ivas_ism_bitrate_switching( return error; } +#ifdef JBM_TSM_ON_TCS + /* save old IntSetup, might be needed for JBM flushing...*/ + intern_config_old = st_ivas->intern_config; + hIntSetupOld = st_ivas->hIntSetup; + tc_granularity_new = 1; + renderer_type_old = st_ivas->renderer_type; +#endif + /*-----------------------------------------------------------------* * Initialize the needed renderer struct and destroy the unnecessary renderer struct *-----------------------------------------------------------------*/ @@ -106,6 +130,39 @@ static ivas_error ivas_ism_bitrate_switching( ivas_output_init( &( st_ivas->hIntSetup ), st_ivas->hDecoderConfig->output_config ); } +#ifdef JBM_TSM_ON_TCS + if ( st_ivas->hDecoderConfig->voip_active ) + { + /* transfer subframe info from DirAC or ParamMC to central tc buffer */ + if ( last_ism_mode == ISM_MODE_PARAM && st_ivas->hDirAC != NULL && ( st_ivas->renderer_type != RENDERER_MONO_DOWNMIX && st_ivas->renderer_type != RENDERER_DISABLE ) ) + { + st_ivas->hTcBuffer->nb_subframes = st_ivas->hDirAC->nb_subframes; + st_ivas->hTcBuffer->subframes_rendered = st_ivas->hDirAC->subframes_rendered; + st_ivas->hTcBuffer->num_slots = st_ivas->hDirAC->num_slots; + st_ivas->hTcBuffer->slots_rendered = st_ivas->hDirAC->slots_rendered; + mvs2s( st_ivas->hDirAC->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS ); + } + /* JBM: when granularity goes down (e.g. Discrete ISM with TD Obj Renderer -> ParamISM with binaural fastconv + render what still fits in the new granularity */ + tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, st_ivas->hDecoderConfig->output_Fs ); + if ( tc_granularity_new < st_ivas->hTcBuffer->n_samples_granularity ) + { + if ( ( error = ivas_jbm_dec_flush_renderer( st_ivas, tc_granularity_new, renderer_type_old, intern_config_old, &hIntSetupOld, MC_MODE_NONE, last_ism_mode, nSamplesRendered, data ) ) != IVAS_ERR_OK ) + { + return error; + } + } + /* JBM: when granularity goes up set samples to discard at the beginning of the frame */ + else if ( tc_granularity_new > st_ivas->hTcBuffer->n_samples_granularity ) + { + if ( ( error = ivas_jbm_dec_set_discard_samples( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + } + } +#endif + if ( st_ivas->ism_mode != last_ism_mode ) { /* EFAP handle */ @@ -128,16 +185,29 @@ static ivas_error ivas_ism_bitrate_switching( ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin ); /* Open the TD Binaural renderer */ +#ifdef FIX_462_HRTF_FILE_BR_SWITCH_MEM_ERR + if ( st_ivas->hHrtfTD == NULL || st_ivas->hBinRendererTd == NULL ) + { + if ( ( error = ivas_td_binaural_open( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + } +#else if ( ( error = ivas_td_binaural_open( st_ivas ) ) != IVAS_ERR_OK ) { return error; } +#endif } else { /* close the ISM renderer and reinitialize */ if ( st_ivas->hIsmRendererData != NULL ) { +#ifdef JBM_TSM_ON_TCS + free( st_ivas->hIsmRendererData->interpolator ); +#endif free( st_ivas->hIsmRendererData ); st_ivas->hIsmRendererData = NULL; } @@ -191,6 +261,20 @@ static ivas_error ivas_ism_bitrate_switching( } /* Close the TD Binaural renderer */ +#ifdef FIX_462_HRTF_FILE_BR_SWITCH_MEM_ERR + if ( st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM == TRUE ) + { + if ( st_ivas->hBinRendererTd != NULL ) + { + ivas_td_binaural_close( &st_ivas->hBinRendererTd ); + } + + if ( st_ivas->hHrtfTD != NULL ) + { + st_ivas->hHrtfTD = NULL; + } + } +#else if ( st_ivas->hBinRendererTd != NULL ) { ivas_td_binaural_close( &st_ivas->hBinRendererTd ); @@ -200,12 +284,16 @@ static ivas_error ivas_ism_bitrate_switching( { st_ivas->hHrtfTD = NULL; } +#endif } else { /* Close the ISM renderer */ if ( st_ivas->hIsmRendererData != NULL ) { +#ifdef JBM_TSM_ON_TCS + free( st_ivas->hIsmRendererData->interpolator ); +#endif free( st_ivas->hIsmRendererData ); st_ivas->hIsmRendererData = NULL; } @@ -229,6 +317,59 @@ static ivas_error ivas_ism_bitrate_switching( } } + /*-----------------------------------------------------------------* + * CLDFB instances + *-----------------------------------------------------------------*/ + + if ( ( error = ivas_cldfb_dec_reconfig( st_ivas, nchan_transport_old, numCldfbAnalyses_old, numCldfbSyntheses_old ) ) != IVAS_ERR_OK ) + { + return error; + } + +#ifdef JBM_TSM_ON_TCS + /*-----------------------------------------------------------------* + * Reconfigure TC buffer + *-----------------------------------------------------------------*/ + if ( st_ivas->hDecoderConfig->voip_active == 1 ) + { + int16_t tc_nchan_full_new; + DECODER_TC_BUFFER_HANDLE hTcBuffer; + + hTcBuffer = st_ivas->hTcBuffer; + tc_buffer_mode_new = ivas_jbm_dec_get_tc_buffer_mode( st_ivas ); + tc_nchan_tc_new = ivas_jbm_dec_get_num_tc_channels( st_ivas ); + tc_nchan_allocate_new = tc_nchan_tc_new; + tc_nchan_full_new = tc_nchan_tc_new; + if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC ) + { + tc_nchan_allocate_new = 2 * BINAURAL_CHANNELS; + tc_nchan_full_new = tc_nchan_allocate_new; + } + if ( st_ivas->ism_mode == ISM_MODE_PARAM && ( st_ivas->renderer_type != RENDERER_MONO_DOWNMIX && st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM ) ) + { + tc_nchan_full_new = 0; + } + /* reconfigure buffer */ + if ( hTcBuffer->tc_buffer_mode != tc_buffer_mode_new || hTcBuffer->nchan_transport_jbm != tc_nchan_tc_new || + hTcBuffer->nchan_buffer_full != tc_nchan_full_new || hTcBuffer->nchan_transport_internal != tc_nchan_allocate_new ) + { + if ( ( error = ivas_jbm_dec_tc_buffer_reconfigure( st_ivas, tc_buffer_mode_new, tc_nchan_tc_new, tc_nchan_allocate_new, tc_nchan_full_new, tc_granularity_new ) ) != IVAS_ERR_OK ) + { + return error; + } + } + /* transfer subframe info from central tc buffer to ParamMC or McMASA (DirAC) */ + if ( st_ivas->hDirAC != NULL ) + { + st_ivas->hDirAC->nb_subframes = st_ivas->hTcBuffer->nb_subframes; + st_ivas->hDirAC->subframes_rendered = st_ivas->hTcBuffer->subframes_rendered; + st_ivas->hDirAC->num_slots = st_ivas->hTcBuffer->num_slots; + st_ivas->hDirAC->slots_rendered = st_ivas->hTcBuffer->slots_rendered; + mvs2s( st_ivas->hTcBuffer->subframe_nbslots, st_ivas->hDirAC->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS ); + } + } +#endif + return error; } @@ -242,20 +383,16 @@ static ivas_error ivas_ism_bitrate_switching( ivas_error ivas_ism_dec_config( Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ -#ifdef DISCRETE_ISM_DTX_CNG , const ISM_MODE last_ism_mode /* i/o: last ISM mode */ -#endif -#ifndef NCHAN_ISM_PARAMETER +#ifdef JBM_TSM_ON_TCS , - const int16_t num_obj /* i : number of objects in the bitstream */ + uint16_t *nSamplesRendered, /* o : number of samples flushed when the renderer granularity changes */ + int16_t *data #endif ) { int32_t ivas_total_brate; -#ifndef DISCRETE_ISM_DTX_CNG - ISM_MODE last_ism_mode; -#endif ivas_error error; int16_t nchan_transport_old; @@ -263,17 +400,9 @@ ivas_error ivas_ism_dec_config( ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; -#ifndef DISCRETE_ISM_DTX_CNG - /* store last frame ISM mode */ - last_ism_mode = st_ivas->ism_mode; -#endif /* Assumes that num of input objects are constant */ -#ifdef NCHAN_ISM_PARAMETER nchan_transport_old = st_ivas->nchan_ism; -#else - nchan_transport_old = num_obj; -#endif if ( last_ism_mode == ISM_MODE_PARAM ) { @@ -283,41 +412,28 @@ ivas_error ivas_ism_dec_config( if ( !st_ivas->bfi && ivas_total_brate != IVAS_SID_5k2 && ivas_total_brate != FRAME_NO_DATA ) { /* select ISM format mode */ -#ifdef NCHAN_ISM_PARAMETER st_ivas->ism_mode = ivas_ism_mode_select( st_ivas->nchan_ism, ivas_total_brate ); st_ivas->nchan_transport = st_ivas->nchan_ism; -#else - st_ivas->ism_mode = ivas_ism_mode_select( num_obj, ivas_total_brate ); - - st_ivas->nchan_transport = num_obj; -#endif 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 ) { -#ifdef NCHAN_ISM_PARAMETER st_ivas->hDecoderConfig->nchan_out = st_ivas->nchan_ism; -#else - st_ivas->hDecoderConfig->nchan_out = num_obj; -#endif } } if ( st_ivas->ini_active_frame != 0 ) { /* ISM bit-rate switching */ -#ifndef DISCRETE_ISM_DTX_CNG - if ( st_ivas->hDecoderConfig->last_ivas_total_brate != IVAS_SID_5k2 && st_ivas->hDecoderConfig->last_ivas_total_brate != FRAME_NO_DATA ) -#endif { if ( ( st_ivas->ism_mode != last_ism_mode ) || ( st_ivas->hDecoderConfig->ivas_total_brate != st_ivas->hDecoderConfig->last_ivas_total_brate ) ) { -#ifdef NCHAN_ISM_PARAMETER - if ( ( error = ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode ) ) != IVAS_ERR_OK ) +#ifdef JBM_TSM_ON_TCS + if ( ( error = ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode, nSamplesRendered, data ) ) != IVAS_ERR_OK ) #else - if ( ( error = ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode, num_obj ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode ) ) != IVAS_ERR_OK ) #endif { return error; @@ -328,58 +444,31 @@ ivas_error ivas_ism_dec_config( } else if ( !st_ivas->bfi && ivas_total_brate == IVAS_SID_5k2 ) { -#ifdef DISCRETE_ISM_DTX_CNG -#ifdef NCHAN_ISM_PARAMETER st_ivas->nchan_transport = st_ivas->nchan_ism; -#else - st_ivas->nchan_transport = num_obj; -#endif 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 ) { -#ifdef NCHAN_ISM_PARAMETER st_ivas->hDecoderConfig->nchan_out = st_ivas->nchan_ism; -#else - st_ivas->hDecoderConfig->nchan_out = num_obj; -#endif } } /* ISM mode switching */ if ( st_ivas->ism_mode != last_ism_mode ) { -#ifdef NCHAN_ISM_PARAMETER - if ( ( error = ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode ) ) != IVAS_ERR_OK ) +#ifdef JBM_TSM_ON_TCS + if ( ( error = ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode, nSamplesRendered, data ) ) != IVAS_ERR_OK ) #else - if ( ( error = ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode, num_obj ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode ) ) != IVAS_ERR_OK ) #endif { return error; } } -#else - if ( last_ism_mode == ISM_MODE_PARAM ) - { - nchan_transport_old = MAX_PARAM_ISM_WAVE; - } - else - { -#ifdef NCHAN_ISM_PARAMETER - st_ivas->nchan_transport = st_ivas->nchan_ism; -#else - st_ivas->nchan_transport = num_obj; -#endif - } -#endif } -#ifdef NCHAN_ISM_PARAMETER switch ( st_ivas->nchan_ism ) -#else - switch ( num_obj ) -#endif { case 1: st_ivas->transport_config = AUDIO_CONFIG_ISM1; diff --git a/lib_dec/ivas_ism_dtx_dec.c b/lib_dec/ivas_ism_dtx_dec.c index ef52c082b7330adf6f3b478ca4f0d98f8ef314a1..7c22ff2e9e16aa871944278f3d3eba7dba5df3d6 100644 --- a/lib_dec/ivas_ism_dtx_dec.c +++ b/lib_dec/ivas_ism_dtx_dec.c @@ -40,58 +40,6 @@ #include "wmc_auto.h" -/*-------------------------------------------------------------------* - * 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 */ -) -{ -#ifndef DISCRETE_ISM_DTX_CNG - int32_t ivas_total_brate; -#endif - Decoder_State *st; - - st = st_ivas->hSCE[sce_id]->hCoreCoder[0]; - -#ifndef DISCRETE_ISM_DTX_CNG - ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; - - if ( ( ivas_total_brate == IVAS_SID_5k2 || ivas_total_brate == FRAME_NO_DATA ) ) -#endif - { - /* 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; -#ifdef DISCRETE_ISM_DTX_CNG - st->next_bit_pos = 0; /* note: needed in paramISM -> discISM switching */ -#endif - - 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; - } -#ifndef DISCRETE_ISM_DTX_CNG - else - { - st->cng_ism_flag = 0; - } -#endif - - return; -} - - /*-------------------------------------------------------------------* * ivas_ism_dtx_dec() * @@ -105,36 +53,16 @@ ivas_error ivas_ism_dtx_dec( { int16_t ch, pos, nchan_ism, nchan_ism_prev; int32_t ivas_total_brate; -#ifdef DISCRETE_ISM_DTX_CNG 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; -#endif + Decoder_State *st; ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; -#ifndef DISCRETE_ISM_DTX_CNG - if ( st_ivas->nchan_transport == 1 ) - { - nb_bits_metadata[0] = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC; - return IVAS_ERR_OK; - } -#endif - -#ifdef NCHAN_ISM_PARAMETER nchan_ism_prev = st_ivas->nchan_ism; -#else - if ( st_ivas->ism_mode == ISM_MODE_PARAM ) - { - nchan_ism_prev = st_ivas->hDirAC->hParamIsm->num_obj; - } - else /* ism_mode == ISM_MODE_DISC */ - { - nchan_ism_prev = st_ivas->nchan_transport; - } -#endif if ( !st_ivas->bfi && ivas_total_brate == IVAS_SID_5k2 ) { @@ -147,12 +75,8 @@ ivas_error ivas_ism_dtx_dec( ( nchan_ism )++; pos--; } -#ifdef NCHAN_ISM_PARAMETER st_ivas->nchan_ism = nchan_ism; -#endif -#ifdef DISCRETE_ISM_DTX_CNG pos--; -#endif if ( nchan_ism != nchan_ism_prev ) { @@ -160,7 +84,6 @@ ivas_error ivas_ism_dtx_dec( return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "wrong number of objects signalled!" ); } -#ifdef DISCRETE_ISM_DTX_CNG last_ism_mode = st_ivas->ism_mode; /* read ism_mode */ @@ -172,35 +95,14 @@ ivas_error ivas_ism_dtx_dec( ism_mode_bstr = (ISM_MODE) ( idx + 1 ); st_ivas->ism_mode = ism_mode_bstr; } - -#ifdef NCHAN_ISM_PARAMETER - if ( ( error = ivas_ism_dec_config( st_ivas, last_ism_mode ) ) != IVAS_ERR_OK ) +#ifdef JBM_TSM_ON_TCS + if ( ( error = ivas_ism_dec_config( st_ivas, last_ism_mode, NULL, NULL ) ) != IVAS_ERR_OK ) #else - if ( ( error = ivas_ism_dec_config( st_ivas, last_ism_mode, nchan_ism ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_ism_dec_config( st_ivas, last_ism_mode ) ) != IVAS_ERR_OK ) #endif { return error; } -#else -#ifdef NCHAN_ISM_PARAMETER - ivas_ism_dec_config( st_ivas ); -#else - ivas_ism_dec_config( st_ivas, nchan_ism ); -#endif - - if ( st_ivas->ism_mode == ISM_MODE_PARAM ) - { -#ifdef NCHAN_ISM_PARAMETER - st_ivas->nchan_transport = 2; -#else - st_ivas->hDirAC->hParamIsm->num_obj = nchan_ism; -#endif - } - else /* ism_mode == ISM_MODE_DISC */ - { - st_ivas->nchan_transport = nchan_ism; - } -#endif } else { @@ -208,7 +110,6 @@ ivas_error ivas_ism_dtx_dec( } /* Metadata decoding and dequantization */ -#ifdef DISCRETE_ISM_DTX_CNG 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 ); @@ -221,11 +122,7 @@ ivas_error ivas_ism_dtx_dec( st_ivas->hISMDTX.sce_id_dtx = sce_id_dtx; } -#else - ivas_param_ism_metadata_dtx_dec( st_ivas ); -#endif -#ifdef DISCRETE_ISM_DTX_CNG set_s( md_diff_flag, 1, nchan_ism ); if ( st_ivas->ism_mode == ISM_MODE_PARAM ) @@ -240,29 +137,24 @@ ivas_error ivas_ism_dtx_dec( update_last_metadata( nchan_ism, st_ivas->hIsmMetaData, md_diff_flag ); st_ivas->hISMDTX.ism_dtx_hangover_cnt = 0; -#endif if ( ivas_total_brate == IVAS_SID_5k2 && !st_ivas->bfi ) { for ( ch = 0; ch < st_ivas->nchan_transport; ch++ ) { -#ifdef DISCRETE_ISM_DTX_CNG nb_bits_metadata[ch] = nb_bits_metadata[sce_id_dtx]; -#else - nb_bits_metadata[ch] = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC; -#endif } } -#ifdef DISCRETE_ISM_DTX_CNG if ( !st_ivas->bfi ) -#else - if ( st_ivas->ism_mode == ISM_MODE_PARAM ) -#endif { for ( ch = 0; ch < st_ivas->nchan_transport; ch++ ) { - ivas_ism_preprocessing( st_ivas, ch ); // VE: after the acceptance of switches, replace the function call by its content + 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; + st->L_frame = min( st->L_frame, L_FRAME16k ); /* note: needed for switching from active frame with L_frame=640 to CNG in object with no SID */ } } diff --git a/lib_dec/ivas_ism_metadata_dec.c b/lib_dec/ivas_ism_metadata_dec.c index feccbc9766a28230619be030a1710d57607d6613..e269d1e6041209e0336d7e8df22a5d7f8d46ce47 100644 --- a/lib_dec/ivas_ism_metadata_dec.c +++ b/lib_dec/ivas_ism_metadata_dec.c @@ -37,9 +37,7 @@ #include "ivas_rom_com.h" #include "prot.h" #include "ivas_stat_enc.h" -#ifdef DISCRETE_ISM_DTX_CNG #include -#endif #ifdef DEBUGGING #include "debug.h" #endif @@ -50,11 +48,11 @@ * Local functions *-----------------------------------------------------------------------*/ -static void decode_angle_indices( DEC_CORE_HANDLE st0, ISM_METADATA_ANGLE_HANDLE angle, int16_t *flag_abs_azimuth ); +static void decode_angle_indices( DEC_CORE_HANDLE st0, ISM_METADATA_ANGLE_HANDLE angle, const int16_t non_diegetic_flag, int16_t *flag_abs_azimuth ); + static int16_t decode_radius( DEC_CORE_HANDLE st0, int16_t *last_radius_idx, int16_t *flag_abs_radius ); -#ifdef DISCRETE_ISM_DTX_CNG /*-------------------------------------------------------------------------* * Local constants *-------------------------------------------------------------------------*/ @@ -131,7 +129,6 @@ static void ism_metadata_smooth( return; } -#endif /*-------------------------------------------------------------------------* @@ -141,90 +138,44 @@ static void ism_metadata_smooth( *-------------------------------------------------------------------------*/ ivas_error ivas_ism_metadata_dec( - const int32_t ism_total_brate, /* i : ISM total bitrate */ -#ifdef NCHAN_ISM_PARAMETER - const int16_t nchan_ism, /* i : number of ISM channels */ -#endif - 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 */ -#ifdef DISCRETE_ISM_DTX_CNG - ISM_DTX_DATA_DEC hISMDTX, /* i/o: ISM DTX structure */ -#endif -#ifdef FIX_379_EXT_METADATA + 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*/ -#else - const PARAM_ISM_CONFIG_HANDLE hParamIsm /* i : Param ISM Config Handle */ -#endif ) { 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; -#ifdef FIX_379_EXT_METADATA int16_t ism_extmeta_bitstream; + int16_t non_diegetic_flag_global; float yaw, pitch, radius; -#else - int16_t ism_extended_metadata_flag; -#endif int16_t flag_abs_radius; int16_t flag_abs_orientation; -#ifdef FIX_379_ANGLE int16_t flag_abs_position; int16_t idx_angle1; int16_t idx_angle2; -#else - int16_t idx_azimuth, flag_abs_azimuth; - int16_t idx_elevation; -#endif 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]; -#ifdef NCHAN_ISM_PARAMETER int16_t nbands, nblocks; -#else - int16_t nchan_ism = 0, nbands, nblocks; -#endif -#ifdef DISCRETE_ISM_DTX_CNG int16_t md_diff_flag[MAX_NUM_OBJECTS]; -#endif ivas_error error; push_wmops( "ism_meta_dec" ); -#ifndef DISCRETE_ISM_DTX_CNG - 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 - - pop_wmops(); - return IVAS_ERR_OK; - } -#endif /* initialization */ st0 = hSCE[0]->hCoreCoder[0]; @@ -235,11 +186,8 @@ ivas_error ivas_ism_metadata_dec( bstr_orig = st0->bit_stream; next_bit_pos_orig = st0->next_bit_pos; st0->next_bit_pos = 0; -#ifdef FIX_379_EXT_METADATA ism_extmeta_bitstream = 0; -#else - ism_extended_metadata_flag = 0; -#endif + non_diegetic_flag_global = 0; /* reverse the bitstream for easier reading of indices */ for ( i = 0; i < min( MAX_BITS_METADATA, last_bit_pos ); i++ ) @@ -255,27 +203,14 @@ ivas_error ivas_ism_metadata_dec( * Read ISM common signaling *----------------------------------------------------------------*/ -#ifdef NCHAN_ISM_PARAMETER /* number of objects was read in ivas_dec_setup() */ st0->next_bit_pos += nchan_ism; -#else - /* read number of objects */ - nchan_ism = 1; - while ( get_next_indice( st0, 1 ) == 1 && nchan_ism < MAX_NUM_OBJECTS ) - { - ( nchan_ism )++; - } -#endif ism_mode = ivas_ism_mode_select( nchan_ism, ism_total_brate ); if ( ism_mode == ISM_MODE_PARAM ) { -#ifdef NCHAN_ISM_PARAMETER *nchan_transport = MAX_PARAM_ISM_WAVE; -#else - hParamIsm->num_obj = nchan_ism; -#endif } else if ( ism_mode == ISM_MODE_DISC ) { @@ -291,13 +226,14 @@ ivas_error ivas_ism_metadata_dec( /* read extended metadata presence flag */ if ( ism_total_brate >= ISM_EXTENDED_METADATA_BRATE ) { -#ifdef FIX_379_EXT_METADATA ism_extmeta_bitstream = get_next_indice( st0, ISM_EXTENDED_METADATA_BITS ); -#else - ism_extended_metadata_flag = get_next_indice( st0, ISM_EXTENDED_METADATA_BITS ); -#endif + + /* read global non-diegetic object flag */ + if ( ism_extmeta_bitstream ) + { + non_diegetic_flag_global = get_next_indice( st0, ISM_METADATA_IS_NDP_BITS ); + } } -#ifdef FIX_379_EXT_METADATA /* 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 */ { @@ -313,7 +249,6 @@ ivas_error ivas_ism_metadata_dec( *ism_extmeta_cnt = 0; } } -#endif /* Read ISM present flags (one per object) */ for ( ch = 0; ch < *nchan_transport; ch++ ) @@ -372,111 +307,87 @@ ivas_error ivas_ism_metadata_dec( { nb_bits_start = st0->next_bit_pos; } -#ifdef FIX_379_ANGLE flag_abs_position = 0; -#else - flag_abs_azimuth = 0; -#endif flag_abs_orientation = 0; flag_abs_radius = 0; if ( hIsmMeta[ch]->ism_metadata_flag ) { -#ifdef FIX_379_ANGLE - 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; -#else - decode_angle_indices( st0, &( hIsmMetaData->angle[0] ), &flag_abs_azimuth ); - idx_azimuth = hIsmMetaData->angle[0].last_azimuth_idx; - idx_elevation = hIsmMetaData->angle[0].last_elevation_idx; -#endif - /* Azimuth/Elevation dequantization */ - if ( ism_mode == ISM_MODE_PARAM ) + if ( non_diegetic_flag_global ) { -#ifdef FIX_379_ANGLE - hParamIsm->azi_index[ch] = idx_angle1; - hParamIsm->ele_index[ch] = idx_angle2; -#else - hParamIsm->azi_index[ch] = idx_azimuth; - hParamIsm->ele_index[ch] = idx_elevation; -#endif + /* read non-diegetic flag for each object */ + hIsmMetaData->non_diegetic_flag = get_next_indice( st0, ISM_METADATA_IS_NDP_BITS ); + } + else + { + hIsmMetaData->non_diegetic_flag = 0; } - else /* ISM_MODE_DISC */ + + if ( hIsmMetaData->non_diegetic_flag ) { -#ifdef FIX_379_ANGLE + /* Panning gain decoding */ + decode_angle_indices( st0, &( hIsmMetaData->position_angle ), hIsmMetaData->non_diegetic_flag, &flag_abs_position ); + idx_angle1 = hIsmMetaData->position_angle.last_angle1_idx; + idx_angle2 = 1 << ( ISM_ELEVATION_NBITS - 1 ); + + /* Panning gain 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 ); -#else - hIsmMetaData->azimuth = ism_dequant_meta( idx_azimuth, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS ); - hIsmMetaData->elevation = ism_dequant_meta( idx_elevation, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS ); -#endif + hIsmMetaData->elevation = 0.0f; - /* radius/raw/pitch dequantization */ -#ifdef FIX_379_EXT_METADATA - if ( ism_extmeta_bitstream ) -#else - if ( ism_extended_metadata_flag ) -#endif + /* save for smoothing metadata evolution */ + hIsmMetaData->last_true_azimuth = hIsmMetaData->azimuth; + hIsmMetaData->last_true_elevation = hIsmMetaData->elevation; + } + else + { + decode_angle_indices( st0, &( hIsmMetaData->position_angle ), hIsmMeta[ch]->non_diegetic_flag, &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 ) { -#ifdef FIX_379_ANGLE - 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; -#else - decode_angle_indices( st0, &( hIsmMetaData->angle[1] ), &flag_abs_orientation ); - idx_azimuth = hIsmMetaData->angle[1].last_azimuth_idx; - idx_elevation = hIsmMetaData->angle[1].last_elevation_idx; -#endif -#ifdef FIX_379_EXT_METADATA -#ifdef FIX_379_ANGLE - 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 ); -#else - yaw = ism_dequant_meta( idx_azimuth, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS ); - pitch = ism_dequant_meta( idx_elevation, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS ); -#endif -#else - hIsmMetaData->yaw = ism_dequant_meta( idx_azimuth, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS ); - hIsmMetaData->pitch = ism_dequant_meta( idx_elevation, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS ); -#endif + hParamIsm->azi_index[ch] = idx_angle1; + hParamIsm->ele_index[ch] = idx_angle2; + } + else /* ISM_MODE_DISC */ + { + 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 ); - idx_radius = decode_radius( st0, &hIsmMetaData->last_radius_idx, &flag_abs_radius ); -#ifdef FIX_379_EXT_METADATA - radius = usdequant( idx_radius, ISM_RADIUS_MIN, ISM_RADIUS_DELTA ); -#else - hIsmMetaData->radius = usdequant( idx_radius, ISM_RADIUS_MIN, ISM_RADIUS_DELTA ); -#endif -#ifdef FIX_379_EXT_METADATA - if ( *ism_extmeta_active == 1 ) + /* radius/raw/pitch dequantization */ + if ( ism_extmeta_bitstream ) { - hIsmMetaData->yaw = yaw; - hIsmMetaData->pitch = pitch; - hIsmMetaData->radius = radius; + decode_angle_indices( st0, &( hIsmMetaData->orientation_angle ), hIsmMeta[ch]->non_diegetic_flag, &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; + } } -#endif - } - else - { -#ifdef FIX_379_EXT_METADATA - if ( *ism_extmeta_active == 0 ) + else { - hIsmMetaData->yaw = 0.0f; - hIsmMetaData->pitch = 0.0f; - hIsmMetaData->radius = 1.0f; + if ( *ism_extmeta_active == 0 ) + { + hIsmMetaData->yaw = 0.0f; + hIsmMetaData->pitch = 0.0f; + hIsmMetaData->radius = 1.0f; + } } -#else - hIsmMetaData->radius = 1.0f; -#endif } + /* save for smoothing metadata evolution */ + hIsmMetaData->last_true_azimuth = hIsmMetaData->azimuth; + hIsmMetaData->last_true_elevation = hIsmMetaData->elevation; } -#ifdef DISCRETE_ISM_DTX_CNG - /* save for smoothing metadata evolution */ - hIsmMetaData->last_true_azimuth = hIsmMetaData->azimuth; - hIsmMetaData->last_true_elevation = hIsmMetaData->elevation; -#endif } - /* save number of metadata bits read */ if ( ism_mode == ISM_MODE_DISC ) { @@ -537,17 +448,6 @@ ivas_error ivas_ism_metadata_dec( } else /* BFI */ { -#ifndef NCHAN_ISM_PARAMETER - /* "nchan_ism", "hIsmMeta->azimuth" and "hIsmMeta->elevation" are recycled from the last frame */ - if ( ism_mode == ISM_MODE_PARAM ) - { - nchan_ism = hParamIsm->num_obj; - } - else if ( ism_mode == ISM_MODE_DISC ) - { - nchan_ism = *nchan_transport; - } -#endif for ( ch = 0; ch < nchan_ism; ch++ ) { hIsmMeta[ch]->last_ism_metadata_flag = hIsmMeta[ch]->ism_metadata_flag; @@ -561,24 +461,17 @@ ivas_error ivas_ism_metadata_dec( { hParamIsm->azi_index[ch] = hParamIsm->azi_index[ch] + hParamIsm->last_az_sgn[ch] * hParamIsm->last_az_diff[ch]; hParamIsm->ele_index[ch] = hParamIsm->ele_index[ch] + hParamIsm->last_el_sgn[ch] * hParamIsm->last_el_diff[ch]; -#ifdef FIX_379_ANGLE hIsmMeta[ch]->position_angle.last_angle1_idx = hParamIsm->azi_index[ch]; hIsmMeta[ch]->position_angle.last_angle2_idx = hParamIsm->ele_index[ch]; -#else - hIsmMeta[ch]->angle[0].last_azimuth_idx = hParamIsm->azi_index[ch]; - hIsmMeta[ch]->angle[0].last_elevation_idx = hParamIsm->ele_index[ch]; -#endif } } } -#ifdef DISCRETE_ISM_DTX_CNG 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; } -#endif /*----------------------------------------------------------------* * Configuration and decision about bitrates per channel @@ -586,7 +479,7 @@ ivas_error ivas_ism_metadata_dec( if ( !bfi ) { - 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 ) + if ( ( error = ivas_ism_config( ism_total_brate, *nchan_transport, nchan_ism, hIsmMeta, ism_extmeta_bitstream, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata ) ) != IVAS_ERR_OK ) { return error; } @@ -595,9 +488,9 @@ ivas_error ivas_ism_metadata_dec( { hIsmMeta[ch]->last_ism_metadata_flag = hIsmMeta[ch]->ism_metadata_flag; + hSCE[ch]->hCoreCoder[0]->low_rate_mode = 0; if ( ism_mode == ISM_MODE_DISC ) { - hSCE[ch]->hCoreCoder[0]->low_rate_mode = 0; if ( hIsmMeta[ch]->ism_metadata_flag == 0 && localVAD[ch] == 0 && ism_metadata_flag_global ) { hSCE[ch]->hCoreCoder[0]->low_rate_mode = 1; @@ -636,7 +529,6 @@ ivas_error ivas_ism_metadata_dec( hSCE[ch]->hCoreCoder[0]->bit_stream = hSCE[ch - 1]->hCoreCoder[0]->bit_stream + ( hSCE[ch - 1]->hCoreCoder[0]->total_brate / FRAMES_PER_SEC ); } -#ifdef DISCRETE_ISM_DTX_CNG /*----------------------------------------------------------------* * Updates *----------------------------------------------------------------*/ @@ -644,7 +536,6 @@ ivas_error ivas_ism_metadata_dec( set_s( md_diff_flag, 1, nchan_ism ); update_last_metadata( nchan_ism, hIsmMeta, md_diff_flag ); -#endif for ( ch = 0; ch < *nchan_transport; ch++ ) { @@ -681,35 +572,24 @@ ivas_error ivas_ism_metadata_dec_create( } st_ivas->hIsmMetaData[ch]->last_ism_metadata_flag = 0; -#ifdef FIX_379_ANGLE 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 ); -#else - st_ivas->hIsmMetaData[ch]->angle[0].last_azimuth_idx = 0; - st_ivas->hIsmMetaData[ch]->angle[0].last_elevation_idx = 1 << ( ISM_ELEVATION_NBITS - 1 ); - st_ivas->hIsmMetaData[ch]->angle[1].last_azimuth_idx = 0; - st_ivas->hIsmMetaData[ch]->angle[1].last_elevation_idx = 1 << ( ISM_ELEVATION_NBITS - 1 ); -#endif st_ivas->hIsmMetaData[ch]->last_radius_idx = 8; /* Init to radius 1.0 */ -#ifdef DISCRETE_ISM_DTX_CNG st_ivas->hIsmMetaData[ch]->last_true_azimuth = 0; st_ivas->hIsmMetaData[ch]->last_true_elevation = 0; -#endif ivas_ism_reset_metadata( st_ivas->hIsmMetaData[ch] ); } - 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 ) + if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, n_ISms, n_ISms, NULL, 0, NULL, NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK ) { return error; } -#ifdef DISCRETE_ISM_DTX_CNG st_ivas->hISMDTX.ism_dtx_hangover_cnt = IVAS_ISM_DTX_HO_MAX; -#endif return IVAS_ERR_OK; } @@ -720,11 +600,11 @@ ivas_error ivas_ism_metadata_dec_create( * * Decoding of an angle *-------------------------------------------------------------------------*/ -#ifdef FIX_379_ANGLE static void decode_angle_indices( DEC_CORE_HANDLE st0, /* i/o: bitstream handle */ ISM_METADATA_ANGLE_HANDLE angle, /* i/o: angle handle */ + const int16_t non_diegetic_flag, /* i : Non diegetic flag */ int16_t *flag_abs_angle1 /* o : Azimuth/yaw encoding mode */ ) { @@ -803,207 +683,71 @@ static void decode_angle_indices( * Elevation/pitch decoding and dequantization *----------------------------------------------------------------*/ - /* Decode elevation/pitch index */ - if ( *flag_abs_angle1 == 0 && get_next_indice( st0, 1 ) == 1 ) /* elevation_abs_flag */ + if ( non_diegetic_flag == 0 ) { - idx_angle2 = get_next_indice( st0, ISM_ELEVATION_NBITS ); - } - else - { - diff = 0; - sgn = 1; - - if ( get_next_indice( st0, 1 ) == 0 ) + /* Decode elevation/pitch index */ + if ( *flag_abs_angle1 == 0 && get_next_indice( st0, 1 ) == 1 ) /* elevation_abs_flag */ { - nbits_diff_angle2 = 1; + idx_angle2 = get_next_indice( st0, ISM_ELEVATION_NBITS ); } else { - nbits_diff_angle2 = 1; + diff = 0; + sgn = 1; - if ( get_next_indice( st0, 1 ) == 1 ) /* negative sign */ + if ( get_next_indice( st0, 1 ) == 0 ) { - sgn = -1; + nbits_diff_angle2 = 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 ) + else { - /* count stop bit */ - nbits_diff_angle2++; - } - } - - idx_angle2 = angle->last_angle2_idx + sgn * diff; - } + nbits_diff_angle2 = 1; - /* 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; -} - -#else - -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_azimuth /* o : Azimuth encoding mode */ -) -{ - int16_t idx_azimuth, nbits_diff_azimuth, diff, sgn; - int16_t idx_elevation, nbits_diff_elevation; - - /*----------------------------------------------------------------* - * 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; + } - if ( get_next_indice( st0, 1 ) == 1 ) /* negative sign */ - { - sgn = -1; - } + nbits_diff_angle2++; - nbits_diff_azimuth++; + /* read until the stop bit */ + while ( ( nbits_diff_angle2 < ISM_ELEVATION_NBITS ) && ( get_next_indice( st0, 1 ) == 1 ) ) + { + diff++; + nbits_diff_angle2++; + } - /* 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_angle2 < ISM_ELEVATION_NBITS ) + { + /* count stop bit */ + nbits_diff_angle2++; + } } - if ( nbits_diff_azimuth < ISM_AZIMUTH_NBITS - 1 ) - { - /* count stop bit */ - nbits_diff_azimuth++; - } + idx_angle2 = angle->last_angle2_idx + sgn * diff; } - idx_azimuth = angle->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 = angle->last_azimuth_idx; - } - - /*----------------------------------------------------------------* - * Elevation decoding and dequantization - *----------------------------------------------------------------*/ - - /* 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 ) + /* sanity check in case of FER or BER */ + if ( idx_angle2 < 0 || idx_angle2 > ( 1 << ISM_ELEVATION_NBITS ) - 1 ) { - nbits_diff_elevation = 1; - } - else - { - nbits_diff_elevation = 1; - - if ( get_next_indice( st0, 1 ) == 1 ) /* negative sign */ - { - 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++; - } + idx_angle2 = angle->last_angle2_idx; } - - idx_elevation = angle->last_elevation_idx + sgn * diff; } - - /* sanity check in case of FER or BER */ - if ( idx_elevation < 0 || idx_elevation > ( 1 << ISM_ELEVATION_NBITS ) - 1 ) + else { - idx_elevation = angle->last_elevation_idx; + idx_angle2 = angle->last_angle2_idx; /* second MD parameter is not transmitted for non-diegetic object */ } /*----------------------------------------------------------------* * Final updates *----------------------------------------------------------------*/ - angle->last_azimuth_idx = idx_azimuth; - angle->last_elevation_idx = idx_elevation; + angle->last_angle2_idx = idx_angle2; + angle->last_angle1_idx = idx_angle1; return; } -#endif - /*------------------------------------------------------------------------- * decode_radius() @@ -1074,7 +818,6 @@ static int16_t decode_radius( } -#ifdef DISCRETE_ISM_DTX_CNG /*-------------------------------------------------------------------* * ivas_ism_metadata_sid_dec() * @@ -1157,7 +900,7 @@ void ivas_ism_metadata_sid_dec( *flag_noisy_speech = 0; *sce_id_dtx = 0; - /* write ISM mode flag to explicitly signal number of spatial parameters */ + /* read ISM mode flag to explicitly signal number of spatial parameters */ if ( nchan_ism > 2 ) { idx = get_next_indice( st0, 1 ); @@ -1190,10 +933,6 @@ void ivas_ism_metadata_sid_dec( hSCE[ch]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence = (float) ( idx ) / (float) ( ( 1 << nBits_coh ) - 1 ); } } - else - { - *sce_id_dtx = 0; - } if ( ism_mode == ISM_MODE_PARAM ) { @@ -1207,7 +946,6 @@ void ivas_ism_metadata_sid_dec( for ( ch = 0; ch < nchan_ism; ch++ ) { hIsmMetaData = hIsmMeta[ch]; - if ( md_diff_flag[ch] == 1 ) { /* Azimuth decoding */ @@ -1221,24 +959,13 @@ void ivas_ism_metadata_sid_dec( /* update last indexes to correspond to active frames coding */ if ( nBits_azimuth > ISM_AZIMUTH_NBITS ) { -#ifdef FIX_379_ANGLE 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->angle[0].last_azimuth_idx = idx_azimuth >> ( nBits_azimuth - ISM_AZIMUTH_NBITS ); - hIsmMetaData->angle[0].last_elevation_idx = idx_elevation >> ( nBits_elevation - ISM_ELEVATION_NBITS ); -#endif } else { -#ifdef FIX_379_ANGLE 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 ); -#else - hIsmMetaData->angle[0].last_azimuth_idx = idx_azimuth << ( ISM_AZIMUTH_NBITS - nBits_azimuth ); - hIsmMetaData->angle[0].last_elevation_idx = idx_elevation << ( ISM_ELEVATION_NBITS - nBits_elevation ); - -#endif } /* save for smoothing metadata evolution */ @@ -1260,4 +987,3 @@ void ivas_ism_metadata_sid_dec( return; } -#endif diff --git a/lib_dec/ivas_ism_param_dec.c b/lib_dec/ivas_ism_param_dec.c index f66323d8a4f038b0a054d6678302cc758603f7cd..5236de4109e9a7344cbb722341c74d50b4e183da 100644 --- a/lib_dec/ivas_ism_param_dec.c +++ b/lib_dec/ivas_ism_param_dec.c @@ -51,10 +51,8 @@ static void ivas_param_ism_dec_dequant_DOA( DIRAC_DEC_HANDLE hDirAC /* i/o: decoder DirAC handle */ -#ifdef NCHAN_ISM_PARAMETER , const int16_t nchan_ism /* i : number of ISM channels */ -#endif ) { int16_t i; @@ -62,18 +60,10 @@ static void ivas_param_ism_dec_dequant_DOA( hParamIsm = hDirAC->hParamIsm; -#ifdef NCHAN_ISM_PARAMETER assert( nchan_ism <= MAX_NUM_OBJECTS ); -#else - assert( hParamIsm->num_obj <= MAX_NUM_OBJECTS ); -#endif /* Get the azimuth and elevation values */ -#ifdef NCHAN_ISM_PARAMETER for ( i = 0; i < nchan_ism; i++ ) -#else - for ( i = 0; i < hParamIsm->num_obj; i++ ) -#endif { 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 ); @@ -167,11 +157,135 @@ static void ivas_ism_get_proto_matrix( return; } +#ifdef JBM_TSM_ON_TCS +static void ivas_param_ism_collect_slot( + DIRAC_DEC_HANDLE hDirAC, /* i/o: decoder DirAC handle */ + float *Cldfb_RealBuffer_in, + float *Cldfb_ImagBuffer_in, + const int16_t ch, + float ref_power[], + float cx_diag[][PARAM_ISM_MAX_DMX] ) +{ + + int16_t band_idx, bin_idx; + int16_t brange[2]; + float tmp; + + /* loop over parameter bands to collect transport channel energies */ + 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]; + for ( bin_idx = brange[0]; bin_idx < brange[1]; bin_idx++ ) + { + tmp = 0.0f; + tmp += ( Cldfb_RealBuffer_in[bin_idx] * Cldfb_RealBuffer_in[bin_idx] ); + tmp += ( Cldfb_ImagBuffer_in[bin_idx] * Cldfb_ImagBuffer_in[bin_idx] ); + cx_diag[bin_idx][ch] += tmp; + ref_power[bin_idx] += tmp; + } + } + return; +} static void ivas_param_ism_compute_mixing_matrix( -#ifdef NCHAN_ISM_PARAMETER - const int16_t nchan_ism, /* i : number of ISM channels */ -#endif + 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 direct_response[MAX_NUM_OBJECTS][PARAM_ISM_MAX_CHAN], + const int16_t nchan_transport, + const int16_t nchan_out_woLFE, + float cx_diag[][PARAM_ISM_MAX_DMX], + float ref_power[], + float mixing_matrix[CLDFB_NO_CHANNELS_MAX][PARAM_ISM_MAX_CHAN * PARAM_ISM_MAX_DMX] ) +{ + int16_t band_idx, bin_idx; + int16_t i, w, obj_indx; + int16_t brange[2]; + float direct_power[MAX_NUM_OBJECTS]; + float cy_diag[PARAM_ISM_MAX_CHAN]; + float cy_diag_tmp[MAX_NUM_OBJECTS][PARAM_ISM_MAX_CHAN]; + float *dir_res_ptr; + float *proto_matrix; + float response_matrix[PARAM_ISM_MAX_CHAN * MAX_NUM_OBJECTS]; + int16_t num_wave; + + proto_matrix = hDirAC->hParamIsmRendering->proto_matrix; + + assert( ( nchan_ism == 3 ) || ( nchan_ism == 4 ) ); + assert( nchan_transport == 2 ); + + if ( hDirAC->hParamIsm->flag_noisy_speech || hISMDTX.dtx_flag ) + { + num_wave = nchan_ism; + } + else + { + num_wave = MAX_PARAM_ISM_WAVE; + } + set_zero( response_matrix, PARAM_ISM_MAX_CHAN * MAX_NUM_OBJECTS ); + + /* loop over parameter bands to compute the mixing matrix */ + 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]; + + /* Compute covaraince matrix from direct response*/ + for ( w = 0; w < num_wave; w++ ) + { + set_zero( cy_diag_tmp[w], nchan_out_woLFE ); + + if ( hDirAC->hParamIsm->flag_noisy_speech || hISMDTX.dtx_flag ) + { + dir_res_ptr = direct_response[w]; + } + else + { + obj_indx = hDirAC->hParamIsm->obj_indices[band_idx][0][w]; + dir_res_ptr = direct_response[obj_indx]; + } + mvr2r( dir_res_ptr, response_matrix + w * nchan_out_woLFE, nchan_out_woLFE ); + /* we only need the diagonal of Cy*/ + matrix_product_diag( dir_res_ptr, nchan_out_woLFE, 1, 0, dir_res_ptr, 1, nchan_out_woLFE, 0, cy_diag_tmp[w] ); + } + + for ( bin_idx = brange[0]; bin_idx < brange[1]; bin_idx++ ) + { + + set_zero( cy_diag, nchan_out_woLFE ); + for ( w = 0; w < num_wave; w++ ) + { + if ( hDirAC->hParamIsm->flag_noisy_speech || hISMDTX.dtx_flag ) + { + direct_power[w] = ( 1.0f / nchan_ism ) * ref_power[bin_idx]; + } + else + { + direct_power[w] = hDirAC->power_ratios[band_idx][0][w] * ref_power[bin_idx]; + } + + if ( direct_power[w] != 0.f ) + { + for ( i = 0; i < nchan_out_woLFE; i++ ) + { + cy_diag[i] += direct_power[w] * cy_diag_tmp[w][i]; + } + } + direct_power[w] = sqrtf( direct_power[w] ); + } + /* Compute mixing matrix */ + computeMixingMatricesISM( nchan_transport, num_wave, nchan_out_woLFE, response_matrix, direct_power, cx_diag[bin_idx], cy_diag, proto_matrix, 1, + PARAM_MC_REG_SX, PARAM_MC_REG_GHAT, mixing_matrix[bin_idx] ); + } + } + + return; +} + +#else +static void ivas_param_ism_compute_mixing_matrix( + 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], @@ -198,20 +312,12 @@ static void ivas_param_ism_compute_mixing_matrix( proto_matrix = hDirAC->hParamIsmRendering->proto_matrix; -#ifdef NCHAN_ISM_PARAMETER assert( ( nchan_ism == 3 ) || ( nchan_ism == 4 ) ); -#else - assert( ( hDirAC->hParamIsm->num_obj == 3 ) || ( hDirAC->hParamIsm->num_obj == 4 ) ); -#endif assert( nchan_transport == 2 ); if ( hDirAC->hParamIsm->flag_noisy_speech || hISMDTX.dtx_flag ) { -#ifdef NCHAN_ISM_PARAMETER num_wave = nchan_ism; -#else - num_wave = hDirAC->hParamIsm->num_obj; -#endif } else { @@ -272,11 +378,7 @@ static void ivas_param_ism_compute_mixing_matrix( { if ( hDirAC->hParamIsm->flag_noisy_speech || hISMDTX.dtx_flag ) { -#ifdef NCHAN_ISM_PARAMETER direct_power[w] = ( 1.0f / nchan_ism ) * ref_power; -#else - direct_power[w] = ( 1.0f / hDirAC->hParamIsm->num_obj ) * ref_power; -#endif } else { @@ -300,7 +402,45 @@ static void ivas_param_ism_compute_mixing_matrix( return; } +#endif + +#ifdef JBM_TSM_ON_TCS +static void ivas_param_ism_render_slot( + DIRAC_DEC_HANDLE hDirAC, + float *Cldfb_RealBuffer_in[PARAM_ISM_MAX_DMX], + float *Cldfb_ImagBuffer_in[PARAM_ISM_MAX_DMX], + float Cldfb_RealBuffer[PARAM_ISM_MAX_CHAN][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], + float Cldfb_ImagBuffer[PARAM_ISM_MAX_CHAN][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], + float mixing_matrix[CLDFB_NO_CHANNELS_MAX][PARAM_ISM_MAX_CHAN * PARAM_ISM_MAX_DMX], + const int16_t interpolator_idx, + const int16_t out_slot_idx, + const int16_t num_ch_LS, + const int16_t nchan_transport ) +{ + int16_t outchIdx, inchIdx, bin_idx; + float tmp_1, mixing_matrix_smooth; + + tmp_1 = hDirAC->hParamIsmRendering->interpolator[interpolator_idx]; + + for ( bin_idx = 0; bin_idx < hDirAC->num_freq_bands; bin_idx++ ) + { + /* smooth the mixing matrix */ + for ( outchIdx = 0; outchIdx < num_ch_LS; outchIdx++ ) + { + for ( inchIdx = 0; inchIdx < nchan_transport; inchIdx++ ) + { + mixing_matrix_smooth = tmp_1 * mixing_matrix[bin_idx][outchIdx + inchIdx * num_ch_LS] + + ( 1 - tmp_1 ) * hDirAC->hParamIsmRendering->mixing_matrix_lin_old[bin_idx][outchIdx + inchIdx * num_ch_LS]; + Cldfb_RealBuffer[outchIdx][out_slot_idx][bin_idx] += mixing_matrix_smooth * Cldfb_RealBuffer_in[inchIdx][bin_idx]; + Cldfb_ImagBuffer[outchIdx][out_slot_idx][bin_idx] += mixing_matrix_smooth * Cldfb_ImagBuffer_in[inchIdx][bin_idx]; + } + } + } + + return; +} +#endif static void ivas_param_ism_rendering( DIRAC_DEC_HANDLE hDirAC, @@ -422,9 +562,6 @@ ivas_error ivas_param_ism_dec_open( IVAS_OUTPUT_SETUP hOutSetup; AUDIO_CONFIG output_config; int32_t output_Fs; -#ifndef NCHAN_ISM_PARAMETER - int16_t nchan_out; -#endif ivas_error error; error = IVAS_ERR_OK; @@ -453,31 +590,27 @@ ivas_error ivas_param_ism_dec_open( output_Fs = st_ivas->hDecoderConfig->output_Fs; output_config = st_ivas->hDecoderConfig->output_config; -#ifdef NCHAN_ISM_PARAMETER ivas_param_ism_config( hDirAC->hParamIsm, st_ivas->nchan_ism ); -#else - 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 ); -#endif /*-----------------------------------------------------------------* * set input parameters *-----------------------------------------------------------------*/ hDirAC->slot_size = (int16_t) ( ( output_Fs / FRAMES_PER_SEC ) / CLDFB_NO_COL_MAX ); +#ifdef JBM_TSM_ON_TCS + hDirAC->hConfig = NULL; + set_s( hDirAC->subframe_nbslots, 0, MAX_JBM_SUBFRAMES_5MS ); + set_s( hDirAC->subframe_nbslots, JBM_CLDFB_SLOTS_IN_SUBFRAME, DEFAULT_JBM_SUBFRAMES_5MS ); + hDirAC->nb_subframes = DEFAULT_JBM_SUBFRAMES_5MS; + hDirAC->subframes_rendered = 0; + hDirAC->slots_rendered = 0; + hDirAC->num_slots = DEFAULT_JBM_SUBFRAMES_5MS * JBM_CLDFB_SLOTS_IN_SUBFRAME; +#else hDirAC->subframe_nbslots = (int16_t) ( CLDFB_NO_COL_MAX * 5.f / 20.f + 0.5f ); hDirAC->nb_subframes = CLDFB_NO_COL_MAX / hDirAC->subframe_nbslots; assert( hDirAC->nb_subframes <= MAX_PARAM_SPATIAL_SUBFRAMES ); +#endif hDirAC->num_freq_bands = (int16_t) ( output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ); hDirAC->hParamIsm->nbands = MAX_PARAM_ISM_NBANDS; @@ -500,11 +633,7 @@ ivas_error ivas_param_ism_dec_open( if ( output_config == AUDIO_CONFIG_EXTERNAL ) { /* nchan_out is essential for memory initialization for CLDFB Synthesis */ -#ifdef NCHAN_ISM_PARAMETER st_ivas->hIntSetup.nchan_out_woLFE = st_ivas->nchan_ism; -#else - st_ivas->hIntSetup.nchan_out_woLFE = hDirAC->hParamIsm->num_obj; -#endif st_ivas->hIntSetup.is_loudspeaker_setup = 1; } @@ -513,10 +642,24 @@ ivas_error ivas_param_ism_dec_open( if ( !( output_config == AUDIO_CONFIG_MONO || output_config == AUDIO_CONFIG_STEREO ) ) { /* Initialize Param ISM Rendering handle */ - if ( ( error = ivas_param_ism_rendering_init( hDirAC->hParamIsmRendering, hOutSetup, st_ivas->nchan_transport, CLDFB_NO_COL_MAX, output_config ) ) != IVAS_ERR_OK ) +#ifdef JBM_TSM_ON_TCS + if ( st_ivas->hDecoderConfig->voip_active ) { - return error; + if ( ( error = ivas_param_ism_rendering_init( hDirAC->hParamIsmRendering, hOutSetup, st_ivas->nchan_transport, MAX_JBM_CLDFB_TIMESLOTS, output_config ) ) != IVAS_ERR_OK ) + { + return error; + } } + else + { +#endif + if ( ( error = ivas_param_ism_rendering_init( hDirAC->hParamIsmRendering, hOutSetup, st_ivas->nchan_transport, CLDFB_NO_COL_MAX, output_config ) ) != IVAS_ERR_OK ) + { + return error; + } +#ifdef JBM_TSM_ON_TCS + } +#endif } if ( !( output_config == AUDIO_CONFIG_EXTERNAL || output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM || output_config == AUDIO_CONFIG_MONO || output_config == AUDIO_CONFIG_STEREO ) ) @@ -532,120 +675,82 @@ ivas_error ivas_param_ism_dec_open( set_zero( hDirAC->azimuth_values, MAX_NUM_OBJECTS ); set_zero( hDirAC->elevation_values, MAX_NUM_OBJECTS ); +#ifdef JBM_TSM_ON_TCS + hDirAC->dirac_md_buffer_length = MAX_PARAM_SPATIAL_SUBFRAMES; +#else hDirAC->dirac_md_buffer_length = 0; +#endif hDirAC->dirac_bs_md_write_idx = 0; hDirAC->dirac_read_idx = 0; hDirAC->spar_to_dirac_write_idx = 0; if ( ( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM ) ) { +#ifndef JBM_TSM_ON_TCS hDirAC->dirac_md_buffer_length = MAX_PARAM_SPATIAL_SUBFRAMES; - 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 ) +#endif + if ( ( error = ivas_dirac_allocate_parameters( hDirAC, 1 ) ) != IVAS_ERR_OK ) { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + return error; } - if ( ( hDirAC->spreadCoherence2 = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL ) + if ( ( error = ivas_dirac_allocate_parameters( hDirAC, 2 ) ) != IVAS_ERR_OK ) { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + return error; } + } - 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" ) ); - } + st_ivas->hISMDTX.dtx_flag = 0; - for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) + st_ivas->hDirAC = hDirAC; +#ifdef JBM_TSM_ON_TCS + if ( st_ivas->hDecoderConfig->voip_active ) + { + if ( st_ivas->renderer_type != RENDERER_MONO_DOWNMIX && st_ivas->renderer_type != RENDERER_DISABLE ) { - 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 ); - - 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 ); - - 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 ); - - 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 ); - - if ( ( hDirAC->energy_ratio1[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL ) + int16_t nchan_transport = st_ivas->nchan_transport; + int16_t nchan_full = 0; + if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + nchan_full = nchan_transport; + hDirAC->hParamIsmRendering->Cldfb_RealBuffer_tc = NULL; + hDirAC->hParamIsmRendering->Cldfb_ImagBuffer_tc = NULL; } - set_f( hDirAC->energy_ratio1[i], 0.0f, hDirAC->num_freq_bands ); - - 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 ); - - if ( ( hDirAC->energy_ratio2[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL ) + else { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + hDirAC->hParamIsmRendering->Cldfb_RealBuffer_tc = (float *) malloc( MAX_JBM_CLDFB_TIMESLOTS * nchan_transport * hDirAC->num_freq_bands * sizeof( float ) ); + set_zero( hDirAC->hParamIsmRendering->Cldfb_RealBuffer_tc, MAX_JBM_CLDFB_TIMESLOTS * nchan_transport * hDirAC->num_freq_bands ); + hDirAC->hParamIsmRendering->Cldfb_ImagBuffer_tc = (float *) malloc( MAX_JBM_CLDFB_TIMESLOTS * nchan_transport * hDirAC->num_freq_bands * sizeof( float ) ); + set_zero( hDirAC->hParamIsmRendering->Cldfb_ImagBuffer_tc, MAX_JBM_CLDFB_TIMESLOTS * nchan_transport * hDirAC->num_freq_bands ); } - set_f( hDirAC->energy_ratio2[i], 0.0f, hDirAC->num_freq_bands ); - - if ( ( hDirAC->spreadCoherence2[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL ) + if ( st_ivas->hTcBuffer == NULL ) { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, nchan_transport, nchan_transport, nchan_full, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK ) + { + return error; + } } - set_f( hDirAC->spreadCoherence2[i], 0.0f, hDirAC->num_freq_bands ); - - if ( ( hDirAC->surroundingCoherence[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL ) + } + else + { + hDirAC->hParamIsmRendering->Cldfb_RealBuffer_tc = NULL; + hDirAC->hParamIsmRendering->Cldfb_ImagBuffer_tc = NULL; + if ( st_ivas->hTcBuffer == NULL ) { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + int16_t nchan_to_allocate = st_ivas->hDecoderConfig->nchan_out; + if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_BUFFER, nchan_to_allocate, nchan_to_allocate, nchan_to_allocate, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK ) + { + return error; + } } - set_f( hDirAC->surroundingCoherence[i], 0.0f, hDirAC->num_freq_bands ); } } - - st_ivas->hISMDTX.dtx_flag = 0; - - st_ivas->hDirAC = hDirAC; + else + { + hDirAC->hParamIsmRendering->Cldfb_RealBuffer_tc = NULL; + hDirAC->hParamIsmRendering->Cldfb_ImagBuffer_tc = NULL; + } +#endif pop_wmops(); return error; @@ -663,7 +768,6 @@ void ivas_param_ism_dec_close( AUDIO_CONFIG output_config /* i : output audio configuration */ ) { - int16_t i; DIRAC_DEC_HANDLE hDirAC; if ( hDirAC_out == NULL || *hDirAC_out == NULL ) @@ -682,145 +786,37 @@ void ivas_param_ism_dec_close( if ( ( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM ) ) { - for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) - { - if ( hDirAC->azimuth[i] != NULL ) - { - free( hDirAC->azimuth[i] ); - hDirAC->azimuth[i] = NULL; - } - - if ( hDirAC->elevation[i] != NULL ) - { - free( hDirAC->elevation[i] ); - hDirAC->elevation[i] = NULL; - } - } + ivas_dirac_deallocate_parameters( hDirAC, 1 ); + ivas_dirac_deallocate_parameters( hDirAC, 2 ); + } - if ( hDirAC->azimuth != NULL ) - { - free( hDirAC->azimuth ); - hDirAC->azimuth = NULL; - } - if ( hDirAC->elevation != NULL ) + if ( !( output_config == AUDIO_CONFIG_MONO || output_config == AUDIO_CONFIG_STEREO ) ) + { + /* Param ISM Rendering */ + if ( hDirAC->hParamIsmRendering->interpolator != NULL ) { - free( hDirAC->elevation ); - hDirAC->elevation = NULL; + free( hDirAC->hParamIsmRendering->interpolator ); + hDirAC->hParamIsmRendering->interpolator = NULL; } - - if ( hDirAC->azimuth2 != NULL ) + if ( hDirAC->hParamIsmRendering->proto_matrix != NULL ) { - for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) - { - if ( hDirAC->azimuth2[i] != NULL ) - { - free( hDirAC->azimuth2[i] ); - hDirAC->azimuth2[i] = NULL; - } - } - free( hDirAC->azimuth2 ); - hDirAC->azimuth2 = NULL; + free( hDirAC->hParamIsmRendering->proto_matrix ); + hDirAC->hParamIsmRendering->proto_matrix = NULL; } + } - if ( hDirAC->elevation2 != NULL ) - { - for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) - { - if ( hDirAC->elevation2[i] != NULL ) - { - free( hDirAC->elevation2[i] ); - hDirAC->elevation2[i] = NULL; - } - } - free( hDirAC->elevation2 ); - hDirAC->elevation2 = NULL; - } - - if ( hDirAC->energy_ratio1 != NULL ) - { - for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) - { - if ( hDirAC->energy_ratio1[i] != NULL ) - { - free( hDirAC->energy_ratio1[i] ); - hDirAC->energy_ratio1[i] = NULL; - } - } - free( hDirAC->energy_ratio1 ); - hDirAC->energy_ratio1 = NULL; - } - - if ( hDirAC->energy_ratio2 != NULL ) - { - for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) - { - if ( hDirAC->energy_ratio2[i] != NULL ) - { - free( hDirAC->energy_ratio2[i] ); - hDirAC->energy_ratio2[i] = NULL; - } - } - free( hDirAC->energy_ratio2 ); - hDirAC->energy_ratio2 = NULL; - } - - if ( hDirAC->spreadCoherence != NULL ) - { - for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) - { - if ( hDirAC->spreadCoherence[i] != NULL ) - { - free( hDirAC->spreadCoherence[i] ); - hDirAC->spreadCoherence[i] = NULL; - } - } - free( hDirAC->spreadCoherence ); - hDirAC->spreadCoherence = NULL; - } - - if ( hDirAC->spreadCoherence2 != NULL ) - { - for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) - { - if ( hDirAC->spreadCoherence2[i] != NULL ) - { - free( hDirAC->spreadCoherence2[i] ); - hDirAC->spreadCoherence2[i] = NULL; - } - } - free( hDirAC->spreadCoherence2 ); - hDirAC->spreadCoherence2 = NULL; - } - - if ( hDirAC->surroundingCoherence != NULL ) - { - for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) - { - if ( hDirAC->surroundingCoherence[i] != NULL ) - { - free( hDirAC->surroundingCoherence[i] ); - hDirAC->surroundingCoherence[i] = NULL; - } - } - free( hDirAC->surroundingCoherence ); - hDirAC->surroundingCoherence = NULL; - } +#ifdef JBM_TSM_ON_TCS + if ( hDirAC->hParamIsmRendering->Cldfb_RealBuffer_tc != NULL ) + { + free( hDirAC->hParamIsmRendering->Cldfb_RealBuffer_tc ); + hDirAC->hParamIsmRendering->Cldfb_RealBuffer_tc = NULL; } - - if ( !( output_config == AUDIO_CONFIG_MONO || output_config == AUDIO_CONFIG_STEREO ) ) + if ( hDirAC->hParamIsmRendering->Cldfb_ImagBuffer_tc != NULL ) { - /* Param ISM Rendering */ - if ( hDirAC->hParamIsmRendering->interpolator != NULL ) - { - free( hDirAC->hParamIsmRendering->interpolator ); - hDirAC->hParamIsmRendering->interpolator = NULL; - } - if ( hDirAC->hParamIsmRendering->proto_matrix != NULL ) - { - free( hDirAC->hParamIsmRendering->proto_matrix ); - hDirAC->hParamIsmRendering->proto_matrix = NULL; - } + free( hDirAC->hParamIsmRendering->Cldfb_ImagBuffer_tc ); + hDirAC->hParamIsmRendering->Cldfb_ImagBuffer_tc = NULL; } +#endif if ( hDirAC->hParamIsmRendering != NULL ) { @@ -849,7 +845,10 @@ 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; - +#ifdef JBM_TSM_ON_TCS + float ref_power[CLDFB_NO_CHANNELS_MAX]; + float cx_diag[CLDFB_NO_CHANNELS_MAX][PARAM_ISM_MAX_DMX]; +#endif /* CLDFB Input Buffers */ 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]; @@ -875,11 +874,7 @@ void ivas_param_ism_dec( nchan_transport = st_ivas->nchan_transport; if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) { -#ifdef NCHAN_ISM_PARAMETER nchan_out = st_ivas->nchan_ism; -#else - nchan_out = st_ivas->hDirAC->hParamIsm->num_obj; -#endif nchan_out_woLFE = nchan_out; st_ivas->hDecoderConfig->nchan_out = nchan_out; } @@ -895,15 +890,20 @@ void ivas_param_ism_dec( push_wmops( "ivas_param_ism_dec" ); +#ifdef JBM_TSM_ON_TCS + /* set buffers to zero */ + for ( bin_idx = 0; bin_idx < CLDFB_NO_CHANNELS_MAX; bin_idx++ ) + { + set_zero( cx_diag[bin_idx], PARAM_ISM_MAX_DMX ); + } + set_zero( ref_power, CLDFB_NO_CHANNELS_MAX ); +#endif + /* Frame-level Processing */ /* De-quantization */ if ( !( ivas_total_brate == IVAS_SID_5k2 || ivas_total_brate == FRAME_NO_DATA ) ) { -#ifdef NCHAN_ISM_PARAMETER ivas_param_ism_dec_dequant_DOA( hDirAC, st_ivas->nchan_ism ); -#else - ivas_param_ism_dec_dequant_DOA( hDirAC ); -#endif ivas_param_ism_dec_dequant_powrat( hDirAC ); st_ivas->hISMDTX.dtx_flag = 0; } @@ -915,11 +915,7 @@ void ivas_param_ism_dec( /* obtain the direct response using EFAP */ if ( !( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) ) { -#ifdef NCHAN_ISM_PARAMETER for ( i = 0; i < st_ivas->nchan_ism; i++ ) -#else - for ( i = 0; i < hDirAC->hParamIsm->num_obj; i++ ) -#endif { efap_determine_gains( st_ivas->hEFAPdata, direct_response[i], hDirAC->azimuth_values[i], hDirAC->elevation_values[i], EFAP_MODE_EFAP ); } @@ -928,11 +924,7 @@ void ivas_param_ism_dec( { int16_t j; -#ifdef NCHAN_ISM_PARAMETER for ( i = 0; i < st_ivas->nchan_ism; i++ ) -#else - for ( i = 0; i < hDirAC->hParamIsm->num_obj; i++ ) -#endif { for ( j = 0; j < nchan_out_woLFE; j++ ) { @@ -971,6 +963,10 @@ void ivas_param_ism_dec( for ( slot_idx = 0; slot_idx < CLDFB_NO_COL_MAX; slot_idx++ ) { cldfbAnalysis_ts( &( output_f[ch][hDirAC->num_freq_bands * slot_idx] ), Cldfb_RealBuffer_in[ch][slot_idx], Cldfb_ImagBuffer_in[ch][slot_idx], hDirAC->num_freq_bands, st_ivas->cldfbAnaDec[ch] ); + +#ifdef JBM_TSM_ON_TCS + ivas_param_ism_collect_slot( hDirAC, Cldfb_RealBuffer_in[ch][slot_idx], Cldfb_ImagBuffer_in[ch][slot_idx], ch, ref_power, cx_diag ); +#endif } } @@ -981,30 +977,41 @@ void ivas_param_ism_dec( } /* Compute mixing matrix */ -#ifdef NCHAN_ISM_PARAMETER - 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 ); +#ifdef JBM_TSM_ON_TCS + ivas_param_ism_compute_mixing_matrix( st_ivas->nchan_ism, hDirAC, st_ivas->hISMDTX, direct_response, nchan_transport, nchan_out_woLFE, cx_diag, ref_power, mixing_matrix ); #else - ivas_param_ism_compute_mixing_matrix( hDirAC, st_ivas->hISMDTX, 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 ); #endif - /* subframe loop for synthesis*/ for ( subframe_idx = 0; subframe_idx < hDirAC->nb_subframes; subframe_idx++ ) { +#ifdef JBM_TSM_ON_TCS + uint16_t slot_idx_start = subframe_idx * hDirAC->subframe_nbslots[subframe_idx]; +#else uint16_t slot_idx_start = subframe_idx * hDirAC->subframe_nbslots; +#endif uint16_t idx_in; uint16_t idx_lfe; /* Set some memories to zero */ for ( ch = 0; ch < nchan_out_woLFE; ch++ ) { +#ifdef JBM_TSM_ON_TCS + for ( slot_idx = 0; slot_idx < hDirAC->subframe_nbslots[subframe_idx]; slot_idx++ ) +#else for ( slot_idx = 0; slot_idx < hDirAC->subframe_nbslots; slot_idx++ ) +#endif { set_f( Cldfb_RealBuffer[ch][slot_idx], 0.0f, hDirAC->num_freq_bands ); set_f( Cldfb_ImagBuffer[ch][slot_idx], 0.0f, hDirAC->num_freq_bands ); } } +#ifdef JBM_TSM_ON_TCS + for ( slot_idx = 0; slot_idx < hDirAC->subframe_nbslots[subframe_idx]; slot_idx++ ) +#else for ( slot_idx = 0; slot_idx < hDirAC->subframe_nbslots; slot_idx++ ) +#endif { index_slot = slot_idx_start + slot_idx; @@ -1022,8 +1029,11 @@ void ivas_param_ism_dec( { if ( ( hSetup.num_lfe > 0 ) && ( hSetup.index_lfe[idx_lfe] == ch ) ) { +#ifdef JBM_TSM_ON_TCS + set_zero( &( output_f[ch][slot_idx_start * hDirAC->num_freq_bands] ), hDirAC->subframe_nbslots[subframe_idx] * hDirAC->num_freq_bands ); +#else set_zero( &( output_f[ch][slot_idx_start * hDirAC->num_freq_bands] ), hDirAC->subframe_nbslots * hDirAC->num_freq_bands ); - +#endif if ( idx_lfe < ( hSetup.num_lfe - 1 ) ) { idx_lfe++; @@ -1035,14 +1045,22 @@ void ivas_param_ism_dec( float *ImagBuffer[16]; /* open CLDFB buffer up to CLDFB_NO_CHANNELS_MAX bands for 48kHz */ +#ifdef JBM_TSM_ON_TCS + for ( i = 0; i < hDirAC->subframe_nbslots[subframe_idx]; i++ ) +#else for ( i = 0; i < hDirAC->subframe_nbslots; i++ ) +#endif { RealBuffer[i] = Cldfb_RealBuffer[idx_in][i]; ImagBuffer[i] = Cldfb_ImagBuffer[idx_in][i]; } - +#ifdef JBM_TSM_ON_TCS + cldfbSynthesis( RealBuffer, ImagBuffer, &( output_f[ch][slot_idx_start * hDirAC->num_freq_bands] ), + hDirAC->num_freq_bands * hDirAC->subframe_nbslots[subframe_idx], st_ivas->cldfbSynDec[ch] ); +#else cldfbSynthesis( RealBuffer, ImagBuffer, &( output_f[ch][slot_idx_start * hDirAC->num_freq_bands] ), hDirAC->num_freq_bands * hDirAC->subframe_nbslots, st_ivas->cldfbSynDec[ch] ); +#endif idx_in++; } @@ -1054,11 +1072,7 @@ void ivas_param_ism_dec( ivas_param_ism_update_mixing_matrix( hDirAC, mixing_matrix, nchan_transport, nchan_out_woLFE ); /* store MetaData parameters */ -#ifdef NCHAN_ISM_PARAMETER for ( ch = 0; ch < st_ivas->nchan_ism; ch++ ) -#else - for ( ch = 0; ch < hDirAC->hParamIsm->num_obj; ch++ ) -#endif { if ( st_ivas->hDirAC->azimuth_values[ch] > 180.0f ) { @@ -1077,6 +1091,402 @@ void ivas_param_ism_dec( return; } +#ifdef JBM_TSM_ON_TCS +void ivas_ism_dec_digest_tc( + Decoder_Struct *st_ivas ) +{ + + ivas_jbm_dec_td_renderers_adapt_subframes( st_ivas ); + + if ( + st_ivas->renderer_type == RENDERER_TD_PANNING || + st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || + st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || + st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM || + ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM && st_ivas->hDecoderConfig->Opt_Headrotation == 0 ) ) + { + int16_t i, num_objects; + int16_t azimuth, elevation; + /* we have a full frame interpolator, adapt it */ + /* for BE testing */ + if ( ( st_ivas->hDecoderConfig->output_Fs / (int32_t) FRAMES_PER_SECOND ) == st_ivas->hTcBuffer->n_samples_available ) + { + int16_t interpolator_length = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / (int32_t) FRAMES_PER_SECOND ); + if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV ) + { + st_ivas->hIsmRendererData->interpolator[0] = 0.0f; + for ( i = 1; i < interpolator_length; i++ ) + { + st_ivas->hIsmRendererData->interpolator[i] = st_ivas->hIsmRendererData->interpolator[i - 1] + 1.f / ( interpolator_length - 1 ); + } + } + else + { + for ( i = 0; i < interpolator_length; i++ ) + { + st_ivas->hIsmRendererData->interpolator[i] = (float) i / ( (float) interpolator_length - 1 ); + } + } + } + else + { + ivas_jbm_dec_get_adapted_linear_interpolator( (int16_t) ( st_ivas->hDecoderConfig->output_Fs / (int32_t) FRAMES_PER_SECOND ), + st_ivas->hTcBuffer->n_samples_available, + st_ivas->hIsmRendererData->interpolator ); + } + /* also get the gains here */ + num_objects = st_ivas->nchan_transport; + for ( i = 0; i < num_objects; i++ ) + { + mvr2r( st_ivas->hIsmRendererData->gains[i], st_ivas->hIsmRendererData->prev_gains[i], MAX_OUTPUT_CHANNELS ); + if ( st_ivas->intern_config == AUDIO_CONFIG_STEREO ) + { + ivas_ism_get_stereo_gains( st_ivas->hIsmMetaData[i]->azimuth, + st_ivas->hIsmMetaData[i]->elevation, + &st_ivas->hIsmRendererData->gains[i][0], + &st_ivas->hIsmRendererData->gains[i][1] ); + } + else + { + // 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->renderer_type == RENDERER_TD_PANNING || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) && st_ivas->hHeadTrackData == NULL ) + { + + + if ( st_ivas->hIntSetup.is_planar_setup ) + { + /* If no elevation support in output format, then rendering should be done with zero elevation */ + elevation = 0; + } + if ( st_ivas->hEFAPdata != NULL ) + { + efap_determine_gains( st_ivas->hEFAPdata, st_ivas->hIsmRendererData->gains[i], azimuth, elevation, EFAP_MODE_EFAP ); + } + } + else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV ) + { + /*get HOA gets for direction (ACN/SN3D)*/ + ivas_dirac_dec_get_response( azimuth, elevation, st_ivas->hIsmRendererData->gains[i], st_ivas->hIntSetup.ambisonics_order ); + } + } + } + } + return; +} + +void ivas_param_ism_dec_digest_tc( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + const uint16_t nCldfbSlots, /* i : number of CLFBS slots in the transport channels */ + float *transport_channels_f[] /* i : synthesized core-coder transport channels/DirAC output */ +) +{ + int16_t ch, nchan_transport, nchan_out, nchan_out_woLFE, i; + int16_t slot_idx, bin_idx; + int32_t ivas_total_brate; + float ref_power[CLDFB_NO_CHANNELS_MAX]; + float cx_diag[CLDFB_NO_CHANNELS_MAX][PARAM_ISM_MAX_DMX]; + /* Direct Response/EFAP Gains */ + float direct_response[MAX_NUM_OBJECTS][PARAM_ISM_MAX_CHAN]; + + DIRAC_DEC_HANDLE hDirAC; + + /* Initialization */ + hDirAC = st_ivas->hDirAC; + assert( hDirAC ); + + nchan_transport = st_ivas->nchan_transport; + ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; + + if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) + { + nchan_out = st_ivas->nchan_ism; + nchan_out_woLFE = nchan_out; + st_ivas->hDecoderConfig->nchan_out = nchan_out; + } + else + { + nchan_out = st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe; + nchan_out_woLFE = st_ivas->hIntSetup.nchan_out_woLFE; + } + + push_wmops( "ivas_param_ism_dec" ); + + /* general setup */ + ivas_jbm_dec_get_adapted_linear_interpolator( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbSlots, hDirAC->hParamIsmRendering->interpolator ); + + ivas_dirac_dec_set_md_map( st_ivas, nCldfbSlots ); + + /* set buffers to zero */ + for ( bin_idx = 0; bin_idx < CLDFB_NO_CHANNELS_MAX; bin_idx++ ) + { + set_zero( cx_diag[bin_idx], PARAM_ISM_MAX_DMX ); + } + set_zero( ref_power, CLDFB_NO_CHANNELS_MAX ); + + /* Frame-level Processing */ + /* De-quantization */ + 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 < 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 ); + } + } + else + { + int16_t j; + + for ( i = 0; i < st_ivas->nchan_ism; i++ ) + { + for ( j = 0; j < nchan_out_woLFE; j++ ) + { + if ( i == j ) + { + direct_response[i][j] = 1.0f; + } + else + { + direct_response[i][j] = 0.0f; + } + } + } + + for ( i = 0; i < nchan_transport; i++ ) + { + for ( j = 0; j < nchan_out_woLFE; j++ ) + { + if ( i == j ) + { + hDirAC->hParamIsmRendering->proto_matrix[( i * nchan_out_woLFE ) + j] = 1.0f; + } + else + { + hDirAC->hParamIsmRendering->proto_matrix[( i * nchan_out_woLFE ) + j] = 0.0f; + } + } + } + } + + for ( ch = 0; ch < nchan_transport; ch++ ) + { + /*-----------------------------------------------------------------* + * CLDFB Analysis + *-----------------------------------------------------------------*/ + for ( slot_idx = 0; slot_idx < nCldfbSlots; slot_idx++ ) + { + float RealBuffer[CLDFB_NO_CHANNELS_MAX]; + float ImagBuffer[CLDFB_NO_CHANNELS_MAX]; + + cldfbAnalysis_ts( &( transport_channels_f[ch][hDirAC->num_freq_bands * slot_idx] ), RealBuffer, ImagBuffer, hDirAC->num_freq_bands, st_ivas->cldfbAnaDec[ch] ); + mvr2r( RealBuffer, &hDirAC->hParamIsmRendering->Cldfb_RealBuffer_tc[slot_idx * hDirAC->num_freq_bands * nchan_transport + ch * hDirAC->num_freq_bands], hDirAC->num_freq_bands ); + mvr2r( ImagBuffer, &hDirAC->hParamIsmRendering->Cldfb_ImagBuffer_tc[slot_idx * hDirAC->num_freq_bands * nchan_transport + ch * hDirAC->num_freq_bands], hDirAC->num_freq_bands ); + + ivas_param_ism_collect_slot( hDirAC, RealBuffer, ImagBuffer, ch, ref_power, cx_diag ); + } + } + + /* Obtain Mixing Matrix on a frame-level */ + for ( bin_idx = 0; bin_idx < hDirAC->num_freq_bands; bin_idx++ ) + { + set_f( hDirAC->hParamIsmRendering->mixing_matrix_lin[bin_idx], 0.0f, nchan_transport * nchan_out_woLFE ); + } + + /* Compute mixing matrix */ + ivas_param_ism_compute_mixing_matrix( st_ivas->nchan_ism, hDirAC, st_ivas->hISMDTX, direct_response, nchan_transport, nchan_out_woLFE, cx_diag, ref_power, hDirAC->hParamIsmRendering->mixing_matrix_lin ); + + + pop_wmops(); + + return; +} + +static void ivas_ism_param_dec_render_sf( Decoder_Struct *st_ivas, + IVAS_OUTPUT_SETUP hSetup, + const int16_t nchan_transport, + const int16_t nchan_out, + const int16_t nchan_out_woLFE, + float *output_f[] /* o : rendered time signal */ +) +{ + + int16_t ch, slot_idx, i, index_slot; + /* CLDFB Output Buffers */ + float Cldfb_RealBuffer[PARAM_ISM_MAX_CHAN][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX]; + float Cldfb_ImagBuffer[PARAM_ISM_MAX_CHAN][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX]; + float *Cldfb_RealBuffer_in[PARAM_ISM_MAX_DMX]; + float *Cldfb_ImagBuffer_in[PARAM_ISM_MAX_DMX]; + DIRAC_DEC_HANDLE hDirAC; + + int16_t slot_idx_start; + int16_t idx_in; + int16_t idx_lfe; + int16_t subframe_idx; + + hDirAC = st_ivas->hDirAC; + slot_idx_start = hDirAC->slots_rendered; + subframe_idx = hDirAC->subframes_rendered; + + /* Set some memories to zero */ + for ( ch = 0; ch < nchan_out_woLFE; ch++ ) + { + for ( slot_idx = 0; slot_idx < hDirAC->subframe_nbslots[subframe_idx]; slot_idx++ ) + { + set_f( Cldfb_RealBuffer[ch][slot_idx], 0.0f, hDirAC->num_freq_bands ); + set_f( Cldfb_ImagBuffer[ch][slot_idx], 0.0f, hDirAC->num_freq_bands ); + } + } + + for ( slot_idx = 0; slot_idx < hDirAC->subframe_nbslots[subframe_idx]; slot_idx++ ) + { + index_slot = slot_idx_start + slot_idx; + + for ( ch = 0; ch < nchan_transport; ch++ ) + { + Cldfb_RealBuffer_in[ch] = &hDirAC->hParamIsmRendering->Cldfb_RealBuffer_tc[index_slot * hDirAC->num_freq_bands * nchan_transport + ch * hDirAC->num_freq_bands]; + Cldfb_ImagBuffer_in[ch] = &hDirAC->hParamIsmRendering->Cldfb_ImagBuffer_tc[index_slot * hDirAC->num_freq_bands * nchan_transport + ch * hDirAC->num_freq_bands]; + } + + + /* Compute bandwise rendering to target LS using covariance rendering */ + ivas_param_ism_render_slot( hDirAC, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, + Cldfb_RealBuffer, Cldfb_ImagBuffer, hDirAC->hParamIsmRendering->mixing_matrix_lin, index_slot, slot_idx, + nchan_out_woLFE, nchan_transport ); + } + + /* CLDFB Synthesis */ + idx_in = 0; + idx_lfe = 0; + + for ( ch = 0; ch < nchan_out; ch++ ) + { + if ( ( hSetup.num_lfe > 0 ) && ( hSetup.index_lfe[idx_lfe] == ch ) ) + { + set_zero( output_f[ch], hDirAC->subframe_nbslots[subframe_idx] * hDirAC->num_freq_bands ); + if ( idx_lfe < ( hSetup.num_lfe - 1 ) ) + { + idx_lfe++; + } + } + else + { + float *RealBuffer[16]; + float *ImagBuffer[16]; + + /* open CLDFB buffer up to CLDFB_NO_CHANNELS_MAX bands for 48kHz */ + for ( i = 0; i < hDirAC->subframe_nbslots[subframe_idx]; i++ ) + { + RealBuffer[i] = Cldfb_RealBuffer[idx_in][i]; + ImagBuffer[i] = Cldfb_ImagBuffer[idx_in][i]; + } + cldfbSynthesis( RealBuffer, ImagBuffer, output_f[ch], + hDirAC->num_freq_bands * hDirAC->subframe_nbslots[subframe_idx], st_ivas->cldfbSynDec[ch] ); + idx_in++; + } + } + hDirAC->slots_rendered += hDirAC->subframe_nbslots[subframe_idx]; + hDirAC->subframes_rendered++; +} + +void ivas_param_ism_dec_render( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + const uint16_t nSamplesAsked, /* i : number of CLDFB slots requested */ + uint16_t *nSamplesRendered, /* o : number of CLDFB slots rendered */ + uint16_t *nSamplesAvailable, /* o : number of CLDFB slots still to render */ + float *output_f[] /* o : rendered time signal */ +) +{ + int16_t ch, slots_to_render, first_sf, last_sf, subframe_idx; + uint16_t slot_size, n_samples_sf; + DIRAC_DEC_HANDLE hDirAC; + IVAS_OUTPUT_SETUP hSetup; + int16_t nchan_transport, nchan_out, nchan_out_woLFE; + float *output_f_local[MAX_OUTPUT_CHANNELS]; + + hDirAC = st_ivas->hDirAC; + hSetup = st_ivas->hIntSetup; +#ifdef DEBUGGING + assert( hDirAC ); +#endif + nchan_transport = st_ivas->nchan_transport; + if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) + { + nchan_out = st_ivas->nchan_ism; + nchan_out_woLFE = nchan_out; + st_ivas->hDecoderConfig->nchan_out = nchan_out; + } + else + { + nchan_out = st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe; + nchan_out_woLFE = st_ivas->hIntSetup.nchan_out_woLFE; + } + slot_size = NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ); + /* loop for synthesis, assume we always have to render in multiples of 5ms subframes with spills */ + slots_to_render = min( hDirAC->num_slots - hDirAC->slots_rendered, nSamplesAsked / slot_size ); + *nSamplesRendered = slots_to_render * slot_size; + first_sf = hDirAC->subframes_rendered; + last_sf = first_sf; + while ( slots_to_render > 0 ) + { + slots_to_render -= hDirAC->subframe_nbslots[last_sf]; + last_sf++; + } +#ifdef DEBUGGING + assert( slots_to_render == 0 ); +#endif + for ( ch = 0; ch < nchan_out; ch++ ) + { + output_f_local[ch] = &output_f[ch][0]; + } + for ( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ ) + { + ivas_ism_param_dec_render_sf( st_ivas, hSetup, nchan_transport, nchan_out, nchan_out_woLFE, output_f_local ); + n_samples_sf = hDirAC->subframe_nbslots[subframe_idx] * st_ivas->hDirAC->slot_size; + for ( ch = 0; ch < nchan_out; ch++ ) + { + output_f_local[ch] += n_samples_sf; + } + } + if ( hDirAC->slots_rendered == hDirAC->num_slots ) + { + /* copy the memories */ + /* store mixing matrix for next subframe */ + ivas_param_ism_update_mixing_matrix( hDirAC, hDirAC->hParamIsmRendering->mixing_matrix_lin, nchan_transport, nchan_out_woLFE ); + + /* store MetaData parameters */ + for ( ch = 0; ch < st_ivas->nchan_ism; ch++ ) + { + if ( st_ivas->hDirAC->azimuth_values[ch] > 180.0f ) + { + st_ivas->hIsmMetaData[ch]->azimuth = st_ivas->hDirAC->azimuth_values[ch] - 360.0f; + } + else + { + st_ivas->hIsmMetaData[ch]->azimuth = st_ivas->hDirAC->azimuth_values[ch]; + } + + st_ivas->hIsmMetaData[ch]->elevation = st_ivas->hDirAC->elevation_values[ch]; + } + } + *nSamplesAvailable = ( hDirAC->num_slots - hDirAC->slots_rendered ) * slot_size; + return; +} + +#endif + /*-------------------------------------------------------------------------* * ivas_param_ism_params_to_masa_param_mapping() @@ -1104,11 +1514,7 @@ void ivas_param_ism_params_to_masa_param_mapping( if ( !( ivas_total_brate == IVAS_SID_5k2 || ivas_total_brate == FRAME_NO_DATA ) ) { -#ifdef NCHAN_ISM_PARAMETER ivas_param_ism_dec_dequant_DOA( hDirAC, st_ivas->nchan_ism ); -#else - ivas_param_ism_dec_dequant_DOA( hDirAC ); -#endif ivas_param_ism_dec_dequant_powrat( hDirAC ); st_ivas->hISMDTX.dtx_flag = 0; } @@ -1117,11 +1523,7 @@ void ivas_param_ism_params_to_masa_param_mapping( st_ivas->hISMDTX.dtx_flag = 1; } -#ifdef NCHAN_ISM_PARAMETER if ( st_ivas->nchan_ism > 1 ) -#else - if ( hDirAC->hParamIsm->num_obj > 1 ) -#endif { if ( st_ivas->hISMDTX.dtx_flag ) { @@ -1205,144 +1607,3 @@ void ivas_param_ism_params_to_masa_param_mapping( return; } - -#ifndef DISCRETE_ISM_DTX_CNG -static void ivas_param_ism_dec_dequantize_DOA_dtx( - int16_t azi_bits, - int16_t ele_bits, - int16_t azi_idx, - int16_t ele_idx, - float *azi_val, - float *ele_val ) -{ - int16_t nbits, npoints, angle_spacing, az_alpha, ele_alpha, tmp_alpha; - - /* Step 1: Determine angle spacing/n_points based on minimum value among elevation/azimuth bits */ - nbits = min( azi_bits, ele_bits ); - - if ( nbits == ISM_ELEVATION_NBITS ) - { - angle_spacing = 5; - } - else - { - angle_spacing = (int16_t) ( ( 180.f / (float) ( 1 << nbits ) ) + 0.5f ); - } - - npoints = (int16_t) ( ( 90 / angle_spacing ) + 0.5f ); - - /* sanity check */ - if ( angle_spacing == 360 ) - { - assert( azi_idx == 0 ); - assert( ele_idx == 0 ); - - *azi_val = 0.f; - *ele_val = 0.f; - return; - } - - /* Get the azimuth and elevation values */ - ele_alpha = 2 * npoints - 1; - assert( ( 0 <= ele_idx ) && ( ele_idx < ele_alpha ) ); - *ele_val = (float) ( ( ele_idx - npoints ) * angle_spacing ); - - az_alpha = 4 * npoints - 1; - assert( ( 0 <= azi_idx ) && ( azi_idx < az_alpha ) ); - tmp_alpha = (int16_t) ( azi_idx * ( 360.f / az_alpha ) ); - - if ( tmp_alpha > 180.0f ) - { - *azi_val = ( (float) tmp_alpha ) - 360.0f; - } - else - { - *azi_val = (float) tmp_alpha; - } - - return; -} - - -/*------------------------------------------------------------------------- - * ivas_param_ism_metadata_dtx_dec() - * - * - *-------------------------------------------------------------------------*/ - -void ivas_param_ism_metadata_dtx_dec( - Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ -) -{ - int16_t azi_idx, ele_idx, i; - int16_t last_bit_pos, next_bit_pos_orig; - uint16_t bstr_meta[IVAS_SID_5k2 / FRAMES_PER_SEC], *bstr_orig; - DEC_CORE_HANDLE st0; - PARAM_ISM_CONFIG_HANDLE hParamIsm; /* Parametric ISM handle */ - int16_t coh_idx; - - if ( st_ivas->hDecoderConfig->ivas_total_brate == FRAME_NO_DATA ) - { - return; - } - - st0 = st_ivas->hSCE[0]->hCoreCoder[0]; - hParamIsm = st_ivas->hDirAC->hParamIsm; - - last_bit_pos = (int16_t) ( ( st_ivas->hDecoderConfig->ivas_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 = st_ivas->hDecoderConfig->ivas_total_brate; /* needed for BER detection in get_next_indice() */ - - /* number of objects was already read in ivas_ism_get_dtx_dec() */ - /* update the position in the bitstream */ -#ifdef NCHAN_ISM_PARAMETER - st0->next_bit_pos += st_ivas->nchan_ism; -#else - st0->next_bit_pos += hParamIsm->num_obj; -#endif - - /* read sce id */ - st_ivas->hISMDTX.sce_id_dtx = get_next_indice( st0, 1 ); - - /* read the noisy speech flag */ - hParamIsm->flag_noisy_speech = get_next_indice( st0, 1 ); - - /* decode the coherence */ - coh_idx = get_next_indice( st0, PARAM_ISM_DTX_COH_SCA_BITS ); - st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence = (float) ( coh_idx ) / (float) ( ( 1 << PARAM_ISM_DTX_COH_SCA_BITS ) - 1 ); - st_ivas->hSCE[1]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence = st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence; - - /* get the DOA'S */ -#ifdef NCHAN_ISM_PARAMETER - for ( i = 0; i < st_ivas->nchan_ism; i++ ) -#else - for ( i = 0; i < hParamIsm->num_obj; i++ ) -#endif - { - /* read from bitstream and dequantize */ - azi_idx = get_next_indice( st0, PARAM_ISM_DTX_AZI_BITS ); - ele_idx = get_next_indice( st0, PARAM_ISM_DTX_ELE_BITS ); - - ivas_param_ism_dec_dequantize_DOA_dtx( PARAM_ISM_DTX_AZI_BITS, PARAM_ISM_DTX_ELE_BITS, azi_idx, ele_idx, &( st_ivas->hDirAC->azimuth_values[i] ), &( st_ivas->hDirAC->elevation_values[i] ) ); - } - - /* set the bitstream pointer to its original position */ - st0->bit_stream = bstr_orig; - st0->next_bit_pos = next_bit_pos_orig; - -#ifdef DEBUG_MODE_PARAM_ISM - dbgwrite( &( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence ), sizeof( float ), 1, 1, "./res/ParamISM_coh_dec.dat" ); -#endif - - return; -} -#endif diff --git a/lib_dec/ivas_ism_renderer.c b/lib_dec/ivas_ism_renderer.c index a5bdcc410046ad9acd629d86862610ac3b39714c..3b38e2d890f0c28df26f3841e5e89d502e51cc5b 100644 --- a/lib_dec/ivas_ism_renderer.c +++ b/lib_dec/ivas_ism_renderer.c @@ -58,6 +58,9 @@ ivas_error ivas_ism_renderer_open( { int16_t i; uint16_t interpolator_length; +#ifdef JBM_TSM_ON_TCS + uint16_t init_interpolator_length; +#endif ivas_error error; error = IVAS_ERR_OK; @@ -78,14 +81,34 @@ ivas_error ivas_ism_renderer_open( for ( i = 0; i < MAX_NUM_OBJECTS; i++ ) { set_f( st_ivas->hIsmRendererData->prev_gains[i], 0.0f, MAX_OUTPUT_CHANNELS ); +#ifdef JBM_TSM_ON_TCS + set_f( st_ivas->hIsmRendererData->gains[i], 0.0f, MAX_OUTPUT_CHANNELS ); +#endif } +#ifdef JBM_TSM_ON_TCS + if ( st_ivas->hDecoderConfig->voip_active ) + { + init_interpolator_length = NS2SA( st_ivas->hDecoderConfig->output_Fs, MAX_JBM_CLDFB_TIMESLOTS * CLDFB_SLOT_NS ); + interpolator_length = (uint16_t) ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC ); + } + else + { + init_interpolator_length = (uint16_t) ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC ); + interpolator_length = init_interpolator_length; + } + st_ivas->hIsmRendererData->interpolator = (float *) malloc( sizeof( float ) * init_interpolator_length ); + for ( i = 0; i < interpolator_length; i++ ) + { + st_ivas->hIsmRendererData->interpolator[i] = (float) i / ( (float) interpolator_length - 1 ); + } +#else 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 - 1 ); } - +#endif return error; } @@ -97,9 +120,13 @@ ivas_error ivas_ism_renderer_open( *-------------------------------------------------------------------------*/ void ivas_ism_render( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ +#ifdef JBM_TSM_ON_TCS + float *output_f[], /* i/o: core-coder transport channels/object output */ +#else float output_f[][L_FRAME48k], /* i/o: core-coder transport channels/object output */ - const int16_t output_frame /* i : output frame length per channel */ +#endif + const int16_t output_frame /* i : output frame length per channel */ ) { int16_t i, j, k, j2; @@ -111,11 +138,7 @@ void ivas_ism_render( int16_t azimuth, elevation; float Rmat[3][3]; -#ifdef NCHAN_ISM_PARAMETER nchan_ism = st_ivas->nchan_ism; -#else - nchan_ism = st_ivas->nchan_transport; -#endif nchan_out_woLFE = st_ivas->hIntSetup.nchan_out_woLFE; lfe_index = 0; @@ -153,7 +176,7 @@ void ivas_ism_render( else { /* Head rotation: rotate the object positions depending the head's orientation */ - if ( st_ivas->hHeadTrackData != NULL && st_ivas->hHeadTrackData->num_quaternions >= 0 ) + if ( st_ivas->hHeadTrackData != NULL && st_ivas->hHeadTrackData->num_quaternions >= 0 && !st_ivas->hIsmMetaData[i]->non_diegetic_flag ) { rotateAziEle( st_ivas->hIsmMetaData[i]->azimuth, st_ivas->hIsmMetaData[i]->elevation, &azimuth, &elevation, Rmat, st_ivas->hIntSetup.is_planar_setup ); } @@ -205,6 +228,87 @@ void ivas_ism_render( return; } +#ifdef JBM_TSM_ON_TCS +void ivas_ism_render_sf( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + float *output_f[], /* i/o: core-coder transport channels/object output */ + const int16_t n_samples_to_render /* i : output frame length per channel */ +) +{ + int16_t i, j, k, j2; + float *g1, g2, *tc; + int16_t num_objects, nchan_out_woLFE, lfe_index; + int16_t azimuth, elevation; + int16_t tc_offset; + int16_t interp_offset; + float Rmat[3][3]; + float gain, prev_gain; + + num_objects = st_ivas->nchan_transport; + nchan_out_woLFE = st_ivas->hIntSetup.nchan_out_woLFE; + + tc_offset = st_ivas->hTcBuffer->n_samples_rendered; + interp_offset = st_ivas->hTcBuffer->n_samples_rendered; + + for ( i = 0; i < nchan_out_woLFE + st_ivas->hIntSetup.num_lfe; i++ ) + { + set_f( output_f[i], 0.0f, n_samples_to_render ); + } + + if ( st_ivas->hHeadTrackData != NULL && st_ivas->hHeadTrackData->num_quaternions >= 0 ) + { + /* Calculate rotation matrix from the quaternion */ + QuatToRotMat( st_ivas->hHeadTrackData->Quaternions[st_ivas->hHeadTrackData->num_quaternions++], Rmat ); + ivas_jbm_dec_get_adapted_linear_interpolator( n_samples_to_render, + n_samples_to_render, + st_ivas->hIsmRendererData->interpolator ); + interp_offset = 0; + } + + for ( i = 0; i < num_objects; i++ ) + { + + /* Head rotation: rotate the object positions depending the head's orientation */ + if ( st_ivas->hHeadTrackData != NULL && st_ivas->hHeadTrackData->num_quaternions >= 0 ) + { + rotateAziEle( st_ivas->hIsmMetaData[i]->azimuth, st_ivas->hIsmMetaData[i]->elevation, &azimuth, &elevation, Rmat, st_ivas->hIntSetup.is_planar_setup ); + if ( st_ivas->hEFAPdata != NULL ) + { + efap_determine_gains( st_ivas->hEFAPdata, st_ivas->hIsmRendererData->gains[i], azimuth, elevation, EFAP_MODE_EFAP ); + } + } + + lfe_index = 0; + for ( j = 0, j2 = 0; j < nchan_out_woLFE; j++, j2++ ) + { + if ( ( st_ivas->hIntSetup.num_lfe > 0 ) && ( st_ivas->hIntSetup.index_lfe[lfe_index] == j ) ) + { + ( lfe_index < ( st_ivas->hIntSetup.num_lfe - 1 ) ) ? ( lfe_index++, j2++ ) : j2++; + } + + gain = st_ivas->hIsmRendererData->gains[i][j]; + prev_gain = st_ivas->hIsmRendererData->prev_gains[i][j]; + if ( fabsf( gain ) > 0.0f || fabsf( prev_gain ) > 0.0f ) + { + g1 = &st_ivas->hIsmRendererData->interpolator[interp_offset]; + tc = &st_ivas->hTcBuffer->tc[i][tc_offset]; + for ( k = 0; k < n_samples_to_render; k++ ) + { + g2 = 1.0f - *g1; + output_f[j2][k] += ( *( g1++ ) * gain + g2 * prev_gain ) * *( tc++ ); + } + } + /* update here only in case of head rotation */ + if ( st_ivas->hHeadTrackData != NULL && st_ivas->hHeadTrackData->num_quaternions >= 0 ) + { + st_ivas->hIsmRendererData->prev_gains[i][j] = gain; + } + } + } + return; +} +#endif + /*-------------------------------------------------------------------------* * ivas_ism_get_stereo_gains() diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c new file mode 100644 index 0000000000000000000000000000000000000000..2ecbc9b382061bdbc08d816f5b48dc55342f72e7 --- /dev/null +++ b/lib_dec/ivas_jbm_dec.c @@ -0,0 +1,1705 @@ +/****************************************************************************************************** + + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. 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 "cnst.h" +#include "ivas_cnst.h" +#include "rom_com.h" +#include "prot.h" +#include "ivas_prot.h" +#include "ivas_prot_rend.h" +#include "ivas_rom_com.h" +#include +#ifdef DEBUGGING +#include "debug.h" +#endif +#include "wmc_auto.h" + + +#ifdef JBM_TSM_ON_TCS + +/*-----------------------------------------------------------------------* + * Local function prototypes + *-----------------------------------------------------------------------*/ +static void ivas_jbm_dec_copy_tc( Decoder_Struct *st_ivas, const int16_t nSamplesForRendering, int16_t *nSamplesResidual, float *data, float *tc_digest_f[] ); +static void ivas_jbm_dec_tc_buffer_playout( Decoder_Struct *st_ivas, const uint16_t nSamplesAsked, uint16_t *nSamplesRendered, float *output[] ); + + +/*--------------------------------------------------------------------------* + * ivas_jbm_dec_tc() + * + * Principal IVAS decoder routine, decoding of metadata and transport channels + *--------------------------------------------------------------------------*/ +ivas_error ivas_jbm_dec_tc( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + float *data /* o : transport channel signal */ +) +{ + int16_t n, output_frame, nchan_out; + Decoder_State *st; /* used for bitstream handling */ + float output[MAX_TRANSPORT_CHANNELS][L_FRAME48k]; /* 'float' buffer for transport channels, MAX_TRANSPORT_CHANNELS channels */ /* IVAS_fmToDo: buffer can be allocated dynamically based on the actual number of output channels */ + int16_t nchan_remapped, hodirac_flag; + float output_lfe_ch[L_FRAME48k]; + int16_t nb_bits_metadata[MAX_SCE]; + int32_t output_Fs, ivas_total_brate; + AUDIO_CONFIG output_config; + ivas_error error; + float *p_output[MAX_TRANSPORT_CHANNELS]; + + error = IVAS_ERR_OK; + + push_wmops( "ivas_jbm_dec_tc" ); + + /*----------------------------------------------------------------* + * Initialization of local vars after struct has been set + *----------------------------------------------------------------*/ + + output_Fs = st_ivas->hDecoderConfig->output_Fs; + nchan_out = st_ivas->hTcBuffer->nchan_transport_jbm; + output_config = st_ivas->hDecoderConfig->output_config; + ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; + hodirac_flag = ivas_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order ); + + output_frame = (int16_t) ( output_Fs / FRAMES_PER_SEC ); + + for ( n = 0; n < MAX_TRANSPORT_CHANNELS; n++ ) + { + p_output[n] = &output[n][0]; + } + + /*----------------------------------------------------------------* + * Decoding + Rendering + *----------------------------------------------------------------*/ + + if ( st_ivas->bfi && st_ivas->ini_frame == 0 ) + { + /* zero output when first frame(s) is lost */ + for ( n = 0; n < nchan_out; n++ ) + { + set_f( output[n], 0.0f, output_frame ); + } + +#ifdef DEBUG_MODE_INFO + create_sce_dec( st_ivas, 0, ivas_total_brate ); + output_debug_mode_info_dec( st_ivas->hSCE[0]->hCoreCoder, 1, output_frame, NULL ); + destroy_sce_dec( st_ivas->hSCE[0] ); + st_ivas->hSCE[0] = NULL; +#endif + } + else if ( st_ivas->ivas_format == STEREO_FORMAT ) + { + st_ivas->hCPE[0]->element_brate = ivas_total_brate; + + if ( ( error = ivas_cpe_dec( st_ivas, 0, output, output_frame, 0 ) ) != IVAS_ERR_OK ) + { + return error; + } + + /* HP filtering */ + for ( n = 0; n < min( nchan_out, st_ivas->nchan_transport ); n++ ) + { + hp20( output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs ); + } + if ( st_ivas->renderer_type == RENDERER_MC && st_ivas->hDecoderConfig->nchan_out == 1 ) + { + ivas_ls_setup_conversion( st_ivas, st_ivas->nchan_transport, output_frame, p_output, p_output ); + } + } + else if ( st_ivas->ivas_format == ISM_FORMAT ) + { + /* Metadata decoding and configuration */ + 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 ) + { + // 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 */ + { + 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++ ) + { + if ( ( error = ivas_sce_dec( st_ivas, n, &output[n], output_frame, nb_bits_metadata[n] ) ) != IVAS_ERR_OK ) + { + return error; + } + + /* HP filtering */ + hp20( output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs ); + } + if ( st_ivas->renderer_type == RENDERER_MONO_DOWNMIX ) + { + ivas_mono_downmix_render_passive( st_ivas, output, output_frame ); + } + } + else if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT ) + { + set_s( nb_bits_metadata, 0, MAX_SCE ); + + /* read parameters from the bitstream */ + if ( st_ivas->hQMetaData != NULL && st_ivas->sba_mode != SBA_MODE_SPAR ) + { + st = ( st_ivas->nSCE > 0 ) ? st_ivas->hSCE[0]->hCoreCoder[0] : st_ivas->hCPE[0]->hCoreCoder[0]; + + if ( st_ivas->ivas_format == SBA_FORMAT ) + { + ivas_dirac_dec_read_BS( ivas_total_brate, st, st_ivas->hDirAC, st_ivas->hQMetaData, &nb_bits_metadata[0], st_ivas->sba_mode, hodirac_flag, 0 ); + } + else + { + if ( ( error = ivas_masa_decode( st_ivas, st, &nb_bits_metadata[0] ) ) != IVAS_ERR_OK ) + { + return error; + } + } + } + else if ( st_ivas->sba_mode == SBA_MODE_SPAR ) + { + if ( st_ivas->hQMetaData != NULL ) + { + st = ( st_ivas->nSCE > 0 ) ? st_ivas->hSCE[0]->hCoreCoder[0] : st_ivas->hCPE[0]->hCoreCoder[0]; + ivas_dirac_dec_read_BS( ivas_total_brate, st, st_ivas->hDirAC, st_ivas->hQMetaData, &nb_bits_metadata[0], st_ivas->sba_mode, hodirac_flag, st_ivas->hSpar->dirac_to_spar_md_bands ); + } + + if ( ( error = ivas_spar_dec( st_ivas, nb_bits_metadata ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + if ( st_ivas->nchan_transport == CPE_CHANNELS && st_ivas->nCPE >= 1 ) + { + st_ivas->hCPE[0]->element_brate = ivas_total_brate; + } + + /* core-decoding of transport channels */ + if ( st_ivas->nSCE == 1 ) + { + if ( ( error = ivas_sce_dec( st_ivas, 0, &output[0], output_frame, nb_bits_metadata[0] ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else if ( st_ivas->nCPE == 1 ) + { + if ( ( error = ivas_cpe_dec( st_ivas, 0, output, output_frame, nb_bits_metadata[0] ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else if ( st_ivas->nCPE > 1 ) + { + if ( ( error = ivas_mct_dec( st_ivas, output, output_frame, nb_bits_metadata[0] ) ) != IVAS_ERR_OK ) + { + return error; + } + } + +#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" ); +#endif + /* TCs remapping */ + nchan_remapped = st_ivas->nchan_transport; + if ( st_ivas->sba_dirac_stereo_flag ) + { + 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_get_spar_dec_md_num_subframes( st_ivas->sba_order, st_ivas->hDecoderConfig->ivas_total_brate ) ); + } + + 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 ) ) ) + { + nchan_remapped = 1; /* Only one channel transported */ + } + + /* HP filtering */ +#ifndef DEBUG_SPAR_BYPASS_EVS_CODEC + for ( n = 0; n < nchan_remapped; n++ ) + { + hp20( output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs ); + } +#endif + if ( st_ivas->ivas_format == SBA_FORMAT ) + { + nchan_remapped = ivas_sba_remapTCs( output, st_ivas, output_frame ); + + if ( st_ivas->sba_mode == SBA_MODE_SPAR && ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) ) + { + ivas_sba_mix_matrix_determiner( st_ivas->hSpar, output, st_ivas->bfi, nchan_remapped, output_frame ); + } + else if ( st_ivas->sba_mode == SBA_MODE_SPAR ) + { + ivas_spar_dec_agc_pca( st_ivas, output, output_frame ); + } + } + + if ( st_ivas->ivas_format == MASA_FORMAT ) + { + ivas_masa_prerender( st_ivas, output, output_frame ); + } + else if ( st_ivas->ivas_format == SBA_FORMAT && ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) ) + { + float gain = 0.8414f; /* Todo: Temporary gain for roughly matching the loudness. To be tuned later together with other outputs. */ + + for ( n = 0; n < nchan_remapped; n++ ) + { + v_multc( output[n], gain, output[n], output_frame ); + } + } + } + else if ( st_ivas->ivas_format == MC_FORMAT ) + { + st = ( st_ivas->nSCE > 0 ) ? st_ivas->hSCE[0]->hCoreCoder[0] : st_ivas->hCPE[0]->hCoreCoder[0]; + + /* LFE channel decoder */ + if ( st_ivas->mc_mode == MC_MODE_MCT ) + { + if ( st_ivas->hCPE[1]->hCoreCoder[1]->hTcxCfg == NULL ) + { + 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 ); + } + + if ( st_ivas->mc_mode == MC_MODE_MCT ) + { + if ( ( error = ivas_mct_dec( st_ivas, output, output_frame, 0 ) ) != IVAS_ERR_OK ) + { + return error; + } + + mvr2r( output_lfe_ch, output[LFE_CHANNEL], output_frame ); + + /* HP filtering */ + for ( n = 0; n < st_ivas->nchan_transport; n++ ) + { + if ( n != LFE_CHANNEL ) + { + hp20( output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs ); + } + } + if ( st_ivas->transport_config != st_ivas->intern_config && ( st_ivas->intern_config == AUDIO_CONFIG_FOA || st_ivas->intern_config == AUDIO_CONFIG_HOA2 || st_ivas->intern_config == AUDIO_CONFIG_HOA3 ) ) + { + if ( ( st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe ) <= ( st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe ) ) + { + ivas_mc2sba( st_ivas->hTransSetup, p_output, p_output, output_frame, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE ); + } + } + if ( ( st_ivas->renderer_type == RENDERER_MC || st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) && ( st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe ) >= ( st_ivas->hOutSetup.nchan_out_woLFE + st_ivas->hOutSetup.num_lfe ) ) + { + if ( st_ivas->renderer_type == RENDERER_MC ) + { + ivas_ls_setup_conversion( st_ivas, st_ivas->nchan_transport, output_frame, p_output, p_output ); + } + else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) + { + ivas_mc2sba( st_ivas->hIntSetup, p_output, p_output, output_frame, st_ivas->hOutSetup.ambisonics_order, 0.f ); + } + } + } + else if ( st_ivas->mc_mode == MC_MODE_PARAMMC ) + { + /* read Parametric MC parameters from the bitstream */ + ivas_param_mc_dec_read_BS( ivas_total_brate, st, st_ivas->hParamMC, &nb_bits_metadata[0] ); + + if ( st_ivas->nCPE == 1 ) + { + if ( ( error = ivas_cpe_dec( st_ivas, 0, output, output_frame, nb_bits_metadata[0] ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else if ( st_ivas->nCPE > 1 ) + { + if ( ( error = ivas_mct_dec( st_ivas, output, output_frame, nb_bits_metadata[0] ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + /* HP filtering */ + for ( n = 0; n < st_ivas->nchan_transport; n++ ) + { + hp20( output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs ); + } + + /* Rendering */ + if ( output_config == AUDIO_CONFIG_MONO || output_config == AUDIO_CONFIG_STEREO ) + { + ivas_ls_setup_conversion( st_ivas, st_ivas->nchan_transport, output_frame, p_output, p_output ); + } + } + else if ( st_ivas->mc_mode == MC_MODE_MCMASA ) + { + if ( st_ivas->hOutSetup.separateChannelEnabled ) + { + st = st_ivas->hCPE[0]->hCoreCoder[0]; /* Metadata is always with CPE in the case of separated channel */ + } + + /* read McMASA parameters from the bitstream */ + if ( ( error = ivas_masa_decode( st_ivas, st, &nb_bits_metadata[0] ) ) != IVAS_ERR_OK ) + { + return error; + } + + if ( st_ivas->hOutSetup.separateChannelEnabled ) + { + /* Decode the transport audio signals */ + if ( ( error = ivas_cpe_dec( st_ivas, 0, output, output_frame, nb_bits_metadata[0] ) ) != IVAS_ERR_OK ) + { + return error; + } + + /* Identify the index of the separated channel, always LFE_CHANNEL-1 here */ + n = LFE_CHANNEL - 1; + + /* Decode the separated channel to output[n] to be combined with the synthesized channels */ + if ( ( error = ivas_sce_dec( st_ivas, 0, &output[n], output_frame, 0 ) ) != IVAS_ERR_OK ) + { + return error; + } + + /* Delay the separated channel to sync with CLDFB delay of the DirAC synthesis, and synthesize the LFE signal. */ + if ( output_config == AUDIO_CONFIG_5_1 || output_config == AUDIO_CONFIG_7_1 || + output_config == AUDIO_CONFIG_5_1_4 || output_config == AUDIO_CONFIG_7_1_4 || + output_config == AUDIO_CONFIG_5_1_2 || ( output_config == AUDIO_CONFIG_LS_CUSTOM && st_ivas->hOutSetup.num_lfe > 0 ) ) + { + ivas_lfe_synth_with_filters( st_ivas->hMasa->hMasaLfeSynth, output, output_frame, n, LFE_CHANNEL ); + } + else if ( output_config == AUDIO_CONFIG_LS_CUSTOM && st_ivas->hOutSetup.num_lfe == 0 ) + { + /* Delay the separated channel to sync with the DirAC rendering */ + delay_signal( output[n], output_frame, st_ivas->hMasa->hMasaLfeSynth->delayBuffer_syncDirAC, st_ivas->hMasa->hMasaLfeSynth->delayBuffer_syncDirAC_size ); + } + } + else + { + if ( st_ivas->nSCE == 1 ) + { + if ( ( error = ivas_sce_dec( st_ivas, 0, output, output_frame, nb_bits_metadata[0] ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else if ( st_ivas->nCPE == 1 ) + { + if ( ( error = ivas_cpe_dec( st_ivas, 0, output, output_frame, nb_bits_metadata[0] ) ) != IVAS_ERR_OK ) + { + return error; + } + } + } + + 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, 1 ); + } + + /* HP filtering */ + for ( n = 0; n < getNumChanSynthesis( st_ivas ); n++ ) + { + hp20( output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs ); + } + + if ( st_ivas->renderer_type == RENDERER_MCMASA_MONO_STEREO ) + { + ivas_mono_stereo_downmix_mcmasa( st_ivas, output, output_frame ); + } + } + } + + + /*----------------------------------------------------------------* + * Write IVAS transport channels + *----------------------------------------------------------------*/ + + ivas_syn_output_f( p_output, output_frame, st_ivas->hTcBuffer->nchan_transport_jbm, data ); + + + /*----------------------------------------------------------------* + * Common updates + *----------------------------------------------------------------*/ + + 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 */ + { + st_ivas->ini_frame++; + } + + if ( st_ivas->ini_active_frame < MAX_FRAME_COUNTER && !( st_ivas->bfi && st_ivas->ini_frame == 0 ) && ivas_total_brate > IVAS_SID_5k2 ) /* needed in MASA decoder in case the first active frame is BFI, and there were SID-frames decoded before */ + { + st_ivas->ini_active_frame++; + } + +#ifdef DEBUG_MODE_INFO + dbgwrite( &st_ivas->bfi, sizeof( int16_t ), 1, output_frame, "res/bfi" ); + dbgwrite( &st_ivas->BER_detect, sizeof( int16_t ), 1, output_frame, "res/BER_detect" ); + { + float tmpF = ivas_total_brate / 1000.0f; + dbgwrite( &tmpF, sizeof( float ), 1, output_frame, "res/ivas_total_brate.dec" ); + } +#endif + + pop_wmops(); + return error; +} + +/*--------------------------------------------------------------------------* + * ivas_jbm_dec_feed_tc_to_renderer() + * + * Feed decoded transport channels and metadata to the IVAS renderer routine + *--------------------------------------------------------------------------*/ + +ivas_error ivas_jbm_dec_feed_tc_to_renderer( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + const int16_t nSamplesForRendering, /* i: : number of TC samples available for rendering */ + int16_t *nSamplesResidual, /* o: : number of samples not fitting into the renderer grid and buffer for the next call*/ + float *data /* i : transport channels */ +) +{ + + float data_f[MAX_CLDFB_DIGEST_CHANNELS][MAX_JBM_L_FRAME48k]; /* 'float' buffer for transport channels that will be directly converted with the CLDFB */ + float *p_data_f[MAX_CLDFB_DIGEST_CHANNELS]; + int16_t n_render_timeslots; + int16_t n; + ivas_error error; + + error = IVAS_ERR_OK; + + push_wmops( "ivas_jbm_dec_feed_tc_to_rendererer" ); + + for ( n = 0; n < MAX_CLDFB_DIGEST_CHANNELS; n++ ) + { + p_data_f[n] = &data_f[n][0]; + } + ivas_jbm_dec_copy_tc( st_ivas, nSamplesForRendering, nSamplesResidual, data, p_data_f ); + n_render_timeslots = st_ivas->hTcBuffer->n_samples_available / st_ivas->hTcBuffer->n_samples_granularity; + + if ( st_ivas->hTcBuffer->tc_buffer_mode == TC_BUFFER_MODE_BUFFER ) + { + ivas_jbm_dec_td_renderers_adapt_subframes( st_ivas ); + } + else if ( st_ivas->ivas_format == STEREO_FORMAT ) + { + ivas_jbm_dec_td_renderers_adapt_subframes( st_ivas ); + } + else if ( st_ivas->ivas_format == ISM_FORMAT ) + { + /* Rendering */ + if ( st_ivas->ism_mode == ISM_MODE_PARAM ) + { + 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_set_md_map( st_ivas, n_render_timeslots ); + ivas_param_ism_params_to_masa_param_mapping( st_ivas ); + } + else if ( st_ivas->renderer_type == RENDERER_PARAM_ISM || st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) + { + ivas_param_ism_dec_digest_tc( st_ivas, n_render_timeslots, p_data_f ); + } + } + else /* ISM_MODE_DISC */ + { + ivas_ism_dec_digest_tc( st_ivas ); + } + } + else if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT ) + { + ivas_sba_dec_digest_tc( st_ivas, n_render_timeslots, st_ivas->hTcBuffer->n_samples_available ); + } + else if ( st_ivas->ivas_format == MC_FORMAT ) + { + if ( st_ivas->mc_mode == MC_MODE_MCT ) + { + ivas_jbm_dec_td_renderers_adapt_subframes( st_ivas ); + } + else if ( st_ivas->mc_mode == MC_MODE_PARAMMC ) + { + ivas_param_mc_dec_digest_tc( st_ivas, (uint8_t) n_render_timeslots, p_data_f ); + } + else if ( st_ivas->mc_mode == MC_MODE_MCMASA ) + { + ivas_sba_dec_digest_tc( st_ivas, n_render_timeslots, st_ivas->hTcBuffer->n_samples_available ); + } + } + + pop_wmops(); + + return error; +} + + +/*--------------------------------------------------------------------------* + * ivas_dec_render() + * + * Principal IVAS rendering routine + *--------------------------------------------------------------------------*/ +ivas_error ivas_jbm_dec_render( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + const uint16_t nSamplesAsked, /* i : number of samples wanted */ + uint16_t *nSamplesRendered, /* o : number of samples rendered */ + uint16_t *nSamplesAvailableNext, /* o : number of samples still available in the rendering pipeline */ + int16_t *data /* o : output synthesis signal */ +) +{ + + int16_t n, nchan_out; + int16_t nchan_transport; + float output[MAX_OUTPUT_CHANNELS][L_FRAME48k]; /* 'float' buffer for output synthesis, MAX_OUTPUT_CHANNELS channels */ /* IVAS_fmToDo: buffer can be allocated dynamically based on the actual number of output channels */ + int16_t nchan_remapped; + int32_t output_Fs; + AUDIO_CONFIG output_config; + int16_t nSamplesAskedLocal; + ivas_error error; + float *p_output[MAX_OUTPUT_CHANNELS]; + float *p_tc[MAX_TRANSPORT_CHANNELS]; + + error = IVAS_ERR_OK; + + push_wmops( "ivas_dec_render" ); + + /*----------------------------------------------------------------* + * Initialization of local vars after struct has been set + *----------------------------------------------------------------*/ + + output_Fs = st_ivas->hDecoderConfig->output_Fs; + nchan_out = st_ivas->hDecoderConfig->nchan_out; + nchan_transport = st_ivas->hTcBuffer->nchan_transport_jbm; + output_config = st_ivas->hDecoderConfig->output_config; + nSamplesAskedLocal = nSamplesAsked + st_ivas->hTcBuffer->n_samples_discard; + for ( n = 0; n < MAX_OUTPUT_CHANNELS; n++ ) + { + p_output[n] = &output[n][0]; + } + + for ( n = 0; n < st_ivas->hTcBuffer->nchan_transport_internal; n++ ) + { + p_tc[n] = &st_ivas->hTcBuffer->tc[n][st_ivas->hTcBuffer->n_samples_rendered]; + } + + /*----------------------------------------------------------------* + * Rendering + *----------------------------------------------------------------*/ + + if ( st_ivas->ivas_format == UNDEFINED_FORMAT ) + { + assert( 0 ); + } + else if ( st_ivas->hTcBuffer->tc_buffer_mode == TC_BUFFER_MODE_BUFFER ) + { + ivas_jbm_dec_tc_buffer_playout( st_ivas, nSamplesAskedLocal, nSamplesRendered, p_output ); + } + else if ( st_ivas->ivas_format == STEREO_FORMAT ) + { + /* Rendering */ + if ( st_ivas->renderer_type == RENDERER_MC ) + { + *nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal ); + ivas_ls_setup_conversion( st_ivas, st_ivas->nchan_transport, *nSamplesRendered, p_tc, p_output ); + } + } + else if ( st_ivas->ivas_format == ISM_FORMAT ) + { + /* Rendering */ + if ( st_ivas->ism_mode == ISM_MODE_PARAM ) + { + 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_binaural_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, st_ivas->nchan_transport, p_output ); + } + else if ( st_ivas->renderer_type == RENDERER_PARAM_ISM || st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) + { + ivas_param_ism_dec_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output ); + + if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) + { + /* Convert CICP19 -> Ambisonics */ + ivas_mc2sba( st_ivas->hIntSetup, p_output, p_output, *nSamplesRendered, st_ivas->hOutSetup.ambisonics_order, 0.f ); + } + } + } + else /* ISM_MODE_DISC */ + { + *nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal ); + /* Loudspeaker or Ambisonics rendering */ + if ( st_ivas->renderer_type == RENDERER_TD_PANNING || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) + { + /* Convert to CICPxx; used also for ISM->CICP19->binaural_room rendering */ + ivas_ism_render_sf( st_ivas, p_output, *nSamplesRendered ); + } + else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV ) + { + /* Convert to Ambisonics; used also for ISM->HOA3->binaural rendering */ + ivas_ism2sba_sf( st_ivas->hTcBuffer->tc, p_output, st_ivas->hIsmRendererData, st_ivas->nchan_transport, *nSamplesRendered, st_ivas->hTcBuffer->n_samples_rendered, st_ivas->hIntSetup.ambisonics_order ); + } + + /* Binaural rendering */ + if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD ) + { + ObjRenderIVASSubframe( st_ivas, p_output, *nSamplesRendered ); + } + else if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) + { + if ( ( error = ivas_rend_crendProcessSubframe( st_ivas->hCrendWrapper, + AUDIO_CONFIG_7_1_4, + AUDIO_CONFIG_BINAURAL_ROOM, + st_ivas->hDecoderConfig, + NULL, + NULL, + NULL, + st_ivas->hTcBuffer, + p_output, + p_output, + *nSamplesRendered, + output_Fs ) ) != IVAS_ERR_OK ) + { + return error; + } + ivas_binaural_add_LFE( st_ivas, *nSamplesRendered, p_output, p_output ); + } +#ifdef DEBUGGING + else if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) + { + ivas_binaural_cldfb_sf( st_ivas, *nSamplesRendered, p_output ); + } +#endif + } + } + else if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT ) + { + nchan_remapped = nchan_transport; + /* Loudspeakers, Ambisonics or Binaural rendering */ + 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_binaural_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, nchan_remapped, p_output ); + } + else if ( st_ivas->sba_mode == SBA_MODE_DIRAC || st_ivas->ivas_format == MASA_FORMAT ) + { + if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC ) + { + *nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal ); + for ( n = 0; n < nchan_remapped; n++ ) + { + mvr2r( st_ivas->hTcBuffer->tc[n] + st_ivas->hTcBuffer->n_samples_rendered, p_output[n], *nSamplesRendered ); + } + ivas_sba_linear_renderer( p_output, *nSamplesRendered, nchan_remapped, output_config, st_ivas->hOutSetup, st_ivas->hoa_dec_mtx ); + } + else if ( st_ivas->renderer_type == RENDERER_DIRAC ) + { + ivas_dirac_dec_render( st_ivas, nchan_remapped, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output ); + } + } + else /* SBA_MODE_SPAR */ + { + ivas_sba_dec_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output ); + } + } + else if ( st_ivas->ivas_format == MC_FORMAT ) + { + if ( st_ivas->mc_mode == MC_MODE_MCT ) + { + *nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal ); + if ( st_ivas->transport_config != st_ivas->intern_config && ( st_ivas->intern_config == AUDIO_CONFIG_FOA || st_ivas->intern_config == AUDIO_CONFIG_HOA2 || st_ivas->intern_config == AUDIO_CONFIG_HOA3 ) ) + { + ivas_mc2sba( st_ivas->hTransSetup, p_tc, p_output, *nSamplesRendered, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE ); + } + + /* Rendering */ + if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) + { + if ( ( error = ivas_rend_crendProcessSubframe( st_ivas->hCrendWrapper, + st_ivas->intern_config, + st_ivas->hOutSetup.output_config, + st_ivas->hDecoderConfig, + st_ivas->hHeadTrackData, + &st_ivas->hIntSetup, + st_ivas->hEFAPdata, + st_ivas->hTcBuffer, + p_tc, + p_output, + *nSamplesRendered, + output_Fs ) ) != IVAS_ERR_OK ) + { + return error; + } + ivas_binaural_add_LFE( st_ivas, *nSamplesRendered, st_ivas->hTcBuffer->tc, p_output ); + } + else if ( st_ivas->renderer_type == RENDERER_MC ) + { + *nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal ); + ivas_ls_setup_conversion( st_ivas, st_ivas->nchan_transport, *nSamplesRendered, p_tc, p_output ); + } + else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) + { + ivas_mc2sba( st_ivas->hIntSetup, p_tc, p_output, *nSamplesRendered, st_ivas->hOutSetup.ambisonics_order, 0.f ); + } + else if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD ) + { + ObjRenderIVASSubframe( st_ivas, p_output, *nSamplesRendered ); + ivas_binaural_add_LFE( st_ivas, *nSamplesRendered, st_ivas->hTcBuffer->tc, p_output ); + } + } + else if ( st_ivas->mc_mode == MC_MODE_PARAMMC ) + { + ivas_param_mc_dec_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output ); + } + else if ( st_ivas->mc_mode == MC_MODE_MCMASA ) + { + + /* Rendering */ + int16_t offset = st_ivas->hDirAC->slots_rendered * st_ivas->hDirAC->slot_size; + nchan_remapped = st_ivas->nchan_transport; + + 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_binaural_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, nchan_remapped, p_output ); + } + else if ( st_ivas->renderer_type == RENDERER_DIRAC || st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) /* rendering to CICPxx and Ambisonics */ + { + ivas_dirac_dec_render( st_ivas, nchan_remapped, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output ); + + + if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) + { + /* we still need to copy the separate channel if available */ + if ( st_ivas->hOutSetup.separateChannelEnabled ) + { + mvr2r( st_ivas->hTcBuffer->tc[LFE_CHANNEL - 1] + offset, output[st_ivas->hOutSetup.separateChannelIndex], *nSamplesRendered ); + } + ivas_mc2sba( st_ivas->hIntSetup, p_output, p_output, *nSamplesRendered, st_ivas->hOutSetup.ambisonics_order, 0.f ); + } + else if ( st_ivas->intern_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 ) ) + { + for ( n = st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe; n < st_ivas->hOutSetup.nchan_out_woLFE + st_ivas->hOutSetup.num_lfe; n++ ) + { + set_zero( output[n], *nSamplesRendered ); + } + } + } + /* copy discrete C and TD LFE from internal TC to output */ + if ( st_ivas->hOutSetup.separateChannelEnabled ) + { + if ( output_config == AUDIO_CONFIG_5_1 || output_config == AUDIO_CONFIG_7_1 || + output_config == AUDIO_CONFIG_5_1_4 || output_config == AUDIO_CONFIG_7_1_4 || + output_config == AUDIO_CONFIG_5_1_2 || ( output_config == AUDIO_CONFIG_LS_CUSTOM && st_ivas->hOutSetup.num_lfe > 0 ) ) + { + mvr2r( st_ivas->hTcBuffer->tc[LFE_CHANNEL] + offset, output[LFE_CHANNEL], *nSamplesRendered ); + mvr2r( st_ivas->hTcBuffer->tc[LFE_CHANNEL - 1] + offset, output[st_ivas->hOutSetup.separateChannelIndex], *nSamplesRendered ); + } + else if ( output_config == AUDIO_CONFIG_LS_CUSTOM && st_ivas->hOutSetup.num_lfe == 0 ) + { + /* Delay the separated channel to sync with the DirAC rendering */ + mvr2r( st_ivas->hTcBuffer->tc[LFE_CHANNEL - 1] + offset, output[st_ivas->hOutSetup.separateChannelIndex], *nSamplesRendered ); + } + } + } + } + + /*----------------------------------------------------------------* + * Write IVAS output channels + * - compensation for saturation + * - float to integer conversion + *----------------------------------------------------------------*/ + st_ivas->hTcBuffer->n_samples_available -= *nSamplesRendered; + st_ivas->hTcBuffer->n_samples_rendered += *nSamplesRendered; + if ( st_ivas->hTcBuffer->n_samples_discard > 0 ) + { + for ( n = 0; n < MAX_OUTPUT_CHANNELS; n++ ) + { + p_output[n] += st_ivas->hTcBuffer->n_samples_discard; + } + *nSamplesRendered -= st_ivas->hTcBuffer->n_samples_discard; + st_ivas->hTcBuffer->n_samples_discard = 0; + } + + ivas_limiter_dec( st_ivas->hLimiter, p_output, nchan_out, *nSamplesRendered, st_ivas->BER_detect ); + +#ifdef DEBUGGING + st_ivas->noClipping += +#endif + ivas_syn_output( p_output, *nSamplesRendered, nchan_out, data ); + + *nSamplesAvailableNext = st_ivas->hTcBuffer->n_samples_available; + + pop_wmops(); + return error; +} + + +/*--------------------------------------------------------------------------* + * ivas_jbm_dec_dec_flush_renderer() + * + * Flush samples if renderer granularity changes on a bitrate change + *--------------------------------------------------------------------------*/ +ivas_error ivas_jbm_dec_flush_renderer( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + const int16_t tc_granularity_new, /* i : new renderer granularity */ + const RENDERER_TYPE renderer_type_old, /* i : old renderer type */ + const AUDIO_CONFIG intern_config_old, /* i : old internal config */ + const IVAS_OUTPUT_SETUP_HANDLE hIntSetupOld, /* i : old internal output setup */ + const MC_MODE mc_mode_old, /* i : old MC mode */ + const ISM_MODE ism_mode_old, /* i : old ISM mode */ + uint16_t *nSamplesRendered, /* o : number of samples flushed */ + int16_t *data /* o : rendered samples */ +) +{ + ivas_error error; + int16_t n_samples_still_available; + int16_t n_slots_still_available; + int16_t n_samples_to_render; + DECODER_TC_BUFFER_HANDLE hTcBuffer; + float output[MAX_CICP_CHANNELS][L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES]; + float *p_output[MAX_CICP_CHANNELS]; + + error = IVAS_ERR_OK; + + *nSamplesRendered = 0; + hTcBuffer = st_ivas->hTcBuffer; + /* get number of possible slots in new granularity */ + n_samples_still_available = hTcBuffer->n_samples_buffered - hTcBuffer->n_samples_rendered; + n_slots_still_available = n_samples_still_available / tc_granularity_new; + *nSamplesRendered = n_slots_still_available * tc_granularity_new; + n_samples_to_render = *nSamplesRendered; + n_samples_still_available -= n_samples_to_render; + assert( n_samples_still_available < tc_granularity_new ); + if ( n_slots_still_available ) + { + int ch_idx; + /* render what is still there with zero padding */ + for ( ch_idx = 0; ch_idx < hTcBuffer->nchan_buffer_full; ch_idx++ ) + { + /* move it at the beginning of the TC buffer with zero padding */ + mvr2r( hTcBuffer->tc[ch_idx] + hTcBuffer->n_samples_rendered, hTcBuffer->tc[ch_idx], n_samples_to_render ); + set_zero( hTcBuffer->tc[ch_idx] + n_samples_to_render, hTcBuffer->n_samples_granularity - n_samples_to_render ); + mvr2r( hTcBuffer->tc[ch_idx] + hTcBuffer->n_samples_rendered + n_samples_to_render, hTcBuffer->tc[ch_idx] + hTcBuffer->n_samples_granularity, n_samples_still_available ); + } + /* simple change of the slot info */ + hTcBuffer->num_slots = 1; + hTcBuffer->nb_subframes = 1; + hTcBuffer->subframes_rendered = 0; + hTcBuffer->slots_rendered = 0; + hTcBuffer->subframe_nbslots[0] = 1; + hTcBuffer->n_samples_buffered = hTcBuffer->n_samples_granularity + n_samples_still_available; + hTcBuffer->n_samples_available = 0; + hTcBuffer->n_samples_flushed = n_samples_to_render; + hTcBuffer->n_samples_rendered = hTcBuffer->n_samples_granularity; + + for ( ch_idx = 0; ch_idx < MAX_CICP_CHANNELS; ch_idx++ ) + { + p_output[ch_idx] = output[ch_idx]; + } + + if ( st_ivas->ivas_format == ISM_FORMAT ) + { + if ( ism_mode_old == ISM_MODE_DISC ) + { + /* Binaural rendering */ + if ( renderer_type_old == RENDERER_BINAURAL_OBJECTS_TD ) + { + ObjRenderIVASSubframe( st_ivas, p_output, hTcBuffer->n_samples_granularity ); + } + else if ( renderer_type_old == RENDERER_BINAURAL_MIXER_CONV_ROOM ) + { + /* Convert to CICPxx; used also for ISM->CICP19->binaural_room rendering */ + set_f( st_ivas->hIsmRendererData->interpolator, 1.0f, hTcBuffer->n_samples_granularity ); + ivas_ism_render_sf( st_ivas, p_output, hTcBuffer->n_samples_granularity ); + if ( ( error = ivas_rend_crendProcessSubframe( st_ivas->hCrendWrapper, + AUDIO_CONFIG_7_1_4, + AUDIO_CONFIG_BINAURAL_ROOM, + st_ivas->hDecoderConfig, + NULL, + NULL, + NULL, + st_ivas->hTcBuffer, + p_output, + p_output, + hTcBuffer->n_samples_granularity, + st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK ) + { + return error; + } + ivas_binaural_add_LFE( st_ivas, hTcBuffer->n_samples_granularity, p_output, p_output ); + } + } + else + { + return IVAS_ERROR( IVAS_ERR_WRONG_MODE, "Wrong ISM_MODE in VoIP renderer flushing!" ); + } + } + else if ( st_ivas->ivas_format == MC_FORMAT ) + { + if ( mc_mode_old == MC_MODE_MCT ) + { + if ( renderer_type_old == RENDERER_BINAURAL_MIXER_CONV || renderer_type_old == RENDERER_BINAURAL_MIXER_CONV_ROOM ) + { + if ( ( error = ivas_rend_crendProcessSubframe( st_ivas->hCrendWrapper, + intern_config_old, + st_ivas->hOutSetup.output_config, + st_ivas->hDecoderConfig, + st_ivas->hHeadTrackData, + hIntSetupOld, + st_ivas->hEFAPdata, + st_ivas->hTcBuffer, + hTcBuffer->tc, + p_output, + hTcBuffer->n_samples_granularity, + st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK ) + { + return error; + } + ivas_binaural_add_LFE( st_ivas, hTcBuffer->n_samples_granularity, st_ivas->hTcBuffer->tc, p_output ); + } + else if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD ) + { + ObjRenderIVASSubframe( st_ivas, p_output, hTcBuffer->n_samples_granularity ); + ivas_binaural_add_LFE( st_ivas, hTcBuffer->n_samples_granularity, st_ivas->hTcBuffer->tc, p_output ); + } + } + else + { + return IVAS_ERROR( IVAS_ERR_WRONG_MODE, "Wrong MC_MODE in VoIP renderer flushing!" ); + } + } + else + { + return IVAS_ERROR( IVAS_ERR_WRONG_MODE, "Wrong IVAS format in VoIP renderer flushing!" ); + } + } + + /* Only write out the valid data*/ + ivas_limiter_dec( st_ivas->hLimiter, p_output, st_ivas->hDecoderConfig->nchan_out, *nSamplesRendered, st_ivas->BER_detect ); + +#ifdef DEBUGGING + st_ivas->noClipping += +#endif + ivas_syn_output( p_output, *nSamplesRendered, st_ivas->hDecoderConfig->nchan_out, data ); + + + return error; +} + +/*--------------------------------------------------------------------------* + * ivas_jbm_dec_set_discard_samples() + * + * Set number of samples to discard in the first subframe if the renderer granularity changes on a bitrate change + *--------------------------------------------------------------------------*/ +ivas_error ivas_jbm_dec_set_discard_samples( + Decoder_Struct *st_ivas /* i/o: main IVAS decoder structre */ +) +{ + int16_t nMaxSlotsPerSubframe, nSlotsInFirstSubframe; + ivas_error error; + + error = IVAS_ERR_OK; + + /* render first frame with front zero padding and discarding those samples */ + nMaxSlotsPerSubframe = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / ( FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES ) ) / st_ivas->hTcBuffer->n_samples_granularity; + nSlotsInFirstSubframe = nMaxSlotsPerSubframe - st_ivas->hTcBuffer->subframe_nbslots[st_ivas->hTcBuffer->nb_subframes - 1]; + if ( nSlotsInFirstSubframe > 0 ) + { + st_ivas->hTcBuffer->n_samples_discard = ( nMaxSlotsPerSubframe - nSlotsInFirstSubframe ) * st_ivas->hTcBuffer->n_samples_granularity; + /* set last subframes number to max to ensure correct continuation */ + st_ivas->hTcBuffer->subframe_nbslots[st_ivas->hTcBuffer->nb_subframes - 1] = nMaxSlotsPerSubframe; + } + return error; +} + +/*--------------------------------------------------------------------------* + * ivas_jbm_dec_get_adapted_linear_interpolator() + * + * Get an interpolator that is adapted to time scale modified IVAS frame + *--------------------------------------------------------------------------*/ + +void ivas_jbm_dec_get_adapted_linear_interpolator( + const int16_t default_interp_length, /* i : default length of the (full-frame) interpolator */ + const int16_t interp_length, /* i : length of the interpolator to be created */ + float *interpolator /* o : the interpolator */ +) +{ + int16_t jbm_segment_len, idx; + float dec; +#ifdef DEBUGGING + assert( default_interp_length % 2 == 0 ); +#endif + + jbm_segment_len = ( default_interp_length >> 1 ); + dec = 1.0f / default_interp_length; + + interpolator[interp_length - 1] = 1.0f; + for ( idx = interp_length - 2; idx >= jbm_segment_len; idx-- ) + { + interpolator[idx] = max( 0.0f, interpolator[idx + 1] - dec ); + } + if ( interpolator[idx + 1] > 0.0f ) + { + dec = interpolator[idx + 1] / ( jbm_segment_len + 1 ); + for ( ; idx >= 0; idx-- ) + { + interpolator[idx] = interpolator[idx + 1] - dec; + } + } + else + { + set_f( interpolator, 0.0f, idx + 1 ); + } +} + +/*--------------------------------------------------------------------------* + * ivas_jbm_dec_get_adapted_subframes() + * + * Get an interpolator that is adapted to time scale modified IVAS frame + *--------------------------------------------------------------------------*/ +void ivas_jbm_dec_get_adapted_subframes( + const int16_t nCldfbTs, /* i : number of time slots in the current frame */ + int16_t *subframe_nbslots, /* i/o: subframe grid */ + int16_t *nb_subframes /* i/o: number of subframes in the frame */ +) +{ + uint16_t nSlotsInLastSubframe, nSlotsInFirstSubframe; + uint16_t nCldfbSlotsLocal = nCldfbTs; + /* get last subframe size from previous frame, determine how many slots have to be processed + in the first subframe (i.e. potential leftover of a 5ms subframe) */ + nSlotsInFirstSubframe = ( PARAM_MC_MAX_NSLOTS_IN_SUBFRAME - subframe_nbslots[*nb_subframes - 1] ); + *nb_subframes = 0; + if ( nSlotsInFirstSubframe > 0 ) + { + *nb_subframes = 1; + nCldfbSlotsLocal -= nSlotsInFirstSubframe; + } + *nb_subframes += (int16_t) ceilf( (float) nCldfbSlotsLocal / (float) PARAM_MC_MAX_NSLOTS_IN_SUBFRAME ); + nSlotsInLastSubframe = nCldfbSlotsLocal % PARAM_MC_MAX_NSLOTS_IN_SUBFRAME; + set_s( subframe_nbslots, 0, MAX_JBM_SUBFRAMES_5MS ); + set_s( subframe_nbslots, PARAM_MC_MAX_NSLOTS_IN_SUBFRAME, *nb_subframes ); + if ( nSlotsInFirstSubframe > 0 ) + { + subframe_nbslots[0] = nSlotsInFirstSubframe; + } + if ( nSlotsInLastSubframe > 0 ) + { + subframe_nbslots[*nb_subframes - 1] = nSlotsInLastSubframe; + } + return; +} + +/*--------------------------------------------------------------------------* + * ivas_jbm_dec_get_adapted_linear_interpolator() + * + * Get an meta data map adapted to a time scale modified IVAS frame + *--------------------------------------------------------------------------*/ +void ivas_jbm_dec_get_md_map( + const int16_t default_len, /* i : default frame length in metadata slots */ + const int16_t len, /* i : length of the modfied frames in metadata slots */ + const int16_t subframe_len, /* i : default length of a subframe */ + const int16_t offset, /* i : current read offset into the md buffer */ + const int16_t buf_len, /* i : length of the metadata buffer */ + int16_t *map /* o : metadata index map */ +) +{ + int16_t jbm_segment_len, map_idx, src_idx, src_idx_map; + float dec, src_idx_f; +#ifdef DEBUGGING + assert( default_len % 2 == 0 ); +#endif + + jbm_segment_len = ( default_len >> 1 ); + dec = 1.0f / default_len; + + + for ( map_idx = len - 1, src_idx = default_len - 1; map_idx >= jbm_segment_len; map_idx--, src_idx-- ) + { + src_idx_map = max( 0, src_idx / subframe_len ); + map[map_idx] = ( offset + src_idx_map ) % buf_len; + } + /* changed part (first segment), interpolate index to parameters + (we do not want to interpolate and smooth acutal direction/diffuseness values even more) */ + if ( src_idx >= 0 ) + { + dec = ( (float) ( src_idx + 1 ) ) / ( (float) jbm_segment_len ); + src_idx_f = (float) ( src_idx + 1 ) - dec; + for ( ; map_idx >= 0; map_idx-- ) + { + src_idx = max( 0, ( (int16_t) round_f( src_idx_f ) ) / subframe_len ); + map[map_idx] = ( offset + src_idx ) % buf_len; + src_idx_f -= dec; + } + } + else + { + set_s( map, offset, map_idx + 1 ); + } +} + +/*--------------------------------------------------------------------------* + * ivas_jbm_dec_get_num_tc_channels() + * + * Get the number of transport channels provided by the JBM transport channel decode function + *--------------------------------------------------------------------------*/ +int16_t ivas_jbm_dec_get_num_tc_channels( Decoder_Struct *st_ivas ) /* i : IVAS decoder handle */ +{ + int16_t num_tc; + int32_t ivas_total_brate; + AUDIO_CONFIG output_config; + + if ( st_ivas->renderer_type == RENDERER_DISABLE ) + { + num_tc = st_ivas->hDecoderConfig->nchan_out; + } + else + { + num_tc = st_ivas->nchan_transport; + } + output_config = st_ivas->hDecoderConfig->output_config; + + ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; + if ( st_ivas->ivas_format == STEREO_FORMAT && st_ivas->hDecoderConfig->nchan_out == 1 ) + { + num_tc = 1; + } + else if ( st_ivas->ivas_format == ISM_FORMAT ) + { + if ( st_ivas->renderer_type == RENDERER_MONO_DOWNMIX ) + { + num_tc = 1; + } + } + else if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT ) + { + if ( st_ivas->sba_dirac_stereo_flag ) + { + num_tc = CPE_CHANNELS; + } + 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 ) ) ) + { + num_tc = 1; /* Only one channel transported */ + } + + if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL && st_ivas->nchan_transport == 2 && st_ivas->hDecoderConfig->ivas_total_brate < MASA_STEREO_MIN_BITRATE && st_ivas->hDecoderConfig->ivas_total_brate > IVAS_SID_5k2 ) + { + num_tc = CPE_CHANNELS; + } + if ( st_ivas->ivas_format == SBA_FORMAT ) + { + if ( ( st_ivas->sba_mode != SBA_MODE_SPAR && st_ivas->sba_planar && num_tc >= 3 ) || + ( ( st_ivas->sba_mode == SBA_MODE_SPAR ) && num_tc == 3 ) ) + { + num_tc++; + } + } + } + else if ( st_ivas->ivas_format == MC_FORMAT ) + { + if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO ) + { + num_tc = 1; + } + else if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ) + { + num_tc = 2; + } + else if ( st_ivas->mc_mode == MC_MODE_MCT ) + { + /* do all static dmx already in the TC decoder if less channels than transported... */ + if ( st_ivas->transport_config != st_ivas->intern_config && ( st_ivas->intern_config == AUDIO_CONFIG_FOA || st_ivas->intern_config == AUDIO_CONFIG_HOA2 || st_ivas->intern_config == AUDIO_CONFIG_HOA3 ) ) + { + if ( ( st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe ) > ( st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe ) ) + { + num_tc = st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe; + } + } + else if ( ( st_ivas->renderer_type == RENDERER_MC || st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) && ( st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe ) >= ( st_ivas->hOutSetup.nchan_out_woLFE + st_ivas->hOutSetup.num_lfe ) ) + { + num_tc = st_ivas->hOutSetup.nchan_out_woLFE + st_ivas->hOutSetup.num_lfe; + } + } + else if ( st_ivas->mc_mode == MC_MODE_MCMASA ) + { + if ( st_ivas->hOutSetup.separateChannelEnabled ) + { + num_tc++; + } + if ( st_ivas->hOutSetup.separateChannelEnabled && ( output_config == AUDIO_CONFIG_5_1 || output_config == AUDIO_CONFIG_7_1 || + output_config == AUDIO_CONFIG_5_1_4 || output_config == AUDIO_CONFIG_7_1_4 || + output_config == AUDIO_CONFIG_5_1_2 || ( output_config == AUDIO_CONFIG_LS_CUSTOM && st_ivas->hOutSetup.num_lfe > 0 ) ) ) + { + /* LFE is synthesized in TD with the TCs*/ + num_tc++; + } + } + } + + return num_tc; +} + +/*--------------------------------------------------------------------------* + * ivas_jbm_dec_copy_tc() + * + * Copy interleaved transport chnannels to the correct buffers, update the TC + * buffer handle + *--------------------------------------------------------------------------*/ +void ivas_jbm_dec_copy_tc( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + const int16_t nSamplesForRendering, /* i : number of samples to digest */ + int16_t *nSamplesResidual, /* o : number of samples that will be left for the next frame */ + float *data, /* i : (interleaved) transport channel samples */ + float *tc_digest_f[] /* o : samples that will be directly digestest (eg. by CLDFB) */ +) +{ + int16_t ch; + DECODER_TC_BUFFER_HANDLE hTcBuffer; + int16_t n_samples_still_available, m; + int16_t n_ch_full_copy; + int16_t n_ch_res_copy; + + + hTcBuffer = st_ivas->hTcBuffer; + n_samples_still_available = hTcBuffer->n_samples_buffered - hTcBuffer->n_samples_rendered; + hTcBuffer->n_samples_buffered = n_samples_still_available + nSamplesForRendering + hTcBuffer->n_samples_discard; + hTcBuffer->n_samples_available = hTcBuffer->n_samples_granularity * ( hTcBuffer->n_samples_buffered / hTcBuffer->n_samples_granularity ); + *nSamplesResidual = hTcBuffer->n_samples_buffered - hTcBuffer->n_samples_available; + n_ch_full_copy = min( hTcBuffer->nchan_transport_jbm, hTcBuffer->nchan_buffer_full ); + n_ch_res_copy = hTcBuffer->nchan_transport_jbm - hTcBuffer->nchan_buffer_full; + + for ( ch = 0; ch < n_ch_full_copy; ch++ ) + { + set_zero( hTcBuffer->tc[ch], hTcBuffer->n_samples_discard ); + mvr2r( hTcBuffer->tc[ch] + hTcBuffer->n_samples_rendered, hTcBuffer->tc[ch] + hTcBuffer->n_samples_discard, n_samples_still_available ); + for ( m = 0; m < nSamplesForRendering; m++ ) + { + hTcBuffer->tc[ch][n_samples_still_available + hTcBuffer->n_samples_discard + m] = data[m * st_ivas->hTcBuffer->nchan_transport_jbm + ch]; + } + } + if ( n_ch_res_copy > 0 ) + { + for ( ; ch < hTcBuffer->nchan_transport_jbm; ch++ ) + { + mvr2r( hTcBuffer->tc[ch], tc_digest_f[ch], n_samples_still_available ); + for ( m = 0; m < nSamplesForRendering; m++ ) + { + tc_digest_f[ch][n_samples_still_available + m] = data[m * st_ivas->hTcBuffer->nchan_transport_jbm + ch]; + } + mvr2r( tc_digest_f[ch] + hTcBuffer->n_samples_available, hTcBuffer->tc[ch], *nSamplesResidual ); + } + } + hTcBuffer->n_samples_rendered = 0; + return; +} + + +int16_t ivas_jbm_dec_get_render_granularity( const RENDERER_TYPE rendererType, + const int32_t output_Fs ) +{ + int16_t render_granularity; + + if ( rendererType == RENDERER_BINAURAL_OBJECTS_TD || rendererType == RENDERER_BINAURAL_MIXER_CONV || rendererType == RENDERER_BINAURAL_MIXER_CONV_ROOM ) + { + render_granularity = NS2SA( output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES ); + } + else + { + render_granularity = NS2SA( output_Fs, CLDFB_SLOT_NS ); + } + + return render_granularity; +} + +/*--------------------------------------------------------------------------* + * ivas_jbm_dec_tc_buffer_open() + * + * open and initialize the transport channel buffer + *--------------------------------------------------------------------------*/ +ivas_error ivas_jbm_dec_tc_buffer_open( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + const TC_BUFFER_MODE tc_buffer_mode, /* i : buffer mode */ + const int16_t nchan_transport_jbm, /* i : number of real transport channels */ + const int16_t nchan_transport_internal, /* i : number of totally buffered channels */ + const int16_t nchan_full, /* i : nubmer of channels to fully store */ + const int16_t n_samples_granularity /* i : granularity of the renderer/buffer */ +) +{ + int16_t nsamp_to_allocate; + DECODER_TC_BUFFER_HANDLE hTcBuffer; + ivas_error error; + int16_t nMaxSlotsPerSubframe; + int16_t nchan_residual; + int16_t ch_idx; + + error = IVAS_ERR_OK; + + /*-----------------------------------------------------------------* + * prepare library opening + *-----------------------------------------------------------------*/ + + if ( ( hTcBuffer = (DECODER_TC_BUFFER_HANDLE) malloc( sizeof( DECODER_TC_BUFFER ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TC Buffer\n" ) ); + } + hTcBuffer->tc_buffer_mode = tc_buffer_mode; + hTcBuffer->nchan_transport_jbm = nchan_transport_jbm; + hTcBuffer->nchan_transport_internal = nchan_transport_internal; + hTcBuffer->nchan_buffer_full = nchan_full; + nchan_residual = nchan_transport_internal - nchan_full; + hTcBuffer->n_samples_granularity = n_samples_granularity; + hTcBuffer->n_samples_available = 0; + hTcBuffer->n_samples_buffered = 0; + hTcBuffer->n_samples_rendered = 0; + hTcBuffer->slots_rendered = 0; + hTcBuffer->subframes_rendered = 0; + hTcBuffer->n_samples_discard = 0; + hTcBuffer->n_samples_flushed = 0; + hTcBuffer->nb_subframes = MAX_PARAM_SPATIAL_SUBFRAMES; + nsamp_to_allocate = 0; + nMaxSlotsPerSubframe = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / ( FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES ) ) / hTcBuffer->n_samples_granularity; + hTcBuffer->num_slots = nMaxSlotsPerSubframe * MAX_PARAM_SPATIAL_SUBFRAMES; + set_s( hTcBuffer->subframe_nbslots, 0, MAX_JBM_SUBFRAMES_5MS ); + set_s( hTcBuffer->subframe_nbslots, nMaxSlotsPerSubframe, MAX_PARAM_SPATIAL_SUBFRAMES ); + + if ( hTcBuffer->tc_buffer_mode == TC_BUFFER_MODE_NONE ) + { + hTcBuffer->tc_buffer = NULL; + for ( ch_idx = 0; ch_idx < MAX_TRANSPORT_CHANNELS; ch_idx++ ) + { + hTcBuffer->tc[ch_idx] = NULL; + } + } + else + { + int16_t n_samp_full = ( NS2SA( st_ivas->hDecoderConfig->output_Fs, MAX_JBM_L_FRAME_NS ) + hTcBuffer->n_samples_granularity - 1 ); + int16_t n_samp_residual = hTcBuffer->n_samples_granularity - 1; + int32_t offset; + nsamp_to_allocate = hTcBuffer->nchan_buffer_full * n_samp_full; + nsamp_to_allocate += nchan_residual * n_samp_residual; + hTcBuffer->tc_buffer = (float *) malloc( nsamp_to_allocate * sizeof( float ) ); + set_zero( hTcBuffer->tc_buffer, nsamp_to_allocate ); + offset = 0; + for ( ch_idx = 0; ch_idx < hTcBuffer->nchan_buffer_full; ch_idx++ ) + { + hTcBuffer->tc[ch_idx] = &hTcBuffer->tc_buffer[offset]; + offset += n_samp_full; + } + for ( ; ch_idx < hTcBuffer->nchan_transport_internal; ch_idx++ ) + { + hTcBuffer->tc[ch_idx] = &hTcBuffer->tc_buffer[offset]; + offset += n_samp_residual; + } + for ( ; ch_idx < MAX_TRANSPORT_CHANNELS; ch_idx++ ) + { + hTcBuffer->tc[ch_idx] = NULL; + } + } + + st_ivas->hTcBuffer = hTcBuffer; + return error; +} + +/*--------------------------------------------------------------------------* + * ivas_jbm_dec_tc_buffer_reconfigure() + * + * open and initialize the transport channel buffer + *--------------------------------------------------------------------------*/ +ivas_error ivas_jbm_dec_tc_buffer_reconfigure( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + const TC_BUFFER_MODE tc_buffer_mode, /* i : new buffer mode */ + const int16_t nchan_transport_jbm, /* i : new number of real transport channels */ + const int16_t nchan_transport_internal, /* i : new number of totally buffered channels */ + const int16_t nchan_full, /* i : new number of channels to fully store */ + const int16_t n_samples_granularity /* i : new granularity of the renderer/buffer */ +) +{ + ivas_error error; + int16_t nsamp_to_allocate, n_samp_full, n_samp_residual, offset, nchan_residual; + int16_t ch_idx; + DECODER_TC_BUFFER_HANDLE hTcBuffer; + + error = IVAS_ERR_OK; + + hTcBuffer = st_ivas->hTcBuffer; + + /* if granularity changes, adapt subframe_nb_slots */ + if ( n_samples_granularity != hTcBuffer->n_samples_granularity ) + { +#ifdef DEBUGGING + int16_t nMaxSlotsPerSubframeOld; +#endif + int16_t nMaxSlotsPerSubframeNew; + + nMaxSlotsPerSubframeNew = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / ( FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES ) ) / n_samples_granularity; +#ifdef DEBUGGING + nMaxSlotsPerSubframeOld = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / ( FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES ) ) / st_ivas->hTcBuffer->n_samples_granularity; + assert( hTcBuffer->subframe_nbslots[hTcBuffer->subframes_rendered - 1] == nMaxSlotsPerSubframeOld ); + if ( n_samples_granularity < hTcBuffer->n_samples_granularity ) + { + assert( ( hTcBuffer->n_samples_granularity % n_samples_granularity ) == 0 ); + } + else + { + assert( ( n_samples_granularity % hTcBuffer->n_samples_granularity ) == 0 ); + } +#endif + /* if samples were flushed, take that into account here */ + if ( n_samples_granularity < hTcBuffer->n_samples_granularity && hTcBuffer->n_samples_flushed > 0 ) + { + hTcBuffer->subframe_nbslots[hTcBuffer->subframes_rendered - 1] = hTcBuffer->n_samples_flushed / n_samples_granularity; + hTcBuffer->n_samples_flushed = 0; + } + else + { + hTcBuffer->subframe_nbslots[hTcBuffer->subframes_rendered - 1] = nMaxSlotsPerSubframeNew; + } + } + + hTcBuffer->tc_buffer_mode = tc_buffer_mode; + hTcBuffer->nchan_transport_jbm = nchan_transport_jbm; + hTcBuffer->nchan_transport_internal = nchan_transport_internal; + hTcBuffer->nchan_buffer_full = nchan_full; + nchan_residual = nchan_transport_internal - nchan_full; + hTcBuffer->n_samples_granularity = n_samples_granularity; + /* what is remaining from last frames needs always be smaller than n_samples_granularity */ + assert( ( hTcBuffer->n_samples_buffered - hTcBuffer->n_samples_rendered ) < n_samples_granularity ); + + /* realloc buffers */ + free( hTcBuffer->tc_buffer ); + n_samp_full = ( NS2SA( st_ivas->hDecoderConfig->output_Fs, MAX_JBM_L_FRAME_NS ) + hTcBuffer->n_samples_granularity - 1 ); + n_samp_residual = hTcBuffer->n_samples_granularity - 1; + nsamp_to_allocate = hTcBuffer->nchan_buffer_full * n_samp_full; + nsamp_to_allocate += nchan_residual * n_samp_residual; + hTcBuffer->tc_buffer = (float *) malloc( nsamp_to_allocate * sizeof( float ) ); + set_zero( hTcBuffer->tc_buffer, nsamp_to_allocate ); + offset = 0; + for ( ch_idx = 0; ch_idx < hTcBuffer->nchan_buffer_full; ch_idx++ ) + { + hTcBuffer->tc[ch_idx] = &hTcBuffer->tc_buffer[offset]; + offset += n_samp_full; + } + for ( ; ch_idx < hTcBuffer->nchan_transport_internal; ch_idx++ ) + { + hTcBuffer->tc[ch_idx] = &hTcBuffer->tc_buffer[offset]; + offset += n_samp_residual; + } + for ( ; ch_idx < MAX_TRANSPORT_CHANNELS; ch_idx++ ) + { + hTcBuffer->tc[ch_idx] = NULL; + } + + return error; +} + +void ivas_jbm_dec_tc_buffer_playout( + Decoder_Struct *st_ivas, + const uint16_t nSamplesAsked, + uint16_t *nSamplesRendered, + float *output[] ) +{ + + int16_t ch_idx, slot_size, slots_to_render, first_sf, last_sf; + + slot_size = st_ivas->hTcBuffer->n_samples_granularity; + /* loop for synthesis, assume we always have to render in multiples of 5ms subframes with spills */ + slots_to_render = min( st_ivas->hTcBuffer->num_slots - st_ivas->hTcBuffer->slots_rendered, nSamplesAsked / slot_size ); + st_ivas->hTcBuffer->slots_rendered += slots_to_render; + *nSamplesRendered = (uint16_t) slots_to_render * slot_size; + first_sf = st_ivas->hTcBuffer->subframes_rendered; + last_sf = first_sf; + while ( slots_to_render > 0 ) + { + slots_to_render -= st_ivas->hTcBuffer->subframe_nbslots[last_sf]; + last_sf++; + } + for ( ch_idx = 0; ch_idx < st_ivas->hTcBuffer->nchan_transport_jbm; ch_idx++ ) + { + mvr2r( st_ivas->hTcBuffer->tc[ch_idx] + st_ivas->hTcBuffer->n_samples_rendered, output[ch_idx], *nSamplesRendered ); + } + + st_ivas->hTcBuffer->subframes_rendered = last_sf; +} + +void ivas_jbm_dec_tc_buffer_close( + DECODER_TC_BUFFER_HANDLE *phTcBuffer /* i/o: TC buffer handle */ +) +{ + int16_t i; + + if ( *phTcBuffer != NULL ) + { + for ( i = 0; i < MAX_TRANSPORT_CHANNELS; i++ ) + { + ( *phTcBuffer )->tc[i] = NULL; + } + if ( ( *phTcBuffer )->tc_buffer != NULL ) + { + free( ( *phTcBuffer )->tc_buffer ); + ( *phTcBuffer )->tc_buffer = NULL; + } + + free( *phTcBuffer ); + *phTcBuffer = NULL; + } + return; +} + +void ivas_jbm_dec_td_renderers_adapt_subframes( + Decoder_Struct *st_ivas ) +{ + int16_t nMaxSlotsPerSubframe, nSlotsAvailable; + uint16_t nSlotsInLastSubframe, nSlotsInFirstSubframe; + nMaxSlotsPerSubframe = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / ( FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES ) ) / st_ivas->hTcBuffer->n_samples_granularity; + nSlotsAvailable = st_ivas->hTcBuffer->n_samples_available / st_ivas->hTcBuffer->n_samples_granularity; + st_ivas->hTcBuffer->num_slots = nSlotsAvailable; + st_ivas->hTcBuffer->n_samples_available = nSlotsAvailable * st_ivas->hTcBuffer->n_samples_granularity; + nSlotsInFirstSubframe = nMaxSlotsPerSubframe - st_ivas->hTcBuffer->subframe_nbslots[st_ivas->hTcBuffer->nb_subframes - 1]; + st_ivas->hTcBuffer->nb_subframes = 0; + if ( nSlotsInFirstSubframe > 0 ) + { + st_ivas->hTcBuffer->nb_subframes = 1; + nSlotsAvailable -= nSlotsInFirstSubframe; + } + st_ivas->hTcBuffer->nb_subframes += (int16_t) ceilf( (float) nSlotsAvailable / (float) nMaxSlotsPerSubframe ); + nSlotsInLastSubframe = nSlotsAvailable % nMaxSlotsPerSubframe; + set_s( st_ivas->hTcBuffer->subframe_nbslots, 0, MAX_JBM_SUBFRAMES_5MS ); + set_s( st_ivas->hTcBuffer->subframe_nbslots, nMaxSlotsPerSubframe, st_ivas->hTcBuffer->nb_subframes ); + if ( nSlotsInFirstSubframe > 0 ) + { + st_ivas->hTcBuffer->subframe_nbslots[0] = nSlotsInFirstSubframe; + } + if ( nSlotsInLastSubframe > 0 ) + { + st_ivas->hTcBuffer->subframe_nbslots[st_ivas->hTcBuffer->nb_subframes - 1] = nSlotsInLastSubframe; + } + st_ivas->hTcBuffer->slots_rendered = 0; + st_ivas->hTcBuffer->subframes_rendered = 0; +} + +TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode( Decoder_Struct *st_ivas ) +{ + TC_BUFFER_MODE buffer_mode; + buffer_mode = TC_BUFFER_MODE_BUFFER; + + /*:TODO: wrap this maybe nicer without directly accessing the st_ivas struct...*/ + switch ( st_ivas->renderer_type ) + { + /* all renderers where we are done after TC decoding (might include DMX to mono/stereo */ + case RENDERER_DISABLE: + case RENDERER_MCMASA_MONO_STEREO: + case RENDERER_MONO_DOWNMIX: + buffer_mode = TC_BUFFER_MODE_BUFFER; + break; + case RENDERER_TD_PANNING: + case RENDERER_BINAURAL_OBJECTS_TD: + case RENDERER_BINAURAL_FASTCONV: + case RENDERER_BINAURAL_FASTCONV_ROOM: + case RENDERER_BINAURAL_PARAMETRIC: + case RENDERER_BINAURAL_PARAMETRIC_ROOM: + case RENDERER_STEREO_PARAMETRIC: + case RENDERER_DIRAC: + case RENDERER_PARAM_ISM: + case RENDERER_BINAURAL_MIXER_CONV: + case RENDERER_BINAURAL_MIXER_CONV_ROOM: + buffer_mode = TC_BUFFER_MODE_RENDERER; + break; + case RENDERER_MC_PARAMMC: + if ( st_ivas->hParamMC->synthesis_conf == PARAM_MC_SYNTH_MONO_STEREO ) + { + buffer_mode = TC_BUFFER_MODE_BUFFER; /* TCs are already the DMX to mono or stereo */ + } + else + { + buffer_mode = TC_BUFFER_MODE_RENDERER; + } + break; + case RENDERER_MC: + if ( ivas_jbm_dec_get_num_tc_channels( st_ivas ) != st_ivas->hDecoderConfig->nchan_out ) + { + buffer_mode = TC_BUFFER_MODE_RENDERER; + } + break; + case RENDERER_SBA_LINEAR_ENC: + if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT && ( st_ivas->renderer_type == RENDERER_MC || st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) && ( st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe ) >= ( st_ivas->hOutSetup.nchan_out_woLFE + st_ivas->hOutSetup.num_lfe ) ) + { + buffer_mode = TC_BUFFER_MODE_BUFFER; + } + else + { + buffer_mode = TC_BUFFER_MODE_RENDERER; + } + break; + case RENDERER_SBA_LINEAR_DEC: + if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR && ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ) ) + { + buffer_mode = TC_BUFFER_MODE_BUFFER; + } + else + { + buffer_mode = TC_BUFFER_MODE_RENDERER; + } + break; +#ifdef DEBUGGING + default: + assert( 0 ); +#endif + } + + + return buffer_mode; +} +#endif diff --git a/lib_dec/ivas_masa_dec.c b/lib_dec/ivas_masa_dec.c index 3c7e490cbc1c18191c288d82d2f5eb6bef784878..7445bfb4894103069b518c76da51d939b6088b54 100644 --- a/lib_dec/ivas_masa_dec.c +++ b/lib_dec/ivas_masa_dec.c @@ -47,22 +47,23 @@ /*-----------------------------------------------------------------------* * Local constants *-----------------------------------------------------------------------*/ -#define SPAR_META_DELAY_SUBFRAMES 2 /* Number of subframes to delay the SPAR metadata */ -#ifdef FIX_350_MASA_DELAY_COMP -#define SPH_IDX_FRONT ( MASA_NO_POINTS_EQUATOR / 2 ) /* Spherical index corresponding to front direction for setting as default value */ -#endif + +#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 *-----------------------------------------------------------------------*/ - +#ifndef HR_METADATA 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 ); +#endif + static void index_16bits( IVAS_QMETADATA_HANDLE hQMetaData, SPHERICAL_GRID_DATA *Sph_Grid16 ); -#ifdef FIX_350_MASA_DELAY_COMP + static void create_masa_ext_out_meta( MASA_DECODER *hMasa, IVAS_QMETADATA_HANDLE hQMetaData, const int16_t nchan_transport ); -#endif static void replicate_subframes( IVAS_QMETADATA_HANDLE hQMetaData ); @@ -195,8 +196,36 @@ ivas_error ivas_masa_decode( /* Remove already read bits from the bit budget */ hQMetaData->metadata_max_bits -= *nb_bits_read; - - *nb_bits_read += ivas_qmetadata_dec_decode( hQMetaData, st->bit_stream, &st->next_bit_pos ); +#ifdef HR_METADATA + if ( ivas_total_brate >= IVAS_384k ) + { + if ( ivas_total_brate >= IVAS_512k ) + { + *nb_bits_read += ivas_qmetadata_dec_decode_hr_384_512( hQMetaData, st->bit_stream, &st->next_bit_pos, hMasa->data.sph_grid16, 16, 4 +#ifdef FIX_HBR_MASAMETA + , + hMasa->config.numCodingBands +#endif + ); + } + else + { + *nb_bits_read += ivas_qmetadata_dec_decode_hr_384_512( hQMetaData, st->bit_stream, &st->next_bit_pos, hMasa->data.sph_grid16, 11, 3 +#ifdef FIX_HBR_MASAMETA + , + hMasa->config.numCodingBands +#endif + ); + } + } + else + { +#endif + *nb_bits_read += ivas_qmetadata_dec_decode( hQMetaData, st->bit_stream, &st->next_bit_pos, + 0 ); +#ifdef HR_METADATA + } +#endif /* Get direction decoding quality. EC 1 and 2 are handled by the default value. */ if ( hQMetaData->ec_flag == 2 ) @@ -279,7 +308,10 @@ 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, + 0 ); } st->next_bit_pos = next_bit_pos_orig; @@ -308,12 +340,10 @@ ivas_error ivas_masa_decode( } } -#ifdef FIX_350_MASA_DELAY_COMP 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 ); } -#endif return error /* *nb_bits_read*/; } @@ -355,19 +385,15 @@ ivas_error ivas_masa_dec_open( } generate_gridEq( hMasa->data.sph_grid16 ); -#ifdef FIX_350_MASA_DELAY_COMP 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" ) ); } -#endif } else { hMasa->data.sph_grid16 = NULL; -#ifdef FIX_350_MASA_DELAY_COMP hMasa->data.extOutMeta = NULL; -#endif } if ( st_ivas->mc_mode == MC_MODE_MCMASA ) @@ -381,6 +407,25 @@ ivas_error ivas_masa_dec_open( st_ivas->hMasa = hMasa; +#ifdef JBM_TSM_ON_TCS + /* allocate transport channels*/ + if ( st_ivas->hDecoderConfig->voip_active == 1 && st_ivas->hTcBuffer == NULL && st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM && st_ivas->renderer_type != RENDERER_STEREO_PARAMETRIC ) + { + int16_t nchan_to_allocate; + TC_BUFFER_MODE buffer_mode; + buffer_mode = TC_BUFFER_MODE_RENDERER; + if ( st_ivas->mc_mode == MC_MODE_MCMASA && ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO ) ) + { + buffer_mode = TC_BUFFER_MODE_BUFFER; + } + nchan_to_allocate = ivas_jbm_dec_get_num_tc_channels( st_ivas ); + if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, buffer_mode, nchan_to_allocate, nchan_to_allocate, nchan_to_allocate, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK ) + { + return error; + } + } +#endif /* JBM_TMS_ON_TCS*/ + return error; } @@ -411,13 +456,11 @@ void ivas_masa_dec_close( hMasa->data.sph_grid16 = NULL; } -#ifdef FIX_350_MASA_DELAY_COMP if ( hMasa->data.extOutMeta != NULL ) { free( hMasa->data.extOutMeta ); hMasa->data.extOutMeta = NULL; } -#endif if ( hMasa->hMasaLfeSynth != NULL ) { @@ -464,6 +507,10 @@ static ivas_error ivas_masa_dec_config( { int16_t i; MASA_DECODER_HANDLE hMasa; +#ifdef FIX_HBR_MASAMETA + uint8_t maxBand; + int16_t maxBin; +#endif ivas_error error; error = IVAS_ERR_OK; @@ -472,6 +519,19 @@ static ivas_error ivas_masa_dec_config( 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 ); ivas_masa_set_coding_config( &( hMasa->config ), hMasa->data.band_mapping, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) ); + +#ifdef HR_METADATA + if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->hDecoderConfig->ivas_total_brate == IVAS_512k ) + { + hMasa->config.mergeRatiosOverSubframes = 0; + /* initialize spherical grid */ + if ( hMasa->data.sph_grid16 == NULL ) + { + hMasa->data.sph_grid16 = (SPHERICAL_GRID_DATA *) malloc( sizeof( SPHERICAL_GRID_DATA ) ); + generate_gridEq( hMasa->data.sph_grid16 ); + } + } +#endif st_ivas->hQMetaData->metadata_max_bits = hMasa->config.max_metadata_bits; st_ivas->hQMetaData->bandMap = hMasa->data.band_mapping; st_ivas->hQMetaData->nchan_transport = st_ivas->nchan_transport; @@ -501,7 +561,26 @@ static ivas_error ivas_masa_dec_config( ivas_set_qmetadata_maxbit_req( st_ivas->hQMetaData, st_ivas->ivas_format ); -#ifdef FIX_350_MASA_DELAY_COMP +#ifdef FIX_HBR_MASAMETA + /* Find maximum band usable */ + maxBin = (int16_t) ( st_ivas->hDecoderConfig->output_Fs * INV_CLDFB_BANDWIDTH ); + maxBand = 0; + while ( maxBand <= MASA_FREQUENCY_BANDS && MASA_band_grouping_24[maxBand] <= maxBin ) + { + maxBand++; + } + maxBand--; + + 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, maxBand, 0, hMasa->data.extOutMeta ); + } + else + { + masa_sample_rate_band_correction( &( hMasa->config ), hMasa->data.band_mapping, st_ivas->hQMetaData, maxBand, 0, NULL ); + } +#else if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) { /* need to apply the sampling rate correction also for the EXT output MASA meta buffer */ @@ -511,8 +590,6 @@ static ivas_error ivas_masa_dec_config( { masa_sample_rate_band_correction( &( hMasa->config ), hMasa->data.band_mapping, st_ivas->hQMetaData, st_ivas->hDecoderConfig->output_Fs, NULL ); } -#else - masa_sample_rate_band_correction( &( hMasa->config ), hMasa->data.band_mapping, st_ivas->hQMetaData, st_ivas->hDecoderConfig->output_Fs ); #endif return error; @@ -531,7 +608,11 @@ void ivas_masa_prerender( const int16_t output_frame /* i : output frame length per channel */ ) { +#ifdef FIX_490_MASA_2TC_LBR_DTX + if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->nchan_transport == 2 && st_ivas->hDecoderConfig->ivas_total_brate < MASA_STEREO_MIN_BITRATE ) +#else if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->nchan_transport == 2 && st_ivas->hDecoderConfig->ivas_total_brate < MASA_STEREO_MIN_BITRATE && st_ivas->hDecoderConfig->ivas_total_brate > IVAS_SID_5k2 ) +#endif { if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) { @@ -553,7 +634,7 @@ void ivas_masa_prerender( /*-------------------------------------------------------------------* * Local functions *-------------------------------------------------------------------*/ - +#ifndef HR_METADATA /* !r: index of quantized value */ static int16_t quantize_theta( float x, /* i : theta value to be quantized */ @@ -722,7 +803,7 @@ static uint16_t index_theta_phi_16( return idx_sph; } - +#endif static void index_16bits( IVAS_QMETADATA_HANDLE hQMetaData, @@ -737,8 +818,8 @@ static void index_16bits( { for ( block = 0; block < hQMetaData->q_direction[0].cfg.nblocks; block++ ) { - hQMetaData->q_direction[d].band_data[band].spherical_index[block] = index_theta_phi_16( hQMetaData->q_direction[d].band_data[band].elevation[block], - hQMetaData->q_direction[d].band_data[band].azimuth[block], Sph_Grid16 ); + hQMetaData->q_direction[d].band_data[band].spherical_index[block] = index_theta_phi_16( &( hQMetaData->q_direction[d].band_data[band].elevation[block] ), + &( hQMetaData->q_direction[d].band_data[band].azimuth[block] ), Sph_Grid16 ); } } } @@ -1093,6 +1174,7 @@ ivas_error ivas_masa_dec_reconfigure( uint16_t *bit_stream; Decoder_State **sts; int32_t ivas_total_brate, last_ivas_total_brate; + int16_t numCldfbAnalyses_old, numCldfbSyntheses_old; ivas_error error; error = IVAS_ERR_OK; @@ -1100,6 +1182,26 @@ 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; + ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old ); + + /* renderer might have changed, reselect */ + ivas_renderer_select( st_ivas ); + + if ( st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->hDirAC == NULL ) + { + /* 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 ) + { + /* close unnecessary DirAC dec */ + ivas_dirac_dec_close( &( st_ivas->hDirAC ) ); + } + /* possible reconfigure is done later */ + /*-----------------------------------------------------------------* * Allocate and initialize SCE/CPE and other handles *-----------------------------------------------------------------*/ @@ -1156,34 +1258,82 @@ ivas_error ivas_masa_dec_reconfigure( } } } + if ( st_ivas->hDiracDecBin != NULL ) + { + /* regularization factor is bitrate-dependent */ + st_ivas->hDiracDecBin->reqularizationFactor = configure_reqularization_factor( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate ); + } + /*-----------------------------------------------------------------* + * 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 + *-----------------------------------------------------------------*/ ivas_masa_set_elements( ivas_total_brate, st_ivas->mc_mode, st_ivas->nchan_transport, st_ivas->hQMetaData, &tmp, &tmp, &tmp ); +#ifdef JBM_TSM_ON_TCS + if ( st_ivas->hDecoderConfig->voip_active == 1 ) + { + int16_t tc_nchan_to_allocate; + int16_t tc_nchan_transport; + TC_BUFFER_MODE buffer_mode_new; + + buffer_mode_new = ivas_jbm_dec_get_tc_buffer_mode( st_ivas ); + tc_nchan_transport = ivas_jbm_dec_get_num_tc_channels( st_ivas ); + tc_nchan_to_allocate = tc_nchan_transport; + if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC ) + { + tc_nchan_to_allocate = 2 * BINAURAL_CHANNELS; + } + if ( tc_nchan_transport != st_ivas->hTcBuffer->nchan_transport_jbm || tc_nchan_to_allocate != st_ivas->hTcBuffer->nchan_transport_internal || buffer_mode_new != st_ivas->hTcBuffer->tc_buffer_mode ) + { + if ( ( error = ivas_jbm_dec_tc_buffer_reconfigure( st_ivas, buffer_mode_new, tc_nchan_transport, tc_nchan_to_allocate, tc_nchan_to_allocate, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK ) + { + return error; + } + } + } +#endif return error; } -/*-------------------------------------------------------------------* - * ivas_spar_param_to_masa_param_mapping() - * - * Determine MASA metadata from the SPAR metadata - *-------------------------------------------------------------------*/ +#ifdef JBM_TSM_ON_TCS +#endif void ivas_spar_param_to_masa_param_mapping( - 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 */ + Decoder_Struct *st_ivas, /* i/o: IVAS decoder struct */ + float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i : Input audio in CLDFB domain, real */ + float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i : Input audio in CLDFB domain, imag */ + const int16_t subframe /* i : Subframe to map */ ) { - int16_t i, j, sf, band, bin, slot, ch, nBins, nchan_transport; + int16_t i, j, band, bin, slot, ch, nBins, nchan_transport; int16_t mixer_mat_index; int16_t dirac_write_idx; DIRAC_DEC_HANDLE hDirAC; DIFFUSE_DISTRIBUTION_HANDLE hDiffuseDist; - float mixer_mat_sf_bands_real[MAX_PARAM_SPATIAL_SUBFRAMES][SPAR_DIRAC_SPLIT_START_BAND][FOA_CHANNELS][FOA_CHANNELS]; - float mixer_mat_sf_bins_real[MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX][FOA_CHANNELS][FOA_CHANNELS]; + float mixer_mat_sf_bands_real[SPAR_DIRAC_SPLIT_START_BAND][FOA_CHANNELS][FOA_CHANNELS]; + float mixer_mat_sf_bins_real[CLDFB_NO_CHANNELS_MAX][FOA_CHANNELS][FOA_CHANNELS]; int16_t *band_grouping; int16_t band_start, band_end; float transportSignalEnergies[2][CLDFB_NO_CHANNELS_MAX]; @@ -1193,6 +1343,12 @@ void ivas_spar_param_to_masa_param_mapping( float foaCovarianceMtx[FOA_CHANNELS][FOA_CHANNELS]; float Iy, Iz, Ix, E, azi, ele, I, ratio; float diffuseGainX, diffuseGainY, diffuseGainZ, diffuseGainSum; +#ifdef JBM_TSM_ON_TCS + int16_t slot_idx, slot_idx_start, sf; + SPAR_DEC_HANDLE hSpar; + float slot_fac; +#endif + /* Set values */ hDirAC = st_ivas->hDirAC; @@ -1200,7 +1356,12 @@ void ivas_spar_param_to_masa_param_mapping( hDiffuseDist = st_ivas->hDirAC->hDiffuseDist; nchan_transport = st_ivas->nchan_transport; band_grouping = hDirAC->band_grouping; +#ifdef JBM_TSM_ON_TCS + hSpar = st_ivas->hSpar; + dirac_write_idx = hDirAC->render_to_md_map[subframe]; +#else dirac_write_idx = hDirAC->dirac_read_idx; /* Mixing matrices, from which MASA meta is determined, already have the delay compensation */ +#endif /* Init arrays */ for ( i = 0; i < FOA_CHANNELS; i++ ) @@ -1209,54 +1370,75 @@ void ivas_spar_param_to_masa_param_mapping( } /* Delay the SPAR mixing matrices to have them synced with the audio */ - for ( sf = firstSubframe; sf < ( firstSubframe + nSubframes ); sf++ ) +#ifdef JBM_TSM_ON_TCS + slot_idx_start = hSpar->slots_rendered; + slot_fac = 1.0f / (float) hSpar->subframe_nbslots[subframe]; + + for ( slot_idx = 0; slot_idx < hSpar->subframe_nbslots[subframe]; slot_idx++ ) { - if ( sf < SPAR_META_DELAY_SUBFRAMES ) + sf = hSpar->render_to_md_map[slot_idx + slot_idx_start] / JBM_CLDFB_SLOTS_IN_SUBFRAME; +#endif + if ( subframe < SPAR_META_DELAY_SUBFRAMES ) { +#ifdef JBM_TSM_ON_TCS mixer_mat_index = sf + MAX_PARAM_SPATIAL_SUBFRAMES - SPAR_META_DELAY_SUBFRAMES + 1; +#else + mixer_mat_index = subframe + MAX_PARAM_SPATIAL_SUBFRAMES - SPAR_META_DELAY_SUBFRAMES + 1; +#endif for ( band = 0; band < SPAR_DIRAC_SPLIT_START_BAND; band++ ) { for ( i = 0; i < FOA_CHANNELS; i++ ) { for ( j = 0; j < FOA_CHANNELS; j++ ) { - mixer_mat_sf_bands_real[sf][band][i][j] = st_ivas->hSpar->hMdDec->mixer_mat_prev[mixer_mat_index][i][j][band]; +#ifdef JBM_TSM_ON_TCS + mixer_mat_sf_bands_real[band][i][j] = slot_fac * st_ivas->hSpar->hMdDec->mixer_mat_prev[mixer_mat_index][i][j][band]; +#else + mixer_mat_sf_bands_real[band][i][j] = st_ivas->hSpar->hMdDec->mixer_mat_prev[mixer_mat_index][i][j][band]; +#endif } } } } else { +#ifdef JBM_TSM_ON_TCS mixer_mat_index = sf - SPAR_META_DELAY_SUBFRAMES; +#else + mixer_mat_index = subframe - SPAR_META_DELAY_SUBFRAMES; +#endif for ( band = 0; band < SPAR_DIRAC_SPLIT_START_BAND; band++ ) { for ( i = 0; i < FOA_CHANNELS; i++ ) { for ( j = 0; j < FOA_CHANNELS; j++ ) { - mixer_mat_sf_bands_real[sf][band][i][j] = st_ivas->hSpar->hMdDec->mixer_mat[i][j][band + mixer_mat_index * IVAS_MAX_NUM_BANDS]; +#ifdef JBM_TSM_ON_TCS + mixer_mat_sf_bands_real[band][i][j] = slot_fac * st_ivas->hSpar->hMdDec->mixer_mat[i][j][band + mixer_mat_index * IVAS_MAX_NUM_BANDS]; +#else + mixer_mat_sf_bands_real[band][i][j] = st_ivas->hSpar->hMdDec->mixer_mat[i][j][band + mixer_mat_index * IVAS_MAX_NUM_BANDS]; +#endif } } } } +#ifdef JBM_TSM_ON_TCS } +#endif /* Map the mixing matrices from the frequency bands to frequency bins */ bin = 0; - for ( sf = firstSubframe; sf < ( firstSubframe + nSubframes ); sf++ ) + for ( band = 0; band < SPAR_DIRAC_SPLIT_START_BAND; band++ ) { - for ( band = 0; band < SPAR_DIRAC_SPLIT_START_BAND; band++ ) + band_start = band_grouping[band]; + band_end = band_grouping[band + 1]; + for ( bin = band_start; bin < band_end; bin++ ) { - band_start = band_grouping[band]; - band_end = band_grouping[band + 1]; - for ( bin = band_start; bin < band_end; bin++ ) + for ( i = 0; i < FOA_CHANNELS; i++ ) { - for ( i = 0; i < FOA_CHANNELS; i++ ) + for ( j = 0; j < FOA_CHANNELS; j++ ) { - for ( j = 0; j < FOA_CHANNELS; j++ ) - { - mixer_mat_sf_bins_real[sf][bin][i][j] = mixer_mat_sf_bands_real[sf][band][i][j]; - } + mixer_mat_sf_bins_real[bin][i][j] = mixer_mat_sf_bands_real[band][i][j]; } } } @@ -1264,125 +1446,143 @@ void ivas_spar_param_to_masa_param_mapping( nBins = bin; /* Determine MASA metadata */ - for ( sf = firstSubframe; sf < ( firstSubframe + nSubframes ); sf++ ) + /* Determine transport signal energies and cross correlations when more than 1 TC */ + if ( nchan_transport == 2 ) { - /* Determine transport signal energies and cross correlations when more than 1 TC */ - if ( nchan_transport == 2 ) - { - set_zero( transportSignalEnergies[0], nBins ); - set_zero( transportSignalEnergies[1], nBins ); - set_zero( transportSignalCrossCorrelation, nBins ); + set_zero( transportSignalEnergies[0], nBins ); + set_zero( transportSignalEnergies[1], nBins ); + set_zero( transportSignalCrossCorrelation, nBins ); - for ( slot = 0; slot < hDirAC->subframe_nbslots; slot++ ) +#ifdef JBM_TSM_ON_TCS + for ( slot = 0; slot < hDirAC->subframe_nbslots[subframe]; slot++ ) +#else + for ( slot = 0; slot < hDirAC->subframe_nbslots; slot++ ) +#endif + { + for ( bin = 0; bin < nBins; bin++ ) { - int16_t slotThis = slot + ( hDirAC->subframe_nbslots * sf ); - - for ( bin = 0; bin < nBins; bin++ ) + for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) { - for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) - { - instEne = ( inRe[ch][slotThis][bin] * inRe[ch][slotThis][bin] ); - instEne += ( inIm[ch][slotThis][bin] * inIm[ch][slotThis][bin] ); - transportSignalEnergies[ch][bin] += instEne; - } - transportSignalCrossCorrelation[bin] += inRe[0][slotThis][bin] * inRe[1][slotThis][bin]; - transportSignalCrossCorrelation[bin] += inIm[0][slotThis][bin] * inIm[1][slotThis][bin]; + instEne = ( inRe[ch][slot][bin] * inRe[ch][slot][bin] ); + instEne += ( inIm[ch][slot][bin] * inIm[ch][slot][bin] ); + transportSignalEnergies[ch][bin] += instEne; } + transportSignalCrossCorrelation[bin] += inRe[0][slot][bin] * inRe[1][slot][bin]; + transportSignalCrossCorrelation[bin] += inIm[0][slot][bin] * inIm[1][slot][bin]; } } + } - if ( hDiffuseDist != NULL ) + if ( hDiffuseDist != NULL ) + { +#ifdef JBM_TSM_ON_TCS + set_zero( hDiffuseDist->diffuseRatioX, CLDFB_NO_CHANNELS_MAX ); + set_zero( hDiffuseDist->diffuseRatioY, CLDFB_NO_CHANNELS_MAX ); + set_zero( hDiffuseDist->diffuseRatioZ, CLDFB_NO_CHANNELS_MAX ); +#else + set_zero( hDiffuseDist->diffuseRatioX[subframe], CLDFB_NO_CHANNELS_MAX ); + set_zero( hDiffuseDist->diffuseRatioY[subframe], CLDFB_NO_CHANNELS_MAX ); + set_zero( hDiffuseDist->diffuseRatioZ[subframe], CLDFB_NO_CHANNELS_MAX ); +#endif + } + + for ( bin = 0; bin < nBins; bin++ ) + { + /* Set the energy of the first transport signal */ + if ( nchan_transport == 1 ) + { + inCovarianceMtx[0][0] = 1.0f; /* In case of 1TC, fixed value can be used */ + } + else + { + inCovarianceMtx[0][0] = transportSignalEnergies[0][bin]; /* In case of 2TC, use actual energies */ + } + /* Decorrelated channels assumed to have the same energy as the source channel */ + inCovarianceMtx[1][1] = inCovarianceMtx[0][0]; + inCovarianceMtx[2][2] = inCovarianceMtx[0][0]; + inCovarianceMtx[3][3] = inCovarianceMtx[0][0]; + + /* In case residuals were transmitted, use their actual energies and cross correlations */ + if ( nchan_transport == 2 ) { - set_zero( hDiffuseDist->diffuseRatioX[sf], CLDFB_NO_CHANNELS_MAX ); - set_zero( hDiffuseDist->diffuseRatioY[sf], CLDFB_NO_CHANNELS_MAX ); - set_zero( hDiffuseDist->diffuseRatioZ[sf], CLDFB_NO_CHANNELS_MAX ); + inCovarianceMtx[1][1] = transportSignalEnergies[1][bin]; + inCovarianceMtx[0][1] = transportSignalCrossCorrelation[bin]; + inCovarianceMtx[1][0] = inCovarianceMtx[0][1]; } - for ( bin = 0; bin < nBins; bin++ ) + compute_foa_cov_matrix( foaCovarianceMtx, inCovarianceMtx, mixer_mat_sf_bins_real[bin] ); + + /* Estimate MASA metadata */ + Iy = foaCovarianceMtx[0][1]; /* Intensity in Y direction */ + Iz = foaCovarianceMtx[0][2]; /* Intensity in Z direction */ + Ix = foaCovarianceMtx[0][3]; /* Intensity in X direction */ + I = sqrtf( Ix * Ix + Iy * Iy + Iz * Iz ); /* Intensity vector length */ + E = ( foaCovarianceMtx[0][0] + foaCovarianceMtx[1][1] + foaCovarianceMtx[2][2] + foaCovarianceMtx[3][3] ) / 2.0f; /* Overall energy */ + azi = atan2f( Iy, Ix ); /* Azimuth */ + ele = atan2f( Iz, sqrtf( Ix * Ix + Iy * Iy ) ); /* Elevation */ + ratio = I / fmaxf( 1e-12f, E ); /* Energy ratio */ + ratio = fmaxf( 0.0f, fminf( 1.0f, ratio ) ); + + hDirAC->azimuth[dirac_write_idx][bin] = (int16_t) roundf( azi / PI_OVER_180 ); + hDirAC->elevation[dirac_write_idx][bin] = (int16_t) roundf( ele / PI_OVER_180 ); + hDirAC->energy_ratio1[dirac_write_idx][bin] = ratio; + hDirAC->diffuseness_vector[dirac_write_idx][bin] = 1.0f - ratio; + + hDirAC->spreadCoherence[dirac_write_idx][bin] = 0.0f; + hDirAC->surroundingCoherence[dirac_write_idx][bin] = 0.0f; + + /* Determine directional distribution of the indirect audio based on the SPAR mixing matrices (and the transport audio signals when 2 TC) */ + if ( hDiffuseDist != NULL ) { - /* Set the energy of the first transport signal */ if ( nchan_transport == 1 ) { - inCovarianceMtx[0][0] = 1.0f; /* In case of 1TC, fixed value can be used */ + diffuseGainY = fabsf( mixer_mat_sf_bins_real[bin][1][1] ); + diffuseGainX = fabsf( mixer_mat_sf_bins_real[bin][3][2] ); + diffuseGainZ = fabsf( mixer_mat_sf_bins_real[bin][2][3] ); + } + else if ( nchan_transport == 2 ) + { + diffuseGainY = fabsf( mixer_mat_sf_bins_real[bin][1][1] * transportSignalEnergies[1][bin] ); + diffuseGainX = fabsf( mixer_mat_sf_bins_real[bin][3][2] * transportSignalEnergies[0][bin] ) + fabsf( mixer_mat_sf_bins_real[bin][3][1] * transportSignalEnergies[1][bin] ); + diffuseGainZ = fabsf( mixer_mat_sf_bins_real[bin][2][3] * transportSignalEnergies[0][bin] ) + fabsf( mixer_mat_sf_bins_real[bin][2][1] * transportSignalEnergies[1][bin] ); } else { - inCovarianceMtx[0][0] = transportSignalEnergies[0][bin]; /* In case of 2TC, use actual energies */ + diffuseGainY = 1.0f; + diffuseGainX = 1.0f; + diffuseGainZ = 1.0f; } - /* Decorrelated channels assumed to have the same energy as the source channel */ - inCovarianceMtx[1][1] = inCovarianceMtx[0][0]; - inCovarianceMtx[2][2] = inCovarianceMtx[0][0]; - inCovarianceMtx[3][3] = inCovarianceMtx[0][0]; - /* In case residuals were transmitted, use their actual energies and cross correlations */ - if ( nchan_transport == 2 ) + diffuseGainSum = diffuseGainY + diffuseGainX + diffuseGainZ; + +#ifdef JBM_TSM_ON_TCS + if ( diffuseGainSum == 0.0f ) { - inCovarianceMtx[1][1] = transportSignalEnergies[1][bin]; - inCovarianceMtx[0][1] = transportSignalCrossCorrelation[bin]; - inCovarianceMtx[1][0] = inCovarianceMtx[0][1]; + hDiffuseDist->diffuseRatioX[bin] = 1.0f / 3.0f; + hDiffuseDist->diffuseRatioY[bin] = 1.0f / 3.0f; + hDiffuseDist->diffuseRatioZ[bin] = 1.0f / 3.0f; } - - compute_foa_cov_matrix( foaCovarianceMtx, inCovarianceMtx, mixer_mat_sf_bins_real[sf][bin] ); - - /* Estimate MASA metadata */ - Iy = foaCovarianceMtx[0][1]; /* Intensity in Y direction */ - Iz = foaCovarianceMtx[0][2]; /* Intensity in Z direction */ - Ix = foaCovarianceMtx[0][3]; /* Intensity in X direction */ - I = sqrtf( Ix * Ix + Iy * Iy + Iz * Iz ); /* Intensity vector length */ - E = ( foaCovarianceMtx[0][0] + foaCovarianceMtx[1][1] + foaCovarianceMtx[2][2] + foaCovarianceMtx[3][3] ) / 2.0f; /* Overall energy */ - azi = atan2f( Iy, Ix ); /* Azimuth */ - ele = atan2f( Iz, sqrtf( Ix * Ix + Iy * Iy ) ); /* Elevation */ - ratio = I / fmaxf( 1e-12f, E ); /* Energy ratio */ - ratio = fmaxf( 0.0f, fminf( 1.0f, ratio ) ); - - hDirAC->azimuth[dirac_write_idx][bin] = (int16_t) roundf( azi / PI_OVER_180 ); - hDirAC->elevation[dirac_write_idx][bin] = (int16_t) roundf( ele / PI_OVER_180 ); - hDirAC->energy_ratio1[dirac_write_idx][bin] = ratio; - hDirAC->diffuseness_vector[dirac_write_idx][bin] = 1.0f - ratio; - - hDirAC->spreadCoherence[dirac_write_idx][bin] = 0.0f; - hDirAC->surroundingCoherence[dirac_write_idx][bin] = 0.0f; - - /* Determine directional distribution of the indirect audio based on the SPAR mixing matrices (and the transport audio signals when 2 TC) */ - if ( hDiffuseDist != NULL ) + else { - if ( nchan_transport == 1 ) - { - diffuseGainY = fabsf( mixer_mat_sf_bins_real[sf][bin][1][1] ); - diffuseGainX = fabsf( mixer_mat_sf_bins_real[sf][bin][3][2] ); - diffuseGainZ = fabsf( mixer_mat_sf_bins_real[sf][bin][2][3] ); - } - else if ( nchan_transport == 2 ) - { - diffuseGainY = fabsf( mixer_mat_sf_bins_real[sf][bin][1][1] * transportSignalEnergies[1][bin] ); - diffuseGainX = fabsf( mixer_mat_sf_bins_real[sf][bin][3][2] * transportSignalEnergies[0][bin] ) + fabsf( mixer_mat_sf_bins_real[sf][bin][3][1] * transportSignalEnergies[1][bin] ); - diffuseGainZ = fabsf( mixer_mat_sf_bins_real[sf][bin][2][3] * transportSignalEnergies[0][bin] ) + fabsf( mixer_mat_sf_bins_real[sf][bin][2][1] * transportSignalEnergies[1][bin] ); - } - else - { - diffuseGainY = 1.0f; - diffuseGainX = 1.0f; - diffuseGainZ = 1.0f; - } - - diffuseGainSum = diffuseGainY + diffuseGainX + diffuseGainZ; - - if ( diffuseGainSum == 0.0f ) - { - hDiffuseDist->diffuseRatioX[sf][bin] = 1.0f / 3.0f; - hDiffuseDist->diffuseRatioY[sf][bin] = 1.0f / 3.0f; - hDiffuseDist->diffuseRatioZ[sf][bin] = 1.0f / 3.0f; - } - else - { - hDiffuseDist->diffuseRatioX[sf][bin] = diffuseGainX / ( diffuseGainSum + EPSILON ); - hDiffuseDist->diffuseRatioY[sf][bin] = diffuseGainY / ( diffuseGainSum + EPSILON ); - hDiffuseDist->diffuseRatioZ[sf][bin] = diffuseGainZ / ( diffuseGainSum + EPSILON ); - } + hDiffuseDist->diffuseRatioX[bin] = diffuseGainX / ( diffuseGainSum + EPSILON ); + hDiffuseDist->diffuseRatioY[bin] = diffuseGainY / ( diffuseGainSum + EPSILON ); + hDiffuseDist->diffuseRatioZ[bin] = diffuseGainZ / ( diffuseGainSum + EPSILON ); + } +#else + if ( diffuseGainSum == 0.0f ) + { + hDiffuseDist->diffuseRatioX[subframe][bin] = 1.0f / 3.0f; + hDiffuseDist->diffuseRatioY[subframe][bin] = 1.0f / 3.0f; + hDiffuseDist->diffuseRatioZ[subframe][bin] = 1.0f / 3.0f; } + else + { + hDiffuseDist->diffuseRatioX[subframe][bin] = diffuseGainX / ( diffuseGainSum + EPSILON ); + hDiffuseDist->diffuseRatioY[subframe][bin] = diffuseGainY / ( diffuseGainSum + EPSILON ); + hDiffuseDist->diffuseRatioZ[subframe][bin] = diffuseGainZ / ( diffuseGainSum + EPSILON ); + } +#endif } - - dirac_write_idx = ( dirac_write_idx + 1 ) % hDirAC->dirac_md_buffer_length; } return; @@ -1428,7 +1628,6 @@ static void compute_foa_cov_matrix( return; } -#ifdef FIX_350_MASA_DELAY_COMP static void create_masa_ext_out_meta( MASA_DECODER *hMasa, IVAS_QMETADATA_HANDLE hQMetaData, @@ -1560,4 +1759,3 @@ static void create_masa_ext_out_meta( return; } -#endif diff --git a/lib_dec/ivas_mc_param_dec.c b/lib_dec/ivas_mc_param_dec.c index a6637ed1f2d306d2cbd52ef130f7755d848582f9..c6e0776660877f0faf0577fb3e5583cf268e5d48 100644 --- a/lib_dec/ivas_mc_param_dec.c +++ b/lib_dec/ivas_mc_param_dec.c @@ -76,7 +76,11 @@ typedef struct parameter_band_mapping_struct static void ivas_param_mc_dec_init( PARAM_MC_DEC_HANDLE hParamMC, const int16_t nchan_in, const int16_t nchan_out ); +#ifdef JBM_TSM_ON_TCS +static void param_mc_protoSignalComputation( float *RealBuffer, float *ImagBuffer, float *proto_frame_f, const PARAM_MC_DIFF_PROTO_INFO *diff_proto_info, const int16_t num_freq_bands ); +#else 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 ); +#endif 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 ); @@ -86,13 +90,23 @@ static int16_t ivas_param_mc_uniform_decoder( float *seq, const int16_t sz_seq, static void ivas_param_mc_dequantize_cov( PARAM_MC_DEC_HANDLE hDirAC, float *ild_q, float *icc_q, const int16_t param_band_index, const int16_t nY_int, const PARAM_MC_SYNTHESIS_CONF synth_conf, const int16_t nY, const int16_t nX, float *Cx_state, float *Cproto, float *Cy_state ); +#ifdef JBM_TSM_ON_TCS +static void ivas_param_mc_get_mixing_matrices( PARAM_MC_DEC_HANDLE hParamMC, IVAS_OUTPUT_SETUP *hSynthesisOutputSetup, float Cx_in[PARAM_MC_MAX_PARAMETER_BANDS][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], float *mixing_matrix[], float *mixing_matrix_res[], const int16_t nY_int, const PARAM_MC_SYNTHESIS_CONF synth_conf, const int16_t nX, const int16_t nY ); + +static void ivas_param_mc_get_mono_stereo_mixing_matrices( PARAM_MC_DEC_HANDLE hParamMC, float Cx_in[PARAM_MC_MAX_PARAMETER_BANDS][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], float *mixing_matrix[], float *mixing_matrix_res[], const int16_t nY_intern, const int16_t nX, const int16_t nY_cov ); +#else static void ivas_param_mc_get_mixing_matrices( PARAM_MC_DEC_HANDLE hParamMC, IVAS_OUTPUT_SETUP *hSynthesisOutputSetup, float Cx_in[PARAM_MC_MAX_PARAMETER_BANDS][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], float mixing_matrix[PARAM_MC_MAX_PARAMETER_BANDS][MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS], float mixing_matrix_res[PARAM_MC_MAX_PARAMETER_BANDS_RES][MAX_CICP_CHANNELS * MAX_CICP_CHANNELS], const int16_t nY_int, const PARAM_MC_SYNTHESIS_CONF synth_conf, const int16_t nX, const int16_t nY ); static void ivas_param_mc_get_mono_stereo_mixing_matrices( PARAM_MC_DEC_HANDLE hParamMC, float Cx_in[PARAM_MC_MAX_PARAMETER_BANDS][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], float mixing_matrix[PARAM_MC_MAX_PARAMETER_BANDS][MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS], float mixing_matrix_res[PARAM_MC_MAX_PARAMETER_BANDS_RES][MAX_CICP_CHANNELS * MAX_CICP_CHANNELS], const int16_t nY_intern, const int16_t nX, const int16_t nY_cov ); +#endif +#ifdef JBM_TSM_ON_TCS +static void param_mc_update_mixing_matrices( PARAM_MC_DEC_HANDLE hParamMC, float *mixing_matrix[], float *mixing_matrix_res[], const uint16_t nX, const uint16_t nY ); +#else static void param_mc_update_mixing_matrices( PARAM_MC_DEC_HANDLE hParamMC, float mixing_matrix[PARAM_MC_MAX_PARAMETER_BANDS][MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS], float mixing_matrix_res[PARAM_MC_MAX_PARAMETER_BANDS_RES][MAX_CICP_CHANNELS * MAX_CICP_CHANNELS], const uint16_t nX, const uint16_t nY ); +#endif -static void param_mc_compute_interpolator( const uint16_t bAttackPresent, const uint16_t attackPos, const uint16_t interp_length, float *interpolator ); +static void ivas_param_mc_dec_compute_interpolator( const uint16_t bAttackPresent, const uint16_t attackPos, const uint16_t interp_length, float *interpolator ); static void param_mc_set_num_synth_bands( const int32_t output_Fs, PARAM_MC_DEC_HANDLE hParamMC ); @@ -224,7 +238,13 @@ ivas_error ivas_param_mc_dec_open( *-----------------------------------------------------------------*/ hParamMC->slot_size = (int16_t) ( output_Fs / FRAMES_PER_SEC ) / CLDFB_NO_COL_MAX; +#ifdef JBM_TSM_ON_TCS + set_s( hParamMC->subframe_nbslots, 0, MAX_JBM_SUBFRAMES_5MS ); + set_s( hParamMC->subframe_nbslots, PARAM_MC_MAX_NSLOTS_IN_SUBFRAME, DEFAULT_JBM_SUBFRAMES_5MS ); + hParamMC->nb_subframes = DEFAULT_JBM_SUBFRAMES_5MS; +#else hParamMC->subframe_nbslots = CLDFB_NO_COL_MAX / PARAM_MC_NSUBFRAMES_DEC; +#endif hParamMC->num_freq_bands = (int16_t) ( output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ); hParamMC->max_band_energy_compensation = hParamMC->num_freq_bands; @@ -420,6 +440,9 @@ ivas_error ivas_param_mc_dec_open( return error; } +#ifdef JBM_TSM_ON_TCS + ivas_param_mc_dec_compute_interpolator( 0, 0, DEFAULT_JBM_CLDFB_TIMESLOTS, hParamMC->h_output_synthesis_params.interpolator ); +#endif /* Head rotation */ if ( ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) && st_ivas->hDecoderConfig->Opt_Headrotation ) @@ -455,6 +478,30 @@ ivas_error ivas_param_mc_dec_open( ivas_param_mc_dec_init( hParamMC, nchan_transport, nchan_out_cov ); +#ifdef JBM_TSM_ON_TCS + if ( st_ivas->hDecoderConfig->voip_active && hParamMC->synthesis_conf != PARAM_MC_SYNTH_MONO_STEREO ) + { + hParamMC->Cldfb_RealBuffer_tc = (float *) malloc( MAX_JBM_CLDFB_TIMESLOTS * nchan_transport * hParamMC->num_freq_bands * sizeof( float ) ); + set_zero( hParamMC->Cldfb_RealBuffer_tc, MAX_JBM_CLDFB_TIMESLOTS * nchan_transport * hParamMC->num_freq_bands ); + hParamMC->Cldfb_ImagBuffer_tc = (float *) malloc( MAX_JBM_CLDFB_TIMESLOTS * nchan_transport * hParamMC->num_freq_bands * sizeof( float ) ); + set_zero( hParamMC->Cldfb_ImagBuffer_tc, MAX_JBM_CLDFB_TIMESLOTS * nchan_transport * hParamMC->num_freq_bands ); + if ( st_ivas->hTcBuffer == NULL ) + { + if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, nchan_transport, nchan_transport, 0, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK ) + { + return error; + } + } + } + else + { + hParamMC->Cldfb_RealBuffer_tc = NULL; + hParamMC->Cldfb_ImagBuffer_tc = NULL; + } + hParamMC->subframes_rendered = 0; + hParamMC->slots_rendered = 0; +#endif + st_ivas->hParamMC = hParamMC; return error; @@ -597,12 +644,14 @@ ivas_error ivas_param_mc_dec_reconfig( #endif } - /*-----------------------------------------------------------------* - * set input parameters - *-----------------------------------------------------------------*/ + /*-----------------------------------------------------------------* + * set input parameters + *-----------------------------------------------------------------*/ +#ifndef JBM_TSM_ON_TCS 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; +#endif hParamMC->num_freq_bands = (int16_t) ( output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ); hParamMC->max_band_energy_compensation = hParamMC->num_freq_bands; @@ -914,6 +963,10 @@ ivas_error ivas_param_mc_dec_reconfig( return error; } +#ifdef JBM_TSM_ON_TCS + ivas_param_mc_dec_compute_interpolator( 0, 0, DEFAULT_JBM_CLDFB_TIMESLOTS, hParamMC->h_output_synthesis_params.interpolator ); +#endif + 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 ); @@ -1124,6 +1177,19 @@ void ivas_param_mc_dec_close( hParamMC->hoa_encoder = NULL; } +#ifdef JBM_TSM_ON_TCS + if ( hParamMC->Cldfb_RealBuffer_tc != NULL ) + { + free( hParamMC->Cldfb_RealBuffer_tc ); + hParamMC->Cldfb_RealBuffer_tc = NULL; + } + if ( hParamMC->Cldfb_ImagBuffer_tc != NULL ) + { + free( hParamMC->Cldfb_ImagBuffer_tc ); + hParamMC->Cldfb_ImagBuffer_tc = NULL; + } +#endif + free( *hParamMC_out ); *hParamMC_out = NULL; @@ -1241,7 +1307,9 @@ void ivas_param_mc_dec_read_BS( num_lfe_bands = 0; } - param_mc_compute_interpolator( hMetadataPMC->bAttackPresent, hMetadataPMC->attackIndex, PARAM_MC_MAX_NSLOTS, hParamMC->h_output_synthesis_params.interpolator ); +#ifndef JBM_TSM_ON_TCS + ivas_param_mc_dec_compute_interpolator( hMetadataPMC->bAttackPresent, hMetadataPMC->attackIndex, PARAM_MC_MAX_NSLOTS, hParamMC->h_output_synthesis_params.interpolator ); +#endif if ( hMetadataPMC->flag_use_adaptive_icc_map == 1 ) { @@ -1328,6 +1396,9 @@ void ivas_param_mc_dec_read_BS( /* for PLC, use the saved ILDs and ICCs from the past and set the transient flag and transient position to zero */ hMetadataPMC->bAttackPresent = 0; hMetadataPMC->attackIndex = 0; +#ifndef JBM_TSM_ON_TCS + ivas_param_mc_dec_compute_interpolator( hMetadataPMC->bAttackPresent, hMetadataPMC->attackIndex, PARAM_MC_MAX_NSLOTS, hParamMC->h_output_synthesis_params.interpolator ); +#endif } pop_wmops(); @@ -1335,6 +1406,149 @@ void ivas_param_mc_dec_read_BS( return; } +#ifdef JBM_TSM_ON_TCS +void ivas_param_mc_dec_digest_tc( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + const uint8_t nCldfbSlots, /* i : number of CLFBS slots in the transport channels */ + float *transport_channels_f[] /* i : synthesized core-coder transport channels/DirAC output */ +) +{ + PARAM_MC_DEC_HANDLE hParamMC; + int16_t i, ch; + int16_t slot_idx, param_band_idx; + int16_t nchan_transport, nchan_out_transport, nchan_out_cldfb; + int16_t nchan_out_cov; + /*CLDFB*/ + float cx[PARAM_MC_MAX_PARAMETER_BANDS][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS]; + float cx_imag[PARAM_MC_MAX_PARAMETER_BANDS][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS]; + float real_part, imag_part; + /* format converter */ + int16_t channel_active[MAX_OUTPUT_CHANNELS]; + IVAS_OUTPUT_SETUP *hSynthesisOutputSetup; + + hParamMC = st_ivas->hParamMC; + assert( hParamMC ); + + push_wmops( "param_mc_dec_digest_tc" ); + + set_s( channel_active, 0, MAX_CICP_CHANNELS ); + nchan_transport = st_ivas->nchan_transport; + nchan_out_transport = st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe; + + if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) + { + nchan_out_cldfb = BINAURAL_CHANNELS; + set_s( channel_active, 1, nchan_out_cldfb ); + nchan_out_cov = st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe; + hSynthesisOutputSetup = &st_ivas->hTransSetup; + } + else if ( hParamMC->synthesis_conf == PARAM_MC_SYNTH_LS_CONV_CLDFB ) + { + nchan_out_cov = nchan_out_transport; + nchan_out_cldfb = st_ivas->hOutSetup.nchan_out_woLFE + st_ivas->hOutSetup.num_lfe; + hSynthesisOutputSetup = &st_ivas->hTransSetup; + } + else 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; + nchan_out_cldfb = nchan_out_cov; + set_s( channel_active, 1, nchan_out_cov ); + hSynthesisOutputSetup = &st_ivas->hOutSetup; + } + else + { + nchan_out_cov = nchan_out_transport; + nchan_out_cldfb = nchan_out_transport; + set_s( channel_active, 1, nchan_out_cov ); + hSynthesisOutputSetup = &st_ivas->hTransSetup; + } + + /* adapt transient position */ + if ( hParamMC->hMetadataPMC->bAttackPresent ) + { + hParamMC->hMetadataPMC->attackIndex = (int16_t) max( 0, hParamMC->hMetadataPMC->attackIndex + ( ( nCldfbSlots - DEFAULT_JBM_CLDFB_TIMESLOTS ) / 2 ) ); + } + /* adapt subframes */ + hParamMC->num_slots = nCldfbSlots; + hParamMC->slots_rendered = 0; + hParamMC->subframes_rendered = 0; + ivas_jbm_dec_get_adapted_subframes( nCldfbSlots, hParamMC->subframe_nbslots, &hParamMC->nb_subframes ); + + ivas_param_mc_dec_compute_interpolator( hParamMC->hMetadataPMC->bAttackPresent, hParamMC->hMetadataPMC->attackIndex, nCldfbSlots, hParamMC->h_output_synthesis_params.interpolator ); + + for ( param_band_idx = 0; param_band_idx < PARAM_MC_MAX_PARAMETER_BANDS; param_band_idx++ ) + { + set_zero( cx[param_band_idx], PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS ); + set_zero( cx_imag[param_band_idx], PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS ); + } + + /* slot loop for gathering the input data */ + for ( slot_idx = 0; slot_idx < nCldfbSlots; slot_idx++ ) + { + float RealBuffer[CLDFB_NO_CHANNELS_MAX]; + float ImagBuffer[CLDFB_NO_CHANNELS_MAX]; + + /* CLDFB Analysis*/ + for ( ch = 0; ch < nchan_transport; ch++ ) + { + cldfbAnalysis_ts( &( transport_channels_f[ch][hParamMC->num_freq_bands * slot_idx] ), RealBuffer, ImagBuffer, hParamMC->num_freq_bands, st_ivas->cldfbAnaDec[ch] ); + + mvr2r( RealBuffer, &hParamMC->Cldfb_RealBuffer_tc[slot_idx * hParamMC->num_freq_bands * nchan_transport + ch * hParamMC->num_freq_bands], hParamMC->num_freq_bands ); + mvr2r( ImagBuffer, &hParamMC->Cldfb_ImagBuffer_tc[slot_idx * hParamMC->num_freq_bands * nchan_transport + ch * hParamMC->num_freq_bands], hParamMC->num_freq_bands ); + } + + if ( slot_idx >= 2 * hParamMC->hMetadataPMC->attackIndex ) + { + ivas_dirac_dec_output_synthesis_cov_param_mc_collect_slot( &hParamMC->Cldfb_RealBuffer_tc[slot_idx * hParamMC->num_freq_bands * nchan_transport], &hParamMC->Cldfb_ImagBuffer_tc[slot_idx * hParamMC->num_freq_bands * nchan_transport], cx, cx_imag, hParamMC, nchan_transport ); + } + } + + /* map from complex input covariance to real values */ + for ( param_band_idx = 0; param_band_idx < hParamMC->num_param_bands_synth; param_band_idx++ ) + { + /* Cx for transport channels */ + for ( i = 0; i < nchan_transport * nchan_transport; i++ ) + { + real_part = cx[param_band_idx][i]; + imag_part = cx_imag[param_band_idx][i]; + + /* (a-ib)(c+id) = ac + bd + i(ad-bc) */ + if ( param_band_idx < hParamMC->max_param_band_abs_cov ) + { + cx[param_band_idx][i] = sqrtf( real_part * real_part + imag_part * imag_part ); + } + else + { + cx[param_band_idx][i] = real_part; + } + } + } + + /* we have to do it similar to the encoder in case of attacks (i.e. accumulate two bands) to ensure correct DMX of the target covariance*/ + if ( hParamMC->hMetadataPMC->bAttackPresent && ( hParamMC->synthesis_conf == PARAM_MC_SYNTH_LS_CONV_COV || hParamMC->synthesis_conf == PARAM_MC_SYNTH_MONO_STEREO ) ) + { + for ( param_band_idx = 0; param_band_idx < hParamMC->num_param_bands_synth; param_band_idx += 2 ) + { + v_add( cx[param_band_idx], cx[param_band_idx + 1], cx[param_band_idx], nchan_transport * nchan_transport ); + mvr2r( cx[param_band_idx], cx[param_band_idx + 1], nchan_transport * nchan_transport ); + } + } + + + if ( hParamMC->synthesis_conf == PARAM_MC_SYNTH_MONO_STEREO ) + { + ivas_param_mc_get_mono_stereo_mixing_matrices( hParamMC, cx, hParamMC->h_output_synthesis_cov_state.mixing_matrix, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res, nchan_out_transport, nchan_transport, nchan_out_cov ); + } + else + { + /* generate mixing matrices */ + ivas_param_mc_get_mixing_matrices( hParamMC, hSynthesisOutputSetup, cx, hParamMC->h_output_synthesis_cov_state.mixing_matrix, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res, nchan_out_transport, hParamMC->synthesis_conf, nchan_transport, nchan_out_cov ); + } + + pop_wmops(); + + return; +} /*------------------------------------------------------------------------- * ivas_param_mc_dec() @@ -1342,6 +1556,321 @@ void ivas_param_mc_dec_read_BS( * Parametric MC decoding process *------------------------------------------------------------------------*/ +void ivas_param_mc_dec_render( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + const uint16_t nSamplesAsked, /* i : number of CLDFB slots requested */ + uint16_t *nSamplesRendered, /* o : number of CLDFB slots rendered */ + uint16_t *nSamplesAvailable, /* o : number of CLDFB slots still to render */ + float *output_f[] /* o : rendered time signal */ +) +{ + PARAM_MC_DEC_HANDLE hParamMC; + int16_t i, ch; + int16_t subframe_idx; + int16_t slot_idx, slot_idx_start, slot_idx_start_cldfb_synth, first_sf, last_sf, slots_to_render; + int16_t nchan_transport, nchan_out_transport, nchan_out_cldfb; + int16_t nchan_out_cov; + /*CLDFB*/ + float Cldfb_RealBuffer[MAX_INTERN_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX]; + float Cldfb_ImagBuffer[MAX_INTERN_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX]; + float Cldfb_RealBuffer_Binaural[BINAURAL_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX]; + float Cldfb_ImagBuffer_Binaural[BINAURAL_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX]; + /*Decorrelator*/ + float onset_filter[MAX_CICP_CHANNELS * CLDFB_NO_CHANNELS_MAX]; + /* format converter */ + int16_t channel_active[MAX_OUTPUT_CHANNELS]; + uint16_t nband_synth, nbands_to_zero; + uint16_t nchan_out_init; + uint32_t output_Fs; + + hParamMC = st_ivas->hParamMC; + assert( hParamMC ); + + push_wmops( "param_mc_dec_render" ); + + set_s( channel_active, 0, MAX_CICP_CHANNELS ); + nchan_transport = st_ivas->nchan_transport; + nchan_out_transport = st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe; + nchan_out_init = nchan_out_transport; + output_Fs = st_ivas->hDecoderConfig->output_Fs; + + if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) + { + nchan_out_cldfb = BINAURAL_CHANNELS; + set_s( channel_active, 1, nchan_out_cldfb ); + if ( st_ivas->hHeadTrackData ) + { + nchan_out_init = MAX_INTERN_CHANNELS; + } + nchan_out_cov = st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe; + } + else if ( hParamMC->synthesis_conf == PARAM_MC_SYNTH_LS_CONV_CLDFB ) + { + nchan_out_cov = nchan_out_transport; + nchan_out_cldfb = st_ivas->hOutSetup.nchan_out_woLFE + st_ivas->hOutSetup.num_lfe; + } + else 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; + nchan_out_cldfb = nchan_out_cov; + set_s( channel_active, 1, nchan_out_cov ); + } + else + { + nchan_out_cov = nchan_out_transport; + nchan_out_cldfb = nchan_out_transport; + set_s( channel_active, 1, nchan_out_cov ); + } + + /* set everything to zero that will not be decoded */ + nband_synth = hParamMC->band_grouping[hParamMC->num_param_bands_synth]; + nbands_to_zero = hParamMC->num_freq_bands - nband_synth; + for ( ch = 0; ch < nchan_out_init; ch++ ) + { + for ( slot_idx = 0; slot_idx < JBM_CLDFB_SLOTS_IN_SUBFRAME; slot_idx++ ) + { + set_zero( &( Cldfb_RealBuffer[ch][slot_idx][nband_synth] ), nbands_to_zero ); + set_zero( &( Cldfb_ImagBuffer[ch][slot_idx][nband_synth] ), nbands_to_zero ); + } + } + + /* loop for synthesis, assume we always have to render in multiples of 5ms subframes with spills */ + slots_to_render = min( hParamMC->num_slots - hParamMC->slots_rendered, nSamplesAsked / NS2SA( output_Fs, CLDFB_SLOT_NS ) ); + *nSamplesRendered = slots_to_render * NS2SA( output_Fs, CLDFB_SLOT_NS ); + first_sf = hParamMC->subframes_rendered; + last_sf = first_sf; + while ( slots_to_render > 0 ) + { + slots_to_render -= hParamMC->subframe_nbslots[last_sf]; + last_sf++; + } +#ifdef DEBUGGING + assert( slots_to_render == 0 ); +#endif + if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) + { + for ( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ ) + { + slots_to_render += hParamMC->subframe_nbslots[subframe_idx]; + } + } + slot_idx_start = hParamMC->slots_rendered; + slot_idx_start_cldfb_synth = 0; + for ( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ ) + { + for ( slot_idx = 0; slot_idx < hParamMC->subframe_nbslots[subframe_idx]; slot_idx++, hParamMC->slots_rendered++ ) + { + + if ( hParamMC->max_band_decorr > 0 ) + { + /*-----------------------------------------------------------------* + * protoype signal computation + *-----------------------------------------------------------------*/ + + param_mc_protoSignalComputation( &hParamMC->Cldfb_RealBuffer_tc[hParamMC->slots_rendered * nchan_transport * hParamMC->num_freq_bands], + &hParamMC->Cldfb_ImagBuffer_tc[hParamMC->slots_rendered * nchan_transport * hParamMC->num_freq_bands], + hParamMC->proto_frame_f, hParamMC->diff_proto_info, + hParamMC->num_freq_bands ); + + /*-----------------------------------------------------------------* + * frequency domain decorrelation + *-----------------------------------------------------------------*/ + + /* decorrelate prototype frame */ + ivas_dirac_dec_decorr_process( hParamMC->num_freq_bands, + hParamMC->num_outputs_diff, + hParamMC->diff_proto_info->num_protos_diff, + DIRAC_SYNTHESIS_COV_MC_LS, + nchan_transport, + hParamMC->proto_frame_f, + hParamMC->diff_proto_info->num_protos_diff, + hParamMC->diff_proto_info->proto_index_diff, + hParamMC->proto_frame_dec_f, + onset_filter, + hParamMC->h_freq_domain_decorr_ap_params, + hParamMC->h_freq_domain_decorr_ap_state ); + + /* copy decorrelated frame directly to output CLDFB buffer, acts also as intermediate */ + /* memory for the decorrelated signal */ + ivas_param_mc_dec_copy_diffuse_proto( hParamMC, Cldfb_RealBuffer, Cldfb_ImagBuffer, nchan_out_cov, slot_idx ); + } + + /*-----------------------------------------------------------------* + * output synthesis + *-----------------------------------------------------------------*/ + + ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot( &hParamMC->Cldfb_RealBuffer_tc[hParamMC->slots_rendered * nchan_transport * hParamMC->num_freq_bands], + &hParamMC->Cldfb_ImagBuffer_tc[hParamMC->slots_rendered * nchan_transport * hParamMC->num_freq_bands], + Cldfb_RealBuffer, Cldfb_ImagBuffer, + hParamMC->h_output_synthesis_cov_state.mixing_matrix, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res, slot_idx, slot_idx + slot_idx_start, + nchan_transport, nchan_out_cov, hParamMC ); + + if ( ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) ) + { + if ( st_ivas->hHeadTrackData && st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV ) + { + ivas_param_mc_mc2sba_cldfb( st_ivas->hTransSetup, hParamMC->hoa_encoder, slot_idx, Cldfb_RealBuffer, Cldfb_ImagBuffer, nband_synth, GAIN_LFE ); + } + else + { + /* remove LFE */ + uint16_t idx_out; + uint16_t idx_lfe; + IVAS_OUTPUT_SETUP hLsSetup; + + hLsSetup = st_ivas->hTransSetup; + + /* If LFE should be rendered, add it to other channels before removing */ + if ( st_ivas->hBinRenderer->render_lfe ) + { + for ( idx_lfe = 0; idx_lfe < hLsSetup.num_lfe; idx_lfe++ ) + { + /* Copy just the first band of LFE*/ + v_multc( Cldfb_RealBuffer[hLsSetup.index_lfe[idx_lfe]][slot_idx], ( GAIN_LFE / hLsSetup.nchan_out_woLFE ), Cldfb_RealBuffer[hLsSetup.index_lfe[idx_lfe]][slot_idx], 1 ); + v_multc( Cldfb_ImagBuffer[hLsSetup.index_lfe[idx_lfe]][slot_idx], ( GAIN_LFE / hLsSetup.nchan_out_woLFE ), Cldfb_ImagBuffer[hLsSetup.index_lfe[idx_lfe]][slot_idx], 1 ); + + for ( ch = 0; ch < ( hLsSetup.nchan_out_woLFE + hLsSetup.num_lfe ); ch++ ) + { + if ( hLsSetup.index_lfe[idx_lfe] != ch ) + { + v_add( Cldfb_RealBuffer[ch][slot_idx], Cldfb_RealBuffer[hLsSetup.index_lfe[idx_lfe]][slot_idx], Cldfb_RealBuffer[ch][slot_idx], 1 ); + v_add( Cldfb_ImagBuffer[ch][slot_idx], Cldfb_ImagBuffer[hLsSetup.index_lfe[idx_lfe]][slot_idx], Cldfb_ImagBuffer[ch][slot_idx], 1 ); + } + } + } + } + + idx_out = 0; + idx_lfe = 0; + + for ( ch = 0; ch < ( hLsSetup.nchan_out_woLFE + hLsSetup.num_lfe ); ch++ ) + { + if ( ( hLsSetup.num_lfe > 0 ) && ( hLsSetup.index_lfe[idx_lfe] == ch ) ) + { + if ( idx_lfe < ( hLsSetup.num_lfe - 1 ) ) + { + idx_lfe++; + } + } + else if ( ch != idx_out ) + { + mvr2r( Cldfb_RealBuffer[ch][slot_idx], Cldfb_RealBuffer[idx_out][slot_idx], nband_synth ); + mvr2r( Cldfb_ImagBuffer[ch][slot_idx], Cldfb_ImagBuffer[idx_out][slot_idx], nband_synth ); + idx_out++; + } + else + { + idx_out++; + } + } + } + } + } + + if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) + { + ivas_binRenderer( st_ivas->hBinRenderer, st_ivas->hHeadTrackData, hParamMC->subframe_nbslots[subframe_idx], + Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer, Cldfb_ImagBuffer ); + } + else if ( hParamMC->synthesis_conf == PARAM_MC_SYNTH_LS_CONV_CLDFB ) + { + /* format conversion*/ + ivas_lssetupconversion_process_param_mc( st_ivas, hParamMC->subframe_nbslots[subframe_idx], Cldfb_RealBuffer, Cldfb_ImagBuffer, channel_active ); + } + + /* CLDFB synthesis */ + for ( ch = 0; ch < nchan_out_cldfb; ch++ ) + { + float *RealBuffer[16]; + float *ImagBuffer[16]; + + if ( channel_active[ch] ) + { + /* open CLDFB buffer up to CLDFB_NO_CHANNELS_MAX bands for 48kHz */ + for ( i = 0; i < hParamMC->subframe_nbslots[subframe_idx]; i++ ) + { + if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) + { + RealBuffer[i] = Cldfb_RealBuffer_Binaural[ch][i]; + ImagBuffer[i] = Cldfb_ImagBuffer_Binaural[ch][i]; + } + else + { + RealBuffer[i] = Cldfb_RealBuffer[ch][i]; + ImagBuffer[i] = Cldfb_ImagBuffer[ch][i]; + } + } + cldfbSynthesis( RealBuffer, ImagBuffer, &( output_f[ch][slot_idx_start_cldfb_synth * hParamMC->num_freq_bands] ), + hParamMC->num_freq_bands * hParamMC->subframe_nbslots[subframe_idx], st_ivas->cldfbSynDec[ch] ); + } + else + { + set_f( &( output_f[ch][slot_idx_start_cldfb_synth * hParamMC->num_freq_bands] ), 0.0f, hParamMC->num_freq_bands * hParamMC->subframe_nbslots[subframe_idx] ); + } + } + slot_idx_start += hParamMC->subframe_nbslots[subframe_idx]; + slot_idx_start_cldfb_synth += hParamMC->subframe_nbslots[subframe_idx]; + } + + if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) + { + ivas_mc2sba( st_ivas->hIntSetup, output_f, output_f, hParamMC->num_freq_bands * slots_to_render, st_ivas->hOutSetup.ambisonics_order, 0.f ); + } + + /* update */ + if ( hParamMC->slots_rendered == hParamMC->num_slots ) + { + hParamMC->hMetadataPMC->last_coded_bwidth = hParamMC->hMetadataPMC->coded_bwidth; + param_mc_update_mixing_matrices( hParamMC, hParamMC->h_output_synthesis_cov_state.mixing_matrix, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res, nchan_transport, nchan_out_cov ); + } + hParamMC->subframes_rendered = last_sf; + *nSamplesAvailable = ( hParamMC->num_slots - hParamMC->slots_rendered ) * NS2SA( output_Fs, CLDFB_SLOT_NS ); + pop_wmops(); + + return; +} +#endif + +/*------------------------------------------------------------------------- + * ivas_param_mc_dec() + * + * Parametric MC decoding process + *------------------------------------------------------------------------*/ +#ifdef JBM_TSM_ON_TCS +void ivas_param_mc_dec( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + float *output_f[] /* i/o: synthesized core-coder transport channels/DirAC output */ +) +{ + PARAM_MC_DEC_HANDLE hParamMC; + float Cldfb_RealBuffer_in[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_NSLOTS * CLDFB_NO_CHANNELS_MAX]; + float Cldfb_ImagBuffer_in[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_NSLOTS * CLDFB_NO_CHANNELS_MAX]; + uint16_t nSamplesAsked, nSamplesAvailable, nSamplesRendered; + + hParamMC = st_ivas->hParamMC; + assert( hParamMC ); + push_wmops( "param_mc_dec" ); + + /* set some handle pointers to the stack buffers */ + hParamMC->Cldfb_RealBuffer_tc = Cldfb_RealBuffer_in; + hParamMC->Cldfb_ImagBuffer_tc = Cldfb_ImagBuffer_in; + + nSamplesAsked = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC ); + ivas_param_mc_dec_digest_tc( st_ivas, DEFAULT_JBM_CLDFB_TIMESLOTS, output_f ); + ivas_param_mc_dec_render( st_ivas, nSamplesAsked, &nSamplesRendered, &nSamplesAvailable, output_f ); +#ifdef DEBUGGING + assert( nSamplesRendered == nSamplesAsked ); + assert( nSamplesAvailable == 0 ); +#endif + + /* set handle pointers back to NULL */ + hParamMC->Cldfb_RealBuffer_tc = NULL; + hParamMC->Cldfb_ImagBuffer_tc = NULL; + + pop_wmops(); + return; +} +#else void ivas_param_mc_dec( Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ float output_f[][L_FRAME48k] /* i/o: synthesized core-coder transport channels/DirAC output */ @@ -1349,7 +1878,8 @@ void ivas_param_mc_dec( { PARAM_MC_DEC_HANDLE hParamMC; int16_t i, ch; - int16_t subframe_idx, num_subframes; + int16_t subframe_idx; + int16_t nb_subframes; int16_t slot_idx, param_band_idx, slot_idx_start; int16_t nchan_transport, nchan_out_transport, nchan_out_cldfb; int16_t nchan_out_cov; @@ -1496,12 +2026,13 @@ void ivas_param_mc_dec( ivas_param_mc_get_mixing_matrices( hParamMC, hSynthesisOutputSetup, cx, mixing_matrix, mixing_matrix_res, nchan_out_transport, hParamMC->synthesis_conf, nchan_transport, nchan_out_cov ); } + /*** split here... ***/ + /* subframe loop for synthesis*/ - num_subframes = CLDFB_NO_COL_MAX / hParamMC->subframe_nbslots; - for ( subframe_idx = 0; subframe_idx < num_subframes; subframe_idx++ ) + nb_subframes = CLDFB_NO_COL_MAX / hParamMC->subframe_nbslots; + for ( subframe_idx = 0; subframe_idx < nb_subframes; subframe_idx++ ) { slot_idx_start = subframe_idx * hParamMC->subframe_nbslots; - for ( slot_idx = 0; slot_idx < hParamMC->subframe_nbslots; slot_idx++ ) { @@ -1640,7 +2171,6 @@ void ivas_param_mc_dec( ImagBuffer[i] = Cldfb_ImagBuffer[ch][i]; } } - cldfbSynthesis( RealBuffer, ImagBuffer, &( output_f[ch][slot_idx_start * hParamMC->num_freq_bands] ), hParamMC->num_freq_bands * hParamMC->subframe_nbslots, st_ivas->cldfbSynDec[ch] ); } @@ -1663,6 +2193,7 @@ void ivas_param_mc_dec( return; } +#endif /*------------------------------------------------------------------------- @@ -1737,12 +2268,19 @@ static void ivas_param_mc_dec_init( *------------------------------------------------------------------------*/ static void param_mc_protoSignalComputation( +#ifdef JBM_TSM_ON_TCS + float *RealBuffer, /* i : CLDFB samples of the transport channels (real part) */ + float *ImagBuffer, /* i : CLDFB samples of the transport channels (imaginary part) */ +#else float RealBuffer[PARAM_MC_MAX_TRANSPORT_CHANS][PARAM_MC_MAX_NSLOTS][CLDFB_NO_CHANNELS_MAX], /* i : CLDFB samples of the transport channels (real part) */ float ImagBuffer[PARAM_MC_MAX_TRANSPORT_CHANS][PARAM_MC_MAX_NSLOTS][CLDFB_NO_CHANNELS_MAX], /* i : CLDFB samples of the transport channels (imaginary part) */ - float *proto_frame_f, /* o : interleaved complex prototype CLDFB samples */ - const PARAM_MC_DIFF_PROTO_INFO *diff_proto_info, /* i : prototype generation information */ - const int16_t slot_index, /* i : current slot index */ - const int16_t num_freq_bands /* i : number of frequency bands for the prototypes */ +#endif + float *proto_frame_f, /* o : interleaved complex prototype CLDFB samples */ + const PARAM_MC_DIFF_PROTO_INFO *diff_proto_info, /* i : prototype generation information */ +#ifndef JBM_TSM_ON_TCS + const int16_t slot_index, /* i : current slot index */ +#endif + const int16_t num_freq_bands /* i : number of frequency bands for the prototypes */ ) { int16_t band; @@ -1763,8 +2301,13 @@ static void param_mc_protoSignalComputation( int16_t source_ch_idx = diff_proto_info->source_chan_idx[proto_ch_idx][source_ch_cnt]; p_proto_frame = &proto_frame_f[proto_ch_idx * num_freq_bands * 2]; +#ifdef JBM_TSM_ON_TCS + p_real_buffer = &RealBuffer[source_ch_idx * num_freq_bands]; + p_imag_buffer = &ImagBuffer[source_ch_idx * num_freq_bands]; +#else p_real_buffer = &RealBuffer[source_ch_idx][slot_index][0]; p_imag_buffer = &ImagBuffer[source_ch_idx][slot_index][0]; +#endif for ( band = 0; band < num_freq_bands; band++ ) { @@ -1936,15 +2479,18 @@ static int16_t ivas_param_mc_range_decoder_LC( * * compute the interpolator used in the final synthesis *------------------------------------------------------------------------*/ - -static void param_mc_compute_interpolator( +static void ivas_param_mc_dec_compute_interpolator( const uint16_t bAttackPresent, /* i : flag indicating if we have a transient in the current frame */ const uint16_t attackPos, /* i : position of the transient */ const uint16_t interp_length, /* i : number of interpolation values to be calculated */ float *interpolator /* o : interpolator */ ) { +#ifdef JBM_TSM_ON_TCS + int16_t idx; +#else uint16_t idx; +#endif if ( bAttackPresent ) { @@ -1959,10 +2505,14 @@ static void param_mc_compute_interpolator( } else { +#ifdef JBM_TSM_ON_TCS + ivas_jbm_dec_get_adapted_linear_interpolator( DEFAULT_JBM_CLDFB_TIMESLOTS, interp_length, interpolator ); +#else for ( idx = 1; idx <= interp_length; ++idx ) { interpolator[idx - 1] = (float) idx / (float) interp_length; } +#endif } return; @@ -2022,12 +2572,17 @@ static void ivas_param_mc_get_mixing_matrices( PARAM_MC_DEC_HANDLE hParamMC, /* i : Parametric MC handle */ IVAS_OUTPUT_SETUP *hSynthesisOutputSetup, float Cx_in[PARAM_MC_MAX_PARAMETER_BANDS][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], /* i : input covariance for all parameter bands */ - float mixing_matrix[PARAM_MC_MAX_PARAMETER_BANDS][MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS], /* o : direct mixing matrices for all parameter bands */ - float mixing_matrix_res[PARAM_MC_MAX_PARAMETER_BANDS_RES][MAX_CICP_CHANNELS * MAX_CICP_CHANNELS], /* o : residual mixing matrices for all parameter bands */ - const int16_t nY_intern, /* i : number of channels in the transported format */ - const PARAM_MC_SYNTHESIS_CONF synth_config, /* i : Parametric MC synthesis config */ - const int16_t nX, /* i : number of transport channels */ - const int16_t nY_cov /* i : number of covariance synthesis output channels */ +#ifdef JBM_TSM_ON_TCS + float *mixing_matrix[], /* o : direct mixing matrices for all parameter bands */ + float *mixing_matrix_res[], /* o : residual mixing matrices for all parameter bands */ +#else + float mixing_matrix[PARAM_MC_MAX_PARAMETER_BANDS][MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS], /* o : direct mixing matrices for all parameter bands */ + float mixing_matrix_res[PARAM_MC_MAX_PARAMETER_BANDS_RES][MAX_CICP_CHANNELS * MAX_CICP_CHANNELS], /* o : residual mixing matrices for all parameter bands */ +#endif + const int16_t nY_intern, /* i : number of channels in the transported format */ + const PARAM_MC_SYNTHESIS_CONF synth_config, /* i : Parametric MC synthesis config */ + const int16_t nX, /* i : number of transport channels */ + const int16_t nY_cov /* i : number of covariance synthesis output channels */ ) { int16_t param_band_idx; @@ -2276,11 +2831,16 @@ static void ivas_param_mc_get_mixing_matrices( static void ivas_param_mc_get_mono_stereo_mixing_matrices( PARAM_MC_DEC_HANDLE hParamMC, /* i : Parametric MC handle */ float Cx_in[PARAM_MC_MAX_PARAMETER_BANDS][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], /* i : transport channel covariance for all parameter bands */ - float mixing_matrix[PARAM_MC_MAX_PARAMETER_BANDS][MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS], /* o : direct mixing matrix */ - float mixing_matrix_res[PARAM_MC_MAX_PARAMETER_BANDS_RES][MAX_CICP_CHANNELS * MAX_CICP_CHANNELS], /* o : residual mixing matrix (set to zero) */ - const int16_t nY_intern, /* i : number of channels of the transport format */ - const int16_t nX, /* i : number of transport channels */ - const int16_t nY_cov ) /* i : number of output channels */ +#ifdef JBM_TSM_ON_TCS + float *mixing_matrix[], /* o : direct mixing matrices for all parameter bands */ + float *mixing_matrix_res[], /* o : residual mixing matrices for all parameter bands */ +#else + float mixing_matrix[PARAM_MC_MAX_PARAMETER_BANDS][MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS], /* o : direct mixing matrix */ + float mixing_matrix_res[PARAM_MC_MAX_PARAMETER_BANDS_RES][MAX_CICP_CHANNELS * MAX_CICP_CHANNELS], /* o : residual mixing matrix (set to zero) */ +#endif + const int16_t nY_intern, /* i : number of channels of the transport format */ + const int16_t nX, /* i : number of transport channels */ + const int16_t nY_cov ) /* i : number of output channels */ { int16_t param_band_idx; float Cx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS]; @@ -2395,17 +2955,21 @@ static void ivas_param_mc_get_mono_stereo_mixing_matrices( *------------------------------------------------------------------------*/ static void param_mc_update_mixing_matrices( - PARAM_MC_DEC_HANDLE hParamMC, /* i/o: Parametric MC handle */ + PARAM_MC_DEC_HANDLE hParamMC, /* i/o: Parametric MC handle */ +#ifdef JBM_TSM_ON_TCS + float *mixing_matrix[], /* i : direct mixing matrices for the frame just processed */ + float *mixing_matrix_res[], /* i : residual mixing matrices for the frame just processed */ +#else float mixing_matrix[PARAM_MC_MAX_PARAMETER_BANDS][MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS], /* i : direct mixing matrices for the frame just processed */ float mixing_matrix_res[PARAM_MC_MAX_PARAMETER_BANDS_RES][MAX_CICP_CHANNELS * MAX_CICP_CHANNELS], /* i : residual mixing matrices for the frame just processed */ - const uint16_t nX, /* i : number of transport channels */ - const uint16_t nY ) /* i : number of synthesis channels */ +#endif + const uint16_t nX, /* i : number of transport channels */ + const uint16_t nY ) /* i : number of synthesis channels */ { uint16_t param_band_idx; for ( param_band_idx = 0; param_band_idx < hParamMC->hMetadataPMC->nbands_coded; param_band_idx++ ) { - /* final mixing */ int16_t brange[2]; brange[0] = hParamMC->band_grouping[param_band_idx]; diff --git a/lib_dec/ivas_mc_paramupmix_dec.c b/lib_dec/ivas_mc_paramupmix_dec.c new file mode 100644 index 0000000000000000000000000000000000000000..346868ab6a4686978faf188fd65dbad3f220c634 --- /dev/null +++ b/lib_dec/ivas_mc_paramupmix_dec.c @@ -0,0 +1,693 @@ +/****************************************************************************************************** + + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. 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 "cnst.h" +#include "prot.h" +#include "ivas_prot.h" +#include "ivas_cnst.h" +#include "ivas_rom_com.h" +#include "ivas_rom_dec.h" +#include "math.h" +#ifdef DEBUGGING +#include "debug.h" +#endif +#ifdef DEBUG_PLOT +#include "deb_out.h" +#endif +#include "wmc_auto.h" +#include "rom_dec.h" + +/*-----------------------------------------------------------------------* + * Local function prototypes + *-----------------------------------------------------------------------*/ +static void ps_pred_process( MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix, float qmf_mod_re[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float qmf_mod_im[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float qmf_side_re[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float qmf_side_im[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], int16_t ch ); + +static void paramupmix_td_decorr_process( ivas_td_decorr_state_t *hTdDecorr[], float pcm_in[][L_FRAME48k], float **pp_out_pcm, const int16_t output_frame ); + +static int huff_read( Decoder_State *st, const int16_t ( *ht )[2] ); + +static void huffman_decode( Decoder_State *st, int16_t nv, int16_t ivStart, PAR_TYPE parType, QUANT_TYPE quant_type, int16_t bNoDt, int32_t *vq ); + +static void dequant_alpha( int16_t nv, int16_t ivStart, QUANT_TYPE quant_type, int32_t *vq, float *v ); + +static void dequant_beta( int16_t nv, int16_t ivStart, QUANT_TYPE quant_type, int32_t *aq, int32_t *bq, float *beta ); + +static void get_ec_data( Decoder_State *st, PAR_TYPE parType, QUANT_TYPE quant_type, int16_t nParBand, int16_t parBandStart, int32_t *parQ, int32_t *alphaQEnv, float ab[IVAS_MAX_NUM_BANDS] ); + +/*------------------------------------------------------------------------- + * ivas_mc_paramupmix_dec_read_BS() + * + * Read the ParamUpmix MC metadata + *------------------------------------------------------------------------*/ + +void ivas_mc_paramupmix_dec_read_BS( + const int32_t ivas_total_brate, /* i : IVAS total bitrate */ + Decoder_State *st, /* i/o: decoder state structure */ + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix, /* i/o: decoder MC Param-Upmix handle */ + int16_t *nb_bits /* o : number of bits written */ +) +{ + int16_t i, k; + int32_t alpha_quant[IVAS_MAX_NUM_BANDS]; + int16_t nb_bits_read_orig; + int16_t next_bit_pos_orig, last_bit_pos; + uint16_t bstr_meta[MAX_BITS_METADATA], *bit_stream_orig; + + push_wmops( "mc_paramupmix_read_bs" ); + *nb_bits = 0; + + if ( st->bfi ) + { + for ( i = 0; i < MC_PARAMUPMIX_COMBINATIONS; i++ ) + { + for ( k = 0; k < IVAS_MAX_NUM_BANDS; k++ ) + { + hMCParamUpmix->alphas[i][k] = hMCParamUpmix->alpha_prev[i][k]; + hMCParamUpmix->betas[i][k] = hMCParamUpmix->beta_prev[i][k]; + } + } + hMCParamUpmix->first_frame = 1; + } + else /* if (!st->bfi) */ + { + bit_stream_orig = st->bit_stream; + next_bit_pos_orig = st->next_bit_pos; + last_bit_pos = (int16_t) ( ( ivas_total_brate / FRAMES_PER_SEC ) - 1 ); + nb_bits_read_orig = 0; + last_bit_pos -= nb_bits_read_orig; /* reverse the bitstream for easier reading of indices */ + for ( i = 0; i < min( MAX_BITS_METADATA, last_bit_pos ); i++ ) + { + bstr_meta[i] = st_ivas->bit_stream[last_bit_pos - i]; + } + st->bit_stream = bstr_meta; + st->next_bit_pos = 0; + st->bits_frame = min( MAX_BITS_METADATA, last_bit_pos + 1 ); + st->total_brate = st_ivas->hDecoderConfig->ivas_total_brate; /* to avoid BER detect */ + + for ( i = 0; i < MC_PARAMUPMIX_COMBINATIONS; i++ ) + { + get_ec_data( st, ALPHA, FINE /*quant_type*/, IVAS_MAX_NUM_BANDS /*nParBand*/, + 0 /*parBandStart*/, hMCParamUpmix->alpha_quant[i], alpha_quant, hMCParamUpmix->alphas[i] ); + + get_ec_data( st, BETA, FINE /*quant_type*/, IVAS_MAX_NUM_BANDS /*nParBand*/, + 0 /*parBandStart*/, hMCParamUpmix->beta_quant[i], alpha_quant, hMCParamUpmix->betas[i] ); + } + *nb_bits += st->next_bit_pos; + st->bit_stream = bit_stream_orig; + st->next_bit_pos = next_bit_pos_orig; + + if ( hMCParamUpmix->first_frame ) + { + for ( i = 0; i < MC_PARAMUPMIX_COMBINATIONS; i++ ) + { + mvr2r( hMCParamUpmix->alphas[i], hMCParamUpmix->alpha_prev[i], IVAS_MAX_NUM_BANDS ); + mvr2r( hMCParamUpmix->betas[i], hMCParamUpmix->beta_prev[i], IVAS_MAX_NUM_BANDS ); + } + hMCParamUpmix->first_frame = 0; + } + } + + pop_wmops(); + + return; +} + +/*------------------------------------------------------------------------- + * ivas_mc_paramupmix_dec() + * + * MC ParamUpmix decoding process + *------------------------------------------------------------------------*/ +void ivas_mc_paramupmix_dec( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + float output_f[][L_FRAME48k] /* i/o: synthesized core-coder transport channels */ +) +{ + MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix; + int16_t i, k, ch; + int16_t slot_idx; + int16_t first_empty_channel; + int16_t nchan_out_transport; + /*CLDFB*/ + float Cldfb_RealBuffer[MC_PARAMUPMIX_MAX_TRANSPORT_CHANS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; + float Cldfb_ImagBuffer[MC_PARAMUPMIX_MAX_TRANSPORT_CHANS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; + int16_t channel_active[MAX_OUTPUT_CHANNELS]; + int32_t output_Fs; + int16_t output_frame; + float Pcm_decorr[MC_PARAMUPMIX_COMBINATIONS][L_FRAME48k]; /* decorrelated channels */ + float *pPcm_temp[MC_PARAMUPMIX_COMBINATIONS * 2]; /* decorrelated and undecorrelated*/ + int16_t noparamupmix_delay; + AUDIO_CONFIG output_config; + + hMCParamUpmix = st_ivas->hMCParamUpmix; + assert( hMCParamUpmix ); + + push_wmops( "mc_paramupmix_dec" ); + + set_s( channel_active, 0, MAX_CICP_CHANNELS ); + nchan_out_transport = st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe; + set_s( channel_active, 1, nchan_out_transport ); /* change to nchan_out_transport */ + output_Fs = st_ivas->hDecoderConfig->output_Fs; + output_config = st_ivas->hDecoderConfig->output_config; + output_frame = (int16_t) ( output_Fs / FRAMES_PER_SEC ); + + if ( ( output_config == AUDIO_CONFIG_STEREO ) || ( output_config == AUDIO_CONFIG_MONO ) ) + { + first_empty_channel = 8; /* Don't upmix */ + } + else + { + first_empty_channel = 12; + + for ( i = 0; i < MC_PARAMUPMIX_COMBINATIONS; i++ ) + { + pPcm_temp[i] = Pcm_decorr[i]; /* decorrelated */ + } + + paramupmix_td_decorr_process( hMCParamUpmix->hTdDecorr, &( output_f[4] ), pPcm_temp, output_frame ); + + for ( i = 0; i < MC_PARAMUPMIX_COMBINATIONS; i++ ) + { + pPcm_temp[2 * i] = output_f[i + 4]; /* un-decorrelated */ + pPcm_temp[2 * i + 1] = Pcm_decorr[i]; /* decorrelated */ + } + + /* CLDFB Analysis*/ + for ( ch = 0; ch < MC_PARAMUPMIX_COMBINATIONS * 2; ch++ ) + { + /* slot loop for gathering the input data */ + for ( slot_idx = 0; slot_idx < CLDFB_NO_COL_MAX; slot_idx++ ) + { + cldfbAnalysis_ts( &( pPcm_temp[ch][hMCParamUpmix->num_freq_bands * slot_idx] ), Cldfb_RealBuffer[ch][slot_idx], Cldfb_ImagBuffer[ch][slot_idx], hMCParamUpmix->num_freq_bands, st_ivas->cldfbAnaDec[ch] ); + } + } + for ( ch = 0; ch < MC_PARAMUPMIX_COMBINATIONS; ch++ ) + { + ps_pred_process( hMCParamUpmix, + Cldfb_RealBuffer[2 * ch], /* in/out */ + Cldfb_ImagBuffer[2 * ch], + Cldfb_RealBuffer[2 * ch + 1], /* in/out decorr */ + Cldfb_ImagBuffer[2 * ch + 1], + ch ); + + /*-- m, s -> l, r ----------------------------*/ + for ( i = 0; i < CLDFB_NO_COL_MAX; i++ ) + { + for ( k = 0; k < CLDFB_NO_CHANNELS_MAX; k++ ) + { + float qlre = Cldfb_RealBuffer[2 * ch][i][k]; + float qlim = Cldfb_ImagBuffer[2 * ch][i][k]; + float qrre = Cldfb_RealBuffer[2 * ch + 1][i][k]; + float qrim = Cldfb_ImagBuffer[2 * ch + 1][i][k]; + + Cldfb_RealBuffer[2 * ch][i][k] = qlre + qrre; + Cldfb_ImagBuffer[2 * ch][i][k] = qlim + qrim; + Cldfb_RealBuffer[2 * ch + 1][i][k] = qlre - qrre; + Cldfb_ImagBuffer[2 * ch + 1][i][k] = qlim - qrim; + } + } + + mvr2r( hMCParamUpmix->alphas[ch], hMCParamUpmix->alpha_prev[ch], IVAS_MAX_NUM_BANDS ); + mvr2r( hMCParamUpmix->betas[ch], hMCParamUpmix->beta_prev[ch], IVAS_MAX_NUM_BANDS ); + } + + /* boxes = { 0 1 2 3 [4 6] [5 7] [8 10] [9 11] }; */ + pPcm_temp[0] = output_f[4]; + pPcm_temp[1] = output_f[6]; + pPcm_temp[2] = output_f[5]; + pPcm_temp[3] = output_f[7]; + pPcm_temp[4] = output_f[8]; + pPcm_temp[5] = output_f[10]; + pPcm_temp[6] = output_f[9]; + pPcm_temp[7] = output_f[11]; + + /* CLDFB synthesis */ + for ( ch = 0; ch < MC_PARAMUPMIX_COMBINATIONS * 2; ch++ ) + { + for ( slot_idx = 0; slot_idx < CLDFB_NO_COL_MAX; slot_idx++ ) + { + float *ptr_im[1], *ptr_re[1]; + ptr_re[0] = Cldfb_RealBuffer[ch][slot_idx]; + ptr_im[0] = Cldfb_ImagBuffer[ch][slot_idx]; + + cldfbSynthesis( ptr_re, ptr_im, &( pPcm_temp[ch][hMCParamUpmix->num_freq_bands * slot_idx] ), + hMCParamUpmix->num_freq_bands, st_ivas->cldfbSynDec[ch] ); + } + } + + /* adjust delay of other channels */ + noparamupmix_delay = NS2SA( output_Fs, IVAS_FB_DEC_DELAY_NS ); + for ( ch = 0; ch < MC_PARAMUPMIX_COMBINATIONS; ch++ ) + { + float tmp_buf[L_SUBFRAME5MS_48k]; + mvr2r( &output_f[ch][output_frame - noparamupmix_delay], tmp_buf, noparamupmix_delay ); + mvr2r( output_f[ch], &output_f[ch][noparamupmix_delay], output_frame - noparamupmix_delay ); + mvr2r( hMCParamUpmix->pcm_delay[ch], output_f[ch], noparamupmix_delay ); + mvr2r( tmp_buf, hMCParamUpmix->pcm_delay[ch], noparamupmix_delay ); + } + } + + for ( ch = first_empty_channel; ch < MAX_OUTPUT_CHANNELS; ch++ ) + { + set_f( output_f[ch], 0.0, L_FRAME48k ); + } + pop_wmops(); + + return; +} + +/*------------------------------------------------------------------------- + * ivas_mc_paramupmix_getNumTransportChannels() + * + * + *------------------------------------------------------------------------*/ +int16_t ivas_mc_paramupmix_getNumTransportChannels() +{ + int16_t nchan_transport; + nchan_transport = MC_PARAMUPMIX_MAX_TRANSPORT_CHANS; /* 5.1.2 */ + return nchan_transport; +} + +/*------------------------------------------------------------------------- + * ivas_mc_paramupmix_dec_open() + * + * Open Parametric MC decoder handle + *-------------------------------------------------------------------------*/ + +ivas_error ivas_mc_paramupmix_dec_open( + Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ +) +{ + MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix; + int32_t output_Fs; + int16_t nchan_transport; + uint16_t i; + ivas_error error; + + error = IVAS_ERR_OK; + + /*-----------------------------------------------------------------* + * prepare library opening + *-----------------------------------------------------------------*/ + + if ( ( hMCParamUpmix = (MC_PARAMUPMIX_DEC_HANDLE) malloc( sizeof( MC_PARAMUPMIX_DEC_DATA ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param-Upmix MC\n" ) ); + } + output_Fs = st_ivas->hDecoderConfig->output_Fs; + hMCParamUpmix->first_frame = 1; + + st_ivas->nchan_transport = ivas_mc_paramupmix_getNumTransportChannels(); + nchan_transport = st_ivas->nchan_transport; + + switch ( nchan_transport ) + { + case 8: + st_ivas->nCPE = 4; + st_ivas->nSCE = 0; + st_ivas->element_mode_init = IVAS_CPE_MDCT; + break; +#ifdef DEBUGGING + default: + assert( 0 && "Number of TC not supported for MC ParamUpmix!" ); +#endif + } + /*-----------------------------------------------------------------* + * set input parameters + *-----------------------------------------------------------------*/ + + hMCParamUpmix->num_freq_bands = (int16_t) ( output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ); + + for ( i = 0; i < MC_PARAMUPMIX_COMBINATIONS; i++ ) + { + ivas_td_decorr_dec_open( &( hMCParamUpmix->hTdDecorr[i] ), output_Fs, 2, 1 ); + } + + for ( i = 0; i < MC_PARAMUPMIX_MAX_TRANSPORT_CHANS; i++ ) + { + if ( ( hMCParamUpmix->pcm_delay[i] = (float *) malloc( 240 * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for delay buffer\n" ) ); + } + set_zero( hMCParamUpmix->pcm_delay[i], 240 ); + } + + st_ivas->hMCParamUpmix = hMCParamUpmix; + + return error; +} + +/*------------------------------------------------------------------------- + * ivas_mc_paramupmix_dec_close() + * + * Close ParamUpmix MC memories + *------------------------------------------------------------------------*/ + +void ivas_mc_paramupmix_dec_close( + MC_PARAMUPMIX_DEC_HANDLE *hMCParamUpmix /* i/o: Parametric MC decoder handle */ +) +{ + int16_t i; + + if ( hMCParamUpmix == NULL || *hMCParamUpmix == NULL ) + { + return; + } + for ( i = 0; i < MC_PARAMUPMIX_COMBINATIONS; i++ ) + { + ivas_td_decorr_dec_close( &( ( *hMCParamUpmix )->hTdDecorr[i] ) ); + } + for ( i = 0; i < MC_PARAMUPMIX_MAX_TRANSPORT_CHANS; i++ ) + { + if ( ( *hMCParamUpmix )->pcm_delay[i] != NULL ) + { + free( ( *hMCParamUpmix )->pcm_delay[i] ); + } + } + free( *hMCParamUpmix ); + + *hMCParamUpmix = NULL; + + return; +} + +/*****************************************************************************************/ +/* local functions */ +/*****************************************************************************************/ + +static void ps_pred_process( + MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix, + float qmf_mod_re[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* in/out */ + float qmf_mod_im[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + float qmf_side_re[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* in/out */ + float qmf_side_im[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + int16_t ch ) +{ + float vmre, vmim, vsre, vsim; + int16_t iqmf, ipar, ismp, iismp; + float alpha_smp, dalpha, beta_smp, dbeta; + float *alpha1, *alpha2; + float *beta1, *beta2; + float *alpha_prev = hMCParamUpmix->alpha_prev[ch]; + float *beta_prev = hMCParamUpmix->beta_prev[ch]; + + int16_t qmf_to_par_band[] = { + 0, 1, 2, 3, 4, 5, 5, 6, 6, 7, + 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, + 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11 + }; + + for ( iqmf = 0; iqmf < CLDFB_NO_CHANNELS_MAX; iqmf++ ) + { + /* For changing no of parameter bands (ipar1 != ipar2), TIGGER_FRAMING assumed */ + ipar = qmf_to_par_band[iqmf]; + alpha1 = alpha_prev; + beta1 = beta_prev; + + ismp = 0; + alpha2 = hMCParamUpmix->alphas[ch]; + beta2 = hMCParamUpmix->betas[ch]; + alpha_smp = alpha1[ipar]; + beta_smp = beta1[ipar]; + dalpha = ( alpha2[ipar] - alpha1[ipar] ) / CLDFB_NO_COL_MAX; + dbeta = ( beta2[ipar] - beta1[ipar] ) / CLDFB_NO_COL_MAX; + + for ( iismp = 0; iismp < CLDFB_NO_COL_MAX; iismp++ ) + { + alpha_smp += dalpha; + beta_smp += dbeta; + + vmre = qmf_mod_re[ismp][iqmf]; + vmim = qmf_mod_im[ismp][iqmf]; + vsre = qmf_side_re[ismp][iqmf]; + vsim = qmf_side_im[ismp][iqmf]; + + qmf_side_re[ismp][iqmf] = alpha_smp * vmre + beta_smp * vsre; + qmf_side_im[ismp][iqmf] = alpha_smp * vmim + beta_smp * vsim; + + ismp++; + } + + alpha1 = alpha2; + beta1 = beta2; + } +} + +static void paramupmix_td_decorr_process( + ivas_td_decorr_state_t *hTdDecorr[], /* i/o: SPAR Covar. decoder handle */ + float pcm_in[][L_FRAME48k], /* i : input audio channels */ + float **pp_out_pcm, /* o : output audio channels */ + const int16_t output_frame /* i : output frame length */ +) +{ + int16_t j, k; + int16_t offset; + float in_duck_gain[L_FRAME48k], out_duck_gain[L_FRAME48k]; + + offset = (int16_t) ( output_frame * FRAMES_PER_SEC * IVAS_DECORR_PARM_LOOKAHEAD_TAU ); + + /* Look-ahead delay */ + for ( k = 0; k < MC_PARAMUPMIX_COMBINATIONS; k++ ) + { + mvr2r( pcm_in[k], pp_out_pcm[k], output_frame ); + delay_signal( pp_out_pcm[k], output_frame, hTdDecorr[k]->look_ahead_buf, offset ); + + /* In ducking gains */ + if ( hTdDecorr[k]->ducking_flag ) + { + ivas_td_decorr_get_ducking_gains( hTdDecorr[k]->pTrans_det, pcm_in[k], in_duck_gain, out_duck_gain, output_frame, 0 ); + + for ( j = 0; j < output_frame; j++ ) + { + pp_out_pcm[k][j] = pp_out_pcm[k][j] * in_duck_gain[j]; + } + } + + /* All pass delay section */ + ivas_td_decorr_APD_iir_filter( &hTdDecorr[k]->APD_filt_state[0], pp_out_pcm[k], hTdDecorr[k]->num_apd_sections, output_frame ); + + /* Out ducking gains */ + if ( hTdDecorr[k]->ducking_flag ) + { + for ( j = 0; j < output_frame; j++ ) + { + pp_out_pcm[k][j] = pp_out_pcm[k][j] * out_duck_gain[j]; + } + } + } + + return; +} + +static int huff_read( + Decoder_State *st, + const int16_t ( *ht )[2] ) +{ + int16_t node = 0; + uint16_t next_bit = 0; + + do + { + next_bit = st->bit_stream[st->next_bit_pos]; + st->next_bit_pos++; + node = ht[node][next_bit]; + } while ( node > 0 ); + + return -( node + 1 ); +} + +static void huffman_decode( + Decoder_State *st, + int16_t nv, + int16_t ivStart, + PAR_TYPE parType, + QUANT_TYPE quant_type, + int16_t bNoDt, + int32_t *vq ) +{ + const int16_t( *huff_node_table )[2]; + int16_t iv, bdt, nquant, offset; + + + nquant = 0; + switch ( parType ) + { + case ALPHA: + nquant = alpha_quant_table[quant_type].nquant; + break; + case BETA: + nquant = beta_quant_table[quant_type][0].nquant; + break; + default: + assert( 0 ); + } + + offset = nquant - 1; /* range of df/dt [-(nquant - 1), nquant - 1] */ + + if ( bNoDt ) + { + bdt = 0; + } + else + { + bdt = st->bit_stream[st->next_bit_pos]; + st->next_bit_pos++; + } + if ( bdt ) + { /* Get dt */ + switch ( parType ) + { + case ALPHA: + huff_node_table = huff_nodes_dt.alpha[quant_type]; + break; + case BETA: + huff_node_table = huff_nodes_dt.beta[quant_type]; + break; + default: + huff_node_table = NULL; + assert( 0 ); + } + for ( iv = ivStart; iv < nv; iv++ ) + { + vq[iv] = huff_read( st, huff_node_table ) + vq[iv] - offset; + } + } + else /* Get f0, df */ + { + switch ( parType ) + { + case ALPHA: + huff_node_table = huff_nodes_df0.alpha[quant_type]; + break; + case BETA: + huff_node_table = huff_nodes_df0.beta[quant_type]; + break; + default: + huff_node_table = NULL; + assert( 0 ); + } + vq[ivStart] = huff_read( st, huff_node_table ); + + switch ( parType ) + { + case ALPHA: + huff_node_table = huff_nodes_df.alpha[quant_type]; + break; + case BETA: + huff_node_table = huff_nodes_df.beta[quant_type]; + break; + default: + assert( 0 ); + } + + for ( iv = ivStart + 1; iv < nv; iv++ ) + { + vq[iv] = huff_read( st, huff_node_table ) + vq[iv - 1] - offset; + } + } +} + +static void dequant_alpha( + int16_t nv, + int16_t ivStart, + QUANT_TYPE quant_type, + int32_t *vq, + float *v ) +{ + int16_t iv; + ACPL_QUANT_TABLE *quant_table = &alpha_quant_table[quant_type]; + + for ( iv = 0; iv < ivStart; iv++ ) + { + v[iv] = 0; + } + + for ( iv = ivStart; iv < nv; iv++ ) + { + v[iv] = quant_table->data[vq[iv]]; + } +} + +static void dequant_beta( + int16_t nv, + int16_t ivStart, + QUANT_TYPE quant_type, + int32_t *aq, + int32_t *bq, + float *beta ) +{ + int16_t iv; + ACPL_QUANT_TABLE *quant_table; + const int16_t qmap[2][33] = { + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 7, 6, 5, 4, 3, 2, 1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 7, 6, 5, 4, 3, 2, 1, 0 }, + { 0, 1, 2, 3, 4, 3, 2, 1, 0, 1, 2, 3, 4, 3, 2, 1, 0 } + }; + + for ( iv = 0; iv < ivStart; iv++ ) + { + beta[iv] = 0; + } + + for ( iv = ivStart; iv < nv; iv++ ) + { + quant_table = &beta_quant_table[quant_type][qmap[quant_type][aq[iv]]]; + beta[iv] = quant_table->data[bq[iv]]; + } +} + +static void get_ec_data( + Decoder_State *st, + PAR_TYPE parType, + QUANT_TYPE quant_type, + int16_t nParBand, + int16_t parBandStart, + int32_t *parQ, + int32_t *alphaQEnv, + float ab[IVAS_MAX_NUM_BANDS] ) +{ + huffman_decode( st, nParBand, parBandStart, parType, quant_type, 0, parQ ); + if ( parType == ALPHA ) + { + dequant_alpha( nParBand, parBandStart, quant_type, parQ, ab ); + mvl2l( parQ, alphaQEnv, (int16_t) nParBand ); + } + else + { + dequant_beta( nParBand, parBandStart, quant_type, alphaQEnv, parQ, ab ); + } +} diff --git a/lib_dec/ivas_mcmasa_dec.c b/lib_dec/ivas_mcmasa_dec.c index d075bf61da999ff97a6a1b29b2b627b72780fa3d..99b3ff68744b0daf4e3460cd3c9ab3b764ad6bc3 100755 --- a/lib_dec/ivas_mcmasa_dec.c +++ b/lib_dec/ivas_mcmasa_dec.c @@ -76,11 +76,7 @@ ivas_error ivas_mcmasa_dec_reconfig( return error; } -#ifdef SBA2MONO st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas ); -#else - st_ivas->sba_dirac_stereo_flag = ( st_ivas->nchan_transport == 1 && st_ivas->hOutSetup.output_config == AUDIO_CONFIG_STEREO ); -#endif if ( st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_MCMASA_MONO_STEREO ) { @@ -135,16 +131,14 @@ ivas_error ivas_mcmasa_dec_reconfig( } 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 ) ) + /* 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 ) { - /* 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; - } + return error; } + + /* regularization factor is bitrate-dependent */ + st_ivas->hDiracDecBin->reqularizationFactor = configure_reqularization_factor( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate ); } } diff --git a/lib_dec/ivas_mct_core_dec.c b/lib_dec/ivas_mct_core_dec.c index 5222d39b6436c2c2e4ae3563eec0235a3fa968e6..6c5e6575a68a95f7771c605fdddc785335a3e4fc 100644 --- a/lib_dec/ivas_mct_core_dec.c +++ b/lib_dec/ivas_mct_core_dec.c @@ -70,11 +70,7 @@ void ivas_mct_side_bits( Decoder_State *st, *sts[MCT_MAX_CHANNELS]; nf_side_bits = 0; - nChannels = hMCT->nchan_out_woLFE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - + hMCT->num_lfe -#endif - ; + nChannels = hMCT->nchan_out_woLFE; /*initializations */ for ( cpe_id = 0, i = 0; cpe_id < nCPE; cpe_id++ ) @@ -93,9 +89,6 @@ void ivas_mct_side_bits( { st = sts[ch]; if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - st->mct_chan_mode == MCT_CHAN_MODE_LFE || -#endif st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; @@ -123,9 +116,6 @@ void ivas_mct_side_bits( st = sts[ch]; if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && hMCT->LFE_off ) || -#endif st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { chBitRatios[ch] = 0; @@ -199,11 +189,7 @@ void ivas_mct_core_dec( * Initializations *--------------------------------------------------------------------------------*/ - nChannels = hMCT->nchan_out_woLFE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - + hMCT->num_lfe -#endif - ; + nChannels = hMCT->nchan_out_woLFE; /*initializations */ for ( cpe_id = 0, i = 0; cpe_id < nCPE; cpe_id++ ) @@ -218,9 +204,6 @@ void ivas_mct_core_dec( for ( ch = 0, i = 0; ch < nChannels; ch++ ) { if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE || -#endif sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; @@ -251,9 +234,6 @@ void ivas_mct_core_dec( st = sts[ch]; if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - st->mct_chan_mode == MCT_CHAN_MODE_LFE || -#endif sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) /*indicates LFE */ { continue; diff --git a/lib_dec/ivas_mct_dec.c b/lib_dec/ivas_mct_dec.c index 4492968ad8e32902084ae90566a379fbfabf6ae1..6eada0e18b3912579410cf73cf7600bc67c8bf07 100755 --- a/lib_dec/ivas_mct_dec.c +++ b/lib_dec/ivas_mct_dec.c @@ -54,8 +54,11 @@ * Local function prototypes *-----------------------------------------------------------------------*/ +#ifdef JBM_TSM_ON_TCS +static ivas_error ivas_mc_dec_reconfig( Decoder_Struct *st_ivas, uint16_t *nSamplesRendered, int16_t *data ); +#else static ivas_error ivas_mc_dec_reconfig( Decoder_Struct *st_ivas ); - +#endif /*--------------------------------------------------------------------------* * ivas_mct_dec() @@ -106,12 +109,6 @@ ivas_error ivas_mct_dec( } } -#ifndef ISSUE_24_CLEANUP_MCT_LFE - 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() */ - } -#endif for ( cpe_id = 0; cpe_id < nCPE; cpe_id++ ) { @@ -133,13 +130,8 @@ ivas_error ivas_mct_dec( if ( !st_ivas->bfi ) { -#ifndef ISSUE_24_CLEANUP_MCT_LFE - 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 ) ); -#else 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 ) ); -#endif st_ivas->BER_detect |= st_ivas->hCPE[cpe_id]->hCoreCoder[0]->BER_detect; @@ -163,12 +155,7 @@ ivas_error ivas_mct_dec( set_zero( x[n][1], L_FRAME48k / 2 ); } - ivas_mdct_core_invQ( st_ivas->hCPE[cpe_id] -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - hMCT->LFE_off -#endif - , + 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 ); @@ -203,9 +190,6 @@ ivas_error ivas_mct_dec( } ivas_mdct_core_tns_ns( hCPE, -#ifndef ISSUE_24_CLEANUP_MCT_LFE - hMCT->LFE_off, -#endif fUseTns[cpe_id], tnsData[cpe_id], x, Aq[cpe_id], 1 ); } @@ -214,6 +198,7 @@ ivas_error ivas_mct_dec( /* Equalization in MDCT Domain */ ivas_ls_setup_conversion_process_mdct( st_ivas, output ); } + else if ( st_ivas->renderer_type == RENDERER_MC_PARAMMC && ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ) ) { float *x_all[MAX_CICP_CHANNELS][NB_DIV]; @@ -242,9 +227,6 @@ ivas_error ivas_mct_dec( } ivas_mdct_core_reconstruct( hCPE, x, synth, -#ifndef ISSUE_24_CLEANUP_MCT_LFE - hMCT->LFE_off, -#endif fUseTns[cpe_id], 1 ); /*----------------------------------------------------------------* @@ -253,12 +235,6 @@ ivas_error ivas_mct_dec( for ( n = 0; n < CPE_CHANNELS; n++ ) { -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( sts[n]->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - break; - } -#endif if ( st_ivas->sba_dirac_stereo_flag ) { @@ -266,11 +242,7 @@ ivas_error ivas_mct_dec( } /* Postprocessing for ACELP/MDCT core switching and synchronization */ -#ifdef FIX_ISM_DTX_CLICKS 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 ) -#else - 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*/, st_ivas->sba_dirac_stereo_flag, -1, hCPE->last_element_mode ) ) != IVAS_ERR_OK ) -#endif { return error; } @@ -304,9 +276,8 @@ ivas_error ivas_mct_dec( } #endif } -#ifdef ISSUE_24_CLEANUP_MCT_LFE /* 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 ) + if ( st_ivas->ivas_format == MC_FORMAT && ( st_ivas->mc_mode == MC_MODE_MCT || st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) ) { float tmp[L_FRAME48k]; @@ -320,7 +291,6 @@ ivas_error ivas_mct_dec( mvr2r( tmp, output[LFE_CHANNEL - 1], output_frame ); set_zero( output[LFE_CHANNEL], output_frame ); } -#endif #ifdef DEBUG_MODE_INFO for ( cpe_id = 0; cpe_id < nCPE; cpe_id++ ) @@ -370,23 +340,6 @@ ivas_error create_mct_dec( *-----------------------------------------------------------------*/ /* Determine active channels */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - 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 ) - { - hMCT->num_lfe = 0; - hMCT->nchan_out_woLFE = st_ivas->nchan_transport; - } - else if ( st_ivas->ivas_format == SBA_FORMAT ) - { - hMCT->num_lfe = 0; - hMCT->nchan_out_woLFE = st_ivas->nchan_transport; - } -#else if ( ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC ) || st_ivas->ivas_format == SBA_FORMAT ) { hMCT->nchan_out_woLFE = st_ivas->nchan_transport; @@ -395,7 +348,10 @@ ivas_error create_mct_dec( { hMCT->nchan_out_woLFE = st_ivas->nchan_transport - st_ivas->hTransSetup.num_lfe; } -#endif + else if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) + { + hMCT->nchan_out_woLFE = st_ivas->nchan_transport - st_ivas->hTransSetup.num_lfe; + } else { assert( !"IVAS format currently not supported for MCT" ); @@ -409,20 +365,10 @@ 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; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - 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; - } -#endif } } /* in case we have an uneven number of transport channels, indicate last channel ID as inactive */ - if ( ( hMCT->nchan_out_woLFE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - + hMCT->num_lfe -#endif - ) % + if ( ( hMCT->nchan_out_woLFE ) % 2 ) { st_ivas->hCPE[st_ivas->nCPE - 1]->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_IGNORE; @@ -503,23 +449,6 @@ ivas_error mct_dec_reconfigure( if ( b_nchan_change ) { /* Determine active channels */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - 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 ) - { - hMCT->num_lfe = 0; - hMCT->nchan_out_woLFE = st_ivas->nchan_transport; - } - else if ( st_ivas->ivas_format == SBA_FORMAT ) - { - hMCT->num_lfe = 0; - hMCT->nchan_out_woLFE = st_ivas->nchan_transport; - } -#else if ( ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC ) || st_ivas->ivas_format == SBA_FORMAT ) { hMCT->nchan_out_woLFE = st_ivas->nchan_transport; @@ -528,7 +457,10 @@ ivas_error mct_dec_reconfigure( { hMCT->nchan_out_woLFE = st_ivas->nchan_transport - st_ivas->hTransSetup.num_lfe; } -#endif + else if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) + { + hMCT->nchan_out_woLFE = st_ivas->nchan_transport - st_ivas->hTransSetup.num_lfe; + } else { assert( !"IVAS format currently not supported for MCT" ); @@ -541,21 +473,11 @@ 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; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - 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; - } -#endif } } /* in case we have an uneven number of transport channels, indicate last channel ID as inactive */ - if ( ( hMCT->nchan_out_woLFE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - + hMCT->num_lfe -#endif - ) % + if ( ( hMCT->nchan_out_woLFE ) % 2 ) { st_ivas->hCPE[st_ivas->nCPE - 1]->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_IGNORE; @@ -574,18 +496,10 @@ ivas_error mct_dec_reconfigure( st->total_brate = st_ivas->hCPE[cpe_id]->element_brate; if ( !( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) || -#endif ( 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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - st->mct_chan_mode -#endif - ); + 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 ); @@ -711,6 +625,11 @@ void ivas_mct_dec_close( ivas_error ivas_mc_dec_config( Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ const int16_t idx /* i : LS config. index */ +#ifdef JBM_TSM_ON_TCS + , + uint16_t *nSamplesRendered, /* o : samples flushed from last frame (JBM) */ + int16_t *data /* o : flushed samples (JBM) */ +#endif ) { AUDIO_CONFIG signaled_config; @@ -740,7 +659,11 @@ 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 ) { +#ifdef JBM_TSM_ON_TCS + ivas_mc_dec_reconfig( st_ivas, nSamplesRendered, data ); +#else ivas_mc_dec_reconfig( st_ivas ); +#endif } } @@ -759,6 +682,11 @@ ivas_error ivas_mc_dec_config( static ivas_error ivas_mc_dec_reconfig( Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ +#ifdef JBM_TSM_ON_TCS + , + uint16_t *nSamplesRendered, /* o : number of samples flushed from the last frame (JBM) */ + int16_t *data /* o : flushed samples (JBM) */ +#endif ) { int16_t nchan_transport_old, nSCE_old, nCPE_old, sba_dirac_stereo_flag_old, nchan_hp20_old; @@ -768,6 +696,14 @@ static ivas_error ivas_mc_dec_reconfig( Decoder_State *st; ivas_error error; MC_MODE mc_mode, last_mc_mode; +#ifdef JBM_TSM_ON_TCS + TC_BUFFER_MODE tc_buffer_mode_new; + int16_t tc_nchan_tc_new; + int16_t tc_nchan_allocate_new; + int16_t tc_granularity_new; + AUDIO_CONFIG intern_config_old; + IVAS_OUTPUT_SETUP hIntSetupOld; +#endif error = IVAS_ERR_OK; @@ -796,19 +732,65 @@ static ivas_error ivas_mc_dec_reconfig( { nchan_hp20_old = nchan_transport_old; } -#ifdef SBA2MONO st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas ); -#else - st_ivas->sba_dirac_stereo_flag = 0; /* needs to be after getNumChanSynthesis() */ + +#ifdef JBM_TSM_ON_TCS + /* save old IntSetup, might be needed for JBM flushing...*/ + intern_config_old = st_ivas->intern_config; + hIntSetupOld = st_ivas->hIntSetup; + tc_granularity_new = 1; #endif /* 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 ); +#ifdef JBM_TSM_ON_TCS + if ( st_ivas->hDecoderConfig->voip_active ) + { + /* transfer subframe info from DirAC or ParamMC to central tc buffer */ + if ( last_mc_mode == MC_MODE_PARAMMC ) + { + st_ivas->hTcBuffer->nb_subframes = st_ivas->hParamMC->nb_subframes; + st_ivas->hTcBuffer->subframes_rendered = st_ivas->hParamMC->subframes_rendered; + st_ivas->hTcBuffer->num_slots = st_ivas->hParamMC->num_slots; + st_ivas->hTcBuffer->slots_rendered = st_ivas->hParamMC->slots_rendered; + mvs2s( st_ivas->hParamMC->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS ); + } + else if ( last_mc_mode == MC_MODE_MCMASA && st_ivas->hDirAC != NULL ) + { + st_ivas->hTcBuffer->nb_subframes = st_ivas->hDirAC->nb_subframes; + st_ivas->hTcBuffer->subframes_rendered = st_ivas->hDirAC->subframes_rendered; + st_ivas->hTcBuffer->num_slots = st_ivas->hDirAC->num_slots; + st_ivas->hTcBuffer->slots_rendered = st_ivas->hDirAC->slots_rendered; + mvs2s( st_ivas->hDirAC->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS ); + } + /* JBM: when granularity goes down (e.g. MCT with CREND -> ParamMC with binaural fastconv + render what still fits in the new granularity */ + tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, st_ivas->hDecoderConfig->output_Fs ); + if ( tc_granularity_new < st_ivas->hTcBuffer->n_samples_granularity ) + { + if ( ( error = ivas_jbm_dec_flush_renderer( st_ivas, tc_granularity_new, renderer_type_old, intern_config_old, &hIntSetupOld, last_mc_mode, ISM_MODE_NONE, nSamplesRendered, data ) ) != IVAS_ERR_OK ) + { + return error; + } + } + /* JBM: when granularity goes up set samples to discard at the beginning of the frame */ + else if ( tc_granularity_new > st_ivas->hTcBuffer->n_samples_granularity ) + { + if ( ( error = ivas_jbm_dec_set_discard_samples( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + } + } +#endif + + 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 ) ); @@ -826,10 +808,23 @@ static ivas_error ivas_mc_dec_reconfig( ivas_ls_setup_conversion_close( &st_ivas->hLsSetUpConversion ); } + if ( last_mc_mode == MC_MODE_PARAMUPMIX ) + { + ivas_mc_paramupmix_dec_close( &( st_ivas->hMCParamUpmix ) ); + 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 ); +#ifdef JBM_TSM_ON_TCS + if ( st_ivas->hDirAC != NULL ) + { + ivas_dirac_dec_close( &st_ivas->hDirAC ); + vbap_free_data( &( st_ivas->hVBAPdata ) ); + } +#endif + /* init LS conversion if the renderer type asks for it */ if ( st_ivas->renderer_type == RENDERER_MC && st_ivas->hLsSetUpConversion == NULL ) { @@ -840,6 +835,46 @@ static ivas_error ivas_mc_dec_reconfig( } } } + else if ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) + { + st_ivas->nSCE = 0; + st_ivas->nCPE = MC_PARAMUPMIX_MAX_TRANSPORT_CHANS / 2; + st_ivas->nchan_transport = MC_PARAMUPMIX_MAX_TRANSPORT_CHANS; + + if ( last_mc_mode != MC_MODE_PARAMUPMIX ) + /* This should always be the case, only supporting one bitrate currently */ + { + /*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 ); + } + + 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; + } + } + + if ( ( error = ivas_mc_paramupmix_dec_open( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else + { + assert( 0 ); + } + } else if ( st_ivas->mc_mode == MC_MODE_PARAMMC ) { if ( last_mc_mode != MC_MODE_PARAMMC ) @@ -867,6 +902,16 @@ static ivas_error ivas_mc_dec_reconfig( ivas_masa_dec_close( &( st_ivas->hMasa ) ); ivas_qmetadata_close( &st_ivas->hQMetaData ); +#ifdef JBM_TSM_ON_TCS + if ( st_ivas->hDirAC != NULL ) + { + ivas_dirac_dec_close( &st_ivas->hDirAC ); + + vbap_free_data( &( st_ivas->hVBAPdata ) ); + } +#endif + + if ( last_mc_mode == MC_MODE_MCT ) { if ( st_ivas->hMCT != NULL && st_ivas->nchan_transport <= CPE_CHANNELS ) @@ -901,6 +946,8 @@ static ivas_error ivas_mc_dec_reconfig( ivas_ls_setup_conversion_close( &st_ivas->hLsSetUpConversion ); } + ivas_mc_paramupmix_dec_close( &( st_ivas->hMCParamUpmix ) ); + if ( st_ivas->hParamMC != NULL ) { ivas_param_mc_dec_close( &st_ivas->hParamMC ); @@ -980,24 +1027,8 @@ static ivas_error ivas_mc_dec_reconfig( } } - st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( ivas_total_brate, st->igf, st->element_mode -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - st->mct_chan_mode -#endif - ); + st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( ivas_total_brate, st->igf, st->element_mode ); } -#ifndef ISSUE_24_CLEANUP_MCT_LFE - else if ( last_mc_mode == MC_MODE_PARAMMC && st_ivas->mc_mode == MC_MODE_MCT && nchan_transport_old > 2 ) - { -#ifdef DEBUGGING - assert( st_ivas->hCPE[1] != NULL ); -#endif - st = st_ivas->hCPE[1]->hCoreCoder[1]; - st->mct_chan_mode = MCT_CHAN_MODE_LFE; - st->hTcxCfg->fIsTNSAllowed = 0; - } -#endif if ( st_ivas->mc_mode == MC_MODE_MCMASA ) { uint8_t separateChannelEnabled; @@ -1010,6 +1041,11 @@ static ivas_error ivas_mc_dec_reconfig( new_brate_SCE = 0; new_brate_CPE = ( ivas_total_brate / ( st_ivas->nchan_transport - 1 ) ) * CPE_CHANNELS; } + else if ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) + { + 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;*/ @@ -1046,20 +1082,11 @@ static ivas_error ivas_mc_dec_reconfig( return error; } - /*-----------------------------------------------------------------* - * CLDFB instances - *-----------------------------------------------------------------*/ - - if ( ( error = ivas_cldfb_dec_reconfig( st_ivas, nchan_transport_old, numCldfbAnalyses_old, numCldfbSyntheses_old ) ) != IVAS_ERR_OK ) - { - return error; - } /*-----------------------------------------------------------------* * 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 ) + if ( ( st_ivas->mc_mode == MC_MODE_MCT || st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) && st_ivas->hLFE == NULL ) { int32_t binauralization_delay_ns = st_ivas->binaural_latency_ns; if ( st_ivas->hBinRenderer != NULL ) @@ -1080,11 +1107,6 @@ static ivas_error ivas_mc_dec_reconfig( return error; } -#ifndef ISSUE_24_CLEANUP_MCT_LFE - /* reuse core-coder buffers for LFE decoder */ - st_ivas->hLFE->prevsynth_buf = &st_ivas->hCPE[1]->hCoreCoder[1]->old_synth_sw[0]; - st_ivas->hLFE->prior_out_buffer = &st_ivas->hCPE[1]->hCoreCoder[1]->previoussynth[0]; -#endif set_zero( st_ivas->hLFE->prevsynth_buf, LFE_PLC_BUFLEN ); set_zero( st_ivas->hLFE->prior_out_buffer, L_FRAME48k ); @@ -1118,6 +1140,10 @@ static ivas_error ivas_mc_dec_reconfig( else if ( st_ivas->renderer_type == RENDERER_DISABLE && st_ivas->hDirAC != NULL ) { ivas_dirac_dec_close( &( st_ivas->hDirAC ) ); + +#ifdef JBM_TSM_ON_TCS + vbap_free_data( &( st_ivas->hVBAPdata ) ); +#endif } } @@ -1244,5 +1270,78 @@ static ivas_error ivas_mc_dec_reconfig( #endif } + /*-----------------------------------------------------------------* + * 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; + } + +#ifdef JBM_TSM_ON_TCS + /*-----------------------------------------------------------------* + * Reconfigure TC buffer + *-----------------------------------------------------------------*/ + if ( st_ivas->hDecoderConfig->voip_active == 1 ) + { + int16_t tc_nchan_full_new; + DECODER_TC_BUFFER_HANDLE hTcBuffer; + + hTcBuffer = st_ivas->hTcBuffer; + tc_buffer_mode_new = ivas_jbm_dec_get_tc_buffer_mode( st_ivas ); + tc_nchan_tc_new = ivas_jbm_dec_get_num_tc_channels( st_ivas ); + tc_nchan_allocate_new = tc_nchan_tc_new; + tc_nchan_full_new = tc_nchan_tc_new; + if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC ) + { + tc_nchan_allocate_new = 2 * BINAURAL_CHANNELS; + tc_nchan_full_new = tc_nchan_allocate_new; + } + if ( st_ivas->mc_mode == MC_MODE_PARAMMC && st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_MONO && st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_STEREO ) + { + tc_nchan_full_new = 0; + } + /* reconfigure buffer */ + if ( hTcBuffer->tc_buffer_mode != tc_buffer_mode_new || hTcBuffer->nchan_transport_jbm != tc_nchan_tc_new || + hTcBuffer->nchan_buffer_full != tc_nchan_full_new || hTcBuffer->nchan_transport_internal != tc_nchan_allocate_new || + tc_granularity_new != hTcBuffer->n_samples_granularity ) + { + if ( ( error = ivas_jbm_dec_tc_buffer_reconfigure( st_ivas, tc_buffer_mode_new, tc_nchan_tc_new, tc_nchan_allocate_new, tc_nchan_full_new, tc_granularity_new ) ) != IVAS_ERR_OK ) + { + return error; + } + } + /* transfer subframe info from central tc buffer to ParamMC or McMASA (DirAC) */ + if ( st_ivas->hDirAC != NULL ) + { + st_ivas->hDirAC->nb_subframes = st_ivas->hTcBuffer->nb_subframes; + st_ivas->hDirAC->subframes_rendered = st_ivas->hTcBuffer->subframes_rendered; + st_ivas->hDirAC->num_slots = st_ivas->hTcBuffer->num_slots; + st_ivas->hDirAC->slots_rendered = st_ivas->hTcBuffer->slots_rendered; + mvs2s( st_ivas->hTcBuffer->subframe_nbslots, st_ivas->hDirAC->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS ); + } + else if ( st_ivas->hParamMC != NULL ) + { + st_ivas->hParamMC->nb_subframes = st_ivas->hTcBuffer->nb_subframes; + st_ivas->hParamMC->subframes_rendered = st_ivas->hTcBuffer->subframes_rendered; + st_ivas->hParamMC->num_slots = st_ivas->hTcBuffer->num_slots; + st_ivas->hParamMC->slots_rendered = st_ivas->hTcBuffer->slots_rendered; + mvs2s( st_ivas->hTcBuffer->subframe_nbslots, st_ivas->hParamMC->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS ); + } + } +#endif return error; } diff --git a/lib_dec/ivas_mct_dec_mct.c b/lib_dec/ivas_mct_dec_mct.c index 68a846b876dea6667e43abe6365e0dfc60e4498b..987a9cc72f25a60b4e820972aeb8ae6c4fcb4b8e 100644 --- a/lib_dec/ivas_mct_dec_mct.c +++ b/lib_dec/ivas_mct_dec_mct.c @@ -49,12 +49,7 @@ static void indexToChannelPair( MCT_DEC_BLOCK_DATA_HANDLE hBlock, const int16_t nChannels, - const int16_t pairIdx -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - Decoder_State **sts /* i/o: decoder state structure */ -#endif -) + const int16_t pairIdx ) { int16_t ch1, ch2; int16_t tmpIdx = 0; @@ -63,12 +58,6 @@ static void indexToChannelPair( { for ( ch1 = 0; ch1 < ch2; ch1++ ) { -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( sts[ch1]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch2]->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - continue; - } -#endif if ( tmpIdx == pairIdx ) { @@ -111,9 +100,6 @@ void ivas_mct_dec_mct( for ( ch = 0; ch < nchan; ch++ ) { if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE ) && -#endif 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 ); @@ -129,9 +115,6 @@ void ivas_mct_dec_mct( for ( ch = 0; ch < nchan; ch++ ) { if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE && -#endif sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { hMCT->lowE_ch[ch] = get_next_indice( sts[0], 1 ); @@ -142,9 +125,6 @@ void ivas_mct_dec_mct( for ( ch = 0; ch < nchan; ch++ ) { if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE && -#endif sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { nchan_active++; @@ -158,12 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - sts -#endif - ); + indexToChannelPair( hBlock, nchan, channelPairIndex ); /*point to decoder states of actual channels to read block pair bits*/ p_st[0] = sts[hBlock->ch1]; @@ -192,11 +167,7 @@ static void applyGlobalILD( int16_t nSubframes, L_subframeTCX; float qratio; - for ( ch = 0; ch < ( hMCT->nchan_out_woLFE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - + hMCT->num_lfe -#endif - ); + for ( ch = 0; ch < ( hMCT->nchan_out_woLFE ); ch++ ) { nSubframes = ( sts[ch]->core == TCX_20_CORE ) ? 1 : NB_DIV; @@ -279,11 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - + hMCT->num_lfe -#endif - ) ); + set_s( singleChEle, 1, ( hMCT->nchan_out_woLFE ) ); for ( b = 0; b < hMCT->currBlockDataCnt; b++ ) { @@ -336,17 +303,9 @@ void mctStereoIGF_dec( } - if ( sum_s( singleChEle, ( hMCT->nchan_out_woLFE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - + hMCT->num_lfe -#endif - ) ) != 0 ) + if ( sum_s( singleChEle, ( hMCT->nchan_out_woLFE ) ) != 0 ) { - for ( ch = 0; ch < ( hMCT->nchan_out_woLFE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - + hMCT->num_lfe -#endif - ); + for ( ch = 0; ch < ( hMCT->nchan_out_woLFE ); ch++ ) { if ( singleChEle[ch] ) @@ -356,11 +315,7 @@ void mctStereoIGF_dec( { continue; } - if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - || st->mct_chan_mode == MCT_CHAN_MODE_LFE -#endif - ) + 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 83aac5cbc1a915310f4603de74638960595879be..becf11e070428610fdc436ab17ac3a884021c195 100644 --- a/lib_dec/ivas_mdct_core_dec.c +++ b/lib_dec/ivas_mdct_core_dec.c @@ -35,6 +35,7 @@ #include "options.h" #include "prot.h" #include "rom_com.h" +#include "ivas_rom_com.h" #ifdef DEBUGGING #include "debug.h" #endif @@ -162,26 +163,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; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( st->element_mode == IVAS_CPE_MDCT && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) - { -#endif - 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 ); - } -#ifndef ISSUE_24_CLEANUP_MCT_LFE - } - - - 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 ); } -#endif if ( st->core == TCX_20_CORE ) { st->transform_type[0] = st->transform_type[1] = TCX_20; @@ -298,13 +284,10 @@ static void dec_prm_tcx_spec( *-----------------------------------------------------------------*/ void ivas_mdct_dec_side_bits_frame_channel( - CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */ - 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 */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - int16_t *LFE_off, /* o : flag if LFE has content */ -#endif + CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */ + 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 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)*/ @@ -346,14 +329,7 @@ void ivas_mdct_dec_side_bits_frame_channel( continue; } st = sts[ch]; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - *LFE_off = get_next_indice( st0, 1 ); - } - else -#endif - if ( MCT_flag ) + if ( MCT_flag ) { tmp = get_next_indice( st0, 1 ); if ( tmp ) @@ -371,11 +347,7 @@ void ivas_mdct_dec_side_bits_frame_channel( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && *LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) -#else if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) -#endif { sts[ch]->coder_type = INACTIVE; sts[ch]->side_bits_frame_channel = 0; @@ -397,49 +369,103 @@ void ivas_mdct_dec_side_bits_frame_channel( * SNS parameters *--------------------------------------------------------------------------------*/ - skipped_first_channel = 0; sns_low_br_mode = 0; - for ( ch = 0; ch < CPE_CHANNELS; ch++ ) + skipped_first_channel = 0; + if ( !MCT_flag && sts[0]->sr_core == 25600 && ( ( hCPE->element_brate == IVAS_48k || hCPE->element_brate == IVAS_64k ) ) ) { - st = sts[ch]; - -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && *LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) -#else - if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) -#endif + 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 ) { - skipped_first_channel = 1; - continue; - } + int16_t nSubframes; + nSubframes = ( sts[0]->core == TCX_20_CORE ) ? 1 : NB_DIV; - start_bit_pos_sns = st0->next_bit_pos; + for ( int16_t n = 0; n < nSubframes; ++n ) + { + param_lpc[0][n] = get_next_indice( st0, 1 ); + } - if ( ch == 0 || skipped_first_channel ) + /* 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 ) { - /* read SNS stereo mode */ - param_lpc[0][0] = get_next_indice( st0, 1 ) << 1; + int16_t nSubframes; + int16_t idxIndices; - /* 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 ) -#ifndef ISSUE_24_CLEANUP_MCT_LFE - || sts[1]->mct_chan_mode == MCT_CHAN_MODE_LFE -#endif - ) ) + st = sts[ch]; + nSubframes = ( st->core == TCX_20_CORE ) ? 1 : NB_DIV; + idxIndices = 0; + + for ( int16_t n = 0; n < nSubframes; ++n ) { - sns_low_br_mode = get_next_indice( st0, 1 ); + 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; } } - - tmp = ch; - if ( ch == 1 && param_lpc[0][0] == 2 ) + } + else + { + for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { - tmp = 3; - } + 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 ) ); + 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; + st->side_bits_frame_channel += st0->next_bit_pos - start_bit_pos_sns; + } } } @@ -454,10 +480,7 @@ void ivas_mdct_dec_side_bits_frame_channel( *-----------------------------------------------------------------*/ void ivas_mdct_core_invQ( - CPE_DEC_HANDLE hCPE, /* i/o: CPE handle */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - const int16_t LFE_off, /* i : flag if LFE content */ -#endif + CPE_DEC_HANDLE hCPE, /* i/o: CPE handle */ 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 */ @@ -479,7 +502,7 @@ void ivas_mdct_core_invQ( int16_t *prm[CPE_CHANNELS]; /* LPC */ Word16 Aind[CPE_CHANNELS][M + 1]; - float lsf[CPE_CHANNELS][( NB_DIV + 1 ) * M]; + float sns[CPE_CHANNELS][NB_DIV][M]; /* TCX */ float xn_buf[L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX]; int16_t tcx_offset[CPE_CHANNELS]; @@ -544,11 +567,7 @@ void ivas_mdct_core_invQ( { st = sts[ch]; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) -#else if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) -#endif { st->total_brate = st->bits_frame_channel; continue; @@ -602,13 +621,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 ); -#ifndef ISSUE_24_CLEANUP_MCT_LFE - /*disable ACELP_PLC for LFE channel */ - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - st->core = st->last_core; - } -#endif } if ( ( !st->bfi || st->hTcxCfg->psychParamsCurrent == NULL ) && st->core > ACELP_CORE ) @@ -659,23 +671,31 @@ void ivas_mdct_core_invQ( 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 ) + if ( !MCT_flag && sts[0]->sr_core == 25600 && ( ( hCPE->element_brate == IVAS_48k || hCPE->element_brate == IVAS_64k ) ) ) { - sns_avq_dec_stereo( param_lpc[0], param_lpc[1], &lsf[0][M], &lsf[1][M] ); + dequantize_sns( param_lpc, sns, sts ); } else { - for ( ch = 0; ch < CPE_CHANNELS; ch++ ) + 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 ) { - st = sts[ch]; - if ( st->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) + sns_avq_dec_stereo( param_lpc[0], param_lpc[1], sts[0]->L_frame, &sns[0][0][0], &sns[1][0][0] ); + } + else + { + for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { - sns_avq_dec( param_lpc[ch], &lsf[ch][M], st->numlpc ); + st = sts[ch]; + if ( st->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) + { + sns_avq_dec( param_lpc[ch], sns[ch], st->L_frame, st->numlpc ); + } } } } } + /*--------------------------------------------------------------* * Rate switching *---------------------------------------------------------------*/ @@ -698,11 +718,7 @@ void ivas_mdct_core_invQ( { st = sts[ch]; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) -#else if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) -#endif { set_f( x[ch][0], 0.f, st->hTcxCfg->tcx_coded_lines ); /* usually set in decoder_tcx_invQ(), needed for concealment */ @@ -722,7 +738,7 @@ void ivas_mdct_core_invQ( /* Stability Factor */ if ( !bfi ) { - mvr2r( &lsf[ch][( k + 1 ) * M], &Aq[ch][k * M], M ); + mvr2r( sns[ch][k], &Aq[ch][k * M], M ); } else { @@ -758,13 +774,6 @@ void ivas_mdct_core_invQ( 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 ); } } - -#ifndef ISSUE_24_CLEANUP_MCT_LFE - 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 ); - } -#endif } pop_wmops(); @@ -782,11 +791,8 @@ 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 */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - const int16_t LFE_off, /* i : flag if LFE content */ -#endif - int16_t fUseTns[CPE_CHANNELS][NB_DIV], /* i : flage TNS enabled */ - const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0)*/ + int16_t fUseTns[CPE_CHANNELS][NB_DIV], /* i : flage TNS enabled */ + const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0)*/ ) { int16_t ch, k, bfi; @@ -808,9 +814,6 @@ void ivas_mdct_core_reconstruct( int16_t pitch[CPE_CHANNELS][NB_SUBFR16k]; float pit_gain[CPE_CHANNELS][NB_SUBFR16k]; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - int16_t isLFE; -#endif int16_t skip_decoding; set_f( xn_buf, 0, L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX ); @@ -825,21 +828,10 @@ void ivas_mdct_core_reconstruct( st = sts[ch]; skip_decoding = 0; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) -#else if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) -#endif { skip_decoding = 1; } -#ifndef ISSUE_24_CLEANUP_MCT_LFE - isLFE = 0; - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - isLFE = 1; - } -#endif nSubframes[ch] = ( st->core == TCX_20_CORE ) ? 1 : NB_DIV; synth = synth_buf + st->hTcxDec->old_synth_len; @@ -866,9 +858,6 @@ void ivas_mdct_core_reconstruct( 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, -#ifndef ISSUE_24_CLEANUP_MCT_LFE - isLFE, -#endif 0 ); } else @@ -1015,10 +1004,7 @@ void ivas_mdct_core_reconstruct( *-----------------------------------------------------------------*/ void ivas_mdct_core_tns_ns( - CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - const int16_t LFE_off, /* i : flag if LFE has content */ -#endif + CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */ 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 */ @@ -1046,6 +1032,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++ ) { @@ -1056,9 +1043,6 @@ void ivas_mdct_core_tns_ns( L_spec[ch] = st->hTcxCfg->tcx_coded_lines / nSubframes[ch]; if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || -#endif ( 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 ) diff --git a/lib_dec/ivas_objectRenderer_internal.c b/lib_dec/ivas_objectRenderer_internal.c index f1c1fc04f207070edf6ba1652ee35d1fa5fe3c77..081b33e55c13a9b84e0816f75e3a6fb2ebc56986 100644 --- a/lib_dec/ivas_objectRenderer_internal.c +++ b/lib_dec/ivas_objectRenderer_internal.c @@ -66,15 +66,126 @@ ivas_error ivas_td_binaural_open( *---------------------------------------------------------------------*/ ivas_error ivas_td_binaural_renderer( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ +#ifdef JBM_TSM_ON_TCS + float *output[], /* i/o: SCE channels / Binaural synthesis */ +#else float output[][L_FRAME48k], /* i/o: SCE channels / Binaural synthesis */ - const int16_t output_frame /* i : output frame length */ +#endif + const int16_t output_frame /* i : output frame length */ ) { +#ifdef FIX_356_ISM_METADATA_SYNC + int16_t ism_md_subframe_update = 2; + 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, ism_md_subframe_update, output, output_frame ); +#else 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 } + +#ifdef JBM_TSM_ON_TCS +/*---------------------------------------------------------------------* + * ObjRenderIVASFrame() + * + * Receives the current frames for the object streams, updates metadata + * and renders the current frame. + *---------------------------------------------------------------------*/ + +void ObjRenderIVASSubframe( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + float *output[], /* i/o: SCE channels / Binaural synthesis */ + const int16_t n_samples_asked ) +{ + int16_t first_sf, last_sf, subframe_idx; + float reverb_signal[BINAURAL_CHANNELS][L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES]; + float *p_reverb_signal[BINAURAL_CHANNELS]; + float *output_f_local[BINAURAL_CHANNELS]; + float *tc_local[MAX_TRANSPORT_CHANNELS]; + int16_t ch, slot_size, slots_to_render, output_frame; +#ifdef FIX_356_ISM_METADATA_SYNC + int16_t ism_md_subframe_update_jbm = 0; /* Number of subframes to delay metadata to sync with audio */ +#endif + for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) + { + p_reverb_signal[ch] = reverb_signal[ch]; + } + for ( ch = 0; ch < st_ivas->hTcBuffer->nchan_transport_internal; ch++ ) + { + tc_local[ch] = st_ivas->hTcBuffer->tc[ch] + st_ivas->hTcBuffer->n_samples_rendered; + } + for ( ch = 0; ch < st_ivas->hDecoderConfig->nchan_out; ch++ ) + { + output_f_local[ch] = output[ch]; + } + slot_size = st_ivas->hTcBuffer->n_samples_granularity; + /* loop for synthesis, assume we always have to render in multiples of 5ms subframes with spills */ + slots_to_render = min( st_ivas->hTcBuffer->num_slots - st_ivas->hTcBuffer->slots_rendered, n_samples_asked / slot_size ); + first_sf = st_ivas->hTcBuffer->subframes_rendered; + last_sf = first_sf; + st_ivas->hTcBuffer->slots_rendered += slots_to_render; + while ( slots_to_render > 0 ) + { + slots_to_render -= st_ivas->hTcBuffer->subframe_nbslots[last_sf]; + last_sf++; + } + + for ( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ ) + { + output_frame = st_ivas->hTcBuffer->subframe_nbslots[subframe_idx] * st_ivas->hTcBuffer->n_samples_granularity; + + /* Update object position(s) */ +#ifdef FIX_356_ISM_METADATA_SYNC + TDREND_Update_object_positions( st_ivas->hBinRendererTd, st_ivas->nchan_transport, st_ivas->ivas_format, st_ivas->hIsmMetaData ); +#else + TDREND_Update_object_positions( st_ivas->hBinRendererTd, st_ivas->nchan_transport, LFE_CHANNEL, st_ivas->ivas_format, st_ivas->hIsmMetaData, tc_local ); +#endif + + /* 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[0] : NULL, + ( st_ivas->hHeadTrackData != NULL ) ? st_ivas->hHeadTrackData->Pos : NULL ); + + if ( ( st_ivas->hRenderConfig != NULL ) && ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on ) ) + { + ivas_reverb_process( st_ivas->hReverb, st_ivas->transport_config, 0, tc_local, p_reverb_signal, 0 ); + } + + /* Render subframe */ +#ifdef FIX_356_ISM_METADATA_SYNC + TDREND_GetMix( st_ivas->hBinRendererTd, output_f_local, output_frame, 0, ism_md_subframe_update_jbm ); +#else + TDREND_GetMix( st_ivas->hBinRendererTd, output_f_local, output_frame, 0 ); +#endif + if ( st_ivas->hRenderConfig != NULL ) /* Renderer Configuration not enabled in TD standalone renderer */ + { + if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on ) + { + /* add reverb to rendered signals */ + v_add( reverb_signal[0], output_f_local[0], output_f_local[0], output_frame ); + v_add( reverb_signal[1], output_f_local[1], output_f_local[1], output_frame ); + } + } + for ( ch = 0; ch < st_ivas->hTcBuffer->nchan_transport_internal; ch++ ) + { + tc_local[ch] += output_frame; + } + for ( ch = 0; ch < st_ivas->hDecoderConfig->nchan_out; ch++ ) + { + output_f_local[ch] += output_frame; + } + } + st_ivas->hTcBuffer->subframes_rendered = last_sf; + return; +} +#endif diff --git a/lib_dec/ivas_out_setup_conversion.c b/lib_dec/ivas_out_setup_conversion.c index b396fa415cd01ad0317602d5a58df9ce417d48b0..131f07090cd0386c986910002fa8b1d51dbe8800 100644 --- a/lib_dec/ivas_out_setup_conversion.c +++ b/lib_dec/ivas_out_setup_conversion.c @@ -312,7 +312,16 @@ ivas_error ivas_ls_setup_conversion_open( int16_t output_frame; int32_t output_Fs; int16_t nchan_out; + int16_t paramUpmixMonoStereo; + if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMUPMIX && ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ) ) + { + paramUpmixMonoStereo = TRUE; + } + else + { + paramUpmixMonoStereo = FALSE; + } output_Fs = st_ivas->hDecoderConfig->output_Fs; nchan_out = st_ivas->hDecoderConfig->nchan_out; output_frame = (int16_t) ( output_Fs / FRAMES_PER_SEC ); @@ -351,7 +360,22 @@ ivas_error ivas_ls_setup_conversion_open( } else { - inChannels = st_ivas->nchan_transport; + if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) + { + if ( paramUpmixMonoStereo == TRUE ) + { + inChannels = audioCfg2channels( AUDIO_CONFIG_5_1_2 ); + } + else + { + inChannels = st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe; + } + } + else + { + 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 ); if ( ( hLsSetUpConversion->targetEnergyPrev[0] = (float *) malloc( ( MAX_SFB + 2 ) * sizeof( float ) ) ) == NULL ) @@ -397,7 +421,14 @@ ivas_error ivas_ls_setup_conversion_open( { if ( st_ivas->transport_config != AUDIO_CONFIG_INVALID ) { - get_ls_conversion_matrix( hLsSetUpConversion, st_ivas->transport_config, st_ivas->hDecoderConfig->output_config ); + if ( paramUpmixMonoStereo == TRUE ) + { + get_ls_conversion_matrix( hLsSetUpConversion, AUDIO_CONFIG_5_1_2, st_ivas->hDecoderConfig->output_config ); + } + else + { + get_ls_conversion_matrix( hLsSetUpConversion, st_ivas->transport_config, st_ivas->hDecoderConfig->output_config ); + } } else { @@ -465,8 +496,14 @@ void ivas_ls_setup_conversion_close( void ivas_ls_setup_conversion( Decoder_Struct *st_ivas, /* i : IVAS decoder structure */ + const int16_t input_chans, /* i : number of input channels to the renderer */ const int16_t output_frame, /* i : frame length */ - float output[][L_FRAME48k] /* i/o: LS input/output synthesis signal */ +#ifdef JBM_TSM_ON_TCS + float *input[], /* i : LS input/output synthesis signal */ + float *output[] /* i/o: LS input/output synthesis signal */ +#else + float output[][L_FRAME48k] /* i/o: LS input/output synthesis signal */ +#endif ) { int16_t chInIdx, chOutIdx, idx; @@ -481,7 +518,7 @@ void ivas_ls_setup_conversion( for ( chOutIdx = 0; chOutIdx < st_ivas->hDecoderConfig->nchan_out; chOutIdx++ ) { set_zero( output_tmp[chOutIdx], output_frame ); - for ( chInIdx = 0; chInIdx < st_ivas->nchan_transport; chInIdx++ ) + for ( chInIdx = 0; chInIdx < input_chans; chInIdx++ ) { dmxCoeff = hLsSetUpConversion->dmxMtx[chInIdx][chOutIdx]; @@ -493,14 +530,22 @@ void ivas_ls_setup_conversion( { for ( idx = 0; idx < output_frame; idx++ ) { +#ifdef JBM_TSM_ON_TCS + output_tmp[chOutIdx][idx] += input[chInIdx][idx]; +#else output_tmp[chOutIdx][idx] += output[chInIdx][idx]; +#endif } } else { for ( idx = 0; idx < output_frame; idx++ ) { +#ifdef JBM_TSM_ON_TCS + tmpVal = dmxCoeff * input[chInIdx][idx]; +#else tmpVal = dmxCoeff * output[chInIdx][idx]; +#endif output_tmp[chOutIdx][idx] += tmpVal; } } @@ -601,11 +646,7 @@ void ivas_ls_setup_conversion_process_mdct( dmxCoeff = hLsSetUpConversion->dmxMtx[chInIdx][chOutIdx]; if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - !( chInIdx == LFE_CHANNEL && st_ivas->hMCT->LFE_off ) && -#else chInIdx != LFE_CHANNEL && -#endif 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) */ @@ -700,11 +741,7 @@ void ivas_ls_setup_conversion_process_mdct( for ( chInIdx = 0; chInIdx < inChannels; chInIdx++ ) { if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - !( chInIdx == LFE_CHANNEL && st_ivas->hMCT->LFE_off ) && -#else chInIdx != LFE_CHANNEL && -#endif mct_chan_mode[chInIdx] != MCT_CHAN_MODE_IGNORE ) { if ( transform_type[chInIdx][0] == TCX_20 ) @@ -1106,7 +1143,10 @@ void ivas_ls_setup_conversion_process_mdct_param_mc( *-------------------------------------------------------------------------*/ void ivas_lssetupconversion_process_param_mc( - Decoder_Struct *st_ivas, /* i/o: LS setup conversion renderer handle */ + Decoder_Struct *st_ivas, /* i/o: LS setup conversion renderer handle */ +#ifdef JBM_TSM_ON_TCS + int16_t num_timeslots, +#endif float Cldfb_RealBuffer_InOut[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i/o: LS signals */ float Cldfb_ImagBuffer_InOut[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i/o: LS signals */ int16_t channel_active[MAX_CICP_CHANNELS] /* i : bitmap indicating which output channels are active */ @@ -1133,8 +1173,12 @@ void ivas_lssetupconversion_process_param_mc( set_s( channel_active, 0, outChannels ); - /* Loop over each time slots and compute dmx for each time slot */ +/* Loop over each time slots and compute dmx for each time slot */ +#ifdef JBM_TSM_ON_TCS + for ( slotIdx = 0; slotIdx < num_timeslots; slotIdx++ ) +#else for ( slotIdx = 0; slotIdx < st_ivas->hParamMC->subframe_nbslots; slotIdx++ ) +#endif { /* copy buffers */ for ( chInIdx = 0; chInIdx < inChannels; chInIdx++ ) diff --git a/lib_dec/ivas_output_config.c b/lib_dec/ivas_output_config.c index f522a3217d2e9fff9e0422e6dea667e4697ca3a9..e1c2621ea81fbecaa9a1c157a6c37c0467ddb156 100644 --- a/lib_dec/ivas_output_config.c +++ b/lib_dec/ivas_output_config.c @@ -114,7 +114,7 @@ void ivas_renderer_select( else { *renderer_type = RENDERER_BINAURAL_MIXER_CONV_ROOM; -#if defined( DEBUGGING ) +#ifdef DEBUGGING if ( st_ivas->hRenderConfig->renderer_type_override == RENDER_TYPE_OVERRIDE_FASTCONV ) { *renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM; @@ -152,7 +152,8 @@ void ivas_renderer_select( if ( st_ivas->hDecoderConfig->Opt_Headrotation ) { - nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order ); + nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order, + st_ivas->hDecoderConfig->ivas_total_brate ); if ( nchan_internal == 2 ) { st_ivas->hHeadTrackData->shd_rot_max_order = 1; @@ -191,16 +192,16 @@ void ivas_renderer_select( 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 ) ) + 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->mc_mode == MC_MODE_PARAMUPMIX ) && !( 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 ) ) + 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 || st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) ) #endif { *renderer_type = RENDERER_BINAURAL_OBJECTS_TD; } else { - if ( st_ivas->mc_mode == MC_MODE_MCT ) + if ( ( st_ivas->mc_mode == MC_MODE_MCT ) || ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) ) { *renderer_type = RENDERER_BINAURAL_MIXER_CONV; } @@ -228,7 +229,7 @@ void ivas_renderer_select( } else /* AUDIO_CONFIG_BINAURAL_ROOM */ { - if ( st_ivas->mc_mode == MC_MODE_MCT ) + if ( st_ivas->mc_mode == MC_MODE_MCT || st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) { *renderer_type = RENDERER_BINAURAL_MIXER_CONV_ROOM; } @@ -255,6 +256,13 @@ void ivas_renderer_select( * Non-binaural rendering configurations *-----------------------------------------------------------------*/ + else if ( st_ivas->ivas_format == MONO_FORMAT ) + { + if ( output_config == AUDIO_CONFIG_STEREO ) + { + *renderer_type = RENDERER_NON_DIEGETIC_DOWNMIX; + } + } else if ( st_ivas->ivas_format == STEREO_FORMAT ) { if ( output_config != AUDIO_CONFIG_STEREO && output_config != AUDIO_CONFIG_MONO ) @@ -264,37 +272,44 @@ void ivas_renderer_select( } else if ( st_ivas->ivas_format == ISM_FORMAT ) { - if ( st_ivas->ism_mode == ISM_MODE_PARAM ) + if ( ( output_config == AUDIO_CONFIG_STEREO ) && ( st_ivas->hDecoderConfig->Opt_non_diegetic_pan ) ) { - *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; - } + *renderer_type = RENDERER_NON_DIEGETIC_DOWNMIX; } - else /* ISM_MODE_DISC */ + else { - *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 ) + if ( st_ivas->ism_mode == ISM_MODE_PARAM ) { - *renderer_type = RENDERER_SBA_LINEAR_ENC; + *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 if ( output_config == AUDIO_CONFIG_EXTERNAL ) + else /* ISM_MODE_DISC */ { - *renderer_type = RENDERER_DISABLE; + *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; + } } } } @@ -303,11 +318,7 @@ void ivas_renderer_select( *renderer_type = RENDERER_DIRAC; if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR && -#ifdef SBA2MONO ( 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 ) ) -#else - ( 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 ) ) -#endif { if ( output_config == AUDIO_CONFIG_HOA2 || output_config == AUDIO_CONFIG_FOA ) { @@ -324,11 +335,7 @@ void ivas_renderer_select( 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 ) || -#ifdef SBA2MONO ( st_ivas->ivas_format == SBA_FORMAT && ( output_config == AUDIO_CONFIG_STEREO || output_config == AUDIO_CONFIG_MONO ) ) ) -#else - ( st_ivas->ivas_format == SBA_FORMAT && output_config == AUDIO_CONFIG_STEREO && st_ivas->nchan_transport == 1 ) ) -#endif { *renderer_type = RENDERER_DISABLE; } @@ -363,6 +370,21 @@ void ivas_renderer_select( *renderer_type = RENDERER_SBA_LINEAR_ENC; } } + else if ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) + { + *internal_config = transport_config; + if ( *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 ) diff --git a/lib_dec/ivas_qmetadata_dec.c b/lib_dec/ivas_qmetadata_dec.c index 9c6597fdcb881530b248d221ae0934ea93b22882..67aefe90386249495c0756cf1e5d7d2a0731d1f5 100644 --- a/lib_dec/ivas_qmetadata_dec.c +++ b/lib_dec/ivas_qmetadata_dec.c @@ -49,9 +49,19 @@ static int16_t ivas_qmetadata_entropy_decode_diffuseness( uint16_t *bitstream, i static int16_t ivas_qmetadata_entropy_decode_df_ratio( uint16_t *bitstream, int16_t *index, IVAS_QDIRECTION *q_direction, int16_t *dfRatio_bits ); -static int16_t ivas_qmetadata_entropy_decode_dir( IVAS_QDIRECTION *q_direction, uint16_t *bitstream, int16_t *index, const uint16_t diffuseness_index_max_ec_frame, const int16_t nbands, const int16_t start_band ); +static int16_t ivas_qmetadata_entropy_decode_dir( IVAS_QDIRECTION *q_direction, uint16_t *bitstream, int16_t *index, const uint16_t diffuseness_index_max_ec_frame, const int16_t nbands, const int16_t start_band +#ifdef HR_METADATA + , + const int16_t hrmasa_flag +#endif +); -static int16_t ivas_qmetadata_raw_decode_dir( IVAS_QDIRECTION *q_direction, uint16_t *bitstream, int16_t *index, const int16_t nbands, const int16_t start_band ); +static int16_t ivas_qmetadata_raw_decode_dir( IVAS_QDIRECTION *q_direction, uint16_t *bitstream, int16_t *index, const int16_t nbands, const int16_t start_band +#ifdef HR_METADATA + , + const int16_t hrmasa_flag +#endif +); static uint16_t ivas_qmetadata_DecodeQuasiUniform( const uint16_t *bitstream, int16_t *index, const uint16_t alphabet_size ); @@ -77,11 +87,21 @@ static int16_t read_truncGR_azimuth( uint16_t *bitstream, IVAS_QDIRECTION *q_dir static ivas_error read_huf( int16_t *num_bits_read, const uint16_t *bitstream, uint16_t *out, const int16_t start_pos, const int16_t len, const int16_t *huff_code, const int16_t max_len ); -static int16_t read_coherence_data( uint16_t *bitstream, int16_t *p_bit_pos, IVAS_QMETADATA *hQMetaData, const int16_t idx_dir ); +static int16_t read_coherence_data( uint16_t *bitstream, int16_t *p_bit_pos, IVAS_QMETADATA *hQMetaData, const int16_t idx_dir +#ifdef HR_METADATA + , + const int16_t hrmasa_flag +#endif +); static int16_t read_surround_coherence( uint16_t *bitstream, int16_t *p_bit_pos, IVAS_QMETADATA *hQMetaData ); -static void decode_spread_coherence( IVAS_QMETADATA_HANDLE hQMetaData, int16_t idx_d, const int16_t no_frames ); +static void decode_spread_coherence( IVAS_QMETADATA_HANDLE hQMetaData, int16_t idx_d, const int16_t no_frames +#ifdef HR_METADATA + , + const int16_t hrmasa_flag +#endif +); static void decode_combined_index( uint64_t comb_index, const int16_t *no_cv_vec, uint16_t *index, const int16_t len ); @@ -91,6 +111,19 @@ static int16_t read_GR_min_removed_data( uint16_t *bitstream, int16_t *p_bit_pos static int16_t decode_fixed_rate_composed_index_coherence( uint16_t *bitstream, int16_t *p_bit_pos, const int16_t no_bands, int16_t *no_cv_vec, uint16_t *decoded_index, const int16_t no_symb ); +#ifdef HR_METADATA +static int16_t ivas_qmetadata_entropy_decode_diffuseness_hr( uint16_t *bitstream, int16_t *index, IVAS_QDIRECTION *q_direction, uint16_t *diffuseness_index_max_ec_frame ); + +static int16_t ivas_qmetadata_entropy_decode_diffuseness_hr_512( uint16_t *bitstream, int16_t *index, IVAS_QDIRECTION *q_direction ); + +static int16_t ivas_qmetadata_raw_decode_dir_512( IVAS_QDIRECTION *q_direction, uint16_t *bitstream, int16_t *index, const int16_t nbands, const int16_t start_band, const SPHERICAL_GRID_DATA *sph_grid16 ); + +static int16_t read_surround_coherence_hr( uint16_t *bitstream, int16_t *p_bit_pos, IVAS_QMETADATA *hQMetaData ); + +static int16_t read_coherence_data_hr_512( uint16_t *bitstream, int16_t *p_bit_pos, IVAS_QMETADATA *hQMetaData, const int16_t idx_dir, const int16_t nbits_coh ); +#endif + + /*-----------------------------------------------------------------------* * Global function definitions *-----------------------------------------------------------------------*/ @@ -103,9 +136,11 @@ static int16_t decode_fixed_rate_composed_index_coherence( uint16_t *bitstream, /*! r: number of bits read */ int16_t ivas_qmetadata_dec_decode( - IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: hQMetaData handle */ - uint16_t *bitstream, /* i : bitstream */ - int16_t *index /* i/o: bitstream position */ + IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: hQMetaData handle */ + uint16_t *bitstream, /* i : bitstream */ + int16_t *index /* i/o: bitstream position */ + , + const int16_t hodirac_flag /* i : flag to indicate HO-DirAC mode */ ) { int16_t d, b, m; @@ -135,7 +170,6 @@ int16_t ivas_qmetadata_dec_decode( int16_t reduce_bits; int16_t ind_order[MASA_MAXIMUM_CODING_SUBBANDS]; - #ifdef DEBUG_MODE_QMETADATA static FILE *pF = NULL; static FILE *pF_azi = NULL; @@ -192,23 +226,43 @@ int16_t ivas_qmetadata_dec_decode( } bits_diff_sum = 0; - bits_diff_sum += ivas_qmetadata_entropy_decode_diffuseness( bitstream, index, &( hQMetaData->q_direction[0] ), &diffuseness_index_max_ec_frame_pre[0] ); - if ( hQMetaData->no_directions == 2 ) + if ( hodirac_flag ) { - /* Calculate bits for dfRatio */ - dir2band = 0; - for ( b = hQMetaData->q_direction[0].cfg.start_band; b < hQMetaData->q_direction[0].cfg.nbands; b++ ) + if ( hQMetaData->no_directions == 2 ) { - if ( hQMetaData->twoDirBands[b] == 1 ) + /* Calculate bits for dfRatio */ + dir2band = 0; + for ( b = hQMetaData->q_direction[0].cfg.start_band; b < hQMetaData->q_direction[0].cfg.nbands; b++ ) { - dfRatio_bits[dir2band] = ivas_get_df_ratio_bits( hQMetaData->q_direction[0].band_data[b].energy_ratio_index[0] ); - dir2band++; + if ( hQMetaData->twoDirBands[b] == 1 ) + { + dfRatio_bits[dir2band] = ivas_get_df_ratio_bits_hodirac( hQMetaData->q_direction[0].band_data[b].energy_ratio_index[0] ); + dir2band++; + } } + + bits_diff_sum += ivas_qmetadata_entropy_decode_df_ratio( bitstream, index, &( hQMetaData->q_direction[1] ), dfRatio_bits ); } + } + else + { + if ( hQMetaData->no_directions == 2 ) + { + /* Calculate bits for dfRatio */ + dir2band = 0; + for ( b = hQMetaData->q_direction[0].cfg.start_band; b < hQMetaData->q_direction[0].cfg.nbands; b++ ) + { + if ( hQMetaData->twoDirBands[b] == 1 ) + { + dfRatio_bits[dir2band] = ivas_get_df_ratio_bits( hQMetaData->q_direction[0].band_data[b].energy_ratio_index[0] ); + dir2band++; + } + } - bits_diff_sum += ivas_qmetadata_entropy_decode_df_ratio( bitstream, index, &( hQMetaData->q_direction[1] ), dfRatio_bits ); + bits_diff_sum += ivas_qmetadata_entropy_decode_df_ratio( bitstream, index, &( hQMetaData->q_direction[1] ), dfRatio_bits ); + } } /* Calculate direct-to-total energy ratios for both directions from diffuse-to-total ratio and distribution factor of direct-to-total ratios */ @@ -224,14 +278,33 @@ int16_t ivas_qmetadata_dec_decode( diffRatio = diffuseness_reconstructions[hQMetaData->q_direction[0].band_data[b].energy_ratio_index[0]]; dfRatio_qsteps = 1 << dfRatio_bits[dir2band]; - dfRatio = usdequant( hQMetaData->q_direction[1].band_data[dir2band].energy_ratio_index[0], 0.5f, 0.5f / ( dfRatio_qsteps - 1 ) ); + /* already encoded as total and ratios in HO-DirAC */ + if ( hodirac_flag ) + { + dfRatio = usdequant( hQMetaData->q_direction[1].band_data[dir2band].energy_ratio_index[0], 0.0f, 1.f / ( dfRatio_qsteps - 1 ) ); + dir1ratio = 1.f - diffRatio; + dir2ratio = dfRatio; + } + else + { + dfRatio = usdequant( hQMetaData->q_direction[1].band_data[dir2band].energy_ratio_index[0], 0.5f, 0.5f / ( dfRatio_qsteps - 1 ) ); + + dir1ratio = dfRatio * ( 1.0f - diffRatio ); + dir2ratio = ( 1.0f - diffRatio ) - dir1ratio; + } - dir1ratio = dfRatio * ( 1.0f - diffRatio ); - dir2ratio = ( 1.0f - diffRatio ) - dir1ratio; /* Requantize the 1 - dirRatio separately for each direction to obtain inverted dirRatio index. These are used in further decoding. */ hQMetaData->q_direction[0].band_data[b].energy_ratio_index[0] = masa_sq( 1.0f - dir1ratio, diffuseness_thresholds, DIRAC_DIFFUSE_LEVELS ); - hQMetaData->q_direction[1].band_data[dir2band].energy_ratio_index[0] = masa_sq( 1.0f - dir2ratio, diffuseness_thresholds, DIRAC_DIFFUSE_LEVELS ); + if ( hodirac_flag ) + { + float tmp; + hQMetaData->q_direction[1].band_data[dir2band].energy_ratio_index[0] = usquant( dir2ratio, &tmp, 0.0f, 1.f / ( DIRAC_DIFFUSE_LEVELS - 1 ), DIRAC_DIFFUSE_LEVELS ); + } + else + { + hQMetaData->q_direction[1].band_data[dir2band].energy_ratio_index[0] = masa_sq( 1.0f - dir2ratio, diffuseness_thresholds, DIRAC_DIFFUSE_LEVELS ); + } for ( m = 0; m < hQMetaData->q_direction[0].cfg.nblocks; m++ ) { @@ -287,7 +360,8 @@ int16_t ivas_qmetadata_dec_decode( index_dirRatio1Inv = hQMetaData->q_direction[0].band_data[b].energy_ratio_index[0]; index_dirRatio2Inv = hQMetaData->q_direction[1].band_data[dir2band].energy_ratio_index[0]; - masa_compensate_two_dir_energy_ratio_index( index_dirRatio1Inv, index_dirRatio2Inv, &index_dirRatio1Inv_mod, &index_dirRatio2Inv_mod ); + masa_compensate_two_dir_energy_ratio_index( index_dirRatio1Inv, index_dirRatio2Inv, &index_dirRatio1Inv_mod, &index_dirRatio2Inv_mod, + hodirac_flag ); for ( m = 0; m < hQMetaData->q_direction[0].cfg.nblocks; m++ ) { @@ -385,9 +459,15 @@ int16_t ivas_qmetadata_dec_decode( /* Read coherence, if any */ bits_coherence = 0; + if ( all_coherence_zero == 0 ) { - bits_coherence = read_coherence_data( bitstream, index, hQMetaData, d ); + bits_coherence = read_coherence_data( bitstream, index, hQMetaData, d +#ifdef HR_METADATA + , + 0 +#endif + ); } else { @@ -435,11 +515,21 @@ int16_t ivas_qmetadata_dec_decode( if ( raw_flag[0] == 0 ) { - bits_dir += ivas_qmetadata_entropy_decode_dir( q_direction, bitstream, index, diffuseness_index_max_ec_frame, nbands, start_band ); + bits_dir += ivas_qmetadata_entropy_decode_dir( q_direction, bitstream, index, diffuseness_index_max_ec_frame, nbands, start_band +#ifdef HR_METADATA + , + 0 +#endif + ); } else { - bits_dir += ivas_qmetadata_raw_decode_dir( q_direction, bitstream, index, nbands, start_band ); + bits_dir += ivas_qmetadata_raw_decode_dir( q_direction, bitstream, index, nbands, start_band +#ifdef HR_METADATA + , + 0 +#endif + ); } } /* Decode quantized directions band-wise */ @@ -459,7 +549,12 @@ int16_t ivas_qmetadata_dec_decode( { if ( raw_flag[b] == 0 ) { - bits_dir += ivas_qmetadata_entropy_decode_dir( q_direction, bitstream, index, diffuseness_index_max_ec_frame, b + 1, b ); + bits_dir += ivas_qmetadata_entropy_decode_dir( q_direction, bitstream, index, diffuseness_index_max_ec_frame, b + 1, b +#ifdef HR_METADATA + , + 0 +#endif + ); } else { @@ -503,7 +598,12 @@ int16_t ivas_qmetadata_dec_decode( { if ( raw_flag[b] ) { - bits_dir += ivas_qmetadata_raw_decode_dir( q_direction, bitstream, index, b + 1, b ); + bits_dir += ivas_qmetadata_raw_decode_dir( q_direction, bitstream, index, b + 1, b +#ifdef HR_METADATA + , + 0 +#endif + ); } } } @@ -537,7 +637,12 @@ int16_t ivas_qmetadata_dec_decode( { if ( nblocks > 1 ) { - decode_spread_coherence( hQMetaData, d, nblocks ); + decode_spread_coherence( hQMetaData, d, nblocks +#ifdef HR_METADATA + , + 0 +#endif + ); } } else @@ -596,6 +701,7 @@ int16_t ivas_qmetadata_dec_decode( } #endif } + /* move 2 dir data to its correct subband */ if ( hQMetaData->no_directions == 2 ) { @@ -646,16 +752,19 @@ int16_t ivas_qmetadata_dec_decode( } /* Scale energy ratios that sum to over one */ - for ( b = 0; b < hQMetaData->q_direction[0].cfg.nbands; b++ ) + if ( !hodirac_flag ) { - float ratioSum; + for ( b = 0; b < hQMetaData->q_direction[0].cfg.nbands; b++ ) + { + float ratioSum; - ratioSum = hQMetaData->q_direction[0].band_data[b].energy_ratio[0] + hQMetaData->q_direction[1].band_data[b].energy_ratio[0]; + ratioSum = hQMetaData->q_direction[0].band_data[b].energy_ratio[0] + hQMetaData->q_direction[1].band_data[b].energy_ratio[0]; - if ( ratioSum > 1.0f ) - { - set_f( hQMetaData->q_direction[0].band_data[b].energy_ratio, hQMetaData->q_direction[0].band_data[b].energy_ratio[0] / ratioSum, nblocks ); - set_f( hQMetaData->q_direction[1].band_data[b].energy_ratio, hQMetaData->q_direction[1].band_data[b].energy_ratio[0] / ratioSum, nblocks ); + if ( ratioSum > 1.0f ) + { + set_f( hQMetaData->q_direction[0].band_data[b].energy_ratio, hQMetaData->q_direction[0].band_data[b].energy_ratio[0] / ratioSum, nblocks ); + set_f( hQMetaData->q_direction[1].band_data[b].energy_ratio, hQMetaData->q_direction[1].band_data[b].energy_ratio[0] / ratioSum, nblocks ); + } } } } @@ -674,6 +783,412 @@ int16_t ivas_qmetadata_dec_decode( } +#ifdef HR_METADATA +/*-----------------------------------------------------------------------* + * ivas_qmetadata_dec_decode_hr_384_512() + * + * Main function for decoding Spatial Metadata at HRs + *-----------------------------------------------------------------------*/ + +/*! r: number of bits read */ +int16_t ivas_qmetadata_dec_decode_hr_384_512( + IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: hQMetaData handle */ + uint16_t *bitstream, /* i : bitstream */ + int16_t *index, /* i/o: bitstream position */ + const SPHERICAL_GRID_DATA *sph_grid16, /* i : spherical grid for deindexing */ + const int16_t bits_sph_idx, + const int16_t bits_sp_coh +#ifdef FIX_HBR_MASAMETA + , + uint8_t ncoding_bands_config +#endif +) +{ + int16_t d, b, m; + int16_t bits_diff_sum; + int16_t nbands, start_band; + IVAS_QDIRECTION *q_direction; + int16_t start_index_0; + int16_t bits_no_dirs_coh, bits_sur_coherence; + uint16_t all_coherence_zero; + int16_t p[MASA_MAXIMUM_CODING_SUBBANDS], dif_p[MASA_MAXIMUM_CODING_SUBBANDS]; +#ifdef FIX_HBR_MASAMETA + int16_t codedBands, sf_nbands0, sf_nbands1; + sf_nbands1 = 1; +#endif + +#ifdef DEBUG_MODE_QMETADATA + static FILE *pF = NULL; + static FILE *pF_azi = NULL; + static FILE *pF_ele = NULL; + static FILE *pF_ratio = NULL; + static FILE *pF_spcoh = NULL; + static FILE *pF_surcoh = NULL; + + if ( pF == NULL ) + pF = fopen( "./res/qmetadata_dec.txt", "w" ); + if ( pF_azi == NULL ) + pF_azi = fopen( "./res/qmetadata_azi_dec.txt", "w" ); + if ( pF_ele == NULL ) + pF_ele = fopen( "./res/qmetadata_ele_dec.txt", "w" ); + if ( pF_ratio == NULL ) + pF_ratio = fopen( "./res/qmetadata_ratio_dec.txt", "w" ); + if ( pF_spcoh == NULL ) + pF_spcoh = fopen( "./res/qmetadata_spcoh_dec.txt", "w" ); + if ( pF_surcoh == NULL ) + pF_surcoh = fopen( "./res/qmetadata_surcoh_dec.txt", "w" ); +#endif + + start_index_0 = *index; +#ifdef FIX_HBR_MASAMETA + /* read number of higher inactive/not encoded bands */ + if ( bitstream[( *index )--] ) + { + codedBands = MASA_MAXIMUM_CODING_SUBBANDS - ivas_qmetadata_DecodeExtendedGR( bitstream, index, MASA_MAXIMUM_CODING_SUBBANDS, 1 ) - 1; + } + else + { + codedBands = MASA_MAXIMUM_CODING_SUBBANDS; + } + for ( b = codedBands; b < ncoding_bands_config; b++ ) + { + for ( m = 0; m < MAX_PARAM_SPATIAL_SUBFRAMES; m++ ) + { + hQMetaData->q_direction[0].band_data[b].azimuth[m] = 0.0f; + hQMetaData->q_direction[0].band_data[b].elevation[m] = 0.0f; + hQMetaData->q_direction[0].band_data[b].energy_ratio[m] = 0.0f; + + if ( hQMetaData->coherence_flag && hQMetaData->q_direction[0].coherence_band_data != NULL ) + { + hQMetaData->q_direction[0].coherence_band_data[b].spread_coherence[m] = 0u; + } + + if ( hQMetaData->no_directions == 2 ) + { + hQMetaData->q_direction[1].band_data[b].azimuth[m] = 0.0f; + hQMetaData->q_direction[1].band_data[b].elevation[m] = 0.0f; + hQMetaData->q_direction[1].band_data[b].energy_ratio[m] = 0.0f; + + if ( hQMetaData->coherence_flag && hQMetaData->q_direction[1].coherence_band_data != NULL ) + { + hQMetaData->q_direction[1].coherence_band_data[b].spread_coherence[m] = 0u; + } + } + + if ( hQMetaData->coherence_flag && hQMetaData->surcoh_band_data != NULL ) + { + hQMetaData->surcoh_band_data[b].surround_coherence[m] = 0u; + } + } + + if ( hQMetaData->no_directions == 2 ) + { + hQMetaData->twoDirBands[b] = 0; + } + } + sf_nbands0 = hQMetaData->q_direction[0].cfg.nbands; + + hQMetaData->q_direction[0].cfg.nbands = codedBands; + +#endif + /*Coherence flag decoding*/ + bits_no_dirs_coh = 0; + all_coherence_zero = 1; + if ( hQMetaData->coherence_flag ) + { + /* read if coherence is zero */ + all_coherence_zero = bitstream[( *index )--]; + bits_no_dirs_coh += 1; + } + + hQMetaData->all_coherence_zero = (uint8_t) all_coherence_zero; + + if ( hQMetaData->no_directions == 2 ) + { + set_c( (int8_t *) hQMetaData->twoDirBands, 1, hQMetaData->q_direction[0].cfg.nbands ); + } + + if ( bits_sph_idx == 11 && hQMetaData->no_directions == 2 ) + { + /* Read which bands have 2 directions */ + hQMetaData->q_direction[1].cfg.nbands = hQMetaData->numTwoDirBands; +#ifdef FIX_HBR_MASAMETA + sf_nbands1 = hQMetaData->q_direction[1].cfg.nbands; + if ( hQMetaData->q_direction[1].cfg.nbands > codedBands ) + { + hQMetaData->q_direction[1].cfg.nbands = codedBands; + } +#endif + set_c( (int8_t *) hQMetaData->twoDirBands, 0, hQMetaData->q_direction[0].cfg.nbands ); + d = *index; + dif_p[0] = ivas_qmetadata_DecodeExtendedGR( bitstream, index, MASA_MAXIMUM_CODING_SUBBANDS, 0 ); + p[0] = dif_p[0]; + hQMetaData->twoDirBands[p[0]] = 1; +#ifdef FIX_HBR_MASAMETA + for ( b = 1; b < hQMetaData->q_direction[1].cfg.nbands; b++ ) +#else + for ( b = 1; b < hQMetaData->numTwoDirBands; b++ ) +#endif + { + dif_p[b] = ivas_qmetadata_DecodeExtendedGR( bitstream, index, MASA_MAXIMUM_CODING_SUBBANDS, 0 ); + p[b] = p[b - 1] + dif_p[b] + 1; + hQMetaData->twoDirBands[p[b]] = 1; + } + bits_no_dirs_coh += ( d - *index ); + } + +#ifdef FIX_HBR_MASAMETA + if ( bits_sph_idx == 16 && hQMetaData->no_directions == 2 ) + { + sf_nbands1 = hQMetaData->q_direction[1].cfg.nbands; + if ( hQMetaData->q_direction[1].cfg.nbands > codedBands ) + { + hQMetaData->q_direction[1].cfg.nbands = codedBands; + } + } +#endif + bits_diff_sum = ivas_qmetadata_entropy_decode_diffuseness_hr_512( bitstream, index, &( hQMetaData->q_direction[0] ) ); + + if ( hQMetaData->no_directions == 2 ) + { + bits_diff_sum += ivas_qmetadata_entropy_decode_diffuseness_hr_512( bitstream, index, &( hQMetaData->q_direction[1] ) ); + } + + + for ( b = hQMetaData->q_direction[0].cfg.start_band; b < hQMetaData->q_direction[0].cfg.nbands; b++ ) + { + for ( m = 0; m < hQMetaData->q_direction[0].cfg.nblocks; m++ ) + { + hQMetaData->q_direction[0].band_data[b].energy_ratio[m] = 1.0f - diffuseness_reconstructions_hr[hQMetaData->q_direction[0].band_data[b].energy_ratio_index[m]]; + } + } + if ( hQMetaData->no_directions == 2 ) + { + for ( b = hQMetaData->q_direction[1].cfg.start_band; b < hQMetaData->q_direction[1].cfg.nbands; b++ ) + { + for ( m = 0; m < hQMetaData->q_direction[1].cfg.nblocks; m++ ) + { + hQMetaData->q_direction[1].band_data[b].energy_ratio[m] = 1.0f - diffuseness_reconstructions_hr[hQMetaData->q_direction[1].band_data[b].energy_ratio_index[m]]; + if ( hQMetaData->q_direction[1].band_data[b].energy_ratio[m] > 1.0f - hQMetaData->q_direction[0].band_data[b].energy_ratio[m] ) + { + hQMetaData->q_direction[1].band_data[b].energy_ratio[m] = 1.0f - hQMetaData->q_direction[0].band_data[b].energy_ratio[m]; + } + } + } + } + + if ( hQMetaData->no_directions == 2 ) + { + for ( b = hQMetaData->q_direction[1].cfg.start_band; b < hQMetaData->q_direction[1].cfg.nbands; b++ ) + { + for ( m = 0; m < hQMetaData->q_direction[1].cfg.nblocks; m++ ) + { + hQMetaData->q_direction[1].band_data[b].energy_ratio_index_mod[m] = hQMetaData->q_direction[1].band_data[b].energy_ratio_index[m]; + hQMetaData->q_direction[1].band_data[b].bits_sph_idx[m] = bits_sph_idx; + } + } + } + + for ( b = hQMetaData->q_direction[0].cfg.start_band; b < hQMetaData->q_direction[0].cfg.nbands; b++ ) + { + for ( m = 0; m < hQMetaData->q_direction[0].cfg.nblocks; m++ ) + { + hQMetaData->q_direction[0].band_data[b].energy_ratio_index_mod[m] = hQMetaData->q_direction[0].band_data[b].energy_ratio_index[0]; + hQMetaData->q_direction[0].band_data[b].bits_sph_idx[m] = bits_sph_idx; + } + } + + if ( all_coherence_zero == 0 ) + { + bits_sur_coherence = read_surround_coherence_hr( bitstream, index, hQMetaData ); + } + else + { + bits_sur_coherence = 0; + /*Surround coherence*/ + for ( b = 0; b < hQMetaData->q_direction[0].cfg.nbands; b++ ) + { + if ( hQMetaData->surcoh_band_data != NULL ) + { + set_c( (int8_t *) hQMetaData->surcoh_band_data[b].surround_coherence, 0, MAX_PARAM_SPATIAL_SUBFRAMES ); + } + } + } + bits_no_dirs_coh += bits_sur_coherence; + + for ( d = 0; d < hQMetaData->no_directions; d++ ) + { + q_direction = &hQMetaData->q_direction[d]; + nbands = q_direction->cfg.nbands; + start_band = q_direction->cfg.start_band; + + /* Read coherence, if any */ + if ( all_coherence_zero == 0 ) + { + read_coherence_data_hr_512( bitstream, index, hQMetaData, d, bits_sp_coh ); + } + else + { + /*Surround coherence*/ + for ( b = 0; b < hQMetaData->q_direction[0].cfg.nbands; b++ ) + { + if ( hQMetaData->surcoh_band_data != NULL ) + { + set_c( (int8_t *) hQMetaData->surcoh_band_data[b].surround_coherence, 0, MAX_PARAM_SPATIAL_SUBFRAMES ); + } + + if ( hQMetaData->q_direction[d].coherence_band_data != NULL ) + { + set_c( (int8_t *) hQMetaData->q_direction[d].coherence_band_data[b].spread_coherence, 0, MAX_PARAM_SPATIAL_SUBFRAMES ); + } + } + } + + /* Decode quantized directions frame-wise */ + ivas_qmetadata_raw_decode_dir_512( q_direction, bitstream, index, nbands, start_band, sph_grid16 ); + +#ifdef DEBUG_MODE_QMETADATA + + fprintf( pF, "frame %d: diff %d surcoh %d ", frame, bits_diff_sum, bits_sur_coherence ); + fprintf( pF, "dir %d\n", start_index_0 - *index ); + fprintf( pF_azi, "frame %d/dir/ec %d: ", frame, d ); + fprintf( pF_ele, "frame %d/dir/ec %d: ", frame, d ); + fprintf( pF_spcoh, "frame %d/dir %d: ", frame, d ); + fprintf( pF_ratio, "frame %d/dir %d: ", frame, d ); + + for ( b = start_band; b < nbands; b++ ) + { + for ( m = 0; m < q_direction->cfg.nblocks; m++ ) + { + + fprintf( pF_ratio, " %1.3f ", q_direction->band_data[b].energy_ratio[m] ); + fprintf( pF_azi, " %+5.2f ", (int16_t) ( 100.f * q_direction->band_data[b].azimuth[m] ) / 100.f ); + fprintf( pF_ele, " %+5.2f ", (int16_t) ( 100.f * q_direction->band_data[b].elevation[m] ) / 100.f ); + if ( q_direction->coherence_band_data != NULL ) + { + fprintf( pF_spcoh, " %d ", q_direction->coherence_band_data[b].spread_coherence[m] ); + } + } + } + fprintf( pF_ratio, "\n" ); + fprintf( pF_azi, "\n" ); + fprintf( pF_ele, "\n" ); + fprintf( pF_spcoh, "\n" ); +#endif + } + + if ( hQMetaData->no_directions == 2 ) + { + /* move 2 dir data to its correct subband */ + if ( bits_sph_idx == 11 ) + { + + int16_t nblocks; + d = hQMetaData->q_direction[1].cfg.nbands - 1; + nblocks = hQMetaData->q_direction[0].cfg.nblocks; + + for ( b = hQMetaData->q_direction[0].cfg.nbands - 1; b >= 0; b-- ) + { + if ( hQMetaData->twoDirBands[b] == 1 ) + { + mvr2r( hQMetaData->q_direction[1].band_data[d].azimuth, hQMetaData->q_direction[1].band_data[b].azimuth, nblocks ); + mvr2r( hQMetaData->q_direction[1].band_data[d].elevation, hQMetaData->q_direction[1].band_data[b].elevation, nblocks ); + mvr2r( hQMetaData->q_direction[1].band_data[d].energy_ratio, hQMetaData->q_direction[1].band_data[b].energy_ratio, nblocks ); + + + if ( hQMetaData->q_direction[1].coherence_band_data != NULL ) + { + mvc2c( hQMetaData->q_direction[1].coherence_band_data[d].spread_coherence, hQMetaData->q_direction[1].coherence_band_data[b].spread_coherence, nblocks ); + } + d--; + } + else + { + set_f( hQMetaData->q_direction[1].band_data[b].azimuth, 0.0f, nblocks ); + set_f( hQMetaData->q_direction[1].band_data[b].elevation, 0.0f, nblocks ); + set_f( hQMetaData->q_direction[1].band_data[b].energy_ratio, 0.0f, nblocks ); + + if ( hQMetaData->q_direction[1].coherence_band_data != NULL ) + { + set_c( (int8_t *) hQMetaData->q_direction[1].coherence_band_data[b].spread_coherence, 0, nblocks ); + } + } + } + } + + /* Scale energy ratios that sum to over one */ + for ( b = 0; b < hQMetaData->q_direction[0].cfg.nbands; b++ ) + { + float ratioSum; + for ( m = 0; m < hQMetaData->q_direction[0].cfg.nblocks; m++ ) + { + ratioSum = hQMetaData->q_direction[0].band_data[b].energy_ratio[m] + hQMetaData->q_direction[1].band_data[b].energy_ratio[m]; + + if ( ratioSum > 1.0f ) + { + hQMetaData->q_direction[0].band_data[b].energy_ratio[m] = hQMetaData->q_direction[0].band_data[b].energy_ratio[m] / ratioSum; + hQMetaData->q_direction[1].band_data[b].energy_ratio[m] = hQMetaData->q_direction[1].band_data[b].energy_ratio[m] / ratioSum; + } + } + } + } + +#ifdef DEBUG_MODE_QMETADATA + for ( d = 0; d < hQMetaData->no_directions; d++ ) + { + q_direction = &hQMetaData->q_direction[d]; + nbands = q_direction->cfg.nbands; + start_band = q_direction->cfg.start_band; + + + if ( d == 0 ) + { + fprintf( pF_surcoh, "frame %d/dir %d: ", frame, d ); + } + for ( b = start_band; b < nbands; b++ ) + { + for ( m = 0; m < q_direction->cfg.nblocks; m++ ) + { + + + if ( d == 0 && hQMetaData->surcoh_band_data != NULL ) + { + fprintf( pF_surcoh, " %d ", hQMetaData->surcoh_band_data[b].surround_coherence[m] ); + } + } + } + + + if ( d == 0 ) + { + fprintf( pF_surcoh, "\n" ); + } + } +#endif + /* Store status information for renderer use */ + hQMetaData->ec_flag = 0; + + hQMetaData->dir_comp_ratio = 1.0f; + + if ( hQMetaData->dir_comp_ratio > 1.0f ) + { + hQMetaData->dir_comp_ratio = 1.0f; + } + +#ifdef FIX_HBR_MASAMETA + hQMetaData->q_direction[0].cfg.nbands = sf_nbands0; + if ( hQMetaData->no_directions == 2 ) + { + hQMetaData->q_direction[1].cfg.nbands = sf_nbands1; + } +#endif + + return ( start_index_0 - *index ); +} + +#endif + + /*-----------------------------------------------------------------------* * ivas_qmetadata_dec_sid_decode() * @@ -940,6 +1455,12 @@ static int16_t ivas_diffuseness_huff_ec_decode( } +/*-------------------------------------------------------------------* + * ivas_qmetadata_entropy_decode_diffuseness() + * + * + *-------------------------------------------------------------------*/ + static int16_t ivas_qmetadata_entropy_decode_diffuseness( uint16_t *bitstream, /* i : bitstream */ int16_t *index, @@ -1036,6 +1557,142 @@ static int16_t ivas_qmetadata_entropy_decode_diffuseness( } +#ifdef HR_METADATA +/*-------------------------------------------------------------------* + * ivas_qmetadata_entropy_decode_diffuseness_hr() + * + * + *-------------------------------------------------------------------*/ + +static int16_t ivas_qmetadata_entropy_decode_diffuseness_hr( + uint16_t *bitstream, /* i : bitstream */ + int16_t *index, + IVAS_QDIRECTION *q_direction, + uint16_t *diffuseness_index_max_ec_frame ) +{ + int16_t b; + uint16_t dif_min; + int16_t index_start; + int16_t nbands; + int16_t start_band; + + index_start = *index; + nbands = q_direction->cfg.nbands; + start_band = q_direction->cfg.start_band; + + /* diffuseness decoding */ + /* Handle one band as special case*/ + if ( nbands == 1 ) + { + q_direction->band_data[0].energy_ratio_index[0] = 0; + for ( b = 0; b < MASA_BITS_ER_HR; b++ ) + { + q_direction->band_data[0].energy_ratio_index[0] = ( q_direction->band_data[0].energy_ratio_index[0] << 1 ) + bitstream[( *index )--]; + } + *diffuseness_index_max_ec_frame = 5; + + return MASA_BITS_ER_HR; + } + + if ( bitstream[( *index )--] == 0 ) /* dif_use_raw_coding */ + { + /* Decode with similarity strategy with low band count. On higher band counts, decode with Huffman-coding strategy. */ + + if ( bitstream[( *index )--] != 0 ) /* dif_have_unique_value */ + { + dif_min = ivas_qmetadata_DecodeQuasiUniform( bitstream, index, HR_MASA_ER_LEVELS ); /* dif_unique_value */ + + for ( b = start_band; b < nbands; b++ ) + { + q_direction->band_data[b].energy_ratio_index[0] = dif_min; + } + } + else /* all diffuseness values are dif_min_value or dif_min_value + 1 */ + { + dif_min = ivas_qmetadata_DecodeQuasiUniform( bitstream, index, HR_MASA_ER_LEVELS - 1 ); /* dif_min_value */ + + for ( b = start_band; b < nbands; b++ ) + { + q_direction->band_data[b].energy_ratio_index[0] = dif_min + bitstream[( *index )--]; /* dif_bit_offset_values */ + } + } + } + else /* different values for diffuseness */ + { + dif_min = HR_MASA_ER_LEVELS; + + for ( b = start_band; b < nbands; b++ ) + { + q_direction->band_data[b].energy_ratio_index[0] = ivas_qmetadata_DecodeQuasiUniform( bitstream, index, HR_MASA_ER_LEVELS ); + dif_min = min( dif_min, q_direction->band_data[b].energy_ratio_index[0] ); + } + } + + *diffuseness_index_max_ec_frame = 10; + /* adaptively select the diffuseness_index_max_ec threshold */ + if ( dif_min > 10 ) + { + *diffuseness_index_max_ec_frame = HR_MASA_ER_LEVELS - 1; + } + + return ( index_start - *index ); +} + + +/*-------------------------------------------------------------------* + * ivas_qmetadata_entropy_decode_diffuseness_hr_512() + * + * + *-------------------------------------------------------------------*/ + +static int16_t ivas_qmetadata_entropy_decode_diffuseness_hr_512( + uint16_t *bitstream, /* i : bitstream */ + int16_t *index, + IVAS_QDIRECTION *q_direction ) +{ + int16_t b, k; + + int16_t index_start; + int16_t nbands, nblocks; + int16_t start_band; + + index_start = *index; + nbands = q_direction->cfg.nbands; + nblocks = q_direction->cfg.nblocks; + start_band = q_direction->cfg.start_band; + + /* diffuseness decoding */ + /* Handle one band as special case*/ + if ( nbands == 1 ) + { + q_direction->band_data[0].energy_ratio_index[0] = 0; + for ( b = 0; b < MASA_BITS_ER_HR; b++ ) + { + q_direction->band_data[0].energy_ratio_index[0] = ( q_direction->band_data[0].energy_ratio_index[0] << 1 ) + bitstream[( *index )--]; + } + + return MASA_BITS_ER_HR; + } + + for ( b = start_band; b < nbands; b++ ) + { + for ( k = 0; k < nblocks; k++ ) + { + q_direction->band_data[b].energy_ratio_index[k] = ivas_qmetadata_DecodeQuasiUniform( bitstream, index, HR_MASA_ER_LEVELS ); + } + } + + return ( index_start - *index ); +} +#endif + + +/*-------------------------------------------------------------------* + * ivas_qmetadata_entropy_decode_df_ratio() + * + * + *-------------------------------------------------------------------*/ + static int16_t ivas_qmetadata_entropy_decode_df_ratio( uint16_t *bitstream, int16_t *index, @@ -1161,7 +1818,12 @@ static int16_t ivas_qmetadata_entropy_decode_dir( int16_t *index, const uint16_t diffuseness_index_max_ec_frame, const int16_t nbands, - const int16_t start_band ) + const int16_t start_band +#ifdef HR_METADATA + , + const int16_t hrmasa_flag /* i : flag indicating high-rate MASA MD coding*/ +#endif +) { int16_t b, m; int16_t diff_idx; @@ -1188,7 +1850,19 @@ static int16_t ivas_qmetadata_entropy_decode_dir( /*Raw coding for high diffuseness*/ for ( b = start_band; b < nbands; b++ ) { - diff_idx = q_direction->band_data[b].energy_ratio_index_mod[0]; +#ifdef HR_METADATA + if ( hrmasa_flag ) + { + diff_idx = 0; + } + else + { +#endif + diff_idx = q_direction->band_data[b].energy_ratio_index_mod[0]; +#ifdef HR_METADATA + } +#endif + diff_idx_min = min( diff_idx_min, diff_idx ); if ( q_direction->cfg.mc_ls_setup != MC_LS_SETUP_INVALID ) { @@ -1199,7 +1873,11 @@ static int16_t ivas_qmetadata_entropy_decode_dir( elev_alph[b] = no_theta_masa[bits_direction_masa[diff_idx] - 3] * 2 - 1; } +#ifdef HR_METADATA + if ( q_direction->band_data[b].energy_ratio_index_mod[0] > diffuseness_index_max_ec_frame ) +#else if ( diff_idx > diffuseness_index_max_ec_frame ) +#endif { bands_entropic[b] = 0; @@ -1252,7 +1930,18 @@ static int16_t ivas_qmetadata_entropy_decode_dir( if ( bands_entropic[b] ) { int16_t tmp_index; - diff_idx = q_direction->band_data[b].energy_ratio_index_mod[0]; +#ifdef HR_METADATA + if ( hrmasa_flag ) + { + diff_idx = 0; + } + else + { +#endif + diff_idx = q_direction->band_data[b].energy_ratio_index_mod[0]; +#ifdef HR_METADATA + } +#endif if ( q_direction->cfg.mc_ls_setup != MC_LS_SETUP_INVALID ) { @@ -1261,6 +1950,7 @@ static int16_t ivas_qmetadata_entropy_decode_dir( else { avg_elevation_index_projected = ivas_dirac_project_elevation_index( avg_elevation_idx, avg_elevation_alphabet, elev_alph[b] ); + /*reorder elevation indexing*/ tmp_index = avg_elevation_index_projected - ( elev_alph[b] >> 1 ); if ( tmp_index < 0 ) @@ -1277,6 +1967,7 @@ static int16_t ivas_qmetadata_entropy_decode_dir( for ( m = 0; m < nblocks; m++ ) { q_direction->band_data[b].elevation_index[m] = avg_elevation_index_projected; + /*deduce aplhabet for azimuth*/ if ( q_direction->cfg.mc_ls_setup != MC_LS_SETUP_INVALID ) { @@ -1300,7 +1991,19 @@ static int16_t ivas_qmetadata_entropy_decode_dir( { if ( bands_entropic[b] ) { - diff_idx = q_direction->band_data[b].energy_ratio_index_mod[0]; +#ifdef HR_METADATA + if ( hrmasa_flag ) + { + diff_idx = 0; + } + else + { +#endif + diff_idx = q_direction->band_data[b].energy_ratio_index_mod[0]; +#ifdef HR_METADATA + } +#endif + for ( m = 0; m < nblocks; m++ ) { int16_t tmp_index; @@ -1323,7 +2026,6 @@ static int16_t ivas_qmetadata_entropy_decode_dir( } else { - avg_elevation_index_projected = ivas_dirac_project_elevation_index( avg_elevation_idx, avg_elevation_alphabet, elev_alph[b] ); tmp_index = ivas_qmetadata_DecodeExtendedGR( bitstream, index, elev_alph[b], gr_param_elev ); @@ -1359,7 +2061,19 @@ static int16_t ivas_qmetadata_entropy_decode_dir( { if ( bands_entropic[b] ) { - diff_idx = q_direction->band_data[b].energy_ratio_index_mod[0]; +#ifdef HR_METADATA + if ( hrmasa_flag ) + { + diff_idx = 0; + } + else + { +#endif + diff_idx = q_direction->band_data[b].energy_ratio_index_mod[0]; +#ifdef HR_METADATA + } +#endif + for ( m = 0; m < nblocks; m++ ) { q_direction->band_data[b].elevation_index[m] = 0; @@ -1419,6 +2133,7 @@ static int16_t ivas_qmetadata_entropy_decode_dir( set_zero( avg_direction_vector, 3 ); use_adapt_avg = 0; idx = 0; + for ( b = start_band; b < nbands; b++ ) { if ( bands_entropic[b] ) @@ -1478,6 +2193,59 @@ static int16_t ivas_qmetadata_entropy_decode_dir( } +#ifdef HR_METADATA +/*------------------------------------------------------------------------- + * ivas_qmetadata_raw_decode_dir() + * + * Main function for raw decoding of the directions + *------------------------------------------------------------------------*/ + +static int16_t ivas_qmetadata_raw_decode_dir_512( + IVAS_QDIRECTION *q_direction, /* i/o: quantized direction structure */ + uint16_t *bitstream, /* i : bitstream */ + int16_t *index, + const int16_t nbands, + const int16_t start_band, + const SPHERICAL_GRID_DATA *sph_grid16 /* i : spherical grid for deindexing */ +) +{ + int16_t b, m, i; + int16_t nblocks; + int16_t index_start; + uint16_t value; + + index_start = *index; + nblocks = q_direction->cfg.nblocks; + + for ( b = start_band; b < nbands; b++ ) + { + for ( m = 0; m < nblocks; m++ ) + { + value = 0; + for ( i = 0; i < q_direction->band_data[b].bits_sph_idx[m]; i++ ) + { + value = ( value << 1 ) + bitstream[( *index )--]; + } + q_direction->band_data[b].spherical_index[m] = value; + + if ( q_direction->band_data[b].bits_sph_idx[m] == 16 ) + { + deindex_sph_idx( value, sph_grid16, &( q_direction->band_data[b].elevation[m] ), &( q_direction->band_data[b].azimuth[m] ) ); + } + else + { + deindex_spherical_component( q_direction->band_data[b].spherical_index[m], &q_direction->band_data[b].azimuth[m], &q_direction->band_data[b].elevation[m], + &q_direction->band_data[b].azimuth_index[m], &q_direction->band_data[b].elevation_index[m], q_direction->band_data[b].bits_sph_idx[m], + q_direction->cfg.mc_ls_setup ); + } + } + } + + return ( index_start - *index ); +} + +#endif + /*------------------------------------------------------------------------- * ivas_qmetadata_raw_decode_dir() * @@ -1489,7 +2257,12 @@ static int16_t ivas_qmetadata_raw_decode_dir( uint16_t *bitstream, /* i : bitstream */ int16_t *index, const int16_t nbands, - const int16_t start_band ) + const int16_t start_band +#ifdef HR_METADATA + , + const int16_t hrmasa_flag /* i : flag indicating high-rate MASA MD coding*/ +#endif +) { int16_t b, m, azith_alph; int16_t diff_idx; @@ -1507,7 +2280,18 @@ static int16_t ivas_qmetadata_raw_decode_dir( } else { - diff_idx = q_direction->band_data[b].energy_ratio_index_mod[0]; +#ifdef HR_METADATA + if ( hrmasa_flag ) + { + diff_idx = 0; + } + else + { +#endif + diff_idx = q_direction->band_data[b].energy_ratio_index_mod[0]; +#ifdef HR_METADATA + } +#endif for ( m = 0; m < nblocks; m++ ) { @@ -1531,7 +2315,7 @@ static int16_t ivas_qmetadata_raw_decode_dir( * Read the bitstream following the encoding scheme of EncodeQuasiUniform *------------------------------------------------------------------------*/ -/* !r: Value read from the bitstream */ +/*! r: Value read from the bitstream */ static uint16_t ivas_qmetadata_DecodeQuasiUniform( const uint16_t *bitstream, /* i : pointer to the bitstream to read */ int16_t *index, /* i : position in the bitstream to start reading (gets updated with reading) */ @@ -1572,7 +2356,7 @@ static uint16_t ivas_qmetadata_DecodeQuasiUniform( * Reads the bitstream and decodes the value using the ExtendedGR algorithm *------------------------------------------------------------------------*/ -/* !r: Value decoded from the bitstream */ +/*! r: Value decoded from the bitstream */ static int16_t ivas_qmetadata_DecodeExtendedGR( uint16_t *bitstream, /* i : pointer to the bitstream to read */ int16_t *index, /* i/o: position in the bitstream to start reading (gets updated with reading) */ @@ -1631,7 +2415,7 @@ static int16_t ivas_qmetadata_DecodeExtendedGR( * Calculates the correct elevation index from the decoded data *------------------------------------------------------------------------*/ -/* !r: Elevation index as it will be read by the dequantizer */ +/*! r: Elevation index as it will be read by the dequantizer */ static int16_t ivas_qmetadata_ReorderElevationDecoded( const int16_t elev_dist, /* i : Distance to the average extracted from the bitstream */ const int16_t elev_avg, /* i : Average value over time-blocks extracted from the bitstream */ @@ -1661,7 +2445,7 @@ static int16_t ivas_qmetadata_ReorderElevationDecoded( * Local functions: requentizeEC3 *-----------------------------------------------------------------------*/ -/* !r: number of bits read */ +/*! r: number of bits read */ static int16_t read_directions( IVAS_QDIRECTION *q_direction, /* i/o: quantized direction structure */ const uint8_t coding_subbands, /* i : number of directions */ @@ -1713,6 +2497,7 @@ static int16_t read_directions( max_nb_idx = k; } } + if ( q_direction->cfg.nblocks == 1 ) { byteBuffer = 0; @@ -1892,7 +2677,7 @@ static int16_t read_directions( * read and decode the azimuth indexes for one subband *-------------------------------------------------------------------*/ -/* !r: number of bits read */ +/*! r: number of bits read */ static int16_t decode_azimuth( IVAS_QDIRECTION *q_direction, /* i/o: quantized metadata structure */ uint16_t *bitstream, /* i : bitstream to be read */ @@ -2061,7 +2846,7 @@ static int16_t decode_azimuth( * Reads the bitstream and decode the elevation index *-------------------------------------------------------------------*/ -/* !r: number of bits read */ +/*! r: number of bits read */ static int16_t decode_elevation( IVAS_QDIRECTION *q_direction, /* i/o: quantized metadata structure */ uint16_t *bitstream, /* i : input bitstream */ @@ -2189,7 +2974,7 @@ static int16_t decode_elevation( * decoding in fixed rate case, i.e. when using the spherical indexes *-----------------------------------------------------------------*/ -/* !r: number of bits read */ +/*! r: number of bits read */ static int16_t decode_fixed_rate( IVAS_QDIRECTION *q_direction, /* i/o: quantized metadata */ const uint16_t *bitstream, /* i : bitstream to be read */ @@ -2229,7 +3014,7 @@ static int16_t decode_fixed_rate( * Azimuth bitstream reading and decoding in 2D case *-------------------------------------------------------------------*/ -/* !r: number of bits read */ +/*! r: number of bits read */ static int16_t decode_azimuth2D( IVAS_QDIRECTION *q_direction, /* i/o: quantized metadata structure */ uint16_t *bitstream, /* i : bitstream to be read */ @@ -2423,7 +3208,7 @@ static int16_t read_truncGR_azimuth( * *-------------------------------------------------------------------*/ -/* !r: number of bits read */ +/*! r: number of bits read */ static int16_t read_common_direction( uint16_t *bitstream, /* i : bitstream to be read */ IVAS_QDIRECTION *q_direction, /* i/o: quantized direction structure */ @@ -2548,6 +3333,10 @@ static void decode_spread_coherence( IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: quantized metadata structure */ int16_t idx_d, /* i : direction index */ const int16_t no_frames /* i : number of time subframes */ +#ifdef HR_METADATA + , + const int16_t hrmasa_flag /* i : flag indicating high-rate MASA MD coding*/ +#endif ) { int16_t i, j; @@ -2557,6 +3346,9 @@ static void decode_spread_coherence( int16_t MASA_grouping[MASA_MAXIMUM_CODING_SUBBANDS]; IVAS_QDIRECTION *q_direction; int16_t coding_subbands, coding_subbands_0, d, two_dir_band[MASA_MAXIMUM_CODING_SUBBANDS]; +#ifdef HR_METADATA + int16_t min_index; +#endif coding_subbands_0 = hQMetaData->q_direction[0].cfg.nbands; coding_subbands = hQMetaData->q_direction[idx_d].cfg.nbands; @@ -2613,6 +3405,26 @@ static void decode_spread_coherence( { var_azi = var( q_direction->band_data[i].azimuth, no_frames ); +#ifdef HR_METADATA + if ( hrmasa_flag ) + { + minimum_s( (int16_t *) ( q_direction->band_data[i].energy_ratio_index ), q_direction->cfg.nblocks, &min_index ); + min_index = min_index >> 1; + } + else + { + min_index = q_direction->band_data[i].energy_ratio_index[0]; + } + + if ( var_azi < MASA_DELTA_AZI_DCT0 ) + { + idx_sub_cb = MASA_NO_CV_COH * min_index; + } + else + { + idx_sub_cb = MASA_NO_CV_COH * ( min_index + DIRAC_DIFFUSE_LEVELS ); /* NO_CV_COH = 8 */ + } +#else if ( var_azi < MASA_DELTA_AZI_DCT0 ) { idx_sub_cb = MASA_NO_CV_COH * q_direction->band_data[i].energy_ratio_index[0]; @@ -2621,8 +3433,10 @@ static void decode_spread_coherence( { idx_sub_cb = MASA_NO_CV_COH * ( q_direction->band_data[i].energy_ratio_index[0] + DIRAC_DIFFUSE_LEVELS ); /* NO_CV_COH = 8 */ } +#endif dct_coh[i][0] = coherence_cb0_masa[idx_sub_cb + q_direction->coherence_band_data[i].spread_coherence_dct0_index]; + if ( coding_subbands < coding_subbands_0 ) { assert( idx_d == 1 ); @@ -2651,7 +3465,7 @@ static void decode_spread_coherence( * Read Hufman code *-------------------------------------------------------------------*/ -/* !r: number of bits read */ +/*! r: number of bits read */ static ivas_error read_huf( int16_t *num_bits_read, const uint16_t *bitstream, /* i : bitstream to be read */ @@ -2880,18 +3694,103 @@ static int16_t decode_fixed_rate_composed_index_coherence( } -/*------------------------------------------------------------------ - * +#ifdef HR_METADATA +/*-------------------------------------------------------------------* + * read_coherence_data_hr_512() + * + * + *-------------------------------------------------------------------*/ + +/*! r: number of bits read */ +static int16_t read_coherence_data_hr_512( + uint16_t *bitstream, /* i : bitstream */ + int16_t *p_bit_pos, /* i : position in the bitstream */ + IVAS_QMETADATA *hQMetaData, /* i/o: quantized metadata structure */ + const int16_t idx_dir, /* i : direction index */ + const int16_t nbits_coh ) +{ + int16_t j, k, i; + int16_t nbands, nblocks; + int16_t min_index, GR_param; + int16_t cb_size, nbits; + int16_t decoded_idx; + float delta; + + nbands = hQMetaData->q_direction[idx_dir].cfg.nbands; + nblocks = hQMetaData->q_direction[idx_dir].cfg.nblocks; + + + cb_size = 1 << nbits_coh; + delta = 256.0f / cb_size; + nbits = *p_bit_pos; + for ( k = 0; k < nblocks; k++ ) + { + /* read method */ + if ( bitstream[( *p_bit_pos )--] == 1 ) + { + /* average removed */ + /* read average index */ + min_index = 0; + for ( i = 0; i < nbits_coh; i++ ) + { + min_index = ( min_index << 1 ) + bitstream[( *p_bit_pos )--]; + } + /* read GR param */ + GR_param = bitstream[( *p_bit_pos )--]; + for ( j = 0; j < nbands; j++ ) + { + decoded_idx = ivas_qmetadata_DecodeExtendedGR( bitstream, p_bit_pos, 2 * cb_size, GR_param ); + if ( decoded_idx % 2 ) + { + decoded_idx = ( ( decoded_idx + 1 ) >> 1 ) + min_index; + } + else + { + decoded_idx = -( decoded_idx >> 1 ) + min_index; + } + hQMetaData->q_direction[idx_dir].coherence_band_data[j].spread_coherence[k] = (uint8_t) ( decoded_idx * delta + delta / 2.0f ); + } + } + else + { + + /* read min_index */ + min_index = 0; + for ( i = 0; i < nbits_coh; i++ ) + { + min_index = ( min_index << 1 ) + bitstream[( *p_bit_pos )--]; + } + /* read GR param */ + GR_param = bitstream[( *p_bit_pos )--]; + for ( j = 0; j < nbands; j++ ) + { + decoded_idx = ivas_qmetadata_DecodeExtendedGR( bitstream, p_bit_pos, cb_size - min_index, GR_param ) + min_index; + hQMetaData->q_direction[idx_dir].coherence_band_data[j].spread_coherence[k] = (uint8_t) ( decoded_idx * delta + delta / 2.0f ); + } + } + } + nbits = nbits - *p_bit_pos; + return nbits; +} +#endif + + +/*------------------------------------------------------------------- * * read_coherence_data() * * Read coherence data - *------------------------------------------------------------------ - */ + *------------------------------------------------------------------- */ -/* !r: number of bits read */ +/*! r: number of bits read */ static int16_t read_coherence_data( uint16_t *bitstream, /* i : bitstream */ int16_t *p_bit_pos, /* i : position in the bitstream */ IVAS_QMETADATA *hQMetaData, /* i/o: quantized metadata structure */ const int16_t idx_dir /* i : direction index */ +#ifdef HR_METADATA + , + const int16_t hrmasa_flag /* i : flag indicating high-rate MASA MD coding*/ +#endif ) { int16_t j; @@ -2909,6 +3808,10 @@ static int16_t read_coherence_data( int16_t decoded_idx[MASA_MAXIMUM_CODING_SUBBANDS]; uint16_t byteBuffer; int16_t idx_ER; +#ifdef HR_METADATA + int16_t min_index; +#endif + coding_subbands = hQMetaData->q_direction[idx_dir].cfg.nbands; q_direction = &( hQMetaData->q_direction[idx_dir] ); @@ -2919,7 +3822,19 @@ static int16_t read_coherence_data( { for ( j = 0; j < coding_subbands; j++ ) { - idx_ER = 7 - q_direction->band_data[j].energy_ratio_index_mod[0] + coding_subbands / MASA_FACTOR_CV_COH; +#ifdef HR_METADATA + if ( hrmasa_flag ) + { + idx_ER = 7 - ( q_direction->band_data[j].energy_ratio_index_mod[0] >> 1 ) + coding_subbands / MASA_FACTOR_CV_COH; + } + else + { + +#endif + idx_ER = 7 - q_direction->band_data[j].energy_ratio_index_mod[0] + coding_subbands / MASA_FACTOR_CV_COH; +#ifdef HR_METADATA + } +#endif no_cv_vec[j] = idx_ER + 1; } @@ -2943,7 +3858,11 @@ static int16_t read_coherence_data( { if ( no_cv_vec[j] > 1 ) { +#ifdef HR_METADATA + q_direction->coherence_band_data[j].spread_coherence[0] = (uint8_t) roundf( decoded_idx[j] * ( 255.0f / (float) ( 7 - ( q_direction->band_data[j].energy_ratio_index_mod[0] >> ( hrmasa_flag ) ) + coding_subbands / MASA_FACTOR_CV_COH ) ) ); +#else q_direction->coherence_band_data[j].spread_coherence[0] = (uint8_t) roundf( decoded_idx[j] * ( 255.0f / (float) ( 7 - q_direction->band_data[j].energy_ratio_index_mod[0] + coding_subbands / MASA_FACTOR_CV_COH ) ) ); +#endif } else { @@ -2960,7 +3879,11 @@ static int16_t read_coherence_data( { if ( no_cv_vec[j] > 1 ) { +#ifdef HR_METADATA + q_direction->coherence_band_data[j].spread_coherence[0] = (uint8_t) roundf( decoded_index[j] * ( 255.0f / (float) ( 7 - ( q_direction->band_data[j].energy_ratio_index_mod[0] >> ( hrmasa_flag ) ) + coding_subbands / MASA_FACTOR_CV_COH ) ) ); +#else q_direction->coherence_band_data[j].spread_coherence[0] = (uint8_t) roundf( decoded_index[j] * ( 255.0f / (float) ( 7 - q_direction->band_data[j].energy_ratio_index_mod[0] + coding_subbands / MASA_FACTOR_CV_COH ) ) ); +#endif } else { @@ -2973,7 +3896,19 @@ static int16_t read_coherence_data( { for ( j = 0; j < coding_subbands; j++ ) { - no_cv_vec[j] = len_cb_dct0_masa[q_direction->band_data[j].energy_ratio_index[0]]; /* spread coherence DCT0*/ +#ifdef HR_METADATA + if ( hrmasa_flag ) + { + minimum_s( (int16_t *) ( q_direction->band_data[j].energy_ratio_index ), q_direction->cfg.nblocks, &min_index ); + no_cv_vec[j] = len_cb_dct0_masa[min_index >> 1]; /* spread coherence DCT0*/ + } + else + { +#endif + no_cv_vec[j] = len_cb_dct0_masa[q_direction->band_data[j].energy_ratio_index[0]]; /* spread coherence DCT0*/ +#ifdef HR_METADATA + } +#endif } if ( sum_s( no_cv_vec, coding_subbands ) > MASA_COH_LIMIT_2IDX ) @@ -3096,13 +4031,14 @@ static int16_t read_coherence_data( return nbits; } + /*-------------------------------------------------------------------* * read_surround_coherence() * * *-------------------------------------------------------------------*/ -int16_t read_surround_coherence( +static int16_t read_surround_coherence( uint16_t *bitstream, /* i : bitstream */ int16_t *p_bit_pos, /* i : position in the bitstream */ IVAS_QMETADATA *hQMetaData /* i/o: quantized metadata structure */ @@ -3258,6 +4194,168 @@ int16_t read_surround_coherence( } +#ifdef HR_METADATA +/*-------------------------------------------------------------------* + * read_surround_coherence_hr() + * + * + *-------------------------------------------------------------------*/ + +static int16_t read_surround_coherence_hr( + uint16_t *bitstream, /* i : bitstream */ + int16_t *p_bit_pos, /* i : position in the bitstream */ + IVAS_QMETADATA *hQMetaData /* i/o: quantized metadata structure */ +) +{ + int16_t coding_subbands; + int16_t no_cv_vec[MASA_MAXIMUM_CODING_SUBBANDS]; + int16_t bit_pos; + float error_ratio_surr; + int16_t idx_ER[MASA_MAXIMUM_CODING_SUBBANDS]; + int16_t bits_sur_coherence, bits_GR; + int16_t j, k, sf; + uint16_t byteBuffer; + uint16_t idx_sur_coh[MASA_MAXIMUM_CODING_SUBBANDS]; + IVAS_QDIRECTION *q_direction; + int16_t min_index; + int16_t d, idx; + coding_subbands = hQMetaData->q_direction[0].cfg.nbands; + q_direction = hQMetaData->q_direction; + + bits_sur_coherence = 0; + bit_pos = *p_bit_pos; + + for ( sf = 0; sf < hQMetaData->q_direction[0].cfg.nblocks; sf++ ) + { + d = 0; + for ( j = 0; j < coding_subbands; j++ ) + { + error_ratio_surr = 1.0f; + if ( hQMetaData->no_directions == 2 ) + { + d += hQMetaData->twoDirBands[j]; + idx = max( d - 1, 0 ); + error_ratio_surr = 1.0f - q_direction[0].band_data[j].energy_ratio[sf] - q_direction[1].band_data[idx].energy_ratio[sf] * hQMetaData->twoDirBands[j]; + } + else + { + error_ratio_surr = 1.0f - q_direction[0].band_data[j].energy_ratio[sf]; + } + + + if ( error_ratio_surr <= 0 ) + { + error_ratio_surr = 0; + no_cv_vec[j] = 1; + idx_ER[j] = 0; + } + else + { + idx_ER[j] = 7; // masa_sq( error_ratio_surr, diffuseness_thresholds, DIRAC_DIFFUSE_LEVELS ); + no_cv_vec[j] = idx_cb_sur_coh_masa[idx_ER[j]] + 2; + } + } + + if ( sum_s( no_cv_vec, coding_subbands ) == coding_subbands ) + { + /* surround coherence is zero */ + for ( j = 0; j < coding_subbands; j++ ) + { + for ( k = 0; k < MAX_PARAM_SPATIAL_SUBFRAMES; k++ ) + { + if ( hQMetaData->surcoh_band_data != NULL ) + { + hQMetaData->surcoh_band_data[j].surround_coherence[k] = 0; + } + } + } + } + else + { + /* read how the surround coherence is encoded */ + byteBuffer = bitstream[bit_pos--]; + bits_sur_coherence += 1; + + if ( byteBuffer & 1 ) + { + /* GR decoding */ + /* read GR order */ + byteBuffer = bitstream[bit_pos--]; + bits_sur_coherence += 1; + + /* read min index */ + bits_GR = bit_pos; + min_index = ivas_qmetadata_DecodeExtendedGR( bitstream, &bit_pos, MASA_MAX_NO_CV_SUR_COH, 0 ); + bits_sur_coherence += bits_GR - bit_pos; + + /* read GR data */ + for ( j = 0; j < coding_subbands; j++ ) + { + bits_GR = bit_pos; + /* decoding for min removed */ + if ( no_cv_vec[j] > 1 ) + { + idx_sur_coh[j] = ivas_qmetadata_DecodeExtendedGR( bitstream, &bit_pos, no_cv_vec[j] - min_index, ( byteBuffer & 1 ) ); + bits_sur_coherence += bits_GR - bit_pos; + } + else + { + idx_sur_coh[j] = 0; + } + } + + for ( j = 0; j < coding_subbands; j++ ) + { + if ( no_cv_vec[j] > 1 ) + { + hQMetaData->surcoh_band_data[j].sur_coherence_index = idx_sur_coh[j] + min_index; + hQMetaData->surcoh_band_data[j].surround_coherence[sf] = sur_coherence_cb_masa[idx_cb_sur_coh_masa[idx_ER[j]] * MASA_MAX_NO_CV_SUR_COH + hQMetaData->surcoh_band_data[j].sur_coherence_index]; + } + else + { + hQMetaData->surcoh_band_data[j].sur_coherence_index = idx_sur_coh[j]; + hQMetaData->surcoh_band_data[j].surround_coherence[sf] = 0; + } + } + } + else + { + /* fixed rate */ + uint16_t sur_coh_temp_index[MASA_MAXIMUM_CODING_SUBBANDS]; + set_s( (int16_t *) sur_coh_temp_index, 0, MASA_MAXIMUM_CODING_SUBBANDS ); + + decode_fixed_rate_composed_index_coherence( bitstream, &bit_pos, coding_subbands, no_cv_vec, sur_coh_temp_index, MASA_MAX_NO_CV_SUR_COH ); + + for ( j = 0; j < coding_subbands; j++ ) + { + hQMetaData->surcoh_band_data[j].sur_coherence_index = sur_coh_temp_index[j]; + } + + /* deindex surround coherence */ + for ( j = 0; j < coding_subbands; j++ ) + { + if ( no_cv_vec[j] > 1 ) + { + hQMetaData->surcoh_band_data[j].surround_coherence[sf] = sur_coherence_cb_masa[idx_cb_sur_coh_masa[idx_ER[j]] * MASA_MAX_NO_CV_SUR_COH + hQMetaData->surcoh_band_data[j].sur_coherence_index]; + } + else + { + hQMetaData->surcoh_band_data[j].surround_coherence[sf] = 0; + } + } + } + } + } + + /* Replace return value with the actual read bits. bits_sur_coherence might show wrong count at this point. */ + bits_sur_coherence = *p_bit_pos - bit_pos; + *p_bit_pos = bit_pos; + + return bits_sur_coherence; +} + +#endif + /*-------------------------------------------------------------------* * decode_combined_index() * diff --git a/lib_dec/ivas_rom_dec.c b/lib_dec/ivas_rom_dec.c index 78d4eafea1b1674fe291cdfa5026538b71dceb20..6a33a36aaa072eb8fb15cf98c29159072bd55bcd 100644 --- a/lib_dec/ivas_rom_dec.c +++ b/lib_dec/ivas_rom_dec.c @@ -226,7 +226,7 @@ const float dft_win_8k[70] = * stereo CNA tables *------------------------------------------------------------------------*/ -const int16_t cna_init_bands[MAX_CNA_NBANDS + 1] = +const int16_t cna_init_bands[CNA_INIT_NBANDS + 1] = { 1, 4, 14, 33, 67, 171, 320 }; @@ -520,9 +520,13 @@ const float ap_split_frequencies[DIRAC_DECORR_NUM_SPLIT_BANDS + 1] = 0.0f, 0.125f, 0.375f, 1.0f }; -const int16_t sba_map_tc[8] = +const int16_t sba_map_tc[11] = { - 0, 1, 2, 3, 4, 8, 9, 15 + 0, 1, 2, 3, 4, 8, 9, 15, 5, 6, 7 +}; +const int16_t sba_map_tc_512[11] = +{ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 15 }; @@ -538,3 +542,290 @@ const float dmxmtx_table[BINAURAL_CHANNELS][11] = /* clang-format on */ + + +const int16_t huff_nodes_first_band_alpha[32][2] = { /* Alpha Fine Huffman table df0 */ + { -17, 1 }, + { 3, 2 }, + { -16, -18 }, + { 5, 4 }, + { -15, 6 }, + { -19, 7 }, + { 9, 8 }, + { 11, 10 }, + { -14, -20 }, + { 13, 12 }, + { -21, 14 }, + { -13, 15 }, + { 17, 16 }, + { -22, 18 }, + { -12, 19 }, + { -9, -10 }, + { -11, 20 }, + { -23, 21 }, + { -8, 22 }, + { -24, 23 }, + { -25, 24 }, + { -7, 25 }, + { -26, 26 }, + { 28, 27 }, + { -6, -27 }, + { -33, 29 }, + { -1, -28 }, + { -5, 30 }, + { -29, -30 }, + { -4, 31 }, + { -3, -31 }, + { -2, -32 } +}; +const int16_t huff_nodes_first_band_alpha_coarse[16][2] = { /* Alpha Coarse Huffman table df0 */ + { -9, 1 }, + { -8, 2 }, + { -10, 3 }, + { 5, 4 }, + { -7, 6 }, + { -11, 7 }, + { -5, 8 }, + { -6, 9 }, + { -12, 10 }, + { -13, 11 }, + { -4, 12 }, + { -14, 13 }, + { -3, 14 }, + { -15, 15 }, + { -2, -16 }, + { -1, -17 } +}; + + +const int16_t huff_nodes_alpha_1D_DF[64][2] = { /* Alpha Fine Huffman table df */ + { -33, 1 }, + { 3, 2 }, + { -32, -34 }, + { 5, 4 }, + { -31, -35 }, + { 7, 6 }, + { -30, 8 }, + { -36, 9 }, + { 11, 10 }, + { -37, 12 }, + { -29, 13 }, + { -28, 14 }, + { -38, 15 }, + { 17, 16 }, + { -27, -39 }, + { 19, 18 }, + { -26, 20 }, + { -40, 21 }, + { 23, 22 }, + { -41, 24 }, + { -25, 25 }, + { -24, 26 }, + { -42, 27 }, + { -43, 28 }, + { -23, 29 }, + { -44, 30 }, + { -22, 31 }, + { -45, 32 }, + { -21, 33 }, + { -20, 34 }, + { -46, 35 }, + { -19, 36 }, + { -47, 37 }, + { -18, -48 }, + { 39, 38 }, + { -17, -49 }, + { 41, 40 }, + { -16, 42 }, + { -1, -50 }, + { -65, 43 }, + { 45, 44 }, + { -51, 46 }, + { -15, 47 }, + { 49, 48 }, + { -52, 50 }, + { -14, 51 }, + { 53, 52 }, + { -13, 54 }, + { -53, 55 }, + { 57, 56 }, + { -12, 58 }, + { -54, 59 }, + { 61, 60 }, + { -55, 62 }, + { -11, 63 }, + { -10, -61 }, + { -5, -57 }, + { -58, -60 }, + { -56, -59 }, + { -4, -6 }, + { -7, -64 }, + { -9, -63 }, + { -3, -8 }, + { -2, -62 } +}; +const int16_t huff_nodes_alpha_1D_DF_coarse[32][2] = { /* Alpha Coarse Huffman table df */ + { -17, 1 }, + { -18, 2 }, + { -16, 3 }, + { -15, 4 }, + { -19, 5 }, + { 7, 6 }, + { -14, -20 }, + { 9, 8 }, + { -13, -21 }, + { 11, 10 }, + { -22, 12 }, + { -12, 13 }, + { -23, 14 }, + { -11, 15 }, + { -10, 16 }, + { -24, 17 }, + { -9, -25 }, + { 19, 18 }, + { -26, 20 }, + { -8, 21 }, + { 23, 22 }, + { 25, 24 }, + { -27, 26 }, + { -7, 27 }, + { -1, -33 }, + { -6, 28 }, + { -28, 29 }, + { -29, 30 }, + { -5, -31 }, + { -30, 31 }, + { -3, -4 }, + { -2, -32 } +}; + +const int16_t huff_nodes_alpha_1D_DT[64][2] = { /* Alpha Fine Huffman table dt */ + { -33, 1 }, + { -34, 2 }, + { -32, 3 }, + { 5, 4 }, + { -31, -35 }, + { 7, 6 }, + { -36, 8 }, + { -30, 9 }, + { 11, 10 }, + { -29, -37 }, + { 13, 12 }, + { 15, 14 }, + { -28, -38 }, + { 17, 16 }, + { -27, -39 }, + { 19, 18 }, + { -40, 20 }, + { -26, 21 }, + { 23, 22 }, + { -25, -41 }, + { 25, 24 }, + { -24, -42 }, + { 27, 26 }, + { -23, -43 }, + { 29, 28 }, + { -22, -44 }, + { 31, 30 }, + { -45, 32 }, + { -21, 33 }, + { -20, 34 }, + { -46, 35 }, + { -47, 36 }, + { -19, 37 }, + { -48, 38 }, + { -18, 39 }, + { 41, 40 }, + { -17, -49 }, + { 43, 42 }, + { -50, 44 }, + { -16, 45 }, + { 47, 46 }, + { -51, 48 }, + { -15, 49 }, + { 51, 50 }, + { -52, -65 }, + { -1, -14 }, + { 53, 52 }, + { -53, 54 }, + { -13, 55 }, + { 57, 56 }, + { -12, 58 }, + { -54, 59 }, + { 61, 60 }, + { -11, -55 }, + { -56, 62 }, + { -10, 63 }, + { -9, -57 }, + { -5, -6 }, + { -58, -61 }, + { -7, -59 }, + { -8, -62 }, + { -4, -60 }, + { -3, -64 }, + { -2, -63 } +}; +const int16_t huff_nodes_alpha_1D_DT_coarse[32][2] = { /* Alpha Coarse Huffman table dt */ + { -17, 1 }, + { -18, 2 }, + { -16, 3 }, + { -19, 4 }, + { -15, 5 }, + { 7, 6 }, + { -14, -20 }, + { 9, 8 }, + { -21, 10 }, + { -13, 11 }, + { 13, 12 }, + { -12, -22 }, + { 15, 14 }, + { -11, -23 }, + { 17, 16 }, + { -24, 18 }, + { -10, 19 }, + { -25, 20 }, + { -9, 21 }, + { 23, 22 }, + { -26, 24 }, + { -8, 25 }, + { 27, 26 }, + { -1, -33 }, + { -7, -27 }, + { 29, 28 }, + { -28, 30 }, + { -6, 31 }, + { -5, -29 }, + { -3, -31 }, + { -4, -30 }, + { -2, -32 } +}; + +const int16_t huff_nodes_first_band_beta[8][2] = /* Beta Fine Huffman table df0 */ + { { -1, 1 }, { -2, 2 }, { -3, 3 }, { -4, 4 }, { -5, 5 }, { -6, 6 }, { -7, 7 }, { -8, -9 } }; +const int16_t huff_nodes_first_band_beta_coarse[4][2] = /* Beta Coarse Huffman table df0 */ + { { -1, 1 }, { -2, 2 }, { -3, 3 }, { -4, -5 } }; + +const int16_t huff_nodes_beta_1D_DF[16][2] = /* Beta Fine Huffman table df */ + { { -9, 1 }, { -10, 2 }, { -8, 3 }, { -11, 4 }, { -7, 5 }, { 7, 6 }, { -6, -12 }, { 9, 8 }, { -5, -13 }, { 11, 10 }, { -4, -14 }, { -15, 12 }, { -3, 13 }, { -16, 14 }, { -2, 15 }, { -1, -17 } }; +const int16_t huff_nodes_beta_1D_DF_coarse[8][2] = /* Beta Coarse Huffman table df */ + { { -5, 1 }, { -6, 2 }, { -4, 3 }, { -3, 4 }, { -7, 5 }, { -2, 6 }, { -8, 7 }, { -1, -9 } }; + +const int16_t huff_nodes_beta_1D_DT[16][2] = /* Beta Fine Huffman table dt */ + { { -9, 1 }, { -10, 2 }, { -8, 3 }, { -11, 4 }, { -7, 5 }, { 7, 6 }, { -6, -12 }, { -13, 8 }, { -5, 9 }, { -14, 10 }, { -4, 11 }, { -15, 12 }, { -3, 13 }, { -16, 14 }, { -2, 15 }, { -1, -17 } }; +const int16_t huff_nodes_beta_1D_DT_coarse[8][2] = /* Beta Coarse Huffman table dt */ + { { -5, 1 }, { -6, 2 }, { -4, 3 }, { -7, 4 }, { -3, 5 }, { -8, 6 }, { -2, 7 }, { -1, -9 } }; + +HUFF_NODE_TABLE huff_nodes_df0 = { + { huff_nodes_first_band_alpha, huff_nodes_first_band_alpha_coarse }, + { huff_nodes_first_band_beta, huff_nodes_first_band_beta_coarse } +}; + +HUFF_NODE_TABLE huff_nodes_df = { + { huff_nodes_alpha_1D_DF, huff_nodes_alpha_1D_DF_coarse }, + { huff_nodes_beta_1D_DF, huff_nodes_beta_1D_DF_coarse } +}; + +HUFF_NODE_TABLE huff_nodes_dt = { + { huff_nodes_alpha_1D_DT, huff_nodes_alpha_1D_DT_coarse }, + { huff_nodes_beta_1D_DT, huff_nodes_beta_1D_DT_coarse } +}; diff --git a/lib_dec/ivas_rom_dec.h b/lib_dec/ivas_rom_dec.h index 4366077bbb3b45e0367057e36a01ae93c01512a5..7a19f170c0b00f12d5050d4224dcd05cc7960b98 100644 --- a/lib_dec/ivas_rom_dec.h +++ b/lib_dec/ivas_rom_dec.h @@ -68,7 +68,7 @@ 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 int16_t cna_init_bands[CNA_INIT_NBANDS + 1]; extern const float min_smooth_gains1[SBA_DIRAC_STEREO_NUM_BANDS]; extern const float max_smooth_gains1[SBA_DIRAC_STEREO_NUM_BANDS]; @@ -111,8 +111,8 @@ extern const float ap_lattice_coeffs_3[DIRAC_DECORR_FILTER_LEN_3 * DIRAC_MAX_NUM extern const float *const ap_lattice_coeffs[DIRAC_DECORR_NUM_SPLIT_BANDS]; extern const float ap_split_frequencies[DIRAC_DECORR_NUM_SPLIT_BANDS + 1]; -extern const int16_t sba_map_tc[8]; - +extern const int16_t sba_map_tc[11]; +extern const int16_t sba_map_tc_512[11]; /*----------------------------------------------------------------------------------* * FASTCONV and PARAMETRIC binaural renderer ROM tables @@ -121,4 +121,26 @@ extern const int16_t sba_map_tc[8]; extern const float dmxmtx_table[BINAURAL_CHANNELS][11]; +extern const int16_t huff_nodes_first_band_alpha[32][2]; +extern const int16_t huff_nodes_first_band_alpha_coarse[16][2]; + + +extern const int16_t huff_nodes_alpha_1D_DF[64][2]; +extern const int16_t huff_nodes_alpha_1D_DF_coarse[32][2]; + +extern const int16_t huff_nodes_alpha_1D_DT[64][2]; +extern const int16_t huff_nodes_alpha_1D_DT_coarse[32][2]; + +extern const int16_t huff_nodes_first_band_beta[8][2]; +extern const int16_t huff_nodes_first_band_beta_coarse[4][2]; + +extern const int16_t huff_nodes_beta_1D_DF[16][2]; +extern const int16_t huff_nodes_beta_1D_DF_coarse[8][2]; + +extern const int16_t huff_nodes_beta_1D_DT[16][2]; +extern const int16_t huff_nodes_beta_1D_DT_coarse[8][2]; +extern const HUFF_NODE_TABLE huff_nodes_df0; +extern const HUFF_NODE_TABLE huff_nodes_df; +extern const HUFF_NODE_TABLE huff_nodes_dt; + #endif diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec.c old mode 100755 new mode 100644 index 5377ad9402f4e5362be22a3aaed0a35bcd1bcbc8..ac8bb23541e85f11e8a6d506396d3f512ab4ef98 --- a/lib_dec/ivas_sba_dec.c +++ b/lib_dec/ivas_sba_dec.c @@ -47,7 +47,6 @@ #include "wmc_auto.h" -#ifdef FIX_386_CORECODER_RECONFIG /*-------------------------------------------------------------------* * ivas_sba_set_cna_cng_flag() * @@ -93,7 +92,6 @@ void ivas_sba_set_cna_cng_flag( return; } -#endif /*-------------------------------------------------------------------* @@ -110,113 +108,99 @@ ivas_error ivas_sba_dec_reconfigure( AUDIO_CONFIG intern_config_old; int16_t numCldfbAnalyses_old, numCldfbSyntheses_old; int16_t sba_dirac_stereo_flag_old; - SBA_MODE sba_mode_old; - int32_t ivas_total_brate, last_ivas_total_brate; + int32_t ivas_total_brate; + int32_t last_ivas_total_brate; + RENDERER_TYPE old_renderer_type; + DECODER_CONFIG_HANDLE hDecoderConfig; ivas_error error; - int16_t band_grouping[IVAS_MAX_NUM_BANDS + 1]; - error = IVAS_ERR_OK; hDecoderConfig = st_ivas->hDecoderConfig; ivas_total_brate = hDecoderConfig->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 ); - st_ivas->sba_mode = sba_mode_old; - /*-----------------------------------------------------------------* * 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 SBA_HPF_TUNING_DEC nchan_hp20_old = getNumChanSynthesis( st_ivas ); -#else - int16_t analysis_order_old; - analysis_order_old = ivas_sba_get_analysis_order( last_ivas_total_brate, st_ivas->sba_order ); - if ( analysis_order_old > 1 ) - { - nchan_hp20_old = 0; - } - else - { - nchan_hp20_old = st_ivas->nchan_transport; - } -#endif 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 ); - st_ivas->sba_mode = ivas_sba_mode_select( ivas_total_brate ); +#ifdef JBM_TSM_ON_TCS + /* save old */ + if ( st_ivas->hDirAC == NULL && st_ivas->hSpar != NULL ) + { + st_ivas->hTcBuffer->num_slots = st_ivas->hSpar->num_slots; + st_ivas->hTcBuffer->nb_subframes = st_ivas->hSpar->nb_subframes; + st_ivas->hTcBuffer->slots_rendered = st_ivas->hSpar->slots_rendered; + st_ivas->hTcBuffer->subframes_rendered = st_ivas->hSpar->subframes_rendered; + mvs2s( st_ivas->hSpar->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS ); + } + else if ( st_ivas->hDirAC != NULL ) + { + st_ivas->hTcBuffer->num_slots = st_ivas->hDirAC->num_slots; + st_ivas->hTcBuffer->nb_subframes = st_ivas->hDirAC->nb_subframes; + st_ivas->hTcBuffer->slots_rendered = st_ivas->hDirAC->slots_rendered; + st_ivas->hTcBuffer->subframes_rendered = st_ivas->hDirAC->subframes_rendered; + mvs2s( st_ivas->hDirAC->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS ); + } +#endif /*-----------------------------------------------------------------* * Allocate, initialize, and configure SBA handles *-----------------------------------------------------------------*/ + int16_t sba_order_internal; + SPAR_DEC_HANDLE hSpar; + hSpar = st_ivas->hSpar; - if ( st_ivas->sba_mode != SBA_MODE_SPAR ) - { - ivas_spar_dec_close( &( st_ivas->hSpar ), hDecoderConfig->output_Fs, 0 ); + sba_order_internal = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); - 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 ) + if ( hSpar != NULL ) + { + if ( ( hSpar->hPCA != NULL ) && ( ( hDecoderConfig->ivas_total_brate != PCA_BRATE ) || ( sba_order_internal != 1 ) ) ) { - return error; + free( st_ivas->hSpar->hPCA ); + hSpar->hPCA = NULL; } -#ifdef SBA2MONO - st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas ); -#else - st_ivas->sba_dirac_stereo_flag = ( st_ivas->nchan_transport == 1 && hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ); -#endif - } - else - { - int16_t sba_order_internal; - SPAR_DEC_HANDLE hSpar = st_ivas->hSpar; - - sba_order_internal = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); - - if ( hSpar != NULL ) + if ( nchan_transport_old != ivas_get_sba_num_TCs( ivas_total_brate, sba_order_internal ) || ( last_ivas_total_brate >= IVAS_512k && ivas_total_brate < IVAS_512k ) || ( last_ivas_total_brate < IVAS_512k && ivas_total_brate >= IVAS_512k ) ) { - if ( ( hSpar->hPCA != NULL ) && ( ( hDecoderConfig->ivas_total_brate != PCA_BRATE ) || ( sba_order_internal != 1 ) ) ) - { - free( st_ivas->hSpar->hPCA ); - hSpar->hPCA = NULL; - } - if ( nchan_transport_old != ivas_get_sba_num_TCs( ivas_total_brate, sba_order_internal ) ) - { - - ivas_spar_dec_close( &( st_ivas->hSpar ), hDecoderConfig->output_Fs, 1 ); + 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_spar_dec_open( st_ivas, 0 ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_spar_dec_open( st_ivas, 1 ) ) != IVAS_ERR_OK ) { return error; } } - hSpar = st_ivas->hSpar; -#ifdef SBA2MONO - st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas ); -#else - st_ivas->sba_dirac_stereo_flag = 0; -#endif + 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_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 ); +#ifdef JBM_TSM_ON_TCS + /* synchronize subframe info */ + st_ivas->hSpar->num_slots = st_ivas->hTcBuffer->num_slots; + st_ivas->hSpar->nb_subframes = st_ivas->hTcBuffer->nb_subframes; + st_ivas->hSpar->slots_rendered = st_ivas->hTcBuffer->slots_rendered; + st_ivas->hSpar->subframes_rendered = st_ivas->hTcBuffer->subframes_rendered; + mvs2s( st_ivas->hTcBuffer->subframe_nbslots, st_ivas->hSpar->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS ); +#endif if ( st_ivas->nchan_transport == 1 ) { st_ivas->element_mode_init = IVAS_SCE; @@ -281,7 +265,7 @@ ivas_error ivas_sba_dec_reconfigure( ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin ); } - 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 ) ) ) ) + 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 ) ) || ( last_ivas_total_brate > IVAS_256k && ivas_total_brate <= IVAS_256k ) || ( last_ivas_total_brate <= IVAS_256k && ivas_total_brate > IVAS_256k ) ) { DIRAC_CONFIG_FLAG flag_config; @@ -289,44 +273,46 @@ ivas_error ivas_sba_dec_reconfigure( if ( st_ivas->hDirAC != NULL ) { flag_config = DIRAC_RECONFIGURE_MODE; - if ( ( sba_mode_old == st_ivas->sba_mode ) && ( st_ivas->sba_mode != SBA_MODE_SPAR ) ) - { - flag_config = DIRAC_RECONFIGURE; - } } if ( ( error = ivas_dirac_dec_config( st_ivas, flag_config ) ) != IVAS_ERR_OK ) { return error; } +#ifdef JBM_TSM_ON_TCS + /* synchronize subframe info */ + st_ivas->hDirAC->num_slots = st_ivas->hTcBuffer->num_slots; + st_ivas->hDirAC->nb_subframes = st_ivas->hTcBuffer->nb_subframes; + st_ivas->hDirAC->slots_rendered = st_ivas->hTcBuffer->slots_rendered; + st_ivas->hDirAC->subframes_rendered = st_ivas->hTcBuffer->subframes_rendered; + mvs2s( st_ivas->hTcBuffer->subframe_nbslots, st_ivas->hDirAC->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS ); +#endif } - if ( st_ivas->sba_mode == SBA_MODE_SPAR ) - { - 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 ) || ( 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 ) ) ) + 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_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order ) ? IVAS_MAX_NUM_BANDS : ( IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ) + + ) ) != IVAS_ERR_OK ) { - 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 ); + return error; } - else if ( st_ivas->renderer_type == RENDERER_DISABLE || ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC && st_ivas->sba_mode != SBA_MODE_SPAR ) ) + if ( st_ivas->renderer_type == RENDERER_DISABLE ) { ivas_dirac_dec_close( &( st_ivas->hDirAC ) ); vbap_free_data( &( st_ivas->hVBAPdata ) ); } - if ( st_ivas->hDirAC != NULL && st_ivas->sba_mode == SBA_MODE_SPAR ) + if ( st_ivas->hDirAC != NULL ) { 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; @@ -350,6 +336,18 @@ ivas_error ivas_sba_dec_reconfigure( return error; } + /*-----------------------------------------------------------------* + * 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 *-----------------------------------------------------------------*/ @@ -359,5 +357,175 @@ ivas_error ivas_sba_dec_reconfigure( return error; } +#ifdef JBM_TSM_ON_TCS + /*-----------------------------------------------------------------* + * TC buffer + *-----------------------------------------------------------------*/ + if ( st_ivas->hDecoderConfig->voip_active == 1 ) + { + int16_t tc_nchan_to_allocate; + int16_t tc_nchan_tc; + TC_BUFFER_MODE tc_buffer_mode; + + tc_buffer_mode = TC_BUFFER_MODE_RENDERER; + tc_nchan_tc = ivas_jbm_dec_get_num_tc_channels( st_ivas ); + tc_nchan_to_allocate = tc_nchan_tc; + if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO ) + { + tc_buffer_mode = TC_BUFFER_MODE_BUFFER; + tc_nchan_tc = st_ivas->hDecoderConfig->nchan_out; + tc_nchan_to_allocate = tc_nchan_tc; + } + else if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC ) + { + tc_nchan_to_allocate = 2 * BINAURAL_CHANNELS; + } + else if ( st_ivas->sba_mode == SBA_MODE_SPAR ) + { + tc_nchan_to_allocate = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order, + st_ivas->hDecoderConfig->ivas_total_brate ); + } + 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 ) ) ) + { + tc_nchan_to_allocate++; /* we need a channel for the CNG in this case*/ + } + } + + if ( tc_nchan_tc != st_ivas->hTcBuffer->nchan_transport_jbm || tc_nchan_to_allocate != st_ivas->hTcBuffer->nchan_transport_internal || tc_buffer_mode != st_ivas->hTcBuffer->tc_buffer_mode ) + { + if ( ( error = ivas_jbm_dec_tc_buffer_reconfigure( st_ivas, tc_buffer_mode, tc_nchan_tc, tc_nchan_to_allocate, tc_nchan_to_allocate, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK ) + { + return error; + } + } + } +#endif + return error; +} + +#ifdef JBM_TSM_ON_TCS +ivas_error ivas_sba_dec_digest_tc( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + const int16_t nCldfbSlots, /* i : number of CLDFB slots */ + const int16_t nSamplesForRendering /* i : number of samples provided */ +) +{ + + int16_t ch_idx; + ivas_error error; + + error = IVAS_ERR_OK; + + /* set the md map */ + if ( st_ivas->hDirAC && !( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC && st_ivas->sba_mode == SBA_MODE_DIRAC ) ) + { + ivas_dirac_dec_set_md_map( st_ivas, nCldfbSlots ); + } + if ( st_ivas->sba_mode == SBA_MODE_SPAR ) + { + ivas_spar_dec_digest_tc( st_ivas, st_ivas->nchan_transport, nCldfbSlots, nSamplesForRendering ); + } + if ( st_ivas->hDiracDecBin != NULL && ( st_ivas->hDiracDecBin->useTdDecorr ) ) + { + int16_t nSamplesLeftForTD, default_frame; + float *decorr_signal[BINAURAL_CHANNELS]; + float *p_tc[2 * BINAURAL_CHANNELS]; + default_frame = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC ); + nSamplesLeftForTD = nSamplesForRendering; + for ( ch_idx = 0; ch_idx < BINAURAL_CHANNELS; ch_idx++ ) + { + decorr_signal[ch_idx] = st_ivas->hTcBuffer->tc[ch_idx + BINAURAL_CHANNELS]; + p_tc[ch_idx] = st_ivas->hTcBuffer->tc[ch_idx]; + } + while ( nSamplesLeftForTD ) + { + int16_t nSamplesToDecorr = min( nSamplesLeftForTD, default_frame ); + ivas_td_decorr_process( st_ivas->hDiracDecBin->hTdDecorr, p_tc, decorr_signal, nSamplesToDecorr ); + for ( ch_idx = 0; ch_idx < BINAURAL_CHANNELS; ch_idx++ ) + { + decorr_signal[ch_idx] += nSamplesToDecorr; + p_tc[ch_idx] += nSamplesToDecorr; + } + nSamplesLeftForTD -= nSamplesToDecorr; + } + } + /* if we have a late CNG generation, do it here */ + if ( st_ivas->nchan_transport == 1 && st_ivas->hSCE[0]->hCoreCoder[0] != NULL && st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag && st_ivas->sba_mode != SBA_MODE_SPAR ) + { + Decoder_State *st = st_ivas->hSCE[0]->hCoreCoder[0]; + generate_masking_noise_lb_dirac( st->hFdCngDec->hFdCngCom, st_ivas->hTcBuffer->tc[1], nCldfbSlots, st->cna_dirac_flag && st->flag_cna ); + } return error; } + +void ivas_sba_dec_render( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + const uint16_t nSamplesAsked, /* i : number of CLDFB slots requested */ + uint16_t *nSamplesRendered, /* o : number of CLDFB slots rendered */ + uint16_t *nSamplesAvailable, /* o : number of CLDFB slots still to render */ + float *output_f[] /* o : rendered time signal */ +) +{ + int16_t slots_to_render, first_sf, last_sf, subframe_idx; + uint16_t slot_size, ch; + uint16_t nchan_internal, nchan_out; + SPAR_DEC_HANDLE hSpar; + float *output_f_local[MAX_OUTPUT_CHANNELS]; + + hSpar = st_ivas->hSpar; + nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order, + st_ivas->hDecoderConfig->ivas_total_brate ); + nchan_out = st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe; +#ifdef DEBUGGING + assert( hSpar ); +#endif + for ( ch = 0; ch < nchan_out; ch++ ) + { + output_f_local[ch] = output_f[ch]; + } + slot_size = NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ); + /* loop for synthesis, assume we always have to render in multiples of 5ms subframes with spills */ + slots_to_render = min( hSpar->num_slots - hSpar->slots_rendered, nSamplesAsked / slot_size ); + *nSamplesRendered = slots_to_render * slot_size; + first_sf = hSpar->subframes_rendered; + last_sf = first_sf; + while ( slots_to_render > 0 ) + { + slots_to_render -= hSpar->subframe_nbslots[last_sf]; + last_sf++; + } +#ifdef DEBUGGING + assert( slots_to_render == 0 ); +#endif + for ( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ ) + { + int16_t n_samples_sf = slot_size * hSpar->subframe_nbslots[subframe_idx]; + ivas_spar_dec_upmixer_sf( st_ivas, output_f_local, nchan_internal ); + for ( ch = 0; ch < nchan_out; ch++ ) + { + output_f_local[ch] += n_samples_sf; + } + } + + if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC ) + { + ivas_sba_linear_renderer( output_f, *nSamplesRendered, st_ivas->hIntSetup.nchan_out_woLFE, st_ivas->hDecoderConfig->output_config, st_ivas->hOutSetup, st_ivas->hoa_dec_mtx ); + } + if ( st_ivas->hDirAC != NULL && hSpar->slots_rendered == hSpar->num_slots ) + { + if ( st_ivas->hDirAC->hConfig->dec_param_estim == 1 ) + { + st_ivas->hDirAC->dirac_read_idx = ( st_ivas->hDirAC->dirac_read_idx + DEFAULT_JBM_CLDFB_TIMESLOTS ) % st_ivas->hDirAC->dirac_md_buffer_length; + } + else + { + st_ivas->hDirAC->dirac_read_idx = ( st_ivas->hDirAC->dirac_read_idx + DEFAULT_JBM_SUBFRAMES_5MS ) % st_ivas->hDirAC->dirac_md_buffer_length; + } + } + *nSamplesAvailable = ( hSpar->num_slots - hSpar->slots_rendered ) * slot_size; + + return; +} +#endif diff --git a/lib_dec/ivas_sba_dirac_stereo_dec.c b/lib_dec/ivas_sba_dirac_stereo_dec.c index 82ccaceea92e266ab569af6a080a9cb4cebebf76..3ae546193244df0d048fa8579a0048aabf2ef25b 100644 --- a/lib_dec/ivas_sba_dirac_stereo_dec.c +++ b/lib_dec/ivas_sba_dirac_stereo_dec.c @@ -45,7 +45,6 @@ #include "wmc_auto.h" -#ifdef SBA2MONO /*-------------------------------------------------------------------* * ivas_get_sba_dirac_stereo_flag() * @@ -82,7 +81,6 @@ int16_t ivas_get_sba_dirac_stereo_flag( return sba_dirac_stereo_flag; } -#endif /*-------------------------------------------------------------------* @@ -493,22 +491,17 @@ static void ivas_sba_dirac_stereo_upmix_hb( 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 */ -#ifdef SBA2MONO - const int16_t sba_mono_flag, /* i : flag for mono output */ - const int16_t bwidth, /* i : bandwidth of signal */ -#endif - const STEREO_DFT_DEC_DATA_HANDLE hStereoDft /* i : Stereo DFT handle for mixing matrix */ + 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; -#ifdef SBA2MONO float gp, gm; float gain_fac; -#endif if ( !mcmasa ) { -#ifdef SBA2MONO 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 ) { @@ -579,38 +572,6 @@ static void ivas_sba_dirac_stereo_upmix_hb( hb_stereo_synth[1][i] = 0.5f * hb_synth[i] * gain_fac * gm; } } -#else - for ( i = 0; i < output_frame / 2; i++ ) - { - float 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] + - hStereoDft->mixer_mat_smooth[0][0][11] + hStereoDft->mixer_mat_smooth[1][0][11]; - - float 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] + - hStereoDft->mixer_mat_smooth[0][0][11] - hStereoDft->mixer_mat_smooth[1][0][11]; - - hb_stereo_synth[0][i] = 0.5f * hb_synth[i] * 0.25f * gp; - hb_stereo_synth[1][i] = 0.5f * hb_synth[i] * 0.25f * gm; - } - for ( i = output_frame / 2; i < output_frame; i++ ) - { - float 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] + - hStereoDft->mixer_mat_smooth[0][0][11 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][0][11 + IVAS_MAX_NUM_BANDS]; - - float 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] + - hStereoDft->mixer_mat_smooth[0][0][11 + IVAS_MAX_NUM_BANDS] - hStereoDft->mixer_mat_smooth[1][0][11 + IVAS_MAX_NUM_BANDS]; - - hb_stereo_synth[0][i] = 0.5f * hb_synth[i] * 0.25f * gp; - hb_stereo_synth[1][i] = 0.5f * hb_synth[i] * 0.25f * gm; - } -#endif } else { @@ -732,6 +693,10 @@ void ivas_sba_dirac_stereo_smooth_parameters( 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 */ +#ifdef FIX_STEREO_474 + , + const int16_t num_md_sub_frames /* i : number of subframes in mixing matrix */ +#endif ) { int16_t i, j, k, i_sf; @@ -771,6 +736,9 @@ void ivas_sba_dirac_stereo_smooth_parameters( float xfade_start_ns; int16_t xfade_delay_subframes; int16_t i_hist; +#ifdef FIX_STEREO_474 + int16_t md_sf; +#endif 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 ) ); @@ -781,6 +749,11 @@ void ivas_sba_dirac_stereo_smooth_parameters( { for ( i_sf = k * 2; i_sf < ( k + 1 ) * 2; i_sf++ ) { + +#ifdef FIX_STEREO_474 + md_sf = ( num_md_sub_frames == MAX_PARAM_SPATIAL_SUBFRAMES ) ? i_sf : 0; +#endif + if ( hStereoDft->first_frame ) { for ( i = 0; i < 2; i++ ) @@ -825,7 +798,11 @@ void ivas_sba_dirac_stereo_smooth_parameters( { for ( b = 0; b < hStereoDft->nbands; b++ ) { +#ifdef FIX_STEREO_474 + hMdDec->mixer_mat_prev[4][i][j][b] = hMdDec->mixer_mat[i][j][b + md_sf * IVAS_MAX_NUM_BANDS]; +#else hMdDec->mixer_mat_prev[4][i][j][b] = hMdDec->mixer_mat[i][j][b + i_sf * IVAS_MAX_NUM_BANDS]; +#endif } } } @@ -853,9 +830,7 @@ void ivas_sba_dirac_stereo_dec( ) { int16_t dtx_flag, fd_cng_flag; -#ifdef SBA2MONO int16_t sba_mono_flag; -#endif int16_t memOffset; float tmp_buf[NS2SA( 48000, IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS )]; float tmp_synth[L_FRAME16k]; @@ -880,9 +855,7 @@ void ivas_sba_dirac_stereo_dec( dtx_flag = ( hSCE->hCoreCoder[0]->core_brate <= SID_2k40 ); fd_cng_flag = ( dtx_flag && hSCE->hCoreCoder[0]->cng_type == FD_CNG ); } -#ifdef SBA2MONO sba_mono_flag = ( st_ivas->hDecoderConfig->nchan_out == 1 ) ? 1 : 0; -#endif memOffset = NS2SA( output_frame * FRAMES_PER_SEC, IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS ); @@ -921,39 +894,31 @@ void ivas_sba_dirac_stereo_dec( } /* DFT Stereo upmix */ -#ifdef SBA2MONO stereo_dft_dec( hStereoDft, hCPE->hCoreCoder[0], DFT, NULL, NULL, 1 /*st_ivas->sba_dirac_stereo_flag*/, sba_mono_flag, -#else - stereo_dft_dec( hStereoDft, hCPE->hCoreCoder[0], DFT, NULL, NULL, 1, /*st_ivas->sba_dirac_stereo_flag*/ -#endif - ( st_ivas->hSpar != NULL && !mcmasa ) ? st_ivas->hSpar->hMdDec : 0, + ( 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 ); + st_ivas->hDecoderConfig->output_Fs, st_ivas->nchan_transport +#ifdef FIX_STEREO_474 + , + ivas_get_spar_dec_md_num_subframes( st_ivas->sba_order, st_ivas->hDecoderConfig->ivas_total_brate ) +#endif + ); /* DFT synthesis */ stereo_dft_dec_synthesize( hCPE, DFT, 0, output[0], output_frame ); -#ifdef SBA2MONO if ( !sba_mono_flag ) { stereo_dft_dec_synthesize( hCPE, DFT, 1, output[1], output_frame ); } -#else - stereo_dft_dec_synthesize( hCPE, DFT, 1, output[1], output_frame ); -#endif synchro_synthesis( st_ivas->hDecoderConfig->ivas_total_brate, hCPE, output, output_frame, 1 /*st_ivas->sba_dirac_stereo_flag*/ ); /* output scaling */ -#ifdef SBA2MONO if ( !sba_mono_flag ) { v_multc( output[0], 0.5f, output[0], output_frame ); v_multc( output[1], 0.5f, output[1], output_frame ); } -#else - v_multc( output[0], 0.5f, output[0], output_frame ); - v_multc( output[1], 0.5f, output[1], output_frame ); -#endif /* delay HB synth */ if ( st_ivas->nchan_transport == 1 ) @@ -970,26 +935,18 @@ void ivas_sba_dirac_stereo_dec( 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, -#ifdef SBA2MONO ( st_ivas->sba_mode != SBA_MODE_SPAR || mcmasa ), sba_mono_flag, hSCE->hCoreCoder[0]->bwidth, hStereoDft ); -#else - ( st_ivas->sba_mode != SBA_MODE_SPAR || mcmasa ), hStereoDft ); -#endif /* add HB to ACELP core */ v_add( output[0], hb_synth_stereo[0], output[0], output_frame ); -#ifdef SBA2MONO if ( !sba_mono_flag ) { -#endif 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, ( st_ivas->sba_mode == SBA_MODE_SPAR && !mcmasa ) ); -#ifdef SBA2MONO } -#endif } return; diff --git a/lib_dec/ivas_sba_rendering_internal.c b/lib_dec/ivas_sba_rendering_internal.c index a80986b39e7a41caf4b8a0844ac63951e90517a0..71a5718436251a496db1f5644969f05c6c1a7c6c 100644 --- a/lib_dec/ivas_sba_rendering_internal.c +++ b/lib_dec/ivas_sba_rendering_internal.c @@ -65,7 +65,10 @@ void ivas_sba2mc_cldfb( 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 */ +#ifdef JBM_TSM_ON_TCS + const int16_t nb_timeslots, /* i : number of time slots to process */ +#endif + const float *hoa_dec_mtx /* i : HOA decoding mtx */ ) { int16_t iBlock, iBand, n, m; @@ -89,7 +92,11 @@ void ivas_sba2mc_cldfb( g = hoa_dec_mtx[SBA_NHARM_HOA3 * n + m]; p_realOut = realOut[n]; p_imagOut = imagOut[n]; +#ifdef JBM_TSM_ON_TCS + for ( iBlock = 0; iBlock < nb_timeslots; iBlock++ ) +#else for ( iBlock = 0; iBlock < MAX_PARAM_SPATIAL_SUBFRAMES; iBlock++ ) +#endif { p_real = RealBuffer[m][iBlock]; p_imag = ImagBuffer[m][iBlock]; @@ -108,7 +115,11 @@ void ivas_sba2mc_cldfb( { p_realOut = realOut[n]; p_imagOut = imagOut[n]; +#ifdef JBM_TSM_ON_TCS + for ( iBlock = 0; iBlock < nb_timeslots; iBlock++ ) +#else for ( iBlock = 0; iBlock < MAX_PARAM_SPATIAL_SUBFRAMES; iBlock++ ) +#endif { p_real = RealBuffer[n][iBlock]; p_imag = ImagBuffer[n][iBlock]; @@ -133,11 +144,16 @@ void ivas_sba2mc_cldfb( *-------------------------------------------------------------------------*/ void ivas_mc2sba( - IVAS_OUTPUT_SETUP hIntSetup, /* i : Format of decoder output */ + IVAS_OUTPUT_SETUP hIntSetup, /* i : Format of decoder output */ +#ifdef JBM_TSM_ON_TCS + float *in_buffer_td[], /* i : MC signals (on input) and the HOA3 (on output) */ + float *buffer_td[], /* i/o: MC signals (on input) and the HOA3 (on output) */ +#else 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 */ +#endif + 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; @@ -168,7 +184,11 @@ void ivas_mc2sba( /* Add LFE to omni W with gain*/ for ( k = 0; k < output_frame; k++ ) { +#ifdef JBM_TSM_ON_TCS + buffer_tmp[0][k] += gain_lfe * in_buffer_td[i][k]; +#else buffer_tmp[0][k] += gain_lfe * buffer_td[i][k]; +#endif } } @@ -194,7 +214,11 @@ void ivas_mc2sba( { for ( k = 0; k < output_frame; k++ ) { +#ifdef JBM_TSM_ON_TCS + buffer_tmp[j][k] += gains[j] * in_buffer_td[i][k]; +#else buffer_tmp[j][k] += gains[j] * buffer_td[i][k]; +#endif } } } @@ -279,7 +303,11 @@ int16_t ivas_sba_remapTCs( *-------------------------------------------------------------------------*/ void ivas_ism2sba( - float buffer_td[][L_FRAME48k], /* i/o: TD signal buffers */ +#ifdef JBM_TSM_ON_TCS + float *buffer_td[], /* i/o: TD signal buffers */ +#else + float buffer_td[][L_FRAME48k], /* i/o: TD signal buffers */ +#endif 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 */ @@ -335,6 +363,59 @@ void ivas_ism2sba( return; } +#ifdef JBM_TSM_ON_TCS +/*-------------------------------------------------------------------------* + * ivas_ism2sba() + * + * ISM transformed into SBA in TD domain. + *-------------------------------------------------------------------------*/ + +void ivas_ism2sba_sf( + float *buffer_in[], /* i : TC buffer */ + float *buffer_out[], /* o : TD signal buffers */ + ISM_RENDERER_HANDLE hIsmRendererData, /* i/o: renderer data */ + const int16_t num_objects, /* i : number of objects */ + const int16_t n_samples_to_render, /* i : output frame length per channel */ + const int16_t offset, /* i : offset for the interpolatr */ + const int16_t sba_order /* i : Ambisonic (SBA) order */ +) +{ + int16_t i, j, k; + float g1, *g2, *tc, *out, gain, prev_gain; + 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_out[j], n_samples_to_render ); + } + + for ( i = 0; i < num_objects; i++ ) + { + for ( j = 0; j < sba_num_chans; j++ ) + { + g2 = hIsmRendererData->interpolator + offset; + g1 = 1 - *g2; + tc = buffer_in[i] + offset; + out = buffer_out[j]; + gain = hIsmRendererData->gains[i][j]; + prev_gain = hIsmRendererData->prev_gains[i][j]; + for ( k = 0; k < n_samples_to_render; k++ ) + { + *( out++ ) += ( ( *( g2++ ) ) * gain + g1 * prev_gain ) * ( *( tc++ ) ); + g1 = 1.0f - *g2; + } + } + } + + return; +} +#endif /*-------------------------------------------------------------------* * ivas_sba_upmixer_renderer() @@ -348,13 +429,19 @@ void ivas_sba_upmixer_renderer( const int16_t output_frame /* i : output frame length */ ) { - int16_t i, nchan_internal; + + int16_t nchan_internal; +#ifndef JBM_TSM_ON_TCS + int16_t i; float temp; +#endif push_wmops( "ivas_sba_upmixer_renderer" ); - nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order ); + nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order, + st_ivas->hDecoderConfig->ivas_total_brate ); +#ifndef JBM_TSM_ON_TCS if ( st_ivas->nchan_transport >= 3 ) { /*convert WYZX downmix to WYXZ*/ @@ -365,15 +452,25 @@ void ivas_sba_upmixer_renderer( output[3][i] = temp; } } +#endif /* Upmixer + Renderer */ ivas_spar_dec_upmixer( st_ivas, output, nchan_internal, output_frame ); if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC ) { +#ifdef JBM_TSM_ON_TCS + float *output_f[MAX_OUTPUT_CHANNELS]; + int16_t ch; + for ( ch = 0; ch < MAX_OUTPUT_CHANNELS; ch++ ) + { + output_f[ch] = output[ch]; + } + ivas_sba_linear_renderer( output_f, output_frame, st_ivas->hIntSetup.nchan_out_woLFE, st_ivas->hDecoderConfig->output_config, st_ivas->hOutSetup, st_ivas->hoa_dec_mtx ); +#else 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 ); +#endif } - pop_wmops(); return; @@ -387,7 +484,11 @@ void ivas_sba_upmixer_renderer( *-------------------------------------------------------------------*/ static void ivas_sba_mtx_mult( - float output_f[][L_FRAME48k], /* i/o: synthesized core-coder transport channels/DirAC output */ +#ifdef JBM_TSM_ON_TCS + float *output_f[], /* i/o: synthesized core-corder transport channels/DirAC output */ +#else + float output_f[][L_FRAME48k], /* i/o: synthesized core-corder transport channels/DirAC output */ +#endif 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 */ @@ -447,7 +548,11 @@ static void ivas_sba_mtx_mult( *-------------------------------------------------------------------*/ ivas_error ivas_sba_linear_renderer( - float output_f[][L_FRAME48k], /* i/o: synthesized core-coder transport channels/DirAC output */ +#ifdef JBM_TSM_ON_TCS + float *output_f[], /* i/o: synthesized core-coder transport channels/DirAC output */ +#else + float output_f[][L_FRAME48k], /* i/o: synthesized core-coder transport channels/DirAC output */ +#endif 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 */ @@ -581,7 +686,8 @@ void ivas_sba_mix_matrix_determiner( /* 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 ); + ivas_spar_dec_gen_umx_mat( hSpar->hMdDec, nchan_transport, num_bands_out, bfi, + MAX_PARAM_SPATIAL_SUBFRAMES ); return; } diff --git a/lib_dec/ivas_sce_dec.c b/lib_dec/ivas_sce_dec.c index 064cdbb4e093afee49f03aec8b479615008039f5..97a9b8189561c02b52568353f64d4d0cde103382 100755 --- a/lib_dec/ivas_sce_dec.c +++ b/lib_dec/ivas_sce_dec.c @@ -77,11 +77,7 @@ 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; -#ifdef DISCRETE_ISM_DTX_CNG if ( st_ivas->ivas_format == ISM_FORMAT ) -#else - if ( st_ivas->ism_mode == ISM_MODE_PARAM ) -#endif { st->cng_type = FD_CNG; } @@ -91,30 +87,24 @@ ivas_error ivas_sce_dec( *-----------------------------------------------------------------*/ /* 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!" ); + + if ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->hISMDTX.sce_id_dtx != sce_id ) + { + st->total_brate = FRAME_NO_DATA; + } } - else if ( !st_ivas->bfi && ivas_total_brate <= SID_2k40 ) + else if ( !st_ivas->bfi && ivas_total_brate == FRAME_NO_DATA ) { - st->total_brate = ivas_total_brate; + st->total_brate = FRAME_NO_DATA; } -#ifdef DISCRETE_ISM_DTX_CNG 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; } -#else - else if ( !st_ivas->bfi && ( last_ivas_total_brate <= SID_2k40 || last_ivas_total_brate == IVAS_SID_5k2 ) ) - { - /* check if this is indeed needed? */ - if ( st_ivas->ivas_format != ISM_FORMAT ) - { - st->total_brate = hSCE->element_brate - nb_bits_metadata * FRAMES_PER_SEC; - } - } -#endif /* read the bandwidth */ if ( st_ivas->bfi || st->total_brate <= SID_2k40 ) @@ -181,11 +171,16 @@ 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; + + if ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->hISMDTX.sce_id_dtx != sce_id ) + { + st->total_brate = FRAME_NO_DATA; + } } - else if ( !st_ivas->bfi && ivas_total_brate <= SID_2k40 ) + else if ( !st_ivas->bfi && ivas_total_brate == FRAME_NO_DATA ) { st->total_brate = ivas_total_brate; } @@ -365,11 +360,7 @@ ivas_error create_sce_dec( return error; } -#ifdef SBA2MONO 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 ) ) ) -#else - if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ) -#endif { if ( ( error = openCldfb( &st->cldfbSynHB, CLDFB_SYNTHESIS, st->output_Fs, CLDFB_PROTOTYPE_1_25MS ) ) != IVAS_ERR_OK ) { diff --git a/lib_dec/ivas_sns_dec.c b/lib_dec/ivas_sns_dec.c index 7aecb898d139a033876c4916c8ec4aebadeaab30..e11551d2a603439892d7d0589a20ffebe908d8d7 100644 --- a/lib_dec/ivas_sns_dec.c +++ b/lib_dec/ivas_sns_dec.c @@ -35,6 +35,9 @@ #include "prot.h" #include "ivas_prot.h" #include "rom_com.h" +#include "ivas_rom_com.h" +#include "ivas_cnst.h" +#include #include "wmc_auto.h" /*------------------------------------------------------------------- @@ -45,24 +48,45 @@ static void sns_1st_dec( const int16_t index, /* i : codebook index */ - float *snsq /* i/o: i:prediction o:quantized sns */ + const int16_t core, + const int16_t L_frame, + float *snsq /* i/o: i:prediction o:quantized sns */ ) { int16_t i; - const float *p_dico; + const int16_t *p_dico, *means; + const float cdbk_fix2float = 1.f / powf( 2, SNS_CDBKS_BITS_4_FRAC ); + const float means_fix2float = 1.f / powf( 2, SNS_MEANS_BITS_4_FRAC ); - p_dico = &sns_vq_cdk1[( index % 32 ) * ( M / 2 )]; + means = NULL; + switch ( L_frame ) + { + case L_FRAME16k: + means = &sns_1st_means_16k[core - 1][0]; + break; + case L_FRAME25_6k: + means = &sns_1st_means_25k6[core - 1][0]; + break; + case L_FRAME32k: + means = &sns_1st_means_32k[core - 1][0]; + break; + default: + assert( !"illegal frame length in sns_1st_cod" ); + } + + + p_dico = &sns_1st_cdbk[0][core - 1][0] + ( index % 32 ) * ( M / 2 ); for ( i = 0; i < M / 2; i++ ) { - snsq[i] = *p_dico++; + snsq[i] = ( *p_dico++ ) * cdbk_fix2float + means[i] * means_fix2float; } - p_dico = &sns_vq_cdk2[( index >> 5 ) * ( M / 2 )]; + p_dico = &sns_1st_cdbk[1][core - 1][0] + ( index >> 5 ) * ( M / 2 ); for ( i = M / 2; i < M; i++ ) { - snsq[i] = *p_dico++; + snsq[i] = ( *p_dico++ ) * cdbk_fix2float + means[i] * means_fix2float; } return; @@ -103,29 +127,23 @@ 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 */ + float SNS_Q[NB_DIV][M], /* o : Quantized SNS vectors */ + const int16_t L_frame, const int16_t numlpc /* i : Number of sets of lpc */ ) { int16_t i, nbi, last; int16_t q_type; - /* Last LPC index */ - if ( numlpc == 1 ) - { - last = 0; - } - else - { - last = M; - } + /* go from one-based indexing to zero-based indexing */ + last = numlpc - 1; index++; /* Decode last LPC */ - sns_1st_dec( *index++, &SNS_Q[last] ); - sns_2st_dec( &SNS_Q[last], index ); + sns_1st_dec( *index++, numlpc, L_frame, SNS_Q[last] ); + sns_2st_dec( SNS_Q[last], index ); nbi = 2 + index[0] + index[1]; index += nbi; @@ -136,16 +154,16 @@ void sns_avq_dec( if ( q_type == 0 ) { - sns_1st_dec( *index++, &SNS_Q[0] ); - sns_2st_dec( &SNS_Q[0], index ); + sns_1st_dec( *index++, numlpc, L_frame, SNS_Q[0] ); + sns_2st_dec( SNS_Q[0], index ); } else if ( q_type == 1 ) { for ( i = 0; i < M; i++ ) { - SNS_Q[i] = SNS_Q[M + i]; + SNS_Q[0][i] = SNS_Q[0][M + i]; } - sns_2st_dec( &SNS_Q[0], index ); + sns_2st_dec( SNS_Q[0], index ); } } @@ -160,10 +178,11 @@ 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) */ + const int16_t L_frame, + float *SNS_Ql, /* o : Quantized SNS vectors (left channel) */ + float *SNS_Qr /* o : Quantized SNS vectors (right channe) */ ) { int16_t i, stereo_mode; @@ -176,7 +195,7 @@ void sns_avq_dec_stereo( { /* MS coding */ - sns_1st_dec( *indexl++, mid_q ); + sns_1st_dec( *indexl++, TCX_20_CORE, L_frame, mid_q ); sns_2st_dec( mid_q, indexl ); for ( i = 0; i < M; i++ ) @@ -199,12 +218,75 @@ void sns_avq_dec_stereo( { /* LR decoding */ - sns_1st_dec( *indexl++, SNS_Ql ); + sns_1st_dec( *indexl++, TCX_20_CORE, L_frame, SNS_Ql ); sns_2st_dec( SNS_Ql, indexl ); - sns_1st_dec( *indexr++, SNS_Qr ); + sns_1st_dec( *indexr++, TCX_20_CORE, L_frame, SNS_Qr ); sns_2st_dec( SNS_Qr, indexr ); } return; } + +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; + 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; + msvq_dec( side_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], 0, NULL, snsQ, NULL ); + } + 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 ); + } + } + } +} diff --git a/lib_dec/ivas_spar_decoder.c b/lib_dec/ivas_spar_decoder.c index 01e4db2ed40c3764b0b9d07e375cb255767d39c2..0c1948a56cda70b7043e12ba6e72f8f1297f3afc 100644 --- a/lib_dec/ivas_spar_decoder.c +++ b/lib_dec/ivas_spar_decoder.c @@ -41,6 +41,7 @@ #include "ivas_prot.h" #include "ivas_prot_rend.h" #include "ivas_rom_com.h" +#include "ivas_rom_dec.h" #include "ivas_stat_com.h" #include #include @@ -71,10 +72,13 @@ ivas_error ivas_spar_dec_open( IVAS_FB_CFG *fb_cfg; int16_t i, j, b, active_w_mixing; int32_t output_Fs; + int16_t num_decor_chs; 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 ); + + num_channels_internal = ivas_sba_get_nchan_metadata( sba_order_internal, st_ivas->hDecoderConfig->ivas_total_brate ); + hSpar = st_ivas->hSpar; if ( !spar_reconfig_flag ) @@ -87,9 +91,17 @@ ivas_error ivas_spar_dec_open( } output_Fs = st_ivas->hDecoderConfig->output_Fs; + if ( num_channels_internal > ( SBA_HOA2_ORDER + 1 ) * ( SBA_HOA2_ORDER + 1 ) ) + { + num_decor_chs = IVAS_HBR_MAX_DECOR_CHS; + } + else + { + num_decor_chs = num_channels_internal - 1; + } /* TD decorr. */ - if ( ( error = ivas_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_decor_chs + 1, 1 ) ) != IVAS_ERR_OK ) { return error; } @@ -104,7 +116,8 @@ ivas_error ivas_spar_dec_open( /* set FB config. */ active_w_mixing = -1; - if ( ( error = ivas_fb_set_cfg( &fb_cfg, SBA_FORMAT, SBA_MODE_SPAR, num_channels_internal, num_channels_internal, active_w_mixing, output_Fs ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_fb_set_cfg( &fb_cfg, SBA_FORMAT, SBA_MODE_SPAR, num_channels_internal, num_channels_internal, active_w_mixing, output_Fs, + 0 ) ) != IVAS_ERR_OK ) { return error; } @@ -173,6 +186,49 @@ ivas_error ivas_spar_dec_open( ivas_output_init( &( st_ivas->hTransSetup ), st_ivas->transport_config ); +#ifdef JBM_TSM_ON_TCS + set_s( hSpar->subframe_nbslots, 0, MAX_JBM_SUBFRAMES_5MS ); + set_s( hSpar->subframe_nbslots, JBM_CLDFB_SLOTS_IN_SUBFRAME, DEFAULT_JBM_SUBFRAMES_5MS ); + hSpar->nb_subframes = DEFAULT_JBM_SUBFRAMES_5MS; + hSpar->subframes_rendered = 0; + hSpar->slots_rendered = 0; + hSpar->num_slots = DEFAULT_JBM_SUBFRAMES_5MS * JBM_CLDFB_SLOTS_IN_SUBFRAME; + /* init render timeslot mapping */ + { + int16_t map_idx; + set_s( hSpar->render_to_md_map, 0, MAX_JBM_SUBFRAMES_5MS * JBM_CLDFB_SLOTS_IN_SUBFRAME ); + for ( map_idx = 0; map_idx < DEFAULT_JBM_CLDFB_TIMESLOTS; map_idx++ ) + { + hSpar->render_to_md_map[map_idx] = map_idx; + } + } + /* allocate transport channels*/ + if ( st_ivas->hDecoderConfig->voip_active == 1 && st_ivas->hTcBuffer == NULL ) + { + int16_t nchan_to_allocate; + int16_t nchan_tc; + TC_BUFFER_MODE buffer_mode; + + buffer_mode = TC_BUFFER_MODE_RENDERER; + nchan_tc = ivas_jbm_dec_get_num_tc_channels( st_ivas ); + nchan_to_allocate = num_channels_internal; + if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO ) + { + buffer_mode = TC_BUFFER_MODE_BUFFER; + nchan_tc = st_ivas->hDecoderConfig->nchan_out; + nchan_to_allocate = nchan_tc; + } + else if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC ) + { + nchan_to_allocate = 2 * BINAURAL_CHANNELS; + } + if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, buffer_mode, nchan_tc, nchan_to_allocate, nchan_to_allocate, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK ) + { + return error; + } + } +#endif + st_ivas->hSpar = hSpar; return error; @@ -598,7 +654,7 @@ void ivas_spar_get_cldfb_gains( * determines if an FOA input channel is transmitted as residual channel. *---------------------------------------------------------------------*/ -/* !r: 1 if prediction residual channel */ +/*! r: 1 if prediction residual channel */ int16_t ivas_is_res_channel( const int16_t ch, /* i : ch index in WYZX ordering */ const int16_t nchan_transport /* i : number of transport channels (1-4) */ @@ -635,6 +691,7 @@ static void ivas_spar_dec_MD( { int16_t num_channels, table_idx, num_bands_out, bfi, sba_order; int32_t ivas_total_brate; + int16_t num_md_sub_frames; DECODER_CONFIG_HANDLE hDecoderConfig = st_ivas->hDecoderConfig; SPAR_DEC_HANDLE hSpar = st_ivas->hSpar; @@ -647,7 +704,11 @@ static void ivas_spar_dec_MD( sba_order = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); bfi = st_ivas->bfi; ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; - num_channels = ivas_sba_get_nchan_metadata( sba_order ); + num_channels = ivas_sba_get_nchan_metadata( sba_order, + ivas_total_brate ); + + num_md_sub_frames = ivas_get_spar_dec_md_num_subframes( sba_order, st_ivas->hDecoderConfig->ivas_total_brate ); + num_bands_out = hSpar->hFbMixer->pFb->filterbank_num_bands; if ( ivas_total_brate > FRAME_NO_DATA && !bfi ) @@ -706,7 +767,10 @@ static void ivas_spar_dec_MD( if ( st0->m_old_frame_type == ZERO_FRAME && ivas_total_brate == IVAS_SID_5k2 && st0->prev_bfi == 0 && hSpar->hMdDec->spar_md_cfg.nchan_transport == 1 ) { - ivas_spar_setup_md_smoothing( hSpar->hMdDec, num_bands_out ); + ivas_spar_setup_md_smoothing( hSpar->hMdDec, num_bands_out + + , + num_md_sub_frames ); } else { @@ -717,7 +781,8 @@ static void ivas_spar_dec_MD( { if ( !bfi ) { - ivas_spar_smooth_md_dtx( hSpar->hMdDec, num_bands_out ); + ivas_spar_smooth_md_dtx( hSpar->hMdDec, num_bands_out, + num_md_sub_frames ); } set_s( hSpar->hMdDec->valid_bands, 0, IVAS_MAX_NUM_BANDS ); @@ -856,7 +921,8 @@ static void ivas_spar_get_skip_mat( const int16_t num_ch_out, const int16_t num_ch_in, const int16_t num_spar_bands, - int16_t skip_mat[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH] ) + int16_t skip_mat[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], + const int16_t num_md_sub_frames ) { int16_t spar_band, out_ch, in_ch; int16_t i_ts, skip_flag; @@ -867,12 +933,11 @@ static void ivas_spar_get_skip_mat( { skip_mat[out_ch][in_ch] = 1; skip_flag = 1; - for ( i_ts = 0; i_ts < MAX_PARAM_SPATIAL_SUBFRAMES; i_ts++ ) { for ( spar_band = 0; spar_band < num_spar_bands; spar_band++ ) { - if ( hSpar->hMdDec->mixer_mat_prev[1 + i_ts][out_ch][in_ch][spar_band] != 0.0f || hSpar->hMdDec->mixer_mat[out_ch][in_ch][spar_band + i_ts * MAX_PARAM_SPATIAL_SUBFRAMES] != 0.0f ) + if ( hSpar->hMdDec->mixer_mat_prev[1 + i_ts][out_ch][in_ch][spar_band] != 0.0f ) { skip_flag = 0; break; @@ -885,51 +950,457 @@ static void ivas_spar_get_skip_mat( break; } } + if ( skip_mat[out_ch][in_ch] == 1 ) + { + for ( i_ts = 0; i_ts < num_md_sub_frames; i_ts++ ) + { + for ( spar_band = 0; spar_band < num_spar_bands; spar_band++ ) + { + if ( hSpar->hMdDec->mixer_mat[out_ch][in_ch][spar_band + i_ts * MAX_PARAM_SPATIAL_SUBFRAMES] != 0.0f ) + { + skip_flag = 0; + break; + } + } + + if ( skip_flag == 0 ) + { + skip_mat[out_ch][in_ch] = 0; + break; + } + } + } + } + } + + return; +} + + +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; +} + +#ifdef JBM_TSM_ON_TCS +void ivas_spar_dec_agc_pca( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + float output[][L_FRAME48k], /* i/o: input/output audio channels */ + const int16_t output_frame /* i : output frame length */ +) +{ + + int16_t nchan_transport; + int16_t num_in_ingest; + DECODER_CONFIG_HANDLE hDecoderConfig; + SPAR_DEC_HANDLE hSpar; + + push_wmops( "ivas_spar_dec_agc_pca" ); + + hSpar = st_ivas->hSpar; + hDecoderConfig = st_ivas->hDecoderConfig; + nchan_transport = hSpar->hMdDec->spar_md_cfg.nchan_transport; + + if ( st_ivas->nchan_transport >= 3 ) + { + float temp; + int16_t i; + /*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; } } + if ( hSpar->hMdDec->td_decorr_flag ) + { + num_in_ingest = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order, + st_ivas->hDecoderConfig->ivas_total_brate ); + } + else + { + num_in_ingest = nchan_transport; + } + /*---------------------------------------------------------------------* + * AGC + *---------------------------------------------------------------------*/ + + ivas_agc_dec_process( hSpar->hAgcDec, output, output, nchan_transport, output_frame ); +#ifdef DEBUG_SBA_AUDIO_DUMP + /* Dump audio signal after ivas_agc_dec_process */ + ivas_spar_dump_signal_wav( output_frame, NULL, output, st_ivas->nchan_transport, spar_foa_dec_wav[1], "ivas_agc_dec_process()" ); +#endif + + if ( hSpar->hPCA != NULL ) + { + ivas_pca_dec( hSpar->hPCA, output_frame, num_in_ingest, hDecoderConfig->ivas_total_brate, hDecoderConfig->last_ivas_total_brate, st_ivas->bfi, output ); +#ifdef DEBUG_SBA_AUDIO_DUMP + /* Dump audio signal after ivas_pca_dec */ + ivas_spar_dump_signal_wav( output_frame, NULL, output, num_in_ingest, spar_foa_dec_wav[2], "ivas_pca_dec()" ); +#endif + } + pop_wmops(); return; } +void ivas_spar_dec_set_render_map( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + int16_t nCldfbTs ) +{ + SPAR_DEC_HANDLE hSpar; + + hSpar = st_ivas->hSpar; +#ifdef DEBUGGING + assert( hSpar ); +#endif + + /* adapt subframes */ + hSpar->num_slots = nCldfbTs; + hSpar->slots_rendered = 0; + hSpar->subframes_rendered = 0; + set_s( hSpar->render_to_md_map, 0, MAX_JBM_SUBFRAMES_5MS * JBM_CLDFB_SLOTS_IN_SUBFRAME ); + ivas_jbm_dec_get_adapted_subframes( nCldfbTs, hSpar->subframe_nbslots, &hSpar->nb_subframes ); + ivas_jbm_dec_get_md_map( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbTs, 1, 0, DEFAULT_JBM_CLDFB_TIMESLOTS, hSpar->render_to_md_map ); + return; +} /*-------------------------------------------------------------------* * ivas_spar_dec_upmixer() * * IVAS SPAR upmixer *-------------------------------------------------------------------*/ +void ivas_spar_dec_set_render_params( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + const int16_t n_cldfb_slots /* i : number of cldfb slots in this frame */ +) +{ + SPAR_DEC_HANDLE hSpar; + int16_t nchan_transport; + int16_t num_bands_out; + + hSpar = st_ivas->hSpar; + /*---------------------------------------------------------------------* + * Gen umx mat + *---------------------------------------------------------------------*/ + nchan_transport = hSpar->hMdDec->spar_md_cfg.nchan_transport; + num_bands_out = hSpar->hFbMixer->pFb->filterbank_num_bands; + ivas_spar_dec_gen_umx_mat( hSpar->hMdDec, nchan_transport, num_bands_out, st_ivas->bfi, + ivas_get_spar_dec_md_num_subframes( st_ivas->sba_order, st_ivas->hDecoderConfig->ivas_total_brate ) ); + + ivas_spar_dec_set_render_map( st_ivas, n_cldfb_slots ); + + return; +} + +void ivas_spar_dec_digest_tc( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + const int16_t nchan_transport, /* i : number of transport channels */ + const int16_t nCldfbSlots, /* i : number of CLDFB slots */ + const int16_t nSamplesForRendering /* i : number of samples provided */ +) +{ + SPAR_DEC_HANDLE hSpar; + + hSpar = st_ivas->hSpar; + if ( hSpar->hMdDec->td_decorr_flag && !( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) ) + { + float Pcm_tmp[MAX_SPAR_INTERNAL_CHANNELS][L_FRAME48k]; + float *pPcm_tmp[MAX_SPAR_INTERNAL_CHANNELS]; + float *p_tc[MAX_SPAR_INTERNAL_CHANNELS]; + int16_t nchan_internal, ch; + int16_t nSamplesLeftForTD, default_frame; + /* TD decorrelator */ + default_frame = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC ); + nSamplesLeftForTD = nSamplesForRendering; + nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order, + st_ivas->hDecoderConfig->ivas_total_brate ); + for ( ch = 0; ch < nchan_internal; ch++ ) + { + pPcm_tmp[ch] = Pcm_tmp[ch]; + p_tc[ch] = st_ivas->hTcBuffer->tc[ch]; + } + + while ( nSamplesLeftForTD ) + { + int16_t nSamplesToDecorr = min( nSamplesLeftForTD, default_frame ); + ivas_td_decorr_process( hSpar->hTdDecorr, p_tc, pPcm_tmp, nSamplesToDecorr ); + if ( hSpar->hTdDecorr->num_apd_outputs >= ( nchan_internal - nchan_transport ) ) + { + for ( ch = 0; ch < nchan_internal - nchan_transport; ch++ ) + { + mvr2r( pPcm_tmp[hSpar->hTdDecorr->num_apd_outputs - 1 - ch], p_tc[nchan_internal - 1 - ch], nSamplesToDecorr ); + } + } + else + { + for ( ch = 0; ch < nchan_internal - nchan_transport; ch++ ) + { + set_zero( p_tc[nchan_internal - 1 - ch], nSamplesToDecorr ); + } + for ( ch = 0; ch < hSpar->hTdDecorr->num_apd_outputs; ch++ ) + { + mvr2r( pPcm_tmp[hSpar->hTdDecorr->num_apd_outputs - 1 - ch], p_tc[nchan_internal - 1 - ch], nSamplesToDecorr ); + } + } + for ( ch = 0; ch < nchan_internal; ch++ ) + { + p_tc[ch] += nSamplesToDecorr; + } + nSamplesLeftForTD -= nSamplesToDecorr; + } + } + + ivas_spar_dec_set_render_params( st_ivas, nCldfbSlots ); + + + return; +} + void ivas_spar_dec_upmixer( Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ float output[][L_FRAME48k], /* i/o: input/output audio channels */ const int16_t nchan_internal, /* i : number of internal channels */ const int16_t output_frame /* i : output frame length */ ) +{ + SPAR_DEC_HANDLE hSpar; + int16_t nchan_transport, nchan_out; + int16_t subframe_idx, n, i; + int16_t n_samples_sf; + float *output_f_local[MAX_OUTPUT_CHANNELS]; + float Pcm_tmp[MAX_OUTPUT_CHANNELS][L_FRAME48k]; + float *pPcm_tmp[MAX_OUTPUT_CHANNELS]; + + hSpar = st_ivas->hSpar; + nchan_transport = hSpar->hMdDec->spar_md_cfg.nchan_transport; + nchan_out = st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe; + n_samples_sf = JBM_CLDFB_SLOTS_IN_SUBFRAME * NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ); + for ( n = 0; n < MAX_OUTPUT_CHANNELS; n++ ) + { + output_f_local[n] = &output[n][0]; + } + for ( n = 0; n < nchan_internal; n++ ) + { + st_ivas->hTcBuffer->tc[n] = output[n]; + } + + /*---------------------------------------------------------------------* + * TD decorrelation + *---------------------------------------------------------------------*/ + for ( i = 0; i < nchan_internal; i++ ) + { + pPcm_tmp[i] = Pcm_tmp[i]; + } + if ( hSpar->hMdDec->td_decorr_flag ) + { + ivas_td_decorr_process( hSpar->hTdDecorr, st_ivas->hTcBuffer->tc, pPcm_tmp, output_frame ); + if ( hSpar->hTdDecorr->num_apd_outputs >= ( nchan_internal - nchan_transport ) ) + { + for ( i = 0; i < nchan_internal - nchan_transport; i++ ) + { + mvr2r( pPcm_tmp[hSpar->hTdDecorr->num_apd_outputs - 1 - i], st_ivas->hTcBuffer->tc[nchan_internal - 1 - i], output_frame ); + } + } + else + { + for ( i = 0; i < nchan_internal - nchan_transport; i++ ) + { + set_zero( st_ivas->hTcBuffer->tc[nchan_internal - 1 - i], output_frame ); + } + for ( i = 0; i < hSpar->hTdDecorr->num_apd_outputs; i++ ) + { + mvr2r( pPcm_tmp[hSpar->hTdDecorr->num_apd_outputs - 1 - i], st_ivas->hTcBuffer->tc[nchan_internal - 1 - i], output_frame ); + } + } + } + + + ivas_spar_dec_set_render_params( st_ivas, DEFAULT_JBM_CLDFB_TIMESLOTS ); + + if ( st_ivas->hDirAC != 0 ) + { + ivas_dirac_dec_set_md_map( st_ivas, DEFAULT_JBM_CLDFB_TIMESLOTS ); + } + + for ( subframe_idx = 0; subframe_idx < MAX_PARAM_SPATIAL_SUBFRAMES; subframe_idx++ ) + { + ivas_spar_dec_upmixer_sf( st_ivas, output_f_local, nchan_internal ); + for ( n = 0; n < nchan_out; n++ ) + { + output_f_local[n] += n_samples_sf; + } + } + for ( n = 0; n < nchan_internal; n++ ) + { + st_ivas->hTcBuffer->tc[n] = NULL; + } + if ( st_ivas->hDirAC != 0 ) + { + if ( st_ivas->hDirAC->hConfig->dec_param_estim == 1 ) + { + st_ivas->hDirAC->dirac_read_idx = ( st_ivas->hDirAC->dirac_read_idx + DEFAULT_JBM_CLDFB_TIMESLOTS ) % st_ivas->hDirAC->dirac_md_buffer_length; + } + else + { + st_ivas->hDirAC->dirac_read_idx = ( st_ivas->hDirAC->dirac_read_idx + DEFAULT_JBM_SUBFRAMES_5MS ) % st_ivas->hDirAC->dirac_md_buffer_length; + } + } + return; +} +#endif + + +#ifdef JBM_TSM_ON_TCS +/*-------------------------------------------------------------------* + * ivas_spar_dec_upmixer_sf() + * + * IVAS SPAR upmixer + *-------------------------------------------------------------------*/ +void ivas_spar_dec_upmixer_sf( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + float *output[], /* o : output audio channels */ + const int16_t nchan_internal /* i : number of internal channels */ +) +#else +void ivas_spar_dec_upmixer( + + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + float output[][L_FRAME48k], /* i/o: input/output audio channels */ + const int16_t nchan_internal, /* i : number of internal channels */ + const int16_t output_frame /* i : output frame length */ +) +#endif { int16_t cldfb_band, num_cldfb_bands, numch_in, numch_out; float *cldfb_in_ts_re[MAX_OUTPUT_CHANNELS][CLDFB_NO_COL_MAX]; float *cldfb_in_ts_im[MAX_OUTPUT_CHANNELS][CLDFB_NO_COL_MAX]; int16_t i, b, ts, out_ch, in_ch; int16_t num_spar_bands, spar_band, nchan_transport; - int16_t num_in_ingest, num_bands_out, split_band; + int16_t num_in_ingest, split_band; +#ifdef JBM_TSM_ON_TCS + int16_t slot_size, slot_idx_start; + float *p_tc[MAX_OUTPUT_CHANNELS]; + int16_t md_idx; +#endif float Pcm_tmp[MAX_OUTPUT_CHANNELS][L_FRAME48k]; int16_t numch_out_dirac; +#ifndef JBM_TSM_ON_TCS float *pPcm_tmp[MAX_OUTPUT_CHANNELS]; + int16_t num_bands_out; +#endif float mixer_mat[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH][IVAS_MAX_NUM_BANDS]; int16_t b_skip_mat[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH]; DECODER_CONFIG_HANDLE hDecoderConfig; SPAR_DEC_HANDLE hSpar; + int16_t num_md_sub_frames; +#ifndef JBM_TSM_ON_TCS + int16_t md_sf_idx; +#endif +#ifdef JBM_TSM_ON_TCS + push_wmops( "ivas_spar_dec_upmixer_sf" ); +#else push_wmops( "ivas_spar_dec_upmixer" ); +#endif hSpar = st_ivas->hSpar; hDecoderConfig = st_ivas->hDecoderConfig; +#ifndef JBM_TSM_ON_TCS num_bands_out = hSpar->hFbMixer->pFb->filterbank_num_bands; +#endif nchan_transport = hSpar->hMdDec->spar_md_cfg.nchan_transport; num_cldfb_bands = hSpar->hFbMixer->pFb->fb_bin_to_band.num_cldfb_bands; numch_in = hSpar->hFbMixer->fb_cfg->num_in_chans; numch_out = hSpar->hFbMixer->fb_cfg->num_out_chans; + num_md_sub_frames = ivas_get_spar_dec_md_num_subframes( st_ivas->sba_order, hDecoderConfig->ivas_total_brate ); + +#ifdef JBM_TSM_ON_TCS + slot_size = NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ); + slot_idx_start = hSpar->slots_rendered; + for ( i = 0; i < nchan_internal; i++ ) + { + p_tc[i] = st_ivas->hTcBuffer->tc[i] + slot_idx_start * slot_size; + } +#endif + #ifdef DEBUG_SPAR_BYPASS_EVS_CODEC /* by-pass core-coder */ /*write the core coder output to a file for debugging*/ @@ -967,17 +1438,19 @@ void ivas_spar_dec_upmixer( } #endif +#ifndef JBM_TSM_ON_TCS /*---------------------------------------------------------------------* * AGC *---------------------------------------------------------------------*/ ivas_agc_dec_process( hSpar->hAgcDec, output, output, nchan_transport, output_frame ); + #ifdef DEBUG_SBA_AUDIO_DUMP /* Dump audio signal after ivas_agc_dec_process */ ivas_spar_dump_signal_wav( output_frame, NULL, output, st_ivas->nchan_transport, spar_foa_dec_wav[1], "ivas_agc_dec_process()" ); #endif - +#endif /*---------------------------------------------------------------------* * TD Decorr and pcm ingest *---------------------------------------------------------------------*/ @@ -991,11 +1464,12 @@ void ivas_spar_dec_upmixer( num_in_ingest = nchan_transport; } +#ifndef JBM_TSM_ON_TCS for ( i = 0; i < nchan_internal; i++ ) { pPcm_tmp[i] = Pcm_tmp[i]; } - +#endif /*---------------------------------------------------------------------* * PCA decoder *---------------------------------------------------------------------*/ @@ -1003,6 +1477,7 @@ void ivas_spar_dec_upmixer( hSpar->pca_ingest_channels = num_in_ingest; #endif +#ifndef JBM_TSM_ON_TCS /* will already happen in the TC decoding */ if ( hSpar->hPCA != NULL ) { ivas_pca_dec( hSpar->hPCA, output_frame, num_in_ingest, hDecoderConfig->ivas_total_brate, hDecoderConfig->last_ivas_total_brate, st_ivas->bfi, output ); @@ -1011,22 +1486,37 @@ void ivas_spar_dec_upmixer( ivas_spar_dump_signal_wav( output_frame, NULL, output, num_in_ingest, spar_foa_dec_wav[2], "ivas_pca_dec()" ); #endif } +#endif - +#ifndef JBM_TSM_ON_TCS /*---------------------------------------------------------------------* * TD decorrelation *---------------------------------------------------------------------*/ if ( hSpar->hMdDec->td_decorr_flag ) { - ivas_td_decorr_process( hSpar->hTdDecorr, output, pPcm_tmp, output_frame ); - for ( i = 0; i < nchan_internal - nchan_transport; i++ ) + ivas_td_decorr_process( hSpar->hTdDecorr, output, pPcm_tmp, output_frame ); + if ( hSpar->hTdDecorr->num_apd_outputs >= ( nchan_internal - nchan_transport ) ) + { + for ( i = 0; i < nchan_internal - nchan_transport; i++ ) + { + mvr2r( pPcm_tmp[hSpar->hTdDecorr->num_apd_outputs - 1 - i], output[nchan_internal - 1 - i], output_frame ); + } + } + else { - mvr2r( pPcm_tmp[hSpar->hTdDecorr->num_apd_outputs - 1 - i], output[nchan_internal - 1 - i], output_frame ); + for ( i = 0; i < nchan_internal - nchan_transport; i++ ) + { + set_zero( output[nchan_internal - 1 - i], output_frame ); + } + for ( i = 0; i < hSpar->hTdDecorr->num_apd_outputs; i++ ) + { + mvr2r( pPcm_tmp[hSpar->hTdDecorr->num_apd_outputs - 1 - i], output[nchan_internal - 1 - i], output_frame ); + } } } - +#endif hSpar->hFbMixer->fb_cfg->num_in_chans = num_in_ingest; @@ -1059,12 +1549,14 @@ void ivas_spar_dec_upmixer( } } +#ifndef JBM_TSM_ON_TCS /*---------------------------------------------------------------------* * Gen umx mat *---------------------------------------------------------------------*/ - ivas_spar_dec_gen_umx_mat( hSpar->hMdDec, nchan_transport, num_bands_out, st_ivas->bfi ); - + ivas_spar_dec_gen_umx_mat( hSpar->hMdDec, nchan_transport, num_bands_out, st_ivas->bfi, + num_md_sub_frames ); +#endif /*---------------------------------------------------------------------* * CLDFB Processing and Synthesis @@ -1074,19 +1566,39 @@ void ivas_spar_dec_upmixer( /* apply parameters */ /* determine if we can skip certain data */ - ivas_spar_get_skip_mat( hSpar, numch_out, numch_in, num_spar_bands, b_skip_mat ); /* this can be precomputed based on bitrate and format*/ + ivas_spar_get_skip_mat( hSpar, numch_out, numch_in, num_spar_bands, b_skip_mat, + num_md_sub_frames ); /* this can be precomputed based on bitrate and format*/ numch_out_dirac = hDecoderConfig->nchan_out; +#ifdef DEBUG_SBA_AUDIO_DUMP + /* Dump audio signal after ivas_agc_dec_process */ +#ifdef JBM_TSM_ON_TCS + ivas_spar_dump_signal_wav( output_frame, p_tc, NULL, numch_in, spar_foa_dec_wav[4], "ivas_spar_upmixer()" ); +#else + ivas_spar_dump_signal_wav( output_frame, NULL, output, numch_in, spar_foa_dec_wav[4], "ivas_spar_upmixer()" ); +#endif +#endif + +#ifndef JBM_TSM_ON_TCS for ( int16_t i_sf = 0; i_sf < MAX_PARAM_SPATIAL_SUBFRAMES; i_sf++ ) { +#endif /* CLDFB analysis of incoming frame */ for ( in_ch = 0; in_ch < numch_in; in_ch++ ) { - for ( ts = 0; ts < MAX_PARAM_SPATIAL_SUBFRAMES; ts++ ) +#ifdef JBM_TSM_ON_TCS + for ( ts = 0; ts < hSpar->subframe_nbslots[hSpar->subframes_rendered]; ts++ ) +#else + for ( ts = 0; ts < MAX_PARAM_SPATIAL_SUBFRAMES; ts++ ) +#endif { cldfbAnalysis_ts( - &output[in_ch][( ts + i_sf * MAX_PARAM_SPATIAL_SUBFRAMES ) * num_cldfb_bands], +#ifdef JBM_TSM_ON_TCS + &p_tc[in_ch][ts * num_cldfb_bands], +#else + &output[in_ch][( ts + i_sf * MAX_PARAM_SPATIAL_SUBFRAMES ) * num_cldfb_bands], +#endif cldfb_in_ts_re[in_ch][ts], cldfb_in_ts_im[in_ch][ts], num_cldfb_bands, @@ -1094,10 +1606,38 @@ void ivas_spar_dec_upmixer( } } - for ( ts = 0; ts < MAX_PARAM_SPATIAL_SUBFRAMES; ts++ ) + if ( ( hDecoderConfig->ivas_total_brate < IVAS_24k4 ) && ( ( hDecoderConfig->output_config == AUDIO_CONFIG_HOA2 ) || ( hDecoderConfig->output_config == AUDIO_CONFIG_HOA3 ) ) ) { - /* 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 ); + ivas_spar_calc_smooth_facs( cldfb_in_ts_re[0], cldfb_in_ts_im[0], num_spar_bands, &hSpar->hFbMixer->pFb->fb_bin_to_band, hSpar->hMdDec->smooth_fac, hSpar->hMdDec->smooth_buf ); + } + +#ifdef JBM_TSM_ON_TCS + for ( ts = 0; ts < hSpar->subframe_nbslots[hSpar->subframes_rendered]; ts++ ) +#else + for ( ts = 0; ts < MAX_PARAM_SPATIAL_SUBFRAMES; ts++ ) +#endif + { +#ifdef JBM_TSM_ON_TCS + md_idx = hSpar->render_to_md_map[ts + slot_idx_start]; + ivas_spar_get_parameters( hSpar, hDecoderConfig, md_idx, numch_out, numch_in, num_spar_bands, mixer_mat ); +#else + /* 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 ); +#endif + 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[spar_band] ) * mixer_mat[out_ch][in_ch][spar_band] + hSpar->hMdDec->smooth_fac[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]; + } + } + } + } for ( cldfb_band = 0; cldfb_band < num_cldfb_bands; cldfb_band++ ) { @@ -1113,27 +1653,26 @@ void ivas_spar_dec_upmixer( for ( in_ch = 0; in_ch < numch_in; in_ch++ ) { - if ( b_skip_mat[out_ch][in_ch] ) + if ( b_skip_mat[out_ch][in_ch] == 0 ) { - continue; - } - else if ( cldfb_band < CLDFB_PAR_WEIGHT_START_BAND ) /* tuning parameter, depends on how much SPAR Filters overlap for the CLDFB bands */ - { - spar_band = bin2band->p_cldfb_map_to_spar_band[cldfb_band]; - cldfb_par = mixer_mat[out_ch][in_ch][spar_band]; - } - else - { - cldfb_par = 0.0f; - for ( spar_band = bin2band->p_spar_start_bands[cldfb_band]; spar_band < num_spar_bands; spar_band++ ) + if ( cldfb_band < CLDFB_PAR_WEIGHT_START_BAND ) /* tuning parameter, depends on how much SPAR Filters overlap for the CLDFB bands */ { - /* accumulate contributions from all SPAR bands */ - cldfb_par += mixer_mat[out_ch][in_ch][spar_band] * bin2band->pp_cldfb_weights_per_spar_band[cldfb_band][spar_band]; + spar_band = bin2band->p_cldfb_map_to_spar_band[cldfb_band]; + cldfb_par = mixer_mat[out_ch][in_ch][spar_band]; + } + else + { + cldfb_par = 0.0f; + for ( spar_band = bin2band->p_spar_start_bands[cldfb_band]; spar_band < num_spar_bands; spar_band++ ) + { + /* accumulate contributions from all SPAR bands */ + cldfb_par += mixer_mat[out_ch][in_ch][spar_band] * bin2band->pp_cldfb_weights_per_spar_band[cldfb_band][spar_band]; + } } - } - out_re[out_ch] += cldfb_in_ts_re[in_ch][ts][cldfb_band] * cldfb_par; - out_im[out_ch] += cldfb_in_ts_im[in_ch][ts][cldfb_band] * cldfb_par; + out_re[out_ch] += cldfb_in_ts_re[in_ch][ts][cldfb_band] * cldfb_par; + out_im[out_ch] += cldfb_in_ts_im[in_ch][ts][cldfb_band] * cldfb_par; + } } } @@ -1144,11 +1683,44 @@ void ivas_spar_dec_upmixer( cldfb_in_ts_im[out_ch][ts][cldfb_band] = out_im[out_ch]; } } +#ifdef JBM_TSM_ON_TCS + if ( ( ( slot_idx_start + ts + 1 ) == hSpar->num_slots ) || ( ( md_idx / JBM_CLDFB_SLOTS_IN_SUBFRAME ) != ( hSpar->render_to_md_map[ts + slot_idx_start + 1] / JBM_CLDFB_SLOTS_IN_SUBFRAME ) ) ) + { + /* we have crossed an unadapted parameter sf border, update previous mixing matrices */ + int16_t md_sf = md_idx / JBM_CLDFB_SLOTS_IN_SUBFRAME; + split_band = SPAR_DIRAC_SPLIT_START_BAND; + md_sf = ( num_md_sub_frames == MAX_PARAM_SPATIAL_SUBFRAMES ) ? md_sf : 0; + if ( split_band < IVAS_MAX_NUM_BANDS ) + { + mvr2r( hSpar->hMdDec->mixer_mat_prev[1][0][0], hSpar->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( hSpar->hMdDec->mixer_mat_prev[2][0][0], hSpar->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( hSpar->hMdDec->mixer_mat_prev[3][0][0], hSpar->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( hSpar->hMdDec->mixer_mat_prev[4][0][0], hSpar->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 ( out_ch = 0; out_ch < numch_out; out_ch++ ) + { + for ( in_ch = 0; in_ch < numch_in; in_ch++ ) + { + for ( b = 0; b < num_spar_bands; b++ ) + { + hSpar->hMdDec->mixer_mat_prev[4][out_ch][in_ch][b] = hSpar->hMdDec->mixer_mat[out_ch][in_ch][b + md_sf * IVAS_MAX_NUM_BANDS]; + } + } + } + hSpar->i_subframe++; + hSpar->i_subframe = min( hSpar->i_subframe, MAX_PARAM_SPATIAL_SUBFRAMES ); + } + } +#endif } if ( hDecoderConfig->output_config != AUDIO_CONFIG_FOA && hDecoderConfig->output_config != AUDIO_CONFIG_STEREO && hDecoderConfig->output_config != AUDIO_CONFIG_MONO ) { - ivas_dirac_dec( st_ivas, output, nchan_internal, cldfb_in_ts_re, cldfb_in_ts_im, i_sf ); +#ifdef JBM_TSM_ON_TCS + ivas_dirac_dec_render_sf( st_ivas, output, nchan_internal, cldfb_in_ts_re, cldfb_in_ts_im ); +#else + ivas_dirac_dec( st_ivas, output, nchan_internal, cldfb_in_ts_re, cldfb_in_ts_im, i_sf ); +#endif } if ( st_ivas->hDirAC != NULL ) @@ -1162,8 +1734,11 @@ void ivas_spar_dec_upmixer( { if ( ( st_ivas->hOutSetup.num_lfe > 0 ) && ( st_ivas->hOutSetup.index_lfe[idx_lfe] == ch ) ) { - set_zero( &( output[ch][i_sf * MAX_PARAM_SPATIAL_SUBFRAMES * num_cldfb_bands] ), MAX_PARAM_SPATIAL_SUBFRAMES * num_cldfb_bands ); - +#ifdef JBM_TSM_ON_TCS + set_zero( output[ch], hSpar->subframe_nbslots[hSpar->subframes_rendered] * num_cldfb_bands ); +#else + set_zero( &( output[ch][i_sf * MAX_PARAM_SPATIAL_SUBFRAMES * num_cldfb_bands] ), MAX_PARAM_SPATIAL_SUBFRAMES * num_cldfb_bands ); +#endif if ( idx_lfe < ( st_ivas->hDirAC->hOutSetup.num_lfe - 1 ) ) { idx_lfe++; @@ -1173,12 +1748,20 @@ void ivas_spar_dec_upmixer( { if ( hDecoderConfig->output_config == AUDIO_CONFIG_FOA || !( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL || st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM ) ) { - for ( ts = 0; ts < MAX_PARAM_SPATIAL_SUBFRAMES; ts++ ) +#ifdef JBM_TSM_ON_TCS + for ( ts = 0; ts < hSpar->subframe_nbslots[hSpar->subframes_rendered]; ts++ ) +#else + for ( ts = 0; ts < MAX_PARAM_SPATIAL_SUBFRAMES; ts++ ) +#endif { cldfbSynthesis( &cldfb_in_ts_re[idx_in][ts], &cldfb_in_ts_im[idx_in][ts], - &output[ch][( ts + i_sf * MAX_PARAM_SPATIAL_SUBFRAMES ) * num_cldfb_bands], +#ifdef JBM_TSM_ON_TCS + &output[ch][ts * num_cldfb_bands], +#else + &output[ch][( ts + i_sf * MAX_PARAM_SPATIAL_SUBFRAMES ) * num_cldfb_bands], +#endif num_cldfb_bands, st_ivas->cldfbSynDec[idx_in] ); } @@ -1195,12 +1778,20 @@ void ivas_spar_dec_upmixer( /* CLDFB to time synthesis (overwrite mixer output) */ for ( out_ch = 0; out_ch < numch_out_dirac; out_ch++ ) { - for ( ts = 0; ts < MAX_PARAM_SPATIAL_SUBFRAMES; ts++ ) +#ifdef JBM_TSM_ON_TCS + for ( ts = 0; ts < hSpar->subframe_nbslots[hSpar->subframes_rendered]; ts++ ) +#else + for ( ts = 0; ts < MAX_PARAM_SPATIAL_SUBFRAMES; ts++ ) +#endif { cldfbSynthesis( &cldfb_in_ts_re[out_ch][ts], &cldfb_in_ts_im[out_ch][ts], - &output[out_ch][( ts + i_sf * MAX_PARAM_SPATIAL_SUBFRAMES ) * num_cldfb_bands], +#ifdef JBM_TSM_ON_TCS + &output[out_ch][ts * num_cldfb_bands], +#else + &output[out_ch][( ts + i_sf * MAX_PARAM_SPATIAL_SUBFRAMES ) * num_cldfb_bands], +#endif num_cldfb_bands, st_ivas->cldfbSynDec[out_ch] ); } @@ -1214,6 +1805,9 @@ void ivas_spar_dec_upmixer( ivas_spar_dump_signal_wav( output_frame, NULL, output, hSpar->numOutChannels, spar_foa_dec_wav[3], "cldfbSynthesis()" ); #endif + +#ifndef JBM_TSM_ON_TCS + md_sf_idx = ( num_md_sub_frames == MAX_PARAM_SPATIAL_SUBFRAMES ) ? i_sf : 0; split_band = SPAR_DIRAC_SPLIT_START_BAND; if ( split_band < IVAS_MAX_NUM_BANDS ) { @@ -1230,13 +1824,19 @@ void ivas_spar_dec_upmixer( { for ( b = 0; b < num_spar_bands; b++ ) { - hSpar->hMdDec->mixer_mat_prev[4][out_ch][in_ch][b] = hSpar->hMdDec->mixer_mat[out_ch][in_ch][b + i_sf * IVAS_MAX_NUM_BANDS]; + hSpar->hMdDec->mixer_mat_prev[4][out_ch][in_ch][b] = hSpar->hMdDec->mixer_mat[out_ch][in_ch][b + md_sf_idx * IVAS_MAX_NUM_BANDS]; } } } } +#endif +#ifndef JBM_TSM_ON_TCS } - +#endif +#ifdef JBM_TSM_ON_TCS + hSpar->slots_rendered += hSpar->subframe_nbslots[hSpar->subframes_rendered]; + hSpar->subframes_rendered++; +#endif pop_wmops(); return; diff --git a/lib_dec/ivas_spar_md_dec.c b/lib_dec/ivas_spar_md_dec.c index 3b47d6500e1ab98d6a3bcdca8da23c7fcccbfb47..f9d34970c25e5177f2833d8bbf782e0fd1f5e4ad 100644 --- a/lib_dec/ivas_spar_md_dec.c +++ b/lib_dec/ivas_spar_md_dec.c @@ -63,9 +63,9 @@ 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 numch_out, const int16_t active_w_vlbr ); -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, const int16_t strat, const int32_t ivas_total_brate ); 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 ); @@ -75,9 +75,9 @@ static void ivas_get_band_idx_from_differential( ivas_spar_md_t *pSpar_md, const static void ivas_mat_col_rearrange( float in_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], const int16_t order[IVAS_SPAR_MAX_CH], const int16_t i_ts, float ***mixer_mat, const int16_t bands, const int16_t num_ch ); -static void ivas_spar_dec_compute_ramp_down_post_matrix( ivas_spar_md_dec_state_t *hMdDec, const int16_t num_bands, const int16_t bfi ); +static void ivas_spar_dec_compute_ramp_down_post_matrix( ivas_spar_md_dec_state_t *hMdDec, const int16_t num_bands, const int16_t bfi, const int16_t num_md_sub_frames ); -static void ivas_spar_md_fill_invalid_bands( ivas_spar_dec_matrices_t *pSpar_coeffs, ivas_spar_dec_matrices_t *pSpar_coeffs_prev, const int16_t *valid_bands, int16_t *base_band_age, const int16_t num_bands, const int16_t sba_order ); +static void ivas_spar_md_fill_invalid_bands( ivas_spar_dec_matrices_t *pSpar_coeffs, ivas_spar_dec_matrices_t *pSpar_coeffs_prev, const int16_t *valid_bands, int16_t *base_band_age, const int16_t num_bands, const int16_t numch_out, const int16_t num_md_sub_frames ); static ivas_error ivas_spar_set_dec_config( ivas_spar_md_dec_state_t *hMdDec, const int16_t nchan_transport, float *pFC ); @@ -97,11 +97,12 @@ static void ivas_spar_dec_parse_md_bs( ivas_spar_md_dec_state_t *hMdDec, Decoder static ivas_error ivas_spar_md_dec_matrix_open( ivas_spar_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle */ const int16_t num_channels /* i : number of internal channels */ -) + , + const int16_t num_md_sub_frames ) { int16_t i, j; - 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 ) + if ( ( hMdDec->spar_md.band_coeffs = (ivas_band_coeffs_t *) malloc( IVAS_MAX_NUM_BANDS * num_md_sub_frames * sizeof( ivas_band_coeffs_t ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for band_coeffs in SPAR MD" ); } @@ -117,7 +118,7 @@ static ivas_error ivas_spar_md_dec_matrix_open( } for ( j = 0; j < num_channels; j++ ) { - if ( ( hMdDec->mixer_mat[i][j] = (float *) malloc( MAX_PARAM_SPATIAL_SUBFRAMES * IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) + if ( ( hMdDec->mixer_mat[i][j] = (float *) malloc( num_md_sub_frames * IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } @@ -136,7 +137,7 @@ static ivas_error ivas_spar_md_dec_matrix_open( } for ( j = 0; j < num_channels; j++ ) { - if ( ( hMdDec->spar_coeffs.C_re[i][j] = (float *) malloc( MAX_PARAM_SPATIAL_SUBFRAMES * IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) + if ( ( hMdDec->spar_coeffs.C_re[i][j] = (float *) malloc( num_md_sub_frames * IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } @@ -155,7 +156,7 @@ static ivas_error ivas_spar_md_dec_matrix_open( } for ( j = 0; j < num_channels; j++ ) { - if ( ( hMdDec->spar_coeffs.P_re[i][j] = (float *) malloc( MAX_PARAM_SPATIAL_SUBFRAMES * IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) + if ( ( hMdDec->spar_coeffs.P_re[i][j] = (float *) malloc( num_md_sub_frames * IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } @@ -241,6 +242,21 @@ static ivas_error ivas_spar_md_dec_matrix_open( return IVAS_ERR_OK; } +int16_t ivas_get_spar_dec_md_num_subframes( + const int16_t sba_order, /* i : Ambisonic (SBA) order */ + const int32_t ivas_total_brate ) +{ + int16_t num_subframes; + num_subframes = MAX_PARAM_SPATIAL_SUBFRAMES; + if ( sba_order > SBA_FOA_ORDER ) + { + if ( ivas_total_brate >= IVAS_512k ) + { + num_subframes = 1; + } + } + return ( num_subframes ); +} /*------------------------------------------------------------------------- * ivas_spar_md_dec_open() @@ -258,6 +274,7 @@ ivas_error ivas_spar_md_dec_open( { ivas_spar_md_dec_state_t *hMdDec; ivas_error error; + int16_t num_md_sub_frames; error = IVAS_ERR_OK; @@ -266,7 +283,9 @@ ivas_error ivas_spar_md_dec_open( return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD decoder" ); } - if ( ( error = ivas_spar_md_dec_matrix_open( hMdDec, num_channels ) ) != IVAS_ERR_OK ) + num_md_sub_frames = ivas_get_spar_dec_md_num_subframes( sba_order, hDecoderConfig->ivas_total_brate ); + if ( ( error = ivas_spar_md_dec_matrix_open( hMdDec, num_channels, + num_md_sub_frames ) ) != IVAS_ERR_OK ) { return error; } @@ -443,10 +462,18 @@ ivas_error ivas_spar_md_dec_init( int16_t nchan_transport; float pFC[IVAS_MAX_NUM_BANDS], PR_minmax[2]; - hMdDec->spar_hoa_md_flag = ivas_sba_get_spar_hoa_md_flag( sba_order, hDecoderConfig->ivas_total_brate ); - hMdDec->spar_md.num_bands = ( hMdDec->spar_hoa_md_flag ) ? IVAS_MAX_NUM_BANDS : min( IVAS_MAX_NUM_BANDS, SPAR_DIRAC_SPLIT_START_BAND ); + ivas_sba_get_spar_hoa_md_flag( sba_order, hDecoderConfig->ivas_total_brate, &hMdDec->spar_hoa_md_flag, &hMdDec->spar_hoa_dirac2spar_md_flag ); - ivas_spar_set_bitrate_config( &hMdDec->spar_md_cfg, hMdDec->table_idx, hMdDec->spar_md.num_bands ); + ivas_sba_get_spar_hoa_ch_ind( num_channels, hDecoderConfig->ivas_total_brate, hMdDec->HOA_md_ind ); + + hMdDec->spar_md.num_bands = ( hMdDec->spar_hoa_md_flag ) ? IVAS_MAX_NUM_BANDS : min( IVAS_MAX_NUM_BANDS, SPAR_DIRAC_SPLIT_START_BAND ); + ivas_spar_set_bitrate_config( &hMdDec->spar_md_cfg, hMdDec->table_idx, hMdDec->spar_md.num_bands +#ifdef ARITH_HUFF_CODER_CHANGES + , + hMdDec->spar_hoa_dirac2spar_md_flag, + 0, 0, 0 +#endif + ); nchan_transport = hMdDec->spar_md_cfg.nchan_transport; @@ -536,6 +563,19 @@ 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 ); + set_zero( hMdDec->smooth_fac, IVAS_MAX_NUM_BANDS ); + for ( i = 0; i < IVAS_MAX_NUM_BANDS; i++ ) + { + set_zero( hMdDec->smooth_buf[i], 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 ); + } + } + return IVAS_ERR_OK; } @@ -558,7 +598,8 @@ static ivas_error ivas_spar_set_dec_config( hMdDec->spar_md_cfg.max_freq_per_chan[i] = ivas_spar_br_table_consts[hMdDec->table_idx].fpcs; } - nchan = ivas_sba_get_nchan_metadata( ivas_spar_br_table_consts[hMdDec->table_idx].sba_order ); + nchan = ivas_sba_get_nchan_metadata( ivas_spar_br_table_consts[hMdDec->table_idx].sba_order, + ivas_spar_br_table_consts[hMdDec->table_idx].ivas_total_brate ); switch ( nchan ) { @@ -618,9 +659,18 @@ void ivas_spar_md_dec_process( { int16_t j, k, b, bw, dtx_vad, nB, i_ts; ivas_spar_md_dec_state_t *hMdDec; + int16_t num_md_chs; + int16_t num_md_sub_frames; hMdDec = st_ivas->hSpar->hMdDec; + int16_t active_w_vlbr; + active_w_vlbr = ( st_ivas->hDecoderConfig->ivas_total_brate < IVAS_24k4 ) ? 1 : 0; + + num_md_chs = ivas_sba_get_nchan_metadata( sba_order, st_ivas->hDecoderConfig->ivas_total_brate ); + num_md_sub_frames = ivas_get_spar_dec_md_num_subframes( sba_order, st_ivas->hDecoderConfig->ivas_total_brate ); + + 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 ); @@ -629,7 +679,10 @@ void ivas_spar_md_dec_process( char f_name[100]; int16_t num_bands = nB; int16_t num_subframes = 1, num_block_groups = 1, num_elements = 1, byte_size = sizeof( float ); - int16_t num_ch = ivas_sba_get_nchan_metadata( sba_order ); + int16_t num_ch = ivas_sba_get_nchan_metadata( sba_order + , + st_ivas->hDecoderConfig->ivas_total_brate + ); for ( b = 0; b < num_bands; b++ ) { sprintf( f_name, "spar_band_pred_coeffs_dec.bin" ); @@ -671,9 +724,101 @@ 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 ); + if ( hMdDec->spar_hoa_dirac2spar_md_flag == 1 ) + { + ivas_spar_to_dirac( st_ivas, hMdDec, dtx_vad, num_bands_out, bw ); + } /* set correct number of bands*/ nB = IVAS_MAX_NUM_BANDS; @@ -681,9 +826,131 @@ 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++ ) + for ( i_ts = 1; i_ts < num_md_sub_frames; i_ts++ ) { for ( b = 0; b < hMdDec->spar_md.num_bands; b++ ) { @@ -707,7 +974,11 @@ 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, num_md_sub_frames, bw, dtx_vad, nB, + num_md_chs, + active_w_vlbr + + ); #ifdef DEBUG_SPAR_DIRAC_WRITE_OUT_PRED_PARS { @@ -720,13 +991,18 @@ void ivas_spar_md_dec_process( fprintf( fid, "%.6f\n", hMdDec->mixer_mat[1][0][band] ); } #endif - + if ( bw == IVAS_RED_BAND_FACT ) + { + nB = nB << 1; + } for ( b = nB; b < num_bands_out; b++ ) { hMdDec->valid_bands[b] = 1; } - ivas_spar_md_fill_invalid_bands( &hMdDec->spar_coeffs, &hMdDec->spar_coeffs_prev, &hMdDec->valid_bands[0], &hMdDec->base_band_age[0], num_bands_out, sba_order ); + ivas_spar_md_fill_invalid_bands( &hMdDec->spar_coeffs, &hMdDec->spar_coeffs_prev, &hMdDec->valid_bands[0], &hMdDec->base_band_age[0], num_bands_out, + num_md_chs, + num_md_sub_frames ); hMdDec->dtx_md_smoothing_cntr = 1; @@ -746,6 +1022,8 @@ void ivas_spar_md_dec_process( void ivas_spar_smooth_md_dtx( ivas_spar_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle */ const int16_t num_bands_out /* i : number of output bands */ + , + const int16_t num_md_sub_frames /* i : number of metadata subframes */ ) { int16_t j, k, b, dmx_ch; @@ -781,7 +1059,7 @@ void ivas_spar_smooth_md_dtx( } /* expand MD to all time slots */ - for ( int16_t i_ts = 1; i_ts < MAX_PARAM_SPATIAL_SUBFRAMES; i_ts++ ) + for ( int16_t i_ts = 1; i_ts < num_md_sub_frames; i_ts++ ) { for ( b = 0; b < num_bands_out; b++ ) { @@ -821,6 +1099,8 @@ void ivas_spar_smooth_md_dtx( void ivas_spar_setup_md_smoothing( ivas_spar_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle */ const int16_t num_bands_out /* i : number of output bands */ + , + const int16_t num_md_sub_frames /* i : number of metadata subframes */ ) { /* copy the coeffs */ @@ -872,7 +1152,8 @@ void ivas_spar_setup_md_smoothing( } } - ivas_spar_smooth_md_dtx( hMdDec, num_bands_out ); + ivas_spar_smooth_md_dtx( hMdDec, num_bands_out, + num_md_sub_frames ); return; } @@ -952,14 +1233,14 @@ 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 numch_out, + const int16_t active_w_vlbr ) { - int16_t numch_out, num_bands, dmx_ch, split_band; + int16_t num_bands, dmx_ch, split_band; int16_t i, j, k, m, b, i_ts, active_w; const int16_t *order; float active_w_dm_fac, re; - numch_out = ivas_sba_get_nchan_metadata( sba_order ); num_bands = num_bands_out; order = remix_order_set[hMdDec->spar_md_cfg.remix_unmix_order]; @@ -994,10 +1275,12 @@ static void ivas_get_spar_matrices( } }*/ #endif - + if ( bw == IVAS_RED_BAND_FACT ) + { + num_bands = num_bands >> 1; + } active_w = hMdDec->spar_md_cfg.active_w; - active_w_dm_fac = ( dtx_vad == 0 ) ? IVAS_ACTIVEW_DM_F_SCALE_DTX : IVAS_ACTIVEW_DM_F_SCALE; - + 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 ); for ( i_ts = 0; i_ts < n_ts; i_ts++ ) { for ( i = 0; i < numch_out; i++ ) @@ -1008,12 +1291,6 @@ 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 ); } } - - if ( bw == IVAS_RED_BAND_FACT ) - { - num_bands = num_bands >> 1; - } - num_bands = min( num_bands, nB ); for ( b = 0; b < num_bands; b++ ) @@ -1342,13 +1619,14 @@ void ivas_spar_dec_gen_umx_mat( const int16_t nchan_transport, /* i : number of transport channels */ const int16_t num_bands_out, /* i : number of output bands */ const int16_t bfi /* i : bad frame indicator */ -) + , + const int16_t num_md_sub_frames ) { int16_t i, j, b, i_ts, num_out_ch; num_out_ch = hMdDec->spar_md_cfg.num_umx_chs; - for ( i_ts = 0; i_ts < MAX_PARAM_SPATIAL_SUBFRAMES; i_ts++ ) + for ( i_ts = 0; i_ts < num_md_sub_frames; i_ts++ ) { if ( hMdDec->td_decorr_flag == 1 ) { @@ -1409,7 +1687,8 @@ void ivas_spar_dec_gen_umx_mat( #endif } - ivas_spar_dec_compute_ramp_down_post_matrix( hMdDec, num_bands_out, bfi ); + ivas_spar_dec_compute_ramp_down_post_matrix( hMdDec, num_bands_out, bfi, + num_md_sub_frames ); return; } @@ -1439,6 +1718,7 @@ 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]; + int16_t do_repeat[IVAS_MAX_NUM_BANDS]; *dtx_vad = 1; *bands_bw = 1; @@ -1561,6 +1841,7 @@ static void ivas_spar_dec_parse_md_bs( for ( i = 0; i < *nB; i++ ) { do_diff[i] = 0; + do_repeat[i] = 0; } } else if ( strat < 4 ) @@ -1570,9 +1851,21 @@ static void ivas_spar_dec_parse_md_bs( for ( i = 0; i < *nB; i++ ) { do_diff[i] = 0; + do_repeat[i] = 0; } no_ec = 1; } + else 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; @@ -1581,6 +1874,7 @@ static void ivas_spar_dec_parse_md_bs( 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 ); @@ -1592,7 +1886,8 @@ 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, + strat, ivas_total_brate ); } else { @@ -1643,9 +1938,12 @@ 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]; } - hMdDec->valid_bands[i] |= ( do_diff[i] == 0 ) ? 1 : 0; + 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]; + } } - #ifdef SPAR_HOA_DBG int16_t b; b = 0; @@ -1736,9 +2034,12 @@ 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, + const int16_t strat, + const int32_t ivas_total_brate ) { - int16_t i, j, ndm, ndec; + int16_t i, ndm, ndec; + int16_t j; ivas_cell_dim_t pred_cell_dims[IVAS_MAX_NUM_BANDS]; ivas_cell_dim_t drct_cell_dims[IVAS_MAX_NUM_BANDS]; ivas_cell_dim_t decd_cell_dims[IVAS_MAX_NUM_BANDS]; @@ -1751,22 +2052,35 @@ 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 ) + 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 + { + pred_cell_dims[i].dim1 = ndm + ndec - 1; + if ( hMdDec->spar_hoa_md_flag && hMdDec->spar_hoa_dirac2spar_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; } - 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; } any_diff = 0; @@ -1781,7 +2095,7 @@ static void ivas_decode_arith_bs( if ( any_diff == 1 ) { - if ( hMdDec->spar_hoa_md_flag ) + if ( hMdDec->spar_hoa_md_flag && hMdDec->spar_hoa_dirac2spar_md_flag ) { for ( i = 0; i < nB; i++ ) { @@ -1803,7 +2117,7 @@ static void ivas_decode_arith_bs( ivas_fill_band_coeffs_idx( hMdDec->spar_md.band_coeffs_idx, nB, symbol_arr_re, pred_cell_dims, PRED_COEFF, planarCP ); - if ( hMdDec->spar_hoa_md_flag ) + if ( hMdDec->spar_hoa_md_flag && hMdDec->spar_hoa_dirac2spar_md_flag ) { for ( i = 0; i < nB; i++ ) { @@ -1875,7 +2189,6 @@ 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 ); } - return; } @@ -2069,7 +2382,7 @@ static void ivas_decode_huffman_bs( drct_dim = ndec * ( ndm - 1 ); decd_dim = ndec; pred_offset = 0; - if ( hMdDec->spar_hoa_md_flag ) + if ( hMdDec->spar_hoa_md_flag && hMdDec->spar_hoa_dirac2spar_md_flag ) { if ( i >= SPAR_DIRAC_SPLIT_START_BAND ) { @@ -2079,10 +2392,11 @@ 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] ); + ivas_huffman_decode( &hMdDec->huff_coeffs.pred_huff_re[qsi], st0, + &hMdDec->spar_md.band_coeffs_idx[i].pred_index_re[j] ); } - if ( hMdDec->spar_hoa_md_flag ) + if ( hMdDec->spar_hoa_md_flag && hMdDec->spar_hoa_dirac2spar_md_flag ) { if ( i >= SPAR_DIRAC_SPLIT_START_BAND ) { @@ -2135,16 +2449,13 @@ static void ivas_spar_md_fill_invalid_bands( const int16_t *valid_bands, int16_t *base_band_age, const int16_t num_bands, - const int16_t sba_order /* i : SBA order */ -) + const int16_t num_channels, + const int16_t num_md_sub_frames ) { int16_t i, j, b, all_valid; int16_t valid_band_idx[IVAS_MAX_NUM_BANDS], idx = -1; int16_t last_valid_band_idx[IVAS_MAX_NUM_BANDS]; float w = 0; - int16_t num_channels; - - num_channels = ivas_sba_get_nchan_metadata( sba_order ); set_s( valid_band_idx, 0, IVAS_MAX_NUM_BANDS ); set_s( last_valid_band_idx, 0, IVAS_MAX_NUM_BANDS ); @@ -2231,7 +2542,7 @@ static void ivas_spar_md_fill_invalid_bands( { for ( j = 0; j < num_channels; j++ ) { - for ( i_ts = 1; i_ts < MAX_PARAM_SPATIAL_SUBFRAMES; i_ts++ ) + for ( i_ts = 1; i_ts < num_md_sub_frames; i_ts++ ) { pSpar_coeffs->C_re[i][j][b + i_ts * IVAS_MAX_NUM_BANDS] = pSpar_coeffs->C_re[i][j][b]; pSpar_coeffs->P_re[i][j][b + i_ts * IVAS_MAX_NUM_BANDS] = pSpar_coeffs->P_re[i][j][b]; @@ -2255,7 +2566,8 @@ static void ivas_spar_md_fill_invalid_bands( static void ivas_spar_dec_compute_ramp_down_post_matrix( ivas_spar_md_dec_state_t *hMdDec, const int16_t num_bands_out, - const int16_t bfi ) + const int16_t bfi, + const int16_t num_md_sub_frames ) { int16_t num_in_ch, num_out_ch, i, j, b; @@ -2294,7 +2606,7 @@ static void ivas_spar_dec_compute_ramp_down_post_matrix( } /* apply the post matrix */ - for ( int16_t i_ts = 0; i_ts < MAX_PARAM_SPATIAL_SUBFRAMES; i_ts++ ) + for ( int16_t i_ts = 0; i_ts < num_md_sub_frames; i_ts++ ) { for ( i = 0; i < num_out_ch; i++ ) { @@ -2531,6 +2843,8 @@ 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 */ + , + const int16_t bw /* i : band joining factor */ ) { DIRAC_DEC_HANDLE hDirAC; @@ -2556,16 +2870,18 @@ void ivas_spar_to_dirac( int16_t pred_idx; int16_t *dirac_to_spar_md_bands; int16_t enc_param_start_band; + int16_t active_w_vlbr; sba_order_internal = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); start_band = 0; - end_band = min( num_bands_out, SPAR_DIRAC_SPLIT_START_BAND ); + 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; + enc_param_start_band = st_ivas->hSpar->enc_param_start_band / bw; + active_w_vlbr = ( st_ivas->hDecoderConfig->ivas_total_brate < IVAS_24k4 ) ? 1 : 0; - if ( hDirAC != NULL ) + if ( hDirAC != NULL && ivas_get_hodirac_flag( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->sba_analysis_order ) == 0 ) { band_grouping = hDirAC->band_grouping; #ifdef ENABLE_DITHER @@ -2612,7 +2928,7 @@ void ivas_spar_to_dirac( } else { - f_scale = IVAS_ACTIVEW_DM_F_SCALE; + f_scale = ( active_w_vlbr ) ? IVAS_ACTIVEW_DM_F_SCALE_VLBR : IVAS_ACTIVEW_DM_F_SCALE; } } else @@ -2661,7 +2977,11 @@ void ivas_spar_to_dirac( qmf_band_start = band_grouping[band]; qmf_band_end = band_grouping[band + 1]; +#ifdef JBM_TSM_ON_TCS + for ( block = 0; block < MAX_PARAM_SPATIAL_SUBFRAMES; block++ ) +#else for ( block = 0; block < hDirAC->nb_subframes; block++ ) +#endif { int16_t ts_start, ts_end, ts; @@ -2683,6 +3003,7 @@ void ivas_spar_to_dirac( hDirAC->energy_ratio1[block][b] = en_ratio; tmp_write_idx_band = tmp_write_idx_param_band; + if ( hDirAC->hConfig->dec_param_estim == FALSE ) { hDirAC->elevation[tmp_write_idx_band][b] = ele_dith; @@ -2720,13 +3041,20 @@ void ivas_spar_to_dirac( } /*read DirAC metadata, convert DirAC to SPAR*/ - for ( ; band < num_bands_out; band++ ) + for ( ; band < num_bands_out / bw; band++ ) { int16_t dirac_band_idx; dirac_band_idx = dirac_to_spar_md_bands[band] - enc_param_start_band; - for ( block = 0; block < MAX_PARAM_SPATIAL_SUBFRAMES; block++ ) + 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++ ) { if ( st_ivas->hQMetaData->q_direction->band_data[dirac_band_idx].azimuth[block] < 0.f ) { @@ -2742,7 +3070,8 @@ 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, + st_ivas->hQMetaData->useLowerRes, active_w_vlbr ); /* temporarily copy frame-wise prediction coefficients in DirAC bands*/ for ( pred_idx = 0; pred_idx < FOA_CHANNELS - 1; pred_idx++ ) @@ -2753,9 +3082,32 @@ void ivas_spar_to_dirac( } } } + 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 ); - 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 ); - + 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]; + } + } + } + } /* expand DirAC TC 20ms MD for residual channels to all subframes*/ for ( block = 0; block < MAX_PARAM_SPATIAL_SUBFRAMES; block++ ) { @@ -2772,7 +3124,7 @@ void ivas_spar_to_dirac( } } - for ( b = end_band; b < num_bands_out; b++ ) + for ( b = end_band * bw; b < num_bands_out; b++ ) { hMdDec->valid_bands[b] = 1; } diff --git a/lib_dec/ivas_stat_dec.h b/lib_dec/ivas_stat_dec.h index 8c27a09baf05bb2de82c968601beaceab2f45e17..af9d5da5f4f7fe0dd5d67026fff4ac1f3ad6ceb9 100644 --- a/lib_dec/ivas_stat_dec.h +++ b/lib_dec/ivas_stat_dec.h @@ -391,9 +391,7 @@ typedef struct int16_t dtx_flag; int16_t sce_id_dtx; -#ifdef DISCRETE_ISM_DTX_CNG int16_t ism_dtx_hangover_cnt; /* hangover counter for ISM DTX decoder */ -#endif } ISM_DTX_DATA_DEC; @@ -437,7 +435,11 @@ typedef struct param_ism_rendering float *proto_matrix; float *interpolator; float mixing_matrix_lin_old[CLDFB_NO_CHANNELS_MAX][PARAM_ISM_MAX_CHAN * PARAM_ISM_MAX_DMX]; - +#ifdef JBM_TSM_ON_TCS + float mixing_matrix_lin[CLDFB_NO_CHANNELS_MAX][PARAM_ISM_MAX_CHAN * PARAM_ISM_MAX_DMX]; + float *Cldfb_RealBuffer_tc; + float *Cldfb_ImagBuffer_tc; +#endif } PARAM_ISM_RENDERING_DATA, *PARAM_ISM_RENDERING_HANDLE; @@ -573,10 +575,13 @@ typedef struct dirac_output_synthesis_cov_state_structure float *cy_old[CLDFB_NO_CHANNELS_MAX]; float *mixing_matrix_old[CLDFB_NO_CHANNELS_MAX]; float *mixing_matrix_res_old[CLDFB_NO_CHANNELS_MAX]; +#ifdef JBM_TSM_ON_TCS + float *mixing_matrix[CLDFB_NO_CHANNELS_MAX]; + float *mixing_matrix_res[CLDFB_NO_CHANNELS_MAX]; +#endif } DIRAC_OUTPUT_SYNTHESIS_COV_STATE; - /* MASA stereo transport signal type detection structure */ typedef struct { @@ -614,9 +619,15 @@ typedef struct /* Diffuse sound directional distribution data structure */ typedef struct ivas_diffuse_distribution_data_structure { +#ifdef JBM_TSM_ON_TCS + float diffuseRatioX[CLDFB_NO_CHANNELS_MAX]; + float diffuseRatioY[CLDFB_NO_CHANNELS_MAX]; + float diffuseRatioZ[CLDFB_NO_CHANNELS_MAX]; +#else float diffuseRatioX[MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX]; float diffuseRatioY[MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX]; float diffuseRatioZ[MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX]; +#endif } DIFFUSE_DISTRIBUTION_DATA, *DIFFUSE_DISTRIBUTION_HANDLE; @@ -628,7 +639,15 @@ typedef struct ivas_dirac_dec_data_structure IVAS_OUTPUT_SETUP hOutSetup; int16_t slot_size; +#ifdef JBM_TSM_ON_TCS + int16_t subframe_nbslots[MAX_JBM_SUBFRAMES_5MS]; + int16_t subframes_rendered; + int16_t slots_rendered; + int16_t num_slots; + int16_t render_to_md_map[MAX_JBM_SUBFRAMES_5MS * JBM_CLDFB_SLOTS_IN_SUBFRAME]; +#else int16_t subframe_nbslots; +#endif int16_t nb_subframes; int16_t num_freq_bands; @@ -713,6 +732,7 @@ typedef struct ivas_dirac_dec_data_structure PARAM_ISM_RENDERING_HANDLE hParamIsmRendering; IVAS_FB_MIXER_HANDLE hFbMdft; int16_t dirac_to_spar_md_bands[DIRAC_MAX_NBANDS]; + const int16_t *sba_map_tc; } DIRAC_DEC_DATA, *DIRAC_DEC_HANDLE; @@ -736,7 +756,17 @@ typedef struct ivas_param_mc_dec_data_structure { int16_t slot_size; +#ifdef JBM_TSM_ON_TCS + float *Cldfb_RealBuffer_tc; + float *Cldfb_ImagBuffer_tc; + int16_t subframe_nbslots[MAX_JBM_SUBFRAMES_5MS]; + int16_t nb_subframes; + int16_t subframes_rendered; + int16_t slots_rendered; + int16_t num_slots; +#else int16_t subframe_nbslots; +#endif int16_t num_freq_bands; int16_t num_param_bands_synth; @@ -773,7 +803,25 @@ typedef struct ivas_param_mc_dec_data_structure } PARAM_MC_DEC_DATA, *PARAM_MC_DEC_HANDLE; +/*----------------------------------------------------------------------------------* + * MC Param-Upmix Mode structures + *----------------------------------------------------------------------------------*/ +/* ===== MC Param-Upmix Mode main structure ===== */ +typedef struct ivas_mc_paramupmix_dec_data_structure +{ + int16_t num_freq_bands; + ivas_td_decorr_state_t *hTdDecorr[MC_PARAMUPMIX_COMBINATIONS]; + float alphas[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS]; + float betas[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS]; + float alpha_prev[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS]; + float beta_prev[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS]; + int32_t alpha_quant[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS]; + int32_t beta_quant[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS]; + bool first_frame; + float *pcm_delay[MC_PARAMUPMIX_MAX_TRANSPORT_CHANS]; + +} MC_PARAMUPMIX_DEC_DATA, *MC_PARAMUPMIX_DEC_HANDLE; /*------------------------------------------------------------------------------------------* * SPAR decoder structures *------------------------------------------------------------------------------------------*/ @@ -809,6 +857,11 @@ typedef struct ivas_spar_md_dec_state_t int16_t table_idx; int16_t dtx_vad; int16_t spar_hoa_md_flag; + int16_t spar_hoa_dirac2spar_md_flag; + int16_t HOA_md_ind[IVAS_SPAR_MAX_CH]; + float smooth_buf[IVAS_MAX_NUM_BANDS][2 * SBA_DIRAC_NRG_SMOOTH_LONG + 1]; + float smooth_fac[IVAS_MAX_NUM_BANDS]; + float mixer_mat_prev2[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH][IVAS_MAX_NUM_BANDS]; } ivas_spar_md_dec_state_t; @@ -860,6 +913,14 @@ typedef struct ivas_spar_dec_lib_t int16_t numOutChannels; int16_t pca_ingest_channels; #endif +#ifdef JBM_TSM_ON_TCS + int16_t subframe_nbslots[MAX_JBM_SUBFRAMES_5MS]; + int16_t render_to_md_map[MAX_JBM_CLDFB_TIMESLOTS]; + int16_t nb_subframes; + int16_t subframes_rendered; + int16_t slots_rendered; + int16_t num_slots; +#endif } SPAR_DEC_DATA, *SPAR_DEC_HANDLE; @@ -953,14 +1014,8 @@ 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 */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - int16_t LFE_off; -#endif + 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 */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - int16_t num_lfe; -#endif } MCT_DEC_DATA, *MCT_DEC_HANDLE; @@ -976,15 +1031,9 @@ typedef struct ivas_lfe_dec_data_structure 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; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - float *prior_out_buffer; - - float *prevsynth_buf; -#else float prior_out_buffer[L_FRAME48k]; float prevsynth_buf[LFE_PLC_BUFLEN]; -#endif float *lfe_delay_buf; int16_t lfe_addl_delay; int16_t bfi_count; @@ -1041,7 +1090,12 @@ typedef struct vbap_data_structure typedef struct renderer_struct { float prev_gains[MAX_CICP_CHANNELS - 1][MAX_OUTPUT_CHANNELS]; +#ifdef JBM_TSM_ON_TCS + float *interpolator; + float gains[MAX_CICP_CHANNELS - 1][MAX_OUTPUT_CHANNELS]; +#else float interpolator[L_FRAME48k]; +#endif } ISM_RENDERER_DATA, *ISM_RENDERER_HANDLE; @@ -1108,7 +1162,6 @@ typedef struct ivas_mcmasa_lfe_synth_struct } MCMASA_LFE_SYNTH_DATA, *MCMASA_LFE_SYNTH_DATA_HANDLE; -#ifdef FIX_350_MASA_DELAY_COMP typedef struct ivas_masa_decoder_ext_out_meta_struct { MASA_DECRIPTIVE_META descriptiveMeta; @@ -1121,16 +1174,13 @@ typedef struct ivas_masa_decoder_ext_out_meta_struct uint8_t diffuseToTotalRatio[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]; } MASA_DECODER_EXT_OUT_META; -#endif typedef struct ivas_masa_decoder_data_struct { int16_t band_mapping[MASA_FREQUENCY_BANDS + 1]; SPHERICAL_GRID_DATA *sph_grid16; -#ifdef FIX_350_MASA_DELAY_COMP MASA_DECODER_EXT_OUT_META *extOutMeta; -#endif float dir_decode_quality; } MASA_DECODER_DATA; @@ -1158,17 +1208,48 @@ typedef struct decoder_config_structure 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 */ +#ifdef FIX_439_OTR_PARAMS + HEAD_ORIENT_TRK_T orientation_tracking; /* indicates orientation tracking type */ +#else + int16_t orientation_tracking; /* indicates orientation tracking type */ +#endif + int16_t Opt_non_diegetic_pan; /* indicates diegetic or not */ + float non_diegetic_pan_gain; /* non diegetic panning gain*/ + int16_t Opt_AMR_WB; /* flag indicating AMR-WB IO mode */ /* temp. development parameters */ #ifdef DEBUGGING int16_t force_rend; /* forced TD/CLDFB binaural renderer (for ISM and MC) */ #endif +#ifdef JBM_TSM_ON_TCS + int16_t voip_active; +#endif } DECODER_CONFIG, *DECODER_CONFIG_HANDLE; + +#ifdef JBM_TSM_ON_TCS +typedef struct decoder_tc_buffer_structure +{ + float *tc_buffer; /* the buffer itself */ + float *tc[MAX_TRANSPORT_CHANNELS]; /* pointers into the buffer to the beginning of each tc */ + TC_BUFFER_MODE tc_buffer_mode; /* mode of the buffer (no buffering, render buffering, out buffering) */ + int16_t nchan_transport_jbm; /* number of TCs after TC decoding */ + int16_t nchan_transport_internal; /* total number of TC buffer channels, can include e.g. TD decorr data */ + int16_t nchan_buffer_full; /* number of channels to be fully buffered */ + int16_t n_samples_available; /* samples still available for rendering in the current frame */ + int16_t n_samples_buffered; /* full number of samples in the buffer (including spill to next frame) */ + int16_t n_samples_rendered; /* samples already rendered in the current frame */ + int16_t n_samples_granularity; /* render granularity */ + int16_t n_samples_flushed; + int16_t subframe_nbslots[MAX_JBM_SUBFRAMES_5MS]; + int16_t nb_subframes; + int16_t subframes_rendered; + int16_t slots_rendered; + int16_t num_slots; + int16_t n_samples_discard; /* number of samples to discard from the beginning of the output */ +} DECODER_TC_BUFFER, *DECODER_TC_BUFFER_HANDLE; +#endif /*----------------------------------------------------------------------------------* * * Main IVAS decoder structure @@ -1220,13 +1301,12 @@ typedef struct Decoder_Struct IVAS_QMETADATA_HANDLE hQMetaData; /* q_metadata handle */ MCT_DEC_HANDLE hMCT; /* MCT handle */ PARAM_MC_DEC_HANDLE hParamMC; /* Parametric MC handle */ + MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix; /* MC Param-Upmix handle */ MASA_DECODER_HANDLE hMasa; /* MASA handle */ LFE_DEC_HANDLE hLFE; /* LFE handle */ ISM_MODE ism_mode; /* ISM format mode */ -#ifdef NCHAN_ISM_PARAMETER int16_t nchan_ism; /* number of ISM channels */ -#endif SBA_MODE sba_mode; /* SBA format mode */ MC_MODE mc_mode; /* MC format mode */ int16_t sba_order; /* Ambisonic (SBA) order */ @@ -1261,11 +1341,13 @@ typedef struct Decoder_Struct int32_t noClipping; /* number of clipped samples */ #endif int32_t last_active_ivas_total_brate; -#ifdef FIX_379_EXT_METADATA int16_t ism_extmeta_active; /* Extended metadata active in decoder */ int16_t ism_extmeta_cnt; /* Change frame counter for extended metadata */ -#endif + +#ifdef JBM_TSM_ON_TCS + DECODER_TC_BUFFER_HANDLE hTcBuffer; +#endif } Decoder_Struct; /* clang-format on */ diff --git a/lib_dec/ivas_stereo_cng_dec.c b/lib_dec/ivas_stereo_cng_dec.c index b55cf4cfbdbda5037c08726630424a19321bfd20..c12498c015e6a9d54b79278ec89f36c8bacbf6c7 100644 --- a/lib_dec/ivas_stereo_cng_dec.c +++ b/lib_dec/ivas_stereo_cng_dec.c @@ -90,8 +90,7 @@ void stereo_dft_dec_sid_coh( int16_t bits_tmp; int16_t b; - /* 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; + nr_of_sid_stereo_bits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; /* 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 +173,6 @@ void stereo_dft_dec_sid_coh( ( *nb_bits )++; } - dtx_read_padding_bits( st, ( IVAS_SID_5k2 - 4400 ) / FRAMES_PER_SEC ); return; } diff --git a/lib_dec/ivas_stereo_dft_dec.c b/lib_dec/ivas_stereo_dft_dec.c index 769f6016b487b16c2f1824ad302af50b9a6136ee..02fd3a41d309f7237c43b7b07fbdc7b71ca36838 100644 --- a/lib_dec/ivas_stereo_dft_dec.c +++ b/lib_dec/ivas_stereo_dft_dec.c @@ -1126,13 +1126,15 @@ void stereo_dft_dec( 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 */ -#ifdef SBA2MONO - const int16_t sba_mono_flag, /* i : signal mono 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 */ +#ifdef FIX_STEREO_474 + , + const int16_t num_md_sub_frames /* i: number of MD subframes */ #endif - 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; @@ -1210,7 +1212,12 @@ void stereo_dft_dec( ivas_sba_dirac_stereo_smooth_parameters( hStereoDft, hMdDec, cross_fade_start_offset, - output_Fs ); + output_Fs +#ifdef FIX_STEREO_474 + , + num_md_sub_frames +#endif + ); } else { @@ -1342,6 +1349,7 @@ void stereo_dft_dec( { g = hStereoDft->g_state[b]; } + /* store side gains from inactive frames for later use by the stereo CNA */ if ( hStereoDft->band_limits[b] < L_FRAME16k && ( hStereoDft->frame_sid_nodata || st0->VAD == 0 ) ) { @@ -1413,7 +1421,6 @@ void stereo_dft_dec( if ( nchan_transport == 1 ) { -#ifdef SBA2MONO if ( sba_mono_flag ) { if ( b == 0 ) @@ -1451,7 +1458,6 @@ void stereo_dft_dec( } else { -#endif if ( b == 0 ) { i = 0; @@ -1496,9 +1502,7 @@ void stereo_dft_dec( DFT_L[2 * i + 1] = DFT_W + DFT_Y; DFT_R[2 * i + 1] = DFT_W - DFT_Y; } -#ifdef SBA2MONO } -#endif } else if ( nchan_transport >= 2 ) { @@ -1601,7 +1605,7 @@ void stereo_dft_dec( if ( hStereoDft->frame_sid_nodata || st0->VAD == 0 ) { - hFdCngDec->cna_band_limits[b] = hStereoDft->band_limits[hFdCngDec->cna_nbands]; + hFdCngDec->cna_band_limits[hFdCngDec->cna_nbands] = hStereoDft->band_limits[hFdCngDec->cna_nbands]; } if ( hStereoDft->frame_sid_nodata && !sba_dirac_stereo_flag ) diff --git a/lib_dec/ivas_stereo_mdct_core_dec.c b/lib_dec/ivas_stereo_mdct_core_dec.c index ab8844c8e895bef1a7d5fe025b9e245b6cdee640..cbeaf2a1e516f0b4d2473fd8f8ca1ff406dd2c2c 100644 --- a/lib_dec/ivas_stereo_mdct_core_dec.c +++ b/lib_dec/ivas_stereo_mdct_core_dec.c @@ -222,9 +222,6 @@ void stereo_mdct_core_dec( if ( !bfi ) { ivas_mdct_dec_side_bits_frame_channel( hCPE, param_lpc, p_param, hCPE->hCoreCoder[0], -#ifndef ISSUE_24_CLEANUP_MCT_LFE - NULL, -#endif nTnsBitsTCX10, param, 0, 0 ); if ( sts[0]->igf ) @@ -257,9 +254,6 @@ void stereo_mdct_core_dec( } ivas_mdct_core_invQ( hCPE, -#ifndef ISSUE_24_CLEANUP_MCT_LFE - 0, -#endif nTnsBitsTCX10, p_param, param_lpc, param, fUseTns, tnsData, x_0, x, Aq, ms_mask, 0 ); for ( ch = 0; ch < nChannels; ch++ ) @@ -354,9 +348,6 @@ void stereo_mdct_core_dec( } ivas_mdct_core_tns_ns( hCPE, -#ifndef ISSUE_24_CLEANUP_MCT_LFE - 0, -#endif 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 ) ) @@ -372,9 +363,6 @@ void stereo_mdct_core_dec( } ivas_mdct_core_reconstruct( hCPE, x, signal_outFB_tmp, -#ifndef ISSUE_24_CLEANUP_MCT_LFE - 0, -#endif fUseTns, 0 ); mvr2r( signal_out_tmp[0], signal_out[0], L_FRAME48k ); diff --git a/lib_dec/ivas_stereo_mdct_stereo_dec.c b/lib_dec/ivas_stereo_mdct_stereo_dec.c index cccef8ec84b5553b7761be21f3f2ee9f3ccd9c41..efc9ebe845d7fffafea2ff96565a9f82de09aa64 100644 --- a/lib_dec/ivas_stereo_mdct_stereo_dec.c +++ b/lib_dec/ivas_stereo_mdct_stereo_dec.c @@ -468,6 +468,9 @@ ivas_error initMdctStereoDtxData( /* Init FD-CNG */ initFdCngDec( st ); + } + if ( st->first_CNG == 0 ) + { if ( ch == 1 && st->cng_sba_flag ) { st->hFdCngDec->hFdCngCom->seed += 3; diff --git a/lib_dec/ivas_stereo_switching_dec.c b/lib_dec/ivas_stereo_switching_dec.c index 144f7950e976bf44af0a64acd3b43dd84ea68b74..88d82ac17b8d7732c94bd2260191d40e91185d3b 100644 --- a/lib_dec/ivas_stereo_switching_dec.c +++ b/lib_dec/ivas_stereo_switching_dec.c @@ -963,19 +963,12 @@ ivas_error stereo_memory_dec( if ( ivas_format == MC_FORMAT && hCPE->element_mode == IVAS_CPE_MDCT ) { - if ( mc_mode == MC_MODE_MCT ) + if ( mc_mode == MC_MODE_MCT || mc_mode == MC_MODE_PARAMUPMIX ) { /* deallocate the FdCNG handle */ for ( i = 0; i < CPE_CHANNELS; ++i ) { deleteFdCngDec( &hCPE->hCoreCoder[i]->hFdCngDec ); -#ifndef ISSUE_24_CLEANUP_MCT_LFE - /* deallocate CLDFB synthesis for LFE channel */ - if ( hCPE->hCoreCoder[i]->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - deleteCldfb( &hCPE->hCoreCoder[i]->cldfbSyn ); - } -#endif } } else diff --git a/lib_dec/ivas_tcx_core_dec.c b/lib_dec/ivas_tcx_core_dec.c index b5dcfd2bbede473d6a2ee5b8e5bbf6742162a994..ab82fb4e07653b0d0900c75137aecd588738b608 100644 --- a/lib_dec/ivas_tcx_core_dec.c +++ b/lib_dec/ivas_tcx_core_dec.c @@ -95,25 +95,12 @@ 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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - st->mct_chan_mode -#endif - ); + st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_flag ); if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - !MCT_flag && -#endif st->element_mode != EVS_MONO ) { - st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - st->mct_chan_mode -#endif - ); + st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode ); } if ( hTcxLtpDec != NULL ) { @@ -176,10 +163,6 @@ void stereo_tcx_core_dec( STEREO_CNG_DEC_HANDLE hStereoCng, /* i : Stereo CNG handle */ const int16_t nchan_out, /* i : number of output channels */ const IVAS_FORMAT ivas_format /* i : IVAS format */ -#ifndef DISCRETE_ISM_DTX_CNG - , - const ISM_MODE ism_mode /* i : ISM mode (only needed if format is ISM)*/ -#endif ) { int16_t i, k; @@ -743,11 +726,7 @@ void stereo_tcx_core_dec( if ( st->element_mode != IVAS_CPE_TD ) { -#ifndef DISCRETE_ISM_DTX_CNG - if ( ivas_format == ISM_FORMAT && ism_mode == ISM_MODE_PARAM ) -#else if ( ivas_format == ISM_FORMAT ) -#endif { float buffer[L_FRAME16k]; lerp( signal_outFB, buffer, st->L_frame, hTcxDec->L_frameTCX ); diff --git a/lib_dec/jbm_jb4sb.h b/lib_dec/jbm_jb4sb.h index 54b873b006b1c9532794cae661a7f3c2aea031ad..7954358595a32c3dceff516f4a04a87c73b09648 100644 --- a/lib_dec/jbm_jb4sb.h +++ b/lib_dec/jbm_jb4sb.h @@ -78,6 +78,14 @@ struct JB4_DATAUNIT int16_t nextCoderType; }; +#ifdef JBM_TSM_ON_TCS +typedef enum +{ + JBM_RENDERER_NONE, + JBM_RENDERER_IVAS, +} JBM_RENDERER_TYPE; +#endif + typedef struct JB4_DATAUNIT *JB4_DATAUNIT_HANDLE; diff --git a/lib_dec/jbm_pcmdsp_apa.c b/lib_dec/jbm_pcmdsp_apa.c index c816a9d9c8b4fadbea3da7e1ccb7061dbc4cd677..c224b4cfbf011792e21bb1e621f096553d11dbbb 100644 --- a/lib_dec/jbm_pcmdsp_apa.c +++ b/lib_dec/jbm_pcmdsp_apa.c @@ -66,7 +66,12 @@ struct apa_state_t { /* output buffer */ +#ifdef JBM_TSM_ON_TCS + bool evs_compat_mode; + float *buf_out; +#else int16_t *buf_out; +#endif uint16_t buf_out_capacity; uint16_t l_buf_out; @@ -86,6 +91,14 @@ struct apa_state_t /* total number of processed input samples since apa_reset() */ uint32_t l_in_total; +#ifdef JBM_TSM_ON_TCS + /* time resolution in samples of the IVAS renderer*/ + uint16_t l_ts; + + /* samples already available in the renderer buffer */ + uint16_t l_r_buf; +#endif + /* sum of inserted/removed samples since last apa_set_scale() */ int32_t diffSinceSetScale; /* number of input frames since last apa_set_scale() */ @@ -123,6 +136,17 @@ static float apa_corrEnergy2dB( float energy, uint16_t corr_len ); static float apa_getQualityIncreaseForLowEnergy( float energydB ); +#ifdef JBM_TSM_ON_TCS +static bool logarithmic_search( const apa_state_t *ps, const float *signal, int16_t s_start, uint16_t inlen, uint16_t offset, uint16_t fixed_pos, uint16_t corr_len, uint16_t wss, uint16_t css, int16_t *synchpos ); + +static bool find_synch( apa_state_t *ps, const float *in, uint16_t l_in, int16_t s_start, uint16_t s_len, int16_t fixed_pos, uint16_t corr_len, uint16_t offset, float *energy, float *quality, int16_t *synch_pos ); + +static bool copy_frm( apa_state_t *ps, const float frm_in[], float frm_out[], uint16_t *l_frm_out ); + +static bool shrink_frm( apa_state_t *ps, const float frm_in[], uint16_t maxScaling, float frm_out[], uint16_t *l_frm_out ); + +static bool extend_frm( apa_state_t *ps, const float frm_in[], float frm_out[], uint16_t *l_frm_out ); +#else static bool logarithmic_search( const apa_state_t *ps, const int16_t *signal, int16_t s_start, uint16_t inlen, uint16_t offset, uint16_t fixed_pos, uint16_t corr_len, uint16_t wss, uint16_t css, int16_t *synchpos ); static bool find_synch( apa_state_t *ps, const int16_t *in, uint16_t l_in, int16_t s_start, uint16_t s_len, int16_t fixed_pos, uint16_t corr_len, uint16_t offset, float *energy, float *quality, int16_t *synch_pos ); @@ -132,7 +156,7 @@ static bool copy_frm( apa_state_t *ps, const int16_t frm_in[], int16_t frm_out[] static bool shrink_frm( apa_state_t *ps, const int16_t frm_in[], uint16_t maxScaling, int16_t frm_out[], uint16_t *l_frm_out ); static bool extend_frm( apa_state_t *ps, const int16_t frm_in[], int16_t frm_out[], uint16_t *l_frm_out ); - +#endif /*---------------------------------------------------------------------* * Public functions @@ -164,6 +188,10 @@ ivas_error apa_init( return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM\n" ) ); } +#ifdef JBM_TSM_ON_TCS + ps->evs_compat_mode = false; +#endif + apa_reset( ps ); *pps = ps; @@ -196,9 +224,58 @@ void apa_reset( ps->bad_frame_count = 0; ps->good_frame_count = 0; +#ifdef JBM_TSM_ON_TCS + ps->l_ts = 1; + ps->l_r_buf = 0; +#endif return; } +#ifdef JBM_TSM_ON_TCS +uint8_t apa_reconfigure( + apa_state_t *ps, + uint16_t num_channels, + uint16_t l_ts ) +{ + + /* realloc buffer */ + free( ps->buf_out ); + ps->num_channels = (uint16_t) num_channels; + ps->buf_out_capacity = (uint16_t) ( APA_BUF_PER_CHANNEL * num_channels ); + ps->buf_out = (float *) malloc( sizeof( float ) * ps->buf_out_capacity ); + if ( !ps->buf_out ) + { + return 2; + } + ps->l_buf_out = 0; + ps->l_in_total = 0; + ps->l_ts = ps->num_channels * l_ts; + + /* set everything else dependent on the number of channels */ + /* set segment size */ + /* in the order of a pitch, set to 160 samples at 16 kHz */ + /* used for windowing and as the correlation length, i.e., */ + /* the size of the template segment. */ + ps->l_seg = ( ps->rate / 100 ) * ps->num_channels; + + /* set frame size */ + /* set to 320 samples at 16 kHz */ + ps->l_frm = ( ps->rate / FRAMES_PER_SEC ) * ps->num_channels; + + /* set minimum pitch */ + /* set to 40 samples at 16 kHz */ + /* (defines min change in number of samples, i.e., abs(l_in-l_out) >= p_min) */ + ps->p_min = ( ps->rate / 400 ) * ps->num_channels; + + /* set search length */ + /* must cover one pitch, set to 200 samples at 16 kHz */ + /* (the resulting maximum pitch is then p_min+l_search = 240 samples at 16 kHz) */ + ps->l_search = ( ps->rate / 80 ) * ps->num_channels; + + return 0; +} + +#endif /* Sets the audio configuration. */ bool apa_set_rate( @@ -302,6 +379,52 @@ bool apa_set_scale( return 0; } +#ifdef JBM_TSM_ON_TCS +bool apa_set_renderer_granularity( + apa_state_t *ps, + uint16_t l_ts ) +{ + /* make sure pointer is valid */ + if ( ps == NULL ) + { + return 1; + } + + + /* copy to state struct */ + ps->l_ts = l_ts * ps->num_channels; + return 0; +} + +bool apa_set_renderer_residual_samples( + apa_state_t *ps, + uint16_t l_r_buf ) +{ + /* make sure pointer is valid */ + if ( ps == NULL ) + { + return 1; + } + + + /* copy to state struct */ + ps->l_r_buf = l_r_buf * ps->num_channels; + return 0; +} + +bool apa_set_evs_compat_mode( apa_state_t *ps, bool mode ) +{ + /* make sure pointer is valid */ + if ( ps == NULL ) + { + return 1; + } + + ps->evs_compat_mode = mode; + + return 0; +} +#endif /* ******************************************************************************** @@ -454,16 +577,28 @@ bool apa_exit( ******************************************************************************** */ uint8_t apa_exec( - apa_state_t *ps, /* i/o: state struct */ - const int16_t a_in[], /* i : input samples */ - uint16_t l_in, /* i : number of input samples */ - uint16_t maxScaling, /* i : allowed number of inserted/removed samples */ - int16_t a_out[], /* o : output samples */ - uint16_t *l_out /* o : number of output samples */ + apa_state_t *ps, /* i/o: state struct */ +#ifdef JBM_TSM_ON_TCS + const float a_in[], /* i : input samples */ +#else + const int16_t a_in[], /* i : input samples */ +#endif + uint16_t l_in, /* i : number of input samples */ + uint16_t maxScaling, /* i : allowed number of inserted/removed samples */ +#ifdef JBM_TSM_ON_TCS + float a_out[], /* o : output samples */ +#else + int16_t a_out[], /* o : output samples */ +#endif + uint16_t *l_out /* o : number of output samples */ ) { uint16_t i; +#ifdef JBM_TSM_ON_TCS + float frm_in[APA_BUF]; /* TODO(mcjbm): this buffer could be smaller - always allocates space for 16 channels */ +#else int16_t frm_in[APA_BUF]; /* TODO(mcjbm): this buffer could be smaller - always allocates space for 16 channels */ +#endif uint16_t l_frm_out; int16_t l_rem; int32_t dl_scaled, dl_copied, l_frm_out_target; @@ -525,8 +660,13 @@ uint8_t apa_exec( } else { +#ifdef JBM_TSM_ON_TCS + float *buf_out_ptr = &( ps->buf_out[ps->l_buf_out - ps->l_frm] ); + float *frm_in_ptr = &( frm_in[ps->l_frm] ); +#else int16_t *buf_out_ptr = &( ps->buf_out[ps->l_buf_out - ps->l_frm] ); int16_t *frm_in_ptr = &( frm_in[ps->l_frm] ); +#endif /* fill input frame */ /* 1st input frame: previous output samples */ @@ -581,8 +721,13 @@ uint8_t apa_exec( /* discard old samples; always keep at least most recent l_frm samples */ if ( ( ps->l_buf_out + l_frm_out ) > ps->buf_out_capacity ) { +#ifdef JBM_TSM_ON_TCS + float *buf_out_ptr1 = ps->buf_out; + float *buf_out_ptr2; +#else int16_t *buf_out_ptr1 = ps->buf_out; int16_t *buf_out_ptr2; +#endif l_rem = ( ps->l_frm - l_frm_out ); if ( l_rem < 0 ) @@ -602,7 +747,11 @@ uint8_t apa_exec( return 5; } { +#ifdef JBM_TSM_ON_TCS + float *buf_out_ptr = &( ps->buf_out[ps->l_buf_out] ); +#else int16_t *buf_out_ptr = &( ps->buf_out[ps->l_buf_out] ); +#endif for ( i = 0; i < l_frm_out; i++ ) { buf_out_ptr[i] = a_out[i]; @@ -660,7 +809,11 @@ uint8_t apa_exec( */ static void get_scaling_quality( const apa_state_t *ps, +#ifdef JBM_TSM_ON_TCS + const float *signal, +#else const int16_t *signal, +#endif uint16_t s_len, uint16_t offset, uint16_t corr_len, @@ -813,7 +966,11 @@ static float apa_getQualityIncreaseForLowEnergy( */ static bool logarithmic_search( const apa_state_t *ps, +#ifdef JBM_TSM_ON_TCS + const float *signal, +#else const int16_t *signal, +#endif int16_t s_start, uint16_t inlen, uint16_t offset, @@ -926,7 +1083,11 @@ static bool logarithmic_search( */ static bool find_synch( apa_state_t *ps, +#ifdef JBM_TSM_ON_TCS + const float *in, +#else const int16_t *in, +#endif uint16_t l_in, int16_t s_start, uint16_t s_len, @@ -981,8 +1142,13 @@ static bool find_synch( */ static bool copy_frm( apa_state_t *ps, +#ifdef JBM_TSM_ON_TCS + const float frm_in[], + float frm_out[], +#else const int16_t frm_in[], int16_t frm_out[], +#endif uint16_t *l_frm_out ) { uint16_t i; @@ -1029,9 +1195,17 @@ static bool copy_frm( */ static bool shrink_frm( apa_state_t *ps, +#ifdef JBM_TSM_ON_TCS + const float frm_in[], +#else const int16_t frm_in[], +#endif uint16_t maxScaling, +#ifdef JBM_TSM_ON_TCS + float frm_out[], +#else int16_t frm_out[], +#endif uint16_t *l_frm_out ) { bool findSynchResult = 0; @@ -1062,7 +1236,28 @@ static bool shrink_frm( /* maximum scaling */ energy = -65; quality = 5; - if ( maxScaling != 0U && s_end > maxScaling + 1 ) +#ifdef JBM_TSM_ON_TCS + if ( ps->evs_compat_mode == false ) + { + + xtract = maxScaling; + /* take samples already in the renderer buf into account */ + xtract += ps->l_r_buf; + /* snap to renderer time slot borders */ + xtract -= ( ps->l_ts - ( l_frm - xtract + ps->l_r_buf ) % ps->l_ts ); + while ( xtract < 0 ) + { + xtract += ps->l_ts; + } + while ( xtract > ( s_end - ps->num_channels ) ) + { + /* exceeded the possible shrinking, go back one renderer ts*/ + xtract -= ps->l_ts; + } + } + else +#endif + if ( maxScaling != 0U && s_end > maxScaling + 1 ) { xtract = maxScaling; } @@ -1118,7 +1313,18 @@ static bool shrink_frm( { return 1; } - overlapAdd( frm_in, frm_in + xtract, frm_out, l_seg, ps->num_channels, ps->win + ps->l_halfwin, ps->win ); +#ifdef JBM_TSM_ON_TCS + if ( ps->evs_compat_mode == true ) + { + overlapAddEvs( frm_in, frm_in + xtract, frm_out, l_seg, ps->num_channels, ps->win + ps->l_halfwin, ps->win ); + } + else + { +#endif + overlapAdd( frm_in, frm_in + xtract, frm_out, l_seg, ps->num_channels, ps->win + ps->l_halfwin, ps->win ); +#ifdef JBM_TSM_ON_TCS + } +#endif } else { @@ -1165,8 +1371,13 @@ static bool shrink_frm( */ static bool extend_frm( apa_state_t *ps, +#ifdef JBM_TSM_ON_TCS + const float frm_in[], + float frm_out[], +#else const int16_t frm_in[], int16_t frm_out[], +#endif uint16_t *l_frm_out ) { bool findSynchResult = 0; @@ -1180,8 +1391,14 @@ static bool extend_frm( int16_t s_start = 0; float energy, quality = 0.0f; uint16_t l_frm, l_seg; +#ifdef JBM_TSM_ON_TCS + const float *fadeOut, *fadeIn; + float *out; +#else const int16_t *fadeOut, *fadeIn; int16_t *out; +#endif + l_frm = ps->l_frm; l_seg = ps->l_seg; @@ -1271,6 +1488,15 @@ static bool extend_frm( energy = -65; quality = 5; xtract[n] = s_start + ps->num_channels; +#ifdef JBM_TSM_ON_TCS + if ( ps->evs_compat_mode == false ) + { + /* take renderer buffer samples into accout */ + xtract[n] += ps->l_r_buf; + /* snap to next renderer time slot border to resynchronize */ + xtract[n] -= ( ( N - 1 ) * l_seg - xtract[n] + ps->l_r_buf ) % ps->l_ts; + } +#endif } else { @@ -1327,13 +1553,29 @@ static bool extend_frm( fadeOut = frm_in + l_frm + xtract[n - 1] + l_seg; fadeIn = frm_in + l_frm + xtract[n]; out = frm_out + ( n - 2 ) * l_seg; - overlapAdd( fadeOut, fadeIn, out, l_seg, ps->num_channels, ps->win + ps->l_halfwin, ps->win ); +#ifdef JBM_TSM_ON_TCS + if ( ps->evs_compat_mode == true ) + { + overlapAddEvs( fadeOut, fadeIn, out, l_seg, ps->num_channels, ps->win + ps->l_halfwin, ps->win ); + } + else + { +#endif + overlapAdd( fadeOut, fadeIn, out, l_seg, ps->num_channels, ps->win + ps->l_halfwin, ps->win ); +#ifdef JBM_TSM_ON_TCS + } +#endif } else { /* just copy down 1st half of current segment (= 2nd half of previous segment) */ +#ifdef JBM_TSM_ON_TCS + float *frm_out_ptr; + const float *frm_in_ptr; +#else int16_t *frm_out_ptr; const int16_t *frm_in_ptr; +#endif frm_out_ptr = &( frm_out[( n - 2 ) * l_seg] ); frm_in_ptr = &( frm_in[l_frm + xtract[n]] ); for ( i = 0; i < l_seg; i++ ) diff --git a/lib_dec/jbm_pcmdsp_apa.h b/lib_dec/jbm_pcmdsp_apa.h index 543042f53b4301789af0eabe9fddee082254c8fa..a5e7cb7d61ab0810bf36913fd761bc39946a8a00 100644 --- a/lib_dec/jbm_pcmdsp_apa.h +++ b/lib_dec/jbm_pcmdsp_apa.h @@ -114,12 +114,26 @@ bool apa_set_rate( apa_state_t *ps, const int32_t output_Fs ); * @return 0 on success, 1 on failure */ bool apa_set_scale( apa_state_t *s, uint16_t scale ); +#ifdef JBM_TSM_ON_TCS +bool apa_set_renderer_granularity( apa_state_t *ps, uint16_t l_ts ); + +bool apa_set_renderer_residual_samples( apa_state_t *ps, uint16_t l_r_buf ); + +bool apa_set_evs_compat_mode( apa_state_t *ps, bool mode ); + +uint8_t apa_reconfigure( apa_state_t *ps, uint16_t num_channels, uint16_t l_ts ); +#endif + bool apa_set_complexity_options( apa_state_t *s, uint16_t wss, uint16_t css ); bool apa_set_quality( apa_state_t *s, float quality, uint16_t qualityred, uint16_t qualityrise ); bool apa_exit( apa_state_t **s ); +#ifdef JBM_TSM_ON_TCS +uint8_t apa_exec( apa_state_t *s, const float a_in[], uint16_t l_in, uint16_t maxScaling, float a_out[], uint16_t *l_out ); +#else uint8_t apa_exec( apa_state_t *s, const int16_t a_in[], uint16_t l_in, uint16_t maxScaling, int16_t a_out[], uint16_t *l_out ); +#endif #endif /* JBM_PCMDSP_APA_H */ diff --git a/lib_dec/jbm_pcmdsp_fifo.c b/lib_dec/jbm_pcmdsp_fifo.c index 81e833e5e56fc3860b7045c6b97405e52b71ae15..fd0df04ca8efac158aade1d4d66085cd601da55c 100644 --- a/lib_dec/jbm_pcmdsp_fifo.c +++ b/lib_dec/jbm_pcmdsp_fifo.c @@ -116,6 +116,15 @@ ivas_error pcmdsp_fifo_init( return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM\n" ) ); } +#ifdef DEBUGGING + { + uint32_t i; + for ( i = 0; i < nDataBytes; i++ ) + { + h->dataBegin[i] = 0; + } + } +#endif h->dataEnd = h->dataBegin + nDataBytes; h->dataWriteIterator = h->dataBegin; h->dataReadIterator = h->dataBegin; @@ -166,6 +175,49 @@ int16_t pcmdsp_fifo_write( return 0; } +#ifdef JBM_TSM_ON_TCS +/* Writes the given audio data to the FIFO. */ +int16_t pcmdsp_fifo_write_zero( + PCMDSP_FIFO_HANDLE h, + uint16_t nSamplesPerChannel ) +{ + uint16_t nBytesToWrite; + + /* check for empty input buffer */ + if ( nSamplesPerChannel == 0U ) + { + return 0; + } + + /* check, if enough space left */ + if ( nSamplesPerChannel > h->capacity - h->size ) + { + return -1; + } + + nBytesToWrite = nSamplesPerChannel * h->nBytesPerSampleSet; + if ( h->dataWriteIterator + nBytesToWrite > h->dataEnd ) + { + /* wrap around: writing two parts */ + uint16_t bytesOfFirstPart, secondSize; + bytesOfFirstPart = (uint16_t) ( h->dataEnd - h->dataWriteIterator ); + secondSize = nBytesToWrite - bytesOfFirstPart; + set_c( (int8_t *) h->dataWriteIterator, 0, bytesOfFirstPart ); + set_c( (int8_t *) h->dataBegin, 0, secondSize ); + h->dataWriteIterator = h->dataBegin + secondSize; + } + else + { + /* no wrap around: simple write */ + set_c( (int8_t *) h->dataWriteIterator, 0, nBytesToWrite ); + h->dataWriteIterator += nBytesToWrite; + } + h->size += nSamplesPerChannel; + + return 0; +} +#endif + /* Reads the given number of audio samples from the FIFO. */ int16_t pcmdsp_fifo_read( PCMDSP_FIFO_HANDLE h, diff --git a/lib_dec/jbm_pcmdsp_fifo.h b/lib_dec/jbm_pcmdsp_fifo.h index 13ffd146f871fb1b4d7c227b965a1931ba2f1e11..e6c64dc9e8e7b5cbeaa1c51f3f1ecda1cdc1f434 100644 --- a/lib_dec/jbm_pcmdsp_fifo.h +++ b/lib_dec/jbm_pcmdsp_fifo.h @@ -73,6 +73,9 @@ void pcmdsp_fifo_destroy( PCMDSP_FIFO_HANDLE *ph ); 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 ); +#ifdef JBM_TSM_ON_TCS +int16_t pcmdsp_fifo_write_zero( PCMDSP_FIFO_HANDLE h, uint16_t nSamplesPerChannel ); +#endif int16_t pcmdsp_fifo_read( PCMDSP_FIFO_HANDLE h, uint16_t nSamplesPerChannel, uint8_t *samples ); diff --git a/lib_dec/jbm_pcmdsp_similarityestimation.c b/lib_dec/jbm_pcmdsp_similarityestimation.c index f575acc7ad337f77ac81495ec36340ce1ce2ef49..e83d1f7c3769ff944fd751760a0b61bc1b301f70 100644 --- a/lib_dec/jbm_pcmdsp_similarityestimation.c +++ b/lib_dec/jbm_pcmdsp_similarityestimation.c @@ -52,7 +52,11 @@ /* Calculates cross correlation coefficient for template segment. */ float cross_correlation_self( +#ifdef JBM_TSM_ON_TCS + const float *signal, +#else const int16_t *signal, +#endif uint16_t x, uint16_t y, uint16_t corr_len ) @@ -63,7 +67,11 @@ float cross_correlation_self( c_c = 0.0f; for ( j = 0; j < corr_len; j++ ) { +#ifdef JBM_TSM_ON_TCS + c_c += ( signal[j + x] * signal[j + y] ); +#else c_c += ( (float) signal[j + x] * (float) signal[j + y] ); +#endif } return c_c; @@ -71,7 +79,11 @@ float cross_correlation_self( /* Calculates cross correlation coefficient for template segment. */ float cross_correlation_subsampled_self( +#ifdef JBM_TSM_ON_TCS + const float *signal, +#else const int16_t *signal, +#endif uint16_t x, uint16_t y, uint16_t corr_len, @@ -83,7 +95,11 @@ float cross_correlation_subsampled_self( c_c = 0.0f; for ( j = 0; j < corr_len; j += subsampling ) { +#ifdef JBM_TSM_ON_TCS + c_c += ( signal[j + x] * signal[j + y] ); +#else c_c += ( (float) signal[j + x] * (float) signal[j + y] ); +#endif } return c_c; @@ -92,7 +108,11 @@ float cross_correlation_subsampled_self( /* Calculates normalized cross correlation coefficient for template segment. */ float normalized_cross_correlation_self( +#ifdef JBM_TSM_ON_TCS + const float *signal, +#else const int16_t *signal, +#endif uint16_t x, uint16_t y, uint16_t corr_len, @@ -102,7 +122,11 @@ float normalized_cross_correlation_self( float c_c; float energy_xy, energy_x, energy_y; uint16_t j; +#ifdef JBM_TSM_ON_TCS + const float *signal_a, *signal_b; +#else const int16_t *signal_a, *signal_b; +#endif c_c = 0.0f; energy_x = 0.0f; @@ -111,11 +135,21 @@ float normalized_cross_correlation_self( signal_b = &signal[y]; for ( j = 0; j < corr_len; j += subsampling ) { +#ifdef JBM_TSM_ON_TCS + c_c += ( signal_a[j] * signal_b[j] ); + energy_x += ( signal_a[j] ) * ( signal_a[j] ); + energy_y += ( signal_b[j] ) * ( signal_b[j] ); +#else c_c += ( (float) signal_a[j] * (float) signal_b[j] ); energy_x += ( (float) signal_a[j] ) * ( (float) signal_a[j] ); energy_y += ( (float) signal_b[j] ) * ( (float) signal_b[j] ); +#endif } +#ifdef JBM_TSM_ON_TCS + energy_xy = sqrtf( energy_x * energy_y ); +#else energy_xy = (float) sqrt( (float) energy_x * (float) energy_y ); +#endif if ( energy_xy < 1.0f ) { energy_xy = 1.0f; /* conceal silent frames */ @@ -130,7 +164,11 @@ float normalized_cross_correlation_self( /* Splits the signal into segments and checks if all of them have very low energy. */ bool isSilence( +#ifdef JBM_TSM_ON_TCS + const float *signal, +#else const int16_t *signal, +#endif uint32_t len, uint32_t segments ) { @@ -145,7 +183,11 @@ bool isSilence( if ( ( i != 0U && i % samplesPerSegment == 0U ) || i + 1 == len ) { /* check energy of current segment */ +#ifdef JBM_TSM_ON_TCS + energy = 10 * log10f( energy / (float) samplesPerSegment ); +#else energy = 10 * (float) log10( energy / samplesPerSegment ); +#endif if ( energy > -65 ) { return false; diff --git a/lib_dec/jbm_pcmdsp_similarityestimation.h b/lib_dec/jbm_pcmdsp_similarityestimation.h index 4dc92f27b7cff9320280124d17733c6d6f7feabc..44b4fd246a4d9881550107196c374923284a15c7 100644 --- a/lib_dec/jbm_pcmdsp_similarityestimation.h +++ b/lib_dec/jbm_pcmdsp_similarityestimation.h @@ -67,7 +67,15 @@ * ******************************************************************************** */ -float cross_correlation_self( const int16_t *signal, uint16_t x, uint16_t y, uint16_t corr_len ); +float cross_correlation_self( +#ifdef JBM_TSM_ON_TCS + const float *signal, +#else + const int16_t *signal, +#endif + uint16_t x, + uint16_t y, + uint16_t corr_len ); /* ******************************************************************************** @@ -94,7 +102,16 @@ float cross_correlation_self( const int16_t *signal, uint16_t x, uint16_t y, uin * ******************************************************************************** */ -float cross_correlation_subsampled_self( const int16_t *signal, uint16_t x, uint16_t y, uint16_t corr_len, uint16_t subsampling ); +float cross_correlation_subsampled_self( +#ifdef JBM_TSM_ON_TCS + const float *signal, +#else + const int16_t *signal, +#endif + uint16_t x, + uint16_t y, + uint16_t corr_len, + uint16_t subsampling ); /* ******************************************************************************** @@ -132,9 +149,26 @@ float cross_correlation_subsampled_self( const int16_t *signal, uint16_t x, uint * ******************************************************************************** */ -float normalized_cross_correlation_self( const int16_t *signal, uint16_t x, uint16_t y, uint16_t corr_len, uint16_t subsampling, float *energy ); +float normalized_cross_correlation_self( +#ifdef JBM_TSM_ON_TCS + const float *signal, +#else + const int16_t *signal, +#endif + uint16_t x, + uint16_t y, + uint16_t corr_len, + uint16_t subsampling, + float *energy ); /* Splits the signal into segments and checks if all of them have very low energy. */ -bool isSilence( const int16_t *signal, uint32_t len, uint32_t segments ); +bool isSilence( +#ifdef JBM_TSM_ON_TCS + const float *signal, +#else + const int16_t *signal, +#endif + uint32_t len, + uint32_t segments ); #endif /* JBM_PCMDSP_SIMILARITYESTIMATION_H */ diff --git a/lib_dec/jbm_pcmdsp_window.c b/lib_dec/jbm_pcmdsp_window.c index f9f71ac802093d4a0b8dbfcab05d43895dae989d..a31d368c9119d1d35361c9657998fba14d24dff5 100644 --- a/lib_dec/jbm_pcmdsp_window.c +++ b/lib_dec/jbm_pcmdsp_window.c @@ -80,9 +80,15 @@ void hannWindow( *-----------------------------------------------------------------------*/ void overlapAdd( +#ifdef JBM_TSM_ON_TCS + const float *fadeOut, + const float *fadeIn, + float *out, +#else const int16_t *fadeOut, const int16_t *fadeIn, int16_t *out, +#endif uint16_t n, uint16_t nChannels, const float *fadeOutWin, @@ -90,7 +96,11 @@ void overlapAdd( { float fdOutVal, fdInVal; int16_t i, j, hannIter; +#ifdef JBM_TSM_ON_TCS + float combinedVal; +#else int32_t combinedVal; +#endif for ( j = 0; j < nChannels; j++ ) { @@ -101,8 +111,11 @@ void overlapAdd( fdOutVal = fadeOut[i] * fadeOutWin[hannIter]; fdInVal = fadeIn[i] * fadeInWin[hannIter]; /* round combinedVal value (taking care of sign) */ +#ifdef JBM_TSM_ON_TCS + combinedVal = fdInVal + fdOutVal; + out[i] = combinedVal; +#else combinedVal = (int32_t) ( ( fdInVal + fdOutVal ) + 0.5 ); - if ( fdInVal + fdOutVal < 0.0 ) { combinedVal = (int32_t) ( ( fdInVal + fdOutVal ) - 0.5 ); @@ -117,7 +130,57 @@ void overlapAdd( { combinedVal = MIN16B; } + out[i] = (int16_t) combinedVal; +#endif + hannIter++; + } + } + + return; +} + +void overlapAddEvs( + const float *fadeOut, + const float *fadeIn, + float *out, + uint16_t n, + uint16_t nChannels, + const float *fadeOutWin, + const float *fadeInWin ) +{ + float fdOutVal, fdInVal; + int16_t i, j, hannIter; + float combinedVal; + + for ( j = 0; j < nChannels; j++ ) + { + /* reset Hann window iterator to beginning (both channels use same window) */ + hannIter = 0; + for ( i = j; i < n; i += nChannels ) + { + fdOutVal = fadeOut[i] * fadeOutWin[hannIter]; + fdInVal = fadeIn[i] * fadeInWin[hannIter]; + /* round combinedVal value (taking care of sign) */ + + combinedVal = floorf( ( fdInVal + fdOutVal ) + 0.5f ); + if ( fdInVal + fdOutVal < 0.0 ) + { + combinedVal = ceilf( ( fdInVal + fdOutVal ) - 0.5f ); + } + + /* saturate value */ + if ( combinedVal > MAX16B_FLT ) + { + combinedVal = MAX16B_FLT; + } + else if ( combinedVal < MIN16B_FLT ) + { + combinedVal = MIN16B_FLT; + } + + out[i] = combinedVal; + hannIter++; } } diff --git a/lib_dec/jbm_pcmdsp_window.h b/lib_dec/jbm_pcmdsp_window.h index 67759e97384d759c2666f260eb2fd0754afe1326..8c1823867a8fa5d614b1d73c64a0ff6cb4c06cca 100644 --- a/lib_dec/jbm_pcmdsp_window.h +++ b/lib_dec/jbm_pcmdsp_window.h @@ -61,6 +61,10 @@ void hannWindow( uint16_t n, float *w ); * @param[in] nChannels number of channels * @param[in] fadeOutWin window for fade out * @param[in] fadeInWin window for fade in */ +#ifdef JBM_TSM_ON_TCS +void overlapAdd( const float *fadeOut, const float *fadeIn, float *out, uint16_t n, uint16_t nChannels, const float *fadeOutWin, const float *fadeInWin ); +void overlapAddEvs( const float *fadeOut, const float *fadeIn, float *out, uint16_t n, uint16_t nChannels, const float *fadeOutWin, const float *fadeInWin ); +#else void overlapAdd( const int16_t *fadeOut, const int16_t *fadeIn, int16_t *out, uint16_t n, uint16_t nChannels, const float *fadeOutWin, const float *fadeInWin ); - +#endif #endif /* JBM_PCMDSP_WINDOW_H */ diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index a1410c482e1031ad3e6ed4c3480ea175ba449102..07166b8ddbf7a72dc273592592bdbb77e98dbf1c 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -54,11 +54,27 @@ struct IVAS_DEC_VOIP 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 */ +#ifdef JBM_TSM_ON_TCS + float *apaExecBuffer; /* Buffer for APA scaling */ +#else + int16_t *apaExecBuffer; /* Buffer for APA scaling */ +#endif 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 VARIABLE_SPEED_DECODING + uint8_t mode; + uint16_t speedFac; + bool needNewFrame; +#endif +#ifdef JBM_TSM_ON_TCS + JBM_RENDERER_TYPE rendererType; + PCMDSP_FIFO_HANDLE hFifoOut; + uint8_t nTransportChannelsOld; + uint16_t nSamplesAvailableNext; +#else + PCMDSP_FIFO_HANDLE hFifoAfterTimeScaler; +#endif #ifdef SUPPORT_JBM_TRACEFILE IVAS_JBM_TRACE_DATA JbmTraceData; #endif @@ -93,10 +109,26 @@ static void IVAS_DEC_Close_VoIP( IVAS_DEC_VOIP *hVoIP ); #ifdef SUPPORT_JBM_TRACEFILE static void store_JbmData( IVAS_DEC_VOIP *hVoIP, JB4_DATAUNIT_HANDLE dataUnit, const uint32_t systemTimestamp_ms, const uint16_t extBufferedSamples, const int32_t output_Fs ); #endif +#ifdef JBM_TSM_ON_TCS +static ivas_error evs_dec_main( Decoder_Struct *st_ivas, const int16_t nOutSamples, float *floatBuf, int16_t *pcmBuf ); +#else static ivas_error evs_dec_main( Decoder_Struct *st_ivas, const int16_t nOutSamples, int16_t *pcmBuf ); +#endif static ivas_error input_format_API_to_internal( IVAS_DEC_INPUT_FORMAT input_format, int16_t *bitstream_format_internal, int16_t *sdp_hf_only, const bool is_voip_enabled ); -static void init_decoder_config( DECODER_CONFIG_HANDLE hDecoderConfig, const int16_t orientation_tracking, const float no_diegetic_pan ); - +#ifdef FIX_439_OTR_PARAMS +static void init_decoder_config( DECODER_CONFIG_HANDLE hDecoderConfig ); +#else +static void init_decoder_config( DECODER_CONFIG_HANDLE hDecoderConfig, const int16_t orientation_tracking ); +#endif +#ifdef JBM_TSM_ON_TCS +static int16_t IVAS_DEC_VoIP_GetRenderGranularity( Decoder_Struct *st_ivas ); +static JBM_RENDERER_TYPE IVAS_DEC_VoIP_GetRendererConfig( IVAS_DEC_HANDLE hIvasDec ); +static ivas_error IVAS_DEC_VoIP_reconfigure( IVAS_DEC_HANDLE hIvasDec, const uint16_t nTransportChannels, const uint16_t l_ts ); +static ivas_error IVAS_DEC_Setup( IVAS_DEC_HANDLE hIvasDec, uint16_t *nTcBufferGranularity, uint8_t *nTransportChannels, uint8_t *nOutChannels, uint16_t *nSamplesRendered, int16_t *data ); +static ivas_error IVAS_DEC_GetTcSamples( IVAS_DEC_HANDLE hIvasDec, float *pcmBuf, int16_t *nOutSamples ); +static ivas_error IVAS_DEC_RendererFeedTcSamples( IVAS_DEC_HANDLE hIvasDec, const int16_t nSamplesForRendering, int16_t *nSamplesResidual, float *pcmBuf ); +static ivas_error IVAS_DEC_GetRenderedSamples( IVAS_DEC_HANDLE hIvasDec, const uint16_t nSamplesForRendering, uint16_t *nSamplesRendered, uint16_t *nSamplesAvailableNext, int16_t *pcmBuf ); +#endif /*---------------------------------------------------------------------* * IVAS_DEC_Open() @@ -106,10 +138,13 @@ static void init_decoder_config( DECODER_CONFIG_HANDLE hDecoderConfig, const int /* may return an error but may still have allocated memory - thus run Close also in case of error to release memory */ ivas_error IVAS_DEC_Open( - IVAS_DEC_HANDLE *phIvasDec, /* i/o: pointer to an IVAS decoder handle to be opened */ - const IVAS_DEC_MODE mode, /* i : compatibility mode (EVS or IVAS) */ - const int16_t orientation_tracking, /* i : orientation tracking type */ - float no_diegetic_pan ) + IVAS_DEC_HANDLE *phIvasDec, /* i/o: pointer to an IVAS decoder handle to be opened */ + const IVAS_DEC_MODE mode /* i : compatibility mode (EVS or IVAS) */ +#ifndef FIX_439_OTR_PARAMS + , + const int16_t orientation_tracking /* i : orientation tracking type */ +#endif +) { IVAS_DEC_HANDLE hIvasDec; Decoder_Struct *st_ivas; @@ -162,8 +197,11 @@ ivas_error IVAS_DEC_Open( st_ivas = hIvasDec->st_ivas; /* initialize Decoder Config. handle */ - init_decoder_config( hIvasDec->st_ivas->hDecoderConfig, orientation_tracking, no_diegetic_pan ); - +#ifdef FIX_439_OTR_PARAMS + init_decoder_config( hIvasDec->st_ivas->hDecoderConfig ); +#else + init_decoder_config( hIvasDec->st_ivas->hDecoderConfig, orientation_tracking ); +#endif /* initialize pointers to handles to NULL */ ivas_initialize_handles_dec( st_ivas ); @@ -213,9 +251,12 @@ ivas_error IVAS_DEC_Open( *---------------------------------------------------------------------*/ static void init_decoder_config( - DECODER_CONFIG_HANDLE hDecoderConfig, /* i/o: configuration structure */ - const int16_t orientation_tracking, - const float no_diegetic_pan ) + DECODER_CONFIG_HANDLE hDecoderConfig /* i/o: configuration structure */ +#ifndef FIX_439_OTR_PARAMS + , + const int16_t orientation_tracking +#endif +) { hDecoderConfig->Opt_AMR_WB = 0; hDecoderConfig->nchan_out = 1; @@ -224,9 +265,17 @@ static void init_decoder_config( hDecoderConfig->Opt_HRTF_binary = 0; hDecoderConfig->Opt_Headrotation = 0; hDecoderConfig->Opt_RendConfigCustom = 0; +#ifdef FIX_439_OTR_PARAMS + hDecoderConfig->orientation_tracking = HEAD_ORIENT_TRK_NONE; +#else hDecoderConfig->orientation_tracking = orientation_tracking; - hDecoderConfig->no_diegetic_pan = no_diegetic_pan; +#endif + hDecoderConfig->Opt_non_diegetic_pan = 0; + hDecoderConfig->non_diegetic_pan_gain = 0; +#ifdef JBM_TSM_ON_TCS + hDecoderConfig->voip_active = 0; +#endif return; } @@ -388,7 +437,12 @@ ivas_error IVAS_DEC_Configure( 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 */ - const int16_t renderConfigEnabled /* i : enable Renderer config. file for binaural output */ +#ifdef FIX_439_OTR_PARAMS + const HEAD_ORIENT_TRK_T orientation_tracking, /* i : head orientation tracking type */ +#endif + const int16_t renderConfigEnabled, /* i : enable Renderer config. file for binaural output */ + const int16_t Opt_non_diegetic_pan, /* i : diegetic or not */ + const float non_diegetic_pan_gain /* i : non diegetic panning gain */ ) { Decoder_Struct *st_ivas; @@ -406,7 +460,8 @@ ivas_error IVAS_DEC_Configure( return IVAS_ERR_WRONG_PARAMS; } - if ( hIvasDec->mode == IVAS_DEC_MODE_EVS && outputFormat != IVAS_DEC_OUTPUT_MONO ) + if ( hIvasDec->mode == IVAS_DEC_MODE_EVS && !( ( outputFormat == IVAS_DEC_OUTPUT_MONO && Opt_non_diegetic_pan == 0 ) || + ( outputFormat == IVAS_DEC_OUTPUT_STEREO && Opt_non_diegetic_pan == 1 ) ) ) { return IVAS_ERR_WRONG_MODE; } @@ -436,8 +491,13 @@ ivas_error IVAS_DEC_Configure( hDecoderConfig->Opt_LsCustom = customLsOutputEnabled; hDecoderConfig->Opt_Headrotation = enableHeadRotation; +#ifdef FIX_439_OTR_PARAMS + hDecoderConfig->orientation_tracking = orientation_tracking; +#endif hDecoderConfig->Opt_HRTF_binary = hrtfReaderEnabled; hDecoderConfig->Opt_RendConfigCustom = renderConfigEnabled; + hDecoderConfig->Opt_non_diegetic_pan = Opt_non_diegetic_pan; + hDecoderConfig->non_diegetic_pan_gain = non_diegetic_pan_gain; /* Set decoder parameters to initial values */ if ( ( error = ivas_init_decoder_front( st_ivas ) ) != IVAS_ERR_OK ) @@ -463,7 +523,11 @@ ivas_error IVAS_DEC_Configure( *---------------------------------------------------------------------*/ ivas_error IVAS_DEC_EnableVoIP( - IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ + IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ +#ifdef VARIABLE_SPEED_DECODING + const IVAS_DEC_VOIP_MODE voipMode, /* i : VoIP or varable speed */ + const uint16_t speedFac, /* i : speed factor for varable speed */ +#endif const int16_t jbmSafetyMargin, /* i : allowed delay reserve for JBM, in milliseconds */ const IVAS_DEC_INPUT_FORMAT inputFormat /* i : format of the input bitstream */ ) @@ -473,8 +537,10 @@ ivas_error IVAS_DEC_EnableVoIP( error = IVAS_ERR_OK; +#ifndef JBM_TSM_ON_TCS /* initialize time scaler and FIFO after time scaler */ uint16_t wss, css; +#endif if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL ) { @@ -486,8 +552,30 @@ ivas_error IVAS_DEC_EnableVoIP( hIvasDec->Opt_VOIP = 1; - hDecoderConfig->nchan_out = audioCfg2channels( hDecoderConfig->output_config ); +#ifdef JBM_TSM_ON_TCS + hDecoderConfig->voip_active = 1; +#endif + +#ifdef JBM_TSM_ON_TCS + if ( hDecoderConfig->output_config != AUDIO_CONFIG_EXTERNAL ) + { +#endif + hDecoderConfig->nchan_out = audioCfg2channels( hDecoderConfig->output_config ); + +#ifdef JBM_TSM_ON_TCS + } +#ifdef VARIABLE_SPEED_DECODING + else + { + hDecoderConfig->nchan_out = 1; + } +#endif +#endif + + +#ifndef JBM_TSM_ON_TCS assert( hDecoderConfig->nchan_out > 0 && "EXT output not yet supported in VoIP mode" ); +#endif if ( ( error = input_format_API_to_internal( inputFormat, &hIvasDec->bitstreamformat, &hIvasDec->sdp_hf_only, true ) ) != IVAS_ERR_OK ) { @@ -501,13 +589,31 @@ ivas_error IVAS_DEC_EnableVoIP( hIvasDec->hVoIP->lastDecodedWasActive = 0; hIvasDec->hVoIP->hCurrentDataUnit = NULL; +#ifdef VARIABLE_SPEED_DECODING + hIvasDec->hVoIP->mode = voipMode; + hIvasDec->hVoIP->speedFac = speedFac; + hIvasDec->hVoIP->needNewFrame = false; +#endif +#ifdef JBM_TSM_ON_TCS + hIvasDec->hVoIP->nSamplesFrame = (uint16_t) ( hDecoderConfig->output_Fs / FRAMES_PER_SEC ); + hIvasDec->hVoIP->nSamplesAvailableNext = 0; + hIvasDec->hVoIP->rendererType = JBM_RENDERER_NONE; + hIvasDec->hVoIP->hFifoOut = NULL; +#else hIvasDec->hVoIP->nSamplesFrame = (uint16_t) ( hDecoderConfig->output_Fs * hDecoderConfig->nchan_out / FRAMES_PER_SEC ); +#endif +#ifdef JBM_TSM_ON_TCS + /* postpone init of the buffers until we know the real number of TCs*/ + hIvasDec->hVoIP->apaExecBuffer = NULL; + hIvasDec->hVoIP->nTransportChannelsOld = 0; +#else 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" ); } +#endif #define WMC_TOOL_SKIP /* Bitstream conversion is not counted towards complexity and memory usage */ @@ -520,15 +626,23 @@ ivas_error IVAS_DEC_EnableVoIP( } /* initialize JBM */ - if ( ( error = JB4_Create( &hIvasDec->hVoIP->hJBM ) != IVAS_ERR_OK ) != IVAS_ERR_OK ) - { - return error; - } - if ( ( error = JB4_Init( hIvasDec->hVoIP->hJBM, jbmSafetyMargin ) ) != IVAS_ERR_OK ) +#ifdef VARIABLE_SPEED_DECODING + hIvasDec->hVoIP->hJBM = NULL; + if ( hIvasDec->hVoIP->mode == IVAS_DEC_VOIP_MODE_VOIP ) { - return error; +#endif + if ( ( error = JB4_Create( &hIvasDec->hVoIP->hJBM ) != IVAS_ERR_OK ) != IVAS_ERR_OK ) + { + return error; + } + if ( JB4_Init( hIvasDec->hVoIP->hJBM, jbmSafetyMargin ) != 0 ) + { + return IVAS_ERR_FAILED_ALLOC; + } +#ifdef VARIABLE_SPEED_DECODING } - +#endif +#ifndef JBM_TSM_ON_TCS if ( hDecoderConfig->output_Fs == 8000 ) { wss = 1; @@ -553,8 +667,40 @@ ivas_error IVAS_DEC_EnableVoIP( { return IVAS_ERR_INIT_ERROR; } +#endif - if ( apa_init( &hIvasDec->hVoIP->hTimeScaler, hDecoderConfig->nchan_out ) != IVAS_ERR_OK || +#ifdef JBM_TSM_ON_TCS + + /* postpone init of time scaler until we know the real number of TCs */ + hIvasDec->hVoIP->hTimeScaler = NULL; + /* create output pcm fifo*/ + /* :TODO: also provide CLDFB output FIFO if things work out */ +#ifdef VARIABLE_SPEED_DECODING + if ( hIvasDec->hVoIP->mode == IVAS_DEC_VOIP_MODE_VARIABLE_SPEED ) + { + hIvasDec->hVoIP->needNewFrame = true; + } +#endif +#else +#ifdef VARIABLE_SPEED_DECODING + { + float startQuality = hIvasDec->hVoIP->mode == IVAS_DEC_VOIP_MODE_VARIABLE_SPEED ? -2.0f : 1.0f; + 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, startQuality, 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 ) + { + return IVAS_ERR_INIT_ERROR; + } + /* we instantly need a new frame */ + hIvasDec->hVoIP->needNewFrame = true; + } +#else + 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 || @@ -563,6 +709,8 @@ ivas_error IVAS_DEC_EnableVoIP( { return IVAS_ERR_INIT_ERROR; } +#endif +#endif return error; } @@ -651,6 +799,13 @@ ivas_error IVAS_DEC_FeedFrame_Serial( st->use_partial_copy = 1; } +#ifdef VARIABLE_SPEED_DECODING + if ( hIvasDec->hVoIP != NULL && hIvasDec->hVoIP->mode == IVAS_DEC_VOIP_MODE_VARIABLE_SPEED ) + { + hIvasDec->hVoIP->needNewFrame = false; + } +#endif + return error; } @@ -683,7 +838,11 @@ ivas_error IVAS_DEC_GetSamples( if ( hIvasDec->mode == IVAS_DEC_MODE_EVS ) { +#ifdef JBM_TSM_ON_TCS + if ( ( error = evs_dec_main( st_ivas, *nOutSamples, NULL, pcmBuf ) ) != IVAS_ERR_OK ) +#else if ( ( error = evs_dec_main( st_ivas, *nOutSamples, pcmBuf ) ) != IVAS_ERR_OK ) +#endif { return error; } @@ -708,6 +867,187 @@ ivas_error IVAS_DEC_GetSamples( } +#ifdef JBM_TSM_ON_TCS +/*---------------------------------------------------------------------* + * IVAS_DEC_Setup( ) + * + * Main function to decode to PCM data of the transport channels + *---------------------------------------------------------------------*/ + +static ivas_error IVAS_DEC_Setup( + IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ + uint16_t *nTcBufferGranularity, /* o : granularity of the TC Buffer */ + uint8_t *nTransportChannels, /* o : number of decoded transport PCM channels */ + uint8_t *nOutChannels, /* o : number of decoded out channels (PCM or CLDFB) */ + uint16_t *nSamplesRendered, /* o : number of samples flushed from the last frame */ + int16_t *data /* o : flushed samples */ +) +{ + ivas_error error; + + error = IVAS_ERR_OK; + + *nSamplesRendered = 0; + + if ( hIvasDec->mode == IVAS_DEC_MODE_EVS ) + { + *nTransportChannels = 1; + *nOutChannels = 1; + } + else + { + Decoder_Struct *st_ivas; + + st_ivas = hIvasDec->st_ivas; + /*----------------------------------------------------------------* + * IVAS decoder setup + * - read IVAS format signaling + * - read IVAS format specific signaling + * - initialize decoder in the first frame based on IVAS format and number of transport channels + * - reconfigure the decoder when the number of TC or IVAS total bitrate change + *----------------------------------------------------------------*/ + + if ( st_ivas->bfi == 0 ) + { + if ( ( error = ivas_dec_setup( st_ivas, nSamplesRendered, data ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + *nTransportChannels = (uint8_t) st_ivas->hTcBuffer->nchan_transport_jbm; + *nTcBufferGranularity = (uint16_t) st_ivas->hTcBuffer->n_samples_granularity; + *nOutChannels = (uint8_t) st_ivas->hDecoderConfig->nchan_out; + } + + return error; +} + +/*---------------------------------------------------------------------* + * IVAS_DEC_GetTcSamples( ) + * + * Main function to decode to PCM data of the transport channels + *---------------------------------------------------------------------*/ + +ivas_error IVAS_DEC_GetTcSamples( + IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ + float *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 per channel written to output buffer */ +) +{ + Decoder_Struct *st_ivas; + ivas_error error; + + error = IVAS_ERR_OK; + + if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + st_ivas = hIvasDec->st_ivas; + + *nOutSamples = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC ); + + if ( hIvasDec->mode == IVAS_DEC_MODE_EVS ) + { + if ( ( error = evs_dec_main( st_ivas, *nOutSamples, pcmBuf, NULL ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else if ( hIvasDec->mode == IVAS_DEC_MODE_IVAS ) + { + /* run the main IVAS decoding routine */ + if ( ( error = ivas_jbm_dec_tc( st_ivas, pcmBuf ) ) != IVAS_ERR_OK ) + { + return error; + } + + hIvasDec->isInitialized = true; /* Initialization done in ivas_dec() */ + } + + if ( hIvasDec->hasBeenFedFirstGoodFrame ) + { + hIvasDec->hasDecodedFirstGoodFrame = true; + } + + return error; +} + +/*---------------------------------------------------------------------* + * IVAS_DEC_Rendered_FeedTcSamples( ) + * + * Main function to decode to PCM data of the transport channels + *---------------------------------------------------------------------*/ + +ivas_error IVAS_DEC_RendererFeedTcSamples( + IVAS_DEC_HANDLE hIvasDec, /* i/o : IVAS decoder handle */ + const int16_t nSamplesForRendering, /* i: : number of TC samples wanted from the renderer */ + int16_t *nSamplesResidual, /* o: : number of samples not fitting into the renderer grid and buffer for the next call*/ + float *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 */ +) +{ + Decoder_Struct *st_ivas; + + ivas_error error; + + error = IVAS_ERR_OK; + + if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + st_ivas = hIvasDec->st_ivas; + + /* feed the TCs to the IVAS renderer */ + if ( ( error = ivas_jbm_dec_feed_tc_to_renderer( st_ivas, nSamplesForRendering, nSamplesResidual, pcmBuf ) ) != IVAS_ERR_OK ) + { + return error; + } + + return error; +} + +/*---------------------------------------------------------------------* + * IVAS_DEC_GetRenderedSamples( ) + * + * Main function to decode to PCM data of the transport channels + *---------------------------------------------------------------------*/ + +ivas_error IVAS_DEC_GetRenderedSamples( + IVAS_DEC_HANDLE hIvasDec, /* i/o : IVAS decoder handle */ + const uint16_t nSamplesForRendering, /* i: : number of TC samples wanted from the renderer */ + uint16_t *nSamplesRendered, /* o : number of samples rendered */ + uint16_t *nSamplesAvailableNext, /* o : number of samples still available in the renerer pipeline */ + 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 */ +) +{ + Decoder_Struct *st_ivas; + ivas_error error; + + error = IVAS_ERR_OK; + + if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + st_ivas = hIvasDec->st_ivas; + + /* run the main IVAS decoding routine */ + if ( ( error = ivas_jbm_dec_render( st_ivas, nSamplesForRendering, nSamplesRendered, nSamplesAvailableNext, pcmBuf ) ) != IVAS_ERR_OK ) + { + return error; + } + + + return error; +} +#endif + + /*---------------------------------------------------------------------* * IVAS_DEC_GetNumObjects( ) * @@ -825,17 +1165,12 @@ ivas_error IVAS_DEC_GetObjectMetadata( { metadata->azimuth = 0.f; metadata->elevation = 0.f; -#ifdef FIX_379_EXT_METADATA metadata->radius = 1.f; metadata->spread = 0.f; metadata->gainFactor = 1.f; metadata->yaw = 0.f; metadata->pitch = 0.f; -#else - metadata->radius = 0.f; - metadata->spread = 0.f; - metadata->gainFactor = 1.f; -#endif + metadata->non_diegetic_flag = 0; } else { @@ -846,6 +1181,7 @@ ivas_error IVAS_DEC_GetObjectMetadata( metadata->pitch = hIsmMeta->pitch; metadata->spread = 0.f; metadata->gainFactor = 1.f; + metadata->non_diegetic_flag = hIsmMeta->non_diegetic_flag; } return IVAS_ERR_OK; @@ -859,12 +1195,8 @@ ivas_error IVAS_DEC_GetObjectMetadata( *---------------------------------------------------------------------*/ ivas_error IVAS_DEC_GetMasaMetadata( - IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ -#ifdef FIX_350_MASA_DELAY_COMP + 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 */ -#else - IVAS_MASA_QMETADATA_HANDLE *hMasaMetadata /* o : pointer to handle, which will be set to point to metadata from the most recently decoded frame */ -#endif ) { if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL ) @@ -877,11 +1209,7 @@ ivas_error IVAS_DEC_GetMasaMetadata( return IVAS_ERR_WRONG_MODE; } -#ifdef FIX_350_MASA_DELAY_COMP *hMasaExtOutMeta = hIvasDec->st_ivas->hMasa->data.extOutMeta; -#else - *hMasaMetadata = hIvasDec->st_ivas->hQMetaData; -#endif return IVAS_ERR_OK; } @@ -895,7 +1223,7 @@ 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, listener orientation */ - IVAS_POSITION *Pos /* i : listener position */ + IVAS_VECTOR3 *Pos /* i : listener position */ ) { HEAD_TRACK_DATA_HANDLE hHeadTrackData; @@ -1252,6 +1580,14 @@ ivas_error IVAS_DEC_GetDelay( nSamples[2] = (int16_t) roundf( (float) st_ivas->binaural_latency_ns * hDecoderConfig->output_Fs / 1000000000.f ); nSamples[0] = nSamples[1] + nSamples[2]; +#ifdef FIX_356_ISM_METADATA_SYNC + if ( st_ivas->ivas_format == ISM_FORMAT ) + { + /* note: in ISM, all delay is compensated at the decoder by default, so subtract the encoder delay for print-out */ + nSamples[1] -= NS2SA( hDecoderConfig->output_Fs, IVAS_ENC_DELAY_NS ); + } +#endif + *timeScale = hDecoderConfig->output_Fs; return IVAS_ERR_OK; @@ -1443,6 +1779,27 @@ ivas_error IVAS_DEC_VoIP_FeedFrame( return IVAS_ERR_OK; } +#ifdef VARIABLE_SPEED_DECODING +/*---------------------------------------------------------------------* + * IVAS_DEC_VoIP_SetScale( ) + * + * Set the TSM scale + *---------------------------------------------------------------------*/ + +ivas_error IVAS_DEC_VoIP_SetScale( + IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ + const int16_t scale /* i : TSM scale to set */ +) +{ + ivas_error error; + + error = IVAS_ERR_OK; + + hIvasDec->hVoIP->speedFac = scale; + + return error; +} +#endif /*---------------------------------------------------------------------* * IVAS_DEC_VoIP_GetSamples( ) @@ -1455,11 +1812,16 @@ ivas_error IVAS_DEC_VoIP_GetSamples( 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 systemTimestamp_ms /* i : current system timestamp */ +#if defined( JBM_TSM_ON_TCS ) || defined( VARIABLE_SPEED_DECODING ) + , + uint16_t *sampleAvailableNext /* o : samples available for the next call */ +#endif #ifdef SUPPORT_JBM_TRACEFILE , JbmTraceFileWriterFn jbmWriterFn, void *jbmWriter #endif + ) { Decoder_Struct *st_ivas; @@ -1473,6 +1835,12 @@ ivas_error IVAS_DEC_VoIP_GetSamples( int16_t timeScalingDone; int16_t result; ivas_error error; +#ifdef JBM_TSM_ON_TCS + int16_t nSamplesRendered; + uint16_t nSamplesTcsScaled; + uint8_t nTransportChannels; + uint8_t nOutChannels; +#endif error = IVAS_ERR_OK; @@ -1481,133 +1849,472 @@ ivas_error IVAS_DEC_VoIP_GetSamples( hVoIP = hIvasDec->hVoIP; timeScalingDone = 0; +#ifdef JBM_TSM_ON_TCS + nOutChannels = (uint8_t) st_ivas->hDecoderConfig->nchan_out; + nTransportChannels = 0; + nSamplesTcsScaled = hVoIP->nSamplesFrame; + nSamplesRendered = 0; +#endif +#ifdef VARIABLE_SPEED_DECODING + scale = hVoIP->speedFac; + maxScaling = hVoIP->speedFac; +#endif + /* TODO(mcjbm): ringbuffer capacity should be configurable by user */ +#ifdef JBM_TSM_ON_TCS + if ( ( hVoIP->hFifoOut != NULL && nSamplesPerChannel > hVoIP->hFifoOut->capacity ) || nSamplesPerChannel == 0 ) +#else if ( nSamplesPerChannel > hVoIP->hFifoAfterTimeScaler->capacity || nSamplesPerChannel == 0 ) +#endif { return IVAS_ERR_WRONG_PARAMS; } /* make sure that the FIFO after decoder/scaler contains at least one sound card frame (i.e. 20ms) */ +#ifdef JBM_TSM_ON_TCS + while ( ( hVoIP->hFifoOut != NULL && pcmdsp_fifo_nReadableSamplesPerChannel( hVoIP->hFifoOut ) < nSamplesPerChannel ) || ( hVoIP->hFifoOut == NULL && nSamplesRendered < nSamplesPerChannel ) ) +#else while ( pcmdsp_fifo_nReadableSamplesPerChannel( hVoIP->hFifoAfterTimeScaler ) < nSamplesPerChannel ) +#endif { - extBufferedSamples = pcmdsp_fifo_nReadableSamplesPerChannel( hVoIP->hFifoAfterTimeScaler ); - extBufferedTime_ms = extBufferedSamples * 1000 / hDecoderConfig->output_Fs; - dataUnit = NULL; - /* pop one access unit from the jitter buffer */ - result = JB4_PopDataUnit( hVoIP->hJBM, systemTimestamp_ms, extBufferedTime_ms, &dataUnit, &scale, &maxScaling ); - if ( result != 0 ) +#ifdef VARIABLE_SPEED_DECODING + if ( hVoIP->mode == IVAS_DEC_VOIP_MODE_VARIABLE_SPEED && hVoIP->needNewFrame ) { - return IVAS_ERR_UNKNOWN; + /* we need another bs frame fed into the decoder...*/ + *sampleAvailableNext = 0; + return IVAS_ERR_VS_FRAME_NEEDED; } - - maxScaling = maxScaling * hDecoderConfig->output_Fs / 1000; - /* avoid time scaling multiple times in one sound card slot */ - if ( scale != 100U ) +#endif +#ifdef JBM_TSM_ON_TCS + if ( hVoIP->nSamplesAvailableNext == 0 ) { - if ( timeScalingDone ) + if ( hVoIP->hFifoOut ) { - scale = 100; + extBufferedSamples = pcmdsp_fifo_nReadableSamplesPerChannel( hVoIP->hFifoOut ); + nSamplesRendered = extBufferedSamples; } else { - timeScalingDone = 1; + extBufferedSamples = nSamplesRendered; /* TODO: JBM use renderer residual samples here */ } - } - - /* copy bitstream into decoder state */ - if ( dataUnit ) - { - hIvasDec->hVoIP->hCurrentDataUnit = dataUnit; +#else + extBufferedSamples = pcmdsp_fifo_nReadableSamplesPerChannel( hVoIP->hFifoAfterTimeScaler ); +#endif + extBufferedTime_ms = extBufferedSamples * 1000 / hDecoderConfig->output_Fs; - 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 ( hIvasDec->hasDecodedFirstGoodFrame ) - { - /* Decoder has been initialized with first good frame - do PLC */ - IVAS_DEC_FeedFrame_Serial( hIvasDec, hIvasDec->hVoIP->bs_conversion_buf, 0, 1 ); - } + dataUnit = NULL; +#ifdef VARIABLE_SPEED_DECODING + if ( hVoIP->mode == IVAS_DEC_VOIP_MODE_VOIP ) + { +#endif + /* pop one access unit from the jitter buffer */ + result = JB4_PopDataUnit( hVoIP->hJBM, systemTimestamp_ms, extBufferedTime_ms, &dataUnit, &scale, &maxScaling ); + if ( result != 0 ) + { + return IVAS_ERR_UNKNOWN; + } +#ifdef VARIABLE_SPEED_DECODING + } + else if ( hVoIP->mode == IVAS_DEC_VOIP_MODE_VARIABLE_SPEED ) + { + scale = hVoIP->speedFac; + maxScaling = hVoIP->speedFac; + } +#ifdef DEBUGGING + else + { + assert( "Wrong VoIP mode!\n" && 0 ); + } +#endif +#endif - /* decode */ - if ( !hIvasDec->hasBeenFedFirstGoodFrame ) - { - /* codec mode to use not known yet - simply output silence */ + maxScaling = maxScaling * hDecoderConfig->output_Fs / 1000; + /* avoid time scaling multiple times in one sound card slot */ + if ( scale != 100U ) + { + if ( timeScalingDone ) + { + scale = 100; + } + else + { + timeScalingDone = 1; + } + } + +#ifdef VARIABLE_SPEED_DECODING + if ( hVoIP->mode == IVAS_DEC_VOIP_MODE_VOIP ) + { +#endif + /* copy bitstream into decoder state */ + if ( dataUnit ) + { + hIvasDec->hVoIP->hCurrentDataUnit = dataUnit; + + 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 ( hIvasDec->hasDecodedFirstGoodFrame ) + { + /* Decoder has been initialized with first good frame - do PLC */ + IVAS_DEC_FeedFrame_Serial( hIvasDec, hIvasDec->hVoIP->bs_conversion_buf, 0, 1 ); + } +#ifdef VARIABLE_SPEED_DECODING + } +#endif + /* decode */ + if ( !hIvasDec->hasBeenFedFirstGoodFrame ) + { + /* codec mode to use not known yet - simply output silence */ +#ifdef JBM_TSM_ON_TCS + nSamplesTcsScaled = hVoIP->nSamplesFrame; + if ( hVoIP->hFifoOut != NULL ) + { + /* feed zeros to FIFO */ + if ( pcmdsp_fifo_write_zero( hVoIP->hFifoOut, nSamplesTcsScaled ) != 0 ) + { + return IVAS_ERR_UNKNOWN; + } + } + else + { + /* directly set output zero */ + set_s( pcmBuf, 0, nSamplesPerChannel * nOutChannels ); + } + nSamplesRendered = nSamplesTcsScaled; +#else set_s( hVoIP->apaExecBuffer, 0, hVoIP->nSamplesFrame ); /* TODO(mcjbm): Could be optimized: just write directly to output buffer */ - } - else - { +#endif + } + else + { +#ifdef JBM_TSM_ON_TCS + uint16_t l_ts = 1; + uint16_t nSamplesRendered_loop; + /* setup ivas decoder and get the number of TCs */ + /* might render some remaining samples from the previous frame too if the renderer granularity changed */ + if ( hVoIP->hFifoOut ) + { + int16_t rendererPcmBuf[( MAX_OUTPUT_CHANNELS * L_FRAME_MAX * APA_MAX_SCALE ) / 100]; + if ( ( error = IVAS_DEC_Setup( hIvasDec, &l_ts, &nTransportChannels, &nOutChannels, &nSamplesRendered_loop, rendererPcmBuf ) ) != IVAS_ERR_OK ) + { + return error; + } + if ( pcmdsp_fifo_write( hVoIP->hFifoOut, (uint8_t *) rendererPcmBuf, nSamplesRendered_loop ) != 0 ) + { + return IVAS_ERR_UNKNOWN; + } + } + else + { + if ( ( error = IVAS_DEC_Setup( hIvasDec, &l_ts, &nTransportChannels, &nOutChannels, &nSamplesRendered_loop, pcmBuf + nSamplesRendered * nOutChannels ) ) != IVAS_ERR_OK ) + { + return error; + } + } + nSamplesRendered += nSamplesRendered_loop; + if ( nTransportChannels != hVoIP->nTransportChannelsOld ) + { + IVAS_DEC_VoIP_reconfigure( hIvasDec, nTransportChannels, l_ts ); + } + /* decode TCs only */ + if ( ( error = IVAS_DEC_GetTcSamples( hIvasDec, hVoIP->apaExecBuffer, &nOutSamplesElse ) ) != IVAS_ERR_OK ) + { + return error; + } + +#else if ( ( error = IVAS_DEC_GetSamples( hIvasDec, hVoIP->apaExecBuffer, &nOutSamplesElse ) ) != IVAS_ERR_OK ) { return error; } - } +#endif + } - if ( dataUnit ) - { - if ( dataUnit->partial_frame != 0 ) +#ifdef VARIABLE_SPEED_DECODING + if ( hVoIP->mode == IVAS_DEC_VOIP_MODE_VOIP ) { - hVoIP->lastDecodedWasActive = 1; +#endif + if ( dataUnit ) + { + if ( dataUnit->partial_frame != 0 ) + { + hVoIP->lastDecodedWasActive = 1; + } + else + { + hVoIP->lastDecodedWasActive = !dataUnit->silenceIndicator; + } + /* data unit memory is no longer used */ + JB4_FreeDataUnit( hVoIP->hJBM, dataUnit ); + } +#ifdef VARIABLE_SPEED_DECODING } else { - hVoIP->lastDecodedWasActive = !dataUnit->silenceIndicator; + hVoIP->lastDecodedWasActive = 1; + } +#endif + /* limit scale to range supported by time scaler */ + if ( scale < APA_MIN_SCALE ) + { + scale = APA_MIN_SCALE; + } + else if ( scale > APA_MAX_SCALE ) + { + scale = APA_MAX_SCALE; } - /* data unit memory is no longer used */ - JB4_FreeDataUnit( hVoIP->hJBM, dataUnit ); - } - /* limit scale to range supported by time scaler */ - if ( scale < APA_MIN_SCALE ) + /* apply time scaling on decoded/concealed samples */ +#ifdef JBM_TSM_ON_TCS + if ( hIvasDec->hasBeenFedFirstGoodFrame ) + { +#endif + if ( apa_set_scale( hVoIP->hTimeScaler, (uint16_t) scale ) != 0 ) + { + return IVAS_ERR_UNKNOWN; + } +#ifdef JBM_TSM_ON_TCS + result = apa_exec( hVoIP->hTimeScaler, hVoIP->apaExecBuffer, hVoIP->nSamplesFrame * nTransportChannels, (uint16_t) maxScaling, hVoIP->apaExecBuffer, &nTimeScalerOutSamples ); +#else + result = apa_exec( hVoIP->hTimeScaler, hVoIP->apaExecBuffer, hVoIP->nSamplesFrame, (uint16_t) maxScaling, hVoIP->apaExecBuffer, &nTimeScalerOutSamples ); +#endif + if ( result != 0 ) + { + return IVAS_ERR_UNKNOWN; + } + assert( nTimeScalerOutSamples <= APA_BUF ); + +#ifdef JBM_TSM_ON_TCS + nSamplesTcsScaled = nTimeScalerOutSamples / nTransportChannels; +#else + /* append scaled samples to FIFO */ + if ( pcmdsp_fifo_write( hVoIP->hFifoAfterTimeScaler, (uint8_t *) hVoIP->apaExecBuffer, (uint16_t) ( nTimeScalerOutSamples / hDecoderConfig->nchan_out ) ) != 0 ) { - scale = APA_MIN_SCALE; + return IVAS_ERR_UNKNOWN; } - else if ( scale > APA_MAX_SCALE ) +#ifdef VARIABLE_SPEED_DECODING + if ( hVoIP->mode == IVAS_DEC_VOIP_MODE_VARIABLE_SPEED ) { - scale = APA_MAX_SCALE; + int16_t nSamplesAvailable = pcmdsp_fifo_nReadableSamplesPerChannel( hVoIP->hFifoAfterTimeScaler ); + if ( nSamplesAvailable < nSamplesPerChannel ) + { + hVoIP->needNewFrame = true; + } } +#endif +#endif - /* apply time scaling on decoded/concealed samples */ - if ( apa_set_scale( hVoIP->hTimeScaler, (uint16_t) scale ) != 0 ) - { - return IVAS_ERR_UNKNOWN; +#ifdef JBM_TSM_ON_TCS + if ( hIvasDec->hasBeenFedFirstGoodFrame && hVoIP->rendererType != JBM_RENDERER_NONE ) + { + /* render IVAS frames */ + int16_t nResidualSamples; + if ( ( error = IVAS_DEC_RendererFeedTcSamples( hIvasDec, nSamplesTcsScaled, &nResidualSamples, hVoIP->apaExecBuffer ) ) != IVAS_ERR_OK ) + { + return error; + } + /* feed residual samples to TSM for the next call */ + if ( apa_set_renderer_residual_samples( hVoIP->hTimeScaler, (uint16_t) nResidualSamples ) != 0 ) + { + return IVAS_ERR_UNKNOWN; + } + } + else + { + /* inplace float->int16_t conversion*/ +#ifdef DEBUGGING + st_ivas->noClipping += +#endif + syn_output( hVoIP->apaExecBuffer, nTimeScalerOutSamples, (int16_t *) hVoIP->apaExecBuffer ); + + if ( pcmdsp_fifo_write( hVoIP->hFifoOut, (uint8_t *) hVoIP->apaExecBuffer, nSamplesTcsScaled ) != 0 ) + { + return IVAS_ERR_UNKNOWN; + } + nSamplesRendered = nSamplesTcsScaled; + } + } +#endif +#ifdef SUPPORT_JBM_TRACEFILE + /* 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 +#ifdef JBM_TSM_ON_TCS } - result = apa_exec( hVoIP->hTimeScaler, hVoIP->apaExecBuffer, hVoIP->nSamplesFrame, (uint16_t) maxScaling, hVoIP->apaExecBuffer, &nTimeScalerOutSamples ); - if ( result != 0 ) + if ( hIvasDec->hasBeenFedFirstGoodFrame && hVoIP->rendererType != JBM_RENDERER_NONE ) { - return IVAS_ERR_UNKNOWN; + uint16_t nSamplesRendered_loop; + int16_t nSamplesToRender; + if ( hVoIP->hFifoOut ) + { + int16_t rendererPcmBuf[( MAX_OUTPUT_CHANNELS * L_FRAME_MAX * APA_MAX_SCALE ) / 100]; + nSamplesToRender = nSamplesPerChannel - pcmdsp_fifo_nReadableSamplesPerChannel( hVoIP->hFifoOut ); + /* render IVAS frames */ + if ( ( error = IVAS_DEC_GetRenderedSamples( hIvasDec, nSamplesToRender, &nSamplesRendered_loop, &hVoIP->nSamplesAvailableNext, rendererPcmBuf ) ) != IVAS_ERR_OK ) + { + return error; + } + if ( pcmdsp_fifo_write( hVoIP->hFifoOut, (uint8_t *) rendererPcmBuf, nSamplesRendered_loop ) != 0 ) + { + return IVAS_ERR_UNKNOWN; + } + } + else + { + nSamplesToRender = nSamplesPerChannel - nSamplesRendered; + /* render IVAS frames directly to the output buffer */ + if ( ( error = IVAS_DEC_GetRenderedSamples( hIvasDec, nSamplesToRender, &nSamplesRendered_loop, &hVoIP->nSamplesAvailableNext, pcmBuf + nSamplesRendered * nOutChannels ) ) != IVAS_ERR_OK ) + { + return error; + } + } + nSamplesRendered += nSamplesRendered_loop; +#ifdef VARIABLE_SPEED_DECODING + if ( hVoIP->mode == IVAS_DEC_VOIP_MODE_VARIABLE_SPEED && hVoIP->nSamplesAvailableNext == 0 ) + { + hVoIP->needNewFrame = true; + } +#endif } - assert( nTimeScalerOutSamples <= APA_BUF ); - - /* append scaled samples to FIFO */ - if ( pcmdsp_fifo_write( hVoIP->hFifoAfterTimeScaler, (uint8_t *) hVoIP->apaExecBuffer, (uint16_t) ( nTimeScalerOutSamples / hDecoderConfig->nchan_out ) ) != 0 ) + else if ( !hIvasDec->hasBeenFedFirstGoodFrame && hVoIP->hFifoOut == NULL ) { - return IVAS_ERR_UNKNOWN; + hVoIP->nSamplesAvailableNext = 0; } - -#ifdef SUPPORT_JBM_TRACEFILE - /* jbmWriterFn and jbmWriter may be NULL if tracefile writing was not requested on CLI */ - if ( jbmWriterFn != NULL && jbmWriter != NULL ) + else { - /* write JBM trace data entry */ - store_JbmData( hVoIP, dataUnit, systemTimestamp_ms, extBufferedSamples, hDecoderConfig->output_Fs ); - if ( ( jbmWriterFn( &hVoIP->JbmTraceData, jbmWriter ) ) != IVAS_ERR_OK ) + hVoIP->nSamplesAvailableNext = max( 0, pcmdsp_fifo_nReadableSamplesPerChannel( hVoIP->hFifoOut ) - nSamplesPerChannel ); +#ifdef VARIABLE_SPEED_DECODING + if ( hVoIP->mode == IVAS_DEC_VOIP_MODE_VARIABLE_SPEED && hVoIP->nSamplesAvailableNext < nSamplesPerChannel ) { - fprintf( stderr, "\nError writing JBM Trace data to file\n" ); - return IVAS_ERR_UNKNOWN; + hVoIP->needNewFrame = true; } +#endif + hVoIP->nSamplesAvailableNext = 0; } #endif } /* fetch a user-specified number of samples from FIFO */ +#if defined( JBM_TSM_ON_TCS ) + if ( hVoIP->hFifoOut ) + { + if ( pcmdsp_fifo_read( hVoIP->hFifoOut, nSamplesPerChannel, (uint8_t *) pcmBuf ) != 0 ) +#else if ( pcmdsp_fifo_read( hVoIP->hFifoAfterTimeScaler, nSamplesPerChannel, (uint8_t *) pcmBuf ) != 0 ) +#endif + { + return IVAS_ERR_UNKNOWN; + } +#ifdef JBM_TSM_ON_TCS + } +#endif + +#if defined( JBM_TSM_ON_TCS ) || defined( VARIABLE_SPEED_DECODING ) +#ifdef JBM_TSM_ON_TCS + *sampleAvailableNext = hVoIP->nSamplesAvailableNext; +#else + *sampleAvailableNext = max( 0, pcmdsp_fifo_nReadableSamplesPerChannel( hVoIP->hFifoAfterTimeScaler ) ); +#ifdef VARIABLE_SPEED_DECODING + if ( hVoIP->mode == IVAS_DEC_VOIP_MODE_VARIABLE_SPEED ) { - return IVAS_ERR_UNKNOWN; + if ( *sampleAvailableNext < nSamplesPerChannel ) + { + hVoIP->needNewFrame = true; + } + } +#endif +#endif +#endif + + return error; +} + +/*---------------------------------------------------------------------* + * IVAS_DEC_VoIP_Flush( ) + * + * Function to flush remaining audio in VoIP + *---------------------------------------------------------------------*/ + +#if defined( VARIABLE_SPEED_DECODING ) || defined( JBM_TSM_ON_TCS ) +ivas_error IVAS_DEC_VoIP_Flush( + IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ + const int16_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 */ + uint16_t *nSamplesAvailableNext, /* o : number of samples still available */ + int16_t *nSamplesFlushed /* o : number of samples flushed */ +) +{ + ivas_error error; + IVAS_DEC_VOIP *hVoIP; +#ifdef JBM_TSM_ON_TCS + int16_t rendererPcmBuf[( MAX_OUTPUT_CHANNELS * L_FRAME_MAX * APA_MAX_SCALE ) / 100]; + uint16_t nSamplesToRender; + uint16_t nSamplesFlushedLocal; +#endif + error = IVAS_ERR_OK; + + hVoIP = hIvasDec->hVoIP; +#if defined( JBM_TSM_ON_TCS ) + *nSamplesFlushed = min( nSamplesPerChannel, hVoIP->nSamplesAvailableNext ); +#else + *nSamplesFlushed = min( nSamplesPerChannel, pcmdsp_fifo_nReadableSamplesPerChannel( hVoIP->hFifoAfterTimeScaler ) ); +#endif +#ifdef JBM_TSM_ON_TCS + if ( hVoIP->rendererType == JBM_RENDERER_NONE ) + { +#endif + /* fetch a user-specified number of samples from FIFO */ +#if defined( JBM_TSM_ON_TCS ) + if ( pcmdsp_fifo_read( hVoIP->hFifoOut, *nSamplesFlushed, (uint8_t *) pcmBuf ) != 0 ) +#else + if ( pcmdsp_fifo_read( hVoIP->hFifoAfterTimeScaler, *nSamplesFlushed, (uint8_t *) pcmBuf ) != 0 ) +#endif + { + return IVAS_ERR_UNKNOWN; + } +#if defined( JBM_TSM_ON_TCS ) + hVoIP->nSamplesAvailableNext -= *nSamplesFlushed; + *nSamplesAvailableNext = hVoIP->nSamplesAvailableNext; +#else + *nSamplesAvailableNext = pcmdsp_fifo_nReadableSamplesPerChannel( hVoIP->hFifoAfterTimeScaler ); +#endif +#ifdef JBM_TSM_ON_TCS } + else + { + nSamplesToRender = (uint16_t) *nSamplesFlushed; + /* render IVAS frames */ + if ( ( error = IVAS_DEC_GetRenderedSamples( hIvasDec, nSamplesToRender, &nSamplesFlushedLocal, &hVoIP->nSamplesAvailableNext, rendererPcmBuf ) ) != IVAS_ERR_OK ) + { + return error; + } + if ( pcmdsp_fifo_write( hVoIP->hFifoOut, (uint8_t *) rendererPcmBuf, nSamplesFlushedLocal ) != 0 ) + { + return IVAS_ERR_UNKNOWN; + } + if ( pcmdsp_fifo_read( hVoIP->hFifoOut, nSamplesFlushedLocal, (uint8_t *) pcmBuf ) != 0 ) + { + return IVAS_ERR_UNKNOWN; + } + *nSamplesAvailableNext = hVoIP->nSamplesAvailableNext; + *nSamplesFlushed = (int16_t) nSamplesFlushedLocal; + } +#endif return error; } +#endif /*---------------------------------------------------------------------* @@ -1618,9 +2325,17 @@ ivas_error IVAS_DEC_VoIP_GetSamples( bool IVAS_DEC_VoIP_IsEmpty( IVAS_DEC_HANDLE hIvasDec /* i/o: IVAS decoder handle */ +#ifdef JBM_TSM_ON_TCS + , + int16_t nSamplesAsked +#endif ) { +#ifdef JBM_TSM_ON_TCS + return ( ( JB4_bufferedDataUnits( hIvasDec->hVoIP->hJBM ) == 0 ) && ( hIvasDec->hVoIP->nSamplesAvailableNext < nSamplesAsked ) ); +#else return JB4_bufferedDataUnits( hIvasDec->hVoIP->hJBM ) == 0; +#endif } @@ -1661,8 +2376,11 @@ static void IVAS_DEC_Close_VoIP( apa_exit( &hVoIP->hTimeScaler ); +#ifdef JBM_TSM_ON_TCS + pcmdsp_fifo_destroy( &hVoIP->hFifoOut ); +#else pcmdsp_fifo_destroy( &hVoIP->hFifoAfterTimeScaler ); - +#endif if ( hVoIP->apaExecBuffer != NULL ) { free( hVoIP->apaExecBuffer ); @@ -1758,55 +2476,7 @@ const char *IVAS_DEC_GetErrorMessage( ivas_error error /* i : decoder error code enum */ ) { - switch ( error ) - { - case IVAS_ERR_OK: - return "no error"; - case IVAS_ERR_FAILED_ALLOC: - return "Failed allocation error"; - case IVAS_ERR_WRONG_PARAMS: - return "wrong parameters"; - case IVAS_ERR_INIT_ERROR: - return "initialization error"; - case IVAS_ERR_INVALID_BITSTREAM: - return "Invalid bitstream"; - case IVAS_ERR_DECODER_ERROR: - return "decoder error"; - case IVAS_ERR_WRONG_MODE: - return "wrong mode"; - case IVAS_ERR_INVALID_OUTPUT_FORMAT: - return "invalid output format"; - case IVAS_ERR_INVALID_SAMPLING_RATE: - return "invalid sampling rate"; - case IVAS_ERR_HEAD_ROTATION_NOT_SUPPORTED: - return "head rotation not supported"; - case IVAS_ERR_INVALID_HRTF: - return "Not supported HRTF filter set"; - case IVAS_ERR_INVALID_INPUT_FORMAT: - return "invalid format of input bitstream"; - case IVAS_ERR_INVALID_INDEX: - return "invalid index"; - case IVAS_ERR_INTERNAL: - case IVAS_ERR_INTERNAL_FATAL: - return "internal error"; - case IVAS_ERR_RECONFIGURE_NOT_SUPPORTED: - return "reconfigure not supported"; - case IVAS_ERR_UNEXPECTED_NULL_POINTER: - return "unexpected NULL pointer"; -#ifdef DEBUGGING - case IVAS_ERR_INVALID_FORCE_MODE: - return "invalid force mode"; -#endif - case IVAS_ERR_FAILED_FILE_READ: - return "could not read from file"; - case IVAS_ERR_NOT_IMPLEMENTED: - return "not implemented"; - case IVAS_ERR_UNKNOWN: - default: - break; - } - - return "unknown error"; + return ivas_error_to_string( error ); } @@ -1942,7 +2612,15 @@ static ivas_error printConfigInfo_dec( if ( st_ivas->ivas_format == MONO_FORMAT ) { - fprintf( stdout, "Output configuration: mono EVS bit-exact decoding\n" ); + if ( st_ivas->hDecoderConfig->Opt_non_diegetic_pan ) + { + fprintf( stdout, "Output configuration: mono EVS bit-exact decoding to stereo\n" ); + fprintf( stdout, "Non-diegetic panning: %.2f\n", st_ivas->hDecoderConfig->non_diegetic_pan_gain * 90.f ); + } + else + { + fprintf( stdout, "Output configuration: mono EVS bit-exact decoding\n" ); + } } else { @@ -1981,6 +2659,7 @@ static ivas_error printConfigInfo_dec( fprintf( stdout, "Input configuration: %s\n", config_str ); } } + get_channel_config( st_ivas->hDecoderConfig->output_config, &config_str[0] ); fprintf( stdout, "Output configuration: %s\n", config_str ); @@ -1999,6 +2678,28 @@ static ivas_error printConfigInfo_dec( fprintf( stdout, "Head rotation: ON\n" ); } +#ifdef FIX_439_OTR_PARAMS + if ( st_ivas->hDecoderConfig->orientation_tracking != HEAD_ORIENT_TRK_NONE ) + { + switch ( st_ivas->hDecoderConfig->orientation_tracking ) + { + case HEAD_ORIENT_TRK_AVG: + fprintf( stdout, "Orientation tracking: AVG\n" ); + break; + case HEAD_ORIENT_TRK_REF: + fprintf( stdout, "Orientation tracking: REF\n" ); + break; + case HEAD_ORIENT_TRK_REF_VEC: + fprintf( stdout, "Orientation tracking: REF_VEC\n" ); + break; + case HEAD_ORIENT_TRK_REF_VEC_LEV: + fprintf( stdout, "Orientation tracking: REF_VEC_LEV\n" ); + break; + default: + break; + } + } +#else if ( st_ivas->hDecoderConfig->orientation_tracking != IVAS_ORIENT_TRK_NONE ) { switch ( st_ivas->hDecoderConfig->orientation_tracking ) @@ -2017,6 +2718,12 @@ static ivas_error printConfigInfo_dec( break; } } +#endif + + if ( st_ivas->hDecoderConfig->Opt_non_diegetic_pan ) + { + fprintf( stdout, "Non-diegetic panning: %.2f\n", st_ivas->hDecoderConfig->non_diegetic_pan_gain * 90.f ); + } } return IVAS_ERR_OK; @@ -2117,10 +2824,18 @@ void IVAS_DEC_PrintDisclaimer( void ) static ivas_error evs_dec_main( Decoder_Struct *st_ivas, const int16_t nOutSamples, +#ifdef JBM_TSM_ON_TCS + float *floatBuf, +#endif int16_t *pcmBuf ) { DEC_CORE_HANDLE *hCoreCoder; - float output[L_FRAME48k]; + float output[MAX_OUTPUT_CHANNELS_IN_DIEGETIC_PAN][L_FRAME48k]; + float mixer_left, mixer_rigth; +#ifdef JBM_TSM_ON_TCS + float *p_output[MAX_OUTPUT_CHANNELS_IN_DIEGETIC_PAN]; + int16_t ch; +#endif ivas_error error; error = IVAS_ERR_OK; @@ -2130,19 +2845,26 @@ static ivas_error evs_dec_main( mdct_switching_dec( hCoreCoder[0] ); +#ifdef JBM_TSM_ON_TCS + for ( ch = 0; ch < MAX_OUTPUT_CHANNELS_IN_DIEGETIC_PAN; ch++ ) + { + p_output[ch] = output[ch]; + } +#endif + /* run the main EVS decoding routine */ if ( hCoreCoder[0]->codec_mode == MODE1 ) { if ( hCoreCoder[0]->Opt_AMR_WB ) { - if ( ( error = amr_wb_dec( hCoreCoder[0], st_ivas->mem_hp20_out[0], output ) ) != IVAS_ERR_OK ) + if ( ( error = amr_wb_dec( hCoreCoder[0], st_ivas->mem_hp20_out[0], output[0] ) ) != IVAS_ERR_OK ) { return error; } } else { - if ( ( error = evs_dec( hCoreCoder[0], st_ivas->mem_hp20_out[0], output, FRAMEMODE_NORMAL ) ) != IVAS_ERR_OK ) + if ( ( error = evs_dec( hCoreCoder[0], st_ivas->mem_hp20_out[0], output[0], FRAMEMODE_NORMAL ) ) != IVAS_ERR_OK ) { return error; } @@ -2152,21 +2874,21 @@ static ivas_error evs_dec_main( { if ( hCoreCoder[0]->bfi == 0 ) { - if ( ( error = evs_dec( hCoreCoder[0], st_ivas->mem_hp20_out[0], output, FRAMEMODE_NORMAL ) ) != IVAS_ERR_OK ) + if ( ( error = evs_dec( hCoreCoder[0], st_ivas->mem_hp20_out[0], output[0], FRAMEMODE_NORMAL ) ) != IVAS_ERR_OK ) { return error; } } else if ( hCoreCoder[0]->bfi == 2 ) { - if ( ( error = evs_dec( hCoreCoder[0], st_ivas->mem_hp20_out[0], output, FRAMEMODE_FUTURE ) ) != IVAS_ERR_OK ) + if ( ( error = evs_dec( hCoreCoder[0], st_ivas->mem_hp20_out[0], output[0], FRAMEMODE_FUTURE ) ) != IVAS_ERR_OK ) { return error; } } else { - if ( ( error = evs_dec( hCoreCoder[0], st_ivas->mem_hp20_out[0], output, FRAMEMODE_MISSING ) ) != IVAS_ERR_OK ) + if ( ( error = evs_dec( hCoreCoder[0], st_ivas->mem_hp20_out[0], output[0], FRAMEMODE_MISSING ) ) != IVAS_ERR_OK ) { return error; } @@ -2175,12 +2897,42 @@ static ivas_error evs_dec_main( st_ivas->BER_detect = hCoreCoder[0]->BER_detect; - /* convert 'float' output data to 'short' */ + if ( st_ivas->renderer_type == RENDERER_NON_DIEGETIC_DOWNMIX ) + { + mixer_left = ( st_ivas->hDecoderConfig->non_diegetic_pan_gain + 1.f ) * 0.5f; + mixer_rigth = 1.f - mixer_left; + v_multc( output[0], mixer_rigth, output[1], nOutSamples ); + v_multc( output[0], mixer_left, output[0], nOutSamples ); + } + +#ifdef JBM_TSM_ON_TCS + if ( floatBuf != NULL ) + { + /* BE workaround */ + int16_t pcm_buf_local[L_FRAME48k]; + + + /* convert 'float' output data to 'short' */ #ifdef DEBUGGING - st_ivas->noClipping += + st_ivas->noClipping += +#endif + ivas_syn_output( p_output, nOutSamples, st_ivas->hDecoderConfig->nchan_out, pcm_buf_local ); + mvs2r( pcm_buf_local, floatBuf, nOutSamples * st_ivas->hDecoderConfig->nchan_out ); + } + else + { +#endif +#ifdef DEBUGGING + st_ivas->noClipping += +#endif +#ifdef JBM_TSM_ON_TCS + ivas_syn_output( p_output, nOutSamples, st_ivas->hDecoderConfig->nchan_out, pcmBuf ); +#else + ivas_syn_output( output, nOutSamples, st_ivas->hDecoderConfig->nchan_out, pcmBuf ); +#endif +#ifdef JBM_TSM_ON_TCS + } #endif - syn_output( output, nOutSamples, pcmBuf ); - return error; } @@ -2371,3 +3123,141 @@ static ivas_error input_format_API_to_internal( return IVAS_ERR_OK; } + +#ifdef JBM_TSM_ON_TCS +static int16_t IVAS_DEC_VoIP_GetRenderGranularity( Decoder_Struct *st_ivas ) +{ + + return st_ivas->hTcBuffer->n_samples_granularity; +} + +static JBM_RENDERER_TYPE IVAS_DEC_VoIP_GetRendererConfig( IVAS_DEC_HANDLE hIvasDec ) +{ + JBM_RENDERER_TYPE rendererType; + rendererType = JBM_RENDERER_NONE; + + if ( hIvasDec->mode == IVAS_DEC_MODE_EVS ) + { + rendererType = JBM_RENDERER_NONE; + } + else + { + rendererType = JBM_RENDERER_IVAS; + } + + return rendererType; +} + +ivas_error IVAS_DEC_VoIP_reconfigure( IVAS_DEC_HANDLE hIvasDec, const uint16_t nTransportChannels, const uint16_t l_ts ) +{ + + IVAS_DEC_VOIP *hVoIP; + ivas_error error; + + + hVoIP = hIvasDec->hVoIP; + + if ( hIvasDec->hVoIP->hTimeScaler == NULL ) + { + + uint16_t wss, css; + float startQuality; + DECODER_CONFIG_HANDLE hDecoderConfig; + +#ifdef VARIABLE_SPEED_DECODING + startQuality = hVoIP->mode == IVAS_DEC_VOIP_MODE_VARIABLE_SPEED ? -2.0f : 1.0f; +#else + startQuality = 1.0f; +#endif + /* get current renderer type*/ + hVoIP->rendererType = IVAS_DEC_VoIP_GetRendererConfig( hIvasDec ); + hDecoderConfig = hIvasDec->st_ivas->hDecoderConfig; + if ( hDecoderConfig->output_Fs == 8000 ) + { + wss = 1; + css = 1; + } + else if ( hDecoderConfig->output_Fs == 16000 ) + { + wss = 2; + css = 1; + } + else if ( hDecoderConfig->output_Fs == 32000 ) + { + wss = 4; + css = 2; + } + else if ( hDecoderConfig->output_Fs == 48000 ) + { + wss = 6; + css = 3; + } + else + { + return IVAS_ERR_INIT_ERROR; + } + hIvasDec->hVoIP->apaExecBuffer = malloc( sizeof( float ) * APA_BUF_PER_CHANNEL * nTransportChannels ); + set_zero( hIvasDec->hVoIP->apaExecBuffer, APA_BUF_PER_CHANNEL * nTransportChannels ); + if ( hIvasDec->hVoIP->apaExecBuffer == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate VoIP handle" ); + } + if ( apa_init( &hIvasDec->hVoIP->hTimeScaler, + nTransportChannels ) != 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, startQuality, 4, 4 ) != 0 || + apa_set_renderer_granularity( hIvasDec->hVoIP->hTimeScaler, l_ts ) != 0 ) + { + return IVAS_ERR_INIT_ERROR; + } + if ( hVoIP->hFifoOut == NULL && hVoIP->rendererType == JBM_RENDERER_NONE ) + { + /* we still need the FIFO out buffer */ + if ( pcmdsp_fifo_create( &hIvasDec->hVoIP->hFifoOut ) != 0 || + pcmdsp_fifo_init( hIvasDec->hVoIP->hFifoOut, (uint16_t) ( hDecoderConfig->output_Fs * 4 / FRAMES_PER_SEC ) /* 4 frames */, hDecoderConfig->nchan_out, sizeof( int16_t ) ) != 0 ) + { + return IVAS_ERR_INIT_ERROR; + } + } +#ifdef VARIABLE_SPEED_DECODING + else if ( hIvasDec->hVoIP->mode == IVAS_DEC_VOIP_MODE_VARIABLE_SPEED ) + { + if ( pcmdsp_fifo_create( &hIvasDec->hVoIP->hFifoOut ) != 0 || + pcmdsp_fifo_init( hIvasDec->hVoIP->hFifoOut, (uint16_t) ( hDecoderConfig->output_Fs * 4 / FRAMES_PER_SEC ) /* 4 frames */, hDecoderConfig->nchan_out, sizeof( int16_t ) ) != 0 ) + { + return IVAS_ERR_INIT_ERROR; + } + } +#endif + if ( hIvasDec->mode == IVAS_DEC_MODE_EVS ) + { + if ( apa_set_evs_compat_mode( hIvasDec->hVoIP->hTimeScaler, true ) != 0 ) + { + return IVAS_ERR_INIT_ERROR; + } + } + } + else + { + if ( apa_reconfigure( hVoIP->hTimeScaler, nTransportChannels, l_ts ) != 0 ) + { + return IVAS_ERR_INIT_ERROR; + } + + /* realloc apa_exe_buffer */ + free( hIvasDec->hVoIP->apaExecBuffer ); + hIvasDec->hVoIP->apaExecBuffer = malloc( sizeof( float ) * APA_BUF_PER_CHANNEL * nTransportChannels ); + set_zero( hIvasDec->hVoIP->apaExecBuffer, APA_BUF_PER_CHANNEL * nTransportChannels ); + if ( hIvasDec->hVoIP->apaExecBuffer == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate VoIP handle" ); + } + } + hIvasDec->hVoIP->nTransportChannelsOld = (uint8_t) nTransportChannels; + + error = IVAS_ERR_OK; + + return error; +} +#endif diff --git a/lib_dec/lib_dec.h b/lib_dec/lib_dec.h index e1e5bfe9f47fbcb676cf2c8c79ece0d5c2a39398..65e36b055ba91935b429c60c6cd4fd97eff99136 100644 --- a/lib_dec/lib_dec.h +++ b/lib_dec/lib_dec.h @@ -36,7 +36,6 @@ #include "common_api_types.h" #include - /*---------------------------------------------------------------------* * Decoder enums *---------------------------------------------------------------------*/ @@ -77,6 +76,22 @@ typedef enum IVAS_DEC_INPUT_FORMAT_RTPDUMP_HF = 4, /* RTP payload: only Header-Full format without zero padding for size collision avoidance */ } IVAS_DEC_INPUT_FORMAT; +typedef enum _IVAS_DEC_COMPLEXITY_LEVEL +{ + IVAS_DEC_COMPLEXITY_LEVEL_ONE = 1, + IVAS_DEC_COMPLEXITY_LEVEL_TWO = 2, + IVAS_DEC_COMPLEXITY_LEVEL_THREE = 3 +} IVAS_DEC_COMPLEXITY_LEVEL; + + +#ifdef VARIABLE_SPEED_DECODING +typedef enum +{ + IVAS_DEC_VOIP_MODE_VOIP = 0, + IVAS_DEC_VOIP_MODE_VARIABLE_SPEED = 1 +} IVAS_DEC_VOIP_MODE; +#endif + #ifdef DEBUGGING typedef enum _IVAS_DEC_FORCED_REND_MODE { @@ -117,9 +132,11 @@ typedef ivas_error ( *JbmTraceFileWriterFn )( const void *data, void *writer ); /*! r: error code */ ivas_error IVAS_DEC_Open( IVAS_DEC_HANDLE *phIvasDec, /* i/o: pointer to an IVAS decoder handle to be opened */ - IVAS_DEC_MODE mode, /* i : compatibility mode (EVS or IVAS) */ - const int16_t orientation_tracking, /* i : orientation tracking type */ - float no_diegetic_pan + IVAS_DEC_MODE mode /* i : compatibility mode (EVS or IVAS) */ +#ifndef FIX_439_OTR_PARAMS + , + const int16_t orientation_tracking /* i : orientation tracking type */ +#endif ); /*! r: error code */ @@ -130,7 +147,12 @@ ivas_error IVAS_DEC_Configure( 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 */ - const int16_t renderConfigEnabled /* i : enable Renderer config. file for binaural output */ +#ifdef FIX_439_OTR_PARAMS + const HEAD_ORIENT_TRK_T orientation_tracking, /* i : head orientation tracking type */ +#endif + const int16_t renderConfigEnabled, /* i : enable Renderer config. file for binaural output */ + const int16_t Opt_non_diegetic_pan, /* i : diegetic or not */ + const float non_diegetic_pan_gain /* i : non diegetic panning gain */ ); void IVAS_DEC_Close( @@ -166,18 +188,14 @@ ivas_error IVAS_DEC_GetObjectMetadata( /*! r: error code */ ivas_error IVAS_DEC_GetMasaMetadata( IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ -#ifdef FIX_350_MASA_DELAY_COMP 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 */ -#else - IVAS_MASA_QMETADATA_HANDLE *hMasaMetadata /* o : pointer to handle, which will be set to point to metadata from the most recently decoded frame */ -#endif ); /*! r: error code */ ivas_error IVAS_DEC_FeedHeadTrackData( IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ IVAS_QUATERNION *orientation, /* i : head-tracking data */ - IVAS_POSITION *Pos /* i : listener position */ + IVAS_VECTOR3 *Pos /* i : listener position */ ); /*! r: error code */ @@ -203,23 +221,49 @@ ivas_error IVAS_DEC_VoIP_FeedFrame( const bool qBit /* i : Q bit for AMR-WB IO */ ); +#ifdef VARIABLE_SPEED_DECODING +/*! r: error code */ +ivas_error IVAS_DEC_VoIP_SetScale( + IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ + const int16_t scale /* i : TSM scale to set */ +); +#endif + /*! r: error code */ ivas_error IVAS_DEC_VoIP_GetSamples( IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ 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 systemTimestamp_ms /* i : current system timestamp */ +#if defined( JBM_TSM_ON_TCS ) || defined(VARIABLE_SPEED_DECODING ) + , + uint16_t *sampleAvailableNext /* o : samples available for the next call */ +#endif #ifdef SUPPORT_JBM_TRACEFILE , JbmTraceFileWriterFn jbmWriterFn, void* jbmWriter #endif ); +#if defined( JBM_TSM_ON_TCS ) || defined(VARIABLE_SPEED_DECODING ) +ivas_error IVAS_DEC_VoIP_Flush( + IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ + const int16_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 */ + uint16_t *nSamplesAvailableNext, /* o : number of samples still available */ + int16_t *nSamplesFlushed /* o : number of samples flushed */ +); +#endif + /* Setter functions - apply changes to decoder configuration */ /*! r: error code */ ivas_error IVAS_DEC_EnableVoIP( IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ +#ifdef VARIABLE_SPEED_DECODING + const IVAS_DEC_VOIP_MODE voipMode, /* i : VoIP or varable speed */ + const uint16_t speedFac, /* i : speed factor for varable speed */ +#endif const int16_t jbmSafetyMargin, /* i : allowed delay reserve for JBM, in milliseconds */ const IVAS_DEC_INPUT_FORMAT inputFormat /* i : format of the input bitstream */ ); @@ -335,6 +379,10 @@ ivas_error IVAS_DEC_GetPcmFrameSize( /*! r: true if decoder has no data in VoIP jitter buffer */ bool IVAS_DEC_VoIP_IsEmpty( IVAS_DEC_HANDLE hIvasDec /* i/o: IVAS decoder handle */ +#ifdef JBM_TSM_ON_TCS + , + int16_t nSamplesAsked +#endif ); ivas_error IVAS_DEC_VoIP_Get_CA_offset( diff --git a/lib_dec/lsf_dec.c b/lib_dec/lsf_dec.c index e29cc480a22433b3e5b480d5eeb4e661f2728734..73f8933daff76c16e4c0117877280bd95a8be8d7 100644 --- a/lib_dec/lsf_dec.c +++ b/lib_dec/lsf_dec.c @@ -43,10 +43,8 @@ #include "rom_com.h" #include "prot.h" #include "basop_proto_func.h" -#ifdef LSF_RE_USE_SECONDARY_CHANNEL #include "ivas_prot.h" #include "ivas_rom_com.h" -#endif #include "wmc_auto.h" @@ -74,10 +72,8 @@ void lsf_dec( float *lsp_new, /* o : de-quantized LSP vector */ float *lsp_mid, /* o : de-quantized mid-frame LSP vector */ const int16_t tdm_low_rate_mode /* i : secondary channel low rate mode flag */ -#ifdef LSF_RE_USE_SECONDARY_CHANNEL , const float tdm_lsfQ_PCh[M] /* i : Q LSFs for primary channel */ -#endif ) { int16_t i, nBits, coder_type, no_param_lpc; @@ -132,12 +128,8 @@ void lsf_dec( } /* LSF de-quantization */ - lsf_end_dec( st, coder_type, st->bwidth, nBits, lsf_new, param_lpc, LSF_Q_prediction, &no_param_lpc -#ifdef LSF_RE_USE_SECONDARY_CHANNEL - , - tdm_lsfQ_PCh -#endif - ); + lsf_end_dec( st, coder_type, st->bwidth, nBits, lsf_new, param_lpc, LSF_Q_prediction, &no_param_lpc, + tdm_lsfQ_PCh ); /* convert quantized LSFs to LSPs */ lsf2lsp( lsf_new, lsp_new, M, st->sr_core ); @@ -264,13 +256,11 @@ 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 -#ifdef LSF_RE_USE_SECONDARY_CHANNEL + int16_t *lpc_param, /* i : LPC parameters */ + int16_t *LSF_Q_prediction, /* o : LSF prediction mode */ + int16_t *nb_indices /* o : number of indices */ , - const float tdm_lsfQ_PCh[M] -#endif + const float tdm_lsfQ_PCh[M] /* i : Q LSFs for primary channel */ ) { float pred0[M]; /* Prediction for the safety-net quantizer (usually mean)*/ @@ -292,17 +282,13 @@ void lsf_end_dec( int16_t nBits; int16_t coder_type; int16_t flag_1bit_gran; -#ifdef LSF_RE_USE_SECONDARY_CHANNEL float pred3[M]; -#endif + flag_1bit_gran = ( st->element_mode > EVS_MONO ); nBits = nBits_in; *nb_indices = 0; - if ( coder_type_org == GENERIC && st->sr_core == INT_FS_16k && st->codec_mode == MODE1 -#ifdef LSF_RE_USE_SECONDARY_CHANNEL - && ( st->idchan == 0 ) /* this bit is used only for primary channel or mono */ -#endif + if ( coder_type_org == GENERIC && st->sr_core == INT_FS_16k && st->codec_mode == MODE1 && ( st->idchan == 0 ) /* this bit is used only for primary channel or mono */ ) { coder_type = get_next_indice( st, 1 ); @@ -343,14 +329,13 @@ void lsf_end_dec( * Select safety_net or predictive mode *--------------------------------------------------------------------------*/ -#ifdef LSF_RE_USE_SECONDARY_CHANNEL + p_lpc_param = lpc_param; + if ( st->tdm_LRTD_flag == 0 && st->idchan == 1 && tdm_lsfQ_PCh != NULL ) { /* if secondary channel predmode is set to be > 2 */ predmode += 3; } -#endif - p_lpc_param = lpc_param; if ( predmode == 0 ) { @@ -378,7 +363,6 @@ void lsf_end_dec( st->safety_net = safety_net; -#ifdef LSF_RE_USE_SECONDARY_CHANNEL /* Make sure there are the correct bit allocations */ if ( st->idchan == 1 && predmode > 2 ) { @@ -388,7 +372,6 @@ void lsf_end_dec( mvs2s( levels1, levels0, stages0 ); mvs2s( bits1, bits0, stages0 ); } -#endif /*--------------------------------------------------------------------------* * Read indices from array @@ -533,18 +516,15 @@ void lsf_end_dec( pred1[i] = pred0[i] + MU_MA * st->mem_MA[i]; } -#ifdef LSF_RE_USE_SECONDARY_CHANNEL /* TD stereo SCh: perform intra-frame prediction with pulling-to-mean */ if ( st->tdm_LRTD_flag == 0 && st->idchan == 1 && tdm_lsfQ_PCh != NULL ) { tdm_SCh_LSF_intra_pred( st->element_brate, tdm_lsfQ_PCh, pred3 ); } -#endif if ( safety_net ) { /* LVQ */ -#ifdef LSF_RE_USE_SECONDARY_CHANNEL if ( st->tdm_LRTD_flag == 0 && st->idchan == 1 && tdm_lsfQ_PCh != NULL ) { @@ -557,33 +537,24 @@ void lsf_end_dec( } else { -#endif st->BER_detect = st->BER_detect | vq_dec_lvq( 1, qlsf, &lindice[1], stages0, M, mode_lvq, levels0[stages0 - 1] ); v_add( qlsf, pred0, qlsf, M ); v_sub( qlsf, pred1, st->mem_MA, M ); -#ifdef LSF_RE_USE_SECONDARY_CHANNEL } -#endif } else { -#ifdef LSF_RE_USE_SECONDARY_CHANNEL if ( predmode == 4 ) { mode_lvq_p = 9; predmode = 2; } -#endif 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 ) -#endif - ) /* MA only */ + if ( predmode == 1 || ( predmode == 4 ) ) /* 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 2fa1f3573b0a432fe062ffce9c45b8358e721b77..9c911ab5f6f82be803ce483aced3d5e9948bbfe0 100644 --- a/lib_dec/lsf_msvq_ma_dec.c +++ b/lib_dec/lsf_msvq_ma_dec.c @@ -187,7 +187,7 @@ int16_t D_lsf_tcxlpc( NumIndices = 1; - msvq_dec( lsf_codebook[narrowband][cdk], lsf_dims, lsf_offs, TCXLPC_NUMSTAGES, M, M, indices + NumIndices, lsf_q, lsf_q_ind ); + msvq_dec( lsf_codebook[narrowband][cdk], lsf_dims, lsf_offs, TCXLPC_NUMSTAGES, M, M, indices + NumIndices, 0, NULL, lsf_q, lsf_q_ind ); NumIndices += TCXLPC_NUMSTAGES; @@ -195,7 +195,8 @@ int16_t D_lsf_tcxlpc( { /* Only add contribution if flag is enabled */ - 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 ); + + 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 ); NumIndices += TCXLPC_IND_NUMSTAGES; /* Add to MA-removed vector */ @@ -264,7 +265,7 @@ int16_t dec_lsf_tcxlpc( } /* Decode independent lsf */ - msvq_dec( lsf_codebook[narrowband][cdk], lsf_dims, lsf_offs, TCXLPC_NUMSTAGES, M, M, flag + 1, lsf_q_ignored, lsf_q_ind ); + msvq_dec( lsf_codebook[narrowband][cdk], lsf_dims, lsf_offs, TCXLPC_NUMSTAGES, M, M, flag + 1, 0, NULL, lsf_q_ignored, lsf_q_ind ); /* Update flag */ *flag = lsf_ind_is_active( lsf_q_ind, lsf_means[narrowband], narrowband, cdk ); diff --git a/lib_dec/stat_dec.h b/lib_dec/stat_dec.h index 1a82d45587c8cd0ff656a4342d75b2a54735e592..c971cf0e21f1d08f3f3c0ca19c4d774e6f4ffc0f 100644 --- a/lib_dec/stat_dec.h +++ b/lib_dec/stat_dec.h @@ -98,21 +98,22 @@ typedef struct float bandNoiseShape[FFTLEN2]; /* CNG spectral shape computed at the decoder */ float partNoiseShape[NPART]; /* CNG spectral shape computed at the decoder */ - float smoothed_psd[L_FRAME16k]; /* stereo CNA - periodogram smoothed with IIR filter */ - float msPeriodog_ST[NPART_SHAPING]; /* stereo CNA - short-term periodogram */ - int16_t ms_last_inactive_bwidth; /* stereo CNA - bandwidth from the last inactive frame */ - int16_t ms_cnt_bw_up; /* stereo CNA - downward counter of frames since the last NB->WB switch */ - float cna_LR_LT; /* stereo CNA - long-term L/R correlation factor calculated on stereo upmix */ - float cna_ILD_LT; /* stereo CNA - long-term ILD factor calculated on stereo upmix */ - float cna_g_state[STEREO_DFT_BAND_MAX]; /* stereo CNA - side gains from the last inactive frame */ - float cna_cm[STEREO_DFT_BAND_MAX + 1]; /* stereo CNA - coherence from the last inactive frame */ - int16_t first_cna_noise_updated; /* stereo CNA - flag indicating that comfort noise has been properly initialized during warmup */ - int16_t first_cna_noise_update_cnt; /* stereo CNA - counter of CN initialization frames */ - int16_t cna_nbands; /* stereo CNA - number of frequency bands used by the CNA in DFT stereo mode */ - int16_t cna_band_limits[MAX_CNA_NBANDS + 1]; /* stereo CNA - band limits used by the CNA in DFT stereo mode */ - float cna_act_fact; /* stereo CNA - long-term signal activity factor (0-1) */ - float cna_rescale_fact; /* stereo CNA - CN energy re-scaling factor to maintain decoded energy */ - int16_t cna_seed; /* stereo CNA - seed for random CN generator */ + float smoothed_psd[L_FRAME16k]; /* stereo CNA - periodogram smoothed with IIR filter */ + float msPeriodog_ST[NPART_SHAPING]; /* stereo CNA - short-term periodogram */ + int16_t ms_last_inactive_bwidth; /* stereo CNA - bandwidth from the last inactive frame */ + int16_t ms_cnt_bw_up; /* stereo CNA - downward counter of frames since the last NB->WB switch */ + float cna_LR_LT; /* stereo CNA - long-term L/R correlation factor calculated on stereo upmix */ + float cna_ILD_LT; /* stereo CNA - long-term ILD factor calculated on stereo upmix */ + float cna_g_state[STEREO_DFT_BAND_MAX]; /* stereo CNA - side gains from the last inactive frame */ + float cna_cm[STEREO_DFT_BAND_MAX]; /* stereo CNA - coherence from the last inactive frame */ + int16_t first_cna_noise_updated; /* stereo CNA - flag indicating that comfort noise has been properly initialized during warmup */ + int16_t first_cna_noise_update_cnt; /* stereo CNA - counter of CN initialization frames */ + int16_t cna_nbands; /* stereo CNA - number of frequency bands used by the CNA in DFT stereo mode */ + + int16_t cna_band_limits[STEREO_DFT_BAND_MAX + 1]; /* stereo CNA - band limits used by the CNA in DFT stereo mode */ + float cna_act_fact; /* stereo CNA - long-term signal activity factor (0-1) */ + float cna_rescale_fact; /* stereo CNA - CN energy re-scaling factor to maintain decoded energy */ + int16_t cna_seed; /* stereo CNA - seed for random CN generator */ int16_t flag_dtx_mode; float lp_speech; @@ -1345,11 +1346,8 @@ typedef struct Decoder_State /* MCT Channel mode indication: LFE, ignore channel? */ MCT_CHAN_MODE mct_chan_mode; - int16_t cng_ism_flag; /* CNG in Param-ISM flag */ - int16_t read_sid_info; /* For ParamISM, use the transmitted noise */ -#ifdef DISCRETE_ISM_DTX_CNG + int16_t cng_ism_flag; /* CNG in ISM format flag */ int16_t is_ism_format; /* Indication whether the codec operates in ISM format */ -#endif } Decoder_State, *DEC_CORE_HANDLE; diff --git a/lib_dec/tonalMDCTconcealment.c b/lib_dec/tonalMDCTconcealment.c index 81fa9fdf90606dad00025db95b6214a257b1259c..041e3a3d2fa493f5b9d66325cfc9baad7e59ef1a 100644 --- a/lib_dec/tonalMDCTconcealment.c +++ b/lib_dec/tonalMDCTconcealment.c @@ -386,24 +386,14 @@ static void CalcMDXT( const TonalMDCTConcealPtr hTonalMDCTConc, const char type, const float *timeSignal, - float *mdxtOutput -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - const int16_t isLfe -#endif -) + 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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - isLfe -#endif - ); + 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' ) { @@ -422,12 +412,7 @@ void TonalMDCTConceal_Detect( const TonalMDCTConcealPtr hTonalMDCTConc, const float pitchLag, int16_t *numIndices, - const PsychoacousticParameters *psychParamsCurrent -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - const int16_t isLfe -#endif -) + const PsychoacousticParameters *psychParamsCurrent ) { float secondLastMDST[L_FRAME_MAX]; /* 32 bits are required */ float secondLastMDCT[L_FRAME_MAX]; /* 32 bits are required */ @@ -444,18 +429,8 @@ void TonalMDCTConceal_Detect( { if ( !hTonalMDCTConc->secondLastBlockData.tonalConcealmentActive ) { - CalcMDXT( hTonalMDCTConc, 'S', hTonalMDCTConc->secondLastPcmOut, secondLastMDST -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - isLfe -#endif - ); - CalcMDXT( hTonalMDCTConc, 'C', hTonalMDCTConc->secondLastPcmOut, secondLastMDCT -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - isLfe -#endif - ); + CalcMDXT( hTonalMDCTConc, 'S', hTonalMDCTConc->secondLastPcmOut, secondLastMDST ); + CalcMDXT( hTonalMDCTConc, 'C', hTonalMDCTConc->secondLastPcmOut, secondLastMDCT ); hTonalMDCTConc->nNonZeroSamples = 0; for ( i = 0; i < hTonalMDCTConc->nSamples; i++ ) { diff --git a/lib_enc/acelp_core_enc.c b/lib_enc/acelp_core_enc.c index 48cdb5c53614619ab4a6e765bdb1450ef659d48a..d78f9bf25888ea73be399e04a4d086a681708366 100644 --- a/lib_enc/acelp_core_enc.c +++ b/lib_enc/acelp_core_enc.c @@ -47,9 +47,7 @@ #include "prot.h" #include "ivas_cnst.h" #include "ivas_prot.h" -#ifdef LSF_RE_USE_SECONDARY_CHANNEL #include "ivas_rom_com.h" -#endif #include "wmc_auto.h" /*-------------------------------------------------------------------* @@ -75,7 +73,6 @@ 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 */ ) { @@ -372,9 +369,10 @@ ivas_error acelp_core_enc( nb_bits = 0; st->acelp_cfg.FEC_mode = 0; uc_two_stage_flag = 0; + if ( !nelp_mode && !ppp_mode ) { - 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 ); + 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 ); } /*-----------------------------------------------------------------* @@ -410,19 +408,15 @@ ivas_error acelp_core_enc( if ( !tdm_lp_reuse_flag ) { -#ifdef LSF_RE_USE_SECONDARY_CHANNEL lsf_enc( st, lsf_new, lsp_new, lsp_mid, Aq, tdm_low_rate_mode, st->GSC_IVAS_mode, tdm_lsfQ_PCh ); -#else - lsf_enc( st, lsf_new, lsp_new, lsp_mid, Aq, tdm_low_rate_mode, st->GSC_IVAS_mode ); -#endif } 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 */ @@ -430,36 +424,24 @@ 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 ) - { - mvr2r( tdm_lspQ_PCh, lsp_new, M ); - 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 ); @@ -503,7 +485,7 @@ ivas_error acelp_core_enc( { tc_classif_enc( st->L_frame, &tc_subfr, &position, attack_flag, st->pitch[0], res ); - 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 ); + 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 ); } /*---------------------------------------------------------------* @@ -561,14 +543,10 @@ 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 */ - 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 ); + 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 ); /* redo LSF quantization */ -#ifdef LSF_RE_USE_SECONDARY_CHANNEL lsf_enc( st, lsf_new, lsp_new, lsp_mid, Aq, tdm_low_rate_mode, 0, NULL ); -#else - lsf_enc( st, lsf_new, lsp_new, lsp_mid, Aq, tdm_low_rate_mode, 0 ); -#endif /* recalculation of LP residual (filtering through A[z] filter) */ calc_residu( inp, res, Aq, st->L_frame ); diff --git a/lib_enc/acelp_core_switch_enc.c b/lib_enc/acelp_core_switch_enc.c index 291c2128a19a6423946c78e27b1dc0bff58e44f2..0fa3ba313061ef4ef7b4df962e3a2f7d1f6f50f4 100644 --- a/lib_enc/acelp_core_switch_enc.c +++ b/lib_enc/acelp_core_switch_enc.c @@ -73,6 +73,10 @@ void acelp_core_switch_enc( const float *inp; int32_t cbrate; float Aq[2 * ( M + 1 )]; +#ifdef IND_LIST_DYN + uint16_t value; + int16_t nb_bits; +#endif BSTR_ENC_HANDLE hBstr = st->hBstr; /* initializations */ @@ -151,7 +155,7 @@ void acelp_core_switch_enc( * Excitation encoding *----------------------------------------------------------------*/ - 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*/ ); + 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*/ ); encod_gen_voic_core_switch( st, st->last_L_frame, inp, Aq, A, T_op, st->voicing, exc, cbrate ); @@ -159,12 +163,25 @@ void acelp_core_switch_enc( * Manipulate ACELP subframe indices (move them to their proper place) *----------------------------------------------------------------*/ +#ifdef IND_LIST_DYN + i = find_indice( hBstr, TAG_ACELP_SUBFR_LOOP_START, &value, &nb_bits ); +#ifdef DEBUGGING + assert( i >= 0 && "Internal error in ACELP core switching - unable to find ACELP subframe indices!" ); +#endif + while ( hBstr->ind_list[i].id == TAG_ACELP_SUBFR_LOOP_START ) + { + push_indice( hBstr, IND_CORE_SWITCHING_CELP_SUBFRAME, hBstr->ind_list[i].value, hBstr->ind_list[i].nb_bits ); + i++; + } + delete_indice( hBstr, TAG_ACELP_SUBFR_LOOP_START ); +#else for ( i = 0; i < 20; i++ ) { hBstr->ind_list[IND_CORE_SWITCHING_CELP_SUBFRAME + i].value = hBstr->ind_list[TAG_ACELP_SUBFR_LOOP_START + i].value; hBstr->ind_list[IND_CORE_SWITCHING_CELP_SUBFRAME + i].nb_bits = hBstr->ind_list[TAG_ACELP_SUBFR_LOOP_START + i].nb_bits; hBstr->ind_list[TAG_ACELP_SUBFR_LOOP_START + i].nb_bits = -1; } +#endif /*----------------------------------------------------------------* * BWE encoding diff --git a/lib_enc/amr_wb_enc.c b/lib_enc/amr_wb_enc.c old mode 100755 new mode 100644 index 88b3faa5d6c16ffafa834706a7631fd915cf44fa..c0c0b4f18e51df211b71704c96ec4d4c6772a236 --- a/lib_enc/amr_wb_enc.c +++ b/lib_enc/amr_wb_enc.c @@ -342,12 +342,8 @@ void amr_wb_enc( * WB, SWB and FB bandwidth detector *----------------------------------------------------------------*/ - bw_detect( st, st->input, NULL, NULL -#ifdef FIX_MDCT_BASED_BWD - , - 0 -#endif - ); + bw_detect( st, st->input, NULL, NULL, + 0 ); /* in AMR_WB IO, limit the maximum band-width to WB */ if ( st->bwidth > WB ) diff --git a/lib_enc/bw_detect.c b/lib_enc/bw_detect.c old mode 100755 new mode 100644 index 810527e0ef2b6aab7f373d4fa5edbe02795c153a..6de35a211a50ba5e2461bb2f42041346828d5e30 --- a/lib_enc/bw_detect.c +++ b/lib_enc/bw_detect.c @@ -55,11 +55,9 @@ #define ALPHA_BWD 0.75f #define BWD_LT_THRESH 0.6f -#define BWD_COUNT_MAX 100 -#define BWD_COUNT_WIDER_BW 10 -#ifdef FIX_MDCT_BASED_BWD +#define BWD_COUNT_MAX 100 +#define BWD_COUNT_WIDER_BW 10 #define BWD_COUNT_WIDER_BW_MDCT 0 -#endif #define CLDFB_ENER_OFFSET 1.6f @@ -74,10 +72,8 @@ void bw_detect( const float signal_in[], /* i : input signal */ float *spectrum, /* i : MDCT spectrum */ const float *enerBuffer /* i : energy buffer */ -#ifdef FIX_MDCT_BASED_BWD , const int16_t mct_on /* i : flag MCT mode */ -#endif ) { int16_t i, j, k, bw_max, bin_width, n_bins; @@ -87,7 +83,6 @@ 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; -#ifdef FIX_MDCT_BASED_BWD int16_t bwd_count_wider_bw, l_frame; bwd_count_wider_bw = BWD_COUNT_WIDER_BW; @@ -95,7 +90,6 @@ void bw_detect( { bwd_count_wider_bw = BWD_COUNT_WIDER_BW_MDCT; } -#endif if ( st->input_Fs > 8000 ) { @@ -189,10 +183,6 @@ void bw_detect( } else { -#ifndef FIX_MDCT_BASED_BWD - bin_width *= (int16_t) ( ( st->input_Fs / FRAMES_PER_SEC ) / BWD_TOTAL_WIDTH ); - mvr2r( spectrum, spect, (int16_t) ( st->input_Fs / FRAMES_PER_SEC ) ); -#else l_frame = (int16_t) ( st->input_Fs / FRAMES_PER_SEC ); if ( st->core == TCX_10_CORE ) { @@ -201,7 +191,6 @@ void bw_detect( bin_width *= ( l_frame / BWD_TOTAL_WIDTH ); mvr2r( spectrum, spect, l_frame ); -#endif } /*---------------------------------------------------------------------* * compute energy per spectral bins @@ -419,29 +408,17 @@ void bw_detect( /* switching to a higher BW */ if ( st->last_input_bwidth == NB ) { -#ifdef FIX_MDCT_BASED_BWD if ( st->count_WB > bwd_count_wider_bw ) -#else - if ( st->count_WB > BWD_COUNT_WIDER_BW ) -#endif { st->input_bwidth = WB; st->count_WB = BWD_COUNT_MAX; -#ifdef FIX_MDCT_BASED_BWD if ( st->count_SWB > bwd_count_wider_bw ) -#else - if ( st->count_SWB > BWD_COUNT_WIDER_BW ) -#endif { st->input_bwidth = SWB; st->count_SWB = BWD_COUNT_MAX; -#ifdef FIX_MDCT_BASED_BWD if ( st->count_FB > bwd_count_wider_bw ) -#else - if ( st->count_FB > BWD_COUNT_WIDER_BW ) -#endif { st->input_bwidth = FB; st->count_FB = BWD_COUNT_MAX; @@ -452,20 +429,12 @@ void bw_detect( if ( st->last_input_bwidth == WB && st->input_Fs > 16000 ) { -#ifdef FIX_MDCT_BASED_BWD if ( st->count_SWB > bwd_count_wider_bw ) -#else - if ( st->count_SWB > BWD_COUNT_WIDER_BW ) -#endif { st->input_bwidth = SWB; st->count_SWB = BWD_COUNT_MAX; -#ifdef FIX_MDCT_BASED_BWD if ( st->count_FB > bwd_count_wider_bw ) -#else - if ( st->count_FB > BWD_COUNT_WIDER_BW ) -#endif { st->input_bwidth = FB; st->count_FB = BWD_COUNT_MAX; @@ -475,11 +444,7 @@ void bw_detect( if ( st->last_input_bwidth == SWB && st->input_Fs > 32000 ) { -#ifdef FIX_MDCT_BASED_BWD if ( st->count_FB > bwd_count_wider_bw ) -#else - if ( st->count_FB > BWD_COUNT_WIDER_BW ) -#endif { st->input_bwidth = FB; st->count_FB = BWD_COUNT_MAX; @@ -671,28 +636,6 @@ void set_bw_stereo( if ( hCPE->element_mode == IVAS_CPE_MDCT ) { -#ifndef ISSUE_24_CLEANUP_MCT_LFE - /* 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 ) - { - sts[0]->bwidth = sts[0]->input_bwidth; - sts[1]->bwidth = sts[0]->input_bwidth; - } - else if ( sts[0]->input_bwidth != sts[1]->input_bwidth ) - { - sts[0]->bwidth = max( sts[0]->input_bwidth, sts[1]->input_bwidth ); - sts[1]->bwidth = max( sts[0]->input_bwidth, sts[1]->input_bwidth ); - } -#else /* ensure that both CPE channels have the same audio band-width */ if ( sts[0]->input_bwidth == sts[1]->input_bwidth ) { @@ -704,7 +647,6 @@ void set_bw_stereo( sts[0]->bwidth = max( sts[0]->input_bwidth, sts[1]->input_bwidth ); sts[1]->bwidth = max( sts[0]->input_bwidth, sts[1]->input_bwidth ); } -#endif } sts[0]->bwidth = max( sts[0]->bwidth, WB ); @@ -738,9 +680,6 @@ int16_t set_bw_mct( { st = hCPE[cpe_id]->hCoreCoder[ch]; if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - st->mct_chan_mode == MCT_CHAN_MODE_LFE || -#endif st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; diff --git a/lib_enc/cng_enc.c b/lib_enc/cng_enc.c index 04d9e4116621c977f0ae6a60f4c4adc90d259576..6d49d9c8863d9c98ded4ccaf0ffeffcd4e9e0c84 100644 --- a/lib_enc/cng_enc.c +++ b/lib_enc/cng_enc.c @@ -263,11 +263,7 @@ void CNG_enc( } else { -#ifdef LSF_RE_USE_SECONDARY_CHANNEL lsf_enc( st, lsf_new, lsp_new, 0, 0, 0, 0, NULL ); -#else - lsf_enc( st, lsf_new, lsp_new, 0, 0, 0, 0 ); -#endif } /* Reset CNG history if CNG frame length is changed */ @@ -885,8 +881,12 @@ void swb_CNG_enc( else if ( st->element_mode == IVAS_CPE_DFT && st->core_brate == SID_2k40 ) { /* LF-boost not used in DFT-stereo, instead the bandwidth is transmitted */ +#ifdef IND_LIST_DYN + delete_indice( st->hBstr, IND_CNG_ENV1 ); +#else st->hBstr->nb_bits_tot = st->hBstr->nb_bits_tot - st->hBstr->ind_list[IND_CNG_ENV1].nb_bits; st->hBstr->ind_list[IND_CNG_ENV1].nb_bits = -1; +#endif push_indice( st->hBstr, IND_BWIDTH, st->bwidth, 2 ); push_indice( st->hBstr, IND_UNUSED, 0, 4 ); push_indice( st->hBstr, IND_SID_BW, 1, 1 ); @@ -962,8 +962,12 @@ static void shb_CNG_encod( push_indice( hBstr, IND_SHB_CNG_GAIN, idx_ener, 4 ); push_indice( hBstr, IND_SID_BW, 1, 1 ); +#ifdef IND_LIST_DYN + delete_indice( hBstr, IND_CNG_ENV1 ); +#else hBstr->nb_bits_tot = hBstr->nb_bits_tot - hBstr->ind_list[IND_CNG_ENV1].nb_bits; hBstr->ind_list[IND_CNG_ENV1].nb_bits = -1; +#endif if ( st->element_mode == IVAS_CPE_DFT ) { push_indice( st->hBstr, IND_BWIDTH, st->bwidth, 2 ); diff --git a/lib_enc/cod_tcx.c b/lib_enc/cod_tcx.c index ee948998a1ac48fdfdc95cd728a559b9cb27bd81..ac24d74bf2bf792fe34af0619f0c5fbd5186a946 100644 --- a/lib_enc/cod_tcx.c +++ b/lib_enc/cod_tcx.c @@ -73,12 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - 0 -#endif - ); + WindowSignal( hTcxCfg, hTcxCfg->tcx_offset, left_overlap_mode, right_overlap_mode, &left_overlap, &right_overlap, speech, &L_frame, xn_buf, 1, 0 ); /*-----------------------------------------------------------* * Autocorrelation * @@ -139,11 +134,7 @@ void TNSAnalysisStereo( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) -#else if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) -#endif { continue; } @@ -391,11 +382,7 @@ void TNSAnalysisStereo( /* individual decision for each channel */ for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) -#else if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) -#endif { continue; } @@ -477,11 +464,7 @@ void TNSAnalysisStereo( /* we have the decision, set filter data accordingly */ for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) -#else if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) -#endif { continue; } @@ -518,11 +501,7 @@ void TNSAnalysisStereo( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) -#else if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) -#endif { continue; } @@ -992,12 +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 ) ); -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - maxNfCalcBw = min( maxNfCalcBw, MCT_LFE_MAX_LINE ); - } -#endif if ( ( total_brate >= HQ_96k && ( st->element_mode <= IVAS_SCE || st->bwidth < SWB ) ) || total_brate > IVAS_192k ) { fac_ns[ch][n] = 0.0f; @@ -2130,12 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - 0 -#endif - ); + 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 ); @@ -2144,12 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - 0 -#endif - ); + 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 ); diff --git a/lib_enc/core_enc_init.c b/lib_enc/core_enc_init.c index f89f4a132c0b38ba00ea4697e83dc151ab8e1970..774b1398c52a32bba57e2117744381bb9df33648 100644 --- a/lib_enc/core_enc_init.c +++ b/lib_enc/core_enc_init.c @@ -261,12 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - st->mct_chan_mode -#endif - ); + 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_switch.c b/lib_enc/core_enc_switch.c index 806afd273bcc1ab4ad4e9cceb7f2cf8b2b60c3ee..d6c866d4c56e56a671a6b8b857f98bd106d2333d 100644 --- a/lib_enc/core_enc_switch.c +++ b/lib_enc/core_enc_switch.c @@ -95,12 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - st->mct_chan_mode -#endif - ); + st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode ); /* switch IGF configuration */ if ( st->igf ) @@ -117,12 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - st->mct_chan_mode -#endif - ); + st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->total_brate, st->igf, st->element_mode ); if ( st->hTcxCfg->fIsTNSAllowed ) { @@ -161,12 +151,7 @@ void core_coder_mode_switch( } else { - st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - st->mct_chan_mode -#endif - ); + 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/dtx.c b/lib_enc/dtx.c index c99a8faf286fdd9f87c0acfd9ecb2a66dcee6162..8357dd3a82c2dedcf99d2b534d1ae36b5c7e12b8 100644 --- a/lib_enc/dtx.c +++ b/lib_enc/dtx.c @@ -64,8 +64,7 @@ #define LTE_VAR -4.0f #define MAX_BRATE_DTX_EVS ACELP_24k40 /* maximum bitrate to which the default DTX is applied in EVS; otherwise DTX is applied only in silence */ -#define MAX_BRATE_DTX_IVAS IVAS_64k /* maximum bitrate to which the default DTX is applied in IVAS; otherwise DTX is applied only in silence */ - +#define MAX_BRATE_DTX_IVAS IVAS_80k /* maximum bitrate to which the default DTX is applied in IVAS; otherwise DTX is applied only in silence */ /*-------------------------------------------------------------------* * Local function prototypes *-------------------------------------------------------------------*/ @@ -86,9 +85,7 @@ void dtx( ) { float alpha; - DTX_ENC_HANDLE hDtxEnc = st->hDtxEnc; - int16_t last_br_cng_flag, last_br_flag, br_dtx_flag; if ( st->dtx_sce_sba != 0 ) { @@ -99,7 +96,6 @@ void dtx( else { last_br_cng_flag = st->last_total_brate_cng <= MAX_BRATE_DTX_EVS || st->lp_noise < 15 || ( st->element_mode == IVAS_SCE && st->last_total_brate_cng <= MAX_BRATE_DTX_IVAS ); - last_br_flag = st->last_total_brate <= MAX_BRATE_DTX_EVS || st->lp_noise < 15 || ( st->element_mode == IVAS_SCE && st->last_total_brate <= MAX_BRATE_DTX_IVAS ); br_dtx_flag = 0; } @@ -238,7 +234,7 @@ void dtx( } else { - if ( ( st->cng_type == FD_CNG && ( st->total_brate <= MAX_BRATE_DTX_EVS || ( st->element_mode == IVAS_SCE && ivas_total_brate <= MAX_BRATE_DTX_IVAS ) ) ) || ( st->element_mode == IVAS_CPE_MDCT ) ) /* at highest bitrates, use exclusively LP_CNG */ + if ( ( st->cng_type == FD_CNG && ( st->total_brate <= MAX_BRATE_DTX_EVS || ( st->element_mode != EVS_MONO && ivas_total_brate <= MAX_BRATE_DTX_IVAS ) ) ) || ( st->element_mode == IVAS_CPE_MDCT ) ) /* at highest bitrates, use exclusively LP_CNG */ { if ( st->element_mode == EVS_MONO && ( st->total_brate == ACELP_9k60 || st->total_brate == ACELP_16k40 || st->total_brate == ACELP_24k40 ) ) { @@ -259,7 +255,13 @@ void dtx( /* reset the bitstream (IVAS format signaling was already written) */ if ( st->element_mode != IVAS_CPE_MDCT && st->hBstr != NULL ) { - reset_indices_enc( st->hBstr, MAX_NUM_INDICES ); + reset_indices_enc( st->hBstr, +#ifdef IND_LIST_DYN + st->hBstr->nb_ind_tot +#else + MAX_NUM_INDICES +#endif + ); } } diff --git a/lib_enc/enc_ppp.c b/lib_enc/enc_ppp.c index 823d6cf3cdb244a96f0f894df172f66aafbf0b7d..328c1d5b5215d500452fcb61e3e6a76f71597a95 100644 --- a/lib_enc/enc_ppp.c +++ b/lib_enc/enc_ppp.c @@ -169,7 +169,14 @@ ivas_error encod_ppp( } /* delete previous indices */ - reset_indices_enc( hBstr, MAX_NUM_INDICES ); + reset_indices_enc( hBstr, +#ifdef IND_LIST_DYN + hBstr->nb_ind_tot +#else + MAX_NUM_INDICES +#endif + ); + /* signaling matrix (writing of signaling bits) */ signaling_enc( st ); diff --git a/lib_enc/eval_pit_contr.c b/lib_enc/eval_pit_contr.c index 5dd310177230d29c68fe414a5eaa9db3e7ce91cd..76bf54b0254641fe7d8ce3aa6c3761c991cd6835 100644 --- a/lib_enc/eval_pit_contr.c +++ b/lib_enc/eval_pit_contr.c @@ -326,18 +326,26 @@ int16_t Pit_exc_contribution_len( /* pitch contribution useless - delete all previously written indices belonging to pitch contribution */ for ( i = TAG_ACELP_SUBFR_LOOP_START; i < TAG_ACELP_SUBFR_LOOP_END; i++ ) { +#ifdef IND_LIST_DYN + delete_indice( hBstr, i ); +#else if ( hBstr->ind_list[i].nb_bits != -1 ) { hBstr->nb_bits_tot -= hBstr->ind_list[i].nb_bits; hBstr->ind_list[i].nb_bits = -1; } +#endif } +#ifdef IND_LIST_DYN + delete_indice( hBstr, IND_ES_PRED ); +#else if ( hBstr->ind_list[IND_ES_PRED].nb_bits != -1 ) { hBstr->nb_bits_tot -= hBstr->ind_list[IND_ES_PRED].nb_bits; hBstr->ind_list[IND_ES_PRED].nb_bits = -1; } +#endif } if ( st->core_brate < CFREQ_BITRATE ) diff --git a/lib_enc/evs_enc.c b/lib_enc/evs_enc.c index 44c34a2bd7a6942fc17bc938d5dca44f2c95f59f..c45bb444f3aac3fd061469feb5ec6a3b816a3d43 100644 --- a/lib_enc/evs_enc.c +++ b/lib_enc/evs_enc.c @@ -103,6 +103,7 @@ ivas_error evs_enc( error = IVAS_ERR_OK; push_wmops( "evs_enc" ); + /*------------------------------------------------------------------* * Initialization *-----------------------------------------------------------------*/ @@ -242,7 +243,7 @@ ivas_error evs_enc( if ( st->core == ACELP_CORE ) { - 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 ) + 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 ) { return error; } @@ -686,12 +687,7 @@ static void configure_core_coder( } } - st->igf = getIgfPresent( 0, st->total_brate, st->bwidth, st->rf_mode -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - st->mct_chan_mode -#endif - ); + 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 0588f0ddf1638c2610c24dba5e8b954548120da0..e76457e61c941f689e42359149bc27bfb3702a39 100644 --- a/lib_enc/ext_sig_ana.c +++ b/lib_enc/ext_sig_ana.c @@ -215,48 +215,24 @@ void core_signal_analysis_high_bitrate( if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP ) { -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE ) - { -#endif - 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]; - } -#ifndef ISSUE_24_CLEANUP_MCT_LFE - } - 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]; } -#endif 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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - 0 -#endif - ); + 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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - 0 -#endif - ); + 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 */ { @@ -295,15 +271,7 @@ void core_signal_analysis_high_bitrate( for ( i = 0; i < 2; i++ ) { -#ifndef ISSUE_24_CLEANUP_MCT_LFE - assert( st->mct_chan_mode != MCT_CHAN_MODE_LFE ); -#endif - 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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - 0 -#endif - ); + 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 ); @@ -318,11 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && st->mct_chan_mode != MCT_CHAN_MODE_LFE -#endif - ) + if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP ) { edct( tcx20Win, hTcxEnc->spectrum[frameno], L_subframe, st->element_mode ); @@ -347,13 +311,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 ); } -#ifndef ISSUE_24_CLEANUP_MCT_LFE - 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; - } -#endif if ( st->element_mode != IVAS_CPE_MDCT ) { @@ -370,23 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && st->mct_chan_mode != MCT_CHAN_MODE_LFE -#endif - ) + 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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - st->mct_chan_mode == MCT_CHAN_MODE_LFE -#endif - ); + 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 ) @@ -417,15 +365,7 @@ void core_signal_analysis_high_bitrate( for ( i = 0; i < 2; i++ ) { -#ifndef ISSUE_24_CLEANUP_MCT_LFE - assert( st->mct_chan_mode != MCT_CHAN_MODE_LFE ); -#endif - 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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - 0 -#endif - ); + 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 */ @@ -437,11 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && st->mct_chan_mode != MCT_CHAN_MODE_LFE -#endif - ) + if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP ) { edst( mdstWin, mdst_spectrum[frameno], L_subframe, st->element_mode ); @@ -466,12 +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 ); } } -#ifndef ISSUE_24_CLEANUP_MCT_LFE - 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 ); - } -#endif } if ( st->element_mode != IVAS_CPE_MDCT ) @@ -513,11 +443,13 @@ void core_signal_analysis_high_bitrate( { ProcessIGF( st, hTcxEnc->spectrum[frameno], hTcxEnc->spectrum[frameno], powerSpec, transform_type[frameno] == TCX_20, frameno, 0, vad_hover_flag ); } - - /* Copy memory */ - mvr2r( lsp_new, st->lspold_enc, M ); } } + if ( st->element_mode != IVAS_CPE_MDCT ) + { + /* Copy memory */ + mvr2r( lsp_new, st->lspold_enc, M ); + } return; } diff --git a/lib_enc/fd_cng_enc.c b/lib_enc/fd_cng_enc.c index e43b65d56a88383a225e5228d77b2c06bf1d4018..3ac5b8d6908fc3756e7d4a403ad6fd118a65f726 100644 --- a/lib_enc/fd_cng_enc.c +++ b/lib_enc/fd_cng_enc.c @@ -513,12 +513,18 @@ void FdCng_encodeSID( float w[32]; float preemph_fac = st->preemph_fac; - const float *const *codebooks = ( st->element_mode == EVS_MONO ) ? cdk_37bits : cdk_37bits_ivas; + 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]; const float gain_q_offset = ( st->element_mode == EVS_MONO ) ? GAIN_Q_OFFSET_EVS : GAIN_Q_OFFSET_IVAS; /* Init */ N = hFdCngEnc->npartDec; + invTrfMatrix = (float *) tmpRAM; /* dynamically filled */ + set_zero( v, FDCNG_VQ_MAX_LEN ); + /* Convert to LOG */ e = 0.f; for ( i = 0; i < N; i++ ) @@ -544,10 +550,32 @@ void FdCng_encodeSID( /* MSVQ encoder */ set_f( w, 1.0f, N ); - msvq_enc( codebooks, NULL, NULL, v, levels_37bits, FD_CNG_maxC_37bits, FD_CNG_stages_37bits, w, N, FD_CNG_maxN_37bits, indices ); + 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 ); + } - /* MSVQ decoder */ - msvq_dec( codebooks, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, v, NULL ); /* Compute gain */ gain = 0.f; @@ -895,8 +923,21 @@ void stereoFdCngCoherence( else if ( sts[0]->core_brate <= SID_2k40 && sts[1]->core_brate <= SID_2k40 ) { /* case: no VAD for both channels -> INACTIVE FRAME */ - reset_indices_enc( sts[0]->hBstr, MAX_NUM_INDICES ); - reset_indices_enc( sts[1]->hBstr, MAX_NUM_INDICES ); + reset_indices_enc( sts[0]->hBstr, +#ifdef IND_LIST_DYN + sts[0]->hBstr->nb_ind_tot +#else + MAX_NUM_INDICES +#endif + ); + + reset_indices_enc( sts[1]->hBstr, +#ifdef IND_LIST_DYN + sts[1]->hBstr->nb_ind_tot +#else + MAX_NUM_INDICES +#endif + ); /* synchronize SID sending for variable SID rate */ if ( sts[0]->core_brate != sts[1]->core_brate ) @@ -973,6 +1014,12 @@ void FdCngEncodeMDCTStereoSID( int16_t no_side_flag; int16_t is_inp_ms; + 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 */ + + is_inp_ms = 0; if ( hCPE->hCoreCoder[0]->cng_sba_flag == 1 ) { @@ -1023,7 +1070,7 @@ void FdCngEncodeMDCTStereoSID( /* Quantize noise shapes */ for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { - /* Normalize MSVW input */ + /* Normalize MSVQ input */ gain[ch] = 0.f; for ( p = N_GAIN_MIN; p < N_GAIN_MAX; p++ ) { @@ -1035,7 +1082,37 @@ void FdCngEncodeMDCTStereoSID( { ms_ptr[ch][p] -= gain[ch]; } + } + /* 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++ ) + { /* MSVQ */ if ( ch ) { @@ -1046,8 +1123,14 @@ void FdCngEncodeMDCTStereoSID( stages = FD_CNG_stages_37bits; } - 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 ); + /* 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 ); + } } if ( no_side_flag ) @@ -1104,12 +1187,14 @@ void FdCngEncodeMDCTStereoSID( /* ---- Write SID bitstream ---- */ +#ifndef IND_LIST_DYN /* side info */ push_indice( sts[0]->hBstr, IND_SID_TYPE, 1, 1 ); push_indice( sts[0]->hBstr, IND_BWIDTH, sts[0]->bwidth, 2 ); push_indice( sts[0]->hBstr, IND_ACELP_16KHZ, sts[0]->L_frame == L_FRAME16k ? 1 : 0, 1 ); push_indice( sts[1]->hBstr, IND_SID_TYPE, coh_idx, 4 ); push_indice( sts[1]->hBstr, IND_SID_TYPE, no_side_flag, 1 ); +#endif /* noise shapes and channel gains */ for ( ch = 0; ch < CPE_CHANNELS; ch++ ) @@ -1117,10 +1202,23 @@ void FdCngEncodeMDCTStereoSID( if ( ch ) { stages = FD_CNG_JOINT_stages_25bits; +#ifdef IND_LIST_DYN + sts[ch]->hBstr->ind_list = sts[0]->hBstr->ind_list + sts[0]->hBstr->nb_ind_tot; + + /* side info */ + push_indice( sts[ch]->hBstr, IND_SID_TYPE, coh_idx, 4 ); + push_indice( sts[ch]->hBstr, IND_SID_TYPE, no_side_flag, 1 ); +#endif } else { stages = FD_CNG_stages_37bits; +#ifdef IND_LIST_DYN + /* side info */ + push_indice( sts[ch]->hBstr, IND_SID_TYPE, 1, 1 ); + push_indice( sts[ch]->hBstr, IND_BWIDTH, sts[0]->bwidth, 2 ); + push_indice( sts[ch]->hBstr, IND_ACELP_16KHZ, sts[0]->L_frame == L_FRAME16k ? 1 : 0, 1 ); +#endif } for ( int16_t i = 0; i < stages; i++ ) @@ -1133,6 +1231,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; } @@ -1160,6 +1259,11 @@ void FdCngEncodeDiracMDCTStereoSID( int16_t indices[CPE_CHANNELS][FD_CNG_stages_37bits]; int16_t gain_idx[CPE_CHANNELS]; int16_t ch, p; + 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 */ /* set pointers and initialize */ for ( ch = 0; ch < CPE_CHANNELS; ch++ ) @@ -1176,7 +1280,7 @@ void FdCngEncodeDiracMDCTStereoSID( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { E[ch] = 0.0f; - for ( p = 0; p < NPART; p++ ) + for ( p = 0; p < NPART; p++ ) /* TBD Note: NPART should likely be N[ch] if N[ch] may change */ { ms_ptr[ch][p] = 10.f * log10f( lr_in_ptr[ch][p] + EPSILON ); E[ch] += ms_ptr[ch][p]; @@ -1184,12 +1288,13 @@ void FdCngEncodeDiracMDCTStereoSID( } /* M/S transform on log envelopes */ - convertToMS( NPART, ms_ptr[0], ms_ptr[1], 0.5f ); + 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 */ - E[0] = sum_f( ms_ptr[0], NPART ); /* Quantize M noise shape */ - /* Normalize MSVW input */ + /* Normalize MSVQ input */ 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 ); @@ -1199,14 +1304,29 @@ void FdCngEncodeDiracMDCTStereoSID( } /* MSVQ */ - 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 ); + /* 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 ); + /* set S to zero */ set_zero( ms_ptr[1], NPART ); /* compute M gain */ - gain[0] = sum_f( ms_ptr[0], NPART ); + gain[0] = sum_f( ms_ptr[0], NPART ); /* TBD Note: NPART should likely be N[0] if N[0] may change */ 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 ); @@ -1218,7 +1338,7 @@ void FdCngEncodeDiracMDCTStereoSID( gain[1] = gain[0]; /* undo M/S */ - convertToMS( NPART, ms_ptr[0], ms_ptr[1], 1.0f ); + convertToMS( NPART, ms_ptr[0], ms_ptr[1], 1.0f ); /* TBD Note: NPART should likely be N[0] if N[0] may change */ /* restore channel noise envelopes */ for ( ch = 0; ch < CPE_CHANNELS; ch++ ) @@ -1226,7 +1346,7 @@ void FdCngEncodeDiracMDCTStereoSID( HANDLE_FD_CNG_ENC hFdCngEnc = sts[ch]->hFdCngEnc; HANDLE_FD_CNG_COM hFdCngCom = hFdCngEnc->hFdCngCom; - for ( p = 0; p < NPART; p++ ) + for ( p = 0; p < NPART; p++ ) /* TBD Note: NPART should likely be N[0] if N[0] may change */ { lr_out_ptr[ch][p] = powf( 10.f, ( ms_ptr[ch][p] + gain[ch] ) / 10.f ); } @@ -1265,6 +1385,5 @@ void FdCngEncodeDiracMDCTStereoSID( } push_indice( sts[0]->hBstr, IND_ENERGY, gain_idx[0], 7 ); - return; } diff --git a/lib_enc/hq_core_enc.c b/lib_enc/hq_core_enc.c index 43b5ebd68c7c377da7346e7ae6196ef414453108..3fb39b535a79f8da69a5188083fd2c870b3787a4 100644 --- a/lib_enc/hq_core_enc.c +++ b/lib_enc/hq_core_enc.c @@ -116,12 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - 0 -#endif - ); + 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 ); diff --git a/lib_enc/igf_enc.c b/lib_enc/igf_enc.c index 9c68e3fcc760981ad66e0da3ec77b7ebd427ce18..677bc1639e39dca3ff9e3686b0d156ab99eaa31f 100644 --- a/lib_enc/igf_enc.c +++ b/lib_enc/igf_enc.c @@ -1707,6 +1707,41 @@ void IGFEncSetMode( return; } +#ifdef IND_LIST_DYN + +/*-------------------------------------------------------------------* + * pack_bit() + * + * insert a bit into packed octet + *-------------------------------------------------------------------*/ + +static void pack_bit( + const int16_t bit, /* i : bit to be packed */ + uint8_t **pt, /* i/o: pointer to octet array into which bit will be placed */ + uint8_t *omask /* i/o: output mask to indicate where in the octet the bit is to be written */ +) +{ + if ( *omask == 0x80 ) + { + **pt = 0; + } + + if ( bit != 0 ) + { + **pt = **pt | *omask; + } + + *omask >>= 1; + if ( *omask == 0 ) + { + *omask = 0x80; + ( *pt )++; + } + + return; +} + +#endif /*-------------------------------------------------------------------* * IGFEncConcatenateBitstream() @@ -1722,10 +1757,56 @@ void IGFEncConcatenateBitstream( { int16_t i; IGF_ENC_PRIVATE_DATA_HANDLE hPrivateData; +#ifdef IND_LIST_DYN + Indice *ind_list; + uint8_t *pFrame; /* byte array with bit packet and byte aligned coded speech data */ + int16_t *pFrame_size; /* number of bits in the binary encoded access unit [bits] */ + int16_t k, nb_bits_written; + int32_t imask; + uint8_t omask; +#endif hPrivateData = &hIGFEnc->igfData; +#ifndef IND_LIST_DYN hBstr->next_ind -= bsBits; +#endif + +#ifdef IND_LIST_DYN + ind_list = &hBstr->ind_list[hBstr->nb_ind_tot - bsBits]; /* here, we assume that each bit has been written as a single indice */ + pFrame = hPrivateData->igfBitstream; + pFrame_size = &hPrivateData->igfBitstreamBits; + nb_bits_written = 0; + + omask = ( 0x80 >> ( *pFrame_size & 0x7 ) ); + pFrame += *pFrame_size >> 3; + + /* bitstream packing (conversion of individual indices into a serial stream) */ + for ( i = 0; i < bsBits; i++ ) + { + if ( ind_list[i].nb_bits > 0 ) + { + /* mask from MSB to LSB */ + imask = 1 << ( ind_list[i].nb_bits - 1 ); + /* write bit by bit */ + for ( k = 0; k < ind_list[i].nb_bits; k++ ) + { + pack_bit( ind_list[i].value & imask, &pFrame, &omask ); + imask >>= 1; + } + nb_bits_written += ind_list[i].nb_bits; + + /* delete the indice */ + ind_list[i].nb_bits = -1; + } + } + + *pFrame_size += nb_bits_written; + + /* update list of indices */ + hBstr->nb_ind_tot -= bsBits; + hBstr->nb_bits_tot -= nb_bits_written; +#else indices_to_serial_generic( &hBstr->ind_list[hBstr->next_ind], bsBits, hPrivateData->igfBitstream, &hPrivateData->igfBitstreamBits ); /* make sure there are no leftovers from the temporary bitstream writing */ @@ -1735,6 +1816,7 @@ void IGFEncConcatenateBitstream( } hBstr->nb_bits_tot -= hIGFEnc->infoTotalBitsPerFrameWritten; +#endif return; } diff --git a/lib_enc/init_enc.c b/lib_enc/init_enc.c index d73434c15f54a1c9675d2b7e6d8b307ae8ee8225..42b4e8957d92ab0290e02ad72d9101b03aca4e72 100644 --- a/lib_enc/init_enc.c +++ b/lib_enc/init_enc.c @@ -54,7 +54,10 @@ *-----------------------------------------------------------------------*/ ivas_error init_encoder( - Encoder_State *st, /* i/o: state structure */ + Encoder_State *st, /* i/o: state structure */ +#ifdef IND_LIST_DYN + Encoder_Struct *st_ivas, /* i/o: encoder state structure */ +#endif 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 */ @@ -112,6 +115,15 @@ ivas_error init_encoder( { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Bitstream structure\n" ) ); } + +#ifdef IND_LIST_DYN + /* set pointer to the buffer of indices */ + st->hBstr->ind_list = st_ivas->ind_list; + st->hBstr->ivas_ind_list_zero = &st_ivas->ind_list; + st->hBstr->ivas_max_num_indices = &st_ivas->ivas_max_num_indices; + st->hBstr->nb_ind_tot = 0; + st->hBstr->nb_bits_tot = 0; +#endif } else { @@ -463,11 +475,7 @@ ivas_error init_encoder( * LP-CNG *-----------------------------------------------------------------*/ -#ifdef DISCRETE_ISM_DTX_CNG 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 ) ) -#else - if ( ( ( idchan == 0 && st->Opt_DTX_ON && st->element_mode != IVAS_CPE_MDCT ) || st->element_mode == EVS_MONO ) && !( ism_mode == ISM_MODE_PARAM ) ) -#endif { if ( ( st->hTdCngEnc = (TD_CNG_ENC_HANDLE) malloc( sizeof( TD_CNG_ENC_DATA ) ) ) == NULL ) { @@ -731,11 +739,7 @@ ivas_error init_encoder( * IGF *-----------------------------------------------------------------*/ - if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && st->mct_chan_mode != MCT_CHAN_MODE_LFE -#endif - ) + if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) ) { if ( ( st->hIGFEnc = (IGF_ENC_INSTANCE_HANDLE) malloc( sizeof( IGF_ENC_INSTANCE ) ) ) == NULL ) { @@ -755,12 +759,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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - st->mct_chan_mode -#endif - ); + st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode ); } else { @@ -814,30 +813,19 @@ ivas_error init_encoder( /*-----------------------------------------------------------------* * Transient detector *-----------------------------------------------------------------*/ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( ( st->hTranDet = (TRAN_DET_HANDLE) malloc( sizeof( TRAN_DET_DATA ) ) ) == NULL ) { -#endif - 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" ) ); - } + 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 ); - } -#ifndef ISSUE_24_CLEANUP_MCT_LFE + 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 ); } -#endif /*-----------------------------------------------------------------* * IVAS parameters diff --git a/lib_enc/ivas_core_enc.c b/lib_enc/ivas_core_enc.c index 0c85ca186dcafd0c1084465c8b6d34b350aaa028..6536ee333eb4f1b071af67c0fe64eac4b3124fc8 100644 --- a/lib_enc/ivas_core_enc.c +++ b/lib_enc/ivas_core_enc.c @@ -103,6 +103,9 @@ ivas_error ivas_core_enc( int16_t last_element_mode, tdm_Pitch_reuse_flag; int32_t element_brate, last_element_brate, input_Fs; ivas_error error; +#ifdef IND_LIST_DYN + int16_t max_num_indices_BWE; +#endif push_wmops( "ivas_core_enc" ); @@ -195,6 +198,23 @@ ivas_error ivas_core_enc( { st = sts[n]; +#ifdef IND_LIST_DYN + /* update pointer to the buffer of indices of the second channel */ + if ( n == 1 && st->element_mode == IVAS_CPE_TD ) + { + /* adjust the pointer to the buffer of indices of the secondary channel (make space for BWE indices) */ + max_num_indices_BWE = get_BWE_max_num_indices( sts[0]->extl_brate ); + st->hBstr->ind_list = sts[0]->hBstr->ind_list + sts[0]->hBstr->nb_ind_tot + max_num_indices_BWE; + + /* write TD stereo spatial parameters */ + move_indices( hStereoTD->tdm_hBstr_tmp.ind_list, st->hBstr->ind_list, hStereoTD->tdm_hBstr_tmp.nb_ind_tot ); + st->hBstr->nb_ind_tot += hStereoTD->tdm_hBstr_tmp.nb_ind_tot; + st->hBstr->nb_bits_tot += hStereoTD->tdm_hBstr_tmp.nb_bits_tot; + + reset_indices_enc( &hStereoTD->tdm_hBstr_tmp, MAX_IND_TDM_TMP ); + } +#endif + /*---------------------------------------------------------------------* * Write signaling info into the bitstream *---------------------------------------------------------------------*/ @@ -219,7 +239,7 @@ ivas_error ivas_core_enc( if ( st->core == ACELP_CORE ) { /* ACELP core encoder */ - 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 ) + 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 ) { return error; } @@ -260,14 +280,7 @@ ivas_error ivas_core_enc( { 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, -#ifndef ISSUE_24_CLEANUP_MCT_LFE - &hMCT->LFE_off, -#endif - 1, hMCT->nchan_out_woLFE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - + hMCT->num_lfe -#endif - ); + 1, hMCT->nchan_out_woLFE ); } else { @@ -413,7 +426,6 @@ ivas_error ivas_core_enc( } } - #ifdef DEBUG_MODE_INFO for ( n = 0; n < n_CoreChannels; n++ ) { diff --git a/lib_enc/ivas_core_pre_proc_front.c b/lib_enc/ivas_core_pre_proc_front.c old mode 100755 new mode 100644 index 85eba72f006b477315f626931811aceb8c5443f3..5f775d2403a18af76b8b74fc1d1816dfdf7c314d --- a/lib_enc/ivas_core_pre_proc_front.c +++ b/lib_enc/ivas_core_pre_proc_front.c @@ -443,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 ) { @@ -486,12 +479,8 @@ ivas_error pre_proc_front_ivas( if ( st->idchan == 0 && element_mode != IVAS_CPE_MDCT ) { - bw_detect( st, st->input, NULL, enerBuffer -#ifdef FIX_MDCT_BASED_BWD - , - 0 -#endif - ); + bw_detect( st, st->input, NULL, enerBuffer, + 0 ); } if ( element_mode != IVAS_CPE_MDCT ) /* in MDCT stereo, set_bw_stereo() is used instead */ @@ -574,7 +563,14 @@ ivas_error pre_proc_front_ivas( if ( st->hFdCngEnc != NULL && ( st->ini_frame == 0 || last_element_brate != element_brate || st->last_bwidth != st->bwidth ) ) { +#ifdef FIX_443_FD_CNG_INIT + int32_t total_brate; + + total_brate = ( element_mode == IVAS_SCE ) ? st->total_brate : st->bits_frame_nominal * FRAMES_PER_SEC; + configureFdCngEnc( st->hFdCngEnc, max( st->input_bwidth, WB ), total_brate ); +#else configureFdCngEnc( st->hFdCngEnc, max( st->input_bwidth, WB ), st->bits_frame_nominal * FRAMES_PER_SEC ); +#endif if ( hCPE != NULL ) { st->hFdCngEnc->hFdCngCom->CngBitrate = hCPE->element_brate - 1; @@ -834,34 +830,6 @@ ivas_error pre_proc_front_ivas( /* 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 ) - { - 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 ) - { - hCPE->hStereoDft->mus_flag = 2; - } - else - { - hCPE->hStereoDft->mus_flag = 0; - } - } -#endif } /*----------------------------------------------------------------* diff --git a/lib_enc/ivas_corecoder_enc_reconfig.c b/lib_enc/ivas_corecoder_enc_reconfig.c index cbb48495bf6b7f34fcf079df5eebf284e4b0f4d7..439a0f6c63916f60cdb25a74be7b84768ea6c9bc 100644 --- a/lib_enc/ivas_corecoder_enc_reconfig.c +++ b/lib_enc/ivas_corecoder_enc_reconfig.c @@ -41,7 +41,6 @@ #endif #include "wmc_auto.h" - /*-------------------------------------------------------------------* * ivas_corecoder_enc_reconfig() * @@ -61,9 +60,24 @@ ivas_error ivas_corecoder_enc_reconfig( int16_t n, sce_id, cpe_id; int16_t len_inp_memory, n_CoreCoder_existing, nSCE_existing, nCPE_existing; float input_buff[MCT_MAX_BLOCKS][L_FRAME48k + NS2SA( 48000, IVAS_FB_ENC_DELAY_NS )]; - BSTR_ENC_HANDLE hBstr, hMetaData; - Indice *ind_list, *ind_list_metadata; - int16_t nb_bits_tot, next_ind, last_ind; + BSTR_ENC_HANDLE hBstr; +#ifndef IND_LIST_DYN + Indice *ind_list; +#endif +#ifndef IND_LIST_DYN + Indice *ind_list_metadata; + BSTR_ENC_HANDLE hMetaData; +#endif +#ifdef IND_LIST_DYN + int16_t i, nb_bits; + Indice temp_ind_list[MAX_NUM_IND_TEMP_LIST]; +#endif + int16_t nb_bits_tot; +#ifndef IND_LIST_DYN + int16_t last_ind; + int16_t next_ind; +#endif + ENCODER_CONFIG_HANDLE hEncoderConfig; ivas_error error; @@ -133,21 +147,29 @@ ivas_error ivas_corecoder_enc_reconfig( } /* something in transport changes */ +#ifndef IND_LIST_DYN ind_list = NULL; ind_list_metadata = NULL; +#endif hBstr = NULL; +#ifndef IND_LIST_DYN hMetaData = NULL; +#endif /* get the index list pointers */ if ( nSCE_old ) { hBstr = st_ivas->hSCE[0]->hCoreCoder[0]->hBstr; +#ifndef IND_LIST_DYN hMetaData = st_ivas->hSCE[0]->hMetaData; +#endif } else if ( nCPE_old ) { hBstr = st_ivas->hCPE[0]->hCoreCoder[0]->hBstr; +#ifndef IND_LIST_DYN hMetaData = st_ivas->hCPE[nCPE_old - 1]->hMetaData; +#endif } #ifdef DEBUGGING else @@ -157,11 +179,45 @@ ivas_error ivas_corecoder_enc_reconfig( #endif /* save bitstream information */ - ind_list = hBstr->ind_list; /* pointer to the beginning of the global list */ nb_bits_tot = hBstr->nb_bits_tot; +#ifndef IND_LIST_DYN + ind_list = hBstr->ind_list; /* pointer to the beginning of the global list */ next_ind = hBstr->next_ind; last_ind = hBstr->last_ind; +#endif +#ifdef IND_LIST_DYN + i = 0; + nb_bits = 0; + while ( nb_bits < nb_bits_tot && i < MAX_NUM_IND_TEMP_LIST ) + { + if ( hBstr->ind_list[i].nb_bits > 0 ) + { + temp_ind_list[i].id = hBstr->ind_list[i].id; + temp_ind_list[i].value = hBstr->ind_list[i].value; + temp_ind_list[i].nb_bits = hBstr->ind_list[i].nb_bits; + hBstr->ind_list[i].nb_bits = -1; + } + + hBstr->nb_bits_tot = 0; + hBstr->nb_ind_tot = 0; + + nb_bits += temp_ind_list[i].nb_bits; + i++; + } + + for ( ; i < MAX_NUM_IND_TEMP_LIST; i++ ) + { + /* reset nb_bits of all other indices to -1 */ + temp_ind_list[i].nb_bits = -1; + } + +#ifdef DEBUGGING + assert( ( nb_bits == nb_bits_tot ) && "Error saving bitstream information during core-coder reconfiguration!\n" ); +#endif +#endif +#ifndef IND_LIST_DYN ind_list_metadata = hMetaData->ind_list; /* pointer to the beginning of the global list */ +#endif if ( hEncoderConfig->ivas_format == MC_FORMAT && last_mc_mode == MC_MODE_MCMASA && st_ivas->mc_mode == MC_MODE_MCMASA ) { @@ -211,11 +267,7 @@ ivas_error ivas_corecoder_enc_reconfig( { if ( n_CoreCoder_existing > cpe_id * CPE_CHANNELS + n ) { -#ifdef FIX_386_CORECODER_RECONFIG mvr2r( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->input_buff, input_buff[( cpe_id - st_ivas->nCPE ) * CPE_CHANNELS + n], len_inp_memory ); -#else - mvr2r( st_ivas->hCPE[cpe_id]->hCoreCoder[0]->input_buff, input_buff[( cpe_id - st_ivas->nCPE ) * CPE_CHANNELS + n], len_inp_memory ); /* TODO VoiceAge: Please check if this should be hCoreCoder[n] */ -#endif } } @@ -260,23 +312,35 @@ ivas_error ivas_corecoder_enc_reconfig( mvr2r( input_buff[sce_id], st_ivas->hSCE[sce_id]->hCoreCoder[0]->input_buff, len_inp_memory ); } - /* prepare bitstream buffers */ +#ifndef IND_LIST_DYN + /* allocate buffer of indices */ st_ivas->hSCE[sce_id]->hCoreCoder[0]->hBstr->ind_list = ind_list + sce_id * MAX_NUM_INDICES; +#endif /* only reset indices if it is not the first index list, this already contains the IVAS format bits */ if ( sce_id > 0 ) { - reset_indices_enc( st_ivas->hSCE[sce_id]->hCoreCoder[0]->hBstr, MAX_NUM_INDICES ); + reset_indices_enc( st_ivas->hSCE[sce_id]->hCoreCoder[0]->hBstr, +#ifdef IND_LIST_DYN + st_ivas->hSCE[sce_id]->hCoreCoder[0]->hBstr->nb_ind_tot +#else + MAX_NUM_INDICES +#endif + ); } else { - st_ivas->hSCE[sce_id]->hCoreCoder[0]->hBstr->last_ind = last_ind; +#ifndef IND_LIST_DYN st_ivas->hSCE[sce_id]->hCoreCoder[0]->hBstr->nb_bits_tot = nb_bits_tot; + st_ivas->hSCE[sce_id]->hCoreCoder[0]->hBstr->last_ind = last_ind; st_ivas->hSCE[sce_id]->hCoreCoder[0]->hBstr->next_ind = next_ind; +#endif } +#ifndef IND_LIST_DYN 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 ); +#endif } } @@ -288,22 +352,32 @@ ivas_error ivas_corecoder_enc_reconfig( { st_ivas->hCPE[cpe_id]->element_brate = brate_CPE; - /* prepare bitstream buffers */ + /* allocate buffer of indices */ 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() */ +#ifndef IND_LIST_DYN st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->ind_list = ind_list + ( cpe_id * CPE_CHANNELS + n + st_ivas->nSCE ) * MAX_NUM_INDICES; +#endif 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 ); + reset_indices_enc( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr, +#ifdef IND_LIST_DYN + st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->nb_ind_tot +#else + MAX_NUM_INDICES +#endif + ); } else { - st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->last_ind = last_ind; +#ifndef IND_LIST_DYN st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->nb_bits_tot = nb_bits_tot; + st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->last_ind = last_ind; st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->next_ind = next_ind; +#endif } } } @@ -325,23 +399,33 @@ 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 ); /* TODO VoiceAge: Please check if this should be hCoreCoder[n] */ + mvr2r( input_buff[n], st_ivas->hCPE[cpe_id]->hCoreCoder[n]->input_buff, len_inp_memory ); } } - /* prepare bitstream buffers */ for ( n = 0; n < CPE_CHANNELS; n++ ) { +#ifndef IND_LIST_DYN st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->ind_list = ind_list + ( cpe_id * CPE_CHANNELS + n + st_ivas->nSCE ) * MAX_NUM_INDICES; +#endif + /* only reset indices if it is not the first index list, this already contains the IVAS format bits */ 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 ); + reset_indices_enc( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr, +#ifdef IND_LIST_DYN + st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->nb_ind_tot +#else + MAX_NUM_INDICES +#endif + ); } else { - st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->last_ind = last_ind; +#ifndef IND_LIST_DYN st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->nb_bits_tot = nb_bits_tot; + st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->last_ind = last_ind; st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->next_ind = next_ind; +#endif } if ( hEncoderConfig->Opt_DTX_ON ) @@ -352,6 +436,51 @@ ivas_error ivas_corecoder_enc_reconfig( } } +#ifdef IND_LIST_DYN + /* restore bitstream - IVAS format bits should be written in the first core channel of the first SCE/CPE */ + i = 0; + nb_bits = 0; + if ( st_ivas->nSCE > 0 ) + { + while ( nb_bits < nb_bits_tot && i < MAX_NUM_IND_TEMP_LIST ) + { + if ( temp_ind_list[i].nb_bits > 0 ) + { + st_ivas->hSCE[0]->hCoreCoder[0]->hBstr->ind_list[i].id = temp_ind_list[i].id; + st_ivas->hSCE[0]->hCoreCoder[0]->hBstr->ind_list[i].value = temp_ind_list[i].value; + st_ivas->hSCE[0]->hCoreCoder[0]->hBstr->ind_list[i].nb_bits = temp_ind_list[i].nb_bits; + } + + nb_bits += temp_ind_list[i].nb_bits; + i++; + } + st_ivas->hSCE[0]->hCoreCoder[0]->hBstr->nb_ind_tot = i; + st_ivas->hSCE[0]->hCoreCoder[0]->hBstr->nb_bits_tot = nb_bits_tot; + } + else if ( st_ivas->nCPE > 0 ) + { + while ( nb_bits < nb_bits_tot && i < MAX_NUM_IND_TEMP_LIST ) + { + if ( temp_ind_list[i].nb_bits > 0 ) + { + st_ivas->hCPE[0]->hCoreCoder[0]->hBstr->ind_list[i].id = temp_ind_list[i].id; + st_ivas->hCPE[0]->hCoreCoder[0]->hBstr->ind_list[i].value = temp_ind_list[i].value; + st_ivas->hCPE[0]->hCoreCoder[0]->hBstr->ind_list[i].nb_bits = temp_ind_list[i].nb_bits; + } + + nb_bits += temp_ind_list[i].nb_bits; + i++; + } + st_ivas->hCPE[0]->hCoreCoder[0]->hBstr->nb_ind_tot = i; + st_ivas->hCPE[0]->hCoreCoder[0]->hBstr->nb_bits_tot = nb_bits_tot; + } + +#ifdef DEBUGGING + assert( ( nb_bits == nb_bits_tot ) && "Error restoring bitstream information during core-coder reconfiguration!\n" ); +#endif +#endif + + if ( last_mc_mode == MC_MODE_MCMASA && st_ivas->mc_mode == MC_MODE_MCMASA ) { /* restore modified transport signal */ @@ -376,17 +505,11 @@ ivas_error ivas_corecoder_enc_reconfig( for ( n = 0; n < CPE_CHANNELS; n++ ) { st_ivas->hCPE[0]->hCoreCoder[n]->total_brate = st_ivas->hCPE[0]->element_brate; - st_ivas->hCPE[0]->hCoreCoder[n]->bits_frame_nominal = (int16_t) ( st_ivas->hCPE[0]->element_brate / FRAMES_PER_SEC ); 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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - st_ivas->hCPE[0]->hCoreCoder[n]->mct_chan_mode -#endif - ); + st_ivas->hCPE[0]->hCoreCoder[n]->rf_mode ); if ( st_ivas->hCPE[0]->hCoreCoder[n]->igf ) { @@ -412,7 +535,7 @@ ivas_error ivas_corecoder_enc_reconfig( } } - /* metadata handling for CPEs */ + /* alllocate buffer for metadata indices */ if ( st_ivas->nCPE > 0 ) { if ( st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData == NULL ) @@ -421,10 +544,23 @@ ivas_error ivas_corecoder_enc_reconfig( { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MetaData structure\n" ) ); } + +#ifdef IND_LIST_DYN + /* set pointer to the buffer of metadata indices */ + st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData->ind_list = st_ivas->ind_list_metadata; + st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData->ivas_ind_list_zero = &st_ivas->ind_list_metadata; + st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData->ivas_max_num_indices = &st_ivas->ivas_max_num_indices_metadata; + st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData->nb_ind_tot = 0; + st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData->nb_bits_tot = 0; +#endif } +#ifdef IND_LIST_DYN + reset_indices_enc( st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData, st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData->nb_ind_tot ); +#else 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 ); +#endif for ( cpe_id = 0; cpe_id < st_ivas->nCPE - 1; cpe_id++ ) { @@ -448,17 +584,11 @@ ivas_error ivas_corecoder_enc_reconfig( for ( n = 0; n < CPE_CHANNELS; n++ ) { st_ivas->hCPE[0]->hCoreCoder[n]->total_brate = st_ivas->hCPE[0]->element_brate; - st_ivas->hCPE[0]->hCoreCoder[n]->bits_frame_nominal = (int16_t) ( st_ivas->hCPE[0]->element_brate / FRAMES_PER_SEC ); 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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - st_ivas->hCPE[0]->hCoreCoder[n]->mct_chan_mode -#endif - ); + st_ivas->hCPE[0]->hCoreCoder[n]->rf_mode ); if ( st_ivas->hCPE[0]->hCoreCoder[n]->igf ) { diff --git a/lib_enc/ivas_cpe_enc.c b/lib_enc/ivas_cpe_enc.c index 184a867cd1a13dda60a27833465f18b4cbc88334..ab4a36cb5f90bf42798d70b08adeea7a4269107e 100644 --- a/lib_enc/ivas_cpe_enc.c +++ b/lib_enc/ivas_cpe_enc.c @@ -109,7 +109,6 @@ ivas_error ivas_cpe_enc( hCPE = st_ivas->hCPE[cpe_id]; sts = hCPE->hCoreCoder; hEncoderConfig = st_ivas->hEncoderConfig; - max_bwidth = hEncoderConfig->max_bwidth; ivas_format = hEncoderConfig->ivas_format; input_Fs = hEncoderConfig->input_Fs; @@ -154,14 +153,10 @@ ivas_error ivas_cpe_enc( } mvr2r( data_f_ch0, sts[0]->input, input_frame ); -#ifdef ISSUE_24_CLEANUP_MCT_LFE if ( data_f_ch1 != NULL ) /*this may happen for cases with odd number of channels*/ { mvr2r( data_f_ch1, sts[1]->input, input_frame ); } -#else - mvr2r( data_f_ch1, sts[1]->input, input_frame ); -#endif /*----------------------------------------------------------------* * Stereo technology selection @@ -303,27 +298,14 @@ ivas_error ivas_cpe_enc( { if ( st_ivas->hMCT ) { -#ifdef ISSUE_24_CLEANUP_MCT_LFE int16_t lfe_bits; lfe_bits = ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ? st_ivas->hLFE->lfe_bits : 0 ); -#endif sts[n]->total_brate = hCPE->element_brate; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( sts[n]->mct_chan_mode != MCT_CHAN_MODE_LFE ) - { -#endif - 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 - -#ifndef ISSUE_24_CLEANUP_MCT_LFE - ( st_ivas->hMCT->num_lfe == FALSE ? 0 : LFE_BITS ) - -#else + 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 - -#endif - nb_bits_metadata ) / - st_ivas->hMCT->nchan_out_woLFE ); -#ifndef ISSUE_24_CLEANUP_MCT_LFE - } -#endif + nb_bits_metadata ) / + st_ivas->hMCT->nchan_out_woLFE ); } else { @@ -351,7 +333,12 @@ ivas_error ivas_cpe_enc( if ( hCPE->element_mode == IVAS_CPE_DFT ) { - stereo_dft_hybrid_ITD_flag( hCPE->hStereoDft->hConfig, input_Fs ); + stereo_dft_hybrid_ITD_flag( hCPE->hStereoDft->hConfig, input_Fs +#ifdef HYBRID_ITD_MAX + , + hCPE->hStereoDft->hItd->hybrid_itd_max +#endif + ); /* Time Domain ITD compensation using extrapolation */ #ifdef DEBUG_MODE_DFT @@ -682,14 +669,7 @@ ivas_error ivas_cpe_enc( /* Store previous attack detection flag */ for ( n = 0; n < CPE_CHANNELS; n++ ) { -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( sts[n]->mct_chan_mode != MCT_CHAN_MODE_LFE ) - { -#endif - sts[n]->hTranDet->transientDetector.prev_bIsAttackPresent = sts[n]->hTranDet->transientDetector.bIsAttackPresent; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - } -#endif + sts[n]->hTranDet->transientDetector.prev_bIsAttackPresent = sts[n]->hTranDet->transientDetector.bIsAttackPresent; } #ifdef DEBUG_MODE_INFO @@ -837,6 +817,14 @@ ivas_error create_cpe_enc( { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MetaData structure\n" ) ); } + +#ifdef IND_LIST_DYN + /* set pointer to the buffer of metadata indices */ + hCPE->hMetaData->ind_list = st_ivas->ind_list_metadata; + hCPE->hMetaData->ivas_ind_list_zero = &st_ivas->ind_list_metadata; + hCPE->hMetaData->ivas_max_num_indices = &st_ivas->ivas_max_num_indices_metadata; + reset_indices_enc( hCPE->hMetaData, st_ivas->ivas_max_num_indices_metadata ); +#endif } /*-----------------------------------------------------------------* @@ -853,13 +841,11 @@ 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; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - 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, +#ifdef IND_LIST_DYN + st_ivas, #endif - if ( ( error = init_encoder( st, n, hEncoderConfig->var_SID_rate_flag, hEncoderConfig->interval_SID, 0, st_ivas->ism_mode ) ) != IVAS_ERR_OK ) + n, hEncoderConfig->var_SID_rate_flag, hEncoderConfig->interval_SID, 0, st_ivas->ism_mode ) ) != IVAS_ERR_OK ) { return error; } diff --git a/lib_enc/ivas_dirac_enc.c b/lib_enc/ivas_dirac_enc.c index 43bc94fb04c06e30858d5419907091bac7b4872a..283c51c4be7388e1c86ee0040ebf065576360b05 100644 --- a/lib_enc/ivas_dirac_enc.c +++ b/lib_enc/ivas_dirac_enc.c @@ -79,7 +79,15 @@ ivas_error ivas_dirac_enc_open( { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC Config\n" ) ); } - +#ifdef FIX_485_STATIC_BUFFERS + hDirAC->firstrun_sector_params = 1; + set_zero( hDirAC->sec_I_vec_smth_x[0], NUM_ANA_SECTORS * IVAS_MAX_NUM_BANDS ); + set_zero( hDirAC->sec_I_vec_smth_y[0], NUM_ANA_SECTORS * IVAS_MAX_NUM_BANDS ); + set_zero( hDirAC->sec_I_vec_smth_z[0], NUM_ANA_SECTORS * IVAS_MAX_NUM_BANDS ); + set_zero( hDirAC->azi_prev, NUM_ANA_SECTORS * IVAS_MAX_NUM_BANDS ); + set_zero( hDirAC->ele_prev, NUM_ANA_SECTORS * IVAS_MAX_NUM_BANDS ); + set_zero( hDirAC->energy_smth[0], NUM_ANA_SECTORS * IVAS_MAX_NUM_BANDS ); +#endif /*-----------------------------------------------------------------* * DirAC main configuration *-----------------------------------------------------------------*/ @@ -99,7 +107,10 @@ ivas_error ivas_dirac_enc_open( } else { - if ( ( error = ivas_fb_set_cfg( &fb_cfg, SBA_FORMAT, SBA_MODE_DIRAC, DIRAC_MAX_ANA_CHANS, 0, 0, input_Fs ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_fb_set_cfg( &fb_cfg, SBA_FORMAT, SBA_MODE_DIRAC, + FOA_CHANNELS, + 0, 0, input_Fs, + FOA_CHANNELS ) ) != IVAS_ERR_OK ) { return error; } @@ -236,7 +247,15 @@ ivas_error ivas_dirac_enc_reconfigure( /* :TODO: if the number of parameter bands change, do a meaningful mapping of parameter buffers from old to new band setting */ - mvs2s( DirAC_block_grouping, hDirAC->block_grouping, MAX_PARAM_SPATIAL_SUBFRAMES + 1 ); + if ( st_ivas->hQMetaData->useLowerRes ) + { + hDirAC->block_grouping[0] = 0; + hDirAC->block_grouping[1] = MAX_PARAM_SPATIAL_SUBFRAMES; + } + else + { + mvs2s( DirAC_block_grouping_5ms_MDFT, hDirAC->block_grouping, MAX_PARAM_SPATIAL_SUBFRAMES + 1 ); + } return error; } @@ -364,7 +383,9 @@ void ivas_dirac_enc( set_zero( data_f[2], input_frame ); } - ivas_dirac_param_est_enc( hDirAC, &( hQMetaData->q_direction[0] ), hQMetaData->useLowerRes, data_f, NULL, NULL, input_frame, SBA_MODE_DIRAC ); + ivas_dirac_param_est_enc( hDirAC, &( hQMetaData->q_direction[0] ), hQMetaData->useLowerRes, data_f, NULL, NULL, input_frame, SBA_MODE_DIRAC, + 0, + FOA_CHANNELS ); /* encode parameters */ if ( sba_planar || hQMetaData->useLowerRes ) @@ -376,7 +397,8 @@ void ivas_dirac_enc( } } - ivas_qmetadata_enc_encode( hMetaData, hQMetaData ); + ivas_qmetadata_enc_encode( hMetaData, hQMetaData, + 0 ); *nb_bits_metadata = hMetaData->nb_bits_tot; @@ -488,7 +510,7 @@ void ivas_dirac_enc_spar_delay_synchro( int16_t sce_id, cpe_id, i_chan; /* check last sba_mode */ - if ( ivas_sba_mode_select( st_ivas->hEncoderConfig->last_ivas_total_brate ) == SBA_MODE_SPAR ) + if ( ivas_sba_mode_select() == SBA_MODE_SPAR ) { /* initializations */ i_chan = 0; @@ -540,6 +562,8 @@ void computeReferencePower_enc( const int16_t enc_param_start_band, /* i : first band to process */ const int16_t num_freq_bands, /* i : Number of frequency bands */ const SBA_MODE sba_mode /* i : SBA mode */ + , + const int16_t nchan_ana /* i : number of analysis channels */ ) { int16_t brange[2]; @@ -559,7 +583,8 @@ void computeReferencePower_enc( reference_power_W[i] += ( Cldfb_RealBuffer[0][j] * Cldfb_RealBuffer[0][j] ) + ( Cldfb_ImagBuffer[0][j] * Cldfb_ImagBuffer[0][j] ); } reference_power[i] += reference_power_W[i]; - for ( ch_idx = 1; ch_idx < DIRAC_MAX_ANA_CHANS; ch_idx++ ) + + for ( ch_idx = 1; ch_idx < nchan_ana; ch_idx++ ) { /* abs()^2 */ for ( j = brange[0]; j < brange[1]; j++ ) @@ -596,7 +621,9 @@ void ivas_dirac_param_est_enc( float **pp_fr_real, float **pp_fr_imag, const int16_t input_frame, - const SBA_MODE sba_mode ) + const SBA_MODE sba_mode, + const int16_t hodirac_flag, + const int16_t nchan_fb_in ) { int16_t i, d, ts, index, l_ts, num_freq_bands; int16_t band_m_idx, block_m_idx; @@ -617,8 +644,15 @@ void ivas_dirac_param_est_enc( float reference_power[CLDFB_NO_COL_MAX][DIRAC_NO_FB_BANDS_MAX]; + float azi_secs[2 * DIRAC_MAX_ANA_CHANS * DIRAC_MAX_NBANDS] = { 0 }; + float ele_secs[2 * DIRAC_MAX_ANA_CHANS * DIRAC_MAX_NBANDS] = { 0 }; + float diff_secs[2 * DIRAC_MAX_ANA_CHANS * DIRAC_MAX_NBANDS] = { 0 }; + float ene_secs[2 * DIRAC_MAX_ANA_CHANS * DIRAC_MAX_NBANDS] = { 0 }; + push_wmops( "dirac_enc_param_est" ); + num_freq_bands = hDirAC->hConfig->nbands; + /* Initialization */ l_ts = input_frame / MAX_PARAM_SPATIAL_SUBFRAMES; if ( useLowerRes ) @@ -640,7 +674,7 @@ void ivas_dirac_param_est_enc( } /* Copy current frame to memory for delay compensation */ - for ( i = 0; i < DIRAC_MAX_ANA_CHANS; i++ ) + for ( i = 0; i < nchan_fb_in; i++ ) { pcm_in[i] = &data_f[i][0]; p_Cldfb_RealBuffer[i] = &Cldfb_RealBuffer[i][0]; @@ -665,10 +699,12 @@ void ivas_dirac_param_est_enc( { if ( hDirAC->hFbMixer ) { - ivas_fb_mixer_get_windowed_fr( hDirAC->hFbMixer, pcm_in, p_Cldfb_RealBuffer, p_Cldfb_ImagBuffer, l_ts, l_ts ); - ivas_fb_mixer_update_prior_input( hDirAC->hFbMixer, pcm_in, l_ts ); + ivas_fb_mixer_get_windowed_fr( hDirAC->hFbMixer, pcm_in, p_Cldfb_RealBuffer, p_Cldfb_ImagBuffer, l_ts, l_ts, + hDirAC->hFbMixer->fb_cfg->num_in_chans ); + ivas_fb_mixer_update_prior_input( hDirAC->hFbMixer, pcm_in, l_ts, + hDirAC->hFbMixer->fb_cfg->num_in_chans ); - for ( i = 0; i < DIRAC_MAX_ANA_CHANS; i++ ) + for ( i = 0; i < nchan_fb_in; i++ ) { pcm_in[i] += l_ts; } @@ -679,15 +715,14 @@ void ivas_dirac_param_est_enc( assert( pp_fr_real ); assert( pp_fr_imag ); #endif - for ( i = 0; i < DIRAC_MAX_ANA_CHANS; i++ ) + + for ( i = 0; i < nchan_fb_in; i++ ) { - mvr2r( &pp_fr_real[i][block_m_idx * l_ts], Cldfb_RealBuffer[i], l_ts ); - mvr2r( &pp_fr_imag[i][block_m_idx * l_ts], Cldfb_ImagBuffer[i], l_ts ); + mvr2r( &pp_fr_real[i][ts * l_ts], Cldfb_RealBuffer[i], l_ts ); + mvr2r( &pp_fr_imag[i][ts * l_ts], Cldfb_ImagBuffer[i], l_ts ); } } - num_freq_bands = hDirAC->hConfig->nbands; - computeReferencePower_enc( hDirAC->band_grouping, Cldfb_RealBuffer, @@ -695,7 +730,8 @@ void ivas_dirac_param_est_enc( reference_power[ts], hDirAC->hConfig->enc_param_start_band, num_freq_bands, - sba_mode ); + hodirac_flag ? SBA_MODE_DIRAC : sba_mode, + FOA_CHANNELS ); computeIntensityVector_enc( hDirAC, @@ -705,15 +741,18 @@ void ivas_dirac_param_est_enc( num_freq_bands, intensity_real ); - computeDirectionVectors( - intensity_real[0], - intensity_real[1], - intensity_real[2], - hDirAC->hConfig->enc_param_start_band, - num_freq_bands, - direction_vector[0], - direction_vector[1], - direction_vector[2] ); + if ( !hodirac_flag ) + { + computeDirectionVectors( + intensity_real[0], + intensity_real[1], + intensity_real[2], + hDirAC->hConfig->enc_param_start_band, + num_freq_bands, + direction_vector[0], + direction_vector[1], + direction_vector[2] ); + } /* fill buffers of length "averaging_length" time slots for intensity and energy */ hDirAC->index_buffer_intensity = ( hDirAC->index_buffer_intensity % hDirAC->no_col_avg_diff ) + 1; /* averaging_length = 32 */ @@ -727,49 +766,104 @@ void ivas_dirac_param_est_enc( computeDiffuseness_mdft( hDirAC->buffer_intensity_real, hDirAC->buffer_energy, num_freq_bands, hDirAC->no_col_avg_diff, diffuseness_vector ); - for ( band_m_idx = 0; band_m_idx < hDirAC->hConfig->nbands; band_m_idx++ ) + if ( hodirac_flag ) + { +#ifdef DEBUGGING + assert( l_ts <= DIRAC_NO_FB_BANDS_MAX ); +#endif + calculate_hodirac_sector_parameters( +#ifdef FIX_485_STATIC_BUFFERS + hDirAC, +#endif + Cldfb_RealBuffer, + Cldfb_ImagBuffer, + 0.20f, + hDirAC->band_grouping, + hDirAC->hConfig->nbands, + hDirAC->hConfig->enc_param_start_band, + azi_secs, + ele_secs, + diff_secs, + ene_secs ); + } + + if ( hodirac_flag ) + { + for ( band_m_idx = 0; band_m_idx < hDirAC->hConfig->nbands; band_m_idx++ ) + { + hDirAC->diffuseness_m[band_m_idx] += reference_power[ts][band_m_idx] * diffuseness_vector[band_m_idx]; + renormalization_factor_diff[band_m_idx] += reference_power[ts][band_m_idx]; + } + } + else { - norm_tmp = reference_power[ts][band_m_idx] * ( 1 - diffuseness_vector[band_m_idx] ); + for ( band_m_idx = 0; band_m_idx < hDirAC->hConfig->nbands; band_m_idx++ ) + { + norm_tmp = reference_power[ts][band_m_idx] * ( 1 - diffuseness_vector[band_m_idx] ); - hDirAC->direction_vector_m[0][block_m_idx][band_m_idx] += norm_tmp * direction_vector[0][band_m_idx]; - hDirAC->direction_vector_m[1][block_m_idx][band_m_idx] += norm_tmp * direction_vector[1][band_m_idx]; - hDirAC->direction_vector_m[2][block_m_idx][band_m_idx] += norm_tmp * direction_vector[2][band_m_idx]; - renormalization_factor[band_m_idx] += norm_tmp; + hDirAC->direction_vector_m[0][block_m_idx][band_m_idx] += norm_tmp * direction_vector[0][band_m_idx]; + hDirAC->direction_vector_m[1][block_m_idx][band_m_idx] += norm_tmp * direction_vector[1][band_m_idx]; + hDirAC->direction_vector_m[2][block_m_idx][band_m_idx] += norm_tmp * direction_vector[2][band_m_idx]; + renormalization_factor[band_m_idx] += norm_tmp; - hDirAC->diffuseness_m[band_m_idx] += reference_power[ts][band_m_idx] * diffuseness_vector[band_m_idx]; - renormalization_factor_diff[band_m_idx] += reference_power[ts][band_m_idx]; + hDirAC->diffuseness_m[band_m_idx] += reference_power[ts][band_m_idx] * diffuseness_vector[band_m_idx]; + renormalization_factor_diff[band_m_idx] += reference_power[ts][band_m_idx]; + } } } - for ( band_m_idx = 0; band_m_idx < hDirAC->hConfig->nbands; band_m_idx++ ) + if ( !hodirac_flag ) + { - renormalization_factor[band_m_idx] = EPSILON; - for ( d = 0; d < DIRAC_NUM_DIMS; d++ ) - { - renormalization_factor[band_m_idx] += ( hDirAC->direction_vector_m[d][block_m_idx][band_m_idx] * hDirAC->direction_vector_m[d][block_m_idx][band_m_idx] ); - } - renormalization_factor[band_m_idx] = sqrtf( renormalization_factor[band_m_idx] ); - if ( renormalization_factor[band_m_idx] > EPSILON ) - { - hDirAC->direction_vector_m[0][block_m_idx][band_m_idx] /= renormalization_factor[band_m_idx]; - hDirAC->direction_vector_m[1][block_m_idx][band_m_idx] /= renormalization_factor[band_m_idx]; - hDirAC->direction_vector_m[2][block_m_idx][band_m_idx] /= renormalization_factor[band_m_idx]; - } - else + for ( band_m_idx = 0; band_m_idx < hDirAC->hConfig->nbands; band_m_idx++ ) { - hDirAC->direction_vector_m[0][block_m_idx][band_m_idx] = 1; - hDirAC->direction_vector_m[1][block_m_idx][band_m_idx] = 0; - hDirAC->direction_vector_m[2][block_m_idx][band_m_idx] = 0; + renormalization_factor[band_m_idx] = EPSILON; + for ( d = 0; d < DIRAC_NUM_DIMS; d++ ) + { + renormalization_factor[band_m_idx] += ( hDirAC->direction_vector_m[d][block_m_idx][band_m_idx] * hDirAC->direction_vector_m[d][block_m_idx][band_m_idx] ); + } + renormalization_factor[band_m_idx] = sqrtf( renormalization_factor[band_m_idx] ); + + if ( renormalization_factor[band_m_idx] > EPSILON ) + { + hDirAC->direction_vector_m[0][block_m_idx][band_m_idx] /= renormalization_factor[band_m_idx]; + hDirAC->direction_vector_m[1][block_m_idx][band_m_idx] /= renormalization_factor[band_m_idx]; + hDirAC->direction_vector_m[2][block_m_idx][band_m_idx] /= renormalization_factor[band_m_idx]; + } + else + { + hDirAC->direction_vector_m[0][block_m_idx][band_m_idx] = 1; + hDirAC->direction_vector_m[1][block_m_idx][band_m_idx] = 0; + hDirAC->direction_vector_m[2][block_m_idx][band_m_idx] = 0; + } + + /* save the elevation and azimuth values to be used later by the ivas_dirac_QuantizeParameters function */ + for ( d = 0; d < DIRAC_NUM_DIMS; d++ ) + { + dir_v[d] = hDirAC->direction_vector_m[d][block_m_idx][band_m_idx]; + } + + ivas_qmetadata_direction_vector_to_azimuth_elevation( + dir_v, + &q_direction->band_data[band_m_idx].azimuth[block_m_idx], + &q_direction->band_data[band_m_idx].elevation[block_m_idx] ); } + } - /* save the elevation and azimuth values to be used later by the ivas_dirac_QuantizeParameters function */ - for ( d = 0; d < DIRAC_NUM_DIMS; d++ ) + /* Sectors */ + if ( hodirac_flag ) + { + for ( band_m_idx = 0; band_m_idx < hDirAC->hConfig->nbands; band_m_idx++ ) { - dir_v[d] = hDirAC->direction_vector_m[d][block_m_idx][band_m_idx]; - } + q_direction->band_data[band_m_idx].azimuth[block_m_idx] = azi_secs[band_m_idx]; + q_direction->band_data[band_m_idx].elevation[block_m_idx] = ele_secs[band_m_idx]; + // q_direction->band_data[band_m_idx].energy_ratio[block_m_idx] = 1.f - diffuseness_vector[band_m_idx]; // set later - ivas_qmetadata_direction_vector_to_azimuth_elevation( dir_v, &q_direction->band_data[band_m_idx].azimuth[block_m_idx], &q_direction->band_data[band_m_idx].elevation[block_m_idx] ); + q_direction[1].band_data[band_m_idx].azimuth[block_m_idx] = azi_secs[num_freq_bands + band_m_idx]; + q_direction[1].band_data[band_m_idx].elevation[block_m_idx] = ele_secs[num_freq_bands + band_m_idx]; + q_direction[1].band_data[band_m_idx].energy_ratio[block_m_idx] = ( 1.f - diff_secs[band_m_idx] ) / ( ( 1.f - diff_secs[band_m_idx] ) + ( 1.f - diff_secs[num_freq_bands + band_m_idx] ) + EPSILON ); + } } } diff --git a/lib_enc/ivas_enc.c b/lib_enc/ivas_enc.c index 535a1196abf8aaefbb6dda220bbfe4088bc98513..854f638491781ce15292d970f9c502099bbf196c 100644 --- a/lib_enc/ivas_enc.c +++ b/lib_enc/ivas_enc.c @@ -132,9 +132,9 @@ ivas_error ivas_enc( /* bypass EVS coding in float precision, emulating EVS encoder/decoder delay */ for ( i = 0; i < n; i++ ) { - if ( ( ivas_format == SBA_FORMAT ) && ( st_ivas->sba_mode == SBA_MODE_SPAR ) ) + if ( ( ivas_format == SBA_FORMAT ) && ( st_ivas->sba_mode == SBA_MODE_SPAR ) && !( st_ivas->sba_analysis_order > 1 ) ) { - hp20( data_f[HOA_keep_ind[i]], input_frame, st_ivas->mem_hp20_in[i], input_Fs ); + hp20( data_f[HOA_keep_ind[st_ivas->hSpar->hMdEnc->HOA_md_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? */ { @@ -227,16 +227,11 @@ ivas_error ivas_enc( } else { -#ifdef FIX_382_MASA_META_FRAMING_ASYNC ivas_masa_estimate_energy( st_ivas->hMasa, data_f, input_frame, st_ivas->nchan_transport ); /* energy-estimation uses TF-resolution: 4x24 */ -#endif if ( ( error = ivas_masa_enc_config( st_ivas ) ) != IVAS_ERR_OK ) { return error; } -#ifndef FIX_382_MASA_META_FRAMING_ASYNC - ivas_masa_estimate_energy( st_ivas->hMasa, data_f, input_frame, st_ivas->nchan_transport ); /* energy-estimation uses TF-resolution: 4x24 */ -#endif 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 ) { @@ -294,6 +289,7 @@ ivas_error ivas_enc( if ( st_ivas->mc_mode == MC_MODE_MCT ) { st_ivas->hLFE->hBstr = ( st_ivas->nSCE > 0 ) ? st_ivas->hSCE[0]->hCoreCoder[0]->hBstr : st_ivas->hCPE[0]->hCoreCoder[0]->hBstr; + ivas_lfe_enc( st_ivas->hLFE, data_f[LFE_CHANNEL], input_frame, st_ivas->hLFE->hBstr ); } @@ -304,6 +300,20 @@ ivas_error ivas_enc( return error; } } + else if ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) + { + + /* encode MC ParamUpmix parameters and write bitstream */ + ivas_mc_paramupmix_enc( st_ivas, hMetaData, data_f, input_frame ); + + st_ivas->hLFE->hBstr = ( st_ivas->nSCE > 0 ) ? st_ivas->hSCE[0]->hCoreCoder[0]->hBstr : st_ivas->hCPE[0]->hCoreCoder[0]->hBstr; + ivas_lfe_enc( st_ivas->hLFE, data_f[LFE_CHANNEL], input_frame, st_ivas->hLFE->hBstr ); + + if ( ( error = ivas_mct_enc( st_ivas, data_f, input_frame, hMetaData->nb_bits_tot ) ) != IVAS_ERR_OK ) + { + return error; + } + } else if ( st_ivas->mc_mode == MC_MODE_PARAMMC ) { /* encode Parametric MC parameters and write bitstream */ @@ -345,6 +355,10 @@ ivas_error ivas_enc( return error; } +#ifdef IND_LIST_DYN + st_ivas->hCPE[0]->hCoreCoder[0]->hBstr->ind_list = st_ivas->hSCE[0]->hCoreCoder[0]->hBstr->ind_list + st_ivas->hSCE[0]->hCoreCoder[0]->hBstr->nb_ind_tot; +#endif + if ( ( error = ivas_cpe_enc( st_ivas, 0, data_f[0], data_f[1], input_frame, hMetaData->nb_bits_tot ) ) != IVAS_ERR_OK ) { return error; diff --git a/lib_enc/ivas_enc_cov_handler.c b/lib_enc/ivas_enc_cov_handler.c index e117cfc5a55ba7e737c495d437a8c1fe282c91d9..2d1c5425bf37e061f1d25340ef70b0397c40e7e6 100644 --- a/lib_enc/ivas_enc_cov_handler.c +++ b/lib_enc/ivas_enc_cov_handler.c @@ -34,6 +34,7 @@ #include "options.h" #include "prot.h" #include "ivas_prot.h" +#include "ivas_rom_com.h" #ifdef DEBUGGING #include "debug.h" #endif @@ -53,7 +54,7 @@ * Local functions declarations *------------------------------------------------------------------------------------------*/ -static void ivas_band_cov( float **ppIn_FR_real, float **ppIn_FR_imag, const int16_t num_chans, const int16_t num_bins, int16_t stride, float **pFb_bin_to_band, const int16_t *pFb_start_bin_per_band, const int16_t *pFb_active_bins_per_band, const int16_t start_band, const int16_t end_band, float *cov_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH] ); +static void ivas_band_cov( float **ppIn_FR_real, float **ppIn_FR_imag, const int16_t num_chans, const int16_t num_bins, int16_t stride, float **pFb_bin_to_band, const int16_t *pFb_start_bin_per_band, const int16_t *pFb_active_bins_per_band, const int16_t start_band, const int16_t end_band, float *cov_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], const int16_t HOA_md_ind[IVAS_SPAR_MAX_CH] ); /*------------------------------------------------------------------------- * ivas_spar_covar_enc_open() @@ -66,6 +67,8 @@ 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 */ + , + const int32_t ivas_total_brate /* i : IVAS total bitrate */ ) { ivas_enc_cov_handler_state_t *hCovState; @@ -82,8 +85,13 @@ ivas_error ivas_spar_covar_enc_open( cov_smooth_cfg.max_bands = IVAS_MAX_NUM_BANDS; cov_smooth_cfg.max_update_rate = MAX_UPDATE_RATE; cov_smooth_cfg.min_pool_size = MIN_POOL_SIZE; + if ( nchan_inp == 3 ) /* to discriminate between SPAR and mc there could be a better solution */ + { + cov_smooth_cfg.max_update_rate = 1.0f; + cov_smooth_cfg.min_pool_size = 20; + } - if ( ( error = ivas_spar_covar_smooth_enc_open( &hCovState->pCov_state, &cov_smooth_cfg, pFb, nchan_inp ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_spar_covar_smooth_enc_open( &hCovState->pCov_state, &cov_smooth_cfg, pFb, nchan_inp, ivas_total_brate ) ) != IVAS_ERR_OK ) { return error; } @@ -91,7 +99,7 @@ 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; - if ( ( error = ivas_spar_covar_smooth_enc_open( &hCovState->pCov_dtx_state, &cov_smooth_cfg, pFb, nchan_inp ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_spar_covar_smooth_enc_open( &hCovState->pCov_dtx_state, &cov_smooth_cfg, pFb, nchan_inp, ivas_total_brate ) ) != IVAS_ERR_OK ) { return error; } @@ -152,7 +160,8 @@ 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[2] ) + const int16_t transient_det[2], + const int16_t HOA_md_ind[IVAS_SPAR_MAX_CH] ) { int16_t i, j; int16_t dtx_cov_flag; @@ -165,7 +174,8 @@ void ivas_enc_cov_handler_process( pFb->fb_bin_to_band.p_short_stride_start_bin_per_band, pFb->fb_bin_to_band.p_short_stride_num_bins_per_band, start_band, end_band, - cov_real ); + cov_real, + HOA_md_ind ); #ifdef DEBUG_SPAR_WRITE_OUT_COV { @@ -257,7 +267,8 @@ static void ivas_band_cov( const int16_t *pFb_active_bins_per_band, const int16_t start_band, const int16_t end_band, - float *cov_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH] ) + float *cov_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], + const int16_t HOA_md_ind[IVAS_SPAR_MAX_CH] ) { int16_t i, j, k; float pV_re[L_FRAME48k]; @@ -267,9 +278,13 @@ static void ivas_band_cov( { for ( j = i; j < num_chans; j++ ) { + + int16_t i1 = HOA_md_ind[i]; + int16_t j1 = HOA_md_ind[j]; + for ( k = 0; k < num_bins; k++ ) { - pV_re[k] = ppIn_FR_real[i][k] * ppIn_FR_real[j][k] + ppIn_FR_imag[i][k] * ppIn_FR_imag[j][k]; + pV_re[k] = ppIn_FR_real[i1][k] * ppIn_FR_real[j1][k] + ppIn_FR_imag[i1][k] * ppIn_FR_imag[j1][k]; } for ( k = start_band; k < end_band; k++ ) diff --git a/lib_enc/ivas_entropy_coder.c b/lib_enc/ivas_entropy_coder.c index a8f5219f2a3f692b44e6edfcfbfce3771d0a8315..830a05e41a3ce8c426c5f6def0012141c3d65904 100644 --- a/lib_enc/ivas_entropy_coder.c +++ b/lib_enc/ivas_entropy_coder.c @@ -128,12 +128,20 @@ static ivas_error ivas_get_dyn_freq_model( * * Arith encoding of an array of symbols *-----------------------------------------------------------------------------------------*/ - +#ifdef ARITH_HUFF_CODER_CHANGES +static int16_t ivas_arith_encode_array( +#else static void ivas_arith_encode_array( +#endif int16_t *pInput, ivas_arith_t *pArith, BSTR_ENC_HANDLE hMetaData, - const int16_t in_len ) + const int16_t in_len +#ifdef ARITH_HUFF_CODER_CHANGES + , + int32_t wc_strat_arith +#endif +) { int16_t model_index, i, ind; int16_t *pCum_freq = NULL; @@ -144,6 +152,12 @@ static void ivas_arith_encode_array( if ( pArith->dyn_model_bits > 0 ) { ivas_get_dyn_freq_model( pInput, in_len, &model_index, pArith, &pCum_freq ); +#ifdef ARITH_HUFF_CODER_CHANGES + if ( ( hMetaData->nb_bits_tot + pArith->dyn_model_bits ) > wc_strat_arith ) + { + return -1; + } +#endif push_next_indice( hMetaData, model_index, pArith->dyn_model_bits ); } else @@ -158,12 +172,27 @@ static void ivas_arith_encode_array( ind = pInput[i] - pArith->vals[0]; ivas_ari_encode_14bits_ext( hMetaData, &as, ind, (const uint16_t *) pCum_freq ); +#ifdef ARITH_HUFF_CODER_CHANGES + if ( hMetaData->nb_bits_tot > wc_strat_arith ) + { + return -1; + } +#endif } ivas_ari_done_encoding_14bits( hMetaData, &as ); +#ifdef ARITH_HUFF_CODER_CHANGES + if ( hMetaData->nb_bits_tot > wc_strat_arith ) + { + return -1; + } +#endif } - +#ifdef ARITH_HUFF_CODER_CHANGES + return 0; +#else return; +#endif } @@ -172,15 +201,26 @@ static void ivas_arith_encode_array( * * Differential arith encoding *-----------------------------------------------------------------------------------------*/ - +#ifdef ARITH_HUFF_CODER_CHANGES +static int16_t ivas_arithCoder_encode_array_diff( +#else static void ivas_arithCoder_encode_array_diff( +#endif ivas_arith_t *pArith_diff, int16_t *pIn_new, int16_t *pIn_old_scratch, const int16_t length, - BSTR_ENC_HANDLE hMetaData ) + BSTR_ENC_HANDLE hMetaData +#ifdef ARITH_HUFF_CODER_CHANGES + , + int32_t wc_strat_arith +#endif +) { int16_t n; +#ifdef ARITH_HUFF_CODER_CHANGES + int16_t arith_result; +#endif if ( length > 0 ) { @@ -191,10 +231,22 @@ static void ivas_arithCoder_encode_array_diff( ivas_wrap_arround( pIn_old_scratch, pArith_diff->vals[0], pArith_diff->vals[pArith_diff->range - 1], length ); +#ifdef ARITH_HUFF_CODER_CHANGES + arith_result = ivas_arith_encode_array( pIn_old_scratch, pArith_diff, hMetaData, length, + wc_strat_arith ); + if ( arith_result < 0 ) + { + return -1; + } +#else ivas_arith_encode_array( pIn_old_scratch, pArith_diff, hMetaData, length ); +#endif } - +#ifdef ARITH_HUFF_CODER_CHANGES + return 0; +#else return; +#endif } @@ -228,16 +280,27 @@ void ivas_huffman_encode( * * Arithmetic encode a cell array *-----------------------------------------------------------------------------------------*/ - +#ifdef ARITH_HUFF_CODER_CHANGES +static int16_t arith_encode_cell_array( +#else static void arith_encode_cell_array( +#endif ivas_cell_dim_t *pCell_dims, BSTR_ENC_HANDLE hMetaData, const int16_t nB, ivas_arith_t *pArith, - int16_t *pSymbol ) + int16_t *pSymbol +#ifdef ARITH_HUFF_CODER_CHANGES + , + int32_t wc_strat_arith +#endif +) { int16_t total_symbol_len = 0; int16_t i; +#ifdef ARITH_HUFF_CODER_CHANGES + int16_t arith_result; +#endif for ( i = 0; i < nB; i++ ) { @@ -250,11 +313,24 @@ static void arith_encode_cell_array( { if ( pArith->range > 1 ) { +#ifdef ARITH_HUFF_CODER_CHANGES + arith_result = ivas_arith_encode_array( pSymbol, pArith, hMetaData, total_symbol_len, + wc_strat_arith ); + if ( arith_result < 0 ) + { + return -1; + } +#else ivas_arith_encode_array( pSymbol, pArith, hMetaData, total_symbol_len ); +#endif } } +#ifdef ARITH_HUFF_CODER_CHANGES + return 0; +#else return; +#endif } @@ -263,16 +339,27 @@ static void arith_encode_cell_array( * * Arithmetic encode a cell array - differential *-----------------------------------------------------------------------------------------*/ - +#ifdef ARITH_HUFF_CODER_CHANGES +static int16_t arith_encode_cell_array_diff( +#else static void arith_encode_cell_array_diff( +#endif const ivas_cell_dim_t *pCell_dims, BSTR_ENC_HANDLE hMetaData, int16_t nB, ivas_arith_t *pArith_diff, int16_t *pSymbol_old, - int16_t *pSymbol ) + int16_t *pSymbol +#ifdef ARITH_HUFF_CODER_CHANGES + , + int32_t wc_strat_arith +#endif +) { int16_t i, total_symbol_len; +#ifdef ARITH_HUFF_CODER_CHANGES + int16_t arith_result; +#endif total_symbol_len = 0; for ( i = 0; i < nB; i++ ) @@ -286,11 +373,24 @@ static void arith_encode_cell_array_diff( { if ( pArith_diff->range > 1 ) { +#ifdef ARITH_HUFF_CODER_CHANGES + arith_result = ivas_arithCoder_encode_array_diff( pArith_diff, pSymbol, pSymbol_old, total_symbol_len, hMetaData, + wc_strat_arith ); + if ( arith_result < 0 ) + { + return -1; + } +#else ivas_arithCoder_encode_array_diff( pArith_diff, pSymbol, pSymbol_old, total_symbol_len, hMetaData ); +#endif } } +#ifdef ARITH_HUFF_CODER_CHANGES + return 0; +#else return; +#endif } @@ -299,8 +399,11 @@ static void arith_encode_cell_array_diff( * * Arithmetic encode a cell array *-----------------------------------------------------------------------------------------*/ - +#ifdef ARITH_HUFF_CODER_CHANGES +int16_t ivas_arith_encode_cmplx_cell_array( +#else void ivas_arith_encode_cmplx_cell_array( +#endif ivas_arith_t *pArith_re, ivas_arith_t *pArith_re_diff, const int16_t *pDo_diff, @@ -309,7 +412,12 @@ void ivas_arith_encode_cmplx_cell_array( int16_t *pSymbol_old_re, ivas_cell_dim_t *pCell_dims, BSTR_ENC_HANDLE hMetaData, - const int16_t any_diff ) + const int16_t any_diff +#ifdef ARITH_HUFF_CODER_CHANGES + , + int32_t wc_strat_arith +#endif +) { int16_t input_old[IVAS_MAX_INPUT_LEN]; int16_t input_new[IVAS_MAX_INPUT_LEN]; @@ -317,6 +425,9 @@ void ivas_arith_encode_cmplx_cell_array( ivas_cell_dim_t cell_dim[IVAS_MAX_NUM_BANDS], cell_dim_diff[IVAS_MAX_NUM_BANDS]; int16_t len, idx, i, j, idx1; int16_t total_len; +#ifdef ARITH_HUFF_CODER_CHANGES + int16_t arith_result; +#endif idx1 = 0; if ( any_diff == 1 ) @@ -382,14 +493,44 @@ void ivas_arith_encode_cmplx_cell_array( }*/ #endif +#ifdef ARITH_HUFF_CODER_CHANGES + arith_result = arith_encode_cell_array( cell_dim, hMetaData, nB, pArith_re, input, + wc_strat_arith ); + if ( arith_result < 0 ) + { + return -1; + } + + arith_result = arith_encode_cell_array_diff( cell_dim_diff, hMetaData, nB, pArith_re_diff, input_old, input_new, + wc_strat_arith ); + if ( arith_result < 0 ) + { + return -1; + } +#else arith_encode_cell_array( cell_dim, hMetaData, nB, pArith_re, input ); arith_encode_cell_array_diff( cell_dim_diff, hMetaData, nB, pArith_re_diff, input_old, input_new ); +#endif } else { +#ifdef ARITH_HUFF_CODER_CHANGES + arith_result = arith_encode_cell_array( pCell_dims, hMetaData, nB, pArith_re, pSymbol_re, + wc_strat_arith ); + if ( arith_result < 0 ) + { + return -1; + } +#else arith_encode_cell_array( pCell_dims, hMetaData, nB, pArith_re, pSymbol_re ); +#endif } + +#ifdef ARITH_HUFF_CODER_CHANGES + return 0; +#else return; +#endif } diff --git a/lib_enc/ivas_front_vad.c b/lib_enc/ivas_front_vad.c index be476b1244c1bd897f14d76ac2ac4879e106e3ff..3810df1de9b28e7e949841fec3c6baac389da498 100644 --- a/lib_enc/ivas_front_vad.c +++ b/lib_enc/ivas_front_vad.c @@ -430,9 +430,7 @@ ivas_error front_vad_spar( noise_est_down( fr_bands[0], hFrontVad->hNoiseEst->bckr, tmpN, tmpE, st->min_band, st->max_band, &hFrontVad->hNoiseEst->totalNoise, Etot[0], &hFrontVad->hNoiseEst->Etot_last, &hFrontVad->hNoiseEst->Etot_v_h2 ); corr_shift = correlation_shift( hFrontVad->hNoiseEst->totalNoise ); - dtx( st, hEncoderConfig->ivas_total_brate, vad_flag_dtx[0], inp_12k8 ); - /* linear prediction analysis */ alw_pitch_lag_12k8[0] = st->old_pitch_la; alw_pitch_lag_12k8[1] = st->old_pitch_la; diff --git a/lib_enc/ivas_init_enc.c b/lib_enc/ivas_init_enc.c index dfaa321605d550937e2f1b10a5389479a40037c1..d96442835275a54e21750d0efe088cfbc99c62a6 100644 --- a/lib_enc/ivas_init_enc.c +++ b/lib_enc/ivas_init_enc.c @@ -57,7 +57,7 @@ void ivas_write_format( ind = 0; nBits = IVAS_FORMAT_SIGNALING_NBITS; - extra_bits = ( IVAS_FORMAT_SIGNALING_NBITS_SBA - IVAS_FORMAT_SIGNALING_NBITS ); + extra_bits = ( IVAS_FORMAT_SIGNALING_NBITS_EXTENDED - IVAS_FORMAT_SIGNALING_NBITS ); switch ( st_ivas->hEncoderConfig->ivas_format ) { @@ -66,6 +66,11 @@ void ivas_write_format( break; case ISM_FORMAT: ind = 2; + if ( st_ivas->hEncoderConfig->ivas_total_brate >= IVAS_24k4 ) + { + ind = 4; + nBits += extra_bits; + } break; case MC_FORMAT: ind = 1; @@ -184,12 +189,16 @@ int16_t getNumChanAnalysis( n = st_ivas->nSCE + CPE_CHANNELS * st_ivas->nCPE; if ( st_ivas->hEncoderConfig->ivas_format == SBA_FORMAT ) { - n = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order ); + n = ( st_ivas->sba_analysis_order + 1 ) * ( st_ivas->sba_analysis_order + 1 ); } else if ( st_ivas->hEncoderConfig->ivas_format == MC_FORMAT && ( st_ivas->mc_mode == MC_MODE_PARAMMC || st_ivas->mc_mode == MC_MODE_MCMASA ) ) { n = st_ivas->hEncoderConfig->nchan_inp; } + else if ( st_ivas->hEncoderConfig->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) + { + n = st_ivas->hEncoderConfig->nchan_inp; + } else if ( st_ivas->hEncoderConfig->ivas_format == ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_PARAM ) { n = st_ivas->hEncoderConfig->nchan_inp; @@ -290,6 +299,9 @@ void ivas_initialize_handles_enc( /* MCT handle */ st_ivas->hMCT = NULL; + /* MC Param-Upmix handle */ + st_ivas->hMCParamUpmix = NULL; + /* Parametric MC handle */ st_ivas->hParamMC = NULL; @@ -313,9 +325,15 @@ void ivas_initialize_handles_enc( *-------------------------------------------------------------------*/ ivas_error ivas_init_encoder( - Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */ - Indice ind_list[][MAX_NUM_INDICES], /* o : bitstream indices */ + Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */ +#ifndef IND_LIST_DYN + , + Indice ind_list[][MAX_NUM_INDICES] /* o : bitstream indices */ +#endif +#ifndef IND_LIST_DYN + , Indice ind_list_metadata[][MAX_BITS_METADATA] /* o : bitstream indices metadata */ +#endif ) { int16_t i, n; @@ -339,12 +357,56 @@ ivas_error ivas_init_encoder( /* In IVAS, ensure that minimum coded bandwidth is WB */ hEncoderConfig->max_bwidth = max( hEncoderConfig->max_bwidth, WB ); } - + hEncoderConfig->spar_reconfig_flag = 0; 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; + +#ifdef IND_LIST_DYN + /*-----------------------------------------------------------------* + * Allocate and initialize buffer of indices + *-----------------------------------------------------------------*/ + + /* set the maximum allowed number of indices in the list */ + st_ivas->ivas_max_num_indices = get_ivas_max_num_indices( ivas_format, ivas_total_brate ); + + /* allocate buffer of indices */ + if ( ( st_ivas->ind_list = (INDICE_HANDLE) malloc( st_ivas->ivas_max_num_indices * sizeof( Indice ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for buffer of indices!\n" ) ); + } + + /* reset the list of indices */ + for ( i = 0; i < st_ivas->ivas_max_num_indices; i++ ) + { + st_ivas->ind_list[i].nb_bits = -1; + } + + /* set the maximum allowed number of metadata indices in the list */ + st_ivas->ivas_max_num_indices_metadata = get_ivas_max_num_indices_metadata( st_ivas->hEncoderConfig->ivas_format, st_ivas->hEncoderConfig->ivas_total_brate ); + + /* allocate buffer of metadata indices */ + if ( st_ivas->ivas_max_num_indices_metadata > 0 ) + { + if ( ( st_ivas->ind_list_metadata = (INDICE_HANDLE) malloc( st_ivas->ivas_max_num_indices_metadata * sizeof( Indice ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for buffer of metadata indices!\n" ) ); + } + + /* reset the list of metadata indices */ + for ( i = 0; i < st_ivas->ivas_max_num_indices_metadata; i++ ) + { + st_ivas->ind_list_metadata[i].nb_bits = -1; + } + } + else + { + st_ivas->ind_list_metadata = NULL; + } +#endif + /*-----------------------------------------------------------------* * Allocate and initialize SCE/CPE and other handles *-----------------------------------------------------------------*/ @@ -361,9 +423,10 @@ ivas_error ivas_init_encoder( return error; } - /* prepare bitstream buffers */ +#ifndef IND_LIST_DYN st_ivas->hSCE[sce_id]->hCoreCoder[0]->hBstr->ind_list = ind_list[sce_id]; reset_indices_enc( st_ivas->hSCE[sce_id]->hCoreCoder[0]->hBstr, MAX_NUM_INDICES ); +#endif /* prepare stereo downmix for EVS */ if ( hEncoderConfig->stereo_dmx_evs == 1 ) @@ -386,7 +449,8 @@ ivas_error ivas_init_encoder( return error; } - /* prepare bitstream buffers */ +#ifndef IND_LIST_DYN + /* allocate buffer of indices */ for ( n = 0; n < CPE_CHANNELS; n++ ) { st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->ind_list = ind_list[n]; @@ -396,6 +460,7 @@ ivas_error ivas_init_encoder( /* MetaData for DFT stereo */ st_ivas->hCPE[cpe_id]->hMetaData->ind_list = ind_list_metadata[0]; reset_indices_enc( st_ivas->hCPE[cpe_id]->hMetaData, MAX_BITS_METADATA ); +#endif } else if ( ivas_format == ISM_FORMAT ) { @@ -415,12 +480,14 @@ ivas_error ivas_init_encoder( return error; } - /* prepare bitstream buffers */ +#ifndef IND_LIST_DYN + /* MetaData for ISMs */ st_ivas->hSCE[sce_id]->hCoreCoder[0]->hBstr->ind_list = ind_list[sce_id]; 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]; reset_indices_enc( st_ivas->hSCE[sce_id]->hMetaData, MAX_BITS_METADATA ); +#endif } if ( st_ivas->ism_mode == ISM_MODE_PARAM ) @@ -431,11 +498,7 @@ ivas_error ivas_init_encoder( } } -#ifdef DISCRETE_ISM_DTX_CNG if ( st_ivas->hEncoderConfig->Opt_DTX_ON ) -#else - if ( st_ivas->hEncoderConfig->Opt_DTX_ON && st_ivas->ism_mode == ISM_MODE_PARAM ) -#endif { if ( ( error = ivas_ism_dtx_open( st_ivas ) ) != IVAS_ERR_OK ) { @@ -452,8 +515,7 @@ ivas_error ivas_init_encoder( if ( ivas_format == SBA_FORMAT ) { - st_ivas->sba_mode = ivas_sba_mode_select( ivas_total_brate ); - + st_ivas->sba_mode = ivas_sba_mode_select(); 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 ) @@ -485,12 +547,14 @@ ivas_error ivas_init_encoder( return error; } - /* prepare bitstream buffers */ +#ifndef IND_LIST_DYN + /* MetaData for SBA */ st_ivas->hSCE[sce_id]->hCoreCoder[0]->hBstr->ind_list = ind_list[sce_id]; 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]; reset_indices_enc( st_ivas->hSCE[sce_id]->hMetaData, MAX_BITS_METADATA ); +#endif if ( st_ivas->sba_mode == SBA_MODE_SPAR && st_ivas->hEncoderConfig->Opt_DTX_ON ) { @@ -505,11 +569,12 @@ ivas_error ivas_init_encoder( return error; } - /* prepare bitstream buffers */ for ( n = 0; n < CPE_CHANNELS; n++ ) { +#ifndef IND_LIST_DYN 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 ); +#endif if ( hEncoderConfig->Opt_DTX_ON ) { @@ -517,12 +582,14 @@ ivas_error ivas_init_encoder( } } +#ifndef IND_LIST_DYN /* 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 ); } +#endif } if ( st_ivas->nCPE > 1 ) @@ -551,6 +618,8 @@ ivas_error ivas_init_encoder( return error; } +#ifndef IND_LIST_DYN + /* allocate buffer of indices */ for ( n = 0; n < CPE_CHANNELS; n++ ) { /* we need the correct bitstream also for the LFE channel since it might become a proper coded channel when @@ -565,6 +634,7 @@ ivas_error ivas_init_encoder( 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 ); } +#endif } if ( ( error = create_mct_enc( st_ivas ) ) != IVAS_ERR_OK ) @@ -579,6 +649,51 @@ ivas_error ivas_init_encoder( 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_PARAMUPMIX ) + { + st_ivas->nSCE = 0; + st_ivas->nCPE = MC_PARAMUPMIX_MAX_TRANSPORT_CHANS / 2; + st_ivas->nchan_transport = MC_PARAMUPMIX_MAX_TRANSPORT_CHANS; + + if ( ( error = ivas_mc_paramupmix_enc_open( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + + 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->nCPE ) ) ) != IVAS_ERR_OK ) + { + return error; + } + +#ifndef IND_LIST_DYN + for ( n = 0; n < CPE_CHANNELS; n++ ) + { + /* 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 ); + } +#endif + } + + if ( ( error = create_mct_enc( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + + if ( ( error = ivas_create_lfe_enc( &st_ivas->hLFE, input_Fs ) ) != IVAS_ERR_OK ) + { + return error; + } + } else if ( st_ivas->mc_mode == MC_MODE_PARAMMC ) { if ( ( error = ivas_param_mc_enc_open( st_ivas ) ) != IVAS_ERR_OK ) @@ -593,7 +708,8 @@ ivas_error ivas_init_encoder( return error; } - /* prepare bitstream buffers */ +#ifndef IND_LIST_DYN + /* allocate buffer of indices */ for ( n = 0; n < CPE_CHANNELS; n++ ) { st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->ind_list = ind_list[cpe_id * CPE_CHANNELS + n]; @@ -606,6 +722,7 @@ ivas_error ivas_init_encoder( 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 ); } +#endif } if ( st_ivas->nCPE > 1 ) @@ -646,12 +763,14 @@ ivas_error ivas_init_encoder( return error; } - /* prepare bitstream buffers */ +#ifndef IND_LIST_DYN + /* allocate buffer of indices */ st_ivas->hSCE[sce_id]->hCoreCoder[0]->hBstr->ind_list = ind_list[sce_id]; 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]; reset_indices_enc( st_ivas->hSCE[sce_id]->hMetaData, MAX_BITS_METADATA ); +#endif } for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) @@ -663,7 +782,8 @@ ivas_error ivas_init_encoder( return error; } - /* prepare bitstream buffers */ +#ifndef IND_LIST_DYN + /* allocate buffer of indices */ for ( n = 0; n < CPE_CHANNELS; n++ ) { st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->ind_list = ind_list[cpe_id * CPE_CHANNELS + n + st_ivas->nSCE]; @@ -676,6 +796,7 @@ ivas_error ivas_init_encoder( 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 ); } +#endif } } } @@ -729,6 +850,10 @@ void destroy_core_enc( ENC_CORE_HANDLE hCoreCoder /* i/o: core encoder structure */ ) { +#ifdef IND_LIST_DYN + int16_t i; +#endif + destroy_cldfb_encoder( hCoreCoder ); if ( hCoreCoder->hSignalBuf != NULL ) @@ -739,6 +864,13 @@ void destroy_core_enc( if ( hCoreCoder->hBstr != NULL ) { +#ifdef IND_LIST_DYN + /* reset buffer of indices */ + for ( i = 0; i < hCoreCoder->hBstr->nb_ind_tot; i++ ) + { + hCoreCoder->hBstr->ind_list[i].nb_bits = -1; + } +#endif free( hCoreCoder->hBstr ); hCoreCoder->hBstr = NULL; } @@ -946,11 +1078,7 @@ void ivas_destroy_enc( ivas_spar_enc_close( &( st_ivas->hSpar ), st_ivas->hEncoderConfig->input_Fs, nchan_inp, 0 ); /* MASA handle */ -#ifdef FIX_350_MASA_DELAY_COMP ivas_masa_enc_close( &( st_ivas->hMasa ) ); -#else - ivas_masa_enc_close( &( st_ivas->hMasa ), st_ivas->nchan_transport, ivas_format ); -#endif /* MCT handle */ ivas_mct_enc_close( &( st_ivas->hMCT ) ); @@ -958,6 +1086,9 @@ void ivas_destroy_enc( /* LFE handle */ ivas_lfe_enc_close( &( st_ivas->hLFE ) ); + /* Param-Upmix MC handle */ + ivas_mc_paramupmix_enc_close( &( st_ivas->hMCParamUpmix ), st_ivas->hEncoderConfig->input_Fs ); + /* Parametric MC handle */ ivas_param_mc_enc_close( &( st_ivas->hParamMC ), st_ivas->hEncoderConfig->input_Fs ); @@ -974,6 +1105,19 @@ void ivas_destroy_enc( st_ivas->hEncoderConfig = NULL; } +#ifdef IND_LIST_DYN + /* Buffer of indices */ + if ( st_ivas->ind_list != NULL ) + { + free( st_ivas->ind_list ); + } + + if ( st_ivas->ind_list_metadata != NULL ) + { + free( st_ivas->ind_list_metadata ); + } +#endif + /* main IVAS handle */ free( st_ivas ); diff --git a/lib_enc/ivas_ism_dtx_enc.c b/lib_enc/ivas_ism_dtx_enc.c index 3839a42a9df8518f01561990ac87dadefe70696f..907997cf988a94f7ad4408080fbc2bd3fd0d27a7 100644 --- a/lib_enc/ivas_ism_dtx_enc.c +++ b/lib_enc/ivas_ism_dtx_enc.c @@ -42,14 +42,12 @@ #include "wmc_auto.h" -#ifdef DISCRETE_ISM_DTX_CNG /*-----------------------------------------------------------------------* * Local constants *-----------------------------------------------------------------------*/ #define MD_MAX_DIFF_AZIMUTH 10 #define MD_MAX_DIFF_ELEVATION 10 -#endif /*-------------------------------------------------------------------* @@ -76,11 +74,7 @@ ivas_error ivas_ism_dtx_open( hISMDTX->dtx_flag = 0; hISMDTX->sce_id_dtx = 0; -#ifdef DISCRETE_ISM_DTX_CNG hISMDTX->cnt_SID_ISM = -1; -#else - set_s( hISMDTX->dtx_speech_buffer_enc, 0, PARAM_ISM_HYS_BUF_SIZE ); -#endif for ( i = 0; i < MAX_NUM_OBJECTS; i++ ) { @@ -95,7 +89,6 @@ ivas_error ivas_ism_dtx_open( } -#ifdef DISCRETE_ISM_DTX_CNG /*-------------------------------------------------------------------* * ivas_ism_get_dtx_enc() * @@ -174,7 +167,14 @@ int16_t ivas_ism_dtx_enc( if ( dtx_flag ) { /* reset the bitstream (IVAS format signaling was already written) */ - reset_indices_enc( hSCE[0]->hCoreCoder[0]->hBstr, MAX_NUM_INDICES ); + reset_indices_enc( hSCE[0]->hCoreCoder[0]->hBstr, + +#ifdef IND_LIST_DYN + hSCE[0]->hCoreCoder[0]->hBstr->nb_ind_tot +#else + MAX_NUM_INDICES +#endif + ); } /*------------------------------------------------------------------* @@ -258,7 +258,15 @@ int16_t ivas_ism_dtx_enc( 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 ); + int16_t ind = 2; + nBits = IVAS_FORMAT_SIGNALING_NBITS; + if ( ivas_total_brate >= IVAS_24k4 ) + { + ind = 4; + nBits = IVAS_FORMAT_SIGNALING_NBITS_EXTENDED; + } + + push_indice( hSCE[0]->hCoreCoder[0]->hBstr, IND_IVAS_FORMAT, ind, nBits ); } } else /* ism_dtx_flag == 1 */ @@ -297,142 +305,6 @@ int16_t ivas_ism_dtx_enc( return dtx_flag; } -#else -/*-------------------------------------------------------------------* - * ivas_ism_dtx_enc() - * - * Analysis and decision about DTX in ISM format - *-------------------------------------------------------------------*/ - -/*! r: indication of DTX frame */ -int16_t ivas_ism_dtx_enc( - Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */ - int16_t *sid_flag /* o : indication of SID frame */ -) -{ - int16_t i, val, dtx_flag; - - dtx_flag = 0; - *sid_flag = 0; - - /* Move the DTX/CNG speech buffer */ - for ( i = 0; i < ( PARAM_ISM_HYS_BUF_SIZE - 1 ); i++ ) - { - st_ivas->hISMDTX->dtx_speech_buffer_enc[i] = st_ivas->hISMDTX->dtx_speech_buffer_enc[i + 1]; - } - - /* If both TCs are active frame, do not do any post processing */ - if ( !( st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == -1 && st_ivas->hSCE[1]->hCoreCoder[0]->core_brate == -1 ) ) - { - /* covers 3 cases - * case 1: ch0 -> Inactive Frame, ch 1 -> Inactive Frame -> do not do any post-processing (Activate DTX) - * case 2: ch0 -> Inactive Frame, ch 1 -> Active Frame - * case 3: ch0 -> Active Frame, ch 1 -> Inactive Frame - */ - - /* case 2 -> ch 0 is inactive, set it to active */ - if ( st_ivas->hSCE[1]->hCoreCoder[0]->core_brate == -1 && ( st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == SID_2k40 || st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == FRAME_NO_DATA ) ) - { - st_ivas->hISMDTX->dtx_speech_buffer_enc[i] = 0; - } - - /* case 3 -> ch 1 is inactive, set it to active */ - if ( st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == -1 && ( st_ivas->hSCE[1]->hCoreCoder[0]->core_brate == SID_2k40 || st_ivas->hSCE[1]->hCoreCoder[0]->core_brate == FRAME_NO_DATA ) ) - { - st_ivas->hISMDTX->dtx_speech_buffer_enc[i] = 0; - } - - /* case 1: both TCs are inactive */ - if ( ( st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == SID_2k40 || st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == FRAME_NO_DATA ) && ( st_ivas->hSCE[1]->hCoreCoder[0]->core_brate == SID_2k40 || st_ivas->hSCE[1]->hCoreCoder[0]->core_brate == FRAME_NO_DATA ) ) - { - st_ivas->hISMDTX->dtx_speech_buffer_enc[i] = 1; - } - } - else - { - st_ivas->hISMDTX->dtx_speech_buffer_enc[i] = 0; - } - - /* Do a decision based on hysteresis */ - st_ivas->hISMDTX->dtx_flag = 1; - - for ( i = 1; i < ( PARAM_ISM_HYS_BUF_SIZE - 1 ); i++ ) - { - if ( ( st_ivas->hISMDTX->dtx_speech_buffer_enc[i + 1] == 1 ) && ( st_ivas->hISMDTX->dtx_speech_buffer_enc[i - 1] == 1 ) && ( st_ivas->hISMDTX->dtx_speech_buffer_enc[i] == 0 ) ) - { - st_ivas->hISMDTX->dtx_speech_buffer_enc[i] = 1; - } - } - - val = sum_s( st_ivas->hISMDTX->dtx_speech_buffer_enc, PARAM_ISM_HYS_BUF_SIZE ); - - if ( val < 7 ) - { - for ( i = 0; i < PARAM_ISM_HYS_BUF_SIZE; i++ ) - { - st_ivas->hISMDTX->dtx_flag = st_ivas->hISMDTX->dtx_flag && st_ivas->hISMDTX->dtx_speech_buffer_enc[i]; - } - } - - if ( st_ivas->hISMDTX->dtx_flag ) - { - /* case 1 */ - /* force FD-CNG */ - st_ivas->hSCE[0]->hCoreCoder[0]->cng_type = FD_CNG; - st_ivas->hSCE[1]->hCoreCoder[0]->cng_type = FD_CNG; - - /* synchronize the core bitrate */ - if ( ( st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == -1 ) && ( st_ivas->hSCE[0]->hCoreCoder[0]->last_core_brate == SID_2k40 || st_ivas->hSCE[0]->hCoreCoder[0]->last_core_brate == FRAME_NO_DATA ) ) - { - st_ivas->hSCE[0]->hCoreCoder[0]->core_brate = st_ivas->hSCE[0]->hCoreCoder[0]->last_core_brate; - reset_indices_enc( st_ivas->hSCE[0]->hCoreCoder[0]->hBstr, MAX_NUM_INDICES ); - } - - st_ivas->hSCE[1]->hCoreCoder[0]->core_brate = st_ivas->hSCE[0]->hCoreCoder[0]->core_brate; - } - else - { - if ( ( st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == SID_2k40 || st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == FRAME_NO_DATA ) && ( st_ivas->hSCE[1]->hCoreCoder[0]->core_brate == SID_2k40 || st_ivas->hSCE[1]->hCoreCoder[0]->core_brate == FRAME_NO_DATA ) ) - { - st_ivas->hSCE[0]->hCoreCoder[0]->core_brate = -1; - st_ivas->hSCE[1]->hCoreCoder[0]->core_brate = -1; - - /* since ch0 is detected as inactive frame and we are setting it as active frame, - we need to reset bitstream pointer and write the ivas_format once more */ - ivas_write_format( st_ivas ); - } - - /* case 3 -> ch 1 is inactive, set it to active */ - if ( st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == -1 && ( st_ivas->hSCE[1]->hCoreCoder[0]->core_brate == SID_2k40 || st_ivas->hSCE[1]->hCoreCoder[0]->core_brate == FRAME_NO_DATA ) ) - { - st_ivas->hSCE[1]->hCoreCoder[0]->core_brate = -1; - } - - /* case 2 -> ch 0 is inactive, set it to active */ - if ( st_ivas->hSCE[1]->hCoreCoder[0]->core_brate == -1 && ( st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == SID_2k40 || st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == FRAME_NO_DATA ) ) - { - st_ivas->hSCE[0]->hCoreCoder[0]->core_brate = -1; - - /* since ch0 is detected as inactive frame and we are setting it as active frame, - we need to reset bitstream pointer and write the ivas_format once more */ - ivas_write_format( st_ivas ); - } - } - - if ( st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == SID_2k40 ) - { - *sid_flag = 1; - dtx_flag = 1; - } - - if ( st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == FRAME_NO_DATA ) - { - dtx_flag = 1; - } - - return dtx_flag; -} -#endif /*-------------------------------------------------------------------* * ivas_ism_get_sce_id_dtx() @@ -504,11 +376,7 @@ void ivas_ism_coh_estim_dtx_enc( { Encoder_State *st, *st_id0; int16_t sce_id, i; -#ifdef DISCRETE_ISM_DTX_CNG float acorr_ene[MAX_NUM_OBJECTS], xcorr_ene; -#else - float acorr_ene[PARAM_ISM_MAX_DMX], xcorr_ene; -#endif if ( nchan_transport == 1 ) { diff --git a/lib_enc/ivas_ism_enc.c b/lib_enc/ivas_ism_enc.c index f073609b8ab9c877cba22099bca0abc17ee8eb32..8780573773897d6fefa66e19af82cff6919f80d1 100644 --- a/lib_enc/ivas_ism_enc.c +++ b/lib_enc/ivas_ism_enc.c @@ -85,16 +85,10 @@ 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 */ -#ifdef DISCRETE_ISM_DTX_CNG int16_t nchan_ism, dtx_flag, sid_flag, flag_noisy_speech; int16_t md_diff_flag[MAX_NUM_OBJECTS]; -#else -#ifdef NCHAN_ISM_PARAMETER - int16_t nchan_ism, dtx_flag, sid_flag; -#else - int16_t dtx_flag, sid_flag, flag_noisy_speech; -#endif - int16_t i, nBits; +#ifdef IND_LIST_DYN + Encoder_State *prev_st = NULL; #endif ivas_error error; @@ -108,24 +102,9 @@ ivas_error ivas_ism_enc( dtx_flag = 0; sid_flag = 0; -#if ( !defined NCHAN_ISM_PARAMETER || defined DISCRETE_ISM_DTX_CNG ) flag_noisy_speech = 0; -#endif -#ifdef NCHAN_ISM_PARAMETER nchan_ism = st_ivas->hEncoderConfig->nchan_ism; -#else -#ifdef DISCRETE_ISM_DTX_CNG - if ( st_ivas->ism_mode == ISM_MODE_PARAM ) - { - nchan_ism = st_ivas->hDirAC->hParamIsm->num_obj; - } - else /* ism_mode == ISM_MODE_DISC */ - { - nchan_ism = st_ivas->nchan_transport; - } -#endif -#endif set_s( md_diff_flag, 1, nchan_ism ); /*------------------------------------------------------------------* @@ -192,13 +171,11 @@ ivas_error ivas_ism_enc( return error; } -#ifdef DISCRETE_ISM_DTX_CNG if ( st_ivas->hEncoderConfig->Opt_DTX_ON ) { vad_flag[sce_id] = vad_flag_dtx[sce_id][0]; } else -#endif { vad_flag[sce_id] = st->vad_flag; } @@ -208,21 +185,13 @@ ivas_error ivas_ism_enc( * DTX analysis *-----------------------------------------------------------------*/ -#ifdef DISCRETE_ISM_DTX_CNG if ( st_ivas->hEncoderConfig->Opt_DTX_ON ) -#else - if ( st_ivas->hEncoderConfig->Opt_DTX_ON && st_ivas->ism_mode == ISM_MODE_PARAM ) -#endif { /* 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 ); /* analysis and decision about DTX */ -#ifdef DISCRETE_ISM_DTX_CNG 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 ); -#else - dtx_flag = ivas_ism_dtx_enc( st_ivas, &sid_flag ); -#endif if ( sid_flag ) { @@ -247,47 +216,28 @@ ivas_error ivas_ism_enc( if ( st_ivas->ism_mode == ISM_MODE_PARAM ) { ivas_param_ism_compute_noisy_speech_flag( st_ivas ); -#ifdef DISCRETE_ISM_DTX_CNG flag_noisy_speech = st_ivas->hDirAC->hParamIsm->flag_noisy_speech; -#endif } if ( dtx_flag ) { -#ifdef DISCRETE_ISM_DTX_CNG 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 ( sid_flag ) - { -#ifdef NCHAN_ISM_PARAMETER - ivas_param_ism_metadata_dtx_enc( st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, st_ivas->hIsmMetaData, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm, nchan_ism ); -#else - ivas_param_ism_metadata_dtx_enc( st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, st_ivas->hIsmMetaData, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm ); -#endif - } -#endif } 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, -#ifdef NCHAN_ISM_PARAMETER nchan_ism, -#endif 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, -#ifdef NCHAN_ISM_PARAMETER nchan_ism, -#endif 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 ); } -#ifdef DISCRETE_ISM_DTX_CNG update_last_metadata( nchan_ism, st_ivas->hIsmMetaData, md_diff_flag ); -#endif /*----------------------------------------------------------------* * Write IVAS format signaling in SID frames @@ -295,27 +245,9 @@ ivas_error ivas_ism_enc( st = st_ivas->hSCE[0]->hCoreCoder[0]; -#ifdef DISCRETE_ISM_DTX_CNG if ( sid_flag ) -#else - if ( st->core_brate == SID_2k40 ) -#endif { ivas_write_format_sid( st_ivas->hEncoderConfig->ivas_format, IVAS_SCE, st->hBstr ); - -#ifndef DISCRETE_ISM_DTX_CNG - if ( st_ivas->ism_mode != ISM_MODE_PARAM ) - { - /* write unused bits */ - nBits = ( IVAS_SID_5k2 - SID_2k40 ) / 50 - SID_FORMAT_NBITS; - while ( nBits > 0 ) - { - i = min( nBits, 16 ); - push_indice( st->hBstr, IND_UNUSED, 0, i ); - nBits -= i; - } - } -#endif } /*------------------------------------------------------------------* @@ -327,6 +259,14 @@ ivas_error ivas_ism_enc( hSCE = st_ivas->hSCE[sce_id]; st = hSCE->hCoreCoder[0]; +#ifdef IND_LIST_DYN + /* update pointer to the buffer of indices of the next channel */ + if ( sce_id > 0 ) + { + st->hBstr->ind_list = prev_st->hBstr->ind_list + prev_st->hBstr->nb_ind_tot; + } +#endif + if ( st->low_rate_mode ) { st->bwidth = WB; @@ -374,6 +314,10 @@ ivas_error ivas_ism_enc( /* Store previous attack detection flag */ st->hTranDet->transientDetector.prev_bIsAttackPresent = st->hTranDet->transientDetector.bIsAttackPresent; + +#ifdef IND_LIST_DYN + prev_st = st; +#endif } if ( dtx_flag ) @@ -389,7 +333,6 @@ ivas_error ivas_ism_enc( } } -#ifdef DISCRETE_ISM_DTX_CNG #ifdef DEBUG_MODE_INFO if ( dtx_flag ) { @@ -423,7 +366,6 @@ ivas_error ivas_ism_enc( } } } -#endif #endif pop_wmops(); @@ -475,7 +417,7 @@ ivas_error ivas_ism_enc_config( 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 ) + if ( ( error = ivas_ism_config( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hEncoderConfig->nchan_inp, NULL, 0, NULL, NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK ) { return error; } diff --git a/lib_enc/ivas_ism_metadata_enc.c b/lib_enc/ivas_ism_metadata_enc.c index d34479ad2dfe3ea691a743bc24567febbae7fd06..a8c4982e4b39bb22a706951690e3d69be4caef77 100644 --- a/lib_enc/ivas_ism_metadata_enc.c +++ b/lib_enc/ivas_ism_metadata_enc.c @@ -55,8 +55,11 @@ #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 - +#define ISM_FEC_MAX 10 +#define ISM_MD_FEC_DIFF 10 +#define ISM_MD_INC_DIFF_CNT_MAX 6 +#define ISM_MD_FEC_CNT_MAX 25 +#define ISM_MD_RAD_FEC_DIFF 1 #define INTER_OBJECT_PARAM_CHECK ( ( ISM_FEC_MAX / 2 ) - 2 ) /* note: constant must be less than (ISM_FEC_MAX / number of coded parameters) */ @@ -64,11 +67,7 @@ * Local function declarations *-----------------------------------------------------------------------*/ -#ifdef FIX_379_ANGLE 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 ); -#else -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_azimuth_abs, const int16_t idx_elevation_abs, int16_t *flag_abs_azimuth, int16_t *flag_abs_elevation ); -#endif 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 ); @@ -80,12 +79,13 @@ static void encode_radius( BSTR_ENC_HANDLE hBstr, int16_t *last_radius_idx, int1 *-------------------------------------------------------------------------*/ 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 */ + 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 */ + const int16_t non_diegetic_flag /* i : non-diegetic object flag*/ ) { if ( hIsmMeta == NULL ) @@ -101,6 +101,7 @@ ivas_error ivas_set_ism_metadata( hIsmMeta->radius = radius_meta; hIsmMeta->yaw = yaw; hIsmMeta->pitch = pitch; + hIsmMeta->non_diegetic_flag = non_diegetic_flag; return IVAS_ERR_OK; } @@ -166,10 +167,8 @@ static void rate_ism_importance( *-------------------------------------------------------------------------*/ ivas_error ivas_ism_metadata_enc( - const int32_t ism_total_brate, /* i : ISM total bitrate */ -#ifdef NCHAN_ISM_PARAMETER - const int16_t nchan_ism, /* i : number of ISM channels */ -#endif + 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 */ @@ -182,71 +181,34 @@ ivas_error ivas_ism_metadata_enc( ) { int16_t i, ch, nb_bits_start = 0; -#ifdef FIX_379_ANGLE 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]; -#else - int16_t idx_azimuth_abs = 0, flag_abs_azimuth[MAX_NUM_OBJECTS]; - int16_t idx_elevation_abs = 0, flag_abs_elevation[MAX_NUM_OBJECTS]; - int16_t flag_abs_azimuth_orientation[MAX_NUM_OBJECTS]; -#endif 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 non_diegetic_flag_global; int16_t ism_imp[MAX_NUM_OBJECTS]; -#ifdef NCHAN_ISM_PARAMETER int16_t nbands, nblocks; -#else - int16_t nchan_ism, nbands, nblocks; -#endif ivas_error error; error = IVAS_ERR_OK; push_wmops( "ism_meta_enc" ); -#ifndef NCHAN_ISM_PARAMETER - if ( ism_mode == ISM_MODE_PARAM ) - { - nchan_ism = hParamIsm->num_obj; - } - else if ( ism_mode == ISM_MODE_DISC ) - { - nchan_ism = nchan_transport; - } - else - { - return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: incorrect ISM mode" ); - } -#endif - -#ifndef DISCRETE_ISM_DTX_CNG - if ( nchan_ism == 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 */ - pop_wmops(); - - return error; - } -#endif - /* initialization */ ism_metadata_flag_global = 0; + non_diegetic_flag_global = 0; set_s( nb_bits_metadata, 0, nchan_transport ); set_s( flag_abs_azimuth, 0, nchan_ism ); set_s( flag_abs_elevation, 0, nchan_ism ); -#ifdef FIX_379_ANGLE set_s( flag_abs_yaw, 0, nchan_ism ); set_s( flag_abs_pitch, 0, nchan_ism ); -#else - set_s( flag_abs_azimuth_orientation, 0, nchan_ism ); -#endif set_s( flag_abs_radius, 0, nchan_ism ); /*----------------------------------------------------------------* @@ -261,15 +223,39 @@ ivas_error ivas_ism_metadata_enc( } else if ( ism_mode == ISM_MODE_DISC ) { -#ifdef DISCRETE_ISM_DTX_CNG - hIsmMeta[ch]->ism_metadata_flag = localVAD[ch] || hSCE[ch]->hCoreCoder[0]->lp_noise > 10; -#else - /* In case of low level noise for low bitrate inactive frames, do not sent metadata */ - if ( localVAD[ch] == 0 && !( hSCE[ch]->hCoreCoder[0]->tcxonly ) && ( hSCE[ch]->hCoreCoder[0]->lp_noise <= 10 ) ) + if ( hIsmMeta[ch]->ism_metadata_flag == 1 ) { - hIsmMeta[ch]->ism_metadata_flag = 0; + /* In case of low level noise for low bitrate inactive frames, do not sent metadata */ + hIsmMeta[ch]->ism_metadata_flag = localVAD[ch] || hSCE[ch]->hCoreCoder[0]->lp_noise > 10 || hSCE[ch]->hCoreCoder[0]->tcxonly; + /* 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 ) + { + 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 ) || ( fabsf( hIsmMeta[ch]->radius - hIsmMeta[ch]->last_true_radius ) > ISM_MD_RAD_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 ( 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 } } @@ -291,10 +277,22 @@ ivas_error ivas_ism_metadata_enc( } push_indice( hBstr, IND_ISM_NUM_OBJECTS, 0, 1 ); + for ( ch = 0; ch < nchan_ism; ch++ ) + { + ism_metadata_flag_global |= hIsmMeta[ch]->ism_metadata_flag; + non_diegetic_flag_global |= hIsmMeta[ch]->non_diegetic_flag; + } + /* 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 global non-diegetic object flag */ + if ( ism_extended_metadata_flag ) + { + push_indice( hBstr, IND_ISM_EXTENDED_NDP_FLAG, non_diegetic_flag_global, ISM_EXTENDED_METADATA_BITS ); + } } /* write ISM metadata flag (one per object) */ @@ -303,11 +301,6 @@ ivas_error ivas_ism_metadata_enc( push_indice( hBstr, IND_ISM_METADATA_FLAG, ism_imp[ch], ISM_METADATA_FLAG_BITS ); } - for ( ch = 0; ch < nchan_ism; ch++ ) - { - ism_metadata_flag_global |= hIsmMeta[ch]->ism_metadata_flag; - } - if ( ism_mode == ISM_MODE_DISC ) { /* write VAD flag */ @@ -349,51 +342,56 @@ ivas_error ivas_ism_metadata_enc( * Quantize and encode azimuth and elevation *----------------------------------------------------------------*/ - if ( ism_mode == ISM_MODE_DISC ) + if ( ism_extended_metadata_flag && non_diegetic_flag_global ) { -#ifdef FIX_379_ANGLE - 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 ); -#else - idx_azimuth_abs = ism_quant_meta( hIsmMetaData->azimuth, &valQ, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS ); - idx_elevation_abs = ism_quant_meta( hIsmMetaData->elevation, &valQ, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS ); -#endif + /* Write non-diegetic flag for each object */ + push_indice( hBstr, IND_ISM_NDP_FLAG, hIsmMeta[ch]->non_diegetic_flag, ISM_METADATA_IS_NDP_BITS ); } - else /* ISM_MODE_PARAM */ + + if ( hIsmMeta[ch]->non_diegetic_flag ) { -#ifdef FIX_379_ANGLE - idx_angle1_abs = hParamIsm->azi_index[ch]; - idx_angle2_abs = hParamIsm->ele_index[ch]; -#else - idx_azimuth_abs = hParamIsm->azi_index[ch]; - idx_elevation_abs = hParamIsm->ele_index[ch]; -#endif - } -#ifdef FIX_379_ANGLE - 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] ); -#else - encode_angle_indices( hBstr, &( hIsmMetaData->angle[0] ), hIsmMetaData->last_ism_metadata_flag, hSCE[0]->hCoreCoder[0]->ini_frame, idx_azimuth_abs, idx_elevation_abs, &flag_abs_azimuth[ch], &flag_abs_elevation[ch] ); -#endif - /*----------------------------------------------------------------* - * Quantize and encode radius, yaw, and pitch - *----------------------------------------------------------------*/ + /* Map azimuth to panning range [-90:90] */ + if ( hIsmMetaData->azimuth > 90.0f ) + { + hIsmMetaData->azimuth = 180.0f - hIsmMetaData->azimuth; + } + + if ( hIsmMetaData->azimuth < -90.0f ) + { + hIsmMetaData->azimuth = -180.0f - hIsmMetaData->azimuth; + } - if ( ism_mode == ISM_MODE_DISC && ism_extended_metadata_flag ) + idx_angle1_abs = ism_quant_meta( hIsmMetaData->azimuth, &valQ, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS ); + encode_angle_indices( hBstr, &( hIsmMetaData->position_angle ), hIsmMetaData->last_ism_metadata_flag, hSCE[0]->hCoreCoder[0]->ini_frame, idx_angle1_abs, 0, &flag_abs_azimuth[ch], NULL ); + } + else { -#ifdef FIX_379_ANGLE - 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 ); -#else - idx_azimuth_abs = ism_quant_meta( hIsmMetaData->yaw, &valQ, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS ); - idx_elevation_abs = ism_quant_meta( hIsmMetaData->pitch, &valQ, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS ); -#endif - idx_radius_abs = usquant( hIsmMetaData->radius, &valQ, ISM_RADIUS_MIN, ISM_RADIUS_DELTA, 1 << ISM_RADIUS_NBITS ); -#ifdef FIX_379_ANGLE - 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] ); -#else - encode_angle_indices( hBstr, &( hIsmMetaData->angle[1] ), hIsmMetaData->last_ism_metadata_flag, hSCE[0]->hCoreCoder[0]->ini_frame, idx_azimuth_abs, idx_elevation_abs, &flag_abs_azimuth_orientation[ch], &flag_abs_elevation[ch] ); -#endif - encode_radius( hBstr, &hIsmMetaData->last_radius_idx, &hIsmMetaData->radius_diff_cnt, hIsmMetaData->last_ism_metadata_flag, idx_radius_abs, &flag_abs_radius[ch] ); + if ( ism_mode == ISM_MODE_DISC ) + { + 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 ); + } + else /* ISM_MODE_PARAM */ + { + idx_angle1_abs = hParamIsm->azi_index[ch]; + idx_angle2_abs = hParamIsm->ele_index[ch]; + } + + 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] ); + + /*----------------------------------------------------------------* + * Quantize and encode radius, yaw, and pitch + *----------------------------------------------------------------*/ + + if ( ism_mode == ISM_MODE_DISC && ism_extended_metadata_flag ) + { + 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 ); + + 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] ); + } } /* save number of metadata bits written */ @@ -401,6 +399,11 @@ ivas_error ivas_ism_metadata_enc( { nb_bits_metadata[ch] = hBstr->nb_bits_tot - nb_bits_start; } + + /* Updates */ + hIsmMeta[ch]->last_true_azimuth = hIsmMeta[ch]->azimuth; + hIsmMeta[ch]->last_true_elevation = hIsmMeta[ch]->elevation; + hIsmMeta[ch]->last_true_radius = hIsmMeta[ch]->radius; } } @@ -461,20 +464,12 @@ ivas_error ivas_ism_metadata_enc( if ( abs_next % ISM_NUM_PARAM == 0 ) { -#ifdef FIX_379_ANGLE hIsmMeta[ch]->position_angle.angle1_diff_cnt = abs_num - 1; -#else - hIsmMeta[ch]->angle[0].azimuth_diff_cnt = abs_num - 1; -#endif } if ( abs_next % ISM_NUM_PARAM == 1 ) { -#ifdef FIX_379_ANGLE hIsmMeta[ch]->position_angle.angle2_diff_cnt = abs_num - 1; -#else - hIsmMeta[ch]->angle[0].elevation_diff_cnt = abs_num - 1; -#endif /*hIsmMeta[ch]->elevation_diff_cnt = min( hIsmMeta[ch]->elevation_diff_cnt, ISM_FEC_MAX );*/ } @@ -537,7 +532,7 @@ ivas_error ivas_ism_metadata_enc( * Configuration and decision about bitrates per channel *----------------------------------------------------------------*/ - 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 ) + if ( ( error = ivas_ism_config( ism_total_brate, nchan_transport, nchan_ism, hIsmMeta, ism_extended_metadata_flag, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata ) ) != IVAS_ERR_OK ) { return error; } @@ -545,13 +540,24 @@ ivas_error ivas_ism_metadata_enc( for ( ch = 0; ch < nchan_ism; ch++ ) { hIsmMeta[ch]->last_ism_metadata_flag = hIsmMeta[ch]->ism_metadata_flag; + + 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 ); } for ( ch = 0; ch < nchan_transport; ch++ ) { + hSCE[ch]->hCoreCoder[0]->low_rate_mode = 0; if ( ism_mode == ISM_MODE_DISC ) { - hSCE[ch]->hCoreCoder[0]->low_rate_mode = 0; if ( hIsmMeta[ch]->ism_metadata_flag == 0 && localVAD[ch] == 0 && ism_metadata_flag_global ) { hSCE[ch]->hCoreCoder[0]->low_rate_mode = 1; @@ -564,7 +570,11 @@ ivas_error ivas_ism_metadata_enc( /* write metadata only in active frames */ if ( hSCE[0]->hCoreCoder[0]->core_brate > SID_2k40 ) { +#ifdef IND_LIST_DYN + reset_indices_enc( hSCE[ch]->hMetaData, hSCE[ch]->hMetaData->nb_ind_tot ); +#else reset_indices_enc( hSCE[ch]->hMetaData, MAX_BITS_METADATA ); +#endif } } @@ -609,7 +619,6 @@ ivas_error ivas_ism_metadata_enc_create( { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for ISM MetaData\n" ) ); } -#ifdef FIX_379_ANGLE 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; @@ -618,29 +627,23 @@ ivas_error ivas_ism_metadata_enc_create( 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; -#else - st_ivas->hIsmMetaData[ch]->angle[0].last_azimuth_idx = 0; - st_ivas->hIsmMetaData[ch]->angle[0].azimuth_diff_cnt = ISM_FEC_MAX; - st_ivas->hIsmMetaData[ch]->angle[0].last_elevation_idx = 0; - st_ivas->hIsmMetaData[ch]->angle[0].elevation_diff_cnt = ISM_FEC_MAX - 1; - st_ivas->hIsmMetaData[ch]->angle[1].last_azimuth_idx = 0; - st_ivas->hIsmMetaData[ch]->angle[1].azimuth_diff_cnt = ISM_FEC_MAX - 2; - st_ivas->hIsmMetaData[ch]->angle[1].last_elevation_idx = 0; - st_ivas->hIsmMetaData[ch]->angle[1].elevation_diff_cnt = ISM_FEC_MAX - 2; -#endif 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] ); -#ifdef DISCRETE_ISM_DTX_CNG st_ivas->hIsmMetaData[ch]->last_azimuth = 0.0f; st_ivas->hIsmMetaData[ch]->last_elevation = 0.0f; -#endif + + 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; + st_ivas->hIsmMetaData[ch]->last_true_radius = 1.0f; } - 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 ) + if ( ( error = ivas_ism_config( st_ivas->hEncoderConfig->ivas_total_brate, nchan_transport, n_ISms, NULL, 0, NULL, NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK ) { return error; } @@ -757,16 +760,15 @@ static void encode_radius( * * Encoding of an angle *----------------------------------------------------------------*/ -#ifdef FIX_379_ANGLE static void encode_angle_indices( - BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */ + 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 */ + 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; @@ -850,7 +852,7 @@ static void encode_angle_indices( if ( *flag_abs_angle1 == 0 ) { angle->angle1_diff_cnt++; - angle->angle2_diff_cnt = min( angle->angle2_diff_cnt, ISM_FEC_MAX ); + angle->angle1_diff_cnt = min( angle->angle1_diff_cnt, ISM_FEC_MAX ); } else { @@ -873,367 +875,131 @@ static void encode_angle_indices( * 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 ) + if ( flag_abs_angle2 ) { - *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 ) + 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 */ + ) { - diff = min( diff, ISM_MAX_ELEVATION_DIFF_IDX ); - } - else - { - diff = -1 * min( -diff, ISM_MAX_ELEVATION_DIFF_IDX ); + *flag_abs_angle2 = 1; } - if ( last_ism_metadata_flag == 0 || abs( diff_orig - diff ) > ISM_MAX_ELEVATION_DIFF_IDX ) + /* note: elevation/pitch is coded starting from the second frame only (it is meaningless in the init_frame) */ + if ( ini_frame == 0 ) { - angle->angle2_diff_cnt = ISM_FEC_MAX - 1; + *flag_abs_angle2 = 1; + angle->last_angle2_idx = idx_angle2_abs; } - } - /* 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 ) + 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 ) { - idx_angle2 = 1 << 1; - nbits_diff_angle2 = 1; + int16_t diff_orig = diff; - if ( diff < 0 ) + *flag_abs_angle2 = 0; + + + if ( diff >= 0 ) { - idx_angle2 += 1; /* negative sign */ - diff *= -1; + diff = min( diff, ISM_MAX_ELEVATION_DIFF_IDX ); } else { - idx_angle2 += 0; /* positive sign */ + diff = -1 * min( -diff, ISM_MAX_ELEVATION_DIFF_IDX ); } - 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 ) + if ( last_ism_metadata_flag == 0 || abs( diff_orig - diff ) > ISM_MAX_ELEVATION_DIFF_IDX ) { - /* add stop bit */ - idx_angle2 = idx_angle2 << 1; - nbits_diff_angle2++; + angle->angle2_diff_cnt = ISM_FEC_MAX - 1; } } - 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; -} - -#else - -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_azimuth_abs, /* i : Azimuth index */ - const int16_t idx_elevation_abs, /* i : Elevation index */ - int16_t *flag_abs_azimuth, /* o : Azimuth encoding mode */ - int16_t *flag_abs_elevation /* o : Elevation encoding mode */ -) -{ - int16_t idx_azimuth, nbits_diff_azimuth, diff; - int16_t idx_elevation, nbits_diff_elevation; - - /*----------------------------------------------------------------* - * Azimuth index encoding - *----------------------------------------------------------------*/ - - idx_azimuth = idx_azimuth_abs; - - nbits_diff_azimuth = 0; - - *flag_abs_azimuth = 0; /* differential coding by default */ - if ( angle->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) */ - || last_ism_metadata_flag == 0 /* If last frame had no metadata coded, do not use differential coding */ - ) - { - *flag_abs_azimuth = 1; - } - - /* try differential coding */ - if ( *flag_abs_azimuth == 0 ) - { - diff = idx_azimuth_abs - angle->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 ) + /* try differential coding */ + if ( *flag_abs_angle2 == 0 ) { - if ( diff > 0 ) + if ( diff == 0 ) { - diff -= ( 1 << ISM_AZIMUTH_NBITS ) - 1; + idx_angle2 = 0; + nbits_diff_angle2 = 1; } - else + else if ( ABSVAL( diff ) <= ISM_MAX_ELEVATION_DIFF_IDX ) { - diff += ( 1 << ISM_AZIMUTH_NBITS ) - 1; - } - } + idx_angle2 = 1 << 1; + nbits_diff_angle2 = 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 */ - } + if ( diff < 0 ) + { + idx_angle2 += 1; /* negative sign */ + diff *= -1; + } + else + { + idx_angle2 += 0; /* positive sign */ + } - idx_azimuth = idx_azimuth << diff; - nbits_diff_azimuth++; + idx_angle2 = idx_angle2 << diff; + nbits_diff_angle2++; - /* unary coding of "diff */ - idx_azimuth += ( ( 1 << diff ) - 1 ); - nbits_diff_azimuth += diff; + /* unary coding of "diff */ + idx_angle2 += ( ( 1 << diff ) - 1 ); + nbits_diff_angle2 += diff; - if ( nbits_diff_azimuth < ISM_AZIMUTH_NBITS - 1 ) + if ( nbits_diff_angle2 < ISM_ELEVATION_NBITS ) + { + /* add stop bit */ + idx_angle2 = idx_angle2 << 1; + nbits_diff_angle2++; + } + } + else { - /* add stop bit - only for codewords shorter than ISM_AZIMUTH_NBITS */ - idx_azimuth = idx_azimuth << 1; - nbits_diff_azimuth++; + *flag_abs_angle2 = 1; } } - else - { - *flag_abs_azimuth = 1; - } - } - - /* update counter */ - if ( *flag_abs_azimuth == 0 ) - { - angle->azimuth_diff_cnt++; - angle->elevation_diff_cnt = min( angle->elevation_diff_cnt, ISM_FEC_MAX ); - } - else - { - angle->azimuth_diff_cnt = 0; - } - - /* Write azimuth */ - push_indice( hBstr, IND_ISM_AZIMUTH_DIFF_FLAG, *flag_abs_azimuth, 1 ); - if ( *flag_abs_azimuth ) - { - push_indice( hBstr, IND_ISM_AZIMUTH, idx_azimuth, ISM_AZIMUTH_NBITS ); - } - else - { - push_indice( hBstr, IND_ISM_AZIMUTH, idx_azimuth, nbits_diff_azimuth ); - } - - /*----------------------------------------------------------------* - * Elevation index encoding - *----------------------------------------------------------------*/ - - idx_elevation = idx_elevation_abs; - nbits_diff_elevation = 0; - *flag_abs_elevation = 0; /* differential coding by default */ - if ( angle->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) */ - || last_ism_metadata_flag == 0 /* If last frame had no metadata coded, do not use differential coding */ - ) - { - *flag_abs_elevation = 1; - } - - /* note: elevation is coded starting from the second frame only (it is meaningless in the init_frame) */ - if ( ini_frame == 0 ) - { - *flag_abs_elevation = 1; - angle->last_elevation_idx = idx_elevation_abs; - } - - diff = idx_elevation_abs - angle->last_elevation_idx; - - /* avoid absolute coding of elevation if absolute coding was already used for azimuth */ - if ( *flag_abs_azimuth == 1 ) - { - int16_t diff_orig = diff; - - *flag_abs_elevation = 0; - - - if ( diff >= 0 ) + /* update counter */ + if ( *flag_abs_angle2 == 0 ) { - diff = min( diff, ISM_MAX_ELEVATION_DIFF_IDX ); + angle->angle2_diff_cnt++; + angle->angle2_diff_cnt = min( angle->angle2_diff_cnt, ISM_FEC_MAX ); } else { - diff = -1 * min( -diff, ISM_MAX_ELEVATION_DIFF_IDX ); + angle->angle2_diff_cnt = 0; } - if ( last_ism_metadata_flag == 0 || abs( diff_orig - diff ) > ISM_MAX_ELEVATION_DIFF_IDX ) + /* Write elevation */ + if ( *flag_abs_angle1 == 0 ) /* do not write "flag_abs_elevation/pitch" if "flag_abs_azimuth/yaw == 1" */ { - angle->elevation_diff_cnt = ISM_FEC_MAX - 1; + push_indice( hBstr, IND_ISM_ELEVATION_DIFF_FLAG, *flag_abs_angle2, 1 ); } - } - /* try differential coding */ - if ( *flag_abs_elevation == 0 ) - { - if ( diff == 0 ) + if ( *flag_abs_angle2 ) { - 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++; - } + push_indice( hBstr, IND_ISM_ELEVATION, idx_angle2, ISM_ELEVATION_NBITS ); } else { - *flag_abs_elevation = 1; + push_indice( hBstr, IND_ISM_ELEVATION, idx_angle2, nbits_diff_angle2 ); } } - /* update counter */ - if ( *flag_abs_elevation == 0 ) - { - angle->elevation_diff_cnt++; - angle->elevation_diff_cnt = min( angle->elevation_diff_cnt, ISM_FEC_MAX ); - } - else - { - angle->elevation_diff_cnt = 0; - } - - /* Write elevation */ - if ( *flag_abs_azimuth == 0 ) /* do not write "flag_abs_elevation" if "flag_abs_azimuth == 1" */ - { - push_indice( hBstr, IND_ISM_ELEVATION_DIFF_FLAG, *flag_abs_elevation, 1 ); - } - - if ( *flag_abs_elevation ) - { - push_indice( hBstr, IND_ISM_ELEVATION, idx_elevation, ISM_ELEVATION_NBITS ); - } - else - { - push_indice( hBstr, IND_ISM_ELEVATION, idx_elevation, nbits_diff_elevation ); - } - /*----------------------------------------------------------------* * Updates *----------------------------------------------------------------*/ - angle->last_azimuth_idx = idx_azimuth_abs; - angle->last_elevation_idx = idx_elevation_abs; + angle->last_angle1_idx = idx_angle1_abs; + angle->last_angle2_idx = idx_angle2_abs; return; } -#endif -#ifdef DISCRETE_ISM_DTX_CNG + /*-------------------------------------------------------------------* * ivas_ism_metadata_sid_enc() * @@ -1351,25 +1117,17 @@ void ivas_ism_metadata_sid_enc( /* update last indexes to correspond to active frames coding */ if ( nBits_azimuth > ISM_AZIMUTH_NBITS ) { -#ifdef FIX_379_ANGLE 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->angle[0].last_azimuth_idx = idx_azimuth >> ( nBits_azimuth - ISM_AZIMUTH_NBITS ); - hIsmMetaData->angle[0].last_elevation_idx = idx_elevation >> ( nBits_elevation - ISM_ELEVATION_NBITS ); -#endif } else { -#ifdef FIX_379_ANGLE 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 ); -#else - hIsmMetaData->angle[0].last_azimuth_idx = idx_azimuth << ( ISM_AZIMUTH_NBITS - nBits_azimuth ); - hIsmMetaData->angle[0].last_elevation_idx = idx_elevation << ( ISM_ELEVATION_NBITS - nBits_elevation ); -#endif } + + hIsmMetaData->ism_md_fec_cnt_enc = 0; + hIsmMeta[ch]->ism_md_inc_diff_cnt = ISM_MD_INC_DIFF_CNT_MAX; } } @@ -1387,4 +1145,3 @@ void ivas_ism_metadata_sid_enc( return; } -#endif diff --git a/lib_enc/ivas_ism_param_enc.c b/lib_enc/ivas_ism_param_enc.c index 63c1fcea810af6c5d04f93a96e162cd5c0d94c7b..6afb57c1557831c6c65c8060a68a2b92d7edd410 100644 --- a/lib_enc/ivas_ism_param_enc.c +++ b/lib_enc/ivas_ism_param_enc.c @@ -47,27 +47,20 @@ static void ivas_param_ism_compute_obj_parameters( -#ifdef NCHAN_ISM_PARAMETER - const int16_t nchan_ism, /* i : number of ISM channels */ -#endif + 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 */ ) { -#ifdef NCHAN_ISM_PARAMETER int16_t i, b, m, br, mr; -#else - int16_t i, b, m, br, mr, num_obj; -#endif 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]; + float ref_power_local_frame[MAX_NUM_OBJECTS]; + float tmp_ratio; + + set_f( ref_power_local_frame, 0, MAX_NUM_OBJECTS ); -#ifdef NCHAN_ISM_PARAMETER assert( nchan_ism == 3 || nchan_ism == 4 ); -#else - num_obj = hParamIsm->num_obj; - assert( num_obj == 3 || num_obj == 4 ); -#endif for ( b = 0; b < hParamIsm->nbands; b++ ) { @@ -92,11 +85,7 @@ static void ivas_param_ism_compute_obj_parameters( /* for each object, sum up reference power within current T/F tile */ -#ifdef NCHAN_ISM_PARAMETER for ( i = 0; i < nchan_ism; i++ ) -#else - for ( i = 0; i < num_obj; i++ ) -#endif { for ( mr = mrange_start; mr < mrange_end; mr++ ) { @@ -105,6 +94,8 @@ static void ivas_param_ism_compute_obj_parameters( ref_power_local[i] += reference_power_obj[i][mr][br]; } } + /* Sum up T/F tiles per object */ + ref_power_local_frame[i] += ref_power_local[i]; } /* find two dominant objects and derive object indices for current T/F tile */ @@ -119,11 +110,7 @@ static void ivas_param_ism_compute_obj_parameters( index_2 = 0; } -#ifdef NCHAN_ISM_PARAMETER for ( i = MAX_PARAM_ISM_WAVE; i < nchan_ism; i++ ) -#else - for ( i = MAX_PARAM_ISM_WAVE; i < num_obj; i++ ) -#endif { if ( ref_power_local[i] > ref_power_local[index_1] ) { @@ -164,35 +151,42 @@ static void ivas_param_ism_compute_obj_parameters( } } + /* Check if objects have roughly equal power by comparing reference power of first object against all others*/ + hParamIsm->flag_equal_energy = 1; + for ( i = 1; i < nchan_ism; i++ ) + { + if ( ref_power_local_frame[i] != 0.0f ) + { + tmp_ratio = ref_power_local_frame[0] / ref_power_local_frame[i]; + + if ( ( tmp_ratio > 0.975f ) && ( tmp_ratio < 1.025f ) ) + { + hParamIsm->flag_equal_energy &= 1; + } + else + { + hParamIsm->flag_equal_energy &= 0; + break; + } + } + } + return; } static void ivas_param_ism_enc_quantize_DOA( -#ifdef NCHAN_ISM_PARAMETER - const int16_t nchan_ism, /* i : number of ISM channels */ -#endif + 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 */ ) { -#ifdef NCHAN_ISM_PARAMETER int16_t i, azi_idx, ele_idx; -#else - int16_t i, azi_idx, ele_idx, num_obj; -#endif float valQ; -#ifndef NCHAN_ISM_PARAMETER - num_obj = hParamIsm->num_obj; -#endif /* Loop over objects */ -#ifdef NCHAN_ISM_PARAMETER for ( i = 0; i < nchan_ism; i++ ) -#else - for ( i = 0; i < num_obj; i++ ) -#endif { /* Quantize the elevation and obtain quantized elevation value and index */ ele_idx = ism_quant_meta( hIsmMetaData[i]->elevation, &valQ, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS ); @@ -224,11 +218,7 @@ void ivas_param_ism_stereo_dmx( const int16_t input_frame /* i : Length of input frame */ ) { -#ifdef NCHAN_ISM_PARAMETER int16_t i, j; -#else - int16_t i, j, num_obj; -#endif float alpha, azi_shift, tmp, tmp_1; float cardioid_left[MAX_NUM_OBJECTS], cardioid_right[MAX_NUM_OBJECTS]; float stereo_dmx[2][L_FRAME48k]; @@ -239,20 +229,13 @@ void ivas_param_ism_stereo_dmx( /*Initialization*/ alpha = 0.5; azi_shift = 0; -#ifndef NCHAN_ISM_PARAMETER - num_obj = st_ivas->hDirAC->hParamIsm->num_obj; -#endif /* Set the stereo dmx to zero */ set_zero( stereo_dmx[0], L_FRAME48k ); set_zero( stereo_dmx[1], L_FRAME48k ); /* Loop over all objects */ -#ifdef NCHAN_ISM_PARAMETER for ( i = 0; i < st_ivas->hEncoderConfig->nchan_ism; i++ ) -#else - for ( i = 0; i < num_obj; i++ ) -#endif { hIsmMetaData = st_ivas->hIsmMetaData[i]; @@ -314,13 +297,10 @@ ivas_error ivas_param_ism_enc_open( input_Fs = st_ivas->hEncoderConfig->input_Fs; -#ifndef NCHAN_ISM_PARAMETER - /* Assign the number of objects */ - hDirAC->hParamIsm->num_obj = st_ivas->hEncoderConfig->nchan_inp; -#endif /* 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 ) + if ( ( error = ivas_fb_set_cfg( &fb_cfg, ISM_FORMAT, SBA_MODE_NONE, st_ivas->hEncoderConfig->nchan_inp, 0, 0, input_Fs, + 0 ) ) != IVAS_ERR_OK ) { return error; } @@ -331,11 +311,7 @@ ivas_error ivas_param_ism_enc_open( return error; } -#ifdef NCHAN_ISM_PARAMETER ivas_param_ism_config( hDirAC->hParamIsm, st_ivas->hEncoderConfig->nchan_inp ); -#else - ivas_param_ism_config( hDirAC->hParamIsm ); -#endif /* Assign memories for Band and Block grouping */ hDirAC->hParamIsm->nbands = MAX_PARAM_ISM_NBANDS; @@ -402,9 +378,7 @@ void ivas_param_ism_enc( ) { int16_t i, j, ts, l_ts; -#ifdef NCHAN_ISM_PARAMETER int16_t nchan_ism; -#endif int16_t num_time_slots; float *pcm_in[MAX_NUM_OBJECTS]; float fb_RealBuffer[MAX_NUM_OBJECTS][DIRAC_NO_FB_BANDS_MAX]; @@ -415,9 +389,7 @@ void ivas_param_ism_enc( DIRAC_ENC_HANDLE hDirAC; PARAM_ISM_CONFIG_HANDLE hParamIsm; -#ifdef NCHAN_ISM_PARAMETER nchan_ism = st_ivas->hEncoderConfig->nchan_ism; -#endif hDirAC = st_ivas->hDirAC; hParamIsm = hDirAC->hParamIsm; @@ -426,11 +398,7 @@ void ivas_param_ism_enc( l_ts = input_frame / PARAM_ISM_MDFT_NO_SLOTS; num_time_slots = PARAM_ISM_MDFT_NO_SLOTS; -#ifdef NCHAN_ISM_PARAMETER for ( i = 0; i < nchan_ism; i++ ) -#else - for ( i = 0; i < hParamIsm->num_obj; i++ ) -#endif { pcm_in[i] = &data[i][0]; @@ -442,15 +410,13 @@ void ivas_param_ism_enc( 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_get_windowed_fr( hDirAC->hFbMixer, pcm_in, p_fb_RealBuffer, p_fb_ImagBuffer, l_ts, l_ts, + hDirAC->hFbMixer->fb_cfg->num_in_chans ); - ivas_fb_mixer_update_prior_input( hDirAC->hFbMixer, pcm_in, l_ts ); + ivas_fb_mixer_update_prior_input( hDirAC->hFbMixer, pcm_in, l_ts, + hDirAC->hFbMixer->fb_cfg->num_in_chans ); -#ifdef NCHAN_ISM_PARAMETER for ( i = 0; i < nchan_ism; i++ ) -#else - for ( i = 0; i < hParamIsm->num_obj; i++ ) -#endif { pcm_in[i] += l_ts; for ( j = 0; j < DIRAC_NO_FB_BANDS_MAX; j++ ) @@ -461,163 +427,16 @@ void ivas_param_ism_enc( } /* Quantize DOAs */ -#ifdef NCHAN_ISM_PARAMETER ivas_param_ism_enc_quantize_DOA( nchan_ism, st_ivas->hIsmMetaData, hParamIsm ); -#else - ivas_param_ism_enc_quantize_DOA( st_ivas->hIsmMetaData, hParamIsm ); -#endif /* Compute object indices and power ratios */ -#ifdef NCHAN_ISM_PARAMETER ivas_param_ism_compute_obj_parameters( nchan_ism, reference_power_obj, hParamIsm ); -#else - ivas_param_ism_compute_obj_parameters( reference_power_obj, hParamIsm ); -#endif pop_wmops(); return; } -#ifndef DISCRETE_ISM_DTX_CNG -static void ivas_param_ism_enc_quantize_DOA_dtx( - float azimuth, - float elevation, - int16_t azi_bits, - int16_t ele_bits, - int16_t *azi_idx, - int16_t *ele_idx ) -{ - int16_t nbits, npoints, angle_spacing, az_alpha, ele_alpha; - float azi_val; - - /* Step 1: Determine angle spacing/n_points based on minimum value among elevation/azimuth bits */ - nbits = min( azi_bits, ele_bits ); - - if ( nbits == ISM_ELEVATION_NBITS ) - { - angle_spacing = 5; - } - else - { - angle_spacing = (int16_t) ( ( 180.f / (float) ( 1 << nbits ) ) + 0.5f ); - } - - npoints = (int16_t) ( ( 90 / angle_spacing ) + 0.5f ); - - /* Step 2: Quantize Elevation */ - ele_alpha = 2 * npoints - 1; - *ele_idx = (int16_t) ( ( elevation / angle_spacing ) + 0.5f ) + npoints; - if ( *ele_idx >= ele_alpha ) - { - *ele_idx = ele_alpha - 1; - } - assert( ( 0 <= *ele_idx ) && ( *ele_idx < ele_alpha ) ); - - /* Step 3: Quantize Azimuth */ - az_alpha = 4 * npoints - 1; - - /* Convert azimuth in {-180,180} into {0,360} before quantization */ - if ( azimuth >= 0 ) - { - azi_val = azimuth; - } - else - { - azi_val = azimuth + 360.f; - } - - /* Obtain the index of quantized azimuth values */ - *azi_idx = (int16_t) ( ( ( azi_val / 360.f ) * az_alpha ) + 0.5f ); - if ( *azi_idx == az_alpha ) - { - /*wrap around the azimuth angle*/ - *azi_idx = 0; - } - assert( ( 0 <= *azi_idx ) && ( *azi_idx < az_alpha ) ); - - return; -} - - -/*------------------------------------------------------------------------- - * ivas_param_ism_metadata_dtx_enc() - * - *-------------------------------------------------------------------------*/ - -void ivas_param_ism_metadata_dtx_enc( - BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */ - ISM_METADATA_HANDLE hIsmMeta[], /* i : ISM metadata handles */ - ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */ - PARAM_ISM_CONFIG_HANDLE hParamIsm /* i : Param ISM Enc Handle */ -#ifdef NCHAN_ISM_PARAMETER - , - const int16_t nchan_ism /* i : number of ISM channels */ -#endif -) -{ - int16_t i, nBits, nBits_unused; - int16_t azi_idx, ele_idx; - int16_t coh_idx; - - nBits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC; - nBits -= SID_FORMAT_NBITS; - - /* Transmit the metadata */ - /* write number of objects - unary coding */ -#ifdef NCHAN_ISM_PARAMETER - for ( i = 0; i < nchan_ism; i++ ) -#else - for ( i = 1; i < hParamIsm->num_obj; i++ ) -#endif - { - push_indice( hBstr, IND_ISM_NUM_OBJECTS, 1, 1 ); - } - push_indice( hBstr, IND_ISM_NUM_OBJECTS, 0, 1 ); - - /* write sce id */ - push_indice( hBstr, IND_ISM_SCE_ID_DTX, hISMDTX->sce_id_dtx, 1 ); - - /* write noisy speech flag */ - push_indice( hBstr, IND_ISM_NOISY_SPEECH_FLAG, hParamIsm->flag_noisy_speech, 1 ); - - /* quantize and write coherence */ - coh_idx = (int16_t) ( hISMDTX->coh[0] * ( ( 1 << PARAM_ISM_DTX_COH_SCA_BITS ) - 1 ) + 0.5f ); - assert( ( coh_idx >= 0 ) && ( coh_idx <= ( ( 1 << PARAM_ISM_DTX_COH_SCA_BITS ) - 1 ) ) ); - push_indice( hBstr, IND_ISM_DTX_COH_SCA, coh_idx, PARAM_ISM_DTX_COH_SCA_BITS ); - -#ifdef NCHAN_ISM_PARAMETER - for ( i = 0; i < nchan_ism; i++ ) -#else - for ( i = 0; i < hParamIsm->num_obj; i++ ) -#endif - { - ivas_param_ism_enc_quantize_DOA_dtx( hIsmMeta[i]->azimuth, hIsmMeta[i]->elevation, PARAM_ISM_DTX_AZI_BITS, PARAM_ISM_DTX_ELE_BITS, &azi_idx, &ele_idx ); - push_indice( hBstr, IND_ISM_AZIMUTH, azi_idx, PARAM_ISM_DTX_AZI_BITS ); - push_indice( hBstr, IND_ISM_ELEVATION, ele_idx, PARAM_ISM_DTX_ELE_BITS ); - } - -#ifdef DEBUG_MODE_PARAM_ISM - dbgwrite( &( hParamIsm->coh ), sizeof( float ), 1, 1, "./res/ParamISM_coh_enc.dat" ); -#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; - } - -#ifdef DEBUGGING - assert( hBstr->nb_bits_tot == nBits ); -#endif - - return; -} -#endif - /*-------------------------------------------------------------------* * ivas_param_ism_compute_noisy_speech_flag() * @@ -636,31 +455,38 @@ void ivas_param_ism_compute_noisy_speech_flag( st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i + 1]; } - /* 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 ) + /* Set flag_noisy_speech to 0 for cases where object energies are not roughly equal */ + if ( !st_ivas->hDirAC->hParamIsm->flag_equal_energy ) { - 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; + st_ivas->hDirAC->hParamIsm->flag_noisy_speech = 0; + } + else + { + /* 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 ) { - st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = 0; + 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] = 1; + st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = 0; } - } - else - { - st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = 0; - } - - /* 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]; + /* Do a decision based on hysteresis */ + 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; } diff --git a/lib_enc/ivas_lfe_enc.c b/lib_enc/ivas_lfe_enc.c index a14424774ffec7ed5270d26f8d46926c9568e53e..9a5b7549420355b92f1219f695e7f9205e2831b0 100644 --- a/lib_enc/ivas_lfe_enc.c +++ b/lib_enc/ivas_lfe_enc.c @@ -98,7 +98,11 @@ static void ivas_lfe_enc_quant( BSTR_ENC_HANDLE hBstr ) { int16_t bits_written; +#ifdef IND_LIST_DYN + int16_t nb_ind_tot; +#else int16_t next_ind_pos; +#endif uint16_t quant_strategy, write_bit; int16_t num_quant_strategies; int16_t shift_bits; @@ -117,7 +121,11 @@ static void ivas_lfe_enc_quant( num_quant_strategies = IVAS_MAX_NUM_QUANT_STRATS; shift_bits = IVAS_LFE_SHIFT_BITS; bits_written = hBstr->nb_bits_tot; +#ifdef IND_LIST_DYN + nb_ind_tot = hBstr->nb_ind_tot; +#else next_ind_pos = hBstr->next_ind; +#endif for ( quant_strategy = 0; quant_strategy < num_quant_strategies; quant_strategy++ ) @@ -243,7 +251,11 @@ static void ivas_lfe_enc_quant( } bits_written_arith_enc = hBstr->nb_bits_tot; +#ifdef IND_LIST_DYN + next_ind_pos_arith_enc = hBstr->nb_ind_tot; +#else next_ind_pos_arith_enc = hBstr->next_ind; +#endif push_next_indice( hBstr, coding_strategy, 1 ); base2_num_bits_tot = hBstr->nb_bits_tot - bits_written; @@ -259,13 +271,24 @@ static void ivas_lfe_enc_quant( { if ( quant_strategy == ( num_quant_strategies - 1 ) || ( ( target_bits + IVAS_LFE_ID_BITS ) >= base2_num_bits_tot ) ) { +#ifdef IND_LIST_DYN + /* reset bits buffer and code the indices with base 2 coding */ + for ( j = hBstr->nb_ind_tot - 1; j >= next_ind_pos_arith_enc; j-- ) + { + hBstr->ind_list[j].nb_bits = -1; + } + hBstr->nb_ind_tot = next_ind_pos_arith_enc; +#else /* reset bits buffer and code the indices with base 2 coding */ for ( j = hBstr->next_ind - 1; j >= next_ind_pos_arith_enc; j-- ) { hBstr->ind_list[j].nb_bits = -1; } +#endif hBstr->nb_bits_tot = bits_written_arith_enc; +#ifndef IND_LIST_DYN hBstr->next_ind = next_ind_pos_arith_enc; +#endif coding_strategy = 1; push_next_indice( hBstr, coding_strategy, 1 ); @@ -298,13 +321,21 @@ static void ivas_lfe_enc_quant( if ( quant_strategy < ( num_quant_strategies - 1 ) ) { /* reset all indices that were already written - TODO: maybe better store them temporarily first and write at the very end? */ +#ifdef IND_LIST_DYN + for ( j = hBstr->nb_ind_tot - 1; j >= nb_ind_tot; j-- ) +#else for ( j = hBstr->next_ind - 1; j >= next_ind_pos; j-- ) +#endif { hBstr->ind_list[j].nb_bits = -1; } hBstr->nb_bits_tot = bits_written; +#ifdef IND_LIST_DYN + hBstr->nb_ind_tot = nb_ind_tot; +#else hBstr->next_ind = next_ind_pos; +#endif } } } diff --git a/lib_enc/ivas_masa_enc.c b/lib_enc/ivas_masa_enc.c index fbb7af9ab4a3b42566b82e3c6f7fe953251b40b6..0c768f1a176107342df11f6df965acaa24998ab2 100644 --- a/lib_enc/ivas_masa_enc.c +++ b/lib_enc/ivas_masa_enc.c @@ -61,8 +61,12 @@ 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 ); -#ifdef FIX_382_MASA_META_FRAMING_ASYNC -static void average_masa_metadata( MASA_METADATA_FRAME *masaMetadata, float energy[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS] ); +static void average_masa_metadata( MASA_METADATA_FRAME *masaMetadata, float energy[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS] +#ifdef HR_METADATA + , + const SPHERICAL_GRID_DATA *sphGrid +#endif +); static void copy_masa_metadata_subframe( const MASA_METADATA_HANDLE hMetaFrom, const uint8_t sfFrom, MASA_METADATA_HANDLE hMetaTo, const uint8_t sfTo ); @@ -71,7 +75,8 @@ static void copy_masa_metadata( const MASA_METADATA_HANDLE hMetaFrom, MASA_METAD 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 ); -#endif + +static void masa_metadata_direction_alignment( MASA_ENCODER_HANDLE hMasa ); /*-----------------------------------------------------------------------* * Local constants @@ -131,16 +136,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 ); -#ifndef FIX_350_MASA_DELAY_COMP - if ( hEncoderConfig->ivas_format == MASA_FORMAT ) - { - for ( i = 0; i < st_ivas->nchan_transport; i++ ) - { - hMasa->data.delay_buffer[i] = (float *) 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 ); - } - } -#endif hMasa->data.onset_detector_1 = 0.0f; hMasa->data.onset_detector_2 = 0.0f; @@ -149,11 +144,14 @@ ivas_error ivas_masa_enc_open( hMasa->data.prevq_lfeToTotalEnergyRatio = 0.0f; hMasa->data.prevq_lfeIndex = 0; -#ifdef FIX_382_MASA_META_FRAMING_ASYNC hMasa->data.sync_state.prev_sim_stop = 0; hMasa->data.sync_state.prev_offset = 0; hMasa->data.sync_state.frame_mode = MASA_FRAME_4SF; -#endif + + 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 ); st_ivas->hMasa = hMasa; @@ -169,11 +167,6 @@ ivas_error ivas_masa_enc_open( void ivas_masa_enc_close( MASA_ENCODER_HANDLE *hMasa /* i/o: MASA metadata structure */ -#ifndef FIX_350_MASA_DELAY_COMP - , - const int16_t nchan_transport, /* i : Number of transport channels */ - const IVAS_FORMAT ivas_format /* i : IVAS format */ -#endif ) { int16_t i; @@ -188,16 +181,6 @@ void ivas_masa_enc_close( deleteCldfb( &( ( *hMasa )->data.cldfbAnaEnc[i] ) ); } -#ifndef FIX_350_MASA_DELAY_COMP - if ( ivas_format == MASA_FORMAT ) - { - for ( i = 0; i < nchan_transport; i++ ) - { - free( ( *hMasa )->data.delay_buffer[i] ); - ( *hMasa )->data.delay_buffer[i] = NULL; - } - } -#endif free( ( *hMasa ) ); ( *hMasa ) = NULL; @@ -263,10 +246,20 @@ ivas_error ivas_masa_encode( mvr2r( hMasa->masaMetadata.directional_meta[i].azimuth[j], h_orig_metadata[i].azimuth[j], MASA_FREQUENCY_BANDS ); mvr2r( hMasa->masaMetadata.directional_meta[i].elevation[j], h_orig_metadata[i].elevation[j], MASA_FREQUENCY_BANDS ); mvr2r( hMasa->masaMetadata.directional_meta[i].energy_ratio[j], h_orig_metadata[i].energy_ratio[j], MASA_FREQUENCY_BANDS ); +#ifdef HR_METADATA + mvs2s( (int16_t *) ( hMasa->masaMetadata.directional_meta[i].spherical_index[j] ), (int16_t *) ( h_orig_metadata[i].spherical_index[j] ), MASA_FREQUENCY_BANDS ); +#endif } } } +#ifdef HR_METADATA + if ( ivas_format == MASA_FORMAT && ivas_total_brate >= IVAS_384k ) + { + hMasa->config.mergeRatiosOverSubframes = 0; + } +#endif + /* Combine frequency bands and sub-frames */ combine_freqbands_and_subframes( hMasa ); } @@ -330,7 +323,26 @@ ivas_error ivas_masa_encode( } /* Encode metadata */ - ivas_qmetadata_enc_encode( hMetaData, hQMetaData ); +#ifdef HR_METADATA + if ( ivas_total_brate >= IVAS_384k ) + { + if ( ivas_total_brate >= IVAS_512k ) + { + ivas_qmetadata_enc_encode_hr_384_512( hMetaData, hQMetaData, 16, 4 ); + } + else + { + ivas_qmetadata_enc_encode_hr_384_512( hMetaData, hQMetaData, 11, 3 ); + } + } + else + { +#endif + ivas_qmetadata_enc_encode( hMetaData, hQMetaData, + 0 ); +#ifdef HR_METADATA + } +#endif *nb_bits_metadata = hMetaData->nb_bits_tot; @@ -433,27 +445,10 @@ void ivas_masa_estimate_energy( for ( ts = mrange[0]; ts < mrange[1]; ts++ ) { -#ifdef FIX_350_MASA_DELAY_COMP for ( i = 0; i < nchan_transport; i++ ) { cldfbAnalysis_ts( &( data_f[i][l_ts * ts] ), Input_RealBuffer[i], Input_ImagBuffer[i], l_ts, hMasa->data.cldfbAnaEnc[i] ); } -#else - 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++ ) - { - cldfbAnalysis_ts( &( data_f[i][l_ts * ( ts - MASA_ENC_DELAY_SLOTS )] ), Input_RealBuffer[i], Input_ImagBuffer[i], l_ts, hMasa->data.cldfbAnaEnc[i] ); - } - } -#endif for ( band_m_idx = 0; band_m_idx < MASA_FREQUENCY_BANDS; band_m_idx++ ) { @@ -481,12 +476,6 @@ void ivas_masa_estimate_energy( } } -#ifndef FIX_350_MASA_DELAY_COMP - 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 ); - } -#endif return; } @@ -510,7 +499,14 @@ ivas_error ivas_masa_enc_config( uint8_t coherencePresent; uint8_t isActualTwoDir; /* Flag to tell that when there are two directions present in metadata, they both contain meaningful information. */ int32_t ivas_total_brate; +#ifdef FIX_HBR_MASAMETA + uint8_t maxBand; + int16_t maxBin, sf; +#endif ivas_error error; +#ifdef HR_METADATA + SPHERICAL_GRID_DATA *sphGrid; +#endif error = IVAS_ERR_OK; @@ -525,14 +521,36 @@ ivas_error ivas_masa_enc_config( if ( ivas_format == MASA_FORMAT ) { -#ifdef FIX_382_MASA_META_FRAMING_ASYNC + masa_metadata_direction_alignment( hMasa ); + 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 ) { +#ifdef HR_METADATA + if ( ( sphGrid = (SPHERICAL_GRID_DATA *) malloc( sizeof( SPHERICAL_GRID_DATA ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA spherical grid\n" ) ); + } + + if ( ivas_total_brate == IVAS_512k ) + { + generate_gridEq( sphGrid ); + } + else + { + sphGrid->no_theta = 0; + } +#endif + /* average over sub-frames */ - average_masa_metadata( &( hMasa->masaMetadata ), hMasa->data.energy ); - } + average_masa_metadata( &( hMasa->masaMetadata ), hMasa->data.energy +#ifdef HR_METADATA + , + sphGrid #endif + ); + } /* Inspect metadata for parameter changes that affect coding. */ detect_metadata_composition( hMasa, &joinedSubframes, &coherencePresent, &isActualTwoDir ); @@ -623,10 +641,56 @@ ivas_error ivas_masa_enc_config( ivas_set_qmetadata_maxbit_req( hQMetaData, ivas_format ); -#ifdef FIX_350_MASA_DELAY_COMP - masa_sample_rate_band_correction( &( hMasa->config ), hMasa->data.band_mapping, hQMetaData, st_ivas->hEncoderConfig->input_Fs, NULL ); +#ifdef FIX_HBR_MASAMETA + /* Find maximum band usable */ + maxBin = (int16_t) ( st_ivas->hEncoderConfig->input_Fs * INV_CLDFB_BANDWIDTH ); + maxBand = 0; + while ( maxBand <= MASA_FREQUENCY_BANDS && MASA_band_grouping_24[maxBand] <= maxBin ) + { + maxBand++; + } + maxBand--; + + if ( ivas_total_brate > IVAS_256k ) + { + int16_t continueLoop; + continueLoop = 1; + while ( maxBand > 5 && continueLoop ) + { + for ( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ ) + { + if ( hMasa->data.energy[sf][maxBand - 1] > 100000 ) + { + continueLoop = 0; + break; + } + } + if ( continueLoop ) + { + maxBand--; + } + } + + if ( maxBand < MASA_MAXIMUM_CODING_SUBBANDS ) + { + st_ivas->hQMetaData->q_direction->cfg.inactiveBands = MASA_MAXIMUM_CODING_SUBBANDS - maxBand; + } + else + { + st_ivas->hQMetaData->q_direction->cfg.inactiveBands = 0; + } + } + + masa_sample_rate_band_correction( &( hMasa->config ), hMasa->data.band_mapping, hQMetaData, maxBand, ivas_total_brate > IVAS_256k, NULL ); + + if ( hMasa->config.numTwoDirBands >= hMasa->config.numCodingBands ) + { + hMasa->config.numTwoDirBands = hMasa->config.numCodingBands; + set_c( (int8_t *) hMasa->data.twoDirBands, 1, hMasa->config.numCodingBands ); + } + #else - 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 ); #endif /* Transmit stereo signals using a mono downmix at lowest bitrates */ @@ -734,8 +798,11 @@ static void combine_freqbands_and_subframes( } } } - +#ifdef FIX_HBR_MASAMETA + if ( numCodingBands <= MAX_REDUCED_NBANDS ) +#else if ( numCodingBands < MASA_FREQUENCY_BANDS ) +#endif { /* reduce metadata *frequency* resolution. time resolution is not touched */ for ( i = 0; i < numDirections; i++ ) @@ -1065,6 +1132,9 @@ static void move_metadata_to_qmetadata( hQMeta->q_direction[dir].band_data[band].azimuth[sf] = hMeta->directional_meta[dir].azimuth[sf][band]; hQMeta->q_direction[dir].band_data[band].elevation[sf] = hMeta->directional_meta[dir].elevation[sf][band]; hQMeta->q_direction[dir].band_data[band].energy_ratio[sf] = hMeta->directional_meta[dir].energy_ratio[sf][band]; +#ifdef HR_METADATA + hQMeta->q_direction[dir].band_data[band].spherical_index[sf] = hMeta->directional_meta[dir].spherical_index[sf][band]; +#endif if ( hQMeta->q_direction[dir].coherence_band_data != NULL ) { hQMeta->q_direction[dir].coherence_band_data[band].spread_coherence[sf] = (uint8_t) roundf( hMeta->directional_meta[dir].spread_coherence[sf][band] * UINT8_MAX ); @@ -1121,18 +1191,12 @@ static void detect_metadata_composition( ) { MASA_METADATA_FRAME *hMeta; -#ifdef FIX_382_MASA_META_FRAMING_ASYNC int8_t sf, band, dir, numDir; -#else - int16_t sf, band, dir, numDir; -#endif int16_t nSubFrames; uint8_t dirValid[2] = { FALSE }; uint8_t cohPresent = FALSE; uint8_t sfDiffer = FALSE; -#ifdef FIX_382_MASA_META_FRAMING_ASYNC uint8_t sfSimilar; -#endif hMeta = &( hMasa->masaMetadata ); numDir = hMeta->descriptive_meta.numberOfDirections + 1; @@ -1197,7 +1261,6 @@ static void detect_metadata_composition( } /* Check if data over subframes is identical. Check is done by comparing to first subframe. */ -#ifdef FIX_382_MASA_META_FRAMING_ASYNC sfSimilar = TRUE; sf = 1; while ( ( sfSimilar == TRUE ) && ( sf < MAX_PARAM_SPATIAL_SUBFRAMES ) ) @@ -1206,54 +1269,6 @@ static void detect_metadata_composition( sf++; } sfDiffer = sfSimilar == TRUE ? FALSE : TRUE; -#else - dir = 0; - while ( sfDiffer == FALSE && dir < numDir ) - { - 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++; - } -#endif /* Further checks can be done with just one subframe if they are identical */ nSubFrames = sfDiffer == TRUE ? MAX_PARAM_SPATIAL_SUBFRAMES : 1; @@ -1799,7 +1814,6 @@ void ivas_masa_enc_reconfigure( } -#ifdef FIX_382_MASA_META_FRAMING_ASYNC /*-------------------------------------------------------------------* * average_masa_metadata() * @@ -1808,7 +1822,12 @@ void ivas_masa_enc_reconfigure( static void average_masa_metadata( MASA_METADATA_FRAME *hMeta, - float energy[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS] ) + float energy[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS] +#ifdef HR_METADATA + , + const SPHERICAL_GRID_DATA *Sph_Grid16 +#endif +) { int16_t i, j, k; float azi_rad, ele_rad; @@ -1855,7 +1874,13 @@ static void average_masa_metadata( 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; - +#ifdef HR_METADATA + if ( Sph_Grid16->no_theta > 0 ) + { + hMeta->directional_meta[i].spherical_index[j][k] = index_theta_phi_16( &( hMeta->directional_meta[i].elevation[j][k] ), + &( hMeta->directional_meta[i].azimuth[j][k] ), Sph_Grid16 ); + } +#endif 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 ); @@ -2197,4 +2222,173 @@ static void detect_framing_async( return; } + + +/*-------------------------------------------------------------------* + * 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; +#ifdef FIX_HBR_MASAMETA + uint16_t tmp_int_val; +#endif + 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; +#ifdef FIX_HBR_MASAMETA + tmp_int_val = hMeta->directional_meta[0].spherical_index[sf][band]; + hMeta->directional_meta[0].spherical_index[sf][band] = hMeta->directional_meta[1].spherical_index[sf][band]; + hMeta->directional_meta[1].spherical_index[sf][band] = tmp_int_val; #endif + 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; +} diff --git a/lib_enc/ivas_mc_param_enc.c b/lib_enc/ivas_mc_param_enc.c index db9945d0cec3cc358dcec3be5c7ddd917e750ad7..ff01bd3aa19dfd28470ea75a06a3094efb165f8d 100644 --- a/lib_enc/ivas_mc_param_enc.c +++ b/lib_enc/ivas_mc_param_enc.c @@ -140,7 +140,8 @@ ivas_error ivas_param_mc_enc_open( hParamMC->dmx_factors = ivas_param_mc_conf[config_index].dmx_fac; /* set FB config. */ - if ( ( error = ivas_fb_set_cfg( &fb_cfg, MC_FORMAT, SBA_MODE_DIRAC, nchan_inp, 0, 0, input_Fs ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_fb_set_cfg( &fb_cfg, MC_FORMAT, SBA_MODE_DIRAC, nchan_inp, 0, 0, input_Fs, + 0 ) ) != IVAS_ERR_OK ) { return error; } @@ -199,7 +200,7 @@ 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++ ) { - hParamMC->band_grouping[i] *= CLDFB_TO_MDFT_FAC; + hParamMC->band_grouping[i] *= PARAM_MC_CLDFB_TO_MDFT_FAC; } /* set correct coded band width */ @@ -335,7 +336,7 @@ ivas_error ivas_param_mc_enc_reconfig( /* parameter band grouping: 60 band CLDFB to 240 band MDFT resolution */ for ( i = 0; i < hParamMC->hMetadataPMC.num_parameter_bands + 1; i++ ) { - hParamMC->band_grouping[i] *= CLDFB_TO_MDFT_FAC; + hParamMC->band_grouping[i] *= PARAM_MC_CLDFB_TO_MDFT_FAC; } /* set correct coded band width */ @@ -673,7 +674,8 @@ static void ivas_param_mc_param_est_enc( for ( ts = 0; ts < start_ts; ts++ ) { - ivas_fb_mixer_update_prior_input( hParamMC->hFbMixer, pcm_in, l_ts ); + ivas_fb_mixer_update_prior_input( hParamMC->hFbMixer, pcm_in, l_ts, + hParamMC->hFbMixer->fb_cfg->num_in_chans ); for ( i = 0; i < nchan_input; i++ ) { pcm_in[i] += l_ts; @@ -682,8 +684,11 @@ static void ivas_param_mc_param_est_enc( for ( ts = start_ts; ts < num_time_slots; ts++ ) { - 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 ); - ivas_fb_mixer_update_prior_input( hParamMC->hFbMixer, pcm_in, l_ts ); + ivas_fb_mixer_get_windowed_fr( hParamMC->hFbMixer, pcm_in, p_slot_frame_f_real, p_slot_frame_f_imag, l_ts, l_ts, + hParamMC->hFbMixer->fb_cfg->num_in_chans ); + ivas_fb_mixer_update_prior_input( hParamMC->hFbMixer, pcm_in, l_ts, + hParamMC->hFbMixer->fb_cfg->num_in_chans ); + for ( i = 0; i < nchan_input; i++ ) { pcm_in[i] += l_ts; diff --git a/lib_enc/ivas_mc_paramupmix_enc.c b/lib_enc/ivas_mc_paramupmix_enc.c new file mode 100644 index 0000000000000000000000000000000000000000..997b0043ac4f62e51363c6fb40569e2eb03e9b34 --- /dev/null +++ b/lib_enc/ivas_mc_paramupmix_enc.c @@ -0,0 +1,849 @@ +/****************************************************************************************************** + + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. 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 "cnst.h" +#include "rom_enc.h" +#include "rom_com.h" +#include "prot.h" +#include "ivas_prot.h" +#include "ivas_cnst.h" +#include "ivas_rom_com.h" +#include "ivas_rom_enc.h" +#ifdef DEBUGGING +#include "debug.h" +#endif +#ifdef DEBUG_PLOT +#include "deb_out.h" +#endif +#include "wmc_auto.h" + +/*------------------------------------------------------------------------- + * Local function prototypes + *------------------------------------------------------------------------*/ + +static void ivas_mc_paramupmix_dmx( MC_PARAMUPMIX_ENC_HANDLE hMCParamUpmix, float data_f[][L_FRAME48k], const int16_t input_frame ); + +static void ivas_mc_paramupmix_param_est_enc( MC_PARAMUPMIX_ENC_HANDLE hMCParamUpmix, float input_frame_t[][L_FRAME48k], const int16_t input_frame, float alphas[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS], float betas[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS] ); + +static void get_huff_table( PAR_TYPE par_type, QUANT_TYPE quant_type, HUFF_TAB *df0, HUFF_TAB *df, HUFF_TAB *dt ); + +static void write_huff_bits( int32_t value, uint16_t length, uint16_t bit_buffer[MC_PARAMUPMIX_MAX_BITS], int16_t *bit_pos ); + +static void huffman_encode( int16_t bdfOnly, int16_t bdtAllowed, int16_t nv, int16_t ivStart, int32_t *vqPrev, int32_t *vq, PAR_TYPE parType, QUANT_TYPE quant_type, int16_t nq, uint16_t bit_buffer[MC_PARAMUPMIX_MAX_BITS], int16_t *bit_pos ); + +static void put_ec_data( MC_PARAMUPMIX_ENC_HANDLE hMCParamUpmix, int16_t ch, float pars[IVAS_MAX_NUM_BANDS], float alphas[IVAS_MAX_NUM_BANDS], PAR_TYPE parType, uint16_t bit_buffer[MC_PARAMUPMIX_MAX_BITS], int16_t *bit_pos ); + +static void quantize_alpha( int16_t nv, const float *alpha, QUANT_TYPE quant_type, int16_t *pnq, int32_t aq[IVAS_MAX_NUM_BANDS], float *adeq ); + +static void quantize_pars( int16_t nv, const float *v, int16_t nq, const float *data, int32_t vq[IVAS_MAX_NUM_BANDS], float *vdeq ); + +static void quantize_pars( int16_t nv, const float *v, int16_t nq, const float *data, int32_t vq[IVAS_MAX_NUM_BANDS], float *vdeq ); + +/*------------------------------------------------------------------------- + * ivas_mc_paramupmix_enc() + * + * MC ParamUpmix Encoder main encoding function + *------------------------------------------------------------------------*/ + +void ivas_mc_paramupmix_enc( + Encoder_Struct *st_ivas, /* i/o: IVAS Encoder handle */ + BSTR_ENC_HANDLE hBStr, /* 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 */ +) +{ + MC_PARAMUPMIX_ENC_HANDLE hMCParamUpmix; + int16_t i; + float alphas[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS]; + float betas[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS]; + uint16_t bit_buffer[MC_PARAMUPMIX_MAX_BITS]; + int16_t bit_pos; + + push_wmops( "mc_paramupmix_enc" ); + + hMCParamUpmix = st_ivas->hMCParamUpmix; + bit_pos = 0; + + /* Parameter estimation */ + ivas_mc_paramupmix_param_est_enc( hMCParamUpmix, data_f, input_frame, alphas, betas ); + + for ( i = 0; i < MC_PARAMUPMIX_COMBINATIONS; i++ ) + { + put_ec_data( hMCParamUpmix, i, alphas[i], NULL, ALPHA, bit_buffer, &bit_pos ); + put_ec_data( hMCParamUpmix, i, betas[i], alphas[i], BETA, bit_buffer, &bit_pos ); + } + + /* push the PARAM UPMIX MC side info from the temporary buffer into the medatdata bitstream*/ + push_next_bits( hBStr, bit_buffer, bit_pos ); + + /* DMX generation*/ + ivas_mc_paramupmix_dmx( hMCParamUpmix, data_f, input_frame ); + + pop_wmops(); + + return; +} + +/*------------------------------------------------------------------------- + * ivas_mc_paramupmix_enc_open() + * + * Initialize MC ParamUpmix encoder handle + *------------------------------------------------------------------------*/ + +ivas_error ivas_mc_paramupmix_enc_open( + Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */ +) +{ + IVAS_FB_CFG *fb_cfg; + MC_PARAMUPMIX_ENC_HANDLE hMCParamUpmix; + int32_t input_Fs; + int32_t input_frame; + int16_t i, k, b, j; + ivas_error error; + + error = IVAS_ERR_OK; + input_Fs = st_ivas->hEncoderConfig->input_Fs; + input_frame = (int32_t) st_ivas->hEncoderConfig->input_Fs / FRAMES_PER_SEC; + + /* Sanity Checks */ + if ( ( hMCParamUpmix = (MC_PARAMUPMIX_ENC_HANDLE) malloc( sizeof( MC_PARAMUPMIX_ENC_DATA ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MC_MODE_PARAMUPMIX\n" ) ); + } + for ( i = 0; i < MC_PARAMUPMIX_COMBINATIONS; i++ ) + { + for ( k = 0; k < MC_PARAMUPMIX_NCH; k++ ) + { + if ( ( hMCParamUpmix->midside[i][k] = (float *) malloc( sizeof( float ) * input_frame ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MC_MODE_PARAMUPMIX\n" ) ); + } + set_zero( hMCParamUpmix->midside[i][k], (int16_t) input_frame ); + } + } + hMCParamUpmix->first_frame = 1; + + /* MC_LS_SETUP_5_1_2 is the only current configuration */ + st_ivas->nchan_transport = MC_PARAMUPMIX_MAX_TRANSPORT_CHANS; + + /* set core coder dependent on the number of transport channels */ + switch ( st_ivas->nchan_transport ) + { + case 8: + st_ivas->nCPE = 4; + 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 MC PARAM UPMIX MODE!\n" ); +#endif + } + + + /* Transient Detector handle */ + for ( i = 0; i < MC_PARAMUPMIX_COMBINATIONS * MC_PARAMUPMIX_NCH; i++ ) + { + if ( ( error = ivas_transient_det_open( &( hMCParamUpmix->hTranDet[i] ), input_Fs ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + /* set FB config. */ + /* need to set num output channels to a value > 0 to get pFb != NULL */ + if ( ( error = ivas_fb_set_cfg( &fb_cfg, MC_FORMAT, SBA_MODE_SPAR, MC_PARAMUPMIX_COMBINATIONS * MC_PARAMUPMIX_NCH, MC_PARAMUPMIX_COMBINATIONS, 0, input_Fs, + 0 ) ) != IVAS_ERR_OK ) + { + return error; + } + fb_cfg->remix_order = mc_paramupmix_fb_remix_order; + /* override latency, could be moved to ivas_fb_set_cfg */ + /* assuming parameters are calculated at end of frame, compensate for MCT delay and half of decoder fb */ + /* still 1.5ms off, since MCT delay is not large enough */ + /* param at end of frame */ + fb_cfg->prior_input_length = (int16_t) ( NS2SA( input_Fs, 12000000L ) + NS2SA( input_Fs, DELAY_FB_4_NS / 2 ) - input_frame / 2 - NS2SA( input_Fs, DELAY_FB_1_NS / 2 ) ); + fb_cfg->prior_input_length = (int16_t) max( fb_cfg->prior_input_length, input_frame / MAX_PARAM_SPATIAL_SUBFRAMES ); + + /* Allocate and initialize FB mixer handle */ + if ( ( error = ivas_FB_mixer_open( &( hMCParamUpmix->hFbMixer ), input_Fs, fb_cfg, 0 ) ) != IVAS_ERR_OK ) + { + return error; + } + + for ( i = 0; i < MC_PARAMUPMIX_COMBINATIONS; i++ ) + { + /* Covariance handle */ + if ( ( error = ivas_spar_covar_enc_open( &( hMCParamUpmix->hCovEnc[i] ), hMCParamUpmix->hFbMixer->pFb, input_Fs, MC_PARAMUPMIX_NCH + 1, st_ivas->hEncoderConfig->ivas_total_brate ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + + for ( b = 0; b < MC_PARAMUPMIX_COMBINATIONS; b++ ) + { + if ( ( hMCParamUpmix->cov_real[b] = (float ***) malloc( MC_PARAMUPMIX_NCH * sizeof( float ** ) ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR cov real matrix" ); + } + for ( i = 0; i < MC_PARAMUPMIX_NCH; i++ ) + { + if ( ( hMCParamUpmix->cov_real[b][i] = (float **) malloc( MC_PARAMUPMIX_NCH * sizeof( float * ) ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR cov real matrix" ); + } + for ( j = 0; j < MC_PARAMUPMIX_NCH; j++ ) + { + if ( ( hMCParamUpmix->cov_real[b][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 ( ( hMCParamUpmix->cov_dtx_real[b] = (float ***) malloc( MC_PARAMUPMIX_NCH * sizeof( float ** ) ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR cov dtx real matrix" ); + } + for ( i = 0; i < MC_PARAMUPMIX_NCH; i++ ) + { + if ( ( hMCParamUpmix->cov_dtx_real[b][i] = (float **) malloc( MC_PARAMUPMIX_NCH * sizeof( float * ) ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR cov dtx real matrix" ); + } + for ( j = 0; j < MC_PARAMUPMIX_NCH; j++ ) + { + if ( ( hMCParamUpmix->cov_dtx_real[b][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" ); + } + } + } + } + + st_ivas->hMCParamUpmix = hMCParamUpmix; + + return error; +} + +/*------------------------------------------------------------------------- + * ivas_mc_paramupmix_enc_close() + * + * Close MC Param-Upmix encoder handle + *------------------------------------------------------------------------*/ + +void ivas_mc_paramupmix_enc_close( + MC_PARAMUPMIX_ENC_HANDLE *hMCParamUpmix, /* i/o: MC Param-Upmix encoder handle */ + const int32_t sampling_rate ) +{ + int16_t i, k; + int16_t b, j; + + if ( hMCParamUpmix == NULL || *hMCParamUpmix == NULL ) + { + return; + } + for ( b = 0; b < MC_PARAMUPMIX_COMBINATIONS; b++ ) + { + if ( ( *hMCParamUpmix )->cov_real[b] != NULL ) + { + for ( i = 0; i < MC_PARAMUPMIX_NCH; i++ ) + { + if ( ( *hMCParamUpmix )->cov_real[b][i] != NULL ) + { + for ( j = 0; j < MC_PARAMUPMIX_NCH; j++ ) + { + if ( ( *hMCParamUpmix )->cov_real[b][i][j] != NULL ) + { + free( ( *hMCParamUpmix )->cov_real[b][i][j] ); + } + } + free( ( *hMCParamUpmix )->cov_real[b][i] ); + } + } + free( ( *hMCParamUpmix )->cov_real[b] ); + } + if ( ( *hMCParamUpmix )->cov_dtx_real[b] != NULL ) + { + for ( i = 0; i < MC_PARAMUPMIX_NCH; i++ ) + { + if ( ( *hMCParamUpmix )->cov_dtx_real[b][i] != NULL ) + { + for ( j = 0; j < MC_PARAMUPMIX_NCH; j++ ) + { + if ( ( *hMCParamUpmix )->cov_dtx_real[b][i][j] != NULL ) + { + free( ( *hMCParamUpmix )->cov_dtx_real[b][i][j] ); + } + } + free( ( *hMCParamUpmix )->cov_dtx_real[b][i] ); + } + } + free( ( *hMCParamUpmix )->cov_dtx_real[b] ); + } + } + + for ( i = 0; i < MC_PARAMUPMIX_COMBINATIONS; i++ ) + { + for ( k = 0; k < MC_PARAMUPMIX_NCH; k++ ) + { + free( ( *hMCParamUpmix )->midside[i][k] ); + } + } + + for ( i = 0; i < MC_PARAMUPMIX_COMBINATIONS * MC_PARAMUPMIX_NCH; i++ ) + { + ivas_transient_det_close( &( *hMCParamUpmix )->hTranDet[i] ); + } + + if ( ( *hMCParamUpmix )->hFbMixer != NULL ) + { + ivas_FB_mixer_close( &( *hMCParamUpmix )->hFbMixer, sampling_rate, 0 ); + } + + for ( i = 0; i < MC_PARAMUPMIX_COMBINATIONS; i++ ) + { + /* Covariance handle */ + if ( ( *hMCParamUpmix )->hCovEnc[i] != NULL ) + { + ivas_spar_covar_enc_close( &( *hMCParamUpmix )->hCovEnc[i], ( MC_PARAMUPMIX_NCH + 1 ) ); + } + } + + free( *hMCParamUpmix ); + *hMCParamUpmix = NULL; + return; +} + +/*------------------------------------------------------------------------- + * ivas_mc_paramupmix_getNumTransportChannels() + * + * + *------------------------------------------------------------------------*/ + +/* r : number of IVAS transport channels */ +int16_t ivas_mc_paramupmix_getNumTransportChannels() +{ + int16_t nchan_transport; + + /* LFE not included */ + nchan_transport = MC_PARAMUPMIX_MAX_TRANSPORT_CHANS - 1; /*5_1_2*/ + + return nchan_transport; +} + + +/*****************************************************************************************/ +/* local functions */ +/*****************************************************************************************/ +static void get_huff_table( + PAR_TYPE par_type, + QUANT_TYPE quant_type, + HUFF_TAB *df0, + HUFF_TAB *df, + HUFF_TAB *dt ) +{ + switch ( par_type ) + { + case ALPHA: + df0->value = huff_alpha_table[quant_type].df0.value; + df0->length = huff_alpha_table[quant_type].df0.length; + df->value = huff_alpha_table[quant_type].df.value; + df->length = huff_alpha_table[quant_type].df.length; + dt->value = huff_alpha_table[quant_type].dt.value; + dt->length = huff_alpha_table[quant_type].dt.length; + break; + case BETA: + df0->value = huff_beta_table[quant_type].df0.value; + df0->length = huff_beta_table[quant_type].df0.length; + df->value = huff_beta_table[quant_type].df.value; + df->length = huff_beta_table[quant_type].df.length; + dt->value = huff_beta_table[quant_type].dt.value; + dt->length = huff_beta_table[quant_type].dt.length; + break; + } +} + +static void write_huff_bits( + int32_t value, + uint16_t length, + uint16_t bit_buffer[MC_PARAMUPMIX_MAX_BITS], + int16_t *bit_pos ) +{ + int16_t k; + for ( k = length - 1; k >= 0; k-- ) + { + bit_buffer[( *bit_pos )++] = (uint16_t) ( ( value >> k ) & 1 ); + } +} + +static void huffman_encode( + int16_t bdfOnly, + int16_t bdtAllowed, + int16_t nv, + int16_t ivStart, + int32_t *vqPrev, + int32_t *vq, + PAR_TYPE parType, + QUANT_TYPE quant_type, + int16_t nq, + uint16_t bit_buffer[MC_PARAMUPMIX_MAX_BITS], + int16_t *bit_pos ) +{ + int16_t iv, ndf, ndt; + int32_t icode; + int16_t offset; + HUFF_TAB df0, df, dt; + + get_huff_table( parType, quant_type, &df0, &df, &dt ); + + offset = nq - 1; /* range [-(nquant - 1), nquant - 1] */ + + /* Get code length for time and freq diff coding */ + ndf = 0; + ndt = 0; + for ( iv = ivStart; iv < nv; iv++ ) + { + if ( iv == ivStart ) + { + icode = vq[iv]; + ndf += df0.length[icode]; + } + else + { + icode = vq[iv] - vq[iv - 1] + offset; + ndf += df.length[icode]; + } + + icode = vq[iv] - vqPrev[iv] + offset; + ndt += dt.length[icode]; + } + + if ( !bdtAllowed ) /* Time diff not allowed due to conformance or other reason even if bdfOnly = 0 */ + { + ndt = ndf + 1; + } + + /* Write the bitstream */ + if ( bdfOnly || ndf < ndt ) + { + bit_buffer[( *bit_pos )++] = (uint16_t) 0 & 1; + for ( iv = ivStart; iv < nv; iv++ ) + { + if ( iv == ivStart ) + { + icode = vq[iv]; + write_huff_bits( df0.value[icode], df0.length[icode], bit_buffer, bit_pos ); + } + else + { + icode = vq[iv] - vq[iv - 1] + offset; + write_huff_bits( df.value[icode], df.length[icode], bit_buffer, bit_pos ); + } + } + } + else + { + bit_buffer[( *bit_pos )++] = (uint16_t) 1 & 1; + for ( iv = ivStart; iv < nv; iv++ ) + { + icode = vq[iv] - vqPrev[iv] + offset; + if ( icode < 0 || icode >= 2 * nq - 1 ) + { + assert( 0 ); + } + write_huff_bits( dt.value[icode], dt.length[icode], bit_buffer, bit_pos ); + } + } +} + +static void quantize_pars( + int16_t nv, + const float *v, + int16_t nq, + const float *data, + int32_t vq[IVAS_MAX_NUM_BANDS], + float *vdeq ) +{ + int16_t iv, iq, iq0, iq1; + + for ( iv = 0; iv < nv; iv++ ) + { + iq0 = 0; + iq1 = nq - 1; + + while ( iq1 - iq0 > 1 ) + { + iq = ( iq0 + iq1 ) / 2; + if ( v[iv] < data[iq] ) + { + iq1 = iq; + } + else + { + iq0 = iq; + } + } + + if ( fabs( v[iv] - data[iq0] ) < fabs( v[iv] - data[iq1] ) ) + { + vq[iv] = iq0; + vdeq[iv] = data[iq0]; + } + else + { + vq[iv] = iq1; + vdeq[iv] = data[iq1]; + } + } +} + +static void quantize_alpha( + int16_t nv, + const float *alpha, + QUANT_TYPE quant_type, + int16_t *pnq, + int32_t aq[IVAS_MAX_NUM_BANDS], + float *adeq ) +{ + int16_t nq; + const float *data; + + nq = alpha_quant_table[quant_type].nquant; + data = alpha_quant_table[quant_type].data; + + quantize_pars( nv, alpha, nq, data, aq, adeq ); + + *pnq = nq; +} + +static void quantize_beta( + int16_t nv, + const float *beta, + const int32_t aq[IVAS_MAX_NUM_BANDS], + QUANT_TYPE quant_type, + int16_t *pnq, + int32_t bq[IVAS_MAX_NUM_BANDS], + float *bdeq ) +{ + int16_t iv, iq, iq0, iq1; + ACPL_QUANT_TABLE *tables = beta_quant_table[quant_type]; + ACPL_QUANT_TABLE quant_table; + const int16_t qmap[2][33] = { { 0, 1, 2, 3, 4, 5, 6, 7, 8, 7, 6, 5, 4, 3, 2, 1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 7, 6, 5, 4, 3, 2, 1, 0 }, + { 0, 1, 2, 3, 4, 3, 2, 1, 0, 1, 2, 3, 4, 3, 2, 1, 0 } }; + for ( iv = 0; iv < nv; iv++ ) + { + quant_table = tables[qmap[quant_type][aq[iv]]]; + + iq0 = 0; + iq1 = quant_table.nquant - 1; + + while ( iq1 - iq0 > 1 ) + { + iq = ( iq0 + iq1 ) / 2; + if ( beta[iv] < quant_table.data[iq] ) + { + iq1 = iq; + } + else + { + iq0 = iq; + } + } + + if ( fabs( beta[iv] - quant_table.data[iq0] ) < fabs( beta[iv] - quant_table.data[iq1] ) ) + { + bq[iv] = iq0; + bdeq[iv] = quant_table.data[iq0]; + } + else + { + bq[iv] = iq1; + bdeq[iv] = quant_table.data[iq1]; + } + } + + *pnq = beta_quant_table[quant_type][0].nquant; +} + +static void put_ec_data( + MC_PARAMUPMIX_ENC_HANDLE hMCParamUpmix, + int16_t ch, + float pars[IVAS_MAX_NUM_BANDS], + float alphas[IVAS_MAX_NUM_BANDS], + PAR_TYPE parType, + uint16_t bit_buffer[MC_PARAMUPMIX_MAX_BITS], + int16_t *bit_pos ) +{ + int16_t npar = IVAS_MAX_NUM_BANDS; + int16_t onlyFreq = 1; + int16_t nq; + QUANT_TYPE quant_type = FINE; + int32_t alphaQuant[IVAS_MAX_NUM_BANDS]; + int32_t betaQuant[IVAS_MAX_NUM_BANDS]; + float alphaDequant[IVAS_MAX_NUM_BANDS]; + float betaDequant[IVAS_MAX_NUM_BANDS]; + + if ( parType == ALPHA ) + { + quantize_alpha( npar, pars, quant_type, &nq, alphaQuant, alphaDequant ); + } + else + { + quantize_alpha( npar, alphas, quant_type, &nq, alphaQuant, alphaDequant ); + quantize_beta( npar, pars, alphaQuant, quant_type, &nq, betaQuant, betaDequant ); + } + if ( hMCParamUpmix->first_frame ) + { + mvl2l( &( alphaQuant[0] ), &( hMCParamUpmix->alpha_quant_prev[ch][0] ), IVAS_MAX_NUM_BANDS ); + if ( parType == BETA ) + { + mvl2l( &( betaQuant[0] ), &( hMCParamUpmix->beta_quant_prev[ch][0] ), IVAS_MAX_NUM_BANDS ); + if ( ch == ( MC_PARAMUPMIX_COMBINATIONS - 1 ) ) + { + hMCParamUpmix->first_frame = 0; + } + } + } + + /* Always one parameter set per frame for transient frames. Original PS framing is used internally. */ + if ( parType == ALPHA ) + { + huffman_encode( onlyFreq, 1, npar, 0, hMCParamUpmix->alpha_quant_prev[ch], alphaQuant, ALPHA, quant_type, nq, bit_buffer, bit_pos ); + } + else + { + huffman_encode( onlyFreq, 1, npar, 0, hMCParamUpmix->beta_quant_prev[ch], betaQuant, BETA, quant_type, nq, bit_buffer, bit_pos ); + } + + if ( parType == ALPHA ) + { + mvl2l( alphaQuant, hMCParamUpmix->alpha_quant_prev[ch], IVAS_MAX_NUM_BANDS ); + } + else + { + mvl2l( betaQuant, hMCParamUpmix->beta_quant_prev[ch], IVAS_MAX_NUM_BANDS ); + } +} + +/*------------------------------------------------------------------------- + * ivas_mc_paramupmix_dmx() + * + * Computes the time domain down mix signal + *------------------------------------------------------------------------*/ + +static void ivas_mc_paramupmix_dmx( + MC_PARAMUPMIX_ENC_HANDLE hMCParamUpmix, /* i/o: MC ParamUpmix encoder handle */ + float data_f[][L_FRAME48k], /* i/o : Input, downmix out */ + const int16_t input_frame /* i : Input frame length */ +) +{ + int16_t i, l; + int16_t chan1s[4] = { 4, 5, 8, 9 }; + int16_t chan2s[4] = { 6, 7, 10, 11 }; + int16_t chanOut[4] = { 4, 5, 6, 7 }; + int16_t chanZero[4] = { 8, 9, 10, 11 }; + + /* boxes = { 0 1 2 3 [4 6] [5 7] [8 10] [9 11] }; */ + /* 9+11 -> 7 */ + /* 8+10 -> 6 */ + /* 5+7 -> 5 */ + /* 4+6 -> 4 */ + for ( i = 0; i < MC_PARAMUPMIX_COMBINATIONS; i++ ) + { + for ( l = 0; l < input_frame; l++ ) + { + /* mid */ + hMCParamUpmix->midside[i][0][l] = ( data_f[chan1s[i]][l] + data_f[chan2s[i]][l] ) * (float) 0.5; + /* side */ + hMCParamUpmix->midside[i][1][l] = ( data_f[chan1s[i]][l] - data_f[chan2s[i]][l] ) * (float) 0.5; + data_f[chanOut[i]][l] = hMCParamUpmix->midside[i][0][l]; + } + } + for ( i = 0; i < MC_PARAMUPMIX_COMBINATIONS; i++ ) + { + set_zero( data_f[chanZero[i]], input_frame ); + } + return; +} + + +/*------------------------------------------------------------------------- + * ivas_mc_paramupmix_param_est_enc() + * + * run the CLDFB analysis on the input signal + * estimate the input and down mix covariances + *------------------------------------------------------------------------*/ + +static void ivas_mc_paramupmix_param_est_enc( + MC_PARAMUPMIX_ENC_HANDLE hMCParamUpmix, /* i/o: MC Param-Upmix encoder handle */ + float input_frame_t[][L_FRAME48k], /* i : Input frame in the time domain */ + const int16_t input_frame, /* i : Input frame length */ + float alphas[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS], + float betas[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS] ) +{ + float *pcm_in[MC_PARAMUPMIX_COMBINATIONS * MC_PARAMUPMIX_NCH]; + float fr_realbuffer[MC_PARAMUPMIX_COMBINATIONS * MC_PARAMUPMIX_NCH][L_FRAME48k]; + float fr_imagbuffer[MC_PARAMUPMIX_COMBINATIONS * MC_PARAMUPMIX_NCH][L_FRAME48k]; + float FR_Real_Mid[L_FRAME48k], FR_Imag_Mid[L_FRAME48k]; + float *p_fr_realbuffer[MC_PARAMUPMIX_COMBINATIONS * MC_PARAMUPMIX_NCH]; + float *p_fr_imagbuffer[MC_PARAMUPMIX_COMBINATIONS * MC_PARAMUPMIX_NCH]; + float *pp_in_fr_real[MC_PARAMUPMIX_COMBINATIONS * MC_PARAMUPMIX_NCH]; + float *pp_in_fr_imag[MC_PARAMUPMIX_COMBINATIONS * MC_PARAMUPMIX_NCH]; + float *cov_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH]; + float *cov_dtx_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH]; + float rxx, rxy, ryy, cmat, rxxest, drxx, wetaux; + + int16_t l_ts; + int16_t b, i, j, ts, bnd; +#ifdef FIX_468_16KHZ_PUPMIX + int16_t maxbands; +#endif + + int16_t transient_det[MC_PARAMUPMIX_COMBINATIONS][2]; + int16_t transient_det_l[2], transient_det_r[2]; + int16_t chan1s[4] = { 4, 5, 8, 9 }; + int16_t chan2s[4] = { 6, 7, 10, 11 }; + + const int16_t HOA_md_ind[IVAS_SPAR_MAX_CH] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }; + + for ( i = 0; i < MC_PARAMUPMIX_COMBINATIONS; i++ ) + { + pcm_in[2 * i] = input_frame_t[chan1s[i]]; + pcm_in[2 * i + 1] = input_frame_t[chan2s[i]]; + } + + /*-----------------------------------------------------------------------------------------* + * Transient detector + *-----------------------------------------------------------------------------------------*/ + for ( i = 0; i < MC_PARAMUPMIX_COMBINATIONS; i++ ) + { + ivas_transient_det_process( hMCParamUpmix->hTranDet[2 * i], pcm_in[2 * i], input_frame, transient_det_l ); + ivas_transient_det_process( hMCParamUpmix->hTranDet[2 * i + 1], pcm_in[2 * i + 1], input_frame, transient_det_r ); + transient_det[i][0] = transient_det_l[0] || transient_det_r[0]; + transient_det[i][1] = transient_det_l[0] || transient_det_r[0]; + /* should probably be transient_det_l[1] || transient_det_r[1] , but choosing 0 reproduces the before merge state */ + } + + for ( i = 0; i < MC_PARAMUPMIX_COMBINATIONS * MC_PARAMUPMIX_NCH; i++ ) + { + p_fr_realbuffer[i] = fr_realbuffer[i]; + p_fr_imagbuffer[i] = fr_imagbuffer[i]; + } + + /* prepare Parameter MDFT analysis */ + for ( i = 0; i < MC_PARAMUPMIX_COMBINATIONS * MC_PARAMUPMIX_NCH; i++ ) + { + pp_in_fr_real[i] = p_fr_realbuffer[i]; + pp_in_fr_imag[i] = p_fr_imagbuffer[i]; + } + + l_ts = input_frame / MAX_PARAM_SPATIAL_SUBFRAMES; + for ( ts = 0; ts < MAX_PARAM_SPATIAL_SUBFRAMES; ts++ ) + { + ivas_fb_mixer_get_windowed_fr( hMCParamUpmix->hFbMixer, pcm_in, pp_in_fr_real, pp_in_fr_imag, l_ts, l_ts, + hMCParamUpmix->hFbMixer->fb_cfg->num_in_chans ); + ivas_fb_mixer_update_prior_input( hMCParamUpmix->hFbMixer, pcm_in, l_ts, + hMCParamUpmix->hFbMixer->fb_cfg->num_in_chans ); + for ( i = 0; i < MC_PARAMUPMIX_COMBINATIONS * MC_PARAMUPMIX_NCH; i++ ) + { + pcm_in[i] += l_ts; + pp_in_fr_real[i] += l_ts; + pp_in_fr_imag[i] += l_ts; + } + } + + /*-----------------------------------------------------------------------------------------* + * Covariance process + *-----------------------------------------------------------------------------------------*/ + for ( b = 0; b < MC_PARAMUPMIX_COMBINATIONS; b++ ) + { + pp_in_fr_real[0] = p_fr_realbuffer[2 * b]; + pp_in_fr_imag[0] = p_fr_imagbuffer[2 * b]; + pp_in_fr_real[1] = FR_Real_Mid; + pp_in_fr_imag[1] = FR_Imag_Mid; + v_add( pp_in_fr_real[0], p_fr_realbuffer[2 * b + 1], pp_in_fr_real[1], L_FRAME48k ); + v_add( pp_in_fr_imag[0], p_fr_imagbuffer[2 * b + 1], pp_in_fr_imag[1], L_FRAME48k ); + for ( i = 0; i < MC_PARAMUPMIX_NCH; i++ ) + { + for ( j = 0; j < MC_PARAMUPMIX_NCH; j++ ) + { + cov_real[i][j] = hMCParamUpmix->cov_real[b][i][j]; + cov_dtx_real[i][j] = hMCParamUpmix->cov_dtx_real[b][i][j]; + } + } + ivas_enc_cov_handler_process( hMCParamUpmix->hCovEnc[b], pp_in_fr_real, pp_in_fr_imag, cov_real, cov_dtx_real, hMCParamUpmix->hFbMixer->pFb, 0, hMCParamUpmix->hFbMixer->pFb->filterbank_num_bands, MC_PARAMUPMIX_NCH, 0 /*dtx_vad*/, transient_det[b], HOA_md_ind ); + } +#ifdef FIX_468_16KHZ_PUPMIX + maxbands = hMCParamUpmix->hFbMixer->pFb->filterbank_num_bands; + for ( b = 0; b < MC_PARAMUPMIX_COMBINATIONS; b++ ) + { + for ( bnd = 0; bnd < maxbands; bnd++ ) + { +#else + for ( b = 0; b < MC_PARAMUPMIX_COMBINATIONS; b++ ) + { + for ( bnd = 0; bnd < IVAS_MAX_NUM_BANDS; bnd++ ) + { +#endif + rxy = hMCParamUpmix->cov_real[b][1][0][bnd]; + ryy = hMCParamUpmix->cov_real[b][1][1][bnd]; + cmat = rxy / ( ryy + EPSILON ); + alphas[b][bnd] = (float) 2.0 * cmat - (float) 1.0; + + rxx = hMCParamUpmix->cov_real[b][0][0][bnd]; + rxxest = cmat * cmat * ryy; + drxx = rxx - rxxest; + drxx = (float) max( drxx, 0.0 ); + wetaux = (float) sqrt( drxx / ( ryy + EPSILON ) ); + betas[b][bnd] = (float) 2.0 * wetaux; + } + } +#ifdef FIX_468_16KHZ_PUPMIX + if ( maxbands < IVAS_MAX_NUM_BANDS ) + { + for ( b = 0; b < MC_PARAMUPMIX_COMBINATIONS; b++ ) + { + for ( bnd = maxbands; bnd < IVAS_MAX_NUM_BANDS; bnd++ ) + { + alphas[b][bnd] = 0.0; + betas[b][bnd] = 0.0; + } + } + } +#endif + return; +} diff --git a/lib_enc/ivas_mcmasa_enc.c b/lib_enc/ivas_mcmasa_enc.c index 866e4e176c9b0f915d58f87ff6d993486652c258..ec3a49956b727532e24dec28ba6a94314e8e6442 100644 --- a/lib_enc/ivas_mcmasa_enc.c +++ b/lib_enc/ivas_mcmasa_enc.c @@ -188,7 +188,8 @@ ivas_error ivas_mcmasa_enc_open( } /* set FB config. */ - if ( ( error = ivas_fb_set_cfg( &fb_cfg, MASA_FORMAT, SBA_MODE_NONE, numAnalysisChannels, 0, 0, input_Fs ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_fb_set_cfg( &fb_cfg, MASA_FORMAT, SBA_MODE_NONE, numAnalysisChannels, 0, 0, input_Fs, + 0 ) ) != IVAS_ERR_OK ) { return error; } @@ -219,7 +220,8 @@ ivas_error ivas_mcmasa_enc_open( else { /* Allocate and initialize FB mixer handle for LFE channel */ - if ( ( error = ivas_fb_set_cfg( &fb_cfgLfe, MASA_FORMAT, SBA_MODE_NONE, 1, 0, 0, input_Fs ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_fb_set_cfg( &fb_cfgLfe, MASA_FORMAT, SBA_MODE_NONE, 1, 0, 0, input_Fs, + 0 ) ) != IVAS_ERR_OK ) { return error; } @@ -450,11 +452,7 @@ ivas_error ivas_mcmasa_enc_reconfig( /* bitrate changed, may need to do something */ /* brute-force solution: close McMASA and re-instantiate with new settings */ -#ifdef FIX_350_MASA_DELAY_COMP ivas_masa_enc_close( &( st_ivas->hMasa ) ); -#else - ivas_masa_enc_close( &( st_ivas->hMasa ), st_ivas->nchan_transport, st_ivas->hEncoderConfig->ivas_format ); -#endif ivas_mcmasa_enc_close( &( st_ivas->hMcMasa ), st_ivas->hEncoderConfig->input_Fs ); /* Determine if to separate some channels from the analysis */ @@ -749,10 +747,10 @@ void ivas_mcmasa_param_est_enc( float Chnl_ImagBuffer[MCMASA_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX]; float *p_Chnl_RealBuffer[MCMASA_MAX_ANA_CHANS]; float *p_Chnl_ImagBuffer[MCMASA_MAX_ANA_CHANS]; - float Foa_RealBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX]; - float Foa_ImagBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX]; - float FoaEven_RealBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX]; - float FoaEven_ImagBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX]; + float Foa_RealBuffer[FOA_CHANNELS][DIRAC_NO_FB_BANDS_MAX]; + float Foa_ImagBuffer[FOA_CHANNELS][DIRAC_NO_FB_BANDS_MAX]; + float FoaEven_RealBuffer[FOA_CHANNELS][DIRAC_NO_FB_BANDS_MAX]; + float FoaEven_ImagBuffer[FOA_CHANNELS][DIRAC_NO_FB_BANDS_MAX]; float intensity_real[DIRAC_NUM_DIMS][MASA_FREQUENCY_BANDS]; float intensity_even_real[DIRAC_NUM_DIMS][MASA_FREQUENCY_BANDS]; float direction_vector[DIRAC_NUM_DIMS][MASA_FREQUENCY_BANDS]; @@ -835,8 +833,10 @@ void ivas_mcmasa_param_est_enc( for ( ts = mrange[0]; ts < mrange[1]; ts++ ) { - ivas_fb_mixer_get_windowed_fr( hMcMasa->hFbMixer, pcm_in, p_Chnl_RealBuffer, p_Chnl_ImagBuffer, l_ts, l_ts ); - ivas_fb_mixer_update_prior_input( hMcMasa->hFbMixer, pcm_in, l_ts ); + ivas_fb_mixer_get_windowed_fr( hMcMasa->hFbMixer, pcm_in, p_Chnl_RealBuffer, p_Chnl_ImagBuffer, l_ts, l_ts, + hMcMasa->hFbMixer->fb_cfg->num_in_chans ); + ivas_fb_mixer_update_prior_input( hMcMasa->hFbMixer, pcm_in, l_ts, + hMcMasa->hFbMixer->fb_cfg->num_in_chans ); for ( i = 0; i < numAnalysisChannels; i++ ) { pcm_in[i] += l_ts; @@ -977,7 +977,8 @@ void ivas_mcmasa_param_est_enc( reference_power[ts], 0, num_freq_bands, - SBA_MODE_NONE ); + SBA_MODE_NONE, + FOA_CHANNELS ); /* Fill buffers of length "averaging_length" time slots for intensity and energy */ hMcMasa->index_buffer_intensity = ( hMcMasa->index_buffer_intensity % hMcMasa->no_col_avg_diff ) + 1; /* averaging_length = 32 */ @@ -1706,8 +1707,10 @@ static void computeLfeEnergy( for ( ts = mrange[0]; ts < mrange[1]; ts++ ) { - ivas_fb_mixer_get_windowed_fr( hMcMasa->hFbMixerLfe, pcm_in, p_Chnl_RealBuffer, p_Chnl_ImagBuffer, l_ts, l_ts ); - ivas_fb_mixer_update_prior_input( hMcMasa->hFbMixerLfe, pcm_in, l_ts ); + ivas_fb_mixer_get_windowed_fr( hMcMasa->hFbMixerLfe, pcm_in, p_Chnl_RealBuffer, p_Chnl_ImagBuffer, l_ts, l_ts, + hMcMasa->hFbMixerLfe->fb_cfg->num_in_chans ); + ivas_fb_mixer_update_prior_input( hMcMasa->hFbMixerLfe, pcm_in, l_ts, + hMcMasa->hFbMixerLfe->fb_cfg->num_in_chans ); pcm_in[0] += l_ts; /* Compute low frequency energy for LFE, for other channels it is computed in ivas_chnl_param_est_enc() */ diff --git a/lib_enc/ivas_mct_core_enc.c b/lib_enc/ivas_mct_core_enc.c index c2c2e284c2ae200d2146122d403ad4acf6f7c1aa..3bd05fca9273da133393856ddd848a8829dd34a9 100644 --- a/lib_enc/ivas_mct_core_enc.c +++ b/lib_enc/ivas_mct_core_enc.c @@ -51,9 +51,6 @@ *----------------------------------------------------------*/ static void FindChannelRatio( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - MCT_ENC_HANDLE hMCT, /* i/o: MCT encoder structure */ -#endif 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 */ @@ -71,11 +68,7 @@ static void FindChannelRatio( sum_nrg = 0; for ( i = 0; i < nChannels; i++ ) { - if ( sts[i]->mct_chan_mode != MCT_CHAN_MODE_IGNORE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && sts[i]->mct_chan_mode != MCT_CHAN_MODE_LFE -#endif - ) + if ( sts[i]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { sum_nrg += nrg[i]; } @@ -84,11 +77,7 @@ static void FindChannelRatio( for ( i = 0; i < nChannels; i++ ) { - if ( sts[i]->mct_chan_mode != MCT_CHAN_MODE_IGNORE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && sts[i]->mct_chan_mode != MCT_CHAN_MODE_LFE -#endif - ) + 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 ) ) ); @@ -97,13 +86,6 @@ static void FindChannelRatio( { chBitRatios[i] = 0; } -#ifndef ISSUE_24_CLEANUP_MCT_LFE - else if ( hMCT->num_lfe ) - { - assert( sts[i]->mct_chan_mode == MCT_CHAN_MODE_LFE ); - chBitRatios[i] = !hMCT->LFE_off; - } -#endif } #ifdef DEBUG_MODE_MDCT @@ -269,11 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - || hCPE[cpe_id]->hCoreCoder[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE -#endif - ) + if ( hCPE[cpe_id]->hCoreCoder[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { i++; continue; @@ -323,9 +301,6 @@ void ivas_mct_core_enc( st = sts[ch]; if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && hMCT->LFE_off ) || -#endif st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; @@ -355,9 +330,6 @@ void ivas_mct_core_enc( for ( ch = 0; ch < nChannels; ch++ ) { if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE || -#endif sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; @@ -406,9 +378,6 @@ void ivas_mct_core_enc( { st = sts[ch]; if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE || -#endif sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; @@ -441,10 +410,15 @@ void ivas_mct_core_enc( for ( ch = 0; ch < nChannels; ch++ ) { st = sts[ch]; - if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE || + +#ifdef IND_LIST_DYN + /* update the pointer to the buffer of indices of the second channel */ + if ( ch > 0 ) + { + st->hBstr->ind_list = sts[0]->hBstr->ind_list + sts[0]->hBstr->nb_ind_tot; + } #endif + if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; @@ -467,9 +441,6 @@ void ivas_mct_core_enc( { st = sts[ch]; if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE || -#endif sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; @@ -484,9 +455,6 @@ void ivas_mct_core_enc( st = sts[ch]; if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) && hMCT->LFE_off ) || -#endif sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; @@ -503,9 +471,6 @@ void ivas_mct_core_enc( write_mct_bitstream( sts, hMCT, nChannels ); FindChannelRatio( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - hMCT, -#endif sts, chBitRatios, nChannels ); nAvailBits = (int16_t) ( ( ivas_total_brate / FRAMES_PER_SEC ) - NBITS_BWIDTH - hMCT->nBitsMCT - lfe_bits ); @@ -519,7 +484,7 @@ void ivas_mct_core_enc( } else if ( ivas_format == SBA_FORMAT ) { - nAvailBits -= IVAS_FORMAT_SIGNALING_NBITS_SBA; + nAvailBits -= IVAS_FORMAT_SIGNALING_NBITS_EXTENDED; nAvailBits -= SBA_ORDER_BITS + SBA_PLANAR_BITS; } @@ -535,20 +500,13 @@ void ivas_mct_core_enc( for ( ch = 0; ch < nChannels; ch++ ) { if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - ( ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) && hMCT->LFE_off ) || -#endif sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } nAvailBits -= NBBITS_MCT_RATIO; } - nAvailBits -= total_side_bits -#ifndef ISSUE_24_CLEANUP_MCT_LFE - + ( hMCT->num_lfe ? 1 : 0 ) -#endif - + 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" ); @@ -563,9 +521,6 @@ void ivas_mct_core_enc( for ( ch = 0; ch < nChannels; ch++ ) { if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - ( ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) && hMCT->LFE_off ) || -#endif sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; @@ -589,17 +544,10 @@ void ivas_mct_core_enc( { continue; } -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( !( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) && hMCT->LFE_off ) ) /* indicates LFE with no content */ - { -#endif - 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; -#endif -#ifndef ISSUE_24_CLEANUP_MCT_LFE - } + total_brate += st->total_brate; #endif } #ifdef DEBUGGING @@ -611,12 +559,8 @@ 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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - + ( hMCT->num_lfe ? 1 : 0 ) -#endif - + hMCT->nchan_out_woLFE; + format_bits = ( ivas_format == MC_FORMAT ? IVAS_FORMAT_SIGNALING_NBITS + MC_LS_SETUP_BITS : IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + SBA_ORDER_BITS + SBA_PLANAR_BITS ); + 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 diff --git a/lib_enc/ivas_mct_enc.c b/lib_enc/ivas_mct_enc.c index 75191d0a412361b4b8732f3472e12cec085a3ddc..af743deaa1c4c6d6f1827335d3df9b70f2c4ec09 100644 --- a/lib_enc/ivas_mct_enc.c +++ b/lib_enc/ivas_mct_enc.c @@ -101,7 +101,6 @@ static void set_mct_enc_params( * cpe_id 1: L=data[4] R=data[5] * cpe_id 2: L=data[2] (mid) R=NULL *-------------------------------------------------------------------*/ -#ifdef ISSUE_24_CLEANUP_MCT_LFE 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 */ @@ -117,8 +116,7 @@ static void map_input_to_cpe_channels( pdata[i] = data[n]; i++; } - - if ( st_ivas->hEncoderConfig->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ) + if ( st_ivas->hEncoderConfig->ivas_format == MC_FORMAT && ( st_ivas->mc_mode == MC_MODE_MCT || st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) ) { for ( n = LFE_CHANNEL + 1; n < st_ivas->nchan_transport; n++ ) { @@ -137,14 +135,13 @@ static void map_input_to_cpe_channels( } /* 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 ) ) + if ( ( st_ivas->nchan_transport < st_ivas->nCPE * CPE_CHANNELS ) || ( ( st_ivas->mc_mode == MC_MODE_MCT || st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) && st_ivas->hMCT->nchan_out_woLFE < st_ivas->nCPE * CPE_CHANNELS ) ) { pdata[st_ivas->nCPE * CPE_CHANNELS - 1] = NULL; } return; } -#endif /*-------------------------------------------------------------------* * ivas_mct_enc() * @@ -168,9 +165,7 @@ ivas_error ivas_mct_enc( int16_t max_bwidth; int32_t ivas_total_brate; ivas_error error; -#ifdef ISSUE_24_CLEANUP_MCT_LFE float *pdata[MAX_INPUT_CHANNELS]; -#endif error = IVAS_ERR_OK; @@ -200,7 +195,6 @@ 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 */ -#ifdef ISSUE_24_CLEANUP_MCT_LFE /* reset channel mode from previous state*/ if ( ( hCPE->cpe_id * CPE_CHANNELS + n ) >= hMCT->nchan_out_woLFE ) { @@ -210,12 +204,8 @@ ivas_error ivas_mct_enc( { hCPE->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_REGULAR; } -#endif } } -#ifndef ISSUE_24_CLEANUP_MCT_LFE - hMCT->LFE_off = 1; /* disable LFE coding by default for the moment */ -#endif /* reconfiguration in case of bitrate switching */ if ( ivas_total_brate != st_ivas->hEncoderConfig->last_ivas_total_brate ) { @@ -231,18 +221,12 @@ ivas_error ivas_mct_enc( /* set coded audio band-width */ switch_bw = set_bw_mct( st_ivas->hCPE, st_ivas->nCPE ); -#ifdef ISSUE_24_CLEANUP_MCT_LFE /*for MC and MCT remove pointer to LFE input that has been processed seperately */ map_input_to_cpe_channels( st_ivas, pdata, data ); -#endif /* pre-processing */ for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) { -#ifdef ISSUE_24_CLEANUP_MCT_LFE 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 ) -#else - 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 ) -#endif { return error; } @@ -250,14 +234,9 @@ ivas_error ivas_mct_enc( /* joint MCT encoding */ ivas_mct_core_enc( ivas_format, hMCT, st_ivas->hCPE, -#ifndef ISSUE_24_CLEANUP_MCT_LFE - hMCT->nchan_out_woLFE + hMCT->num_lfe -#else - hMCT->nchan_out_woLFE -#endif - , + 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, + ( ivas_format == MC_FORMAT && ( st_ivas->mc_mode == MC_MODE_MCT || st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) ) ? (int16_t) st_ivas->hLFE->lfe_bits : 0, st_ivas->hEncoderConfig->sba_order ); /* Spectrum quantization and coding */ @@ -265,10 +244,13 @@ ivas_error ivas_mct_enc( { hCPE = st_ivas->hCPE[cpe_id]; - ivas_mdct_quant_coder( hCPE, -#ifndef ISSUE_24_CLEANUP_MCT_LFE - hMCT->LFE_off, +#ifdef IND_LIST_DYN + if ( cpe_id > 0 ) + { + hCPE->hCoreCoder[0]->hBstr->ind_list = st_ivas->hCPE[cpe_id - 1]->hCoreCoder[1]->hBstr->ind_list + st_ivas->hCPE[cpe_id - 1]->hCoreCoder[1]->hBstr->nb_ind_tot; + } #endif + 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) */ @@ -324,30 +306,22 @@ 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 */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - hMCT->num_lfe = TRUE; -#endif } else if ( ivas_format == SBA_FORMAT ) { hMCT->nchan_out_woLFE = ivas_get_sba_num_TCs( ivas_total_brate, st_ivas->sba_analysis_order ); -#ifndef ISSUE_24_CLEANUP_MCT_LFE - hMCT->num_lfe = FALSE; -#endif } 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 ); -#ifndef ISSUE_24_CLEANUP_MCT_LFE - hMCT->num_lfe = FALSE; -#endif + } + else if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) + { + hMCT->nchan_out_woLFE = ivas_mc_paramupmix_getNumTransportChannels(); } else if ( ivas_format == SBA_FORMAT ) { hMCT->nchan_out_woLFE = ivas_sba_get_nchan( st_ivas->sba_analysis_order, st_ivas->hEncoderConfig->sba_planar ); -#ifndef ISSUE_24_CLEANUP_MCT_LFE - hMCT->num_lfe = FALSE; -#endif } else { @@ -361,21 +335,11 @@ ivas_error create_mct_enc( for ( n = 0; n < CPE_CHANNELS; n++ ) { st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_REGULAR; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - 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; - } -#endif } } /* in case we have an uneven number of transport channels, indicate last channel ID as inactive */ - if ( ( hMCT->nchan_out_woLFE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - + hMCT->num_lfe -#endif - ) % + if ( ( hMCT->nchan_out_woLFE ) % 2 ) { st_ivas->hCPE[st_ivas->nCPE - 1]->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_IGNORE; @@ -462,23 +426,18 @@ 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 */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - hMCT->num_lfe = TRUE; -#endif + } + else if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) + { + hMCT->nchan_out_woLFE = ivas_mc_paramupmix_getNumTransportChannels(); } 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 ); -#ifndef ISSUE_24_CLEANUP_MCT_LFE - hMCT->num_lfe = FALSE; -#endif } else if ( ivas_format == SBA_FORMAT ) { hMCT->nchan_out_woLFE = st_ivas->nchan_transport; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - hMCT->num_lfe = FALSE; -#endif } else { @@ -494,21 +453,11 @@ ivas_error mct_enc_reconfigure( for ( n = 0; n < CPE_CHANNELS; n++ ) { st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_REGULAR; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - 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; - } -#endif } } /* in case we have an uneven number of transport channels, indicate last channel ID as inactive */ - if ( ( hMCT->nchan_out_woLFE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - + hMCT->num_lfe -#endif - ) % + if ( ( hMCT->nchan_out_woLFE ) % 2 ) { st_ivas->hCPE[st_ivas->nCPE - 1]->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_IGNORE; @@ -527,18 +476,10 @@ ivas_error mct_enc_reconfigure( st->total_brate = st_ivas->hCPE[cpe_id]->element_brate; if ( !( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) || -#endif ( 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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - st->mct_chan_mode -#endif - ); + 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 ); @@ -729,6 +670,11 @@ static ivas_error ivas_mc_enc_reconfig( if ( last_mc_mode != MC_MODE_MCT ) { + if ( st_ivas->hLFE != NULL ) + { + /* LFE handle */ + ivas_lfe_enc_close( &( st_ivas->hLFE ) ); + } /* create LFE handle */ if ( ( error = ivas_create_lfe_enc( &st_ivas->hLFE, st_ivas->hEncoderConfig->input_Fs ) ) != IVAS_ERR_OK ) { @@ -738,18 +684,59 @@ static ivas_error ivas_mc_enc_reconfig( /*De-allocate handles for other MC modes*/ ivas_param_mc_enc_close( &( st_ivas->hParamMC ), st_ivas->hEncoderConfig->input_Fs ); + ivas_mc_paramupmix_enc_close( &( st_ivas->hMCParamUpmix ), st_ivas->hEncoderConfig->input_Fs ); /* De-allocate McMasa-related handles */ ivas_mcmasa_enc_close( &( st_ivas->hMcMasa ), st_ivas->hEncoderConfig->input_Fs ); -#ifdef FIX_350_MASA_DELAY_COMP ivas_masa_enc_close( &( st_ivas->hMasa ) ); -#else - ivas_masa_enc_close( &( st_ivas->hMasa ), nchan_transport_old, MC_FORMAT ); -#endif ivas_qmetadata_close( &st_ivas->hQMetaData ); } } + else if ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) + { + st_ivas->nSCE = 0; + st_ivas->nCPE = MC_PARAMUPMIX_MAX_TRANSPORT_CHANS / 2; + st_ivas->nchan_transport = MC_PARAMUPMIX_MAX_TRANSPORT_CHANS; + + if ( last_mc_mode != MC_MODE_PARAMUPMIX ) + { + if ( st_ivas->hLFE != NULL ) + { + /* LFE handle */ + ivas_lfe_enc_close( &( st_ivas->hLFE ) ); + } + + /* create LFE handle */ + if ( ( error = ivas_create_lfe_enc( &st_ivas->hLFE, st_ivas->hEncoderConfig->input_Fs ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + if ( last_mc_mode != MC_MODE_PARAMUPMIX ) + /* This should always be the case, only supporting one bitrate currently */ + { + if ( ( error = ivas_mc_paramupmix_enc_open( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else + { + assert( 0 ); + } + + /*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 ) @@ -772,13 +759,15 @@ static ivas_error ivas_mc_enc_reconfig( if ( st_ivas->hMasa != NULL ) { -#ifdef FIX_350_MASA_DELAY_COMP ivas_masa_enc_close( &( st_ivas->hMasa ) ); -#else - ivas_masa_enc_close( &( st_ivas->hMasa ), nchan_transport_old, MC_FORMAT ); -#endif st_ivas->hMasa = NULL; } + ivas_mc_paramupmix_enc_close( &( st_ivas->hMCParamUpmix ), st_ivas->hEncoderConfig->input_Fs ); + if ( last_mc_mode == MC_MODE_PARAMUPMIX && st_ivas->hLFE != NULL ) + { + /* LFE handle */ + ivas_lfe_enc_close( &( st_ivas->hLFE ) ); + } ivas_qmetadata_close( &st_ivas->hQMetaData ); @@ -825,6 +814,12 @@ static ivas_error ivas_mc_enc_reconfig( } ivas_param_mc_enc_close( &( st_ivas->hParamMC ), st_ivas->hEncoderConfig->input_Fs ); + ivas_mc_paramupmix_enc_close( &( st_ivas->hMCParamUpmix ), st_ivas->hEncoderConfig->input_Fs ); + if ( last_mc_mode == MC_MODE_PARAMUPMIX && st_ivas->hLFE != NULL ) + { + /* LFE handle */ + ivas_lfe_enc_close( &( st_ivas->hLFE ) ); + } if ( last_mc_mode == MC_MODE_MCT ) { @@ -886,24 +881,10 @@ static ivas_error ivas_mc_enc_reconfig( } } - st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - st->mct_chan_mode -#endif - ); + 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; } -#ifndef ISSUE_24_CLEANUP_MCT_LFE - else if ( last_mc_mode == MC_MODE_PARAMMC && st_ivas->mc_mode == MC_MODE_MCT && nchan_transport_old > 2 ) - { -#ifdef DEBUGGING - assert( st_ivas->hCPE[1] != NULL ); -#endif - st_ivas->hCPE[1]->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_LFE; - } -#endif 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 ); @@ -913,6 +894,11 @@ static ivas_error ivas_mc_enc_reconfig( new_brate_SCE = 0; new_brate_CPE = ( st_ivas->hEncoderConfig->ivas_total_brate / ( st_ivas->nchan_transport - 1 ) ) * CPE_CHANNELS; } + else if ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) + { + 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;*/ diff --git a/lib_enc/ivas_mct_enc_mct.c b/lib_enc/ivas_mct_enc_mct.c index 9c0e43caa0291367f263909b8362439b0f5d4c60..228f48b305453884a1c4a8fef64abc9b2a22190b 100644 --- a/lib_enc/ivas_mct_enc_mct.c +++ b/lib_enc/ivas_mct_enc_mct.c @@ -62,11 +62,7 @@ void getChannelEnergies( for ( ch = 0; ch < nchan; ch++ ) { st = sts[ch]; - if ( st->mct_chan_mode != MCT_CHAN_MODE_IGNORE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && st->mct_chan_mode != MCT_CHAN_MODE_LFE -#endif - ) + 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; @@ -160,11 +156,7 @@ static void getCorrelationMatrix( int16_t ch1, ch2, n, nchan; float tmp; - nchan = hMCT->nchan_out_woLFE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - + hMCT->num_lfe -#endif - ; + nchan = hMCT->nchan_out_woLFE; /* correlation */ for ( ch1 = 0; ch1 < nchan; ch1++ ) @@ -174,12 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_LFE && - sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_LFE -#endif - ) + 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; @@ -237,18 +224,10 @@ static void getBestCorrelation( *_ch2 = -1; *max_corr = 0.f; - for ( ch1 = 0; ch1 < ( hMCT->nchan_out_woLFE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - + hMCT->num_lfe -#endif - ); + for ( ch1 = 0; ch1 < ( hMCT->nchan_out_woLFE ); ch1++ ) { - for ( ch2 = ch1 + 1; ch2 < ( hMCT->nchan_out_woLFE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - + hMCT->num_lfe -#endif - ); + for ( ch2 = ch1 + 1; ch2 < ( hMCT->nchan_out_woLFE ); ch2++ ) { if ( fabsf( *max_corr ) < fabsf( xCorrMatrix[ch1][ch2] ) ) @@ -330,27 +309,14 @@ static void updateCorrelationMatrix( int16_t ch1, ch2, n; /* correlation: */ - for ( ch1 = 0; ch1 < ( hMCT->nchan_out_woLFE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - + hMCT->num_lfe -#endif - ); + for ( ch1 = 0; ch1 < ( hMCT->nchan_out_woLFE ); ch1++ ) { - for ( ch2 = ch1; ch2 < ( hMCT->nchan_out_woLFE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - + hMCT->num_lfe -#endif - ); + 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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_LFE && - sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_LFE -#endif - ) + sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { int16_t nSubframes = ( sts[ch1]->core == TCX_20_CORE ? 1 : NB_DIV ); @@ -377,12 +343,7 @@ static void updateCorrelationMatrix( static int16_t channelPairToIndex( const int16_t chIdx1, const int16_t chIdx2, - const int16_t nChannels -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - Encoder_State **sts /* i/o: encoder state structure */ -#endif -) + const int16_t nChannels ) { int16_t ch1, ch2; int16_t pairIdx; @@ -393,12 +354,6 @@ static int16_t channelPairToIndex( { for ( ch1 = 0; ch1 < ch2; ch1++ ) { -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( sts[ch1]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch2]->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - continue; - } -#endif if ( ch1 == chIdx1 && ch2 == chIdx2 ) { return pairIdx; @@ -438,11 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE -#endif - ) + if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { meanE += nrg[ch]; cnt++; @@ -454,11 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE -#endif - ) + 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; @@ -531,19 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE -#endif - ) + if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { count_active_ch++; } -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) -#else else -#endif { hMCT->mc_global_ild[ch] = 0; } @@ -564,16 +503,8 @@ void apply_MCT_enc( { for ( ch1 = 0; ch1 < ch2; ch1++ ) { - if ( sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_LFE -#endif - && - sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_LFE -#endif - ) + 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] ); } @@ -664,12 +595,7 @@ void apply_MCT_enc( } /* calculate all related values: */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - 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 ); -#else assert( sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ); -#endif getBlockValues( sts, ch1, ch2, hMCT->hBlockData[currBlockDataCnt], mdst_spectrum, inv_spectrum, inv_mdst_spectrum ); @@ -754,11 +680,7 @@ void apply_MCT_enc( for ( ch = 0; ch < nchan; ch++ ) { - if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE -#endif - ) + if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { if ( ( !cpEle[ch] ) || hMCT->currBlockDataCnt == 0 ) { @@ -844,9 +766,6 @@ void write_mct_bitstream( for ( ch = 0; ch < nchan; ch++ ) { if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE ) && -#endif hMCT->currBlockDataCnt && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { push_next_indice( hBstr, hMCT->mc_global_ild[ch], SMDCT_GLOBAL_ILD_BITS ); @@ -858,9 +777,6 @@ void write_mct_bitstream( for ( ch = 0; ch < nchan; ch++ ) { if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE && -#endif sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { push_next_indice( hBstr, hMCT->lowE_ch[ch], 1 ); @@ -874,12 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - sts -#endif - ); + 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*/ @@ -923,11 +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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - + hMCT->num_lfe -#endif - ); + set_s( singleChEle, 1, hMCT->nchan_out_woLFE ); for ( b = 0; b < hMCT->currBlockDataCnt; b++ ) { @@ -944,6 +851,18 @@ void mctStereoIGF_enc( p_st[0] = sts[ch1]; p_st[1] = sts[ch2]; +#ifdef IND_LIST_DYN + if ( ch1 > 0 ) + { + sts[ch1]->hBstr->ind_list = sts[0]->hBstr->ind_list + sts[0]->hBstr->nb_ind_tot; + } + + if ( ch2 > 0 ) + { + sts[ch2]->hBstr->ind_list = sts[0]->hBstr->ind_list + sts[0]->hBstr->nb_ind_tot; + } +#endif + p_powerSpec[0] = powerSpec[ch1]; p_powerSpec[1] = powerSpec[ch2]; @@ -978,17 +897,9 @@ void mctStereoIGF_enc( } /* channel elements that are coded separately detected */ - if ( sum_s( singleChEle, ( hMCT->nchan_out_woLFE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - + hMCT->num_lfe -#endif - ) ) != 0 ) + if ( sum_s( singleChEle, ( hMCT->nchan_out_woLFE ) ) != 0 ) { - for ( ch = 0; ch < ( hMCT->nchan_out_woLFE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - + hMCT->num_lfe -#endif - ); + for ( ch = 0; ch < ( hMCT->nchan_out_woLFE ); ch++ ) { if ( singleChEle[ch] ) @@ -996,14 +907,18 @@ void mctStereoIGF_enc( st = sts[ch]; if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - st->mct_chan_mode == MCT_CHAN_MODE_LFE || -#endif st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } +#ifdef IND_LIST_DYN + if ( ch > 0 ) + { + st->hBstr->ind_list = sts[0]->hBstr->ind_list + sts[0]->hBstr->nb_ind_tot; + } +#endif + nSubframes = st->hTcxEnc->tcxMode == TCX_20 ? 1 : NB_DIV; for ( n = 0; n < nSubframes; n++ ) { diff --git a/lib_enc/ivas_mdct_core_enc.c b/lib_enc/ivas_mdct_core_enc.c old mode 100755 new mode 100644 index 62223d9005a36bf4c4b827bd5ce1cab72dc9c556..edc9ea1e504b954a8bffd936633c307a2fa0b0d8 --- a/lib_enc/ivas_mdct_core_enc.c +++ b/lib_enc/ivas_mdct_core_enc.c @@ -30,6 +30,7 @@ *******************************************************************************************************/ +#include "ivas_cnst.h" #include #include #include "options.h" @@ -38,6 +39,7 @@ #include "prot.h" #include "ivas_prot.h" #include "rom_com.h" +#include "ivas_rom_com.h" #ifdef DEBUGGING #include "debug.h" #endif @@ -88,19 +90,12 @@ static void enc_prm_pre_mdct( { writeTCXWindowing( hBstr, st->hTcxCfg->tcx_last_overlap_mode ); } -#ifndef ISSUE_24_CLEANUP_MCT_LFE - 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 ) { -#endif - 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 ); - } -#ifndef ISSUE_24_CLEANUP_MCT_LFE + assert( ( st->hTcxEnc->kernel_type[0] & 1 ) == ( st->hTcxEnc->kernel_type[1] >> 1 ) ); + push_next_indice( hBstr, st->hTcxEnc->kernel_type[1] & 1, 1 ); } -#endif st->glr_reset = 0; #ifdef DEBUG_PLOT_BITS @@ -291,12 +286,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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - 0 -#endif - ); + 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 */ @@ -319,12 +309,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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - 0 -#endif - ); + 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 */ @@ -589,15 +574,16 @@ 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 */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - int16_t *LFE_off, /* o : flag if LFE has zero content */ -#endif - const int16_t mct_on, /* i : flag mct block (1) or stereo (0) */ - const int16_t nChannels /* i : total number of coded channels */ + 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]; + 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; int16_t param_lpc[CPE_CHANNELS][NPRM_LPC_NEW]; int16_t param_core[CPE_CHANNELS][2 * NPRM_DIV]; int16_t ltpBits[CPE_CHANNELS]; @@ -613,9 +599,10 @@ 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; + int16_t zero_side_flag[NB_DIV]; push_wmops( "mdct_core_whitening" ); @@ -627,14 +614,7 @@ void ivas_mdct_core_whitening_enc( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE ) - { -#endif - stereo_tcx_init_enc( sts[ch] ); -#ifndef ISSUE_24_CLEANUP_MCT_LFE - } -#endif + stereo_tcx_init_enc( sts[ch] ); set_s( tnsSize[ch], 0, 2 ); set_s( tnsBits[ch], 0, 2 ); @@ -674,14 +654,7 @@ void ivas_mdct_core_whitening_enc( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE ) - { -#endif - SetTCXModeInfo( st, st->hTranDet, &st->hTcxCfg->tcx_curr_overlap_mode ); -#ifndef ISSUE_24_CLEANUP_MCT_LFE - } -#endif + SetTCXModeInfo( st, st->hTranDet, &st->hTcxCfg->tcx_curr_overlap_mode ); } } @@ -695,11 +668,7 @@ void ivas_mdct_core_whitening_enc( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) -#else if ( ( hCPE->cpe_id * CPE_CHANNELS + ch ) >= nChannels ) -#endif { continue; } @@ -711,24 +680,7 @@ 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 */ -#ifndef FIX_MDCT_BASED_BWD - if ( st->hTcxEnc->transform_type[0] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP ) - { -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE ) -#else - if ( st->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) -#endif - { - bw_detect( st, NULL, st->hTcxEnc->spectrum[0], NULL ); - } - } -#else -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP ) -#else if ( st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP ) -#endif { nSubframes = ( st->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV; @@ -742,7 +694,6 @@ void ivas_mdct_core_whitening_enc( } } } -#endif if ( st->last_core == ACELP_CORE ) /* reset past kernel info */ { @@ -853,11 +804,7 @@ void ivas_mdct_core_whitening_enc( { TCX_ENC_HANDLE hTcxEncCh = sts[ch]->hTcxEnc; - if ( ( hCPE->cpe_id * CPE_CHANNELS + ch ) >= nChannels -#ifndef ISSUE_24_CLEANUP_MCT_LFE - || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE -#endif - ) + if ( ( hCPE->cpe_id * CPE_CHANNELS + ch ) >= nChannels ) { hTcxEncCh->kernel_symmetry_past = hTcxEncCh->kernel_type[0] = 0; @@ -884,13 +831,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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE -#endif - ) + if ( ( hCPE->cpe_id * CPE_CHANNELS + ch ) >= nChannels ) { continue; } @@ -931,14 +875,11 @@ void ivas_mdct_core_whitening_enc( chE[n] = sum_f( powerSpec, L_subframeTCX ); } - sns_compute_scf( powerSpec, st->hTcxCfg->psychParamsCurrent, st->last_core == ACELP_CORE ? L_subframe : st->L_frame, scf[ch][n] ); + sns_compute_scf( powerSpec, st->hTcxCfg->psychParamsCurrent, st->L_frame, scf[ch][n] ); } /* MCT: detect whether there are silent channels and set mct_chan_mode accordingly */ if ( -#ifndef ISSUE_24_CLEANUP_MCT_LFE - st->mct_chan_mode != MCT_CHAN_MODE_LFE && -#endif mct_on ) { chE_tot = sum_f( chE, NB_DIV ); @@ -956,11 +897,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 ) -#ifndef ISSUE_24_CLEANUP_MCT_LFE - || sts[1]->mct_chan_mode == MCT_CHAN_MODE_LFE -#endif - ) ) + 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; } @@ -969,56 +906,51 @@ void ivas_mdct_core_whitening_enc( sns_low_br_mode = 0; } - 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 ) + if ( !mct_on && sts[0]->sr_core == 25600 && ( ( hCPE->element_brate == IVAS_48k || hCPE->element_brate == IVAS_64k ) ) ) { - sns_avq_cod_stereo( scf[0][0], scf[1][0], scf_q[0][0], scf_q[1][0], param_lpc[0], param_lpc[1] ); + nbits_sns = quantize_sns( scf, scf_q, sts, sns_vq_indices, zero_side_flag, sns_stereo_mode ); } else { -#ifdef DEBUG_MODE_MDCT + 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 ) { - 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" ); + sns_avq_cod_stereo( scf[0][0], scf[1][0], sts[0]->L_frame, scf_q[0][0], scf_q[1][0], param_lpc[0], param_lpc[1] ); } -#endif - for ( ch = 0; ch < CPE_CHANNELS; ch++ ) + else { - param_lpc[ch][0] = ch; - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE -#endif - ) - { - continue; - } - st = sts[ch]; - - if ( st->hTcxEnc->tcxMode == TCX_20 ) +#ifdef DEBUG_MODE_MDCT { - sns_avq_cod( scf[ch][0], NULL, scf_q[ch][0], NULL, ¶m_lpc[ch][1], st->hTcxEnc->tcxMode, sns_low_br_mode ); + 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" ); } - 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 + 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, st->L_frame, 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, st->L_frame, sns_low_br_mode ); + } } } } for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE -#endif - ) + if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -1039,6 +971,7 @@ void ivas_mdct_core_whitening_enc( } } + /*--------------------------------------------------------------* * TNS *---------------------------------------------------------------*/ @@ -1046,11 +979,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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE -#endif - ) + if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -1071,11 +1000,7 @@ void ivas_mdct_core_whitening_enc( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE -#ifndef ISSUE_24_CLEANUP_MCT_LFE - || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE -#endif - ) + if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -1097,9 +1022,6 @@ void ivas_mdct_core_whitening_enc( } } } -#ifndef ISSUE_24_CLEANUP_MCT_LFE -/*check whether LFE channel is active*/ -#endif for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { /*no need to write last channel bit in case of odd channels*/ @@ -1112,15 +1034,7 @@ void ivas_mdct_core_whitening_enc( if ( mct_on ) /* signal bits should be written only for MCT*/ { -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - assert( *LFE_off == 1 ); - push_next_indice( hBstr, *LFE_off, 1 ); - } - else -#endif - if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { push_next_indice( hBstr, 1, 1 ); } @@ -1137,11 +1051,7 @@ void ivas_mdct_core_whitening_enc( { st = sts[ch]; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && ( LFE_off ) ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) -#else if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) -#endif { 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 */ @@ -1179,55 +1089,103 @@ void ivas_mdct_core_whitening_enc( /*--------------------------------------------------------------------------------* * SNS parameters *--------------------------------------------------------------------------------*/ - - /* 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++ ) + if ( !mct_on && sts[0]->sr_core == 25600 && ( ( hCPE->element_brate == IVAS_48k || hCPE->element_brate == IVAS_64k ) ) ) { - st = sts[ch]; + nbits_sns = 0; + idx = 0; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && ( LFE_off ) ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) -#else - if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) -#endif + if ( sts[0]->core == sts[1]->core ) { - skipped_first_channel = 1; - continue; - } + nSubframes = ( sts[0]->core == TCX_20_CORE ) ? 1 : NB_DIV; - nbits_start_sns = hBstr->nb_bits_tot; + /* 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++; + } - num_sns = ( st->core == TCX_20_CORE ) ? 1 : 2; + /* 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++; + } + } + } - if ( ch == 0 || skipped_first_channel ) + for ( ch = 0; ch < CPE_CHANNELS; ++ch ) { - 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 ) -#ifndef ISSUE_24_CLEANUP_MCT_LFE - || sts[1]->mct_chan_mode == MCT_CHAN_MODE_LFE -#endif - ) ) + 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 ) { - /* 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 ); + 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; } - encode_lpc_avq( hBstr, num_sns, param_lpc[ch], st->core, st->element_mode ); + } + 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 ); - st->side_bits_frame_channel += hBstr->nb_bits_tot - nbits_start_sns; + 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; + } } + /*update pitch buffer*/ for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && ( *LFE_off ) ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) -#else if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) -#endif { continue; } @@ -1253,10 +1211,7 @@ void ivas_mdct_core_whitening_enc( *---------------------------------------------------------------*/ void ivas_mdct_quant_coder( - CPE_ENC_HANDLE hCPE, /* i/o: Encoder CPE handle */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - const int16_t LFE_off, /* i : flag if LFE is inactive */ -#endif + CPE_ENC_HANDLE hCPE, /* i/o: Encoder CPE handle */ 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 */ @@ -1302,11 +1257,7 @@ void ivas_mdct_quant_coder( st = sts[ch]; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && ( LFE_off ) ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) -#else if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) -#endif { ignore_chan[ch] = 1; continue; @@ -1366,11 +1317,14 @@ void ivas_mdct_quant_coder( { st = sts[ch]; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && ( LFE_off ) ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) -#else - if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) +#ifdef IND_LIST_DYN + /* update the pointer to the buffer of indices of the second channel */ + if ( ch > 0 ) + { + st->hBstr->ind_list = sts[0]->hBstr->ind_list + sts[0]->hBstr->nb_ind_tot; + } #endif + 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; @@ -1397,11 +1351,7 @@ void ivas_mdct_quant_coder( * Generate Bitstream *---------------------------------------------------------------*/ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && ( LFE_off ) ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) -#else if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) -#endif { continue; } diff --git a/lib_enc/ivas_qmetadata_enc.c b/lib_enc/ivas_qmetadata_enc.c index ac4f83a65794d7bbcdc2104e7b858d5bc8319ff7..40d5bff892bbe423454478a822e67b0cf968be98 100644 --- a/lib_enc/ivas_qmetadata_enc.c +++ b/lib_enc/ivas_qmetadata_enc.c @@ -52,7 +52,7 @@ static float direction_distance( float elevation[DIRAC_MAX_NBANDS][MAX_PARAM_SPA #endif -static void ivas_qmetadata_quantize_diffuseness_nrg_ratios( IVAS_QMETADATA_HANDLE hQMetaData, int16_t *needed_bits, int16_t *nbits_diff, int16_t *dfRatioBits ); +static void ivas_qmetadata_quantize_diffuseness_nrg_ratios( IVAS_QMETADATA_HANDLE hQMetaData, int16_t *needed_bits, int16_t *nbits_diff, int16_t *dfRatioBits, const int16_t hodirac_flag ); static int16_t ivas_qmetadata_entropy_encode_diffuseness( BSTR_ENC_HANDLE hMetaData, IVAS_QDIRECTION *q_direction, uint16_t *diffuseness_index_max_ec_frame ); @@ -60,7 +60,12 @@ static void ivas_qmetadata_reorder_2dir_bands( IVAS_QMETADATA_HANDLE hQMetaData static int16_t ivas_qmetadata_entropy_encode_df_ratio( BSTR_ENC_HANDLE hMetaData, IVAS_QDIRECTION *q_direction, int16_t *df_ratio_bits ); -static int16_t ivas_qmetadata_entropy_encode_dir( BSTR_ENC_HANDLE hMetaData, IVAS_QDIRECTION *q_direction, const uint16_t diffuseness_index_max_ec_frame, const int16_t nbands, const int16_t start_band, const int16_t direction_bits_raw, int16_t max_bits ); +static int16_t ivas_qmetadata_entropy_encode_dir( BSTR_ENC_HANDLE hMetaData, IVAS_QDIRECTION *q_direction, const uint16_t diffuseness_index_max_ec_frame, const int16_t nbands, const int16_t start_band, const int16_t direction_bits_raw, int16_t max_bits +#ifdef HR_METADATA + , + const int16_t hrmasa_flag +#endif +); static int16_t ivas_qmetadata_raw_encode_dir( BSTR_ENC_HANDLE hMetaData, IVAS_QDIRECTION *q_direction, const int16_t nbands, const int16_t start_band ); @@ -88,13 +93,23 @@ static ivas_error write_ec_direction( int16_t *num_bits_written, BSTR_ENC_HANDLE static int16_t write_fixed_rate_direction( BSTR_ENC_HANDLE hMetaData, IVAS_QDIRECTION *q_direction, const int16_t j_idx, const int16_t len ); -static int16_t ivas_qmetadata_quantize_coherence( IVAS_QMETADATA *hQMetaData, const int16_t idx_d, const int16_t all_coherence_zero, BSTR_ENC_HANDLE hMetaData, const int16_t write_flag, int16_t *indice_coherence ); +static int16_t ivas_qmetadata_quantize_coherence( IVAS_QMETADATA *hQMetaData, const int16_t idx_d, const int16_t all_coherence_zero, BSTR_ENC_HANDLE hMetaData, const int16_t write_flag, int16_t *indice_coherence +#ifdef HR_METADATA + , + const int16_t hrmasa_flag +#endif +); static void dct4_transform( uint8_t *v, float *dct_v ); -static float quantize_DCT_0_coh( const float x, const int16_t j, const float *coherence_cb, const float delta_var, const int16_t no_cb, IVAS_QDIRECTION *q_direction, uint16_t *idx_x, int16_t *p_no_cb ); +static float quantize_DCT_0_coh( const float x, const int16_t j, const float *coherence_cb, const float delta_var, const int16_t no_cb, IVAS_QDIRECTION *q_direction, uint16_t *idx_x, int16_t *p_no_cb +#ifdef HR_METADATA + , + const int16_t hrmasa_flag +#endif +); -static int16_t encode_coherence_indexesDCT0( uint16_t *idx_dct, const int16_t len, int16_t *no_cb_vec, BSTR_ENC_HANDLE hMetaData, int16_t indice_coherence, const int16_t nbits, const int16_t nbits1 ); +static int16_t encode_coherence_indexesDCT0( uint16_t *idx_dct, const int16_t len, int16_t *no_cb_vec, BSTR_ENC_HANDLE hMetaData, const int16_t indice_coherence, const int16_t nbits, const int16_t nbits1 ); static int16_t encode_coherence_indexesDCT1( uint16_t *idx_dct, const int16_t len, BSTR_ENC_HANDLE hMetaData ); @@ -118,6 +133,21 @@ static void transform_azimuth_dir2( IVAS_QMETADATA_HANDLE hQMetaData, int16_t *d static int16_t calc_var_azi( const IVAS_QDIRECTION *q_direction, const int16_t diffuseness_index_max_ec_frame, const float avg_azimuth, float *avg_azimuth_out ); +#ifdef HR_METADATA +static void ivas_qmetadata_quantize_diffuseness_nrg_ratios_hr( IVAS_QMETADATA_HANDLE hQMetaData, int16_t *needed_bits, int16_t *nbits_diff, int16_t *dfRatioBits, const int16_t bits_dir_hr ); + +static int16_t ivas_qmetadata_entropy_encode_diffuseness_hr( BSTR_ENC_HANDLE hMetaData, IVAS_QDIRECTION *q_direction, uint16_t *diffuseness_index_max_ec_frame ); + +static void ivas_qmetadata_quantize_diffuseness_nrg_ratios_hr_512( IVAS_QMETADATA_HANDLE hQMetaData, int16_t *needed_bits, const int16_t bits_dir_hr, BSTR_ENC_HANDLE hMetaData ); + +static int16_t encode_surround_coherence_hr( IVAS_QMETADATA *hQMetaData, BSTR_ENC_HANDLE hMetaData ); + +static void ivas_qmetadata_reorder_2dir_bands_hr( IVAS_QMETADATA_HANDLE hQMetaData ); + +static int16_t ivas_qmetadata_quantize_coherence_hr_512( IVAS_QMETADATA *hQMetaData, const int16_t idx_d, const int16_t all_coherence_zero, BSTR_ENC_HANDLE hMetaData, const int16_t bits_coh ); +#endif + + /*-----------------------------------------------------------------------* * ivas_qmetadata_enc_encode() * @@ -125,12 +155,17 @@ static int16_t calc_var_azi( const IVAS_QDIRECTION *q_direction, const int16_t d *-----------------------------------------------------------------------*/ ivas_error ivas_qmetadata_enc_encode( - BSTR_ENC_HANDLE hMetaData, /* i/o: metadata bitstream handle */ - IVAS_QMETADATA *hQMetaData /* i/o: metadata handle */ + BSTR_ENC_HANDLE hMetaData, /* i/o: metadata bitstream handle */ + IVAS_QMETADATA *hQMetaData /* i/o: metadata handle */ + , + const int16_t hodirac_flag /* i : flag to indicate HO-DirAC mode*/ ) { int16_t i, bit_pos_start, bit_pos_start_coh; - int16_t next_ind_start, last_ind_start; + int16_t next_ind_start; +#ifndef IND_LIST_DYN + int16_t last_ind_start; +#endif uint16_t diffuseness_index_max_ec_frame; uint16_t diffuseness_index_max_ec_frame_pre[QMETADATA_MAX_NO_DIRECTIONS]; int16_t bits_dir_raw_pre[QMETADATA_MAX_NO_DIRECTIONS]; @@ -185,6 +220,7 @@ ivas_error ivas_qmetadata_enc_encode( pF_surcoh = fopen( "./res/qmetadata_surcoh_enc.txt", "w" ); #endif + /* Save initial position in bitstream */ bit_pos_0 = hMetaData->nb_bits_tot; bit_pos_start = bit_pos_0; @@ -210,7 +246,10 @@ ivas_error ivas_qmetadata_enc_encode( assert( ndirections == 2 ); #endif /* Reorder 2dir bands for more efficient encoding. */ - ivas_qmetadata_reorder_2dir_bands( hQMetaData ); + if ( !hodirac_flag ) + { + ivas_qmetadata_reorder_2dir_bands( hQMetaData ); + } d = 0; for ( i = hQMetaData->q_direction[1].cfg.start_band; i < hQMetaData->q_direction[1].cfg.nbands; i++ ) { @@ -244,7 +283,8 @@ ivas_error ivas_qmetadata_enc_encode( } /*Quantization of the Diffuseness */ - ivas_qmetadata_quantize_diffuseness_nrg_ratios( hQMetaData, bits_dir_raw_pre, bits_diff, dfRatio_bits ); + ivas_qmetadata_quantize_diffuseness_nrg_ratios( hQMetaData, bits_dir_raw_pre, bits_diff, dfRatio_bits, + hodirac_flag ); bits_diff_sum = 0; bits_diff[0] = ivas_qmetadata_entropy_encode_diffuseness( hMetaData, &( hQMetaData->q_direction[0] ), &diffuseness_index_max_ec_frame_pre[0] ); @@ -380,9 +420,15 @@ ivas_error ivas_qmetadata_enc_encode( /*Coherence */ bits_coherence[d] = 0; bit_pos_start_coh = hMetaData->nb_bits_tot; + if ( all_coherence_zero == 0 ) { - bits_coherence[d] = ivas_qmetadata_quantize_coherence( hQMetaData, d, all_coherence_zero, hMetaData, 0, &indice_coherence ); + bits_coherence[d] = ivas_qmetadata_quantize_coherence( hQMetaData, d, all_coherence_zero, hMetaData, 0, &indice_coherence +#ifdef HR_METADATA + , + 0 +#endif + ); } if ( q_direction->cfg.mc_ls_setup == MC_LS_SETUP_5_1 || q_direction->cfg.mc_ls_setup == MC_LS_SETUP_7_1 ) @@ -394,7 +440,12 @@ ivas_error ivas_qmetadata_enc_encode( else { /* Quantize directions*/ - quantize_direction_frame( q_direction, azimuth_orig, elevation_orig ); + quantize_direction_frame( q_direction, azimuth_orig, elevation_orig +#ifdef HR_METADATA + , + 0 +#endif + ); } /* Signalling 2D*/ @@ -403,8 +454,12 @@ ivas_error ivas_qmetadata_enc_encode( /* Save state of metadata bitstream buffer after writing energy ratios, number of dirs and save space for coherence*/ bit_pos_start = hMetaData->nb_bits_tot; +#ifdef IND_LIST_DYN + next_ind_start = hMetaData->nb_ind_tot; +#else next_ind_start = hMetaData->next_ind; last_ind_start = hMetaData->last_ind; +#endif /* Encode quantized directions with EC frame-wise*/ if ( total_bits_1dir + bits_surround_coh <= hQMetaData->qmetadata_max_bit_req ) @@ -413,14 +468,23 @@ ivas_error ivas_qmetadata_enc_encode( bits_signaling[d]++; } +#ifdef IND_LIST_DYN + next_ind_raw_flag = hMetaData->nb_ind_tot; +#else next_ind_raw_flag = hMetaData->next_ind; +#endif push_next_indice( hMetaData, 0, 1 ); /* Raw coding flag*/ bits_dir_bands[0] = ivas_qmetadata_raw_encode_dir( NULL, q_direction, q_direction->cfg.nbands, q_direction->cfg.start_band ); reduce_bits = hQMetaData->is_masa_ivas_format ? ( total_bits_1dir - ( bits_diff[d] + bits_coherence[d] + bits_signaling[d] ) - 1 ) : MASA_MAX_BITS; bits_ec = ivas_qmetadata_entropy_encode_dir( hMetaData, q_direction, diffuseness_index_max_ec_frame, - q_direction->cfg.nbands, q_direction->cfg.start_band, bits_dir_bands[0], reduce_bits ); + q_direction->cfg.nbands, q_direction->cfg.start_band, bits_dir_bands[0], reduce_bits +#ifdef HR_METADATA + , + 0 +#endif + ); if ( bits_ec < 0 ) { @@ -445,7 +509,11 @@ ivas_error ivas_qmetadata_enc_encode( /* Encode quantized directions with EC band-wise */ if ( ( total_bits_1dir + bits_surround_coh <= hQMetaData->qmetadata_max_bit_req ) && ( bits_dir[d] + bits_diff[d] + bits_coherence[d] + bits_signaling[d] > total_bits_1dir ) && q_direction->cfg.nblocks > 1 ) { - restore_metadata_buffer( hMetaData, next_ind_start, last_ind_start, bit_pos_start ); + restore_metadata_buffer( hMetaData, next_ind_start, +#ifndef IND_LIST_DYN + last_ind_start, +#endif + bit_pos_start ); /* Write signaling */ push_next_indice( hMetaData, 1, 1 ); /*Write 1 bit to signal no EC frame-wise (EC1)*/ @@ -453,7 +521,11 @@ ivas_error ivas_qmetadata_enc_encode( bits_signaling[d] = 3; /* Write raw flags */ +#ifdef IND_LIST_DYN + next_ind_raw_flag = hMetaData->nb_ind_tot; +#else next_ind_raw_flag = hMetaData->next_ind; +#endif for ( i = start_band; i < nbands; i++ ) { push_next_indice( hMetaData, 0, 1 ); /* Raw coding flag*/ @@ -466,7 +538,12 @@ ivas_error ivas_qmetadata_enc_encode( bits_dir_bands[i] = ivas_qmetadata_raw_encode_dir( NULL, q_direction, i + 1, i ); /* Write ec bits */ - bits_ec = ivas_qmetadata_entropy_encode_dir( hMetaData, q_direction, diffuseness_index_max_ec_frame, i + 1, i, bits_dir_bands[i], MASA_MAX_BITS ); + bits_ec = ivas_qmetadata_entropy_encode_dir( hMetaData, q_direction, diffuseness_index_max_ec_frame, i + 1, i, bits_dir_bands[i], MASA_MAX_BITS +#ifdef HR_METADATA + , + 0 +#endif + ); if ( bits_ec >= 0 ) { @@ -522,7 +599,11 @@ ivas_error ivas_qmetadata_enc_encode( /*Bit budget exceeded, bit reduction strategy?*/ extra_bits = 0; - restore_metadata_buffer( hMetaData, next_ind_start, last_ind_start, bit_pos_start ); + restore_metadata_buffer( hMetaData, next_ind_start, +#ifndef IND_LIST_DYN + last_ind_start, +#endif + bit_pos_start ); push_next_indice( hMetaData, 1, 1 ); /*Write 1 bit to signal no EC frame-wise (EC1)*/ if ( nblocks > 1 ) @@ -565,7 +646,12 @@ ivas_error ivas_qmetadata_enc_encode( { bit_pos_start = hMetaData->nb_bits_tot; hMetaData->nb_bits_tot = bit_pos_start_coh; - ivas_qmetadata_quantize_coherence( hQMetaData, d, all_coherence_zero, hMetaData, 1, &indice_coherence ); + ivas_qmetadata_quantize_coherence( hQMetaData, d, all_coherence_zero, hMetaData, 1, &indice_coherence +#ifdef HR_METADATA + , + 0 +#endif + ); hMetaData->nb_bits_tot = bit_pos_start; } @@ -654,6 +740,259 @@ ivas_error ivas_qmetadata_enc_encode( } +#ifdef HR_METADATA +/*-----------------------------------------------------------------------* + * ivas_qmetadata_enc_encode_hr_384_512() + * + * Main function for quantizing and coding Spatial Metadata at HRs + *-----------------------------------------------------------------------*/ + +ivas_error ivas_qmetadata_enc_encode_hr_384_512( + BSTR_ENC_HANDLE hMetaData, /* i/o: metadata bitstream handle */ + IVAS_QMETADATA *hQMetaData, /* i/o: metadata handle */ + const int16_t bits_sph_idx, + const int16_t bits_sp_coh ) +{ + int16_t i, j; + int16_t bits_diff[QMETADATA_MAX_NO_DIRECTIONS]; + IVAS_QDIRECTION *q_direction; + int16_t nbands, nblocks, start_band; + int16_t ndirections, d; + int16_t all_coherence_zero; + int16_t bits_no_dirs_coh; + int16_t bits_ec; + float azimuth_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES], elevation_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES]; + ivas_error error; + + error = IVAS_ERR_OK; + +#ifdef DEBUG_MODE_QMETADATA + + static FILE *pF = NULL; + static FILE *pF_azi = NULL; + static FILE *pF_ele = NULL; + static FILE *pF_ratio = NULL; + static FILE *pF_spcoh = NULL; + static FILE *pF_spcoh_orig = NULL; + static FILE *pF_surcoh = NULL; + + if ( pF == NULL ) + pF = fopen( "./res/qmetadata_enc.txt", "w" ); + if ( pF_azi == NULL ) + pF_azi = fopen( "./res/qmetadata_azi_enc.txt", "w" ); + if ( pF_ele == NULL ) + pF_ele = fopen( "./res/qmetadata_ele_enc.txt", "w" ); + if ( pF_ratio == NULL ) + pF_ratio = fopen( "./res/qmetadata_ratio_enc.txt", "w" ); + if ( pF_spcoh == NULL ) + pF_spcoh = fopen( "./res/qmetadata_spcoh_enc.txt", "w" ); + if ( pF_spcoh_orig == NULL ) + pF_spcoh_orig = fopen( "./res/qmetadata_spcoh_orig.txt", "w" ); + if ( pF_surcoh == NULL ) + pF_surcoh = fopen( "./res/qmetadata_surcoh_enc.txt", "w" ); +#endif + + ndirections = hQMetaData->no_directions; + + /* Check if coherence should be encoded */ + all_coherence_zero = 1; + bits_no_dirs_coh = 0; +#ifdef FIX_HBR_MASAMETA + if ( hQMetaData->q_direction->cfg.inactiveBands > 0 ) + { + push_next_indice( hMetaData, 1, 1 ); + /* write the number of inactive higher bands */ + ivas_qmetadata_encode_extended_gr( hMetaData, hQMetaData->q_direction->cfg.inactiveBands - 1, MASA_MAXIMUM_CODING_SUBBANDS, 1 ); + } + else + { + /* no change */ + push_next_indice( hMetaData, 0, 1 ); + } +#endif + if ( hQMetaData->coherence_flag ) + { + all_coherence_zero = hQMetaData->all_coherence_zero; + push_next_indice( hMetaData, all_coherence_zero, 1 ); /* signal coherence */ + bits_no_dirs_coh += 1; + } + + /* encode 2 direction subbands position */ + if ( ndirections == 2 && bits_sph_idx == 11 ) + { + bits_no_dirs_coh += write_2dir_info( hMetaData, hQMetaData->twoDirBands, hQMetaData->q_direction[0].cfg.nbands, hQMetaData->numTwoDirBands ); + + for ( i = hQMetaData->numTwoDirBands; i < hQMetaData->q_direction[0].cfg.nbands; i++ ) + { + set_f( hQMetaData->q_direction[1].band_data[i].energy_ratio, 0.0f, hQMetaData->q_direction[1].cfg.nblocks ); + } + + hQMetaData->q_direction[1].cfg.nbands = hQMetaData->numTwoDirBands; + } + + /*Quantization and encoding of the Diffuseness */ + ivas_qmetadata_quantize_diffuseness_nrg_ratios_hr_512( hQMetaData, bits_diff, bits_sph_idx, hMetaData ); + + /* Encode surround coherence */ + if ( all_coherence_zero == 0 ) + { + encode_surround_coherence_hr( hQMetaData, hMetaData ); + } + else + { + for ( i = 0; i < hQMetaData->q_direction[0].cfg.nbands; i++ ) + { + if ( hQMetaData->surcoh_band_data != NULL ) + { + set_c( (int8_t *) hQMetaData->surcoh_band_data[i].surround_coherence, 0, hQMetaData->q_direction[0].cfg.nblocks ); + } + } + } + + /* Loop over number of directions*/ + for ( d = 0; d < ndirections; d++ ) + { + q_direction = &( hQMetaData->q_direction[d] ); + + nbands = q_direction->cfg.nbands; + nblocks = q_direction->cfg.nblocks; + start_band = q_direction->cfg.start_band; + +#ifdef DEBUG_MODE_QMETADATA + { + int16_t k; + k = 0; + fprintf( pF_spcoh_orig, "%d %d ", frame, k ); + + for ( i = start_band; i < nbands; i++ ) + { + for ( j = 0; j < nblocks; j++ ) + { + if ( q_direction->coherence_band_data != NULL ) + { + fprintf( pF_spcoh_orig, " %d ", q_direction->coherence_band_data[i].spread_coherence[j] ); + } + } + } + fprintf( pF_spcoh_orig, "\n" ); + } +#endif + + /*Coherence */ + if ( all_coherence_zero == 0 ) + { + ivas_qmetadata_quantize_coherence_hr_512( hQMetaData, d, all_coherence_zero, hMetaData, bits_sp_coh ); + } + + /* write the spherical indexes */ + bits_ec = hMetaData->nb_bits_tot; + if ( bits_sph_idx == 11 ) + { + /* do the quantization */ + quantize_direction_frame( q_direction, azimuth_orig, elevation_orig, 1 ); + } + for ( i = start_band; i < nbands; i++ ) + { + for ( j = 0; j < nblocks; j++ ) + { + push_next_indice( hMetaData, q_direction->band_data[i].spherical_index[j], bits_sph_idx ); + } + } + bits_ec = hMetaData->nb_bits_tot - bits_ec; + +#ifdef DEBUG_MODE_QMETADATA + { + float tmp_f; + fprintf( pF, "frame %d: diff %d ", frame, bits_diff[d] ); + fprintf( pF_azi, "frame %d/dir/ec %d: ", frame, d ); + fprintf( pF_ele, "frame %d/dir/ec %d: ", frame, d ); + fprintf( pF_ratio, "frame %d/dir %d: ", frame, d ); + /*fprintf( pF_spcoh, "frame %d/dir %d: ", frame, d ); */ + fprintf( pF_spcoh, " %d %d ", frame, d ); + + if ( d == 0 ) + { + fprintf( pF_surcoh, "frame %d/dir %d: ", frame, d ); + } + + /* direction_distance( elevation_orig, azimuth_orig, q_direction, nbands, nblocks, mat_dist );*/ + for ( i = start_band; i < nbands; i++ ) + { + for ( j = 0; j < nblocks; j++ ) + { + fprintf( pF_azi, " %+5.2f ", (int16_t) ( 100.f * q_direction->band_data[i].azimuth[j] ) / 100.f ); + fprintf( pF_ele, " %+5.2f ", (int16_t) ( 100.f * q_direction->band_data[i].elevation[j] ) / 100.f ); + fprintf( pF_ratio, " %1.3f ", q_direction->band_data[i].energy_ratio[j] ); + if ( q_direction->coherence_band_data != NULL ) + { + fprintf( pF_spcoh, " %d ", q_direction->coherence_band_data[i].spread_coherence[j] ); + } + if ( d == 0 && hQMetaData->surcoh_band_data != NULL ) + { + fprintf( pF_surcoh, " %d ", hQMetaData->surcoh_band_data[i].surround_coherence[j] ); + } + } + } + fprintf( pF, "\n" ); + fprintf( pF_azi, "\n" ); + fprintf( pF_ele, "\n" ); + fprintf( pF_ratio, "\n" ); + fprintf( pF_spcoh, "\n" ); + if ( d == 0 ) + { + fprintf( pF_surcoh, "\n" ); + } + + for ( i = 0; i < nblocks; i++ ) + { + for ( j = 0; j < nbands; j++ ) + { + dbgwrite( &( q_direction->band_data[j].azimuth[i] ), sizeof( float ), 1, 1, "./res/IVAS_QMETADATA_azi.bin" ); + dbgwrite( &( q_direction->band_data[j].elevation[i] ), sizeof( float ), 1, 1, "./res/IVAS_QMETADATA_ele.bin" ); + dbgwrite( &( q_direction->band_data[j].energy_ratio_index[i] ), sizeof( uint16_t ), 1, 1, "./res/IVAS_QMETADATA_diffuseness_index.bin" ); + tmp_f = 1.f - q_direction->band_data[j].energy_ratio[i]; + dbgwrite( &tmp_f, sizeof( float ), 1, 1, "./res/IVAS_QMETADATA_diffuseness.bin" ); + } + } + + j = (int16_t) ( hMetaData->nb_bits_tot ); + dbgwrite( &j, sizeof( int16_t ), 1, 1, "./res/IVAS_QMETADATA_bits.bin" ); + } +#endif + + /* Save quantized DOAs */ + if ( bits_sph_idx == 11 ) + { + for ( i = start_band; i < nbands; i++ ) + { + mvr2r( azimuth_orig[i], q_direction->band_data[i].azimuth, nblocks ); + mvr2r( elevation_orig[i], q_direction->band_data[i].elevation, nblocks ); + } + } + else + { + for ( i = start_band; i < nbands; i++ ) + { + mvr2r( q_direction->band_data[i].azimuth, q_direction->band_data[i].q_azimuth, nblocks ); + mvr2r( q_direction->band_data[i].elevation, q_direction->band_data[i].q_elevation, nblocks ); + } + } + } +#ifdef FIX_HBR_MASAMETA + if ( hQMetaData->q_direction->cfg.inactiveBands > 0 ) + { + hQMetaData->q_direction[0].cfg.nbands += hQMetaData->q_direction->cfg.inactiveBands; + if ( ndirections > 1 ) + { + hQMetaData->q_direction[1].cfg.nbands += hQMetaData->q_direction->cfg.inactiveBands; + } + } +#endif + return error; +} +#endif + + /*-----------------------------------------------------------------------* * ivas_qmetadata_enc_sid_encode() * @@ -908,15 +1247,19 @@ void ivas_qmetadata_enc_sid_encode( void reset_metadata_spatial( const IVAS_FORMAT ivas_format, /* i : IVAS format */ - BSTR_ENC_HANDLE hMetaData, /* i/o: Metadata bitstream handle */ + BSTR_ENC_HANDLE hMetaData, /* i/o: metadata bitstream handle */ const int32_t element_brate, /* i : element bitrate */ int32_t *total_brate, /* o : total bitrate */ const int32_t core_brate, /* i : core bitrate */ - const int16_t nb_bits_metadata, /* i : number of meatdata bits */ + const int16_t nb_bits_metadata, /* i : number of metadata bits */ const SBA_MODE sba_mode /* i : SBA mode */ ) { int16_t i, next_ind_sid, last_ind_sid; +#ifdef IND_LIST_DYN + int16_t j; +#endif + int16_t metadata_sid_bits; if ( core_brate == SID_2k40 || core_brate == FRAME_NO_DATA ) @@ -925,7 +1268,9 @@ void reset_metadata_spatial( { if ( sba_mode == SBA_MODE_SPAR ) { +#ifdef DEBUGGING assert( hMetaData->ind_list[0].nb_bits == 1 ); +#endif hMetaData->ind_list[0].value = 1; metadata_sid_bits = (int16_t) ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; while ( hMetaData->nb_bits_tot < metadata_sid_bits ) @@ -936,15 +1281,22 @@ void reset_metadata_spatial( else { /* Reset metadata and keep only SID metadata*/ +#ifdef IND_LIST_DYN + last_ind_sid = hMetaData->nb_ind_tot; + next_ind_sid = hMetaData->nb_ind_tot; +#else last_ind_sid = hMetaData->next_ind; next_ind_sid = hMetaData->next_ind; +#endif while ( hMetaData->nb_bits_tot > nb_bits_metadata ) { next_ind_sid--; hMetaData->nb_bits_tot -= hMetaData->ind_list[next_ind_sid].nb_bits; } +#ifndef IND_LIST_DYN hMetaData->next_ind = 0; +#endif hMetaData->nb_bits_tot = 0; for ( i = 0; i < next_ind_sid; i++ ) @@ -952,6 +1304,17 @@ void reset_metadata_spatial( hMetaData->ind_list[i].nb_bits = -1; } +#ifdef IND_LIST_DYN + for ( j = 0, i = next_ind_sid; i < last_ind_sid; i++, j++ ) + { + hMetaData->ind_list[j].value = hMetaData->ind_list[i].value; + hMetaData->ind_list[j].nb_bits = hMetaData->ind_list[i].nb_bits; + hMetaData->nb_bits_tot += hMetaData->ind_list[j].nb_bits; + hMetaData->ind_list[i].nb_bits = -1; + } + + hMetaData->nb_ind_tot = j; +#else for ( i = next_ind_sid; i < last_ind_sid; i++ ) { hMetaData->ind_list[hMetaData->next_ind].value = hMetaData->ind_list[i].value; @@ -960,13 +1323,20 @@ void reset_metadata_spatial( hMetaData->next_ind++; hMetaData->ind_list[i].nb_bits = -1; } + hMetaData->last_ind = hMetaData->next_ind; +#endif +#ifdef DEBUGGING assert( ( hMetaData->nb_bits_tot == ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS ) && "Problem of SID metadata in SCE" ); +#endif } } else { /*Reset metadata*/ +#ifdef IND_LIST_DYN + reset_indices_enc( hMetaData, hMetaData->nb_ind_tot ); +#else for ( i = 0; i < hMetaData->next_ind; i++ ) { hMetaData->ind_list[i].nb_bits = -1; @@ -974,6 +1344,7 @@ void reset_metadata_spatial( hMetaData->nb_bits_tot = 0; hMetaData->next_ind = 0; hMetaData->last_ind = 0; +#endif } *total_brate = element_brate; @@ -983,12 +1354,22 @@ void reset_metadata_spatial( /* Reset SID metadata bits*/ while ( hMetaData->nb_bits_tot > nb_bits_metadata ) { +#ifdef IND_LIST_DYN + hMetaData->nb_ind_tot--; + hMetaData->nb_bits_tot -= hMetaData->ind_list[hMetaData->nb_ind_tot].nb_bits; + hMetaData->ind_list[hMetaData->nb_ind_tot].nb_bits = -1; +#else hMetaData->next_ind--; hMetaData->nb_bits_tot -= hMetaData->ind_list[hMetaData->next_ind].nb_bits; hMetaData->ind_list[hMetaData->next_ind].nb_bits = -1; +#endif } +#ifdef DEBUGGING assert( hMetaData->nb_bits_tot == nb_bits_metadata && "Problem in metadata for SCE" ); +#endif +#ifndef IND_LIST_DYN hMetaData->last_ind = hMetaData->next_ind; +#endif } return; @@ -1001,13 +1382,13 @@ void reset_metadata_spatial( * *------------------------------------------------------------------------*/ -/* !r: quantized spherical index */ +/*! r: quantized spherical index */ int16_t quantize_direction2D( - float phi, /* i : input azimuth value */ - const int16_t no_cw, /* i : number of bits */ - float *phi_q, /* o : quantized azimuth value */ - uint16_t *index_phi, /* o : quantized azimuth index */ - const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */ + float phi, /* i : input azimuth value */ + const int16_t no_cw, /* i : number of bits */ + float *phi_q, /* o : quantized azimuth value */ + uint16_t *index_phi, /* o : quantized azimuth index */ + const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */ ) { int16_t idx_sph; @@ -1019,7 +1400,6 @@ int16_t quantize_direction2D( return 0; } - if ( mc_format != MC_LS_SETUP_INVALID ) { id_phi = quantize_phi_chan_compand( phi + 180, phi_q, no_cw, 0, mc_format ); @@ -1037,17 +1417,19 @@ int16_t quantize_direction2D( } +#ifdef HR_METADATA /*------------------------------------------------------------------------- * ivas_qmetadata_quantize_diffuseness_nrg_ratios() * * Quantize diffuseness *------------------------------------------------------------------------*/ -static void ivas_qmetadata_quantize_diffuseness_nrg_ratios( +static void ivas_qmetadata_quantize_diffuseness_nrg_ratios_hr( IVAS_QMETADATA_HANDLE hQMetaData, int16_t *needed_bits, int16_t *nbits_diff, - int16_t *dfRatioBits ) + int16_t *dfRatioBits, + const int16_t bits_dir_hr ) { int16_t j, k, dir2band; int16_t index_dirRatio1Inv, index_dirRatio2Inv, index_dirRatio1Inv_mod, index_dirRatio2Inv_mod; @@ -1076,10 +1458,10 @@ static void ivas_qmetadata_quantize_diffuseness_nrg_ratios( diffRatio = 1.0f - sumRatio; dfRatio = sumRatio < EPSILON ? 0.5f : dirRatio1 / sumRatio; - index_diff = masa_sq( diffRatio, diffuseness_thresholds, DIRAC_DIFFUSE_LEVELS ); - diffRatioQ = diffuseness_reconstructions[index_diff]; + index_diff = masa_sq( diffRatio, diffuseness_thresholds_hr, HR_MASA_ER_LEVELS ); + diffRatioQ = diffuseness_reconstructions_hr[index_diff]; - dfRatio_bits = ivas_get_df_ratio_bits( index_diff ); + dfRatio_bits = ivas_get_df_ratio_bits( index_diff >> 1 ); dfRatioBits[dir2band] = dfRatio_bits; @@ -1090,7 +1472,7 @@ static void ivas_qmetadata_quantize_diffuseness_nrg_ratios( dirRatio1Q = dfRatioQ * ( 1.0f - diffRatioQ ); dirRatio2Q = ( 1.0f - diffRatioQ ) - dirRatio1Q; - index_dirRatio1Inv = masa_sq( 1.0f - dirRatio1Q, diffuseness_thresholds, DIRAC_DIFFUSE_LEVELS ); + index_dirRatio1Inv = masa_sq( 1.0f - dirRatio1Q, diffuseness_thresholds_hr, HR_MASA_ER_LEVELS ); /* Note: To save memory, we store temporarily index_diff and dfRatio_index into first and second direction * energy ratio index variables until they have been encoded. index_dirRatio1Inv and index_dirRatio2Inv are @@ -1100,9 +1482,9 @@ static void ivas_qmetadata_quantize_diffuseness_nrg_ratios( hQMetaData->q_direction[0].band_data[j].energy_ratio_index[k] = index_diff; hQMetaData->q_direction[0].band_data[j].energy_ratio[k] = dirRatio1Q; } - nbits_diff[0] += MASA_BITS_ER; + nbits_diff[0] += MASA_BITS_ER_HR; - index_dirRatio2Inv = masa_sq( 1.0f - dirRatio2Q, diffuseness_thresholds, DIRAC_DIFFUSE_LEVELS ); + index_dirRatio2Inv = masa_sq( 1.0f - dirRatio2Q, diffuseness_thresholds_hr, HR_MASA_ER_LEVELS ); for ( k = 0; k < hQMetaData->q_direction[1].cfg.nblocks; k++ ) { hQMetaData->q_direction[1].band_data[dir2band].energy_ratio_index[k] = dfRatio_index; @@ -1114,13 +1496,344 @@ static void ivas_qmetadata_quantize_diffuseness_nrg_ratios( * fact that with 2dir data, it is harder to achieve separate high direct-to-total ratio values * which are assumed by the direction quantization system. In practice, this improves direction * accuracy when it is perceptual meaningful. */ - masa_compensate_two_dir_energy_ratio_index( index_dirRatio1Inv, index_dirRatio2Inv, &index_dirRatio1Inv_mod, &index_dirRatio2Inv_mod ); + masa_compensate_two_dir_energy_ratio_index( index_dirRatio1Inv, index_dirRatio2Inv, &index_dirRatio1Inv_mod, &index_dirRatio2Inv_mod, + 0 ); for ( k = 0; k < hQMetaData->q_direction[0].cfg.nblocks; k++ ) { hQMetaData->q_direction[0].band_data[j].energy_ratio_index_mod[k] = index_dirRatio1Inv_mod; - hQMetaData->q_direction[0].band_data[j].bits_sph_idx[k] = bits_direction_masa[index_dirRatio1Inv_mod]; - } + + if ( bits_dir_hr > 0 ) + { + hQMetaData->q_direction[0].band_data[j].bits_sph_idx[k] = bits_dir_hr; + } + else + { + + hQMetaData->q_direction[0].band_data[j].bits_sph_idx[k] = bits_direction_masa[index_dirRatio1Inv_mod]; + } + } + needed_bits[0] += hQMetaData->q_direction[0].cfg.nblocks * bits_direction_masa[index_dirRatio1Inv_mod]; + + for ( k = 0; k < hQMetaData->q_direction[1].cfg.nblocks; k++ ) + { + hQMetaData->q_direction[1].band_data[dir2band].energy_ratio_index_mod[k] = index_dirRatio2Inv_mod; + + if ( bits_dir_hr > 0 ) + { + hQMetaData->q_direction[1].band_data[dir2band].bits_sph_idx[k] = bits_dir_hr; + } + else + { + + hQMetaData->q_direction[1].band_data[dir2band].bits_sph_idx[k] = bits_direction_masa[index_dirRatio2Inv_mod]; + } + } + needed_bits[1] += hQMetaData->q_direction[1].cfg.nblocks * bits_direction_masa[index_dirRatio2Inv_mod]; + + dir2band++; + } + else + { + index_dirRatio1Inv = masa_sq( 1.0f - hQMetaData->q_direction[0].band_data[j].energy_ratio[0], diffuseness_thresholds_hr, HR_MASA_ER_LEVELS ); + + for ( k = 0; k < hQMetaData->q_direction[0].cfg.nblocks; k++ ) + { + hQMetaData->q_direction[0].band_data[j].energy_ratio_index[k] = index_dirRatio1Inv; + hQMetaData->q_direction[0].band_data[j].energy_ratio_index_mod[k] = index_dirRatio1Inv; + hQMetaData->q_direction[0].band_data[j].energy_ratio[k] = 1.0f - diffuseness_reconstructions_hr[index_dirRatio1Inv]; + + if ( bits_dir_hr > 0 ) + { + hQMetaData->q_direction[0].band_data[j].bits_sph_idx[k] = bits_dir_hr; + } + else + { + + hQMetaData->q_direction[0].band_data[j].bits_sph_idx[k] = bits_direction_masa[index_dirRatio1Inv]; + } + } + + nbits_diff[0] += MASA_BITS_ER_HR; + + needed_bits[0] += hQMetaData->q_direction[0].cfg.nblocks * bits_dir_hr; + } + } + + return; +} + + +static void ivas_qmetadata_quantize_diffuseness_nrg_ratios_hr_512( + IVAS_QMETADATA_HANDLE hQMetaData, + int16_t *needed_bits, + const int16_t bits_dir_hr, + BSTR_ENC_HANDLE hMetaData ) +{ + int16_t j, k; + int16_t index; + + needed_bits[0] = 0; + needed_bits[1] = 0; + + for ( j = hQMetaData->q_direction[0].cfg.start_band; j < hQMetaData->q_direction[0].cfg.nbands; ++j ) + { + for ( k = 0; k < hQMetaData->q_direction[0].cfg.nblocks; k++ ) + { + index = masa_sq( 1.0f - hQMetaData->q_direction[0].band_data[j].energy_ratio[k], diffuseness_thresholds_hr, HR_MASA_ER_LEVELS ); + push_next_indice( hMetaData, index, MASA_BITS_ER_HR ); + hQMetaData->q_direction[0].band_data[j].energy_ratio_index[k] = index; + hQMetaData->q_direction[0].band_data[j].energy_ratio_index_mod[k] = index; + hQMetaData->q_direction[0].band_data[j].energy_ratio[k] = 1.0f - diffuseness_reconstructions_hr[index]; + needed_bits[0] += MASA_BITS_ER_HR; + hQMetaData->q_direction[0].band_data[j].bits_sph_idx[k] = bits_dir_hr; + } + } + + if ( hQMetaData->no_directions == 2 ) + { + for ( j = hQMetaData->q_direction[1].cfg.start_band; j < hQMetaData->q_direction[1].cfg.nbands; ++j ) + { + for ( k = 0; k < hQMetaData->q_direction[1].cfg.nblocks; k++ ) + { + index = masa_sq( 1.0f - hQMetaData->q_direction[1].band_data[j].energy_ratio[k], diffuseness_thresholds_hr, HR_MASA_ER_LEVELS ); + push_next_indice( hMetaData, index, MASA_BITS_ER_HR ); + hQMetaData->q_direction[1].band_data[j].energy_ratio_index[k] = index; + hQMetaData->q_direction[1].band_data[j].energy_ratio[k] = 1.0f - diffuseness_reconstructions_hr[index]; + if ( hQMetaData->q_direction[1].band_data[j].energy_ratio[k] > 1.0f - hQMetaData->q_direction[0].band_data[j].energy_ratio[k] ) + { + hQMetaData->q_direction[1].band_data[j].energy_ratio[k] = 1.0f - hQMetaData->q_direction[0].band_data[j].energy_ratio[k]; + } + needed_bits[1] += MASA_BITS_ER_HR; + hQMetaData->q_direction[1].band_data[j].bits_sph_idx[k] = bits_dir_hr; + } + } + } + + return; +} + + +/*------------------------------------------------------------------------- + * ivas_qmetadata_entropy_encode_diffuseness() + * + * encode diffuseness + *------------------------------------------------------------------------*/ + +static int16_t ivas_qmetadata_entropy_encode_diffuseness_hr( + BSTR_ENC_HANDLE hMetaData, + IVAS_QDIRECTION *q_direction, + uint16_t *diffuseness_index_max_ec_frame ) +{ + int16_t start_bit_pos; + int16_t diffuseness_bits_raw; + int16_t b; + int16_t min_diffuseness_m_index, max_diffuseness_m_index; + int16_t nbands; + int16_t start_band; + + nbands = q_direction->cfg.nbands; + start_band = q_direction->cfg.start_band; + + start_bit_pos = hMetaData->nb_bits_tot; + + if ( nbands == 1 ) + { + /* If there is only one band, diffuseness should be coded directly as raw with no signaling. */ + push_next_indice( hMetaData, q_direction->band_data[0].energy_ratio_index[0], MASA_BITS_ER_HR ); + *diffuseness_index_max_ec_frame = 10; + return ( hMetaData->nb_bits_tot - start_bit_pos ); + } + + /* compute the number of raw coding bits */ + diffuseness_bits_raw = 0; + for ( b = start_band; b < nbands; b++ ) + { + diffuseness_bits_raw += ivas_qmetadata_encode_quasi_uniform_length( q_direction->band_data[b].energy_ratio_index[0], HR_MASA_ER_LEVELS ); + } + + min_diffuseness_m_index = q_direction->band_data[start_band].energy_ratio_index[0]; + max_diffuseness_m_index = q_direction->band_data[start_band].energy_ratio_index[0]; + + for ( b = start_band; b < nbands; b++ ) + { + if ( q_direction->band_data[b].energy_ratio_index[0] < min_diffuseness_m_index ) + { + min_diffuseness_m_index = q_direction->band_data[b].energy_ratio_index[0]; + } + + if ( q_direction->band_data[b].energy_ratio_index[0] > max_diffuseness_m_index ) + { + max_diffuseness_m_index = q_direction->band_data[b].energy_ratio_index[0]; + } + } + + /* Use similarity coding approach or raw coding when there is a low number of bands. */ + /* one bit is used to indicate whether diffuseness values are entropy coded or coded raw */ + if ( min_diffuseness_m_index == max_diffuseness_m_index ) /* all values are equal */ + { + push_next_indice( hMetaData, 0, 1 ); /* dif_use_raw_coding */ + push_next_indice( hMetaData, 1, 1 ); /* dif_have_unique_value */ + ivas_qmetadata_encode_quasi_uniform( hMetaData, min_diffuseness_m_index, HR_MASA_ER_LEVELS ); /* dif_unique_value */ + } + else if ( min_diffuseness_m_index + 1 == max_diffuseness_m_index ) /* only two consecutive values are present */ + { + push_next_indice( hMetaData, 0, 1 ); /* dif_use_raw_coding */ + push_next_indice( hMetaData, 0, 1 ); /* dif_have_unique_value */ + ivas_qmetadata_encode_quasi_uniform( hMetaData, min_diffuseness_m_index, HR_MASA_ER_LEVELS - 1 ); /* dif_min_value */ + + for ( b = start_band; b < nbands; b++ ) + { + push_next_indice( hMetaData, q_direction->band_data[b].energy_ratio_index[0] - min_diffuseness_m_index, 1 ); /* dif_bit_offset_values */ + } + } + else /* raw coding */ + { + push_next_indice( hMetaData, 1, 1 ); /* dif_use_raw_coding */ + + for ( b = start_band; b < nbands; b++ ) + { + ivas_qmetadata_encode_quasi_uniform( hMetaData, q_direction->band_data[b].energy_ratio_index[0], HR_MASA_ER_LEVELS ); /* dif_values */ + } + } + + *diffuseness_index_max_ec_frame = 10; + /* adaptively select the diffuseness_index_max_ec threshold */ + if ( min_diffuseness_m_index > 10 ) + { + *diffuseness_index_max_ec_frame = HR_MASA_ER_LEVELS - 1; + } + +#ifdef DEBUGGING + assert( ( hMetaData->nb_bits_tot - start_bit_pos ) <= 1 + diffuseness_bits_raw ); +#endif + return ( hMetaData->nb_bits_tot - start_bit_pos ); +} + +#endif + +/*------------------------------------------------------------------------- + * ivas_qmetadata_quantize_diffuseness_nrg_ratios() + * + * Quantize diffuseness + *------------------------------------------------------------------------*/ + +static void ivas_qmetadata_quantize_diffuseness_nrg_ratios( + IVAS_QMETADATA_HANDLE hQMetaData, + int16_t *needed_bits, + int16_t *nbits_diff, + int16_t *dfRatioBits, + const int16_t hodirac_flag ) +{ + int16_t j, k, dir2band; + int16_t index_dirRatio1Inv, index_dirRatio2Inv, index_dirRatio1Inv_mod, index_dirRatio2Inv_mod; + int16_t index_diff; + + nbits_diff[0] = 0; + nbits_diff[1] = 0; + needed_bits[0] = 0; + needed_bits[1] = 0; + dir2band = 0; + + for ( j = hQMetaData->q_direction[0].cfg.start_band; j < hQMetaData->q_direction[0].cfg.nbands; ++j ) + { + if ( hQMetaData->no_directions == 2 && hQMetaData->twoDirBands[j] == 1 ) + { + float diffRatio, dfRatio, dfRatioQ, diffRatioQ, dirRatio1Q, dirRatio2Q; + float dirRatio1, dirRatio2, sumRatio; + int16_t dfRatio_index, dfRatio_qsteps, dfRatio_bits; + + /* With 2dir metadata, we quantize and transmit diffuse-to-total ratio (diffRatio) and + * distribution factor of direct-to-total ratios (dFRatio). This is more efficient and + * accurate than simple separate quantization of each direct-to-total ratio or their + * separate inverses. */ + if ( hodirac_flag ) + { + /* already encoded as total and ratios in HO-DirAC */ + diffRatio = 1.f - hQMetaData->q_direction[0].band_data[j].energy_ratio[0]; + dfRatio = hQMetaData->q_direction[1].band_data[dir2band].energy_ratio[0]; + } + else + { + dirRatio1 = hQMetaData->q_direction[0].band_data[j].energy_ratio[0]; + dirRatio2 = hQMetaData->q_direction[1].band_data[dir2band].energy_ratio[0]; + sumRatio = dirRatio1 + dirRatio2; + diffRatio = 1.0f - sumRatio; + dfRatio = sumRatio < EPSILON ? 0.5f : dirRatio1 / sumRatio; + } + + + index_diff = masa_sq( diffRatio, diffuseness_thresholds, DIRAC_DIFFUSE_LEVELS ); + diffRatioQ = diffuseness_reconstructions[index_diff]; + + if ( hodirac_flag ) + { + dfRatio_bits = ivas_get_df_ratio_bits_hodirac( index_diff ); + } + else + { + dfRatio_bits = ivas_get_df_ratio_bits( index_diff ); + } + + dfRatioBits[dir2band] = dfRatio_bits; + + dfRatio_qsteps = ( 1 << dfRatio_bits ); + if ( hodirac_flag ) + { + dfRatio_index = usquant( dfRatio, &dfRatioQ, 0.0f, 1.f / ( dfRatio_qsteps - 1 ), dfRatio_qsteps ); + dirRatio1Q = 1.f - diffRatioQ; + dirRatio2Q = dfRatioQ; + } + else + { + dfRatio_index = usquant( dfRatio, &dfRatioQ, 0.5f, 0.5f / ( dfRatio_qsteps - 1 ), dfRatio_qsteps ); + + /* Direction quantization requires also separately quantized direct-to-total ratios. Thus, we calculate them. */ + dirRatio1Q = dfRatioQ * ( 1.0f - diffRatioQ ); + dirRatio2Q = ( 1.0f - diffRatioQ ) - dirRatio1Q; + } + + index_dirRatio1Inv = masa_sq( 1.0f - dirRatio1Q, diffuseness_thresholds, DIRAC_DIFFUSE_LEVELS ); + + /* Note: To save memory, we store temporarily index_diff and dfRatio_index into first and second direction + * energy ratio index variables until they have been encoded. index_dirRatio1Inv and index_dirRatio2Inv are + * then later retrieved for further use in encoding. */ + for ( k = 0; k < hQMetaData->q_direction[0].cfg.nblocks; k++ ) + { + hQMetaData->q_direction[0].band_data[j].energy_ratio_index[k] = index_diff; + hQMetaData->q_direction[0].band_data[j].energy_ratio[k] = dirRatio1Q; + } + nbits_diff[0] += MASA_BITS_ER; + + if ( hodirac_flag ) + { + float tmp; + index_dirRatio2Inv = usquant( dirRatio2Q, &tmp, 0.0f, 1.f / ( DIRAC_DIFFUSE_LEVELS - 1 ), DIRAC_DIFFUSE_LEVELS ); + } + else + { + index_dirRatio2Inv = masa_sq( 1.0f - dirRatio2Q, diffuseness_thresholds, DIRAC_DIFFUSE_LEVELS ); + } + + for ( k = 0; k < hQMetaData->q_direction[1].cfg.nblocks; k++ ) + { + hQMetaData->q_direction[1].band_data[dir2band].energy_ratio_index[k] = dfRatio_index; + hQMetaData->q_direction[1].band_data[dir2band].energy_ratio[k] = dirRatio2Q; + } + nbits_diff[1] += dfRatio_bits; + + /* Obtain compensated direct-to-total ratios for direction quantization. This compensates for the + * fact that with 2dir data, it is harder to achieve separate high direct-to-total ratio values + * which are assumed by the direction quantization system. In practice, this improves direction + * accuracy when it is perceptual meaningful. */ + masa_compensate_two_dir_energy_ratio_index( index_dirRatio1Inv, index_dirRatio2Inv, &index_dirRatio1Inv_mod, &index_dirRatio2Inv_mod, + hodirac_flag ); + + for ( k = 0; k < hQMetaData->q_direction[0].cfg.nblocks; k++ ) + { + hQMetaData->q_direction[0].band_data[j].energy_ratio_index_mod[k] = index_dirRatio1Inv_mod; + hQMetaData->q_direction[0].band_data[j].bits_sph_idx[k] = bits_direction_masa[index_dirRatio1Inv_mod]; + } needed_bits[0] += hQMetaData->q_direction[0].cfg.nblocks * bits_direction_masa[index_dirRatio1Inv_mod]; for ( k = 0; k < hQMetaData->q_direction[1].cfg.nblocks; k++ ) @@ -1145,6 +1858,7 @@ static void ivas_qmetadata_quantize_diffuseness_nrg_ratios( } nbits_diff[0] += MASA_BITS_ER; + needed_bits[0] += hQMetaData->q_direction[0].cfg.nblocks * bits_direction_masa[index_dirRatio1Inv]; } } @@ -1494,24 +2208,34 @@ static int16_t ivas_qmetadata_entropy_encode_df_ratio( /*------------------------------------------------------------------------- * restore_metadata_buffer() * - * Reset metadata buffer + * Restore metadata buffer *------------------------------------------------------------------------*/ void restore_metadata_buffer( BSTR_ENC_HANDLE hMetaData, const int16_t next_ind_start, +#ifndef IND_LIST_DYN const int16_t last_ind_start, +#endif const int16_t bit_pos_start ) { int16_t i; +#ifdef IND_LIST_DYN + for ( i = next_ind_start; i <= hMetaData->nb_ind_tot; i++ ) +#else for ( i = next_ind_start; i <= hMetaData->next_ind; i++ ) +#endif { hMetaData->ind_list[i].nb_bits = -1; } hMetaData->nb_bits_tot = bit_pos_start; +#ifdef IND_LIST_DYN + hMetaData->nb_ind_tot = next_ind_start; +#else hMetaData->next_ind = next_ind_start; hMetaData->last_ind = last_ind_start; +#endif return; } @@ -1560,7 +2284,7 @@ static void ivas_qmetadata_encode_quasi_uniform( * *------------------------------------------------------------------------*/ -/* !r: number of bits using Golomb Rice code */ +/*! r: number of bits using Golomb Rice code */ static int16_t GR_bits_new( uint16_t *data, /* i : data to encode with GR */ int16_t *no_symb, /* i : number of symbols for each component*/ @@ -1614,7 +2338,7 @@ static int16_t GR_bits_new( * Encoding azimuth indexes with GR code using context *------------------------------------------------------------------------*/ -/* !r: numer of bits used for coding */ +/*! r: numer of bits used for coding */ static int16_t GR_bits_azimuth_context( uint16_t *data_in, /* i : data to be encoded */ int16_t *no_symb, /* i : number of symbols for each component */ @@ -1712,7 +2436,7 @@ static int16_t GR_bits_azimuth_context( * Golomb Rice encoding with mean removing *------------------------------------------------------------------------*/ -/* !r: number of bits used */ +/*! r: number of bits used */ static int16_t mean_removed_GR_new( const uint16_t *idx, /* i : data to encode */ const int16_t max_no_symb, @@ -1799,7 +2523,12 @@ static int16_t ivas_qmetadata_entropy_encode_dir( const int16_t nbands, const int16_t start_band, const int16_t direction_bits_raw, - int16_t max_bits ) + int16_t max_bits +#ifdef HR_METADATA + , + const int16_t hrmasa_flag +#endif +) { uint16_t diff_idx_min; int16_t i, j; @@ -1843,10 +2572,22 @@ static int16_t ivas_qmetadata_entropy_encode_dir( idx = 0; dist_count = 0; set_zero( avg_direction_vector, 3 ); + for ( i = start_band; i < nbands; i++ ) { - diff_idx_min = min( q_direction->band_data[i].energy_ratio_index_mod[0], diff_idx_min ); - +#ifdef HR_METADATA + if ( hrmasa_flag ) + { + diff_idx_min = 0; // min( q_direction->band_data[i].energy_ratio_index_mod[0]>>1, diff_idx_min ); + } + else + { +#endif + diff_idx_min = min( q_direction->band_data[i].energy_ratio_index_mod[0], diff_idx_min ); +#ifdef HR_METADATA + } +#endif + if ( q_direction->band_data[i].energy_ratio_index_mod[0] > diffuseness_index_max_ec_frame ) { /* estimate the raw part */ @@ -2046,6 +2787,7 @@ static int16_t ivas_qmetadata_entropy_encode_dir( } } } + direction_bits_ec += elevation_bits_ec_best; } @@ -2218,6 +2960,7 @@ static int16_t ivas_qmetadata_entropy_encode_dir( } } } + /* encode the ExtendedGR part for azimuth */ ivas_qmetadata_encode_quasi_uniform( hMetaData, ivas_qmetadata_reorder_generic( avg_azimuth_index_best - ( avg_azimuth_alphabet >> 1 ) ), avg_azimuth_alphabet ); @@ -2251,6 +2994,7 @@ static int16_t ivas_qmetadata_entropy_encode_dir( ivas_qmetadata_encode_extended_gr( hMetaData, dist_azimuth_indexes_best[idx], dist_azimuth_alphabets[idx], gr_param_azimuth_best ); } } + if ( dist_count > nblocks ) { if ( ( q_direction->cfg.mc_ls_setup != MC_LS_SETUP_INVALID ) && ( nblocks > 1 ) ) @@ -2285,6 +3029,7 @@ static int16_t ivas_qmetadata_entropy_encode_dir( } } } + direction_bits_ec -= bits_gained; } else @@ -3438,7 +4183,7 @@ static ivas_error requantize_direction_EC_3( * writing of the spherical indexes *-------------------------------------------------------------------*/ -/* !r: number of bits written */ +/*! r: number of bits written */ static int16_t write_fixed_rate_direction( BSTR_ENC_HANDLE hMetaData, /* i : MASA metadata structure */ IVAS_QDIRECTION *qdirection, /* i/o: quantized directional parameters */ @@ -3700,7 +4445,7 @@ static void calculate_two_distances( * write metadata using entropy encoding *-------------------------------------------------------------------*/ -/* !r: number of bits written */ +/*! r: number of bits written */ static ivas_error write_ec_direction( int16_t *num_bits_written, /* o : Number of bits written */ BSTR_ENC_HANDLE hMetaData, /* i : MASA metadata structure */ @@ -3874,7 +4619,7 @@ static ivas_error write_ec_direction( * Local functions (coherence Q and coding) *-----------------------------------------------------------------------*/ -/* !r: index */ +/*! r: index */ static uint64_t create_combined_index( uint16_t *idx_dct, /* i : indexes to combine */ const int16_t len, /* i : number of indexes */ @@ -3900,13 +4645,13 @@ static uint64_t create_combined_index( * encoding DCT0 coeffs with joint index *-----------------------------------------------------------------------*/ -/* !r: number of bits written */ +/*! r: number of bits written */ static int16_t encode_coherence_indexesDCT0( uint16_t *idx_dct, /* i : indexes to be encoded */ const int16_t len, /* i : number of indexes */ int16_t *no_cb_vec, /* i : number of codewords for each position */ BSTR_ENC_HANDLE hMetaData, - int16_t indice_coherence, + const int16_t indice_coherence, const int16_t nbits, const int16_t nbits1 ) { @@ -4001,9 +4746,7 @@ static int16_t coherence_coding_length( if ( sum_s( no_cv, coding_subbands ) > MASA_COH_LIMIT_2IDX ) { -#ifdef DEBUGGING - assert( coding_subbands % 2 == 0 ); -#endif + no_cb = 1; half_coding_subbands = coding_subbands / 2; for ( j = 0; j < half_coding_subbands; j++ ) @@ -4049,11 +4792,15 @@ static int16_t coherence_coding_length( * Encoding spread coherence for 1 subframe bands *-------------------------------------------------------------------*/ -/* !r: number of bits written */ +/*! r: number of bits written */ static int16_t encode_spread_coherence_1sf( - IVAS_QMETADATA *q_metadata, /* i : quantized metadata */ - const int16_t idx_d, /* i : current direction index */ - BSTR_ENC_HANDLE hMasaMetaData /* i/o: metadata bitstream handle */ + IVAS_QMETADATA *q_metadata, /* i : quantized metadata */ + const int16_t idx_d, /* i : current direction index */ + BSTR_ENC_HANDLE hMasaMetaData /* i/o: metadata bitstream handle */ +#ifdef HR_METADATA + , + const int16_t hrmasa_flag /* i : flag indicating high-rate MASA MD coding */ +#endif ) { int16_t i, j, k; @@ -4079,11 +4826,24 @@ static int16_t encode_spread_coherence_1sf( GR_ord = 1; idx_shift = 0; + /* number of codevectors added dependent on number of subbands */ extra_cv = coding_subbands / MASA_FACTOR_CV_COH; for ( j = 0; j < coding_subbands; j++ ) { - idx_ER = 7 - q_direction->band_data[j].energy_ratio_index_mod[0] + extra_cv; +#ifdef HR_METADATA + if ( hrmasa_flag ) + { + idx_ER = 7 - ( q_direction->band_data[j].energy_ratio_index_mod[0] >> 1 ) + extra_cv; + } + else + { +#endif + idx_ER = 7 - q_direction->band_data[j].energy_ratio_index_mod[0] + extra_cv; +#ifdef HR_METADATA + } +#endif + if ( idx_ER > 0 ) { idx_sp_coh[j] = (uint16_t) roundf( q_direction->coherence_band_data[j].spread_coherence[0] / ( 255.0f / (float) idx_ER ) ); @@ -4228,7 +4988,7 @@ static int16_t encode_spread_coherence_1sf( * encoding surround coherence *-------------------------------------------------------------------*/ -/* !r: number of bits written */ +/*! r: number of bits written */ static int16_t encode_surround_coherence( IVAS_QMETADATA *hQMetaData, /* i : quantized metadata */ BSTR_ENC_HANDLE hMetaData /* i/o: metadata bitstream handle */ @@ -4433,13 +5193,217 @@ static int16_t encode_surround_coherence( } +#ifdef HR_METADATA +static int16_t encode_surround_coherence_hr( + IVAS_QMETADATA *hQMetaData, /* i : quantized metadata */ + BSTR_ENC_HANDLE hMetaData /* i/o: metadata bitstream handle */ +) +{ + int16_t i, j, k, sf; + int16_t nbits, nbits_fr, nbits_sf; + 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, idx1; + int16_t no_idx16; + int16_t no_cv[MASA_MAXIMUM_CODING_SUBBANDS]; + float error_ratio_surr; + IVAS_QDIRECTION *q_direction; + 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; + int16_t idx16; + + coding_subbands = hQMetaData->q_direction[0].cfg.nbands; + all_coherence_zero = hQMetaData->all_coherence_zero; + q_direction = &( hQMetaData->q_direction[0] ); + nbits = 0; + + if ( all_coherence_zero == 1 ) + { + nbits = 0; + } + else + { + for ( sf = 0; sf < hQMetaData->q_direction[0].cfg.nblocks; sf++ ) + { + GR_ord = 1; + k = 0; + idx_shift = 0; + for ( j = 0; j < coding_subbands; j++ ) + { + if ( hQMetaData->no_directions == 2 ) + { + k += hQMetaData->twoDirBands[j]; + idx16 = max( k - 1, 0 ); + error_ratio_surr = 1.0f - q_direction[0].band_data[j].energy_ratio[sf] - q_direction[1].band_data[idx16].energy_ratio[sf] * hQMetaData->twoDirBands[j]; + } + else + { + error_ratio_surr = 1.0f - q_direction[0].band_data[j].energy_ratio[sf]; + } + + + if ( error_ratio_surr <= 0 ) + { + error_ratio_surr = 0; + idx_sur_coh[j] = 0; + no_cv[j] = 1; + hQMetaData->surcoh_band_data[j].surround_coherence[sf] = 0; /* sur_coherence_cb_masa[idx_cb_sur_coh_masa[DIRAC_DIFFUSE_LEVELS - 1] * MASA_MAX_NO_CV_SUR_COH]; */ + } + else + { + idx_sur_coh[j] = squant_int( hQMetaData->surcoh_band_data[j].surround_coherence[sf], &hQMetaData->surcoh_band_data[j].surround_coherence[sf], + &sur_coherence_cb_masa[idx_cb_sur_coh_masa[7] * MASA_MAX_NO_CV_SUR_COH], idx_cb_sur_coh_masa[7] + 2 ); + no_cv[j] = idx_cb_sur_coh_masa[7] + 2; + no_cv_shift[idx_shift] = no_cv[j]; + idx_sur_coh_shift[idx_shift++] = idx_sur_coh[j]; + } + } + + if ( sum_s( no_cv, coding_subbands ) != coding_subbands ) + { + nbits_max = 0; + if ( coding_subbands > MASA_LIMIT_NO_BANDS_SUR_COH ) + { + j = maximum_s( (int16_t *) idx_sur_coh, coding_subbands, &max_val ); + for ( j = 0; j < coding_subbands; j++ ) + { + if ( no_cv[j] > max_val + 1 ) + { + no_cv[j] = max_val + 1; + } + } + nbits_max = MASA_MAX_NO_CV_SUR_COH - max_val; /* encoded with GR0 as max_no_vals - no_vals*/ + } + if ( max_val == 0 ) + { + for ( j = 0; j < coding_subbands; j++ ) + { + hQMetaData->surcoh_band_data[j].surround_coherence[sf] = 0; + } + } + nbits_sf = coherence_coding_length( idx_sur_coh_shift, idx_shift, coding_subbands, no_cv, + mr_idx_sur_coh, no_cv_shift, &min_idx, &GR_ord, &nbits_fr, &nbits_fr1 ); + half_coding_subbands = coding_subbands / 2; + idx1 = 0; + + /* should check how to encode the average - check distribution */ + if ( nbits_fr + nbits_fr1 + nbits_max < nbits_sf ) + { + /* write flag*/ + push_next_indice( hMetaData, 0, 1 ); + + /* create combined index */ + nbits += nbits_fr + nbits_fr1 + 1; + if ( coding_subbands > MASA_LIMIT_NO_BANDS_SUR_COH ) + { + /* write max value*/ + bits_GR = hMetaData->nb_bits_tot; + ivas_qmetadata_encode_extended_gr( hMetaData, MASA_MAX_NO_CV_SUR_COH - max_val - 1, MASA_MAX_NO_CV_SUR_COH, 0 ); + nbits += hMetaData->nb_bits_tot - bits_GR; + } + + if ( nbits_fr1 > 0 ) + { + idx = create_combined_index( idx_sur_coh, half_coding_subbands, no_cv ); + idx1 = create_combined_index( &idx_sur_coh[half_coding_subbands], half_coding_subbands, &no_cv[half_coding_subbands] ); + } + else + { + idx = create_combined_index( idx_sur_coh, coding_subbands, no_cv ); + } + + if ( nbits_fr % 16 == 0 ) + { + no_idx16 = nbits_fr / 16; + } + else + { + no_idx16 = (int16_t) round_f( ( nbits_fr / 16.0f + 0.5f ) ); + } + + /* write combined index */ + k = nbits_fr; + for ( i = 0; i < no_idx16 - 1; i++ ) + { + k -= 16; + push_next_indice( hMetaData, ( ( idx >> k ) & 65535 ), 16 ); /* 16 bits */ + } + + push_next_indice( hMetaData, ( idx & ( ( 1 << k ) - 1 ) ), k ); + + if ( nbits_fr1 > 0 ) + { + if ( nbits_fr1 % 16 == 0 ) + { + no_idx16 = nbits_fr1 / 16; + } + else + { + no_idx16 = (int16_t) round_f( ( nbits_fr1 / 16.0f + 0.5f ) ); + } + + assert( no_idx16 <= 4 ); + + k = nbits_fr1; + for ( i = 0; i < no_idx16 - 1; i++ ) + { + k -= 16; + push_next_indice( hMetaData, ( ( idx1 >> k ) & 65535 ), 16 ); /* 16 bits */ + } + + push_next_indice( hMetaData, ( idx1 & ( ( 1 << k ) - 1 ) ), k ); + } + } + else + { + /* write flag */ + nbits += 1; + + /* write flag*/ + push_next_indice( hMetaData, 1, 1 ); + + /* write GR_ord */ + push_next_indice( hMetaData, GR_ord, 1 ); + nbits += 1; + + /* write the min */ + bits_GR = hMetaData->nb_bits_tot; + ivas_qmetadata_encode_extended_gr( hMetaData, min_idx, MASA_MAX_NO_CV_SUR_COH, 0 ); + nbits += hMetaData->nb_bits_tot - bits_GR; + + /* write GR data */ + for ( j = 0; j < idx_shift; j++ ) + { + bits_GR = hMetaData->nb_bits_tot; + + ivas_qmetadata_encode_extended_gr( hMetaData, mr_idx_sur_coh[j], no_cv_shift[j], GR_ord ); + + nbits += hMetaData->nb_bits_tot - bits_GR; + } + } + } + } + } + + + return nbits; +} + +#endif + + /*-------------------------------------------------------------------* * quantize_DCT_0_coh() * * quanization of DCT component of order zero for transformed coherence vector *-------------------------------------------------------------------*/ -/* !r: quantized value */ +/*! r: quantized value */ static float quantize_DCT_0_coh( const float x, /* i : input value */ const int16_t j, /* i : subband index */ @@ -4449,14 +5413,44 @@ static float quantize_DCT_0_coh( IVAS_QDIRECTION *q_direction, /* i : quantized metadata */ uint16_t *idx_x, /* o : codewords index */ int16_t *p_no_cb /* o : actual number of codewords dependent on energy ratio value */ +#ifdef HR_METADATA + , + const int16_t hrmasa_flag /* i : flag indicating high-rate MASA MD coding */ +#endif ) { float var_azi, xhat; int16_t idx_sub_cb, idx; - +#ifdef HR_METADATA + int16_t min_index; +#endif /* quantize first DCT component */ var_azi = var( q_direction->band_data[j].azimuth, q_direction->cfg.nblocks ); +#ifdef HR_METADATA + if ( hrmasa_flag ) + { + minimum_s( (int16_t *) ( q_direction->band_data[j].energy_ratio_index ), q_direction->cfg.nblocks, &min_index ); + min_index = min_index >> 1; + } + else + { + min_index = q_direction->band_data[j].energy_ratio_index[0]; + } + + if ( var_azi < delta_var ) + { + idx_sub_cb = no_cb * min_index; + } + else + { + idx_sub_cb = no_cb * ( min_index + DIRAC_DIFFUSE_LEVELS ); + } + + idx = squant( x, &xhat, &coherence_cb[idx_sub_cb], len_cb_dct0_masa[min_index] ); + + *p_no_cb = len_cb_dct0_masa[min_index]; +#else if ( var_azi < delta_var ) { idx_sub_cb = no_cb * q_direction->band_data[j].energy_ratio_index[0]; @@ -4469,7 +5463,7 @@ static float quantize_DCT_0_coh( idx = squant( x, &xhat, &coherence_cb[idx_sub_cb], len_cb_dct0_masa[q_direction->band_data[j].energy_ratio_index[0]] ); *p_no_cb = len_cb_dct0_masa[q_direction->band_data[j].energy_ratio_index[0]]; - +#endif *idx_x = idx; return xhat; @@ -4482,7 +5476,7 @@ static float quantize_DCT_0_coh( * Encoding DCT1 coeffs with joint index or EC *-------------------------------------------------------------------*/ -/* !r: number of bits written */ +/*! r: number of bits written */ static int16_t encode_coherence_indexesDCT1( uint16_t *idx_dct, /* i : data to be encoded */ const int16_t len, /* i : number of data */ @@ -4538,20 +5532,134 @@ static void dct4_transform( } +#ifdef HR_METADATA /*-------------------------------------------------------------------* - * ivas_qmetadata_quantize_coherence() + * ivas_qmetadata_quantize_coherence_hr_512() * * *-------------------------------------------------------------------*/ -/* !r: number of bits written */ -static int16_t ivas_qmetadata_quantize_coherence( +static int16_t ivas_qmetadata_quantize_coherence_hr_512( IVAS_QMETADATA *hQMetaData, /* i/o: quantized metadata */ const int16_t idx_d, /* i : current direction index */ const int16_t all_coherence_zero, /* i : all coherence is zero - flag */ BSTR_ENC_HANDLE hMetaData, /* i : metadata handle */ - const int16_t write_flag, /* i : flag to actually write the data or not */ - int16_t *indice_coherence ) + const int16_t bits_coh ) +{ + int16_t j, k; + int16_t nbands, nblocks; + int16_t nbits; + int16_t nbits1, nbits0, nbits_av; + uint16_t idx_coh[MASA_MAXIMUM_CODING_SUBBANDS]; + IVAS_QDIRECTION *q_direction; + int16_t cbsize; + float delta, tmp; + int16_t min_idx, GR_param, GR_param_av; + uint16_t av, mr_idx[MASA_MAXIMUM_CODING_SUBBANDS]; + + q_direction = &( hQMetaData->q_direction[idx_d] ); + nbands = q_direction->cfg.nbands; + nblocks = q_direction->cfg.nblocks; + nbits = 0; + + if ( all_coherence_zero == 1 ) + { + return nbits; + } + nbits = hMetaData->nb_bits_tot; + + cbsize = 1 << bits_coh; + delta = 256.0f / cbsize; + + for ( k = 0; k < nblocks; k++ ) + { + min_idx = 0; + for ( j = 0; j < nbands; j++ ) + { + idx_coh[j] = usquant( (float) ( q_direction->coherence_band_data[j].spread_coherence[k] ), &tmp, delta / 2.0f, delta, cbsize ); + q_direction->coherence_band_data[j].spread_coherence[k] = (uint8_t) ( idx_coh[j] * delta + delta / 2.0f ); + if ( idx_coh[j] < min_idx ) + { + min_idx = idx_coh[j]; + } + } + + + nbits0 = 0; + nbits1 = 0; + for ( j = 0; j < nbands; j++ ) + { + idx_coh[j] = idx_coh[j] - min_idx; + nbits0 += ivas_qmetadata_encode_extended_gr_length( idx_coh[j], cbsize - min_idx, 0 ); + nbits1 += ivas_qmetadata_encode_extended_gr_length( idx_coh[j], cbsize - min_idx, 1 ); + } + if ( nbits0 < nbits1 ) + { + GR_param = 0; + nbits1 = nbits0; + } + else + { + GR_param = 1; + } + GR_param_av = 1; + nbits_av = mean_removed_GR_new( idx_coh, cbsize, nbands, 1, &GR_param_av, &av, mr_idx ); + + if ( nbits_av < nbits1 ) + { + nbits1 = nbits_av; + GR_param = GR_param_av; + /* use average removed */ + push_next_indice( hMetaData, 1, 1 ); + /* write average */ + push_next_indice( hMetaData, av, bits_coh ); + /* write GR param */ + push_next_indice( hMetaData, GR_param, 1 ); + for ( j = 0; j < nbands; j++ ) + { + ivas_qmetadata_encode_extended_gr( hMetaData, mr_idx[j], 2 * cbsize, GR_param ); + } + } + else + { + /* use min removed */ + push_next_indice( hMetaData, 0, 1 ); + /* write min index */ + push_next_indice( hMetaData, min_idx, bits_coh ); + /* write GR param */ + push_next_indice( hMetaData, GR_param, 1 ); + for ( j = 0; j < nbands; j++ ) + { + ivas_qmetadata_encode_extended_gr( hMetaData, idx_coh[j], cbsize - min_idx, GR_param ); + } + } + } + + nbits = hMetaData->nb_bits_tot - nbits; + return nbits; +} +#endif + + +/*-------------------------------------------------------------------* + * ivas_qmetadata_quantize_coherence() + * + * + *-------------------------------------------------------------------*/ + +/*! r: number of bits written */ +static int16_t ivas_qmetadata_quantize_coherence( + IVAS_QMETADATA *hQMetaData, /* i/o: quantized metadata */ + const int16_t idx_d, /* i : current direction index */ + const int16_t all_coherence_zero, /* i : all coherence is zero - flag */ + BSTR_ENC_HANDLE hMetaData, /* i : metadata handle */ + const int16_t write_flag, /* i : flag to actually write the data or not */ + int16_t *indice_coherence +#ifdef HR_METADATA + , + const int16_t hrmasa_flag /* i : flag indicating high-rate MASA MD coding */ +#endif +) { int16_t j, k; float dct_coh[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES]; @@ -4565,7 +5673,10 @@ static int16_t ivas_qmetadata_quantize_coherence( int16_t two_dir_band[MASA_MAXIMUM_CODING_SUBBANDS]; int16_t no_cb_vec[MASA_MAXIMUM_CODING_SUBBANDS]; IVAS_QDIRECTION *q_direction; - +#ifdef HR_METADATA + int16_t min_index; + min_index = 0; +#endif q_direction = &( hQMetaData->q_direction[idx_d] ); coding_subbands = q_direction->cfg.nbands; nbits = 0; @@ -4577,7 +5688,12 @@ static int16_t ivas_qmetadata_quantize_coherence( if ( hQMetaData->q_direction[idx_d].cfg.nblocks == 1 ) { - nbits = encode_spread_coherence_1sf( hQMetaData, idx_d, hMetaData ); + nbits = encode_spread_coherence_1sf( hQMetaData, idx_d, hMetaData +#ifdef HR_METADATA + , + hrmasa_flag +#endif + ); return nbits; } @@ -4632,13 +5748,32 @@ static int16_t ivas_qmetadata_quantize_coherence( { /* DCT transform */ dct4_transform( hQMetaData->q_direction[idx_d].coherence_band_data[j].spread_coherence, dct_coh[j] ); - no_cb_vec[j] = len_cb_dct0_masa[q_direction->band_data[j].energy_ratio_index[0]]; + +#ifdef HR_METADATA + if ( hrmasa_flag ) + { + minimum_s( (int16_t *) ( q_direction->band_data[j].energy_ratio_index ), q_direction->cfg.nblocks, &min_index ); + no_cb_vec[j] = len_cb_dct0_masa[min_index >> 1]; + } + else + { +#endif + no_cb_vec[j] = len_cb_dct0_masa[q_direction->band_data[j].energy_ratio_index[0]]; +#ifdef HR_METADATA + } +#endif if ( write_flag ) { /* quantize first DCT parameter */ - dct_coh[j][0] = quantize_DCT_0_coh( dct_coh[j][0], j, coherence_cb0_masa, MASA_DELTA_AZI_DCT0, MASA_NO_CV_COH, q_direction, &idx_dct[k], &no_cb_vec[j] ); + dct_coh[j][0] = quantize_DCT_0_coh( dct_coh[j][0], j, coherence_cb0_masa, MASA_DELTA_AZI_DCT0, MASA_NO_CV_COH, q_direction, &idx_dct[k], &no_cb_vec[j] +#ifdef HR_METADATA + , + hrmasa_flag +#endif + ); } + if ( coding_subbands < coding_subbands_0 ) { idx_dct[k + coding_subbands] = squant( dct_coh[j][1], &dct_coh[j][1], &coherence_cb1_masa[MASA_grouping[two_dir_band[j]] * MASA_NO_CV_COH1], MASA_NO_CV_COH1 ); @@ -4701,7 +5836,11 @@ static int16_t ivas_qmetadata_quantize_coherence( else { /* write dummy data now and save the position */ +#ifdef IND_LIST_DYN + *indice_coherence = hMetaData->nb_ind_tot; +#else *indice_coherence = hMetaData->next_ind; +#endif k = nbits; while ( k > 0 ) { @@ -4775,20 +5914,86 @@ static void ivas_qmetadata_reorder_2dir_bands( hQMetaData->q_direction[0].band_data[band].distance[sf] = hQMetaData->q_direction[1].band_data[band].distance[sf]; hQMetaData->q_direction[1].band_data[band].distance[sf] = uint8_tmp; + if ( hQMetaData->coherence_flag ) + { + uint8_tmp = hQMetaData->q_direction[0].coherence_band_data[band].spread_coherence[sf]; + hQMetaData->q_direction[0].coherence_band_data[band].spread_coherence[sf] = hQMetaData->q_direction[1].coherence_band_data[band].spread_coherence[sf]; + hQMetaData->q_direction[1].coherence_band_data[band].spread_coherence[sf] = uint8_tmp; + } + } + if ( hQMetaData->coherence_flag ) + { + flt_tmp = hQMetaData->q_direction[0].band_data[band].energy_ratio[0]; + hQMetaData->q_direction[0].band_data[band].energy_ratio[0] = hQMetaData->q_direction[1].band_data[band].energy_ratio[0]; + hQMetaData->q_direction[1].band_data[band].energy_ratio[0] = flt_tmp; + } + } + } + } + + return; +} + + +#ifdef HR_METADATA +/*-------------------------------------------------------------------* + * ivas_qmetadata_reorder_2dir_bands_hr() + * + * + *-------------------------------------------------------------------*/ + +static void ivas_qmetadata_reorder_2dir_bands_hr( + IVAS_QMETADATA_HANDLE hQMetaData ) +{ + int16_t nbands, nsubframes; + int16_t band, sf; + uint16_t uint16_tmp; + float flt_tmp; + uint8_t uint8_tmp; + + nbands = hQMetaData->q_direction[0].cfg.nbands; + nsubframes = hQMetaData->q_direction[0].cfg.nblocks; + + for ( band = 0; band < nbands; band++ ) + { + if ( hQMetaData->twoDirBands[band] == 1 ) + { + for ( sf = 0; sf < nsubframes; sf++ ) + { + if ( hQMetaData->q_direction[0].band_data[band].energy_ratio[sf] < hQMetaData->q_direction[1].band_data[band].energy_ratio[sf] ) + { + uint16_tmp = hQMetaData->q_direction[0].band_data[band].spherical_index[sf]; + hQMetaData->q_direction[0].band_data[band].spherical_index[sf] = hQMetaData->q_direction[1].band_data[band].spherical_index[sf]; + hQMetaData->q_direction[1].band_data[band].spherical_index[sf] = uint16_tmp; + + flt_tmp = hQMetaData->q_direction[0].band_data[band].azimuth[sf]; + hQMetaData->q_direction[0].band_data[band].azimuth[sf] = hQMetaData->q_direction[1].band_data[band].azimuth[sf]; + hQMetaData->q_direction[1].band_data[band].azimuth[sf] = flt_tmp; + + flt_tmp = hQMetaData->q_direction[0].band_data[band].elevation[sf]; + hQMetaData->q_direction[0].band_data[band].elevation[sf] = hQMetaData->q_direction[1].band_data[band].elevation[sf]; + hQMetaData->q_direction[1].band_data[band].elevation[sf] = flt_tmp; + + uint8_tmp = hQMetaData->q_direction[0].band_data[band].distance[sf]; + hQMetaData->q_direction[0].band_data[band].distance[sf] = hQMetaData->q_direction[1].band_data[band].distance[sf]; + hQMetaData->q_direction[1].band_data[band].distance[sf] = uint8_tmp; + uint8_tmp = hQMetaData->q_direction[0].coherence_band_data[band].spread_coherence[sf]; hQMetaData->q_direction[0].coherence_band_data[band].spread_coherence[sf] = hQMetaData->q_direction[1].coherence_band_data[band].spread_coherence[sf]; hQMetaData->q_direction[1].coherence_band_data[band].spread_coherence[sf] = uint8_tmp; - } - flt_tmp = hQMetaData->q_direction[0].band_data[band].energy_ratio[0]; - hQMetaData->q_direction[0].band_data[band].energy_ratio[0] = hQMetaData->q_direction[1].band_data[band].energy_ratio[0]; - hQMetaData->q_direction[1].band_data[band].energy_ratio[0] = flt_tmp; + + flt_tmp = hQMetaData->q_direction[0].band_data[band].energy_ratio[sf]; + hQMetaData->q_direction[0].band_data[band].energy_ratio[sf] = hQMetaData->q_direction[1].band_data[band].energy_ratio[sf]; + hQMetaData->q_direction[1].band_data[band].energy_ratio[sf] = flt_tmp; + } } } } return; } +#endif /*-------------------------------------------------------------------* @@ -4807,7 +6012,9 @@ static int16_t write_2dir_info( int16_t p[MASA_MAXIMUM_CODING_SUBBANDS]; uint16_t dif_p[MASA_MAXIMUM_CODING_SUBBANDS]; int16_t i, j; + j = 0; + p[0] = 0; for ( i = 0; i < n; i++ ) { if ( twoDirBands[i] == 1 ) @@ -4816,6 +6023,7 @@ static int16_t write_2dir_info( j++; } } + dif_p[0] = p[0]; for ( i = 1; i < j; i++ ) { @@ -4836,6 +6044,12 @@ static int16_t write_2dir_info( } +/*-------------------------------------------------------------------* + * transform_azimuth_dir2() + * + * + *-------------------------------------------------------------------*/ + static void transform_azimuth_dir2( IVAS_QMETADATA_HANDLE hQMetaData, int16_t *dir2_bands ) @@ -4858,6 +6072,14 @@ static void transform_azimuth_dir2( { hQMetaData->q_direction[1].band_data[i].azimuth[b] += 360; } + if ( hQMetaData->q_direction[1].band_data[i].azimuth[b] >= 180 ) + { + hQMetaData->q_direction[1].band_data[i].azimuth[b] -= 360; + } + if ( hQMetaData->q_direction[1].band_data[i].azimuth[b] < -180 ) + { + hQMetaData->q_direction[1].band_data[i].azimuth[b] += 360; + } #ifdef DEBUGGING assert( hQMetaData->q_direction[1].band_data[i].azimuth[b] < 180 && hQMetaData->q_direction[1].band_data[i].azimuth[b] >= -180 ); #endif diff --git a/lib_enc/ivas_qspherical_enc.c b/lib_enc/ivas_qspherical_enc.c index 80a9d0064f2dcfb23dbeb91ed3719dd74e0a526c..4c79b875b7b1dfbc53971c0aec0e400cbabea077 100644 --- a/lib_enc/ivas_qspherical_enc.c +++ b/lib_enc/ivas_qspherical_enc.c @@ -59,7 +59,12 @@ static float direction_distance_cp( float theta, float theta_hat, float theta_ha void quantize_direction_frame( IVAS_QDIRECTION *q_direction, /* i/o: quantized direction structure */ float azimuth_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES], - float elevation_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES] ) + float elevation_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES] +#ifdef HR_METADATA + , + const int16_t hrmasa_flag /* i : flag indicating high-rate MASA MD coding*/ +#endif +) { int16_t i, j; int16_t idx; @@ -92,16 +97,36 @@ void quantize_direction_frame( q_direction->not_in_2D += q_direction->band_data[i].elevation_index[j]; - if ( q_direction->cfg.mc_ls_setup != MC_LS_SETUP_INVALID ) +#ifdef HR_METADATA + if ( hrmasa_flag ) { - q_direction->band_data[i].elevation_m_alphabet[j] = no_theta_masa[bits_direction_masa[idx] - 3]; - q_direction->band_data[i].azimuth_m_alphabet[j] = no_phi_masa[bits_direction_masa[idx] - 1][q_direction->band_data[i].elevation_index[j]]; + if ( q_direction->cfg.mc_ls_setup != MC_LS_SETUP_INVALID ) + { + q_direction->band_data[i].elevation_m_alphabet[j] = no_theta_masa[bits_direction_masa[0] - 3]; + q_direction->band_data[i].azimuth_m_alphabet[j] = no_phi_masa[bits_direction_masa[0] - 1][q_direction->band_data[i].elevation_index[j]]; + } + else + { + q_direction->band_data[i].elevation_m_alphabet[j] = no_theta_masa[bits_direction_masa[0] - 3] * 2 - 1; + q_direction->band_data[i].azimuth_m_alphabet[j] = no_phi_masa[bits_direction_masa[0] - 1][( q_direction->band_data[i].elevation_index[j] + 1 ) >> 1]; + } } else { - q_direction->band_data[i].elevation_m_alphabet[j] = no_theta_masa[bits_direction_masa[idx] - 3] * 2 - 1; - q_direction->band_data[i].azimuth_m_alphabet[j] = no_phi_masa[bits_direction_masa[idx] - 1][( q_direction->band_data[i].elevation_index[j] + 1 ) >> 1]; +#endif + if ( q_direction->cfg.mc_ls_setup != MC_LS_SETUP_INVALID ) + { + q_direction->band_data[i].elevation_m_alphabet[j] = no_theta_masa[bits_direction_masa[idx] - 3]; + q_direction->band_data[i].azimuth_m_alphabet[j] = no_phi_masa[bits_direction_masa[idx] - 1][q_direction->band_data[i].elevation_index[j]]; + } + else + { + q_direction->band_data[i].elevation_m_alphabet[j] = no_theta_masa[bits_direction_masa[idx] - 3] * 2 - 1; + q_direction->band_data[i].azimuth_m_alphabet[j] = no_phi_masa[bits_direction_masa[idx] - 1][( q_direction->band_data[i].elevation_index[j] + 1 ) >> 1]; + } +#ifdef HR_METADATA } +#endif if ( q_direction->band_data[i].azimuth_index[j] == MASA_NO_INDEX ) { @@ -138,6 +163,7 @@ void quantize_direction_frame( return; } + /*-------------------------------------------------------------------* * quantize_direction_frame2D() * @@ -246,6 +272,7 @@ void small_requantize_direction_frame( return; } + /*-------------------------------------------------------------------* * quantize_direction() * @@ -327,7 +354,6 @@ uint16_t quantize_direction( return idx_sph; } - no_th = no_theta_masa[no_bits - 3]; for ( i = 0; i < no_th; i++ ) @@ -473,20 +499,21 @@ uint16_t quantize_direction( return idx_sph; } + /*-------------------------------------------------------------------* * direction_distance_cp() * * quantization distortion calculated on the sphere *----------------------------------------------------------------------*/ -/* !r: distortion value */ +/*! r: distortion value */ static float direction_distance_cp( - float theta, /* i : elevation absolute value */ - float theta_hat, /* i : quantized elevation value in absolute value */ - float theta_hat1, /* i : quantized elevation value in absolute value */ - const float phi, /* i : azimuth value */ - const float phi_hat, /* i : quantized azimuth value */ - const float phi_hat1, /* i : quantized azimuth value */ + float theta, /* i : elevation absolute value */ + float theta_hat, /* i : quantized elevation value in absolute value */ + float theta_hat1, /* i : quantized elevation value in absolute value */ + const float phi, /* i : azimuth value */ + const float phi_hat, /* i : quantized azimuth value */ + const float phi_hat1, /* i : quantized azimuth value */ float *d1 ) { float d, ct, st, st1, st2; @@ -512,28 +539,27 @@ static float direction_distance_cp( * joint quantization of elevation and azimuth *----------------------------------------------------------------------*/ -/* !r: quantized elevation value */ +/*! r: quantized elevation value */ static float quantize_theta_phi( - float *theta_cb, /* i : elevation codebook */ - const int16_t no_th, /* i : elevation codebook size */ - const int16_t *no_phi_loc, /* i : number of azimuth values for each elevation codeword */ - const float abs_theta, /* i : absolute value of elevation to be quantized */ - int16_t *id_phi, /* o : azimuth index */ - int16_t *id_phi_remap, /* o : remapped azimuth index */ - float *phi_hat, /* o : quantized azimuth value */ - const float phi, /* i : input azimuth value; to be quantized */ - const int16_t no_bits, /* i : number of bits used for quantization */ - int16_t *id_theta, /* o : elevation index */ - float *phi_q, /* o : rotated quantized azimuth */ - const int16_t remap, /* i : flag for remapping */ - const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */ + float *theta_cb, /* i : elevation codebook */ + const int16_t no_th, /* i : elevation codebook size */ + const int16_t *no_phi_loc, /* i : number of azimuth values for each elevation codeword*/ + const float abs_theta, /* i : absolute value of elevation to be quantized */ + int16_t *id_phi, /* o : azimuth index */ + int16_t *id_phi_remap, /* o : remapped azimuth index */ + float *phi_hat, /* o : quantized azimuth value */ + const float phi, /* i : input azimuth value; to be quantized */ + const int16_t no_bits, /* i : number of bits used for quantization */ + int16_t *id_theta, /* o : elevation index */ + float *phi_q, /* o : rotated quantized azimuth */ + const int16_t remap, /* i : flag for remapping */ + const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */ ) { float theta_hat, theta_hat1, phi_hat1; int16_t id_th, id_th1, id_th2, id_ph, id_ph1; float d, d1; - id_th = (int16_t) ( abs_theta / delta_theta_masa[no_bits - 3] ); if ( id_th >= no_th ) { @@ -549,7 +575,6 @@ static float quantize_theta_phi( { if ( ( no_th < 6 ) && mc_format == MC_LS_SETUP_INVALID ) { - if ( id_th == 0 ) { id_th1 = 1; diff --git a/lib_enc/ivas_rom_enc.c b/lib_enc/ivas_rom_enc.c index ae7cd2ee1a6c29c3f1fdcb2ae51b93bf31803ce1..45651008836d2e2f33a52992d2cb3e9b77da220b 100644 --- a/lib_enc/ivas_rom_enc.c +++ b/lib_enc/ivas_rom_enc.c @@ -723,4 +723,119 @@ const float Stereo_dmx_wnd_coef_48k[L_FRAME48k] = { }; +const HUFF_TABLE huff_alpha_table[2] = +{ + { /* Alfa Fine */ + { /* df0 */ + { 0x0002ce, 0x000b5e, 0x0004fe, 0x0005ae, 0x00027e, 0x0002de, 0x00016a, 0x0000b2, 0x00004a, 0x00004b, + 0x0000b6, 0x00004e, 0x000024, 0x00002e, 0x00000a, 0x000006, 0x000000, 0x000007, 0x000008, 0x00002f, + 0x000026, 0x000058, 0x0000b4, 0x00009e, 0x00016e, 0x000166, 0x0002df, 0x0002cf, 0x00027c, 0x00027d, + 0x0004ff, 0x000b5f, 0x0002d6 }, + { 10, 12, 11, 11, 10, 10, 9, 8, 7, 7, + 8, 7, 6, 6, 4, 3, 1, 3, 4, 6, + 6, 7, 8, 8, 9, 9, 10, 10, 10, 10, + 11, 12, 10 } + }, + { /* df */ + { 0x0011de, 0x011ffe, 0x013dea, 0x013df6, 0x008eea, 0x013df7, 0x013dee, 0x013deb, 0x013dec, 0x008eee, + 0x008ffe, 0x009efe, 0x0047fe, 0x004f7c, 0x0023fe, 0x0011fe, 0x0013fe, 0x0008f6, 0x0009ee, 0x000476, + 0x00047a, 0x0004f6, 0x00023a, 0x00027a, 0x00027e, 0x00013e, 0x00009a, 0x00004c, 0x00004e, 0x000012, + 0x00000a, 0x000006, 0x000000, 0x000007, 0x00000b, 0x000010, 0x000022, 0x000046, 0x00009b, 0x00013c, + 0x00011c, 0x00023e, 0x00023c, 0x0004fe, 0x00047e, 0x0009fe, 0x0008fe, 0x0008f7, 0x0013ff, 0x0011df, + 0x0027bc, 0x004f7e, 0x004776, 0x009efa, 0x009ef4, 0x013dfe, 0x008eeb, 0x008ee8, 0x013dff, 0x008ee9, + 0x008eef, 0x011fff, 0x013ded, 0x013def, 0x0011dc }, + { 13, 17, 17, 17, 16, 17, 17, 17, 17, 16, + 16, 16, 15, 15, 14, 13, 13, 12, 12, 11, + 11, 11, 10, 10, 10, 9, 8, 7, 7, 5, + 4, 3, 1, 3, 4, 5, 6, 7, 8, 9, + 9, 10, 10, 11, 11, 12, 12, 12, 13, 13, + 14, 15, 15, 16, 16, 17, 16, 16, 17, 16, + 16, 17, 17, 17, 13 } + }, + { /* dt */ + { 0x00eeee, 0x03b3ee, 0x03b3f6, 0x03b3fc, 0x01d9bc, 0x01d9bd, 0x01d9b2, 0x03b3fe, 0x01d9be, 0x01d9f6, + 0x01d9fc, 0x00ecda, 0x00ecfa, 0x00eeef, 0x00766e, 0x007776, 0x003b3a, 0x003bba, 0x001d9a, 0x001ddc, + 0x001dde, 0x000eec, 0x000764, 0x000772, 0x0003b0, 0x0003b8, 0x0001da, 0x0001de, 0x000072, 0x000038, + 0x00001e, 0x000006, 0x000000, 0x000002, 0x00001f, 0x00003a, 0x000073, 0x0001df, 0x0001db, 0x0003ba, + 0x0003b1, 0x000773, 0x000765, 0x000eed, 0x000ecc, 0x001d9e, 0x001d9c, 0x003bbe, 0x003b3b, 0x00777e, + 0x00767c, 0x00eefe, 0x00ecfc, 0x00ecd8, 0x01d9fd, 0x01d9fa, 0x01d9bf, 0x01d9b6, 0x01d9b3, 0x03b3fd, + 0x01d9b7, 0x03b3ff, 0x03b3ef, 0x03b3f7, 0x00eeff }, + { 16, 18, 18, 18, 17, 17, 17, 18, 17, 17, + 17, 16, 16, 16, 15, 15, 14, 14, 13, 13, + 13, 12, 11, 11, 10, 10, 9, 9, 7, 6, + 5, 3, 1, 2, 5, 6, 7, 9, 9, 10, + 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, + 15, 16, 16, 16, 17, 17, 17, 17, 17, 18, + 17, 18, 18, 18, 16 } + } + }, /* End Alfa Fine */ + { /* Alfa Coarse */ + { /* df0 */ + { 0x0003be, 0x0003fe, 0x0001fe, 0x0000fe, 0x00003e, 0x00003a, 0x00001e, 0x000002, 0x000000, 0x000006, + 0x00001c, 0x00007e, 0x000076, 0x0000ee, 0x0001de, 0x0003ff, 0x0003bf }, + { 10, 10, 9, 8, 6, 6, 5, 2, 1, 3, + 5, 7, 7, 8, 9, 10, 10 } + }, + { /* df */ + { 0x007c76, 0x03e3fe, 0x01f1f6, 0x01f1f7, 0x00f8ea, 0x007c74, 0x007c7c, 0x001f1c, 0x000f9e, 0x0007ce, + 0x0003e2, 0x0001f0, 0x0000fa, 0x00007e, 0x00000e, 0x000006, 0x000000, 0x000002, 0x00001e, 0x00007f, + 0x0000fb, 0x0001f2, 0x0003e6, 0x0007c6, 0x000f9f, 0x001f1e, 0x007c7e, 0x00f8fe, 0x00f8fa, 0x01f1fe, + 0x00f8eb, 0x03e3ff, 0x007c77 }, + { 15, 18, 17, 17, 16, 15, 15, 13, 12, 11, + 10, 9, 8, 7, 4, 3, 1, 2, 5, 7, + 8, 9, 10, 11, 12, 13, 15, 16, 16, 17, + 16, 18, 15 } + }, + { /* dt */ + { 0x003efc, 0x00fbfa, 0x007ddc, 0x00fbfe, 0x007dde, 0x007dfc, 0x003ef6, 0x001f76, 0x000fba, 0x000fbe, + 0x0003ec, 0x0001f2, 0x0000f8, 0x00007e, 0x00001e, 0x000006, 0x000000, 0x000002, 0x00000e, 0x00007f, + 0x0000fa, 0x0001f3, 0x0003ed, 0x0007dc, 0x000fbc, 0x001f7a, 0x003ef7, 0x007dfe, 0x007ddf, 0x00fbff, + 0x007ddd, 0x00fbfb, 0x003efd }, + { 14, 16, 15, 16, 15, 15, 14, 13, 12, 12, + 10, 9, 8, 7, 5, 3, 1, 2, 4, 7, + 8, 9, 10, 11, 12, 13, 14, 15, 15, 16, + 15, 16, 14 } + } + } /* End Alfa Coarse */ +}; + +const HUFF_TABLE huff_beta_table[2] = +{ + { /* Beta Fine */ + { /* df0 */ + { 0x000000, 0x000002, 0x000006, 0x00000e, 0x00001e, 0x00003e, 0x00007e, 0x0000fe, 0x0000ff }, + { 1, 2, 3, 4, 5, 6, 7, 8, 8 } + }, + { /* df */ + { 0x001f1e, 0x000f8e, 0x0003e2, 0x0001f2, 0x0000fa, 0x00007e, 0x00001e, 0x000006, 0x000000, 0x000002, + 0x00000e, 0x00007f, 0x0000fb, 0x0001f3, 0x0001f0, 0x0007c6, 0x001f1f }, + { 13, 12, 10, 9, 8, 7, 5, 3, 1, 2, + 4, 7, 8, 9, 9, 11, 13 } + }, + { /* dt */ + { 0x007dfe, 0x003efe, 0x000fbe, 0x0003ee, 0x0000fa, 0x00007e, 0x00001e, 0x000006, 0x000000, 0x000002, + 0x00000e, 0x00007f, 0x00007c, 0x0001f6, 0x0007de, 0x001f7e, 0x007dff }, + { 15, 14, 12, 10, 8, 7, 5, 3, 1, 2, + 4, 7, 7, 9, 11, 13, 15 } + } + }, /* End Beta Fine */ + { /* Beta Coarse */ + { /* df0 */ + { 0x000000, 0x000002, 0x000006, 0x00000e, 0x00000f }, + { 1, 2, 3, 4, 4 } + }, + { /* df */ + { 0x0000fe, 0x00003e, 0x00000e, 0x000006, 0x000000, 0x000002, 0x00001e, 0x00007e, 0x0000ff }, + { 8, 6, 4, 3, 1, 2, 5, 7, 8 } + }, + { /* dt */ + { 0x0000fe, 0x00007e, 0x00001e, 0x000006, 0x000000, 0x000002, 0x00000e, 0x00003e, 0x0000ff }, + { 8, 7, 5, 3, 1, 2, 4, 6, 8 } + } + } /* End Beta Coarse */ +}; + +const int16_t mc_paramupmix_fb_remix_order[4] = {0, 1, 2, 3}; + + /* clang-format on */ diff --git a/lib_enc/ivas_rom_enc.h b/lib_enc/ivas_rom_enc.h index d240fb69187fded50b89d4c3ae5056002b238f30..c208259ed6052b15f17bc946754c8fa311b5e395 100644 --- a/lib_enc/ivas_rom_enc.h +++ b/lib_enc/ivas_rom_enc.h @@ -126,5 +126,8 @@ extern const float Stereo_dmx_s_wnd_coef_48k[L_FRAME48k >> 4]; extern const float Stereo_dmx_wnd_coef_32k[L_FRAME32k]; extern const float Stereo_dmx_wnd_coef_48k[L_FRAME48k]; +extern const HUFF_TABLE huff_alpha_table[2]; +extern const HUFF_TABLE huff_beta_table[2]; +extern const int16_t mc_paramupmix_fb_remix_order[4]; #endif diff --git a/lib_enc/ivas_sba_enc.c b/lib_enc/ivas_sba_enc.c index d3aab0a6e88b631f34c515061a8d9050da7d3345..39da325d620109c32b1e4116ac82a614bc817450 100644 --- a/lib_enc/ivas_sba_enc.c +++ b/lib_enc/ivas_sba_enc.c @@ -119,28 +119,31 @@ ivas_error ivas_sba_enc_reconfigure( { DIRAC_ENC_HANDLE hDirAC = st_ivas->hDirAC; SPAR_ENC_HANDLE hSpar; - SBA_MODE sba_mode_old; int16_t analysis_order_old; int16_t spar_reconfig_flag; +#ifdef FIX_DTX_428 + int16_t nbands_old; + int16_t ndir_old; +#endif spar_reconfig_flag = 0; nchan_transport_old = st_ivas->nchan_transport; nCPE_old = st_ivas->nCPE; nSCE_old = st_ivas->nSCE; - sba_mode_old = st_ivas->sba_mode; - st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_brate, hEncoderConfig->sba_order ); - st_ivas->sba_mode = ivas_sba_mode_select( ivas_total_brate ); - analysis_order_old = ivas_sba_get_analysis_order( hEncoderConfig->last_ivas_total_brate, hEncoderConfig->sba_order ); +#ifdef FIX_DTX_428 + nbands_old = st_ivas->hQMetaData->q_direction->cfg.nbands; + ndir_old = st_ivas->hQMetaData->no_directions; +#endif if ( analysis_order_old != st_ivas->sba_analysis_order ) { int16_t i, n_old; float **old_mem_hp20_in; - n_old = ivas_sba_get_nchan_metadata( analysis_order_old ); - n = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order ); + n_old = ( analysis_order_old + 1 ) * ( analysis_order_old + 1 ); + n = ( st_ivas->sba_analysis_order + 1 ) * ( st_ivas->sba_analysis_order + 1 ); if ( n > n_old ) { @@ -199,35 +202,18 @@ ivas_error ivas_sba_enc_reconfigure( old_mem_hp20_in = NULL; } } + 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 ); - if ( st_ivas->sba_mode == SBA_MODE_SPAR ) + for ( n = 0; n < DIRAC_MAX_ANA_CHANS; n++ ) { - if ( st_ivas->hSpar == NULL ) - { - if ( ( error = ivas_spar_enc_open( st_ivas, spar_reconfig_flag ) ) != IVAS_ERR_OK ) - { - return error; - } - } - - 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 ( n = 0; n < DIRAC_MAX_ANA_CHANS; n++ ) + if ( hDirAC->sba_synchro_buffer[n] != NULL ) { - if ( hDirAC->sba_synchro_buffer[n] != NULL ) - { - free( hDirAC->sba_synchro_buffer[n] ); - hDirAC->sba_synchro_buffer[n] = NULL; - } + free( hDirAC->sba_synchro_buffer[n] ); + hDirAC->sba_synchro_buffer[n] = NULL; } - hDirAC->num_samples_synchro_delay = 0; - } - else - { - ivas_spar_enc_close( &( st_ivas->hSpar ), hEncoderConfig->input_Fs, hEncoderConfig->nchan_inp, spar_reconfig_flag ); } - + hDirAC->num_samples_synchro_delay = 0; hSpar = st_ivas->hSpar; if ( st_ivas->nchan_transport == 1 ) @@ -238,78 +224,47 @@ ivas_error ivas_sba_enc_reconfigure( { hEncoderConfig->element_mode_init = IVAS_CPE_MDCT; } - - if ( ( sba_mode_old != st_ivas->sba_mode ) || ( nchan_transport_old != st_ivas->nchan_transport ) ) + if ( nchan_transport_old != st_ivas->nchan_transport || ( ivas_total_brate < IVAS_512k && hEncoderConfig->last_ivas_total_brate >= IVAS_512k ) || ( ivas_total_brate >= IVAS_512k && hEncoderConfig->last_ivas_total_brate < IVAS_512k ) ) { /* FB mixer handle */ - if ( st_ivas->sba_mode == SBA_MODE_SPAR ) + if ( hDirAC->hFbMixer != NULL ) { - if ( hDirAC->hFbMixer != NULL ) - { - ivas_FB_mixer_close( &( hDirAC->hFbMixer ), hEncoderConfig->input_Fs, 0 ); - hDirAC->hFbMixer = NULL; - } - - if ( sba_mode_old == SBA_MODE_SPAR ) - { - 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; - } - } + ivas_FB_mixer_close( &( hDirAC->hFbMixer ), hEncoderConfig->input_Fs, 0 ); + hDirAC->hFbMixer = NULL; } - 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 ); + spar_reconfig_flag = 1; + ivas_spar_enc_close( &( st_ivas->hSpar ), hEncoderConfig->input_Fs, hEncoderConfig->nchan_inp, spar_reconfig_flag ); - 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; - } - } + if ( ( error = ivas_spar_enc_open( st_ivas, spar_reconfig_flag ) ) != IVAS_ERR_OK ) + { + return error; } } - + hEncoderConfig->spar_reconfig_flag = spar_reconfig_flag; if ( ( error = ivas_dirac_enc_reconfigure( st_ivas ) ) != IVAS_ERR_OK ) { return error; } - - if ( st_ivas->sba_mode == SBA_MODE_SPAR ) +#ifdef FIX_DTX_428 + if ( st_ivas->hQMetaData->q_direction->cfg.nbands != nbands_old || st_ivas->hQMetaData->no_directions != ndir_old ) { - 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; + int16_t dir, j, i; + IVAS_QDIRECTION *q_direction = st_ivas->hQMetaData->q_direction; + for ( dir = 0; dir < st_ivas->hQMetaData->no_directions; dir++ ) + { + for ( j = 0; j < q_direction[dir].cfg.nbands; j++ ) + { + for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ ) + { + q_direction[dir].band_data[j].energy_ratio_index[i] = 0; + q_direction[dir].band_data[j].energy_ratio_index_mod[i] = 0; + } + } + } } - +#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; /*-----------------------------------------------------------------* * Allocate, initialize, and configure SCE/CPE/MCT handles *-----------------------------------------------------------------*/ @@ -322,3 +277,26 @@ ivas_error ivas_sba_enc_reconfigure( return error; } + +#ifdef ARITH_HUFF_CODER_CHANGES +int16_t ivas_sba_get_max_md_bits( + Encoder_Struct *st_ivas ) +{ + int16_t max_md_bits; + int16_t max_bits; + if ( ivas_get_hodirac_flag( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->sba_analysis_order ) ) + { + max_bits = 2000; + } + else + { + max_bits = 500; + } + max_md_bits = min( st_ivas->hQMetaData->metadata_max_bits + 1, max_bits ); // TODO: remove 500 once max MD bits has been defined at all bitrates in DirAC + if ( st_ivas->sba_mode == SBA_MODE_SPAR ) + { + max_md_bits += st_ivas->hSpar->hMdEnc->spar_md_cfg.max_md_bits_spar; + } + return max_md_bits; +} +#endif diff --git a/lib_enc/ivas_sce_enc.c b/lib_enc/ivas_sce_enc.c index c8577a85bae41f124907bdd60809cca4d529b7d6..1b3eac4f1af5e9203a536f9660c0c3b2c6141536 100644 --- a/lib_enc/ivas_sce_enc.c +++ b/lib_enc/ivas_sce_enc.c @@ -312,6 +312,14 @@ ivas_error create_sce_enc( { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MetaData structure\n" ) ); } + +#ifdef IND_LIST_DYN + /* set pointer to the buffer of metadata indices */ + hSCE->hMetaData->ind_list = st_ivas->ind_list_metadata; + hSCE->hMetaData->ivas_ind_list_zero = &st_ivas->ind_list_metadata; + hSCE->hMetaData->ivas_max_num_indices = &st_ivas->ivas_max_num_indices_metadata; + reset_indices_enc( hSCE->hMetaData, st_ivas->ivas_max_num_indices_metadata ); +#endif } else { @@ -332,7 +340,11 @@ 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, st_ivas->ism_mode ) ) != IVAS_ERR_OK ) + if ( ( error = init_encoder( st, +#ifdef IND_LIST_DYN + st_ivas, +#endif + 0, st_ivas->hEncoderConfig->var_SID_rate_flag, st_ivas->hEncoderConfig->interval_SID, 0, st_ivas->ism_mode ) ) != IVAS_ERR_OK ) { return error; } diff --git a/lib_enc/ivas_sns_enc.c b/lib_enc/ivas_sns_enc.c index 9eeb4d87605cc97362ea2ffbb5bcc34f96512fd1..5197a260b9ab0ad830176956a6c33a550cb8e522 100644 --- a/lib_enc/ivas_sns_enc.c +++ b/lib_enc/ivas_sns_enc.c @@ -38,6 +38,8 @@ #include "prot.h" #include "ivas_prot.h" #include "rom_com.h" +#include "ivas_rom_com.h" +#include "ivas_cnst.h" #ifdef DEBUGGING #include "debug.h" #endif @@ -53,84 +55,95 @@ /* r : codebook index */ static int16_t sns_1st_cod( const float *sns, /* i : vector to quantize */ - float *snsq /* i/o: i:prediction o:quantized sns */ + const int16_t L_frame, + const int16_t core, + float *snsq /* o : quantized sns */ ) { - int16_t i, j, index; - int16_t j0, j1, index0, index1; - float dist_min, dist, temp; - const float *p_dico; - - j0 = 0; - j1 = M / 2; - dist_min = 1.0e30f; - p_dico = sns_vq_cdk1; - index0 = 0; - - for ( i = 0; i < 32; i++ ) + int16_t index; + const int16_t split_len = M / 2; + const int16_t *means; + const float means_fix2float = 1.f / powf( 2, SNS_MEANS_BITS_4_FRAC ); + + /* remove means */ + means = NULL; + switch ( L_frame ) { - dist = 0.0; - - for ( j = j0; j < j1; j++ ) - { - temp = sns[j] - *p_dico++; - dist += temp * temp; - } - - if ( dist < dist_min ) - { - dist_min = dist; - index0 = i; - } + case L_FRAME16k: + means = &sns_1st_means_16k[core - 1][0]; + break; + case L_FRAME25_6k: + means = &sns_1st_means_25k6[core - 1][0]; + break; + case L_FRAME32k: + means = &sns_1st_means_32k[core - 1][0]; + break; + default: + assert( !"illegal frame length in sns_1st_cod" ); } - /* quantized vector */ - p_dico = &sns_vq_cdk1[index0 * ( M / 2 )]; - - for ( j = j0; j < j1; j++ ) + for ( int16_t i = 0; i < M; ++i ) { - snsq[j] = *p_dico++; /* += cause it's differential */ + snsq[i] = sns[i] - means[i] * means_fix2float; } - j0 = M / 2; - j1 = M; - dist_min = 1.0e30f; - p_dico = sns_vq_cdk2; - index1 = 0; - - for ( i = 0; i < 32; i++ ) + index = 0; + for ( int16_t split = 0; split < 2; ++split ) { - dist = 0.0; - - for ( j = j0; j < j1; j++ ) + const int16_t *cdbk_ptr; + int16_t j0, j1, index_split; + float dist_min; + const float cdbk_fix2float = 1.f / powf( 2, SNS_CDBKS_BITS_4_FRAC ); + const int16_t *const cdbk = &sns_1st_cdbk[split][core - 1][0]; + + j0 = split * split_len; + j1 = j0 + split_len; + + cdbk_ptr = cdbk; + dist_min = 1.0e30f; + index_split = 0; + for ( int16_t i = 0; i < 32; ++i ) { - temp = sns[j] - *p_dico++; - dist += temp * temp; + float dist; + + dist = 0.f; + for ( int16_t j = j0; j < j1; ++j ) + { + float tmp; + + tmp = snsq[j] - ( *cdbk_ptr++ ) * cdbk_fix2float; + dist += tmp * tmp; + } + + if ( dist < dist_min ) + { + dist_min = dist; + index_split = i; + } } - if ( dist < dist_min ) + /* set quantized vector */ + cdbk_ptr = &cdbk[index_split * split_len]; + for ( int16_t j = j0; j < j1; ++j ) { - dist_min = dist; - index1 = i; + snsq[j] = ( *cdbk_ptr++ ) * cdbk_fix2float + means[j] * means_fix2float; } - } - /* quantized vector */ - p_dico = &sns_vq_cdk2[index1 * ( M / 2 )]; + /* for second split shift by five bits to store both indices as one 10 bit value */ + if ( split == 1 ) + { + index_split <<= 5; + } - for ( j = j0; j < j1; j++ ) - { - snsq[j] = *p_dico++; /* += cause it's differential */ + index += index_split; } - index = index0 + ( index1 << 5 ); - return index; } /*------------------------------------------------------------------- - * sns_1st_cod() + * sns_2st_cod() * * *-------------------------------------------------------------------*/ @@ -193,12 +206,13 @@ static int16_t sns_2st_cod( *-------------------------------------------------------------------*/ void sns_avq_cod( - const float *sns, /* i : Input sns vectors */ - const float *snsmid, /* i : Input mid-sns vectors */ - float *sns_q, /* o : Quantized LFS vectors */ - float *snsmid_q, /* o : Quantized mid-LFS vectors */ - int16_t *index, /* o : Quantization indices */ - const int16_t core, /* i : core */ + const float *sns, /* i : Input sns vectors */ + const float *snsmid, /* i : Input mid-sns vectors */ + float *sns_q, /* o : Quantized LFS vectors */ + float *snsmid_q, /* o : Quantized mid-LFS vectors */ + int16_t *index, /* o : Quantization indices */ + const int16_t core, /* i : core */ + const int16_t L_frame, const int16_t low_brate_mode /* i : flag low bit operating mode */ ) { @@ -206,7 +220,7 @@ void sns_avq_cod( float snsmid_q0[M]; int16_t indxt[256], nbits, nbt, nit; - index[0] = sns_1st_cod( sns, sns_q ); + index[0] = sns_1st_cod( sns, L_frame, core, sns_q ); nit = 1 + 2; if ( !low_brate_mode ) { @@ -227,7 +241,7 @@ void sns_avq_cod( { index++; - index[0] = sns_1st_cod( snsmid, snsmid_q ); + index[0] = sns_1st_cod( snsmid, L_frame, core, snsmid_q ); nit = 1 + 2; if ( !low_brate_mode ) { @@ -282,12 +296,13 @@ 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) */ + const int16_t L_frame, + 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; @@ -327,7 +342,7 @@ void sns_avq_cod_stereo( } /* Quantize mid */ - indexl[0] = sns_1st_cod( mid, mid_q ); + indexl[0] = sns_1st_cod( mid, L_frame, TCX_20_CORE, mid_q ); sns_2st_cod( mid, mid_q, &indexl[1] ); /* Quantize side */ @@ -367,13 +382,143 @@ void sns_avq_cod_stereo( *indexr++ = 1; /* Quantize left */ - indexl[0] = sns_1st_cod( snsl, snsl_q ); + indexl[0] = sns_1st_cod( snsl, L_frame, TCX_20_CORE, snsl_q ); sns_2st_cod( snsl, snsl_q, &indexl[1] ); /* Quantize right */ - indexr[0] = sns_1st_cod( snsr, snsr_q ); + indexr[0] = sns_1st_cod( snsr, L_frame, TCX_20_CORE, snsr_q ); sns_2st_cod( snsr, snsr_q, &indexr[1] ); } return; } + +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]; + + 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; + + /* use snsQ_out as buffer, move input vectors */ + for ( ch = 0; ch < CPE_CHANNELS; ++ch ) + { + nSubframes = ( sts[ch]->core == TCX_20_CORE ) ? 1 : NB_DIV; + for ( k = 0; k < nSubframes; ++k ) + { + mvr2r( sns_in[ch][k], snsQ_out[ch][k], M ); + } + } + + 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[M]; + float ener_side; + + v_sub( snsQ_out[0][k], snsQ_out[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; + + if ( sns_stereo_mode[k] == SNS_STEREO_MODE_MS ) + { + convertToMS( M, snsQ_out[0][k], snsQ_out[1][k], 0.5f ); + } + } + } + + /* prepare buffers depending on the chosen stereo mode */ + + + nSubframes = ( sts[0]->core == TCX_20_CORE ) ? 1 : NB_DIV; + for ( k = 0; k < nSubframes; ++k ) + { + mvr2r( sns_in[0][k], snsQ_out[0][k], M ); + mvr2r( sns_in[1][k], snsQ_out[1][k], M ); + if ( sns_stereo_mode[k] == SNS_STEREO_MODE_MS ) + { + convertToMS( M, snsQ_out[0][k], snsQ_out[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 = 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; + 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; + 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( 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 ); + } + 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 ); + } + } + } + + + return nbits; +} diff --git a/lib_enc/ivas_spar_encoder.c b/lib_enc/ivas_spar_encoder.c index c659979d2b7be0b589bd697fe91870134f9bd355..651dcb2741d4d35c7a7fc88008570e12e2853aef 100644 --- a/lib_enc/ivas_spar_encoder.c +++ b/lib_enc/ivas_spar_encoder.c @@ -66,6 +66,7 @@ ivas_error ivas_spar_enc_open( ENCODER_CONFIG_HANDLE hEncoderConfig; IVAS_FB_CFG *fb_cfg; int16_t nchan_inp, nchan_transport, sba_order_internal; + int16_t nchan_fb_in; int16_t table_idx, active_w_mixing; int32_t input_Fs, ivas_total_brate; ivas_error error; @@ -85,10 +86,29 @@ ivas_error ivas_spar_enc_open( input_Fs = hEncoderConfig->input_Fs; sba_order_internal = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); - nchan_inp = ivas_sba_get_nchan_metadata( sba_order_internal ); + nchan_inp = ivas_sba_get_nchan_metadata( sba_order_internal, + hEncoderConfig->ivas_total_brate ); assert( nchan_inp <= hEncoderConfig->nchan_inp ); ivas_total_brate = hEncoderConfig->ivas_total_brate; + nchan_fb_in = 0; + if ( st_ivas->sba_analysis_order == 1 ) + { + nchan_fb_in = FOA_CHANNELS; + } + else if ( st_ivas->sba_analysis_order == 2 ) + { + nchan_fb_in = 9; + } + else if ( st_ivas->sba_analysis_order == 3 ) + { + nchan_fb_in = 11; + } + else + { + assert( 0 && "sba_order must be 1,2, or 3!" ); + } + nchan_transport = ivas_get_sba_num_TCs( hEncoderConfig->ivas_total_brate, sba_order_internal ); // bw = ivas_get_bw_idx_from_sample_rate(pCfg->input_Fs); @@ -103,7 +123,8 @@ ivas_error ivas_spar_enc_open( /* set FB config. */ active_w_mixing = ivas_spar_br_table_consts[table_idx].active_w; - ivas_fb_set_cfg( &fb_cfg, SBA_FORMAT, SBA_MODE_SPAR, nchan_inp, nchan_transport, active_w_mixing, input_Fs ); + ivas_fb_set_cfg( &fb_cfg, SBA_FORMAT, SBA_MODE_SPAR, nchan_inp, nchan_transport, active_w_mixing, input_Fs, + nchan_fb_in ); fb_cfg->remix_order = remix_order_set[hSpar->hMdEnc->spar_md_cfg.remix_unmix_order]; /* FB mixer handle */ @@ -113,7 +134,7 @@ ivas_error ivas_spar_enc_open( } /* Covariance handle */ - if ( ( error = ivas_spar_covar_enc_open( &( hSpar->hCovEnc ), hSpar->hFbMixer->pFb, input_Fs, nchan_inp ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_spar_covar_enc_open( &( hSpar->hCovEnc ), hSpar->hFbMixer->pFb, input_Fs, nchan_inp, hEncoderConfig->ivas_total_brate ) ) != IVAS_ERR_OK ) { return error; } @@ -202,7 +223,11 @@ ivas_error ivas_spar_enc_open( 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 ) + if ( ( error = init_encoder( hSpar->hCoreCoderVAD, +#ifdef IND_LIST_DYN + st_ivas, +#endif + 0, hEncoderConfig->var_SID_rate_flag, hEncoderConfig->interval_SID, 1, st_ivas->ism_mode ) ) != IVAS_ERR_OK ) { return error; } @@ -319,7 +344,7 @@ ivas_error ivas_spar_enc( // VE2DB: can hFbMixer->ppFilterbank_prior_input be replaced by st->input ? /* check last sba_mode */ - if ( ivas_sba_mode_select( st_ivas->hEncoderConfig->last_ivas_total_brate ) == SBA_MODE_DIRAC ) + if ( ivas_sba_mode_select() == SBA_MODE_DIRAC ) { Encoder_State *sts[MCT_MAX_BLOCKS]; @@ -389,10 +414,11 @@ static ivas_error ivas_spar_enc_process( float data_f[][L_FRAME48k] /* i/o: input/transport audio channels */ ) { - float pcm_tmp[IVAS_SPAR_MAX_CH][L_FRAME48k * 2]; - float *p_pcm_tmp[IVAS_SPAR_MAX_CH]; + float pcm_tmp[DIRAC_MAX_ANA_CHANS][L_FRAME48k * 2]; + float *p_pcm_tmp[DIRAC_MAX_ANA_CHANS]; int16_t i, j, b, i_ts, input_frame, dtx_vad; int16_t transient_det[2]; + int16_t hodirac_flag; 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]; @@ -404,13 +430,25 @@ static ivas_error ivas_spar_enc_process( SPAR_ENC_HANDLE hSpar = st_ivas->hSpar; IVAS_QMETADATA_HANDLE hQMetaData = st_ivas->hQMetaData; int16_t ts, l_ts, orig_dirac_bands, num_del_samples; + float *ppIn_FR_real[IVAS_SPAR_MAX_CH], *ppIn_FR_imag[IVAS_SPAR_MAX_CH]; - float w_del_buf[IVAS_FB_1MS_48K_SAMP]; + float wyzx_del_buf[FOA_CHANNELS][IVAS_FB_1MS_48K_SAMP]; float dir[3], avg_dir[3]; float energySum, vecLen; + int16_t nchan_fb_in; +#ifdef ARITH_HUFF_CODER_CHANGES + /*Commented for now*/ + /*int16_t start_nb_bits; + int16_t total_md_bits, total_sba_bits;*/ +#endif push_wmops( "ivas_spar_enc_process" ); +#ifdef ARITH_HUFF_CODER_CHANGES + /*Commented for now*/ + // start_nb_bits = hMetaData->nb_bits_tot; +#endif + /*-----------------------------------------------------------------------------------------* * Initialization *-----------------------------------------------------------------------------------------*/ @@ -423,10 +461,17 @@ static ivas_error ivas_spar_enc_process( input_frame = (int16_t) ( input_Fs / FRAMES_PER_SEC ); sba_order = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); - nchan_inp = ivas_sba_get_nchan_metadata( sba_order ); + nchan_inp = ivas_sba_get_nchan_metadata( sba_order, + hEncoderConfig->ivas_total_brate ); assert( nchan_inp <= hEncoderConfig->nchan_inp ); - for ( i = FOA_CHANNELS + 1; i < nchan_inp; i++ ) + int16_t active_w_vlbr; + active_w_vlbr = ( hEncoderConfig->ivas_total_brate < IVAS_24k4 ) ? 1 : 0; + + nchan_fb_in = hSpar->hFbMixer->fb_cfg->nchan_fb_in; + nchan_transport = st_ivas->nchan_transport; + + for ( i = FOA_CHANNELS + 1; i < nchan_fb_in; i++ ) { mvr2r( data_f[HOA_keep_ind[i]], data_f[i], input_frame ); } @@ -436,29 +481,37 @@ static ivas_error ivas_spar_enc_process( *-----------------------------------------------------------------------------------------*/ ivas_transient_det_process( hSpar->hTranDet, data_f[0], input_frame, transient_det ); - if ( sba_order == 1 ) + if ( ivas_total_brate < IVAS_24k4 ) { - transient_det[1] = transient_det[0]; + transient_det[1] = 0; } - /* 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 ); + if ( hSpar->hFbMixer->fb_cfg->active_w_mixing == 0 ) + { + /* fill delay (1 ms) buffer for all Transport channels */ + for ( i = 0; i < hSpar->hFbMixer->fb_cfg->num_out_chans; i++ ) + { + int idx = hSpar->hFbMixer->fb_cfg->remix_order[i]; + mvr2r( &hSpar->hFbMixer->ppFilterbank_prior_input[idx][hSpar->hFbMixer->fb_cfg->prior_input_length - num_del_samples], wyzx_del_buf[idx], num_del_samples ); + } + } /*-----------------------------------------------------------------------------------------* * FB mixer ingest *-----------------------------------------------------------------------------------------*/ - for ( i = 0; i < nchan_inp; i++ ) + for ( i = 0; i < nchan_fb_in; i++ ) { p_pcm_tmp[i] = pcm_tmp[i]; } /* run Filter Bank overlapping MDFT analysis first, then we can use the temporary buffer for Parameter MDFT analysis*/ - ivas_fb_mixer_pcm_ingest( hSpar->hFbMixer, data_f, p_pcm_tmp, input_frame ); + ivas_fb_mixer_pcm_ingest( hSpar->hFbMixer, data_f, p_pcm_tmp, input_frame, + hSpar->hMdEnc->HOA_md_ind ); /* prepare Parameter MDFT analysis */ - for ( i = 0; i < nchan_inp; i++ ) + for ( i = 0; i < nchan_fb_in; i++ ) { ppIn_FR_real[i] = p_pcm_tmp[i]; ppIn_FR_imag[i] = p_pcm_tmp[i] + input_frame; @@ -469,10 +522,13 @@ static ivas_error ivas_spar_enc_process( for ( ts = 0; ts < MAX_PARAM_SPATIAL_SUBFRAMES; ts++ ) { - ivas_fb_mixer_get_windowed_fr( hSpar->hFbMixer, p_pcm_tmp, ppIn_FR_real, ppIn_FR_imag, l_ts, l_ts ); - ivas_fb_mixer_update_prior_input( hSpar->hFbMixer, p_pcm_tmp, l_ts ); + ivas_fb_mixer_get_windowed_fr( hSpar->hFbMixer, p_pcm_tmp, ppIn_FR_real, ppIn_FR_imag, l_ts, l_ts, + nchan_fb_in ); - for ( i = 0; i < nchan_inp; i++ ) + ivas_fb_mixer_update_prior_input( hSpar->hFbMixer, p_pcm_tmp, l_ts, + nchan_fb_in ); + + for ( i = 0; i < nchan_fb_in; i++ ) { p_pcm_tmp[i] += l_ts; ppIn_FR_real[i] += l_ts; @@ -481,7 +537,7 @@ static ivas_error ivas_spar_enc_process( } /* turn pointers back to the local buffer, needed for the following processing */ - for ( i = 0; i < nchan_inp; i++ ) + for ( i = 0; i < nchan_fb_in; i++ ) { ppIn_FR_real[i] = pcm_tmp[i]; ppIn_FR_imag[i] = pcm_tmp[i] + input_frame; @@ -494,7 +550,9 @@ static ivas_error ivas_spar_enc_process( * DirAC encoding *-----------------------------------------------------------------------------------------*/ - ivas_dirac_param_est_enc( st_ivas->hDirAC, hQMetaData->q_direction, hQMetaData->useLowerRes, data_f, ppIn_FR_real, ppIn_FR_imag, input_frame, st_ivas->sba_mode ); + hodirac_flag = ivas_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order ); + + ivas_dirac_param_est_enc( st_ivas->hDirAC, hQMetaData->q_direction, hQMetaData->useLowerRes, data_f, ppIn_FR_real, ppIn_FR_imag, input_frame, st_ivas->sba_mode, hodirac_flag, hodirac_flag ? HOA2_CHANNELS : FOA_CHANNELS ); if ( hQMetaData->q_direction->cfg.nbands > 0 ) { @@ -504,14 +562,15 @@ static ivas_error ivas_spar_enc_process( { /* WB 4TC mode bit : disable for now*/ push_next_indice( hMetaData, 0, 1 ); - ivas_qmetadata_enc_encode( hMetaData, hQMetaData ); + + ivas_qmetadata_enc_encode( hMetaData, hQMetaData, hodirac_flag ); } else { hQMetaData->q_direction[0].cfg.nbands = DIRAC_DTX_BANDS; /* compute directions */ - for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ ) + for ( i = 0; i < hQMetaData->q_direction[0].cfg.nblocks; i++ ) { set_zero( dir, 3 ); set_zero( avg_dir, 3 ); @@ -586,7 +645,7 @@ static ivas_error ivas_spar_enc_process( if ( hSpar->hMdEnc->table_idx != table_idx ) { hSpar->hMdEnc->table_idx = table_idx; - if ( ivas_total_brate != hEncoderConfig->last_ivas_total_brate ) + if ( ( ivas_total_brate != hEncoderConfig->last_ivas_total_brate ) && ( !hEncoderConfig->spar_reconfig_flag ) ) { if ( ( error = ivas_spar_md_enc_init( hSpar->hMdEnc, hEncoderConfig, sba_order ) ) != IVAS_ERR_OK ) { @@ -595,7 +654,15 @@ static ivas_error ivas_spar_enc_process( } 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 ); + 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 +#ifdef ARITH_HUFF_CODER_CHANGES + , + hSpar->hMdEnc->spar_hoa_dirac2spar_md_flag, + 1, hEncoderConfig->Opt_PCA_ON, + hSpar->AGC_Enable +#endif + ); } } /*-----------------------------------------------------------------------------------------* @@ -611,7 +678,19 @@ 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 ); + 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, + hSpar->hMdEnc->HOA_md_ind ); nchan_transport = st_ivas->nchan_transport; /*-----------------------------------------------------------------------------------------* @@ -620,9 +699,10 @@ 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, + hSpar->hFbMixer->prior_mixer ); } - + if ( hSpar->hMdEnc->spar_hoa_dirac2spar_md_flag ) { float azi_dirac[IVAS_MAX_NUM_BANDS][MAX_PARAM_SPATIAL_SUBFRAMES]; float ele_dirac[IVAS_MAX_NUM_BANDS][MAX_PARAM_SPATIAL_SUBFRAMES]; @@ -639,8 +719,8 @@ static ivas_error ivas_spar_enc_process( dirac_band_idx = hSpar->dirac_to_spar_md_bands[b] - d_start_band; for ( i_ts = 0; i_ts < hQMetaData->q_direction->cfg.nblocks; i_ts++ ) { - azi_dirac[b][i_ts] = hQMetaData->q_direction->band_data[dirac_band_idx].azimuth[i_ts]; - ele_dirac[b][i_ts] = hQMetaData->q_direction->band_data[dirac_band_idx].elevation[i_ts]; + azi_dirac[b][i_ts] = hQMetaData->q_direction[0].band_data[dirac_band_idx].azimuth[i_ts]; + ele_dirac[b][i_ts] = hQMetaData->q_direction[0].band_data[dirac_band_idx].elevation[i_ts]; } diffuseness[b] = 1.0f - hQMetaData->q_direction->band_data[dirac_band_idx].energy_ratio[0]; } @@ -662,14 +742,80 @@ 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, + hQMetaData->useLowerRes, active_w_vlbr ); } 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, + hSpar->hFbMixer->prior_mixer ); } - +#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 *-----------------------------------------------------------------------------------------*/ @@ -718,14 +864,44 @@ static ivas_error ivas_spar_enc_process( #ifdef DEBUG_SBA_AUDIO_DUMP ivas_spar_dump_signal_wav( input_frame, p_pcm_tmp, NULL, nchan_transport, spar_foa_enc_wav[1], "ivas_fb_mixer_process()" ); #endif - - /* move delayed W into output buffer unless activeW operation*/ if ( hSpar->hFbMixer->fb_cfg->active_w_mixing == 0 ) { - mvr2r( w_del_buf, p_pcm_tmp[0], num_del_samples ); + /* delayed W */ + mvr2r( wyzx_del_buf[0], p_pcm_tmp[0], num_del_samples ); mvr2r( data_f[0], p_pcm_tmp[0] + num_del_samples, input_frame - num_del_samples ); - } + for ( i = 1; i < hSpar->hFbMixer->fb_cfg->num_out_chans; i++ ) + { + int idx = hSpar->hFbMixer->fb_cfg->remix_order[i]; + + /* delayed, reorderd and accumulated with (negative) prediction from W */ + v_add( wyzx_del_buf[idx], p_pcm_tmp[i], p_pcm_tmp[i], num_del_samples ); + v_add( data_f[idx], p_pcm_tmp[i] + num_del_samples, p_pcm_tmp[i] + num_del_samples, input_frame - num_del_samples ); + } + } +#if 0 /* SBA_TD_RESIDUAL */ + { + static FILE *fid = 0; + static int samplesWritten = 0; + int s; + if (!fid) + { + fid = fopen("enc_pcm.txt", "wt"); + } + if (samplesWritten < 8 * 48000) + { + for (s = 0; s < input_frame; s++) + { + for (i = 0; i < hSpar->hFbMixer->fb_cfg->num_out_chans; i++) + { + fprintf(fid, "%.8f ", p_pcm_tmp[i][s]); + } + fprintf(fid, "\n"); + } + samplesWritten += input_frame; + } + } +#endif /*-----------------------------------------------------------------------------------------* * PCA encoder *-----------------------------------------------------------------------------------------*/ @@ -742,7 +918,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 @@ -838,5 +1023,12 @@ static ivas_error ivas_spar_enc_process( pop_wmops(); +#ifdef ARITH_HUFF_CODER_CHANGES + /*Commented for now*/ + /*total_md_bits = hMetaData->nb_bits_tot - start_nb_bits; + total_sba_bits = ivas_sba_get_max_md_bits( st_ivas ); + assert( total_md_bits <= total_sba_bits );*/ +#endif + return error; } diff --git a/lib_enc/ivas_spar_md_enc.c b/lib_enc/ivas_spar_md_enc.c index 645f690ac0f8561aaccc1ea1fc050f03616d7aa7..ca5728f81ed4bceea3897899683abc9ca1017b1a 100644 --- a/lib_enc/ivas_spar_md_enc.c +++ b/lib_enc/ivas_spar_md_enc.c @@ -42,7 +42,6 @@ #include #include "wmc_auto.h" - /*------------------------------------------------------------------------------------------* * PreProcessor *------------------------------------------------------------------------------------------*/ @@ -72,15 +71,22 @@ 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_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 ARITH_HUFF_CODER_CHANGES +static int16_t 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, const int16_t bands_bw ); +#else +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, const int16_t bands_bw ); +#endif +#ifdef ARITH_HUFF_CODER_CHANGES +static int16_t 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, const int16_t strat, const int32_t ivas_total_brate ); +#else +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, 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, 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 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 ); @@ -111,7 +117,6 @@ ivas_error ivas_spar_md_enc_open( ivas_spar_md_enc_state_t *hMdEnc; ivas_error error; int16_t num_channels, i, j; - error = IVAS_ERR_OK; if ( ( hMdEnc = (ivas_spar_md_enc_state_t *) malloc( sizeof( ivas_spar_md_enc_state_t ) ) ) == NULL ) @@ -119,7 +124,8 @@ ivas_error ivas_spar_md_enc_open( return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD encoder" ); } - num_channels = ivas_sba_get_nchan_metadata( sba_order ); + num_channels = ivas_sba_get_nchan_metadata( sba_order, + hEncoderConfig->ivas_total_brate ); if ( ( hMdEnc->spar_md.band_coeffs = (ivas_band_coeffs_t *) malloc( IVAS_MAX_NUM_BANDS * sizeof( ivas_band_coeffs_t ) ) ) == NULL ) { @@ -314,12 +320,26 @@ ivas_error ivas_spar_md_enc_init( float PR_minmax[2]; int16_t num_channels, i, j, k; - hMdEnc->spar_hoa_md_flag = ivas_sba_get_spar_hoa_md_flag( sba_order, hEncoderConfig->ivas_total_brate ); - num_channels = ivas_sba_get_nchan_metadata( sba_order ); - + ivas_sba_get_spar_hoa_md_flag( sba_order, hEncoderConfig->ivas_total_brate, &hMdEnc->spar_hoa_md_flag, &hMdEnc->spar_hoa_dirac2spar_md_flag ); + num_channels = ivas_sba_get_nchan_metadata( sba_order, + hEncoderConfig->ivas_total_brate ); + ivas_sba_get_spar_hoa_ch_ind( num_channels, hEncoderConfig->ivas_total_brate, hMdEnc->HOA_md_ind ); table_idx = ivas_get_spar_table_idx( hEncoderConfig->ivas_total_brate, sba_order, SPAR_CONFIG_BW, NULL, NULL ); - ivas_spar_set_bitrate_config( &hMdEnc->spar_md_cfg, table_idx, ( hMdEnc->spar_hoa_md_flag ) ? IVAS_MAX_NUM_BANDS : SPAR_DIRAC_SPLIT_START_BAND ); + ivas_spar_set_bitrate_config( &hMdEnc->spar_md_cfg, table_idx, + ( hMdEnc->spar_hoa_md_flag ) ? IVAS_MAX_NUM_BANDS : SPAR_DIRAC_SPLIT_START_BAND +#ifdef ARITH_HUFF_CODER_CHANGES + , + hMdEnc->spar_hoa_dirac2spar_md_flag, + 1, hEncoderConfig->Opt_PCA_ON, +#ifndef DEBUG_AGC_ENCODER_CMD_OPTION + ivas_agc_enc_get_flag( ivas_spar_br_table_consts[table_idx].nchan_transport ) +#else + ivas_agc_enc_get_flag( hEncoderConfig->Opt_AGC_ON, ivas_spar_br_table_consts[table_idx].nchan_transport ) +#endif + +#endif + ); /* get FB coefficients */ for ( i = 0; i < IVAS_MAX_NUM_BANDS; i++ ) @@ -510,17 +530,29 @@ static void write_metadata_buffer( BSTR_ENC_HANDLE hMetaData_tmp, BSTR_ENC_HANDLE hMetaData, const int16_t bit_pos_start, - const int16_t next_ind_start, - const int16_t last_ind_start ) + const int16_t next_ind_start +#ifndef IND_LIST_DYN + , + const int16_t last_ind_start +#endif +) { int16_t i; if ( hMetaData->nb_bits_tot > 0 ) { - restore_metadata_buffer( hMetaData, next_ind_start, last_ind_start, bit_pos_start ); + restore_metadata_buffer( hMetaData, next_ind_start, +#ifndef IND_LIST_DYN + last_ind_start, +#endif + bit_pos_start ); } +#ifdef IND_LIST_DYN + for ( i = 0; i < hMetaData_tmp->nb_ind_tot; i++ ) +#else for ( i = 0; i < hMetaData_tmp->next_ind; i++ ) +#endif { push_next_indice( hMetaData, hMetaData_tmp->ind_list[i].value, hMetaData_tmp->ind_list[i].nb_bits ); } @@ -544,31 +576,52 @@ 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 */ + , + float *prior_mixer[IVAS_MAX_FB_MIXER_OUT_CH][IVAS_MAX_SPAR_FB_MIXER_IN_CH] /* i : prior mixer_matrix */ ) { float pred_coeffs_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS]; float dm_fv_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS]; + int16_t i, j, b, qsi, ndm, ndec, num_ch, num_quant_strats; + int16_t planarCP; float pred_coeffs_re_local[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS]; - int16_t i, b, qsi, ndm, ndec, num_ch, num_quant_strats; - int16_t j, planarCP; int16_t k, bwidth, num_bands, num_bands_full, num_bands_bw; int16_t active_w, nchan_transport, dmx_switch, strat; int16_t nB, bands_bw, packed_ok = 0; ivas_strats_t cs[MAX_CODING_STRATS]; int16_t code_strat; - int16_t bit_pos_start, next_ind_start, last_ind_start; + int16_t bit_pos_start, next_ind_start; +#ifndef IND_LIST_DYN + int16_t last_ind_start; +#endif BSTR_ENC_DATA hMetaData_tmp; +#ifdef ARITH_HUFF_CODER_CHANGES + Indice *ind_list_tmp; + int16_t md_indices_allocated; +#else Indice ind_list_tmp[MAX_BITS_METADATA]; // IVAS_fmToDo: size to be optimized +#endif +#ifdef IND_LIST_DYN + int16_t max_num_indices_tmp; +#endif float Wscale[IVAS_MAX_NUM_BANDS]; +#ifdef ARITH_HUFF_CODER_CHANGES + /*extra 16 bits for arithmetic coder as overshoot check is after a symbol is written*/ + md_indices_allocated = hMdEnc->spar_md_cfg.max_bits_per_blk + IVAS_SPAR_ARITH_OVERSHOOT_BITS; + ind_list_tmp = (Indice *) malloc( sizeof( Indice ) * md_indices_allocated ); +#endif + num_quant_strats = hMdEnc->spar_md_cfg.num_quant_strats; - num_ch = ivas_sba_get_nchan_metadata( sba_order ); + num_ch = ivas_sba_get_nchan_metadata( sba_order, + hEncoderConfig->ivas_total_brate ); active_w = hMdEnc->spar_md_cfg.active_w; nchan_transport = hMdEnc->spar_md_cfg.nchan_transport; bwidth = ivas_get_bw_idx_from_sample_rate( hEncoderConfig->input_Fs ); bwidth = min( bwidth, hEncoderConfig->max_bwidth ); - + int16_t active_w_vlbr; + active_w_vlbr = ( hEncoderConfig->ivas_total_brate < IVAS_24k4 ) ? 1 : 0; num_bands = ivas_get_num_bands_from_bw_idx( SPAR_CONFIG_BW ); if ( hMdEnc->spar_hoa_md_flag == 0 ) { @@ -606,11 +659,21 @@ ivas_error ivas_spar_md_enc_process( } hMetaData_tmp.ind_list = ind_list_tmp; + hMetaData_tmp.nb_bits_tot = 0; +#ifdef IND_LIST_DYN + max_num_indices_tmp = MAX_BITS_METADATA; + hMetaData_tmp.ivas_max_num_indices = &max_num_indices_tmp; + hMetaData_tmp.ivas_ind_list_zero = (Indice **) ( &hMetaData_tmp.ind_list ); +#endif /* Save state of metadata bitstream buffer */ bit_pos_start = hMetaData->nb_bits_tot; +#ifdef IND_LIST_DYN + next_ind_start = hMetaData->nb_ind_tot; +#else next_ind_start = hMetaData->next_ind; last_ind_start = hMetaData->last_ind; +#endif dmx_switch = 0; @@ -621,17 +684,23 @@ ivas_error ivas_spar_md_enc_process( ivas_band_mixer( cov_real, num_ch, &num_bands, bands_bw ); } + 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 ); + } else { nB = num_bands; bands_bw = 1; } - - if ( hMdEnc->spar_hoa_md_flag ) + if ( hMdEnc->spar_hoa_md_flag && hMdEnc->spar_hoa_dirac2spar_md_flag ) { for ( b = SPAR_DIRAC_SPLIT_START_BAND; b < num_bands; b++ ) { - for ( i = 0; i < FOA_CHANNELS - 1; i++ ) + for ( i = 0; i < DIRAC_TO_SPAR_HBR_PRED_CHS; i++ ) { pred_coeffs_re_local[i][b] = hMdEnc->spar_md.band_coeffs[b].pred_re[i]; } @@ -639,7 +708,9 @@ 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, + active_w_vlbr, + &hMdEnc->spar_md_cfg, &hMdEnc->spar_md, Wscale, 0 ); for ( i = 0; i < num_ch; i++ ) { @@ -651,7 +722,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 @@ -736,11 +809,46 @@ ivas_error ivas_spar_md_enc_process( fprintf(stderr, "\n\n"); */ #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 ); } - 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 ); + if ( active_w_vlbr ) + { + for ( i = 0; i < 3; i++ ) + { + 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; + } + } + } } else { @@ -753,7 +861,6 @@ ivas_error ivas_spar_md_enc_process( { hMdEnc->spar_md.band_coeffs[b].pred_quant_re[i] = 0; } - 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 ); } } @@ -766,11 +873,11 @@ ivas_error ivas_spar_md_enc_process( } } - if ( hMdEnc->spar_hoa_md_flag ) + if ( hMdEnc->spar_hoa_md_flag && hMdEnc->spar_hoa_dirac2spar_md_flag ) { for ( b = SPAR_DIRAC_SPLIT_START_BAND; b < num_bands; b++ ) { - for ( i = 0; i < FOA_CHANNELS - 1; i++ ) + for ( i = 0; i < DIRAC_TO_SPAR_HBR_PRED_CHS; i++ ) { /* Use the prediction coeffs computed based on DirAC MD to generate mixer matrix */ pred_coeffs_re[i][b] = pred_coeffs_re_local[i][b]; @@ -871,19 +978,35 @@ ivas_error ivas_spar_md_enc_process( strat = cs[i]; if ( strat != NO_STRAT ) { +#ifdef ARITH_HUFF_CODER_CHANGES + reset_indices_enc( &hMetaData_tmp, md_indices_allocated ); +#else reset_indices_enc( &hMetaData_tmp, MAX_BITS_METADATA ); - +#endif ivas_write_spar_md_bitstream( hMdEnc, num_bands, bands_bw, &hMetaData_tmp, hEncoderConfig->ivas_total_brate, strat, qsi, planarCP ); - - if ( hMetaData->nb_bits_tot == bit_pos_start || hMetaData_tmp.nb_bits_tot < ( hMetaData->nb_bits_tot - bit_pos_start ) ) +#ifdef ARITH_HUFF_CODER_CHANGES + /*write to main buffer if its a valid bitstream*/ + if ( hMetaData_tmp.nb_bits_tot > 0 ) { - write_metadata_buffer( &hMetaData_tmp, hMetaData, bit_pos_start, next_ind_start, last_ind_start ); - code_strat = strat; - } - if ( hMetaData->nb_bits_tot - bit_pos_start + ( ( ( hEncoderConfig->ivas_total_brate == IVAS_256k ) && ( sba_order == SBA_FOA_ORDER ) ) ? 1 : 0 ) <= hMdEnc->spar_md_cfg.tgt_bits_per_blk ) - { - packed_ok = 1; - break; +#endif + if ( hMetaData->nb_bits_tot == bit_pos_start || hMetaData_tmp.nb_bits_tot < ( hMetaData->nb_bits_tot - bit_pos_start ) ) + { + write_metadata_buffer( &hMetaData_tmp, hMetaData, bit_pos_start, next_ind_start +#ifndef IND_LIST_DYN + , + last_ind_start +#endif + ); + code_strat = strat; + } + if ( hMetaData->nb_bits_tot - bit_pos_start + ( ( ( hEncoderConfig->ivas_total_brate == IVAS_256k ) && ( sba_order == SBA_FOA_ORDER ) ) ? 1 : 0 ) <= hMdEnc->spar_md_cfg.tgt_bits_per_blk ) + { + + { + packed_ok = 1; + break; + } + } } } } @@ -893,16 +1016,89 @@ ivas_error ivas_spar_md_enc_process( break; } - if ( hMetaData->nb_bits_tot - bit_pos_start + ( ( ( hEncoderConfig->ivas_total_brate == IVAS_256k ) && ( sba_order == SBA_FOA_ORDER ) ) ? 1 : 0 ) <= hMdEnc->spar_md_cfg.max_bits_per_blk ) +#ifdef ARITH_HUFF_CODER_CHANGES + /*only if valid bitstream was written to main buffer*/ + if ( hMetaData->nb_bits_tot > bit_pos_start ) +#endif { - break; + if ( hMetaData->nb_bits_tot - bit_pos_start + ( ( ( hEncoderConfig->ivas_total_brate == IVAS_256k ) && ( sba_order == SBA_FOA_ORDER ) ) ? 1 : 0 ) <= hMdEnc->spar_md_cfg.max_bits_per_blk ) + { +#ifdef ARITH_HUFF_CODER_CHANGES + packed_ok = 1; +#endif + break; + } } } +#ifdef ARITH_HUFF_CODER_CHANGES + if ( dtx_vad == 1 ) + { + assert( packed_ok == 1 ); + } +#endif if ( hEncoderConfig->ivas_total_brate >= IVAS_256k ) { assert( qsi == 0 ); } + /* 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]; + } + } + } + } +#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 ) { @@ -1078,11 +1274,15 @@ 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, code_strat, dtx_vad, qsi ); hMdEnc->spar_md.dtx_vad = dtx_vad; hMdEnc->spar_md.num_bands = num_bands; +#ifdef ARITH_HUFF_CODER_CHANGES + free( ind_list_tmp ); +#endif + return IVAS_ERR_OK; } @@ -1152,6 +1352,9 @@ static void ivas_write_spar_md_bitstream( { int16_t no_ec, i; int16_t do_diff[IVAS_MAX_NUM_BANDS]; +#ifdef ARITH_HUFF_CODER_CHANGES + int16_t entropy_coding_result; +#endif if ( strat == NO_STRAT ) { @@ -1170,55 +1373,82 @@ static void ivas_write_spar_md_bitstream( no_ec = 0; - switch ( strat ) + 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 + { + 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 SPAR_HOA_DBG @@ -1229,12 +1459,28 @@ static void ivas_write_spar_md_bitstream( #endif if ( no_ec == 1 ) { - ivas_get_huffman_coded_bs( hMdEnc, hMetaData, nB, qsi, planarCP ); +#ifdef ARITH_HUFF_CODER_CHANGES + entropy_coding_result = +#endif + ivas_get_huffman_coded_bs( hMdEnc, hMetaData, nB, qsi, planarCP, + bands_bw ); } else { - ivas_get_arith_coded_bs( hMdEnc, hMetaData, do_diff, bands_bw, nB, qsi, planarCP ); +#ifdef ARITH_HUFF_CODER_CHANGES + entropy_coding_result = +#endif + ivas_get_arith_coded_bs( hMdEnc, hMetaData, do_diff, bands_bw, nB, qsi, planarCP, + strat, + ivas_total_brate ); + } + +#ifdef ARITH_HUFF_CODER_CHANGES + if ( entropy_coding_result < 0 ) + { + hMetaData->nb_bits_tot = 0; } +#endif return; } @@ -1245,13 +1491,17 @@ static void ivas_write_spar_md_bitstream( * * Generate huffman coded bitstream *-----------------------------------------------------------------------------------------*/ - +#ifdef ARITH_HUFF_CODER_CHANGES +static int16_t ivas_get_huffman_coded_bs( +#else static void ivas_get_huffman_coded_bs( +#endif ivas_spar_md_enc_state_t *hMdEnc, BSTR_ENC_HANDLE hMetaData, const int16_t nB, const int16_t qsi, - const int16_t planarCP ) + const int16_t planarCP, + const int16_t bands_bw ) { int16_t i, j; int16_t pred_coeff_dim, pred_offset; @@ -1259,16 +1509,17 @@ 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]; + 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]; pred_coeff_dim = ndm + ndec - 1; pred_offset = 0; - if ( hMdEnc->spar_hoa_md_flag ) + if ( hMdEnc->spar_hoa_md_flag && hMdEnc->spar_hoa_dirac2spar_md_flag ) { if ( i >= SPAR_DIRAC_SPLIT_START_BAND ) { - pred_offset = FOA_CHANNELS - 1; + pred_offset = DIRAC_TO_SPAR_HBR_PRED_CHS; } } @@ -1277,6 +1528,12 @@ static void ivas_get_huffman_coded_bs( for ( j = pred_offset; j < pred_coeff_dim; j++ ) { ivas_huffman_encode( &hMdEnc->huff_coeffs.pred_huff_re[qsi], hMdEnc->spar_md.band_coeffs_idx[i].pred_index_re[j], &code, &len ); +#ifdef ARITH_HUFF_CODER_CHANGES + if ( ( hMetaData->nb_bits_tot + len ) > hMdEnc->spar_md_cfg.max_bits_per_blk ) + { + return -1; + } +#endif push_next_indice( hMetaData, code, len ); } @@ -1285,6 +1542,12 @@ static void ivas_get_huffman_coded_bs( if ( keep_planar[(int16_t) floor( j / ( ndm - 1 ) )] ) { ivas_huffman_encode( &hMdEnc->huff_coeffs.drct_huff_re[qsi], hMdEnc->spar_md.band_coeffs_idx[i].drct_index_re[j], &code, &len ); +#ifdef ARITH_HUFF_CODER_CHANGES + if ( ( hMetaData->nb_bits_tot + len ) > hMdEnc->spar_md_cfg.max_bits_per_blk ) + { + return -1; + } +#endif push_next_indice( hMetaData, code, len ); } } @@ -1294,6 +1557,12 @@ static void ivas_get_huffman_coded_bs( if ( keep_planar[j] ) { ivas_huffman_encode( &hMdEnc->huff_coeffs.decd_huff_re[qsi], hMdEnc->spar_md.band_coeffs_idx[i].decd_index_re[j], &code, &len ); +#ifdef ARITH_HUFF_CODER_CHANGES + if ( ( hMetaData->nb_bits_tot + len ) > hMdEnc->spar_md_cfg.max_bits_per_blk ) + { + return -1; + } +#endif push_next_indice( hMetaData, code, len ); } } @@ -1303,24 +1572,46 @@ static void ivas_get_huffman_coded_bs( for ( j = pred_offset; j < pred_coeff_dim; j++ ) { ivas_huffman_encode( &hMdEnc->huff_coeffs.pred_huff_re[qsi], hMdEnc->spar_md.band_coeffs_idx[i].pred_index_re[j], &code, &len ); +#ifdef ARITH_HUFF_CODER_CHANGES + if ( ( hMetaData->nb_bits_tot + len ) > hMdEnc->spar_md_cfg.max_bits_per_blk ) + { + return -1; + } +#endif push_next_indice( hMetaData, code, len ); } for ( j = 0; j < ndec * ( ndm - 1 ); j++ ) { ivas_huffman_encode( &hMdEnc->huff_coeffs.drct_huff_re[qsi], hMdEnc->spar_md.band_coeffs_idx[i].drct_index_re[j], &code, &len ); +#ifdef ARITH_HUFF_CODER_CHANGES + if ( ( hMetaData->nb_bits_tot + len ) > hMdEnc->spar_md_cfg.max_bits_per_blk ) + { + return -1; + } +#endif push_next_indice( hMetaData, code, len ); } for ( j = 0; j < ndec; j++ ) { ivas_huffman_encode( &hMdEnc->huff_coeffs.decd_huff_re[qsi], hMdEnc->spar_md.band_coeffs_idx[i].decd_index_re[j], &code, &len ); +#ifdef ARITH_HUFF_CODER_CHANGES + if ( ( hMetaData->nb_bits_tot + len ) > hMdEnc->spar_md_cfg.max_bits_per_blk ) + { + return -1; + } +#endif push_next_indice( hMetaData, code, len ); } } } +#ifdef ARITH_HUFF_CODER_CHANGES + return 0; +#else return; +#endif } @@ -1329,44 +1620,68 @@ static void ivas_get_huffman_coded_bs( * * Generate arithmetic coded bitstream *-----------------------------------------------------------------------------------------*/ - +#ifdef ARITH_HUFF_CODER_CHANGES +static int16_t ivas_get_arith_coded_bs( +#else static void ivas_get_arith_coded_bs( +#endif 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 ) + const int16_t planarCP, + const int16_t strat, + const int32_t ivas_total_brate ) { - int16_t i, j, any_diff; + int16_t i, any_diff; + int16_t j; ivas_cell_dim_t pred_cell_dims[IVAS_MAX_NUM_BANDS]; ivas_cell_dim_t drct_cell_dims[IVAS_MAX_NUM_BANDS]; ivas_cell_dim_t decd_cell_dims[IVAS_MAX_NUM_BANDS]; ivas_cell_dim_t decx_cell_dims[IVAS_MAX_NUM_BANDS]; int16_t symbol_arr_re[IVAS_MAX_INPUT_LEN]; int16_t symbol_arr_old_re[IVAS_MAX_INPUT_LEN]; +#ifdef ARITH_HUFF_CODER_CHANGES + int16_t arith_result; +#endif for ( i = 0; i < nB; i++ ) { 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 ) + + 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 + { + pred_cell_dims[i].dim1 = ndm + ndec - 1; + if ( hMdEnc->spar_hoa_md_flag && hMdEnc->spar_hoa_dirac2spar_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; } - 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; } any_diff = 0; @@ -1378,7 +1693,7 @@ static void ivas_get_arith_coded_bs( break; } } - if ( hMdEnc->spar_hoa_md_flag ) + if ( hMdEnc->spar_hoa_md_flag && hMdEnc->spar_hoa_dirac2spar_md_flag ) { for ( i = 0; i < nB; i++ ) { @@ -1387,12 +1702,12 @@ static void ivas_get_arith_coded_bs( for ( j = 0; j < pred_cell_dims[i].dim1; j++ ) { hMdEnc->spar_md.band_coeffs_idx[i].pred_index_re[j] = - hMdEnc->spar_md.band_coeffs_idx[i].pred_index_re[j + ( FOA_CHANNELS - 1 )]; + hMdEnc->spar_md.band_coeffs_idx[i].pred_index_re[j + DIRAC_TO_SPAR_HBR_PRED_CHS]; if ( any_diff == 1 ) { hMdEnc->spar_md_prior.band_coeffs_idx_mapped[i].pred_index_re[j] = - hMdEnc->spar_md_prior.band_coeffs_idx_mapped[i].pred_index_re[j + ( FOA_CHANNELS - 1 )]; + hMdEnc->spar_md_prior.band_coeffs_idx_mapped[i].pred_index_re[j + DIRAC_TO_SPAR_HBR_PRED_CHS]; } } } @@ -1405,10 +1720,20 @@ static void ivas_get_arith_coded_bs( ivas_copy_band_coeffs_idx_to_arr( hMdEnc->spar_md_prior.band_coeffs_idx_mapped, nB, symbol_arr_old_re, pred_cell_dims, PRED_COEFF, planarCP ); } +#ifdef ARITH_HUFF_CODER_CHANGES + arith_result = ivas_arith_encode_cmplx_cell_array( &hMdEnc->arith_coeffs.pred_arith_re[qsi], &hMdEnc->arith_coeffs.pred_arith_re_diff[qsi], pDo_diff, nB, + symbol_arr_re, symbol_arr_old_re, pred_cell_dims, hMetaData, any_diff, + hMdEnc->spar_md_cfg.max_bits_per_blk ); + if ( arith_result < 0 ) + { + return -1; + } +#else ivas_arith_encode_cmplx_cell_array( &hMdEnc->arith_coeffs.pred_arith_re[qsi], &hMdEnc->arith_coeffs.pred_arith_re_diff[qsi], pDo_diff, nB, symbol_arr_re, symbol_arr_old_re, pred_cell_dims, hMetaData, any_diff ); +#endif - if ( hMdEnc->spar_hoa_md_flag ) + if ( hMdEnc->spar_hoa_md_flag && hMdEnc->spar_hoa_dirac2spar_md_flag ) { for ( i = 0; i < nB; i++ ) { @@ -1416,10 +1741,10 @@ static void ivas_get_arith_coded_bs( { for ( j = pred_cell_dims[i].dim1 - 1; j >= 0; j-- ) { - hMdEnc->spar_md.band_coeffs_idx[i].pred_index_re[j + ( FOA_CHANNELS - 1 )] = + hMdEnc->spar_md.band_coeffs_idx[i].pred_index_re[j + DIRAC_TO_SPAR_HBR_PRED_CHS] = hMdEnc->spar_md.band_coeffs_idx[i].pred_index_re[j]; } - for ( j = 0; j < FOA_CHANNELS - 1; j++ ) + for ( j = 0; j < DIRAC_TO_SPAR_HBR_PRED_CHS; j++ ) { hMdEnc->spar_md.band_coeffs_idx[i].pred_index_re[j] = 0; } @@ -1448,8 +1773,19 @@ static void ivas_get_arith_coded_bs( } } +#ifdef ARITH_HUFF_CODER_CHANGES + arith_result = ivas_arith_encode_cmplx_cell_array( &hMdEnc->arith_coeffs.drct_arith_re[qsi], &hMdEnc->arith_coeffs.drct_arith_re_diff[qsi], pDo_diff, nB, + symbol_arr_re, symbol_arr_old_re, drct_cell_dims, hMetaData, any_diff, + hMdEnc->spar_md_cfg.max_bits_per_blk ); + if ( arith_result < 0 ) + { + return -1; + } +#else ivas_arith_encode_cmplx_cell_array( &hMdEnc->arith_coeffs.drct_arith_re[qsi], &hMdEnc->arith_coeffs.drct_arith_re_diff[qsi], pDo_diff, nB, symbol_arr_re, symbol_arr_old_re, drct_cell_dims, hMetaData, any_diff ); +#endif + ivas_copy_band_coeffs_idx_to_arr( hMdEnc->spar_md.band_coeffs_idx, nB, symbol_arr_re, decd_cell_dims, DECD_COEFF, planarCP ); @@ -1465,9 +1801,19 @@ static void ivas_get_arith_coded_bs( decd_cell_dims[i].dim1 = decd_cell_dims[i].dim1 - IVAS_SPAR_HOA3_NP_CHS; } } - +#ifdef ARITH_HUFF_CODER_CHANGES + arith_result = ivas_arith_encode_cmplx_cell_array( &hMdEnc->arith_coeffs.decd_arith_re[qsi], &hMdEnc->arith_coeffs.decd_arith_re_diff[qsi], pDo_diff, nB, + symbol_arr_re, symbol_arr_old_re, decd_cell_dims, hMetaData, any_diff, + hMdEnc->spar_md_cfg.max_bits_per_blk ); + if ( arith_result < 0 ) + { + return -1; + } +#else ivas_arith_encode_cmplx_cell_array( &hMdEnc->arith_coeffs.decd_arith_re[qsi], &hMdEnc->arith_coeffs.decd_arith_re_diff[qsi], pDo_diff, nB, symbol_arr_re, symbol_arr_old_re, decd_cell_dims, hMetaData, any_diff ); +#endif + ivas_copy_band_coeffs_idx_to_arr( hMdEnc->spar_md.band_coeffs_idx, nB, symbol_arr_re, decx_cell_dims, DECX_COEFF, planarCP ); @@ -1476,7 +1822,11 @@ static void ivas_get_arith_coded_bs( ivas_copy_band_coeffs_idx_to_arr( hMdEnc->spar_md_prior.band_coeffs_idx_mapped, nB, symbol_arr_old_re, decx_cell_dims, DECX_COEFF, planarCP ); } +#ifdef ARITH_HUFF_CODER_CHANGES + return 0; +#else return; +#endif } @@ -1540,15 +1890,11 @@ static void ivas_select_next_strat( 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 ) { int16_t i, j, b; - - float one_by_bands_bw = ( 1.0f / bands_bw ); - if ( dtx_vad == 0 ) { hMdEnc->spar_md_cfg.prior_strat = START; @@ -1562,8 +1908,9 @@ static void ivas_store_prior_coeffs( for ( i = 0; i < num_bands; i++ ) { - b = (int16_t) floor( i * one_by_bands_bw ); - + 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 ); */ 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 6638a8948893cd39c5278f7d59122448c75a1237..806899c3433cc9be83e57dea810beba68ec9371b 100644 --- a/lib_enc/ivas_stat_enc.h +++ b/lib_enc/ivas_stat_enc.h @@ -81,6 +81,10 @@ typedef struct stereo_itd_data_struct int16_t prev_itd1; int16_t prev_itd2; +#ifdef HYBRID_ITD_MAX + /*flag for hybrid ITD for very large ITDs*/ + int16_t hybrid_itd_max; +#endif } ITD_DATA, *ITD_DATA_HANDLE; typedef struct dft_ana_struct @@ -219,22 +223,6 @@ typedef struct stereo_dft_enc_data_struct 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 int16_t currentNumUpdates; int16_t expectedNumUpdates; /* Expected number of frames before use of ITD estimate */ @@ -331,6 +319,12 @@ typedef struct stereo_mdct_enc_data_structure typedef struct stereo_td_enc_data_structure { +#ifdef IND_LIST_DYN + BSTR_ENC_DATA tdm_hBstr_tmp; /* temporary bitstream structure holding TD stereo spatial parameters */ + Indice tdm_ind_list_tmp[MAX_IND_TDM_TMP]; /* temporary list of indices holding TD stereo spatial parameters */ + int16_t max_ind_tdm_tmp; /* maximum number of indices in the temporary list of indices holding TD stereo spatial parameters */ +#endif + int16_t tdm_lp_reuse_flag; /* Flag that indicate if it is possible to reuse the LP coefficient from the primary channel or not */ int16_t tdm_low_rate_mode; /* secondary channel low rate mode flag */ float tdm_Pri_pitch_buf[NB_SUBFR]; @@ -559,11 +553,7 @@ typedef struct int16_t dtx_flag; int16_t sce_id_dtx; -#ifdef DISCRETE_ISM_DTX_CNG int16_t cnt_SID_ISM; -#else - int16_t dtx_speech_buffer_enc[PARAM_ISM_HYS_BUF_SIZE]; -#endif float long_term_energy_stereo_dmx_enc[MAX_NUM_OBJECTS][PARAM_ISM_HYS_BUF_SIZE]; float coh[MAX_NUM_OBJECTS]; @@ -610,6 +600,17 @@ typedef struct ivas_dirac_enc_data_structure float diffuseness_m[DIRAC_MAX_NBANDS]; int16_t band_grouping[DIRAC_MAX_NBANDS + 1]; int16_t block_grouping[5]; +#ifdef FIX_485_STATIC_BUFFERS + int16_t firstrun_sector_params; + + float sec_I_vec_smth_x[NUM_ANA_SECTORS][IVAS_MAX_NUM_BANDS]; + float sec_I_vec_smth_y[NUM_ANA_SECTORS][IVAS_MAX_NUM_BANDS]; + float sec_I_vec_smth_z[NUM_ANA_SECTORS][IVAS_MAX_NUM_BANDS]; + + float energy_smth[NUM_ANA_SECTORS][IVAS_MAX_NUM_BANDS]; + float azi_prev[NUM_ANA_SECTORS * IVAS_MAX_NUM_BANDS]; + float ele_prev[NUM_ANA_SECTORS * IVAS_MAX_NUM_BANDS]; +#endif int16_t dirac_to_spar_md_bands[DIRAC_MAX_NBANDS]; @@ -619,6 +620,7 @@ typedef struct ivas_dirac_enc_data_structure float **buffer_intensity_real[DIRAC_NUM_DIMS]; float *buffer_energy; + } DIRAC_ENC_DATA, *DIRAC_ENC_HANDLE; /*----------------------------------------------------------------------------------* @@ -676,6 +678,8 @@ typedef struct ivas_spar_md_enc_state_t ivas_huff_coeffs_t huff_coeffs; int16_t table_idx; int16_t spar_hoa_md_flag; + int16_t spar_hoa_dirac2spar_md_flag; + int16_t HOA_md_ind[IVAS_SPAR_MAX_CH]; } ivas_spar_md_enc_state_t; /* PCA structure */ @@ -735,12 +739,36 @@ typedef struct ivas_param_mc_enc_data_structure } PARAM_MC_ENC_DATA, *PARAM_MC_ENC_HANDLE; +/*----------------------------------------------------------------------------------* + * MC ParamUpmix Mode encoder structures + *----------------------------------------------------------------------------------*/ +typedef struct ivas_mc_paramupmix_enc_data_structure +{ + ivas_trans_det_state_t *hTranDet[MC_PARAMUPMIX_COMBINATIONS * MC_PARAMUPMIX_NCH]; + IVAS_FB_MIXER_HANDLE hFbMixer; + ivas_enc_cov_handler_state_t *hCovEnc[MC_PARAMUPMIX_COMBINATIONS]; + float ***cov_real[MC_PARAMUPMIX_COMBINATIONS]; + float ***cov_dtx_real[MC_PARAMUPMIX_COMBINATIONS]; + float *midside[MC_PARAMUPMIX_COMBINATIONS][MC_PARAMUPMIX_NCH]; /* hold PCM of mid-side data */ + int32_t alpha_quant_prev[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS]; + int32_t beta_quant_prev[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS]; + bool first_frame; +} MC_PARAMUPMIX_ENC_DATA, *MC_PARAMUPMIX_ENC_HANDLE; /*----------------------------------------------------------------------------------* * MASA encoder structures *----------------------------------------------------------------------------------*/ -#ifdef FIX_382_MASA_META_FRAMING_ASYNC +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; + /* structure storing MASA framing sync detection and compensation data */ typedef struct ivas_masa_sync_struct { @@ -748,17 +776,14 @@ typedef struct ivas_masa_sync_struct uint8_t prev_sim_stop; uint8_t prev_offset; MASA_FRAME_MODE frame_mode; + } MASA_SYNC_STATE, *MASA_SYNC_HANDLE; -#endif 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]; -#ifndef FIX_350_MASA_DELAY_COMP - float *delay_buffer[MASA_MAX_TRANSPORT_CHANNELS]; -#endif int16_t band_mapping[MASA_FREQUENCY_BANDS + 1]; uint8_t twoDirBands[MASA_FREQUENCY_BANDS]; float importanceWeight[MASA_FREQUENCY_BANDS]; @@ -770,9 +795,10 @@ typedef struct ivas_masa_encoder_data_struct float onset_detector_1; float onset_detector_2; -#ifdef FIX_382_MASA_META_FRAMING_ASYNC MASA_SYNC_STATE sync_state; -#endif + + MASA_DIR_ALIGN_STATE dir_align_state; + } MASA_ENCODER_DATA; typedef struct ivas_masa_encoder_struct @@ -815,8 +841,8 @@ typedef struct ivas_mcmasa_enc_data_structure float **buffer_intensity_real_vert; float *buffer_energy; - float chnlToFoaMtx[DIRAC_MAX_ANA_CHANS][MCMASA_MAX_ANA_CHANS]; - float chnlToFoaEvenMtx[DIRAC_MAX_ANA_CHANS][MCMASA_MAX_ANA_CHANS]; + float chnlToFoaMtx[FOA_CHANNELS][MCMASA_MAX_ANA_CHANS]; + float chnlToFoaEvenMtx[FOA_CHANNELS][MCMASA_MAX_ANA_CHANS]; float ls_azimuth[MCMASA_MAX_ANA_CHANS]; int16_t leftNearest[MCMASA_MAX_ANA_CHANS]; int16_t rightNearest[MCMASA_MAX_ANA_CHANS]; @@ -941,14 +967,8 @@ typedef struct mct_enc_data_structure float lastxCorrMatrix[MCT_MAX_CHANNELS][MCT_MAX_CHANNELS]; int16_t lowE_ch[MCT_MAX_CHANNELS]; -#ifndef ISSUE_24_CLEANUP_MCT_LFE - int16_t LFE_off; -#endif uint16_t mc_global_ild[MCT_MAX_CHANNELS]; int16_t nBitsMCT; /* number of bits spent on mct side info */ -#ifndef ISSUE_24_CLEANUP_MCT_LFE - int16_t num_lfe; -#endif /* pointers to local buffers */ float *p_mdst_spectrum_long[MCT_MAX_BLOCKS][CPE_CHANNELS]; float *p_orig_spectrum_long[MCT_MAX_BLOCKS][CPE_CHANNELS]; @@ -1031,9 +1051,7 @@ 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 */ -#ifdef NCHAN_ISM_PARAMETER int16_t nchan_ism; /* number of ISM channels */ -#endif 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 */ @@ -1054,7 +1072,7 @@ typedef struct encoder_config_structure /* temp. development parameters */ int16_t Opt_PCA_ON; /* flag indicating PCA operation in SBA */ - + int16_t spar_reconfig_flag; #ifdef DEBUGGING /* debugging options */ int16_t stereo_mode_cmdl; /* stereo mode forced from the command-line */ @@ -1079,6 +1097,13 @@ typedef struct { ENCODER_CONFIG_HANDLE hEncoderConfig; /* Encoder configuration structure */ +#ifdef IND_LIST_DYN + Indice *ind_list; /* List of indices */ + int16_t ivas_max_num_indices; /* Maximum allowed number of indices in the list */ + Indice *ind_list_metadata; /* List of indices for metadata */ + int16_t ivas_max_num_indices_metadata; /* Maximum allowed number of indices in the list of metadata */ +#endif + /* high-level encoder parameters */ int16_t nchan_transport; /* number of transport channels */ int16_t sba_analysis_order; /* Ambisonic (SBA) order used for analysis and coding */ @@ -1101,6 +1126,7 @@ typedef struct IVAS_QMETADATA_HANDLE hQMetaData; /* Metadata handle for q_metadata parametric spatial coding DirAC/MASA*/ MCT_ENC_HANDLE hMCT; /* MCT handle */ PARAM_MC_ENC_HANDLE hParamMC; /* Parametric MC handle */ + MC_PARAMUPMIX_ENC_HANDLE hMCParamUpmix; /* MC Param-Upmix handle */ MCMASA_ENC_HANDLE hMcMasa; /* Multi-channel MASA data handle */ LFE_ENC_HANDLE hLFE; /* LFE data handle */ diff --git a/lib_enc/ivas_stereo_cng_enc.c b/lib_enc/ivas_stereo_cng_enc.c index 784ec10807aa6a92c0eb8a6d64c0afde1f342805..76f56532dc7a9f9917c228eefb9efc9524431d13 100644 --- a/lib_enc/ivas_stereo_cng_enc.c +++ b/lib_enc/ivas_stereo_cng_enc.c @@ -173,8 +173,7 @@ void stereo_dft_enc_sid_coh( int16_t alpha_level; int16_t n; - /* 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; + nr_of_sid_stereo_bits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; zeropad = 0; /* Encode coherence vector. Find best fixed predictor by minimizing prediction error on input vector. @@ -329,7 +328,6 @@ void stereo_dft_enc_sid_coh( ( *nb_bits )++; } - push_next_indice( hBstr, zeropad, ( IVAS_SID_5k2 - 4400 ) / FRAMES_PER_SEC ); return; } diff --git a/lib_enc/ivas_stereo_dft_enc.c b/lib_enc/ivas_stereo_dft_enc.c index ab4844ab944067f4a519135e05b06574f6d460f5..dbc06622554a01af8246712094ef87be2d10d0e5 100644 --- a/lib_enc/ivas_stereo_dft_enc.c +++ b/lib_enc/ivas_stereo_dft_enc.c @@ -294,9 +294,16 @@ ivas_error stereo_dft_enc_create( hStereoDft_loc->hConfig->force_mono_transmission = 0; stereo_dft_config( hStereoDft_loc->hConfig, IVAS_24k4, &tmpS, &tmpS ); - stereo_dft_hybrid_ITD_flag( hStereoDft_loc->hConfig, input_Fs ); + stereo_dft_enc_open( hStereoDft_loc, input_Fs, max_bwidth ); + stereo_dft_hybrid_ITD_flag( hStereoDft_loc->hConfig, input_Fs +#ifdef HYBRID_ITD_MAX + , + hStereoDft_loc->hItd->hybrid_itd_max +#endif + ); + *hStereoDft = hStereoDft_loc; return IVAS_ERR_OK; @@ -416,21 +423,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 ); @@ -575,6 +567,9 @@ void stereo_enc_itd_init( hItd->prev_itd1 = 0; hItd->prev_itd2 = 0; +#ifdef HYBRID_ITD_MAX + hItd->hybrid_itd_max = 0; +#endif return; } diff --git a/lib_enc/ivas_stereo_dft_enc_itd.c b/lib_enc/ivas_stereo_dft_enc_itd.c index f52d67a47a328fe47fcdc6ccf4d2c167dc7564f4..025729e0cdc3832e6487d73f76e1f8781f275130 100644 --- a/lib_enc/ivas_stereo_dft_enc_itd.c +++ b/lib_enc/ivas_stereo_dft_enc_itd.c @@ -82,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() * @@ -244,11 +115,19 @@ static void set_band_limits( void stereo_dft_hybrid_ITD_flag( STEREO_DFT_CONFIG_DATA_HANDLE hConfig, /* o : DFT stereo configuration */ const int32_t input_Fs /* i : CPE element sampling rate */ +#ifdef HYBRID_ITD_MAX + , + const int16_t hybrid_itd_max /* i : flag for hybrid ITD for very large ITDs */ +#endif ) { if ( hConfig != NULL ) { - if ( hConfig->res_cod_mode || ( hConfig->ada_wb_res_cod_mode && input_Fs == 16000 ) ) + if ( hConfig->res_cod_mode || ( hConfig->ada_wb_res_cod_mode && input_Fs == 16000 ) +#ifdef HYBRID_ITD_MAX + || ( hybrid_itd_max == 1 ) +#endif + ) { hConfig->hybrid_itd_flag = 1; } @@ -741,9 +620,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; @@ -774,6 +650,11 @@ void stereo_dft_enc_compute_itd( float cng_xcorr_filt; +#ifdef HYBRID_ITD_MAX + int16_t prev_itd_max; + int16_t itd_max_flip; +#endif + if ( hCPE->element_mode == IVAS_CPE_DFT ) { hStereoDft = hCPE->hStereoDft; @@ -984,32 +865,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] ) ) { @@ -1032,23 +887,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; @@ -1057,7 +895,6 @@ void stereo_dft_enc_compute_itd( { alpha = -1.0f; } -#endif if ( hCPE->hCoreCoder[0]->Opt_DTX_ON && hCPE->element_mode == IVAS_CPE_DFT ) { @@ -1140,42 +977,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 /* Low pass filter L/R power spectrum */ /* Calculate coherence as cross spectral density divided by L*R power spectrum */ @@ -1193,42 +997,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 } } } @@ -1242,70 +1013,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 ) { @@ -1624,7 +1341,12 @@ void stereo_dft_enc_compute_itd( hItd->prev_sum_nrg_L_lb = sum_nrg_L_lb; mvr2r( xcorr_lb, hItd->prev_xcorr_lb, STEREO_DFT_XCORR_LB_MAX ); } - +#ifdef HYBRID_ITD_MAX + /*save previous flag*/ + prev_itd_max = hItd->hybrid_itd_max; + /* enable hybrid ITD handling for very large ITDs*/ + hItd->hybrid_itd_max = ( abs( itd ) > STEREO_DFT_ITD_MAX && abs( itd ) < STEREO_DFT_ITD_MAX_ANA && !hCPE->hCoreCoder[0]->sp_aud_decision0 && hCPE->element_brate < IVAS_32k ); +#endif /* Update memory */ hItd->prev_itd = itd; @@ -1639,7 +1361,7 @@ void stereo_dft_enc_compute_itd( #ifdef DEBUG_STEREO_CLF dbgwrite( &hItd->itd[k_offset], sizeof( float ), 1, 1, "res/ITD.x" ); #endif - + /* limit ITD range for MDCT stereo even more */ if ( hCPE->element_mode == IVAS_CPE_MDCT && fabsf( hItd->itd[k_offset] ) > ITD_MAX_MDCT ) { itd = 0; @@ -1649,7 +1371,25 @@ void stereo_dft_enc_compute_itd( hItd->deltaItd[k_offset] = hItd->itd[k_offset] - hItd->td_itd[k_offset]; - /* limit ITD range for MDCT stereo even more */ +#ifdef HYBRID_ITD_MAX + if ( hItd->hybrid_itd_max ) + { + /*check if there is an ITD flip*/ + itd_max_flip = ( hItd->itd[k_offset] * hItd->itd[k_offset - 1] < 0 ); + + if ( hItd->deltaItd[k_offset - 1] != 0 && itd_max_flip == 0 ) + { + int16_t tmp_itd = (int16_t) floor( ( ( hItd->prev_itd ) * ( (float) input_frame / 640 ) ) + 0.5f ); + hItd->deltaItd[k_offset] = -1.0f * tmp_itd - hItd->td_itd[k_offset]; + } + } + /*signal change for next frame*/ + if ( prev_itd_max == 1 && hItd->hybrid_itd_max == 0 ) + { + hItd->hybrid_itd_max = -1; + } +#endif + #ifdef DEBUG_MODE_DFT { int16_t tmp; diff --git a/lib_enc/ivas_stereo_dft_td_itd.c b/lib_enc/ivas_stereo_dft_td_itd.c index b7fb95422f3136080892b0df097b65719ef747c6..27a71dfae477f0d3702d266163887e9204d73f00 100644 --- a/lib_enc/ivas_stereo_dft_td_itd.c +++ b/lib_enc/ivas_stereo_dft_td_itd.c @@ -271,11 +271,18 @@ void stereo_td_itd( hITD->td_itd_32k[i] = hITD->td_itd_32k[i + 1]; } } +#ifdef HYBRID_ITD_MAX + /*reset TD ITDs in case of hybrid itd_max change - turn hybrid ITD off*/ + if ( hITD->hybrid_itd_max == -1 && hybrid_itd_flag == 0 ) + { + hITD->td_itd[k_offset] = 0; + hITD->td_itd_32k[k_offset] = 0; + } +#endif if ( hybrid_itd_flag == 0 ) { return; } - stereo_td_get_td_itd( &( hITD->td_itd[k_offset] ), &( hITD->td_itd_32k[k_offset] ), hITD->itd[k_offset], sts[0]->input_Fs ); /* initializations*/ diff --git a/lib_enc/ivas_stereo_mdct_core_enc.c b/lib_enc/ivas_stereo_mdct_core_enc.c index fa9b108f0075e489fd36560a78baaf2b5a978777..03fcad485a8493450e60aa5f673c257d11a2444c 100644 --- a/lib_enc/ivas_stereo_mdct_core_enc.c +++ b/lib_enc/ivas_stereo_mdct_core_enc.c @@ -236,9 +236,6 @@ 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, -#ifndef ISSUE_24_CLEANUP_MCT_LFE - NULL, -#endif 0, CPE_CHANNELS ); for ( ch = 0; ch < CPE_CHANNELS; ch++ ) @@ -365,7 +362,13 @@ void stereo_mdct_core_enc( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; - +#ifdef IND_LIST_DYN + /* update the pointer to the buffer of indices of the second channel */ + if ( ch == 1 ) + { + st->hBstr->ind_list = sts[0]->hBstr->ind_list + sts[0]->hBstr->nb_ind_tot; + } +#endif ProcessIGF( st, st->hTcxEnc->spectrum[n], orig_spectrum[ch][n], &powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, hCPE->hCoreCoder[0]->sp_aud_decision0, 0 ); } } @@ -376,6 +379,13 @@ void stereo_mdct_core_enc( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; +#ifdef IND_LIST_DYN + /* update the pointer to the buffer of indices of the second channel */ + if ( ch == 1 ) + { + st->hBstr->ind_list = sts[0]->hBstr->ind_list + sts[0]->hBstr->nb_ind_tot; + } +#endif nSubframes = ( st->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV; if ( st->igf ) { @@ -454,9 +464,6 @@ void stereo_mdct_core_enc( #endif ivas_mdct_quant_coder( hCPE, -#ifndef ISSUE_24_CLEANUP_MCT_LFE - 0, -#endif tnsBits, tnsSize, p_param, 0 ); pop_wmops(); diff --git a/lib_enc/ivas_stereo_switching_enc.c b/lib_enc/ivas_stereo_switching_enc.c index 0e6fe1496bd03ad3d770befe24a51544b18b4b77..fca3c7785eab9e833c538536f7f61fc9fb99ebf3 100644 --- a/lib_enc/ivas_stereo_switching_enc.c +++ b/lib_enc/ivas_stereo_switching_enc.c @@ -526,12 +526,7 @@ ivas_error stereo_memory_enc( { 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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - st->mct_chan_mode -#endif - ); + 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) malloc( sizeof( STEREO_MDCT_ENC_DATA ) ) ) == NULL ) diff --git a/lib_enc/ivas_stereo_td_enc.c b/lib_enc/ivas_stereo_td_enc.c index 3857795dceadc5a1f43a07939971f77ac20dcd90..2357e307c56bb49cd1b862f7dd57ee15b8220433 100644 --- a/lib_enc/ivas_stereo_td_enc.c +++ b/lib_enc/ivas_stereo_td_enc.c @@ -124,6 +124,14 @@ void stereo_td_init_enc( hStereoTD->tdm_prev_desired_idx = LRTD_STEREO_LEFT_IS_PRIM; } +#ifdef IND_LIST_DYN + hStereoTD->tdm_hBstr_tmp.ind_list = hStereoTD->tdm_ind_list_tmp; + hStereoTD->tdm_hBstr_tmp.ivas_ind_list_zero = (Indice **) ( &hStereoTD->tdm_hBstr_tmp.ind_list ); + hStereoTD->max_ind_tdm_tmp = MAX_IND_TDM_TMP; + hStereoTD->tdm_hBstr_tmp.ivas_max_num_indices = &hStereoTD->max_ind_tdm_tmp; + reset_indices_enc( &hStereoTD->tdm_hBstr_tmp, MAX_IND_TDM_TMP ); +#endif + return; } @@ -314,12 +322,16 @@ void tdm_configure_enc( int16_t tdm_ratio_bit_alloc_idx, mod_ct; STEREO_TD_ENC_DATA_HANDLE hStereoTD; Encoder_State **sts; +#ifndef IND_LIST_DYN BSTR_ENC_HANDLE hBstr; +#endif int16_t loc_coder_tyape_raw0; hStereoTD = hCPE->hStereoTD; sts = hCPE->hCoreCoder; +#ifndef IND_LIST_DYN hBstr = sts[1]->hBstr; +#endif loc_coder_tyape_raw0 = sts[0]->coder_type_raw; /*----------------------------------------------------------------* @@ -475,6 +487,46 @@ void tdm_configure_enc( * Bitstream writing *----------------------------------------------------------------*/ +#ifdef IND_LIST_DYN + /* transmit the ratio index */ + if ( tdm_SM_or_LRTD_Pri && hStereoTD->tdm_LRTD_flag == 0 ) + { + push_indice( &hStereoTD->tdm_hBstr_tmp, IND_STEREO_TD_ALPHA, tdm_ratio_idx_SM, TDM_RATIO_BITS ); + } + else + { + if ( hStereoTD->tdm_LRTD_flag == 1 ) + { + push_indice( &hStereoTD->tdm_hBstr_tmp, IND_STEREO_TD_ALPHA, hStereoTD->tdm_inst_ratio_idx, TDM_RATIO_BITS ); + } + else + { + push_indice( &hStereoTD->tdm_hBstr_tmp, IND_STEREO_TD_ALPHA, tdm_ratio_idx, TDM_RATIO_BITS ); + } + } + + /* LPC reuse flag */ + if ( sts[1]->coder_type == INACTIVE && tdm_ratio_idx < 29 && tdm_ratio_idx > 1 ) + { + /* normal TD, tdm_lp_reuse_flag always on, tdm_use_IAWB_Ave_lpc varies tdm_ratio_idx<29 && tdm_ratio_idx> 1*/ + push_indice( &hStereoTD->tdm_hBstr_tmp, IND_STEREO_LPC_REUSE, hStereoTD->tdm_use_IAWB_Ave_lpc, TDM_LP_REUSE_BITS ); + } + else + { + push_indice( &hStereoTD->tdm_hBstr_tmp, IND_STEREO_LPC_REUSE, hStereoTD->tdm_lp_reuse_flag, TDM_LP_REUSE_BITS ); + } + + /* LRTD flag */ + push_indice( &hStereoTD->tdm_hBstr_tmp, IND_STEREO_LRTD_FLAG, hStereoTD->tdm_LRTD_flag, TDM_LR_CONTENT_BITS ); + + /* Stereo ICA parameters */ + if ( hStereoTD->tdm_LRTD_flag == 0 ) + { + push_indice( &hStereoTD->tdm_hBstr_tmp, IND_STEREO_REFCHAN, hCPE->hStereoTCA->refChanIndx, STEREO_BITS_TCA_CHAN ); + push_indice( &hStereoTD->tdm_hBstr_tmp, IND_STEREO_CORRSTATS, hCPE->hStereoTCA->indx_ica_NCShift, STEREO_BITS_TCA_CORRSTATS ); + push_indice( &hStereoTD->tdm_hBstr_tmp, IND_STEREO_GD, hCPE->hStereoTCA->indx_ica_gD, STEREO_BITS_TCA_GD ); + } +#else /* transmit the ratio index */ if ( tdm_SM_or_LRTD_Pri && hStereoTD->tdm_LRTD_flag == 0 ) { @@ -513,12 +565,14 @@ void tdm_configure_enc( push_indice( hBstr, IND_STEREO_CORRSTATS, hCPE->hStereoTCA->indx_ica_NCShift, STEREO_BITS_TCA_CORRSTATS ); push_indice( hBstr, IND_STEREO_GD, hCPE->hStereoTCA->indx_ica_gD, STEREO_BITS_TCA_GD ); } +#endif #ifdef DEBUG_MODE_TD dbgwrite( &hStereoTD->tdm_low_rate_mode, 2, 1, 320, "res/tdm_low_rate_mode" ); dbgwrite( &hStereoTD->tdm_lp_reuse_flag, 2, 1, 320, "res/tdm_lp_reuse_flag" ); dbgwrite( &mod_ct, 2, 1, 320, "res/mod_ct.enx" ); #endif + /*----------------------------------------------------------------* * Updates *----------------------------------------------------------------*/ diff --git a/lib_enc/ivas_tcx_core_enc.c b/lib_enc/ivas_tcx_core_enc.c index 3bda423fadd1f51d543cb07329a919f807e8f044..e334f4d0298b6fc9d00f108b3531f59028e0bacf 100644 --- a/lib_enc/ivas_tcx_core_enc.c +++ b/lib_enc/ivas_tcx_core_enc.c @@ -99,20 +99,10 @@ 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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - st->mct_chan_mode -#endif - ); + 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 -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - st->mct_chan_mode -#endif - ); + st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode ); } st->core_brate = st->total_brate; diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c old mode 100644 new mode 100755 index d9bd9d688fffc61b8b26c9595a0719e53bbcafa6..2e56f384ecdd454a487230261a65c53636a620ae --- a/lib_enc/lib_enc.c +++ b/lib_enc/lib_enc.c @@ -35,11 +35,13 @@ #include "prot.h" #include #include +#include #include #ifdef DEBUGGING #include "debug.h" #endif #include "wmc_auto.h" +#include "options.h" /*---------------------------------------------------------------------* * Local struct @@ -48,8 +50,12 @@ struct IVAS_ENC { Encoder_Struct *st_ivas; - Indice ind_list[MAX_NUM_DATA][MAX_NUM_INDICES]; /* list of indices */ +#ifndef IND_LIST_DYN + Indice ind_list[MAX_NUM_DATA][MAX_NUM_INDICES]; /* list of indices */ +#endif +#ifndef IND_LIST_DYN Indice ind_list_metadata[MAX_NUM_METADATA][MAX_BITS_METADATA]; /* list of indices for metadata */ +#endif ENC_CORE_HANDLE hCoreCoder; bool isConfigured; #ifdef DEBUGGING @@ -61,9 +67,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 */ -#ifdef FIX_379_EXT_METADATA - bool extMetadataApi; /* External metadata requested, to be checked against current bit rate */ -#endif + bool extMetadataApi; /* External metadata requested, to be checked against current bit rate */ }; /*---------------------------------------------------------------------* @@ -78,11 +82,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 ); -#ifdef FIX_379_EXT_METADATA static ivas_error sanitizeBitrateISM( const ENCODER_CONFIG_HANDLE hEncoderConfig, const IVAS_ENC_HANDLE hIvasEnc ); -#else -static ivas_error sanitizeBitrateISM( const ENCODER_CONFIG_HANDLE hEncoderConfig ); -#endif 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 ); @@ -106,7 +106,9 @@ ivas_error IVAS_ENC_Open( ) { Encoder_Struct *st_ivas; +#ifndef IND_LIST_DYN int16_t i, j; +#endif if ( phIvasEnc == NULL ) { @@ -141,6 +143,7 @@ ivas_error IVAS_ENC_Open( * Initialize indices *-----------------------------------------------------------------*/ +#ifndef IND_LIST_DYN for ( i = 0; i < MAX_NUM_DATA; ++i ) { for ( j = 0; j < MAX_NUM_INDICES; ++j ) @@ -149,7 +152,9 @@ ivas_error IVAS_ENC_Open( ( *phIvasEnc )->ind_list[i][j].value = 0; } } +#endif +#ifndef IND_LIST_DYN for ( i = 0; i < MAX_NUM_METADATA; ++i ) { for ( j = 0; j < MAX_BITS_METADATA; ++j ) @@ -158,6 +163,7 @@ ivas_error IVAS_ENC_Open( ( *phIvasEnc )->ind_list_metadata[i][j].value = 0; } } +#endif /*-----------------------------------------------------------------* * Allocate IVAS-codec encoder state @@ -185,6 +191,11 @@ ivas_error IVAS_ENC_Open( /* initialize pointers to handles to NULL */ ivas_initialize_handles_enc( st_ivas ); +#ifdef IND_LIST_DYN + st_ivas->ind_list = NULL; + st_ivas->ind_list_metadata = NULL; +#endif + /* set high-level parameters */ st_ivas->mc_mode = MC_MODE_NONE; st_ivas->ism_mode = ISM_MODE_NONE; @@ -394,13 +405,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; -#ifdef NCHAN_ISM_PARAMETER st_ivas->hEncoderConfig->nchan_ism = numObjects; -#endif st_ivas->hEncoderConfig->ism_extended_metadata_flag = ism_extended_metadata; -#ifdef FIX_379_EXT_METADATA hIvasEnc->extMetadataApi = ( ism_extended_metadata == 1 ); -#endif hIvasEnc->maxBandwidthUser = max_bwidth_user; error = configureEncoder( hIvasEnc, inputFs, bitrate, maxBandwidth, dtxConfig, IVAS_ENC_GetDefaultChannelAwareConfig() ); @@ -440,7 +447,7 @@ ivas_error IVAS_ENC_FeedObjectMetadata( return IVAS_ERR_INDEX_OUT_OF_BOUNDS; } - error = ivas_set_ism_metadata( hIvasEnc->st_ivas->hIsmMetaData[ismIndex], metadata.azimuth, metadata.elevation, metadata.radius, metadata.yaw, metadata.pitch ); + error = ivas_set_ism_metadata( hIvasEnc->st_ivas->hIsmMetaData[ismIndex], metadata.azimuth, metadata.elevation, metadata.radius, metadata.yaw, metadata.pitch, metadata.non_diegetic_flag ); if ( error != IVAS_ERR_OK ) { @@ -791,11 +798,7 @@ static ivas_error configureEncoder( } else if ( hEncoderConfig->ivas_format == ISM_FORMAT ) { -#ifdef FIX_379_EXT_METADATA if ( ( error = sanitizeBitrateISM( hEncoderConfig, hIvasEnc ) ) != IVAS_ERR_OK ) -#else - if ( ( error = sanitizeBitrateISM( hEncoderConfig ) ) != IVAS_ERR_OK ) -#endif { return error; } @@ -893,21 +896,16 @@ static ivas_error configureEncoder( } if ( hEncoderConfig->Opt_DTX_ON && hEncoderConfig->ivas_format != MONO_FORMAT && - ( -#ifndef DISCRETE_ISM_DTX_CNG - ( hEncoderConfig->ivas_format == ISM_FORMAT && hEncoderConfig->nchan_inp == 2 ) || // ToDo: see Issue 113 - ( hEncoderConfig->ivas_format == ISM_FORMAT && hEncoderConfig->nchan_inp > 2 && hEncoderConfig->ivas_total_brate != IVAS_24k4 && hEncoderConfig->ivas_total_brate != IVAS_32k ) || // ParamISM -#endif - ( 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 - ) ) + ( ( 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 + ) ) { return IVAS_ERROR( IVAS_ERR_DTX_NOT_SUPPORTED, "DTX is not supported in this IVAS format and element mode." ); } #ifdef DEBUG_AGC_ENCODER_CMD_OPTION - 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 ) ) + if ( hEncoderConfig->Opt_AGC_ON == SBA_AGC_FORCE_ENABLE && !( hEncoderConfig->ivas_format == SBA_FORMAT && ivas_sba_mode_select() == SBA_MODE_SPAR ) ) { return IVAS_ERROR( IVAS_ERR_NOT_SUPPORTED_OPTION, "AGC supported in SBA format at bitrates >= 24.4 kbps only." ); } @@ -927,17 +925,20 @@ static ivas_error configureEncoder( * Finalize initialization *-----------------------------------------------------------------*/ - if ( ( error = ivas_init_encoder( st_ivas, hIvasEnc->ind_list, hIvasEnc->ind_list_metadata ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_init_encoder( st_ivas +#ifndef IND_LIST_DYN + , + hIvasEnc->ind_list +#endif +#ifndef IND_LIST_DYN + , + hIvasEnc->ind_list_metadata +#endif + ) ) != IVAS_ERR_OK ) { return error; } -#ifndef DISCRETE_ISM_DTX_CNG - if ( hEncoderConfig->Opt_DTX_ON && ( hEncoderConfig->ivas_format == ISM_FORMAT ) && !( st_ivas->ism_mode == ISM_MODE_DISC && hEncoderConfig->nchan_inp == 1 ) && !( st_ivas->ism_mode == ISM_MODE_PARAM && ( hEncoderConfig->nchan_inp == 3 || hEncoderConfig->nchan_inp == 4 ) ) ) - { - return IVAS_ERROR( IVAS_ERR_UNKNOWN, "DTX is not supported in this IVAS format and element mode." ); - } -#endif if ( hEncoderConfig->ivas_format == MONO_FORMAT ) { @@ -1074,6 +1075,9 @@ ivas_error IVAS_ENC_EncodeFrameToSerial( ENCODER_CONFIG_HANDLE hEncoderConfig; ENC_CORE_HANDLE hCoreCoder; int16_t i; +#ifdef IND_LIST_DYN + int16_t n, ch; +#endif ivas_error error; error = IVAS_ERR_OK; @@ -1141,6 +1145,89 @@ ivas_error IVAS_ENC_EncodeFrameToSerial( hIvasEnc->switchingActive = true; } +#ifdef IND_LIST_DYN + /*-----------------------------------------------------------------* + * Re-allocate and re-initialize buffer of indices if IVAS total bitrate has changed + *-----------------------------------------------------------------*/ + + if ( hEncoderConfig->ivas_total_brate != hEncoderConfig->last_ivas_total_brate ) + { + /* de-allocate old buffer of indices */ + free( st_ivas->ind_list ); + + /* set the maximum allowed number of indices in the list */ + st_ivas->ivas_max_num_indices = get_ivas_max_num_indices( hEncoderConfig->ivas_format, hEncoderConfig->ivas_total_brate ); + + /* allocate new buffer of indices */ + if ( ( st_ivas->ind_list = (INDICE_HANDLE) malloc( st_ivas->ivas_max_num_indices * sizeof( Indice ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for buffer of indices!\n" ) ); + } + + /* reset the list of indices */ + for ( i = 0; i < st_ivas->ivas_max_num_indices; i++ ) + { + st_ivas->ind_list[i].nb_bits = -1; + } + + /* de-allocate old buffer of metadata indices */ + if ( st_ivas->ind_list_metadata != NULL ) + { + free( st_ivas->ind_list_metadata ); + } + + /* set the maximum allowed number of metadata indices in the list */ + st_ivas->ivas_max_num_indices_metadata = get_ivas_max_num_indices_metadata( hEncoderConfig->ivas_format, hEncoderConfig->ivas_total_brate ); + + if ( st_ivas->ivas_max_num_indices_metadata > 0 ) + { + /* allocate new buffer of metadata indices */ + if ( ( st_ivas->ind_list_metadata = (INDICE_HANDLE) malloc( st_ivas->ivas_max_num_indices_metadata * sizeof( Indice ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for buffer of metadata indices!\n" ) ); + } + + /* reset the list of metadata indices */ + for ( i = 0; i < st_ivas->ivas_max_num_indices_metadata; i++ ) + { + st_ivas->ind_list_metadata[i].nb_bits = -1; + } + } + else + { + st_ivas->ind_list_metadata = NULL; + } + + /* set pointers to the new buffers of indices in each element */ + for ( n = 0; n < st_ivas->nSCE; n++ ) + { + st_ivas->hSCE[n]->hCoreCoder[0]->hBstr->ind_list = st_ivas->ind_list; + st_ivas->hSCE[n]->hCoreCoder[0]->hBstr->ivas_ind_list_zero = &st_ivas->ind_list; + + if ( st_ivas->hSCE[n]->hMetaData != NULL ) + { + st_ivas->hSCE[n]->hMetaData->ind_list = st_ivas->ind_list_metadata; + st_ivas->hSCE[n]->hMetaData->ivas_ind_list_zero = &st_ivas->ind_list_metadata; + } + } + + for ( n = 0; n < st_ivas->nCPE; n++ ) + { + for ( ch = 0; ch < CPE_CHANNELS; ch++ ) + { + st_ivas->hCPE[n]->hCoreCoder[ch]->hBstr->ind_list = st_ivas->ind_list; + st_ivas->hCPE[n]->hCoreCoder[ch]->hBstr->ivas_ind_list_zero = &st_ivas->ind_list; + } + + if ( st_ivas->hCPE[n]->hMetaData != NULL ) + { + st_ivas->hCPE[n]->hMetaData->ind_list = st_ivas->ind_list_metadata; + st_ivas->hCPE[n]->hMetaData->ivas_ind_list_zero = &st_ivas->ind_list_metadata; + } + } + } +#endif + if ( hIvasEnc->switchingActive && hEncoderConfig->ivas_format == MONO_FORMAT ) { copy_encoder_config( st_ivas, hCoreCoder, 0 ); @@ -1393,71 +1480,7 @@ const char *IVAS_ENC_GetErrorMessage( ivas_error error /* i : encoder error code enum */ ) { - switch ( error ) - { - case IVAS_ERR_OK: - return "no error"; - case IVAS_ERR_FAILED_ALLOC: - return "Failed allocation error"; - case IVAS_ERR_WRONG_PARAMS: - return "wrong parameters"; - case IVAS_ERR_INVALID_BANDWIDTH: - return "invalid bandwidth"; - case IVAS_ERR_INVALID_DTX_UPDATE_RATE: - return "invalid DTX update rate"; - case IVAS_ERR_INVALID_SAMPLING_RATE: - return "invalid sampling rate"; - case IVAS_ERR_NOT_CONFIGURED: - return "encoder has not been configured"; - case IVAS_ERR_INVALID_STEREO_MODE: - return "invalid stereo mode"; - case IVAS_ERR_INVALID_CICP_INDEX: - return "invalid CICP index"; - case IVAS_ERR_INVALID_BITRATE: - return "invalid bitrate"; - case IVAS_ERR_INVALID_MASA_CONFIG: - return "invalid MASA config"; - case IVAS_ERR_TOO_MANY_INPUTS: - return "too many object inputs provided"; - case IVAS_ERR_INDEX_OUT_OF_BOUNDS: - return "index out of bounds"; - case IVAS_ERR_INTERNAL: - case IVAS_ERR_INTERNAL_FATAL: - return "internal error"; - case IVAS_ERR_RECONFIGURE_NOT_SUPPORTED: - return "reconfigure not supported"; - case IVAS_ERR_INVALID_FEC_OFFSET: - return "invalid FEC offset"; - case IVAS_ERR_INVALID_INPUT_BUFFER_SIZE: - return "invalid input buffer size"; - case IVAS_ERR_DTX_NOT_SUPPORTED: - return "DTX is not supported in this IVAS format and element mode"; - case IVAS_ERR_UNEXPECTED_NULL_POINTER: - return "unexpected NULL pointer"; - case IVAS_ERR_METADATA_NOT_EXPECTED: - return "metadata input not expected for current configuration"; -#ifdef DEBUGGING - case IVAS_ERR_INVALID_FORCE_MODE: - return "invalid force mode"; -#endif - case IVAS_ERR_NOT_IMPLEMENTED: - return "not implemented"; - case IVAS_ERR_FILE_READER_TIMESTAMP_MISMATCH: - return "mismatched timestamp"; - case IVAS_ERR_ISM_FILE_READER_INVALID_METADATA_FORMAT: - return "invalid metadata format"; - case IVAS_ERR_ISM_INVALID_METADATA_VALUE: - return "invalid metadata value provided"; - case IVAS_ERR_FAILED_FILE_READ: - return "could not read from file"; - case IVAS_ERR_NOT_SUPPORTED_OPTION: - return "option not supported in this set-up"; - case IVAS_ERR_UNKNOWN: - default: - break; - } - - return "unknown error"; + return ivas_error_to_string( error ); } @@ -1751,11 +1774,7 @@ static ivas_error setBitrate( if ( hEncoderConfig->ivas_format == ISM_FORMAT ) { -#ifdef FIX_379_EXT_METADATA if ( ( error = sanitizeBitrateISM( hEncoderConfig, hIvasEnc ) ) != IVAS_ERR_OK ) -#else - if ( ( error = sanitizeBitrateISM( hEncoderConfig ) ) != IVAS_ERR_OK ) -#endif { return error; } @@ -1994,12 +2013,8 @@ static ivas_error sanitizeBandwidth( *---------------------------------------------------------------------*/ static ivas_error sanitizeBitrateISM( -#ifdef FIX_379_EXT_METADATA const ENCODER_CONFIG_HANDLE hEncoderConfig, const IVAS_ENC_HANDLE hIvasEnc ) -#else - const ENCODER_CONFIG_HANDLE hEncoderConfig ) -#endif { if ( hEncoderConfig->ivas_total_brate > IVAS_128k && hEncoderConfig->nchan_inp == 1 ) { @@ -2031,7 +2046,6 @@ static ivas_error sanitizeBitrateISM( return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too low bitrate for 4 ISM specified in IVAS: %d", hEncoderConfig->ivas_total_brate ); } -#ifdef FIX_379_EXT_METADATA if ( hIvasEnc->extMetadataApi ) { hEncoderConfig->ism_extended_metadata_flag = ( hEncoderConfig->ivas_total_brate >= ISM_EXTENDED_METADATA_BRATE ); @@ -2040,12 +2054,6 @@ static ivas_error sanitizeBitrateISM( { hEncoderConfig->ism_extended_metadata_flag = 0; } -#else - if ( hEncoderConfig->ivas_total_brate < ISM_EXTENDED_METADATA_BRATE && hEncoderConfig->ism_extended_metadata_flag == 1 ) - { - return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too low bitrate for extended metadata format specified in IVAS: %d", hEncoderConfig->ivas_total_brate ); - } -#endif return IVAS_ERR_OK; } @@ -2302,9 +2310,7 @@ static void init_encoder_config( hEncoderConfig->var_SID_rate_flag = 1; hEncoderConfig->mc_input_setup = MC_LS_SETUP_INVALID; hEncoderConfig->stereo_dmx_evs = 0; -#ifdef NCHAN_ISM_PARAMETER hEncoderConfig->nchan_ism = 0; -#endif hEncoderConfig->sba_order = 0; hEncoderConfig->sba_planar = 0; hEncoderConfig->ism_extended_metadata_flag = 0; diff --git a/lib_enc/lib_enc.h b/lib_enc/lib_enc.h index 349c41ebef721a1b65be35235e7a17e63a1de4e4..a4a3726b45003fba91b8c9163cc77f0876216be6 100644 --- a/lib_enc/lib_enc.h +++ b/lib_enc/lib_enc.h @@ -94,6 +94,13 @@ typedef enum _IVAS_ENC_MASA_VARIANT IVAS_ENC_MASA_UNDEFINED = 0xffff } IVAS_ENC_MASA_VARIANT; +typedef enum _IVAS_ENC_COMPLEXITY_LEVEL +{ + IVAS_ENC_COMPLEXITY_LEVEL_ONE = 1, + IVAS_ENC_COMPLEXITY_LEVEL_TWO = 2, + IVAS_ENC_COMPLEXITY_LEVEL_THREE = 3 +} IVAS_ENC_COMPLEXITY_LEVEL; + #ifdef DEBUGGING typedef enum _IVAS_ENC_STEREO_MODE { diff --git a/lib_enc/lsf_enc.c b/lib_enc/lsf_enc.c index 052bfbe96e5756518e94fe0c634fa9fb3fb9aa2e..66f8847608b989e47ec7068d02972d36203383db 100644 --- a/lib_enc/lsf_enc.c +++ b/lib_enc/lsf_enc.c @@ -45,10 +45,8 @@ #include "rom_com.h" #include "prot.h" #include "basop_proto_func.h" -#ifdef LSF_RE_USE_SECONDARY_CHANNEL #include "ivas_prot.h" #include "ivas_rom_com.h" -#endif #include "wmc_auto.h" /*-----------------------------------------------------------------* @@ -85,10 +83,8 @@ void lsf_enc( float *Aq, /* o : quantized A(z) for 4 subframes */ const int16_t tdm_low_rate_mode, /* i : secondary channel low rate mode flag */ const int16_t GSC_IVAS_mode /* i : GSC IVAS mode */ -#ifdef LSF_RE_USE_SECONDARY_CHANNEL , const float tdm_lsfQ_PCh[M] /* i : Q LSFs for primary channel */ -#endif ) { int16_t i, nBits, force_sf, no_param_lpc; @@ -184,12 +180,7 @@ void lsf_enc( * LSF quantization *-------------------------------------------------------------------------------------*/ -#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 ); -#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 + 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 ); /* convert quantized LSFs back to LSPs */ lsf2lsp( lsf_new, lsp_new, M, st->sr_core ); @@ -450,11 +441,8 @@ void lsf_end_enc( int16_t *lpc_param, int16_t *no_indices, int16_t *bits_param_lpc, - const int16_t coder_type_raw -#ifdef LSF_RE_USE_SECONDARY_CHANNEL - , + const int16_t coder_type_raw, const float tdm_lsfQ_PCh[M] /* i : Q LSFs for primary channel */ -#endif ) { int16_t i; @@ -486,18 +474,13 @@ void lsf_end_enc( int16_t *TCQIdx; int16_t flag_1bit_gran; BSTR_ENC_HANDLE hBstr = st->hBstr; -#ifdef LSF_RE_USE_SECONDARY_CHANNEL float pred3[M]; int16_t dummy, dummy_v[5]; -#endif flag_1bit_gran = ( st->element_mode > EVS_MONO ); nBits = nBits_in; - if ( coder_type_org == GENERIC && st->sr_core == INT_FS_16k && st->codec_mode == MODE1 -#ifdef LSF_RE_USE_SECONDARY_CHANNEL - && ( st->idchan == 0 ) /* this bit is used only for primary channel or mono */ -#endif + if ( coder_type_org == GENERIC && st->sr_core == INT_FS_16k && st->codec_mode == MODE1 && ( st->idchan == 0 ) /* this bit is used only for primary channel or mono */ ) { if ( coder_type_raw == VOICED ) @@ -571,7 +554,6 @@ void lsf_end_enc( pred1[i] = ModeMeans[mode_lvq][i] + MU_MA * st->mem_MA[i]; } -#ifdef LSF_RE_USE_SECONDARY_CHANNEL /* TD stereo SCh: perform intra-frame prediction with pulling-to-mean */ if ( st->tdm_LRTD_flag == 0 && st->idchan == 1 && tdm_lsfQ_PCh != NULL ) { @@ -580,7 +562,6 @@ void lsf_end_enc( tdm_SCh_LSF_intra_pred( st->element_brate, tdm_lsfQ_PCh, pred3 ); } -#endif if ( predmode == 0 ) /* Safety-net only */ { @@ -601,10 +582,8 @@ void lsf_end_enc( safety_net = 0; } else /* Switched Safety-Net/AR prediction */ -#ifdef LSF_RE_USE_SECONDARY_CHANNEL { if ( predmode == 2 ) -#endif { /* Subtract mean and AR prediction */ mvr2r( ModeMeans[mode_lvq], pred0, M ); @@ -684,7 +663,6 @@ void lsf_end_enc( } } } -#ifdef LSF_RE_USE_SECONDARY_CHANNEL else /* of "if (predmode==2)" */ { mvr2r( ModeMeans[mode_lvq], pred0, M ); @@ -734,7 +712,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] ) @@ -750,7 +727,7 @@ void lsf_end_enc( } } } -#endif + /*--------------------------------------------------------------------------* * Write indices to array *--------------------------------------------------------------------------*/ @@ -758,10 +735,8 @@ 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 + ) { /* VOICED =2 and GENERIC=3, so "coder_type-2" means VOICED =0 and GENERIC=1*/ @@ -769,11 +744,7 @@ void lsf_end_enc( } /* write predictor selection bit */ -#ifdef LSF_RE_USE_SECONDARY_CHANNEL if ( predmode >= 2 ) -#else - if ( predmode == 2 ) -#endif { push_indice( hBstr, IND_LSF_PREDICTOR_SELECT_BIT, safety_net, 1 ); } @@ -791,11 +762,7 @@ void lsf_end_enc( else { cumleft = nBits; -#ifdef LSF_RE_USE_SECONDARY_CHANNEL if ( predmode >= 2 ) -#else - if ( predmode == 2 ) -#endif { /* subtract predictor selection bit */ cumleft = nBits - 1; @@ -924,7 +891,6 @@ void lsf_end_enc( } else { -#ifdef LSF_RE_USE_SECONDARY_CHANNEL if ( st->tdm_LRTD_flag == 0 && st->idchan == 1 && tdm_lsfQ_PCh != NULL ) { /* intra mode*/ @@ -934,14 +900,11 @@ void lsf_end_enc( } else { -#endif vq_dec_lvq( 1, qlsf, &indice[0], stages0, M, mode_lvq, levels0[stages0 - 1] ); v_add( qlsf, pred0, qlsf, M ); v_sub( qlsf, pred1, st->mem_MA, M ); -#ifdef LSF_RE_USE_SECONDARY_CHANNEL } -#endif } } else diff --git a/lib_enc/lsf_msvq_ma_enc.c b/lib_enc/lsf_msvq_ma_enc.c index a620dfac384f499c5d779d0048fc1ac5d0b89ece..9c7bed762948c8b29da305cca7bd148f4f5adad1 100644 --- a/lib_enc/lsf_msvq_ma_enc.c +++ b/lib_enc/lsf_msvq_ma_enc.c @@ -48,25 +48,282 @@ #define kMaxC 8 + +#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 ); + + +int16_t msvq_stage1_dct_search( + /* o : (p_max , best candidate sofar ) */ + const float *u, /* i : target */ + const int16_t N, /* i : target length and IDCT synthesis length */ + + /* parameterization of segmented DCT domain storage */ + const int16_t maxC_st1, /* i : number of final stage 1 candidates to provide */ + + const DCTTYPE dcttype, /* e.g. DCT_T2_16_XX, DCT_T2_24_XX; */ + const int16_t max_dct_trunc, /* i: maximum of truncation lenghts */ + float *invTrfMatrix, /* i : IDCT synthesis matrix for dim N */ + + const float *midQ_truncQ, /* i: midQ vector */ + const float *dct_invScaleF, /* i: global inv scale factors*/ + const float *dct_scaleF, /* i: global scale factors*/ + const Word16 n_segm, /* i: number of segments */ + const Word16 *cols_per_segment, /* i: remaining length per segment */ + const Word16 *trunc_dct_cols_per_segment, /* i: trunc length per segment */ + const Word16 *entries_per_segment, /* i: number of rows per segment */ + const Word16 *cum_entries_per_segment, /* i: number of cumulative entries */ + + const Word8 *const W8Qx_dct_sections[], /*i: Word8(byte) segment table ptrs */ + const Word16 *col_syn_shift[], /*i: columnwise syn shift tables */ + const Word8 *segm_neighbour_fwd, /*i: circular neighbour list fwd */ + const Word8 *segm_neighbour_rev, /*i: circular neighbour list reverse */ + const Word16 npost_check, /*i: number of neigbours to check , should be even */ + + float *st1_mse_ptr, /*i: dynRAM buffer for MSEs */ + int16_t *indices_st1_local, /*o: selected cand indices */ + float *st1_syn_vec_ptr, /*i/o: buffer for IDCT24 synthesis */ + float *dist1_ptr /*o: resulting stage 1 MSEs in DCT-N domain */ +) +{ /* stage1 search in a segmentwise truncated dct N domain without weights */ + + 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_segm[FDCNG_VQ_DCT_NSEGM]; + float tmp, check_mse; + float mse; /* Word32 in BASOP */ + + int16_t p_max, c, c2, segm, j_full, j, i; + int16_t n_ana, p_mins[2], idx_min[2]; + + const Word8 *cbpW8; + const Word16 *dct_col_shift_tab; + + float *st1_mse_pair; + int16_t *st1_idx_pair; + + float tmp2; + int16_t check_ind[FDCNG_VQ_DCT_NPOST]; + assert( ( npost_check % 2 == 0 ) && ( npost_check <= FDCNG_VQ_DCT_NPOST ) ); + + assert( n_segm <= FDCNG_VQ_DCT_NSEGM ); + + n_ana = N; /* VQ stage#1 core is currently always using stored DCT N coeffs */ + assert( n_ana >= max_dct_trunc ); /* check for FDCNGVQ WB , SWB, FB operation */ + + /* remove mid stage#1 vector, in original input domain */ + v_sub( u, midQ_truncQ, u_mr, n_ana ); + + v_multc( u_mr, 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 */ + + dctT2_N_apply_matrix( (const float *) u_mr_scaled, dct_target, min( max_dct_trunc, n_ana ), n_ana, invTrfMatrix, max_dct_trunc, dcttype ); + + /* init search state ptr's at the top */ + set_f( dist1_ptr, FLT_MAX, maxC_st1 ); + st1_mse_pair = &( dist1_ptr[0] ); /* req. ptr post upd +=2 */ + st1_idx_pair = &( indices_st1_local[0] ); /* req. ptr post upd +=2 */ + set_f( mse_trunc_segm, 0.0f, n_segm ); + + for ( segm = 0; segm < n_segm; segm++ ) + { /* point to a new paired location for each segment */ + p_max = 0; /* req. to point to one of 1 or 0, this init can potentially be omitted here,as p_max is always 1 or 0 */ + + /* compute segment common trunction error in dctN domain */ + mse_trunc_segm[segm] += sum2_f( (const float *) ( &( dct_target[cols_per_segment[segm]] ) ), trunc_dct_cols_per_segment[segm] ); + + cbpW8 = W8Qx_dct_sections[segm]; /* Word8 column variable Qx storage , table ptr init */ + + for ( j = 0; j < entries_per_segment[segm]; j++ ) + { + /* unweighted segmented search DCT domain loop */ + j_full = j + cum_entries_per_segment[segm]; /* or simply use j_full++ */ + + mse = mse_trunc_segm[segm]; /* init mse with with common mse truncation part, in BASOP a move32() */ + + dct_col_shift_tab = col_syn_shift[segm]; /* ptr init */ + + for ( c2 = 0; c2 < 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 RAM, move32() in BASOP */ + +#define WMC_TOOL_SKIP + cbpW8 += cols_per_segment[segm]; /* fixed pointer increment for each segment */ +#undef WMC_TOOL_SKIP + + /* overwrite with a new worst index at p_max */ + + /* Note: The three inner loop if's below are not 100% properly instrumented by WMC tool */ + if ( mse < st1_mse_pair[p_max] ) /* L_sub */ + { + st1_idx_pair[p_max] = j_full; /* move16, single BASOP */ + } /* BASOP 2 ops */ + + if ( st1_idx_pair[p_max] == j_full ) + { /* idx updated --> also update mse */ + st1_mse_pair[p_max] = mse; /* move32(), single BASOP */ + } /* BASOP 3 ops */ + + /* avoid WC costly candidate list management by always updating p_max, + as we have only a pair in each segment 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 available as L_lshr */ + + /* Cost: weighted sum with cond moves ('if') => 8 in float , 7 in BASOP with L_lshr */ + } /* j in section */ + + st1_mse_pair += 2; /* req. ptr init */ + st1_idx_pair += 2; /* req. ptr init */ + + } /* next segment */ + + for ( j = 0; j < maxC_st1; j++ ) + { + /* compute_full mse using stored DCT24 domain MSE's */ + /* calculate MSE from stage1 inner using existing inner DCT domain variables */ + dist1_ptr[j] *= dct_scaleF[2]; /* multiplication to get the DCT inner MSE scale to the correct input domain */ + } + + assert( ( maxC_st1 >= 3 ) ); + assert( ( maxC_st1 <= 8 ) ); + + p_max = maximum( dist1_ptr, maxC_st1, NULL ); /* establish current worst candidate for MSVQ stage#2 among all maxC_st1 candidates so far */ + + p_mins[0] = minimum( dist1_ptr, maxC_st1, NULL ); /* find best entry among all maxC_pre */ + tmp = dist1_ptr[p_mins[0]]; + dist1_ptr[p_mins[0]] = FLT_MAX; /* exclude 1st */ + + p_mins[1] = minimum( dist1_ptr, maxC_st1, NULL ); /* find 2nd best entry */ + tmp2 = dist1_ptr[p_mins[1]]; + dist1_ptr[p_mins[1]] = FLT_MAX; /* exclude 2nd */ + + dist1_ptr[p_mins[0]] = tmp; /* restore 1st */ + dist1_ptr[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) global 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] = segm_neighbour_fwd[idx_min[0]]; + check_ind[1] = segm_neighbour_rev[idx_min[0]]; + + check_ind[2] = segm_neighbour_fwd[idx_min[1]]; + check_ind[3] = segm_neighbour_rev[idx_min[1]]; + + check_ind[4] = segm_neighbour_fwd[check_ind[0]]; + check_ind[5] = segm_neighbour_rev[check_ind[1]]; + + check_ind[6] = segm_neighbour_fwd[check_ind[2]]; + check_ind[FDCNG_VQ_DCT_NPOST - 1] = segm_neighbour_rev[check_ind[3]]; + + for ( i = 0; i < npost_check; i++ ) + { + /* move MSE from DCT-inner loop search to input synthesis domain */ + /* multiplication by fdcng_dct_scaleF[2] to get the float outer loop scale correct in IDCT synthesis domain */ + check_mse = st1_mse_ptr[check_ind[i]] * dct_scaleF[2]; + + if ( check_mse < dist1_ptr[p_max] ) + { /* new winner , replace worst */ + dist1_ptr[p_max] = check_mse; + indices_st1_local[p_max] = check_ind[i]; + st1_mse_ptr[check_ind[i]] = FLT_MAX; /* exclude, BASOP: move32() */ + p_max = maximum( dist1_ptr, maxC_st1, NULL ); /* establish a new current worst candidate among all maxC */ + } + } + + /* extract the selected stage one vectors in DCT_N domain , apply IDCT_N and scale up */ + /* always extract full length signal(e.g. 24) to be able to update WB(e.g. N_in==21) candidate MSE values */ + /* in the case that only a part of the IDCT N vector is in final use */ + + /* note: synthesis not yet fully parameterized/generalized for other IDCT lengths */ + assert( N == 24 ); + { + for ( c = 0; c < maxC_st1; c++ ) + { + dec_FDCNG_MSVQ_stage1( indices_st1_local[c], N, invTrfMatrix, dcttype + 1, &( st1_syn_vec_ptr[c * N] ), NULL ); + } + } + + return p_max; /*ptr to worst performing candidate */ +} + + +/* recalc MSE for fdcng WB(0..20) coeffs , + essentially subtract res21^2 ,res22^2, res23^2 that was included in stage1 MSE in the DCT24 domain truncated search, + excludes the waveform contributions at pos 21,22,23 to the MSE, important to keep the WB MSEs update for the subsequent stages +*/ +int16_t msvq_stage1_dct_recalc_candidates_fdcng_wb( /* o : (updated p_max) */ + const float *st1_syn_vec_ptr, /* i : IDCT24 synthesis vectors */ + const float *u, /* i : target signal */ + const int16_t maxC_st1, /* i : number of candidates in stage1 */ + float *dist_ptr /* i/o: updated MSE vector for stage1 */ +) +{ + int16_t p_max_local, c; + const float *p2; + float res24, high_diff[FDCNG_VQ_MAX_LEN - FDCNG_VQ_MAX_LEN_WB]; + + for ( c = 0; c < maxC_st1; c++ ) + { /* point to extended synthesis part */ + p2 = (const float *) &( st1_syn_vec_ptr[c * FDCNG_VQ_MAX_LEN + FDCNG_VQ_MAX_LEN_WB] ); /* ptr init to synthesis candidate c */ + /* for stage#1 use "u" instead of the shortened resid[0], to access the extended/extrapolated input target */ + v_sub( p2, &( u[FDCNG_VQ_MAX_LEN_WB] ), high_diff, FDCNG_VQ_MAX_LEN - FDCNG_VQ_MAX_LEN_WB ); + res24 = dotp( high_diff, high_diff, FDCNG_VQ_MAX_LEN - FDCNG_VQ_MAX_LEN_WB ); /* sum squared over top env. values above WB coeffs */ + + dist_ptr[c] -= res24; /* remove DCT24 high band error contribution */ + } + + /* finally update p_max, as it may potentially change, + due to the core DCT24 search originally optimizing over the longer basis vectors than DCT21 */ + p_max_local = maximum( dist_ptr, maxC_st1, NULL ); + + return p_max_local; +} + + /*--------------------------------------------------------------------------* * 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.) */ - const int16_t offs[], /* i : Starting dimension of each codebook stage (NULL: 0) */ - const float u[], /* i : Vector to be encoded (prediction and mean removed) */ - const int16_t *levels, /* i : Number of levels in each stage */ - const int16_t maxC, /* i : Tree search size (number of candidates kept from */ - /* one stage to the next == M-best) */ - const int16_t stages, /* i : Number of stages */ - const float w[], /* i : Weights */ - const int16_t N, /* i : Vector dimension */ - const int16_t maxN, /* i : Codebook dimension */ - int16_t Idx[] /* o : Indices */ + const float *const *cb, /* i : Codebook (indexed cb[*stages][levels][p]) */ + const int16_t dims[], /* i : Dimension of each codebook stage (NULL: full dim.) */ + const int16_t offs[], /* i : Starting dimension of each codebook stage (NULL: 0) */ + const float u[], /* i : Vector to be encoded (prediction and mean removed) */ + const int16_t *levels, /* i : Number of levels in each stage */ + const int16_t maxC, /* i : Tree search size (number of candidates kept from */ + /* one stage to the next == M-best) */ + const int16_t stages, /* i : Number of stages */ + const float w[], /* i : Weights */ + const int16_t N, /* i : Vector dimension */ + const int16_t maxN, /* i : Codebook dimension */ + const int16_t applyDCT_flag, /* i : applyDCT flag */ + float *invTrfMatrix, /*i/o : synthesis matrix */ + int16_t Idx[] /* o : Indices */ ) { float *resid[2], *dist[2]; @@ -77,9 +334,20 @@ void msvq_enc( float resid_buf[2 * LSFMBEST_MAX * M_MAX], dist_buf[2 * LSFMBEST_MAX], Tmp[M_MAX]; int16_t idx_buf[2 * LSFMBEST_MAX * MAX_VQ_STAGES_USED], parents[LSFMBEST_MAX]; int16_t n, maxn, start; + float *st1_syn_vec_ptr; /* ptr to buffer in dynRAM */ + float *st1_mse_ptr; /* ptr to buffer in existing dRAM used for stage 1 candidate analysis */ + 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 */ + 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 */ + /*----------------------------------------------------------------* - * 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]. *----------------------------------------------------------------*/ @@ -159,84 +427,73 @@ void msvq_enc( { dist[1][j] = FLT_MAX; } - if ( !s ) /* means: m==1 */ + + if ( !s && applyDCT_flag != 0 ) /* 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. */ - /* dist[0][0] */ - for ( j = 0; j < levels[s]; j++ ) + /* stage 1 candidates search in truncated dct24 domain without any weights */ + assert( N == FDCNG_VQ_MAX_LEN || N == FDCNG_VQ_MAX_LEN_WB ); /* 21 and 24 allowed */ + assert( maxC == 2 * FDCNG_VQ_DCT_NSEGM ); + + p_max = msvq_stage1_dct_search( u, FDCNG_VQ_MAX_LEN, maxC, + DCT_T2_24_XX, + FDCNG_VQ_DCT_MAXTRUNC, + invTrfMatrix, /* i : IDCT synthesis matrix for dim N */ + cdk1r_tr_midQ_truncQ, /* i: midQ vector */ + fdcng_dct_invScaleF, /* i: global inv scale factors*/ + fdcng_dct_scaleF, /* i: global scale factors*/ + FDCNG_VQ_DCT_NSEGM, /* i: number of segments */ + cdk1_ivas_cols_per_segment, /* i: remaining length per segment */ + cdk1_ivas_trunc_dct_cols_per_segment, /* i: trunc length per segment */ + cdk1_ivas_entries_per_segment, /* i: number of rows per segment */ + cdk1_ivas_cum_entries_per_segment, /* i: number of cumulative entries */ + cdk_37bits_ivas_stage1_W8Qx_dct_sections, /*i: Word8(byte) segment table ptrs */ + stage1_dct_col_syn_shift, /*i: columnwise syn shift tables */ + cdk1_ivas_segm_neighbour_fwd, /*i: circular neighbour list fwd */ + cdk1_ivas_segm_neighbour_rev, /*i: circular neighbour list reverse */ + FDCNG_VQ_DCT_NPOST, /*i: number of circ. neigbours to post check */ + st1_mse_ptr, indices_st1_local, st1_syn_vec_ptr, dist[1] ); + + + /* move established stage#1 indices to the global MSVQ list structure */ + for ( c = 0; c < maxC; c++ ) { - en = 0.0f; - /* w,Tmp */ - /* Compute weighted codebook element and its energy */ - for ( c2 = 0; c2 < n; c2++ ) - { - Tmp[start + c2] = w[start + c2] * cbp[c2]; - en += cbp[c2] * Tmp[start + c2]; - } - cbp += maxn; /* pointer is incremented */ - - pTmp = &resid[0][0]; - /* Tmp */ - tmp = ( *pTmp++ ) * Tmp[0]; - for ( c2 = 1; c2 < N; c2++ ) - { - tmp += ( *pTmp++ ) * Tmp[c2]; - } - tmp = en - 2.0f * tmp; - tmp += dist[0][0]; - if ( tmp < dist[1][p_max] ) - { - /* Replace worst */ - dist[1][p_max] = tmp; - indices[1][p_max * stages] = j; - parents[p_max] = 0; - - p_max = 0; - for ( c2 = 1; c2 < maxC; c2++ ) - { - if ( dist[1][c2] > dist[1][p_max] ) - { - p_max = c2; - } - } - } /* if (tmp <= dist[1][p_max]) */ - } /* for (j=0; j dist[1][p_max] ) + { + p_max = c2; + } + } + } /* if (tmp <= dist[1][p_max]) */ + } /* for(c=0; cinput, NULL, enerBuffer -#ifdef FIX_MDCT_BASED_BWD - , - 0 -#endif - ); + bw_detect( st, st->input, NULL, enerBuffer, + 0 ); /*----------------------------------------------------------------* * Noise energy down-ward update and total noise energy estimation @@ -258,7 +254,6 @@ void pre_proc( * Select SID or FRAME_NO_DATA frame if DTX enabled *-----------------------------------------------------------------*/ dtx( st, -1, vad_flag_dtx, inp_12k8 ); - /*----------------------------------------------------------------* * Adjust FD-CNG Noise Estimator *----------------------------------------------------------------*/ @@ -621,12 +616,7 @@ void pre_proc( st->gamma = GAMMA16k; } - st->igf = getIgfPresent( EVS_MONO, st->total_brate, st->bwidth, st->rf_mode -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - MCT_CHAN_MODE_REGULAR -#endif - ); + st->igf = getIgfPresent( EVS_MONO, st->total_brate, st->bwidth, st->rf_mode ); } st->coder_type = st->coder_type_raw; diff --git a/lib_enc/qlpc_stoch.c b/lib_enc/qlpc_stoch.c index 8defb07034305ca3298c61478317cd05da8952fa..31021aee7fc20761b2438e3c2aa68e853979ddaf 100644 --- a/lib_enc/qlpc_stoch.c +++ b/lib_enc/qlpc_stoch.c @@ -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,13 @@ 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 -#endif - ); + lsf_end_enc( st, lsf, lsf_q, ENDLSF_NBITS, GENERIC, force_sf, param_lpc, no_param_lpc, bits_param_lpc, GENERIC, NULL ); 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 -#endif - ); + lsf_end_enc( st, lsf, lsf_q, ENDLSF_NBITS, coder_type, force_sf, param_lpc, no_param_lpc, bits_param_lpc, coder_type, NULL ); nb_indices = *no_param_lpc; } diff --git a/lib_enc/speech_music_classif.c b/lib_enc/speech_music_classif.c index cf8568e649db982127b0cd978a935d7f28b97b2f..fac0f01e4fd0e2b142534236ffba478e37a86c54 100644 --- a/lib_enc/speech_music_classif.c +++ b/lib_enc/speech_music_classif.c @@ -1828,6 +1828,7 @@ void ivas_smc_mode_selection( float ton; int16_t i; float S_p2a, S_max, S_ave; + float thr_sp2a; SP_MUS_CLAS_HANDLE hSpMusClas = st->hSpMusClas; @@ -1858,8 +1859,17 @@ 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; + if ( element_brate <= IVAS_16k4 ) + { + thr_sp2a = THR_P2A_HIGH; + } + else + { + thr_sp2a = THR_P2A; + } + /* initial 3-way selection of coding modes (ACELP/GSC/TCX) */ - if ( relE > -10.0f && ( S_p2a > THR_P2A || ton > hSpMusClas->tod_thr_lt ) ) + if ( relE > -10.0f && ( S_p2a > thr_sp2a || ton > hSpMusClas->tod_thr_lt ) ) { /* 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 ec7fb594d1a9d6c326de1f3964f895fd1c7ba01b..77c0ea3d34eb98386bb3a23a3128044af9cc7859 100644 --- a/lib_enc/stat_enc.h +++ b/lib_enc/stat_enc.h @@ -51,11 +51,20 @@ * Indice *------------------------------------------------------------------------------------------*/ +#ifdef IND_LIST_DYN +typedef struct +{ + int16_t id; /* id of the indice */ + uint16_t value; /* value of the quantized indice */ + int16_t nb_bits; /* number of bits used for the quantization of the indice */ +} Indice, *INDICE_HANDLE; +#else typedef struct { uint16_t value; /* value of the quantized indice */ int16_t nb_bits; /* number of bits used for the quantization of the indice */ } Indice; +#endif /*----------------------------------------------------------------------------------* * Bitstream structure @@ -63,11 +72,19 @@ typedef struct typedef struct bitstream_enc_data_structure { +#ifdef IND_LIST_DYN + int16_t nb_ind_tot; /* total number of indices already written */ +#endif int16_t nb_bits_tot; /* total number of bits already written */ Indice *ind_list; /* list of indices */ - int16_t next_ind; /* pointer to the next empty slot in the list of indices */ - int16_t last_ind; /* last written indice */ - +#ifndef IND_LIST_DYN + int16_t next_ind; /* pointer to the next empty slot in the list of indices */ + int16_t last_ind; /* last written indice */ +#endif +#ifdef IND_LIST_DYN + int16_t *ivas_max_num_indices; /* maximum total number of indices in the list */ + Indice **ivas_ind_list_zero; /* beginning of the buffer of indices */ +#endif } BSTR_ENC_DATA, *BSTR_ENC_HANDLE; /*----------------------------------------------------------------------------------* diff --git a/lib_enc/tcx_utils_enc.c b/lib_enc/tcx_utils_enc.c index ba709f0158fee7c34847204f8e5984c5a50b61c9..8099b8cb073c000dc45f5458f172bde8db18e26b 100644 --- a/lib_enc/tcx_utils_enc.c +++ b/lib_enc/tcx_utils_enc.c @@ -1486,11 +1486,19 @@ void ProcessIGF( } else { +#ifdef IND_LIST_DYN + pBsStart = hBstr->nb_ind_tot; +#else pBsStart = hBstr->next_ind; +#endif IGFEncWriteBitstream( hIGFEnc, hBstr, &hIGFEnc->infoTotalBitsPerFrameWritten, igfGridIdx, isIndepFlag ); +#ifdef IND_LIST_DYN + bsBits = hBstr->nb_ind_tot - pBsStart; +#else bsBits = hBstr->next_ind - pBsStart; +#endif IGFEncConcatenateBitstream( hIGFEnc, bsBits, hBstr ); } @@ -1570,11 +1578,24 @@ void ProcessStereoIGF( else { hBstr = sts[ch]->hBstr; +#ifdef IND_LIST_DYN + pBsStart = hBstr->nb_ind_tot; +#else pBsStart = hBstr->next_ind; - +#endif +#ifdef IND_LIST_DYN + if ( ch > 0 ) + { + hBstr->ind_list = sts[0]->hBstr->ind_list + sts[0]->hBstr->nb_ind_tot; + } +#endif IGFEncWriteBitstream( hIGFEnc[ch], hBstr, &hIGFEnc[ch]->infoTotalBitsPerFrameWritten, igfGridIdx, isIndepFlag ); +#ifdef IND_LIST_DYN + bsBits = hBstr->nb_ind_tot - pBsStart; +#else bsBits = hBstr->next_ind - pBsStart; +#endif IGFEncConcatenateBitstream( hIGFEnc[ch], bsBits, hBstr ); } } diff --git a/lib_enc/transient_detection.c b/lib_enc/transient_detection.c index 83f9e2e7a09e26353b7a8ded866256d33fae89d4..1f8b36819f22bfa028814c617b723c4f0760a872 100644 --- a/lib_enc/transient_detection.c +++ b/lib_enc/transient_detection.c @@ -324,89 +324,74 @@ void SetTCXModeInfo( hTcxEnc->tcxMode = NO_TCX; } } -#ifndef ISSUE_24_CLEANUP_MCT_LFE - 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; } -#endif -#ifndef ISSUE_24_CLEANUP_MCT_LFE - if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + + /* determine the right window overlap */ + if ( hTcxEnc->tcxMode == TCX_10 ) { -#endif - /* 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 = 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 ) - { - 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; } } -#ifndef ISSUE_24_CLEANUP_MCT_LFE } -#endif + 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 ) ) diff --git a/lib_enc/transition_enc.c b/lib_enc/transition_enc.c index ce13d7fa36ecf6e44293c41ba52b8c9f49efd7bf..925a6f1c322e2582ab7e214c0eade34cfbbdf055 100644 --- a/lib_enc/transition_enc.c +++ b/lib_enc/transition_enc.c @@ -178,7 +178,7 @@ void transition_enc( if ( *tc_subfr == TC_0_0 ) { /* this is called only to compute unused bits */ - 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*/ ); + 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*/ ); } *clip_gain = gp_clip( st->element_mode, st->core_brate, st->voicing, i_subfr, TRANSITION, xn, gp_cl ); @@ -274,7 +274,7 @@ void transition_enc( if ( i_subfr - *tc_subfr <= L_SUBFR ) { - 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*/ ); + 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*/ ); } /*-----------------------------------------------------------------* diff --git a/lib_enc/updt_enc.c b/lib_enc/updt_enc.c index b194de06d5d117483e8b0b3e936a878d8866298a..6b8c595f5e1ca9b36c3c728a48a6c8711b78772b 100644 --- a/lib_enc/updt_enc.c +++ b/lib_enc/updt_enc.c @@ -408,12 +408,7 @@ void updt_enc_common( st->gamma = GAMMA16k; } - st->igf = getIgfPresent( EVS_MONO, st->total_brate, st->bwidth, st->rf_mode -#ifndef ISSUE_24_CLEANUP_MCT_LFE - , - MCT_CHAN_MODE_REGULAR -#endif - ); + st->igf = getIgfPresent( EVS_MONO, st->total_brate, st->bwidth, st->rf_mode ); } /* update FER clas */ diff --git a/lib_rend/ivas_crend.c b/lib_rend/ivas_crend.c index dde95851aba40543958bd75eac2682469df16749..badf23ab4abe6bb22bf51eca9883d6843261f67a 100644 --- a/lib_rend/ivas_crend.c +++ b/lib_rend/ivas_crend.c @@ -97,7 +97,6 @@ static ivas_error ivas_hrtf_init( hHrtf->pOut_to_bin_diffuse_im[j] = NULL; } - return IVAS_ERR_OK; } @@ -227,7 +226,6 @@ static ivas_error ivas_rend_initCrend( return IVAS_ERR_INTERNAL_FATAL; } - if ( hSetOfHRTF == NULL ) { @@ -583,6 +581,273 @@ static ivas_error ivas_rend_initCrend( } else if ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS ) { +#ifdef UPDATE_SBA_FILTER + if ( inConfig == IVAS_REND_AUDIO_CONFIG_HOA3 ) + { + if ( output_Fs == 48000 ) + { + 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; + + for ( i = 0; i < hHrtf->max_num_ir; i++ ) + { + hHrtf->inv_diffuse_weight[i] = CRendBin_HOA3_HRIR_inv_diffuse_weight_48kHz[i]; + + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + 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]; + } + } + 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; + 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++ ) + { + 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]; + } + } + + 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; + 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]; + + 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 ( 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]; + } + } + else + { + return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" ); + } + } + else if ( inConfig == IVAS_REND_AUDIO_CONFIG_HOA2 ) + { + if ( output_Fs == 48000 ) + { + hHrtf->latency_s = CRendBin_HOA2_HRIR_latency_s; + hHrtf->max_num_iterations = CRendBin_HOA2_HRIR_max_num_iterations_48kHz; + hHrtf->index_frequency_max_diffuse = CRendBin_HOA2_HRIR_index_frequency_max_diffuse_48kHz; + + for ( i = 0; i < hHrtf->max_num_ir; i++ ) + { + hHrtf->inv_diffuse_weight[i] = CRendBin_HOA2_HRIR_inv_diffuse_weight_48kHz[i]; + + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + hHrtf->num_iterations[i][j] = CRendBin_HOA2_HRIR_num_iterations_48kHz[i][j]; + hHrtf->pIndex_frequency_max[i][j] = CRendBin_HOA2_HRIR_pIndex_frequency_max_48kHz[i][j]; + hHrtf->pOut_to_bin_re[i][j] = CRendBin_HOA2_HRIR_coeff_re_48kHz[i][j]; + hHrtf->pOut_to_bin_im[i][j] = CRendBin_HOA2_HRIR_coeff_im_48kHz[i][j]; + } + } + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + hHrtf->num_iterations_diffuse[j] = CRendBin_HOA2_HRIR_num_iterations_diffuse_48kHz[j]; + hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_48kHz[j]; + hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_HOA2_HRIR_coeff_diffuse_re_48kHz[j]; + hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_HOA2_HRIR_coeff_diffuse_im_48kHz[j]; + } + } + else if ( output_Fs == 32000 ) + { + hHrtf->latency_s = CRendBin_HOA2_HRIR_latency_s; + hHrtf->max_num_iterations = CRendBin_HOA2_HRIR_max_num_iterations_32kHz; + hHrtf->index_frequency_max_diffuse = CRendBin_HOA2_HRIR_index_frequency_max_diffuse_32kHz; + + for ( i = 0; i < hHrtf->max_num_ir; i++ ) + { + hHrtf->inv_diffuse_weight[i] = CRendBin_HOA2_HRIR_inv_diffuse_weight_32kHz[i]; + + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + hHrtf->num_iterations[i][j] = CRendBin_HOA2_HRIR_num_iterations_32kHz[i][j]; + hHrtf->pIndex_frequency_max[i][j] = CRendBin_HOA2_HRIR_pIndex_frequency_max_32kHz[i][j]; + hHrtf->pOut_to_bin_re[i][j] = CRendBin_HOA2_HRIR_coeff_re_32kHz[i][j]; + hHrtf->pOut_to_bin_im[i][j] = CRendBin_HOA2_HRIR_coeff_im_32kHz[i][j]; + } + } + + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + hHrtf->num_iterations_diffuse[j] = CRendBin_HOA2_HRIR_num_iterations_diffuse_32kHz[j]; + hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_32kHz[j]; + hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_HOA2_HRIR_coeff_diffuse_re_32kHz[j]; + hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_HOA2_HRIR_coeff_diffuse_im_32kHz[j]; + } + } + else if ( output_Fs == 16000 ) + { + hHrtf->latency_s = CRendBin_HOA2_HRIR_latency_s; + hHrtf->max_num_iterations = CRendBin_HOA2_HRIR_max_num_iterations_16kHz; + hHrtf->index_frequency_max_diffuse = CRendBin_HOA2_HRIR_index_frequency_max_diffuse_16kHz; + + for ( i = 0; i < hHrtf->max_num_ir; i++ ) + { + hHrtf->inv_diffuse_weight[i] = CRendBin_HOA2_HRIR_inv_diffuse_weight_16kHz[i]; + + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + hHrtf->num_iterations[i][j] = CRendBin_HOA2_HRIR_num_iterations_16kHz[i][j]; + hHrtf->pIndex_frequency_max[i][j] = CRendBin_HOA2_HRIR_pIndex_frequency_max_16kHz[i][j]; + hHrtf->pOut_to_bin_re[i][j] = CRendBin_HOA2_HRIR_coeff_re_16kHz[i][j]; + hHrtf->pOut_to_bin_im[i][j] = CRendBin_HOA2_HRIR_coeff_im_16kHz[i][j]; + } + } + + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + hHrtf->num_iterations_diffuse[j] = CRendBin_HOA2_HRIR_num_iterations_diffuse_16kHz[j]; + hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_16kHz[j]; + hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_HOA2_HRIR_coeff_diffuse_re_16kHz[j]; + hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_HOA2_HRIR_coeff_diffuse_im_16kHz[j]; + } + } + else + { + return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" ); + } + } + else if ( inConfig == IVAS_REND_AUDIO_CONFIG_FOA ) + { + if ( output_Fs == 48000 ) + { + hHrtf->latency_s = CRendBin_FOA_HRIR_latency_s; + hHrtf->max_num_iterations = CRendBin_FOA_HRIR_max_num_iterations_48kHz; + hHrtf->index_frequency_max_diffuse = CRendBin_FOA_HRIR_index_frequency_max_diffuse_48kHz; + + for ( i = 0; i < hHrtf->max_num_ir; i++ ) + { + hHrtf->inv_diffuse_weight[i] = CRendBin_FOA_HRIR_inv_diffuse_weight_48kHz[i]; + + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + hHrtf->num_iterations[i][j] = CRendBin_FOA_HRIR_num_iterations_48kHz[i][j]; + hHrtf->pIndex_frequency_max[i][j] = CRendBin_FOA_HRIR_pIndex_frequency_max_48kHz[i][j]; + hHrtf->pOut_to_bin_re[i][j] = CRendBin_FOA_HRIR_coeff_re_48kHz[i][j]; + hHrtf->pOut_to_bin_im[i][j] = CRendBin_FOA_HRIR_coeff_im_48kHz[i][j]; + } + } + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + hHrtf->num_iterations_diffuse[j] = CRendBin_FOA_HRIR_num_iterations_diffuse_48kHz[j]; + hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_48kHz[j]; + hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_FOA_HRIR_coeff_diffuse_re_48kHz[j]; + hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_FOA_HRIR_coeff_diffuse_im_48kHz[j]; + } + } + else if ( output_Fs == 32000 ) + { + hHrtf->latency_s = CRendBin_FOA_HRIR_latency_s; + hHrtf->max_num_iterations = CRendBin_FOA_HRIR_max_num_iterations_32kHz; + hHrtf->index_frequency_max_diffuse = CRendBin_FOA_HRIR_index_frequency_max_diffuse_32kHz; + + for ( i = 0; i < hHrtf->max_num_ir; i++ ) + { + hHrtf->inv_diffuse_weight[i] = CRendBin_FOA_HRIR_inv_diffuse_weight_32kHz[i]; + + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + hHrtf->num_iterations[i][j] = CRendBin_FOA_HRIR_num_iterations_32kHz[i][j]; + hHrtf->pIndex_frequency_max[i][j] = CRendBin_FOA_HRIR_pIndex_frequency_max_32kHz[i][j]; + hHrtf->pOut_to_bin_re[i][j] = CRendBin_FOA_HRIR_coeff_re_32kHz[i][j]; + hHrtf->pOut_to_bin_im[i][j] = CRendBin_FOA_HRIR_coeff_im_32kHz[i][j]; + } + } + + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + hHrtf->num_iterations_diffuse[j] = CRendBin_FOA_HRIR_num_iterations_diffuse_32kHz[j]; + hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_32kHz[j]; + hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_FOA_HRIR_coeff_diffuse_re_32kHz[j]; + hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_FOA_HRIR_coeff_diffuse_im_32kHz[j]; + } + } + else if ( output_Fs == 16000 ) + { + hHrtf->latency_s = CRendBin_FOA_HRIR_latency_s; + hHrtf->max_num_iterations = CRendBin_FOA_HRIR_max_num_iterations_16kHz; + hHrtf->index_frequency_max_diffuse = CRendBin_FOA_HRIR_index_frequency_max_diffuse_16kHz; + + for ( i = 0; i < hHrtf->max_num_ir; i++ ) + { + hHrtf->inv_diffuse_weight[i] = CRendBin_FOA_HRIR_inv_diffuse_weight_16kHz[i]; + + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + hHrtf->num_iterations[i][j] = CRendBin_FOA_HRIR_num_iterations_16kHz[i][j]; + hHrtf->pIndex_frequency_max[i][j] = CRendBin_FOA_HRIR_pIndex_frequency_max_16kHz[i][j]; + hHrtf->pOut_to_bin_re[i][j] = CRendBin_FOA_HRIR_coeff_re_16kHz[i][j]; + hHrtf->pOut_to_bin_im[i][j] = CRendBin_FOA_HRIR_coeff_im_16kHz[i][j]; + } + } + + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + hHrtf->num_iterations_diffuse[j] = CRendBin_FOA_HRIR_num_iterations_diffuse_16kHz[j]; + hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_16kHz[j]; + hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_FOA_HRIR_coeff_diffuse_re_16kHz[j]; + hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_FOA_HRIR_coeff_diffuse_im_16kHz[j]; + } + } + else + { + return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" ); + } + } + else + { + return IVAS_ERROR( IVAS_ERR_INVALID_INPUT_FORMAT, "Encountered unsupported input config in Crend" ); + } +#else if ( output_Fs == 48000 ) { hHrtf->latency_s = CRendBin_HOA3_HRIR_latency_s; @@ -691,6 +956,7 @@ static ivas_error ivas_rend_initCrend( { return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" ); } +#endif } else { @@ -895,7 +1161,115 @@ static ivas_error ivas_rend_initCrend( } else if ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS ) { +#ifdef UPDATE_SBA_FILTER + if ( inConfig == IVAS_REND_AUDIO_CONFIG_HOA3 ) + { + 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 ( i = 0; i < hHrtf->max_num_ir; i++ ) + { + hHrtf->inv_diffuse_weight[i] = hSetOfHRTF->hHRTF_hrir_hoa3->inv_diffuse_weight[i]; +#ifdef USE_SYMETRIC_HRIR_FILTERS + for ( j = 0; j < nb_ear; j++ ) +#else + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) +#endif + { + 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]; + } + } +#ifdef USE_SYMETRIC_HRIR_FILTERS + for ( j = 0; j < nb_ear; j++ ) +#else + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) +#endif + { + 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 if ( inConfig == IVAS_REND_AUDIO_CONFIG_HOA2 ) + { + hHrtf->latency_s = hSetOfHRTF->hHRTF_hrir_hoa2->latency_s; + hHrtf->max_num_iterations = hSetOfHRTF->hHRTF_hrir_hoa2->max_num_iterations; + hHrtf->index_frequency_max_diffuse = hSetOfHRTF->hHRTF_hrir_hoa2->index_frequency_max_diffuse; + + for ( i = 0; i < hHrtf->max_num_ir; i++ ) + { + hHrtf->inv_diffuse_weight[i] = hSetOfHRTF->hHRTF_hrir_hoa2->inv_diffuse_weight[i]; + +#ifdef USE_SYMETRIC_HRIR_FILTERS + for ( j = 0; j < nb_ear; j++ ) +#else + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) +#endif + { + hHrtf->num_iterations[i][j] = hSetOfHRTF->hHRTF_hrir_hoa2->num_iterations[i][j]; + hHrtf->pIndex_frequency_max[i][j] = hSetOfHRTF->hHRTF_hrir_hoa2->pIndex_frequency_max[i][j]; + hHrtf->pOut_to_bin_re[i][j] = hSetOfHRTF->hHRTF_hrir_hoa2->pOut_to_bin_re[i][j]; + hHrtf->pOut_to_bin_im[i][j] = hSetOfHRTF->hHRTF_hrir_hoa2->pOut_to_bin_im[i][j]; + } + } +#ifdef USE_SYMETRIC_HRIR_FILTERS + for ( j = 0; j < nb_ear; j++ ) +#else + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) +#endif + { + hHrtf->num_iterations_diffuse[j] = hSetOfHRTF->hHRTF_hrir_hoa2->num_iterations_diffuse[j]; + hHrtf->pIndex_frequency_max_diffuse[j] = hSetOfHRTF->hHRTF_hrir_hoa2->pIndex_frequency_max_diffuse[j]; + hHrtf->pOut_to_bin_diffuse_re[j] = hSetOfHRTF->hHRTF_hrir_hoa2->pOut_to_bin_diffuse_re[j]; + hHrtf->pOut_to_bin_diffuse_im[j] = hSetOfHRTF->hHRTF_hrir_hoa2->pOut_to_bin_diffuse_im[j]; + } + } + else if ( inConfig == IVAS_REND_AUDIO_CONFIG_FOA ) + { + hHrtf->latency_s = hSetOfHRTF->hHRTF_hrir_foa->latency_s; + hHrtf->max_num_iterations = hSetOfHRTF->hHRTF_hrir_foa->max_num_iterations; + hHrtf->index_frequency_max_diffuse = hSetOfHRTF->hHRTF_hrir_foa->index_frequency_max_diffuse; + + for ( i = 0; i < hHrtf->max_num_ir; i++ ) + { + hHrtf->inv_diffuse_weight[i] = hSetOfHRTF->hHRTF_hrir_foa->inv_diffuse_weight[i]; + +#ifdef USE_SYMETRIC_HRIR_FILTERS + for ( j = 0; j < nb_ear; j++ ) +#else + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) +#endif + { + hHrtf->num_iterations[i][j] = hSetOfHRTF->hHRTF_hrir_foa->num_iterations[i][j]; + hHrtf->pIndex_frequency_max[i][j] = hSetOfHRTF->hHRTF_hrir_foa->pIndex_frequency_max[i][j]; + hHrtf->pOut_to_bin_re[i][j] = hSetOfHRTF->hHRTF_hrir_foa->pOut_to_bin_re[i][j]; + hHrtf->pOut_to_bin_im[i][j] = hSetOfHRTF->hHRTF_hrir_foa->pOut_to_bin_im[i][j]; + } + } +#ifdef USE_SYMETRIC_HRIR_FILTERS + for ( j = 0; j < nb_ear; j++ ) +#else + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) +#endif + { + hHrtf->num_iterations_diffuse[j] = hSetOfHRTF->hHRTF_hrir_foa->num_iterations_diffuse[j]; + hHrtf->pIndex_frequency_max_diffuse[j] = hSetOfHRTF->hHRTF_hrir_foa->pIndex_frequency_max_diffuse[j]; + hHrtf->pOut_to_bin_diffuse_re[j] = hSetOfHRTF->hHRTF_hrir_foa->pOut_to_bin_diffuse_re[j]; + hHrtf->pOut_to_bin_diffuse_im[j] = hSetOfHRTF->hHRTF_hrir_foa->pOut_to_bin_diffuse_im[j]; + } + } + else + { + return IVAS_ERROR( IVAS_ERR_INTERNAL, "Unsupported renderer type in Crend" ); + } + } +#else 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; @@ -932,6 +1306,7 @@ static ivas_error ivas_rend_initCrend( { return IVAS_ERROR( IVAS_ERR_INTERNAL, "Unsupported renderer type in Crend" ); } +#endif } pCrend->hHrtfCrend = hHrtf; @@ -1474,8 +1849,13 @@ static ivas_error ivas_rend_crendConvolver( const CREND_WRAPPER *pCrend, IVAS_REND_AudioConfig inConfig, IVAS_REND_AudioConfig outConfig, +#ifdef JBM_TSM_ON_TCS + float *pcm_in[], + float *pcm_out[], +#else float pcm_in[][L_FRAME48k], float pcm_out[][L_FRAME48k], +#endif const int32_t output_Fs, const int16_t i_ts ) { @@ -1484,9 +1864,17 @@ static ivas_error ivas_rend_crendConvolver( int16_t lfe_idx_in; int16_t offset, offset_in, offset_diffuse; int16_t nchan_in, nchan_out; +#ifdef UPDATE_SBA_FILTER + const float *pIn; +#else float *pIn; +#endif float *pFreq_buf_re, *pFreq_buf_im; +#ifdef UPDATE_SBA_FILTER + const float *pFreq_filt_re, *pFreq_filt_im; +#else float *pFreq_filt_re, *pFreq_filt_im; +#endif float pOut[L_FRAME48k * 2]; float tmp_out_re[L_FRAME48k], tmp_out_im[L_FRAME48k]; ivas_error error; @@ -1640,12 +2028,19 @@ ivas_error ivas_rend_crendProcess( HEAD_TRACK_DATA_HANDLE hHeadTrackData, IVAS_OUTPUT_SETUP_HANDLE hIntSetup, EFAP_HANDLE hEFAPdata, +#ifdef JBM_TSM_ON_TCS + float *output[], /* i/o: input/output audio channels */ +#else float output[][L_FRAME48k], /* i/o: input/output audio channels */ +#endif const int32_t output_Fs ) { int16_t i, subframe_idx, output_frame, subframe_len; int16_t nchan_out; float pcm_tmp[BINAURAL_CHANNELS][L_FRAME48k]; +#ifdef JBM_TSM_ON_TCS + float *p_pcm_tmp[BINAURAL_CHANNELS]; +#endif AUDIO_CONFIG in_config; IVAS_REND_AudioConfigType inConfigType; ivas_error error; @@ -1668,6 +2063,12 @@ ivas_error ivas_rend_crendProcess( output_frame = (int16_t) ( output_Fs / FRAMES_PER_SEC ); subframe_len = output_frame / MAX_PARAM_SPATIAL_SUBFRAMES; +#ifdef JBM_TSM_ON_TCS + for ( i = 0; i < BINAURAL_CHANNELS; i++ ) + { + p_pcm_tmp[i] = pcm_tmp[i]; + } +#endif for ( subframe_idx = 0; subframe_idx < MAX_PARAM_SPATIAL_SUBFRAMES; subframe_idx++ ) { if ( hDecoderConfig && hDecoderConfig->Opt_Headrotation && hHeadTrackData && hHeadTrackData->num_quaternions >= 0 ) @@ -1691,14 +2092,22 @@ ivas_error ivas_rend_crendProcess( if ( ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) || ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS ) ) { +#ifdef JBM_TSM_ON_TCS + if ( ( error = ivas_rend_crendConvolver( pCrend, inRendConfig, outRendConfig, output, p_pcm_tmp, output_Fs, subframe_idx ) ) != IVAS_ERR_OK ) +#else if ( ( error = ivas_rend_crendConvolver( pCrend, inRendConfig, outRendConfig, output, pcm_tmp, output_Fs, subframe_idx ) ) != IVAS_ERR_OK ) +#endif { return error; } if ( pCrend->hCrend->hReverb != NULL ) { +#ifdef JBM_TSM_ON_TCS + if ( ( error = ivas_reverb_process( pCrend->hCrend->hReverb, in_config, 1, output, p_pcm_tmp, subframe_idx ) ) != IVAS_ERR_OK ) +#else if ( ( error = ivas_reverb_process( pCrend->hCrend->hReverb, in_config, 1, output, pcm_tmp, subframe_idx ) ) != IVAS_ERR_OK ) +#endif { return error; } @@ -1720,3 +2129,130 @@ ivas_error ivas_rend_crendProcess( return IVAS_ERR_OK; } + +#ifdef JBM_TSM_ON_TCS +ivas_error ivas_rend_crendProcessSubframe( + 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, + DECODER_TC_BUFFER_HANDLE hTcBuffer, + float *input_f[], + float *output[], /* i/o: input/output audio channels */ + const int16_t n_samples_to_render, + const int32_t output_Fs ) +{ + int16_t subframe_idx, subframe_len; + int16_t nchan_out, nchan_in, ch, first_sf, last_sf, slot_size, slots_to_render; + float *tc_local[MAX_TRANSPORT_CHANNELS]; + float pcm_tmp[BINAURAL_CHANNELS][L_FRAME48k]; + float *p_pcm_tmp[BINAURAL_CHANNELS]; + AUDIO_CONFIG in_config; + IVAS_REND_AudioConfigType inConfigType; + ivas_error error; + IVAS_REND_AudioConfig inRendConfig; + IVAS_REND_AudioConfig outRendConfig; + + push_wmops( "ivas_rend_crendProcessSubframe" ); + + inRendConfig = getRendAudioConfigFromIvasAudioConfig( inConfig ); + outRendConfig = getRendAudioConfigFromIvasAudioConfig( outConfig ); + + in_config = getIvasAudioConfigFromRendAudioConfig( inRendConfig ); + inConfigType = getAudioConfigType( inRendConfig ); + if ( ( error = getAudioConfigNumChannels( outRendConfig, &nchan_out ) ) != IVAS_ERR_OK ) + { + return error; + } + if ( ( error = getAudioConfigNumChannels( inRendConfig, &nchan_in ) ) != IVAS_ERR_OK ) + { + return error; + } + + for ( ch = 0; ch < nchan_in; ch++ ) + { + tc_local[ch] = input_f[ch]; + } + for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) + { + p_pcm_tmp[ch] = pcm_tmp[ch]; + } + + slot_size = hTcBuffer->n_samples_granularity; + /* loop for synthesis, assume we always have to render in multiples of 5ms subframes with spills */ + slots_to_render = min( hTcBuffer->num_slots - hTcBuffer->slots_rendered, n_samples_to_render / slot_size ); + first_sf = hTcBuffer->subframes_rendered; + last_sf = first_sf; + hTcBuffer->slots_rendered += slots_to_render; + while ( slots_to_render > 0 ) + { + slots_to_render -= hTcBuffer->subframe_nbslots[last_sf]; + last_sf++; + } + + for ( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ ) + { + subframe_len = hTcBuffer->subframe_nbslots[subframe_idx] * hTcBuffer->n_samples_granularity; + if ( hDecoderConfig && hDecoderConfig->Opt_Headrotation && hHeadTrackData && hHeadTrackData->num_quaternions >= 0 ) + { + + /* 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, tc_local, subframe_len, *hIntSetup, 0 ); + } + /* Rotation in SD for MC -> BINAURAL_ROOM */ + else if ( ( hIntSetup != NULL ) && hIntSetup->is_loudspeaker_setup ) + { + rotateFrame_sd( hHeadTrackData, tc_local, subframe_len, *hIntSetup, hEFAPdata, 0 ); + } + } + + if ( ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) || ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS ) ) + { + if ( ( error = ivas_rend_crendConvolver( pCrend, inRendConfig, outRendConfig, tc_local, p_pcm_tmp, output_Fs, 0 ) ) != IVAS_ERR_OK ) + { + return error; + } + + if ( pCrend->hCrend->hReverb != NULL ) + { + if ( ( error = ivas_reverb_process( pCrend->hCrend->hReverb, in_config, 1, tc_local, p_pcm_tmp, 0 ) ) != IVAS_ERR_OK ) + { + return error; + } + } + for ( ch = 0; ch < nchan_in; ch++ ) + { + tc_local[ch] += subframe_len; + } + for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) + { + p_pcm_tmp[ch] += subframe_len; + } + } + else + { + return IVAS_ERR_INVALID_INPUT_FORMAT; + } + } + + /* move to output */ + for ( ch = 0; ch < nchan_out; ch++ ) + { + mvr2r( pcm_tmp[ch], output[ch], n_samples_to_render ); + } + + + hTcBuffer->subframes_rendered = last_sf; + pop_wmops(); + + return IVAS_ERR_OK; +} +#endif diff --git a/lib_rend/ivas_dirac_dec_binaural_functions.c b/lib_rend/ivas_dirac_dec_binaural_functions.c index 09704b969e21ba1cd443e6ed929fffcf6b459b9f..f19e0dbf1a4657f63f4961b27c21c6a6d10dbc47 100644 --- a/lib_rend/ivas_dirac_dec_binaural_functions.c +++ b/lib_rend/ivas_dirac_dec_binaural_functions.c @@ -40,9 +40,7 @@ #include "ivas_cnst.h" #include "ivas_rom_binauralRenderer.h" #include "ivas_rom_rend.h" -#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS #include "ivas_rom_com.h" -#endif #ifdef DEBUGGING #include "debug.h" @@ -58,39 +56,43 @@ #define IVAS_TDET_DUCK_MULT_FAC_PARA_BIN ( 2.0f ) #define IVAS_TDET_DUCK_MULT_FAC_PARA_BIN_LOW_BR ( 3.0f ) -#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS -#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS_OPT /* powf(0.95f, 4.0f) for sub-frame smoothing instead of CLDFB slot */ #define ADAPT_HTPROTO_IIR_FAC 0.81450625f -#else -#define ADAPT_HTPROTO_IIR_FAC 0.95f -#endif #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 -#endif /*------------------------------------------------------------------------- * Local function prototypes *------------------------------------------------------------------------*/ -static void ivas_dirac_dec_binaural_internal( Decoder_Struct *st_ivas, float output_f[][L_FRAME48k], const int16_t nchan_transport, const uint8_t firstSubframe, const uint8_t nSubframes ); - -static void ivas_dirac_dec_decorrelate_slot( DIRAC_DEC_HANDLE hDirAC, const int8_t slot, float inRe[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float decRe[][CLDFB_NO_CHANNELS_MAX], float decIm[][CLDFB_NO_CHANNELS_MAX] ); +#ifdef JBM_TSM_ON_TCS +static void ivas_dirac_dec_binaural_internal( Decoder_Struct *st_ivas, float *output_f[], const int16_t nchan_transport, const int16_t subframe ); +#else +static void ivas_dirac_dec_binaural_internal( Decoder_Struct *st_ivas, float output_f[][L_FRAME48k], const int16_t nchan_transport, const int16_t subframe ); +#endif +static void ivas_dirac_dec_decorrelate_slot( DIRAC_DEC_HANDLE hDirAC, const int16_t slot, float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float decRe[][CLDFB_NO_CHANNELS_MAX], float decIm[][CLDFB_NO_CHANNELS_MAX] ); -static void ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matrices( Decoder_Struct *st_ivas, float inRe[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float Rmat[3][3], const uint8_t firstSubframe, const uint8_t nSubFrames ); +static void ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matrices( Decoder_Struct *st_ivas, float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float Rmat[3][3], const int16_t subframe ); static void ivas_dirac_dec_binaural_determine_processing_matrices( Decoder_Struct *st_ivas, const int16_t max_band_decorr, float Rmat[3][3] ); -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 ); +#ifdef JBM_TSM_ON_TCS +static void ivas_dirac_dec_binaural_process_output( Decoder_Struct *st_ivas, float *output_f[], float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], const int16_t max_band_decorr, const int16_t numInChannels, const int16_t subframe ); + +static void adaptTransportSignalsHeadtracked( HEAD_TRACK_DATA_HANDLE hHeadTrackData, float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], const int16_t nBins, const int16_t nSlots, float Rmat[3][3] ); + +static void ivas_dirac_dec_binaural_check_and_switch_transports_headtracked( HEAD_TRACK_DATA_HANDLE hHeadTrackData, float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], const int16_t nBins, const int16_t nSlots, float Rmat[3][3] ); +#else +static void ivas_dirac_dec_binaural_process_output( Decoder_Struct *st_ivas, float output_f[][L_FRAME48k], float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], const int16_t max_band_decorr, const int16_t numInChannels, const int16_t subframe ); + +static void adaptTransportSignalsHeadtracked( HEAD_TRACK_DATA_HANDLE hHeadTrackData, float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], const int16_t nBins, float Rmat[3][3] ); -#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS -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 inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], const int16_t nBins, float Rmat[3][3] ); #endif -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 ); @@ -102,10 +104,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] ); -#ifdef NOKIA_PARAMBIN_REQULARIZATION -static float configure_reqularization_factor( const IVAS_FORMAT ivas_format, const int32_t ivas_brate ); -#endif +#ifdef JBM_TSM_ON_TCS +#endif /*------------------------------------------------------------------------- * ivas_dirac_dec_init_binaural_data() * @@ -164,30 +165,6 @@ ivas_error ivas_dirac_dec_init_binaural_data( set_zero( hBinaural->ChCrossImOutPrev, nBins ); hBinaural->renderStereoOutputInsteadOfBinaural = 0; - hBinaural->useSubframeMode = 1; - - hBinaural->useTdDecorr = 0; - if ( st_ivas->ivas_format == SBA_FORMAT ) - { - if ( st_ivas->nchan_transport == 1 ) - { - hBinaural->useTdDecorr = 1; - } - } - else if ( st_ivas->ivas_format == MASA_FORMAT ) - { - if ( ( st_ivas->hDecoderConfig->ivas_total_brate < IVAS_48k && st_ivas->nchan_transport == 1 ) || st_ivas->hDecoderConfig->ivas_total_brate < MASA_STEREO_MIN_BITRATE ) - { - hBinaural->useTdDecorr = 1; - } - } - else if ( st_ivas->ivas_format == MC_FORMAT ) - { - if ( ( st_ivas->hDecoderConfig->ivas_total_brate < IVAS_48k && st_ivas->nchan_transport == 1 ) ) - { - hBinaural->useTdDecorr = 1; - } - } for ( bin = 0; bin < nBins; bin++ ) { @@ -215,42 +192,23 @@ ivas_error ivas_dirac_dec_init_binaural_data( /* 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 ) || - ( !hBinaural->useSubframeMode && hBinaural->hReverb->blockSize != CLDFB_NO_COL_MAX ) ) ) + ( hBinaural->hReverb->blockSize != CLDFB_SLOTS_PER_SUBFRAME ) ) ) { ivas_binaural_reverb_close( &( hBinaural->hReverb ) ); } if ( hBinaural->hReverb == NULL ) { - 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, - 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 / 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 ) { - 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; - } + return error; } } } @@ -265,40 +223,35 @@ ivas_error ivas_dirac_dec_init_binaural_data( assert( false ); } - if ( hBinaural->useTdDecorr ) + if ( hBinaural->hTdDecorr == NULL ) { - if ( st_ivas->hDecoderConfig->ivas_total_brate >= IVAS_13k2 && st_ivas->ivas_format == SBA_FORMAT ) - { - if ( hBinaural->hTdDecorr == NULL ) - { - ivas_td_decorr_dec_open( &( hBinaural->hTdDecorr ), output_Fs, 3, 1 ); - } - - if ( st_ivas->hDecoderConfig->ivas_total_brate < IVAS_24k4 ) - { - hBinaural->hTdDecorr->pTrans_det->duck_mult_fac = IVAS_TDET_DUCK_MULT_FAC_PARA_BIN_LOW_BR; - } - else - { - hBinaural->hTdDecorr->pTrans_det->duck_mult_fac = IVAS_TDET_DUCK_MULT_FAC_PARA_BIN; - } - } - else - { - ivas_td_decorr_dec_open( &( hBinaural->hTdDecorr ), output_Fs, 3, 0 ); - } + hBinaural->useTdDecorr = 0; } - else + + 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 ) { - ivas_td_decorr_dec_close( &( hBinaural->hTdDecorr ) ); + return error; } -#ifdef NOKIA_PARAMBIN_REQULARIZATION hBinaural->reqularizationFactor = configure_reqularization_factor( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate ); -#endif st_ivas->hDiracDecBin = hBinaural; +#ifdef JBM_TSM_ON_TCS + /* allocate transport channels*/ + if ( st_ivas->hDecoderConfig->voip_active == 1 && st_ivas->hTcBuffer == NULL ) + { + int16_t nchan_to_allocate; + + nchan_to_allocate = 2 * BINAURAL_CHANNELS; + if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, ivas_jbm_dec_get_num_tc_channels( st_ivas ), nchan_to_allocate, nchan_to_allocate, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK ) + { + return error; + } + } + +#endif /* JBM_TMS_ON_TCS*/ + return IVAS_ERR_OK; } @@ -377,6 +330,64 @@ ivas_error ivas_dirac_dec_binaural_copy_hrtfs( return IVAS_ERR_OK; } +#ifdef JBM_TSM_ON_TCS +void ivas_dirac_dec_binaural_render( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + const uint16_t nSamplesAsked, /* i : number of CLDFB slots requested */ + uint16_t *nSamplesRendered, /* o : number of CLDFB slots rendered */ + uint16_t *nSamplesAvailable, /* o : number of CLDFB slots still to render */ + const int16_t nchan_transport, + float *output_f[] /* o : rendered time signal */ +) +{ + int16_t slots_to_render, first_sf, last_sf, subframe_idx; + uint16_t slot_size, ch; + uint16_t nchan_out; + DIRAC_DEC_HANDLE hDirAC; + float *output_f_local[MAX_OUTPUT_CHANNELS]; + + hDirAC = st_ivas->hDirAC; + nchan_out = BINAURAL_CHANNELS; +#ifdef DEBUGGING + assert( hDirAC ); +#endif + for ( ch = 0; ch < nchan_out; ch++ ) + { + output_f_local[ch] = output_f[ch]; + } + slot_size = NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ); + /* loop for synthesis, assume we always have to render in multiples of 5ms subframes with spills */ + slots_to_render = min( hDirAC->num_slots - hDirAC->slots_rendered, nSamplesAsked / slot_size ); + *nSamplesRendered = slots_to_render * slot_size; + first_sf = hDirAC->subframes_rendered; + last_sf = first_sf; + while ( slots_to_render > 0 ) + { + slots_to_render -= hDirAC->subframe_nbslots[last_sf]; + last_sf++; + } +#ifdef DEBUGGING + assert( slots_to_render == 0 ); +#endif + for ( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ ) + { + int16_t n_samples_sf = slot_size * hDirAC->subframe_nbslots[subframe_idx]; + ivas_dirac_dec_binaural_internal( st_ivas, output_f_local, nchan_transport, subframe_idx ); + for ( ch = 0; ch < nchan_out; ch++ ) + { + output_f_local[ch] += n_samples_sf; + } + } + if ( hDirAC->slots_rendered == hDirAC->num_slots ) + { + st_ivas->hDirAC->dirac_read_idx = ( st_ivas->hDirAC->dirac_read_idx + DEFAULT_JBM_SUBFRAMES_5MS ) % st_ivas->hDirAC->dirac_md_buffer_length; + } + *nSamplesAvailable = ( hDirAC->num_slots - hDirAC->slots_rendered ) * slot_size; + + return; +} +#endif + /*------------------------------------------------------------------------- * ivas_dirac_dec_binaural() * @@ -389,34 +400,90 @@ void ivas_dirac_dec_binaural( const int16_t nchan_transport /* i : number of transport channels */ ) { + int16_t subframe; +#ifdef JBM_TSM_ON_TCS + float cng_td_buffer[L_FRAME16k]; + float *p_output[MAX_OUTPUT_CHANNELS]; + int16_t ch; + int16_t slot_size; + int16_t numInChannels; + + slot_size = NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ); + for ( ch = 0; ch < 2 * BINAURAL_CHANNELS; ch++ ) + { + p_output[ch] = &output_f[ch][0]; + } + numInChannels = nchan_transport; + if ( st_ivas->hOutSetup.separateChannelEnabled ) + { + numInChannels++; + } + for ( ch = 0; ch < numInChannels; ch++ ) + { + st_ivas->hTcBuffer->tc[ch] = &output_f[ch][0]; + } + + ivas_dirac_dec_set_md_map( st_ivas, DEFAULT_JBM_CLDFB_TIMESLOTS ); + if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR ) + { + ivas_spar_dec_set_render_map( st_ivas, DEFAULT_JBM_CLDFB_TIMESLOTS ); + } + +#endif + if ( st_ivas->hDiracDecBin->useTdDecorr ) { float *decorr_signal[BINAURAL_CHANNELS]; +#ifndef JBM_TSM_ON_TCS int16_t ch; +#endif int16_t output_frame; for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) { decorr_signal[ch] = (float *) &( output_f[ch + BINAURAL_CHANNELS][0] ); +#ifdef JBM_TSM_ON_TCS + st_ivas->hTcBuffer->tc[ch + BINAURAL_CHANNELS] = decorr_signal[ch]; +#endif } output_frame = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC ); - +#ifdef JBM_TSM_ON_TCS + { + ivas_td_decorr_process( st_ivas->hDiracDecBin->hTdDecorr, p_output, decorr_signal, output_frame ); + } +#else ivas_td_decorr_process( st_ivas->hDiracDecBin->hTdDecorr, output_f, decorr_signal, output_frame ); +#endif + } +#ifdef JBM_TSM_ON_TCS + if ( nchan_transport == 1 && st_ivas->nchan_transport != 2 && st_ivas->hSCE[0]->hCoreCoder[0] != NULL && st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag ) + { + Decoder_State *st = st_ivas->hSCE[0]->hCoreCoder[0]; + st_ivas->hTcBuffer->tc[nchan_transport] = &cng_td_buffer[0]; + generate_masking_noise_lb_dirac( st->hFdCngDec->hFdCngCom, st_ivas->hTcBuffer->tc[nchan_transport], DEFAULT_JBM_CLDFB_TIMESLOTS, st->cna_dirac_flag && st->flag_cna ); } +#endif - if ( st_ivas->hDiracDecBin->useSubframeMode ) + for ( subframe = 0; subframe < MAX_PARAM_SPATIAL_SUBFRAMES; subframe++ ) { - uint8_t subframe; - for ( subframe = 0; subframe < MAX_PARAM_SPATIAL_SUBFRAMES; subframe++ ) +#ifdef JBM_TSM_ON_TCS + int16_t n_samples_sf = slot_size * st_ivas->hDirAC->subframe_nbslots[subframe]; + ivas_dirac_dec_binaural_internal( st_ivas, p_output, nchan_transport, subframe ); + for ( ch = 0; ch < 2 * BINAURAL_CHANNELS; ch++ ) { - ivas_dirac_dec_binaural_internal( st_ivas, output_f, nchan_transport, subframe, 1u ); + p_output[ch] += n_samples_sf; } + st_ivas->hDirAC->dirac_read_idx = ( st_ivas->hDirAC->dirac_read_idx + 1 ) % st_ivas->hDirAC->dirac_md_buffer_length; +#else + ivas_dirac_dec_binaural_internal( st_ivas, output_f, nchan_transport, subframe ); +#endif } - else +#ifdef JBM_TSM_ON_TCS + for ( ch = 0; ch < 2 * BINAURAL_CHANNELS; ch++ ) { - ivas_dirac_dec_binaural_internal( st_ivas, output_f, nchan_transport, 0u, (uint8_t) MAX_PARAM_SPATIAL_SUBFRAMES ); + st_ivas->hTcBuffer->tc[ch] = NULL; } - +#endif return; } @@ -424,28 +491,35 @@ void ivas_dirac_dec_binaural( /*------------------------------------------------------------------------- * Local functions *------------------------------------------------------------------------*/ +#ifdef JBM_TSM_ON_TCS +#endif static void ivas_dirac_dec_binaural_internal( Decoder_Struct *st_ivas, +#ifdef JBM_TSM_ON_TCS + float *output_f[], +#else float output_f[][L_FRAME48k], +#endif const int16_t nchan_transport, - const uint8_t firstSubframe, - const uint8_t nSubframes ) + const int16_t subframe ) { DIRAC_DEC_HANDLE hDirAC; - uint8_t slot, ch, nBins, numInChannels; - float Cldfb_RealBuffer_in[4][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; - float Cldfb_ImagBuffer_in[4][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; + int16_t slot, ch, numInChannels; + float Cldfb_RealBuffer_in[4][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX]; + float Cldfb_ImagBuffer_in[4][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX]; float Rmat[3][3]; - uint8_t firstSlot, slotEnd; int16_t max_band_decorr; DIFFUSE_DISTRIBUTION_DATA diffuseDistData; - - firstSlot = firstSubframe * ( CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES ); - slotEnd = ( firstSubframe + nSubframes ) * ( CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES ); + int16_t nBins, offsetSamples; hDirAC = st_ivas->hDirAC; - nBins = (uint8_t) hDirAC->num_freq_bands; + nBins = hDirAC->num_freq_bands; +#ifdef JBM_TSM_ON_TCS + offsetSamples = hDirAC->slots_rendered * nBins; +#else + offsetSamples = subframe * CLDFB_SLOTS_PER_SUBFRAME * nBins; +#endif /* The input channel number at this processing function (not nchan_transport) */ numInChannels = BINAURAL_CHANNELS; @@ -467,16 +541,25 @@ static void ivas_dirac_dec_binaural_internal( Rmat[2][2] = 1.0f; /* CLDFB Analysis of input */ - for ( slot = firstSlot; slot < slotEnd; slot++ ) +#ifdef JBM_TSM_ON_TCS + for ( slot = 0; slot < hDirAC->subframe_nbslots[subframe]; slot++ ) +#else + for ( slot = 0; slot < CLDFB_SLOTS_PER_SUBFRAME; slot++ ) +#endif { for ( ch = 0; ch < numInChannels; ch++ ) { if ( ch == 0 || nchan_transport == 2 ) { - cldfbAnalysis_ts( &( output_f[ch][nBins * slot] ), - Cldfb_RealBuffer_in[ch][slot], - Cldfb_ImagBuffer_in[ch][slot], - nBins, st_ivas->cldfbAnaDec[ch] ); + cldfbAnalysis_ts( +#ifdef JBM_TSM_ON_TCS + &( st_ivas->hTcBuffer->tc[ch][nBins * slot + offsetSamples] ), +#else + &( output_f[ch][nBins * slot + offsetSamples] ), +#endif + Cldfb_RealBuffer_in[ch][slot], + Cldfb_ImagBuffer_in[ch][slot], + nBins, st_ivas->cldfbAnaDec[ch] ); } else if ( st_ivas->nchan_transport == 2 ) /* Stereo signal transmitted as mono with DFT stereo */ { @@ -490,14 +573,24 @@ static void ivas_dirac_dec_binaural_internal( if ( st_ivas->hSCE[0]->hCoreCoder[0] != NULL && st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag ) { int16_t numCoreBands, b; + int16_t slotInFrame; numCoreBands = st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->numCoreBands; +#ifdef JBM_TSM_ON_TCS + slotInFrame = hDirAC->slots_rendered + slot; +#else + slotInFrame = subframe * CLDFB_SLOTS_PER_SUBFRAME + slot; +#endif generate_masking_noise_dirac( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom, st_ivas->cldfbAnaDec[1], +#ifdef JBM_TSM_ON_TCS + st_ivas->hTcBuffer->tc[nchan_transport], +#else &( output_f[1][L_FRAME48k - L_FRAME16k] ), /*used as temporary static buffer for the whole frame*/ +#endif Cldfb_RealBuffer_in[2][slot], Cldfb_ImagBuffer_in[2][slot], - slot, + slotInFrame, st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag && st_ivas->hSCE[0]->hCoreCoder[0]->flag_cna, ( st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == FRAME_NO_DATA || st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == SID_2k40 ) && ( st_ivas->hSCE[0]->hCoreCoder[0]->cng_type == FD_CNG ) && st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag ); @@ -505,7 +598,7 @@ static void ivas_dirac_dec_binaural_internal( st_ivas->cldfbAnaDec[1], /*nothing will be analyzed, just get cnst*/ NULL, Cldfb_RealBuffer_in[1][slot], Cldfb_ImagBuffer_in[1][slot], - slot, + slotInFrame, st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag && st_ivas->hSCE[0]->hCoreCoder[0]->flag_cna, ( st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == FRAME_NO_DATA || st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == SID_2k40 ) && ( st_ivas->hSCE[0]->hCoreCoder[0]->cng_type == FD_CNG ) && st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag ); @@ -547,10 +640,15 @@ static void ivas_dirac_dec_binaural_internal( { for ( ch = BINAURAL_CHANNELS; ch < ( 2 * BINAURAL_CHANNELS ); ch++ ) { - cldfbAnalysis_ts( &( output_f[ch][nBins * slot] ), - Cldfb_RealBuffer_in[ch][slot], - Cldfb_ImagBuffer_in[ch][slot], - nBins, st_ivas->cldfbAnaDec[ch] ); + cldfbAnalysis_ts( +#ifdef JBM_TSM_ON_TCS + &( st_ivas->hTcBuffer->tc[ch][nBins * slot + offsetSamples] ), +#else + &( output_f[ch][nBins * slot + offsetSamples] ), +#endif + Cldfb_RealBuffer_in[ch][slot], + Cldfb_ImagBuffer_in[ch][slot], + nBins, st_ivas->cldfbAnaDec[ch] ); if ( st_ivas->nchan_transport == 1 && st_ivas->ivas_format == SBA_FORMAT ) { @@ -565,26 +663,30 @@ static void ivas_dirac_dec_binaural_internal( { st_ivas->hDirAC->hDiffuseDist = &diffuseDistData; - ivas_spar_param_to_masa_param_mapping( st_ivas, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, firstSubframe, nSubframes ); + ivas_spar_param_to_masa_param_mapping( st_ivas, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, subframe ); - ivas_sba_prototype_renderer( st_ivas, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, firstSubframe, nSubframes ); + ivas_sba_prototype_renderer( st_ivas, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, subframe ); } if ( st_ivas->hHeadTrackData && st_ivas->hHeadTrackData->num_quaternions >= 0 ) { - QuatToRotMat( st_ivas->hHeadTrackData->Quaternions[firstSubframe], Rmat ); + QuatToRotMat( st_ivas->hHeadTrackData->Quaternions[subframe], Rmat ); if ( nchan_transport == 2 ) { -#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS - adaptTransportSignalsHeadtracked( st_ivas->hHeadTrackData, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, firstSlot, slotEnd, nBins, Rmat ); -#endif +#ifdef JBM_TSM_ON_TCS + adaptTransportSignalsHeadtracked( st_ivas->hHeadTrackData, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, nBins, hDirAC->subframe_nbslots[subframe], Rmat ); + + ivas_dirac_dec_binaural_check_and_switch_transports_headtracked( st_ivas->hHeadTrackData, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, nBins, hDirAC->subframe_nbslots[subframe], Rmat ); +#else + adaptTransportSignalsHeadtracked( st_ivas->hHeadTrackData, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, nBins, Rmat ); - ivas_dirac_dec_binaural_check_and_switch_transports_headtracked( st_ivas->hHeadTrackData, Cldfb_ImagBuffer_in, Cldfb_RealBuffer_in, firstSlot, slotEnd, nBins, Rmat ); + ivas_dirac_dec_binaural_check_and_switch_transports_headtracked( st_ivas->hHeadTrackData, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, nBins, Rmat ); +#endif } } - ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matrices( st_ivas, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, Rmat, firstSubframe, nSubframes ); + ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matrices( st_ivas, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, Rmat, subframe ); if ( st_ivas->ivas_format == ISM_FORMAT ) { @@ -601,19 +703,27 @@ static void ivas_dirac_dec_binaural_internal( ivas_dirac_dec_binaural_determine_processing_matrices( st_ivas, max_band_decorr, Rmat ); - ivas_dirac_dec_binaural_process_output( st_ivas, output_f, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, max_band_decorr, numInChannels, firstSlot, slotEnd ); + ivas_dirac_dec_binaural_process_output( st_ivas, output_f, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, max_band_decorr, numInChannels, subframe ); st_ivas->hDirAC->hDiffuseDist = NULL; + +#ifdef JBM_TSM_ON_TCS + hDirAC->slots_rendered += hDirAC->subframe_nbslots[subframe]; + hDirAC->subframes_rendered++; +#else + hDirAC->dirac_read_idx = ( hDirAC->dirac_read_idx + 1 ) % hDirAC->dirac_md_buffer_length; +#endif + return; } static void ivas_dirac_dec_decorrelate_slot( DIRAC_DEC_HANDLE hDirAC, - const int8_t slot, - float inRe[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + const int16_t slot, + float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], + float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float decRe[][CLDFB_NO_CHANNELS_MAX], float decIm[][CLDFB_NO_CHANNELS_MAX] ) { @@ -660,16 +770,18 @@ static void ivas_dirac_dec_decorrelate_slot( return; } +#ifdef JBM_TSM_ON_TCS +#endif + static void ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matrices( Decoder_Struct *st_ivas, - float inRe[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], + float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float Rmat[3][3], - const uint8_t firstSubframe, - const uint8_t nSubframes ) + const int16_t subframe ) { - uint8_t ch, slot, bin, subframe; + int16_t ch, slot, bin; uint8_t separateCenterChannelRendering; int16_t nBins, idx; float frameMeanDiffusenessEneWeight[CLDFB_NO_CHANNELS_MAX]; @@ -680,6 +792,7 @@ static void ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matric float lowBitRateEQ[CLDFB_NO_CHANNELS_MAX]; uint8_t applyLowBitRateEQ; int16_t dirac_read_idx; + float subFrameTotalEne[CLDFB_NO_CHANNELS_MAX]; hDirAC = st_ivas->hDirAC; h = st_ivas->hDiracDecBin; @@ -720,282 +833,287 @@ static void ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matric } } - /* Formulate input and target covariance matrices combining all subframes */ - for ( subframe = firstSubframe; subframe < ( firstSubframe + nSubframes ); subframe++ ) + /* Formulate input and target covariance matrices for this subframe */ + set_zero( subFrameTotalEne, CLDFB_NO_CHANNELS_MAX ); +#ifdef JBM_TSM_ON_TCS + dirac_read_idx = hDirAC->render_to_md_map[subframe]; +#else + dirac_read_idx = hDirAC->dirac_read_idx; +#endif + + /* Calculate input covariance matrix */ +#ifdef JBM_TSM_ON_TCS + for ( slot = 0; slot < hDirAC->subframe_nbslots[subframe]; slot++ ) +#else + for ( slot = 0; slot < hDirAC->subframe_nbslots; slot++ ) +#endif { - float subFrameTotalEne[CLDFB_NO_CHANNELS_MAX]; + for ( bin = 0; bin < nBins; bin++ ) + { + for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) + { + float instEne; - set_zero( subFrameTotalEne, CLDFB_NO_CHANNELS_MAX ); - dirac_read_idx = hDirAC->dirac_read_idx; + instEne = ( inRe[ch][slot][bin] * inRe[ch][slot][bin] ); + instEne += ( inIm[ch][slot][bin] * inIm[ch][slot][bin] ); + h->ChEne[ch][bin] += instEne; + subFrameTotalEne[bin] += instEne; + } + h->ChCrossRe[bin] += inRe[0][slot][bin] * inRe[1][slot][bin]; + h->ChCrossRe[bin] += inIm[0][slot][bin] * inIm[1][slot][bin]; + h->ChCrossIm[bin] += inRe[0][slot][bin] * inIm[1][slot][bin]; + h->ChCrossIm[bin] -= inIm[0][slot][bin] * inRe[1][slot][bin]; + } + } - /* Calculate input covariance matrix */ - for ( slot = 0; slot < (uint8_t) hDirAC->subframe_nbslots; slot++ ) + /* Apply EQ at low bit rates */ + if ( applyLowBitRateEQ ) + { + int16_t lastEqBin = LOW_BIT_RATE_BINAURAL_EQ_OFFSET + LOW_BIT_RATE_BINAURAL_EQ_BINS - 1; + + for ( bin = LOW_BIT_RATE_BINAURAL_EQ_OFFSET; bin < lastEqBin; bin++ ) { - int16_t slotThis = slot + ( hDirAC->subframe_nbslots * subframe ); + subFrameTotalEne[bin] *= lowBitRateEQ[bin]; + } + for ( ; bin < nBins; bin++ ) + { + subFrameTotalEne[bin] *= lowBitRateEQ[lastEqBin]; + } + } + + if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->nchan_transport == 2 ) + { + float tempRe, tempIm; + + set_zero( subFrameTotalEne, CLDFB_NO_CHANNELS_MAX ); +#ifdef JBM_TSM_ON_TCS + for ( slot = 0; slot < hDirAC->subframe_nbslots[subframe]; slot++ ) +#else + for ( slot = 0; slot < hDirAC->subframe_nbslots; slot++ ) +#endif + { for ( bin = 0; bin < nBins; bin++ ) { - for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) - { - float instEne; - - instEne = ( inRe[ch][slotThis][bin] * inRe[ch][slotThis][bin] ); - instEne += ( inIm[ch][slotThis][bin] * inIm[ch][slotThis][bin] ); - h->ChEne[ch][bin] += instEne; - subFrameTotalEne[bin] += instEne; - } - h->ChCrossRe[bin] += inRe[0][slotThis][bin] * inRe[1][slotThis][bin]; - h->ChCrossRe[bin] += inIm[0][slotThis][bin] * inIm[1][slotThis][bin]; - h->ChCrossIm[bin] += inRe[0][slotThis][bin] * inIm[1][slotThis][bin]; - h->ChCrossIm[bin] -= inIm[0][slotThis][bin] * inRe[1][slotThis][bin]; + tempRe = inRe[0][slot][bin] + inRe[1][slot][bin]; + tempIm = inIm[0][slot][bin] + inIm[1][slot][bin]; + subFrameTotalEne[bin] += tempRe * tempRe + tempIm * tempIm; } } + } + + /* Determine target covariance matrix containing target binaural properties */ + for ( bin = 0; bin < nBins; bin++ ) + { + float diffuseness = 1.0f; /* ratio1 and ratio2 are subtracted from diffuseness further below */ + float surCoh = 0.0f, spreadCoh = 0.0f; /* Default values if spreadSurroundCoherenceApplied == false */ + float diffEne, dirEne, meanEnePerCh; + int16_t dirIndex; + + /* When BINAURAL_ROOM is not indicated, hBinaural->earlyPartEneCorrection[bin] values are all 1.0f. + * When BINAURAL_ROOM is indicated, the binaural audio output is based on combined use of the + * HRTF data set and a BRIR-based data set. The HRTF data set is spectrally corrected to match + * the early spectrum of the BRIR data, using the spectral correction data in + * hBinaural->earlyPartEneCorrection[bin], based on the BRIR set. */ + meanEnePerCh = h->earlyPartEneCorrection[bin] * subFrameTotalEne[bin] / 2.0f; - /* Apply EQ at low bit rates */ - if ( applyLowBitRateEQ ) + /* Determine direct part target covariance matrix (for 1 or 2 directions) */ + for ( dirIndex = 0; dirIndex < hDirAC->numSimultaneousDirections; dirIndex++ ) { - int16_t lastEqBin = LOW_BIT_RATE_BINAURAL_EQ_OFFSET + LOW_BIT_RATE_BINAURAL_EQ_BINS - 1; + int16_t aziDeg, eleDeg; + float lRealp, lImagp, rRealp, rImagp; + float lRealpTmp, lImagpTmp, rRealpTmp, rImagpTmp; + float hrtfEne[BINAURAL_CHANNELS], hrtfCrossRe, hrtfCrossIm, ratio; - for ( bin = LOW_BIT_RATE_BINAURAL_EQ_OFFSET; bin < lastEqBin; bin++ ) + if ( dirIndex == 0 ) /* For first of the two simultaneous directions */ { - subFrameTotalEne[bin] *= lowBitRateEQ[bin]; + aziDeg = hDirAC->azimuth[dirac_read_idx][bin]; + eleDeg = hDirAC->elevation[dirac_read_idx][bin]; + ratio = hDirAC->energy_ratio1[dirac_read_idx][bin]; + spreadCoh = hDirAC->spreadCoherence[dirac_read_idx][bin]; } - for ( ; bin < nBins; bin++ ) + else /* For second of the two simultaneous directions */ { - subFrameTotalEne[bin] *= lowBitRateEQ[lastEqBin]; + aziDeg = hDirAC->azimuth2[dirac_read_idx][bin]; + eleDeg = hDirAC->elevation2[dirac_read_idx][bin]; + ratio = hDirAC->energy_ratio2[dirac_read_idx][bin]; + spreadCoh = hDirAC->spreadCoherence2[dirac_read_idx][bin]; } - } - - if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->nchan_transport == 2 ) - { - float tempRe, tempIm; - - set_zero( subFrameTotalEne, CLDFB_NO_CHANNELS_MAX ); + diffuseness -= ratio; /* diffuseness = 1 - ratio1 - ratio2 */ - for ( slot = 0; slot < (uint8_t) hDirAC->subframe_nbslots; slot++ ) + if ( separateCenterChannelRendering ) { - int16_t slotThis = slot + ( hDirAC->subframe_nbslots * subframe ); - - for ( bin = 0; bin < nBins; bin++ ) - { - tempRe = inRe[0][slotThis][bin] + inRe[1][slotThis][bin]; - tempIm = inIm[0][slotThis][bin] + inIm[1][slotThis][bin]; - subFrameTotalEne[bin] += tempRe * tempRe + tempIm * tempIm; - } + /* In masa + mono rendering mode, the center directions originate from phantom sources, so the + * spread coherence is increased */ + float aziRad, eleRad, doaVectorX, spatialAngleDeg, altSpreadCoh; + + aziRad = (float) aziDeg * PI_OVER_180; + eleRad = (float) eleDeg * PI_OVER_180; + doaVectorX = cosf( aziRad ) * cosf( eleRad ); + spatialAngleDeg = acosf( doaVectorX ) * _180_OVER_PI; + altSpreadCoh = 1.0f - ( spatialAngleDeg / 30.0f ); + spreadCoh = max( spreadCoh, altSpreadCoh ); } - } - - /* Determine target covariance matrix containing target binaural properties */ - for ( bin = 0; bin < nBins; bin++ ) - { - float diffuseness = 1.0f; /* ratio1 and ratio2 are subtracted from diffuseness further below */ - float surCoh = 0.0f, spreadCoh = 0.0f; /* Default values if spreadSurroundCoherenceApplied == false */ - float diffEne, dirEne, meanEnePerCh; - uint16_t dirIndex; - /* When BINAURAL_ROOM is not indicated, hBinaural->earlyPartEneCorrection[bin] values are all 1.0f. - * When BINAURAL_ROOM is indicated, the binaural audio output is based on combined use of the - * HRTF data set and a BRIR-based data set. The HRTF data set is spectrally corrected to match - * the early spectrum of the BRIR data, using the spectral correction data in - * hBinaural->earlyPartEneCorrection[bin], based on the BRIR set. */ - meanEnePerCh = h->earlyPartEneCorrection[bin] * subFrameTotalEne[bin] / 2.0f; + getDirectPartGains( bin, aziDeg, eleDeg, &lRealp, &lImagp, &rRealp, &rImagp, h->renderStereoOutputInsteadOfBinaural, Rmat ); - /* Determine direct part target covariance matrix (for 1 or 2 directions) */ - for ( dirIndex = 0; dirIndex < hDirAC->numSimultaneousDirections; dirIndex++ ) + if ( h->renderStereoOutputInsteadOfBinaural ) { - int16_t aziDeg, eleDeg; - float lRealp, lImagp, rRealp, rImagp; - float lRealpTmp, lImagpTmp, rRealpTmp, rImagpTmp; - float hrtfEne[BINAURAL_CHANNELS], hrtfCrossRe, hrtfCrossIm, ratio; + /* Synthesizing spread coherence is not needed for stereo loudspeaker output, + * as directional sound is reproduced with two loudspeakers in any case */ + spreadCoh = 0.0f; + } - if ( dirIndex == 0 ) /* For first of the two simultaneous directions */ + if ( spreadCoh > 0.0f ) + { + float centerMul, sidesMul; + float hrtfEneCenter, hrtfEneSides, hrtfEneRealized, eneCorrectionFactor; + float w1, w2, w3, eq; + + hrtfEneCenter = ( lRealp * lRealp ) + ( lImagp * lImagp ) + ( rRealp * rRealp ) + ( rImagp * rImagp ); + + /* Spread coherence is synthesized as coherent sources at 30 degree horizontal spacing. + * The following formulas determine the gains for these sources. + * spreadCoh = 0: Only panning + * spreadCoh = 0.5: Three sources coherent panning (e.g. 30 0 -30 deg azi) + * spreadCoh = 1.0: Two sources coherent panning with gap (as above, but center is silent) */ + if ( spreadCoh < 0.5f ) { - aziDeg = hDirAC->azimuth[dirac_read_idx][bin]; - eleDeg = hDirAC->elevation[dirac_read_idx][bin]; - ratio = hDirAC->energy_ratio1[dirac_read_idx][bin]; - spreadCoh = hDirAC->spreadCoherence[dirac_read_idx][bin]; + /* 0.0f < spreadCoh < 0.5f */ + sidesMul = 0.5774f * spreadCoh * 2.0f; /* sqrt(1/3) = 0.5774f */ + centerMul = 1.0f - ( spreadCoh * 2.0f ) + sidesMul; } - else /* For second of the two simultaneous directions */ + else { - aziDeg = hDirAC->azimuth2[dirac_read_idx][bin]; - eleDeg = hDirAC->elevation2[dirac_read_idx][bin]; - ratio = hDirAC->energy_ratio2[dirac_read_idx][bin]; - spreadCoh = hDirAC->spreadCoherence2[dirac_read_idx][bin]; + /* 0.5f <= spreadCoh < 1.0f */ + centerMul = 2.0f - ( 2.0f * spreadCoh ); + sidesMul = inv_sqrt( centerMul + 2.0f ); + centerMul *= sidesMul; } - diffuseness -= ratio; /* diffuseness = 1 - ratio1 - ratio2 */ - if ( separateCenterChannelRendering ) + /* Apply the gain for the center source of the three coherent sources */ + lRealp *= centerMul; + lImagp *= centerMul; + rRealp *= centerMul; + rImagp *= centerMul; + + /* Apply the gain for the left source of the three coherent sources */ + getDirectPartGains( bin, aziDeg + 30, eleDeg, &lRealpTmp, &lImagpTmp, &rRealpTmp, &rImagpTmp, h->renderStereoOutputInsteadOfBinaural, Rmat ); + + hrtfEneSides = ( lRealpTmp * lRealpTmp ) + ( lImagpTmp * lImagpTmp ) + ( rRealpTmp * rRealpTmp ) + ( rImagpTmp * rImagpTmp ); + lRealp += sidesMul * lRealpTmp; + lImagp += sidesMul * lImagpTmp; + rRealp += sidesMul * rRealpTmp; + rImagp += sidesMul * rImagpTmp; + + /* Apply the gain for the right source of the three coherent sources. + * -30 degrees to 330 wrapping due to internal functions. */ + getDirectPartGains( bin, aziDeg + 330, eleDeg, &lRealpTmp, &lImagpTmp, &rRealpTmp, &rImagpTmp, h->renderStereoOutputInsteadOfBinaural, Rmat ); + + hrtfEneSides += ( lRealpTmp * lRealpTmp ) + ( lImagpTmp * lImagpTmp ) + ( rRealpTmp * rRealpTmp ) + ( rImagpTmp * rImagpTmp ); + lRealp += sidesMul * lRealpTmp; + lImagp += sidesMul * lImagpTmp; + rRealp += sidesMul * rRealpTmp; + rImagp += sidesMul * rImagpTmp; + + /* Formulate an eneCorrectionFactor that compensates for the coherent summation of the HRTFs */ + hrtfEneRealized = ( lRealp * lRealp ) + ( lImagp * lImagp ) + ( rRealp * rRealp ) + ( rImagp * rImagp ); + eneCorrectionFactor = ( ( hrtfEneSides * sidesMul * sidesMul ) + + ( hrtfEneCenter * centerMul * centerMul ) ) / + max( 1e-12f, hrtfEneRealized ); + + /* Weighting factors to determine appropriate target spectrum for spread coherent sound */ + if ( spreadCoh < 0.5 ) { - /* In masa + mono rendering mode, the center directions originate from phantom sources, so the - * spread coherence is increased */ - float aziRad, eleRad, doaVectorX, spatialAngleDeg, altSpreadCoh; - - aziRad = (float) aziDeg * PI_OVER_180; - eleRad = (float) eleDeg * PI_OVER_180; - doaVectorX = cosf( aziRad ) * cosf( eleRad ); - spatialAngleDeg = acosf( doaVectorX ) * _180_OVER_PI; - altSpreadCoh = 1.0f - ( spatialAngleDeg / 30.0f ); - spreadCoh = max( spreadCoh, altSpreadCoh ); + w1 = 1.0f - 2.0f * spreadCoh; + w2 = 2.0f * spreadCoh; + w3 = 0.0f; } - - getDirectPartGains( bin, aziDeg, eleDeg, &lRealp, &lImagp, &rRealp, &rImagp, h->renderStereoOutputInsteadOfBinaural, Rmat ); - - if ( h->renderStereoOutputInsteadOfBinaural ) + else { - /* Synthesizing spread coherence is not needed for stereo loudspeaker output, - * as directional sound is reproduced with two loudspeakers in any case */ - spreadCoh = 0.0f; + w1 = 0.0f; + w2 = 2.0f - 2.0f * spreadCoh; + w3 = 2.0f * spreadCoh - 1.0f; } - if ( spreadCoh > 0.0f ) + if ( ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) ) { - float centerMul, sidesMul; - float hrtfEneCenter, hrtfEneSides, hrtfEneRealized, eneCorrectionFactor; - float w1, w2, w3, eq; - - hrtfEneCenter = ( lRealp * lRealp ) + ( lImagp * lImagp ) + ( rRealp * rRealp ) + ( rImagp * rImagp ); - - /* Spread coherence is synthesized as coherent sources at 30 degree horizontal spacing. - * The following formulas determine the gains for these sources. - * spreadCoh = 0: Only panning - * spreadCoh = 0.5: Three sources coherent panning (e.g. 30 0 -30 deg azi) - * spreadCoh = 1.0: Two sources coherent panning with gap (as above, but center is silent) */ - if ( spreadCoh < 0.5f ) - { - /* 0.0f < spreadCoh < 0.5f */ - sidesMul = 0.5774f * spreadCoh * 2.0f; /* sqrt(1/3) = 0.5774f */ - centerMul = 1.0f - ( spreadCoh * 2.0f ) + sidesMul; - } - else - { - /* 0.5f <= spreadCoh < 1.0f */ - centerMul = 2.0f - ( 2.0f * spreadCoh ); - sidesMul = inv_sqrt( centerMul + 2.0f ); - centerMul *= sidesMul; - } + idx = min( bin, MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS - 1 ); - /* Apply the gain for the center source of the three coherent sources */ - lRealp *= centerMul; - lImagp *= centerMul; - rRealp *= centerMul; - rImagp *= centerMul; - - /* Apply the gain for the left source of the three coherent sources */ - getDirectPartGains( bin, aziDeg + 30, eleDeg, &lRealpTmp, &lImagpTmp, &rRealpTmp, &rImagpTmp, h->renderStereoOutputInsteadOfBinaural, Rmat ); - - hrtfEneSides = ( lRealpTmp * lRealpTmp ) + ( lImagpTmp * lImagpTmp ) + ( rRealpTmp * rRealpTmp ) + ( rImagpTmp * rImagpTmp ); - lRealp += sidesMul * lRealpTmp; - lImagp += sidesMul * lImagpTmp; - rRealp += sidesMul * rRealpTmp; - rImagp += sidesMul * rImagpTmp; - - /* Apply the gain for the right source of the three coherent sources. - * -30 degrees to 330 wrapping due to internal functions. */ - getDirectPartGains( bin, aziDeg + 330, eleDeg, &lRealpTmp, &lImagpTmp, &rRealpTmp, &rImagpTmp, h->renderStereoOutputInsteadOfBinaural, Rmat ); - - hrtfEneSides += ( lRealpTmp * lRealpTmp ) + ( lImagpTmp * lImagpTmp ) + ( rRealpTmp * rRealpTmp ) + ( rImagpTmp * rImagpTmp ); - lRealp += sidesMul * lRealpTmp; - lImagp += sidesMul * lImagpTmp; - rRealp += sidesMul * rRealpTmp; - rImagp += sidesMul * rImagpTmp; - - /* Formulate an eneCorrectionFactor that compensates for the coherent summation of the HRTFs */ - hrtfEneRealized = ( lRealp * lRealp ) + ( lImagp * lImagp ) + ( rRealp * rRealp ) + ( rImagp * rImagp ); - eneCorrectionFactor = ( ( hrtfEneSides * sidesMul * sidesMul ) + - ( hrtfEneCenter * centerMul * centerMul ) ) / - max( 1e-12f, hrtfEneRealized ); - - /* Weighting factors to determine appropriate target spectrum for spread coherent sound */ - if ( spreadCoh < 0.5 ) + /* Apply the target spectrum to the eneCorrectionFactor */ + if ( separateCenterChannelRendering ) /* spreadCoh mostly originates from phantom sources in separate channel rendering mode */ { - w1 = 1.0f - 2.0f * spreadCoh; - w2 = 2.0f * spreadCoh; - w3 = 0.0f; + eneCorrectionFactor *= w1 * 1.0f + ( w2 + w3 ) * spreadCohEne1[idx]; } else { - w1 = 0.0f; - w2 = 2.0f - 2.0f * spreadCoh; - w3 = 2.0f * spreadCoh - 1.0f; - } - - 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[idx]; - } - else - { - eneCorrectionFactor *= w1 * 1.0f + w2 * spreadCohEne05[idx] + w3 * spreadCohEne1[idx]; - } + eneCorrectionFactor *= w1 * 1.0f + w2 * spreadCohEne05[idx] + w3 * spreadCohEne1[idx]; } - - /* Equalize the spread coherent combined HRTFs */ - eq = min( 4.0f, sqrtf( eneCorrectionFactor ) ); - lRealp *= eq; - lImagp *= eq; - rRealp *= eq; - rImagp *= eq; } - hrtfEne[0] = ( lRealp * lRealp ) + ( lImagp * lImagp ); - hrtfEne[1] = ( rRealp * rRealp ) + ( rImagp * rImagp ); - hrtfCrossRe = ( lRealp * rRealp ) + ( lImagp * rImagp ); - hrtfCrossIm = ( -lImagp * rRealp ) + ( lRealp * rImagp ); - - /* Add direct part (1 or 2) covariance matrix */ - dirEne = ratio * meanEnePerCh; - h->ChEneOut[0][bin] += dirEne * hrtfEne[0]; /* Dir ene part*/ - h->ChEneOut[1][bin] += dirEne * hrtfEne[1]; - h->ChCrossReOut[bin] += dirEne * hrtfCrossRe; /* Dir cross re */ - h->ChCrossImOut[bin] += dirEne * hrtfCrossIm; /* Dir cross im */ + /* Equalize the spread coherent combined HRTFs */ + eq = min( 4.0f, sqrtf( eneCorrectionFactor ) ); + lRealp *= eq; + lImagp *= eq; + rRealp *= eq; + rImagp *= eq; } - /* Add diffuse / ambient part covariance matrix */ - diffuseness = max( 0.0f, diffuseness ); - diffEne = diffuseness * meanEnePerCh; - surCoh = hDirAC->surroundingCoherence[dirac_read_idx][bin]; - if ( ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) ) + hrtfEne[0] = ( lRealp * lRealp ) + ( lImagp * lImagp ); + hrtfEne[1] = ( rRealp * rRealp ) + ( rImagp * rImagp ); + hrtfCrossRe = ( lRealp * rRealp ) + ( lImagp * rImagp ); + hrtfCrossIm = ( -lImagp * rRealp ) + ( lRealp * rImagp ); + + /* Add direct part (1 or 2) covariance matrix */ + dirEne = ratio * meanEnePerCh; + h->ChEneOut[0][bin] += dirEne * hrtfEne[0]; /* Dir ene part*/ + h->ChEneOut[1][bin] += dirEne * hrtfEne[1]; + h->ChCrossReOut[bin] += dirEne * hrtfCrossRe; /* Dir cross re */ + h->ChCrossImOut[bin] += dirEne * hrtfCrossIm; /* Dir cross im */ + } + + /* Add diffuse / ambient part covariance matrix */ + diffuseness = max( 0.0f, diffuseness ); + diffEne = diffuseness * meanEnePerCh; + surCoh = hDirAC->surroundingCoherence[dirac_read_idx][bin]; + if ( ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) ) + { + if ( !h->renderStereoOutputInsteadOfBinaural ) { - 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[idx]; - } + 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[idx]; } - h->ChEneOut[0][bin] += diffEne; /* Diff ene part*/ - h->ChEneOut[1][bin] += diffEne; + } + h->ChEneOut[0][bin] += diffEne; /* Diff ene part*/ + h->ChEneOut[1][bin] += diffEne; - if ( h->renderStereoOutputInsteadOfBinaural ) + if ( h->renderStereoOutputInsteadOfBinaural ) + { + /* When rendering stereo, ambience (except for surround coherent sound) has zero ICC. */ + h->ChCrossReOut[bin] += surCoh * diffEne; + } + else /* When rendering binaural, ambience has frequency dependent ICC. */ + { + if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR && bin < BINAURAL_COHERENCE_DIFFERENCE_BINS ) { - /* When rendering stereo, ambience (except for surround coherent sound) has zero ICC. */ - h->ChCrossReOut[bin] += surCoh * diffEne; + float diffuseFieldCoherence; +#ifdef JBM_TSM_ON_TCS + diffuseFieldCoherence = hDirAC->hDiffuseDist->diffuseRatioX[bin] * h->diffuseFieldCoherenceX[bin] + hDirAC->hDiffuseDist->diffuseRatioY[bin] * h->diffuseFieldCoherenceY[bin] + hDirAC->hDiffuseDist->diffuseRatioZ[bin] * h->diffuseFieldCoherenceZ[bin]; +#else + diffuseFieldCoherence = hDirAC->hDiffuseDist->diffuseRatioX[subframe][bin] * h->diffuseFieldCoherenceX[bin] + hDirAC->hDiffuseDist->diffuseRatioY[subframe][bin] * h->diffuseFieldCoherenceY[bin] + hDirAC->hDiffuseDist->diffuseRatioZ[subframe][bin] * h->diffuseFieldCoherenceZ[bin]; +#endif + h->ChCrossReOut[bin] += ( ( 1.0f - surCoh ) * diffuseFieldCoherence + surCoh ) * diffEne; } - else /* When rendering binaural, ambience has frequency dependent ICC. */ + else { - if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR && bin < BINAURAL_COHERENCE_DIFFERENCE_BINS ) - { - float diffuseFieldCoherence; - diffuseFieldCoherence = hDirAC->hDiffuseDist->diffuseRatioX[subframe][bin] * h->diffuseFieldCoherenceX[bin] + hDirAC->hDiffuseDist->diffuseRatioY[subframe][bin] * h->diffuseFieldCoherenceY[bin] + hDirAC->hDiffuseDist->diffuseRatioZ[subframe][bin] * h->diffuseFieldCoherenceZ[bin]; - h->ChCrossReOut[bin] += ( ( 1.0f - surCoh ) * diffuseFieldCoherence + surCoh ) * diffEne; - } - else - { - h->ChCrossReOut[bin] += ( ( 1.0f - surCoh ) * h->diffuseFieldCoherence[bin] + surCoh ) * diffEne; - } + h->ChCrossReOut[bin] += ( ( 1.0f - surCoh ) * h->diffuseFieldCoherence[bin] + surCoh ) * diffEne; } - - /* Store parameters for formulating average diffuseness over frame */ - h->frameMeanDiffuseness[bin] += diffEne; - frameMeanDiffusenessEneWeight[bin] += meanEnePerCh; } - hDirAC->dirac_read_idx = ( hDirAC->dirac_read_idx + 1 ) % hDirAC->dirac_md_buffer_length; + /* Store parameters for formulating average diffuseness over frame */ + h->frameMeanDiffuseness[bin] += diffEne; + frameMeanDiffusenessEneWeight[bin] += meanEnePerCh; } /* Formulate average diffuseness over frame */ @@ -1015,11 +1133,11 @@ static void ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matric /* Temporal IIR-type smoothing of covariance matrices */ if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->hDecoderConfig->ivas_total_brate < MASA_STEREO_MIN_BITRATE ) { - IIReneLimiterFactor = 16.0f / (float) nSubframes + ( 1.0f - qualityBasedSmFactor ); + IIReneLimiterFactor = 16.0f + ( 1.0f - qualityBasedSmFactor ); } else { - IIReneLimiterFactor = 8.0f / (float) nSubframes + ( 1.0f - qualityBasedSmFactor ); + IIReneLimiterFactor = 8.0f + ( 1.0f - qualityBasedSmFactor ); } for ( bin = 0; bin < nBins; bin++ ) { @@ -1075,7 +1193,7 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices( const int16_t max_band_decorr, float Rmat[3][3] ) { - uint8_t chA, chB, bin; + int16_t chA, chB, bin; uint8_t separateCenterChannelRendering; int16_t nBins; DIRAC_DEC_BIN_HANDLE h; @@ -1097,19 +1215,11 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices( CrEneR = 0.0f; /* Formulate main processing matrix M */ -#ifdef NOKIA_PARAMBIN_REQULARIZATION formulate2x2MixingMatrix( h->ChEne[0][bin], h->ChEne[1][bin], h->ChCrossRe[bin], h->ChCrossIm[bin], h->ChEneOut[0][bin], h->ChEneOut[1][bin], h->ChCrossReOut[bin], h->ChCrossImOut[bin], prototypeMtx, Mre, Mim, h->reqularizationFactor ); -#else - formulate2x2MixingMatrix( h->ChEne[0][bin], h->ChEne[1][bin], - 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 ); -#endif /* Load estimated covariance matrix to the [2][2] matrix form */ CxRe[0][0] = h->ChEne[0][bin]; @@ -1245,43 +1355,68 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices( return; } +#ifdef JBM_TSM_ON_TCS +#endif static void ivas_dirac_dec_binaural_process_output( Decoder_Struct *st_ivas, +#ifdef JBM_TSM_ON_TCS + float *output_f[], +#else 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], +#endif + float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], + float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], const int16_t max_band_decorr, - const uint8_t numInChannels, - const uint8_t firstSlot, - const uint8_t slotEnd ) + const int16_t numInChannels, + const int16_t subframe ) { - uint8_t slot, bin, chA, chB; + int16_t slot, bin, chA, chB; int16_t nBins; float outSlotRe[CLDFB_NO_CHANNELS_MAX], outSlotIm[CLDFB_NO_CHANNELS_MAX]; float decSlotRe[BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX], decSlotIm[BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX]; - float reverbRe[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; - float reverbIm[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; - uint8_t numSlots; + float reverbRe[BINAURAL_CHANNELS][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX]; + float reverbIm[BINAURAL_CHANNELS][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX]; DIRAC_DEC_BIN_HANDLE h; float interpVal; float *decSlotRePointer; float *decSlotImPointer; + int16_t offsetSamples; +#ifdef JBM_TSM_ON_TCS + int16_t nSlots; +#endif - numSlots = slotEnd - firstSlot; h = st_ivas->hDiracDecBin; nBins = st_ivas->hDirAC->num_freq_bands; +#ifdef JBM_TSM_ON_TCS + offsetSamples = 0; + nSlots = st_ivas->hDirAC->subframe_nbslots[subframe]; +#else + offsetSamples = subframe * CLDFB_SLOTS_PER_SUBFRAME * nBins; +#endif if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) { /* Process second / room effect part of binaural output when needed */ - ivas_binaural_reverb_processFrame( st_ivas->hDiracDecBin->hReverb, numInChannels, inRe, inIm, reverbRe, reverbIm, firstSlot ); +#ifdef JBM_TSM_ON_TCS + ivas_binaural_reverb_processSubframe( st_ivas->hDiracDecBin->hReverb, numInChannels, nSlots, inRe, inIm, reverbRe, reverbIm ); +#else + ivas_binaural_reverb_processSubframe( st_ivas->hDiracDecBin->hReverb, numInChannels, inRe, inIm, reverbRe, reverbIm ); +#endif } interpVal = 0.0f; - for ( slot = firstSlot; slot < ( firstSlot + numSlots ); slot++ ) +#ifdef JBM_TSM_ON_TCS + for ( slot = 0; slot < nSlots; slot++ ) +#else + for ( slot = 0; slot < CLDFB_SLOTS_PER_SUBFRAME; slot++ ) +#endif { - interpVal += 1.0f / (float) numSlots; +#ifdef JBM_TSM_ON_TCS + interpVal += 1.0f / (float) nSlots; +#else + interpVal += 1.0f / ( (float) CLDFB_SLOTS_PER_SUBFRAME ); +#endif if ( !st_ivas->hDiracDecBin->useTdDecorr && max_band_decorr > 0 ) { ivas_dirac_dec_decorrelate_slot( st_ivas->hDirAC, slot, inRe, inIm, decSlotRe, decSlotIm ); @@ -1350,33 +1485,31 @@ static void ivas_dirac_dec_binaural_process_output( outSlotImPr = &( outSlotIm[0] ); /* Inverse filter bank */ - cldfbSynthesis( &outSlotRePr, &outSlotImPr, &( output_f[chA][nBins * slot] ), nBins, st_ivas->cldfbSynDec[chA] ); + cldfbSynthesis( &outSlotRePr, &outSlotImPr, &( output_f[chA][nBins * slot + offsetSamples] ), nBins, st_ivas->cldfbSynDec[chA] ); } } return; } +#ifdef JBM_TSM_ON_TCS +#endif -#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS 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 inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], + float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], + const int16_t nBins, +#ifdef JBM_TSM_ON_TCS + const int16_t nSlots, +#endif float Rmat[3][3] ) { int16_t slot, ch, bin, louderCh; -#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS_OPT 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; -#else - float re[2], im[2], ILD, mono_factor_ILD, mono_factor_rotation, mono_factor, y_val; - float proc_re[2], proc_im[2], sum_re, sum_im, ene_proc, ene_target, mf; -#endif + float eqVal; + int16_t band_idx, bin_lo, bin_hi; /* Determine head-orientation-based mono factor. Rmat[1][1] entry informs how close the ears are aligned according to transport signals. */ @@ -1385,10 +1518,7 @@ static void adaptTransportSignalsHeadtracked( mono_factor_rotation = fmaxf( 0.0f, fminf( 1.0f, mono_factor_rotation ) ); /* Adapt transport signals in frequency bands */ -#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS_OPT /* 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 ) @@ -1396,170 +1526,115 @@ static void adaptTransportSignalsHeadtracked( max_band++; } - for ( sf_idx = 0; sf_idx < n_sf; sf_idx++ ) + for ( band_idx = 0; band_idx < max_band; band_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++ ) { - 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; +#ifdef JBM_TSM_ON_TCS + for ( slot = 0; slot < nSlots; slot++ ) +#else + for ( slot = 0; slot < CLDFB_SLOTS_PER_SUBFRAME; slot++ ) +#endif { - ch_nrg[ch] = 0.0f; - for ( slot = start_slot; slot < stop_slot; slot++ ) + for ( bin = bin_lo; bin < bin_hi; bin++ ) { - 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] ); - } + 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]; } + 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 */ + 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 ) ); + /* 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; + /* 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++ ) + /* Mix original audio and sum signal according to determined mono factor */ + for ( ch = 0; ch < 2; ch++ ) + { + if ( ch != louderCh ) { - 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 ) ) ); + float band_nrg = 0.0f; - for ( slot = start_slot; slot < stop_slot; slot++ ) - { - for ( ch = 0; ch < 2; ch++ ) +#ifdef JBM_TSM_ON_TCS + for ( slot = 0; slot < nSlots; slot++ ) +#else + for ( slot = 0; slot < CLDFB_SLOTS_PER_SUBFRAME; slot++ ) +#endif { for ( bin = bin_lo; bin < bin_hi; bin++ ) { - inRe[ch][slot][bin] *= eqVal; - inIm[ch][slot][bin] *= eqVal; + /* 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 - /* original contribution */ - for ( slot = firstSlot; slot < slotEnd; slot++ ) - { - float eqVal[60]; - - for ( bin = 0; bin < nBins; bin++ ) - { - /* Determine channel energies */ - for ( ch = 0; ch < 2; ch++ ) - { - re[ch] = inRe[ch][slot][bin]; - im[ch] = inIm[ch][slot][bin]; - - hHeadTrackData->chEneIIR[ch][bin] *= ADAPT_HTPROTO_IIR_FAC; - hHeadTrackData->chEneIIR[ch][bin] += ( 1.0f - ADAPT_HTPROTO_IIR_FAC ) * ( ( re[ch] * re[ch] ) + ( im[ch] * im[ch] ) ); - } - - /* Determine ILD */ - ILD = fabsf( 10.0f * log10f( fmaxf( 1e-12f, hHeadTrackData->chEneIIR[0][bin] ) / fmaxf( 1e-12f, hHeadTrackData->chEneIIR[1][bin] ) ) ); - louderCh = ( hHeadTrackData->chEneIIR[1][bin] > hHeadTrackData->chEneIIR[0][bin] ); - - /* 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 */ - sum_re = re[0] + re[1]; - sum_im = im[0] + im[1]; - for ( ch = 0; ch < 2; ch++ ) + else { - mf = ( ch == louderCh ) ? 0.0f : mono_factor; - - proc_re[ch] = mf * sum_re + ( 1.0f - mf ) * re[ch]; - proc_im[ch] = mf * sum_im + ( 1.0f - mf ) * im[ch]; - - hHeadTrackData->procChEneIIR[ch][bin] *= ADAPT_HTPROTO_IIR_FAC; - hHeadTrackData->procChEneIIR[ch][bin] += ( 1.0f - ADAPT_HTPROTO_IIR_FAC ) * ( ( proc_re[ch] * proc_re[ch] ) + ( proc_im[ch] * proc_im[ch] ) ); + /* 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][bin] + hHeadTrackData->chEneIIR[1][bin]; - ene_proc = hHeadTrackData->procChEneIIR[0][bin] + hHeadTrackData->procChEneIIR[1][bin]; - eqVal[bin] = fminf( 4.0f, sqrtf( ene_target / fmaxf( 1e-12f, ene_proc ) ) ); + /* 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 ) ) ); +#ifdef JBM_TSM_ON_TCS + for ( slot = 0; slot < nSlots; slot++ ) +#else + for ( slot = 0; slot < CLDFB_SLOTS_PER_SUBFRAME; slot++ ) +#endif + { for ( ch = 0; ch < 2; ch++ ) { - inRe[ch][slot][bin] = proc_re[ch] * eqVal[bin]; - inIm[ch][slot][bin] = proc_im[ch] * eqVal[bin]; + for ( bin = bin_lo; bin < bin_hi; bin++ ) + { + inRe[ch][slot][bin] *= eqVal; + inIm[ch][slot][bin] *= eqVal; + } } } } -#endif return; } -#endif - 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 inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], + float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], + const int16_t nBins, +#ifdef JBM_TSM_ON_TCS + const int16_t nSlots, +#endif float Rmat[3][3] ) { - uint8_t slot, bin, ch; + int16_t slot, bin, ch; float tmpVal; /* When not currently in prototype signal left-right switching procedure, check if such switching is needed */ @@ -1579,7 +1654,11 @@ static void ivas_dirac_dec_binaural_check_and_switch_transports_headtracked( /* When currently in interpolation */ if ( hHeadTrackData->lrSwitchedNext != hHeadTrackData->lrSwitchedCurrent ) { - for ( slot = firstSlot; slot < slotEnd; slot++ ) +#ifdef JBM_TSM_ON_TCS + for ( slot = 0; slot < nSlots; slot++ ) +#else + for ( slot = 0; slot < CLDFB_SLOTS_PER_SUBFRAME; slot++ ) +#endif { float switchOrderFactor, origOrderFactor; @@ -1635,7 +1714,11 @@ static void ivas_dirac_dec_binaural_check_and_switch_transports_headtracked( /* If not in interpolation, but in switched prototype situation, then switch left and right channels */ if ( hHeadTrackData->lrSwitchedCurrent == 1 ) { - for ( slot = firstSlot; slot < slotEnd; slot++ ) +#ifdef JBM_TSM_ON_TCS + for ( slot = 0; slot < nSlots; slot++ ) +#else + for ( slot = 0; slot < CLDFB_SLOTS_PER_SUBFRAME; slot++ ) +#endif { for ( bin = 0; bin < nBins; bin++ ) { @@ -2089,7 +2172,6 @@ static void hrtfShGetHrtf( } -#ifdef NOKIA_PARAMBIN_REQULARIZATION /*------------------------------------------------------------------------- * configure_reqularization_factor() * @@ -2097,37 +2179,30 @@ static void hrtfShGetHrtf( * parametric binauralizer using IVAS codec format and current bitrate. *------------------------------------------------------------------------*/ -/*! r: Configured reqularization factor value to be set. */ -static float configure_reqularization_factor( - const IVAS_FORMAT ivas_format, /* i: IVAS codec format in use */ - const int32_t ivas_brate ) /* i: Current IVAS bitrate */ +/*! r: Configured reqularization factor value */ +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_brate >= IVAS_256k ) - { - reqularizationFactor = 0.2f; - } - else if ( ivas_brate == IVAS_192k ) - { - reqularizationFactor = 0.3f; - } - else if ( ivas_brate == IVAS_160k ) + if ( ivas_total_brate >= IVAS_160k ) { reqularizationFactor = 0.4f; } - else if ( ivas_brate == IVAS_128k ) + else if ( ivas_total_brate == IVAS_128k ) { reqularizationFactor = 0.5f; } - else if ( ivas_brate == IVAS_96k ) + else if ( ivas_total_brate == IVAS_96k ) { reqularizationFactor = 0.6f; } - else if ( ivas_brate >= IVAS_64k ) + else if ( ivas_total_brate >= IVAS_64k ) { reqularizationFactor = 0.8f; } @@ -2139,19 +2214,19 @@ static float configure_reqularization_factor( if ( ivas_format == MC_FORMAT ) /* This is always McMASA for parametric binauralizer. */ { - if ( ivas_brate >= IVAS_96k ) + if ( ivas_total_brate >= IVAS_96k ) { - reqularizationFactor = 0.3f; + reqularizationFactor = 0.4f; } - else if ( ivas_brate >= IVAS_80k ) + else if ( ivas_total_brate >= IVAS_80k ) { reqularizationFactor = 0.5f; } - else if ( ivas_brate >= IVAS_64k ) + else if ( ivas_total_brate >= IVAS_64k ) { reqularizationFactor = 0.7f; } - else if ( ivas_brate >= IVAS_48k ) + else if ( ivas_total_brate >= IVAS_48k ) { reqularizationFactor = 0.8f; } @@ -2165,4 +2240,3 @@ static float configure_reqularization_factor( return reqularizationFactor; } -#endif diff --git a/lib_rend/ivas_hrtf.c b/lib_rend/ivas_hrtf.c index 2b1f16d025cfb0c9166a5c5c80c6c5489e0ca305..3616bd6c93c86a524b55f180d138099426426fa9 100644 --- a/lib_rend/ivas_hrtf.c +++ b/lib_rend/ivas_hrtf.c @@ -96,6 +96,10 @@ ivas_error ivas_HRTF_CRend_binary_open( ( *hSetOfHRTF )->hHRTF_hrir_combined = NULL; ( *hSetOfHRTF )->hHRTF_hrir_hoa3 = NULL; +#ifdef UPDATE_SBA_FILTER + ( *hSetOfHRTF )->hHRTF_hrir_hoa2 = NULL; + ( *hSetOfHRTF )->hHRTF_hrir_foa = NULL; +#endif ( *hSetOfHRTF )->hHRTF_brir_combined = NULL; return IVAS_ERR_OK; diff --git a/lib_rend/ivas_limiter.c b/lib_rend/ivas_limiter.c index 28c272bc0c820c180908817035d9446a12d6b819..7875165e51d0ce47be819eba3bd6124fe92061be 100644 --- a/lib_rend/ivas_limiter.c +++ b/lib_rend/ivas_limiter.c @@ -171,11 +171,15 @@ void ivas_limiter_close( *-------------------------------------------------------------------*/ void ivas_limiter_dec( - IVAS_LIMITER_HANDLE hLimiter, /* i/o: limiter struct handle */ + IVAS_LIMITER_HANDLE hLimiter, /* i/o: limiter struct handle */ +#ifdef JBM_TSM_ON_TCS + float *output[MAX_OUTPUT_CHANNELS], /* i/o: input/output buffer */ +#else 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 */ +#endif + 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 */ ) { int16_t c; diff --git a/lib_rend/ivas_objectRenderer.c b/lib_rend/ivas_objectRenderer.c index ed36fa26b11a1e90fcd71276d542ad431b79d8a7..3d929e78c7dc4ee6c4f3f85bd3cc160e95db113c 100644 --- a/lib_rend/ivas_objectRenderer.c +++ b/lib_rend/ivas_objectRenderer.c @@ -34,6 +34,7 @@ #include #include "options.h" #include "prot.h" +#include "ivas_prot.h" #include "ivas_prot_rend.h" #include #include "ivas_rom_com.h" @@ -47,9 +48,12 @@ * Local function prototypes *---------------------------------------------------------------------*/ + static void TDREND_Clear_Update_flags( BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd ); + static void angles_to_vec( const float radius, const float azimuth, const float elevation, float *vec ); + /*---------------------------------------------------------------------* * ivas_td_binaural_open_unwrap() * @@ -258,36 +262,82 @@ ivas_error ivas_td_binaural_renderer_unwrap( 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_POSITION *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 */ + const IVAS_VECTOR3 *Pos, /* i : Listener position data per subframe */ +#ifdef FIX_356_ISM_METADATA_SYNC + const int16_t ism_md_subframe_update, /* i: Number of subframes to delay ism metadata to sync with audio */ +#endif +#ifdef JBM_TSM_ON_TCS + float *output[], /* i/o: SCE channels / Binaural synthesis */ +#else + float output[][L_FRAME48k], /* i/o: SCE channels / Binaural synthesis */ +#endif + 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; +#ifdef JBM_TSM_ON_TCS + float *p_reverb_signal[BINAURAL_CHANNELS]; + int16_t ch; + + for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) + { + p_reverb_signal[ch] = reverb_signal[ch]; + } +#endif subframe_length = output_frame / MAX_PARAM_SPATIAL_SUBFRAMES; +#ifdef FIX_356_ISM_METADATA_SYNC + int16_t c_indx, nS; + c_indx = 0; + + for ( nS = 0; nS < num_src; nS++ ) + { + if ( !( ivas_format == MC_FORMAT && nS == lfe_idx ) ) /* Skip LFE for MC */ + { + hBinRendererTd->Sources[c_indx]->InputFrame_p = output[nS]; + hBinRendererTd->Sources[c_indx]->SrcRend_p->InputAvailable = TRUE; + c_indx++; + } + } +#else /* Update object position(s) */ TDREND_Update_object_positions( hBinRendererTd, num_src, lfe_idx, ivas_format, hIsmMetaData, output ); +#endif for ( subframe_idx = 0; subframe_idx < MAX_PARAM_SPATIAL_SUBFRAMES; subframe_idx++ ) { +#ifdef FIX_356_ISM_METADATA_SYNC + if ( subframe_idx == ism_md_subframe_update ) + { + /* Update object position(s) */ + TDREND_Update_object_positions( hBinRendererTd, num_src, ivas_format, hIsmMetaData ); + } +#endif /* Update the listener's location/orientation */ TDREND_Update_listener_orientation( hBinRendererTd, Opt_Headrotation, ( Quaternions != NULL ) ? &Quaternions[subframe_idx] : NULL, ( Pos != NULL ) ? &Pos[subframe_idx] : NULL ); if ( hReverb != NULL && hReverb->pConfig.roomAcoustics.late_reverb_on ) { +#ifdef JBM_TSM_ON_TCS + if ( ( error = ivas_reverb_process( hReverb, transport_config, 0, output, p_reverb_signal, subframe_idx ) ) != IVAS_ERR_OK ) +#else if ( ( error = ivas_reverb_process( hReverb, transport_config, 0, output, reverb_signal, subframe_idx ) ) != IVAS_ERR_OK ) +#endif { return error; } } /* Render subframe */ +#ifdef FIX_356_ISM_METADATA_SYNC + if ( ( error = TDREND_GetMix( hBinRendererTd, output, subframe_length, subframe_idx, ism_md_subframe_update ) ) != IVAS_ERR_OK ) +#else if ( ( error = TDREND_GetMix( hBinRendererTd, output, subframe_length, subframe_idx ) ) != IVAS_ERR_OK ) +#endif { return error; } @@ -313,9 +363,17 @@ ivas_error ivas_td_binaural_renderer_unwrap( 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 */ +#ifdef JBM_TSM_ON_TCS + float *output[], /* i/o: ISM object synth / rendered output in 0,1 */ +#else + float output[][L_FRAME48k], /* i/o: ISM object synth / rendered output in 0,1 */ +#endif + const int16_t subframe_length, /* i/o: subframe length */ + const int16_t subframe_idx /* i : Subframe index to 5 ms subframe */ +#ifdef FIX_356_ISM_METADATA_SYNC + , + const int16_t ism_md_subframe_update /* Number of subframes to delay ism metadata to sync with audio */ +#endif ) { int16_t i; @@ -327,6 +385,13 @@ ivas_error TDREND_GetMix( float hrf_left_delta[SFX_SPAT_BIN_MAX_FILTER_LENGTH]; float hrf_right_delta[SFX_SPAT_BIN_MAX_FILTER_LENGTH]; int16_t intp_count; + float pan_left, pan_right; + +#ifdef FIX_356_ISM_METADATA_SYNC + int16_t subframe_update_flag; + subframe_update_flag = subframe_idx == ism_md_subframe_update; +#endif + error = IVAS_ERR_OK; /* Clear the output buffer to accumulate rendered sources */ @@ -347,10 +412,16 @@ ivas_error TDREND_GetMix( SrcRend_p = Src_p->SrcRend_p; /* Update rendering params if needed */ - if ( hBinRendererTd->Listener_p->PoseUpdated || SrcSpatial_p->Updated ) + if ( ( SrcRend_p->PlayStatus == TDREND_PLAYSTATUS_PLAYING ) && ( hBinRendererTd->Listener_p->PoseUpdated || SrcSpatial_p->Updated ) ) { 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 ); + Src_p->hrf_right_prev, hrf_left_delta, hrf_right_delta, &intp_count, &Src_p->filterlength, &Src_p->itd, &Src_p->Gain, Src_p, +#ifdef FIX_356_ISM_METADATA_SYNC + subframe_update_flag +#else + subframe_idx +#endif + ); } /* Render source if needed */ @@ -358,6 +429,14 @@ ivas_error TDREND_GetMix( { error = TDREND_REND_RenderSourceHRFilt( Src_p, hrf_left_delta, hrf_right_delta, intp_count, output_buf, subframe_length ); } + + if ( ( SrcRend_p->InputAvailable == TRUE ) && ( SrcRend_p->PlayStatus == TDREND_PLAYSTATUS_PLAYING_NON_DIEGETIC ) ) + { + pan_left = ( SrcSpatial_p->Pos_p[1] + 1.f ) * 0.5f; + pan_right = 1.f - pan_left; + v_multc_acc( &Src_p->InputFrame_p[subframe_idx * subframe_length], pan_left, output_buf[0], subframe_length ); + v_multc_acc( &Src_p->InputFrame_p[subframe_idx * subframe_length], pan_right, output_buf[1], subframe_length ); + } } /* Populate output variable */ @@ -403,47 +482,75 @@ static void TDREND_Clear_Update_flags( 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 */ +#ifndef FIX_356_ISM_METADATA_SYNC + const int16_t lfe_idx, /* i : Input LFE index */ +#endif + const IVAS_FORMAT in_format, /* i : Format of input sources */ + const ISM_METADATA_HANDLE *hIsmMetaData /* i : Input metadata for ISM objects */ +#ifndef FIX_356_ISM_METADATA_SYNC + , +#ifdef JBM_TSM_ON_TCS + float *output[] +#else + float output[][L_FRAME48k] /* i/o: SCE/MC channels */ +#endif +#endif ) { TDREND_DirAtten_t *DirAtten_p; int16_t nS; float Pos[3]; float Dir[3]; +#ifndef FIX_356_ISM_METADATA_SYNC int16_t c_indx; +#endif DirAtten_p = hBinRendererTd->DirAtten_p; /* For each source, write the frame data to the source object*/ +#ifndef FIX_356_ISM_METADATA_SYNC c_indx = 0; +#endif for ( nS = 0; nS < num_src; nS++ ) { +#ifndef FIX_356_ISM_METADATA_SYNC if ( !( in_format == MC_FORMAT && nS == lfe_idx ) ) /* Skip LFE for MC */ { hBinRendererTd->Sources[c_indx]->InputFrame_p = output[nS]; hBinRendererTd->Sources[c_indx]->SrcRend_p->InputAvailable = TRUE; c_indx++; } - +#endif if ( in_format == ISM_FORMAT ) { - /* Update the source positions */ /* Source position and direction */ 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 ); + +#ifndef FIX_463_TD_RENDERER_DIRECTIVITY_RESET + /* Source directivity info */ DirAtten_p->ConeInnerAngle = 360.0f; DirAtten_p->ConeOuterAngle = 360.0f; DirAtten_p->ConeOuterGain = 1.0f; +#endif TDREND_MIX_SRC_SetPos( hBinRendererTd, nS, Pos ); TDREND_MIX_SRC_SetDirAtten( hBinRendererTd, nS, DirAtten_p ); - TDREND_MIX_SRC_SetPlayState( hBinRendererTd, nS, TDREND_PLAYSTATUS_PLAYING ); + if ( hIsmMetaData[nS]->non_diegetic_flag ) + { + Pos[0] = 0; + Pos[1] = hIsmMetaData[nS]->azimuth / 90.f; + Pos[2] = 0; + TDREND_MIX_SRC_SetPos( hBinRendererTd, nS, Pos ); + TDREND_MIX_SRC_SetPlayState( hBinRendererTd, nS, TDREND_PLAYSTATUS_PLAYING_NON_DIEGETIC ); + } + else + { + TDREND_MIX_SRC_SetPlayState( hBinRendererTd, nS, TDREND_PLAYSTATUS_PLAYING ); + } TDREND_MIX_SRC_SetDir( hBinRendererTd, nS, Dir ); } } @@ -462,7 +569,7 @@ 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_POSITION *Pos /* i : Listener Position */ + const IVAS_VECTOR3 *Pos /* i : Listener Position */ ) { float FrontVec[3]; @@ -583,6 +690,18 @@ ivas_error ivas_td_binaural_renderer_ext( IVAS_REND_AudioConfigType inConfigType; AUDIO_CONFIG transport_config; ivas_error error; +#ifdef FIX_356_ISM_METADATA_SYNC + int16_t ism_md_subframe_update_ext = 0; +#endif +#ifdef JBM_TSM_ON_TCS + float *p_output[MAX_OUTPUT_CHANNELS]; + int16_t ch; + + for ( ch = 0; ch < MAX_OUTPUT_CHANNELS; ch++ ) + { + p_output[ch] = output[ch]; + } +#endif push_wmops( "ivas_td_binaural_renderer_ext" ); @@ -618,11 +737,30 @@ ivas_error ivas_td_binaural_renderer_ext( hIsmMetaData[0]->yaw = currentPos->yaw; hIsmMetaData[0]->pitch = currentPos->pitch; hIsmMetaData[0]->radius = currentPos->radius; + hIsmMetaData[0]->non_diegetic_flag = currentPos->non_diegetic_flag; } +#ifdef JBM_TSM_ON_TCS +#ifdef FIX_356_ISM_METADATA_SYNC + 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, ism_md_subframe_update_ext, p_output, output_frame ) ) != IVAS_ERR_OK ) +#else + 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, p_output, output_frame ) ) != IVAS_ERR_OK ) +#endif +#else +#ifdef FIX_356_ISM_METADATA_SYNC + 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, ism_md_subframe_update, output, output_frame ) ) != IVAS_ERR_OK ) +#else 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 ) +#endif +#endif { return error; } diff --git a/lib_rend/ivas_objectRenderer_hrFilt.c b/lib_rend/ivas_objectRenderer_hrFilt.c index 91b018b1486f9f3538c9d30d6f890fef0a06c732..6a2bf00278d535f817c46af256111b1a5acd87a4 100644 --- a/lib_rend/ivas_objectRenderer_hrFilt.c +++ b/lib_rend/ivas_objectRenderer_hrFilt.c @@ -69,13 +69,11 @@ ivas_error TDREND_REND_RenderSourceHRFilt( { float LeftOutputFrame[L_SPATIAL_SUBFR_48k]; float RightOutputFrame[L_SPATIAL_SUBFR_48k]; - float Gain; - - Gain = ( *Src_p->SrcRend_p->DirGain_p ) * ( *Src_p->SrcRend_p->DistGain_p ); 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, 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 ); + 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; /* Copy to accumulative output frame */ v_add( LeftOutputFrame, output_buf[0], output_buf[0], subframe_length ); diff --git a/lib_rend/ivas_objectRenderer_sfx.c b/lib_rend/ivas_objectRenderer_sfx.c index 98f45a5dd94b7d6542e679fda3d122d3a13faaa1..d988ad53d2ac65baf5a69da192b9261b6efe7d22 100644 --- a/lib_rend/ivas_objectRenderer_sfx.c +++ b/lib_rend/ivas_objectRenderer_sfx.c @@ -236,7 +236,8 @@ void TDREND_firfilt( float *mem, /* i/o: filter memory */ const int16_t subframe_length, /* i : Length of signal */ const int16_t filterlength, /* i : Filter length */ - const float Gain /* i : Gain */ + const float Gain, /* i : Gain */ + const float prevGain /* i : Previous gain */ ) { float buffer[SFX_SPAT_BIN_MAX_FILTER_LENGTH - 1 + L_SUBFRAME5MS_48k]; @@ -245,6 +246,11 @@ void TDREND_firfilt( float *p_filter; float tmp; int16_t i, j; + float step, gain_tmp, gain_delta; + + gain_delta = ( Gain - prevGain ); + step = gain_delta / ( subframe_length ); + gain_tmp = prevGain; /* Handle memory */ p_signal = buffer + filterlength - 1; @@ -262,7 +268,9 @@ void TDREND_firfilt( { tmp += ( *p_filter++ ) * ( *p_tmp-- ); } - signal[i] = tmp * Gain; + /* Apply linear gain interpolation in case of abrupt gain changes */ + gain_tmp = gain_tmp + step; + signal[i] = tmp * gain_tmp; if ( i < intp_count ) { diff --git a/lib_rend/ivas_objectRenderer_sources.c b/lib_rend/ivas_objectRenderer_sources.c index b14db0b7c2f69c0d784f3f528c4dfa4bc7e8cabe..146827357200dd85373647ae21dc102bea6d5b6f 100644 --- a/lib_rend/ivas_objectRenderer_sources.c +++ b/lib_rend/ivas_objectRenderer_sources.c @@ -219,7 +219,6 @@ static void TDREND_SRC_REND_Init( /* Internal state */ SrcRend_p->InputAvailable = FALSE; SrcRend_p->PlayStatus = TDREND_PLAYSTATUS_INITIAL; - /* SrcGain */ for ( nC = 0; nC < SPAT_BIN_MAX_INPUT_CHANNELS; nC++ ) { @@ -260,7 +259,11 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams( 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 */ +#ifdef FIX_356_ISM_METADATA_SYNC + const int16_t subframe_update_flag +#else + const int16_t subframe_idx /* i : Subframe index to 5 ms subframe */ +#endif ) { TDREND_MIX_Listener_t *Listener_p; @@ -354,7 +357,11 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams( azim_delta = ( azim_delta > 180.0f ) ? ( azim_delta - 360 ) : ( ( azim_delta < -180.0f ) ? ( azim_delta + 360 ) : ( azim_delta ) ); /* map to -180:180 range */ *intp_count = min( MAX_INTERPOLATION_STEPS, max( (int16_t) ( fabsf( azim_delta ) * MAX_ANGULAR_STEP_INV ), (int16_t) ( fabsf( elev_delta ) * MAX_ANGULAR_STEP_INV ) ) ); +#ifdef FIX_356_ISM_METADATA_SYNC + if ( ( *intp_count > 0 ) && subframe_update_flag ) +#else if ( ( *intp_count > 0 ) && subframe_idx == 0 ) +#endif { /* Set deltas for interpolation */ v_sub( hrf_left, hrf_left_prev, hrf_left_delta, *filterlength ); @@ -460,11 +467,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; -#ifdef FIX_379_EXT_METADATA SrcSpatial_p->DistAtten.MaxDist = 15.75f; /* Maximum radius (2^ISM_RADIUS_NBITS-1)*0.25 */ -#else - SrcSpatial_p->DistAtten.MaxDist = 10.0f; -#endif SrcSpatial_p->DistAtten.RollOffFactor = 1.0f; return; @@ -691,7 +694,7 @@ void TDREND_SRC_Init( Src_p->hrf_right_prev[0] = 1; Src_p->azim_prev = 0.0f; Src_p->elev_prev = 0.0f; - + Src_p->prevGain = 1.0f; return; } diff --git a/lib_rend/ivas_orient_trk.c b/lib_rend/ivas_orient_trk.c index 63d863c4b635dcdfc832f9c0027d165a7c902238..ae646b4d5c4b05f4164366730274e152ef58de92 100644 --- a/lib_rend/ivas_orient_trk.c +++ b/lib_rend/ivas_orient_trk.c @@ -406,7 +406,11 @@ ivas_error ivas_orient_trk_Init( pOTR->refRot = identity; /* set safe default tracking mode */ +#ifdef FIX_439_OTR_PARAMS + pOTR->orientation_tracking = HEAD_ORIENT_TRK_NONE; +#else pOTR->trackingType = OTR_TRACKING_NONE; +#endif return IVAS_ERR_OK; } @@ -419,15 +423,24 @@ ivas_error ivas_orient_trk_Init( *-------------------------------------------------------------------*/ ivas_error ivas_orient_trk_SetTrackingType( - ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ + ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ +#ifdef FIX_439_OTR_PARAMS + const HEAD_ORIENT_TRK_T orientation_tracking /* i : orientation tracking type */ +#else const OTR_TRACKING_T trackingType /* i/o: orientation tracking type */ +#endif ) { if ( pOTR == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; } + +#ifdef FIX_439_OTR_PARAMS + pOTR->orientation_tracking = orientation_tracking; +#else pOTR->trackingType = trackingType; +#endif return IVAS_ERR_OK; } @@ -477,17 +490,36 @@ ivas_error ivas_orient_trk_GetMainOrientation( { return IVAS_ERR_UNEXPECTED_NULL_POINTER; } + +#ifdef FIX_439_OTR_PARAMS + switch ( pOTR->orientation_tracking ) +#else switch ( pOTR->trackingType ) +#endif { +#ifdef FIX_439_OTR_PARAMS + case HEAD_ORIENT_TRK_NONE: +#else case OTR_TRACKING_NONE: +#endif *pOrientation = IdentityQuaternion(); break; +#ifdef FIX_439_OTR_PARAMS + case HEAD_ORIENT_TRK_REF_VEC: + case HEAD_ORIENT_TRK_REF_VEC_LEV: + case HEAD_ORIENT_TRK_REF: +#else case OTR_TRACKING_REF_VEC: case OTR_TRACKING_REF_VEC_LEV: case OTR_TRACKING_REF_ORIENT: +#endif *pOrientation = pOTR->refRot; break; +#ifdef FIX_439_OTR_PARAMS + case HEAD_ORIENT_TRK_AVG: +#else case OTR_TRACKING_AVG_ORIENT: +#endif *pOrientation = pOTR->absAvgRot; break; } @@ -539,15 +571,30 @@ ivas_error ivas_orient_trk_SetReferenceVector( return IVAS_ERR_UNEXPECTED_NULL_POINTER; } +#ifdef FIX_439_OTR_PARAMS + switch ( pOTR->orientation_tracking ) +#else switch ( pOTR->trackingType ) +#endif { +#ifdef FIX_439_OTR_PARAMS + case HEAD_ORIENT_TRK_NONE: + case HEAD_ORIENT_TRK_REF: + case HEAD_ORIENT_TRK_AVG: + case HEAD_ORIENT_TRK_REF_VEC: +#else case OTR_TRACKING_NONE: case OTR_TRACKING_REF_ORIENT: case OTR_TRACKING_AVG_ORIENT: case OTR_TRACKING_REF_VEC: +#endif acousticFrontVector = VectorSubtract( listenerPos, refPos ); break; +#ifdef FIX_439_OTR_PARAMS + case HEAD_ORIENT_TRK_REF_VEC_LEV: +#else case OTR_TRACKING_REF_VEC_LEV: +#endif /* ignore the height difference between listener position and reference position */ listenerPosLevel.z = refPosLevel.z = listenerPos.z; listenerPosLevel.x = listenerPos.x; @@ -605,14 +652,28 @@ ivas_error ivas_orient_trk_Process( result = IVAS_ERR_OK; +#ifdef FIX_439_OTR_PARAMS + switch ( pOTR->orientation_tracking ) +#else switch ( pOTR->trackingType ) +#endif { +#ifdef FIX_439_OTR_PARAMS + case HEAD_ORIENT_TRK_NONE: +#else case OTR_TRACKING_NONE: +#endif pOTR->trkRot = absRot; break; +#ifdef FIX_439_OTR_PARAMS + case HEAD_ORIENT_TRK_REF: + case HEAD_ORIENT_TRK_REF_VEC: + case HEAD_ORIENT_TRK_REF_VEC_LEV: +#else case OTR_TRACKING_REF_VEC: case OTR_TRACKING_REF_VEC_LEV: case OTR_TRACKING_REF_ORIENT: +#endif /* Reset average orientation */ pOTR->absAvgRot = absRot; @@ -624,7 +685,11 @@ ivas_error ivas_orient_trk_Process( QuaternionProduct( pOTR->trkRot, absRot, &pOTR->trkRot ); break; +#ifdef FIX_439_OTR_PARAMS + case HEAD_ORIENT_TRK_AVG: +#else case OTR_TRACKING_AVG_ORIENT: +#endif /* Compute average (low-pass filtered) absolute orientation */ QuaternionSlerp( pOTR->absAvgRot, absRot, alpha, &pOTR->absAvgRot ); diff --git a/lib_rend/ivas_prot_rend.h b/lib_rend/ivas_prot_rend.h index 938e8de02c909c85236052bb6055cbd1f97b8143..bcd56aa643e64c9e317545842f0efaa4cd0e75ef 100644 --- a/lib_rend/ivas_prot_rend.h +++ b/lib_rend/ivas_prot_rend.h @@ -92,7 +92,11 @@ void ivas_limiter_close( void ivas_limiter_dec ( IVAS_LIMITER_HANDLE hLimiter, /* i/o: limiter struct handle */ +#ifdef JBM_TSM_ON_TCS + float *output[MAX_OUTPUT_CHANNELS], /* i/o: input/output buffer */ +#else float output[MAX_OUTPUT_CHANNELS][L_FRAME48k], /* i/o: input/output buffer */ +#endif 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 */ @@ -137,11 +141,10 @@ void efap_determine_gains( *----------------------------------------------------------------------------------*/ 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 */ + Decoder_Struct *st_ivas, /* i/o: IVAS decoder struct */ + float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i : Input audio in CLDFB domain, real */ + float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i : Input audio in CLDFB domain, imag */ + const int16_t subframe /* i : Subframe to render */ ); ivas_error ivas_sba_get_hoa_dec_matrix( @@ -156,6 +159,17 @@ void ivas_dirac_dec_binaural( const int16_t nchan_transport /* i : number of transport channels */ ); +#ifdef JBM_TSM_ON_TCS +void ivas_dirac_dec_binaural_render( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + const uint16_t nSamplesAsked, /* i : number of CLDFB slots requested */ + uint16_t *nSamplesRendered, /* o : number of CLDFB slots rendered */ + uint16_t *nSamplesAvailable, /* o : number of CLDFB slots still to render */ + const int16_t nchan_transport, + float *output_f[] /* o : rendered time signal */ +); +#endif + 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 */ @@ -221,8 +235,15 @@ ivas_error ivas_td_binaural_renderer_unwrap( 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_POSITION *Pos, /* i : Listener position data per subframe */ - float output[][L_FRAME48k], /* i/o: SCE channels / Binaural synthesis */ + const IVAS_VECTOR3 *Pos, /* i : Listener position data per subframe */ +#ifdef FIX_356_ISM_METADATA_SYNC + const int16_t ism_md_subframe_update, +#endif +#ifdef JBM_TSM_ON_TCS + float *output[], /* i/o: SCE channels / Binaural synthesis */ +#else + float output[][L_FRAME48k], /* i/o: SCE channels / Binaural synthesis */ +#endif const int16_t output_frame /* i : output frame length */ ); @@ -264,25 +285,42 @@ void ivas_td_binaural_close( ivas_error TDREND_GetMix( BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ +#ifdef JBM_TSM_ON_TCS + float *output[], /* i/o: ISM object synth / rendered output in 0,1 */ +#else float output[][L_FRAME48k], /* i/o: ISM object synth / rendered output in 0,1 */ +#endif const int16_t subframe_length, /* i/o: subframe length */ const int16_t subframe_idx /* i : Subframe index to 5 ms subframe */ +#ifdef FIX_356_ISM_METADATA_SYNC + , + const int16_t ism_md_subframe_update /* Number of subframes to delay metadata to sync with audio */ +#endif ); 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_POSITION *Pos /* i : Listener Position */ + 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 */ +#ifndef FIX_356_ISM_METADATA_SYNC const int16_t lfe_idx, /* i : Input LFE index */ +#endif const IVAS_FORMAT in_format, /* i : Format of input sources */ - const ISM_METADATA_HANDLE *hIsmMetaData, /* i : Input metadata for ISM objects */ + const ISM_METADATA_HANDLE *hIsmMetaData /* i : Input metadata for ISM objects */ +#ifndef FIX_356_ISM_METADATA_SYNC + , +#ifdef JBM_TSM_ON_TCS + float *output[] /* i/o: SCE/MC channels */ +#else float output[][L_FRAME48k] /* i/o: SCE/MC channels */ +#endif +#endif ); void BSplineModelEvalDealloc( @@ -353,7 +391,11 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams( int16_t *itd, /* o: ITD value */ float *Gain, /* o: Gain value */ TDREND_SRC_t *Src_p, +#ifdef FIX_356_ISM_METADATA_SYNC + const int16_t subframe_update_flag /* i : Flag to determine update subframe idx */ +#else const int16_t subframe_idx /* i : Subframe index to 5 ms subframe */ +#endif ); ivas_error TDREND_SRC_Alloc( @@ -462,7 +504,8 @@ void TDREND_firfilt( float *mem, /* i/o: filter memory */ const int16_t subframe_length, /* i : Length of signal */ const int16_t filterlength, /* i : Filter length */ - const float Gain /* i : Gain */ + const float Gain, /* i : Gain */ + const float prevGain /* i : Previous gain */ ); @@ -493,11 +536,29 @@ ivas_error ivas_rend_crendProcess( HEAD_TRACK_DATA_HANDLE hHeadTrackData, IVAS_OUTPUT_SETUP_HANDLE hIntSetup, EFAP_HANDLE hEFAPdata, +#ifdef JBM_TSM_ON_TCS + float *output[], /* i/o: input/output audio channels */ +#else float output[][L_FRAME48k], /* i/o: input/output audio channels */ +#endif const int32_t output_Fs ); - +#ifdef JBM_TSM_ON_TCS +ivas_error ivas_rend_crendProcessSubframe( + 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, + DECODER_TC_BUFFER_HANDLE hTcBuffer, + float *input_f[], + float *output[], /* i/o: input/output audio channels */ + const int16_t n_samples_to_render, + const int32_t output_Fs ); +#endif ivas_error ivas_crend_init_from_rom( @@ -537,16 +598,21 @@ 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 */ +void ivas_binaural_reverb_processSubframe( + REVERB_STRUCT_HANDLE hReverb, /* i/o: binaural reverb handle */ + const int16_t numInChannels, /* i : num input channels to be processed */ +#ifdef JBM_TSM_ON_TCS + const int16_t numSlots, /* i : number of slots to be processed */ +#endif + float inReal[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i : input CLDFB data real */ + float inImag[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i : input CLDFB data imag */ + float outReal[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* o : output CLDFB data real */ + float outImag[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX] /* o : output CLDFB data imag */ ); +#ifdef JBM_TSM_ON_TCS +#endif + ivas_error ivas_reverb_open( REVERB_HANDLE *hReverb, /* i/o: Reverberator handle */ const AUDIO_CONFIG input_audio_config, /* i : reverb. input audio configuration */ @@ -563,8 +629,13 @@ 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 */ +#ifdef JBM_TSM_ON_TCS + float *pcm_in[], /* i : the PCM audio to apply reverb on */ + float *pcm_out[], /* o : the PCM audio with reverb applied */ +#else 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 */ +#endif const int16_t i_ts /* i : subframe index */ ); @@ -787,7 +858,11 @@ void SHrotmatgen( void rotateFrame_shd( HEAD_TRACK_DATA_HANDLE hHeadTrackData, /* i : head track handle */ - float output[][L_FRAME48k], /* i/o: unrotated HOA3 signal buffer in TD */ +#ifdef JBM_TSM_ON_TCS + float *output[], /* i/o: unrotated HOA3 signal buffer in TD */ +#else + float output[][L_FRAME48k], /* i/o: unrotated HOA3 signal buffer in TD */ +#endif 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 */ @@ -795,7 +870,11 @@ void rotateFrame_shd( void rotateFrame_sd( HEAD_TRACK_DATA_HANDLE hHeadTrackData, /* i : head track handle */ - float output[][L_FRAME48k], /* i/o: unrotated SD signal buffer in TD */ +#ifdef JBM_TSM_ON_TCS + float *output[], /* i/o: unrotated SD signal buffer in TD */ +#else + float output[][L_FRAME48k], /* i/o: unrotated SD signal buffer in TD */ +#endif 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 */ @@ -807,6 +886,9 @@ void rotateFrame_shd_cldfb( 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 */ +#ifdef JBM_TSM_ON_TCS + const int16_t numTimeSlots, /* i : number of time slots to process */ +#endif const int16_t shd_rot_max_order /* i : split-order rotation method */ ); @@ -816,6 +898,9 @@ void rotateFrame_sd_cldfb( 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 */ +#ifdef JBM_TSM_ON_TCS + const int16_t numTimeSlots, /* i : number of time slots to process */ +#endif const int16_t nb_band /* i : number of CLDFB bands to process */ ); @@ -848,7 +933,11 @@ ivas_error ivas_orient_trk_Init( ivas_error ivas_orient_trk_SetTrackingType( ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ +#ifdef FIX_439_OTR_PARAMS + const HEAD_ORIENT_TRK_T orientation_tracking /* i : orientation tracking type */ +#else const OTR_TRACKING_T trackingType /* i : orientation tracking type */ +#endif ); ivas_error ivas_orient_trk_SetReferenceRotation( diff --git a/lib_rend/ivas_reverb.c b/lib_rend/ivas_reverb.c index a63b6f4c572c067c6dc8ee55f865f1d6c8b8e3f7..1f2bc07ade174064f86fd4e20dee604bb1efba2c 100644 --- a/lib_rend/ivas_reverb.c +++ b/lib_rend/ivas_reverb.c @@ -1441,7 +1441,11 @@ static void reverb_block( static ivas_error downmix_input_block( const REVERB_HANDLE hReverb, +#ifdef JBM_TSM_ON_TCS + float *pcm_in[], +#else float pcm_in[][L_FRAME48k], +#endif const AUDIO_CONFIG input_audio_config, float *pPcm_out, const int16_t input_offset ) @@ -1583,9 +1587,14 @@ 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 */ +#ifdef JBM_TSM_ON_TCS + float *pcm_in[], /* i : the PCM audio to apply reverb on */ + float *pcm_out[], /* o : the PCM audio with reverb applied */ +#else + 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 */ +#endif + 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]; @@ -1620,25 +1629,39 @@ ivas_error ivas_reverb_process( * 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 */ +void ivas_binaural_reverb_processSubframe( + REVERB_STRUCT_HANDLE hReverb, /* i/o: binaural reverb handle */ + const int16_t numInChannels, /* i : num inputs to be processed */ +#ifdef JBM_TSM_ON_TCS + const int16_t numSlots, /* i : number of slots to be processed */ +#endif + float inReal[][CLDFB_SLOTS_PER_SUBFRAME][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_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i : input CLDFB data imag */ + float outReal[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* o : output CLDFB data real */ + float outImag[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX] /* o : output CLDFB data imag */ ) { /* Declare the required variables */ int16_t idx, bin, ch, sample, invertSampleIndex, tapIdx, *phaseShiftTypePr; float **tapRealPr, **tapImagPr; + push_wmops( "binaural_reverb" ); /* 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++ ) { +#ifdef JBM_TSM_ON_TCS + /* Move the data forwards by blockSize (i.e. by the frame size of 16 CLDFB slots) */ + mvr2r( hReverb->loopBufReal[bin], hReverb->loopBufReal[bin] + numSlots, hReverb->loopBufLength[bin] ); + mvr2r( hReverb->loopBufImag[bin], hReverb->loopBufImag[bin] + numSlots, 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], numSlots ); + v_multc( hReverb->loopBufImag[bin] + hReverb->loopBufLength[bin], hReverb->loopAttenuationFactor[bin], hReverb->loopBufImag[bin], numSlots ); +#else /* 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] ); @@ -1648,15 +1671,23 @@ void ivas_binaural_reverb_processFrame( * 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 ); +#endif } /* 2) Apply the determined pre-delay to the input audio, and add the delayed audio to the loop. */ idx = hReverb->preDelayBufferIndex; +#ifdef JBM_TSM_ON_TCS + for ( sample = 0; sample < numSlots; sample++ ) +#else for ( sample = 0; sample < hReverb->blockSize; sample++ ) +#endif { - uint16_t sampleWithOffset; - sampleWithOffset = sample + offsetSamplesIO; +#ifdef JBM_TSM_ON_TCS + invertSampleIndex = numSlots - sample - 1; +#else invertSampleIndex = hReverb->blockSize - sample - 1; +#endif + for ( bin = 0; bin < hReverb->numBins; bin++ ) { /* Add from pre-delay buffer a sample to the loop buffer, in a time-inverted order. @@ -1673,13 +1704,13 @@ void ivas_binaural_reverb_processFrame( { 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 ); + v_add( hReverb->preDelayBufferReal[idx], inReal[ch][sample], hReverb->preDelayBufferReal[idx], hReverb->numBins ); + v_add( hReverb->preDelayBufferImag[idx], inImag[ch][sample], 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 ); + v_sub( hReverb->preDelayBufferReal[idx], inImag[ch][sample], hReverb->preDelayBufferReal[idx], hReverb->numBins ); + v_add( hReverb->preDelayBufferImag[idx], inReal[ch][sample], hReverb->preDelayBufferImag[idx], hReverb->numBins ); } } idx = ( idx + 1 ) % hReverb->preDelayBufferLength; @@ -1694,17 +1725,41 @@ void ivas_binaural_reverb_processFrame( /* 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 */ +#ifdef JBM_TSM_ON_TCS + set_f( hReverb->outputBufferReal[bin][ch], 0.0f, numSlots ); + set_f( hReverb->outputBufferImag[bin][ch], 0.0f, numSlots ); +#else set_f( hReverb->outputBufferReal[bin][ch], 0.0f, hReverb->blockSize ); set_f( hReverb->outputBufferImag[bin][ch], 0.0f, hReverb->blockSize ); +#endif /* Add from temporally decaying sparse tap locations the audio to the output. */ for ( tapIdx = 0; tapIdx < hReverb->taps[bin][ch]; tapIdx++ ) { switch ( phaseShiftTypePr[tapIdx] ) { +#ifdef JBM_TSM_ON_TCS + case 0: /* 0 degrees phase */ + v_add( hReverb->outputBufferReal[bin][ch], tapRealPr[tapIdx], hReverb->outputBufferReal[bin][ch], numSlots ); + v_add( hReverb->outputBufferImag[bin][ch], tapImagPr[tapIdx], hReverb->outputBufferImag[bin][ch], numSlots ); + break; + case 1: /* 90 degrees phase */ + v_sub( hReverb->outputBufferReal[bin][ch], tapImagPr[tapIdx], hReverb->outputBufferReal[bin][ch], numSlots ); + v_add( hReverb->outputBufferImag[bin][ch], tapRealPr[tapIdx], hReverb->outputBufferImag[bin][ch], numSlots ); + break; + case 2: /* 180 degrees phase */ + v_sub( hReverb->outputBufferReal[bin][ch], tapRealPr[tapIdx], hReverb->outputBufferReal[bin][ch], numSlots ); + v_sub( hReverb->outputBufferImag[bin][ch], tapImagPr[tapIdx], hReverb->outputBufferImag[bin][ch], numSlots ); + break; + default: /* 270 degrees phase */ + v_add( hReverb->outputBufferReal[bin][ch], tapImagPr[tapIdx], hReverb->outputBufferReal[bin][ch], numSlots ); + v_sub( hReverb->outputBufferImag[bin][ch], tapRealPr[tapIdx], hReverb->outputBufferImag[bin][ch], numSlots ); + break; +#else 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 ); @@ -1721,6 +1776,7 @@ void ivas_binaural_reverb_processFrame( 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; +#endif } } } @@ -1730,7 +1786,11 @@ void ivas_binaural_reverb_processFrame( { if ( hReverb->useBinauralCoherence ) { +#ifdef JBM_TSM_ON_TCS + for ( sample = 0; sample < numSlots; sample++ ) +#else for ( sample = 0; sample < hReverb->blockSize; sample++ ) +#endif { float leftRe, rightRe, leftIm, rightIm; @@ -1751,30 +1811,38 @@ void ivas_binaural_reverb_processFrame( /* 4) Write data to output */ for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) { +#ifdef JBM_TSM_ON_TCS + for ( sample = 0; sample < numSlots; sample++ ) +#else for ( sample = 0; sample < hReverb->blockSize; sample++ ) +#endif { - uint16_t sampleWithOffset; - - sampleWithOffset = sample + offsetSamplesIO; - /* Audio was in the temporally inverted order for convolution, re-invert audio to output */ +/* Audio was in the temporally inverted order for convolution, re-invert audio to output */ +#ifdef JBM_TSM_ON_TCS + invertSampleIndex = numSlots - sample - 1; +#else invertSampleIndex = hReverb->blockSize - sample - 1; +#endif 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]; + outReal[ch][sample][bin] = hReverb->outputBufferReal[bin][ch][invertSampleIndex]; + outImag[ch][sample][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; + outReal[ch][sample][bin] = 0.0f; + outImag[ch][sample][bin] = 0.0f; } } } + pop_wmops(); return; } +#ifdef JBM_TSM_ON_TCS +#endif /*------------------------------------------------------------------------- * ivas_binaural_reverb_open() @@ -1899,7 +1967,6 @@ ivas_error ivas_binaural_reverb_open( } -#ifdef FIX_103_RA_PARAMS_PARAM_BIN_REND if ( ( roomAcoustics ) && ( roomAcoustics->override ) ) { ivas_reverb_prepare_cldfb_params( roomAcoustics, hHrtfFastConv, output_config, roomAcoustics->use_brir, sampling_rate, t60, ene ); @@ -1919,28 +1986,6 @@ ivas_error ivas_binaural_reverb_open( ivas_binaural_reverb_setPreDelay( hReverb, 10 ); } } -#else - if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) - { - if ( !roomAcoustics->override ) - { - ivas_binaural_reverb_setReverbTimes( hReverb, sampling_rate, hHrtfFastConv->fastconvReverberationTimes, hHrtfFastConv->fastconvReverberationEneCorrections ); - ivas_binaural_reverb_setPreDelay( hReverb, 10 ); - } - else - { - 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 - { - ivas_binaural_reverb_setReverbTimes( hReverb, sampling_rate, hHrtfParambin->parametricReverberationTimes, hHrtfParambin->parametricReverberationEneCorrections ); - ivas_binaural_reverb_setPreDelay( hReverb, 10 ); - } - -#endif return IVAS_ERR_OK; } diff --git a/lib_rend/ivas_rom_binauralRenderer.c b/lib_rend/ivas_rom_binauralRenderer.c index 9708bac83aec16af96f97ae080fba9933f23d4bb..560a1382d4da5baa0b2f20df636b2f1c17a04bac 100644 --- a/lib_rend/ivas_rom_binauralRenderer.c +++ b/lib_rend/ivas_rom_binauralRenderer.c @@ -53,6 +53,9 @@ /* * Generated with Matlab version 9.3.0.713579 (R2017b) by MUXE6256 */ + +#ifndef UPDATE_SBA_FILTER + const float FASTCONV_HOA3_latency_s = 0.001979167f; const float leftHRIRReal_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS]= { @@ -3670,6 +3673,7071 @@ const float rightHRIRImag_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NT } }; +#endif + +#ifdef UPDATE_SBA_FILTER + +const float FASTCONV_HOA3_latency_s = 0.000666667f; +const float leftHRIRReal_HOA3[BINAURAL_CONVBANDS][16][BINAURAL_NTAPS]= +{ + { + {+0.028305f, +0.686064f, +0.068005f, +0.008358f, +0.000134f}, + {+0.041076f, +0.081510f, -0.101574f, +0.012332f, +0.000133f}, + {+0.004694f, +0.091178f, -0.006019f, -0.000987f, -0.000100f}, + {+0.005000f, +0.062531f, -0.030068f, +0.002120f, -0.000090f}, + {+0.008304f, +0.004854f, +0.003618f, -0.000840f, -0.000150f}, + {+0.005344f, +0.010835f, +0.007864f, +0.004915f, -0.000112f}, + {-0.014194f, +0.005486f, -0.000750f, -0.002195f, +0.000158f}, + {+0.002251f, -0.002762f, +0.046227f, +0.004129f, +0.000004f}, + {-0.024537f, +0.046996f, -0.049712f, -0.006618f, +0.000145f}, + {+0.010068f, -0.052648f, +0.026763f, +0.010223f, +0.000366f}, + {+0.000943f, +0.017480f, -0.020482f, -0.001034f, -0.000058f}, + {+0.002377f, -0.034436f, -0.006489f, +0.012518f, +0.000220f}, + {-0.003606f, -0.027453f, +0.015178f, +0.001090f, -0.000006f}, + {-0.000854f, -0.033509f, +0.016348f, +0.002809f, +0.000078f}, + {+0.001127f, -0.002978f, +0.013287f, +0.005932f, -0.000006f}, + {-0.002728f, -0.006413f, +0.003444f, +0.002047f, +0.000053f} + }, + { + {-0.060981f, +0.539033f, -0.032927f, -0.008925f, -0.000158f}, + {-0.088569f, +0.331317f, +0.135589f, -0.009798f, -0.000139f}, + {-0.006979f, +0.010016f, -0.062582f, +0.002090f, +0.000127f}, + {-0.010389f, +0.024941f, -0.053685f, -0.002256f, +0.000117f}, + {-0.013525f, -0.047393f, -0.001706f, +0.001388f, +0.000191f}, + {-0.006413f, -0.030122f, -0.020701f, -0.011138f, +0.000148f}, + {+0.024834f, +0.109440f, +0.032236f, +0.002032f, -0.000215f}, + {-0.002223f, -0.102504f, -0.064424f, -0.005351f, -0.000007f}, + {+0.037480f, +0.308972f, +0.087606f, +0.006506f, -0.000210f}, + {-0.016939f, -0.106048f, -0.043760f, -0.005027f, -0.000470f}, + {-0.000739f, -0.002371f, -0.021897f, -0.001907f, +0.000076f}, + {-0.005038f, -0.073983f, -0.110448f, -0.018835f, -0.000283f}, + {+0.003491f, -0.004047f, +0.005200f, -0.002767f, +0.000014f}, + {+0.001174f, +0.011186f, +0.026019f, -0.003363f, -0.000098f}, + {-0.002185f, -0.029503f, -0.056810f, -0.012753f, +0.000001f}, + {+0.003633f, +0.007292f, -0.011811f, -0.003296f, -0.000071f} + }, + { + {+0.056640f, +0.424888f, -0.091068f, -0.008146f, -0.000105f}, + {+0.085624f, +0.535380f, -0.135686f, -0.024218f, -0.000137f}, + {+0.000837f, -0.039137f, -0.022512f, -0.003663f, +0.000063f}, + {+0.009275f, -0.013781f, -0.023629f, -0.005508f, +0.000051f}, + {+0.004547f, -0.088202f, +0.042587f, -0.003924f, +0.000093f}, + {-0.003101f, -0.099791f, +0.033209f, +0.007324f, +0.000060f}, + {-0.010598f, +0.183236f, -0.035352f, +0.008713f, -0.000074f}, + {-0.003128f, -0.087287f, -0.092687f, -0.003205f, -0.000001f}, + {-0.002915f, +0.422198f, -0.021401f, +0.017334f, -0.000046f}, + {+0.008367f, -0.030365f, -0.081942f, -0.019445f, -0.000222f}, + {-0.002027f, -0.059247f, +0.024597f, +0.009143f, +0.000033f}, + {+0.005485f, -0.016036f, -0.189920f, +0.005523f, -0.000134f}, + {+0.004590f, +0.043786f, -0.049890f, +0.002054f, -0.000006f}, + {+0.000794f, +0.086150f, -0.052409f, -0.001703f, -0.000051f}, + {+0.002015f, +0.016274f, -0.139462f, +0.010767f, +0.000013f}, + {+0.000980f, +0.021151f, -0.025610f, +0.002927f, -0.000028f} + }, + { + {-0.037044f, +0.299825f, +0.010626f, +0.009027f, +0.000178f}, + {-0.073631f, +0.563948f, +0.256507f, +0.030068f, +0.000165f}, + {+0.001394f, +0.007863f, +0.051772f, +0.005838f, -0.000136f}, + {-0.007311f, +0.033976f, +0.087547f, +0.012955f, -0.000125f}, + {-0.000742f, +0.006564f, +0.155719f, +0.010210f, -0.000207f}, + {+0.003772f, -0.011095f, +0.118202f, +0.002442f, -0.000158f}, + {-0.001621f, -0.014236f, -0.266669f, -0.019686f, +0.000230f}, + {+0.004592f, +0.006155f, +0.002774f, +0.008968f, +0.000009f}, + {-0.017921f, +0.015905f, -0.425734f, -0.038383f, +0.000222f}, + {-0.007216f, +0.258967f, +0.290441f, +0.007092f, +0.000519f}, + {+0.003522f, -0.023316f, +0.032467f, -0.009674f, -0.000084f}, + {-0.006507f, +0.177693f, +0.033997f, -0.006462f, +0.000311f}, + {-0.006842f, +0.024376f, -0.051686f, +0.001498f, -0.000018f}, + {-0.002603f, +0.039216f, -0.091765f, +0.003591f, +0.000108f}, + {-0.003570f, +0.063130f, -0.095408f, -0.005271f, -0.000002f}, + {-0.003443f, +0.045327f, +0.012038f, -0.006717f, +0.000078f} + }, + { + {+0.016927f, -0.038791f, +0.287896f, +0.014303f, +0.000072f}, + {+0.067605f, -0.097306f, +0.721167f, +0.014182f, +0.000134f}, + {+0.004523f, -0.006482f, +0.087578f, -0.003063f, -0.000024f}, + {+0.010963f, -0.024388f, +0.147380f, -0.008366f, -0.000010f}, + {+0.009045f, +0.033260f, +0.131601f, -0.010659f, -0.000033f}, + {+0.006391f, +0.001186f, +0.117010f, -0.003913f, -0.000007f}, + {-0.000206f, -0.124154f, -0.212720f, +0.011624f, -0.000013f}, + {+0.001006f, +0.018224f, +0.038185f, -0.004418f, -0.000004f}, + {+0.005972f, -0.280246f, -0.279425f, +0.024886f, -0.000056f}, + {+0.013866f, +0.056049f, +0.470046f, +0.033031f, +0.000066f}, + {-0.002003f, +0.013997f, -0.006699f, +0.002838f, -0.000007f}, + {+0.005432f, +0.012448f, +0.193385f, +0.021709f, +0.000041f}, + {+0.002080f, -0.035733f, +0.001464f, -0.003877f, +0.000020f}, + {+0.000948f, -0.008178f, -0.047042f, -0.001214f, +0.000022f}, + {+0.008010f, -0.037066f, -0.006003f, +0.001581f, -0.000020f}, + {+0.002016f, -0.033476f, +0.072960f, +0.011160f, +0.000001f} + }, + { + {-0.031783f, -0.056831f, +0.279059f, -0.028993f, -0.000193f}, + {-0.066811f, -0.547107f, +0.401585f, -0.049258f, -0.000209f}, + {-0.014835f, -0.045923f, +0.063394f, -0.003455f, +0.000127f}, + {-0.030703f, -0.186180f, +0.047058f, -0.002768f, +0.000115f}, + {-0.020147f, -0.183472f, -0.029803f, +0.002654f, +0.000199f}, + {-0.004470f, -0.071648f, +0.045482f, -0.003212f, +0.000142f}, + {+0.003858f, +0.057272f, -0.023397f, +0.006911f, -0.000202f}, + {-0.004365f, -0.021410f, +0.013528f, -0.002517f, -0.000010f}, + {-0.011844f, +0.030236f, +0.050498f, +0.004358f, -0.000183f}, + {-0.006262f, -0.197324f, +0.174496f, -0.041478f, -0.000509f}, + {-0.000909f, +0.022088f, -0.010300f, +0.001930f, +0.000082f}, + {+0.000576f, -0.053541f, +0.096593f, -0.021942f, -0.000302f}, + {-0.001649f, -0.054620f, +0.008127f, +0.002136f, +0.000016f}, + {+0.004848f, +0.029592f, +0.000282f, +0.000006f, -0.000106f}, + {-0.010837f, -0.090950f, -0.014402f, -0.000183f, +0.000006f}, + {+0.000125f, -0.021283f, +0.064876f, -0.009148f, -0.000073f} + }, + { + {+0.115524f, -0.001880f, -0.031709f, +0.016815f, -0.000032f}, + {+0.083119f, -0.442745f, -0.062014f, +0.030630f, -0.000109f}, + {+0.026381f, -0.044427f, -0.014701f, +0.004175f, -0.000007f}, + {+0.059970f, -0.279751f, -0.022479f, +0.004671f, -0.000021f}, + {+0.025539f, -0.285695f, -0.030687f, +0.001281f, -0.000018f}, + {-0.015563f, -0.014341f, -0.021407f, +0.004386f, -0.000034f}, + {-0.005271f, +0.080088f, +0.036839f, -0.008678f, +0.000080f}, + {-0.004239f, -0.044848f, +0.005762f, +0.002882f, +0.000009f}, + {+0.051110f, +0.084066f, +0.036589f, -0.007555f, +0.000131f}, + {-0.012587f, -0.147413f, -0.020658f, +0.013969f, +0.000077f}, + {+0.003103f, +0.017462f, -0.008157f, -0.001803f, -0.000018f}, + {-0.001965f, +0.006861f, -0.032042f, +0.005627f, +0.000042f}, + {+0.003954f, -0.069529f, +0.014309f, +0.000469f, -0.000034f}, + {-0.011351f, +0.041303f, +0.021348f, +0.000056f, +0.000005f}, + {+0.003411f, -0.131943f, -0.006306f, -0.000445f, +0.000025f}, + {-0.006265f, +0.023141f, +0.008583f, +0.003180f, +0.000023f} + }, + { + {-0.170064f, -0.305557f, -0.025217f, +0.001133f, +0.000198f}, + {-0.064730f, -0.498651f, -0.047336f, +0.004429f, +0.000255f}, + {-0.023390f, -0.090206f, -0.010300f, +0.000988f, -0.000108f}, + {-0.044740f, -0.402670f, -0.013847f, +0.001569f, -0.000092f}, + {-0.008298f, -0.311166f, -0.004422f, +0.002306f, -0.000173f}, + {+0.024372f, +0.077330f, -0.000442f, +0.001491f, -0.000110f}, + {+0.006327f, +0.051079f, +0.002801f, -0.003002f, +0.000146f}, + {+0.022671f, -0.029757f, -0.017304f, +0.000691f, +0.000009f}, + {-0.067089f, -0.067084f, +0.027632f, -0.007480f, +0.000108f}, + {+0.016067f, -0.071916f, -0.031764f, +0.005887f, +0.000449f}, + {-0.001118f, +0.007300f, -0.004732f, +0.000912f, -0.000072f}, + {-0.012764f, +0.015163f, -0.034285f, +0.004782f, +0.000265f}, + {+0.002476f, -0.078915f, +0.001493f, -0.000518f, -0.000008f}, + {+0.012009f, +0.058211f, +0.005130f, -0.001142f, +0.000096f}, + {+0.017876f, -0.124879f, -0.017363f, +0.001041f, -0.000014f}, + {+0.016489f, +0.044821f, -0.013683f, +0.000199f, +0.000060f} + }, + { + {+0.031523f, -0.568562f, -0.010165f, -0.004741f, -0.000011f}, + {-0.072210f, -0.453377f, -0.012668f, -0.009988f, +0.000056f}, + {-0.013073f, -0.089526f, -0.006790f, -0.002603f, +0.000024f}, + {-0.055858f, -0.385059f, +0.007901f, -0.002683f, +0.000038f}, + {-0.048389f, -0.243348f, +0.011742f, -0.002577f, +0.000053f}, + {-0.000883f, +0.129298f, +0.003415f, -0.002563f, +0.000054f}, + {+0.004842f, +0.028248f, -0.014727f, +0.004067f, -0.000113f}, + {-0.035207f, +0.044693f, -0.000317f, -0.001511f, -0.000014f}, + {+0.027873f, -0.208313f, -0.025747f, +0.006096f, -0.000162f}, + {-0.003882f, -0.022910f, +0.004172f, -0.004195f, -0.000185f}, + {-0.007316f, +0.007332f, +0.005614f, -0.000479f, +0.000037f}, + {+0.030651f, -0.049980f, +0.004306f, -0.003095f, -0.000103f}, + {-0.012670f, -0.046258f, -0.010787f, -0.000294f, +0.000044f}, + {-0.001544f, +0.071605f, -0.001508f, +0.001151f, -0.000025f}, + {-0.039147f, -0.057668f, +0.001114f, -0.001056f, -0.000026f}, + {-0.013243f, +0.076337f, -0.002755f, -0.000535f, -0.000039f} + }, + { + {+0.207932f, -0.287807f, +0.039075f, +0.000182f, -0.000191f}, + {+0.222358f, -0.019823f, +0.045919f, -0.001569f, -0.000284f}, + {+0.051902f, +0.024897f, +0.018540f, -0.000535f, +0.000087f}, + {+0.157008f, -0.084022f, +0.015927f, -0.001511f, +0.000065f}, + {+0.104303f, -0.038679f, +0.004300f, -0.001876f, +0.000138f}, + {-0.031107f, +0.090841f, +0.009802f, -0.001340f, +0.000075f}, + {-0.026573f, -0.012360f, -0.012445f, +0.003442f, -0.000083f}, + {+0.021614f, +0.128929f, +0.008965f, -0.000458f, -0.000006f}, + {+0.022498f, -0.192805f, -0.008217f, +0.005889f, -0.000025f}, + {+0.001966f, -0.020932f, +0.017205f, -0.001490f, -0.000358f}, + {+0.013558f, +0.031486f, +0.001450f, -0.000305f, +0.000057f}, + {-0.020576f, -0.126851f, +0.015311f, -0.000876f, -0.000211f}, + {+0.011427f, -0.005250f, -0.003401f, +0.000196f, -0.000006f}, + {-0.015857f, +0.049501f, -0.003717f, +0.000601f, -0.000080f}, + {+0.034004f, +0.039429f, +0.003524f, -0.000004f, +0.000023f}, + {-0.014818f, +0.079680f, +0.007758f, +0.000184f, -0.000042f} + }, + { + {-0.203020f, +0.343926f, -0.022319f, +0.001551f, +0.000052f}, + {-0.128697f, +0.502946f, -0.012208f, +0.003598f, +0.000018f}, + {-0.021293f, +0.148245f, -0.006309f, +0.001691f, -0.000030f}, + {-0.108184f, +0.296591f, -0.010288f, +0.001875f, -0.000040f}, + {-0.072445f, +0.199735f, -0.008865f, +0.001996f, -0.000070f}, + {+0.035970f, +0.000468f, -0.003327f, +0.001758f, -0.000054f}, + {+0.022536f, -0.076991f, +0.011763f, -0.002716f, +0.000111f}, + {+0.019549f, +0.129451f, +0.001977f, +0.001130f, +0.000018f}, + {-0.040267f, -0.070315f, +0.008077f, -0.004109f, +0.000149f}, + {-0.011400f, -0.010732f, -0.007406f, +0.002026f, +0.000250f}, + {-0.002851f, +0.052737f, -0.000419f, +0.000375f, -0.000049f}, + {-0.020950f, -0.124942f, -0.003929f, +0.001693f, +0.000137f}, + {-0.002830f, +0.012262f, +0.001345f, -0.000201f, -0.000049f}, + {+0.023252f, -0.010554f, +0.006382f, -0.000870f, +0.000037f}, + {+0.002904f, +0.073991f, +0.004806f, +0.000805f, +0.000022f}, + {+0.038844f, +0.012454f, +0.000939f, +0.000294f, +0.000047f} + }, + { + {-0.104978f, +0.491439f, -0.023130f, -0.000395f, +0.000170f}, + {-0.174716f, +0.431741f, -0.037189f, +0.000731f, +0.000283f}, + {-0.071508f, +0.077184f, -0.011405f, +0.000280f, -0.000069f}, + {-0.071830f, +0.341169f, -0.016908f, +0.001162f, -0.000044f}, + {-0.046880f, +0.228632f, -0.012580f, +0.001764f, -0.000105f}, + {-0.015443f, -0.068044f, -0.005570f, +0.000844f, -0.000048f}, + {+0.020736f, -0.083339f, +0.010949f, -0.002791f, +0.000031f}, + {-0.052065f, +0.019705f, -0.009215f, +0.000218f, +0.000001f}, + {+0.033356f, +0.036658f, +0.013911f, -0.004323f, -0.000040f}, + {+0.006601f, +0.021923f, -0.013349f, +0.000309f, +0.000258f}, + {-0.019016f, +0.023410f, -0.005296f, +0.000367f, -0.000039f}, + {+0.051437f, -0.010933f, -0.004546f, -0.000118f, +0.000155f}, + {+0.002536f, +0.019548f, +0.001804f, +0.000278f, +0.000021f}, + {-0.005862f, -0.062421f, -0.001401f, -0.000650f, +0.000064f}, + {-0.033799f, +0.010290f, -0.008108f, -0.000071f, -0.000030f}, + {-0.019280f, -0.065253f, -0.001294f, -0.000391f, +0.000024f} + }, + { + {+0.271163f, -0.091653f, +0.035807f, -0.000730f, -0.000085f}, + {+0.261169f, -0.235971f, +0.033757f, -0.001621f, -0.000093f}, + {+0.095839f, -0.182710f, +0.015397f, -0.001103f, +0.000028f}, + {+0.156712f, -0.007300f, +0.019789f, -0.001371f, +0.000033f}, + {+0.111926f, -0.011250f, +0.016908f, -0.001748f, +0.000072f}, + {-0.005469f, -0.082676f, +0.002169f, -0.001143f, +0.000043f}, + {-0.049695f, +0.016110f, -0.010723f, +0.002011f, -0.000086f}, + {+0.031235f, -0.105162f, +0.004404f, -0.000861f, -0.000020f}, + {-0.012529f, +0.088572f, -0.009833f, +0.002839f, -0.000106f}, + {+0.012620f, +0.018407f, +0.006593f, -0.002080f, -0.000273f}, + {+0.020511f, -0.042167f, +0.004809f, -0.000322f, +0.000054f}, + {-0.032247f, +0.119711f, -0.002446f, -0.001305f, -0.000148f}, + {-0.004589f, +0.033907f, -0.002233f, +0.000259f, +0.000047f}, + {-0.024243f, -0.043735f, -0.001053f, +0.000816f, -0.000043f}, + {+0.018051f, -0.070970f, +0.002759f, -0.000690f, -0.000016f}, + {-0.025928f, -0.049597f, -0.005106f, -0.000174f, -0.000047f} + }, + { + {-0.009292f, -0.523511f, +0.005609f, +0.000701f, -0.000140f}, + {+0.049598f, -0.562660f, +0.018307f, +0.000353f, -0.000250f}, + {+0.026674f, -0.300653f, +0.000453f, -0.000226f, +0.000059f}, + {-0.025200f, -0.281197f, +0.004191f, -0.000792f, +0.000032f}, + {-0.023452f, -0.216602f, +0.003361f, -0.001302f, +0.000079f}, + {+0.022798f, -0.048857f, +0.002028f, -0.000528f, +0.000034f}, + {+0.017850f, +0.123147f, -0.004163f, +0.001736f, -0.000002f}, + {+0.030232f, -0.106769f, +0.006484f, -0.000160f, +0.000004f}, + {-0.027081f, +0.068469f, -0.013975f, +0.002765f, +0.000074f}, + {-0.015824f, -0.032277f, +0.008777f, +0.000341f, -0.000168f}, + {+0.010909f, -0.060681f, +0.000865f, -0.000330f, +0.000023f}, + {-0.018513f, +0.140495f, +0.006788f, +0.000319f, -0.000106f}, + {-0.009128f, +0.032657f, +0.001038f, -0.000299f, -0.000035f}, + {+0.030409f, +0.035966f, +0.000871f, +0.000497f, -0.000049f}, + {+0.024037f, -0.062735f, +0.004854f, -0.000003f, +0.000033f}, + {+0.031906f, +0.040222f, +0.004969f, +0.000300f, -0.000009f} + }, + { + {-0.274242f, -0.111152f, -0.038437f, +0.000541f, +0.000106f}, + {-0.297362f, -0.028772f, -0.040257f, +0.001002f, +0.000153f}, + {-0.157861f, -0.028386f, -0.015885f, +0.000932f, -0.000023f}, + {-0.130190f, -0.116848f, -0.020017f, +0.001091f, -0.000023f}, + {-0.100486f, -0.097500f, -0.017137f, +0.001413f, -0.000066f}, + {-0.042930f, +0.041353f, -0.001818f, +0.000969f, -0.000030f}, + {+0.035539f, +0.107479f, +0.005226f, -0.001521f, +0.000054f}, + {-0.056245f, +0.022881f, -0.006748f, +0.000737f, +0.000020f}, + {+0.051781f, -0.041176f, +0.012387f, -0.002184f, +0.000054f}, + {-0.005351f, -0.056149f, -0.003091f, +0.002220f, +0.000265f}, + {-0.035484f, +0.008203f, -0.004198f, +0.000217f, -0.000054f}, + {+0.049383f, +0.039088f, +0.002024f, +0.001275f, +0.000143f}, + {+0.027963f, -0.019171f, +0.001212f, -0.000337f, -0.000040f}, + {+0.004231f, +0.075991f, +0.001119f, -0.000670f, +0.000043f}, + {-0.028326f, +0.016304f, -0.003947f, +0.000597f, +0.000009f}, + {+0.014165f, +0.065014f, +0.003473f, +0.000208f, +0.000042f} + }, + { + {+0.100761f, +0.468705f, +0.009523f, -0.000855f, +0.000106f}, + {+0.068322f, +0.534398f, -0.000794f, -0.001015f, +0.000195f}, + {+0.100085f, +0.366003f, +0.010962f, +0.000114f, -0.000054f}, + {+0.079789f, +0.208939f, +0.006983f, +0.000516f, -0.000029f}, + {+0.074868f, +0.177414f, +0.007217f, +0.000977f, -0.000063f}, + {+0.040080f, +0.169063f, +0.003424f, +0.000213f, -0.000031f}, + {-0.047852f, -0.014657f, +0.004244f, -0.000996f, -0.000005f}, + {+0.004688f, +0.112753f, -0.003849f, +0.000122f, -0.000008f}, + {-0.009956f, -0.138804f, +0.008769f, -0.001626f, -0.000077f}, + {+0.022634f, -0.009810f, -0.007400f, -0.000511f, +0.000099f}, + {+0.010732f, +0.077733f, +0.000399f, +0.000274f, -0.000009f}, + {-0.039390f, -0.089325f, -0.008313f, -0.000351f, +0.000070f}, + {-0.019067f, -0.090342f, -0.002768f, +0.000205f, +0.000044f}, + {-0.042005f, +0.002738f, -0.004159f, -0.000376f, +0.000037f}, + {-0.016073f, +0.032695f, -0.005232f, +0.000105f, -0.000033f}, + {-0.040117f, -0.022661f, -0.007858f, -0.000231f, -0.000002f} + }, + { + {+0.246756f, +0.241170f, +0.035479f, -0.000554f, -0.000114f}, + {+0.272424f, +0.216540f, +0.039997f, -0.001031f, -0.000186f}, + {+0.100824f, +0.372627f, +0.007492f, -0.000845f, +0.000020f}, + {+0.086728f, +0.200706f, +0.013419f, -0.000947f, +0.000014f}, + {+0.067471f, +0.194793f, +0.010208f, -0.001216f, +0.000058f}, + {+0.018637f, +0.214052f, -0.004837f, -0.000884f, +0.000020f}, + {+0.025584f, -0.127835f, -0.000911f, +0.001401f, -0.000028f}, + {+0.056339f, +0.027855f, +0.010673f, -0.000579f, -0.000019f}, + {-0.060859f, -0.070229f, -0.011217f, +0.002123f, -0.000013f}, + {-0.014798f, +0.052375f, +0.000623f, -0.002191f, -0.000241f}, + {+0.034285f, +0.039743f, +0.005351f, -0.000109f, +0.000050f}, + {+0.007201f, -0.159482f, +0.003886f, -0.001201f, -0.000130f}, + {-0.020187f, -0.092383f, +0.000382f, +0.000354f, +0.000030f}, + {+0.028788f, -0.109693f, +0.004153f, +0.000525f, -0.000041f}, + {+0.036625f, -0.054073f, +0.008577f, -0.000524f, -0.000003f}, + {-0.002610f, -0.084126f, +0.000986f, -0.000174f, -0.000035f} + }, + { + {-0.167535f, -0.399812f, -0.020854f, +0.000806f, -0.000074f}, + {-0.145635f, -0.430918f, -0.013134f, +0.001141f, -0.000134f}, + {-0.184602f, -0.052096f, -0.013909f, -0.000043f, +0.000053f}, + {-0.110131f, -0.103022f, -0.011251f, -0.000423f, +0.000031f}, + {-0.114138f, -0.085208f, -0.011213f, -0.000798f, +0.000055f}, + {-0.095938f, +0.054666f, -0.000697f, -0.000059f, +0.000033f}, + {-0.000204f, -0.169483f, -0.009146f, +0.000575f, -0.000003f}, + {-0.030090f, -0.112432f, -0.004382f, -0.000216f, +0.000011f}, + {+0.053018f, +0.105332f, -0.004066f, +0.000908f, +0.000060f}, + {-0.009119f, +0.057095f, +0.007675f, +0.000456f, -0.000052f}, + {-0.027961f, -0.057568f, -0.003773f, -0.000262f, -0.000002f}, + {+0.030433f, -0.136477f, +0.002756f, +0.000256f, -0.000046f}, + {+0.049955f, +0.009293f, +0.002856f, -0.000133f, -0.000047f}, + {+0.028171f, -0.112646f, +0.000816f, +0.000380f, -0.000028f}, + {+0.014607f, -0.096614f, -0.000430f, -0.000147f, +0.000031f}, + {+0.051182f, -0.003494f, +0.006796f, +0.000143f, +0.000008f} + }, + { + {-0.208650f, -0.335847f, -0.029770f, +0.000608f, +0.000111f}, + {-0.234234f, -0.291735f, -0.035875f, +0.001265f, +0.000192f}, + {+0.043525f, -0.386017f, -0.001141f, +0.000753f, -0.000019f}, + {-0.024332f, -0.238532f, -0.004594f, +0.000982f, -0.000011f}, + {-0.003204f, -0.260777f, -0.001135f, +0.001218f, -0.000051f}, + {+0.094495f, -0.222636f, +0.006686f, +0.000805f, -0.000016f}, + {-0.041620f, -0.113126f, +0.003804f, -0.001425f, +0.000014f}, + {-0.059468f, -0.070637f, -0.008480f, +0.000599f, +0.000018f}, + {+0.037218f, +0.133212f, +0.009087f, -0.002277f, -0.000009f}, + {+0.028004f, -0.004399f, +0.001485f, +0.002043f, +0.000214f}, + {-0.030214f, -0.052517f, -0.005355f, +0.000063f, -0.000045f}, + {-0.064016f, -0.008538f, -0.001790f, +0.001210f, +0.000117f}, + {-0.035765f, +0.136937f, -0.003958f, -0.000288f, -0.000023f}, + {-0.055646f, +0.013868f, -0.004689f, -0.000551f, +0.000038f}, + {-0.069712f, +0.026129f, -0.007603f, +0.000472f, -0.000000f}, + {-0.022298f, +0.108549f, -0.003048f, +0.000134f, +0.000029f} + }, + { + {+0.220027f, +0.326004f, +0.029195f, -0.000639f, +0.000050f}, + {+0.196112f, +0.377527f, +0.024063f, -0.000894f, +0.000082f}, + {+0.120792f, -0.254914f, +0.016146f, +0.000093f, -0.000054f}, + {+0.094942f, -0.058645f, +0.007709f, +0.000309f, -0.000035f}, + {+0.109837f, -0.090094f, +0.008580f, +0.000595f, -0.000051f}, + {+0.015004f, -0.336419f, -0.000747f, +0.000099f, -0.000037f}, + {+0.088851f, +0.073948f, +0.011663f, -0.000480f, +0.000014f}, + {+0.078671f, +0.147609f, +0.010996f, +0.000157f, -0.000013f}, + {-0.073075f, -0.041998f, -0.000840f, -0.000593f, -0.000038f}, + {-0.021795f, -0.078114f, -0.010687f, -0.000406f, +0.000022f}, + {+0.048839f, +0.075397f, +0.009105f, +0.000275f, +0.000010f}, + {+0.060558f, +0.174519f, +0.000133f, -0.000349f, +0.000030f}, + {-0.014867f, +0.171348f, +0.000948f, +0.000119f, +0.000048f}, + {+0.011606f, +0.111954f, +0.001552f, -0.000324f, +0.000023f}, + {+0.032653f, +0.181837f, +0.003210f, +0.000081f, -0.000029f}, + {-0.047749f, +0.068914f, -0.006585f, -0.000128f, -0.000011f} + }, + { + {+0.160319f, +0.417913f, +0.022833f, -0.000655f, -0.000102f}, + {+0.203183f, +0.369192f, +0.029570f, -0.001470f, -0.000179f}, + {-0.099428f, +0.084211f, -0.009701f, -0.000901f, +0.000019f}, + {-0.024797f, +0.121541f, +0.001449f, -0.000997f, +0.000010f}, + {-0.062623f, +0.173224f, -0.004907f, -0.001276f, +0.000047f}, + {-0.122967f, -0.126986f, -0.011441f, -0.000914f, +0.000015f}, + {-0.052738f, +0.283556f, -0.009426f, +0.001548f, -0.000011f}, + {+0.026749f, +0.238083f, -0.000760f, -0.000643f, -0.000018f}, + {-0.009777f, -0.145605f, -0.003329f, +0.002400f, +0.000014f}, + {-0.015861f, -0.086444f, +0.001699f, -0.001895f, -0.000191f}, + {+0.021170f, +0.125446f, -0.000128f, -0.000133f, +0.000040f}, + {+0.009541f, +0.253886f, -0.000901f, -0.000985f, -0.000105f}, + {+0.062589f, +0.060931f, +0.003167f, +0.000273f, +0.000019f}, + {+0.045937f, +0.052228f, +0.008096f, +0.000661f, -0.000035f}, + {+0.065525f, +0.132007f, +0.007909f, -0.000377f, +0.000001f}, + {+0.049219f, -0.081032f, +0.007172f, +0.000024f, -0.000024f} + }, + { + {-0.257389f, -0.225050f, -0.034043f, +0.000536f, -0.000034f}, + {-0.247632f, -0.326555f, -0.030602f, +0.000692f, -0.000048f}, + {-0.031117f, +0.179461f, -0.007189f, +0.000264f, +0.000055f}, + {-0.035804f, +0.099360f, -0.004701f, -0.000140f, +0.000038f}, + {-0.050312f, +0.188989f, -0.003722f, -0.000209f, +0.000050f}, + {+0.100154f, +0.206241f, +0.011197f, +0.000132f, +0.000040f}, + {-0.083770f, +0.242079f, -0.010883f, +0.000381f, -0.000023f}, + {-0.128871f, +0.005839f, -0.011060f, +0.000130f, +0.000016f}, + {+0.079686f, -0.004748f, +0.001794f, +0.000421f, +0.000023f}, + {+0.049708f, +0.006526f, +0.011594f, +0.000511f, -0.000001f}, + {-0.089665f, -0.042291f, -0.010250f, -0.000131f, -0.000016f}, + {-0.097341f, +0.094533f, -0.003394f, +0.000253f, -0.000020f}, + {-0.063601f, -0.124244f, -0.005358f, -0.000329f, -0.000050f}, + {-0.033103f, -0.074639f, -0.008297f, +0.000018f, -0.000018f}, + {-0.088809f, -0.106459f, -0.010306f, +0.000001f, +0.000028f}, + {+0.024983f, -0.120136f, +0.002311f, -0.000104f, +0.000013f} + }, + { + {-0.103698f, -0.459883f, -0.015029f, +0.000609f, +0.000094f}, + {-0.162130f, -0.457377f, -0.023723f, +0.001331f, +0.000162f}, + {+0.064814f, +0.022691f, +0.012901f, +0.000560f, -0.000021f}, + {+0.014719f, +0.018235f, +0.000043f, +0.000822f, -0.000013f}, + {+0.074601f, -0.003099f, +0.007367f, +0.000899f, -0.000047f}, + {+0.032786f, +0.305719f, +0.004336f, +0.000704f, -0.000017f}, + {+0.154173f, -0.111921f, +0.017036f, -0.001496f, +0.000014f}, + {+0.075072f, -0.308164f, +0.011544f, +0.000327f, +0.000019f}, + {-0.016061f, +0.143722f, +0.001013f, -0.002196f, -0.000011f}, + {-0.025959f, +0.115431f, -0.002496f, +0.001721f, +0.000173f}, + {+0.041136f, -0.248497f, +0.009339f, +0.000010f, -0.000035f}, + {+0.096543f, -0.197881f, +0.009153f, +0.000920f, +0.000096f}, + {+0.003482f, -0.225559f, +0.000330f, -0.000071f, -0.000017f}, + {-0.034753f, -0.075563f, -0.003521f, -0.000361f, +0.000033f}, + {-0.012501f, -0.228861f, +0.001789f, +0.000220f, -0.000002f}, + {-0.060118f, +0.006012f, -0.006537f, +0.000205f, +0.000020f} + }, + { + {+0.272901f, +0.120676f, +0.037748f, -0.000537f, +0.000024f}, + {+0.297115f, +0.254096f, +0.039956f, -0.000532f, +0.000029f}, + {+0.012561f, -0.060035f, +0.001952f, -0.000137f, -0.000057f}, + {-0.010704f, -0.021303f, -0.001694f, +0.000133f, -0.000041f}, + {-0.011296f, -0.129516f, -0.000519f, +0.000384f, -0.000049f}, + {-0.122480f, +0.073347f, -0.013051f, -0.000154f, -0.000043f}, + {-0.027641f, -0.385713f, +0.003287f, -0.000254f, +0.000026f}, + {+0.091871f, -0.289596f, +0.005177f, +0.000144f, -0.000020f}, + {-0.076925f, +0.038077f, -0.006550f, -0.000475f, -0.000017f}, + {-0.038364f, +0.096477f, -0.011620f, -0.000633f, -0.000016f}, + {+0.083812f, -0.194659f, +0.004197f, +0.000207f, +0.000021f}, + {+0.014333f, -0.322027f, -0.003857f, -0.000214f, +0.000012f}, + {+0.069724f, -0.130370f, +0.003481f, +0.000262f, +0.000055f}, + {+0.055755f, +0.063207f, +0.009924f, -0.000154f, +0.000014f}, + {+0.116659f, -0.036299f, +0.011120f, +0.000178f, -0.000028f}, + {+0.003252f, +0.097067f, -0.002843f, -0.000113f, -0.000015f} + }, + { + {+0.054050f, +0.455222f, +0.008683f, -0.000439f, -0.000087f}, + {+0.103203f, +0.556970f, +0.012926f, -0.001069f, -0.000150f}, + {-0.045598f, +0.034469f, -0.010843f, -0.000589f, +0.000024f}, + {+0.039968f, -0.100631f, +0.007931f, -0.000653f, +0.000016f}, + {-0.036140f, -0.084377f, -0.005388f, -0.000960f, +0.000048f}, + {+0.073377f, -0.218074f, +0.003890f, -0.000548f, +0.000019f}, + {-0.139694f, -0.217657f, -0.014427f, +0.001226f, -0.000017f}, + {-0.165152f, +0.096949f, -0.015920f, -0.000710f, -0.000018f}, + {+0.031303f, -0.142424f, +0.007473f, +0.002097f, +0.000008f}, + {+0.049659f, -0.036455f, +0.006360f, -0.001588f, -0.000158f}, + {-0.120231f, +0.105131f, -0.009262f, -0.000134f, +0.000029f}, + {-0.112765f, -0.136113f, -0.006454f, -0.000956f, -0.000090f}, + {-0.075212f, +0.079481f, -0.002605f, +0.000191f, +0.000013f}, + {+0.010244f, +0.133401f, +0.001533f, +0.000399f, -0.000031f}, + {-0.084844f, +0.273648f, -0.011540f, -0.000496f, +0.000003f}, + {+0.047604f, +0.022269f, +0.009154f, -0.000024f, -0.000017f} + }, + { + {-0.277495f, -0.057148f, -0.039168f, +0.000475f, -0.000017f}, + {-0.335782f, -0.115073f, -0.042124f, +0.000524f, -0.000017f}, + {-0.014669f, +0.088939f, +0.001371f, +0.000122f, +0.000060f}, + {+0.009872f, -0.151750f, -0.001271f, -0.000309f, +0.000043f}, + {+0.029086f, +0.017821f, +0.006048f, -0.000346f, +0.000049f}, + {+0.042390f, -0.261438f, +0.007011f, -0.000009f, +0.000045f}, + {+0.104924f, +0.146847f, +0.003710f, +0.000271f, -0.000026f}, + {+0.039062f, +0.403951f, +0.006577f, +0.000208f, +0.000025f}, + {+0.091871f, -0.050822f, +0.003447f, +0.000141f, +0.000018f}, + {+0.018408f, -0.085038f, +0.009119f, +0.000628f, +0.000033f}, + {+0.008166f, +0.290055f, -0.001289f, -0.000009f, -0.000025f}, + {+0.083446f, +0.145097f, +0.006817f, +0.000355f, -0.000005f}, + {+0.001946f, +0.186834f, -0.001987f, -0.000254f, -0.000062f}, + {-0.073121f, +0.003981f, -0.011768f, +0.000112f, -0.000011f}, + {-0.055297f, +0.324881f, -0.002032f, +0.000100f, +0.000030f}, + {-0.005812f, -0.063805f, -0.001869f, -0.000040f, +0.000017f} + }, + { + {-0.014583f, -0.461985f, -0.000589f, +0.000415f, +0.000084f}, + {-0.018754f, -0.598224f, -0.004168f, +0.000868f, +0.000145f}, + {+0.055019f, -0.010592f, +0.005290f, +0.000633f, -0.000030f}, + {-0.104242f, +0.017058f, -0.011823f, +0.000782f, -0.000020f}, + {-0.000800f, +0.063354f, -0.000572f, +0.000962f, -0.000051f}, + {-0.090619f, -0.057573f, -0.010215f, +0.000723f, -0.000024f}, + {+0.065017f, +0.191423f, +0.017537f, -0.001148f, +0.000017f}, + {+0.139685f, +0.247968f, +0.017011f, +0.000519f, +0.000015f}, + {-0.081755f, +0.219112f, -0.011774f, -0.001680f, -0.000011f}, + {-0.055793f, +0.030364f, -0.009245f, +0.001646f, +0.000143f}, + {+0.108310f, +0.127663f, +0.016687f, -0.000038f, -0.000024f}, + {+0.021618f, +0.220697f, +0.010039f, +0.000820f, +0.000085f}, + {+0.057142f, +0.095325f, +0.009328f, -0.000335f, -0.000006f}, + {+0.036537f, -0.167818f, +0.005791f, -0.000423f, +0.000028f}, + {+0.142336f, +0.030915f, +0.012827f, +0.000283f, -0.000005f}, + {-0.054469f, +0.008573f, -0.006883f, +0.000115f, +0.000013f} + }, + { + {+0.285346f, -0.000721f, +0.040577f, -0.000527f, +0.000010f}, + {+0.330415f, -0.056420f, +0.045563f, -0.000643f, +0.000004f}, + {-0.012995f, -0.109088f, -0.001469f, -0.000116f, -0.000061f}, + {+0.054559f, +0.256864f, +0.005920f, +0.000204f, -0.000044f}, + {-0.023615f, +0.028111f, -0.005911f, +0.000294f, -0.000047f}, + {+0.037741f, +0.135965f, -0.001385f, -0.000118f, -0.000047f}, + {-0.085123f, -0.059304f, -0.014815f, -0.000093f, +0.000026f}, + {-0.148478f, -0.190646f, -0.017151f, -0.000040f, -0.000030f}, + {-0.071070f, +0.234644f, +0.000090f, +0.000012f, -0.000018f}, + {-0.012169f, +0.103078f, -0.005526f, -0.000708f, -0.000048f}, + {-0.074830f, -0.156990f, -0.009538f, +0.000116f, +0.000028f}, + {-0.062857f, +0.082116f, -0.012816f, -0.000338f, -0.000001f}, + {-0.030566f, -0.039000f, -0.001188f, +0.000200f, +0.000068f}, + {+0.059034f, -0.139462f, +0.005767f, +0.000011f, +0.000009f}, + {-0.076286f, -0.295015f, -0.006131f, +0.000097f, -0.000032f}, + {+0.020240f, +0.124242f, +0.005046f, +0.000022f, -0.000019f} + }, + { + {-0.029891f, +0.483300f, -0.005377f, -0.000391f, -0.000081f}, + {-0.047047f, +0.524471f, -0.005924f, -0.000814f, -0.000145f}, + {-0.033704f, -0.078188f, -0.004373f, -0.000586f, +0.000038f}, + {+0.113469f, +0.163524f, +0.016393f, -0.000689f, +0.000025f}, + {+0.026484f, -0.050686f, +0.004980f, -0.000903f, +0.000054f}, + {+0.034959f, +0.130515f, +0.008100f, -0.000616f, +0.000030f}, + {-0.066335f, -0.098213f, -0.008880f, +0.001011f, -0.000017f}, + {-0.023755f, -0.374088f, -0.006475f, -0.000645f, -0.000010f}, + {+0.134342f, -0.080266f, +0.017137f, +0.001581f, +0.000017f}, + {+0.074905f, -0.029652f, +0.011288f, -0.001578f, -0.000126f}, + {-0.054496f, -0.184572f, -0.009789f, -0.000066f, +0.000019f}, + {+0.016479f, -0.037096f, -0.001911f, -0.000841f, -0.000081f}, + {-0.021095f, -0.045463f, -0.006941f, +0.000367f, -0.000005f}, + {-0.086237f, +0.078591f, -0.009216f, +0.000337f, -0.000026f}, + {-0.069456f, -0.298926f, -0.009331f, -0.000395f, +0.000009f}, + {+0.062149f, +0.062591f, +0.008033f, -0.000068f, -0.000009f} + }, + { + {-0.287720f, +0.086727f, -0.040473f, +0.000543f, -0.000002f}, + {-0.307994f, +0.118968f, -0.043852f, +0.000752f, +0.000013f}, + {+0.022546f, +0.002148f, +0.001070f, +0.000030f, +0.000061f}, + {-0.122549f, -0.198231f, -0.013063f, -0.000256f, +0.000044f}, + {+0.010325f, -0.076779f, +0.004480f, -0.000277f, +0.000045f}, + {-0.047884f, -0.004957f, -0.004446f, +0.000008f, +0.000047f}, + {+0.101276f, +0.163028f, +0.013822f, +0.000017f, -0.000028f}, + {+0.155414f, -0.094864f, +0.020739f, +0.000087f, +0.000033f}, + {+0.000170f, -0.277663f, -0.004084f, -0.000303f, +0.000013f}, + {-0.006631f, -0.159391f, +0.003115f, +0.000670f, +0.000060f}, + {+0.094163f, +0.047695f, +0.013081f, -0.000014f, -0.000031f}, + {+0.015662f, -0.033250f, +0.008826f, +0.000442f, +0.000008f}, + {+0.006909f, +0.002414f, +0.001228f, -0.000038f, -0.000070f}, + {+0.006389f, +0.219286f, -0.001425f, -0.000018f, -0.000007f}, + {+0.134427f, +0.013316f, +0.014160f, -0.000072f, +0.000032f}, + {-0.053148f, -0.113719f, -0.007802f, -0.000103f, +0.000020f} + }, + { + {+0.079885f, -0.476239f, +0.011873f, +0.000403f, +0.000078f}, + {+0.090327f, -0.495394f, +0.013216f, +0.000916f, +0.000142f}, + {+0.000547f, +0.029987f, +0.004365f, +0.000538f, -0.000045f}, + {-0.078456f, -0.260754f, -0.012403f, +0.000685f, -0.000030f}, + {-0.048231f, +0.015397f, -0.007225f, +0.000847f, -0.000058f}, + {+0.004788f, -0.088135f, +0.001735f, +0.000622f, -0.000036f}, + {+0.068597f, +0.218020f, +0.007943f, -0.001019f, +0.000017f}, + {-0.078771f, +0.264267f, -0.009097f, +0.000536f, +0.000005f}, + {-0.131816f, -0.067791f, -0.019315f, -0.001572f, -0.000023f}, + {-0.095197f, -0.024052f, -0.012511f, +0.001509f, +0.000110f}, + {+0.005662f, +0.184911f, +0.000567f, +0.000000f, -0.000014f}, + {+0.009469f, -0.021505f, +0.002081f, +0.000772f, +0.000077f}, + {+0.033042f, -0.040492f, +0.006178f, -0.000358f, +0.000017f}, + {+0.078726f, +0.109328f, +0.007889f, -0.000339f, +0.000024f}, + {-0.046322f, +0.287690f, -0.005571f, +0.000332f, -0.000013f}, + {-0.044568f, -0.127346f, -0.006458f, +0.000067f, +0.000005f} + }, + { + {+0.276202f, -0.173485f, +0.038792f, -0.000516f, -0.000006f}, + {+0.290883f, -0.185607f, +0.040080f, -0.000773f, -0.000032f}, + {+0.006320f, +0.034810f, -0.001793f, -0.000042f, -0.000058f}, + {+0.162615f, +0.113765f, +0.021156f, +0.000233f, -0.000044f}, + {+0.015723f, +0.117462f, +0.000807f, +0.000218f, -0.000042f}, + {+0.035133f, -0.040557f, +0.002714f, -0.000053f, -0.000045f}, + {-0.149176f, -0.117916f, -0.017638f, +0.000076f, +0.000032f}, + {-0.096551f, +0.235346f, -0.015008f, -0.000034f, -0.000033f}, + {+0.060894f, +0.224376f, +0.012831f, +0.000523f, -0.000005f}, + {+0.046438f, +0.197810f, +0.002809f, -0.000665f, -0.000069f}, + {-0.091389f, +0.035774f, -0.012879f, +0.000048f, +0.000034f}, + {-0.015830f, -0.061261f, -0.007852f, -0.000438f, -0.000014f}, + {+0.002026f, -0.092831f, -0.002527f, +0.000001f, +0.000068f}, + {-0.065981f, -0.109512f, -0.004136f, +0.000073f, +0.000006f}, + {-0.096454f, +0.210224f, -0.012022f, +0.000110f, -0.000032f}, + {+0.076635f, +0.057848f, +0.009841f, +0.000158f, -0.000021f} + }, + { + {-0.125058f, +0.440590f, -0.018260f, -0.000430f, -0.000074f}, + {-0.130636f, +0.461671f, -0.019013f, -0.001042f, -0.000135f}, + {-0.005358f, +0.049252f, -0.002302f, -0.000396f, +0.000051f}, + {+0.032652f, +0.314396f, +0.003878f, -0.000647f, +0.000035f}, + {+0.057782f, +0.056244f, +0.005456f, -0.000765f, +0.000061f}, + {-0.029537f, +0.058278f, -0.004239f, -0.000490f, +0.000041f}, + {-0.028429f, -0.304901f, -0.002344f, +0.001021f, -0.000019f}, + {+0.130605f, -0.114123f, +0.015550f, -0.000447f, -0.000002f}, + {+0.097618f, +0.163746f, +0.014826f, +0.001576f, +0.000024f}, + {+0.095269f, +0.125227f, +0.010570f, -0.001415f, -0.000094f}, + {+0.036826f, -0.161036f, +0.004519f, -0.000009f, +0.000008f}, + {-0.033206f, -0.037588f, -0.003181f, -0.000776f, -0.000072f}, + {-0.072280f, +0.019767f, -0.008230f, +0.000211f, -0.000025f}, + {-0.018897f, -0.179348f, -0.001641f, +0.000298f, -0.000022f}, + {+0.125361f, -0.129557f, +0.014806f, -0.000290f, +0.000016f}, + {+0.013372f, +0.152966f, +0.003485f, -0.000081f, -0.000000f} + }, + { + {-0.255232f, +0.238323f, -0.036506f, +0.000482f, +0.000012f}, + {-0.271075f, +0.243750f, -0.037165f, +0.000660f, +0.000051f}, + {-0.023107f, +0.018988f, -0.002567f, +0.000111f, +0.000056f}, + {-0.186496f, -0.022822f, -0.024016f, -0.000167f, +0.000044f}, + {-0.051695f, -0.108630f, -0.002988f, -0.000126f, +0.000040f}, + {-0.009503f, +0.085941f, -0.000815f, +0.000139f, +0.000044f}, + {+0.180203f, +0.018265f, +0.021900f, -0.000114f, -0.000036f}, + {+0.016842f, -0.287897f, +0.004711f, +0.000063f, +0.000033f}, + {-0.099412f, -0.136019f, -0.018932f, -0.000549f, -0.000004f}, + {-0.093434f, -0.165866f, -0.008284f, +0.000735f, +0.000077f}, + {+0.070607f, -0.107384f, +0.011250f, -0.000036f, -0.000037f}, + {+0.051205f, +0.088169f, +0.009120f, +0.000422f, +0.000021f}, + {+0.038077f, +0.190808f, +0.007278f, -0.000071f, -0.000066f}, + {+0.068484f, -0.044857f, +0.006706f, -0.000103f, -0.000005f}, + {+0.001471f, -0.319381f, +0.000965f, -0.000110f, +0.000032f}, + {-0.082910f, +0.001623f, -0.012705f, -0.000176f, +0.000021f} + }, + { + {+0.160937f, -0.399834f, +0.024221f, +0.000432f, +0.000069f}, + {+0.165837f, -0.426649f, +0.024449f, +0.001120f, +0.000123f}, + {+0.023251f, -0.053963f, +0.006296f, +0.000280f, -0.000056f}, + {+0.026012f, -0.349222f, +0.003958f, +0.000583f, -0.000040f}, + {-0.039815f, -0.122590f, -0.005933f, +0.000681f, -0.000065f}, + {+0.034180f, +0.017407f, +0.005868f, +0.000354f, -0.000044f}, + {-0.036119f, +0.354110f, -0.007651f, -0.001004f, +0.000024f}, + {-0.131608f, -0.060108f, -0.015438f, +0.000373f, +0.000002f}, + {-0.047240f, -0.215086f, -0.007922f, -0.001603f, -0.000021f}, + {-0.065165f, -0.208130f, -0.007649f, +0.001302f, +0.000078f}, + {-0.065730f, +0.103768f, -0.008899f, -0.000008f, -0.000000f}, + {+0.017223f, +0.140007f, +0.001227f, +0.000774f, +0.000066f}, + {+0.083700f, +0.123118f, +0.007692f, -0.000085f, +0.000029f}, + {-0.033766f, +0.111436f, -0.004405f, -0.000238f, +0.000019f}, + {-0.130713f, -0.118837f, -0.014005f, +0.000285f, -0.000018f}, + {+0.016465f, -0.154956f, +0.002867f, +0.000097f, -0.000004f} + }, + { + {+0.233948f, -0.286085f, +0.033289f, -0.000467f, -0.000018f}, + {+0.251749f, -0.291487f, +0.034882f, -0.000530f, -0.000064f}, + {+0.025018f, -0.051984f, +0.002062f, -0.000213f, -0.000058f}, + {+0.182278f, -0.109310f, +0.023310f, +0.000129f, -0.000046f}, + {+0.065186f, +0.041803f, +0.007285f, +0.000055f, -0.000040f}, + {-0.015347f, -0.057135f, -0.002287f, -0.000244f, -0.000046f}, + {-0.178612f, +0.136904f, -0.019882f, +0.000114f, +0.000039f}, + {+0.053858f, +0.222770f, +0.004143f, -0.000170f, -0.000036f}, + {+0.110687f, +0.021864f, +0.019313f, +0.000540f, +0.000009f}, + {+0.120059f, +0.080527f, +0.013286f, -0.000793f, -0.000086f}, + {-0.042102f, +0.139525f, -0.007143f, -0.000010f, +0.000040f}, + {-0.075712f, +0.002196f, -0.010631f, -0.000380f, -0.000025f}, + {-0.101650f, -0.158974f, -0.013076f, +0.000245f, +0.000069f}, + {-0.030059f, +0.115541f, -0.003547f, +0.000111f, +0.000004f}, + {+0.094721f, +0.222768f, +0.008889f, +0.000048f, -0.000033f}, + {+0.083573f, -0.053860f, +0.010877f, +0.000192f, -0.000022f} + }, + { + {-0.194975f, +0.371746f, -0.029687f, -0.000407f, -0.000065f}, + {-0.199395f, +0.402227f, -0.030381f, -0.001070f, -0.000111f}, + {-0.043558f, +0.051835f, -0.007510f, -0.000301f, +0.000063f}, + {-0.080069f, +0.290708f, -0.009721f, -0.000585f, +0.000048f}, + {+0.028118f, +0.096712f, +0.004235f, -0.000661f, +0.000071f}, + {-0.020670f, -0.048284f, -0.004447f, -0.000361f, +0.000049f}, + {+0.106751f, -0.298076f, +0.013906f, +0.000980f, -0.000031f}, + {+0.091450f, +0.162172f, +0.012475f, -0.000348f, -0.000002f}, + {-0.007498f, +0.199756f, +0.002586f, +0.001500f, +0.000016f}, + {+0.027250f, +0.222848f, +0.002393f, -0.001277f, -0.000059f}, + {+0.083457f, -0.055583f, +0.011895f, +0.000049f, -0.000010f}, + {+0.023912f, -0.145973f, +0.001523f, -0.000736f, -0.000060f}, + {-0.039347f, -0.252351f, -0.003368f, +0.000088f, -0.000034f}, + {+0.047081f, -0.002879f, +0.005773f, +0.000201f, -0.000016f}, + {+0.061353f, +0.270295f, +0.008425f, -0.000276f, +0.000021f}, + {-0.056743f, +0.162677f, -0.007387f, -0.000128f, +0.000010f} + }, + { + {-0.209644f, +0.348707f, -0.029121f, +0.000472f, +0.000023f}, + {-0.234739f, +0.346303f, -0.031613f, +0.000452f, +0.000075f}, + {-0.012221f, +0.097631f, -0.001448f, +0.000286f, +0.000064f}, + {-0.151155f, +0.176475f, -0.021969f, -0.000127f, +0.000048f}, + {-0.074908f, -0.067483f, -0.011111f, -0.000037f, +0.000040f}, + {+0.024868f, +0.020084f, +0.003583f, +0.000348f, +0.000052f}, + {+0.132213f, -0.252477f, +0.017287f, -0.000139f, -0.000041f}, + {-0.086895f, -0.114633f, -0.010835f, +0.000242f, +0.000044f}, + {-0.087061f, +0.080457f, -0.017193f, -0.000553f, -0.000009f}, + {-0.128529f, -0.021349f, -0.015609f, +0.000805f, +0.000095f}, + {+0.009730f, -0.170684f, +0.001530f, +0.000070f, -0.000041f}, + {+0.063989f, -0.082569f, +0.011861f, +0.000327f, +0.000027f}, + {+0.131743f, +0.010936f, +0.017709f, -0.000376f, -0.000079f}, + {-0.009127f, -0.086499f, -0.000601f, -0.000142f, -0.000005f}, + {-0.128048f, -0.022758f, -0.015753f, -0.000038f, +0.000035f}, + {-0.059404f, +0.160944f, -0.006871f, -0.000228f, +0.000022f} + }, + { + {+0.229440f, -0.322824f, +0.033988f, +0.000389f, +0.000061f}, + {+0.240846f, -0.383749f, +0.036120f, +0.000976f, +0.000103f}, + {+0.056585f, -0.008789f, +0.009971f, +0.000419f, -0.000080f}, + {+0.105118f, -0.219752f, +0.015610f, +0.000635f, -0.000061f}, + {-0.026805f, -0.145169f, -0.000897f, +0.000699f, -0.000083f}, + {+0.004898f, +0.050127f, +0.002984f, +0.000479f, -0.000062f}, + {-0.141946f, +0.172154f, -0.021221f, -0.000916f, +0.000039f}, + {-0.048244f, -0.174628f, -0.006354f, +0.000456f, -0.000003f}, + {+0.037664f, -0.109078f, +0.001169f, -0.001297f, -0.000015f}, + {+0.006723f, -0.230147f, +0.003197f, +0.001300f, +0.000034f}, + {-0.095384f, -0.009012f, -0.012879f, -0.000031f, +0.000023f}, + {-0.048765f, +0.092236f, -0.006693f, +0.000674f, +0.000056f}, + {-0.024712f, +0.249773f, -0.004585f, -0.000253f, +0.000048f}, + {-0.029610f, -0.053064f, -0.004978f, -0.000209f, +0.000011f}, + {+0.020111f, -0.251548f, +0.002558f, +0.000313f, -0.000027f}, + {+0.088864f, -0.064651f, +0.009687f, +0.000147f, -0.000018f} + }, + { + {+0.175493f, -0.403144f, +0.024964f, -0.000494f, -0.000029f}, + {+0.208289f, -0.431823f, +0.027399f, -0.000496f, -0.000086f}, + {-0.008906f, -0.108845f, -0.001685f, -0.000188f, -0.000067f}, + {+0.127825f, -0.183453f, +0.018081f, +0.000198f, -0.000048f}, + {+0.107325f, +0.060873f, +0.013159f, +0.000090f, -0.000038f}, + {-0.020607f, +0.012217f, -0.003265f, -0.000308f, -0.000058f}, + {-0.079060f, +0.266458f, -0.009775f, +0.000157f, +0.000041f}, + {+0.096681f, +0.050055f, +0.012663f, -0.000225f, -0.000055f}, + {+0.051411f, -0.089715f, +0.013539f, +0.000663f, +0.000008f}, + {+0.129678f, -0.037696f, +0.015815f, -0.000703f, -0.000099f}, + {+0.037248f, +0.197082f, +0.005086f, -0.000193f, +0.000037f}, + {-0.043816f, +0.101985f, -0.008254f, -0.000336f, -0.000028f}, + {-0.117065f, +0.106956f, -0.016478f, +0.000283f, +0.000091f}, + {+0.024549f, +0.029471f, +0.003315f, +0.000242f, +0.000008f}, + {+0.102968f, -0.125147f, +0.012245f, +0.000115f, -0.000038f}, + {+0.007500f, -0.187296f, +0.002430f, +0.000314f, -0.000019f} + }, + { + {-0.255049f, +0.256577f, -0.038217f, -0.000401f, -0.000056f}, + {-0.286340f, +0.326727f, -0.042071f, -0.000948f, -0.000098f}, + {-0.058758f, -0.032715f, -0.010103f, -0.000506f, +0.000109f}, + {-0.123738f, +0.204736f, -0.019030f, -0.000624f, +0.000081f}, + {-0.004658f, +0.232611f, -0.002627f, -0.000673f, +0.000101f}, + {+0.001246f, -0.020482f, -0.002726f, -0.000581f, +0.000087f}, + {+0.149860f, -0.087638f, +0.023219f, +0.000836f, -0.000049f}, + {+0.011705f, +0.182241f, +0.000824f, -0.000663f, +0.000015f}, + {-0.036322f, +0.046246f, -0.002434f, +0.001110f, +0.000020f}, + {-0.041445f, +0.225060f, -0.008066f, -0.001247f, -0.000002f}, + {+0.082241f, +0.130716f, +0.009581f, -0.000052f, -0.000037f}, + {+0.061982f, -0.060921f, +0.008434f, -0.000587f, -0.000055f}, + {+0.070313f, -0.179626f, +0.010580f, +0.000496f, -0.000079f}, + {+0.010271f, +0.049933f, +0.003107f, +0.000216f, -0.000007f}, + {-0.072320f, +0.142479f, -0.007956f, -0.000403f, +0.000037f}, + {-0.080097f, -0.050215f, -0.010237f, -0.000128f, +0.000027f} + }, + { + {-0.138659f, +0.433413f, -0.019489f, +0.000507f, +0.000036f}, + {-0.163451f, +0.512532f, -0.021259f, +0.000613f, +0.000105f}, + {+0.031656f, +0.104824f, +0.003994f, -0.000128f, +0.000059f}, + {-0.110770f, +0.224024f, -0.015294f, -0.000397f, +0.000039f}, + {-0.125629f, +0.045496f, -0.015544f, -0.000259f, +0.000027f}, + {+0.013056f, -0.002303f, +0.002874f, +0.000034f, +0.000053f}, + {+0.034706f, -0.263278f, +0.003483f, -0.000141f, -0.000039f}, + {-0.095465f, +0.017678f, -0.011595f, +0.000132f, +0.000064f}, + {-0.033817f, +0.054176f, -0.010428f, -0.000890f, -0.000012f}, + {-0.119869f, +0.100206f, -0.015399f, +0.000474f, +0.000091f}, + {-0.083578f, -0.121580f, -0.008601f, +0.000327f, -0.000026f}, + {+0.021962f, -0.124782f, +0.004983f, +0.000417f, +0.000031f}, + {+0.081591f, -0.160439f, +0.012843f, +0.000024f, -0.000092f}, + {-0.025765f, -0.006872f, -0.004893f, -0.000318f, -0.000015f}, + {-0.048404f, +0.176242f, -0.007439f, -0.000200f, +0.000038f}, + {+0.029349f, +0.118206f, +0.002646f, -0.000434f, +0.000011f} + }, + { + {+0.273332f, -0.197278f, +0.041000f, +0.000427f, +0.000049f}, + {+0.321458f, -0.231555f, +0.047137f, +0.001083f, +0.000091f}, + {+0.051312f, +0.073576f, +0.009852f, +0.000350f, -0.000146f}, + {+0.149316f, -0.177043f, +0.022631f, +0.000468f, -0.000104f}, + {+0.053207f, -0.228176f, +0.008455f, +0.000505f, -0.000122f}, + {+0.006068f, +0.008715f, +0.003223f, +0.000482f, -0.000122f}, + {-0.145901f, +0.015682f, -0.022924f, -0.000759f, +0.000061f}, + {+0.021739f, -0.160951f, +0.002760f, +0.000739f, -0.000036f}, + {+0.029254f, -0.044035f, +0.001822f, -0.001067f, -0.000028f}, + {+0.071428f, -0.194582f, +0.013164f, +0.000987f, -0.000034f}, + {-0.035270f, -0.192622f, -0.005952f, +0.000220f, +0.000050f}, + {-0.068773f, +0.014813f, -0.009109f, +0.000533f, +0.000056f}, + {-0.089870f, +0.103512f, -0.014502f, -0.000459f, +0.000122f}, + {+0.001775f, -0.051927f, +0.000206f, -0.000272f, +0.000005f}, + {+0.077868f, -0.020072f, +0.010512f, +0.000382f, -0.000051f}, + {+0.053027f, +0.078728f, +0.007627f, +0.000029f, -0.000036f} + }, + { + {+0.101834f, -0.458014f, +0.014426f, -0.000475f, -0.000042f}, + {+0.106819f, -0.558024f, +0.013421f, -0.000683f, -0.000132f}, + {-0.052912f, -0.088899f, -0.008225f, +0.000491f, -0.000027f}, + {+0.083094f, -0.280030f, +0.010300f, +0.000632f, -0.000016f}, + {+0.114197f, -0.131784f, +0.014954f, +0.000412f, -0.000002f}, + {-0.019246f, -0.031443f, -0.004356f, +0.000329f, -0.000027f}, + {+0.005316f, +0.248103f, +0.002960f, +0.000118f, +0.000033f}, + {+0.080531f, -0.067083f, +0.011460f, +0.000110f, -0.000064f}, + {+0.031144f, -0.046782f, +0.008670f, +0.001209f, +0.000024f}, + {+0.102756f, -0.143879f, +0.013003f, -0.000283f, -0.000065f}, + {+0.095015f, +0.011155f, +0.012207f, -0.000367f, +0.000008f}, + {+0.004913f, +0.131661f, -0.000343f, -0.000524f, -0.000039f}, + {-0.046459f, +0.170846f, -0.007777f, -0.000479f, +0.000069f}, + {+0.027234f, -0.016428f, +0.003165f, +0.000304f, +0.000026f}, + {+0.005481f, -0.131071f, +0.001565f, +0.000318f, -0.000030f}, + {-0.043474f, -0.073298f, -0.006440f, +0.000550f, +0.000003f} + }, + { + {-0.286640f, +0.137246f, -0.043420f, -0.000432f, -0.000040f}, + {-0.340199f, +0.128020f, -0.049926f, -0.001339f, -0.000072f}, + {-0.035997f, -0.119831f, -0.005662f, +0.000296f, +0.000179f}, + {-0.172429f, +0.110349f, -0.024201f, -0.000100f, +0.000122f}, + {-0.092373f, +0.185204f, -0.014035f, -0.000067f, +0.000138f}, + {-0.010912f, -0.048983f, -0.001816f, +0.000075f, +0.000154f}, + {+0.129079f, +0.059883f, +0.019833f, +0.000637f, -0.000073f}, + {-0.041407f, +0.122204f, -0.006834f, -0.000592f, +0.000062f}, + {-0.030715f, +0.048574f, -0.001376f, +0.001126f, +0.000032f}, + {-0.096213f, +0.160581f, -0.016571f, -0.000370f, +0.000063f}, + {-0.010051f, +0.173763f, -0.000750f, -0.000501f, -0.000056f}, + {+0.062657f, +0.045986f, +0.006800f, -0.000608f, -0.000057f}, + {+0.093242f, -0.041300f, +0.014445f, -0.000123f, -0.000165f}, + {-0.019827f, +0.053398f, -0.000412f, +0.000436f, -0.000009f}, + {-0.057687f, -0.032809f, -0.008352f, -0.000201f, +0.000065f}, + {-0.029198f, -0.096300f, -0.002960f, +0.000112f, +0.000041f} + }, + { + {-0.065817f, +0.474129f, -0.008963f, +0.000406f, +0.000046f}, + {-0.048357f, +0.572445f, -0.005311f, +0.000514f, +0.000163f}, + {+0.075398f, +0.048030f, +0.008271f, -0.000640f, -0.000031f}, + {-0.038405f, +0.313945f, -0.005856f, -0.000669f, -0.000022f}, + {-0.086028f, +0.192206f, -0.012072f, -0.000418f, -0.000038f}, + {+0.040227f, +0.025362f, +0.003912f, -0.000532f, -0.000024f}, + {-0.038209f, -0.193928f, -0.006045f, -0.000139f, -0.000021f}, + {-0.067018f, +0.081277f, -0.009330f, -0.000374f, +0.000051f}, + {-0.028904f, +0.056950f, -0.007486f, -0.001345f, -0.000045f}, + {-0.078983f, +0.183476f, -0.010913f, +0.000304f, +0.000020f}, + {-0.083563f, +0.058421f, -0.010558f, +0.000255f, +0.000015f}, + {-0.030882f, -0.097232f, -0.001515f, +0.000622f, +0.000053f}, + {+0.015685f, -0.158569f, +0.005189f, +0.000820f, -0.000018f}, + {-0.013899f, +0.061952f, -0.002806f, -0.000268f, -0.000038f}, + {+0.012586f, +0.075138f, +0.001144f, -0.000413f, +0.000015f}, + {+0.050911f, +0.027618f, +0.006661f, -0.000507f, -0.000023f} + }, + { + {+0.298262f, -0.083362f, +0.045235f, +0.000350f, +0.000028f}, + {+0.345899f, -0.033997f, +0.051595f, +0.001615f, +0.000035f}, + {-0.000119f, +0.165002f, +0.002953f, -0.001311f, -0.000187f}, + {+0.171388f, -0.008423f, +0.025114f, -0.000464f, -0.000125f}, + {+0.115274f, -0.117327f, +0.017963f, -0.000487f, -0.000138f}, + {-0.008614f, +0.100535f, +0.001469f, -0.001024f, -0.000165f}, + {-0.096130f, -0.104542f, -0.016843f, -0.000419f, +0.000082f}, + {+0.057723f, -0.112429f, +0.010191f, +0.000184f, -0.000084f}, + {+0.036341f, -0.043085f, +0.001450f, -0.001349f, -0.000025f}, + {+0.112953f, -0.110523f, +0.019836f, -0.000405f, -0.000071f}, + {+0.043415f, -0.138944f, +0.005951f, +0.000778f, +0.000051f}, + {-0.038181f, -0.085067f, -0.005138f, +0.000773f, +0.000051f}, + {-0.082623f, -0.007927f, -0.014925f, +0.001161f, +0.000188f}, + {+0.027034f, -0.000974f, +0.001645f, -0.000490f, +0.000020f}, + {+0.035360f, +0.038752f, +0.006345f, -0.000067f, -0.000073f}, + {+0.000083f, +0.105539f, -0.000772f, -0.000317f, -0.000036f} + }, + { + {+0.027126f, -0.497380f, +0.003317f, -0.000351f, -0.000045f}, + {-0.007859f, -0.574645f, -0.003243f, -0.000139f, -0.000188f}, + {-0.075777f, +0.049221f, -0.008353f, -0.000117f, +0.000106f}, + {-0.000094f, -0.270760f, +0.000675f, +0.000190f, +0.000068f}, + {+0.052764f, -0.211602f, +0.007618f, -0.000144f, +0.000084f}, + {-0.046479f, +0.043520f, -0.004619f, -0.000085f, +0.000093f}, + {+0.048000f, +0.115677f, +0.008039f, +0.000243f, +0.000005f}, + {+0.053119f, -0.119462f, +0.006689f, +0.000259f, -0.000024f}, + {+0.023530f, -0.067795f, +0.006354f, +0.001215f, +0.000069f}, + {+0.051960f, -0.201931f, +0.007334f, -0.001040f, +0.000035f}, + {+0.061094f, -0.110021f, +0.007462f, +0.000103f, -0.000039f}, + {+0.036876f, +0.032412f, +0.003266f, -0.000534f, -0.000070f}, + {+0.001902f, +0.122288f, -0.002472f, -0.000241f, -0.000056f}, + {-0.004270f, -0.048829f, +0.000734f, +0.000014f, +0.000048f}, + {-0.012745f, -0.036706f, -0.002273f, +0.000205f, +0.000006f}, + {-0.042314f, +0.038832f, -0.005804f, +0.000347f, +0.000043f} + }, + { + {-0.307088f, +0.013827f, -0.046648f, -0.000063f, -0.000017f}, + {-0.343985f, -0.057778f, -0.051999f, -0.001370f, +0.000021f}, + {+0.039378f, -0.130507f, -0.000123f, +0.002505f, +0.000156f}, + {-0.152973f, -0.035960f, -0.024197f, +0.000907f, +0.000105f}, + {-0.122328f, +0.057169f, -0.020503f, +0.000916f, +0.000113f}, + {+0.036115f, -0.084847f, -0.000437f, +0.002283f, +0.000139f}, + {+0.065884f, +0.089825f, +0.012704f, +0.000253f, -0.000086f}, + {-0.076176f, +0.079461f, -0.013926f, +0.000844f, +0.000095f}, + {-0.041886f, +0.032735f, -0.001798f, +0.001521f, +0.000002f}, + {-0.120605f, +0.060574f, -0.022209f, +0.000951f, +0.000049f}, + {-0.065666f, +0.088077f, -0.009755f, -0.000580f, -0.000035f}, + {+0.014536f, +0.066997f, +0.002290f, -0.001040f, -0.000035f}, + {+0.069578f, +0.020859f, +0.015775f, -0.002732f, -0.000173f}, + {-0.018357f, -0.025356f, -0.001559f, +0.000309f, -0.000039f}, + {-0.021973f, -0.023763f, -0.004557f, +0.000507f, +0.000072f}, + {+0.024594f, -0.064613f, +0.005019f, +0.000113f, +0.000019f} + }, + { + {+0.017452f, +0.509103f, +0.002330f, +0.000354f, +0.000040f}, + {+0.065401f, +0.568079f, +0.010528f, -0.000542f, +0.000194f}, + {+0.050175f, -0.114107f, +0.005162f, +0.003266f, -0.000174f}, + {+0.018374f, +0.227727f, +0.003630f, +0.001902f, -0.000110f}, + {-0.023543f, +0.209166f, -0.002096f, +0.002246f, -0.000125f}, + {+0.031298f, -0.092434f, +0.002541f, +0.002737f, -0.000158f}, + {-0.039294f, -0.069055f, -0.007101f, -0.000802f, +0.000015f}, + {-0.027981f, +0.151965f, -0.004965f, +0.000568f, -0.000008f}, + {-0.016092f, +0.076462f, -0.004970f, -0.000449f, -0.000085f}, + {-0.025683f, +0.205232f, -0.002533f, +0.003878f, -0.000082f}, + {-0.031489f, +0.139294f, -0.004565f, -0.001598f, +0.000056f}, + {-0.026207f, +0.002872f, -0.002107f, +0.000154f, +0.000084f}, + {-0.008497f, -0.098826f, +0.002487f, -0.002569f, +0.000130f}, + {+0.010858f, +0.022687f, +0.002492f, +0.000762f, -0.000051f}, + {+0.007112f, +0.019771f, +0.000809f, +0.000752f, -0.000028f}, + {+0.017429f, -0.074807f, +0.003855f, +0.000473f, -0.000058f} + } +}; + +const float leftHRIRImag_HOA3[BINAURAL_CONVBANDS][16][BINAURAL_NTAPS]= +{ + { + {-0.132965f, +0.086484f, +0.111577f, -0.006297f, -0.000146f}, + {-0.159214f, +0.438495f, -0.131837f, -0.004567f, -0.000134f}, + {-0.006365f, -0.027154f, +0.040068f, -0.008136f, +0.000115f}, + {-0.012177f, +0.011068f, +0.006759f, -0.003623f, +0.000106f}, + {-0.003524f, +0.002365f, -0.008243f, +0.002720f, +0.000173f}, + {+0.001684f, -0.006593f, -0.024280f, +0.012226f, +0.000133f}, + {+0.003794f, -0.002370f, +0.013706f, -0.004985f, -0.000191f}, + {+0.009569f, -0.049227f, +0.045250f, -0.003942f, -0.000006f}, + {-0.015413f, +0.062027f, -0.005814f, -0.010696f, -0.000183f}, + {-0.012650f, +0.030376f, +0.022293f, -0.005058f, -0.000424f}, + {+0.003808f, -0.011707f, -0.008010f, +0.002270f, +0.000068f}, + {-0.003343f, +0.012704f, +0.014571f, -0.003409f, -0.000255f}, + {+0.000428f, +0.007434f, +0.003549f, -0.001445f, +0.000011f}, + {-0.006298f, +0.029469f, -0.007911f, +0.000838f, -0.000089f}, + {-0.003358f, +0.002973f, +0.012948f, -0.001507f, +0.000003f}, + {-0.000168f, +0.002647f, +0.005935f, -0.001295f, -0.000063f} + }, + { + {+0.075202f, +0.228858f, +0.021577f, -0.002573f, -0.000120f}, + {+0.061927f, +0.923113f, -0.018254f, -0.003553f, -0.000135f}, + {+0.002952f, -0.050194f, +0.020301f, -0.000013f, +0.000082f}, + {+0.008722f, +0.019708f, -0.013956f, +0.001282f, +0.000072f}, + {+0.001425f, +0.021365f, -0.019206f, -0.005433f, +0.000123f}, + {-0.004675f, -0.040742f, -0.087083f, -0.008021f, +0.000087f}, + {-0.001220f, -0.034662f, +0.025115f, +0.004561f, -0.000118f}, + {-0.004799f, -0.049232f, +0.074542f, +0.003362f, -0.000003f}, + {+0.011236f, +0.040604f, -0.010517f, +0.002046f, -0.000098f}, + {+0.006435f, +0.139253f, +0.070542f, -0.004148f, -0.000297f}, + {-0.001842f, -0.052892f, -0.056325f, -0.005942f, +0.000046f}, + {+0.004364f, +0.052115f, +0.019067f, -0.000398f, -0.000179f}, + {+0.003644f, +0.037489f, +0.030067f, +0.000286f, +0.000000f}, + {+0.000279f, +0.074681f, +0.035692f, +0.005433f, -0.000065f}, + {+0.001702f, +0.024063f, +0.022013f, +0.000449f, +0.000009f}, + {+0.001629f, +0.004730f, -0.001402f, -0.003756f, -0.000041f} + }, + { + {-0.022776f, +0.213361f, +0.033702f, +0.017530f, +0.000169f}, + {+0.017318f, +0.757708f, +0.032772f, +0.023486f, +0.000150f}, + {-0.000995f, +0.005778f, -0.039399f, +0.003826f, -0.000133f}, + {-0.001086f, +0.066855f, -0.049052f, -0.001880f, -0.000124f}, + {+0.003861f, +0.074613f, -0.059871f, +0.001275f, -0.000202f}, + {+0.004218f, -0.001879f, -0.134238f, -0.000831f, -0.000156f}, + {-0.007011f, -0.156373f, +0.120347f, +0.000348f, +0.000228f}, + {+0.001557f, +0.050757f, -0.023560f, -0.002558f, +0.000008f}, + {-0.014029f, -0.230152f, +0.192472f, +0.009207f, +0.000223f}, + {+0.003304f, +0.293531f, -0.162769f, +0.029563f, +0.000502f}, + {-0.000187f, -0.025533f, -0.089914f, +0.003071f, -0.000081f}, + {-0.001118f, +0.199397f, -0.178948f, +0.009074f, +0.000301f}, + {-0.002128f, +0.041497f, +0.024472f, -0.001412f, -0.000017f}, + {+0.001502f, +0.027123f, +0.081159f, -0.005992f, +0.000104f}, + {+0.000493f, +0.080670f, -0.051505f, -0.003323f, -0.000001f}, + {-0.001770f, +0.022371f, -0.053147f, +0.009257f, +0.000076f} + }, + { + {+0.009638f, -0.020599f, -0.278274f, -0.025390f, +0.000089f}, + {-0.019638f, +0.173586f, -0.454125f, -0.045073f, +0.000138f}, + {+0.001861f, +0.029237f, -0.038358f, -0.002128f, -0.000043f}, + {-0.006025f, +0.060820f, -0.033037f, +0.001020f, -0.000030f}, + {-0.010927f, +0.114232f, +0.022410f, +0.002610f, -0.000063f}, + {-0.001151f, +0.065308f, -0.047475f, +0.003953f, -0.000033f}, + {+0.017565f, -0.230160f, -0.003612f, +0.002199f, +0.000030f}, + {-0.002909f, +0.050062f, -0.035205f, +0.001706f, -0.000001f}, + {+0.028618f, -0.411400f, -0.073259f, -0.001960f, -0.000006f}, + {-0.012397f, +0.141388f, -0.368076f, -0.043941f, +0.000144f}, + {+0.000613f, +0.027917f, -0.038807f, +0.005057f, -0.000020f}, + {-0.005278f, +0.064856f, -0.339877f, -0.008614f, +0.000087f}, + {-0.003908f, -0.015797f, -0.023962f, +0.003729f, +0.000013f}, + {+0.002822f, -0.051424f, +0.011636f, +0.000447f, +0.000037f}, + {-0.001743f, -0.007517f, -0.130092f, +0.010670f, -0.000017f}, + {+0.001199f, -0.016221f, -0.122288f, -0.007685f, +0.000014f} + }, + { + {-0.029178f, -0.030294f, -0.242046f, +0.016235f, -0.000187f}, + {-0.008133f, -0.216891f, -0.173004f, +0.046339f, -0.000186f}, + {-0.004784f, +0.011306f, -0.001565f, +0.002974f, +0.000133f}, + {+0.001643f, -0.028149f, +0.058358f, +0.006461f, +0.000122f}, + {+0.012719f, -0.054617f, +0.162135f, +0.005430f, +0.000206f}, + {+0.004192f, -0.016864f, +0.049221f, +0.004060f, +0.000152f}, + {-0.017065f, +0.041944f, -0.209787f, -0.017496f, -0.000221f}, + {+0.005651f, -0.007117f, +0.010168f, -0.000370f, -0.000010f}, + {-0.040832f, +0.087605f, -0.438294f, -0.024557f, -0.000208f}, + {+0.015743f, -0.224869f, -0.116394f, +0.024045f, -0.000521f}, + {-0.000520f, +0.017676f, -0.001703f, -0.007076f, +0.000085f}, + {+0.005864f, -0.108940f, -0.176379f, -0.006190f, -0.000311f}, + {+0.004834f, -0.026630f, -0.021079f, -0.003057f, +0.000018f}, + {-0.003714f, -0.006337f, -0.039785f, +0.000713f, -0.000108f}, + {+0.003235f, -0.035740f, -0.081406f, -0.014616f, +0.000003f}, + {-0.000931f, -0.029194f, -0.104837f, -0.000498f, -0.000077f} + }, + { + {+0.064069f, +0.415122f, +0.053438f, -0.001987f, -0.000053f}, + {+0.009859f, +0.329919f, +0.267131f, -0.025972f, -0.000125f}, + {+0.007782f, +0.093625f, +0.062218f, -0.005519f, +0.000007f}, + {+0.006679f, +0.087174f, +0.140907f, -0.012343f, -0.000007f}, + {-0.009694f, -0.066480f, +0.161387f, -0.014778f, +0.000006f}, + {-0.011976f, -0.007185f, +0.079605f, -0.010521f, -0.000016f}, + {+0.000557f, +0.101449f, -0.157518f, +0.024682f, +0.000050f}, + {-0.008085f, -0.037335f, +0.019864f, -0.001614f, +0.000006f}, + {+0.030203f, +0.393848f, -0.238529f, +0.036570f, +0.000098f}, + {-0.011087f, -0.102790f, +0.079859f, -0.000351f, +0.000008f}, + {+0.001584f, +0.009914f, +0.007779f, +0.002067f, -0.000006f}, + {+0.003353f, -0.001777f, +0.008005f, +0.013355f, +0.000003f}, + {-0.003172f, -0.008210f, +0.010652f, +0.000223f, -0.000027f}, + {-0.001325f, -0.010307f, -0.051607f, +0.003067f, -0.000008f}, + {-0.010253f, -0.010690f, +0.002393f, +0.009426f, +0.000023f}, + {-0.002525f, +0.029747f, -0.022901f, +0.004832f, +0.000012f} + }, + { + {-0.046682f, +0.646468f, +0.038502f, -0.000394f, +0.000197f}, + {+0.044970f, +0.559290f, +0.057727f, +0.008886f, +0.000233f}, + {+0.000940f, +0.137203f, +0.026727f, +0.004536f, -0.000119f}, + {+0.021842f, +0.212599f, -0.004934f, +0.008826f, -0.000104f}, + {+0.023556f, +0.052508f, -0.021029f, +0.010719f, -0.000188f}, + {+0.008092f, -0.004951f, +0.027003f, +0.006766f, -0.000127f}, + {+0.010424f, -0.025150f, +0.006816f, -0.012676f, +0.000176f}, + {+0.012013f, -0.064462f, +0.013618f, +0.002713f, +0.000010f}, + {+0.003530f, +0.310311f, -0.011616f, -0.019741f, +0.000148f}, + {+0.004678f, -0.016958f, +0.018438f, +0.001910f, +0.000484f}, + {-0.001327f, +0.004928f, +0.011742f, +0.001214f, -0.000078f}, + {-0.013688f, +0.047967f, +0.031851f, -0.002524f, +0.000286f}, + {+0.008554f, -0.003502f, +0.000653f, +0.000953f, -0.000012f}, + {+0.001110f, -0.052143f, -0.004967f, -0.003628f, +0.000102f}, + {+0.024328f, -0.026559f, +0.000732f, -0.001055f, -0.000010f}, + {+0.007177f, -0.017435f, +0.026024f, -0.001281f, +0.000068f} + }, + { + {-0.091452f, +0.552905f, -0.002702f, -0.003959f, +0.000011f}, + {-0.151251f, +0.284723f, -0.015522f, -0.005073f, +0.000086f}, + {-0.028691f, +0.087255f, -0.003554f, -0.001461f, +0.000017f}, + {-0.098620f, +0.103367f, -0.000693f, -0.001510f, +0.000032f}, + {-0.064701f, +0.012013f, -0.004462f, -0.000173f, +0.000038f}, + {+0.014183f, -0.018557f, -0.019481f, -0.000708f, +0.000046f}, + {+0.006021f, -0.064708f, +0.035867f, -0.001201f, -0.000101f}, + {-0.011933f, -0.098741f, -0.004801f, -0.001237f, -0.000012f}, + {-0.036700f, +0.201775f, +0.040310f, -0.000652f, -0.000152f}, + {-0.005765f, +0.013682f, +0.000873f, -0.007110f, -0.000136f}, + {-0.003019f, -0.012643f, -0.006120f, -0.000396f, +0.000028f}, + {+0.011018f, +0.079111f, +0.001161f, -0.005334f, -0.000076f}, + {-0.015223f, -0.010103f, +0.018116f, -0.000552f, +0.000040f}, + {+0.010935f, -0.049744f, +0.004931f, +0.000250f, -0.000016f}, + {-0.032242f, -0.086323f, +0.005558f, -0.001593f, -0.000026f}, + {+0.000743f, -0.058299f, -0.001218f, -0.002067f, -0.000032f} + }, + { + {+0.231005f, +0.048404f, +0.009154f, +0.001498f, -0.000196f}, + {+0.192280f, -0.252895f, -0.010481f, +0.000333f, -0.000272f}, + {+0.043883f, -0.025510f, -0.003790f, -0.000402f, +0.000097f}, + {+0.135351f, -0.212029f, -0.009492f, -0.001960f, +0.000078f}, + {+0.084125f, -0.181115f, -0.006598f, -0.003510f, +0.000156f}, + {-0.033552f, +0.023473f, -0.003836f, -0.001049f, +0.000092f}, + {-0.027732f, +0.007669f, +0.004823f, +0.004147f, -0.000114f}, + {-0.005511f, -0.108447f, -0.007469f, -0.001175f, -0.000008f}, + {+0.049262f, +0.093379f, +0.014337f, +0.006176f, -0.000066f}, + {+0.011588f, -0.007485f, -0.021418f, -0.002195f, -0.000406f}, + {+0.004828f, -0.034802f, +0.002483f, -0.000357f, +0.000065f}, + {+0.010126f, +0.088145f, -0.024313f, -0.000561f, -0.000239f}, + {+0.009822f, -0.024986f, +0.000140f, +0.000383f, +0.000001f}, + {-0.022780f, -0.006413f, +0.006349f, +0.001513f, -0.000089f}, + {+0.014962f, -0.135165f, -0.012780f, -0.000522f, +0.000019f}, + {-0.023635f, -0.027393f, -0.008518f, +0.000542f, -0.000051f} + }, + { + {-0.129287f, -0.488427f, -0.015298f, +0.003330f, +0.000032f}, + {-0.025480f, -0.578744f, -0.004928f, +0.005728f, -0.000021f}, + {-0.001654f, -0.098586f, -0.003334f, +0.000763f, -0.000028f}, + {-0.033875f, -0.443496f, +0.008037f, +0.001296f, -0.000041f}, + {-0.018947f, -0.326335f, +0.012624f, +0.000806f, -0.000063f}, + {+0.025064f, +0.093936f, +0.002533f, +0.000591f, -0.000056f}, + {+0.010694f, +0.085378f, -0.009219f, -0.001445f, +0.000116f}, + {+0.036700f, -0.055426f, -0.001721f, +0.001199f, +0.000016f}, + {-0.043110f, -0.003684f, -0.012692f, -0.002555f, +0.000160f}, + {-0.008512f, -0.041967f, +0.005268f, +0.006560f, +0.000223f}, + {+0.005601f, -0.039303f, +0.001728f, -0.000112f, -0.000044f}, + {-0.035999f, +0.034895f, +0.002757f, +0.004270f, +0.000123f}, + {+0.002203f, -0.033200f, -0.001100f, -0.000045f, -0.000048f}, + {+0.016721f, +0.047214f, -0.004075f, -0.000550f, +0.000032f}, + {+0.021446f, -0.110159f, +0.004884f, +0.001124f, +0.000025f}, + {+0.032915f, +0.061006f, +0.000313f, +0.001075f, +0.000044f} + }, + { + {-0.165686f, -0.410109f, -0.015586f, -0.000896f, +0.000182f}, + {-0.225295f, -0.253817f, -0.010634f, -0.001216f, +0.000288f}, + {-0.066393f, -0.000376f, -0.002622f, -0.000038f, -0.000077f}, + {-0.130423f, -0.277756f, -0.010288f, +0.000606f, -0.000054f}, + {-0.089464f, -0.200814f, -0.007558f, +0.001360f, -0.000121f}, + {+0.004322f, +0.115904f, +0.010769f, +0.000324f, -0.000060f}, + {+0.034499f, +0.049740f, -0.008222f, -0.001335f, +0.000055f}, + {-0.046786f, +0.057680f, +0.004042f, +0.000640f, +0.000003f}, + {+0.024894f, -0.095189f, -0.014289f, -0.002426f, -0.000011f}, + {-0.005629f, -0.034211f, +0.013115f, +0.002185f, +0.000307f}, + {-0.019520f, -0.005119f, +0.001636f, +0.000261f, -0.000048f}, + {+0.038933f, -0.062477f, +0.011725f, +0.001017f, +0.000182f}, + {-0.005035f, -0.021514f, -0.003233f, -0.000466f, +0.000014f}, + {+0.007389f, +0.053217f, -0.000456f, -0.000398f, +0.000072f}, + {-0.037733f, -0.010531f, -0.003329f, +0.000340f, -0.000027f}, + {-0.003757f, +0.111811f, +0.004737f, -0.000075f, +0.000033f} + }, + { + {+0.245533f, +0.226873f, +0.035259f, -0.002770f, -0.000070f}, + {+0.206677f, +0.408421f, +0.026814f, -0.005082f, -0.000056f}, + {+0.053751f, +0.188303f, +0.009769f, -0.000688f, +0.000029f}, + {+0.149357f, +0.154463f, +0.013417f, -0.001098f, +0.000037f}, + {+0.105083f, +0.109018f, +0.007715f, -0.000799f, +0.000072f}, + {-0.025793f, +0.064751f, -0.005742f, -0.000924f, +0.000050f}, + {-0.041996f, -0.072003f, +0.001334f, +0.001959f, -0.000101f}, + {+0.008234f, +0.134619f, -0.001439f, -0.000932f, -0.000019f}, + {+0.007939f, -0.128639f, +0.012917f, +0.003363f, -0.000130f}, + {+0.013715f, +0.007050f, +0.000167f, -0.004932f, -0.000266f}, + {+0.012412f, +0.040469f, -0.000036f, -0.000063f, +0.000052f}, + {-0.005607f, -0.122490f, -0.001069f, -0.003166f, -0.000145f}, + {+0.002475f, -0.010103f, -0.001112f, +0.000172f, +0.000049f}, + {-0.026992f, -0.004924f, -0.001965f, +0.000301f, -0.000041f}, + {+0.008412f, +0.067378f, +0.003334f, -0.000633f, -0.000020f}, + {-0.034796f, +0.054935f, -0.005935f, -0.000590f, -0.000048f} + }, + { + {+0.049172f, +0.518027f, +0.003115f, +0.000335f, -0.000156f}, + {+0.120618f, +0.519623f, +0.008479f, +0.000432f, -0.000270f}, + {+0.062888f, +0.179664f, -0.000296f, +0.000157f, +0.000063f}, + {+0.019992f, +0.341262f, +0.002080f, -0.000355f, +0.000037f}, + {+0.012267f, +0.246756f, -0.001889f, -0.000730f, +0.000091f}, + {+0.028297f, -0.020937f, -0.002730f, -0.000026f, +0.000039f}, + {-0.008636f, -0.121054f, +0.007814f, +0.000720f, -0.000014f}, + {+0.046484f, +0.071961f, +0.002387f, -0.000455f, +0.000002f}, + {-0.042652f, -0.042219f, +0.005353f, +0.001621f, +0.000061f}, + {-0.003781f, +0.030870f, -0.013170f, -0.002144f, -0.000211f}, + {+0.016747f, +0.033277f, +0.000186f, -0.000012f, +0.000031f}, + {-0.038322f, -0.079239f, -0.009485f, -0.001067f, -0.000129f}, + {-0.009213f, +0.006178f, +0.001082f, +0.000202f, -0.000029f}, + {+0.017679f, -0.071909f, +0.003357f, +0.000147f, -0.000056f}, + {+0.031925f, +0.035422f, +0.000231f, -0.000251f, +0.000032f}, + {+0.027629f, -0.047451f, +0.003771f, -0.000092f, -0.000016f} + }, + { + {-0.277356f, +0.009713f, -0.040871f, +0.002128f, +0.000098f}, + {-0.288048f, -0.119309f, -0.040772f, +0.004167f, +0.000126f}, + {-0.135614f, -0.121199f, -0.015970f, +0.000584f, -0.000025f}, + {-0.147900f, +0.068278f, -0.021757f, +0.001011f, -0.000028f}, + {-0.111155f, +0.046512f, -0.012782f, +0.000892f, -0.000069f}, + {-0.020452f, -0.099912f, -0.003632f, +0.000896f, -0.000036f}, + {+0.051789f, -0.026841f, -0.000416f, -0.002061f, +0.000070f}, + {-0.048315f, -0.075067f, -0.004473f, +0.000718f, +0.000020f}, + {+0.038466f, +0.097321f, -0.002604f, -0.003632f, +0.000080f}, + {-0.012250f, +0.014195f, +0.001656f, +0.003568f, +0.000272f}, + {-0.029260f, -0.036443f, -0.002521f, +0.000109f, -0.000054f}, + {+0.049141f, +0.042766f, +0.002001f, +0.002307f, +0.000147f}, + {+0.016365f, +0.045379f, +0.003479f, +0.000052f, -0.000044f}, + {+0.016380f, -0.068248f, +0.002419f, -0.000284f, +0.000043f}, + {-0.026309f, -0.049393f, -0.000660f, +0.000389f, +0.000012f}, + {+0.020013f, -0.061398f, +0.001390f, +0.000285f, +0.000045f} + }, + { + {+0.056395f, -0.497410f, +0.010462f, +0.000112f, +0.000123f}, + {+0.008278f, -0.564708f, +0.007533f, +0.000534f, +0.000224f}, + {+0.029776f, -0.375504f, +0.009908f, -0.000167f, -0.000056f}, + {+0.053843f, -0.247636f, +0.011973f, +0.000305f, -0.000030f}, + {+0.047919f, -0.200610f, +0.011974f, +0.000485f, -0.000070f}, + {-0.001747f, -0.136529f, +0.008548f, -0.000030f, -0.000031f}, + {-0.034659f, +0.098248f, -0.009286f, -0.000733f, -0.000004f}, + {-0.013390f, -0.125590f, +0.000347f, +0.000408f, -0.000006f}, + {+0.018416f, +0.125823f, -0.010099f, -0.001587f, -0.000079f}, + {+0.015670f, -0.020509f, +0.010455f, +0.001886f, +0.000130f}, + {-0.001269f, -0.078191f, +0.000719f, -0.000060f, -0.000015f}, + {-0.015954f, +0.139586f, +0.005155f, +0.000966f, +0.000087f}, + {-0.000690f, +0.074979f, -0.002970f, -0.000046f, +0.000040f}, + {-0.036315f, +0.016998f, -0.007922f, -0.000063f, +0.000042f}, + {-0.017947f, -0.053543f, -0.003628f, +0.000169f, -0.000034f}, + {-0.036250f, +0.025051f, -0.004463f, +0.000134f, +0.000003f} + }, + { + {+0.261565f, -0.175456f, +0.039964f, -0.001605f, -0.000112f}, + {+0.289123f, -0.124032f, +0.042209f, -0.003292f, -0.000173f}, + {+0.147448f, -0.202794f, +0.013343f, -0.000451f, +0.000021f}, + {+0.111431f, -0.158046f, +0.014055f, -0.000866f, +0.000018f}, + {+0.088516f, -0.135597f, +0.008911f, -0.000941f, +0.000062f}, + {+0.046542f, -0.074771f, -0.001267f, -0.000681f, +0.000024f}, + {-0.008851f, +0.134457f, +0.003904f, +0.001907f, -0.000040f}, + {+0.057725f, -0.011782f, +0.007446f, -0.000690f, -0.000019f}, + {-0.064453f, -0.009485f, -0.001505f, +0.003482f, -0.000032f}, + {-0.003750f, -0.043297f, -0.001696f, -0.002710f, -0.000254f}, + {+0.036881f, -0.019154f, +0.003756f, -0.000164f, +0.000052f}, + {-0.028484f, +0.127049f, -0.000373f, -0.001785f, -0.000137f}, + {-0.030494f, +0.034591f, -0.002192f, -0.000165f, +0.000035f}, + {+0.009470f, +0.091778f, +0.004810f, +0.000325f, -0.000042f}, + {+0.029100f, +0.027840f, +0.006520f, -0.000311f, -0.000006f}, + {-0.009135f, +0.066628f, -0.000798f, -0.000116f, -0.000038f} + }, + { + {-0.134646f, +0.431836f, -0.022252f, -0.000261f, -0.000089f}, + {-0.108773f, +0.480556f, -0.020213f, -0.000915f, -0.000164f}, + {-0.157283f, +0.252511f, -0.017953f, +0.000158f, +0.000053f}, + {-0.096912f, +0.162399f, -0.016830f, -0.000259f, +0.000029f}, + {-0.094935f, +0.145981f, -0.017427f, -0.000284f, +0.000058f}, + {-0.078691f, +0.105220f, -0.009040f, -0.000009f, +0.000031f}, + {+0.032041f, +0.084421f, +0.004353f, +0.000773f, +0.000002f}, + {-0.016068f, +0.102075f, -0.005241f, -0.000269f, +0.000010f}, + {+0.027628f, -0.144744f, +0.013233f, +0.001492f, +0.000070f}, + {-0.013497f, -0.033838f, -0.009244f, -0.001447f, -0.000073f}, + {-0.020163f, +0.066780f, -0.002771f, +0.000069f, +0.000003f}, + {+0.051113f, +0.013125f, -0.004746f, -0.000733f, -0.000056f}, + {+0.038408f, -0.068407f, +0.004887f, -0.000113f, -0.000046f}, + {+0.039739f, +0.052992f, +0.003676f, -0.000005f, -0.000032f}, + {+0.019468f, +0.046585f, -0.000417f, -0.000092f, +0.000032f}, + {+0.046026f, -0.019351f, +0.006238f, -0.000147f, +0.000005f} + }, + { + {-0.227969f, +0.284525f, -0.035118f, +0.001170f, +0.000113f}, + {-0.251619f, +0.250783f, -0.039635f, +0.002380f, +0.000192f}, + {-0.028234f, +0.444181f, -0.004258f, +0.000378f, -0.000019f}, + {-0.057970f, +0.223549f, -0.006095f, +0.000655f, -0.000012f}, + {-0.039868f, +0.230386f, -0.002246f, +0.000818f, -0.000054f}, + {+0.036223f, +0.280336f, +0.007555f, +0.000539f, -0.000017f}, + {-0.045995f, -0.019070f, -0.002489f, -0.001639f, +0.000020f}, + {-0.058114f, +0.032997f, -0.008873f, +0.000662f, +0.000018f}, + {+0.053231f, -0.094713f, +0.003411f, -0.002983f, -0.000000f}, + {+0.022768f, +0.016336f, +0.003117f, +0.002216f, +0.000227f}, + {-0.031511f, +0.045619f, -0.004901f, +0.000227f, -0.000048f}, + {-0.045006f, -0.127523f, -0.002107f, +0.001382f, +0.000124f}, + {-0.004533f, -0.139114f, -0.003073f, +0.000203f, -0.000026f}, + {-0.046710f, -0.071863f, -0.004169f, -0.000343f, +0.000040f}, + {-0.053226f, -0.067429f, -0.008363f, +0.000293f, +0.000001f}, + {-0.008131f, -0.104415f, -0.002326f, +0.000063f, +0.000032f} + }, + { + {+0.193626f, -0.362707f, +0.031027f, +0.000215f, +0.000061f}, + {+0.168437f, -0.394610f, +0.030765f, +0.000832f, +0.000106f}, + {+0.166845f, +0.150839f, +0.019333f, -0.000239f, -0.000053f}, + {+0.108632f, -0.026149f, +0.014836f, +0.000210f, -0.000033f}, + {+0.117845f, -0.006812f, +0.017402f, +0.000161f, -0.000052f}, + {+0.070459f, +0.240877f, +0.004084f, -0.000089f, -0.000035f}, + {+0.051571f, -0.166446f, +0.000272f, -0.000594f, +0.000009f}, + {+0.048610f, -0.137567f, +0.012351f, +0.000122f, -0.000012f}, + {-0.060459f, +0.077161f, -0.017457f, -0.001202f, -0.000048f}, + {-0.008901f, +0.071218f, +0.004889f, +0.001056f, +0.000035f}, + {+0.035581f, -0.061262f, +0.007127f, -0.000111f, +0.000006f}, + {+0.009360f, -0.207644f, +0.007254f, +0.000645f, +0.000037f}, + {-0.043066f, -0.091054f, -0.000390f, +0.000159f, +0.000048f}, + {-0.006722f, -0.129159f, -0.003572f, +0.000128f, +0.000025f}, + {+0.002648f, -0.158951f, +0.005371f, +0.000083f, -0.000030f}, + {-0.052294f, -0.037930f, -0.006102f, +0.000171f, -0.000010f} + }, + { + {+0.185388f, -0.373945f, +0.028242f, -0.000870f, -0.000107f}, + {+0.218466f, -0.313607f, +0.033711f, -0.001650f, -0.000187f}, + {-0.089184f, -0.227856f, -0.003013f, -0.000234f, +0.000019f}, + {-0.005910f, -0.195725f, +0.001490f, -0.000426f, +0.000010f}, + {-0.033058f, -0.233100f, -0.003881f, -0.000583f, +0.000049f}, + {-0.128077f, -0.046310f, -0.008240f, -0.000349f, +0.000015f}, + {+0.004052f, -0.247839f, -0.003163f, +0.001295f, -0.000012f}, + {+0.052459f, -0.138631f, +0.002655f, -0.000517f, -0.000018f}, + {-0.024548f, +0.123596f, -0.001667f, +0.002422f, +0.000013f}, + {-0.026309f, +0.052058f, -0.001607f, -0.001982f, -0.000202f}, + {+0.029154f, -0.072410f, +0.002905f, -0.000210f, +0.000043f}, + {+0.051381f, -0.149021f, -0.000115f, -0.001232f, -0.000111f}, + {+0.060324f, +0.057180f, +0.002547f, -0.000144f, +0.000020f}, + {+0.052887f, -0.036634f, +0.006886f, +0.000170f, -0.000037f}, + {+0.075539f, -0.053066f, +0.006319f, -0.000332f, +0.000001f}, + {+0.036656f, +0.098177f, +0.004589f, -0.000133f, -0.000026f} + }, + { + {-0.239844f, +0.276952f, -0.036663f, -0.000075f, -0.000041f}, + {-0.218935f, +0.356480f, -0.037109f, -0.000536f, -0.000063f}, + {-0.067555f, -0.247328f, -0.016085f, +0.000198f, +0.000054f}, + {-0.065557f, -0.103844f, -0.011325f, -0.000270f, +0.000037f}, + {-0.082669f, -0.157628f, -0.013419f, -0.000257f, +0.000050f}, + {+0.051102f, -0.310690f, +0.001856f, +0.000105f, +0.000038f}, + {-0.105915f, -0.086143f, -0.002835f, +0.000369f, -0.000019f}, + {-0.108427f, +0.103999f, -0.015274f, -0.000237f, +0.000014f}, + {+0.072751f, -0.025221f, +0.019360f, +0.000835f, +0.000029f}, + {+0.042856f, -0.056448f, -0.001929f, -0.000741f, -0.000011f}, + {-0.068206f, +0.080584f, -0.011613f, +0.000093f, -0.000013f}, + {-0.091336f, +0.056612f, -0.010772f, -0.000543f, -0.000024f}, + {-0.026414f, +0.186526f, -0.002964f, -0.000133f, -0.000049f}, + {-0.024927f, +0.082144f, -0.001315f, +0.000035f, -0.000020f}, + {-0.062843f, +0.155369f, -0.009444f, -0.000091f, +0.000028f}, + {+0.038812f, +0.095103f, +0.003754f, -0.000076f, +0.000012f} + }, + { + {-0.131680f, +0.440943f, -0.020891f, +0.000627f, +0.000098f}, + {-0.183833f, +0.406966f, -0.027778f, +0.001207f, +0.000171f}, + {+0.086183f, -0.003067f, +0.012386f, +0.000168f, -0.000020f}, + {+0.026332f, +0.035398f, +0.002657f, +0.000383f, -0.000011f}, + {+0.076464f, +0.083380f, +0.010071f, +0.000597f, -0.000047f}, + {+0.086834f, -0.252931f, +0.010256f, +0.000250f, -0.000016f}, + {+0.112579f, +0.244861f, +0.011209f, -0.001100f, +0.000012f}, + {+0.018202f, +0.300605f, +0.006408f, +0.000602f, +0.000018f}, + {-0.003044f, -0.137405f, -0.002719f, -0.002137f, -0.000013f}, + {-0.003641f, -0.131818f, -0.001737f, +0.001737f, +0.000181f}, + {+0.001297f, +0.195950f, +0.005713f, +0.000204f, -0.000037f}, + {+0.045795f, +0.259231f, +0.005407f, +0.001178f, +0.000100f}, + {-0.039454f, +0.170156f, -0.000777f, +0.000115f, -0.000018f}, + {-0.040004f, +0.055755f, -0.008185f, -0.000317f, +0.000034f}, + {-0.043921f, +0.182226f, -0.005163f, +0.000395f, -0.000002f}, + {-0.058367f, -0.053246f, -0.007857f, +0.000065f, +0.000022f} + }, + { + {+0.266519f, -0.168414f, +0.039980f, +0.000112f, +0.000029f}, + {+0.270044f, -0.288912f, +0.044466f, +0.000374f, +0.000037f}, + {+0.013148f, +0.108379f, +0.008696f, -0.000082f, -0.000056f}, + {+0.007547f, +0.066767f, +0.004336f, +0.000293f, -0.000040f}, + {+0.013959f, +0.178267f, +0.007930f, +0.000231f, -0.000050f}, + {-0.126652f, +0.073753f, -0.010940f, -0.000032f, -0.000041f}, + {+0.037971f, +0.357198f, -0.003626f, -0.000116f, +0.000025f}, + {+0.123814f, +0.144678f, +0.015962f, +0.000194f, -0.000018f}, + {-0.073603f, -0.033162f, -0.018399f, -0.000381f, -0.000019f}, + {-0.052463f, -0.055986f, +0.001868f, +0.000682f, -0.000008f}, + {+0.099011f, +0.055743f, +0.009504f, -0.000033f, +0.000019f}, + {+0.066616f, +0.234328f, +0.006904f, +0.000399f, +0.000016f}, + {+0.081064f, -0.004874f, +0.003489f, +0.000036f, +0.000052f}, + {+0.044214f, -0.078007f, +0.004257f, +0.000035f, +0.000016f}, + {+0.107368f, -0.054956f, +0.018386f, -0.000009f, -0.000028f}, + {-0.008996f, -0.126597f, -0.002978f, +0.000081f, -0.000014f} + }, + { + {+0.076584f, -0.456777f, +0.013253f, -0.000677f, -0.000090f}, + {+0.135714f, -0.493797f, +0.019817f, -0.001205f, -0.000155f}, + {-0.049801f, +0.003798f, -0.009316f, -0.000287f, +0.000022f}, + {+0.008289f, +0.072460f, +0.002582f, -0.000487f, +0.000014f}, + {-0.058361f, +0.066933f, -0.007899f, -0.000705f, +0.000047f}, + {+0.024939f, +0.304082f, +0.002238f, -0.000320f, +0.000018f}, + {-0.164640f, +0.054259f, -0.014251f, +0.000972f, -0.000016f}, + {-0.129320f, -0.239583f, -0.014072f, -0.000614f, -0.000019f}, + {+0.023151f, +0.107790f, +0.002402f, +0.001999f, +0.000009f}, + {+0.042244f, +0.087154f, +0.004003f, -0.001651f, -0.000165f}, + {-0.087421f, -0.223827f, -0.009440f, -0.000302f, +0.000032f}, + {-0.123261f, -0.040927f, -0.008130f, -0.001094f, -0.000093f}, + {-0.047678f, -0.191325f, -0.003834f, -0.000119f, +0.000015f}, + {+0.025350f, -0.109559f, +0.002027f, +0.000400f, -0.000032f}, + {-0.031404f, -0.277712f, -0.007376f, -0.000280f, +0.000002f}, + {+0.054594f, -0.026570f, +0.007177f, +0.000010f, -0.000018f} + }, + { + {-0.274121f, +0.081952f, -0.043113f, -0.000004f, -0.000021f}, + {-0.317778f, +0.199223f, -0.049734f, -0.000202f, -0.000022f}, + {-0.015529f, -0.058172f, -0.001453f, +0.000253f, +0.000058f}, + {+0.020112f, +0.056461f, -0.003930f, -0.000113f, +0.000042f}, + {+0.027311f, -0.065956f, -0.001130f, +0.000048f, +0.000049f}, + {+0.092570f, +0.201332f, +0.007025f, +0.000092f, +0.000044f}, + {+0.078874f, -0.299423f, +0.007522f, +0.000058f, -0.000026f}, + {-0.031803f, -0.392121f, -0.002719f, +0.000010f, +0.000023f}, + {+0.078295f, +0.019932f, +0.020674f, +0.000126f, +0.000017f}, + {+0.029291f, +0.096155f, +0.000322f, -0.000490f, +0.000025f}, + {-0.042190f, -0.292546f, -0.004474f, +0.000130f, -0.000023f}, + {+0.047310f, -0.289378f, -0.003082f, -0.000264f, -0.000009f}, + {-0.036042f, -0.202365f, -0.005972f, -0.000021f, -0.000059f}, + {-0.067032f, +0.032496f, -0.007059f, -0.000199f, -0.000013f}, + {-0.101204f, -0.185795f, -0.005848f, +0.000042f, +0.000029f}, + {-0.006759f, +0.066549f, -0.000681f, -0.000136f, +0.000016f} + }, + { + {-0.033486f, +0.450867f, -0.006565f, +0.000576f, +0.000085f}, + {-0.061876f, +0.590080f, -0.009764f, +0.001166f, +0.000147f}, + {+0.051215f, +0.040728f, +0.006725f, +0.000135f, -0.000027f}, + {-0.075886f, -0.090288f, -0.009577f, +0.000383f, -0.000018f}, + {+0.015185f, -0.082124f, +0.005184f, +0.000502f, -0.000049f}, + {-0.096327f, -0.079550f, -0.006514f, +0.000328f, -0.000021f}, + {+0.097424f, -0.250345f, +0.019698f, -0.001078f, +0.000017f}, + {+0.169040f, -0.091237f, +0.017597f, +0.000283f, +0.000017f}, + {-0.049945f, -0.183685f, -0.013171f, -0.002034f, -0.000009f}, + {-0.051580f, -0.036720f, -0.010126f, +0.001380f, +0.000151f}, + {+0.125504f, -0.039269f, +0.013578f, +0.000208f, -0.000027f}, + {+0.070511f, -0.247836f, +0.009393f, +0.000912f, +0.000087f}, + {+0.075408f, -0.033832f, +0.006471f, +0.000223f, -0.000010f}, + {+0.010281f, +0.155017f, +0.004289f, -0.000279f, +0.000029f}, + {+0.128761f, +0.151968f, +0.010917f, +0.000111f, -0.000004f}, + {-0.047805f, -0.002840f, -0.010782f, -0.000029f, +0.000015f} + }, + { + {+0.280158f, -0.030000f, +0.043460f, +0.000075f, +0.000014f}, + {+0.336614f, -0.016258f, +0.050302f, +0.000297f, +0.000011f}, + {+0.002372f, +0.120514f, -0.000413f, -0.000319f, -0.000061f}, + {+0.016063f, -0.229902f, +0.006035f, +0.000097f, -0.000043f}, + {-0.028633f, -0.007390f, -0.002007f, -0.000039f, -0.000048f}, + {+0.005134f, -0.220494f, -0.003892f, -0.000252f, -0.000046f}, + {-0.096636f, +0.051599f, -0.015635f, +0.000127f, +0.000026f}, + {-0.105407f, +0.323356f, -0.007410f, +0.000133f, -0.000028f}, + {-0.087018f, -0.141885f, -0.014985f, +0.000005f, -0.000018f}, + {-0.018235f, -0.085003f, +0.002078f, +0.000390f, -0.000041f}, + {-0.049559f, +0.222425f, -0.001760f, -0.000043f, +0.000027f}, + {-0.087658f, -0.008493f, -0.002149f, +0.000327f, +0.000002f}, + {-0.025991f, +0.110117f, +0.002501f, +0.000106f, +0.000066f}, + {+0.073066f, +0.062410f, +0.006753f, +0.000139f, +0.000010f}, + {-0.012343f, +0.361812f, +0.000879f, +0.000019f, -0.000031f}, + {+0.008849f, -0.097553f, +0.003670f, +0.000140f, -0.000018f} + }, + { + {-0.006954f, -0.470379f, -0.000165f, -0.000551f, -0.000082f}, + {-0.019214f, -0.554319f, +0.001599f, -0.001129f, -0.000145f}, + {-0.050232f, +0.045555f, -0.004649f, -0.000015f, +0.000034f}, + {+0.117286f, -0.075343f, +0.011788f, -0.000390f, +0.000023f}, + {+0.013982f, +0.062149f, +0.000689f, -0.000526f, +0.000053f}, + {+0.064167f, -0.122065f, +0.007764f, -0.000174f, +0.000027f}, + {-0.057456f, +0.102739f, -0.012482f, +0.000929f, -0.000017f}, + {-0.086303f, +0.350740f, -0.008732f, -0.000319f, -0.000013f}, + {+0.114468f, +0.156124f, +0.012352f, +0.002008f, +0.000014f}, + {+0.063324f, +0.045704f, +0.011079f, -0.001189f, -0.000135f}, + {-0.081653f, +0.167815f, -0.010699f, -0.000264f, +0.000021f}, + {+0.009546f, +0.130825f, -0.003286f, -0.000952f, -0.000083f}, + {-0.034292f, +0.088622f, -0.006613f, -0.000382f, +0.000000f}, + {-0.064658f, -0.148003f, -0.007951f, +0.000319f, -0.000027f}, + {-0.118973f, +0.200930f, -0.010476f, -0.000078f, +0.000007f}, + {+0.061648f, -0.019855f, +0.007486f, +0.000045f, -0.000011f} + }, + { + {-0.287193f, -0.042900f, -0.042884f, -0.000074f, -0.000006f}, + {-0.316269f, -0.095647f, -0.050717f, -0.000419f, +0.000004f}, + {+0.024609f, -0.065464f, -0.001044f, +0.000352f, +0.000061f}, + {-0.090934f, +0.238549f, -0.014249f, -0.000001f, +0.000044f}, + {+0.019808f, +0.051257f, -0.001165f, +0.000156f, +0.000046f}, + {-0.048333f, +0.050030f, -0.007461f, +0.000269f, +0.000047f}, + {+0.082327f, -0.120302f, +0.020222f, -0.000034f, -0.000027f}, + {+0.165448f, -0.034472f, +0.017814f, +0.000021f, +0.000032f}, + {+0.033316f, +0.280356f, +0.011492f, -0.000020f, +0.000016f}, + {+0.008225f, +0.128802f, -0.005400f, -0.000223f, +0.000054f}, + {+0.088609f, -0.096391f, +0.012066f, +0.000087f, -0.000030f}, + {+0.036267f, +0.078389f, +0.005104f, -0.000176f, +0.000004f}, + {+0.020864f, +0.001946f, +0.003538f, -0.000159f, -0.000070f}, + {-0.031397f, -0.200648f, -0.000765f, -0.000186f, -0.000008f}, + {+0.119879f, -0.159775f, +0.011369f, +0.000002f, +0.000032f}, + {-0.036654f, +0.129414f, -0.004412f, -0.000114f, +0.000020f} + }, + { + {+0.055358f, +0.480776f, +0.007156f, +0.000440f, +0.000080f}, + {+0.069696f, +0.497403f, +0.009705f, +0.000945f, +0.000144f}, + {+0.014636f, -0.076742f, +0.003268f, +0.000063f, -0.000042f}, + {-0.098616f, +0.221987f, -0.012598f, +0.000348f, -0.000027f}, + {-0.038012f, -0.038810f, -0.004148f, +0.000514f, -0.000056f}, + {-0.010993f, +0.104517f, -0.004208f, +0.000219f, -0.000033f}, + {+0.073401f, -0.141057f, +0.006526f, -0.000916f, +0.000016f}, + {-0.033949f, -0.336614f, -0.001600f, +0.000255f, +0.000007f}, + {-0.139291f, +0.017101f, -0.017309f, -0.001860f, -0.000021f}, + {-0.085604f, -0.017452f, -0.013308f, +0.001048f, +0.000118f}, + {+0.029028f, -0.187952f, +0.005021f, +0.000216f, -0.000016f}, + {-0.006564f, +0.006493f, -0.001419f, +0.000780f, +0.000079f}, + {+0.020490f, +0.003411f, +0.006133f, +0.000307f, +0.000011f}, + {+0.091616f, -0.016927f, +0.008786f, -0.000287f, +0.000025f}, + {+0.009844f, -0.323610f, +0.003492f, +0.000078f, -0.000011f}, + {-0.056286f, +0.097814f, -0.006882f, -0.000079f, +0.000007f} + }, + { + {+0.282827f, +0.133300f, +0.042549f, +0.000086f, -0.000002f}, + {+0.297764f, +0.151816f, +0.046261f, +0.000499f, -0.000022f}, + {-0.010547f, -0.035236f, +0.000498f, -0.000494f, -0.000059f}, + {+0.144406f, -0.152441f, +0.023633f, -0.000028f, -0.000044f}, + {-0.000542f, -0.094714f, +0.004019f, -0.000229f, -0.000043f}, + {+0.041461f, +0.019853f, +0.008957f, -0.000418f, -0.000046f}, + {-0.123943f, +0.154058f, -0.020412f, +0.000069f, +0.000030f}, + {-0.130914f, -0.179670f, -0.017352f, -0.000111f, -0.000033f}, + {+0.036620f, -0.258117f, -0.000481f, +0.000034f, -0.000009f}, + {+0.021657f, -0.180451f, +0.009924f, +0.000053f, -0.000065f}, + {-0.095197f, +0.006584f, -0.013724f, -0.000061f, +0.000032f}, + {-0.011099f, +0.015338f, -0.000599f, +0.000168f, -0.000011f}, + {+0.002807f, +0.034719f, -0.003109f, +0.000353f, +0.000070f}, + {-0.041276f, +0.181885f, -0.005275f, +0.000201f, +0.000007f}, + {-0.125301f, -0.110921f, -0.015164f, -0.000039f, -0.000032f}, + {+0.066993f, -0.092159f, +0.009251f, +0.000136f, -0.000021f} + }, + { + {-0.104112f, -0.458657f, -0.013927f, -0.000353f, -0.000076f}, + {-0.111390f, -0.472799f, -0.015450f, -0.000704f, -0.000139f}, + {+0.000873f, -0.019121f, -0.001169f, -0.000093f, +0.000048f}, + {+0.056615f, -0.285336f, +0.007942f, -0.000391f, +0.000032f}, + {+0.055650f, -0.007065f, +0.007223f, -0.000546f, +0.000060f}, + {-0.018845f, -0.077039f, -0.001923f, -0.000256f, +0.000039f}, + {-0.051977f, +0.260211f, -0.006687f, +0.000819f, -0.000018f}, + {+0.110604f, +0.197201f, +0.015009f, -0.000259f, -0.000003f}, + {+0.118052f, -0.135388f, +0.015667f, +0.001612f, +0.000024f}, + {+0.098237f, -0.061993f, +0.014872f, -0.000974f, -0.000101f}, + {+0.016600f, +0.180900f, +0.001935f, -0.000217f, +0.000011f}, + {-0.024890f, -0.001895f, -0.000719f, -0.000667f, -0.000075f}, + {-0.052001f, -0.047705f, -0.008689f, -0.000203f, -0.000021f}, + {-0.051423f, +0.163687f, -0.007750f, +0.000277f, -0.000023f}, + {+0.092904f, +0.226447f, +0.010447f, -0.000087f, +0.000014f}, + {+0.029788f, -0.148840f, +0.003437f, +0.000063f, -0.000002f} + }, + { + {-0.265513f, -0.211642f, -0.040584f, -0.000055f, +0.000009f}, + {-0.279427f, -0.216928f, -0.044464f, -0.000461f, +0.000042f}, + {-0.017280f, +0.004077f, -0.001930f, +0.000533f, +0.000057f}, + {-0.175703f, +0.073912f, -0.028215f, +0.000106f, +0.000044f}, + {-0.032929f, +0.127864f, -0.007891f, +0.000307f, +0.000041f}, + {-0.023458f, -0.073855f, -0.003516f, +0.000521f, +0.000044f}, + {+0.165507f, -0.073413f, +0.027506f, -0.000119f, -0.000034f}, + {+0.058760f, +0.277549f, +0.005732f, +0.000115f, +0.000033f}, + {-0.086524f, +0.185360f, -0.006494f, -0.000114f, +0.000000f}, + {-0.068563f, +0.191058f, -0.014677f, +0.000094f, +0.000073f}, + {+0.083271f, +0.077777f, +0.010978f, +0.000035f, -0.000035f}, + {+0.032739f, -0.090968f, +0.003108f, -0.000130f, +0.000018f}, + {+0.012042f, -0.148829f, +0.005352f, -0.000453f, -0.000067f}, + {+0.074068f, -0.028523f, +0.009472f, -0.000233f, -0.000006f}, + {+0.054178f, +0.286348f, +0.004315f, +0.000011f, +0.000032f}, + {-0.081317f, +0.023039f, -0.011622f, -0.000155f, +0.000021f} + }, + { + {+0.144447f, +0.416258f, +0.019880f, +0.000298f, +0.000071f}, + {+0.149133f, +0.438088f, +0.020811f, +0.000535f, +0.000129f}, + {+0.015049f, +0.049287f, -0.000123f, +0.000146f, -0.000053f}, + {-0.004923f, +0.337598f, +0.000454f, +0.000368f, -0.000037f}, + {-0.051157f, +0.099533f, -0.006353f, +0.000530f, -0.000063f}, + {+0.036114f, +0.015276f, +0.002183f, +0.000257f, -0.000042f}, + {-0.001423f, -0.329473f, -0.000629f, -0.000758f, +0.000021f}, + {-0.137836f, -0.026570f, -0.019057f, +0.000357f, +0.000002f}, + {-0.074813f, +0.206610f, -0.009222f, -0.001398f, -0.000023f}, + {-0.082213f, +0.168162f, -0.013202f, +0.000891f, +0.000086f}, + {-0.053436f, -0.133406f, -0.007060f, +0.000274f, -0.000004f}, + {+0.031202f, -0.097339f, +0.000600f, +0.000565f, +0.000069f}, + {+0.084087f, -0.042545f, +0.010288f, +0.000114f, +0.000027f}, + {-0.011630f, -0.156396f, +0.002102f, -0.000281f, +0.000021f}, + {-0.139327f, -0.009640f, -0.015858f, +0.000166f, -0.000017f}, + {+0.001227f, +0.149601f, +0.000552f, -0.000041f, -0.000002f} + }, + { + {+0.243657f, +0.264257f, +0.037689f, -0.000001f, -0.000015f}, + {+0.259444f, +0.270037f, +0.041639f, +0.000297f, -0.000058f}, + {+0.024732f, +0.031819f, +0.004944f, -0.000508f, -0.000056f}, + {+0.188302f, +0.043036f, +0.027818f, -0.000121f, -0.000045f}, + {+0.061013f, -0.068025f, +0.009284f, -0.000332f, -0.000040f}, + {-0.005481f, +0.077635f, +0.001849f, -0.000481f, -0.000044f}, + {-0.183484f, -0.052352f, -0.028430f, +0.000255f, +0.000038f}, + {+0.021508f, -0.270954f, +0.003464f, -0.000123f, -0.000034f}, + {+0.112315f, -0.086235f, +0.009937f, +0.000307f, +0.000007f}, + {+0.107969f, -0.120398f, +0.018769f, -0.000181f, -0.000082f}, + {-0.056786f, -0.126822f, -0.007959f, -0.000033f, +0.000039f}, + {-0.069219f, +0.054400f, -0.005730f, +0.000053f, -0.000023f}, + {-0.070651f, +0.193415f, -0.010674f, +0.000389f, +0.000067f}, + {-0.051509f, -0.092171f, -0.007870f, +0.000294f, +0.000005f}, + {+0.051121f, -0.299571f, +0.006590f, -0.000024f, -0.000032f}, + {+0.084035f, +0.019475f, +0.012921f, +0.000164f, -0.000021f} + }, + { + {-0.178130f, -0.383088f, -0.025598f, -0.000261f, -0.000067f}, + {-0.182587f, -0.405974f, -0.025901f, -0.000462f, -0.000117f}, + {-0.033772f, -0.059691f, -0.003877f, -0.000106f, +0.000059f}, + {-0.056171f, -0.329183f, -0.006810f, -0.000311f, +0.000043f}, + {+0.030324f, -0.107424f, +0.007446f, -0.000469f, +0.000068f}, + {-0.029083f, +0.038828f, -0.003047f, -0.000232f, +0.000046f}, + {+0.074081f, +0.341332f, +0.009025f, +0.000675f, -0.000027f}, + {+0.114367f, -0.124510f, +0.017364f, -0.000363f, -0.000002f}, + {+0.019963f, -0.231444f, +0.001211f, +0.001284f, +0.000019f}, + {+0.044510f, -0.213643f, +0.009811f, -0.000749f, -0.000069f}, + {+0.075343f, +0.079800f, +0.011596f, -0.000341f, -0.000004f}, + {+0.002994f, +0.163592f, +0.001034f, -0.000473f, -0.000063f}, + {-0.066930f, +0.201208f, -0.008014f, -0.000114f, -0.000031f}, + {+0.046049f, +0.057169f, +0.003278f, +0.000251f, -0.000018f}, + {+0.102214f, -0.218411f, +0.013142f, -0.000169f, +0.000019f}, + {-0.034525f, -0.167091f, -0.007400f, +0.000056f, +0.000007f} + }, + { + {-0.222238f, -0.317392f, -0.033615f, +0.000033f, +0.000021f}, + {-0.241813f, -0.315693f, -0.038994f, -0.000147f, +0.000070f}, + {-0.020356f, -0.081902f, -0.002758f, +0.000479f, +0.000060f}, + {-0.167023f, -0.157180f, -0.026364f, +0.000127f, +0.000047f}, + {-0.066143f, +0.046203f, -0.014148f, +0.000357f, +0.000040f}, + {+0.022432f, -0.042335f, +0.001522f, +0.000437f, +0.000048f}, + {+0.157680f, +0.214692f, +0.024775f, -0.000379f, -0.000040f}, + {-0.074512f, +0.166548f, -0.010491f, +0.000080f, +0.000039f}, + {-0.105735f, -0.034968f, -0.008768f, -0.000539f, -0.000010f}, + {-0.123458f, +0.044963f, -0.022305f, +0.000260f, +0.000091f}, + {+0.027259f, +0.155333f, +0.002873f, +0.000021f, -0.000041f}, + {+0.074325f, +0.052152f, +0.007210f, +0.000007f, +0.000026f}, + {+0.123302f, -0.087187f, +0.015137f, -0.000263f, -0.000074f}, + {+0.007845f, +0.113256f, +0.003459f, -0.000313f, -0.000004f}, + {-0.120092f, +0.122041f, -0.014660f, +0.000024f, +0.000034f}, + {-0.076429f, -0.107035f, -0.008690f, -0.000173f, +0.000022f} + }, + { + {+0.213344f, +0.349398f, +0.030097f, +0.000237f, +0.000063f}, + {+0.219215f, +0.390772f, +0.031915f, +0.000487f, +0.000107f}, + {+0.052529f, +0.029499f, +0.005648f, -0.000100f, -0.000070f}, + {+0.095709f, +0.245511f, +0.012927f, +0.000199f, -0.000053f}, + {-0.028737f, +0.105483f, -0.003866f, +0.000348f, -0.000076f}, + {+0.013337f, -0.055289f, +0.001002f, +0.000053f, -0.000054f}, + {-0.130180f, -0.225228f, -0.015900f, -0.000591f, +0.000035f}, + {-0.068381f, +0.171403f, -0.012635f, +0.000260f, +0.000000f}, + {+0.025988f, +0.167605f, +0.004069f, -0.001280f, -0.000015f}, + {-0.008972f, +0.221115f, -0.003663f, +0.000531f, +0.000048f}, + {-0.090641f, -0.028424f, -0.013918f, +0.000378f, +0.000016f}, + {-0.038654f, -0.120101f, -0.004990f, +0.000461f, +0.000057f}, + {+0.005905f, -0.263875f, +0.003095f, +0.000269f, +0.000040f}, + {-0.040815f, +0.035273f, -0.004946f, -0.000197f, +0.000014f}, + {-0.018746f, +0.272655f, -0.004798f, +0.000121f, -0.000023f}, + {+0.076538f, +0.124942f, +0.010206f, -0.000084f, -0.000014f} + }, + { + {+0.192920f, +0.381741f, +0.029300f, -0.000048f, -0.000026f}, + {+0.222170f, +0.388402f, +0.034955f, +0.000099f, -0.000080f}, + {+0.001699f, +0.107240f, +0.000947f, -0.000519f, -0.000066f}, + {+0.136658f, +0.180309f, +0.023176f, -0.000174f, -0.000048f}, + {+0.088774f, -0.075575f, +0.016123f, -0.000436f, -0.000040f}, + {-0.024745f, +0.004479f, -0.001974f, -0.000454f, -0.000055f}, + {-0.102774f, -0.266722f, -0.019008f, +0.000449f, +0.000041f}, + {+0.092562f, -0.080882f, +0.015366f, -0.000075f, -0.000049f}, + {+0.070990f, +0.091884f, +0.006305f, +0.000702f, +0.000009f}, + {+0.128422f, +0.011753f, +0.022348f, -0.000409f, -0.000098f}, + {+0.011288f, -0.189192f, +0.003841f, +0.000041f, +0.000039f}, + {-0.054725f, -0.090752f, -0.006454f, -0.000058f, -0.000028f}, + {-0.128788f, -0.054495f, -0.017806f, +0.000292f, +0.000085f}, + {+0.020286f, -0.059861f, +0.001026f, +0.000246f, +0.000006f}, + {+0.120848f, +0.054441f, +0.017027f, -0.000075f, -0.000037f}, + {+0.034321f, +0.188962f, +0.004725f, +0.000162f, -0.000021f} + }, + { + {-0.244141f, -0.287056f, -0.034191f, -0.000192f, -0.000058f}, + {-0.264405f, -0.355877f, -0.037791f, -0.000515f, -0.000101f}, + {-0.059687f, +0.011038f, -0.007243f, +0.000348f, +0.000093f}, + {-0.113575f, -0.207201f, -0.018101f, -0.000078f, +0.000070f}, + {+0.015137f, -0.192002f, -0.000035f, -0.000213f, +0.000092f}, + {-0.000786f, +0.038825f, -0.000032f, +0.000190f, +0.000073f}, + {+0.148464f, +0.121467f, +0.020501f, +0.000551f, -0.000044f}, + {+0.029628f, -0.179066f, +0.005364f, -0.000049f, +0.000007f}, + {-0.038114f, -0.078616f, -0.007491f, +0.001320f, +0.000017f}, + {-0.025506f, -0.225558f, -0.001578f, -0.000313f, -0.000019f}, + {+0.093865f, -0.065189f, +0.011642f, -0.000361f, -0.000030f}, + {+0.055369f, +0.081537f, +0.009138f, -0.000492f, -0.000055f}, + {+0.051502f, +0.222620f, +0.004584f, -0.000598f, -0.000061f}, + {+0.019309f, -0.058544f, +0.003257f, +0.000181f, -0.000009f}, + {-0.051402f, -0.209177f, -0.004739f, -0.000005f, +0.000032f}, + {-0.088918f, +0.001217f, -0.011717f, +0.000085f, +0.000023f} + }, + { + {-0.156411f, -0.421444f, -0.024491f, +0.000067f, +0.000032f}, + {-0.186613f, -0.476552f, -0.029757f, -0.000163f, +0.000095f}, + {+0.020430f, -0.113691f, +0.002893f, +0.000775f, +0.000065f}, + {-0.119151f, -0.201740f, -0.018300f, +0.000297f, +0.000045f}, + {-0.119879f, +0.010231f, -0.016974f, +0.000596f, +0.000034f}, + {+0.016380f, +0.009027f, +0.002417f, +0.000683f, +0.000057f}, + {+0.054627f, +0.269651f, +0.010810f, -0.000526f, -0.000040f}, + {-0.097390f, +0.017005f, -0.015311f, +0.000161f, +0.000060f}, + {-0.042266f, -0.067204f, -0.002884f, -0.000753f, -0.000009f}, + {-0.124653f, -0.076460f, -0.020814f, +0.000683f, +0.000097f}, + {-0.063103f, +0.174209f, -0.008521f, -0.000147f, -0.000032f}, + {+0.034711f, +0.112933f, +0.002461f, +0.000059f, +0.000029f}, + {+0.100579f, +0.144714f, +0.014721f, -0.000551f, -0.000093f}, + {-0.025957f, +0.015194f, -0.003388f, -0.000192f, -0.000011f}, + {-0.076574f, -0.167585f, -0.012107f, +0.000148f, +0.000039f}, + {+0.014876f, -0.155274f, +0.000070f, -0.000119f, +0.000015f} + }, + { + {+0.265430f, +0.225416f, +0.037831f, +0.000115f, +0.000053f}, + {+0.306311f, +0.277325f, +0.043227f, +0.000433f, +0.000096f}, + {+0.056945f, -0.056467f, +0.006568f, -0.000476f, -0.000127f}, + {+0.136114f, +0.189590f, +0.020608f, +0.000082f, -0.000092f}, + {+0.029899f, +0.236698f, +0.003149f, +0.000187f, -0.000112f}, + {+0.002353f, -0.011865f, -0.000725f, -0.000346f, -0.000104f}, + {-0.149926f, -0.044328f, -0.020529f, -0.000533f, +0.000055f}, + {+0.006499f, +0.177667f, -0.000005f, -0.000147f, -0.000024f}, + {+0.030173f, +0.047667f, +0.008504f, -0.001253f, -0.000024f}, + {+0.058868f, +0.204995f, +0.005519f, +0.000216f, -0.000017f}, + {-0.060797f, +0.176638f, -0.008488f, +0.000290f, +0.000044f}, + {-0.066026f, -0.042360f, -0.010165f, +0.000503f, +0.000055f}, + {-0.083588f, -0.140991f, -0.010070f, +0.000860f, +0.000099f}, + {-0.004801f, +0.048462f, -0.000139f, -0.000150f, +0.000006f}, + {+0.080388f, +0.074103f, +0.009601f, -0.000068f, -0.000044f}, + {+0.065811f, -0.073786f, +0.011524f, -0.000018f, -0.000032f} + }, + { + {+0.119762f, +0.449669f, +0.018731f, -0.000115f, -0.000039f}, + {+0.134482f, +0.541069f, +0.022864f, +0.000250f, -0.000117f}, + {-0.042132f, +0.097515f, -0.006293f, -0.001210f, -0.000046f}, + {+0.098328f, +0.249713f, +0.014715f, -0.000530f, -0.000029f}, + {+0.121827f, +0.094517f, +0.018717f, -0.000823f, -0.000016f}, + {-0.013897f, +0.016128f, -0.002834f, -0.001121f, -0.000043f}, + {-0.013035f, -0.259005f, -0.004212f, +0.000650f, +0.000036f}, + {+0.088488f, +0.051805f, +0.014091f, -0.000366f, -0.000066f}, + {+0.034103f, +0.039837f, +0.000657f, +0.000674f, +0.000017f}, + {+0.110624f, +0.126988f, +0.019030f, -0.001012f, -0.000081f}, + {+0.093230f, -0.059767f, +0.012720f, +0.000213f, +0.000018f}, + {-0.010158f, -0.127393f, +0.000864f, +0.000011f, -0.000034f}, + {-0.063926f, -0.170726f, -0.009503f, +0.001011f, +0.000084f}, + {+0.027512f, -0.003892f, +0.003562f, +0.000233f, +0.000020f}, + {+0.023442f, +0.159229f, +0.006050f, -0.000235f, -0.000035f}, + {-0.037775f, +0.088532f, -0.005468f, +0.000062f, -0.000004f} + }, + { + {-0.281213f, -0.164420f, -0.039852f, -0.000042f, -0.000045f}, + {-0.333286f, -0.175696f, -0.047590f, -0.000222f, -0.000083f}, + {-0.046428f, +0.089416f, -0.005265f, +0.000281f, +0.000164f}, + {-0.162498f, -0.149672f, -0.023881f, -0.000229f, +0.000114f}, + {-0.075028f, -0.208672f, -0.010268f, -0.000343f, +0.000132f}, + {-0.011727f, +0.019516f, +0.000540f, +0.000212f, +0.000139f}, + {+0.140528f, -0.025264f, +0.018383f, +0.000497f, -0.000067f}, + {-0.033739f, -0.136327f, -0.003526f, +0.000118f, +0.000049f}, + {-0.027078f, -0.053959f, -0.007554f, +0.001057f, +0.000031f}, + {-0.086060f, -0.177107f, -0.010290f, -0.000364f, +0.000050f}, + {+0.010787f, -0.184727f, +0.002953f, -0.000174f, -0.000054f}, + {+0.067502f, -0.008050f, +0.010245f, -0.000436f, -0.000057f}, + {+0.094254f, +0.075792f, +0.012552f, -0.000706f, -0.000144f}, + {-0.009743f, -0.063892f, -0.003613f, +0.000014f, -0.000006f}, + {-0.069093f, +0.013884f, -0.010485f, -0.000027f, +0.000058f}, + {-0.040587f, +0.086338f, -0.006898f, -0.000093f, +0.000039f} + }, + { + {-0.083222f, -0.468035f, -0.013503f, +0.000232f, +0.000044f}, + {-0.075896f, -0.571385f, -0.014672f, -0.000160f, +0.000148f}, + {+0.064646f, -0.084083f, +0.009714f, +0.001578f, +0.000001f}, + {-0.061670f, -0.306739f, -0.009048f, +0.000650f, -0.000001f}, + {-0.101027f, -0.169945f, -0.015494f, +0.000962f, -0.000016f}, + {+0.029442f, -0.045651f, +0.004343f, +0.001546f, +0.000004f}, + {-0.024934f, +0.231230f, -0.000602f, -0.000728f, -0.000028f}, + {-0.072285f, -0.076179f, -0.012914f, +0.000746f, +0.000059f}, + {-0.032566f, -0.041990f, -0.000543f, -0.000656f, -0.000034f}, + {-0.090764f, -0.173219f, -0.015307f, +0.001207f, +0.000044f}, + {-0.090276f, -0.027741f, -0.013865f, -0.000091f, +0.000003f}, + {-0.018263f, +0.122358f, -0.003953f, -0.000094f, +0.000045f}, + {+0.030642f, +0.175289f, +0.004377f, -0.001562f, -0.000047f}, + {-0.023328f, -0.044760f, -0.001438f, -0.000338f, -0.000032f}, + {+0.006646f, -0.104149f, -0.000978f, +0.000365f, +0.000024f}, + {+0.048240f, -0.050757f, +0.006981f, -0.000141f, -0.000013f} + }, + { + {+0.293187f, +0.109518f, +0.041947f, +0.000007f, +0.000034f}, + {+0.344718f, +0.073613f, +0.049496f, -0.000072f, +0.000056f}, + {+0.021693f, -0.150854f, +0.000496f, +0.000303f, -0.000187f}, + {+0.175693f, +0.054150f, +0.024494f, +0.000572f, -0.000126f}, + {+0.106866f, +0.149507f, +0.014360f, +0.000666f, -0.000140f}, + {+0.005446f, -0.082692f, -0.002403f, +0.000314f, -0.000163f}, + {-0.114767f, +0.094767f, -0.014918f, -0.000548f, +0.000078f}, + {+0.049475f, +0.114052f, +0.007022f, +0.000118f, -0.000074f}, + {+0.031125f, +0.054985f, +0.008404f, -0.000705f, -0.000030f}, + {+0.107661f, +0.132716f, +0.012982f, +0.000706f, -0.000070f}, + {+0.028176f, +0.155327f, +0.002943f, +0.000018f, +0.000055f}, + {-0.051419f, +0.071483f, -0.007973f, +0.000234f, +0.000055f}, + {-0.090400f, -0.012443f, -0.011441f, +0.000118f, +0.000180f}, + {+0.025522f, +0.028081f, +0.003864f, +0.000120f, +0.000013f}, + {+0.045874f, -0.043114f, +0.007466f, +0.000223f, -0.000070f}, + {+0.014499f, -0.105809f, +0.003088f, +0.000276f, -0.000039f} + }, + { + {+0.046789f, +0.488561f, +0.007479f, -0.000388f, -0.000046f}, + {+0.018640f, +0.575973f, +0.005892f, -0.000203f, -0.000177f}, + {-0.079067f, +0.002856f, -0.010533f, -0.001448f, +0.000068f}, + {+0.016267f, +0.296423f, +0.004542f, -0.000403f, +0.000045f}, + {+0.068852f, +0.208415f, +0.010824f, -0.000748f, +0.000061f}, + {-0.046351f, -0.003708f, -0.005559f, -0.001546f, +0.000058f}, + {+0.047339f, -0.155305f, +0.003323f, +0.000760f, +0.000014f}, + {+0.060540f, +0.100086f, +0.009755f, -0.001008f, -0.000039f}, + {+0.028568f, +0.054083f, +0.000810f, +0.000898f, +0.000057f}, + {+0.065074f, +0.200619f, +0.010710f, -0.000928f, +0.000007f}, + {+0.072568f, +0.087920f, +0.011704f, -0.000262f, -0.000027f}, + {+0.035957f, -0.060576f, +0.005664f, +0.000112f, -0.000061f}, + {-0.005716f, -0.143119f, -0.000691f, +0.001673f, -0.000018f}, + {+0.004173f, +0.058408f, +0.000175f, +0.000594f, +0.000044f}, + {-0.014414f, +0.051132f, -0.000839f, -0.000345f, -0.000005f}, + {-0.049091f, -0.010855f, -0.005751f, +0.000426f, +0.000033f} + }, + { + {-0.304340f, -0.049256f, -0.042947f, -0.000088f, -0.000022f}, + {-0.346449f, +0.017003f, -0.049621f, +0.000139f, -0.000009f}, + {+0.019745f, +0.150866f, +0.002851f, -0.000874f, +0.000177f}, + {-0.162730f, +0.020120f, -0.025248f, -0.000808f, +0.000118f}, + {-0.121162f, -0.084738f, -0.017259f, -0.000808f, +0.000129f}, + {+0.021528f, +0.096693f, +0.003962f, -0.000943f, +0.000157f}, + {+0.080586f, -0.103642f, +0.011291f, +0.000589f, -0.000085f}, + {-0.068191f, -0.098030f, -0.009096f, -0.000708f, +0.000092f}, + {-0.036751f, -0.046076f, -0.010119f, +0.000284f, +0.000015f}, + {-0.119856f, -0.085575f, -0.015319f, -0.000749f, +0.000064f}, + {-0.056191f, -0.109851f, -0.006441f, -0.000263f, -0.000045f}, + {+0.024446f, -0.076942f, +0.005466f, +0.000057f, -0.000045f}, + {+0.077086f, -0.012676f, +0.010840f, +0.000676f, -0.000186f}, + {-0.022826f, +0.016537f, -0.004763f, -0.000058f, -0.000029f}, + {-0.027607f, +0.031101f, -0.005172f, -0.000482f, +0.000074f}, + {+0.014855f, +0.087430f, -0.000738f, -0.000308f, +0.000029f} + }, + { + {-0.005004f, -0.508800f, -0.001655f, +0.000570f, +0.000043f}, + {+0.037995f, -0.575156f, +0.001530f, +0.000956f, +0.000194f}, + {+0.063856f, +0.080957f, +0.012812f, -0.000366f, -0.000142f}, + {+0.010948f, -0.247204f, +0.002839f, -0.000988f, -0.000091f}, + {-0.037852f, -0.213873f, -0.003692f, -0.000614f, -0.000107f}, + {+0.039839f, +0.066118f, +0.007988f, +0.000076f, -0.000128f}, + {-0.045977f, +0.093672f, -0.005215f, -0.000506f, +0.000005f}, + {-0.041130f, -0.141991f, -0.007462f, +0.000858f, +0.000008f}, + {-0.021819f, -0.064730f, +0.000517f, -0.001640f, -0.000079f}, + {-0.039217f, -0.211900f, -0.002725f, -0.000921f, -0.000061f}, + {-0.045306f, -0.127706f, -0.011256f, +0.001493f, +0.000048f}, + {-0.032008f, +0.009436f, -0.005842f, +0.000094f, +0.000078f}, + {-0.004712f, +0.114810f, -0.003709f, -0.000227f, +0.000095f}, + {+0.008291f, -0.029832f, +0.002509f, -0.001272f, -0.000051f}, + {+0.010544f, -0.029052f, +0.001437f, -0.000138f, -0.000018f}, + {+0.030918f, +0.063638f, +0.005584f, -0.001227f, -0.000052f} + }, + { + {+0.309505f, -0.026680f, +0.043359f, +0.000419f, +0.000012f}, + {+0.340746f, -0.112091f, +0.048231f, +0.000694f, -0.000055f}, + {-0.050908f, -0.091302f, -0.002377f, +0.001134f, -0.000125f}, + {+0.144586f, -0.040667f, +0.026484f, +0.000403f, -0.000085f}, + {+0.123071f, +0.035557f, +0.020641f, +0.000216f, -0.000092f}, + {-0.043825f, -0.058128f, -0.002805f, +0.001548f, -0.000111f}, + {-0.057009f, +0.077140f, -0.008666f, -0.000464f, +0.000085f}, + {+0.083496f, +0.049994f, +0.012188f, +0.002184f, -0.000094f}, + {+0.041301f, +0.031775f, +0.012825f, +0.000028f, +0.000015f}, + {+0.123609f, +0.042304f, +0.020375f, -0.000225f, -0.000027f}, + {+0.072663f, +0.052460f, +0.006157f, +0.001671f, +0.000023f}, + {-0.007106f, +0.047603f, -0.003493f, -0.000487f, +0.000023f}, + {-0.066995f, +0.014584f, -0.013984f, -0.001717f, +0.000149f}, + {+0.012333f, -0.023056f, +0.004831f, -0.000535f, +0.000051f}, + {+0.018093f, -0.018206f, +0.005001f, +0.000871f, -0.000068f}, + {-0.032484f, -0.034633f, +0.000235f, -0.000375f, -0.000007f} + } +}; + +const float rightHRIRReal_HOA3[BINAURAL_CONVBANDS][16][BINAURAL_NTAPS]= +{ + { + {+0.028305f, +0.686064f, +0.068005f, +0.008358f, +0.000134f}, + {-0.041076f, -0.081510f, +0.101574f, -0.012332f, -0.000133f}, + {+0.004694f, +0.091178f, -0.006019f, -0.000987f, -0.000100f}, + {+0.005000f, +0.062531f, -0.030068f, +0.002120f, -0.000090f}, + {-0.008304f, -0.004854f, -0.003618f, +0.000840f, +0.000150f}, + {-0.005344f, -0.010835f, -0.007864f, -0.004915f, +0.000112f}, + {-0.014194f, +0.005486f, -0.000750f, -0.002195f, +0.000158f}, + {+0.002251f, -0.002762f, +0.046227f, +0.004129f, +0.000004f}, + {-0.024537f, +0.046996f, -0.049712f, -0.006618f, +0.000145f}, + {-0.010068f, +0.052648f, -0.026763f, -0.010223f, -0.000366f}, + {-0.000943f, -0.017480f, +0.020482f, +0.001034f, +0.000058f}, + {-0.002377f, +0.034436f, +0.006489f, -0.012518f, -0.000220f}, + {-0.003606f, -0.027453f, +0.015178f, +0.001090f, -0.000006f}, + {-0.000854f, -0.033509f, +0.016348f, +0.002809f, +0.000078f}, + {+0.001127f, -0.002978f, +0.013287f, +0.005932f, -0.000006f}, + {-0.002728f, -0.006413f, +0.003444f, +0.002047f, +0.000053f} + }, + { + {-0.060981f, +0.539033f, -0.032927f, -0.008925f, -0.000158f}, + {+0.088569f, -0.331317f, -0.135589f, +0.009798f, +0.000139f}, + {-0.006979f, +0.010016f, -0.062582f, +0.002090f, +0.000127f}, + {-0.010389f, +0.024941f, -0.053685f, -0.002256f, +0.000117f}, + {+0.013525f, +0.047393f, +0.001706f, -0.001388f, -0.000191f}, + {+0.006413f, +0.030122f, +0.020701f, +0.011138f, -0.000148f}, + {+0.024834f, +0.109440f, +0.032236f, +0.002032f, -0.000215f}, + {-0.002223f, -0.102504f, -0.064424f, -0.005351f, -0.000007f}, + {+0.037480f, +0.308972f, +0.087606f, +0.006506f, -0.000210f}, + {+0.016939f, +0.106048f, +0.043760f, +0.005027f, +0.000470f}, + {+0.000739f, +0.002371f, +0.021897f, +0.001907f, -0.000076f}, + {+0.005038f, +0.073983f, +0.110448f, +0.018835f, +0.000283f}, + {+0.003491f, -0.004047f, +0.005200f, -0.002767f, +0.000014f}, + {+0.001174f, +0.011186f, +0.026019f, -0.003363f, -0.000098f}, + {-0.002185f, -0.029503f, -0.056810f, -0.012753f, +0.000001f}, + {+0.003633f, +0.007292f, -0.011811f, -0.003296f, -0.000071f} + }, + { + {+0.056640f, +0.424888f, -0.091068f, -0.008146f, -0.000105f}, + {-0.085624f, -0.535380f, +0.135686f, +0.024218f, +0.000137f}, + {+0.000837f, -0.039137f, -0.022512f, -0.003663f, +0.000063f}, + {+0.009275f, -0.013781f, -0.023629f, -0.005508f, +0.000051f}, + {-0.004547f, +0.088202f, -0.042587f, +0.003924f, -0.000093f}, + {+0.003101f, +0.099791f, -0.033209f, -0.007324f, -0.000060f}, + {-0.010598f, +0.183236f, -0.035352f, +0.008713f, -0.000074f}, + {-0.003128f, -0.087287f, -0.092687f, -0.003205f, -0.000001f}, + {-0.002915f, +0.422198f, -0.021401f, +0.017334f, -0.000046f}, + {-0.008367f, +0.030365f, +0.081942f, +0.019445f, +0.000222f}, + {+0.002027f, +0.059247f, -0.024597f, -0.009143f, -0.000033f}, + {-0.005485f, +0.016036f, +0.189920f, -0.005523f, +0.000134f}, + {+0.004590f, +0.043786f, -0.049890f, +0.002054f, -0.000006f}, + {+0.000794f, +0.086150f, -0.052409f, -0.001703f, -0.000051f}, + {+0.002015f, +0.016274f, -0.139462f, +0.010767f, +0.000013f}, + {+0.000980f, +0.021151f, -0.025610f, +0.002927f, -0.000028f} + }, + { + {-0.037044f, +0.299825f, +0.010626f, +0.009027f, +0.000178f}, + {+0.073631f, -0.563948f, -0.256507f, -0.030068f, -0.000165f}, + {+0.001394f, +0.007863f, +0.051772f, +0.005838f, -0.000136f}, + {-0.007311f, +0.033976f, +0.087547f, +0.012955f, -0.000125f}, + {+0.000742f, -0.006564f, -0.155719f, -0.010210f, +0.000207f}, + {-0.003772f, +0.011095f, -0.118202f, -0.002442f, +0.000158f}, + {-0.001621f, -0.014236f, -0.266669f, -0.019686f, +0.000230f}, + {+0.004592f, +0.006155f, +0.002774f, +0.008968f, +0.000009f}, + {-0.017921f, +0.015905f, -0.425734f, -0.038383f, +0.000222f}, + {+0.007216f, -0.258967f, -0.290441f, -0.007092f, -0.000519f}, + {-0.003522f, +0.023316f, -0.032467f, +0.009674f, +0.000084f}, + {+0.006507f, -0.177693f, -0.033997f, +0.006462f, -0.000311f}, + {-0.006842f, +0.024376f, -0.051686f, +0.001498f, -0.000018f}, + {-0.002603f, +0.039216f, -0.091765f, +0.003591f, +0.000108f}, + {-0.003570f, +0.063130f, -0.095408f, -0.005271f, -0.000002f}, + {-0.003443f, +0.045327f, +0.012038f, -0.006717f, +0.000078f} + }, + { + {+0.016927f, -0.038791f, +0.287896f, +0.014303f, +0.000072f}, + {-0.067605f, +0.097306f, -0.721167f, -0.014182f, -0.000134f}, + {+0.004523f, -0.006482f, +0.087578f, -0.003063f, -0.000024f}, + {+0.010963f, -0.024388f, +0.147380f, -0.008366f, -0.000010f}, + {-0.009045f, -0.033260f, -0.131601f, +0.010659f, +0.000033f}, + {-0.006391f, -0.001186f, -0.117010f, +0.003913f, +0.000007f}, + {-0.000206f, -0.124154f, -0.212720f, +0.011624f, -0.000013f}, + {+0.001006f, +0.018224f, +0.038185f, -0.004418f, -0.000004f}, + {+0.005972f, -0.280246f, -0.279425f, +0.024886f, -0.000056f}, + {-0.013866f, -0.056049f, -0.470046f, -0.033031f, -0.000066f}, + {+0.002003f, -0.013997f, +0.006699f, -0.002838f, +0.000007f}, + {-0.005432f, -0.012448f, -0.193385f, -0.021709f, -0.000041f}, + {+0.002080f, -0.035733f, +0.001464f, -0.003877f, +0.000020f}, + {+0.000948f, -0.008178f, -0.047042f, -0.001214f, +0.000022f}, + {+0.008010f, -0.037066f, -0.006003f, +0.001581f, -0.000020f}, + {+0.002016f, -0.033476f, +0.072960f, +0.011160f, +0.000001f} + }, + { + {-0.031783f, -0.056831f, +0.279059f, -0.028993f, -0.000193f}, + {+0.066811f, +0.547107f, -0.401585f, +0.049258f, +0.000209f}, + {-0.014835f, -0.045923f, +0.063394f, -0.003455f, +0.000127f}, + {-0.030703f, -0.186180f, +0.047058f, -0.002768f, +0.000115f}, + {+0.020147f, +0.183472f, +0.029803f, -0.002654f, -0.000199f}, + {+0.004470f, +0.071648f, -0.045482f, +0.003212f, -0.000142f}, + {+0.003858f, +0.057272f, -0.023397f, +0.006911f, -0.000202f}, + {-0.004365f, -0.021410f, +0.013528f, -0.002517f, -0.000010f}, + {-0.011844f, +0.030236f, +0.050498f, +0.004358f, -0.000183f}, + {+0.006262f, +0.197324f, -0.174496f, +0.041478f, +0.000509f}, + {+0.000909f, -0.022088f, +0.010300f, -0.001930f, -0.000082f}, + {-0.000576f, +0.053541f, -0.096593f, +0.021942f, +0.000302f}, + {-0.001649f, -0.054620f, +0.008127f, +0.002136f, +0.000016f}, + {+0.004848f, +0.029592f, +0.000282f, +0.000006f, -0.000106f}, + {-0.010837f, -0.090950f, -0.014402f, -0.000183f, +0.000006f}, + {+0.000125f, -0.021283f, +0.064876f, -0.009148f, -0.000073f} + }, + { + {+0.115524f, -0.001880f, -0.031709f, +0.016815f, -0.000032f}, + {-0.083119f, +0.442745f, +0.062014f, -0.030630f, +0.000109f}, + {+0.026381f, -0.044427f, -0.014701f, +0.004175f, -0.000007f}, + {+0.059970f, -0.279751f, -0.022479f, +0.004671f, -0.000021f}, + {-0.025539f, +0.285695f, +0.030687f, -0.001281f, +0.000018f}, + {+0.015563f, +0.014341f, +0.021407f, -0.004386f, +0.000034f}, + {-0.005271f, +0.080088f, +0.036839f, -0.008678f, +0.000080f}, + {-0.004239f, -0.044848f, +0.005762f, +0.002882f, +0.000009f}, + {+0.051110f, +0.084066f, +0.036589f, -0.007555f, +0.000131f}, + {+0.012587f, +0.147413f, +0.020658f, -0.013969f, -0.000077f}, + {-0.003103f, -0.017462f, +0.008157f, +0.001803f, +0.000018f}, + {+0.001965f, -0.006861f, +0.032042f, -0.005627f, -0.000042f}, + {+0.003954f, -0.069529f, +0.014309f, +0.000469f, -0.000034f}, + {-0.011351f, +0.041303f, +0.021348f, +0.000056f, +0.000005f}, + {+0.003411f, -0.131943f, -0.006306f, -0.000445f, +0.000025f}, + {-0.006265f, +0.023141f, +0.008583f, +0.003180f, +0.000023f} + }, + { + {-0.170064f, -0.305557f, -0.025217f, +0.001133f, +0.000198f}, + {+0.064730f, +0.498651f, +0.047336f, -0.004429f, -0.000255f}, + {-0.023390f, -0.090206f, -0.010300f, +0.000988f, -0.000108f}, + {-0.044740f, -0.402670f, -0.013847f, +0.001569f, -0.000092f}, + {+0.008298f, +0.311166f, +0.004422f, -0.002306f, +0.000173f}, + {-0.024372f, -0.077330f, +0.000442f, -0.001491f, +0.000110f}, + {+0.006327f, +0.051079f, +0.002801f, -0.003002f, +0.000146f}, + {+0.022671f, -0.029757f, -0.017304f, +0.000691f, +0.000009f}, + {-0.067089f, -0.067084f, +0.027632f, -0.007480f, +0.000108f}, + {-0.016067f, +0.071916f, +0.031764f, -0.005887f, -0.000449f}, + {+0.001118f, -0.007300f, +0.004732f, -0.000912f, +0.000072f}, + {+0.012764f, -0.015163f, +0.034285f, -0.004782f, -0.000265f}, + {+0.002476f, -0.078915f, +0.001493f, -0.000518f, -0.000008f}, + {+0.012009f, +0.058211f, +0.005130f, -0.001142f, +0.000096f}, + {+0.017876f, -0.124879f, -0.017363f, +0.001041f, -0.000014f}, + {+0.016489f, +0.044821f, -0.013683f, +0.000199f, +0.000060f} + }, + { + {+0.031523f, -0.568562f, -0.010165f, -0.004741f, -0.000011f}, + {+0.072210f, +0.453377f, +0.012668f, +0.009988f, -0.000056f}, + {-0.013073f, -0.089526f, -0.006790f, -0.002603f, +0.000024f}, + {-0.055858f, -0.385059f, +0.007901f, -0.002683f, +0.000038f}, + {+0.048389f, +0.243348f, -0.011742f, +0.002577f, -0.000053f}, + {+0.000883f, -0.129298f, -0.003415f, +0.002563f, -0.000054f}, + {+0.004842f, +0.028248f, -0.014727f, +0.004067f, -0.000113f}, + {-0.035207f, +0.044693f, -0.000317f, -0.001511f, -0.000014f}, + {+0.027873f, -0.208313f, -0.025747f, +0.006096f, -0.000162f}, + {+0.003882f, +0.022910f, -0.004172f, +0.004195f, +0.000185f}, + {+0.007316f, -0.007332f, -0.005614f, +0.000479f, -0.000037f}, + {-0.030651f, +0.049980f, -0.004306f, +0.003095f, +0.000103f}, + {-0.012670f, -0.046258f, -0.010787f, -0.000294f, +0.000044f}, + {-0.001544f, +0.071605f, -0.001508f, +0.001151f, -0.000025f}, + {-0.039147f, -0.057668f, +0.001114f, -0.001056f, -0.000026f}, + {-0.013243f, +0.076337f, -0.002755f, -0.000535f, -0.000039f} + }, + { + {+0.207932f, -0.287807f, +0.039075f, +0.000182f, -0.000191f}, + {-0.222358f, +0.019823f, -0.045919f, +0.001569f, +0.000284f}, + {+0.051902f, +0.024897f, +0.018540f, -0.000535f, +0.000087f}, + {+0.157008f, -0.084022f, +0.015927f, -0.001511f, +0.000065f}, + {-0.104303f, +0.038679f, -0.004300f, +0.001876f, -0.000138f}, + {+0.031107f, -0.090841f, -0.009802f, +0.001340f, -0.000075f}, + {-0.026573f, -0.012360f, -0.012445f, +0.003442f, -0.000083f}, + {+0.021614f, +0.128929f, +0.008965f, -0.000458f, -0.000006f}, + {+0.022498f, -0.192805f, -0.008217f, +0.005889f, -0.000025f}, + {-0.001966f, +0.020932f, -0.017205f, +0.001490f, +0.000358f}, + {-0.013558f, -0.031486f, -0.001450f, +0.000305f, -0.000057f}, + {+0.020576f, +0.126851f, -0.015311f, +0.000876f, +0.000211f}, + {+0.011427f, -0.005250f, -0.003401f, +0.000196f, -0.000006f}, + {-0.015857f, +0.049501f, -0.003717f, +0.000601f, -0.000080f}, + {+0.034004f, +0.039429f, +0.003524f, -0.000004f, +0.000023f}, + {-0.014818f, +0.079680f, +0.007758f, +0.000184f, -0.000042f} + }, + { + {-0.203020f, +0.343926f, -0.022319f, +0.001551f, +0.000052f}, + {+0.128697f, -0.502946f, +0.012208f, -0.003598f, -0.000018f}, + {-0.021293f, +0.148245f, -0.006309f, +0.001691f, -0.000030f}, + {-0.108184f, +0.296591f, -0.010288f, +0.001875f, -0.000040f}, + {+0.072445f, -0.199735f, +0.008865f, -0.001996f, +0.000070f}, + {-0.035970f, -0.000468f, +0.003327f, -0.001758f, +0.000054f}, + {+0.022536f, -0.076991f, +0.011763f, -0.002716f, +0.000111f}, + {+0.019549f, +0.129451f, +0.001977f, +0.001130f, +0.000018f}, + {-0.040267f, -0.070315f, +0.008077f, -0.004109f, +0.000149f}, + {+0.011400f, +0.010732f, +0.007406f, -0.002026f, -0.000250f}, + {+0.002851f, -0.052737f, +0.000419f, -0.000375f, +0.000049f}, + {+0.020950f, +0.124942f, +0.003929f, -0.001693f, -0.000137f}, + {-0.002830f, +0.012262f, +0.001345f, -0.000201f, -0.000049f}, + {+0.023252f, -0.010554f, +0.006382f, -0.000870f, +0.000037f}, + {+0.002904f, +0.073991f, +0.004806f, +0.000805f, +0.000022f}, + {+0.038844f, +0.012454f, +0.000939f, +0.000294f, +0.000047f} + }, + { + {-0.104978f, +0.491439f, -0.023130f, -0.000395f, +0.000170f}, + {+0.174716f, -0.431741f, +0.037189f, -0.000731f, -0.000283f}, + {-0.071508f, +0.077184f, -0.011405f, +0.000280f, -0.000069f}, + {-0.071830f, +0.341169f, -0.016908f, +0.001162f, -0.000044f}, + {+0.046880f, -0.228632f, +0.012580f, -0.001764f, +0.000105f}, + {+0.015443f, +0.068044f, +0.005570f, -0.000844f, +0.000048f}, + {+0.020736f, -0.083339f, +0.010949f, -0.002791f, +0.000031f}, + {-0.052065f, +0.019705f, -0.009215f, +0.000218f, +0.000001f}, + {+0.033356f, +0.036658f, +0.013911f, -0.004323f, -0.000040f}, + {-0.006601f, -0.021923f, +0.013349f, -0.000309f, -0.000258f}, + {+0.019016f, -0.023410f, +0.005296f, -0.000367f, +0.000039f}, + {-0.051437f, +0.010933f, +0.004546f, +0.000118f, -0.000155f}, + {+0.002536f, +0.019548f, +0.001804f, +0.000278f, +0.000021f}, + {-0.005862f, -0.062421f, -0.001401f, -0.000650f, +0.000064f}, + {-0.033799f, +0.010290f, -0.008108f, -0.000071f, -0.000030f}, + {-0.019280f, -0.065253f, -0.001294f, -0.000391f, +0.000024f} + }, + { + {+0.271163f, -0.091653f, +0.035807f, -0.000730f, -0.000085f}, + {-0.261169f, +0.235971f, -0.033757f, +0.001621f, +0.000093f}, + {+0.095839f, -0.182710f, +0.015397f, -0.001103f, +0.000028f}, + {+0.156712f, -0.007300f, +0.019789f, -0.001371f, +0.000033f}, + {-0.111926f, +0.011250f, -0.016908f, +0.001748f, -0.000072f}, + {+0.005469f, +0.082676f, -0.002169f, +0.001143f, -0.000043f}, + {-0.049695f, +0.016110f, -0.010723f, +0.002011f, -0.000086f}, + {+0.031235f, -0.105162f, +0.004404f, -0.000861f, -0.000020f}, + {-0.012529f, +0.088572f, -0.009833f, +0.002839f, -0.000106f}, + {-0.012620f, -0.018407f, -0.006593f, +0.002080f, +0.000273f}, + {-0.020511f, +0.042167f, -0.004809f, +0.000322f, -0.000054f}, + {+0.032247f, -0.119711f, +0.002446f, +0.001305f, +0.000148f}, + {-0.004589f, +0.033907f, -0.002233f, +0.000259f, +0.000047f}, + {-0.024243f, -0.043735f, -0.001053f, +0.000816f, -0.000043f}, + {+0.018051f, -0.070970f, +0.002759f, -0.000690f, -0.000016f}, + {-0.025928f, -0.049597f, -0.005106f, -0.000174f, -0.000047f} + }, + { + {-0.009292f, -0.523511f, +0.005609f, +0.000701f, -0.000140f}, + {-0.049598f, +0.562660f, -0.018307f, -0.000353f, +0.000250f}, + {+0.026674f, -0.300653f, +0.000453f, -0.000226f, +0.000059f}, + {-0.025200f, -0.281197f, +0.004191f, -0.000792f, +0.000032f}, + {+0.023452f, +0.216602f, -0.003361f, +0.001302f, -0.000079f}, + {-0.022798f, +0.048857f, -0.002028f, +0.000528f, -0.000034f}, + {+0.017850f, +0.123147f, -0.004163f, +0.001736f, -0.000002f}, + {+0.030232f, -0.106769f, +0.006484f, -0.000160f, +0.000004f}, + {-0.027081f, +0.068469f, -0.013975f, +0.002765f, +0.000074f}, + {+0.015824f, +0.032277f, -0.008777f, -0.000341f, +0.000168f}, + {-0.010909f, +0.060681f, -0.000865f, +0.000330f, -0.000023f}, + {+0.018513f, -0.140495f, -0.006788f, -0.000319f, +0.000106f}, + {-0.009128f, +0.032657f, +0.001038f, -0.000299f, -0.000035f}, + {+0.030409f, +0.035966f, +0.000871f, +0.000497f, -0.000049f}, + {+0.024037f, -0.062735f, +0.004854f, -0.000003f, +0.000033f}, + {+0.031906f, +0.040222f, +0.004969f, +0.000300f, -0.000009f} + }, + { + {-0.274242f, -0.111152f, -0.038437f, +0.000541f, +0.000106f}, + {+0.297362f, +0.028772f, +0.040257f, -0.001002f, -0.000153f}, + {-0.157861f, -0.028386f, -0.015885f, +0.000932f, -0.000023f}, + {-0.130190f, -0.116848f, -0.020017f, +0.001091f, -0.000023f}, + {+0.100486f, +0.097500f, +0.017137f, -0.001413f, +0.000066f}, + {+0.042930f, -0.041353f, +0.001818f, -0.000969f, +0.000030f}, + {+0.035539f, +0.107479f, +0.005226f, -0.001521f, +0.000054f}, + {-0.056245f, +0.022881f, -0.006748f, +0.000737f, +0.000020f}, + {+0.051781f, -0.041176f, +0.012387f, -0.002184f, +0.000054f}, + {+0.005351f, +0.056149f, +0.003091f, -0.002220f, -0.000265f}, + {+0.035484f, -0.008203f, +0.004198f, -0.000217f, +0.000054f}, + {-0.049383f, -0.039088f, -0.002024f, -0.001275f, -0.000143f}, + {+0.027963f, -0.019171f, +0.001212f, -0.000337f, -0.000040f}, + {+0.004231f, +0.075991f, +0.001119f, -0.000670f, +0.000043f}, + {-0.028326f, +0.016304f, -0.003947f, +0.000597f, +0.000009f}, + {+0.014165f, +0.065014f, +0.003473f, +0.000208f, +0.000042f} + }, + { + {+0.100761f, +0.468705f, +0.009523f, -0.000855f, +0.000106f}, + {-0.068322f, -0.534398f, +0.000794f, +0.001015f, -0.000195f}, + {+0.100085f, +0.366003f, +0.010962f, +0.000114f, -0.000054f}, + {+0.079789f, +0.208939f, +0.006983f, +0.000516f, -0.000029f}, + {-0.074868f, -0.177414f, -0.007217f, -0.000977f, +0.000063f}, + {-0.040080f, -0.169063f, -0.003424f, -0.000213f, +0.000031f}, + {-0.047852f, -0.014657f, +0.004244f, -0.000996f, -0.000005f}, + {+0.004688f, +0.112753f, -0.003849f, +0.000122f, -0.000008f}, + {-0.009956f, -0.138804f, +0.008769f, -0.001626f, -0.000077f}, + {-0.022634f, +0.009810f, +0.007400f, +0.000511f, -0.000099f}, + {-0.010732f, -0.077733f, -0.000399f, -0.000274f, +0.000009f}, + {+0.039390f, +0.089325f, +0.008313f, +0.000351f, -0.000070f}, + {-0.019067f, -0.090342f, -0.002768f, +0.000205f, +0.000044f}, + {-0.042005f, +0.002738f, -0.004159f, -0.000376f, +0.000037f}, + {-0.016073f, +0.032695f, -0.005232f, +0.000105f, -0.000033f}, + {-0.040117f, -0.022661f, -0.007858f, -0.000231f, -0.000002f} + }, + { + {+0.246756f, +0.241170f, +0.035479f, -0.000554f, -0.000114f}, + {-0.272424f, -0.216540f, -0.039997f, +0.001031f, +0.000186f}, + {+0.100824f, +0.372627f, +0.007492f, -0.000845f, +0.000020f}, + {+0.086728f, +0.200706f, +0.013419f, -0.000947f, +0.000014f}, + {-0.067471f, -0.194793f, -0.010208f, +0.001216f, -0.000058f}, + {-0.018637f, -0.214052f, +0.004837f, +0.000884f, -0.000020f}, + {+0.025584f, -0.127835f, -0.000911f, +0.001401f, -0.000028f}, + {+0.056339f, +0.027855f, +0.010673f, -0.000579f, -0.000019f}, + {-0.060859f, -0.070229f, -0.011217f, +0.002123f, -0.000013f}, + {+0.014798f, -0.052375f, -0.000623f, +0.002191f, +0.000241f}, + {-0.034285f, -0.039743f, -0.005351f, +0.000109f, -0.000050f}, + {-0.007201f, +0.159482f, -0.003886f, +0.001201f, +0.000130f}, + {-0.020187f, -0.092383f, +0.000382f, +0.000354f, +0.000030f}, + {+0.028788f, -0.109693f, +0.004153f, +0.000525f, -0.000041f}, + {+0.036625f, -0.054073f, +0.008577f, -0.000524f, -0.000003f}, + {-0.002610f, -0.084126f, +0.000986f, -0.000174f, -0.000035f} + }, + { + {-0.167535f, -0.399812f, -0.020854f, +0.000806f, -0.000074f}, + {+0.145635f, +0.430918f, +0.013134f, -0.001141f, +0.000134f}, + {-0.184602f, -0.052096f, -0.013909f, -0.000043f, +0.000053f}, + {-0.110131f, -0.103022f, -0.011251f, -0.000423f, +0.000031f}, + {+0.114138f, +0.085208f, +0.011213f, +0.000798f, -0.000055f}, + {+0.095938f, -0.054666f, +0.000697f, +0.000059f, -0.000033f}, + {-0.000204f, -0.169483f, -0.009146f, +0.000575f, -0.000003f}, + {-0.030090f, -0.112432f, -0.004382f, -0.000216f, +0.000011f}, + {+0.053018f, +0.105332f, -0.004066f, +0.000908f, +0.000060f}, + {+0.009119f, -0.057095f, -0.007675f, -0.000456f, +0.000052f}, + {+0.027961f, +0.057568f, +0.003773f, +0.000262f, +0.000002f}, + {-0.030433f, +0.136477f, -0.002756f, -0.000256f, +0.000046f}, + {+0.049955f, +0.009293f, +0.002856f, -0.000133f, -0.000047f}, + {+0.028171f, -0.112646f, +0.000816f, +0.000380f, -0.000028f}, + {+0.014607f, -0.096614f, -0.000430f, -0.000147f, +0.000031f}, + {+0.051182f, -0.003494f, +0.006796f, +0.000143f, +0.000008f} + }, + { + {-0.208650f, -0.335847f, -0.029770f, +0.000608f, +0.000111f}, + {+0.234234f, +0.291735f, +0.035875f, -0.001265f, -0.000192f}, + {+0.043525f, -0.386017f, -0.001141f, +0.000753f, -0.000019f}, + {-0.024332f, -0.238532f, -0.004594f, +0.000982f, -0.000011f}, + {+0.003204f, +0.260777f, +0.001135f, -0.001218f, +0.000051f}, + {-0.094495f, +0.222636f, -0.006686f, -0.000805f, +0.000016f}, + {-0.041620f, -0.113126f, +0.003804f, -0.001425f, +0.000014f}, + {-0.059468f, -0.070637f, -0.008480f, +0.000599f, +0.000018f}, + {+0.037218f, +0.133212f, +0.009087f, -0.002277f, -0.000009f}, + {-0.028004f, +0.004399f, -0.001485f, -0.002043f, -0.000214f}, + {+0.030214f, +0.052517f, +0.005355f, -0.000063f, +0.000045f}, + {+0.064016f, +0.008538f, +0.001790f, -0.001210f, -0.000117f}, + {-0.035765f, +0.136937f, -0.003958f, -0.000288f, -0.000023f}, + {-0.055646f, +0.013868f, -0.004689f, -0.000551f, +0.000038f}, + {-0.069712f, +0.026129f, -0.007603f, +0.000472f, -0.000000f}, + {-0.022298f, +0.108549f, -0.003048f, +0.000134f, +0.000029f} + }, + { + {+0.220027f, +0.326004f, +0.029195f, -0.000639f, +0.000050f}, + {-0.196112f, -0.377527f, -0.024063f, +0.000894f, -0.000082f}, + {+0.120792f, -0.254914f, +0.016146f, +0.000093f, -0.000054f}, + {+0.094942f, -0.058645f, +0.007709f, +0.000309f, -0.000035f}, + {-0.109837f, +0.090094f, -0.008580f, -0.000595f, +0.000051f}, + {-0.015004f, +0.336419f, +0.000747f, -0.000099f, +0.000037f}, + {+0.088851f, +0.073948f, +0.011663f, -0.000480f, +0.000014f}, + {+0.078671f, +0.147609f, +0.010996f, +0.000157f, -0.000013f}, + {-0.073075f, -0.041998f, -0.000840f, -0.000593f, -0.000038f}, + {+0.021795f, +0.078114f, +0.010687f, +0.000406f, -0.000022f}, + {-0.048839f, -0.075397f, -0.009105f, -0.000275f, -0.000010f}, + {-0.060558f, -0.174519f, -0.000133f, +0.000349f, -0.000030f}, + {-0.014867f, +0.171348f, +0.000948f, +0.000119f, +0.000048f}, + {+0.011606f, +0.111954f, +0.001552f, -0.000324f, +0.000023f}, + {+0.032653f, +0.181837f, +0.003210f, +0.000081f, -0.000029f}, + {-0.047749f, +0.068914f, -0.006585f, -0.000128f, -0.000011f} + }, + { + {+0.160319f, +0.417913f, +0.022833f, -0.000655f, -0.000102f}, + {-0.203183f, -0.369192f, -0.029570f, +0.001470f, +0.000179f}, + {-0.099428f, +0.084211f, -0.009701f, -0.000901f, +0.000019f}, + {-0.024797f, +0.121541f, +0.001449f, -0.000997f, +0.000010f}, + {+0.062623f, -0.173224f, +0.004907f, +0.001276f, -0.000047f}, + {+0.122967f, +0.126986f, +0.011441f, +0.000914f, -0.000015f}, + {-0.052738f, +0.283556f, -0.009426f, +0.001548f, -0.000011f}, + {+0.026749f, +0.238083f, -0.000760f, -0.000643f, -0.000018f}, + {-0.009777f, -0.145605f, -0.003329f, +0.002400f, +0.000014f}, + {+0.015861f, +0.086444f, -0.001699f, +0.001895f, +0.000191f}, + {-0.021170f, -0.125446f, +0.000128f, +0.000133f, -0.000040f}, + {-0.009541f, -0.253886f, +0.000901f, +0.000985f, +0.000105f}, + {+0.062589f, +0.060931f, +0.003167f, +0.000273f, +0.000019f}, + {+0.045937f, +0.052228f, +0.008096f, +0.000661f, -0.000035f}, + {+0.065525f, +0.132007f, +0.007909f, -0.000377f, +0.000001f}, + {+0.049219f, -0.081032f, +0.007172f, +0.000024f, -0.000024f} + }, + { + {-0.257389f, -0.225050f, -0.034043f, +0.000536f, -0.000034f}, + {+0.247632f, +0.326555f, +0.030602f, -0.000692f, +0.000048f}, + {-0.031117f, +0.179461f, -0.007189f, +0.000264f, +0.000055f}, + {-0.035804f, +0.099360f, -0.004701f, -0.000140f, +0.000038f}, + {+0.050312f, -0.188989f, +0.003722f, +0.000209f, -0.000050f}, + {-0.100154f, -0.206241f, -0.011197f, -0.000132f, -0.000040f}, + {-0.083770f, +0.242079f, -0.010883f, +0.000381f, -0.000023f}, + {-0.128871f, +0.005839f, -0.011060f, +0.000130f, +0.000016f}, + {+0.079686f, -0.004748f, +0.001794f, +0.000421f, +0.000023f}, + {-0.049708f, -0.006526f, -0.011594f, -0.000511f, +0.000001f}, + {+0.089665f, +0.042291f, +0.010250f, +0.000131f, +0.000016f}, + {+0.097341f, -0.094533f, +0.003394f, -0.000253f, +0.000020f}, + {-0.063601f, -0.124244f, -0.005358f, -0.000329f, -0.000050f}, + {-0.033103f, -0.074639f, -0.008297f, +0.000018f, -0.000018f}, + {-0.088809f, -0.106459f, -0.010306f, +0.000001f, +0.000028f}, + {+0.024983f, -0.120136f, +0.002311f, -0.000104f, +0.000013f} + }, + { + {-0.103698f, -0.459883f, -0.015029f, +0.000609f, +0.000094f}, + {+0.162130f, +0.457377f, +0.023723f, -0.001331f, -0.000162f}, + {+0.064814f, +0.022691f, +0.012901f, +0.000560f, -0.000021f}, + {+0.014719f, +0.018235f, +0.000043f, +0.000822f, -0.000013f}, + {-0.074601f, +0.003099f, -0.007367f, -0.000899f, +0.000047f}, + {-0.032786f, -0.305719f, -0.004336f, -0.000704f, +0.000017f}, + {+0.154173f, -0.111921f, +0.017036f, -0.001496f, +0.000014f}, + {+0.075072f, -0.308164f, +0.011544f, +0.000327f, +0.000019f}, + {-0.016061f, +0.143722f, +0.001013f, -0.002196f, -0.000011f}, + {+0.025959f, -0.115431f, +0.002496f, -0.001721f, -0.000173f}, + {-0.041136f, +0.248497f, -0.009339f, -0.000010f, +0.000035f}, + {-0.096543f, +0.197881f, -0.009153f, -0.000920f, -0.000096f}, + {+0.003482f, -0.225559f, +0.000330f, -0.000071f, -0.000017f}, + {-0.034753f, -0.075563f, -0.003521f, -0.000361f, +0.000033f}, + {-0.012501f, -0.228861f, +0.001789f, +0.000220f, -0.000002f}, + {-0.060118f, +0.006012f, -0.006537f, +0.000205f, +0.000020f} + }, + { + {+0.272901f, +0.120676f, +0.037748f, -0.000537f, +0.000024f}, + {-0.297115f, -0.254096f, -0.039956f, +0.000532f, -0.000029f}, + {+0.012561f, -0.060035f, +0.001952f, -0.000137f, -0.000057f}, + {-0.010704f, -0.021303f, -0.001694f, +0.000133f, -0.000041f}, + {+0.011296f, +0.129516f, +0.000519f, -0.000384f, +0.000049f}, + {+0.122480f, -0.073347f, +0.013051f, +0.000154f, +0.000043f}, + {-0.027641f, -0.385713f, +0.003287f, -0.000254f, +0.000026f}, + {+0.091871f, -0.289596f, +0.005177f, +0.000144f, -0.000020f}, + {-0.076925f, +0.038077f, -0.006550f, -0.000475f, -0.000017f}, + {+0.038364f, -0.096477f, +0.011620f, +0.000633f, +0.000016f}, + {-0.083812f, +0.194659f, -0.004197f, -0.000207f, -0.000021f}, + {-0.014333f, +0.322027f, +0.003857f, +0.000214f, -0.000012f}, + {+0.069724f, -0.130370f, +0.003481f, +0.000262f, +0.000055f}, + {+0.055755f, +0.063207f, +0.009924f, -0.000154f, +0.000014f}, + {+0.116659f, -0.036299f, +0.011120f, +0.000178f, -0.000028f}, + {+0.003252f, +0.097067f, -0.002843f, -0.000113f, -0.000015f} + }, + { + {+0.054050f, +0.455222f, +0.008683f, -0.000439f, -0.000087f}, + {-0.103203f, -0.556970f, -0.012926f, +0.001069f, +0.000150f}, + {-0.045598f, +0.034469f, -0.010843f, -0.000589f, +0.000024f}, + {+0.039968f, -0.100631f, +0.007931f, -0.000653f, +0.000016f}, + {+0.036140f, +0.084377f, +0.005388f, +0.000960f, -0.000048f}, + {-0.073377f, +0.218074f, -0.003890f, +0.000548f, -0.000019f}, + {-0.139694f, -0.217657f, -0.014427f, +0.001226f, -0.000017f}, + {-0.165152f, +0.096949f, -0.015920f, -0.000710f, -0.000018f}, + {+0.031303f, -0.142424f, +0.007473f, +0.002097f, +0.000008f}, + {-0.049659f, +0.036455f, -0.006360f, +0.001588f, +0.000158f}, + {+0.120231f, -0.105131f, +0.009262f, +0.000134f, -0.000029f}, + {+0.112765f, +0.136113f, +0.006454f, +0.000956f, +0.000090f}, + {-0.075212f, +0.079481f, -0.002605f, +0.000191f, +0.000013f}, + {+0.010244f, +0.133401f, +0.001533f, +0.000399f, -0.000031f}, + {-0.084844f, +0.273648f, -0.011540f, -0.000496f, +0.000003f}, + {+0.047604f, +0.022269f, +0.009154f, -0.000024f, -0.000017f} + }, + { + {-0.277495f, -0.057148f, -0.039168f, +0.000475f, -0.000017f}, + {+0.335782f, +0.115073f, +0.042124f, -0.000524f, +0.000017f}, + {-0.014669f, +0.088939f, +0.001371f, +0.000122f, +0.000060f}, + {+0.009872f, -0.151750f, -0.001271f, -0.000309f, +0.000043f}, + {-0.029086f, -0.017821f, -0.006048f, +0.000346f, -0.000049f}, + {-0.042390f, +0.261438f, -0.007011f, +0.000009f, -0.000045f}, + {+0.104924f, +0.146847f, +0.003710f, +0.000271f, -0.000026f}, + {+0.039062f, +0.403951f, +0.006577f, +0.000208f, +0.000025f}, + {+0.091871f, -0.050822f, +0.003447f, +0.000141f, +0.000018f}, + {-0.018408f, +0.085038f, -0.009119f, -0.000628f, -0.000033f}, + {-0.008166f, -0.290055f, +0.001289f, +0.000009f, +0.000025f}, + {-0.083446f, -0.145097f, -0.006817f, -0.000355f, +0.000005f}, + {+0.001946f, +0.186834f, -0.001987f, -0.000254f, -0.000062f}, + {-0.073121f, +0.003981f, -0.011768f, +0.000112f, -0.000011f}, + {-0.055297f, +0.324881f, -0.002032f, +0.000100f, +0.000030f}, + {-0.005812f, -0.063805f, -0.001869f, -0.000040f, +0.000017f} + }, + { + {-0.014583f, -0.461985f, -0.000589f, +0.000415f, +0.000084f}, + {+0.018754f, +0.598224f, +0.004168f, -0.000868f, -0.000145f}, + {+0.055019f, -0.010592f, +0.005290f, +0.000633f, -0.000030f}, + {-0.104242f, +0.017058f, -0.011823f, +0.000782f, -0.000020f}, + {+0.000800f, -0.063354f, +0.000572f, -0.000962f, +0.000051f}, + {+0.090619f, +0.057573f, +0.010215f, -0.000723f, +0.000024f}, + {+0.065017f, +0.191423f, +0.017537f, -0.001148f, +0.000017f}, + {+0.139685f, +0.247968f, +0.017011f, +0.000519f, +0.000015f}, + {-0.081755f, +0.219112f, -0.011774f, -0.001680f, -0.000011f}, + {+0.055793f, -0.030364f, +0.009245f, -0.001646f, -0.000143f}, + {-0.108310f, -0.127663f, -0.016687f, +0.000038f, +0.000024f}, + {-0.021618f, -0.220697f, -0.010039f, -0.000820f, -0.000085f}, + {+0.057142f, +0.095325f, +0.009328f, -0.000335f, -0.000006f}, + {+0.036537f, -0.167818f, +0.005791f, -0.000423f, +0.000028f}, + {+0.142336f, +0.030915f, +0.012827f, +0.000283f, -0.000005f}, + {-0.054469f, +0.008573f, -0.006883f, +0.000115f, +0.000013f} + }, + { + {+0.285346f, -0.000721f, +0.040577f, -0.000527f, +0.000010f}, + {-0.330415f, +0.056420f, -0.045563f, +0.000643f, -0.000004f}, + {-0.012995f, -0.109088f, -0.001469f, -0.000116f, -0.000061f}, + {+0.054559f, +0.256864f, +0.005920f, +0.000204f, -0.000044f}, + {+0.023615f, -0.028111f, +0.005911f, -0.000294f, +0.000047f}, + {-0.037741f, -0.135965f, +0.001385f, +0.000118f, +0.000047f}, + {-0.085123f, -0.059304f, -0.014815f, -0.000093f, +0.000026f}, + {-0.148478f, -0.190646f, -0.017151f, -0.000040f, -0.000030f}, + {-0.071070f, +0.234644f, +0.000090f, +0.000012f, -0.000018f}, + {+0.012169f, -0.103078f, +0.005526f, +0.000708f, +0.000048f}, + {+0.074830f, +0.156990f, +0.009538f, -0.000116f, -0.000028f}, + {+0.062857f, -0.082116f, +0.012816f, +0.000338f, +0.000001f}, + {-0.030566f, -0.039000f, -0.001188f, +0.000200f, +0.000068f}, + {+0.059034f, -0.139462f, +0.005767f, +0.000011f, +0.000009f}, + {-0.076286f, -0.295015f, -0.006131f, +0.000097f, -0.000032f}, + {+0.020240f, +0.124242f, +0.005046f, +0.000022f, -0.000019f} + }, + { + {-0.029891f, +0.483300f, -0.005377f, -0.000391f, -0.000081f}, + {+0.047047f, -0.524471f, +0.005924f, +0.000814f, +0.000145f}, + {-0.033704f, -0.078188f, -0.004373f, -0.000586f, +0.000038f}, + {+0.113469f, +0.163524f, +0.016393f, -0.000689f, +0.000025f}, + {-0.026484f, +0.050686f, -0.004980f, +0.000903f, -0.000054f}, + {-0.034959f, -0.130515f, -0.008100f, +0.000616f, -0.000030f}, + {-0.066335f, -0.098213f, -0.008880f, +0.001011f, -0.000017f}, + {-0.023755f, -0.374088f, -0.006475f, -0.000645f, -0.000010f}, + {+0.134342f, -0.080266f, +0.017137f, +0.001581f, +0.000017f}, + {-0.074905f, +0.029652f, -0.011288f, +0.001578f, +0.000126f}, + {+0.054496f, +0.184572f, +0.009789f, +0.000066f, -0.000019f}, + {-0.016479f, +0.037096f, +0.001911f, +0.000841f, +0.000081f}, + {-0.021095f, -0.045463f, -0.006941f, +0.000367f, -0.000005f}, + {-0.086237f, +0.078591f, -0.009216f, +0.000337f, -0.000026f}, + {-0.069456f, -0.298926f, -0.009331f, -0.000395f, +0.000009f}, + {+0.062149f, +0.062591f, +0.008033f, -0.000068f, -0.000009f} + }, + { + {-0.287720f, +0.086727f, -0.040473f, +0.000543f, -0.000002f}, + {+0.307994f, -0.118968f, +0.043852f, -0.000752f, -0.000013f}, + {+0.022546f, +0.002148f, +0.001070f, +0.000030f, +0.000061f}, + {-0.122549f, -0.198231f, -0.013063f, -0.000256f, +0.000044f}, + {-0.010325f, +0.076779f, -0.004480f, +0.000277f, -0.000045f}, + {+0.047884f, +0.004957f, +0.004446f, -0.000008f, -0.000047f}, + {+0.101276f, +0.163028f, +0.013822f, +0.000017f, -0.000028f}, + {+0.155414f, -0.094864f, +0.020739f, +0.000087f, +0.000033f}, + {+0.000170f, -0.277663f, -0.004084f, -0.000303f, +0.000013f}, + {+0.006631f, +0.159391f, -0.003115f, -0.000670f, -0.000060f}, + {-0.094163f, -0.047695f, -0.013081f, +0.000014f, +0.000031f}, + {-0.015662f, +0.033250f, -0.008826f, -0.000442f, -0.000008f}, + {+0.006909f, +0.002414f, +0.001228f, -0.000038f, -0.000070f}, + {+0.006389f, +0.219286f, -0.001425f, -0.000018f, -0.000007f}, + {+0.134427f, +0.013316f, +0.014160f, -0.000072f, +0.000032f}, + {-0.053148f, -0.113719f, -0.007802f, -0.000103f, +0.000020f} + }, + { + {+0.079885f, -0.476239f, +0.011873f, +0.000403f, +0.000078f}, + {-0.090327f, +0.495394f, -0.013216f, -0.000916f, -0.000142f}, + {+0.000547f, +0.029987f, +0.004365f, +0.000538f, -0.000045f}, + {-0.078456f, -0.260754f, -0.012403f, +0.000685f, -0.000030f}, + {+0.048231f, -0.015397f, +0.007225f, -0.000847f, +0.000058f}, + {-0.004788f, +0.088135f, -0.001735f, -0.000622f, +0.000036f}, + {+0.068597f, +0.218020f, +0.007943f, -0.001019f, +0.000017f}, + {-0.078771f, +0.264267f, -0.009097f, +0.000536f, +0.000005f}, + {-0.131816f, -0.067791f, -0.019315f, -0.001572f, -0.000023f}, + {+0.095197f, +0.024052f, +0.012511f, -0.001509f, -0.000110f}, + {-0.005662f, -0.184911f, -0.000567f, -0.000000f, +0.000014f}, + {-0.009469f, +0.021505f, -0.002081f, -0.000772f, -0.000077f}, + {+0.033042f, -0.040492f, +0.006178f, -0.000358f, +0.000017f}, + {+0.078726f, +0.109328f, +0.007889f, -0.000339f, +0.000024f}, + {-0.046322f, +0.287690f, -0.005571f, +0.000332f, -0.000013f}, + {-0.044568f, -0.127346f, -0.006458f, +0.000067f, +0.000005f} + }, + { + {+0.276202f, -0.173485f, +0.038792f, -0.000516f, -0.000006f}, + {-0.290883f, +0.185607f, -0.040080f, +0.000773f, +0.000032f}, + {+0.006320f, +0.034810f, -0.001793f, -0.000042f, -0.000058f}, + {+0.162615f, +0.113765f, +0.021156f, +0.000233f, -0.000044f}, + {-0.015723f, -0.117462f, -0.000807f, -0.000218f, +0.000042f}, + {-0.035133f, +0.040557f, -0.002714f, +0.000053f, +0.000045f}, + {-0.149176f, -0.117916f, -0.017638f, +0.000076f, +0.000032f}, + {-0.096551f, +0.235346f, -0.015008f, -0.000034f, -0.000033f}, + {+0.060894f, +0.224376f, +0.012831f, +0.000523f, -0.000005f}, + {-0.046438f, -0.197810f, -0.002809f, +0.000665f, +0.000069f}, + {+0.091389f, -0.035774f, +0.012879f, -0.000048f, -0.000034f}, + {+0.015830f, +0.061261f, +0.007852f, +0.000438f, +0.000014f}, + {+0.002026f, -0.092831f, -0.002527f, +0.000001f, +0.000068f}, + {-0.065981f, -0.109512f, -0.004136f, +0.000073f, +0.000006f}, + {-0.096454f, +0.210224f, -0.012022f, +0.000110f, -0.000032f}, + {+0.076635f, +0.057848f, +0.009841f, +0.000158f, -0.000021f} + }, + { + {-0.125058f, +0.440590f, -0.018260f, -0.000430f, -0.000074f}, + {+0.130636f, -0.461671f, +0.019013f, +0.001042f, +0.000135f}, + {-0.005358f, +0.049252f, -0.002302f, -0.000396f, +0.000051f}, + {+0.032652f, +0.314396f, +0.003878f, -0.000647f, +0.000035f}, + {-0.057782f, -0.056244f, -0.005456f, +0.000765f, -0.000061f}, + {+0.029537f, -0.058278f, +0.004239f, +0.000490f, -0.000041f}, + {-0.028429f, -0.304901f, -0.002344f, +0.001021f, -0.000019f}, + {+0.130605f, -0.114123f, +0.015550f, -0.000447f, -0.000002f}, + {+0.097618f, +0.163746f, +0.014826f, +0.001576f, +0.000024f}, + {-0.095269f, -0.125227f, -0.010570f, +0.001415f, +0.000094f}, + {-0.036826f, +0.161036f, -0.004519f, +0.000009f, -0.000008f}, + {+0.033206f, +0.037588f, +0.003181f, +0.000776f, +0.000072f}, + {-0.072280f, +0.019767f, -0.008230f, +0.000211f, -0.000025f}, + {-0.018897f, -0.179348f, -0.001641f, +0.000298f, -0.000022f}, + {+0.125361f, -0.129557f, +0.014806f, -0.000290f, +0.000016f}, + {+0.013372f, +0.152966f, +0.003485f, -0.000081f, -0.000000f} + }, + { + {-0.255232f, +0.238323f, -0.036506f, +0.000482f, +0.000012f}, + {+0.271075f, -0.243750f, +0.037165f, -0.000660f, -0.000051f}, + {-0.023107f, +0.018988f, -0.002567f, +0.000111f, +0.000056f}, + {-0.186496f, -0.022822f, -0.024016f, -0.000167f, +0.000044f}, + {+0.051695f, +0.108630f, +0.002988f, +0.000126f, -0.000040f}, + {+0.009503f, -0.085941f, +0.000815f, -0.000139f, -0.000044f}, + {+0.180203f, +0.018265f, +0.021900f, -0.000114f, -0.000036f}, + {+0.016842f, -0.287897f, +0.004711f, +0.000063f, +0.000033f}, + {-0.099412f, -0.136019f, -0.018932f, -0.000549f, -0.000004f}, + {+0.093434f, +0.165866f, +0.008284f, -0.000735f, -0.000077f}, + {-0.070607f, +0.107384f, -0.011250f, +0.000036f, +0.000037f}, + {-0.051205f, -0.088169f, -0.009120f, -0.000422f, -0.000021f}, + {+0.038077f, +0.190808f, +0.007278f, -0.000071f, -0.000066f}, + {+0.068484f, -0.044857f, +0.006706f, -0.000103f, -0.000005f}, + {+0.001471f, -0.319381f, +0.000965f, -0.000110f, +0.000032f}, + {-0.082910f, +0.001623f, -0.012705f, -0.000176f, +0.000021f} + }, + { + {+0.160937f, -0.399834f, +0.024221f, +0.000432f, +0.000069f}, + {-0.165837f, +0.426649f, -0.024449f, -0.001120f, -0.000123f}, + {+0.023251f, -0.053963f, +0.006296f, +0.000280f, -0.000056f}, + {+0.026012f, -0.349222f, +0.003958f, +0.000583f, -0.000040f}, + {+0.039815f, +0.122590f, +0.005933f, -0.000681f, +0.000065f}, + {-0.034180f, -0.017407f, -0.005868f, -0.000354f, +0.000044f}, + {-0.036119f, +0.354110f, -0.007651f, -0.001004f, +0.000024f}, + {-0.131608f, -0.060108f, -0.015438f, +0.000373f, +0.000002f}, + {-0.047240f, -0.215086f, -0.007922f, -0.001603f, -0.000021f}, + {+0.065165f, +0.208130f, +0.007649f, -0.001302f, -0.000078f}, + {+0.065730f, -0.103768f, +0.008899f, +0.000008f, +0.000000f}, + {-0.017223f, -0.140007f, -0.001227f, -0.000774f, -0.000066f}, + {+0.083700f, +0.123118f, +0.007692f, -0.000085f, +0.000029f}, + {-0.033766f, +0.111436f, -0.004405f, -0.000238f, +0.000019f}, + {-0.130713f, -0.118837f, -0.014005f, +0.000285f, -0.000018f}, + {+0.016465f, -0.154956f, +0.002867f, +0.000097f, -0.000004f} + }, + { + {+0.233948f, -0.286085f, +0.033289f, -0.000467f, -0.000018f}, + {-0.251749f, +0.291487f, -0.034882f, +0.000530f, +0.000064f}, + {+0.025018f, -0.051984f, +0.002062f, -0.000213f, -0.000058f}, + {+0.182278f, -0.109310f, +0.023310f, +0.000129f, -0.000046f}, + {-0.065186f, -0.041803f, -0.007285f, -0.000055f, +0.000040f}, + {+0.015347f, +0.057135f, +0.002287f, +0.000244f, +0.000046f}, + {-0.178612f, +0.136904f, -0.019882f, +0.000114f, +0.000039f}, + {+0.053858f, +0.222770f, +0.004143f, -0.000170f, -0.000036f}, + {+0.110687f, +0.021864f, +0.019313f, +0.000540f, +0.000009f}, + {-0.120059f, -0.080527f, -0.013286f, +0.000793f, +0.000086f}, + {+0.042102f, -0.139525f, +0.007143f, +0.000010f, -0.000040f}, + {+0.075712f, -0.002196f, +0.010631f, +0.000380f, +0.000025f}, + {-0.101650f, -0.158974f, -0.013076f, +0.000245f, +0.000069f}, + {-0.030059f, +0.115541f, -0.003547f, +0.000111f, +0.000004f}, + {+0.094721f, +0.222768f, +0.008889f, +0.000048f, -0.000033f}, + {+0.083573f, -0.053860f, +0.010877f, +0.000192f, -0.000022f} + }, + { + {-0.194975f, +0.371746f, -0.029687f, -0.000407f, -0.000065f}, + {+0.199395f, -0.402227f, +0.030381f, +0.001070f, +0.000111f}, + {-0.043558f, +0.051835f, -0.007510f, -0.000301f, +0.000063f}, + {-0.080069f, +0.290708f, -0.009721f, -0.000585f, +0.000048f}, + {-0.028118f, -0.096712f, -0.004235f, +0.000661f, -0.000071f}, + {+0.020670f, +0.048284f, +0.004447f, +0.000361f, -0.000049f}, + {+0.106751f, -0.298076f, +0.013906f, +0.000980f, -0.000031f}, + {+0.091450f, +0.162172f, +0.012475f, -0.000348f, -0.000002f}, + {-0.007498f, +0.199756f, +0.002586f, +0.001500f, +0.000016f}, + {-0.027250f, -0.222848f, -0.002393f, +0.001277f, +0.000059f}, + {-0.083457f, +0.055583f, -0.011895f, -0.000049f, +0.000010f}, + {-0.023912f, +0.145973f, -0.001523f, +0.000736f, +0.000060f}, + {-0.039347f, -0.252351f, -0.003368f, +0.000088f, -0.000034f}, + {+0.047081f, -0.002879f, +0.005773f, +0.000201f, -0.000016f}, + {+0.061353f, +0.270295f, +0.008425f, -0.000276f, +0.000021f}, + {-0.056743f, +0.162677f, -0.007387f, -0.000128f, +0.000010f} + }, + { + {-0.209644f, +0.348707f, -0.029121f, +0.000472f, +0.000023f}, + {+0.234739f, -0.346303f, +0.031613f, -0.000452f, -0.000075f}, + {-0.012221f, +0.097631f, -0.001448f, +0.000286f, +0.000064f}, + {-0.151155f, +0.176475f, -0.021969f, -0.000127f, +0.000048f}, + {+0.074908f, +0.067483f, +0.011111f, +0.000037f, -0.000040f}, + {-0.024868f, -0.020084f, -0.003583f, -0.000348f, -0.000052f}, + {+0.132213f, -0.252477f, +0.017287f, -0.000139f, -0.000041f}, + {-0.086895f, -0.114633f, -0.010835f, +0.000242f, +0.000044f}, + {-0.087061f, +0.080457f, -0.017193f, -0.000553f, -0.000009f}, + {+0.128529f, +0.021349f, +0.015609f, -0.000805f, -0.000095f}, + {-0.009730f, +0.170684f, -0.001530f, -0.000070f, +0.000041f}, + {-0.063989f, +0.082569f, -0.011861f, -0.000327f, -0.000027f}, + {+0.131743f, +0.010936f, +0.017709f, -0.000376f, -0.000079f}, + {-0.009127f, -0.086499f, -0.000601f, -0.000142f, -0.000005f}, + {-0.128048f, -0.022758f, -0.015753f, -0.000038f, +0.000035f}, + {-0.059404f, +0.160944f, -0.006871f, -0.000228f, +0.000022f} + }, + { + {+0.229440f, -0.322824f, +0.033988f, +0.000389f, +0.000061f}, + {-0.240846f, +0.383749f, -0.036120f, -0.000976f, -0.000103f}, + {+0.056585f, -0.008789f, +0.009971f, +0.000419f, -0.000080f}, + {+0.105118f, -0.219752f, +0.015610f, +0.000635f, -0.000061f}, + {+0.026805f, +0.145169f, +0.000897f, -0.000699f, +0.000083f}, + {-0.004898f, -0.050127f, -0.002984f, -0.000479f, +0.000062f}, + {-0.141946f, +0.172154f, -0.021221f, -0.000916f, +0.000039f}, + {-0.048244f, -0.174628f, -0.006354f, +0.000456f, -0.000003f}, + {+0.037664f, -0.109078f, +0.001169f, -0.001297f, -0.000015f}, + {-0.006723f, +0.230147f, -0.003197f, -0.001300f, -0.000034f}, + {+0.095384f, +0.009012f, +0.012879f, +0.000031f, -0.000023f}, + {+0.048765f, -0.092236f, +0.006693f, -0.000674f, -0.000056f}, + {-0.024712f, +0.249773f, -0.004585f, -0.000253f, +0.000048f}, + {-0.029610f, -0.053064f, -0.004978f, -0.000209f, +0.000011f}, + {+0.020111f, -0.251548f, +0.002558f, +0.000313f, -0.000027f}, + {+0.088864f, -0.064651f, +0.009687f, +0.000147f, -0.000018f} + }, + { + {+0.175493f, -0.403144f, +0.024964f, -0.000494f, -0.000029f}, + {-0.208289f, +0.431823f, -0.027399f, +0.000496f, +0.000086f}, + {-0.008906f, -0.108845f, -0.001685f, -0.000188f, -0.000067f}, + {+0.127825f, -0.183453f, +0.018081f, +0.000198f, -0.000048f}, + {-0.107325f, -0.060873f, -0.013159f, -0.000090f, +0.000038f}, + {+0.020607f, -0.012217f, +0.003265f, +0.000308f, +0.000058f}, + {-0.079060f, +0.266458f, -0.009775f, +0.000157f, +0.000041f}, + {+0.096681f, +0.050055f, +0.012663f, -0.000225f, -0.000055f}, + {+0.051411f, -0.089715f, +0.013539f, +0.000663f, +0.000008f}, + {-0.129678f, +0.037696f, -0.015815f, +0.000703f, +0.000099f}, + {-0.037248f, -0.197082f, -0.005086f, +0.000193f, -0.000037f}, + {+0.043816f, -0.101985f, +0.008254f, +0.000336f, +0.000028f}, + {-0.117065f, +0.106956f, -0.016478f, +0.000283f, +0.000091f}, + {+0.024549f, +0.029471f, +0.003315f, +0.000242f, +0.000008f}, + {+0.102968f, -0.125147f, +0.012245f, +0.000115f, -0.000038f}, + {+0.007500f, -0.187296f, +0.002430f, +0.000314f, -0.000019f} + }, + { + {-0.255049f, +0.256577f, -0.038217f, -0.000401f, -0.000056f}, + {+0.286340f, -0.326727f, +0.042071f, +0.000948f, +0.000098f}, + {-0.058758f, -0.032715f, -0.010103f, -0.000506f, +0.000109f}, + {-0.123738f, +0.204736f, -0.019030f, -0.000624f, +0.000081f}, + {+0.004658f, -0.232611f, +0.002627f, +0.000673f, -0.000101f}, + {-0.001246f, +0.020482f, +0.002726f, +0.000581f, -0.000087f}, + {+0.149860f, -0.087638f, +0.023219f, +0.000836f, -0.000049f}, + {+0.011705f, +0.182241f, +0.000824f, -0.000663f, +0.000015f}, + {-0.036322f, +0.046246f, -0.002434f, +0.001110f, +0.000020f}, + {+0.041445f, -0.225060f, +0.008066f, +0.001247f, +0.000002f}, + {-0.082241f, -0.130716f, -0.009581f, +0.000052f, +0.000037f}, + {-0.061982f, +0.060921f, -0.008434f, +0.000587f, +0.000055f}, + {+0.070313f, -0.179626f, +0.010580f, +0.000496f, -0.000079f}, + {+0.010271f, +0.049933f, +0.003107f, +0.000216f, -0.000007f}, + {-0.072320f, +0.142479f, -0.007956f, -0.000403f, +0.000037f}, + {-0.080097f, -0.050215f, -0.010237f, -0.000128f, +0.000027f} + }, + { + {-0.138659f, +0.433413f, -0.019489f, +0.000507f, +0.000036f}, + {+0.163451f, -0.512532f, +0.021259f, -0.000613f, -0.000105f}, + {+0.031656f, +0.104824f, +0.003994f, -0.000128f, +0.000059f}, + {-0.110770f, +0.224024f, -0.015294f, -0.000397f, +0.000039f}, + {+0.125629f, -0.045496f, +0.015544f, +0.000259f, -0.000027f}, + {-0.013056f, +0.002303f, -0.002874f, -0.000034f, -0.000053f}, + {+0.034706f, -0.263278f, +0.003483f, -0.000141f, -0.000039f}, + {-0.095465f, +0.017678f, -0.011595f, +0.000132f, +0.000064f}, + {-0.033817f, +0.054176f, -0.010428f, -0.000890f, -0.000012f}, + {+0.119869f, -0.100206f, +0.015399f, -0.000474f, -0.000091f}, + {+0.083578f, +0.121580f, +0.008601f, -0.000327f, +0.000026f}, + {-0.021962f, +0.124782f, -0.004983f, -0.000417f, -0.000031f}, + {+0.081591f, -0.160439f, +0.012843f, +0.000024f, -0.000092f}, + {-0.025765f, -0.006872f, -0.004893f, -0.000318f, -0.000015f}, + {-0.048404f, +0.176242f, -0.007439f, -0.000200f, +0.000038f}, + {+0.029349f, +0.118206f, +0.002646f, -0.000434f, +0.000011f} + }, + { + {+0.273332f, -0.197278f, +0.041000f, +0.000427f, +0.000049f}, + {-0.321458f, +0.231555f, -0.047137f, -0.001083f, -0.000091f}, + {+0.051312f, +0.073576f, +0.009852f, +0.000350f, -0.000146f}, + {+0.149316f, -0.177043f, +0.022631f, +0.000468f, -0.000104f}, + {-0.053207f, +0.228176f, -0.008455f, -0.000505f, +0.000122f}, + {-0.006068f, -0.008715f, -0.003223f, -0.000482f, +0.000122f}, + {-0.145901f, +0.015682f, -0.022924f, -0.000759f, +0.000061f}, + {+0.021739f, -0.160951f, +0.002760f, +0.000739f, -0.000036f}, + {+0.029254f, -0.044035f, +0.001822f, -0.001067f, -0.000028f}, + {-0.071428f, +0.194582f, -0.013164f, -0.000987f, +0.000034f}, + {+0.035270f, +0.192622f, +0.005952f, -0.000220f, -0.000050f}, + {+0.068773f, -0.014813f, +0.009109f, -0.000533f, -0.000056f}, + {-0.089870f, +0.103512f, -0.014502f, -0.000459f, +0.000122f}, + {+0.001775f, -0.051927f, +0.000206f, -0.000272f, +0.000005f}, + {+0.077868f, -0.020072f, +0.010512f, +0.000382f, -0.000051f}, + {+0.053027f, +0.078728f, +0.007627f, +0.000029f, -0.000036f} + }, + { + {+0.101834f, -0.458014f, +0.014426f, -0.000475f, -0.000042f}, + {-0.106819f, +0.558024f, -0.013421f, +0.000683f, +0.000132f}, + {-0.052912f, -0.088899f, -0.008225f, +0.000491f, -0.000027f}, + {+0.083094f, -0.280030f, +0.010300f, +0.000632f, -0.000016f}, + {-0.114197f, +0.131784f, -0.014954f, -0.000412f, +0.000002f}, + {+0.019246f, +0.031443f, +0.004356f, -0.000329f, +0.000027f}, + {+0.005316f, +0.248103f, +0.002960f, +0.000118f, +0.000033f}, + {+0.080531f, -0.067083f, +0.011460f, +0.000110f, -0.000064f}, + {+0.031144f, -0.046782f, +0.008670f, +0.001209f, +0.000024f}, + {-0.102756f, +0.143879f, -0.013003f, +0.000283f, +0.000065f}, + {-0.095015f, -0.011155f, -0.012207f, +0.000367f, -0.000008f}, + {-0.004913f, -0.131661f, +0.000343f, +0.000524f, +0.000039f}, + {-0.046459f, +0.170846f, -0.007777f, -0.000479f, +0.000069f}, + {+0.027234f, -0.016428f, +0.003165f, +0.000304f, +0.000026f}, + {+0.005481f, -0.131071f, +0.001565f, +0.000318f, -0.000030f}, + {-0.043474f, -0.073298f, -0.006440f, +0.000550f, +0.000003f} + }, + { + {-0.286640f, +0.137246f, -0.043420f, -0.000432f, -0.000040f}, + {+0.340199f, -0.128020f, +0.049926f, +0.001339f, +0.000072f}, + {-0.035997f, -0.119831f, -0.005662f, +0.000296f, +0.000179f}, + {-0.172429f, +0.110349f, -0.024201f, -0.000100f, +0.000122f}, + {+0.092373f, -0.185204f, +0.014035f, +0.000067f, -0.000138f}, + {+0.010912f, +0.048983f, +0.001816f, -0.000075f, -0.000154f}, + {+0.129079f, +0.059883f, +0.019833f, +0.000637f, -0.000073f}, + {-0.041407f, +0.122204f, -0.006834f, -0.000592f, +0.000062f}, + {-0.030715f, +0.048574f, -0.001376f, +0.001126f, +0.000032f}, + {+0.096213f, -0.160581f, +0.016571f, +0.000370f, -0.000063f}, + {+0.010051f, -0.173763f, +0.000750f, +0.000501f, +0.000056f}, + {-0.062657f, -0.045986f, -0.006800f, +0.000608f, +0.000057f}, + {+0.093242f, -0.041300f, +0.014445f, -0.000123f, -0.000165f}, + {-0.019827f, +0.053398f, -0.000412f, +0.000436f, -0.000009f}, + {-0.057687f, -0.032809f, -0.008352f, -0.000201f, +0.000065f}, + {-0.029198f, -0.096300f, -0.002960f, +0.000112f, +0.000041f} + }, + { + {-0.065817f, +0.474129f, -0.008963f, +0.000406f, +0.000046f}, + {+0.048357f, -0.572445f, +0.005311f, -0.000514f, -0.000163f}, + {+0.075398f, +0.048030f, +0.008271f, -0.000640f, -0.000031f}, + {-0.038405f, +0.313945f, -0.005856f, -0.000669f, -0.000022f}, + {+0.086028f, -0.192206f, +0.012072f, +0.000418f, +0.000038f}, + {-0.040227f, -0.025362f, -0.003912f, +0.000532f, +0.000024f}, + {-0.038209f, -0.193928f, -0.006045f, -0.000139f, -0.000021f}, + {-0.067018f, +0.081277f, -0.009330f, -0.000374f, +0.000051f}, + {-0.028904f, +0.056950f, -0.007486f, -0.001345f, -0.000045f}, + {+0.078983f, -0.183476f, +0.010913f, -0.000304f, -0.000020f}, + {+0.083563f, -0.058421f, +0.010558f, -0.000255f, -0.000015f}, + {+0.030882f, +0.097232f, +0.001515f, -0.000622f, -0.000053f}, + {+0.015685f, -0.158569f, +0.005189f, +0.000820f, -0.000018f}, + {-0.013899f, +0.061952f, -0.002806f, -0.000268f, -0.000038f}, + {+0.012586f, +0.075138f, +0.001144f, -0.000413f, +0.000015f}, + {+0.050911f, +0.027618f, +0.006661f, -0.000507f, -0.000023f} + }, + { + {+0.298262f, -0.083362f, +0.045235f, +0.000350f, +0.000028f}, + {-0.345899f, +0.033997f, -0.051595f, -0.001615f, -0.000035f}, + {-0.000119f, +0.165002f, +0.002953f, -0.001311f, -0.000187f}, + {+0.171388f, -0.008423f, +0.025114f, -0.000464f, -0.000125f}, + {-0.115274f, +0.117327f, -0.017963f, +0.000487f, +0.000138f}, + {+0.008614f, -0.100535f, -0.001469f, +0.001024f, +0.000165f}, + {-0.096130f, -0.104542f, -0.016843f, -0.000419f, +0.000082f}, + {+0.057723f, -0.112429f, +0.010191f, +0.000184f, -0.000084f}, + {+0.036341f, -0.043085f, +0.001450f, -0.001349f, -0.000025f}, + {-0.112953f, +0.110523f, -0.019836f, +0.000405f, +0.000071f}, + {-0.043415f, +0.138944f, -0.005951f, -0.000778f, -0.000051f}, + {+0.038181f, +0.085067f, +0.005138f, -0.000773f, -0.000051f}, + {-0.082623f, -0.007927f, -0.014925f, +0.001161f, +0.000188f}, + {+0.027034f, -0.000974f, +0.001645f, -0.000490f, +0.000020f}, + {+0.035360f, +0.038752f, +0.006345f, -0.000067f, -0.000073f}, + {+0.000083f, +0.105539f, -0.000772f, -0.000317f, -0.000036f} + }, + { + {+0.027126f, -0.497380f, +0.003317f, -0.000351f, -0.000045f}, + {+0.007859f, +0.574645f, +0.003243f, +0.000139f, +0.000188f}, + {-0.075777f, +0.049221f, -0.008353f, -0.000117f, +0.000106f}, + {-0.000094f, -0.270760f, +0.000675f, +0.000190f, +0.000068f}, + {-0.052764f, +0.211602f, -0.007618f, +0.000144f, -0.000084f}, + {+0.046479f, -0.043520f, +0.004619f, +0.000085f, -0.000093f}, + {+0.048000f, +0.115677f, +0.008039f, +0.000243f, +0.000005f}, + {+0.053119f, -0.119462f, +0.006689f, +0.000259f, -0.000024f}, + {+0.023530f, -0.067795f, +0.006354f, +0.001215f, +0.000069f}, + {-0.051960f, +0.201931f, -0.007334f, +0.001040f, -0.000035f}, + {-0.061094f, +0.110021f, -0.007462f, -0.000103f, +0.000039f}, + {-0.036876f, -0.032412f, -0.003266f, +0.000534f, +0.000070f}, + {+0.001902f, +0.122288f, -0.002472f, -0.000241f, -0.000056f}, + {-0.004270f, -0.048829f, +0.000734f, +0.000014f, +0.000048f}, + {-0.012745f, -0.036706f, -0.002273f, +0.000205f, +0.000006f}, + {-0.042314f, +0.038832f, -0.005804f, +0.000347f, +0.000043f} + }, + { + {-0.307088f, +0.013827f, -0.046648f, -0.000063f, -0.000017f}, + {+0.343985f, +0.057778f, +0.051999f, +0.001370f, -0.000021f}, + {+0.039378f, -0.130507f, -0.000123f, +0.002505f, +0.000156f}, + {-0.152973f, -0.035960f, -0.024197f, +0.000907f, +0.000105f}, + {+0.122328f, -0.057169f, +0.020503f, -0.000916f, -0.000113f}, + {-0.036115f, +0.084847f, +0.000437f, -0.002283f, -0.000139f}, + {+0.065884f, +0.089825f, +0.012704f, +0.000253f, -0.000086f}, + {-0.076176f, +0.079461f, -0.013926f, +0.000844f, +0.000095f}, + {-0.041886f, +0.032735f, -0.001798f, +0.001521f, +0.000002f}, + {+0.120605f, -0.060574f, +0.022209f, -0.000951f, -0.000049f}, + {+0.065666f, -0.088077f, +0.009755f, +0.000580f, +0.000035f}, + {-0.014536f, -0.066997f, -0.002290f, +0.001040f, +0.000035f}, + {+0.069578f, +0.020859f, +0.015775f, -0.002732f, -0.000173f}, + {-0.018357f, -0.025356f, -0.001559f, +0.000309f, -0.000039f}, + {-0.021973f, -0.023763f, -0.004557f, +0.000507f, +0.000072f}, + {+0.024594f, -0.064613f, +0.005019f, +0.000113f, +0.000019f} + }, + { + {+0.017452f, +0.509103f, +0.002330f, +0.000354f, +0.000040f}, + {-0.065401f, -0.568079f, -0.010528f, +0.000542f, -0.000194f}, + {+0.050175f, -0.114107f, +0.005162f, +0.003266f, -0.000174f}, + {+0.018374f, +0.227727f, +0.003630f, +0.001902f, -0.000110f}, + {+0.023543f, -0.209166f, +0.002096f, -0.002246f, +0.000125f}, + {-0.031298f, +0.092434f, -0.002541f, -0.002737f, +0.000158f}, + {-0.039294f, -0.069055f, -0.007101f, -0.000802f, +0.000015f}, + {-0.027981f, +0.151965f, -0.004965f, +0.000568f, -0.000008f}, + {-0.016092f, +0.076462f, -0.004970f, -0.000449f, -0.000085f}, + {+0.025683f, -0.205232f, +0.002533f, -0.003878f, +0.000082f}, + {+0.031489f, -0.139294f, +0.004565f, +0.001598f, -0.000056f}, + {+0.026207f, -0.002872f, +0.002107f, -0.000154f, -0.000084f}, + {-0.008497f, -0.098826f, +0.002487f, -0.002569f, +0.000130f}, + {+0.010858f, +0.022687f, +0.002492f, +0.000762f, -0.000051f}, + {+0.007112f, +0.019771f, +0.000809f, +0.000752f, -0.000028f}, + {+0.017429f, -0.074807f, +0.003855f, +0.000473f, -0.000058f} + } +}; + +const float rightHRIRImag_HOA3[BINAURAL_CONVBANDS][16][BINAURAL_NTAPS]= +{ + { + {-0.132965f, +0.086484f, +0.111577f, -0.006297f, -0.000146f}, + {+0.159214f, -0.438495f, +0.131837f, +0.004567f, +0.000134f}, + {-0.006365f, -0.027154f, +0.040068f, -0.008136f, +0.000115f}, + {-0.012177f, +0.011068f, +0.006759f, -0.003623f, +0.000106f}, + {+0.003524f, -0.002365f, +0.008243f, -0.002720f, -0.000173f}, + {-0.001684f, +0.006593f, +0.024280f, -0.012226f, -0.000133f}, + {+0.003794f, -0.002370f, +0.013706f, -0.004985f, -0.000191f}, + {+0.009569f, -0.049227f, +0.045250f, -0.003942f, -0.000006f}, + {-0.015413f, +0.062027f, -0.005814f, -0.010696f, -0.000183f}, + {+0.012650f, -0.030376f, -0.022293f, +0.005058f, +0.000424f}, + {-0.003808f, +0.011707f, +0.008010f, -0.002270f, -0.000068f}, + {+0.003343f, -0.012704f, -0.014571f, +0.003409f, +0.000255f}, + {+0.000428f, +0.007434f, +0.003549f, -0.001445f, +0.000011f}, + {-0.006298f, +0.029469f, -0.007911f, +0.000838f, -0.000089f}, + {-0.003358f, +0.002973f, +0.012948f, -0.001507f, +0.000003f}, + {-0.000168f, +0.002647f, +0.005935f, -0.001295f, -0.000063f} + }, + { + {+0.075202f, +0.228858f, +0.021577f, -0.002573f, -0.000120f}, + {-0.061927f, -0.923113f, +0.018254f, +0.003553f, +0.000135f}, + {+0.002952f, -0.050194f, +0.020301f, -0.000013f, +0.000082f}, + {+0.008722f, +0.019708f, -0.013956f, +0.001282f, +0.000072f}, + {-0.001425f, -0.021365f, +0.019206f, +0.005433f, -0.000123f}, + {+0.004675f, +0.040742f, +0.087083f, +0.008021f, -0.000087f}, + {-0.001220f, -0.034662f, +0.025115f, +0.004561f, -0.000118f}, + {-0.004799f, -0.049232f, +0.074542f, +0.003362f, -0.000003f}, + {+0.011236f, +0.040604f, -0.010517f, +0.002046f, -0.000098f}, + {-0.006435f, -0.139253f, -0.070542f, +0.004148f, +0.000297f}, + {+0.001842f, +0.052892f, +0.056325f, +0.005942f, -0.000046f}, + {-0.004364f, -0.052115f, -0.019067f, +0.000398f, +0.000179f}, + {+0.003644f, +0.037489f, +0.030067f, +0.000286f, +0.000000f}, + {+0.000279f, +0.074681f, +0.035692f, +0.005433f, -0.000065f}, + {+0.001702f, +0.024063f, +0.022013f, +0.000449f, +0.000009f}, + {+0.001629f, +0.004730f, -0.001402f, -0.003756f, -0.000041f} + }, + { + {-0.022776f, +0.213361f, +0.033702f, +0.017530f, +0.000169f}, + {-0.017318f, -0.757708f, -0.032772f, -0.023486f, -0.000150f}, + {-0.000995f, +0.005778f, -0.039399f, +0.003826f, -0.000133f}, + {-0.001086f, +0.066855f, -0.049052f, -0.001880f, -0.000124f}, + {-0.003861f, -0.074613f, +0.059871f, -0.001275f, +0.000202f}, + {-0.004218f, +0.001879f, +0.134238f, +0.000831f, +0.000156f}, + {-0.007011f, -0.156373f, +0.120347f, +0.000348f, +0.000228f}, + {+0.001557f, +0.050757f, -0.023560f, -0.002558f, +0.000008f}, + {-0.014029f, -0.230152f, +0.192472f, +0.009207f, +0.000223f}, + {-0.003304f, -0.293531f, +0.162769f, -0.029563f, -0.000502f}, + {+0.000187f, +0.025533f, +0.089914f, -0.003071f, +0.000081f}, + {+0.001118f, -0.199397f, +0.178948f, -0.009074f, -0.000301f}, + {-0.002128f, +0.041497f, +0.024472f, -0.001412f, -0.000017f}, + {+0.001502f, +0.027123f, +0.081159f, -0.005992f, +0.000104f}, + {+0.000493f, +0.080670f, -0.051505f, -0.003323f, -0.000001f}, + {-0.001770f, +0.022371f, -0.053147f, +0.009257f, +0.000076f} + }, + { + {+0.009638f, -0.020599f, -0.278274f, -0.025390f, +0.000089f}, + {+0.019638f, -0.173586f, +0.454125f, +0.045073f, -0.000138f}, + {+0.001861f, +0.029237f, -0.038358f, -0.002128f, -0.000043f}, + {-0.006025f, +0.060820f, -0.033037f, +0.001020f, -0.000030f}, + {+0.010927f, -0.114232f, -0.022410f, -0.002610f, +0.000063f}, + {+0.001151f, -0.065308f, +0.047475f, -0.003953f, +0.000033f}, + {+0.017565f, -0.230160f, -0.003612f, +0.002199f, +0.000030f}, + {-0.002909f, +0.050062f, -0.035205f, +0.001706f, -0.000001f}, + {+0.028618f, -0.411400f, -0.073259f, -0.001960f, -0.000006f}, + {+0.012397f, -0.141388f, +0.368076f, +0.043941f, -0.000144f}, + {-0.000613f, -0.027917f, +0.038807f, -0.005057f, +0.000020f}, + {+0.005278f, -0.064856f, +0.339877f, +0.008614f, -0.000087f}, + {-0.003908f, -0.015797f, -0.023962f, +0.003729f, +0.000013f}, + {+0.002822f, -0.051424f, +0.011636f, +0.000447f, +0.000037f}, + {-0.001743f, -0.007517f, -0.130092f, +0.010670f, -0.000017f}, + {+0.001199f, -0.016221f, -0.122288f, -0.007685f, +0.000014f} + }, + { + {-0.029178f, -0.030294f, -0.242046f, +0.016235f, -0.000187f}, + {+0.008133f, +0.216891f, +0.173004f, -0.046339f, +0.000186f}, + {-0.004784f, +0.011306f, -0.001565f, +0.002974f, +0.000133f}, + {+0.001643f, -0.028149f, +0.058358f, +0.006461f, +0.000122f}, + {-0.012719f, +0.054617f, -0.162135f, -0.005430f, -0.000206f}, + {-0.004192f, +0.016864f, -0.049221f, -0.004060f, -0.000152f}, + {-0.017065f, +0.041944f, -0.209787f, -0.017496f, -0.000221f}, + {+0.005651f, -0.007117f, +0.010168f, -0.000370f, -0.000010f}, + {-0.040832f, +0.087605f, -0.438294f, -0.024557f, -0.000208f}, + {-0.015743f, +0.224869f, +0.116394f, -0.024045f, +0.000521f}, + {+0.000520f, -0.017676f, +0.001703f, +0.007076f, -0.000085f}, + {-0.005864f, +0.108940f, +0.176379f, +0.006190f, +0.000311f}, + {+0.004834f, -0.026630f, -0.021079f, -0.003057f, +0.000018f}, + {-0.003714f, -0.006337f, -0.039785f, +0.000713f, -0.000108f}, + {+0.003235f, -0.035740f, -0.081406f, -0.014616f, +0.000003f}, + {-0.000931f, -0.029194f, -0.104837f, -0.000498f, -0.000077f} + }, + { + {+0.064069f, +0.415122f, +0.053438f, -0.001987f, -0.000053f}, + {-0.009859f, -0.329919f, -0.267131f, +0.025972f, +0.000125f}, + {+0.007782f, +0.093625f, +0.062218f, -0.005519f, +0.000007f}, + {+0.006679f, +0.087174f, +0.140907f, -0.012343f, -0.000007f}, + {+0.009694f, +0.066480f, -0.161387f, +0.014778f, -0.000006f}, + {+0.011976f, +0.007185f, -0.079605f, +0.010521f, +0.000016f}, + {+0.000557f, +0.101449f, -0.157518f, +0.024682f, +0.000050f}, + {-0.008085f, -0.037335f, +0.019864f, -0.001614f, +0.000006f}, + {+0.030203f, +0.393848f, -0.238529f, +0.036570f, +0.000098f}, + {+0.011087f, +0.102790f, -0.079859f, +0.000351f, -0.000008f}, + {-0.001584f, -0.009914f, -0.007779f, -0.002067f, +0.000006f}, + {-0.003353f, +0.001777f, -0.008005f, -0.013355f, -0.000003f}, + {-0.003172f, -0.008210f, +0.010652f, +0.000223f, -0.000027f}, + {-0.001325f, -0.010307f, -0.051607f, +0.003067f, -0.000008f}, + {-0.010253f, -0.010690f, +0.002393f, +0.009426f, +0.000023f}, + {-0.002525f, +0.029747f, -0.022901f, +0.004832f, +0.000012f} + }, + { + {-0.046682f, +0.646468f, +0.038502f, -0.000394f, +0.000197f}, + {-0.044970f, -0.559290f, -0.057727f, -0.008886f, -0.000233f}, + {+0.000940f, +0.137203f, +0.026727f, +0.004536f, -0.000119f}, + {+0.021842f, +0.212599f, -0.004934f, +0.008826f, -0.000104f}, + {-0.023556f, -0.052508f, +0.021029f, -0.010719f, +0.000188f}, + {-0.008092f, +0.004951f, -0.027003f, -0.006766f, +0.000127f}, + {+0.010424f, -0.025150f, +0.006816f, -0.012676f, +0.000176f}, + {+0.012013f, -0.064462f, +0.013618f, +0.002713f, +0.000010f}, + {+0.003530f, +0.310311f, -0.011616f, -0.019741f, +0.000148f}, + {-0.004678f, +0.016958f, -0.018438f, -0.001910f, -0.000484f}, + {+0.001327f, -0.004928f, -0.011742f, -0.001214f, +0.000078f}, + {+0.013688f, -0.047967f, -0.031851f, +0.002524f, -0.000286f}, + {+0.008554f, -0.003502f, +0.000653f, +0.000953f, -0.000012f}, + {+0.001110f, -0.052143f, -0.004967f, -0.003628f, +0.000102f}, + {+0.024328f, -0.026559f, +0.000732f, -0.001055f, -0.000010f}, + {+0.007177f, -0.017435f, +0.026024f, -0.001281f, +0.000068f} + }, + { + {-0.091452f, +0.552905f, -0.002702f, -0.003959f, +0.000011f}, + {+0.151251f, -0.284723f, +0.015522f, +0.005073f, -0.000086f}, + {-0.028691f, +0.087255f, -0.003554f, -0.001461f, +0.000017f}, + {-0.098620f, +0.103367f, -0.000693f, -0.001510f, +0.000032f}, + {+0.064701f, -0.012013f, +0.004462f, +0.000173f, -0.000038f}, + {-0.014183f, +0.018557f, +0.019481f, +0.000708f, -0.000046f}, + {+0.006021f, -0.064708f, +0.035867f, -0.001201f, -0.000101f}, + {-0.011933f, -0.098741f, -0.004801f, -0.001237f, -0.000012f}, + {-0.036700f, +0.201775f, +0.040310f, -0.000652f, -0.000152f}, + {+0.005765f, -0.013682f, -0.000873f, +0.007110f, +0.000136f}, + {+0.003019f, +0.012643f, +0.006120f, +0.000396f, -0.000028f}, + {-0.011018f, -0.079111f, -0.001161f, +0.005334f, +0.000076f}, + {-0.015223f, -0.010103f, +0.018116f, -0.000552f, +0.000040f}, + {+0.010935f, -0.049744f, +0.004931f, +0.000250f, -0.000016f}, + {-0.032242f, -0.086323f, +0.005558f, -0.001593f, -0.000026f}, + {+0.000743f, -0.058299f, -0.001218f, -0.002067f, -0.000032f} + }, + { + {+0.231005f, +0.048404f, +0.009154f, +0.001498f, -0.000196f}, + {-0.192280f, +0.252895f, +0.010481f, -0.000333f, +0.000272f}, + {+0.043883f, -0.025510f, -0.003790f, -0.000402f, +0.000097f}, + {+0.135351f, -0.212029f, -0.009492f, -0.001960f, +0.000078f}, + {-0.084125f, +0.181115f, +0.006598f, +0.003510f, -0.000156f}, + {+0.033552f, -0.023473f, +0.003836f, +0.001049f, -0.000092f}, + {-0.027732f, +0.007669f, +0.004823f, +0.004147f, -0.000114f}, + {-0.005511f, -0.108447f, -0.007469f, -0.001175f, -0.000008f}, + {+0.049262f, +0.093379f, +0.014337f, +0.006176f, -0.000066f}, + {-0.011588f, +0.007485f, +0.021418f, +0.002195f, +0.000406f}, + {-0.004828f, +0.034802f, -0.002483f, +0.000357f, -0.000065f}, + {-0.010126f, -0.088145f, +0.024313f, +0.000561f, +0.000239f}, + {+0.009822f, -0.024986f, +0.000140f, +0.000383f, +0.000001f}, + {-0.022780f, -0.006413f, +0.006349f, +0.001513f, -0.000089f}, + {+0.014962f, -0.135165f, -0.012780f, -0.000522f, +0.000019f}, + {-0.023635f, -0.027393f, -0.008518f, +0.000542f, -0.000051f} + }, + { + {-0.129287f, -0.488427f, -0.015298f, +0.003330f, +0.000032f}, + {+0.025480f, +0.578744f, +0.004928f, -0.005728f, +0.000021f}, + {-0.001654f, -0.098586f, -0.003334f, +0.000763f, -0.000028f}, + {-0.033875f, -0.443496f, +0.008037f, +0.001296f, -0.000041f}, + {+0.018947f, +0.326335f, -0.012624f, -0.000806f, +0.000063f}, + {-0.025064f, -0.093936f, -0.002533f, -0.000591f, +0.000056f}, + {+0.010694f, +0.085378f, -0.009219f, -0.001445f, +0.000116f}, + {+0.036700f, -0.055426f, -0.001721f, +0.001199f, +0.000016f}, + {-0.043110f, -0.003684f, -0.012692f, -0.002555f, +0.000160f}, + {+0.008512f, +0.041967f, -0.005268f, -0.006560f, -0.000223f}, + {-0.005601f, +0.039303f, -0.001728f, +0.000112f, +0.000044f}, + {+0.035999f, -0.034895f, -0.002757f, -0.004270f, -0.000123f}, + {+0.002203f, -0.033200f, -0.001100f, -0.000045f, -0.000048f}, + {+0.016721f, +0.047214f, -0.004075f, -0.000550f, +0.000032f}, + {+0.021446f, -0.110159f, +0.004884f, +0.001124f, +0.000025f}, + {+0.032915f, +0.061006f, +0.000313f, +0.001075f, +0.000044f} + }, + { + {-0.165686f, -0.410109f, -0.015586f, -0.000896f, +0.000182f}, + {+0.225295f, +0.253817f, +0.010634f, +0.001216f, -0.000288f}, + {-0.066393f, -0.000376f, -0.002622f, -0.000038f, -0.000077f}, + {-0.130423f, -0.277756f, -0.010288f, +0.000606f, -0.000054f}, + {+0.089464f, +0.200814f, +0.007558f, -0.001360f, +0.000121f}, + {-0.004322f, -0.115904f, -0.010769f, -0.000324f, +0.000060f}, + {+0.034499f, +0.049740f, -0.008222f, -0.001335f, +0.000055f}, + {-0.046786f, +0.057680f, +0.004042f, +0.000640f, +0.000003f}, + {+0.024894f, -0.095189f, -0.014289f, -0.002426f, -0.000011f}, + {+0.005629f, +0.034211f, -0.013115f, -0.002185f, -0.000307f}, + {+0.019520f, +0.005119f, -0.001636f, -0.000261f, +0.000048f}, + {-0.038933f, +0.062477f, -0.011725f, -0.001017f, -0.000182f}, + {-0.005035f, -0.021514f, -0.003233f, -0.000466f, +0.000014f}, + {+0.007389f, +0.053217f, -0.000456f, -0.000398f, +0.000072f}, + {-0.037733f, -0.010531f, -0.003329f, +0.000340f, -0.000027f}, + {-0.003757f, +0.111811f, +0.004737f, -0.000075f, +0.000033f} + }, + { + {+0.245533f, +0.226873f, +0.035259f, -0.002770f, -0.000070f}, + {-0.206677f, -0.408421f, -0.026814f, +0.005082f, +0.000056f}, + {+0.053751f, +0.188303f, +0.009769f, -0.000688f, +0.000029f}, + {+0.149357f, +0.154463f, +0.013417f, -0.001098f, +0.000037f}, + {-0.105083f, -0.109018f, -0.007715f, +0.000799f, -0.000072f}, + {+0.025793f, -0.064751f, +0.005742f, +0.000924f, -0.000050f}, + {-0.041996f, -0.072003f, +0.001334f, +0.001959f, -0.000101f}, + {+0.008234f, +0.134619f, -0.001439f, -0.000932f, -0.000019f}, + {+0.007939f, -0.128639f, +0.012917f, +0.003363f, -0.000130f}, + {-0.013715f, -0.007050f, -0.000167f, +0.004932f, +0.000266f}, + {-0.012412f, -0.040469f, +0.000036f, +0.000063f, -0.000052f}, + {+0.005607f, +0.122490f, +0.001069f, +0.003166f, +0.000145f}, + {+0.002475f, -0.010103f, -0.001112f, +0.000172f, +0.000049f}, + {-0.026992f, -0.004924f, -0.001965f, +0.000301f, -0.000041f}, + {+0.008412f, +0.067378f, +0.003334f, -0.000633f, -0.000020f}, + {-0.034796f, +0.054935f, -0.005935f, -0.000590f, -0.000048f} + }, + { + {+0.049172f, +0.518027f, +0.003115f, +0.000335f, -0.000156f}, + {-0.120618f, -0.519623f, -0.008479f, -0.000432f, +0.000270f}, + {+0.062888f, +0.179664f, -0.000296f, +0.000157f, +0.000063f}, + {+0.019992f, +0.341262f, +0.002080f, -0.000355f, +0.000037f}, + {-0.012267f, -0.246756f, +0.001889f, +0.000730f, -0.000091f}, + {-0.028297f, +0.020937f, +0.002730f, +0.000026f, -0.000039f}, + {-0.008636f, -0.121054f, +0.007814f, +0.000720f, -0.000014f}, + {+0.046484f, +0.071961f, +0.002387f, -0.000455f, +0.000002f}, + {-0.042652f, -0.042219f, +0.005353f, +0.001621f, +0.000061f}, + {+0.003781f, -0.030870f, +0.013170f, +0.002144f, +0.000211f}, + {-0.016747f, -0.033277f, -0.000186f, +0.000012f, -0.000031f}, + {+0.038322f, +0.079239f, +0.009485f, +0.001067f, +0.000129f}, + {-0.009213f, +0.006178f, +0.001082f, +0.000202f, -0.000029f}, + {+0.017679f, -0.071909f, +0.003357f, +0.000147f, -0.000056f}, + {+0.031925f, +0.035422f, +0.000231f, -0.000251f, +0.000032f}, + {+0.027629f, -0.047451f, +0.003771f, -0.000092f, -0.000016f} + }, + { + {-0.277356f, +0.009713f, -0.040871f, +0.002128f, +0.000098f}, + {+0.288048f, +0.119309f, +0.040772f, -0.004167f, -0.000126f}, + {-0.135614f, -0.121199f, -0.015970f, +0.000584f, -0.000025f}, + {-0.147900f, +0.068278f, -0.021757f, +0.001011f, -0.000028f}, + {+0.111155f, -0.046512f, +0.012782f, -0.000892f, +0.000069f}, + {+0.020452f, +0.099912f, +0.003632f, -0.000896f, +0.000036f}, + {+0.051789f, -0.026841f, -0.000416f, -0.002061f, +0.000070f}, + {-0.048315f, -0.075067f, -0.004473f, +0.000718f, +0.000020f}, + {+0.038466f, +0.097321f, -0.002604f, -0.003632f, +0.000080f}, + {+0.012250f, -0.014195f, -0.001656f, -0.003568f, -0.000272f}, + {+0.029260f, +0.036443f, +0.002521f, -0.000109f, +0.000054f}, + {-0.049141f, -0.042766f, -0.002001f, -0.002307f, -0.000147f}, + {+0.016365f, +0.045379f, +0.003479f, +0.000052f, -0.000044f}, + {+0.016380f, -0.068248f, +0.002419f, -0.000284f, +0.000043f}, + {-0.026309f, -0.049393f, -0.000660f, +0.000389f, +0.000012f}, + {+0.020013f, -0.061398f, +0.001390f, +0.000285f, +0.000045f} + }, + { + {+0.056395f, -0.497410f, +0.010462f, +0.000112f, +0.000123f}, + {-0.008278f, +0.564708f, -0.007533f, -0.000534f, -0.000224f}, + {+0.029776f, -0.375504f, +0.009908f, -0.000167f, -0.000056f}, + {+0.053843f, -0.247636f, +0.011973f, +0.000305f, -0.000030f}, + {-0.047919f, +0.200610f, -0.011974f, -0.000485f, +0.000070f}, + {+0.001747f, +0.136529f, -0.008548f, +0.000030f, +0.000031f}, + {-0.034659f, +0.098248f, -0.009286f, -0.000733f, -0.000004f}, + {-0.013390f, -0.125590f, +0.000347f, +0.000408f, -0.000006f}, + {+0.018416f, +0.125823f, -0.010099f, -0.001587f, -0.000079f}, + {-0.015670f, +0.020509f, -0.010455f, -0.001886f, -0.000130f}, + {+0.001269f, +0.078191f, -0.000719f, +0.000060f, +0.000015f}, + {+0.015954f, -0.139586f, -0.005155f, -0.000966f, -0.000087f}, + {-0.000690f, +0.074979f, -0.002970f, -0.000046f, +0.000040f}, + {-0.036315f, +0.016998f, -0.007922f, -0.000063f, +0.000042f}, + {-0.017947f, -0.053543f, -0.003628f, +0.000169f, -0.000034f}, + {-0.036250f, +0.025051f, -0.004463f, +0.000134f, +0.000003f} + }, + { + {+0.261565f, -0.175456f, +0.039964f, -0.001605f, -0.000112f}, + {-0.289123f, +0.124032f, -0.042209f, +0.003292f, +0.000173f}, + {+0.147448f, -0.202794f, +0.013343f, -0.000451f, +0.000021f}, + {+0.111431f, -0.158046f, +0.014055f, -0.000866f, +0.000018f}, + {-0.088516f, +0.135597f, -0.008911f, +0.000941f, -0.000062f}, + {-0.046542f, +0.074771f, +0.001267f, +0.000681f, -0.000024f}, + {-0.008851f, +0.134457f, +0.003904f, +0.001907f, -0.000040f}, + {+0.057725f, -0.011782f, +0.007446f, -0.000690f, -0.000019f}, + {-0.064453f, -0.009485f, -0.001505f, +0.003482f, -0.000032f}, + {+0.003750f, +0.043297f, +0.001696f, +0.002710f, +0.000254f}, + {-0.036881f, +0.019154f, -0.003756f, +0.000164f, -0.000052f}, + {+0.028484f, -0.127049f, +0.000373f, +0.001785f, +0.000137f}, + {-0.030494f, +0.034591f, -0.002192f, -0.000165f, +0.000035f}, + {+0.009470f, +0.091778f, +0.004810f, +0.000325f, -0.000042f}, + {+0.029100f, +0.027840f, +0.006520f, -0.000311f, -0.000006f}, + {-0.009135f, +0.066628f, -0.000798f, -0.000116f, -0.000038f} + }, + { + {-0.134646f, +0.431836f, -0.022252f, -0.000261f, -0.000089f}, + {+0.108773f, -0.480556f, +0.020213f, +0.000915f, +0.000164f}, + {-0.157283f, +0.252511f, -0.017953f, +0.000158f, +0.000053f}, + {-0.096912f, +0.162399f, -0.016830f, -0.000259f, +0.000029f}, + {+0.094935f, -0.145981f, +0.017427f, +0.000284f, -0.000058f}, + {+0.078691f, -0.105220f, +0.009040f, +0.000009f, -0.000031f}, + {+0.032041f, +0.084421f, +0.004353f, +0.000773f, +0.000002f}, + {-0.016068f, +0.102075f, -0.005241f, -0.000269f, +0.000010f}, + {+0.027628f, -0.144744f, +0.013233f, +0.001492f, +0.000070f}, + {+0.013497f, +0.033838f, +0.009244f, +0.001447f, +0.000073f}, + {+0.020163f, -0.066780f, +0.002771f, -0.000069f, -0.000003f}, + {-0.051113f, -0.013125f, +0.004746f, +0.000733f, +0.000056f}, + {+0.038408f, -0.068407f, +0.004887f, -0.000113f, -0.000046f}, + {+0.039739f, +0.052992f, +0.003676f, -0.000005f, -0.000032f}, + {+0.019468f, +0.046585f, -0.000417f, -0.000092f, +0.000032f}, + {+0.046026f, -0.019351f, +0.006238f, -0.000147f, +0.000005f} + }, + { + {-0.227969f, +0.284525f, -0.035118f, +0.001170f, +0.000113f}, + {+0.251619f, -0.250783f, +0.039635f, -0.002380f, -0.000192f}, + {-0.028234f, +0.444181f, -0.004258f, +0.000378f, -0.000019f}, + {-0.057970f, +0.223549f, -0.006095f, +0.000655f, -0.000012f}, + {+0.039868f, -0.230386f, +0.002246f, -0.000818f, +0.000054f}, + {-0.036223f, -0.280336f, -0.007555f, -0.000539f, +0.000017f}, + {-0.045995f, -0.019070f, -0.002489f, -0.001639f, +0.000020f}, + {-0.058114f, +0.032997f, -0.008873f, +0.000662f, +0.000018f}, + {+0.053231f, -0.094713f, +0.003411f, -0.002983f, -0.000000f}, + {-0.022768f, -0.016336f, -0.003117f, -0.002216f, -0.000227f}, + {+0.031511f, -0.045619f, +0.004901f, -0.000227f, +0.000048f}, + {+0.045006f, +0.127523f, +0.002107f, -0.001382f, -0.000124f}, + {-0.004533f, -0.139114f, -0.003073f, +0.000203f, -0.000026f}, + {-0.046710f, -0.071863f, -0.004169f, -0.000343f, +0.000040f}, + {-0.053226f, -0.067429f, -0.008363f, +0.000293f, +0.000001f}, + {-0.008131f, -0.104415f, -0.002326f, +0.000063f, +0.000032f} + }, + { + {+0.193626f, -0.362707f, +0.031027f, +0.000215f, +0.000061f}, + {-0.168437f, +0.394610f, -0.030765f, -0.000832f, -0.000106f}, + {+0.166845f, +0.150839f, +0.019333f, -0.000239f, -0.000053f}, + {+0.108632f, -0.026149f, +0.014836f, +0.000210f, -0.000033f}, + {-0.117845f, +0.006812f, -0.017402f, -0.000161f, +0.000052f}, + {-0.070459f, -0.240877f, -0.004084f, +0.000089f, +0.000035f}, + {+0.051571f, -0.166446f, +0.000272f, -0.000594f, +0.000009f}, + {+0.048610f, -0.137567f, +0.012351f, +0.000122f, -0.000012f}, + {-0.060459f, +0.077161f, -0.017457f, -0.001202f, -0.000048f}, + {+0.008901f, -0.071218f, -0.004889f, -0.001056f, -0.000035f}, + {-0.035581f, +0.061262f, -0.007127f, +0.000111f, -0.000006f}, + {-0.009360f, +0.207644f, -0.007254f, -0.000645f, -0.000037f}, + {-0.043066f, -0.091054f, -0.000390f, +0.000159f, +0.000048f}, + {-0.006722f, -0.129159f, -0.003572f, +0.000128f, +0.000025f}, + {+0.002648f, -0.158951f, +0.005371f, +0.000083f, -0.000030f}, + {-0.052294f, -0.037930f, -0.006102f, +0.000171f, -0.000010f} + }, + { + {+0.185388f, -0.373945f, +0.028242f, -0.000870f, -0.000107f}, + {-0.218466f, +0.313607f, -0.033711f, +0.001650f, +0.000187f}, + {-0.089184f, -0.227856f, -0.003013f, -0.000234f, +0.000019f}, + {-0.005910f, -0.195725f, +0.001490f, -0.000426f, +0.000010f}, + {+0.033058f, +0.233100f, +0.003881f, +0.000583f, -0.000049f}, + {+0.128077f, +0.046310f, +0.008240f, +0.000349f, -0.000015f}, + {+0.004052f, -0.247839f, -0.003163f, +0.001295f, -0.000012f}, + {+0.052459f, -0.138631f, +0.002655f, -0.000517f, -0.000018f}, + {-0.024548f, +0.123596f, -0.001667f, +0.002422f, +0.000013f}, + {+0.026309f, -0.052058f, +0.001607f, +0.001982f, +0.000202f}, + {-0.029154f, +0.072410f, -0.002905f, +0.000210f, -0.000043f}, + {-0.051381f, +0.149021f, +0.000115f, +0.001232f, +0.000111f}, + {+0.060324f, +0.057180f, +0.002547f, -0.000144f, +0.000020f}, + {+0.052887f, -0.036634f, +0.006886f, +0.000170f, -0.000037f}, + {+0.075539f, -0.053066f, +0.006319f, -0.000332f, +0.000001f}, + {+0.036656f, +0.098177f, +0.004589f, -0.000133f, -0.000026f} + }, + { + {-0.239844f, +0.276952f, -0.036663f, -0.000075f, -0.000041f}, + {+0.218935f, -0.356480f, +0.037109f, +0.000536f, +0.000063f}, + {-0.067555f, -0.247328f, -0.016085f, +0.000198f, +0.000054f}, + {-0.065557f, -0.103844f, -0.011325f, -0.000270f, +0.000037f}, + {+0.082669f, +0.157628f, +0.013419f, +0.000257f, -0.000050f}, + {-0.051102f, +0.310690f, -0.001856f, -0.000105f, -0.000038f}, + {-0.105915f, -0.086143f, -0.002835f, +0.000369f, -0.000019f}, + {-0.108427f, +0.103999f, -0.015274f, -0.000237f, +0.000014f}, + {+0.072751f, -0.025221f, +0.019360f, +0.000835f, +0.000029f}, + {-0.042856f, +0.056448f, +0.001929f, +0.000741f, +0.000011f}, + {+0.068206f, -0.080584f, +0.011613f, -0.000093f, +0.000013f}, + {+0.091336f, -0.056612f, +0.010772f, +0.000543f, +0.000024f}, + {-0.026414f, +0.186526f, -0.002964f, -0.000133f, -0.000049f}, + {-0.024927f, +0.082144f, -0.001315f, +0.000035f, -0.000020f}, + {-0.062843f, +0.155369f, -0.009444f, -0.000091f, +0.000028f}, + {+0.038812f, +0.095103f, +0.003754f, -0.000076f, +0.000012f} + }, + { + {-0.131680f, +0.440943f, -0.020891f, +0.000627f, +0.000098f}, + {+0.183833f, -0.406966f, +0.027778f, -0.001207f, -0.000171f}, + {+0.086183f, -0.003067f, +0.012386f, +0.000168f, -0.000020f}, + {+0.026332f, +0.035398f, +0.002657f, +0.000383f, -0.000011f}, + {-0.076464f, -0.083380f, -0.010071f, -0.000597f, +0.000047f}, + {-0.086834f, +0.252931f, -0.010256f, -0.000250f, +0.000016f}, + {+0.112579f, +0.244861f, +0.011209f, -0.001100f, +0.000012f}, + {+0.018202f, +0.300605f, +0.006408f, +0.000602f, +0.000018f}, + {-0.003044f, -0.137405f, -0.002719f, -0.002137f, -0.000013f}, + {+0.003641f, +0.131818f, +0.001737f, -0.001737f, -0.000181f}, + {-0.001297f, -0.195950f, -0.005713f, -0.000204f, +0.000037f}, + {-0.045795f, -0.259231f, -0.005407f, -0.001178f, -0.000100f}, + {-0.039454f, +0.170156f, -0.000777f, +0.000115f, -0.000018f}, + {-0.040004f, +0.055755f, -0.008185f, -0.000317f, +0.000034f}, + {-0.043921f, +0.182226f, -0.005163f, +0.000395f, -0.000002f}, + {-0.058367f, -0.053246f, -0.007857f, +0.000065f, +0.000022f} + }, + { + {+0.266519f, -0.168414f, +0.039980f, +0.000112f, +0.000029f}, + {-0.270044f, +0.288912f, -0.044466f, -0.000374f, -0.000037f}, + {+0.013148f, +0.108379f, +0.008696f, -0.000082f, -0.000056f}, + {+0.007547f, +0.066767f, +0.004336f, +0.000293f, -0.000040f}, + {-0.013959f, -0.178267f, -0.007930f, -0.000231f, +0.000050f}, + {+0.126652f, -0.073753f, +0.010940f, +0.000032f, +0.000041f}, + {+0.037971f, +0.357198f, -0.003626f, -0.000116f, +0.000025f}, + {+0.123814f, +0.144678f, +0.015962f, +0.000194f, -0.000018f}, + {-0.073603f, -0.033162f, -0.018399f, -0.000381f, -0.000019f}, + {+0.052463f, +0.055986f, -0.001868f, -0.000682f, +0.000008f}, + {-0.099011f, -0.055743f, -0.009504f, +0.000033f, -0.000019f}, + {-0.066616f, -0.234328f, -0.006904f, -0.000399f, -0.000016f}, + {+0.081064f, -0.004874f, +0.003489f, +0.000036f, +0.000052f}, + {+0.044214f, -0.078007f, +0.004257f, +0.000035f, +0.000016f}, + {+0.107368f, -0.054956f, +0.018386f, -0.000009f, -0.000028f}, + {-0.008996f, -0.126597f, -0.002978f, +0.000081f, -0.000014f} + }, + { + {+0.076584f, -0.456777f, +0.013253f, -0.000677f, -0.000090f}, + {-0.135714f, +0.493797f, -0.019817f, +0.001205f, +0.000155f}, + {-0.049801f, +0.003798f, -0.009316f, -0.000287f, +0.000022f}, + {+0.008289f, +0.072460f, +0.002582f, -0.000487f, +0.000014f}, + {+0.058361f, -0.066933f, +0.007899f, +0.000705f, -0.000047f}, + {-0.024939f, -0.304082f, -0.002238f, +0.000320f, -0.000018f}, + {-0.164640f, +0.054259f, -0.014251f, +0.000972f, -0.000016f}, + {-0.129320f, -0.239583f, -0.014072f, -0.000614f, -0.000019f}, + {+0.023151f, +0.107790f, +0.002402f, +0.001999f, +0.000009f}, + {-0.042244f, -0.087154f, -0.004003f, +0.001651f, +0.000165f}, + {+0.087421f, +0.223827f, +0.009440f, +0.000302f, -0.000032f}, + {+0.123261f, +0.040927f, +0.008130f, +0.001094f, +0.000093f}, + {-0.047678f, -0.191325f, -0.003834f, -0.000119f, +0.000015f}, + {+0.025350f, -0.109559f, +0.002027f, +0.000400f, -0.000032f}, + {-0.031404f, -0.277712f, -0.007376f, -0.000280f, +0.000002f}, + {+0.054594f, -0.026570f, +0.007177f, +0.000010f, -0.000018f} + }, + { + {-0.274121f, +0.081952f, -0.043113f, -0.000004f, -0.000021f}, + {+0.317778f, -0.199223f, +0.049734f, +0.000202f, +0.000022f}, + {-0.015529f, -0.058172f, -0.001453f, +0.000253f, +0.000058f}, + {+0.020112f, +0.056461f, -0.003930f, -0.000113f, +0.000042f}, + {-0.027311f, +0.065956f, +0.001130f, -0.000048f, -0.000049f}, + {-0.092570f, -0.201332f, -0.007025f, -0.000092f, -0.000044f}, + {+0.078874f, -0.299423f, +0.007522f, +0.000058f, -0.000026f}, + {-0.031803f, -0.392121f, -0.002719f, +0.000010f, +0.000023f}, + {+0.078295f, +0.019932f, +0.020674f, +0.000126f, +0.000017f}, + {-0.029291f, -0.096155f, -0.000322f, +0.000490f, -0.000025f}, + {+0.042190f, +0.292546f, +0.004474f, -0.000130f, +0.000023f}, + {-0.047310f, +0.289378f, +0.003082f, +0.000264f, +0.000009f}, + {-0.036042f, -0.202365f, -0.005972f, -0.000021f, -0.000059f}, + {-0.067032f, +0.032496f, -0.007059f, -0.000199f, -0.000013f}, + {-0.101204f, -0.185795f, -0.005848f, +0.000042f, +0.000029f}, + {-0.006759f, +0.066549f, -0.000681f, -0.000136f, +0.000016f} + }, + { + {-0.033486f, +0.450867f, -0.006565f, +0.000576f, +0.000085f}, + {+0.061876f, -0.590080f, +0.009764f, -0.001166f, -0.000147f}, + {+0.051215f, +0.040728f, +0.006725f, +0.000135f, -0.000027f}, + {-0.075886f, -0.090288f, -0.009577f, +0.000383f, -0.000018f}, + {-0.015185f, +0.082124f, -0.005184f, -0.000502f, +0.000049f}, + {+0.096327f, +0.079550f, +0.006514f, -0.000328f, +0.000021f}, + {+0.097424f, -0.250345f, +0.019698f, -0.001078f, +0.000017f}, + {+0.169040f, -0.091237f, +0.017597f, +0.000283f, +0.000017f}, + {-0.049945f, -0.183685f, -0.013171f, -0.002034f, -0.000009f}, + {+0.051580f, +0.036720f, +0.010126f, -0.001380f, -0.000151f}, + {-0.125504f, +0.039269f, -0.013578f, -0.000208f, +0.000027f}, + {-0.070511f, +0.247836f, -0.009393f, -0.000912f, -0.000087f}, + {+0.075408f, -0.033832f, +0.006471f, +0.000223f, -0.000010f}, + {+0.010281f, +0.155017f, +0.004289f, -0.000279f, +0.000029f}, + {+0.128761f, +0.151968f, +0.010917f, +0.000111f, -0.000004f}, + {-0.047805f, -0.002840f, -0.010782f, -0.000029f, +0.000015f} + }, + { + {+0.280158f, -0.030000f, +0.043460f, +0.000075f, +0.000014f}, + {-0.336614f, +0.016258f, -0.050302f, -0.000297f, -0.000011f}, + {+0.002372f, +0.120514f, -0.000413f, -0.000319f, -0.000061f}, + {+0.016063f, -0.229902f, +0.006035f, +0.000097f, -0.000043f}, + {+0.028633f, +0.007390f, +0.002007f, +0.000039f, +0.000048f}, + {-0.005134f, +0.220494f, +0.003892f, +0.000252f, +0.000046f}, + {-0.096636f, +0.051599f, -0.015635f, +0.000127f, +0.000026f}, + {-0.105407f, +0.323356f, -0.007410f, +0.000133f, -0.000028f}, + {-0.087018f, -0.141885f, -0.014985f, +0.000005f, -0.000018f}, + {+0.018235f, +0.085003f, -0.002078f, -0.000390f, +0.000041f}, + {+0.049559f, -0.222425f, +0.001760f, +0.000043f, -0.000027f}, + {+0.087658f, +0.008493f, +0.002149f, -0.000327f, -0.000002f}, + {-0.025991f, +0.110117f, +0.002501f, +0.000106f, +0.000066f}, + {+0.073066f, +0.062410f, +0.006753f, +0.000139f, +0.000010f}, + {-0.012343f, +0.361812f, +0.000879f, +0.000019f, -0.000031f}, + {+0.008849f, -0.097553f, +0.003670f, +0.000140f, -0.000018f} + }, + { + {-0.006954f, -0.470379f, -0.000165f, -0.000551f, -0.000082f}, + {+0.019214f, +0.554319f, -0.001599f, +0.001129f, +0.000145f}, + {-0.050232f, +0.045555f, -0.004649f, -0.000015f, +0.000034f}, + {+0.117286f, -0.075343f, +0.011788f, -0.000390f, +0.000023f}, + {-0.013982f, -0.062149f, -0.000689f, +0.000526f, -0.000053f}, + {-0.064167f, +0.122065f, -0.007764f, +0.000174f, -0.000027f}, + {-0.057456f, +0.102739f, -0.012482f, +0.000929f, -0.000017f}, + {-0.086303f, +0.350740f, -0.008732f, -0.000319f, -0.000013f}, + {+0.114468f, +0.156124f, +0.012352f, +0.002008f, +0.000014f}, + {-0.063324f, -0.045704f, -0.011079f, +0.001189f, +0.000135f}, + {+0.081653f, -0.167815f, +0.010699f, +0.000264f, -0.000021f}, + {-0.009546f, -0.130825f, +0.003286f, +0.000952f, +0.000083f}, + {-0.034292f, +0.088622f, -0.006613f, -0.000382f, +0.000000f}, + {-0.064658f, -0.148003f, -0.007951f, +0.000319f, -0.000027f}, + {-0.118973f, +0.200930f, -0.010476f, -0.000078f, +0.000007f}, + {+0.061648f, -0.019855f, +0.007486f, +0.000045f, -0.000011f} + }, + { + {-0.287193f, -0.042900f, -0.042884f, -0.000074f, -0.000006f}, + {+0.316269f, +0.095647f, +0.050717f, +0.000419f, -0.000004f}, + {+0.024609f, -0.065464f, -0.001044f, +0.000352f, +0.000061f}, + {-0.090934f, +0.238549f, -0.014249f, -0.000001f, +0.000044f}, + {-0.019808f, -0.051257f, +0.001165f, -0.000156f, -0.000046f}, + {+0.048333f, -0.050030f, +0.007461f, -0.000269f, -0.000047f}, + {+0.082327f, -0.120302f, +0.020222f, -0.000034f, -0.000027f}, + {+0.165448f, -0.034472f, +0.017814f, +0.000021f, +0.000032f}, + {+0.033316f, +0.280356f, +0.011492f, -0.000020f, +0.000016f}, + {-0.008225f, -0.128802f, +0.005400f, +0.000223f, -0.000054f}, + {-0.088609f, +0.096391f, -0.012066f, -0.000087f, +0.000030f}, + {-0.036267f, -0.078389f, -0.005104f, +0.000176f, -0.000004f}, + {+0.020864f, +0.001946f, +0.003538f, -0.000159f, -0.000070f}, + {-0.031397f, -0.200648f, -0.000765f, -0.000186f, -0.000008f}, + {+0.119879f, -0.159775f, +0.011369f, +0.000002f, +0.000032f}, + {-0.036654f, +0.129414f, -0.004412f, -0.000114f, +0.000020f} + }, + { + {+0.055358f, +0.480776f, +0.007156f, +0.000440f, +0.000080f}, + {-0.069696f, -0.497403f, -0.009705f, -0.000945f, -0.000144f}, + {+0.014636f, -0.076742f, +0.003268f, +0.000063f, -0.000042f}, + {-0.098616f, +0.221987f, -0.012598f, +0.000348f, -0.000027f}, + {+0.038012f, +0.038810f, +0.004148f, -0.000514f, +0.000056f}, + {+0.010993f, -0.104517f, +0.004208f, -0.000219f, +0.000033f}, + {+0.073401f, -0.141057f, +0.006526f, -0.000916f, +0.000016f}, + {-0.033949f, -0.336614f, -0.001600f, +0.000255f, +0.000007f}, + {-0.139291f, +0.017101f, -0.017309f, -0.001860f, -0.000021f}, + {+0.085604f, +0.017452f, +0.013308f, -0.001048f, -0.000118f}, + {-0.029028f, +0.187952f, -0.005021f, -0.000216f, +0.000016f}, + {+0.006564f, -0.006493f, +0.001419f, -0.000780f, -0.000079f}, + {+0.020490f, +0.003411f, +0.006133f, +0.000307f, +0.000011f}, + {+0.091616f, -0.016927f, +0.008786f, -0.000287f, +0.000025f}, + {+0.009844f, -0.323610f, +0.003492f, +0.000078f, -0.000011f}, + {-0.056286f, +0.097814f, -0.006882f, -0.000079f, +0.000007f} + }, + { + {+0.282827f, +0.133300f, +0.042549f, +0.000086f, -0.000002f}, + {-0.297764f, -0.151816f, -0.046261f, -0.000499f, +0.000022f}, + {-0.010547f, -0.035236f, +0.000498f, -0.000494f, -0.000059f}, + {+0.144406f, -0.152441f, +0.023633f, -0.000028f, -0.000044f}, + {+0.000542f, +0.094714f, -0.004019f, +0.000229f, +0.000043f}, + {-0.041461f, -0.019853f, -0.008957f, +0.000418f, +0.000046f}, + {-0.123943f, +0.154058f, -0.020412f, +0.000069f, +0.000030f}, + {-0.130914f, -0.179670f, -0.017352f, -0.000111f, -0.000033f}, + {+0.036620f, -0.258117f, -0.000481f, +0.000034f, -0.000009f}, + {-0.021657f, +0.180451f, -0.009924f, -0.000053f, +0.000065f}, + {+0.095197f, -0.006584f, +0.013724f, +0.000061f, -0.000032f}, + {+0.011099f, -0.015338f, +0.000599f, -0.000168f, +0.000011f}, + {+0.002807f, +0.034719f, -0.003109f, +0.000353f, +0.000070f}, + {-0.041276f, +0.181885f, -0.005275f, +0.000201f, +0.000007f}, + {-0.125301f, -0.110921f, -0.015164f, -0.000039f, -0.000032f}, + {+0.066993f, -0.092159f, +0.009251f, +0.000136f, -0.000021f} + }, + { + {-0.104112f, -0.458657f, -0.013927f, -0.000353f, -0.000076f}, + {+0.111390f, +0.472799f, +0.015450f, +0.000704f, +0.000139f}, + {+0.000873f, -0.019121f, -0.001169f, -0.000093f, +0.000048f}, + {+0.056615f, -0.285336f, +0.007942f, -0.000391f, +0.000032f}, + {-0.055650f, +0.007065f, -0.007223f, +0.000546f, -0.000060f}, + {+0.018845f, +0.077039f, +0.001923f, +0.000256f, -0.000039f}, + {-0.051977f, +0.260211f, -0.006687f, +0.000819f, -0.000018f}, + {+0.110604f, +0.197201f, +0.015009f, -0.000259f, -0.000003f}, + {+0.118052f, -0.135388f, +0.015667f, +0.001612f, +0.000024f}, + {-0.098237f, +0.061993f, -0.014872f, +0.000974f, +0.000101f}, + {-0.016600f, -0.180900f, -0.001935f, +0.000217f, -0.000011f}, + {+0.024890f, +0.001895f, +0.000719f, +0.000667f, +0.000075f}, + {-0.052001f, -0.047705f, -0.008689f, -0.000203f, -0.000021f}, + {-0.051423f, +0.163687f, -0.007750f, +0.000277f, -0.000023f}, + {+0.092904f, +0.226447f, +0.010447f, -0.000087f, +0.000014f}, + {+0.029788f, -0.148840f, +0.003437f, +0.000063f, -0.000002f} + }, + { + {-0.265513f, -0.211642f, -0.040584f, -0.000055f, +0.000009f}, + {+0.279427f, +0.216928f, +0.044464f, +0.000461f, -0.000042f}, + {-0.017280f, +0.004077f, -0.001930f, +0.000533f, +0.000057f}, + {-0.175703f, +0.073912f, -0.028215f, +0.000106f, +0.000044f}, + {+0.032929f, -0.127864f, +0.007891f, -0.000307f, -0.000041f}, + {+0.023458f, +0.073855f, +0.003516f, -0.000521f, -0.000044f}, + {+0.165507f, -0.073413f, +0.027506f, -0.000119f, -0.000034f}, + {+0.058760f, +0.277549f, +0.005732f, +0.000115f, +0.000033f}, + {-0.086524f, +0.185360f, -0.006494f, -0.000114f, +0.000000f}, + {+0.068563f, -0.191058f, +0.014677f, -0.000094f, -0.000073f}, + {-0.083271f, -0.077777f, -0.010978f, -0.000035f, +0.000035f}, + {-0.032739f, +0.090968f, -0.003108f, +0.000130f, -0.000018f}, + {+0.012042f, -0.148829f, +0.005352f, -0.000453f, -0.000067f}, + {+0.074068f, -0.028523f, +0.009472f, -0.000233f, -0.000006f}, + {+0.054178f, +0.286348f, +0.004315f, +0.000011f, +0.000032f}, + {-0.081317f, +0.023039f, -0.011622f, -0.000155f, +0.000021f} + }, + { + {+0.144447f, +0.416258f, +0.019880f, +0.000298f, +0.000071f}, + {-0.149133f, -0.438088f, -0.020811f, -0.000535f, -0.000129f}, + {+0.015049f, +0.049287f, -0.000123f, +0.000146f, -0.000053f}, + {-0.004923f, +0.337598f, +0.000454f, +0.000368f, -0.000037f}, + {+0.051157f, -0.099533f, +0.006353f, -0.000530f, +0.000063f}, + {-0.036114f, -0.015276f, -0.002183f, -0.000257f, +0.000042f}, + {-0.001423f, -0.329473f, -0.000629f, -0.000758f, +0.000021f}, + {-0.137836f, -0.026570f, -0.019057f, +0.000357f, +0.000002f}, + {-0.074813f, +0.206610f, -0.009222f, -0.001398f, -0.000023f}, + {+0.082213f, -0.168162f, +0.013202f, -0.000891f, -0.000086f}, + {+0.053436f, +0.133406f, +0.007060f, -0.000274f, +0.000004f}, + {-0.031202f, +0.097339f, -0.000600f, -0.000565f, -0.000069f}, + {+0.084087f, -0.042545f, +0.010288f, +0.000114f, +0.000027f}, + {-0.011630f, -0.156396f, +0.002102f, -0.000281f, +0.000021f}, + {-0.139327f, -0.009640f, -0.015858f, +0.000166f, -0.000017f}, + {+0.001227f, +0.149601f, +0.000552f, -0.000041f, -0.000002f} + }, + { + {+0.243657f, +0.264257f, +0.037689f, -0.000001f, -0.000015f}, + {-0.259444f, -0.270037f, -0.041639f, -0.000297f, +0.000058f}, + {+0.024732f, +0.031819f, +0.004944f, -0.000508f, -0.000056f}, + {+0.188302f, +0.043036f, +0.027818f, -0.000121f, -0.000045f}, + {-0.061013f, +0.068025f, -0.009284f, +0.000332f, +0.000040f}, + {+0.005481f, -0.077635f, -0.001849f, +0.000481f, +0.000044f}, + {-0.183484f, -0.052352f, -0.028430f, +0.000255f, +0.000038f}, + {+0.021508f, -0.270954f, +0.003464f, -0.000123f, -0.000034f}, + {+0.112315f, -0.086235f, +0.009937f, +0.000307f, +0.000007f}, + {-0.107969f, +0.120398f, -0.018769f, +0.000181f, +0.000082f}, + {+0.056786f, +0.126822f, +0.007959f, +0.000033f, -0.000039f}, + {+0.069219f, -0.054400f, +0.005730f, -0.000053f, +0.000023f}, + {-0.070651f, +0.193415f, -0.010674f, +0.000389f, +0.000067f}, + {-0.051509f, -0.092171f, -0.007870f, +0.000294f, +0.000005f}, + {+0.051121f, -0.299571f, +0.006590f, -0.000024f, -0.000032f}, + {+0.084035f, +0.019475f, +0.012921f, +0.000164f, -0.000021f} + }, + { + {-0.178130f, -0.383088f, -0.025598f, -0.000261f, -0.000067f}, + {+0.182587f, +0.405974f, +0.025901f, +0.000462f, +0.000117f}, + {-0.033772f, -0.059691f, -0.003877f, -0.000106f, +0.000059f}, + {-0.056171f, -0.329183f, -0.006810f, -0.000311f, +0.000043f}, + {-0.030324f, +0.107424f, -0.007446f, +0.000469f, -0.000068f}, + {+0.029083f, -0.038828f, +0.003047f, +0.000232f, -0.000046f}, + {+0.074081f, +0.341332f, +0.009025f, +0.000675f, -0.000027f}, + {+0.114367f, -0.124510f, +0.017364f, -0.000363f, -0.000002f}, + {+0.019963f, -0.231444f, +0.001211f, +0.001284f, +0.000019f}, + {-0.044510f, +0.213643f, -0.009811f, +0.000749f, +0.000069f}, + {-0.075343f, -0.079800f, -0.011596f, +0.000341f, +0.000004f}, + {-0.002994f, -0.163592f, -0.001034f, +0.000473f, +0.000063f}, + {-0.066930f, +0.201208f, -0.008014f, -0.000114f, -0.000031f}, + {+0.046049f, +0.057169f, +0.003278f, +0.000251f, -0.000018f}, + {+0.102214f, -0.218411f, +0.013142f, -0.000169f, +0.000019f}, + {-0.034525f, -0.167091f, -0.007400f, +0.000056f, +0.000007f} + }, + { + {-0.222238f, -0.317392f, -0.033615f, +0.000033f, +0.000021f}, + {+0.241813f, +0.315693f, +0.038994f, +0.000147f, -0.000070f}, + {-0.020356f, -0.081902f, -0.002758f, +0.000479f, +0.000060f}, + {-0.167023f, -0.157180f, -0.026364f, +0.000127f, +0.000047f}, + {+0.066143f, -0.046203f, +0.014148f, -0.000357f, -0.000040f}, + {-0.022432f, +0.042335f, -0.001522f, -0.000437f, -0.000048f}, + {+0.157680f, +0.214692f, +0.024775f, -0.000379f, -0.000040f}, + {-0.074512f, +0.166548f, -0.010491f, +0.000080f, +0.000039f}, + {-0.105735f, -0.034968f, -0.008768f, -0.000539f, -0.000010f}, + {+0.123458f, -0.044963f, +0.022305f, -0.000260f, -0.000091f}, + {-0.027259f, -0.155333f, -0.002873f, -0.000021f, +0.000041f}, + {-0.074325f, -0.052152f, -0.007210f, -0.000007f, -0.000026f}, + {+0.123302f, -0.087187f, +0.015137f, -0.000263f, -0.000074f}, + {+0.007845f, +0.113256f, +0.003459f, -0.000313f, -0.000004f}, + {-0.120092f, +0.122041f, -0.014660f, +0.000024f, +0.000034f}, + {-0.076429f, -0.107035f, -0.008690f, -0.000173f, +0.000022f} + }, + { + {+0.213344f, +0.349398f, +0.030097f, +0.000237f, +0.000063f}, + {-0.219215f, -0.390772f, -0.031915f, -0.000487f, -0.000107f}, + {+0.052529f, +0.029499f, +0.005648f, -0.000100f, -0.000070f}, + {+0.095709f, +0.245511f, +0.012927f, +0.000199f, -0.000053f}, + {+0.028737f, -0.105483f, +0.003866f, -0.000348f, +0.000076f}, + {-0.013337f, +0.055289f, -0.001002f, -0.000053f, +0.000054f}, + {-0.130180f, -0.225228f, -0.015900f, -0.000591f, +0.000035f}, + {-0.068381f, +0.171403f, -0.012635f, +0.000260f, +0.000000f}, + {+0.025988f, +0.167605f, +0.004069f, -0.001280f, -0.000015f}, + {+0.008972f, -0.221115f, +0.003663f, -0.000531f, -0.000048f}, + {+0.090641f, +0.028424f, +0.013918f, -0.000378f, -0.000016f}, + {+0.038654f, +0.120101f, +0.004990f, -0.000461f, -0.000057f}, + {+0.005905f, -0.263875f, +0.003095f, +0.000269f, +0.000040f}, + {-0.040815f, +0.035273f, -0.004946f, -0.000197f, +0.000014f}, + {-0.018746f, +0.272655f, -0.004798f, +0.000121f, -0.000023f}, + {+0.076538f, +0.124942f, +0.010206f, -0.000084f, -0.000014f} + }, + { + {+0.192920f, +0.381741f, +0.029300f, -0.000048f, -0.000026f}, + {-0.222170f, -0.388402f, -0.034955f, -0.000099f, +0.000080f}, + {+0.001699f, +0.107240f, +0.000947f, -0.000519f, -0.000066f}, + {+0.136658f, +0.180309f, +0.023176f, -0.000174f, -0.000048f}, + {-0.088774f, +0.075575f, -0.016123f, +0.000436f, +0.000040f}, + {+0.024745f, -0.004479f, +0.001974f, +0.000454f, +0.000055f}, + {-0.102774f, -0.266722f, -0.019008f, +0.000449f, +0.000041f}, + {+0.092562f, -0.080882f, +0.015366f, -0.000075f, -0.000049f}, + {+0.070990f, +0.091884f, +0.006305f, +0.000702f, +0.000009f}, + {-0.128422f, -0.011753f, -0.022348f, +0.000409f, +0.000098f}, + {-0.011288f, +0.189192f, -0.003841f, -0.000041f, -0.000039f}, + {+0.054725f, +0.090752f, +0.006454f, +0.000058f, +0.000028f}, + {-0.128788f, -0.054495f, -0.017806f, +0.000292f, +0.000085f}, + {+0.020286f, -0.059861f, +0.001026f, +0.000246f, +0.000006f}, + {+0.120848f, +0.054441f, +0.017027f, -0.000075f, -0.000037f}, + {+0.034321f, +0.188962f, +0.004725f, +0.000162f, -0.000021f} + }, + { + {-0.244141f, -0.287056f, -0.034191f, -0.000192f, -0.000058f}, + {+0.264405f, +0.355877f, +0.037791f, +0.000515f, +0.000101f}, + {-0.059687f, +0.011038f, -0.007243f, +0.000348f, +0.000093f}, + {-0.113575f, -0.207201f, -0.018101f, -0.000078f, +0.000070f}, + {-0.015137f, +0.192002f, +0.000035f, +0.000213f, -0.000092f}, + {+0.000786f, -0.038825f, +0.000032f, -0.000190f, -0.000073f}, + {+0.148464f, +0.121467f, +0.020501f, +0.000551f, -0.000044f}, + {+0.029628f, -0.179066f, +0.005364f, -0.000049f, +0.000007f}, + {-0.038114f, -0.078616f, -0.007491f, +0.001320f, +0.000017f}, + {+0.025506f, +0.225558f, +0.001578f, +0.000313f, +0.000019f}, + {-0.093865f, +0.065189f, -0.011642f, +0.000361f, +0.000030f}, + {-0.055369f, -0.081537f, -0.009138f, +0.000492f, +0.000055f}, + {+0.051502f, +0.222620f, +0.004584f, -0.000598f, -0.000061f}, + {+0.019309f, -0.058544f, +0.003257f, +0.000181f, -0.000009f}, + {-0.051402f, -0.209177f, -0.004739f, -0.000005f, +0.000032f}, + {-0.088918f, +0.001217f, -0.011717f, +0.000085f, +0.000023f} + }, + { + {-0.156411f, -0.421444f, -0.024491f, +0.000067f, +0.000032f}, + {+0.186613f, +0.476552f, +0.029757f, +0.000163f, -0.000095f}, + {+0.020430f, -0.113691f, +0.002893f, +0.000775f, +0.000065f}, + {-0.119151f, -0.201740f, -0.018300f, +0.000297f, +0.000045f}, + {+0.119879f, -0.010231f, +0.016974f, -0.000596f, -0.000034f}, + {-0.016380f, -0.009027f, -0.002417f, -0.000683f, -0.000057f}, + {+0.054627f, +0.269651f, +0.010810f, -0.000526f, -0.000040f}, + {-0.097390f, +0.017005f, -0.015311f, +0.000161f, +0.000060f}, + {-0.042266f, -0.067204f, -0.002884f, -0.000753f, -0.000009f}, + {+0.124653f, +0.076460f, +0.020814f, -0.000683f, -0.000097f}, + {+0.063103f, -0.174209f, +0.008521f, +0.000147f, +0.000032f}, + {-0.034711f, -0.112933f, -0.002461f, -0.000059f, -0.000029f}, + {+0.100579f, +0.144714f, +0.014721f, -0.000551f, -0.000093f}, + {-0.025957f, +0.015194f, -0.003388f, -0.000192f, -0.000011f}, + {-0.076574f, -0.167585f, -0.012107f, +0.000148f, +0.000039f}, + {+0.014876f, -0.155274f, +0.000070f, -0.000119f, +0.000015f} + }, + { + {+0.265430f, +0.225416f, +0.037831f, +0.000115f, +0.000053f}, + {-0.306311f, -0.277325f, -0.043227f, -0.000433f, -0.000096f}, + {+0.056945f, -0.056467f, +0.006568f, -0.000476f, -0.000127f}, + {+0.136114f, +0.189590f, +0.020608f, +0.000082f, -0.000092f}, + {-0.029899f, -0.236698f, -0.003149f, -0.000187f, +0.000112f}, + {-0.002353f, +0.011865f, +0.000725f, +0.000346f, +0.000104f}, + {-0.149926f, -0.044328f, -0.020529f, -0.000533f, +0.000055f}, + {+0.006499f, +0.177667f, -0.000005f, -0.000147f, -0.000024f}, + {+0.030173f, +0.047667f, +0.008504f, -0.001253f, -0.000024f}, + {-0.058868f, -0.204995f, -0.005519f, -0.000216f, +0.000017f}, + {+0.060797f, -0.176638f, +0.008488f, -0.000290f, -0.000044f}, + {+0.066026f, +0.042360f, +0.010165f, -0.000503f, -0.000055f}, + {-0.083588f, -0.140991f, -0.010070f, +0.000860f, +0.000099f}, + {-0.004801f, +0.048462f, -0.000139f, -0.000150f, +0.000006f}, + {+0.080388f, +0.074103f, +0.009601f, -0.000068f, -0.000044f}, + {+0.065811f, -0.073786f, +0.011524f, -0.000018f, -0.000032f} + }, + { + {+0.119762f, +0.449669f, +0.018731f, -0.000115f, -0.000039f}, + {-0.134482f, -0.541069f, -0.022864f, -0.000250f, +0.000117f}, + {-0.042132f, +0.097515f, -0.006293f, -0.001210f, -0.000046f}, + {+0.098328f, +0.249713f, +0.014715f, -0.000530f, -0.000029f}, + {-0.121827f, -0.094517f, -0.018717f, +0.000823f, +0.000016f}, + {+0.013897f, -0.016128f, +0.002834f, +0.001121f, +0.000043f}, + {-0.013035f, -0.259005f, -0.004212f, +0.000650f, +0.000036f}, + {+0.088488f, +0.051805f, +0.014091f, -0.000366f, -0.000066f}, + {+0.034103f, +0.039837f, +0.000657f, +0.000674f, +0.000017f}, + {-0.110624f, -0.126988f, -0.019030f, +0.001012f, +0.000081f}, + {-0.093230f, +0.059767f, -0.012720f, -0.000213f, -0.000018f}, + {+0.010158f, +0.127393f, -0.000864f, -0.000011f, +0.000034f}, + {-0.063926f, -0.170726f, -0.009503f, +0.001011f, +0.000084f}, + {+0.027512f, -0.003892f, +0.003562f, +0.000233f, +0.000020f}, + {+0.023442f, +0.159229f, +0.006050f, -0.000235f, -0.000035f}, + {-0.037775f, +0.088532f, -0.005468f, +0.000062f, -0.000004f} + }, + { + {-0.281213f, -0.164420f, -0.039852f, -0.000042f, -0.000045f}, + {+0.333286f, +0.175696f, +0.047590f, +0.000222f, +0.000083f}, + {-0.046428f, +0.089416f, -0.005265f, +0.000281f, +0.000164f}, + {-0.162498f, -0.149672f, -0.023881f, -0.000229f, +0.000114f}, + {+0.075028f, +0.208672f, +0.010268f, +0.000343f, -0.000132f}, + {+0.011727f, -0.019516f, -0.000540f, -0.000212f, -0.000139f}, + {+0.140528f, -0.025264f, +0.018383f, +0.000497f, -0.000067f}, + {-0.033739f, -0.136327f, -0.003526f, +0.000118f, +0.000049f}, + {-0.027078f, -0.053959f, -0.007554f, +0.001057f, +0.000031f}, + {+0.086060f, +0.177107f, +0.010290f, +0.000364f, -0.000050f}, + {-0.010787f, +0.184727f, -0.002953f, +0.000174f, +0.000054f}, + {-0.067502f, +0.008050f, -0.010245f, +0.000436f, +0.000057f}, + {+0.094254f, +0.075792f, +0.012552f, -0.000706f, -0.000144f}, + {-0.009743f, -0.063892f, -0.003613f, +0.000014f, -0.000006f}, + {-0.069093f, +0.013884f, -0.010485f, -0.000027f, +0.000058f}, + {-0.040587f, +0.086338f, -0.006898f, -0.000093f, +0.000039f} + }, + { + {-0.083222f, -0.468035f, -0.013503f, +0.000232f, +0.000044f}, + {+0.075896f, +0.571385f, +0.014672f, +0.000160f, -0.000148f}, + {+0.064646f, -0.084083f, +0.009714f, +0.001578f, +0.000001f}, + {-0.061670f, -0.306739f, -0.009048f, +0.000650f, -0.000001f}, + {+0.101027f, +0.169945f, +0.015494f, -0.000962f, +0.000016f}, + {-0.029442f, +0.045651f, -0.004343f, -0.001546f, -0.000004f}, + {-0.024934f, +0.231230f, -0.000602f, -0.000728f, -0.000028f}, + {-0.072285f, -0.076179f, -0.012914f, +0.000746f, +0.000059f}, + {-0.032566f, -0.041990f, -0.000543f, -0.000656f, -0.000034f}, + {+0.090764f, +0.173219f, +0.015307f, -0.001207f, -0.000044f}, + {+0.090276f, +0.027741f, +0.013865f, +0.000091f, -0.000003f}, + {+0.018263f, -0.122358f, +0.003953f, +0.000094f, -0.000045f}, + {+0.030642f, +0.175289f, +0.004377f, -0.001562f, -0.000047f}, + {-0.023328f, -0.044760f, -0.001438f, -0.000338f, -0.000032f}, + {+0.006646f, -0.104149f, -0.000978f, +0.000365f, +0.000024f}, + {+0.048240f, -0.050757f, +0.006981f, -0.000141f, -0.000013f} + }, + { + {+0.293187f, +0.109518f, +0.041947f, +0.000007f, +0.000034f}, + {-0.344718f, -0.073613f, -0.049496f, +0.000072f, -0.000056f}, + {+0.021693f, -0.150854f, +0.000496f, +0.000303f, -0.000187f}, + {+0.175693f, +0.054150f, +0.024494f, +0.000572f, -0.000126f}, + {-0.106866f, -0.149507f, -0.014360f, -0.000666f, +0.000140f}, + {-0.005446f, +0.082692f, +0.002403f, -0.000314f, +0.000163f}, + {-0.114767f, +0.094767f, -0.014918f, -0.000548f, +0.000078f}, + {+0.049475f, +0.114052f, +0.007022f, +0.000118f, -0.000074f}, + {+0.031125f, +0.054985f, +0.008404f, -0.000705f, -0.000030f}, + {-0.107661f, -0.132716f, -0.012982f, -0.000706f, +0.000070f}, + {-0.028176f, -0.155327f, -0.002943f, -0.000018f, -0.000055f}, + {+0.051419f, -0.071483f, +0.007973f, -0.000234f, -0.000055f}, + {-0.090400f, -0.012443f, -0.011441f, +0.000118f, +0.000180f}, + {+0.025522f, +0.028081f, +0.003864f, +0.000120f, +0.000013f}, + {+0.045874f, -0.043114f, +0.007466f, +0.000223f, -0.000070f}, + {+0.014499f, -0.105809f, +0.003088f, +0.000276f, -0.000039f} + }, + { + {+0.046789f, +0.488561f, +0.007479f, -0.000388f, -0.000046f}, + {-0.018640f, -0.575973f, -0.005892f, +0.000203f, +0.000177f}, + {-0.079067f, +0.002856f, -0.010533f, -0.001448f, +0.000068f}, + {+0.016267f, +0.296423f, +0.004542f, -0.000403f, +0.000045f}, + {-0.068852f, -0.208415f, -0.010824f, +0.000748f, -0.000061f}, + {+0.046351f, +0.003708f, +0.005559f, +0.001546f, -0.000058f}, + {+0.047339f, -0.155305f, +0.003323f, +0.000760f, +0.000014f}, + {+0.060540f, +0.100086f, +0.009755f, -0.001008f, -0.000039f}, + {+0.028568f, +0.054083f, +0.000810f, +0.000898f, +0.000057f}, + {-0.065074f, -0.200619f, -0.010710f, +0.000928f, -0.000007f}, + {-0.072568f, -0.087920f, -0.011704f, +0.000262f, +0.000027f}, + {-0.035957f, +0.060576f, -0.005664f, -0.000112f, +0.000061f}, + {-0.005716f, -0.143119f, -0.000691f, +0.001673f, -0.000018f}, + {+0.004173f, +0.058408f, +0.000175f, +0.000594f, +0.000044f}, + {-0.014414f, +0.051132f, -0.000839f, -0.000345f, -0.000005f}, + {-0.049091f, -0.010855f, -0.005751f, +0.000426f, +0.000033f} + }, + { + {-0.304340f, -0.049256f, -0.042947f, -0.000088f, -0.000022f}, + {+0.346449f, -0.017003f, +0.049621f, -0.000139f, +0.000009f}, + {+0.019745f, +0.150866f, +0.002851f, -0.000874f, +0.000177f}, + {-0.162730f, +0.020120f, -0.025248f, -0.000808f, +0.000118f}, + {+0.121162f, +0.084738f, +0.017259f, +0.000808f, -0.000129f}, + {-0.021528f, -0.096693f, -0.003962f, +0.000943f, -0.000157f}, + {+0.080586f, -0.103642f, +0.011291f, +0.000589f, -0.000085f}, + {-0.068191f, -0.098030f, -0.009096f, -0.000708f, +0.000092f}, + {-0.036751f, -0.046076f, -0.010119f, +0.000284f, +0.000015f}, + {+0.119856f, +0.085575f, +0.015319f, +0.000749f, -0.000064f}, + {+0.056191f, +0.109851f, +0.006441f, +0.000263f, +0.000045f}, + {-0.024446f, +0.076942f, -0.005466f, -0.000057f, +0.000045f}, + {+0.077086f, -0.012676f, +0.010840f, +0.000676f, -0.000186f}, + {-0.022826f, +0.016537f, -0.004763f, -0.000058f, -0.000029f}, + {-0.027607f, +0.031101f, -0.005172f, -0.000482f, +0.000074f}, + {+0.014855f, +0.087430f, -0.000738f, -0.000308f, +0.000029f} + }, + { + {-0.005004f, -0.508800f, -0.001655f, +0.000570f, +0.000043f}, + {-0.037995f, +0.575156f, -0.001530f, -0.000956f, -0.000194f}, + {+0.063856f, +0.080957f, +0.012812f, -0.000366f, -0.000142f}, + {+0.010948f, -0.247204f, +0.002839f, -0.000988f, -0.000091f}, + {+0.037852f, +0.213873f, +0.003692f, +0.000614f, +0.000107f}, + {-0.039839f, -0.066118f, -0.007988f, -0.000076f, +0.000128f}, + {-0.045977f, +0.093672f, -0.005215f, -0.000506f, +0.000005f}, + {-0.041130f, -0.141991f, -0.007462f, +0.000858f, +0.000008f}, + {-0.021819f, -0.064730f, +0.000517f, -0.001640f, -0.000079f}, + {+0.039217f, +0.211900f, +0.002725f, +0.000921f, +0.000061f}, + {+0.045306f, +0.127706f, +0.011256f, -0.001493f, -0.000048f}, + {+0.032008f, -0.009436f, +0.005842f, -0.000094f, -0.000078f}, + {-0.004712f, +0.114810f, -0.003709f, -0.000227f, +0.000095f}, + {+0.008291f, -0.029832f, +0.002509f, -0.001272f, -0.000051f}, + {+0.010544f, -0.029052f, +0.001437f, -0.000138f, -0.000018f}, + {+0.030918f, +0.063638f, +0.005584f, -0.001227f, -0.000052f} + }, + { + {+0.309505f, -0.026680f, +0.043359f, +0.000419f, +0.000012f}, + {-0.340746f, +0.112091f, -0.048231f, -0.000694f, +0.000055f}, + {-0.050908f, -0.091302f, -0.002377f, +0.001134f, -0.000125f}, + {+0.144586f, -0.040667f, +0.026484f, +0.000403f, -0.000085f}, + {-0.123071f, -0.035557f, -0.020641f, -0.000216f, +0.000092f}, + {+0.043825f, +0.058128f, +0.002805f, -0.001548f, +0.000111f}, + {-0.057009f, +0.077140f, -0.008666f, -0.000464f, +0.000085f}, + {+0.083496f, +0.049994f, +0.012188f, +0.002184f, -0.000094f}, + {+0.041301f, +0.031775f, +0.012825f, +0.000028f, +0.000015f}, + {-0.123609f, -0.042304f, -0.020375f, +0.000225f, +0.000027f}, + {-0.072663f, -0.052460f, -0.006157f, -0.001671f, -0.000023f}, + {+0.007106f, -0.047603f, +0.003493f, +0.000487f, -0.000023f}, + {-0.066995f, +0.014584f, -0.013984f, -0.001717f, +0.000149f}, + {+0.012333f, -0.023056f, +0.004831f, -0.000535f, +0.000051f}, + {+0.018093f, -0.018206f, +0.005001f, +0.000871f, -0.000068f}, + {-0.032484f, -0.034633f, +0.000235f, -0.000375f, -0.000007f} + } +}; + +#endif + +#ifdef UPDATE_SBA_FILTER + +const float FASTCONV_HOA2_latency_s = 0.000666667f; +const float leftHRIRReal_HOA2[BINAURAL_CONVBANDS][9][BINAURAL_NTAPS]= +{ + { + {-0.005335f, +0.653226f, +0.143797f, +0.002456f, -0.000002f}, + {-0.013208f, +0.379140f, -0.322559f, -0.004978f, -0.000009f}, + {+0.001925f, +0.054222f, +0.043071f, -0.002449f, -0.000110f}, + {-0.000927f, +0.060176f, -0.015580f, -0.001281f, -0.000042f}, + {+0.003471f, +0.011471f, +0.002826f, +0.001074f, -0.000026f}, + {+0.003706f, -0.001098f, -0.005680f, +0.008863f, +0.000084f}, + {-0.005326f, -0.000766f, -0.002007f, -0.003072f, +0.000014f}, + {+0.001747f, -0.039662f, +0.085770f, +0.000859f, +0.000050f}, + {-0.009494f, +0.084274f, -0.084910f, -0.005996f, -0.000078f} + }, + { + {+0.020549f, +0.471556f, -0.054545f, -0.003976f, +0.000002f}, + {+0.031621f, +0.813566f, +0.056755f, +0.007166f, +0.000006f}, + {-0.002271f, -0.021372f, -0.026223f, +0.003087f, +0.000136f}, + {+0.000511f, +0.035700f, -0.040529f, +0.002564f, +0.000048f}, + {-0.007142f, -0.001751f, -0.001329f, -0.002743f, +0.000028f}, + {-0.006527f, -0.051957f, -0.070578f, -0.014200f, -0.000113f}, + {+0.014135f, +0.025109f, +0.015403f, +0.005652f, -0.000015f}, + {-0.003291f, -0.069019f, +0.036066f, +0.001141f, -0.000069f}, + {+0.028061f, +0.152663f, -0.025603f, +0.008277f, +0.000102f} + }, + { + {-0.039663f, +0.412008f, +0.017452f, +0.000445f, +0.000002f}, + {-0.026960f, +0.962971f, +0.087407f, +0.001953f, +0.000014f}, + {-0.001486f, -0.002955f, -0.054042f, +0.000085f, +0.000075f}, + {+0.003107f, +0.048844f, -0.051503f, -0.002108f, +0.000034f}, + {+0.009864f, -0.005169f, -0.019159f, +0.003128f, +0.000025f}, + {+0.004987f, -0.054770f, -0.099413f, +0.003316f, -0.000044f}, + {-0.024855f, +0.021795f, +0.065786f, -0.002538f, -0.000013f}, + {+0.003623f, +0.018186f, -0.058320f, -0.005763f, -0.000022f}, + {-0.055010f, +0.126807f, +0.109029f, +0.001546f, +0.000045f} + }, + { + {+0.043174f, +0.455537f, -0.027678f, +0.002529f, -0.000002f}, + {-0.025122f, +0.922813f, +0.028063f, -0.008613f, -0.000006f}, + {+0.002020f, +0.051124f, -0.010761f, +0.000153f, -0.000146f}, + {-0.010597f, +0.081732f, -0.001493f, +0.001479f, -0.000051f}, + {-0.024810f, +0.014152f, +0.030508f, -0.002185f, -0.000029f}, + {-0.011648f, +0.040215f, +0.008697f, +0.003893f, +0.000125f}, + {+0.043616f, -0.007408f, -0.035355f, -0.000987f, +0.000015f}, + {-0.007698f, +0.031375f, -0.028885f, +0.004919f, +0.000076f}, + {+0.093586f, +0.162669f, -0.029770f, -0.007128f, -0.000112f} + }, + { + {-0.001041f, +0.494032f, +0.005715f, -0.001108f, -0.000002f}, + {+0.143821f, +0.682007f, -0.029450f, +0.003481f, -0.000019f}, + {+0.006306f, +0.070613f, -0.011179f, -0.001860f, -0.000038f}, + {+0.031146f, +0.059515f, -0.014381f, -0.000905f, -0.000027f}, + {+0.052905f, -0.051459f, -0.001250f, +0.000868f, -0.000023f}, + {+0.029241f, +0.030800f, +0.000944f, -0.000488f, -0.000000f}, + {-0.055716f, +0.063529f, +0.002159f, +0.000641f, +0.000013f}, + {+0.013468f, -0.008041f, -0.000774f, +0.000134f, -0.000007f}, + {-0.101473f, +0.336570f, +0.012535f, +0.003233f, -0.000009f} + }, + { + {-0.092816f, +0.358882f, +0.002536f, -0.001449f, +0.000001f}, + {-0.262828f, +0.127251f, -0.020151f, +0.004341f, +0.000009f}, + {-0.022963f, +0.059857f, +0.016901f, +0.000212f, +0.000141f}, + {-0.064426f, -0.041934f, +0.012804f, -0.000049f, +0.000052f}, + {-0.064139f, -0.206373f, +0.000508f, -0.000138f, +0.000031f}, + {-0.035857f, -0.035091f, +0.016850f, -0.002300f, -0.000120f}, + {+0.032908f, +0.170386f, -0.004178f, +0.001249f, -0.000015f}, + {-0.010158f, -0.037569f, +0.007236f, -0.002146f, -0.000070f}, + {+0.021780f, +0.486360f, -0.004267f, +0.000644f, +0.000106f} + }, + { + {+0.166528f, -0.018320f, +0.002944f, +0.001057f, +0.000002f}, + {+0.217141f, -0.537828f, +0.015478f, -0.003353f, +0.000022f}, + {+0.036889f, -0.008294f, -0.001367f, +0.001254f, +0.000008f}, + {+0.069514f, -0.229400f, +0.010249f, +0.000566f, +0.000020f}, + {+0.019714f, -0.330742f, +0.003692f, -0.000002f, +0.000022f}, + {+0.010625f, -0.080582f, -0.010145f, +0.000258f, +0.000041f}, + {+0.022526f, +0.170893f, +0.014154f, -0.001025f, -0.000013f}, + {-0.007441f, -0.048091f, +0.004112f, +0.000974f, +0.000032f}, + {+0.115639f, +0.344255f, +0.014295f, -0.000177f, -0.000021f} + }, + { + {-0.099909f, -0.399087f, -0.008044f, +0.000848f, -0.000001f}, + {+0.054243f, -0.757012f, +0.020850f, -0.002283f, -0.000013f}, + {-0.025209f, -0.091980f, -0.004347f, +0.000486f, -0.000127f}, + {+0.003575f, -0.340857f, -0.007962f, -0.000163f, -0.000051f}, + {+0.071769f, -0.265803f, -0.002595f, +0.000097f, -0.000034f}, + {+0.026489f, -0.035458f, +0.005585f, +0.001110f, +0.000100f}, + {-0.060623f, +0.023422f, -0.010689f, -0.000403f, +0.000015f}, + {+0.027371f, -0.008448f, -0.007673f, -0.000192f, +0.000053f}, + {-0.176311f, -0.087697f, -0.004740f, -0.000958f, -0.000089f} + }, + { + {-0.098192f, -0.380559f, -0.012062f, -0.000872f, -0.000003f}, + {-0.307522f, -0.201411f, -0.041908f, +0.002386f, -0.000023f}, + {-0.016794f, -0.090327f, -0.008151f, -0.001481f, +0.000012f}, + {-0.117497f, -0.178818f, -0.001213f, -0.000161f, -0.000015f}, + {-0.130667f, +0.017905f, -0.002862f, -0.000224f, -0.000021f}, + {-0.026816f, +0.061563f, -0.002730f, -0.000500f, -0.000070f}, + {+0.035111f, -0.133808f, +0.000916f, +0.000421f, +0.000014f}, + {-0.028071f, +0.069426f, -0.005372f, -0.000149f, -0.000048f}, + {+0.069362f, -0.446237f, -0.000098f, +0.000728f, +0.000041f} + }, + { + {+0.200424f, +0.084933f, +0.029127f, -0.000528f, +0.000002f}, + {+0.208158f, +0.589613f, +0.015424f, +0.001691f, +0.000018f}, + {+0.041516f, +0.016661f, +0.015205f, -0.000153f, +0.000109f}, + {+0.138467f, +0.186187f, +0.007440f, -0.000185f, +0.000051f}, + {+0.077086f, +0.303705f, -0.003329f, +0.000036f, +0.000037f}, + {-0.020310f, +0.080808f, +0.007043f, -0.000054f, -0.000070f}, + {+0.031948f, -0.141008f, -0.000818f, +0.000548f, -0.000016f}, + {+0.000366f, +0.119534f, +0.006275f, +0.000355f, -0.000032f}, + {+0.109021f, -0.372983f, +0.009320f, +0.000129f, +0.000067f} + }, + { + {-0.031292f, +0.437887f, -0.005797f, +0.000706f, +0.000004f}, + {+0.174454f, +0.640794f, +0.027817f, -0.001980f, +0.000023f}, + {+0.003185f, +0.089160f, -0.003572f, +0.001064f, -0.000021f}, + {-0.004179f, +0.383165f, +0.003748f, +0.000389f, +0.000011f}, + {+0.056596f, +0.310132f, +0.010567f, +0.000223f, +0.000018f}, + {+0.057823f, -0.028077f, +0.000893f, +0.000451f, +0.000085f}, + {-0.063559f, +0.001711f, -0.003009f, -0.000543f, -0.000016f}, + {+0.035766f, +0.073579f, +0.002518f, +0.000224f, +0.000053f}, + {-0.161175f, +0.042780f, -0.016398f, -0.000634f, -0.000050f} + }, + { + {-0.205155f, +0.167329f, -0.030119f, +0.000379f, -0.000002f}, + {-0.339082f, -0.153701f, -0.034923f, -0.001267f, -0.000022f}, + {-0.072520f, -0.022480f, -0.011077f, +0.000072f, -0.000094f}, + {-0.141121f, +0.163887f, -0.018765f, +0.000088f, -0.000051f}, + {-0.127275f, +0.020840f, -0.015322f, +0.000034f, -0.000041f}, + {-0.027665f, -0.152414f, -0.006975f, -0.000222f, +0.000038f}, + {+0.020531f, +0.124947f, +0.003832f, -0.000374f, +0.000019f}, + {-0.042138f, -0.039811f, -0.003937f, -0.000440f, +0.000012f}, + {+0.031495f, +0.327305f, +0.001379f, +0.000105f, -0.000048f} + }, + { + {+0.145847f, -0.370580f, +0.020419f, -0.000633f, -0.000004f}, + {+0.026755f, -0.715695f, -0.002721f, +0.001713f, -0.000021f}, + {+0.048263f, -0.214620f, +0.011454f, -0.000799f, +0.000024f}, + {+0.105105f, -0.209642f, +0.009809f, -0.000393f, -0.000007f}, + {+0.046673f, -0.240709f, +0.003039f, -0.000354f, -0.000014f}, + {-0.046604f, -0.126235f, -0.001254f, -0.000637f, -0.000087f}, + {+0.040919f, +0.089993f, +0.004646f, +0.000614f, +0.000016f}, + {+0.003849f, -0.106327f, -0.000606f, -0.000255f, -0.000050f}, + {+0.114169f, +0.187796f, +0.016720f, +0.000604f, +0.000050f} + }, + { + {+0.151563f, -0.357850f, +0.023901f, -0.000267f, +0.000003f}, + {+0.329416f, -0.240852f, +0.037687f, +0.000972f, +0.000025f}, + {+0.079637f, -0.178703f, +0.006277f, -0.000085f, +0.000084f}, + {+0.067743f, -0.255542f, +0.013928f, -0.000093f, +0.000052f}, + {+0.085616f, -0.171409f, +0.015038f, -0.000016f, +0.000044f}, + {+0.080584f, +0.060419f, +0.009795f, +0.000260f, -0.000011f}, + {-0.039270f, -0.029107f, -0.004384f, +0.000149f, -0.000022f}, + {+0.040700f, -0.048532f, +0.005694f, +0.000308f, +0.000003f}, + {-0.100428f, -0.143102f, -0.013507f, -0.000175f, +0.000032f} + }, + { + {-0.221520f, +0.217382f, -0.031802f, +0.000571f, +0.000004f}, + {-0.191369f, +0.563524f, -0.020930f, -0.001563f, +0.000018f}, + {-0.142768f, +0.156236f, -0.016728f, +0.000768f, -0.000025f}, + {-0.131233f, +0.058224f, -0.018961f, +0.000413f, +0.000003f}, + {-0.094869f, +0.113180f, -0.014106f, +0.000387f, +0.000009f}, + {-0.032009f, +0.229593f, -0.004382f, +0.000814f, +0.000078f}, + {-0.014026f, -0.058166f, -0.005170f, -0.000559f, -0.000016f}, + {-0.035069f, +0.066238f, -0.003175f, +0.000270f, +0.000041f}, + {-0.032944f, -0.241581f, -0.006363f, -0.000531f, -0.000047f} + }, + { + {-0.072792f, +0.444420f, -0.012987f, +0.000205f, -0.000004f}, + {-0.237324f, +0.482374f, -0.029199f, -0.000704f, -0.000027f}, + {+0.015060f, +0.403253f, +0.004767f, +0.000016f, -0.000078f}, + {-0.002750f, +0.257555f, -0.001283f, +0.000101f, -0.000052f}, + {-0.029761f, +0.216925f, -0.003727f, +0.000037f, -0.000045f}, + {-0.050908f, +0.208738f, -0.003838f, -0.000287f, -0.000007f}, + {+0.026158f, +0.010072f, +0.007655f, -0.000049f, +0.000026f}, + {-0.018378f, +0.087639f, -0.004770f, -0.000153f, -0.000011f}, + {+0.100406f, -0.034654f, +0.015514f, +0.000140f, -0.000022f} + }, + { + {+0.257437f, -0.065717f, +0.037575f, -0.000530f, -0.000004f}, + {+0.281553f, -0.324420f, +0.036967f, +0.001412f, -0.000017f}, + {+0.165202f, +0.184739f, +0.014027f, -0.000709f, +0.000026f}, + {+0.125102f, +0.059915f, +0.017871f, -0.000393f, +0.000001f}, + {+0.112292f, -0.000623f, +0.014750f, -0.000389f, -0.000004f}, + {+0.090463f, +0.007129f, +0.003581f, -0.000747f, -0.000067f}, + {+0.027231f, +0.007327f, +0.004513f, +0.000487f, +0.000014f}, + {+0.046307f, -0.017672f, +0.008365f, -0.000175f, -0.000032f}, + {-0.028415f, +0.161325f, -0.001715f, +0.000514f, +0.000043f} + }, + { + {-0.007526f, -0.473436f, +0.001022f, -0.000153f, +0.000005f}, + {+0.129889f, -0.550582f, +0.015713f, +0.000496f, +0.000029f}, + {-0.152654f, -0.291103f, -0.013185f, -0.000005f, +0.000074f}, + {-0.054068f, -0.217748f, -0.007018f, -0.000142f, +0.000051f}, + {-0.037999f, -0.233960f, -0.005179f, -0.000063f, +0.000045f}, + {-0.058157f, -0.208550f, -0.000279f, +0.000232f, +0.000018f}, + {-0.043982f, -0.108725f, -0.011637f, +0.000065f, -0.000029f}, + {+0.000177f, -0.092885f, -0.000896f, -0.000064f, +0.000013f}, + {-0.062887f, +0.105831f, -0.012283f, -0.000152f, +0.000016f} + }, + { + {-0.267052f, -0.072481f, -0.039143f, +0.000481f, +0.000004f}, + {-0.316645f, +0.147998f, -0.045958f, -0.001265f, +0.000015f}, + {-0.048560f, -0.443085f, -0.007515f, +0.000666f, -0.000028f}, + {-0.086419f, -0.172339f, -0.010499f, +0.000432f, -0.000005f}, + {-0.085408f, -0.166595f, -0.008605f, +0.000440f, +0.000000f}, + {-0.015618f, -0.269874f, -0.001215f, +0.000625f, +0.000057f}, + {-0.041006f, -0.120930f, -0.000588f, -0.000488f, -0.000012f}, + {-0.062603f, +0.004952f, -0.009992f, +0.000232f, +0.000027f}, + {+0.049095f, -0.068280f, +0.006362f, -0.000520f, -0.000040f} + }, + { + {+0.085562f, +0.471449f, +0.011009f, +0.000129f, -0.000005f}, + {-0.040209f, +0.573378f, -0.000615f, -0.000315f, -0.000031f}, + {+0.171918f, -0.105151f, +0.017403f, +0.000004f, -0.000072f}, + {+0.084128f, +0.083375f, +0.007231f, +0.000038f, -0.000051f}, + {+0.092144f, +0.099172f, +0.007312f, -0.000077f, -0.000045f}, + {+0.077363f, -0.132678f, +0.001733f, -0.000235f, -0.000023f}, + {+0.111219f, +0.109132f, +0.015848f, -0.000079f, +0.000032f}, + {+0.040923f, +0.172426f, +0.008798f, -0.000008f, -0.000013f}, + {+0.029588f, -0.098729f, +0.007764f, +0.000221f, -0.000011f} + }, + { + {+0.254737f, +0.211411f, +0.036795f, -0.000484f, -0.000003f}, + {+0.338234f, -0.015114f, +0.048846f, +0.001053f, -0.000013f}, + {-0.069108f, +0.254859f, -0.003290f, -0.000753f, +0.000029f}, + {+0.023788f, +0.170361f, +0.006488f, -0.000354f, +0.000008f}, + {+0.008393f, +0.222503f, +0.002681f, -0.000354f, +0.000003f}, + {-0.081171f, +0.098496f, -0.004558f, -0.000585f, -0.000051f}, + {-0.022336f, +0.317809f, -0.007308f, +0.000546f, +0.000009f}, + {+0.059371f, +0.155239f, +0.002593f, -0.000198f, -0.000025f}, + {-0.050719f, +0.026919f, -0.006976f, +0.000534f, +0.000037f} + }, + { + {-0.158995f, -0.424829f, -0.020702f, -0.000042f, +0.000006f}, + {-0.052902f, -0.616966f, -0.013055f, +0.000306f, +0.000032f}, + {-0.087152f, +0.213242f, -0.015296f, +0.000352f, +0.000070f}, + {-0.054260f, +0.047270f, -0.008042f, +0.000061f, +0.000051f}, + {-0.073970f, +0.094701f, -0.008512f, +0.000228f, +0.000046f}, + {+0.017462f, +0.238223f, +0.000790f, +0.000485f, +0.000029f}, + {-0.138534f, +0.148762f, -0.014349f, -0.000008f, -0.000034f}, + {-0.109919f, -0.097327f, -0.010882f, +0.000233f, +0.000014f}, + {-0.006806f, +0.096529f, -0.003657f, -0.000365f, +0.000007f} + }, + { + {-0.218541f, -0.332409f, -0.031504f, +0.000445f, +0.000003f}, + {-0.344919f, -0.163301f, -0.048934f, -0.001021f, +0.000012f}, + {+0.081260f, -0.052733f, +0.012413f, +0.000334f, -0.000031f}, + {+0.001753f, -0.039186f, -0.002593f, +0.000192f, -0.000011f}, + {+0.044437f, -0.083315f, +0.002185f, +0.000075f, -0.000005f}, + {+0.063695f, +0.165969f, +0.005598f, +0.000350f, +0.000048f}, + {+0.133966f, -0.261153f, +0.015377f, -0.000538f, -0.000006f}, + {+0.023795f, -0.302979f, +0.005384f, -0.000124f, +0.000025f}, + {+0.048328f, +0.008375f, +0.007723f, -0.000384f, -0.000035f} + }, + { + {+0.215234f, +0.334693f, +0.029335f, -0.000032f, -0.000006f}, + {+0.163645f, +0.620258f, +0.029442f, -0.000199f, -0.000034f}, + {+0.033793f, -0.124345f, +0.006813f, -0.000105f, -0.000071f}, + {+0.000974f, -0.040313f, +0.001531f, +0.000006f, -0.000052f}, + {+0.011132f, -0.127973f, +0.004627f, +0.000028f, -0.000047f}, + {-0.084325f, -0.052788f, -0.007351f, -0.000453f, -0.000037f}, + {+0.056743f, -0.375950f, +0.009997f, +0.000141f, +0.000035f}, + {+0.111528f, -0.176673f, +0.008510f, +0.000146f, -0.000018f}, + {-0.011877f, -0.092945f, -0.003074f, +0.000266f, -0.000004f} + }, + { + {+0.170586f, +0.400778f, +0.026157f, -0.000380f, -0.000003f}, + {+0.309161f, +0.398764f, +0.040718f, +0.000943f, -0.000011f}, + {-0.062016f, +0.029728f, -0.012911f, -0.000459f, +0.000035f}, + {+0.031810f, -0.090010f, +0.007426f, -0.000129f, +0.000014f}, + {-0.032063f, -0.056196f, -0.004324f, -0.000244f, +0.000009f}, + {+0.022806f, -0.208884f, -0.000856f, -0.000371f, -0.000043f}, + {-0.165081f, -0.039385f, -0.016746f, +0.000367f, +0.000003f}, + {-0.128190f, +0.183103f, -0.012188f, -0.000425f, -0.000025f}, + {-0.049731f, -0.043210f, -0.002580f, +0.000500f, +0.000034f} + }, + { + {-0.253118f, -0.253855f, -0.036031f, +0.000022f, +0.000008f}, + {-0.270280f, -0.483591f, -0.039528f, +0.000153f, +0.000036f}, + {-0.018783f, +0.101617f, -0.001693f, +0.000100f, +0.000073f}, + {+0.020506f, -0.111990f, -0.001982f, -0.000215f, +0.000054f}, + {+0.026438f, +0.035500f, +0.002626f, -0.000034f, +0.000050f}, + {+0.052495f, -0.162509f, +0.005782f, +0.000307f, +0.000047f}, + {+0.034503f, +0.254582f, -0.002428f, -0.000029f, -0.000037f}, + {-0.007059f, +0.365527f, +0.000861f, +0.000308f, +0.000024f}, + {+0.051840f, +0.110577f, +0.004579f, -0.000471f, +0.000002f} + }, + { + {-0.123354f, -0.454617f, -0.017101f, +0.000408f, +0.000003f}, + {-0.216188f, -0.557670f, -0.033272f, -0.000921f, +0.000010f}, + {+0.060077f, -0.016368f, +0.008130f, +0.000544f, -0.000041f}, + {-0.097698f, +0.063611f, -0.011314f, +0.000334f, -0.000020f}, + {-0.004155f, +0.082194f, -0.000724f, +0.000315f, -0.000015f}, + {-0.061885f, +0.007918f, -0.004267f, +0.000661f, +0.000034f}, + {+0.120251f, +0.108336f, +0.021527f, -0.000454f, +0.000001f}, + {+0.138249f, +0.145446f, +0.014907f, +0.000187f, +0.000021f}, + {+0.010129f, +0.174821f, +0.000225f, -0.000291f, -0.000033f} + }, + { + {+0.286163f, +0.175080f, +0.040522f, -0.000072f, -0.000009f}, + {+0.316113f, +0.262138f, +0.049307f, -0.000066f, -0.000038f}, + {-0.006202f, -0.116156f, -0.000344f, -0.000116f, -0.000074f}, + {+0.026045f, +0.250354f, +0.005697f, +0.000168f, -0.000055f}, + {-0.033061f, +0.037487f, -0.003086f, +0.000057f, -0.000051f}, + {+0.009161f, +0.111428f, -0.002750f, -0.000407f, -0.000055f}, + {-0.050197f, -0.166126f, -0.010372f, +0.000135f, +0.000039f}, + {-0.108124f, -0.227657f, -0.011340f, -0.000057f, -0.000029f}, + {-0.062623f, +0.065189f, -0.003295f, +0.000387f, +0.000001f} + }, + { + {+0.066678f, +0.512159f, +0.009358f, -0.000375f, -0.000002f}, + {+0.128892f, +0.546911f, +0.020182f, +0.000837f, -0.000009f}, + {-0.041244f, -0.065432f, -0.004659f, -0.000466f, +0.000049f}, + {+0.124448f, +0.097696f, +0.018095f, -0.000283f, +0.000027f}, + {+0.039700f, -0.075487f, +0.006824f, -0.000303f, +0.000022f}, + {+0.033671f, +0.064807f, +0.008036f, -0.000540f, -0.000022f}, + {-0.115666f, -0.069551f, -0.016489f, +0.000343f, -0.000004f}, + {-0.044678f, -0.318287f, -0.008724f, -0.000374f, -0.000016f}, + {+0.045915f, -0.096744f, +0.005450f, +0.000336f, +0.000032f} + }, + { + {-0.306654f, -0.062299f, -0.043370f, +0.000070f, +0.000010f}, + {-0.327815f, -0.157084f, -0.053522f, +0.000024f, +0.000042f}, + {+0.020545f, +0.022620f, -0.000196f, -0.000030f, +0.000072f}, + {-0.093582f, -0.234733f, -0.010882f, -0.000285f, +0.000055f}, + {+0.018657f, -0.107686f, +0.002873f, -0.000136f, +0.000051f}, + {-0.022629f, -0.029525f, -0.002254f, +0.000156f, +0.000058f}, + {+0.080228f, +0.235900f, +0.013683f, -0.000069f, -0.000040f}, + {+0.131827f, -0.044535f, +0.015502f, +0.000103f, +0.000031f}, + {+0.019414f, -0.130958f, +0.003490f, -0.000488f, -0.000004f} + }, + { + {-0.003446f, -0.527577f, -0.000418f, +0.000351f, +0.000001f}, + {-0.063671f, -0.564794f, -0.009104f, -0.000762f, +0.000008f}, + {+0.005424f, +0.040112f, +0.004744f, +0.000443f, -0.000057f}, + {-0.104226f, -0.211764f, -0.016606f, +0.000287f, -0.000034f}, + {-0.067397f, +0.027841f, -0.010395f, +0.000286f, -0.000029f}, + {-0.014235f, -0.044128f, -0.001136f, +0.000560f, +0.000010f}, + {+0.112939f, +0.189986f, +0.013999f, -0.000350f, +0.000008f}, + {-0.051770f, +0.234766f, -0.004628f, +0.000261f, +0.000010f}, + {-0.057159f, -0.008653f, -0.009510f, -0.000310f, -0.000032f} + }, + { + {+0.309125f, -0.046398f, +0.043868f, -0.000070f, -0.000010f}, + {+0.337900f, +0.049301f, +0.053004f, +0.000032f, -0.000046f}, + {+0.006452f, +0.038403f, -0.000549f, +0.000028f, -0.000068f}, + {+0.142396f, +0.170693f, +0.019921f, +0.000322f, -0.000053f}, + {+0.012544f, +0.153200f, +0.002399f, +0.000157f, -0.000049f}, + {+0.026935f, +0.020769f, +0.002517f, -0.000142f, -0.000057f}, + {-0.135188f, -0.190554f, -0.017975f, +0.000073f, +0.000042f}, + {-0.083199f, +0.182605f, -0.012518f, -0.000033f, -0.000031f}, + {+0.022452f, +0.113080f, +0.002881f, +0.000561f, +0.000007f} + }, + { + {-0.056550f, +0.514353f, -0.008128f, -0.000326f, +0.000000f}, + {-0.002761f, +0.570850f, +0.000438f, +0.000698f, -0.000005f}, + {-0.005763f, +0.055193f, -0.003144f, -0.000303f, +0.000064f}, + {+0.066858f, +0.287146f, +0.008674f, -0.000271f, +0.000039f}, + {+0.079593f, +0.051699f, +0.009265f, -0.000243f, +0.000035f}, + {-0.004491f, +0.069814f, -0.001757f, -0.000412f, -0.000001f}, + {-0.070466f, -0.289680f, -0.008846f, +0.000325f, -0.000013f}, + {+0.096678f, -0.094366f, +0.010661f, -0.000155f, -0.000007f}, + {+0.041572f, +0.082696f, +0.006577f, +0.000266f, +0.000031f} + }, + { + {-0.298262f, +0.141215f, -0.042908f, +0.000091f, +0.000010f}, + {-0.335616f, +0.061120f, -0.052587f, -0.000136f, +0.000050f}, + {-0.028168f, +0.019948f, -0.003001f, +0.000044f, +0.000065f}, + {-0.179347f, -0.090626f, -0.024448f, -0.000251f, +0.000051f}, + {-0.055697f, -0.153136f, -0.006127f, -0.000099f, +0.000047f}, + {-0.022758f, +0.040841f, -0.001974f, +0.000245f, +0.000056f}, + {+0.171241f, +0.083402f, +0.023385f, -0.000076f, -0.000043f}, + {+0.018087f, -0.211528f, +0.004820f, +0.000028f, +0.000030f}, + {-0.051883f, -0.059963f, -0.007202f, -0.000532f, -0.000011f} + }, + { + {+0.109668f, -0.485328f, +0.016423f, +0.000299f, -0.000001f}, + {+0.064276f, -0.551492f, +0.008554f, -0.000611f, +0.000002f}, + {+0.027762f, -0.066226f, +0.006657f, +0.000180f, -0.000068f}, + {-0.008606f, -0.352413f, -0.000966f, +0.000207f, -0.000045f}, + {-0.061405f, -0.140795f, -0.008634f, +0.000186f, -0.000040f}, + {+0.022602f, -0.028596f, +0.003958f, +0.000252f, -0.000003f}, + {+0.006333f, +0.339254f, -0.001045f, -0.000313f, +0.000017f}, + {-0.095236f, -0.035271f, -0.011532f, +0.000098f, +0.000006f}, + {-0.006892f, -0.129936f, -0.001855f, -0.000288f, -0.000028f} + }, + { + {+0.280162f, -0.222327f, +0.040172f, -0.000132f, -0.000011f}, + {+0.325666f, -0.150573f, +0.051593f, +0.000209f, -0.000054f}, + {+0.028869f, -0.065199f, +0.002958f, -0.000146f, -0.000066f}, + {+0.187456f, -0.052621f, +0.025102f, +0.000202f, -0.000052f}, + {+0.080571f, +0.077938f, +0.010648f, +0.000040f, -0.000047f}, + {+0.004481f, -0.054774f, +0.000402f, -0.000382f, -0.000060f}, + {-0.176395f, +0.061006f, -0.022445f, +0.000083f, +0.000045f}, + {+0.032007f, +0.158843f, +0.002664f, -0.000125f, -0.000033f}, + {+0.057225f, -0.034866f, +0.006728f, +0.000520f, +0.000013f} + }, + { + {-0.158921f, +0.451848f, -0.023918f, -0.000281f, +0.000001f}, + {-0.121553f, +0.536831f, -0.017942f, +0.000578f, +0.000001f}, + {-0.050855f, +0.055529f, -0.008445f, -0.000215f, +0.000075f}, + {-0.052686f, +0.312195f, -0.005219f, -0.000224f, +0.000052f}, + {+0.037110f, +0.141320f, +0.006102f, -0.000195f, +0.000048f}, + {-0.024782f, -0.009783f, -0.004483f, -0.000288f, +0.000009f}, + {+0.063910f, -0.304697f, +0.007623f, +0.000328f, -0.000023f}, + {+0.068609f, +0.100384f, +0.009341f, -0.000091f, -0.000007f}, + {-0.033166f, +0.101342f, -0.001173f, +0.000251f, +0.000026f} + }, + { + {-0.254134f, +0.305063f, -0.036122f, +0.000175f, +0.000012f}, + {-0.313748f, +0.244268f, -0.048706f, -0.000275f, +0.000058f}, + {-0.012267f, +0.112660f, -0.001928f, +0.000238f, +0.000072f}, + {-0.161165f, +0.140763f, -0.024820f, -0.000200f, +0.000054f}, + {-0.090126f, -0.058592f, -0.014503f, -0.000035f, +0.000049f}, + {+0.010917f, +0.042825f, +0.001085f, +0.000524f, +0.000070f}, + {+0.139731f, -0.183781f, +0.020533f, -0.000104f, -0.000047f}, + {-0.056473f, -0.093013f, -0.007395f, +0.000190f, +0.000040f}, + {-0.028362f, +0.108300f, -0.004536f, -0.000507f, -0.000014f} + }, + { + {+0.204108f, -0.397468f, +0.030234f, +0.000284f, -0.000002f}, + {+0.186187f, -0.523327f, +0.027065f, -0.000548f, -0.000002f}, + {+0.063644f, -0.004588f, +0.010914f, +0.000342f, -0.000092f}, + {+0.084172f, -0.238464f, +0.012067f, +0.000307f, -0.000066f}, + {-0.023241f, -0.163547f, -0.001737f, +0.000268f, -0.000061f}, + {+0.017633f, +0.031273f, +0.004558f, +0.000453f, -0.000024f}, + {-0.103701f, +0.192462f, -0.015036f, -0.000326f, +0.000032f}, + {-0.040508f, -0.117502f, -0.005435f, +0.000218f, +0.000003f}, + {+0.044739f, -0.003358f, +0.002673f, -0.000166f, -0.000026f} + }, + { + {+0.217925f, -0.374764f, +0.031310f, -0.000194f, -0.000015f}, + {+0.287194f, -0.371793f, +0.043606f, +0.000298f, -0.000065f}, + {-0.012378f, -0.121133f, -0.001692f, -0.000139f, -0.000076f}, + {+0.138854f, -0.153518f, +0.021173f, +0.000296f, -0.000054f}, + {+0.110078f, +0.041091f, +0.015691f, +0.000117f, -0.000048f}, + {-0.016824f, -0.020994f, -0.002433f, -0.000470f, -0.000080f}, + {-0.093179f, +0.207425f, -0.014155f, +0.000078f, +0.000048f}, + {+0.066586f, +0.047692f, +0.008958f, -0.000170f, -0.000050f}, + {-0.006034f, -0.079321f, +0.001680f, +0.000546f, +0.000014f} + }, + { + {-0.239100f, +0.326388f, -0.035676f, -0.000310f, +0.000005f}, + {-0.254019f, +0.457019f, -0.035395f, +0.000472f, +0.000004f}, + {-0.063172f, -0.043743f, -0.010677f, -0.000446f, +0.000122f}, + {-0.106250f, +0.224976f, -0.016160f, -0.000331f, +0.000087f}, + {-0.006588f, +0.220018f, -0.002089f, -0.000280f, +0.000081f}, + {-0.012847f, -0.026665f, -0.004159f, -0.000613f, +0.000053f}, + {+0.116434f, -0.116659f, +0.017836f, +0.000308f, -0.000043f}, + {+0.014851f, +0.127471f, +0.001839f, -0.000426f, +0.000008f}, + {-0.024363f, -0.047415f, -0.002156f, +0.000076f, +0.000029f} + }, + { + {-0.177651f, +0.419626f, -0.025372f, +0.000189f, +0.000018f}, + {-0.234856f, +0.487730f, -0.036693f, -0.000275f, +0.000076f}, + {+0.036507f, +0.108100f, +0.004077f, -0.000196f, +0.000068f}, + {-0.123472f, +0.198845f, -0.018454f, -0.000539f, +0.000045f}, + {-0.120851f, +0.044023f, -0.017124f, -0.000326f, +0.000038f}, + {+0.019744f, +0.023127f, +0.003003f, +0.000144f, +0.000080f}, + {+0.054985f, -0.211321f, +0.008525f, +0.000002f, -0.000046f}, + {-0.067840f, +0.000644f, -0.008680f, +0.000062f, +0.000059f}, + {+0.013438f, +0.012637f, +0.000624f, -0.000676f, -0.000018f} + }, + { + {+0.265046f, -0.258984f, +0.039613f, +0.000315f, -0.000010f}, + {+0.305263f, -0.341002f, +0.042929f, -0.000320f, -0.000009f}, + {+0.052493f, +0.082191f, +0.010230f, +0.000306f, -0.000162f}, + {+0.135578f, -0.200816f, +0.020288f, +0.000195f, -0.000112f}, + {+0.047909f, -0.214878f, +0.007490f, +0.000138f, -0.000104f}, + {+0.013632f, +0.032324f, +0.004221f, +0.000548f, -0.000093f}, + {-0.118924f, +0.057091f, -0.018445f, -0.000261f, +0.000056f}, + {+0.008331f, -0.114878f, +0.000663f, +0.000507f, -0.000028f}, + {+0.005413f, +0.022808f, -0.000439f, -0.000059f, -0.000035f} + }, + { + {+0.136435f, -0.454829f, +0.019582f, -0.000149f, -0.000018f}, + {+0.168461f, -0.553033f, +0.027068f, +0.000281f, -0.000094f}, + {-0.056383f, -0.088168f, -0.008472f, +0.000590f, -0.000037f}, + {+0.096992f, -0.262712f, +0.013318f, +0.000816f, -0.000021f}, + {+0.110234f, -0.118824f, +0.015813f, +0.000528f, -0.000014f}, + {-0.029948f, -0.036351f, -0.005263f, +0.000282f, -0.000056f}, + {-0.020326f, +0.210405f, -0.002631f, -0.000079f, +0.000039f}, + {+0.060030f, -0.032820f, +0.009213f, +0.000193f, -0.000059f}, + {-0.003943f, +0.005977f, -0.000375f, +0.000898f, +0.000028f} + }, + { + {-0.284355f, +0.190433f, -0.042800f, -0.000266f, +0.000017f}, + {-0.335277f, +0.219226f, -0.046865f, +0.000105f, +0.000022f}, + {-0.036478f, -0.124061f, -0.005694f, +0.000344f, +0.000198f}, + {-0.163243f, +0.134561f, -0.022257f, +0.000183f, +0.000132f}, + {-0.083868f, +0.178051f, -0.011964f, +0.000280f, +0.000122f}, + {-0.010723f, -0.070555f, -0.001815f, +0.000022f, +0.000132f}, + {+0.111861f, +0.009495f, +0.016549f, +0.000135f, -0.000069f}, + {-0.022143f, +0.095016f, -0.003757f, -0.000379f, +0.000052f}, + {-0.000565f, +0.002446f, +0.001442f, +0.000102f, +0.000039f} + }, + { + {-0.095291f, +0.479278f, -0.013467f, +0.000098f, +0.000016f}, + {-0.099306f, +0.582261f, -0.017486f, -0.000468f, +0.000116f}, + {+0.078355f, +0.049439f, +0.008412f, -0.000772f, -0.000023f}, + {-0.051414f, +0.305039f, -0.008849f, -0.000882f, -0.000019f}, + {-0.082995f, +0.177822f, -0.013237f, -0.000567f, -0.000026f}, + {+0.049222f, +0.017872f, +0.004795f, -0.000539f, +0.000005f}, + {-0.011696f, -0.179076f, -0.000545f, +0.000092f, -0.000026f}, + {-0.054786f, +0.044185f, -0.008075f, -0.000456f, +0.000046f}, + {-0.005431f, -0.002236f, -0.000119f, -0.000987f, -0.000046f} + }, + { + {+0.300035f, -0.126686f, +0.045279f, +0.000141f, -0.000023f}, + {+0.347527f, -0.104803f, +0.049661f, +0.000162f, -0.000050f}, + {+0.000140f, +0.170954f, +0.002869f, -0.001398f, -0.000210f}, + {+0.165631f, -0.028348f, +0.023643f, -0.000777f, -0.000136f}, + {+0.103480f, -0.108513f, +0.015479f, -0.000834f, -0.000124f}, + {-0.013480f, +0.114650f, +0.000763f, -0.001025f, -0.000149f}, + {-0.089040f, -0.060481f, -0.014574f, +0.000082f, +0.000079f}, + {+0.036486f, -0.097396f, +0.006421f, +0.000002f, -0.000073f}, + {+0.003333f, -0.016091f, -0.002020f, -0.000329f, -0.000034f} + }, + { + {+0.051566f, -0.506796f, +0.007039f, -0.000099f, -0.000010f}, + {+0.033731f, -0.589122f, +0.007210f, +0.000795f, -0.000134f}, + {-0.079279f, +0.049325f, -0.008393f, +0.000023f, +0.000100f}, + {+0.010994f, -0.265800f, +0.003418f, +0.000397f, +0.000069f}, + {+0.052364f, -0.186418f, +0.009164f, +0.000026f, +0.000073f}, + {-0.052053f, +0.056265f, -0.005015f, -0.000066f, +0.000065f}, + {+0.026200f, +0.116741f, +0.002983f, +0.000008f, +0.000008f}, + {+0.048119f, -0.079713f, +0.006644f, +0.000374f, -0.000021f}, + {+0.010900f, -0.005754f, +0.000987f, +0.000869f, +0.000068f} + }, + { + {-0.311437f, +0.048951f, -0.046976f, +0.000118f, +0.000027f}, + {-0.349598f, -0.000051f, -0.050374f, -0.000038f, +0.000095f}, + {+0.040613f, -0.137831f, -0.000066f, +0.002700f, +0.000181f}, + {-0.149052f, -0.019968f, -0.023093f, +0.001262f, +0.000115f}, + {-0.107473f, +0.058841f, -0.017699f, +0.001256f, +0.000101f}, + {+0.043140f, -0.091871f, +0.000478f, +0.002412f, +0.000129f}, + {+0.064483f, +0.059569f, +0.011301f, -0.000210f, -0.000082f}, + {-0.054255f, +0.077805f, -0.009915f, +0.000915f, +0.000081f}, + {-0.008263f, +0.025078f, +0.001271f, +0.000578f, +0.000014f} + }, + { + {-0.002478f, +0.521278f, -0.000544f, +0.000189f, +0.000002f}, + {+0.031629f, +0.587979f, +0.001886f, -0.001424f, +0.000137f}, + {+0.053320f, -0.118505f, +0.004875f, +0.003174f, -0.000173f}, + {+0.008995f, +0.224389f, +0.001153f, +0.001756f, -0.000113f}, + {-0.029482f, +0.180110f, -0.004281f, +0.002087f, -0.000115f}, + {+0.033134f, -0.107741f, +0.001943f, +0.002753f, -0.000132f}, + {-0.023463f, -0.074570f, -0.002999f, -0.000562f, +0.000011f}, + {-0.031477f, +0.111590f, -0.005933f, +0.000350f, -0.000010f}, + {-0.015016f, +0.015277f, -0.001484f, -0.000128f, -0.000086f} + } +}; + +const float leftHRIRImag_HOA2[BINAURAL_CONVBANDS][9][BINAURAL_NTAPS]= +{ + { + {-0.036807f, -0.174045f, +0.179146f, +0.002758f, +0.000002f}, + {-0.081675f, +0.202936f, -0.124120f, -0.000184f, +0.000007f}, + {-0.000843f, -0.038970f, +0.052716f, -0.008143f, +0.000125f}, + {-0.004478f, -0.013122f, +0.028558f, -0.008290f, +0.000045f}, + {-0.006316f, +0.012132f, -0.006515f, +0.002119f, +0.000027f}, + {+0.000794f, -0.004296f, -0.005127f, +0.004942f, -0.000100f}, + {+0.010293f, -0.025048f, +0.008939f, -0.001610f, -0.000015f}, + {-0.001111f, -0.008117f, +0.033872f, -0.002789f, -0.000061f}, + {+0.009292f, -0.031334f, +0.001941f, -0.005137f, +0.000092f} + }, + { + {+0.046648f, -0.328217f, -0.004769f, -0.004729f, +0.000002f}, + {+0.078219f, +0.186706f, -0.335495f, +0.010505f, +0.000011f}, + {+0.003389f, -0.028871f, +0.074809f, -0.001736f, +0.000093f}, + {+0.011160f, -0.006841f, +0.031676f, +0.003121f, +0.000038f}, + {+0.007422f, +0.043414f, -0.006982f, -0.001963f, +0.000025f}, + {+0.003254f, +0.003751f, -0.013792f, +0.005415f, -0.000065f}, + {-0.015187f, -0.099887f, -0.012484f, -0.000245f, -0.000014f}, + {-0.000628f, +0.067594f, +0.116266f, +0.000062f, -0.000037f}, + {-0.017876f, -0.212825f, -0.109502f, -0.000434f, +0.000062f} + }, + { + {-0.062391f, -0.298587f, +0.055506f, +0.004604f, -0.000002f}, + {-0.110139f, -0.008656f, +0.076872f, -0.013912f, -0.000006f}, + {-0.006661f, +0.041459f, +0.008680f, +0.005198f, -0.000143f}, + {-0.017346f, +0.064502f, -0.000311f, +0.000229f, -0.000050f}, + {-0.012574f, +0.112476f, -0.042863f, +0.000548f, -0.000028f}, + {-0.008554f, +0.117685f, -0.085746f, -0.010222f, +0.000121f}, + {+0.018386f, -0.231260f, +0.055470f, +0.002605f, +0.000015f}, + {-0.000043f, +0.098076f, +0.074022f, +0.004739f, +0.000074f}, + {+0.020228f, -0.438516f, +0.026318f, +0.002404f, -0.000109f} + }, + { + {+0.087093f, -0.185047f, -0.039795f, -0.001148f, -0.000002f}, + {+0.179442f, +0.138305f, -0.024941f, +0.004193f, -0.000016f}, + {+0.010153f, +0.053373f, -0.028050f, +0.000631f, -0.000056f}, + {+0.022351f, +0.115243f, -0.015706f, +0.000824f, -0.000030f}, + {+0.016881f, +0.188764f, -0.015179f, +0.001478f, -0.000024f}, + {+0.011436f, +0.169671f, -0.055918f, +0.006134f, +0.000022f}, + {-0.007516f, -0.296099f, +0.030173f, -0.003476f, +0.000013f}, + {+0.001835f, +0.047910f, -0.004611f, -0.005834f, +0.000008f}, + {+0.012183f, -0.522145f, -0.012957f, -0.000556f, -0.000026f} + }, + { + {-0.118429f, +0.036347f, +0.008994f, -0.001813f, +0.000002f}, + {-0.195669f, +0.557237f, +0.044782f, +0.005092f, +0.000007f}, + {-0.015263f, +0.077237f, -0.016810f, -0.004030f, +0.000145f}, + {-0.025184f, +0.187315f, -0.016739f, -0.002009f, +0.000052f}, + {-0.002368f, +0.225780f, -0.012360f, -0.001921f, +0.000030f}, + {-0.004974f, +0.160969f, -0.009969f, -0.002830f, -0.000125f}, + {-0.023306f, -0.243341f, -0.007075f, +0.002049f, -0.000015f}, + {+0.002539f, +0.043064f, -0.021665f, +0.000872f, -0.000074f}, + {-0.088704f, -0.392340f, -0.007003f, +0.000682f, +0.000110f} + }, + { + {+0.111405f, +0.324593f, -0.000106f, +0.001284f, +0.000002f}, + {+0.051589f, +0.868735f, -0.017996f, -0.003263f, +0.000021f}, + {+0.016644f, +0.116184f, -0.001320f, +0.001603f, +0.000021f}, + {+0.004222f, +0.242602f, +0.004139f, +0.000694f, +0.000023f}, + {-0.043767f, +0.191695f, +0.013679f, +0.000447f, +0.000023f}, + {-0.015164f, +0.134423f, +0.000808f, +0.001816f, +0.000022f}, + {+0.056350f, -0.114712f, -0.004403f, +0.000262f, -0.000013f}, + {-0.013985f, +0.017892f, -0.014819f, +0.002850f, +0.000020f}, + {+0.155162f, -0.041775f, -0.009744f, -0.001067f, -0.000007f} + }, + { + {-0.005031f, +0.479299f, +0.003719f, +0.000668f, -0.000001f}, + {+0.200078f, +0.617927f, +0.007665f, -0.002820f, -0.000011f}, + {-0.000023f, +0.128657f, +0.013087f, +0.000664f, -0.000135f}, + {+0.058851f, +0.171528f, +0.001838f, +0.000874f, -0.000052f}, + {+0.096474f, +0.013567f, +0.000492f, +0.000745f, -0.000033f}, + {+0.033027f, +0.054815f, +0.011873f, +0.000718f, +0.000112f}, + {-0.056173f, +0.039930f, +0.001299f, -0.001259f, +0.000015f}, + {+0.020372f, -0.043296f, +0.005705f, -0.001029f, +0.000062f}, + {-0.120615f, +0.346286f, -0.013057f, -0.000997f, -0.000098f} + }, + { + {-0.150793f, +0.255763f, -0.018096f, -0.000700f, -0.000003f}, + {-0.305707f, -0.158732f, -0.020717f, +0.002646f, -0.000023f}, + {-0.031522f, +0.078751f, +0.001465f, -0.000649f, +0.000004f}, + {-0.117107f, -0.077176f, -0.004724f, -0.000677f, -0.000018f}, + {-0.093448f, -0.250387f, -0.003900f, -0.000293f, -0.000021f}, + {-0.019351f, -0.028793f, -0.005286f, -0.001746f, -0.000057f}, + {+0.008202f, +0.128064f, +0.008788f, +0.000321f, +0.000014f}, + {-0.007910f, -0.090056f, -0.001122f, -0.000874f, -0.000041f}, + {-0.028598f, +0.475838f, +0.000814f, +0.001596f, +0.000033f} + }, + { + {+0.168446f, -0.229619f, +0.014684f, -0.000669f, +0.000001f}, + {+0.083028f, -0.735157f, +0.014942f, +0.001813f, +0.000016f}, + {+0.038009f, -0.019540f, -0.002379f, +0.000167f, +0.000118f}, + {+0.076227f, -0.357687f, +0.003886f, -0.000171f, +0.000051f}, + {+0.001844f, -0.389834f, +0.002086f, -0.000484f, +0.000036f}, + {-0.023047f, -0.027798f, -0.004234f, -0.000497f, -0.000086f}, + {+0.049557f, +0.071524f, +0.006302f, +0.000906f, -0.000015f}, + {-0.020459f, -0.071010f, -0.006011f, -0.000277f, -0.000043f}, + {+0.164709f, +0.192774f, +0.015494f, +0.000611f, +0.000078f} + }, + { + {+0.032104f, -0.431950f, +0.008160f, +0.000726f, +0.000004f}, + {+0.260971f, -0.444113f, +0.025794f, -0.002256f, +0.000023f}, + {+0.008385f, -0.056100f, +0.003103f, +0.000095f, -0.000018f}, + {+0.067113f, -0.367438f, +0.006254f, +0.000198f, +0.000013f}, + {+0.110994f, -0.232179f, +0.008226f, +0.000230f, +0.000019f}, + {+0.042146f, +0.074633f, +0.011186f, +0.001034f, +0.000080f}, + {-0.054919f, -0.080526f, -0.007215f, -0.000649f, -0.000015f}, + {+0.040307f, +0.016321f, -0.001764f, +0.000829f, +0.000052f}, + {-0.137526f, -0.246324f, -0.007988f, -0.001200f, -0.000047f} + }, + { + {-0.213011f, -0.046980f, -0.025382f, +0.000494f, -0.000002f}, + {-0.288608f, +0.395114f, -0.041290f, -0.001283f, -0.000020f}, + {-0.054132f, +0.049386f, -0.007328f, -0.000057f, -0.000101f}, + {-0.158872f, -0.025219f, -0.014949f, +0.000114f, -0.000051f}, + {-0.121403f, +0.113923f, -0.010204f, +0.000233f, -0.000039f}, + {-0.000083f, +0.147208f, +0.001729f, +0.000936f, +0.000054f}, + {-0.003048f, -0.154788f, -0.006001f, -0.000457f, +0.000017f}, + {-0.025771f, +0.106681f, +0.002198f, +0.000260f, +0.000022f}, + {-0.031294f, -0.392095f, -0.012018f, -0.000574f, -0.000057f} + }, + { + {+0.092561f, +0.424974f, +0.010810f, -0.000681f, -0.000004f}, + {-0.075902f, +0.706014f, -0.007828f, +0.002003f, -0.000022f}, + {+0.013154f, +0.161409f, +0.005603f, -0.000211f, +0.000023f}, + {+0.066254f, +0.312283f, +0.004744f, +0.000026f, -0.000009f}, + {+0.002036f, +0.295824f, -0.002824f, +0.000014f, -0.000016f}, + {-0.060712f, +0.057606f, -0.008012f, -0.000958f, -0.000087f}, + {+0.056082f, -0.061636f, +0.008052f, +0.000524f, +0.000016f}, + {-0.017683f, +0.111805f, -0.002642f, -0.000403f, -0.000052f}, + {+0.146777f, -0.113700f, +0.017959f, +0.001010f, +0.000051f} + }, + { + {+0.185320f, +0.277358f, +0.022712f, -0.000351f, +0.000003f}, + {+0.344646f, +0.053912f, +0.053141f, +0.000939f, +0.000024f}, + {+0.086838f, +0.051841f, +0.006637f, +0.000180f, +0.000089f}, + {+0.105953f, +0.243944f, +0.014187f, -0.000146f, +0.000052f}, + {+0.111669f, +0.123210f, +0.013173f, -0.000233f, +0.000042f}, + {+0.059758f, -0.131270f, +0.005702f, -0.000643f, -0.000024f}, + {-0.036902f, +0.080134f, -0.000673f, +0.000325f, -0.000020f}, + {+0.046052f, +0.010828f, +0.004846f, -0.000246f, -0.000004f}, + {-0.077354f, +0.231910f, -0.006126f, +0.000362f, +0.000039f} + }, + { + {-0.189874f, -0.302002f, -0.024437f, +0.000614f, +0.000004f}, + {-0.115695f, -0.648554f, -0.017187f, -0.001787f, +0.000020f}, + {-0.095557f, -0.230274f, -0.014609f, +0.000114f, -0.000025f}, + {-0.124579f, -0.115101f, -0.017138f, -0.000088f, +0.000005f}, + {-0.076830f, -0.166427f, -0.008366f, -0.000057f, +0.000012f}, + {+0.014099f, -0.211406f, -0.003003f, +0.000568f, +0.000083f}, + {-0.023815f, +0.096932f, -0.005676f, -0.000440f, -0.000016f}, + {-0.021782f, -0.093860f, -0.002871f, +0.000144f, +0.000046f}, + {-0.073734f, +0.238033f, -0.010094f, -0.000798f, -0.000049f} + }, + { + {-0.114426f, -0.412169f, -0.014852f, +0.000236f, -0.000004f}, + {-0.286060f, -0.383093f, -0.046192f, -0.000709f, -0.000026f}, + {-0.046449f, -0.312275f, +0.001217f, -0.000173f, -0.000081f}, + {-0.033813f, -0.256375f, -0.003843f, +0.000097f, -0.000052f}, + {-0.058368f, -0.191934f, -0.007694f, +0.000156f, -0.000044f}, + {-0.082552f, -0.075789f, -0.001514f, +0.000419f, +0.000001f}, + {+0.034473f, +0.003962f, +0.003250f, -0.000222f, +0.000024f}, + {-0.030695f, -0.079541f, -0.002956f, +0.000205f, -0.000008f}, + {+0.109333f, -0.044153f, +0.010252f, -0.000221f, -0.000027f} + }, + { + {+0.243812f, +0.144409f, +0.034010f, -0.000542f, -0.000004f}, + {+0.244934f, +0.430481f, +0.034506f, +0.001609f, -0.000017f}, + {+0.170812f, +0.012823f, +0.017960f, -0.000055f, +0.000026f}, + {+0.131633f, -0.001407f, +0.017629f, +0.000130f, -0.000001f}, + {+0.106876f, +0.065820f, +0.014688f, +0.000058f, -0.000007f}, + {+0.074279f, +0.153828f, +0.004932f, -0.000344f, -0.000072f}, + {+0.015569f, -0.022714f, +0.005207f, +0.000342f, +0.000015f}, + {+0.042274f, +0.032502f, +0.005140f, -0.000141f, -0.000036f}, + {-0.002837f, -0.214678f, +0.001786f, +0.000703f, +0.000045f} + }, + { + {+0.033445f, +0.465385f, +0.003356f, -0.000154f, +0.000005f}, + {+0.178742f, +0.528051f, +0.033152f, +0.000550f, +0.000028f}, + {-0.087971f, +0.405281f, -0.012908f, +0.000193f, +0.000076f}, + {-0.026721f, +0.243121f, -0.004203f, -0.000014f, +0.000052f}, + {-0.002076f, +0.236562f, -0.002162f, -0.000025f, +0.000045f}, + {-0.002032f, +0.267039f, -0.003164f, -0.000247f, +0.000013f}, + {-0.028517f, +0.053584f, -0.006240f, +0.000168f, -0.000027f}, + {+0.008947f, +0.081105f, +0.001162f, -0.000039f, +0.000013f}, + {-0.084445f, -0.084241f, -0.009779f, +0.000091f, +0.000019f} + }, + { + {-0.265151f, +0.001033f, -0.038066f, +0.000492f, +0.000004f}, + {-0.302075f, -0.213979f, -0.045228f, -0.001475f, +0.000016f}, + {-0.119858f, +0.361574f, -0.010750f, +0.000044f, -0.000027f}, + {-0.110652f, +0.115838f, -0.014030f, -0.000216f, -0.000003f}, + {-0.106693f, +0.078792f, -0.012412f, -0.000130f, +0.000002f}, + {-0.068216f, +0.174315f, -0.001858f, +0.000344f, +0.000061f}, + {-0.039397f, +0.042700f, -0.003620f, -0.000322f, -0.000013f}, + {-0.052577f, -0.019393f, -0.009859f, +0.000138f, +0.000029f}, + {+0.042907f, +0.113552f, +0.005000f, -0.000638f, -0.000041f} + }, + { + {+0.045692f, -0.476580f, +0.008546f, +0.000086f, -0.000005f}, + {-0.080587f, -0.555433f, -0.017854f, -0.000450f, -0.000030f}, + {+0.182440f, -0.087182f, +0.017382f, -0.000294f, -0.000073f}, + {+0.075234f, -0.167476f, +0.008676f, +0.000034f, -0.000051f}, + {+0.071029f, -0.192007f, +0.008454f, +0.000011f, -0.000045f}, + {+0.086510f, -0.044174f, +0.003825f, +0.000041f, -0.000021f}, + {+0.075632f, -0.138240f, +0.011735f, -0.000028f, +0.000030f}, + {+0.013949f, -0.129305f, +0.005892f, -0.000040f, -0.000013f}, + {+0.045386f, +0.105892f, +0.005725f, +0.000024f, -0.000013f} + }, + { + {+0.264038f, -0.137768f, +0.037820f, -0.000452f, -0.000003f}, + {+0.327432f, +0.075214f, +0.050477f, +0.001428f, -0.000014f}, + {-0.022770f, -0.385123f, +0.004729f, +0.000100f, +0.000029f}, + {+0.054670f, -0.198426f, +0.007785f, +0.000271f, +0.000006f}, + {+0.049580f, -0.225410f, +0.005863f, +0.000204f, +0.000001f}, + {-0.043237f, -0.226727f, +0.000581f, -0.000235f, -0.000054f}, + {+0.021121f, -0.232475f, -0.003318f, +0.000194f, +0.000010f}, + {+0.068959f, -0.050792f, +0.006419f, -0.000075f, -0.000026f}, + {-0.050269f, -0.045913f, -0.008553f, +0.000508f, +0.000038f} + }, + { + {-0.122605f, +0.455832f, -0.019204f, -0.000024f, +0.000005f}, + {-0.006912f, +0.595107f, +0.002722f, +0.000314f, +0.000031f}, + {-0.131648f, -0.207572f, -0.020072f, +0.000119f, +0.000071f}, + {-0.075587f, -0.001389f, -0.007880f, -0.000200f, +0.000051f}, + {-0.092628f, -0.010795f, -0.009442f, -0.000210f, +0.000045f}, + {-0.034470f, -0.235595f, -0.004153f, -0.000184f, +0.000026f}, + {-0.138101f, +0.003560f, -0.013139f, +0.000044f, -0.000033f}, + {-0.076887f, +0.172735f, -0.011353f, -0.000186f, +0.000014f}, + {-0.018601f, -0.096133f, -0.000488f, -0.000002f, +0.000009f} + }, + { + {-0.239360f, +0.273817f, -0.034391f, +0.000359f, +0.000003f}, + {-0.344438f, +0.077598f, -0.050391f, -0.001368f, +0.000013f}, + {+0.085915f, +0.127791f, +0.009171f, +0.000053f, -0.000030f}, + {-0.003884f, +0.104668f, -0.002926f, -0.000117f, -0.000009f}, + {+0.025938f, +0.166624f, +0.001223f, +0.000030f, -0.000004f}, + {+0.087357f, -0.053855f, +0.006567f, +0.000375f, +0.000050f}, + {+0.079989f, +0.335328f, +0.010537f, -0.000213f, -0.000007f}, + {-0.027119f, +0.254717f, +0.001273f, +0.000328f, +0.000025f}, + {+0.049245f, +0.007836f, +0.007008f, -0.000515f, -0.000036f} + }, + { + {+0.189098f, -0.383414f, +0.028124f, +0.000092f, -0.000006f}, + {+0.108559f, -0.623832f, +0.013156f, -0.000170f, -0.000033f}, + {+0.052357f, +0.172914f, +0.014590f, -0.000154f, -0.000071f}, + {+0.027066f, +0.057228f, +0.004014f, +0.000183f, -0.000051f}, + {+0.042915f, +0.138441f, +0.007131f, +0.000079f, -0.000046f}, + {-0.062416f, +0.169373f, -0.002459f, +0.000150f, -0.000033f}, + {+0.109725f, +0.292825f, +0.008449f, +0.000038f, +0.000034f}, + {+0.124357f, +0.027929f, +0.015491f, +0.000061f, -0.000016f}, + {-0.001095f, +0.082699f, -0.001391f, +0.000112f, -0.000006f} + }, + { + {+0.194740f, -0.370983f, +0.028830f, -0.000424f, -0.000003f}, + {+0.334444f, -0.280705f, +0.047056f, +0.001250f, -0.000011f}, + {-0.070560f, -0.024714f, -0.010185f, -0.000110f, +0.000033f}, + {+0.007889f, +0.031645f, +0.004166f, +0.000046f, +0.000012f}, + {-0.044996f, +0.004394f, -0.003024f, -0.000024f, +0.000007f}, + {-0.022525f, +0.227369f, -0.001642f, -0.000313f, -0.000046f}, + {-0.165185f, -0.117904f, -0.015701f, +0.000142f, +0.000004f}, + {-0.080987f, -0.285489f, -0.008434f, -0.000232f, -0.000025f}, + {-0.049085f, +0.003557f, -0.010651f, +0.000401f, +0.000034f} + }, + { + {-0.234674f, +0.289561f, -0.036001f, +0.000013f, +0.000007f}, + {-0.223672f, +0.578241f, -0.027233f, +0.000092f, +0.000035f}, + {-0.024623f, -0.100323f, -0.004564f, +0.000328f, +0.000072f}, + {+0.017801f, +0.020633f, -0.002076f, -0.000042f, +0.000053f}, + {+0.013115f, -0.081785f, -0.000959f, +0.000079f, +0.000049f}, + {+0.080738f, +0.072886f, +0.004201f, -0.000076f, +0.000042f}, + {-0.002607f, -0.352196f, -0.003911f, -0.000017f, -0.000036f}, + {-0.069172f, -0.307620f, -0.004866f, -0.000006f, +0.000021f}, + {+0.028180f, -0.122432f, +0.007621f, -0.000085f, +0.000003f} + }, + { + {-0.147199f, +0.422160f, -0.022071f, +0.000321f, +0.000003f}, + {-0.267023f, +0.513414f, -0.037707f, -0.001150f, +0.000010f}, + {+0.060495f, +0.031583f, +0.008763f, -0.000093f, -0.000037f}, + {-0.065578f, -0.105960f, -0.010002f, -0.000209f, -0.000017f}, + {+0.014195f, -0.075807f, +0.002631f, -0.000201f, -0.000012f}, + {-0.053647f, -0.122427f, -0.002638f, +0.000093f, +0.000039f}, + {+0.142781f, -0.115711f, +0.024592f, -0.000188f, -0.000001f}, + {+0.149590f, +0.020216f, +0.015264f, -0.000015f, +0.000023f}, + {+0.037239f, -0.118872f, +0.000382f, -0.000458f, -0.000033f} + }, + { + {+0.269441f, -0.218896f, +0.041241f, +0.000004f, -0.000008f}, + {+0.303693f, -0.362352f, +0.037014f, -0.000053f, -0.000037f}, + {+0.007833f, +0.119694f, -0.000960f, -0.000345f, -0.000073f}, + {-0.004355f, -0.200633f, +0.001490f, +0.000103f, -0.000055f}, + {-0.032562f, +0.000305f, -0.004514f, +0.000019f, -0.000051f}, + {-0.017941f, -0.163230f, -0.007036f, +0.000034f, -0.000051f}, + {-0.046904f, +0.177005f, -0.004300f, +0.000147f, +0.000038f}, + {-0.058069f, +0.331227f, -0.002327f, +0.000118f, -0.000026f}, + {-0.065673f, +0.027120f, -0.006378f, +0.000220f, -0.000001f} + }, + { + {+0.096520f, -0.484461f, +0.013741f, -0.000314f, -0.000002f}, + {+0.168182f, -0.564851f, +0.028399f, +0.001136f, -0.000010f}, + {-0.055680f, +0.028246f, -0.005855f, +0.000184f, +0.000045f}, + {+0.118738f, -0.014371f, +0.012220f, +0.000155f, +0.000023f}, + {+0.022063f, +0.085271f, +0.002211f, +0.000137f, +0.000019f}, + {+0.049978f, -0.052230f, +0.005756f, +0.000013f, -0.000028f}, + {-0.111748f, +0.067754f, -0.020811f, +0.000056f, -0.000003f}, + {-0.098929f, +0.266647f, -0.009254f, +0.000013f, -0.000019f}, + {+0.022954f, +0.155435f, -0.001383f, +0.000344f, +0.000033f} + }, + { + {-0.298102f, +0.119927f, -0.044074f, +0.000054f, +0.000009f}, + {-0.324241f, +0.201048f, -0.044886f, -0.000061f, +0.000040f}, + {+0.018875f, -0.083814f, -0.000418f, +0.000398f, +0.000073f}, + {-0.061162f, +0.256472f, -0.008387f, +0.000024f, +0.000055f}, + {+0.028563f, +0.073381f, +0.002819f, +0.000106f, +0.000051f}, + {-0.019828f, +0.052279f, -0.002320f, +0.000130f, +0.000057f}, + {+0.058477f, -0.203321f, +0.012650f, -0.000104f, -0.000040f}, + {+0.133242f, -0.084836f, +0.013242f, -0.000015f, +0.000030f}, + {+0.042678f, +0.121577f, +0.007398f, -0.000185f, -0.000002f} + }, + { + {-0.034897f, +0.521904f, -0.005636f, +0.000275f, +0.000001f}, + {-0.096022f, +0.555951f, -0.014099f, -0.001080f, +0.000009f}, + {+0.022232f, -0.076542f, +0.003659f, -0.000139f, -0.000053f}, + {-0.117964f, +0.166708f, -0.014124f, -0.000190f, -0.000030f}, + {-0.054876f, -0.054232f, -0.005942f, -0.000155f, -0.000026f}, + {-0.020865f, +0.046834f, -0.005114f, -0.000034f, +0.000016f}, + {+0.119090f, -0.116285f, +0.014688f, -0.000066f, +0.000006f}, + {-0.009162f, -0.296851f, +0.001585f, -0.000015f, +0.000013f}, + {-0.057034f, -0.032243f, -0.004358f, -0.000329f, -0.000032f} + }, + { + {+0.309227f, -0.006599f, +0.046261f, -0.000088f, -0.000010f}, + {+0.335689f, -0.108899f, +0.045170f, +0.000116f, -0.000044f}, + {-0.010768f, -0.025357f, +0.000938f, -0.000529f, -0.000070f}, + {+0.120101f, -0.199389f, +0.018645f, -0.000027f, -0.000054f}, + {-0.005167f, -0.128785f, +0.000940f, -0.000138f, -0.000050f}, + {+0.023264f, -0.025419f, +0.006527f, -0.000284f, -0.000058f}, + {-0.107846f, +0.228561f, -0.015701f, +0.000136f, +0.000041f}, + {-0.112356f, -0.131761f, -0.015190f, -0.000104f, -0.000031f}, + {+0.003668f, -0.126548f, +0.000034f, +0.000218f, +0.000005f} + }, + { + {-0.027502f, -0.522603f, -0.003411f, -0.000264f, -0.000000f}, + {+0.030738f, -0.578245f, +0.004213f, +0.001069f, -0.000007f}, + {-0.000609f, -0.013454f, -0.002363f, +0.000076f, +0.000061f}, + {+0.087398f, -0.248212f, +0.011938f, +0.000075f, +0.000037f}, + {+0.076224f, -0.003106f, +0.010057f, +0.000063f, +0.000032f}, + {+0.005937f, -0.057510f, +0.000360f, -0.000077f, -0.000005f}, + {-0.095342f, +0.246056f, -0.013136f, +0.000057f, -0.000011f}, + {+0.080706f, +0.167833f, +0.010054f, +0.000007f, -0.000008f}, + {+0.052615f, -0.051218f, +0.005205f, +0.000238f, +0.000032f} + }, + { + {-0.304352f, -0.097670f, -0.045722f, +0.000119f, +0.000010f}, + {-0.340086f, -0.006265f, -0.046602f, -0.000169f, +0.000048f}, + {-0.020424f, +0.011099f, -0.001667f, +0.000571f, +0.000066f}, + {-0.162423f, +0.138866f, -0.025027f, +0.000093f, +0.000052f}, + {-0.033809f, +0.166438f, -0.006399f, +0.000195f, +0.000048f}, + {-0.027146f, -0.011761f, -0.003177f, +0.000395f, +0.000056f}, + {+0.155957f, -0.140724f, +0.023139f, -0.000149f, -0.000042f}, + {+0.050658f, +0.213522f, +0.006115f, +0.000088f, +0.000030f}, + {-0.039762f, +0.093271f, -0.004720f, -0.000234f, -0.000009f} + }, + { + {+0.084174f, +0.498153f, +0.011738f, +0.000258f, -0.000001f}, + {+0.034060f, +0.568731f, +0.004971f, -0.001035f, +0.000004f}, + {+0.017008f, +0.063888f, +0.000389f, +0.000004f, -0.000066f}, + {-0.040634f, +0.328420f, -0.004057f, -0.000038f, -0.000042f}, + {-0.073934f, +0.106271f, -0.009079f, -0.000021f, -0.000038f}, + {+0.016227f, +0.051899f, -0.000373f, +0.000148f, -0.000001f}, + {+0.040260f, -0.318605f, +0.006025f, -0.000077f, +0.000015f}, + {-0.100959f, -0.021877f, -0.014425f, +0.000114f, +0.000006f}, + {-0.027106f, +0.113757f, -0.001462f, -0.000158f, -0.000030f} + }, + { + {+0.289347f, +0.183367f, +0.043677f, -0.000132f, -0.000010f}, + {+0.332610f, +0.106477f, +0.046382f, +0.000181f, -0.000052f}, + {+0.030172f, +0.040872f, +0.005239f, -0.000542f, -0.000065f}, + {+0.188712f, -0.022024f, +0.026128f, -0.000084f, -0.000051f}, + {+0.071871f, -0.114351f, +0.009162f, -0.000197f, -0.000047f}, + {+0.013433f, +0.054663f, +0.003535f, -0.000343f, -0.000057f}, + {-0.178475f, +0.017894f, -0.025738f, +0.000205f, +0.000044f}, + {+0.010117f, -0.193309f, +0.001195f, -0.000079f, -0.000031f}, + {+0.059297f, -0.019649f, +0.006335f, +0.000285f, +0.000013f} + }, + { + {-0.134846f, -0.467842f, -0.019524f, -0.000244f, +0.000001f}, + {-0.092222f, -0.547291f, -0.014252f, +0.000986f, -0.000001f}, + {-0.040107f, -0.068680f, -0.004663f, +0.000023f, +0.000071f}, + {-0.024493f, -0.346874f, -0.002774f, +0.000070f, +0.000048f}, + {+0.047272f, -0.147189f, +0.008626f, +0.000053f, +0.000044f}, + {-0.026008f, -0.007599f, -0.001975f, -0.000132f, +0.000005f}, + {+0.030534f, +0.339732f, +0.003406f, +0.000035f, -0.000020f}, + {+0.083347f, -0.077557f, +0.013266f, -0.000128f, -0.000007f}, + {-0.013672f, -0.131388f, -0.003403f, +0.000118f, +0.000027f} + }, + { + {-0.267902f, -0.264872f, -0.040046f, +0.000129f, +0.000011f}, + {-0.321912f, -0.191063f, -0.044992f, -0.000193f, +0.000056f}, + {-0.022572f, -0.096725f, -0.002705f, +0.000503f, +0.000069f}, + {-0.176343f, -0.111752f, -0.025706f, +0.000048f, +0.000053f}, + {-0.084811f, +0.059741f, -0.013684f, +0.000183f, +0.000048f}, + {+0.004452f, -0.055305f, -0.000514f, +0.000261f, +0.000064f}, + {+0.161895f, +0.139155f, +0.022695f, -0.000241f, -0.000046f}, + {-0.046966f, +0.125238f, -0.006695f, +0.000013f, +0.000036f}, + {-0.046666f, -0.080465f, -0.004500f, -0.000378f, -0.000014f} + }, + { + {+0.182763f, +0.425959f, +0.026111f, +0.000216f, -0.000001f}, + {+0.151967f, +0.538951f, +0.023953f, -0.000917f, -0.000002f}, + {+0.059967f, +0.029780f, +0.006750f, -0.000233f, -0.000082f}, + {+0.071926f, +0.268254f, +0.009365f, -0.000173f, -0.000058f}, + {-0.030147f, +0.144364f, -0.004637f, -0.000155f, -0.000054f}, + {+0.022610f, -0.026139f, +0.001896f, -0.000081f, -0.000015f}, + {-0.089140f, -0.244883f, -0.010242f, +0.000037f, +0.000027f}, + {-0.053982f, +0.112441f, -0.009466f, +0.000027f, +0.000006f}, + {+0.043125f, +0.054784f, +0.006054f, -0.000118f, -0.000026f} + }, + { + {+0.236555f, +0.344253f, +0.035451f, -0.000140f, -0.000014f}, + {+0.305017f, +0.302445f, +0.041503f, +0.000225f, -0.000061f}, + {+0.000099f, +0.121249f, +0.000347f, -0.000531f, -0.000075f}, + {+0.147839f, +0.147624f, +0.023593f, -0.000074f, -0.000055f}, + {+0.099074f, -0.056676f, +0.015836f, -0.000238f, -0.000049f}, + {-0.015365f, +0.033058f, -0.001023f, -0.000263f, -0.000075f}, + {-0.115117f, -0.202631f, -0.018500f, +0.000266f, +0.000048f}, + {+0.062522f, -0.070317f, +0.009998f, +0.000023f, -0.000045f}, + {+0.009357f, +0.103095f, +0.001665f, +0.000461f, +0.000014f} + }, + { + {-0.223414f, -0.360443f, -0.031653f, -0.000161f, +0.000003f}, + {-0.220330f, -0.504684f, -0.033230f, +0.000874f, +0.000003f}, + {-0.065668f, +0.018345f, -0.008069f, +0.000490f, +0.000105f}, + {-0.094224f, -0.228227f, -0.015610f, +0.000296f, +0.000075f}, + {+0.011044f, -0.195618f, -0.000221f, +0.000284f, +0.000070f}, + {-0.015206f, +0.030774f, -0.001584f, +0.000377f, +0.000037f}, + {+0.112319f, +0.149909f, +0.015570f, -0.000082f, -0.000037f}, + {+0.027593f, -0.125221f, +0.004605f, +0.000167f, +0.000001f}, + {-0.035657f, +0.033761f, -0.006506f, +0.000132f, +0.000027f} + }, + { + {-0.197435f, -0.400152f, -0.030189f, +0.000183f, +0.000017f}, + {-0.265346f, -0.433349f, -0.035911f, -0.000309f, +0.000070f}, + {+0.024825f, -0.121781f, +0.003662f, +0.000791f, +0.000075f}, + {-0.131639f, -0.172895f, -0.018896f, +0.000200f, +0.000051f}, + {-0.118431f, +0.000422f, -0.015867f, +0.000387f, +0.000045f}, + {+0.018068f, -0.023258f, +0.002724f, +0.000522f, +0.000082f}, + {+0.072974f, +0.212278f, +0.011511f, -0.000340f, -0.000047f}, + {-0.068530f, +0.023641f, -0.010358f, +0.000042f, +0.000055f}, + {+0.013236f, -0.038962f, +0.000910f, -0.000477f, -0.000015f} + }, + { + {+0.253363f, +0.291660f, +0.036499f, +0.000094f, -0.000007f}, + {+0.281798f, +0.406628f, +0.041589f, -0.000891f, -0.000005f}, + {+0.059479f, -0.066959f, +0.007177f, -0.000628f, -0.000142f}, + {+0.120109f, +0.213729f, +0.018705f, -0.000288f, -0.000099f}, + {+0.027666f, +0.223189f, +0.003521f, -0.000300f, -0.000093f}, + {+0.013844f, -0.028875f, +0.000557f, -0.000575f, -0.000072f}, + {-0.118976f, -0.083818f, -0.016708f, +0.000094f, +0.000049f}, + {-0.002209f, +0.126405f, -0.000845f, -0.000338f, -0.000017f}, + {+0.011760f, -0.039638f, +0.005259f, -0.000091f, -0.000032f} + }, + { + {+0.156753f, +0.440657f, +0.023910f, -0.000253f, -0.000018f}, + {+0.203795f, +0.522732f, +0.028158f, +0.000411f, -0.000085f}, + {-0.046218f, +0.097129f, -0.007205f, -0.001249f, -0.000056f}, + {+0.112467f, +0.226687f, +0.015571f, -0.000451f, -0.000035f}, + {+0.117838f, +0.083303f, +0.016703f, -0.000616f, -0.000028f}, + {-0.023412f, +0.030837f, -0.004021f, -0.001018f, -0.000071f}, + {-0.037437f, -0.211830f, -0.005723f, +0.000467f, +0.000043f}, + {+0.064323f, +0.023579f, +0.009934f, -0.000232f, -0.000060f}, + {-0.009156f, -0.006104f, -0.001969f, +0.000387f, +0.000022f} + }, + { + {-0.275944f, -0.222761f, -0.039627f, -0.000066f, +0.000013f}, + {-0.322019f, -0.286370f, -0.048482f, +0.000959f, +0.000014f}, + {-0.046923f, +0.094317f, -0.005599f, +0.000435f, +0.000182f}, + {-0.150750f, -0.177020f, -0.022662f, +0.000117f, +0.000123f}, + {-0.067347f, -0.202691f, -0.009894f, +0.000124f, +0.000115f}, + {-0.015081f, +0.042971f, -0.000082f, +0.000445f, +0.000114f}, + {+0.117640f, +0.025700f, +0.015946f, -0.000085f, -0.000063f}, + {-0.016418f, -0.100980f, -0.001676f, +0.000298f, +0.000040f}, + {-0.000250f, +0.010429f, -0.002435f, -0.000017f, +0.000037f} + }, + { + {-0.115447f, -0.469158f, -0.017950f, +0.000366f, +0.000017f}, + {-0.134884f, -0.571706f, -0.018454f, -0.000373f, +0.000105f}, + {+0.067420f, -0.084270f, +0.010575f, +0.001650f, +0.000010f}, + {-0.076003f, -0.293259f, -0.009993f, +0.000579f, +0.000003f}, + {-0.098520f, -0.155744f, -0.013412f, +0.000754f, -0.000004f}, + {+0.039536f, -0.043110f, +0.005899f, +0.001509f, +0.000034f}, + {+0.003041f, +0.203039f, +0.001212f, -0.000536f, -0.000033f}, + {-0.056528f, -0.038194f, -0.009590f, +0.000577f, +0.000054f}, + {-0.001245f, +0.013315f, +0.000319f, -0.000346f, -0.000036f} + }, + { + {+0.292999f, +0.157930f, +0.042403f, +0.000087f, -0.000020f}, + {+0.342354f, +0.162255f, +0.051635f, -0.001110f, -0.000034f}, + {+0.022156f, -0.154740f, +0.000608f, +0.000173f, -0.000208f}, + {+0.168151f, +0.078549f, +0.023857f, +0.000280f, -0.000137f}, + {+0.096594f, +0.143573f, +0.013193f, +0.000234f, -0.000126f}, + {+0.002506f, -0.100103f, -0.002757f, +0.000120f, -0.000144f}, + {-0.102496f, +0.041774f, -0.013753f, -0.000024f, +0.000074f}, + {+0.028733f, +0.095250f, +0.004398f, -0.000056f, -0.000064f}, + {-0.000053f, +0.012400f, +0.002539f, +0.000289f, -0.000038f} + }, + { + {+0.073802f, +0.495430f, +0.011185f, -0.000471f, -0.000013f}, + {+0.067107f, +0.583553f, +0.008494f, +0.000150f, -0.000126f}, + {-0.082122f, +0.004027f, -0.011237f, -0.001551f, +0.000060f}, + {+0.028928f, +0.288941f, +0.005398f, -0.000320f, +0.000043f}, + {+0.067365f, +0.187138f, +0.009613f, -0.000522f, +0.000049f}, + {-0.053548f, -0.014546f, -0.006738f, -0.001557f, +0.000028f}, + {+0.021691f, -0.148588f, +0.001549f, +0.000530f, +0.000018f}, + {+0.052283f, +0.060853f, +0.007887f, -0.000799f, -0.000034f}, + {+0.008489f, -0.003383f, +0.001566f, +0.000494f, +0.000057f} + }, + { + {-0.307330f, -0.088798f, -0.043952f, -0.000185f, +0.000025f}, + {-0.348741f, -0.055377f, -0.052852f, +0.001109f, +0.000070f}, + {+0.020133f, +0.157206f, +0.002804f, -0.000807f, +0.000201f}, + {-0.157718f, +0.000354f, -0.025108f, -0.000577f, +0.000129f}, + {-0.107002f, -0.082667f, -0.016074f, -0.000429f, +0.000116f}, + {+0.027699f, +0.106463f, +0.004855f, -0.000830f, +0.000144f}, + {+0.076446f, -0.063154f, +0.011339f, +0.000105f, -0.000081f}, + {-0.046001f, -0.090381f, -0.006439f, -0.000517f, +0.000079f}, + {-0.003916f, -0.020923f, -0.003928f, -0.000676f, +0.000026f} + }, + { + {-0.027283f, -0.518967f, -0.004482f, +0.000531f, +0.000006f}, + {-0.002104f, -0.586753f, +0.000310f, +0.000388f, +0.000138f}, + {+0.067195f, +0.083021f, +0.013467f, -0.000261f, -0.000139f}, + {+0.000203f, -0.242050f, +0.002218f, -0.001130f, -0.000092f}, + {-0.041057f, -0.183900f, -0.003084f, -0.000869f, -0.000096f}, + {+0.043480f, +0.079977f, +0.008525f, +0.000104f, -0.000100f}, + {-0.026266f, +0.096019f, -0.004003f, -0.000222f, +0.000001f}, + {-0.040550f, -0.099815f, -0.006813f, +0.000626f, +0.000005f}, + {-0.012858f, -0.005094f, -0.001938f, -0.001102f, -0.000079f} + }, + { + {+0.314481f, +0.005188f, +0.044811f, +0.000426f, -0.000028f}, + {+0.346528f, -0.051746f, +0.052277f, -0.000401f, -0.000122f}, + {-0.053118f, -0.097595f, -0.002410f, +0.001225f, -0.000151f}, + {+0.140849f, -0.024347f, +0.026727f, +0.000253f, -0.000095f}, + {+0.107847f, +0.047702f, +0.019644f, -0.000097f, -0.000079f}, + {-0.051228f, -0.061068f, -0.003689f, +0.001630f, -0.000102f}, + {-0.056164f, +0.049815f, -0.009319f, +0.000032f, +0.000080f}, + {+0.061891f, +0.058300f, +0.009871f, +0.001903f, -0.000079f}, + {+0.009880f, +0.028684f, +0.006879f, +0.001108f, +0.000001f} + } +}; + +const float rightHRIRReal_HOA2[BINAURAL_CONVBANDS][9][BINAURAL_NTAPS]= +{ + { + {-0.005335f, +0.653226f, +0.143797f, +0.002456f, -0.000002f}, + {+0.013208f, -0.379140f, +0.322559f, +0.004978f, +0.000009f}, + {+0.001925f, +0.054222f, +0.043071f, -0.002449f, -0.000110f}, + {-0.000927f, +0.060176f, -0.015580f, -0.001281f, -0.000042f}, + {-0.003471f, -0.011471f, -0.002826f, -0.001074f, +0.000026f}, + {-0.003706f, +0.001098f, +0.005680f, -0.008863f, -0.000084f}, + {-0.005326f, -0.000766f, -0.002007f, -0.003072f, +0.000014f}, + {+0.001747f, -0.039662f, +0.085770f, +0.000859f, +0.000050f}, + {-0.009494f, +0.084274f, -0.084910f, -0.005996f, -0.000078f} + }, + { + {+0.020549f, +0.471556f, -0.054545f, -0.003976f, +0.000002f}, + {-0.031621f, -0.813566f, -0.056755f, -0.007166f, -0.000006f}, + {-0.002271f, -0.021372f, -0.026223f, +0.003087f, +0.000136f}, + {+0.000511f, +0.035700f, -0.040529f, +0.002564f, +0.000048f}, + {+0.007142f, +0.001751f, +0.001329f, +0.002743f, -0.000028f}, + {+0.006527f, +0.051957f, +0.070578f, +0.014200f, +0.000113f}, + {+0.014135f, +0.025109f, +0.015403f, +0.005652f, -0.000015f}, + {-0.003291f, -0.069019f, +0.036066f, +0.001141f, -0.000069f}, + {+0.028061f, +0.152663f, -0.025603f, +0.008277f, +0.000102f} + }, + { + {-0.039663f, +0.412008f, +0.017452f, +0.000445f, +0.000002f}, + {+0.026960f, -0.962971f, -0.087407f, -0.001953f, -0.000014f}, + {-0.001486f, -0.002955f, -0.054042f, +0.000085f, +0.000075f}, + {+0.003107f, +0.048844f, -0.051503f, -0.002108f, +0.000034f}, + {-0.009864f, +0.005169f, +0.019159f, -0.003128f, -0.000025f}, + {-0.004987f, +0.054770f, +0.099413f, -0.003316f, +0.000044f}, + {-0.024855f, +0.021795f, +0.065786f, -0.002538f, -0.000013f}, + {+0.003623f, +0.018186f, -0.058320f, -0.005763f, -0.000022f}, + {-0.055010f, +0.126807f, +0.109029f, +0.001546f, +0.000045f} + }, + { + {+0.043174f, +0.455537f, -0.027678f, +0.002529f, -0.000002f}, + {+0.025122f, -0.922813f, -0.028063f, +0.008613f, +0.000006f}, + {+0.002020f, +0.051124f, -0.010761f, +0.000153f, -0.000146f}, + {-0.010597f, +0.081732f, -0.001493f, +0.001479f, -0.000051f}, + {+0.024810f, -0.014152f, -0.030508f, +0.002185f, +0.000029f}, + {+0.011648f, -0.040215f, -0.008697f, -0.003893f, -0.000125f}, + {+0.043616f, -0.007408f, -0.035355f, -0.000987f, +0.000015f}, + {-0.007698f, +0.031375f, -0.028885f, +0.004919f, +0.000076f}, + {+0.093586f, +0.162669f, -0.029770f, -0.007128f, -0.000112f} + }, + { + {-0.001041f, +0.494032f, +0.005715f, -0.001108f, -0.000002f}, + {-0.143821f, -0.682007f, +0.029450f, -0.003481f, +0.000019f}, + {+0.006306f, +0.070613f, -0.011179f, -0.001860f, -0.000038f}, + {+0.031146f, +0.059515f, -0.014381f, -0.000905f, -0.000027f}, + {-0.052905f, +0.051459f, +0.001250f, -0.000868f, +0.000023f}, + {-0.029241f, -0.030800f, -0.000944f, +0.000488f, +0.000000f}, + {-0.055716f, +0.063529f, +0.002159f, +0.000641f, +0.000013f}, + {+0.013468f, -0.008041f, -0.000774f, +0.000134f, -0.000007f}, + {-0.101473f, +0.336570f, +0.012535f, +0.003233f, -0.000009f} + }, + { + {-0.092816f, +0.358882f, +0.002536f, -0.001449f, +0.000001f}, + {+0.262828f, -0.127251f, +0.020151f, -0.004341f, -0.000009f}, + {-0.022963f, +0.059857f, +0.016901f, +0.000212f, +0.000141f}, + {-0.064426f, -0.041934f, +0.012804f, -0.000049f, +0.000052f}, + {+0.064139f, +0.206373f, -0.000508f, +0.000138f, -0.000031f}, + {+0.035857f, +0.035091f, -0.016850f, +0.002300f, +0.000120f}, + {+0.032908f, +0.170386f, -0.004178f, +0.001249f, -0.000015f}, + {-0.010158f, -0.037569f, +0.007236f, -0.002146f, -0.000070f}, + {+0.021780f, +0.486360f, -0.004267f, +0.000644f, +0.000106f} + }, + { + {+0.166528f, -0.018320f, +0.002944f, +0.001057f, +0.000002f}, + {-0.217141f, +0.537828f, -0.015478f, +0.003353f, -0.000022f}, + {+0.036889f, -0.008294f, -0.001367f, +0.001254f, +0.000008f}, + {+0.069514f, -0.229400f, +0.010249f, +0.000566f, +0.000020f}, + {-0.019714f, +0.330742f, -0.003692f, +0.000002f, -0.000022f}, + {-0.010625f, +0.080582f, +0.010145f, -0.000258f, -0.000041f}, + {+0.022526f, +0.170893f, +0.014154f, -0.001025f, -0.000013f}, + {-0.007441f, -0.048091f, +0.004112f, +0.000974f, +0.000032f}, + {+0.115639f, +0.344255f, +0.014295f, -0.000177f, -0.000021f} + }, + { + {-0.099909f, -0.399087f, -0.008044f, +0.000848f, -0.000001f}, + {-0.054243f, +0.757012f, -0.020850f, +0.002283f, +0.000013f}, + {-0.025209f, -0.091980f, -0.004347f, +0.000486f, -0.000127f}, + {+0.003575f, -0.340857f, -0.007962f, -0.000163f, -0.000051f}, + {-0.071769f, +0.265803f, +0.002595f, -0.000097f, +0.000034f}, + {-0.026489f, +0.035458f, -0.005585f, -0.001110f, -0.000100f}, + {-0.060623f, +0.023422f, -0.010689f, -0.000403f, +0.000015f}, + {+0.027371f, -0.008448f, -0.007673f, -0.000192f, +0.000053f}, + {-0.176311f, -0.087697f, -0.004740f, -0.000958f, -0.000089f} + }, + { + {-0.098192f, -0.380559f, -0.012062f, -0.000872f, -0.000003f}, + {+0.307522f, +0.201411f, +0.041908f, -0.002386f, +0.000023f}, + {-0.016794f, -0.090327f, -0.008151f, -0.001481f, +0.000012f}, + {-0.117497f, -0.178818f, -0.001213f, -0.000161f, -0.000015f}, + {+0.130667f, -0.017905f, +0.002862f, +0.000224f, +0.000021f}, + {+0.026816f, -0.061563f, +0.002730f, +0.000500f, +0.000070f}, + {+0.035111f, -0.133808f, +0.000916f, +0.000421f, +0.000014f}, + {-0.028071f, +0.069426f, -0.005372f, -0.000149f, -0.000048f}, + {+0.069362f, -0.446237f, -0.000098f, +0.000728f, +0.000041f} + }, + { + {+0.200424f, +0.084933f, +0.029127f, -0.000528f, +0.000002f}, + {-0.208158f, -0.589613f, -0.015424f, -0.001691f, -0.000018f}, + {+0.041516f, +0.016661f, +0.015205f, -0.000153f, +0.000109f}, + {+0.138467f, +0.186187f, +0.007440f, -0.000185f, +0.000051f}, + {-0.077086f, -0.303705f, +0.003329f, -0.000036f, -0.000037f}, + {+0.020310f, -0.080808f, -0.007043f, +0.000054f, +0.000070f}, + {+0.031948f, -0.141008f, -0.000818f, +0.000548f, -0.000016f}, + {+0.000366f, +0.119534f, +0.006275f, +0.000355f, -0.000032f}, + {+0.109021f, -0.372983f, +0.009320f, +0.000129f, +0.000067f} + }, + { + {-0.031292f, +0.437887f, -0.005797f, +0.000706f, +0.000004f}, + {-0.174454f, -0.640794f, -0.027817f, +0.001980f, -0.000023f}, + {+0.003185f, +0.089160f, -0.003572f, +0.001064f, -0.000021f}, + {-0.004179f, +0.383165f, +0.003748f, +0.000389f, +0.000011f}, + {-0.056596f, -0.310132f, -0.010567f, -0.000223f, -0.000018f}, + {-0.057823f, +0.028077f, -0.000893f, -0.000451f, -0.000085f}, + {-0.063559f, +0.001711f, -0.003009f, -0.000543f, -0.000016f}, + {+0.035766f, +0.073579f, +0.002518f, +0.000224f, +0.000053f}, + {-0.161175f, +0.042780f, -0.016398f, -0.000634f, -0.000050f} + }, + { + {-0.205155f, +0.167329f, -0.030119f, +0.000379f, -0.000002f}, + {+0.339082f, +0.153701f, +0.034923f, +0.001267f, +0.000022f}, + {-0.072520f, -0.022480f, -0.011077f, +0.000072f, -0.000094f}, + {-0.141121f, +0.163887f, -0.018765f, +0.000088f, -0.000051f}, + {+0.127275f, -0.020840f, +0.015322f, -0.000034f, +0.000041f}, + {+0.027665f, +0.152414f, +0.006975f, +0.000222f, -0.000038f}, + {+0.020531f, +0.124947f, +0.003832f, -0.000374f, +0.000019f}, + {-0.042138f, -0.039811f, -0.003937f, -0.000440f, +0.000012f}, + {+0.031495f, +0.327305f, +0.001379f, +0.000105f, -0.000048f} + }, + { + {+0.145847f, -0.370580f, +0.020419f, -0.000633f, -0.000004f}, + {-0.026755f, +0.715695f, +0.002721f, -0.001713f, +0.000021f}, + {+0.048263f, -0.214620f, +0.011454f, -0.000799f, +0.000024f}, + {+0.105105f, -0.209642f, +0.009809f, -0.000393f, -0.000007f}, + {-0.046673f, +0.240709f, -0.003039f, +0.000354f, +0.000014f}, + {+0.046604f, +0.126235f, +0.001254f, +0.000637f, +0.000087f}, + {+0.040919f, +0.089993f, +0.004646f, +0.000614f, +0.000016f}, + {+0.003849f, -0.106327f, -0.000606f, -0.000255f, -0.000050f}, + {+0.114169f, +0.187796f, +0.016720f, +0.000604f, +0.000050f} + }, + { + {+0.151563f, -0.357850f, +0.023901f, -0.000267f, +0.000003f}, + {-0.329416f, +0.240852f, -0.037687f, -0.000972f, -0.000025f}, + {+0.079637f, -0.178703f, +0.006277f, -0.000085f, +0.000084f}, + {+0.067743f, -0.255542f, +0.013928f, -0.000093f, +0.000052f}, + {-0.085616f, +0.171409f, -0.015038f, +0.000016f, -0.000044f}, + {-0.080584f, -0.060419f, -0.009795f, -0.000260f, +0.000011f}, + {-0.039270f, -0.029107f, -0.004384f, +0.000149f, -0.000022f}, + {+0.040700f, -0.048532f, +0.005694f, +0.000308f, +0.000003f}, + {-0.100428f, -0.143102f, -0.013507f, -0.000175f, +0.000032f} + }, + { + {-0.221520f, +0.217382f, -0.031802f, +0.000571f, +0.000004f}, + {+0.191369f, -0.563524f, +0.020930f, +0.001563f, -0.000018f}, + {-0.142768f, +0.156236f, -0.016728f, +0.000768f, -0.000025f}, + {-0.131233f, +0.058224f, -0.018961f, +0.000413f, +0.000003f}, + {+0.094869f, -0.113180f, +0.014106f, -0.000387f, -0.000009f}, + {+0.032009f, -0.229593f, +0.004382f, -0.000814f, -0.000078f}, + {-0.014026f, -0.058166f, -0.005170f, -0.000559f, -0.000016f}, + {-0.035069f, +0.066238f, -0.003175f, +0.000270f, +0.000041f}, + {-0.032944f, -0.241581f, -0.006363f, -0.000531f, -0.000047f} + }, + { + {-0.072792f, +0.444420f, -0.012987f, +0.000205f, -0.000004f}, + {+0.237324f, -0.482374f, +0.029199f, +0.000704f, +0.000027f}, + {+0.015060f, +0.403253f, +0.004767f, +0.000016f, -0.000078f}, + {-0.002750f, +0.257555f, -0.001283f, +0.000101f, -0.000052f}, + {+0.029761f, -0.216925f, +0.003727f, -0.000037f, +0.000045f}, + {+0.050908f, -0.208738f, +0.003838f, +0.000287f, +0.000007f}, + {+0.026158f, +0.010072f, +0.007655f, -0.000049f, +0.000026f}, + {-0.018378f, +0.087639f, -0.004770f, -0.000153f, -0.000011f}, + {+0.100406f, -0.034654f, +0.015514f, +0.000140f, -0.000022f} + }, + { + {+0.257437f, -0.065717f, +0.037575f, -0.000530f, -0.000004f}, + {-0.281553f, +0.324420f, -0.036967f, -0.001412f, +0.000017f}, + {+0.165202f, +0.184739f, +0.014027f, -0.000709f, +0.000026f}, + {+0.125102f, +0.059915f, +0.017871f, -0.000393f, +0.000001f}, + {-0.112292f, +0.000623f, -0.014750f, +0.000389f, +0.000004f}, + {-0.090463f, -0.007129f, -0.003581f, +0.000747f, +0.000067f}, + {+0.027231f, +0.007327f, +0.004513f, +0.000487f, +0.000014f}, + {+0.046307f, -0.017672f, +0.008365f, -0.000175f, -0.000032f}, + {-0.028415f, +0.161325f, -0.001715f, +0.000514f, +0.000043f} + }, + { + {-0.007526f, -0.473436f, +0.001022f, -0.000153f, +0.000005f}, + {-0.129889f, +0.550582f, -0.015713f, -0.000496f, -0.000029f}, + {-0.152654f, -0.291103f, -0.013185f, -0.000005f, +0.000074f}, + {-0.054068f, -0.217748f, -0.007018f, -0.000142f, +0.000051f}, + {+0.037999f, +0.233960f, +0.005179f, +0.000063f, -0.000045f}, + {+0.058157f, +0.208550f, +0.000279f, -0.000232f, -0.000018f}, + {-0.043982f, -0.108725f, -0.011637f, +0.000065f, -0.000029f}, + {+0.000177f, -0.092885f, -0.000896f, -0.000064f, +0.000013f}, + {-0.062887f, +0.105831f, -0.012283f, -0.000152f, +0.000016f} + }, + { + {-0.267052f, -0.072481f, -0.039143f, +0.000481f, +0.000004f}, + {+0.316645f, -0.147998f, +0.045958f, +0.001265f, -0.000015f}, + {-0.048560f, -0.443085f, -0.007515f, +0.000666f, -0.000028f}, + {-0.086419f, -0.172339f, -0.010499f, +0.000432f, -0.000005f}, + {+0.085408f, +0.166595f, +0.008605f, -0.000440f, -0.000000f}, + {+0.015618f, +0.269874f, +0.001215f, -0.000625f, -0.000057f}, + {-0.041006f, -0.120930f, -0.000588f, -0.000488f, -0.000012f}, + {-0.062603f, +0.004952f, -0.009992f, +0.000232f, +0.000027f}, + {+0.049095f, -0.068280f, +0.006362f, -0.000520f, -0.000040f} + }, + { + {+0.085562f, +0.471449f, +0.011009f, +0.000129f, -0.000005f}, + {+0.040209f, -0.573378f, +0.000615f, +0.000315f, +0.000031f}, + {+0.171918f, -0.105151f, +0.017403f, +0.000004f, -0.000072f}, + {+0.084128f, +0.083375f, +0.007231f, +0.000038f, -0.000051f}, + {-0.092144f, -0.099172f, -0.007312f, +0.000077f, +0.000045f}, + {-0.077363f, +0.132678f, -0.001733f, +0.000235f, +0.000023f}, + {+0.111219f, +0.109132f, +0.015848f, -0.000079f, +0.000032f}, + {+0.040923f, +0.172426f, +0.008798f, -0.000008f, -0.000013f}, + {+0.029588f, -0.098729f, +0.007764f, +0.000221f, -0.000011f} + }, + { + {+0.254737f, +0.211411f, +0.036795f, -0.000484f, -0.000003f}, + {-0.338234f, +0.015114f, -0.048846f, -0.001053f, +0.000013f}, + {-0.069108f, +0.254859f, -0.003290f, -0.000753f, +0.000029f}, + {+0.023788f, +0.170361f, +0.006488f, -0.000354f, +0.000008f}, + {-0.008393f, -0.222503f, -0.002681f, +0.000354f, -0.000003f}, + {+0.081171f, -0.098496f, +0.004558f, +0.000585f, +0.000051f}, + {-0.022336f, +0.317809f, -0.007308f, +0.000546f, +0.000009f}, + {+0.059371f, +0.155239f, +0.002593f, -0.000198f, -0.000025f}, + {-0.050719f, +0.026919f, -0.006976f, +0.000534f, +0.000037f} + }, + { + {-0.158995f, -0.424829f, -0.020702f, -0.000042f, +0.000006f}, + {+0.052902f, +0.616966f, +0.013055f, -0.000306f, -0.000032f}, + {-0.087152f, +0.213242f, -0.015296f, +0.000352f, +0.000070f}, + {-0.054260f, +0.047270f, -0.008042f, +0.000061f, +0.000051f}, + {+0.073970f, -0.094701f, +0.008512f, -0.000228f, -0.000046f}, + {-0.017462f, -0.238223f, -0.000790f, -0.000485f, -0.000029f}, + {-0.138534f, +0.148762f, -0.014349f, -0.000008f, -0.000034f}, + {-0.109919f, -0.097327f, -0.010882f, +0.000233f, +0.000014f}, + {-0.006806f, +0.096529f, -0.003657f, -0.000365f, +0.000007f} + }, + { + {-0.218541f, -0.332409f, -0.031504f, +0.000445f, +0.000003f}, + {+0.344919f, +0.163301f, +0.048934f, +0.001021f, -0.000012f}, + {+0.081260f, -0.052733f, +0.012413f, +0.000334f, -0.000031f}, + {+0.001753f, -0.039186f, -0.002593f, +0.000192f, -0.000011f}, + {-0.044437f, +0.083315f, -0.002185f, -0.000075f, +0.000005f}, + {-0.063695f, -0.165969f, -0.005598f, -0.000350f, -0.000048f}, + {+0.133966f, -0.261153f, +0.015377f, -0.000538f, -0.000006f}, + {+0.023795f, -0.302979f, +0.005384f, -0.000124f, +0.000025f}, + {+0.048328f, +0.008375f, +0.007723f, -0.000384f, -0.000035f} + }, + { + {+0.215234f, +0.334693f, +0.029335f, -0.000032f, -0.000006f}, + {-0.163645f, -0.620258f, -0.029442f, +0.000199f, +0.000034f}, + {+0.033793f, -0.124345f, +0.006813f, -0.000105f, -0.000071f}, + {+0.000974f, -0.040313f, +0.001531f, +0.000006f, -0.000052f}, + {-0.011132f, +0.127973f, -0.004627f, -0.000028f, +0.000047f}, + {+0.084325f, +0.052788f, +0.007351f, +0.000453f, +0.000037f}, + {+0.056743f, -0.375950f, +0.009997f, +0.000141f, +0.000035f}, + {+0.111528f, -0.176673f, +0.008510f, +0.000146f, -0.000018f}, + {-0.011877f, -0.092945f, -0.003074f, +0.000266f, -0.000004f} + }, + { + {+0.170586f, +0.400778f, +0.026157f, -0.000380f, -0.000003f}, + {-0.309161f, -0.398764f, -0.040718f, -0.000943f, +0.000011f}, + {-0.062016f, +0.029728f, -0.012911f, -0.000459f, +0.000035f}, + {+0.031810f, -0.090010f, +0.007426f, -0.000129f, +0.000014f}, + {+0.032063f, +0.056196f, +0.004324f, +0.000244f, -0.000009f}, + {-0.022806f, +0.208884f, +0.000856f, +0.000371f, +0.000043f}, + {-0.165081f, -0.039385f, -0.016746f, +0.000367f, +0.000003f}, + {-0.128190f, +0.183103f, -0.012188f, -0.000425f, -0.000025f}, + {-0.049731f, -0.043210f, -0.002580f, +0.000500f, +0.000034f} + }, + { + {-0.253118f, -0.253855f, -0.036031f, +0.000022f, +0.000008f}, + {+0.270280f, +0.483591f, +0.039528f, -0.000153f, -0.000036f}, + {-0.018783f, +0.101617f, -0.001693f, +0.000100f, +0.000073f}, + {+0.020506f, -0.111990f, -0.001982f, -0.000215f, +0.000054f}, + {-0.026438f, -0.035500f, -0.002626f, +0.000034f, -0.000050f}, + {-0.052495f, +0.162509f, -0.005782f, -0.000307f, -0.000047f}, + {+0.034503f, +0.254582f, -0.002428f, -0.000029f, -0.000037f}, + {-0.007059f, +0.365527f, +0.000861f, +0.000308f, +0.000024f}, + {+0.051840f, +0.110577f, +0.004579f, -0.000471f, +0.000002f} + }, + { + {-0.123354f, -0.454617f, -0.017101f, +0.000408f, +0.000003f}, + {+0.216188f, +0.557670f, +0.033272f, +0.000921f, -0.000010f}, + {+0.060077f, -0.016368f, +0.008130f, +0.000544f, -0.000041f}, + {-0.097698f, +0.063611f, -0.011314f, +0.000334f, -0.000020f}, + {+0.004155f, -0.082194f, +0.000724f, -0.000315f, +0.000015f}, + {+0.061885f, -0.007918f, +0.004267f, -0.000661f, -0.000034f}, + {+0.120251f, +0.108336f, +0.021527f, -0.000454f, +0.000001f}, + {+0.138249f, +0.145446f, +0.014907f, +0.000187f, +0.000021f}, + {+0.010129f, +0.174821f, +0.000225f, -0.000291f, -0.000033f} + }, + { + {+0.286163f, +0.175080f, +0.040522f, -0.000072f, -0.000009f}, + {-0.316113f, -0.262138f, -0.049307f, +0.000066f, +0.000038f}, + {-0.006202f, -0.116156f, -0.000344f, -0.000116f, -0.000074f}, + {+0.026045f, +0.250354f, +0.005697f, +0.000168f, -0.000055f}, + {+0.033061f, -0.037487f, +0.003086f, -0.000057f, +0.000051f}, + {-0.009161f, -0.111428f, +0.002750f, +0.000407f, +0.000055f}, + {-0.050197f, -0.166126f, -0.010372f, +0.000135f, +0.000039f}, + {-0.108124f, -0.227657f, -0.011340f, -0.000057f, -0.000029f}, + {-0.062623f, +0.065189f, -0.003295f, +0.000387f, +0.000001f} + }, + { + {+0.066678f, +0.512159f, +0.009358f, -0.000375f, -0.000002f}, + {-0.128892f, -0.546911f, -0.020182f, -0.000837f, +0.000009f}, + {-0.041244f, -0.065432f, -0.004659f, -0.000466f, +0.000049f}, + {+0.124448f, +0.097696f, +0.018095f, -0.000283f, +0.000027f}, + {-0.039700f, +0.075487f, -0.006824f, +0.000303f, -0.000022f}, + {-0.033671f, -0.064807f, -0.008036f, +0.000540f, +0.000022f}, + {-0.115666f, -0.069551f, -0.016489f, +0.000343f, -0.000004f}, + {-0.044678f, -0.318287f, -0.008724f, -0.000374f, -0.000016f}, + {+0.045915f, -0.096744f, +0.005450f, +0.000336f, +0.000032f} + }, + { + {-0.306654f, -0.062299f, -0.043370f, +0.000070f, +0.000010f}, + {+0.327815f, +0.157084f, +0.053522f, -0.000024f, -0.000042f}, + {+0.020545f, +0.022620f, -0.000196f, -0.000030f, +0.000072f}, + {-0.093582f, -0.234733f, -0.010882f, -0.000285f, +0.000055f}, + {-0.018657f, +0.107686f, -0.002873f, +0.000136f, -0.000051f}, + {+0.022629f, +0.029525f, +0.002254f, -0.000156f, -0.000058f}, + {+0.080228f, +0.235900f, +0.013683f, -0.000069f, -0.000040f}, + {+0.131827f, -0.044535f, +0.015502f, +0.000103f, +0.000031f}, + {+0.019414f, -0.130958f, +0.003490f, -0.000488f, -0.000004f} + }, + { + {-0.003446f, -0.527577f, -0.000418f, +0.000351f, +0.000001f}, + {+0.063671f, +0.564794f, +0.009104f, +0.000762f, -0.000008f}, + {+0.005424f, +0.040112f, +0.004744f, +0.000443f, -0.000057f}, + {-0.104226f, -0.211764f, -0.016606f, +0.000287f, -0.000034f}, + {+0.067397f, -0.027841f, +0.010395f, -0.000286f, +0.000029f}, + {+0.014235f, +0.044128f, +0.001136f, -0.000560f, -0.000010f}, + {+0.112939f, +0.189986f, +0.013999f, -0.000350f, +0.000008f}, + {-0.051770f, +0.234766f, -0.004628f, +0.000261f, +0.000010f}, + {-0.057159f, -0.008653f, -0.009510f, -0.000310f, -0.000032f} + }, + { + {+0.309125f, -0.046398f, +0.043868f, -0.000070f, -0.000010f}, + {-0.337900f, -0.049301f, -0.053004f, -0.000032f, +0.000046f}, + {+0.006452f, +0.038403f, -0.000549f, +0.000028f, -0.000068f}, + {+0.142396f, +0.170693f, +0.019921f, +0.000322f, -0.000053f}, + {-0.012544f, -0.153200f, -0.002399f, -0.000157f, +0.000049f}, + {-0.026935f, -0.020769f, -0.002517f, +0.000142f, +0.000057f}, + {-0.135188f, -0.190554f, -0.017975f, +0.000073f, +0.000042f}, + {-0.083199f, +0.182605f, -0.012518f, -0.000033f, -0.000031f}, + {+0.022452f, +0.113080f, +0.002881f, +0.000561f, +0.000007f} + }, + { + {-0.056550f, +0.514353f, -0.008128f, -0.000326f, +0.000000f}, + {+0.002761f, -0.570850f, -0.000438f, -0.000698f, +0.000005f}, + {-0.005763f, +0.055193f, -0.003144f, -0.000303f, +0.000064f}, + {+0.066858f, +0.287146f, +0.008674f, -0.000271f, +0.000039f}, + {-0.079593f, -0.051699f, -0.009265f, +0.000243f, -0.000035f}, + {+0.004491f, -0.069814f, +0.001757f, +0.000412f, +0.000001f}, + {-0.070466f, -0.289680f, -0.008846f, +0.000325f, -0.000013f}, + {+0.096678f, -0.094366f, +0.010661f, -0.000155f, -0.000007f}, + {+0.041572f, +0.082696f, +0.006577f, +0.000266f, +0.000031f} + }, + { + {-0.298262f, +0.141215f, -0.042908f, +0.000091f, +0.000010f}, + {+0.335616f, -0.061120f, +0.052587f, +0.000136f, -0.000050f}, + {-0.028168f, +0.019948f, -0.003001f, +0.000044f, +0.000065f}, + {-0.179347f, -0.090626f, -0.024448f, -0.000251f, +0.000051f}, + {+0.055697f, +0.153136f, +0.006127f, +0.000099f, -0.000047f}, + {+0.022758f, -0.040841f, +0.001974f, -0.000245f, -0.000056f}, + {+0.171241f, +0.083402f, +0.023385f, -0.000076f, -0.000043f}, + {+0.018087f, -0.211528f, +0.004820f, +0.000028f, +0.000030f}, + {-0.051883f, -0.059963f, -0.007202f, -0.000532f, -0.000011f} + }, + { + {+0.109668f, -0.485328f, +0.016423f, +0.000299f, -0.000001f}, + {-0.064276f, +0.551492f, -0.008554f, +0.000611f, -0.000002f}, + {+0.027762f, -0.066226f, +0.006657f, +0.000180f, -0.000068f}, + {-0.008606f, -0.352413f, -0.000966f, +0.000207f, -0.000045f}, + {+0.061405f, +0.140795f, +0.008634f, -0.000186f, +0.000040f}, + {-0.022602f, +0.028596f, -0.003958f, -0.000252f, +0.000003f}, + {+0.006333f, +0.339254f, -0.001045f, -0.000313f, +0.000017f}, + {-0.095236f, -0.035271f, -0.011532f, +0.000098f, +0.000006f}, + {-0.006892f, -0.129936f, -0.001855f, -0.000288f, -0.000028f} + }, + { + {+0.280162f, -0.222327f, +0.040172f, -0.000132f, -0.000011f}, + {-0.325666f, +0.150573f, -0.051593f, -0.000209f, +0.000054f}, + {+0.028869f, -0.065199f, +0.002958f, -0.000146f, -0.000066f}, + {+0.187456f, -0.052621f, +0.025102f, +0.000202f, -0.000052f}, + {-0.080571f, -0.077938f, -0.010648f, -0.000040f, +0.000047f}, + {-0.004481f, +0.054774f, -0.000402f, +0.000382f, +0.000060f}, + {-0.176395f, +0.061006f, -0.022445f, +0.000083f, +0.000045f}, + {+0.032007f, +0.158843f, +0.002664f, -0.000125f, -0.000033f}, + {+0.057225f, -0.034866f, +0.006728f, +0.000520f, +0.000013f} + }, + { + {-0.158921f, +0.451848f, -0.023918f, -0.000281f, +0.000001f}, + {+0.121553f, -0.536831f, +0.017942f, -0.000578f, -0.000001f}, + {-0.050855f, +0.055529f, -0.008445f, -0.000215f, +0.000075f}, + {-0.052686f, +0.312195f, -0.005219f, -0.000224f, +0.000052f}, + {-0.037110f, -0.141320f, -0.006102f, +0.000195f, -0.000048f}, + {+0.024782f, +0.009783f, +0.004483f, +0.000288f, -0.000009f}, + {+0.063910f, -0.304697f, +0.007623f, +0.000328f, -0.000023f}, + {+0.068609f, +0.100384f, +0.009341f, -0.000091f, -0.000007f}, + {-0.033166f, +0.101342f, -0.001173f, +0.000251f, +0.000026f} + }, + { + {-0.254134f, +0.305063f, -0.036122f, +0.000175f, +0.000012f}, + {+0.313748f, -0.244268f, +0.048706f, +0.000275f, -0.000058f}, + {-0.012267f, +0.112660f, -0.001928f, +0.000238f, +0.000072f}, + {-0.161165f, +0.140763f, -0.024820f, -0.000200f, +0.000054f}, + {+0.090126f, +0.058592f, +0.014503f, +0.000035f, -0.000049f}, + {-0.010917f, -0.042825f, -0.001085f, -0.000524f, -0.000070f}, + {+0.139731f, -0.183781f, +0.020533f, -0.000104f, -0.000047f}, + {-0.056473f, -0.093013f, -0.007395f, +0.000190f, +0.000040f}, + {-0.028362f, +0.108300f, -0.004536f, -0.000507f, -0.000014f} + }, + { + {+0.204108f, -0.397468f, +0.030234f, +0.000284f, -0.000002f}, + {-0.186187f, +0.523327f, -0.027065f, +0.000548f, +0.000002f}, + {+0.063644f, -0.004588f, +0.010914f, +0.000342f, -0.000092f}, + {+0.084172f, -0.238464f, +0.012067f, +0.000307f, -0.000066f}, + {+0.023241f, +0.163547f, +0.001737f, -0.000268f, +0.000061f}, + {-0.017633f, -0.031273f, -0.004558f, -0.000453f, +0.000024f}, + {-0.103701f, +0.192462f, -0.015036f, -0.000326f, +0.000032f}, + {-0.040508f, -0.117502f, -0.005435f, +0.000218f, +0.000003f}, + {+0.044739f, -0.003358f, +0.002673f, -0.000166f, -0.000026f} + }, + { + {+0.217925f, -0.374764f, +0.031310f, -0.000194f, -0.000015f}, + {-0.287194f, +0.371793f, -0.043606f, -0.000298f, +0.000065f}, + {-0.012378f, -0.121133f, -0.001692f, -0.000139f, -0.000076f}, + {+0.138854f, -0.153518f, +0.021173f, +0.000296f, -0.000054f}, + {-0.110078f, -0.041091f, -0.015691f, -0.000117f, +0.000048f}, + {+0.016824f, +0.020994f, +0.002433f, +0.000470f, +0.000080f}, + {-0.093179f, +0.207425f, -0.014155f, +0.000078f, +0.000048f}, + {+0.066586f, +0.047692f, +0.008958f, -0.000170f, -0.000050f}, + {-0.006034f, -0.079321f, +0.001680f, +0.000546f, +0.000014f} + }, + { + {-0.239100f, +0.326388f, -0.035676f, -0.000310f, +0.000005f}, + {+0.254019f, -0.457019f, +0.035395f, -0.000472f, -0.000004f}, + {-0.063172f, -0.043743f, -0.010677f, -0.000446f, +0.000122f}, + {-0.106250f, +0.224976f, -0.016160f, -0.000331f, +0.000087f}, + {+0.006588f, -0.220018f, +0.002089f, +0.000280f, -0.000081f}, + {+0.012847f, +0.026665f, +0.004159f, +0.000613f, -0.000053f}, + {+0.116434f, -0.116659f, +0.017836f, +0.000308f, -0.000043f}, + {+0.014851f, +0.127471f, +0.001839f, -0.000426f, +0.000008f}, + {-0.024363f, -0.047415f, -0.002156f, +0.000076f, +0.000029f} + }, + { + {-0.177651f, +0.419626f, -0.025372f, +0.000189f, +0.000018f}, + {+0.234856f, -0.487730f, +0.036693f, +0.000275f, -0.000076f}, + {+0.036507f, +0.108100f, +0.004077f, -0.000196f, +0.000068f}, + {-0.123472f, +0.198845f, -0.018454f, -0.000539f, +0.000045f}, + {+0.120851f, -0.044023f, +0.017124f, +0.000326f, -0.000038f}, + {-0.019744f, -0.023127f, -0.003003f, -0.000144f, -0.000080f}, + {+0.054985f, -0.211321f, +0.008525f, +0.000002f, -0.000046f}, + {-0.067840f, +0.000644f, -0.008680f, +0.000062f, +0.000059f}, + {+0.013438f, +0.012637f, +0.000624f, -0.000676f, -0.000018f} + }, + { + {+0.265046f, -0.258984f, +0.039613f, +0.000315f, -0.000010f}, + {-0.305263f, +0.341002f, -0.042929f, +0.000320f, +0.000009f}, + {+0.052493f, +0.082191f, +0.010230f, +0.000306f, -0.000162f}, + {+0.135578f, -0.200816f, +0.020288f, +0.000195f, -0.000112f}, + {-0.047909f, +0.214878f, -0.007490f, -0.000138f, +0.000104f}, + {-0.013632f, -0.032324f, -0.004221f, -0.000548f, +0.000093f}, + {-0.118924f, +0.057091f, -0.018445f, -0.000261f, +0.000056f}, + {+0.008331f, -0.114878f, +0.000663f, +0.000507f, -0.000028f}, + {+0.005413f, +0.022808f, -0.000439f, -0.000059f, -0.000035f} + }, + { + {+0.136435f, -0.454829f, +0.019582f, -0.000149f, -0.000018f}, + {-0.168461f, +0.553033f, -0.027068f, -0.000281f, +0.000094f}, + {-0.056383f, -0.088168f, -0.008472f, +0.000590f, -0.000037f}, + {+0.096992f, -0.262712f, +0.013318f, +0.000816f, -0.000021f}, + {-0.110234f, +0.118824f, -0.015813f, -0.000528f, +0.000014f}, + {+0.029948f, +0.036351f, +0.005263f, -0.000282f, +0.000056f}, + {-0.020326f, +0.210405f, -0.002631f, -0.000079f, +0.000039f}, + {+0.060030f, -0.032820f, +0.009213f, +0.000193f, -0.000059f}, + {-0.003943f, +0.005977f, -0.000375f, +0.000898f, +0.000028f} + }, + { + {-0.284355f, +0.190433f, -0.042800f, -0.000266f, +0.000017f}, + {+0.335277f, -0.219226f, +0.046865f, -0.000105f, -0.000022f}, + {-0.036478f, -0.124061f, -0.005694f, +0.000344f, +0.000198f}, + {-0.163243f, +0.134561f, -0.022257f, +0.000183f, +0.000132f}, + {+0.083868f, -0.178051f, +0.011964f, -0.000280f, -0.000122f}, + {+0.010723f, +0.070555f, +0.001815f, -0.000022f, -0.000132f}, + {+0.111861f, +0.009495f, +0.016549f, +0.000135f, -0.000069f}, + {-0.022143f, +0.095016f, -0.003757f, -0.000379f, +0.000052f}, + {-0.000565f, +0.002446f, +0.001442f, +0.000102f, +0.000039f} + }, + { + {-0.095291f, +0.479278f, -0.013467f, +0.000098f, +0.000016f}, + {+0.099306f, -0.582261f, +0.017486f, +0.000468f, -0.000116f}, + {+0.078355f, +0.049439f, +0.008412f, -0.000772f, -0.000023f}, + {-0.051414f, +0.305039f, -0.008849f, -0.000882f, -0.000019f}, + {+0.082995f, -0.177822f, +0.013237f, +0.000567f, +0.000026f}, + {-0.049222f, -0.017872f, -0.004795f, +0.000539f, -0.000005f}, + {-0.011696f, -0.179076f, -0.000545f, +0.000092f, -0.000026f}, + {-0.054786f, +0.044185f, -0.008075f, -0.000456f, +0.000046f}, + {-0.005431f, -0.002236f, -0.000119f, -0.000987f, -0.000046f} + }, + { + {+0.300035f, -0.126686f, +0.045279f, +0.000141f, -0.000023f}, + {-0.347527f, +0.104803f, -0.049661f, -0.000162f, +0.000050f}, + {+0.000140f, +0.170954f, +0.002869f, -0.001398f, -0.000210f}, + {+0.165631f, -0.028348f, +0.023643f, -0.000777f, -0.000136f}, + {-0.103480f, +0.108513f, -0.015479f, +0.000834f, +0.000124f}, + {+0.013480f, -0.114650f, -0.000763f, +0.001025f, +0.000149f}, + {-0.089040f, -0.060481f, -0.014574f, +0.000082f, +0.000079f}, + {+0.036486f, -0.097396f, +0.006421f, +0.000002f, -0.000073f}, + {+0.003333f, -0.016091f, -0.002020f, -0.000329f, -0.000034f} + }, + { + {+0.051566f, -0.506796f, +0.007039f, -0.000099f, -0.000010f}, + {-0.033731f, +0.589122f, -0.007210f, -0.000795f, +0.000134f}, + {-0.079279f, +0.049325f, -0.008393f, +0.000023f, +0.000100f}, + {+0.010994f, -0.265800f, +0.003418f, +0.000397f, +0.000069f}, + {-0.052364f, +0.186418f, -0.009164f, -0.000026f, -0.000073f}, + {+0.052053f, -0.056265f, +0.005015f, +0.000066f, -0.000065f}, + {+0.026200f, +0.116741f, +0.002983f, +0.000008f, +0.000008f}, + {+0.048119f, -0.079713f, +0.006644f, +0.000374f, -0.000021f}, + {+0.010900f, -0.005754f, +0.000987f, +0.000869f, +0.000068f} + }, + { + {-0.311437f, +0.048951f, -0.046976f, +0.000118f, +0.000027f}, + {+0.349598f, +0.000051f, +0.050374f, +0.000038f, -0.000095f}, + {+0.040613f, -0.137831f, -0.000066f, +0.002700f, +0.000181f}, + {-0.149052f, -0.019968f, -0.023093f, +0.001262f, +0.000115f}, + {+0.107473f, -0.058841f, +0.017699f, -0.001256f, -0.000101f}, + {-0.043140f, +0.091871f, -0.000478f, -0.002412f, -0.000129f}, + {+0.064483f, +0.059569f, +0.011301f, -0.000210f, -0.000082f}, + {-0.054255f, +0.077805f, -0.009915f, +0.000915f, +0.000081f}, + {-0.008263f, +0.025078f, +0.001271f, +0.000578f, +0.000014f} + }, + { + {-0.002478f, +0.521278f, -0.000544f, +0.000189f, +0.000002f}, + {-0.031629f, -0.587979f, -0.001886f, +0.001424f, -0.000137f}, + {+0.053320f, -0.118505f, +0.004875f, +0.003174f, -0.000173f}, + {+0.008995f, +0.224389f, +0.001153f, +0.001756f, -0.000113f}, + {+0.029482f, -0.180110f, +0.004281f, -0.002087f, +0.000115f}, + {-0.033134f, +0.107741f, -0.001943f, -0.002753f, +0.000132f}, + {-0.023463f, -0.074570f, -0.002999f, -0.000562f, +0.000011f}, + {-0.031477f, +0.111590f, -0.005933f, +0.000350f, -0.000010f}, + {-0.015016f, +0.015277f, -0.001484f, -0.000128f, -0.000086f} + } +}; + +const float rightHRIRImag_HOA2[BINAURAL_CONVBANDS][9][BINAURAL_NTAPS]= +{ + { + {-0.036807f, -0.174045f, +0.179146f, +0.002758f, +0.000002f}, + {+0.081675f, -0.202936f, +0.124120f, +0.000184f, -0.000007f}, + {-0.000843f, -0.038970f, +0.052716f, -0.008143f, +0.000125f}, + {-0.004478f, -0.013122f, +0.028558f, -0.008290f, +0.000045f}, + {+0.006316f, -0.012132f, +0.006515f, -0.002119f, -0.000027f}, + {-0.000794f, +0.004296f, +0.005127f, -0.004942f, +0.000100f}, + {+0.010293f, -0.025048f, +0.008939f, -0.001610f, -0.000015f}, + {-0.001111f, -0.008117f, +0.033872f, -0.002789f, -0.000061f}, + {+0.009292f, -0.031334f, +0.001941f, -0.005137f, +0.000092f} + }, + { + {+0.046648f, -0.328217f, -0.004769f, -0.004729f, +0.000002f}, + {-0.078219f, -0.186706f, +0.335495f, -0.010505f, -0.000011f}, + {+0.003389f, -0.028871f, +0.074809f, -0.001736f, +0.000093f}, + {+0.011160f, -0.006841f, +0.031676f, +0.003121f, +0.000038f}, + {-0.007422f, -0.043414f, +0.006982f, +0.001963f, -0.000025f}, + {-0.003254f, -0.003751f, +0.013792f, -0.005415f, +0.000065f}, + {-0.015187f, -0.099887f, -0.012484f, -0.000245f, -0.000014f}, + {-0.000628f, +0.067594f, +0.116266f, +0.000062f, -0.000037f}, + {-0.017876f, -0.212825f, -0.109502f, -0.000434f, +0.000062f} + }, + { + {-0.062391f, -0.298587f, +0.055506f, +0.004604f, -0.000002f}, + {+0.110139f, +0.008656f, -0.076872f, +0.013912f, +0.000006f}, + {-0.006661f, +0.041459f, +0.008680f, +0.005198f, -0.000143f}, + {-0.017346f, +0.064502f, -0.000311f, +0.000229f, -0.000050f}, + {+0.012574f, -0.112476f, +0.042863f, -0.000548f, +0.000028f}, + {+0.008554f, -0.117685f, +0.085746f, +0.010222f, -0.000121f}, + {+0.018386f, -0.231260f, +0.055470f, +0.002605f, +0.000015f}, + {-0.000043f, +0.098076f, +0.074022f, +0.004739f, +0.000074f}, + {+0.020228f, -0.438516f, +0.026318f, +0.002404f, -0.000109f} + }, + { + {+0.087093f, -0.185047f, -0.039795f, -0.001148f, -0.000002f}, + {-0.179442f, -0.138305f, +0.024941f, -0.004193f, +0.000016f}, + {+0.010153f, +0.053373f, -0.028050f, +0.000631f, -0.000056f}, + {+0.022351f, +0.115243f, -0.015706f, +0.000824f, -0.000030f}, + {-0.016881f, -0.188764f, +0.015179f, -0.001478f, +0.000024f}, + {-0.011436f, -0.169671f, +0.055918f, -0.006134f, -0.000022f}, + {-0.007516f, -0.296099f, +0.030173f, -0.003476f, +0.000013f}, + {+0.001835f, +0.047910f, -0.004611f, -0.005834f, +0.000008f}, + {+0.012183f, -0.522145f, -0.012957f, -0.000556f, -0.000026f} + }, + { + {-0.118429f, +0.036347f, +0.008994f, -0.001813f, +0.000002f}, + {+0.195669f, -0.557237f, -0.044782f, -0.005092f, -0.000007f}, + {-0.015263f, +0.077237f, -0.016810f, -0.004030f, +0.000145f}, + {-0.025184f, +0.187315f, -0.016739f, -0.002009f, +0.000052f}, + {+0.002368f, -0.225780f, +0.012360f, +0.001921f, -0.000030f}, + {+0.004974f, -0.160969f, +0.009969f, +0.002830f, +0.000125f}, + {-0.023306f, -0.243341f, -0.007075f, +0.002049f, -0.000015f}, + {+0.002539f, +0.043064f, -0.021665f, +0.000872f, -0.000074f}, + {-0.088704f, -0.392340f, -0.007003f, +0.000682f, +0.000110f} + }, + { + {+0.111405f, +0.324593f, -0.000106f, +0.001284f, +0.000002f}, + {-0.051589f, -0.868735f, +0.017996f, +0.003263f, -0.000021f}, + {+0.016644f, +0.116184f, -0.001320f, +0.001603f, +0.000021f}, + {+0.004222f, +0.242602f, +0.004139f, +0.000694f, +0.000023f}, + {+0.043767f, -0.191695f, -0.013679f, -0.000447f, -0.000023f}, + {+0.015164f, -0.134423f, -0.000808f, -0.001816f, -0.000022f}, + {+0.056350f, -0.114712f, -0.004403f, +0.000262f, -0.000013f}, + {-0.013985f, +0.017892f, -0.014819f, +0.002850f, +0.000020f}, + {+0.155162f, -0.041775f, -0.009744f, -0.001067f, -0.000007f} + }, + { + {-0.005031f, +0.479299f, +0.003719f, +0.000668f, -0.000001f}, + {-0.200078f, -0.617927f, -0.007665f, +0.002820f, +0.000011f}, + {-0.000023f, +0.128657f, +0.013087f, +0.000664f, -0.000135f}, + {+0.058851f, +0.171528f, +0.001838f, +0.000874f, -0.000052f}, + {-0.096474f, -0.013567f, -0.000492f, -0.000745f, +0.000033f}, + {-0.033027f, -0.054815f, -0.011873f, -0.000718f, -0.000112f}, + {-0.056173f, +0.039930f, +0.001299f, -0.001259f, +0.000015f}, + {+0.020372f, -0.043296f, +0.005705f, -0.001029f, +0.000062f}, + {-0.120615f, +0.346286f, -0.013057f, -0.000997f, -0.000098f} + }, + { + {-0.150793f, +0.255763f, -0.018096f, -0.000700f, -0.000003f}, + {+0.305707f, +0.158732f, +0.020717f, -0.002646f, +0.000023f}, + {-0.031522f, +0.078751f, +0.001465f, -0.000649f, +0.000004f}, + {-0.117107f, -0.077176f, -0.004724f, -0.000677f, -0.000018f}, + {+0.093448f, +0.250387f, +0.003900f, +0.000293f, +0.000021f}, + {+0.019351f, +0.028793f, +0.005286f, +0.001746f, +0.000057f}, + {+0.008202f, +0.128064f, +0.008788f, +0.000321f, +0.000014f}, + {-0.007910f, -0.090056f, -0.001122f, -0.000874f, -0.000041f}, + {-0.028598f, +0.475838f, +0.000814f, +0.001596f, +0.000033f} + }, + { + {+0.168446f, -0.229619f, +0.014684f, -0.000669f, +0.000001f}, + {-0.083028f, +0.735157f, -0.014942f, -0.001813f, -0.000016f}, + {+0.038009f, -0.019540f, -0.002379f, +0.000167f, +0.000118f}, + {+0.076227f, -0.357687f, +0.003886f, -0.000171f, +0.000051f}, + {-0.001844f, +0.389834f, -0.002086f, +0.000484f, -0.000036f}, + {+0.023047f, +0.027798f, +0.004234f, +0.000497f, +0.000086f}, + {+0.049557f, +0.071524f, +0.006302f, +0.000906f, -0.000015f}, + {-0.020459f, -0.071010f, -0.006011f, -0.000277f, -0.000043f}, + {+0.164709f, +0.192774f, +0.015494f, +0.000611f, +0.000078f} + }, + { + {+0.032104f, -0.431950f, +0.008160f, +0.000726f, +0.000004f}, + {-0.260971f, +0.444113f, -0.025794f, +0.002256f, -0.000023f}, + {+0.008385f, -0.056100f, +0.003103f, +0.000095f, -0.000018f}, + {+0.067113f, -0.367438f, +0.006254f, +0.000198f, +0.000013f}, + {-0.110994f, +0.232179f, -0.008226f, -0.000230f, -0.000019f}, + {-0.042146f, -0.074633f, -0.011186f, -0.001034f, -0.000080f}, + {-0.054919f, -0.080526f, -0.007215f, -0.000649f, -0.000015f}, + {+0.040307f, +0.016321f, -0.001764f, +0.000829f, +0.000052f}, + {-0.137526f, -0.246324f, -0.007988f, -0.001200f, -0.000047f} + }, + { + {-0.213011f, -0.046980f, -0.025382f, +0.000494f, -0.000002f}, + {+0.288608f, -0.395114f, +0.041290f, +0.001283f, +0.000020f}, + {-0.054132f, +0.049386f, -0.007328f, -0.000057f, -0.000101f}, + {-0.158872f, -0.025219f, -0.014949f, +0.000114f, -0.000051f}, + {+0.121403f, -0.113923f, +0.010204f, -0.000233f, +0.000039f}, + {+0.000083f, -0.147208f, -0.001729f, -0.000936f, -0.000054f}, + {-0.003048f, -0.154788f, -0.006001f, -0.000457f, +0.000017f}, + {-0.025771f, +0.106681f, +0.002198f, +0.000260f, +0.000022f}, + {-0.031294f, -0.392095f, -0.012018f, -0.000574f, -0.000057f} + }, + { + {+0.092561f, +0.424974f, +0.010810f, -0.000681f, -0.000004f}, + {+0.075902f, -0.706014f, +0.007828f, -0.002003f, +0.000022f}, + {+0.013154f, +0.161409f, +0.005603f, -0.000211f, +0.000023f}, + {+0.066254f, +0.312283f, +0.004744f, +0.000026f, -0.000009f}, + {-0.002036f, -0.295824f, +0.002824f, -0.000014f, +0.000016f}, + {+0.060712f, -0.057606f, +0.008012f, +0.000958f, +0.000087f}, + {+0.056082f, -0.061636f, +0.008052f, +0.000524f, +0.000016f}, + {-0.017683f, +0.111805f, -0.002642f, -0.000403f, -0.000052f}, + {+0.146777f, -0.113700f, +0.017959f, +0.001010f, +0.000051f} + }, + { + {+0.185320f, +0.277358f, +0.022712f, -0.000351f, +0.000003f}, + {-0.344646f, -0.053912f, -0.053141f, -0.000939f, -0.000024f}, + {+0.086838f, +0.051841f, +0.006637f, +0.000180f, +0.000089f}, + {+0.105953f, +0.243944f, +0.014187f, -0.000146f, +0.000052f}, + {-0.111669f, -0.123210f, -0.013173f, +0.000233f, -0.000042f}, + {-0.059758f, +0.131270f, -0.005702f, +0.000643f, +0.000024f}, + {-0.036902f, +0.080134f, -0.000673f, +0.000325f, -0.000020f}, + {+0.046052f, +0.010828f, +0.004846f, -0.000246f, -0.000004f}, + {-0.077354f, +0.231910f, -0.006126f, +0.000362f, +0.000039f} + }, + { + {-0.189874f, -0.302002f, -0.024437f, +0.000614f, +0.000004f}, + {+0.115695f, +0.648554f, +0.017187f, +0.001787f, -0.000020f}, + {-0.095557f, -0.230274f, -0.014609f, +0.000114f, -0.000025f}, + {-0.124579f, -0.115101f, -0.017138f, -0.000088f, +0.000005f}, + {+0.076830f, +0.166427f, +0.008366f, +0.000057f, -0.000012f}, + {-0.014099f, +0.211406f, +0.003003f, -0.000568f, -0.000083f}, + {-0.023815f, +0.096932f, -0.005676f, -0.000440f, -0.000016f}, + {-0.021782f, -0.093860f, -0.002871f, +0.000144f, +0.000046f}, + {-0.073734f, +0.238033f, -0.010094f, -0.000798f, -0.000049f} + }, + { + {-0.114426f, -0.412169f, -0.014852f, +0.000236f, -0.000004f}, + {+0.286060f, +0.383093f, +0.046192f, +0.000709f, +0.000026f}, + {-0.046449f, -0.312275f, +0.001217f, -0.000173f, -0.000081f}, + {-0.033813f, -0.256375f, -0.003843f, +0.000097f, -0.000052f}, + {+0.058368f, +0.191934f, +0.007694f, -0.000156f, +0.000044f}, + {+0.082552f, +0.075789f, +0.001514f, -0.000419f, -0.000001f}, + {+0.034473f, +0.003962f, +0.003250f, -0.000222f, +0.000024f}, + {-0.030695f, -0.079541f, -0.002956f, +0.000205f, -0.000008f}, + {+0.109333f, -0.044153f, +0.010252f, -0.000221f, -0.000027f} + }, + { + {+0.243812f, +0.144409f, +0.034010f, -0.000542f, -0.000004f}, + {-0.244934f, -0.430481f, -0.034506f, -0.001609f, +0.000017f}, + {+0.170812f, +0.012823f, +0.017960f, -0.000055f, +0.000026f}, + {+0.131633f, -0.001407f, +0.017629f, +0.000130f, -0.000001f}, + {-0.106876f, -0.065820f, -0.014688f, -0.000058f, +0.000007f}, + {-0.074279f, -0.153828f, -0.004932f, +0.000344f, +0.000072f}, + {+0.015569f, -0.022714f, +0.005207f, +0.000342f, +0.000015f}, + {+0.042274f, +0.032502f, +0.005140f, -0.000141f, -0.000036f}, + {-0.002837f, -0.214678f, +0.001786f, +0.000703f, +0.000045f} + }, + { + {+0.033445f, +0.465385f, +0.003356f, -0.000154f, +0.000005f}, + {-0.178742f, -0.528051f, -0.033152f, -0.000550f, -0.000028f}, + {-0.087971f, +0.405281f, -0.012908f, +0.000193f, +0.000076f}, + {-0.026721f, +0.243121f, -0.004203f, -0.000014f, +0.000052f}, + {+0.002076f, -0.236562f, +0.002162f, +0.000025f, -0.000045f}, + {+0.002032f, -0.267039f, +0.003164f, +0.000247f, -0.000013f}, + {-0.028517f, +0.053584f, -0.006240f, +0.000168f, -0.000027f}, + {+0.008947f, +0.081105f, +0.001162f, -0.000039f, +0.000013f}, + {-0.084445f, -0.084241f, -0.009779f, +0.000091f, +0.000019f} + }, + { + {-0.265151f, +0.001033f, -0.038066f, +0.000492f, +0.000004f}, + {+0.302075f, +0.213979f, +0.045228f, +0.001475f, -0.000016f}, + {-0.119858f, +0.361574f, -0.010750f, +0.000044f, -0.000027f}, + {-0.110652f, +0.115838f, -0.014030f, -0.000216f, -0.000003f}, + {+0.106693f, -0.078792f, +0.012412f, +0.000130f, -0.000002f}, + {+0.068216f, -0.174315f, +0.001858f, -0.000344f, -0.000061f}, + {-0.039397f, +0.042700f, -0.003620f, -0.000322f, -0.000013f}, + {-0.052577f, -0.019393f, -0.009859f, +0.000138f, +0.000029f}, + {+0.042907f, +0.113552f, +0.005000f, -0.000638f, -0.000041f} + }, + { + {+0.045692f, -0.476580f, +0.008546f, +0.000086f, -0.000005f}, + {+0.080587f, +0.555433f, +0.017854f, +0.000450f, +0.000030f}, + {+0.182440f, -0.087182f, +0.017382f, -0.000294f, -0.000073f}, + {+0.075234f, -0.167476f, +0.008676f, +0.000034f, -0.000051f}, + {-0.071029f, +0.192007f, -0.008454f, -0.000011f, +0.000045f}, + {-0.086510f, +0.044174f, -0.003825f, -0.000041f, +0.000021f}, + {+0.075632f, -0.138240f, +0.011735f, -0.000028f, +0.000030f}, + {+0.013949f, -0.129305f, +0.005892f, -0.000040f, -0.000013f}, + {+0.045386f, +0.105892f, +0.005725f, +0.000024f, -0.000013f} + }, + { + {+0.264038f, -0.137768f, +0.037820f, -0.000452f, -0.000003f}, + {-0.327432f, -0.075214f, -0.050477f, -0.001428f, +0.000014f}, + {-0.022770f, -0.385123f, +0.004729f, +0.000100f, +0.000029f}, + {+0.054670f, -0.198426f, +0.007785f, +0.000271f, +0.000006f}, + {-0.049580f, +0.225410f, -0.005863f, -0.000204f, -0.000001f}, + {+0.043237f, +0.226727f, -0.000581f, +0.000235f, +0.000054f}, + {+0.021121f, -0.232475f, -0.003318f, +0.000194f, +0.000010f}, + {+0.068959f, -0.050792f, +0.006419f, -0.000075f, -0.000026f}, + {-0.050269f, -0.045913f, -0.008553f, +0.000508f, +0.000038f} + }, + { + {-0.122605f, +0.455832f, -0.019204f, -0.000024f, +0.000005f}, + {+0.006912f, -0.595107f, -0.002722f, -0.000314f, -0.000031f}, + {-0.131648f, -0.207572f, -0.020072f, +0.000119f, +0.000071f}, + {-0.075587f, -0.001389f, -0.007880f, -0.000200f, +0.000051f}, + {+0.092628f, +0.010795f, +0.009442f, +0.000210f, -0.000045f}, + {+0.034470f, +0.235595f, +0.004153f, +0.000184f, -0.000026f}, + {-0.138101f, +0.003560f, -0.013139f, +0.000044f, -0.000033f}, + {-0.076887f, +0.172735f, -0.011353f, -0.000186f, +0.000014f}, + {-0.018601f, -0.096133f, -0.000488f, -0.000002f, +0.000009f} + }, + { + {-0.239360f, +0.273817f, -0.034391f, +0.000359f, +0.000003f}, + {+0.344438f, -0.077598f, +0.050391f, +0.001368f, -0.000013f}, + {+0.085915f, +0.127791f, +0.009171f, +0.000053f, -0.000030f}, + {-0.003884f, +0.104668f, -0.002926f, -0.000117f, -0.000009f}, + {-0.025938f, -0.166624f, -0.001223f, -0.000030f, +0.000004f}, + {-0.087357f, +0.053855f, -0.006567f, -0.000375f, -0.000050f}, + {+0.079989f, +0.335328f, +0.010537f, -0.000213f, -0.000007f}, + {-0.027119f, +0.254717f, +0.001273f, +0.000328f, +0.000025f}, + {+0.049245f, +0.007836f, +0.007008f, -0.000515f, -0.000036f} + }, + { + {+0.189098f, -0.383414f, +0.028124f, +0.000092f, -0.000006f}, + {-0.108559f, +0.623832f, -0.013156f, +0.000170f, +0.000033f}, + {+0.052357f, +0.172914f, +0.014590f, -0.000154f, -0.000071f}, + {+0.027066f, +0.057228f, +0.004014f, +0.000183f, -0.000051f}, + {-0.042915f, -0.138441f, -0.007131f, -0.000079f, +0.000046f}, + {+0.062416f, -0.169373f, +0.002459f, -0.000150f, +0.000033f}, + {+0.109725f, +0.292825f, +0.008449f, +0.000038f, +0.000034f}, + {+0.124357f, +0.027929f, +0.015491f, +0.000061f, -0.000016f}, + {-0.001095f, +0.082699f, -0.001391f, +0.000112f, -0.000006f} + }, + { + {+0.194740f, -0.370983f, +0.028830f, -0.000424f, -0.000003f}, + {-0.334444f, +0.280705f, -0.047056f, -0.001250f, +0.000011f}, + {-0.070560f, -0.024714f, -0.010185f, -0.000110f, +0.000033f}, + {+0.007889f, +0.031645f, +0.004166f, +0.000046f, +0.000012f}, + {+0.044996f, -0.004394f, +0.003024f, +0.000024f, -0.000007f}, + {+0.022525f, -0.227369f, +0.001642f, +0.000313f, +0.000046f}, + {-0.165185f, -0.117904f, -0.015701f, +0.000142f, +0.000004f}, + {-0.080987f, -0.285489f, -0.008434f, -0.000232f, -0.000025f}, + {-0.049085f, +0.003557f, -0.010651f, +0.000401f, +0.000034f} + }, + { + {-0.234674f, +0.289561f, -0.036001f, +0.000013f, +0.000007f}, + {+0.223672f, -0.578241f, +0.027233f, -0.000092f, -0.000035f}, + {-0.024623f, -0.100323f, -0.004564f, +0.000328f, +0.000072f}, + {+0.017801f, +0.020633f, -0.002076f, -0.000042f, +0.000053f}, + {-0.013115f, +0.081785f, +0.000959f, -0.000079f, -0.000049f}, + {-0.080738f, -0.072886f, -0.004201f, +0.000076f, -0.000042f}, + {-0.002607f, -0.352196f, -0.003911f, -0.000017f, -0.000036f}, + {-0.069172f, -0.307620f, -0.004866f, -0.000006f, +0.000021f}, + {+0.028180f, -0.122432f, +0.007621f, -0.000085f, +0.000003f} + }, + { + {-0.147199f, +0.422160f, -0.022071f, +0.000321f, +0.000003f}, + {+0.267023f, -0.513414f, +0.037707f, +0.001150f, -0.000010f}, + {+0.060495f, +0.031583f, +0.008763f, -0.000093f, -0.000037f}, + {-0.065578f, -0.105960f, -0.010002f, -0.000209f, -0.000017f}, + {-0.014195f, +0.075807f, -0.002631f, +0.000201f, +0.000012f}, + {+0.053647f, +0.122427f, +0.002638f, -0.000093f, -0.000039f}, + {+0.142781f, -0.115711f, +0.024592f, -0.000188f, -0.000001f}, + {+0.149590f, +0.020216f, +0.015264f, -0.000015f, +0.000023f}, + {+0.037239f, -0.118872f, +0.000382f, -0.000458f, -0.000033f} + }, + { + {+0.269441f, -0.218896f, +0.041241f, +0.000004f, -0.000008f}, + {-0.303693f, +0.362352f, -0.037014f, +0.000053f, +0.000037f}, + {+0.007833f, +0.119694f, -0.000960f, -0.000345f, -0.000073f}, + {-0.004355f, -0.200633f, +0.001490f, +0.000103f, -0.000055f}, + {+0.032562f, -0.000305f, +0.004514f, -0.000019f, +0.000051f}, + {+0.017941f, +0.163230f, +0.007036f, -0.000034f, +0.000051f}, + {-0.046904f, +0.177005f, -0.004300f, +0.000147f, +0.000038f}, + {-0.058069f, +0.331227f, -0.002327f, +0.000118f, -0.000026f}, + {-0.065673f, +0.027120f, -0.006378f, +0.000220f, -0.000001f} + }, + { + {+0.096520f, -0.484461f, +0.013741f, -0.000314f, -0.000002f}, + {-0.168182f, +0.564851f, -0.028399f, -0.001136f, +0.000010f}, + {-0.055680f, +0.028246f, -0.005855f, +0.000184f, +0.000045f}, + {+0.118738f, -0.014371f, +0.012220f, +0.000155f, +0.000023f}, + {-0.022063f, -0.085271f, -0.002211f, -0.000137f, -0.000019f}, + {-0.049978f, +0.052230f, -0.005756f, -0.000013f, +0.000028f}, + {-0.111748f, +0.067754f, -0.020811f, +0.000056f, -0.000003f}, + {-0.098929f, +0.266647f, -0.009254f, +0.000013f, -0.000019f}, + {+0.022954f, +0.155435f, -0.001383f, +0.000344f, +0.000033f} + }, + { + {-0.298102f, +0.119927f, -0.044074f, +0.000054f, +0.000009f}, + {+0.324241f, -0.201048f, +0.044886f, +0.000061f, -0.000040f}, + {+0.018875f, -0.083814f, -0.000418f, +0.000398f, +0.000073f}, + {-0.061162f, +0.256472f, -0.008387f, +0.000024f, +0.000055f}, + {-0.028563f, -0.073381f, -0.002819f, -0.000106f, -0.000051f}, + {+0.019828f, -0.052279f, +0.002320f, -0.000130f, -0.000057f}, + {+0.058477f, -0.203321f, +0.012650f, -0.000104f, -0.000040f}, + {+0.133242f, -0.084836f, +0.013242f, -0.000015f, +0.000030f}, + {+0.042678f, +0.121577f, +0.007398f, -0.000185f, -0.000002f} + }, + { + {-0.034897f, +0.521904f, -0.005636f, +0.000275f, +0.000001f}, + {+0.096022f, -0.555951f, +0.014099f, +0.001080f, -0.000009f}, + {+0.022232f, -0.076542f, +0.003659f, -0.000139f, -0.000053f}, + {-0.117964f, +0.166708f, -0.014124f, -0.000190f, -0.000030f}, + {+0.054876f, +0.054232f, +0.005942f, +0.000155f, +0.000026f}, + {+0.020865f, -0.046834f, +0.005114f, +0.000034f, -0.000016f}, + {+0.119090f, -0.116285f, +0.014688f, -0.000066f, +0.000006f}, + {-0.009162f, -0.296851f, +0.001585f, -0.000015f, +0.000013f}, + {-0.057034f, -0.032243f, -0.004358f, -0.000329f, -0.000032f} + }, + { + {+0.309227f, -0.006599f, +0.046261f, -0.000088f, -0.000010f}, + {-0.335689f, +0.108899f, -0.045170f, -0.000116f, +0.000044f}, + {-0.010768f, -0.025357f, +0.000938f, -0.000529f, -0.000070f}, + {+0.120101f, -0.199389f, +0.018645f, -0.000027f, -0.000054f}, + {+0.005167f, +0.128785f, -0.000940f, +0.000138f, +0.000050f}, + {-0.023264f, +0.025419f, -0.006527f, +0.000284f, +0.000058f}, + {-0.107846f, +0.228561f, -0.015701f, +0.000136f, +0.000041f}, + {-0.112356f, -0.131761f, -0.015190f, -0.000104f, -0.000031f}, + {+0.003668f, -0.126548f, +0.000034f, +0.000218f, +0.000005f} + }, + { + {-0.027502f, -0.522603f, -0.003411f, -0.000264f, -0.000000f}, + {-0.030738f, +0.578245f, -0.004213f, -0.001069f, +0.000007f}, + {-0.000609f, -0.013454f, -0.002363f, +0.000076f, +0.000061f}, + {+0.087398f, -0.248212f, +0.011938f, +0.000075f, +0.000037f}, + {-0.076224f, +0.003106f, -0.010057f, -0.000063f, -0.000032f}, + {-0.005937f, +0.057510f, -0.000360f, +0.000077f, +0.000005f}, + {-0.095342f, +0.246056f, -0.013136f, +0.000057f, -0.000011f}, + {+0.080706f, +0.167833f, +0.010054f, +0.000007f, -0.000008f}, + {+0.052615f, -0.051218f, +0.005205f, +0.000238f, +0.000032f} + }, + { + {-0.304352f, -0.097670f, -0.045722f, +0.000119f, +0.000010f}, + {+0.340086f, +0.006265f, +0.046602f, +0.000169f, -0.000048f}, + {-0.020424f, +0.011099f, -0.001667f, +0.000571f, +0.000066f}, + {-0.162423f, +0.138866f, -0.025027f, +0.000093f, +0.000052f}, + {+0.033809f, -0.166438f, +0.006399f, -0.000195f, -0.000048f}, + {+0.027146f, +0.011761f, +0.003177f, -0.000395f, -0.000056f}, + {+0.155957f, -0.140724f, +0.023139f, -0.000149f, -0.000042f}, + {+0.050658f, +0.213522f, +0.006115f, +0.000088f, +0.000030f}, + {-0.039762f, +0.093271f, -0.004720f, -0.000234f, -0.000009f} + }, + { + {+0.084174f, +0.498153f, +0.011738f, +0.000258f, -0.000001f}, + {-0.034060f, -0.568731f, -0.004971f, +0.001035f, -0.000004f}, + {+0.017008f, +0.063888f, +0.000389f, +0.000004f, -0.000066f}, + {-0.040634f, +0.328420f, -0.004057f, -0.000038f, -0.000042f}, + {+0.073934f, -0.106271f, +0.009079f, +0.000021f, +0.000038f}, + {-0.016227f, -0.051899f, +0.000373f, -0.000148f, +0.000001f}, + {+0.040260f, -0.318605f, +0.006025f, -0.000077f, +0.000015f}, + {-0.100959f, -0.021877f, -0.014425f, +0.000114f, +0.000006f}, + {-0.027106f, +0.113757f, -0.001462f, -0.000158f, -0.000030f} + }, + { + {+0.289347f, +0.183367f, +0.043677f, -0.000132f, -0.000010f}, + {-0.332610f, -0.106477f, -0.046382f, -0.000181f, +0.000052f}, + {+0.030172f, +0.040872f, +0.005239f, -0.000542f, -0.000065f}, + {+0.188712f, -0.022024f, +0.026128f, -0.000084f, -0.000051f}, + {-0.071871f, +0.114351f, -0.009162f, +0.000197f, +0.000047f}, + {-0.013433f, -0.054663f, -0.003535f, +0.000343f, +0.000057f}, + {-0.178475f, +0.017894f, -0.025738f, +0.000205f, +0.000044f}, + {+0.010117f, -0.193309f, +0.001195f, -0.000079f, -0.000031f}, + {+0.059297f, -0.019649f, +0.006335f, +0.000285f, +0.000013f} + }, + { + {-0.134846f, -0.467842f, -0.019524f, -0.000244f, +0.000001f}, + {+0.092222f, +0.547291f, +0.014252f, -0.000986f, +0.000001f}, + {-0.040107f, -0.068680f, -0.004663f, +0.000023f, +0.000071f}, + {-0.024493f, -0.346874f, -0.002774f, +0.000070f, +0.000048f}, + {-0.047272f, +0.147189f, -0.008626f, -0.000053f, -0.000044f}, + {+0.026008f, +0.007599f, +0.001975f, +0.000132f, -0.000005f}, + {+0.030534f, +0.339732f, +0.003406f, +0.000035f, -0.000020f}, + {+0.083347f, -0.077557f, +0.013266f, -0.000128f, -0.000007f}, + {-0.013672f, -0.131388f, -0.003403f, +0.000118f, +0.000027f} + }, + { + {-0.267902f, -0.264872f, -0.040046f, +0.000129f, +0.000011f}, + {+0.321912f, +0.191063f, +0.044992f, +0.000193f, -0.000056f}, + {-0.022572f, -0.096725f, -0.002705f, +0.000503f, +0.000069f}, + {-0.176343f, -0.111752f, -0.025706f, +0.000048f, +0.000053f}, + {+0.084811f, -0.059741f, +0.013684f, -0.000183f, -0.000048f}, + {-0.004452f, +0.055305f, +0.000514f, -0.000261f, -0.000064f}, + {+0.161895f, +0.139155f, +0.022695f, -0.000241f, -0.000046f}, + {-0.046966f, +0.125238f, -0.006695f, +0.000013f, +0.000036f}, + {-0.046666f, -0.080465f, -0.004500f, -0.000378f, -0.000014f} + }, + { + {+0.182763f, +0.425959f, +0.026111f, +0.000216f, -0.000001f}, + {-0.151967f, -0.538951f, -0.023953f, +0.000917f, +0.000002f}, + {+0.059967f, +0.029780f, +0.006750f, -0.000233f, -0.000082f}, + {+0.071926f, +0.268254f, +0.009365f, -0.000173f, -0.000058f}, + {+0.030147f, -0.144364f, +0.004637f, +0.000155f, +0.000054f}, + {-0.022610f, +0.026139f, -0.001896f, +0.000081f, +0.000015f}, + {-0.089140f, -0.244883f, -0.010242f, +0.000037f, +0.000027f}, + {-0.053982f, +0.112441f, -0.009466f, +0.000027f, +0.000006f}, + {+0.043125f, +0.054784f, +0.006054f, -0.000118f, -0.000026f} + }, + { + {+0.236555f, +0.344253f, +0.035451f, -0.000140f, -0.000014f}, + {-0.305017f, -0.302445f, -0.041503f, -0.000225f, +0.000061f}, + {+0.000099f, +0.121249f, +0.000347f, -0.000531f, -0.000075f}, + {+0.147839f, +0.147624f, +0.023593f, -0.000074f, -0.000055f}, + {-0.099074f, +0.056676f, -0.015836f, +0.000238f, +0.000049f}, + {+0.015365f, -0.033058f, +0.001023f, +0.000263f, +0.000075f}, + {-0.115117f, -0.202631f, -0.018500f, +0.000266f, +0.000048f}, + {+0.062522f, -0.070317f, +0.009998f, +0.000023f, -0.000045f}, + {+0.009357f, +0.103095f, +0.001665f, +0.000461f, +0.000014f} + }, + { + {-0.223414f, -0.360443f, -0.031653f, -0.000161f, +0.000003f}, + {+0.220330f, +0.504684f, +0.033230f, -0.000874f, -0.000003f}, + {-0.065668f, +0.018345f, -0.008069f, +0.000490f, +0.000105f}, + {-0.094224f, -0.228227f, -0.015610f, +0.000296f, +0.000075f}, + {-0.011044f, +0.195618f, +0.000221f, -0.000284f, -0.000070f}, + {+0.015206f, -0.030774f, +0.001584f, -0.000377f, -0.000037f}, + {+0.112319f, +0.149909f, +0.015570f, -0.000082f, -0.000037f}, + {+0.027593f, -0.125221f, +0.004605f, +0.000167f, +0.000001f}, + {-0.035657f, +0.033761f, -0.006506f, +0.000132f, +0.000027f} + }, + { + {-0.197435f, -0.400152f, -0.030189f, +0.000183f, +0.000017f}, + {+0.265346f, +0.433349f, +0.035911f, +0.000309f, -0.000070f}, + {+0.024825f, -0.121781f, +0.003662f, +0.000791f, +0.000075f}, + {-0.131639f, -0.172895f, -0.018896f, +0.000200f, +0.000051f}, + {+0.118431f, -0.000422f, +0.015867f, -0.000387f, -0.000045f}, + {-0.018068f, +0.023258f, -0.002724f, -0.000522f, -0.000082f}, + {+0.072974f, +0.212278f, +0.011511f, -0.000340f, -0.000047f}, + {-0.068530f, +0.023641f, -0.010358f, +0.000042f, +0.000055f}, + {+0.013236f, -0.038962f, +0.000910f, -0.000477f, -0.000015f} + }, + { + {+0.253363f, +0.291660f, +0.036499f, +0.000094f, -0.000007f}, + {-0.281798f, -0.406628f, -0.041589f, +0.000891f, +0.000005f}, + {+0.059479f, -0.066959f, +0.007177f, -0.000628f, -0.000142f}, + {+0.120109f, +0.213729f, +0.018705f, -0.000288f, -0.000099f}, + {-0.027666f, -0.223189f, -0.003521f, +0.000300f, +0.000093f}, + {-0.013844f, +0.028875f, -0.000557f, +0.000575f, +0.000072f}, + {-0.118976f, -0.083818f, -0.016708f, +0.000094f, +0.000049f}, + {-0.002209f, +0.126405f, -0.000845f, -0.000338f, -0.000017f}, + {+0.011760f, -0.039638f, +0.005259f, -0.000091f, -0.000032f} + }, + { + {+0.156753f, +0.440657f, +0.023910f, -0.000253f, -0.000018f}, + {-0.203795f, -0.522732f, -0.028158f, -0.000411f, +0.000085f}, + {-0.046218f, +0.097129f, -0.007205f, -0.001249f, -0.000056f}, + {+0.112467f, +0.226687f, +0.015571f, -0.000451f, -0.000035f}, + {-0.117838f, -0.083303f, -0.016703f, +0.000616f, +0.000028f}, + {+0.023412f, -0.030837f, +0.004021f, +0.001018f, +0.000071f}, + {-0.037437f, -0.211830f, -0.005723f, +0.000467f, +0.000043f}, + {+0.064323f, +0.023579f, +0.009934f, -0.000232f, -0.000060f}, + {-0.009156f, -0.006104f, -0.001969f, +0.000387f, +0.000022f} + }, + { + {-0.275944f, -0.222761f, -0.039627f, -0.000066f, +0.000013f}, + {+0.322019f, +0.286370f, +0.048482f, -0.000959f, -0.000014f}, + {-0.046923f, +0.094317f, -0.005599f, +0.000435f, +0.000182f}, + {-0.150750f, -0.177020f, -0.022662f, +0.000117f, +0.000123f}, + {+0.067347f, +0.202691f, +0.009894f, -0.000124f, -0.000115f}, + {+0.015081f, -0.042971f, +0.000082f, -0.000445f, -0.000114f}, + {+0.117640f, +0.025700f, +0.015946f, -0.000085f, -0.000063f}, + {-0.016418f, -0.100980f, -0.001676f, +0.000298f, +0.000040f}, + {-0.000250f, +0.010429f, -0.002435f, -0.000017f, +0.000037f} + }, + { + {-0.115447f, -0.469158f, -0.017950f, +0.000366f, +0.000017f}, + {+0.134884f, +0.571706f, +0.018454f, +0.000373f, -0.000105f}, + {+0.067420f, -0.084270f, +0.010575f, +0.001650f, +0.000010f}, + {-0.076003f, -0.293259f, -0.009993f, +0.000579f, +0.000003f}, + {+0.098520f, +0.155744f, +0.013412f, -0.000754f, +0.000004f}, + {-0.039536f, +0.043110f, -0.005899f, -0.001509f, -0.000034f}, + {+0.003041f, +0.203039f, +0.001212f, -0.000536f, -0.000033f}, + {-0.056528f, -0.038194f, -0.009590f, +0.000577f, +0.000054f}, + {-0.001245f, +0.013315f, +0.000319f, -0.000346f, -0.000036f} + }, + { + {+0.292999f, +0.157930f, +0.042403f, +0.000087f, -0.000020f}, + {-0.342354f, -0.162255f, -0.051635f, +0.001110f, +0.000034f}, + {+0.022156f, -0.154740f, +0.000608f, +0.000173f, -0.000208f}, + {+0.168151f, +0.078549f, +0.023857f, +0.000280f, -0.000137f}, + {-0.096594f, -0.143573f, -0.013193f, -0.000234f, +0.000126f}, + {-0.002506f, +0.100103f, +0.002757f, -0.000120f, +0.000144f}, + {-0.102496f, +0.041774f, -0.013753f, -0.000024f, +0.000074f}, + {+0.028733f, +0.095250f, +0.004398f, -0.000056f, -0.000064f}, + {-0.000053f, +0.012400f, +0.002539f, +0.000289f, -0.000038f} + }, + { + {+0.073802f, +0.495430f, +0.011185f, -0.000471f, -0.000013f}, + {-0.067107f, -0.583553f, -0.008494f, -0.000150f, +0.000126f}, + {-0.082122f, +0.004027f, -0.011237f, -0.001551f, +0.000060f}, + {+0.028928f, +0.288941f, +0.005398f, -0.000320f, +0.000043f}, + {-0.067365f, -0.187138f, -0.009613f, +0.000522f, -0.000049f}, + {+0.053548f, +0.014546f, +0.006738f, +0.001557f, -0.000028f}, + {+0.021691f, -0.148588f, +0.001549f, +0.000530f, +0.000018f}, + {+0.052283f, +0.060853f, +0.007887f, -0.000799f, -0.000034f}, + {+0.008489f, -0.003383f, +0.001566f, +0.000494f, +0.000057f} + }, + { + {-0.307330f, -0.088798f, -0.043952f, -0.000185f, +0.000025f}, + {+0.348741f, +0.055377f, +0.052852f, -0.001109f, -0.000070f}, + {+0.020133f, +0.157206f, +0.002804f, -0.000807f, +0.000201f}, + {-0.157718f, +0.000354f, -0.025108f, -0.000577f, +0.000129f}, + {+0.107002f, +0.082667f, +0.016074f, +0.000429f, -0.000116f}, + {-0.027699f, -0.106463f, -0.004855f, +0.000830f, -0.000144f}, + {+0.076446f, -0.063154f, +0.011339f, +0.000105f, -0.000081f}, + {-0.046001f, -0.090381f, -0.006439f, -0.000517f, +0.000079f}, + {-0.003916f, -0.020923f, -0.003928f, -0.000676f, +0.000026f} + }, + { + {-0.027283f, -0.518967f, -0.004482f, +0.000531f, +0.000006f}, + {+0.002104f, +0.586753f, -0.000310f, -0.000388f, -0.000138f}, + {+0.067195f, +0.083021f, +0.013467f, -0.000261f, -0.000139f}, + {+0.000203f, -0.242050f, +0.002218f, -0.001130f, -0.000092f}, + {+0.041057f, +0.183900f, +0.003084f, +0.000869f, +0.000096f}, + {-0.043480f, -0.079977f, -0.008525f, -0.000104f, +0.000100f}, + {-0.026266f, +0.096019f, -0.004003f, -0.000222f, +0.000001f}, + {-0.040550f, -0.099815f, -0.006813f, +0.000626f, +0.000005f}, + {-0.012858f, -0.005094f, -0.001938f, -0.001102f, -0.000079f} + }, + { + {+0.314481f, +0.005188f, +0.044811f, +0.000426f, -0.000028f}, + {-0.346528f, +0.051746f, -0.052277f, +0.000401f, +0.000122f}, + {-0.053118f, -0.097595f, -0.002410f, +0.001225f, -0.000151f}, + {+0.140849f, -0.024347f, +0.026727f, +0.000253f, -0.000095f}, + {-0.107847f, -0.047702f, -0.019644f, +0.000097f, +0.000079f}, + {+0.051228f, +0.061068f, +0.003689f, -0.001630f, +0.000102f}, + {-0.056164f, +0.049815f, -0.009319f, +0.000032f, +0.000080f}, + {+0.061891f, +0.058300f, +0.009871f, +0.001903f, -0.000079f}, + {+0.009880f, +0.028684f, +0.006879f, +0.001108f, +0.000001f} + } +}; + +#endif + +#ifdef UPDATE_SBA_FILTER + +const float FASTCONV_FOA_latency_s = 0.000666667f; +const float leftHRIRReal_FOA[BINAURAL_CONVBANDS][4][BINAURAL_NTAPS]= +{ + { + {+0.001139f, +0.701381f, +0.088362f, +0.001507f, +0.000002f}, + {+0.000414f, +0.262095f, -0.237214f, -0.003224f, +0.000036f}, + {+0.002081f, +0.073269f, +0.016442f, -0.002305f, -0.000016f}, + {+0.003374f, +0.067272f, -0.027345f, -0.000156f, +0.000027f} + }, + { + {-0.006858f, +0.573976f, -0.025590f, -0.002173f, -0.000001f}, + {-0.018683f, +0.673324f, +0.155049f, +0.004529f, -0.000042f}, + {-0.004167f, -0.005579f, -0.043222f, +0.004198f, +0.000026f}, + {-0.007696f, +0.026588f, -0.047141f, +0.000930f, -0.000031f} + }, + { + {+0.022690f, +0.504423f, -0.025668f, -0.000505f, -0.000002f}, + {+0.098922f, +0.785742f, +0.002391f, +0.001725f, -0.000029f}, + {+0.001996f, -0.028688f, -0.031830f, -0.002187f, +0.000003f}, + {+0.012563f, -0.012620f, -0.033386f, -0.001639f, -0.000022f} + }, + { + {-0.068470f, +0.403356f, +0.003719f, +0.002403f, +0.000001f}, + {-0.238766f, +0.395418f, +0.032160f, -0.006283f, +0.000045f}, + {-0.003715f, -0.000119f, +0.009760f, -0.000148f, -0.000031f}, + {-0.028559f, -0.040197f, +0.002155f, +0.000892f, +0.000033f} + }, + { + {+0.145134f, +0.119557f, +0.007639f, -0.000923f, +0.000003f}, + {+0.294065f, -0.334693f, -0.019103f, +0.002511f, +0.000020f}, + {+0.020226f, -0.024338f, +0.012605f, +0.001278f, +0.000012f}, + {+0.043958f, -0.145428f, +0.013697f, +0.000566f, +0.000018f} + }, + { + {-0.153301f, -0.308264f, -0.003171f, -0.001265f, -0.000001f}, + {-0.095935f, -0.863498f, -0.010369f, +0.003299f, -0.000045f}, + {-0.032438f, -0.100491f, +0.003144f, -0.001769f, +0.000029f}, + {-0.013113f, -0.237010f, +0.000894f, -0.000875f, -0.000033f} + }, + { + {-0.012428f, -0.509031f, -0.004688f, +0.000988f, -0.000003f}, + {-0.244664f, -0.595158f, -0.023888f, -0.002491f, -0.000012f}, + {+0.002609f, -0.144907f, -0.010043f, +0.000781f, -0.000027f}, + {-0.074154f, -0.145409f, -0.008757f, -0.000058f, -0.000014f} + }, + { + {+0.212788f, -0.155514f, +0.023333f, +0.000561f, +0.000002f}, + {+0.330585f, +0.291160f, +0.047010f, -0.002016f, +0.000043f}, + {+0.050155f, -0.068056f, -0.001580f, +0.001116f, -0.000021f}, + {+0.122861f, +0.153186f, +0.009329f, +0.000801f, +0.000032f} + }, + { + {-0.148866f, +0.399380f, -0.016077f, -0.000584f, +0.000004f}, + {+0.007222f, +0.769639f, -0.001057f, +0.002043f, +0.000007f}, + {-0.045137f, +0.068695f, +0.001800f, -0.000989f, +0.000039f}, + {-0.030243f, +0.388427f, -0.005358f, -0.000487f, +0.000012f} + }, + { + {-0.148858f, +0.389050f, -0.019934f, -0.000504f, -0.000003f}, + {-0.349211f, +0.214703f, -0.051501f, +0.001478f, -0.000039f}, + {-0.029971f, +0.074752f, -0.006844f, -0.000679f, +0.000009f}, + {-0.127591f, +0.245277f, -0.008622f, -0.000243f, -0.000032f} + }, + { + {+0.239012f, -0.214946f, +0.031611f, +0.000498f, -0.000004f}, + {+0.196316f, -0.613847f, +0.027133f, -0.001726f, -0.000004f}, + {+0.059322f, -0.077618f, +0.010338f, +0.000544f, -0.000046f}, + {+0.142102f, -0.158560f, +0.013819f, +0.000336f, -0.000011f} + }, + { + {+0.056721f, -0.491541f, +0.006821f, +0.000413f, +0.000004f}, + {+0.248916f, -0.524024f, +0.041690f, -0.001135f, +0.000035f}, + {+0.029432f, -0.129169f, -0.000386f, +0.000757f, +0.000007f}, + {+0.025409f, -0.327769f, +0.004549f, +0.000075f, +0.000034f} + }, + { + {-0.277481f, +0.028032f, -0.037920f, -0.000438f, +0.000003f}, + {-0.308141f, +0.332951f, -0.045686f, +0.001496f, +0.000003f}, + {-0.108659f, +0.087169f, -0.015132f, -0.000418f, +0.000046f}, + {-0.144191f, -0.063507f, -0.018317f, -0.000173f, +0.000009f} + }, + { + {+0.037467f, +0.509783f, +0.006165f, -0.000331f, -0.000005f}, + {-0.118379f, +0.623008f, -0.023288f, +0.000858f, -0.000032f}, + {+0.020828f, +0.293771f, +0.009322f, -0.000570f, -0.000020f}, + {+0.044708f, +0.223468f, +0.005411f, -0.000025f, -0.000036f} + }, + { + {+0.276681f, +0.136508f, +0.039053f, +0.000399f, -0.000002f}, + {+0.342800f, -0.086499f, +0.051427f, -0.001312f, -0.000004f}, + {+0.141529f, +0.115364f, +0.013240f, +0.000205f, -0.000040f}, + {+0.110040f, +0.119206f, +0.016186f, +0.000083f, -0.000006f} + }, + { + {-0.117783f, -0.468960f, -0.017913f, +0.000250f, +0.000005f}, + {+0.005671f, -0.604318f, +0.007143f, -0.000660f, +0.000031f}, + {-0.130049f, -0.297226f, -0.017966f, +0.000439f, +0.000030f}, + {-0.077788f, -0.170577f, -0.011766f, -0.000035f, +0.000037f} + }, + { + {-0.252966f, -0.256306f, -0.036605f, -0.000365f, +0.000002f}, + {-0.337478f, -0.074281f, -0.052432f, +0.001197f, +0.000005f}, + {-0.072906f, -0.386255f, -0.005369f, -0.000119f, +0.000033f}, + {-0.075520f, -0.174614f, -0.010607f, -0.000037f, +0.000003f} + }, + { + {+0.180447f, +0.410401f, +0.027706f, -0.000193f, -0.000005f}, + {+0.079743f, +0.570802f, +0.007521f, +0.000528f, -0.000032f}, + {+0.189755f, +0.008151f, +0.021117f, -0.000340f, -0.000036f}, + {+0.097648f, +0.090203f, +0.013931f, +0.000113f, -0.000038f} + }, + { + {+0.221150f, +0.344584f, +0.031954f, +0.000342f, -0.000001f}, + {+0.324392f, +0.195009f, +0.049761f, -0.001141f, -0.000005f}, + {-0.055564f, +0.372598f, -0.003229f, +0.000147f, -0.000026f}, + {+0.029197f, +0.196512f, +0.004268f, -0.000027f, +0.000001f} + }, + { + {-0.234543f, -0.356749f, -0.036109f, +0.000161f, +0.000005f}, + {-0.158828f, -0.551737f, -0.020300f, -0.000447f, +0.000034f}, + {-0.128996f, +0.253163f, -0.019502f, +0.000205f, +0.000038f}, + {-0.086326f, +0.024093f, -0.010653f, -0.000104f, +0.000038f} + }, + { + {-0.180736f, -0.438688f, -0.025011f, -0.000324f, +0.000001f}, + {-0.301948f, -0.334020f, -0.045105f, +0.001128f, +0.000004f}, + {+0.108851f, -0.109590f, +0.011684f, +0.000065f, +0.000022f}, + {+0.007794f, -0.114979f, -0.002557f, +0.000055f, -0.000004f} + }, + { + {+0.283619f, +0.272902f, +0.041849f, -0.000148f, -0.000005f}, + {+0.241474f, +0.503493f, +0.031717f, +0.000352f, -0.000035f}, + {+0.045390f, -0.198917f, +0.011556f, -0.000593f, -0.000041f}, + {+0.041019f, -0.061071f, +0.008824f, +0.000017f, -0.000039f} + }, + { + {+0.123506f, +0.516214f, +0.017365f, +0.000301f, -0.000001f}, + {+0.256327f, +0.482583f, +0.037542f, -0.001057f, -0.000002f}, + {-0.083839f, +0.008074f, -0.016916f, +0.000282f, -0.000018f}, + {+0.003422f, -0.003727f, +0.003177f, -0.000000f, +0.000006f} + }, + { + {-0.313797f, -0.154486f, -0.046391f, +0.000147f, +0.000005f}, + {-0.319981f, -0.404727f, -0.042569f, -0.000317f, +0.000036f}, + {-0.021107f, +0.110660f, -0.004978f, +0.000416f, +0.000047f}, + {-0.008153f, -0.022716f, -0.004670f, +0.000045f, +0.000040f} + }, + { + {-0.061089f, -0.539358f, -0.009248f, -0.000286f, +0.000001f}, + {-0.177073f, -0.627220f, -0.025260f, +0.001022f, +0.000001f}, + {+0.071424f, -0.032340f, +0.013321f, -0.000179f, +0.000014f}, + {-0.053388f, +0.046353f, -0.007111f, -0.000176f, -0.000010f} + }, + { + {+0.324287f, +0.053524f, +0.049068f, -0.000116f, -0.000006f}, + {+0.369344f, +0.211212f, +0.048775f, +0.000225f, -0.000037f}, + {+0.008002f, -0.135643f, +0.001207f, -0.000329f, -0.000053f}, + {+0.026056f, +0.169088f, +0.008645f, +0.000250f, -0.000042f} + }, + { + {+0.005776f, +0.541579f, +0.000581f, +0.000240f, -0.000000f}, + {+0.077934f, +0.656141f, +0.014760f, -0.000940f, -0.000001f}, + {-0.071537f, -0.021095f, -0.007901f, +0.000019f, -0.000006f}, + {+0.095328f, +0.067372f, +0.010448f, -0.000101f, +0.000015f} + }, + { + {-0.328162f, +0.029093f, -0.049230f, +0.000107f, +0.000007f}, + {-0.369662f, -0.037217f, -0.051825f, -0.000167f, +0.000038f}, + {+0.023527f, +0.120022f, -0.000102f, +0.000278f, +0.000058f}, + {-0.090284f, -0.212186f, -0.013169f, -0.000132f, +0.000043f} + }, + { + {+0.048978f, -0.548479f, +0.007485f, -0.000233f, -0.000001f}, + {-0.003228f, -0.602938f, -0.001617f, +0.000911f, +0.000001f}, + {+0.040104f, +0.095644f, +0.005888f, -0.000009f, -0.000005f}, + {-0.081710f, -0.220378f, -0.013048f, -0.000016f, -0.000021f} + }, + { + {+0.324250f, -0.126479f, +0.048291f, -0.000066f, -0.000007f}, + {+0.357292f, -0.046143f, +0.050921f, +0.000098f, -0.000041f}, + {-0.027149f, -0.003860f, +0.000272f, -0.000124f, -0.000060f}, + {+0.141329f, +0.121139f, +0.018219f, +0.000314f, -0.000043f} + }, + { + {-0.104734f, +0.530347f, -0.015582f, +0.000224f, +0.000002f}, + {-0.054628f, +0.590170f, -0.008056f, -0.000909f, +0.000000f}, + {-0.005584f, -0.032979f, -0.004816f, +0.000029f, +0.000015f}, + {+0.037866f, +0.274890f, +0.006759f, -0.000046f, +0.000027f} + }, + { + {-0.308177f, +0.218644f, -0.045991f, +0.000043f, +0.000007f}, + {-0.346201f, +0.142031f, -0.048180f, -0.000046f, +0.000045f}, + {-0.007019f, -0.030662f, -0.000480f, +0.000081f, +0.000058f}, + {-0.162861f, -0.035781f, -0.023778f, -0.000324f, +0.000041f} + }, + { + {+0.155747f, -0.491433f, +0.022764f, -0.000231f, -0.000003f}, + {+0.112390f, -0.563014f, +0.016093f, +0.000905f, -0.000002f}, + {+0.014636f, -0.060316f, +0.003797f, -0.000151f, -0.000023f}, + {+0.007188f, -0.297579f, +0.001361f, +0.000018f, -0.000032f} + }, + { + {+0.282333f, -0.296973f, +0.042631f, -0.000038f, -0.000007f}, + {+0.325943f, -0.233378f, +0.045604f, +0.000052f, -0.000049f}, + {+0.025539f, -0.043016f, +0.004050f, -0.000129f, -0.000057f}, + {+0.170600f, -0.047495f, +0.024487f, +0.000283f, -0.000040f} + }, + { + {-0.198966f, +0.440444f, -0.029339f, +0.000240f, +0.000003f}, + {-0.163937f, +0.519986f, -0.024102f, -0.000910f, +0.000006f}, + {-0.041643f, +0.059924f, -0.008056f, +0.000252f, +0.000028f}, + {-0.058279f, +0.303786f, -0.008000f, +0.000033f, +0.000037f} + }, + { + {-0.251233f, +0.360645f, -0.037855f, +0.000048f, +0.000007f}, + {-0.301209f, +0.307267f, -0.042244f, -0.000061f, +0.000052f}, + {-0.017898f, +0.097992f, -0.002832f, +0.000217f, +0.000060f}, + {-0.154977f, +0.157077f, -0.021873f, -0.000264f, +0.000040f} + }, + { + {+0.235922f, -0.385212f, +0.034692f, -0.000230f, -0.000003f}, + {+0.211902f, -0.482439f, +0.031812f, +0.000875f, -0.000009f}, + {+0.062526f, -0.022786f, +0.009165f, -0.000192f, -0.000037f}, + {+0.100642f, -0.232077f, +0.012026f, +0.000003f, -0.000044f} + }, + { + {+0.215580f, -0.416556f, +0.032649f, -0.000062f, -0.000008f}, + {+0.273278f, -0.387323f, +0.037577f, +0.000065f, -0.000055f}, + {-0.005939f, -0.125998f, +0.001105f, -0.000285f, -0.000067f}, + {+0.119018f, -0.200389f, +0.019595f, +0.000282f, -0.000042f} + }, + { + {-0.266556f, +0.321627f, -0.039270f, +0.000204f, +0.000005f}, + {-0.262381f, +0.436199f, -0.039035f, -0.000825f, +0.000011f}, + {-0.067202f, -0.031111f, -0.011093f, +0.000033f, +0.000054f}, + {-0.114634f, +0.160892f, -0.016486f, -0.000093f, +0.000057f} + }, + { + {-0.175988f, +0.460735f, -0.026828f, +0.000048f, +0.000010f}, + {-0.233172f, +0.480676f, -0.031122f, -0.000031f, +0.000060f}, + {+0.031548f, +0.122002f, +0.003267f, +0.000158f, +0.000072f}, + {-0.094567f, +0.192621f, -0.015001f, -0.000394f, +0.000041f} + }, + { + {+0.289864f, -0.252340f, +0.042717f, -0.000164f, -0.000008f}, + {+0.309890f, -0.352443f, +0.045041f, +0.000820f, -0.000012f}, + {+0.059594f, +0.080834f, +0.009319f, +0.000095f, -0.000085f}, + {+0.123492f, -0.142957f, +0.017979f, +0.000125f, -0.000076f} + }, + { + {+0.134575f, -0.490695f, +0.020657f, -0.000008f, -0.000011f}, + {+0.176248f, -0.555316f, +0.023664f, -0.000054f, -0.000070f}, + {-0.054408f, -0.093413f, -0.005141f, +0.000202f, -0.000064f}, + {+0.078026f, -0.213530f, +0.012432f, +0.000637f, -0.000030f} + }, + { + {-0.306423f, +0.183981f, -0.045149f, +0.000152f, +0.000012f}, + {-0.341487f, +0.240296f, -0.050133f, -0.000895f, +0.000016f}, + {-0.041086f, -0.112975f, -0.007981f, +0.000040f, +0.000125f}, + {-0.138721f, +0.120523f, -0.020161f, +0.000004f, +0.000099f} + }, + { + {-0.092719f, +0.511558f, -0.014604f, -0.000050f, +0.000009f}, + {-0.112835f, +0.589997f, -0.014321f, +0.000122f, +0.000086f}, + {+0.068469f, +0.059054f, +0.008838f, -0.000612f, +0.000032f}, + {-0.054382f, +0.253255f, -0.007586f, -0.000904f, +0.000005f} + }, + { + {+0.317269f, -0.115684f, +0.046850f, -0.000208f, -0.000018f}, + {+0.356933f, -0.130812f, +0.052103f, +0.001044f, -0.000027f}, + {+0.019507f, +0.139642f, +0.002950f, -0.000683f, -0.000159f}, + {+0.152449f, -0.061207f, +0.020045f, -0.000364f, -0.000115f} + }, + { + {+0.051096f, -0.523693f, +0.008474f, +0.000105f, -0.000004f}, + {+0.049349f, -0.600329f, +0.005605f, -0.000022f, -0.000106f}, + {-0.079985f, -0.011392f, -0.007657f, +0.000780f, +0.000028f}, + {+0.017397f, -0.267260f, +0.004496f, +0.000957f, +0.000035f} + }, + { + {-0.323905f, +0.049833f, -0.047865f, +0.000329f, +0.000021f}, + {-0.358893f, +0.027640f, -0.053272f, -0.001258f, +0.000053f}, + {+0.015053f, -0.158953f, -0.000193f, +0.001713f, +0.000167f}, + {-0.144359f, -0.018540f, -0.020249f, +0.000901f, +0.000114f} + }, + { + {-0.008373f, +0.533499f, -0.002225f, -0.000084f, -0.000004f}, + {+0.010355f, +0.593074f, +0.003536f, -0.000223f, +0.000122f}, + {+0.071969f, -0.070538f, +0.006817f, -0.000021f, -0.000104f}, + {+0.009075f, +0.217846f, -0.000438f, -0.000486f, -0.000083f} + }, + { + {+0.325536f, +0.023312f, +0.048108f, -0.000519f, -0.000020f}, + {+0.352731f, +0.066640f, +0.052836f, +0.001159f, -0.000094f}, + {-0.047485f, +0.116702f, -0.002224f, -0.002868f, -0.000134f}, + {+0.125804f, +0.038871f, +0.018687f, -0.001207f, -0.000088f} + }, + { + {-0.036324f, -0.531073f, -0.003989f, -0.000084f, +0.000013f}, + {-0.069318f, -0.580051f, -0.011694f, +0.000718f, -0.000126f}, + {-0.044835f, +0.120121f, -0.003388f, -0.003194f, +0.000173f}, + {-0.016464f, -0.181504f, -0.002802f, -0.001577f, +0.000124f} + } +}; + +const float leftHRIRImag_FOA[BINAURAL_CONVBANDS][4][BINAURAL_NTAPS]= +{ + { + {-0.075561f, -0.068517f, +0.140821f, -0.000006f, -0.000001f}, + {-0.113351f, +0.312423f, -0.154809f, +0.003274f, -0.000040f}, + {-0.002167f, -0.037131f, +0.050206f, -0.009097f, +0.000022f}, + {-0.008959f, -0.001538f, +0.017300f, -0.005827f, -0.000030f} + }, + { + {+0.088726f, -0.056723f, -0.005193f, -0.002691f, -0.000002f}, + {+0.119871f, +0.624601f, -0.192908f, +0.005870f, -0.000033f}, + {+0.004166f, -0.045506f, +0.052787f, -0.000546f, +0.000010f}, + {+0.009543f, +0.003765f, +0.008451f, +0.003327f, -0.000025f} + }, + { + {-0.102143f, +0.113338f, +0.041532f, +0.003556f, +0.000001f}, + {-0.144265f, +0.722990f, +0.063761f, -0.009098f, +0.000044f}, + {-0.005127f, +0.024047f, -0.013948f, +0.005687f, -0.000029f}, + {-0.011405f, +0.075487f, -0.028027f, -0.000790f, +0.000032f} + }, + { + {+0.102256f, +0.332031f, -0.028467f, -0.000969f, +0.000002f}, + {+0.105041f, +0.913298f, +0.007994f, +0.001561f, +0.000024f}, + {+0.007491f, +0.060974f, -0.023635f, -0.001357f, +0.000004f}, + {+0.005542f, +0.127425f, -0.011646f, +0.000496f, +0.000020f} + }, + { + {-0.044065f, +0.500826f, -0.002410f, -0.001370f, -0.000001f}, + {+0.092604f, +0.883373f, +0.024383f, +0.004737f, -0.000046f}, + {-0.004561f, +0.083819f, -0.019790f, -0.002951f, +0.000031f}, + {+0.027047f, +0.113206f, -0.016192f, -0.001506f, -0.000033f} + }, + { + {-0.101331f, +0.396216f, -0.004920f, +0.000653f, -0.000003f}, + {-0.315234f, +0.274804f, -0.039014f, -0.001908f, -0.000016f}, + {-0.020480f, +0.081227f, +0.012774f, +0.001524f, -0.000020f}, + {-0.075525f, -0.016066f, +0.005310f, +0.001230f, -0.000016f} + }, + { + {+0.205124f, -0.066361f, +0.022115f, +0.000986f, +0.000002f}, + {+0.252202f, -0.571430f, +0.010069f, -0.002911f, +0.000045f}, + {+0.049641f, -0.008053f, +0.006538f, +0.000795f, -0.000026f}, + {+0.069872f, -0.229431f, +0.016281f, +0.000270f, +0.000032f} + }, + { + {-0.075366f, -0.478001f, -0.007669f, -0.000701f, +0.000003f}, + {+0.124742f, -0.753308f, +0.025384f, +0.001863f, +0.000009f}, + {-0.028983f, -0.121665f, -0.007415f, -0.000267f, +0.000034f}, + {+0.036071f, -0.292663f, -0.003455f, -0.000819f, +0.000013f} + }, + { + {-0.186385f, -0.294120f, -0.028378f, -0.000604f, -0.000002f}, + {-0.364681f, +0.008978f, -0.038744f, +0.001757f, -0.000041f}, + {-0.036441f, -0.104767f, -0.010428f, -0.000824f, +0.000015f}, + {-0.145432f, -0.035047f, -0.010123f, +0.000064f, -0.000032f} + }, + { + {+0.200759f, +0.301898f, +0.028191f, +0.000609f, -0.000004f}, + {+0.106790f, +0.737079f, +0.007371f, -0.001552f, -0.000005f}, + {+0.050065f, +0.035831f, +0.013930f, +0.000498f, -0.000043f}, + {+0.098812f, +0.316605f, +0.005024f, +0.000388f, -0.000012f} + }, + { + {+0.102918f, +0.447646f, +0.016687f, +0.000392f, +0.000003f}, + {+0.311637f, +0.412036f, +0.037367f, -0.001208f, +0.000037f}, + {+0.029150f, +0.073712f, +0.005390f, +0.000373f, -0.000001f}, + {+0.078159f, +0.331302f, +0.015024f, +0.000096f, +0.000033f} + }, + { + {-0.263157f, -0.117240f, -0.038079f, -0.000498f, +0.000003f}, + {-0.266046f, -0.483755f, -0.030591f, +0.001325f, +0.000003f}, + {-0.079262f, -0.094840f, -0.015385f, -0.000509f, +0.000047f}, + {-0.153547f, -0.029982f, -0.019729f, -0.000450f, +0.000010f} + }, + { + {-0.007705f, -0.507985f, -0.003383f, -0.000318f, -0.000004f}, + {-0.186453f, -0.597236f, -0.023398f, +0.000963f, -0.000033f}, + {-0.013117f, -0.205170f, +0.001765f, -0.000228f, -0.000014f}, + {+0.017314f, -0.287283f, -0.002959f, -0.000038f, -0.000035f} + }, + { + {+0.280521f, -0.062761f, +0.041073f, +0.000449f, -0.000003f}, + {+0.334574f, +0.214167f, +0.043236f, -0.001215f, -0.000003f}, + {+0.133038f, +0.011844f, +0.017286f, +0.000551f, -0.000044f}, + {+0.127101f, -0.107475f, +0.022000f, +0.000440f, -0.000008f} + }, + { + {-0.080859f, +0.491833f, -0.009289f, +0.000270f, +0.000005f}, + {+0.060956f, +0.629530f, +0.006506f, -0.000817f, +0.000032f}, + {-0.073930f, +0.331264f, -0.010959f, +0.000254f, +0.000026f}, + {-0.063542f, +0.194964f, -0.009265f, +0.000065f, +0.000037f} + }, + { + {-0.266097f, +0.204693f, -0.039752f, -0.000407f, +0.000002f}, + {-0.343709f, -0.003857f, -0.048079f, +0.001153f, +0.000004f}, + {-0.120675f, +0.268205f, -0.012518f, -0.000600f, +0.000037f}, + {-0.094236f, +0.151237f, -0.013332f, -0.000477f, +0.000005f} + }, + { + {+0.151764f, -0.437914f, +0.020131f, -0.000242f, -0.000005f}, + {+0.036841f, -0.588874f, +0.009139f, +0.000664f, -0.000032f}, + {+0.174802f, -0.176925f, +0.017691f, -0.000280f, -0.000033f}, + {+0.090868f, -0.134423f, +0.011793f, -0.000076f, -0.000038f} + }, + { + {+0.237215f, -0.304481f, +0.035938f, +0.000373f, -0.000001f}, + {+0.332318f, -0.127083f, +0.047424f, -0.001052f, -0.000005f}, + {+0.006779f, -0.431468f, +0.002691f, +0.000532f, -0.000029f}, + {+0.053552f, -0.194194f, +0.007469f, +0.000494f, -0.000001f} + }, + { + {-0.208558f, +0.382505f, -0.029564f, +0.000207f, +0.000005f}, + {-0.116623f, +0.564310f, -0.021854f, -0.000528f, +0.000033f}, + {-0.172351f, -0.159278f, -0.018428f, +0.000360f, +0.000037f}, + {-0.097811f, +0.036173f, -0.011033f, +0.000077f, +0.000038f} + }, + { + {-0.202490f, +0.392017f, -0.029907f, -0.000333f, +0.000001f}, + {-0.316139f, +0.253384f, -0.044455f, +0.000945f, +0.000004f}, + {+0.097332f, +0.245644f, +0.004917f, -0.000556f, +0.000023f}, + {-0.006532f, +0.174857f, -0.002876f, -0.000550f, -0.000002f} + }, + { + {+0.261135f, -0.320885f, +0.037011f, -0.000181f, -0.000005f}, + {+0.197969f, -0.536807f, +0.033309f, +0.000398f, -0.000034f}, + {+0.081783f, +0.256891f, +0.014473f, -0.000242f, -0.000040f}, + {+0.065893f, +0.064104f, +0.007328f, +0.000082f, -0.000039f} + }, + { + {+0.153724f, -0.486020f, +0.022676f, +0.000325f, -0.000001f}, + {+0.283217f, -0.402227f, +0.039413f, -0.000851f, -0.000003f}, + {-0.100031f, -0.031468f, -0.013972f, +0.000537f, -0.000020f}, + {-0.008541f, -0.048318f, +0.000499f, +0.000444f, +0.000005f} + }, + { + {-0.302384f, +0.214214f, -0.042285f, +0.000129f, +0.000005f}, + {-0.280104f, +0.464455f, -0.045587f, -0.000282f, +0.000035f}, + {-0.027898f, -0.140901f, -0.007378f, +0.000003f, +0.000044f}, + {-0.020559f, -0.029800f, -0.003256f, -0.000145f, +0.000040f} + }, + { + {-0.091526f, +0.536382f, -0.014577f, -0.000305f, +0.000001f}, + {-0.221871f, +0.553999f, -0.029769f, +0.000764f, +0.000002f}, + {+0.073977f, +0.023109f, +0.011231f, -0.000304f, +0.000016f}, + {-0.025756f, -0.040011f, -0.004558f, -0.000368f, -0.000008f} + }, + { + {+0.321259f, -0.098962f, +0.045846f, -0.000108f, -0.000006f}, + {+0.348987f, -0.318713f, +0.051856f, +0.000239f, -0.000036f}, + {+0.017761f, +0.116280f, -0.000624f, -0.000200f, -0.000050f}, + {+0.009582f, -0.098230f, +0.005306f, +0.000144f, -0.000041f} + }, + { + {+0.032445f, -0.541906f, +0.005704f, +0.000315f, -0.000001f}, + {+0.127167f, -0.654253f, +0.018462f, -0.000765f, -0.000001f}, + {-0.073982f, -0.022018f, -0.008993f, +0.000517f, -0.000010f}, + {+0.079904f, +0.007744f, +0.010527f, +0.000350f, +0.000012f} + }, + { + {-0.327237f, +0.011995f, -0.047308f, +0.000087f, +0.000007f}, + {-0.372361f, +0.111338f, -0.055931f, -0.000147f, +0.000037f}, + {+0.006939f, -0.148510f, +0.003422f, +0.000212f, +0.000056f}, + {-0.056276f, +0.216052f, -0.007073f, -0.000104f, +0.000043f} + }, + { + {+0.021322f, +0.548401f, +0.003440f, -0.000317f, -0.000000f}, + {-0.036763f, +0.621232f, -0.007074f, +0.000670f, +0.000001f}, + {+0.060591f, -0.069431f, +0.006623f, -0.000636f, +0.000001f}, + {-0.095686f, +0.156364f, -0.008769f, -0.000353f, -0.000018f} + }, + { + {+0.328267f, +0.077867f, +0.046857f, -0.000082f, -0.000007f}, + {+0.361014f, +0.007604f, +0.057275f, +0.000179f, -0.000039f}, + {-0.031203f, +0.067398f, -0.002430f, -0.000232f, -0.000059f}, + {+0.120666f, -0.172404f, +0.015941f, +0.000046f, -0.000043f} + }, + { + {-0.077320f, -0.544064f, -0.010931f, +0.000301f, +0.000001f}, + {-0.025615f, -0.586847f, -0.004514f, -0.000654f, -0.000000f}, + {-0.019503f, +0.080767f, -0.004247f, +0.000554f, +0.000010f}, + {+0.060877f, -0.260909f, +0.007725f, +0.000342f, +0.000024f} + }, + { + {-0.318158f, -0.173881f, -0.045614f, +0.000092f, +0.000007f}, + {-0.350970f, -0.090433f, -0.053929f, -0.000134f, +0.000043f}, + {+0.011187f, +0.032303f, +0.001760f, +0.000373f, +0.000059f}, + {-0.154877f, +0.074143f, -0.023096f, -0.000037f, +0.000042f} + }, + { + {+0.131227f, +0.515417f, +0.018725f, -0.000280f, -0.000002f}, + {+0.083743f, +0.574149f, +0.012466f, +0.000576f, -0.000001f}, + {+0.005315f, +0.026215f, +0.002698f, -0.000477f, -0.000019f}, + {-0.015816f, +0.287949f, -0.001995f, -0.000235f, -0.000030f} + }, + { + {+0.296693f, +0.260934f, +0.042541f, -0.000091f, -0.000007f}, + {+0.335556f, +0.189122f, +0.052026f, +0.000094f, -0.000047f}, + {+0.020995f, +0.006183f, -0.000036f, -0.000396f, -0.000057f}, + {+0.168822f, +0.001307f, +0.024594f, -0.000017f, -0.000040f} + }, + { + {-0.178422f, -0.467768f, -0.025765f, +0.000259f, +0.000003f}, + {-0.138949f, -0.536439f, -0.020095f, -0.000522f, +0.000004f}, + {-0.028752f, -0.066596f, -0.002138f, +0.000378f, +0.000026f}, + {-0.031690f, -0.308623f, -0.005893f, +0.000213f, +0.000034f} + }, + { + {-0.267781f, -0.330036f, -0.038496f, +0.000071f, +0.000007f}, + {-0.312281f, -0.270728f, -0.048992f, -0.000017f, +0.000050f}, + {-0.024788f, -0.069674f, -0.002302f, +0.000335f, +0.000057f}, + {-0.167013f, -0.101727f, -0.022607f, -0.000026f, +0.000040f} + }, + { + {+0.218246f, +0.415608f, +0.031895f, -0.000250f, -0.000003f}, + {+0.187767f, +0.495269f, +0.027755f, +0.000490f, -0.000007f}, + {+0.054038f, +0.052249f, +0.006077f, -0.000385f, -0.000032f}, + {+0.082423f, +0.279154f, +0.011379f, -0.000228f, -0.000040f} + }, + { + {+0.234462f, +0.390517f, +0.033506f, -0.000040f, -0.000008f}, + {+0.286682f, +0.344540f, +0.044785f, -0.000053f, -0.000053f}, + {+0.007799f, +0.121924f, -0.000254f, -0.000274f, -0.000063f}, + {+0.137635f, +0.191812f, +0.020083f, +0.000078f, -0.000041f} + }, + { + {-0.252188f, -0.355561f, -0.036817f, +0.000259f, +0.000004f}, + {-0.236813f, -0.457491f, -0.035054f, -0.000497f, +0.000010f}, + {-0.067322f, +0.004912f, -0.008444f, +0.000591f, +0.000044f}, + {-0.110001f, -0.188497f, -0.016071f, +0.000306f, +0.000049f} + }, + { + {-0.196649f, -0.440315f, -0.028013f, +0.000028f, +0.000009f}, + {-0.254039f, -0.432758f, -0.039405f, +0.000094f, +0.000057f}, + {+0.018169f, -0.125990f, +0.003787f, +0.000283f, +0.000070f}, + {-0.104872f, -0.193750f, -0.016320f, -0.000067f, +0.000042f} + }, + { + {+0.279232f, +0.288906f, +0.040649f, -0.000288f, -0.000006f}, + {+0.287453f, +0.396154f, +0.041796f, +0.000496f, -0.000012f}, + {+0.065516f, -0.051533f, +0.008251f, -0.000833f, -0.000068f}, + {+0.117846f, +0.150938f, +0.019317f, -0.000398f, -0.000066f} + }, + { + {+0.155838f, +0.477142f, +0.022236f, -0.000054f, -0.000011f}, + {+0.205090f, +0.523697f, +0.032347f, -0.000074f, -0.000064f}, + {-0.043133f, +0.115358f, -0.007458f, -0.000536f, -0.000071f}, + {+0.086685f, +0.200152f, +0.011885f, -0.000042f, -0.000037f} + }, + { + {-0.298969f, -0.220193f, -0.043767f, +0.000325f, +0.000010f}, + {-0.328142f, -0.292452f, -0.047271f, -0.000442f, +0.000014f}, + {-0.051610f, +0.100445f, -0.006535f, +0.000948f, +0.000105f}, + {-0.130003f, -0.132255f, -0.020754f, +0.000362f, +0.000088f} + }, + { + {-0.114168f, -0.502804f, -0.016020f, +0.000104f, +0.000010f}, + {-0.143455f, -0.576024f, -0.024058f, +0.000023f, +0.000077f}, + {+0.061115f, -0.073546f, +0.010498f, +0.000984f, +0.000052f}, + {-0.068233f, -0.228084f, -0.008576f, +0.000257f, +0.000020f} + }, + { + {+0.312611f, +0.151372f, +0.045798f, -0.000314f, -0.000015f}, + {+0.351200f, +0.182575f, +0.051390f, +0.000326f, -0.000020f}, + {+0.031920f, -0.116916f, +0.003818f, -0.000728f, -0.000144f}, + {+0.146596f, +0.100142f, +0.022461f, -0.000165f, -0.000108f} + }, + { + {+0.072361f, +0.518728f, +0.009942f, -0.000175f, -0.000007f}, + {+0.079531f, +0.601014f, +0.014699f, -0.000081f, -0.000095f}, + {-0.074110f, +0.046958f, -0.012342f, -0.001344f, -0.000005f}, + {+0.036969f, +0.268420f, +0.004301f, -0.000333f, +0.000013f} + }, + { + {-0.321149f, -0.084827f, -0.047210f, +0.000251f, +0.000020f}, + {-0.359514f, -0.071785f, -0.052488f, -0.000127f, +0.000038f}, + {-0.004461f, +0.153778f, +0.000819f, +0.000092f, +0.000168f}, + {-0.150780f, -0.016846f, -0.022402f, -0.000246f, +0.000118f} + }, + { + {-0.030564f, -0.529872f, -0.003428f, +0.000214f, -0.000000f}, + {-0.017715f, -0.598148f, -0.005426f, +0.000313f, +0.000115f}, + {+0.077791f, +0.029195f, +0.012192f, +0.001184f, -0.000065f}, + {-0.001917f, -0.241534f, -0.000982f, +0.000017f, -0.000059f} + }, + { + {+0.325748f, +0.016029f, +0.047602f, -0.000149f, -0.000021f}, + {+0.356902f, -0.024523f, +0.052188f, +0.000031f, -0.000071f}, + {-0.031837f, -0.135684f, -0.003925f, +0.000518f, -0.000157f}, + {+0.134040f, -0.031563f, +0.022612f, +0.000523f, -0.000105f} + }, + { + {-0.013284f, +0.534819f, -0.003031f, -0.000141f, +0.000009f}, + {-0.041065f, +0.588511f, -0.002930f, -0.000807f, -0.000127f}, + {-0.057814f, -0.095156f, -0.013622f, +0.000710f, +0.000141f}, + {-0.013462f, +0.193769f, -0.004638f, +0.001465f, +0.000106f} + }, + { + {-0.323552f, +0.059375f, -0.047359f, +0.000017f, +0.000018f}, + {-0.347235f, +0.120486f, -0.050411f, -0.000521f, +0.000120f}, + {+0.056648f, +0.076781f, +0.002619f, -0.000739f, +0.000101f}, + {-0.118370f, +0.031720f, -0.024225f, -0.000048f, +0.000065f} + } +}; + +const float rightHRIRReal_FOA[BINAURAL_CONVBANDS][4][BINAURAL_NTAPS]= +{ + { + {+0.001139f, +0.701381f, +0.088362f, +0.001507f, +0.000002f}, + {-0.000414f, -0.262095f, +0.237214f, +0.003224f, -0.000036f}, + {+0.002081f, +0.073269f, +0.016442f, -0.002305f, -0.000016f}, + {+0.003374f, +0.067272f, -0.027345f, -0.000156f, +0.000027f} + }, + { + {-0.006858f, +0.573976f, -0.025590f, -0.002173f, -0.000001f}, + {+0.018683f, -0.673324f, -0.155049f, -0.004529f, +0.000042f}, + {-0.004167f, -0.005579f, -0.043222f, +0.004198f, +0.000026f}, + {-0.007696f, +0.026588f, -0.047141f, +0.000930f, -0.000031f} + }, + { + {+0.022690f, +0.504423f, -0.025668f, -0.000505f, -0.000002f}, + {-0.098922f, -0.785742f, -0.002391f, -0.001725f, +0.000029f}, + {+0.001996f, -0.028688f, -0.031830f, -0.002187f, +0.000003f}, + {+0.012563f, -0.012620f, -0.033386f, -0.001639f, -0.000022f} + }, + { + {-0.068470f, +0.403356f, +0.003719f, +0.002403f, +0.000001f}, + {+0.238766f, -0.395418f, -0.032160f, +0.006283f, -0.000045f}, + {-0.003715f, -0.000119f, +0.009760f, -0.000148f, -0.000031f}, + {-0.028559f, -0.040197f, +0.002155f, +0.000892f, +0.000033f} + }, + { + {+0.145134f, +0.119557f, +0.007639f, -0.000923f, +0.000003f}, + {-0.294065f, +0.334693f, +0.019103f, -0.002511f, -0.000020f}, + {+0.020226f, -0.024338f, +0.012605f, +0.001278f, +0.000012f}, + {+0.043958f, -0.145428f, +0.013697f, +0.000566f, +0.000018f} + }, + { + {-0.153301f, -0.308264f, -0.003171f, -0.001265f, -0.000001f}, + {+0.095935f, +0.863498f, +0.010369f, -0.003299f, +0.000045f}, + {-0.032438f, -0.100491f, +0.003144f, -0.001769f, +0.000029f}, + {-0.013113f, -0.237010f, +0.000894f, -0.000875f, -0.000033f} + }, + { + {-0.012428f, -0.509031f, -0.004688f, +0.000988f, -0.000003f}, + {+0.244664f, +0.595158f, +0.023888f, +0.002491f, +0.000012f}, + {+0.002609f, -0.144907f, -0.010043f, +0.000781f, -0.000027f}, + {-0.074154f, -0.145409f, -0.008757f, -0.000058f, -0.000014f} + }, + { + {+0.212788f, -0.155514f, +0.023333f, +0.000561f, +0.000002f}, + {-0.330585f, -0.291160f, -0.047010f, +0.002016f, -0.000043f}, + {+0.050155f, -0.068056f, -0.001580f, +0.001116f, -0.000021f}, + {+0.122861f, +0.153186f, +0.009329f, +0.000801f, +0.000032f} + }, + { + {-0.148866f, +0.399380f, -0.016077f, -0.000584f, +0.000004f}, + {-0.007222f, -0.769639f, +0.001057f, -0.002043f, -0.000007f}, + {-0.045137f, +0.068695f, +0.001800f, -0.000989f, +0.000039f}, + {-0.030243f, +0.388427f, -0.005358f, -0.000487f, +0.000012f} + }, + { + {-0.148858f, +0.389050f, -0.019934f, -0.000504f, -0.000003f}, + {+0.349211f, -0.214703f, +0.051501f, -0.001478f, +0.000039f}, + {-0.029971f, +0.074752f, -0.006844f, -0.000679f, +0.000009f}, + {-0.127591f, +0.245277f, -0.008622f, -0.000243f, -0.000032f} + }, + { + {+0.239012f, -0.214946f, +0.031611f, +0.000498f, -0.000004f}, + {-0.196316f, +0.613847f, -0.027133f, +0.001726f, +0.000004f}, + {+0.059322f, -0.077618f, +0.010338f, +0.000544f, -0.000046f}, + {+0.142102f, -0.158560f, +0.013819f, +0.000336f, -0.000011f} + }, + { + {+0.056721f, -0.491541f, +0.006821f, +0.000413f, +0.000004f}, + {-0.248916f, +0.524024f, -0.041690f, +0.001135f, -0.000035f}, + {+0.029432f, -0.129169f, -0.000386f, +0.000757f, +0.000007f}, + {+0.025409f, -0.327769f, +0.004549f, +0.000075f, +0.000034f} + }, + { + {-0.277481f, +0.028032f, -0.037920f, -0.000438f, +0.000003f}, + {+0.308141f, -0.332951f, +0.045686f, -0.001496f, -0.000003f}, + {-0.108659f, +0.087169f, -0.015132f, -0.000418f, +0.000046f}, + {-0.144191f, -0.063507f, -0.018317f, -0.000173f, +0.000009f} + }, + { + {+0.037467f, +0.509783f, +0.006165f, -0.000331f, -0.000005f}, + {+0.118379f, -0.623008f, +0.023288f, -0.000858f, +0.000032f}, + {+0.020828f, +0.293771f, +0.009322f, -0.000570f, -0.000020f}, + {+0.044708f, +0.223468f, +0.005411f, -0.000025f, -0.000036f} + }, + { + {+0.276681f, +0.136508f, +0.039053f, +0.000399f, -0.000002f}, + {-0.342800f, +0.086499f, -0.051427f, +0.001312f, +0.000004f}, + {+0.141529f, +0.115364f, +0.013240f, +0.000205f, -0.000040f}, + {+0.110040f, +0.119206f, +0.016186f, +0.000083f, -0.000006f} + }, + { + {-0.117783f, -0.468960f, -0.017913f, +0.000250f, +0.000005f}, + {-0.005671f, +0.604318f, -0.007143f, +0.000660f, -0.000031f}, + {-0.130049f, -0.297226f, -0.017966f, +0.000439f, +0.000030f}, + {-0.077788f, -0.170577f, -0.011766f, -0.000035f, +0.000037f} + }, + { + {-0.252966f, -0.256306f, -0.036605f, -0.000365f, +0.000002f}, + {+0.337478f, +0.074281f, +0.052432f, -0.001197f, -0.000005f}, + {-0.072906f, -0.386255f, -0.005369f, -0.000119f, +0.000033f}, + {-0.075520f, -0.174614f, -0.010607f, -0.000037f, +0.000003f} + }, + { + {+0.180447f, +0.410401f, +0.027706f, -0.000193f, -0.000005f}, + {-0.079743f, -0.570802f, -0.007521f, -0.000528f, +0.000032f}, + {+0.189755f, +0.008151f, +0.021117f, -0.000340f, -0.000036f}, + {+0.097648f, +0.090203f, +0.013931f, +0.000113f, -0.000038f} + }, + { + {+0.221150f, +0.344584f, +0.031954f, +0.000342f, -0.000001f}, + {-0.324392f, -0.195009f, -0.049761f, +0.001141f, +0.000005f}, + {-0.055564f, +0.372598f, -0.003229f, +0.000147f, -0.000026f}, + {+0.029197f, +0.196512f, +0.004268f, -0.000027f, +0.000001f} + }, + { + {-0.234543f, -0.356749f, -0.036109f, +0.000161f, +0.000005f}, + {+0.158828f, +0.551737f, +0.020300f, +0.000447f, -0.000034f}, + {-0.128996f, +0.253163f, -0.019502f, +0.000205f, +0.000038f}, + {-0.086326f, +0.024093f, -0.010653f, -0.000104f, +0.000038f} + }, + { + {-0.180736f, -0.438688f, -0.025011f, -0.000324f, +0.000001f}, + {+0.301948f, +0.334020f, +0.045105f, -0.001128f, -0.000004f}, + {+0.108851f, -0.109590f, +0.011684f, +0.000065f, +0.000022f}, + {+0.007794f, -0.114979f, -0.002557f, +0.000055f, -0.000004f} + }, + { + {+0.283619f, +0.272902f, +0.041849f, -0.000148f, -0.000005f}, + {-0.241474f, -0.503493f, -0.031717f, -0.000352f, +0.000035f}, + {+0.045390f, -0.198917f, +0.011556f, -0.000593f, -0.000041f}, + {+0.041019f, -0.061071f, +0.008824f, +0.000017f, -0.000039f} + }, + { + {+0.123506f, +0.516214f, +0.017365f, +0.000301f, -0.000001f}, + {-0.256327f, -0.482583f, -0.037542f, +0.001057f, +0.000002f}, + {-0.083839f, +0.008074f, -0.016916f, +0.000282f, -0.000018f}, + {+0.003422f, -0.003727f, +0.003177f, -0.000000f, +0.000006f} + }, + { + {-0.313797f, -0.154486f, -0.046391f, +0.000147f, +0.000005f}, + {+0.319981f, +0.404727f, +0.042569f, +0.000317f, -0.000036f}, + {-0.021107f, +0.110660f, -0.004978f, +0.000416f, +0.000047f}, + {-0.008153f, -0.022716f, -0.004670f, +0.000045f, +0.000040f} + }, + { + {-0.061089f, -0.539358f, -0.009248f, -0.000286f, +0.000001f}, + {+0.177073f, +0.627220f, +0.025260f, -0.001022f, -0.000001f}, + {+0.071424f, -0.032340f, +0.013321f, -0.000179f, +0.000014f}, + {-0.053388f, +0.046353f, -0.007111f, -0.000176f, -0.000010f} + }, + { + {+0.324287f, +0.053524f, +0.049068f, -0.000116f, -0.000006f}, + {-0.369344f, -0.211212f, -0.048775f, -0.000225f, +0.000037f}, + {+0.008002f, -0.135643f, +0.001207f, -0.000329f, -0.000053f}, + {+0.026056f, +0.169088f, +0.008645f, +0.000250f, -0.000042f} + }, + { + {+0.005776f, +0.541579f, +0.000581f, +0.000240f, -0.000000f}, + {-0.077934f, -0.656141f, -0.014760f, +0.000940f, +0.000001f}, + {-0.071537f, -0.021095f, -0.007901f, +0.000019f, -0.000006f}, + {+0.095328f, +0.067372f, +0.010448f, -0.000101f, +0.000015f} + }, + { + {-0.328162f, +0.029093f, -0.049230f, +0.000107f, +0.000007f}, + {+0.369662f, +0.037217f, +0.051825f, +0.000167f, -0.000038f}, + {+0.023527f, +0.120022f, -0.000102f, +0.000278f, +0.000058f}, + {-0.090284f, -0.212186f, -0.013169f, -0.000132f, +0.000043f} + }, + { + {+0.048978f, -0.548479f, +0.007485f, -0.000233f, -0.000001f}, + {+0.003228f, +0.602938f, +0.001617f, -0.000911f, -0.000001f}, + {+0.040104f, +0.095644f, +0.005888f, -0.000009f, -0.000005f}, + {-0.081710f, -0.220378f, -0.013048f, -0.000016f, -0.000021f} + }, + { + {+0.324250f, -0.126479f, +0.048291f, -0.000066f, -0.000007f}, + {-0.357292f, +0.046143f, -0.050921f, -0.000098f, +0.000041f}, + {-0.027149f, -0.003860f, +0.000272f, -0.000124f, -0.000060f}, + {+0.141329f, +0.121139f, +0.018219f, +0.000314f, -0.000043f} + }, + { + {-0.104734f, +0.530347f, -0.015582f, +0.000224f, +0.000002f}, + {+0.054628f, -0.590170f, +0.008056f, +0.000909f, -0.000000f}, + {-0.005584f, -0.032979f, -0.004816f, +0.000029f, +0.000015f}, + {+0.037866f, +0.274890f, +0.006759f, -0.000046f, +0.000027f} + }, + { + {-0.308177f, +0.218644f, -0.045991f, +0.000043f, +0.000007f}, + {+0.346201f, -0.142031f, +0.048180f, +0.000046f, -0.000045f}, + {-0.007019f, -0.030662f, -0.000480f, +0.000081f, +0.000058f}, + {-0.162861f, -0.035781f, -0.023778f, -0.000324f, +0.000041f} + }, + { + {+0.155747f, -0.491433f, +0.022764f, -0.000231f, -0.000003f}, + {-0.112390f, +0.563014f, -0.016093f, -0.000905f, +0.000002f}, + {+0.014636f, -0.060316f, +0.003797f, -0.000151f, -0.000023f}, + {+0.007188f, -0.297579f, +0.001361f, +0.000018f, -0.000032f} + }, + { + {+0.282333f, -0.296973f, +0.042631f, -0.000038f, -0.000007f}, + {-0.325943f, +0.233378f, -0.045604f, -0.000052f, +0.000049f}, + {+0.025539f, -0.043016f, +0.004050f, -0.000129f, -0.000057f}, + {+0.170600f, -0.047495f, +0.024487f, +0.000283f, -0.000040f} + }, + { + {-0.198966f, +0.440444f, -0.029339f, +0.000240f, +0.000003f}, + {+0.163937f, -0.519986f, +0.024102f, +0.000910f, -0.000006f}, + {-0.041643f, +0.059924f, -0.008056f, +0.000252f, +0.000028f}, + {-0.058279f, +0.303786f, -0.008000f, +0.000033f, +0.000037f} + }, + { + {-0.251233f, +0.360645f, -0.037855f, +0.000048f, +0.000007f}, + {+0.301209f, -0.307267f, +0.042244f, +0.000061f, -0.000052f}, + {-0.017898f, +0.097992f, -0.002832f, +0.000217f, +0.000060f}, + {-0.154977f, +0.157077f, -0.021873f, -0.000264f, +0.000040f} + }, + { + {+0.235922f, -0.385212f, +0.034692f, -0.000230f, -0.000003f}, + {-0.211902f, +0.482439f, -0.031812f, -0.000875f, +0.000009f}, + {+0.062526f, -0.022786f, +0.009165f, -0.000192f, -0.000037f}, + {+0.100642f, -0.232077f, +0.012026f, +0.000003f, -0.000044f} + }, + { + {+0.215580f, -0.416556f, +0.032649f, -0.000062f, -0.000008f}, + {-0.273278f, +0.387323f, -0.037577f, -0.000065f, +0.000055f}, + {-0.005939f, -0.125998f, +0.001105f, -0.000285f, -0.000067f}, + {+0.119018f, -0.200389f, +0.019595f, +0.000282f, -0.000042f} + }, + { + {-0.266556f, +0.321627f, -0.039270f, +0.000204f, +0.000005f}, + {+0.262381f, -0.436199f, +0.039035f, +0.000825f, -0.000011f}, + {-0.067202f, -0.031111f, -0.011093f, +0.000033f, +0.000054f}, + {-0.114634f, +0.160892f, -0.016486f, -0.000093f, +0.000057f} + }, + { + {-0.175988f, +0.460735f, -0.026828f, +0.000048f, +0.000010f}, + {+0.233172f, -0.480676f, +0.031122f, +0.000031f, -0.000060f}, + {+0.031548f, +0.122002f, +0.003267f, +0.000158f, +0.000072f}, + {-0.094567f, +0.192621f, -0.015001f, -0.000394f, +0.000041f} + }, + { + {+0.289864f, -0.252340f, +0.042717f, -0.000164f, -0.000008f}, + {-0.309890f, +0.352443f, -0.045041f, -0.000820f, +0.000012f}, + {+0.059594f, +0.080834f, +0.009319f, +0.000095f, -0.000085f}, + {+0.123492f, -0.142957f, +0.017979f, +0.000125f, -0.000076f} + }, + { + {+0.134575f, -0.490695f, +0.020657f, -0.000008f, -0.000011f}, + {-0.176248f, +0.555316f, -0.023664f, +0.000054f, +0.000070f}, + {-0.054408f, -0.093413f, -0.005141f, +0.000202f, -0.000064f}, + {+0.078026f, -0.213530f, +0.012432f, +0.000637f, -0.000030f} + }, + { + {-0.306423f, +0.183981f, -0.045149f, +0.000152f, +0.000012f}, + {+0.341487f, -0.240296f, +0.050133f, +0.000895f, -0.000016f}, + {-0.041086f, -0.112975f, -0.007981f, +0.000040f, +0.000125f}, + {-0.138721f, +0.120523f, -0.020161f, +0.000004f, +0.000099f} + }, + { + {-0.092719f, +0.511558f, -0.014604f, -0.000050f, +0.000009f}, + {+0.112835f, -0.589997f, +0.014321f, -0.000122f, -0.000086f}, + {+0.068469f, +0.059054f, +0.008838f, -0.000612f, +0.000032f}, + {-0.054382f, +0.253255f, -0.007586f, -0.000904f, +0.000005f} + }, + { + {+0.317269f, -0.115684f, +0.046850f, -0.000208f, -0.000018f}, + {-0.356933f, +0.130812f, -0.052103f, -0.001044f, +0.000027f}, + {+0.019507f, +0.139642f, +0.002950f, -0.000683f, -0.000159f}, + {+0.152449f, -0.061207f, +0.020045f, -0.000364f, -0.000115f} + }, + { + {+0.051096f, -0.523693f, +0.008474f, +0.000105f, -0.000004f}, + {-0.049349f, +0.600329f, -0.005605f, +0.000022f, +0.000106f}, + {-0.079985f, -0.011392f, -0.007657f, +0.000780f, +0.000028f}, + {+0.017397f, -0.267260f, +0.004496f, +0.000957f, +0.000035f} + }, + { + {-0.323905f, +0.049833f, -0.047865f, +0.000329f, +0.000021f}, + {+0.358893f, -0.027640f, +0.053272f, +0.001258f, -0.000053f}, + {+0.015053f, -0.158953f, -0.000193f, +0.001713f, +0.000167f}, + {-0.144359f, -0.018540f, -0.020249f, +0.000901f, +0.000114f} + }, + { + {-0.008373f, +0.533499f, -0.002225f, -0.000084f, -0.000004f}, + {-0.010355f, -0.593074f, -0.003536f, +0.000223f, -0.000122f}, + {+0.071969f, -0.070538f, +0.006817f, -0.000021f, -0.000104f}, + {+0.009075f, +0.217846f, -0.000438f, -0.000486f, -0.000083f} + }, + { + {+0.325536f, +0.023312f, +0.048108f, -0.000519f, -0.000020f}, + {-0.352731f, -0.066640f, -0.052836f, -0.001159f, +0.000094f}, + {-0.047485f, +0.116702f, -0.002224f, -0.002868f, -0.000134f}, + {+0.125804f, +0.038871f, +0.018687f, -0.001207f, -0.000088f} + }, + { + {-0.036324f, -0.531073f, -0.003989f, -0.000084f, +0.000013f}, + {+0.069318f, +0.580051f, +0.011694f, -0.000718f, +0.000126f}, + {-0.044835f, +0.120121f, -0.003388f, -0.003194f, +0.000173f}, + {-0.016464f, -0.181504f, -0.002802f, -0.001577f, +0.000124f} + } +}; + +const float rightHRIRImag_FOA[BINAURAL_CONVBANDS][4][BINAURAL_NTAPS]= +{ + { + {-0.075561f, -0.068517f, +0.140821f, -0.000006f, -0.000001f}, + {+0.113351f, -0.312423f, +0.154809f, -0.003274f, +0.000040f}, + {-0.002167f, -0.037131f, +0.050206f, -0.009097f, +0.000022f}, + {-0.008959f, -0.001538f, +0.017300f, -0.005827f, -0.000030f} + }, + { + {+0.088726f, -0.056723f, -0.005193f, -0.002691f, -0.000002f}, + {-0.119871f, -0.624601f, +0.192908f, -0.005870f, +0.000033f}, + {+0.004166f, -0.045506f, +0.052787f, -0.000546f, +0.000010f}, + {+0.009543f, +0.003765f, +0.008451f, +0.003327f, -0.000025f} + }, + { + {-0.102143f, +0.113338f, +0.041532f, +0.003556f, +0.000001f}, + {+0.144265f, -0.722990f, -0.063761f, +0.009098f, -0.000044f}, + {-0.005127f, +0.024047f, -0.013948f, +0.005687f, -0.000029f}, + {-0.011405f, +0.075487f, -0.028027f, -0.000790f, +0.000032f} + }, + { + {+0.102256f, +0.332031f, -0.028467f, -0.000969f, +0.000002f}, + {-0.105041f, -0.913298f, -0.007994f, -0.001561f, -0.000024f}, + {+0.007491f, +0.060974f, -0.023635f, -0.001357f, +0.000004f}, + {+0.005542f, +0.127425f, -0.011646f, +0.000496f, +0.000020f} + }, + { + {-0.044065f, +0.500826f, -0.002410f, -0.001370f, -0.000001f}, + {-0.092604f, -0.883373f, -0.024383f, -0.004737f, +0.000046f}, + {-0.004561f, +0.083819f, -0.019790f, -0.002951f, +0.000031f}, + {+0.027047f, +0.113206f, -0.016192f, -0.001506f, -0.000033f} + }, + { + {-0.101331f, +0.396216f, -0.004920f, +0.000653f, -0.000003f}, + {+0.315234f, -0.274804f, +0.039014f, +0.001908f, +0.000016f}, + {-0.020480f, +0.081227f, +0.012774f, +0.001524f, -0.000020f}, + {-0.075525f, -0.016066f, +0.005310f, +0.001230f, -0.000016f} + }, + { + {+0.205124f, -0.066361f, +0.022115f, +0.000986f, +0.000002f}, + {-0.252202f, +0.571430f, -0.010069f, +0.002911f, -0.000045f}, + {+0.049641f, -0.008053f, +0.006538f, +0.000795f, -0.000026f}, + {+0.069872f, -0.229431f, +0.016281f, +0.000270f, +0.000032f} + }, + { + {-0.075366f, -0.478001f, -0.007669f, -0.000701f, +0.000003f}, + {-0.124742f, +0.753308f, -0.025384f, -0.001863f, -0.000009f}, + {-0.028983f, -0.121665f, -0.007415f, -0.000267f, +0.000034f}, + {+0.036071f, -0.292663f, -0.003455f, -0.000819f, +0.000013f} + }, + { + {-0.186385f, -0.294120f, -0.028378f, -0.000604f, -0.000002f}, + {+0.364681f, -0.008978f, +0.038744f, -0.001757f, +0.000041f}, + {-0.036441f, -0.104767f, -0.010428f, -0.000824f, +0.000015f}, + {-0.145432f, -0.035047f, -0.010123f, +0.000064f, -0.000032f} + }, + { + {+0.200759f, +0.301898f, +0.028191f, +0.000609f, -0.000004f}, + {-0.106790f, -0.737079f, -0.007371f, +0.001552f, +0.000005f}, + {+0.050065f, +0.035831f, +0.013930f, +0.000498f, -0.000043f}, + {+0.098812f, +0.316605f, +0.005024f, +0.000388f, -0.000012f} + }, + { + {+0.102918f, +0.447646f, +0.016687f, +0.000392f, +0.000003f}, + {-0.311637f, -0.412036f, -0.037367f, +0.001208f, -0.000037f}, + {+0.029150f, +0.073712f, +0.005390f, +0.000373f, -0.000001f}, + {+0.078159f, +0.331302f, +0.015024f, +0.000096f, +0.000033f} + }, + { + {-0.263157f, -0.117240f, -0.038079f, -0.000498f, +0.000003f}, + {+0.266046f, +0.483755f, +0.030591f, -0.001325f, -0.000003f}, + {-0.079262f, -0.094840f, -0.015385f, -0.000509f, +0.000047f}, + {-0.153547f, -0.029982f, -0.019729f, -0.000450f, +0.000010f} + }, + { + {-0.007705f, -0.507985f, -0.003383f, -0.000318f, -0.000004f}, + {+0.186453f, +0.597236f, +0.023398f, -0.000963f, +0.000033f}, + {-0.013117f, -0.205170f, +0.001765f, -0.000228f, -0.000014f}, + {+0.017314f, -0.287283f, -0.002959f, -0.000038f, -0.000035f} + }, + { + {+0.280521f, -0.062761f, +0.041073f, +0.000449f, -0.000003f}, + {-0.334574f, -0.214167f, -0.043236f, +0.001215f, +0.000003f}, + {+0.133038f, +0.011844f, +0.017286f, +0.000551f, -0.000044f}, + {+0.127101f, -0.107475f, +0.022000f, +0.000440f, -0.000008f} + }, + { + {-0.080859f, +0.491833f, -0.009289f, +0.000270f, +0.000005f}, + {-0.060956f, -0.629530f, -0.006506f, +0.000817f, -0.000032f}, + {-0.073930f, +0.331264f, -0.010959f, +0.000254f, +0.000026f}, + {-0.063542f, +0.194964f, -0.009265f, +0.000065f, +0.000037f} + }, + { + {-0.266097f, +0.204693f, -0.039752f, -0.000407f, +0.000002f}, + {+0.343709f, +0.003857f, +0.048079f, -0.001153f, -0.000004f}, + {-0.120675f, +0.268205f, -0.012518f, -0.000600f, +0.000037f}, + {-0.094236f, +0.151237f, -0.013332f, -0.000477f, +0.000005f} + }, + { + {+0.151764f, -0.437914f, +0.020131f, -0.000242f, -0.000005f}, + {-0.036841f, +0.588874f, -0.009139f, -0.000664f, +0.000032f}, + {+0.174802f, -0.176925f, +0.017691f, -0.000280f, -0.000033f}, + {+0.090868f, -0.134423f, +0.011793f, -0.000076f, -0.000038f} + }, + { + {+0.237215f, -0.304481f, +0.035938f, +0.000373f, -0.000001f}, + {-0.332318f, +0.127083f, -0.047424f, +0.001052f, +0.000005f}, + {+0.006779f, -0.431468f, +0.002691f, +0.000532f, -0.000029f}, + {+0.053552f, -0.194194f, +0.007469f, +0.000494f, -0.000001f} + }, + { + {-0.208558f, +0.382505f, -0.029564f, +0.000207f, +0.000005f}, + {+0.116623f, -0.564310f, +0.021854f, +0.000528f, -0.000033f}, + {-0.172351f, -0.159278f, -0.018428f, +0.000360f, +0.000037f}, + {-0.097811f, +0.036173f, -0.011033f, +0.000077f, +0.000038f} + }, + { + {-0.202490f, +0.392017f, -0.029907f, -0.000333f, +0.000001f}, + {+0.316139f, -0.253384f, +0.044455f, -0.000945f, -0.000004f}, + {+0.097332f, +0.245644f, +0.004917f, -0.000556f, +0.000023f}, + {-0.006532f, +0.174857f, -0.002876f, -0.000550f, -0.000002f} + }, + { + {+0.261135f, -0.320885f, +0.037011f, -0.000181f, -0.000005f}, + {-0.197969f, +0.536807f, -0.033309f, -0.000398f, +0.000034f}, + {+0.081783f, +0.256891f, +0.014473f, -0.000242f, -0.000040f}, + {+0.065893f, +0.064104f, +0.007328f, +0.000082f, -0.000039f} + }, + { + {+0.153724f, -0.486020f, +0.022676f, +0.000325f, -0.000001f}, + {-0.283217f, +0.402227f, -0.039413f, +0.000851f, +0.000003f}, + {-0.100031f, -0.031468f, -0.013972f, +0.000537f, -0.000020f}, + {-0.008541f, -0.048318f, +0.000499f, +0.000444f, +0.000005f} + }, + { + {-0.302384f, +0.214214f, -0.042285f, +0.000129f, +0.000005f}, + {+0.280104f, -0.464455f, +0.045587f, +0.000282f, -0.000035f}, + {-0.027898f, -0.140901f, -0.007378f, +0.000003f, +0.000044f}, + {-0.020559f, -0.029800f, -0.003256f, -0.000145f, +0.000040f} + }, + { + {-0.091526f, +0.536382f, -0.014577f, -0.000305f, +0.000001f}, + {+0.221871f, -0.553999f, +0.029769f, -0.000764f, -0.000002f}, + {+0.073977f, +0.023109f, +0.011231f, -0.000304f, +0.000016f}, + {-0.025756f, -0.040011f, -0.004558f, -0.000368f, -0.000008f} + }, + { + {+0.321259f, -0.098962f, +0.045846f, -0.000108f, -0.000006f}, + {-0.348987f, +0.318713f, -0.051856f, -0.000239f, +0.000036f}, + {+0.017761f, +0.116280f, -0.000624f, -0.000200f, -0.000050f}, + {+0.009582f, -0.098230f, +0.005306f, +0.000144f, -0.000041f} + }, + { + {+0.032445f, -0.541906f, +0.005704f, +0.000315f, -0.000001f}, + {-0.127167f, +0.654253f, -0.018462f, +0.000765f, +0.000001f}, + {-0.073982f, -0.022018f, -0.008993f, +0.000517f, -0.000010f}, + {+0.079904f, +0.007744f, +0.010527f, +0.000350f, +0.000012f} + }, + { + {-0.327237f, +0.011995f, -0.047308f, +0.000087f, +0.000007f}, + {+0.372361f, -0.111338f, +0.055931f, +0.000147f, -0.000037f}, + {+0.006939f, -0.148510f, +0.003422f, +0.000212f, +0.000056f}, + {-0.056276f, +0.216052f, -0.007073f, -0.000104f, +0.000043f} + }, + { + {+0.021322f, +0.548401f, +0.003440f, -0.000317f, -0.000000f}, + {+0.036763f, -0.621232f, +0.007074f, -0.000670f, -0.000001f}, + {+0.060591f, -0.069431f, +0.006623f, -0.000636f, +0.000001f}, + {-0.095686f, +0.156364f, -0.008769f, -0.000353f, -0.000018f} + }, + { + {+0.328267f, +0.077867f, +0.046857f, -0.000082f, -0.000007f}, + {-0.361014f, -0.007604f, -0.057275f, -0.000179f, +0.000039f}, + {-0.031203f, +0.067398f, -0.002430f, -0.000232f, -0.000059f}, + {+0.120666f, -0.172404f, +0.015941f, +0.000046f, -0.000043f} + }, + { + {-0.077320f, -0.544064f, -0.010931f, +0.000301f, +0.000001f}, + {+0.025615f, +0.586847f, +0.004514f, +0.000654f, +0.000000f}, + {-0.019503f, +0.080767f, -0.004247f, +0.000554f, +0.000010f}, + {+0.060877f, -0.260909f, +0.007725f, +0.000342f, +0.000024f} + }, + { + {-0.318158f, -0.173881f, -0.045614f, +0.000092f, +0.000007f}, + {+0.350970f, +0.090433f, +0.053929f, +0.000134f, -0.000043f}, + {+0.011187f, +0.032303f, +0.001760f, +0.000373f, +0.000059f}, + {-0.154877f, +0.074143f, -0.023096f, -0.000037f, +0.000042f} + }, + { + {+0.131227f, +0.515417f, +0.018725f, -0.000280f, -0.000002f}, + {-0.083743f, -0.574149f, -0.012466f, -0.000576f, +0.000001f}, + {+0.005315f, +0.026215f, +0.002698f, -0.000477f, -0.000019f}, + {-0.015816f, +0.287949f, -0.001995f, -0.000235f, -0.000030f} + }, + { + {+0.296693f, +0.260934f, +0.042541f, -0.000091f, -0.000007f}, + {-0.335556f, -0.189122f, -0.052026f, -0.000094f, +0.000047f}, + {+0.020995f, +0.006183f, -0.000036f, -0.000396f, -0.000057f}, + {+0.168822f, +0.001307f, +0.024594f, -0.000017f, -0.000040f} + }, + { + {-0.178422f, -0.467768f, -0.025765f, +0.000259f, +0.000003f}, + {+0.138949f, +0.536439f, +0.020095f, +0.000522f, -0.000004f}, + {-0.028752f, -0.066596f, -0.002138f, +0.000378f, +0.000026f}, + {-0.031690f, -0.308623f, -0.005893f, +0.000213f, +0.000034f} + }, + { + {-0.267781f, -0.330036f, -0.038496f, +0.000071f, +0.000007f}, + {+0.312281f, +0.270728f, +0.048992f, +0.000017f, -0.000050f}, + {-0.024788f, -0.069674f, -0.002302f, +0.000335f, +0.000057f}, + {-0.167013f, -0.101727f, -0.022607f, -0.000026f, +0.000040f} + }, + { + {+0.218246f, +0.415608f, +0.031895f, -0.000250f, -0.000003f}, + {-0.187767f, -0.495269f, -0.027755f, -0.000490f, +0.000007f}, + {+0.054038f, +0.052249f, +0.006077f, -0.000385f, -0.000032f}, + {+0.082423f, +0.279154f, +0.011379f, -0.000228f, -0.000040f} + }, + { + {+0.234462f, +0.390517f, +0.033506f, -0.000040f, -0.000008f}, + {-0.286682f, -0.344540f, -0.044785f, +0.000053f, +0.000053f}, + {+0.007799f, +0.121924f, -0.000254f, -0.000274f, -0.000063f}, + {+0.137635f, +0.191812f, +0.020083f, +0.000078f, -0.000041f} + }, + { + {-0.252188f, -0.355561f, -0.036817f, +0.000259f, +0.000004f}, + {+0.236813f, +0.457491f, +0.035054f, +0.000497f, -0.000010f}, + {-0.067322f, +0.004912f, -0.008444f, +0.000591f, +0.000044f}, + {-0.110001f, -0.188497f, -0.016071f, +0.000306f, +0.000049f} + }, + { + {-0.196649f, -0.440315f, -0.028013f, +0.000028f, +0.000009f}, + {+0.254039f, +0.432758f, +0.039405f, -0.000094f, -0.000057f}, + {+0.018169f, -0.125990f, +0.003787f, +0.000283f, +0.000070f}, + {-0.104872f, -0.193750f, -0.016320f, -0.000067f, +0.000042f} + }, + { + {+0.279232f, +0.288906f, +0.040649f, -0.000288f, -0.000006f}, + {-0.287453f, -0.396154f, -0.041796f, -0.000496f, +0.000012f}, + {+0.065516f, -0.051533f, +0.008251f, -0.000833f, -0.000068f}, + {+0.117846f, +0.150938f, +0.019317f, -0.000398f, -0.000066f} + }, + { + {+0.155838f, +0.477142f, +0.022236f, -0.000054f, -0.000011f}, + {-0.205090f, -0.523697f, -0.032347f, +0.000074f, +0.000064f}, + {-0.043133f, +0.115358f, -0.007458f, -0.000536f, -0.000071f}, + {+0.086685f, +0.200152f, +0.011885f, -0.000042f, -0.000037f} + }, + { + {-0.298969f, -0.220193f, -0.043767f, +0.000325f, +0.000010f}, + {+0.328142f, +0.292452f, +0.047271f, +0.000442f, -0.000014f}, + {-0.051610f, +0.100445f, -0.006535f, +0.000948f, +0.000105f}, + {-0.130003f, -0.132255f, -0.020754f, +0.000362f, +0.000088f} + }, + { + {-0.114168f, -0.502804f, -0.016020f, +0.000104f, +0.000010f}, + {+0.143455f, +0.576024f, +0.024058f, -0.000023f, -0.000077f}, + {+0.061115f, -0.073546f, +0.010498f, +0.000984f, +0.000052f}, + {-0.068233f, -0.228084f, -0.008576f, +0.000257f, +0.000020f} + }, + { + {+0.312611f, +0.151372f, +0.045798f, -0.000314f, -0.000015f}, + {-0.351200f, -0.182575f, -0.051390f, -0.000326f, +0.000020f}, + {+0.031920f, -0.116916f, +0.003818f, -0.000728f, -0.000144f}, + {+0.146596f, +0.100142f, +0.022461f, -0.000165f, -0.000108f} + }, + { + {+0.072361f, +0.518728f, +0.009942f, -0.000175f, -0.000007f}, + {-0.079531f, -0.601014f, -0.014699f, +0.000081f, +0.000095f}, + {-0.074110f, +0.046958f, -0.012342f, -0.001344f, -0.000005f}, + {+0.036969f, +0.268420f, +0.004301f, -0.000333f, +0.000013f} + }, + { + {-0.321149f, -0.084827f, -0.047210f, +0.000251f, +0.000020f}, + {+0.359514f, +0.071785f, +0.052488f, +0.000127f, -0.000038f}, + {-0.004461f, +0.153778f, +0.000819f, +0.000092f, +0.000168f}, + {-0.150780f, -0.016846f, -0.022402f, -0.000246f, +0.000118f} + }, + { + {-0.030564f, -0.529872f, -0.003428f, +0.000214f, -0.000000f}, + {+0.017715f, +0.598148f, +0.005426f, -0.000313f, -0.000115f}, + {+0.077791f, +0.029195f, +0.012192f, +0.001184f, -0.000065f}, + {-0.001917f, -0.241534f, -0.000982f, +0.000017f, -0.000059f} + }, + { + {+0.325748f, +0.016029f, +0.047602f, -0.000149f, -0.000021f}, + {-0.356902f, +0.024523f, -0.052188f, -0.000031f, +0.000071f}, + {-0.031837f, -0.135684f, -0.003925f, +0.000518f, -0.000157f}, + {+0.134040f, -0.031563f, +0.022612f, +0.000523f, -0.000105f} + }, + { + {-0.013284f, +0.534819f, -0.003031f, -0.000141f, +0.000009f}, + {+0.041065f, -0.588511f, +0.002930f, +0.000807f, +0.000127f}, + {-0.057814f, -0.095156f, -0.013622f, +0.000710f, +0.000141f}, + {-0.013462f, +0.193769f, -0.004638f, +0.001465f, +0.000106f} + }, + { + {-0.323552f, +0.059375f, -0.047359f, +0.000017f, +0.000018f}, + {+0.347235f, -0.120486f, +0.050411f, +0.000521f, -0.000120f}, + {+0.056648f, +0.076781f, +0.002619f, -0.000739f, +0.000101f}, + {-0.118370f, +0.031720f, -0.024225f, -0.000048f, +0.000065f} + } +}; + +#endif + const float FASTCONV_HRIR_latency_s = 0.000666667f; const float leftHRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]= { diff --git a/lib_rend/ivas_rom_binauralRenderer.h b/lib_rend/ivas_rom_binauralRenderer.h index 939f6ef78fa76c7b82a6755f985294490a26d1c8..26aae29319e9ee91544a1ef8c8724e036cf33243 100644 --- a/lib_rend/ivas_rom_binauralRenderer.h +++ b/lib_rend/ivas_rom_binauralRenderer.h @@ -48,6 +48,16 @@ extern float leftHRIRReal_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NT 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]; +#ifdef UPDATE_SBA_FILTER +extern float leftHRIRReal_HOA2[BINAURAL_CONVBANDS][9][BINAURAL_NTAPS]; +extern float leftHRIRImag_HOA2[BINAURAL_CONVBANDS][9][BINAURAL_NTAPS]; +extern float rightHRIRReal_HOA2[BINAURAL_CONVBANDS][9][BINAURAL_NTAPS]; +extern float rightHRIRImag_HOA2[BINAURAL_CONVBANDS][9][BINAURAL_NTAPS]; +extern float leftHRIRReal_FOA[BINAURAL_CONVBANDS][4][BINAURAL_NTAPS]; +extern float leftHRIRImag_FOA[BINAURAL_CONVBANDS][4][BINAURAL_NTAPS]; +extern float rightHRIRReal_FOA[BINAURAL_CONVBANDS][4][BINAURAL_NTAPS]; +extern float rightHRIRImag_FOA[BINAURAL_CONVBANDS][4][BINAURAL_NTAPS]; +#endif extern float leftHRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]; extern float leftHRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]; @@ -55,6 +65,10 @@ 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; +#ifdef UPDATE_SBA_FILTER +extern float FASTCONV_HOA2_latency_s; +extern float FASTCONV_FOA_latency_s; +#endif extern float hrtfShCoeffsRe[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS]; extern float hrtfShCoeffsIm[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS]; diff --git a/lib_rend/ivas_rom_binaural_crend_head.c b/lib_rend/ivas_rom_binaural_crend_head.c index 583efe2454f546e5ba432c84426ad1951e4da3a9..ce43f7bce49e2c8e69eb034d2584f7a76a3514ef 100644 --- a/lib_rend/ivas_rom_binaural_crend_head.c +++ b/lib_rend/ivas_rom_binaural_crend_head.c @@ -42,11 +42,17 @@ +#ifndef UPDATE_SBA_FILTER #include +#endif #include +#ifndef UPDATE_SBA_FILTER #include "cnst.h" +#endif #include "ivas_cnst.h" +/* clang-format off */ + #define WMC_TOOL_SKIP diff --git a/lib_rend/ivas_rom_binaural_crend_head.h b/lib_rend/ivas_rom_binaural_crend_head.h index 4646e8cd9d7ec13934a1409fb8e3d214826182f0..4779d12a99aac1491e04da2b657f6a3a5c33cbe3 100644 --- a/lib_rend/ivas_rom_binaural_crend_head.h +++ b/lib_rend/ivas_rom_binaural_crend_head.h @@ -45,10 +45,14 @@ #ifndef _IVAS_ROM_BINAURAL_CREND_HEAD_ #define _IVAS_ROM_BINAURAL_CREND_HEAD_ +#ifndef UPDATE_SBA_FILTER #include #include "cnst.h" +#endif #include "ivas_cnst.h" +#ifdef USE_HRIR_128_METH5_IRC_53_Q10_SYML_ITRP1_48000 + /********************** CRendBin_Combined_HRIR **********************/ @@ -96,6 +100,9 @@ extern float CRendBin_Combined_HRIR_coeff_re_16kHz[15][1][80]; extern float CRendBin_Combined_HRIR_coeff_im_16kHz[15][1][80]; extern float *CRendBin_Combined_HRIR_coeff_diffuse_re_16kHz[1]; extern float *CRendBin_Combined_HRIR_coeff_diffuse_im_16kHz[1]; +#endif + +#ifndef UPDATE_SBA_FILTER /********************** CRendBin_HOA3_HRIR **********************/ @@ -143,6 +150,161 @@ extern float CRendBin_HOA3_HRIR_coeff_re_16kHz[16][1][160]; extern float CRendBin_HOA3_HRIR_coeff_im_16kHz[16][1][160]; extern float *CRendBin_HOA3_HRIR_coeff_diffuse_re_16kHz[1]; extern float *CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[1]; +#endif /* UPDATE_SBA_FILTER */ + +#ifdef UPDATE_SBA_FILTER + + +/********************** CRendBin_FOA_HRIR **********************/ +extern uint16_t CRendBin_FOA_HRIR_Use_Symetric_Filters; +extern float CRendBin_FOA_HRIR_latency_s; + +/* Sample Rate = 48000 */ + +extern int16_t CRendBin_FOA_HRIR_max_num_iterations_48kHz; +extern uint16_t CRendBin_FOA_HRIR_num_iterations_48kHz[4][BINAURAL_CHANNELS]; +extern uint16_t CRendBin_FOA_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS]; +extern uint16_t CRendBin_FOA_HRIR_pIndex_frequency_max_48kHz[4][BINAURAL_CHANNELS][1]; +extern uint16_t CRendBin_FOA_HRIR_index_frequency_max_diffuse_48kHz; +extern float CRendBin_FOA_HRIR_inv_diffuse_weight_48kHz[4]; +extern uint16_t *CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS]; +extern float CRendBin_FOA_HRIR_coeff_re_48kHz[4][BINAURAL_CHANNELS][240]; +extern float CRendBin_FOA_HRIR_coeff_im_48kHz[4][BINAURAL_CHANNELS][240]; +extern float *CRendBin_FOA_HRIR_coeff_diffuse_re_48kHz[BINAURAL_CHANNELS]; +extern float *CRendBin_FOA_HRIR_coeff_diffuse_im_48kHz[BINAURAL_CHANNELS]; + +/* Sample Rate = 32000 */ + +extern int16_t CRendBin_FOA_HRIR_max_num_iterations_32kHz; +extern uint16_t CRendBin_FOA_HRIR_num_iterations_32kHz[4][BINAURAL_CHANNELS]; +extern uint16_t CRendBin_FOA_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS]; +extern uint16_t CRendBin_FOA_HRIR_pIndex_frequency_max_32kHz[4][BINAURAL_CHANNELS][1]; +extern uint16_t CRendBin_FOA_HRIR_index_frequency_max_diffuse_32kHz; +extern float CRendBin_FOA_HRIR_inv_diffuse_weight_32kHz[4]; +extern uint16_t *CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS]; +extern float CRendBin_FOA_HRIR_coeff_re_32kHz[4][BINAURAL_CHANNELS][160]; +extern float CRendBin_FOA_HRIR_coeff_im_32kHz[4][BINAURAL_CHANNELS][160]; +extern float *CRendBin_FOA_HRIR_coeff_diffuse_re_32kHz[BINAURAL_CHANNELS]; +extern float *CRendBin_FOA_HRIR_coeff_diffuse_im_32kHz[BINAURAL_CHANNELS]; + +/* Sample Rate = 16000 */ + +extern int16_t CRendBin_FOA_HRIR_max_num_iterations_16kHz; +extern uint16_t CRendBin_FOA_HRIR_num_iterations_16kHz[4][BINAURAL_CHANNELS]; +extern uint16_t CRendBin_FOA_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS]; +extern uint16_t CRendBin_FOA_HRIR_pIndex_frequency_max_16kHz[4][BINAURAL_CHANNELS][1]; +extern uint16_t CRendBin_FOA_HRIR_index_frequency_max_diffuse_16kHz; +extern float CRendBin_FOA_HRIR_inv_diffuse_weight_16kHz[4]; +extern uint16_t *CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS]; +extern float CRendBin_FOA_HRIR_coeff_re_16kHz[4][BINAURAL_CHANNELS][80]; +extern float CRendBin_FOA_HRIR_coeff_im_16kHz[4][BINAURAL_CHANNELS][80]; +extern float *CRendBin_FOA_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS]; +extern float *CRendBin_FOA_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS]; +#endif /* UPDATE_SBA_FILTER */ + +#ifdef UPDATE_SBA_FILTER + + +/********************** CRendBin_HOA2_HRIR **********************/ + +extern uint16_t CRendBin_HOA2_HRIR_Use_Symetric_Filters; +extern float CRendBin_HOA2_HRIR_latency_s; + +/* Sample Rate = 48000 */ + +extern int16_t CRendBin_HOA2_HRIR_max_num_iterations_48kHz; +extern uint16_t CRendBin_HOA2_HRIR_num_iterations_48kHz[9][BINAURAL_CHANNELS]; +extern uint16_t CRendBin_HOA2_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS]; +extern uint16_t CRendBin_HOA2_HRIR_pIndex_frequency_max_48kHz[9][BINAURAL_CHANNELS][1]; +extern uint16_t CRendBin_HOA2_HRIR_index_frequency_max_diffuse_48kHz; +extern float CRendBin_HOA2_HRIR_inv_diffuse_weight_48kHz[9]; +extern uint16_t *CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS]; +extern float CRendBin_HOA2_HRIR_coeff_re_48kHz[9][BINAURAL_CHANNELS][240]; +extern float CRendBin_HOA2_HRIR_coeff_im_48kHz[9][BINAURAL_CHANNELS][240]; +extern float *CRendBin_HOA2_HRIR_coeff_diffuse_re_48kHz[BINAURAL_CHANNELS]; +extern float *CRendBin_HOA2_HRIR_coeff_diffuse_im_48kHz[BINAURAL_CHANNELS]; + +/* Sample Rate = 32000 */ + +extern int16_t CRendBin_HOA2_HRIR_max_num_iterations_32kHz; +extern uint16_t CRendBin_HOA2_HRIR_num_iterations_32kHz[9][BINAURAL_CHANNELS]; +extern uint16_t CRendBin_HOA2_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS]; +extern uint16_t CRendBin_HOA2_HRIR_pIndex_frequency_max_32kHz[9][BINAURAL_CHANNELS][1]; +extern uint16_t CRendBin_HOA2_HRIR_index_frequency_max_diffuse_32kHz; +extern float CRendBin_HOA2_HRIR_inv_diffuse_weight_32kHz[9]; +extern uint16_t *CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS]; +extern float CRendBin_HOA2_HRIR_coeff_re_32kHz[9][BINAURAL_CHANNELS][160]; +extern float CRendBin_HOA2_HRIR_coeff_im_32kHz[9][BINAURAL_CHANNELS][160]; +extern float *CRendBin_HOA2_HRIR_coeff_diffuse_re_32kHz[BINAURAL_CHANNELS]; +extern float *CRendBin_HOA2_HRIR_coeff_diffuse_im_32kHz[BINAURAL_CHANNELS]; + +/* Sample Rate = 16000 */ + +extern int16_t CRendBin_HOA2_HRIR_max_num_iterations_16kHz; +extern uint16_t CRendBin_HOA2_HRIR_num_iterations_16kHz[9][BINAURAL_CHANNELS]; +extern uint16_t CRendBin_HOA2_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS]; +extern uint16_t CRendBin_HOA2_HRIR_pIndex_frequency_max_16kHz[9][BINAURAL_CHANNELS][1]; +extern uint16_t CRendBin_HOA2_HRIR_index_frequency_max_diffuse_16kHz; +extern float CRendBin_HOA2_HRIR_inv_diffuse_weight_16kHz[9]; +extern uint16_t *CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS]; +extern float CRendBin_HOA2_HRIR_coeff_re_16kHz[9][BINAURAL_CHANNELS][80]; +extern float CRendBin_HOA2_HRIR_coeff_im_16kHz[9][BINAURAL_CHANNELS][80]; +extern float *CRendBin_HOA2_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS]; +extern float *CRendBin_HOA2_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS]; +#endif /* UPDATE_SBA_FILTER */ + +#ifdef UPDATE_SBA_FILTER + + +/********************** CRendBin_HOA3_HRIR **********************/ + +extern uint16_t CRendBin_HOA3_HRIR_Use_Symetric_Filters; +extern float CRendBin_HOA3_HRIR_latency_s; + +/* Sample Rate = 48000 */ + +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]; +extern uint16_t CRendBin_HOA3_HRIR_pIndex_frequency_max_48kHz[16][BINAURAL_CHANNELS][1]; +extern uint16_t CRendBin_HOA3_HRIR_index_frequency_max_diffuse_48kHz; +extern float CRendBin_HOA3_HRIR_inv_diffuse_weight_48kHz[16]; +extern uint16_t *CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS]; +extern float CRendBin_HOA3_HRIR_coeff_re_48kHz[16][BINAURAL_CHANNELS][240]; +extern float CRendBin_HOA3_HRIR_coeff_im_48kHz[16][BINAURAL_CHANNELS][240]; +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 */ + +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]; +extern uint16_t CRendBin_HOA3_HRIR_pIndex_frequency_max_32kHz[16][BINAURAL_CHANNELS][1]; +extern uint16_t CRendBin_HOA3_HRIR_index_frequency_max_diffuse_32kHz; +extern float CRendBin_HOA3_HRIR_inv_diffuse_weight_32kHz[16]; +extern uint16_t *CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS]; +extern float CRendBin_HOA3_HRIR_coeff_re_32kHz[16][BINAURAL_CHANNELS][160]; +extern float CRendBin_HOA3_HRIR_coeff_im_32kHz[16][BINAURAL_CHANNELS][160]; +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 */ + +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]; +extern uint16_t CRendBin_HOA3_HRIR_pIndex_frequency_max_16kHz[16][BINAURAL_CHANNELS][1]; +extern uint16_t CRendBin_HOA3_HRIR_index_frequency_max_diffuse_16kHz; +extern float CRendBin_HOA3_HRIR_inv_diffuse_weight_16kHz[16]; +extern uint16_t *CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS]; +extern float CRendBin_HOA3_HRIR_coeff_re_16kHz[16][BINAURAL_CHANNELS][80]; +extern float CRendBin_HOA3_HRIR_coeff_im_16kHz[16][BINAURAL_CHANNELS][80]; +extern float *CRendBin_HOA3_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS]; +extern float *CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS]; +#endif /* UPDATE_SBA_FILTER */ + + /********************** CRendBin_Combined_BRIR **********************/ diff --git a/lib_rend/ivas_rotation.c b/lib_rend/ivas_rotation.c index 58536df19f343eff092a44f56a2f31d3b15c6739..6809cdee2bcf9869dbe8918d5bb820746c242f29 100644 --- a/lib_rend/ivas_rotation.c +++ b/lib_rend/ivas_rotation.c @@ -85,19 +85,10 @@ ivas_error ivas_headTrack_open( ( *hHeadTrackData )->Rmat_prev[i][i] = 1.0f; } -#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS -#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS_OPT 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 ); -#else - set_zero( ( *hHeadTrackData )->chEneIIR[0], CLDFB_NO_CHANNELS_MAX ); - set_zero( ( *hHeadTrackData )->chEneIIR[1], CLDFB_NO_CHANNELS_MAX ); - set_zero( ( *hHeadTrackData )->procChEneIIR[0], CLDFB_NO_CHANNELS_MAX ); - set_zero( ( *hHeadTrackData )->procChEneIIR[1], CLDFB_NO_CHANNELS_MAX ); -#endif -#endif return IVAS_ERR_OK; } @@ -174,14 +165,13 @@ void Euler2Quat( float cr = cosf( roll * 0.5f ); float sr = sinf( roll * 0.5f ); float cp = cosf( pitch * 0.5f ); - float sp = sinf( -pitch * 0.5f ); + float sp = sinf( pitch * 0.5f ); float cy = cosf( yaw * 0.5f ); float sy = sinf( yaw * 0.5f ); - - 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; + 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; return; } @@ -260,10 +250,14 @@ void rotateAziEle( 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 */ +#ifdef JBM_TSM_ON_TCS + float *output[], /* i/o: unrotated HOA3 signal buffer in TD */ +#else + float output[][L_FRAME48k], /* i/o: unrotated HOA3 signal buffer in TD */ +#endif + 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 */ ) { int16_t i, l, n, m; @@ -363,11 +357,15 @@ void rotateFrame_shd( 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 */ +#ifdef JBM_TSM_ON_TCS + float *output[], /* i/o: unrotated SD signal buffer in TD */ +#else + float output[][L_FRAME48k], /* i/o: unrotated SD signal buffer in TD */ +#endif + 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 */ ) { int16_t i, j; @@ -501,7 +499,10 @@ void rotateFrame_shd_cldfb( 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 */ +#ifdef JBM_TSM_ON_TCS + const int16_t numTimeSlots, +#endif + const int16_t shd_rot_max_order /* i : split-order rotation method */ ) { int16_t n = 0; @@ -524,7 +525,11 @@ void rotateFrame_shd_cldfb( SHrotmatgen( SHrotmat, Rmat, shd_rot_max_order ); /* rotation by mtx multiplication */ +#ifdef JBM_TSM_ON_TCS + for ( i = 0; i < numTimeSlots; i++ ) +#else for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ ) +#endif { for ( iBand = 0; iBand < CLDFB_NO_CHANNELS_MAX; iBand++ ) { @@ -595,7 +600,10 @@ void rotateFrame_sd_cldfb( 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 JBM_TSM_ON_TCS + const int16_t numTimeSlots, /* i : number of time slots to process */ +#endif + const int16_t nb_band /* i : number of CLDFB bands to process */ ) { int16_t iBlock, iBand, m, n; @@ -653,7 +661,11 @@ void rotateFrame_sd_cldfb( p_imagRot = imagRot[n]; if ( g1 > 0.f ) { +#ifdef JBM_TSM_ON_TCS + for ( iBlock = 0; iBlock < numTimeSlots; iBlock++ ) +#else for ( iBlock = 0; iBlock < MAX_PARAM_SPATIAL_SUBFRAMES; iBlock++ ) +#endif { p_real = Cldfb_RealBuffer[m][iBlock]; p_imag = Cldfb_ImagBuffer[m][iBlock]; @@ -673,7 +685,11 @@ void rotateFrame_sd_cldfb( { p_realRot = realRot[n]; p_imagRot = imagRot[n]; +#ifdef JBM_TSM_ON_TCS + for ( iBlock = 0; iBlock < numTimeSlots; iBlock++ ) +#else for ( iBlock = 0; iBlock < MAX_PARAM_SPATIAL_SUBFRAMES; iBlock++ ) +#endif { p_real = Cldfb_RealBuffer[n][iBlock]; p_imag = Cldfb_ImagBuffer[n][iBlock]; diff --git a/lib_rend/ivas_sba_rendering.c b/lib_rend/ivas_sba_rendering.c index 8fd10d83ba3b261a3874eed9065197fbca20ab3a..eeeb505dea009192cd800ae5acbc8ceb3026e320 100644 --- a/lib_rend/ivas_sba_rendering.c +++ b/lib_rend/ivas_sba_rendering.c @@ -50,12 +50,11 @@ * Render prototype audio signals using SBA mixing matrices *-------------------------------------------------------------------*/ -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 */ +#ifdef JBM_TSM_ON_TCS +void ivas_sba_prototype_renderer_sf( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder struct */ + float inRe[][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i : Input audio in CLDFB domain, real */ + float inIm[][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX] /* i : Input audio in CLDFB domain, imag */ ) { float mixer_mat[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH][IVAS_MAX_NUM_BANDS]; @@ -66,8 +65,8 @@ void ivas_sba_prototype_renderer( int16_t num_cldfb_bands, numch_in, numch_out; int16_t cldfb_band; int16_t out_ch, in_ch; - int16_t firstSlot, slotEnd, firstInCh, inChEnd, firstOutCh, outChEnd; - int16_t sf_idx; + int16_t firstInCh, inChEnd, firstOutCh, outChEnd; + int16_t slot_idx_start; push_wmops( "ivas_sba_prototype_renderer" ); @@ -75,12 +74,166 @@ void ivas_sba_prototype_renderer( hDecoderConfig = st_ivas->hDecoderConfig; num_spar_bands = hSpar->hFbMixer->pFb->filterbank_num_bands; - firstSlot = firstSubframe * ( CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES ); - slotEnd = ( firstSubframe + nSubframes ) * ( CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES ); + num_cldfb_bands = hSpar->hFbMixer->pFb->fb_bin_to_band.num_cldfb_bands; + numch_in = hSpar->hFbMixer->fb_cfg->num_in_chans; + numch_out = hSpar->hFbMixer->fb_cfg->num_out_chans; + + if ( st_ivas->nchan_transport == 1 ) + { + firstInCh = 0; + inChEnd = 1; + firstOutCh = 0; + outChEnd = 1; + } + else /* 2 TC */ + { + firstInCh = 0; + inChEnd = 2; + firstOutCh = 1; + outChEnd = 2; + } + slot_idx_start = hSpar->slots_rendered; + /* Apply mixing matrix */ + for ( ts = 0; ts < hSpar->subframe_nbslots[hSpar->subframes_rendered]; ts++ ) + { + int16_t md_idx = hSpar->render_to_md_map[ts + slot_idx_start]; + /* determine SPAR parameters for this time slot */ + ivas_spar_get_parameters( hSpar, hDecoderConfig, md_idx, numch_out, numch_in, num_spar_bands, mixer_mat ); + + for ( cldfb_band = 0; cldfb_band < num_cldfb_bands; cldfb_band++ ) + { + float out_re[IVAS_SPAR_MAX_CH]; + float out_im[IVAS_SPAR_MAX_CH]; + float cldfb_par; + ivas_fb_bin_to_band_data_t *bin2band = &hSpar->hFbMixer->pFb->fb_bin_to_band; + + for ( out_ch = firstOutCh; out_ch < outChEnd; out_ch++ ) + { + out_re[out_ch] = 0.0f; + out_im[out_ch] = 0.0f; + + for ( in_ch = firstInCh; in_ch < inChEnd; in_ch++ ) + { + if ( cldfb_band < CLDFB_PAR_WEIGHT_START_BAND ) /* tuning parameter, depends on how much SPAR Filters overlap for the CLDFB bands */ + { + spar_band = bin2band->p_cldfb_map_to_spar_band[cldfb_band]; + cldfb_par = mixer_mat[out_ch][in_ch][spar_band]; + } + else + { + cldfb_par = 0.0f; + for ( spar_band = bin2band->p_spar_start_bands[cldfb_band]; spar_band < num_spar_bands; spar_band++ ) + { + /* accumulate contributions from all SPAR bands */ + cldfb_par += mixer_mat[out_ch][in_ch][spar_band] * bin2band->pp_cldfb_weights_per_spar_band[cldfb_band][spar_band]; + } + } + + out_re[out_ch] += inRe[in_ch][ts][cldfb_band] * cldfb_par; + out_im[out_ch] += inIm[in_ch][ts][cldfb_band] * cldfb_par; + } + } + + /*update CLDFB data with the parameter-modified data*/ + for ( out_ch = firstOutCh; out_ch < outChEnd; out_ch++ ) + { + inRe[out_ch][ts][cldfb_band] = out_re[out_ch]; + inIm[out_ch][ts][cldfb_band] = out_im[out_ch]; + } + } + + /* Update mixing matrices */ + if ( ( ( slot_idx_start + ts + 1 ) == hSpar->num_slots ) || ( ( md_idx / JBM_CLDFB_SLOTS_IN_SUBFRAME ) != ( hSpar->render_to_md_map[ts + slot_idx_start + 1] / JBM_CLDFB_SLOTS_IN_SUBFRAME ) ) ) + { + /* we have crossed an unadapted parameter sf border, update previous mixing matrices */ + int16_t md_sf = md_idx / JBM_CLDFB_SLOTS_IN_SUBFRAME; + hSpar->i_subframe++; + hSpar->i_subframe = min( hSpar->i_subframe, MAX_PARAM_SPATIAL_SUBFRAMES ); + mvr2r( hSpar->hMdDec->mixer_mat_prev[1][0][0], hSpar->hMdDec->mixer_mat_prev[0][0][0], IVAS_MAX_FB_MIXER_OUT_CH * IVAS_MAX_FB_MIXER_IN_CH * IVAS_MAX_NUM_BANDS ); + mvr2r( hSpar->hMdDec->mixer_mat_prev[2][0][0], hSpar->hMdDec->mixer_mat_prev[1][0][0], IVAS_MAX_FB_MIXER_OUT_CH * IVAS_MAX_FB_MIXER_IN_CH * IVAS_MAX_NUM_BANDS ); + mvr2r( hSpar->hMdDec->mixer_mat_prev[3][0][0], hSpar->hMdDec->mixer_mat_prev[2][0][0], IVAS_MAX_FB_MIXER_OUT_CH * IVAS_MAX_FB_MIXER_IN_CH * IVAS_MAX_NUM_BANDS ); + mvr2r( hSpar->hMdDec->mixer_mat_prev[4][0][0], hSpar->hMdDec->mixer_mat_prev[3][0][0], IVAS_MAX_FB_MIXER_OUT_CH * IVAS_MAX_FB_MIXER_IN_CH * IVAS_MAX_NUM_BANDS ); + + for ( out_ch = 0; out_ch < numch_out; out_ch++ ) + { + for ( in_ch = 0; in_ch < numch_in; in_ch++ ) + { + for ( b = 0; b < num_spar_bands; b++ ) + { + hSpar->hMdDec->mixer_mat_prev[4][out_ch][in_ch][b] = hSpar->hMdDec->mixer_mat[out_ch][in_ch][b + md_sf * IVAS_MAX_NUM_BANDS]; + } + } + } + } + } + + /* Create prototypes */ + if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) + { + for ( ts = 0; ts < hSpar->subframe_nbslots[hSpar->subframes_rendered]; ts++ ) + { + if ( st_ivas->nchan_transport == 1 ) /* Dual mono */ + { + mvr2r( inRe[0][ts], inRe[1][ts], CLDFB_NO_CHANNELS_MAX ); + mvr2r( inIm[0][ts], inIm[1][ts], CLDFB_NO_CHANNELS_MAX ); + } + else if ( st_ivas->nchan_transport == 2 ) /* Opposing cardioids */ + { + float temp_signal[CLDFB_NO_CHANNELS_MAX]; + + v_add( inRe[0][ts], inRe[1][ts], temp_signal, CLDFB_NO_CHANNELS_MAX ); + v_sub( inRe[0][ts], inRe[1][ts], inRe[1][ts], CLDFB_NO_CHANNELS_MAX ); + mvr2r( temp_signal, inRe[0][ts], CLDFB_NO_CHANNELS_MAX ); + v_multc( inRe[0][ts], 0.5f, inRe[0][ts], CLDFB_NO_CHANNELS_MAX ); + v_multc( inRe[1][ts], 0.5f, inRe[1][ts], CLDFB_NO_CHANNELS_MAX ); + + v_add( inIm[0][ts], inIm[1][ts], temp_signal, CLDFB_NO_CHANNELS_MAX ); + v_sub( inIm[0][ts], inIm[1][ts], inIm[1][ts], CLDFB_NO_CHANNELS_MAX ); + mvr2r( temp_signal, inIm[0][ts], CLDFB_NO_CHANNELS_MAX ); + v_multc( inIm[0][ts], 0.5f, inIm[0][ts], CLDFB_NO_CHANNELS_MAX ); + v_multc( inIm[1][ts], 0.5f, inIm[1][ts], CLDFB_NO_CHANNELS_MAX ); + } + } + } + + pop_wmops(); + + return; +} +#endif + +void ivas_sba_prototype_renderer( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder struct */ + float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i : Input audio in CLDFB domain, real */ + float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i : Input audio in CLDFB domain, imag */ + const int16_t subframe /* i : Subframe to render */ +) +{ + float mixer_mat[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH][IVAS_MAX_NUM_BANDS]; + SPAR_DEC_HANDLE hSpar; + DECODER_CONFIG_HANDLE hDecoderConfig; + int16_t num_spar_bands, spar_band; + int16_t b, ts; + int16_t num_cldfb_bands, numch_in, numch_out; + int16_t cldfb_band; + int16_t out_ch, in_ch; + int16_t firstInCh, inChEnd, firstOutCh, outChEnd; +#ifdef JBM_TSM_ON_TCS + int16_t slot_idx_start, md_idx; +#endif + + push_wmops( "ivas_sba_prototype_renderer" ); + + hSpar = st_ivas->hSpar; + hDecoderConfig = st_ivas->hDecoderConfig; + num_spar_bands = hSpar->hFbMixer->pFb->filterbank_num_bands; num_cldfb_bands = hSpar->hFbMixer->pFb->fb_bin_to_band.num_cldfb_bands; numch_in = hSpar->hFbMixer->fb_cfg->num_in_chans; numch_out = hSpar->hFbMixer->fb_cfg->num_out_chans; +#ifdef JBM_TSM_ON_TCS + slot_idx_start = hSpar->slots_rendered; +#endif if ( st_ivas->nchan_transport == 1 ) { @@ -98,10 +251,19 @@ void ivas_sba_prototype_renderer( } /* Apply mixing matrix */ - for ( ts = firstSlot; ts < slotEnd; ts++ ) +#ifdef JBM_TSM_ON_TCS + for ( ts = 0; ts < hSpar->subframe_nbslots[hSpar->subframes_rendered]; ts++ ) +#else + for ( ts = 0; ts < CLDFB_SLOTS_PER_SUBFRAME; ts++ ) +#endif { /* determine SPAR parameters for this time slot */ - ivas_spar_get_parameters( hSpar, hDecoderConfig, ts, numch_out, numch_in, num_spar_bands, mixer_mat ); +#ifdef JBM_TSM_ON_TCS + md_idx = hSpar->render_to_md_map[ts + slot_idx_start]; + ivas_spar_get_parameters( hSpar, hDecoderConfig, md_idx, numch_out, numch_in, num_spar_bands, mixer_mat ); +#else + ivas_spar_get_parameters( hSpar, hDecoderConfig, ts + subframe * CLDFB_SLOTS_PER_SUBFRAME, numch_out, numch_in, num_spar_bands, mixer_mat ); +#endif for ( cldfb_band = 0; cldfb_band < num_cldfb_bands; cldfb_band++ ) { @@ -144,11 +306,12 @@ void ivas_sba_prototype_renderer( inIm[out_ch][ts][cldfb_band] = out_im[out_ch]; } } - +#ifdef JBM_TSM_ON_TCS /* Update mixing matrices */ - if ( ( ( ts + 1 ) % MAX_PARAM_SPATIAL_SUBFRAMES ) == 0 ) + if ( ( ( slot_idx_start + ts + 1 ) == hSpar->num_slots ) || ( ( md_idx / JBM_CLDFB_SLOTS_IN_SUBFRAME ) != ( hSpar->render_to_md_map[ts + slot_idx_start + 1] / JBM_CLDFB_SLOTS_IN_SUBFRAME ) ) ) { - sf_idx = ts / MAX_PARAM_SPATIAL_SUBFRAMES; + /* we have crossed an unadapted parameter sf border, update previous mixing matrices */ + int16_t md_sf = md_idx / JBM_CLDFB_SLOTS_IN_SUBFRAME; hSpar->i_subframe++; hSpar->i_subframe = min( hSpar->i_subframe, MAX_PARAM_SPATIAL_SUBFRAMES ); mvr2r( hSpar->hMdDec->mixer_mat_prev[1][0][0], hSpar->hMdDec->mixer_mat_prev[0][0][0], IVAS_MAX_FB_MIXER_OUT_CH * IVAS_MAX_FB_MIXER_IN_CH * IVAS_MAX_NUM_BANDS ); @@ -162,17 +325,43 @@ void ivas_sba_prototype_renderer( { for ( b = 0; b < num_spar_bands; b++ ) { - hSpar->hMdDec->mixer_mat_prev[4][out_ch][in_ch][b] = hSpar->hMdDec->mixer_mat[out_ch][in_ch][b + sf_idx * IVAS_MAX_NUM_BANDS]; + hSpar->hMdDec->mixer_mat_prev[4][out_ch][in_ch][b] = hSpar->hMdDec->mixer_mat[out_ch][in_ch][b + md_sf * IVAS_MAX_NUM_BANDS]; } } } } +#endif } +#ifndef JBM_TSM_ON_TCS + /* Update mixing matrices */ + hSpar->i_subframe++; + hSpar->i_subframe = min( hSpar->i_subframe, MAX_PARAM_SPATIAL_SUBFRAMES ); + mvr2r( hSpar->hMdDec->mixer_mat_prev[1][0][0], hSpar->hMdDec->mixer_mat_prev[0][0][0], IVAS_MAX_FB_MIXER_OUT_CH * IVAS_MAX_FB_MIXER_IN_CH * IVAS_MAX_NUM_BANDS ); + mvr2r( hSpar->hMdDec->mixer_mat_prev[2][0][0], hSpar->hMdDec->mixer_mat_prev[1][0][0], IVAS_MAX_FB_MIXER_OUT_CH * IVAS_MAX_FB_MIXER_IN_CH * IVAS_MAX_NUM_BANDS ); + mvr2r( hSpar->hMdDec->mixer_mat_prev[3][0][0], hSpar->hMdDec->mixer_mat_prev[2][0][0], IVAS_MAX_FB_MIXER_OUT_CH * IVAS_MAX_FB_MIXER_IN_CH * IVAS_MAX_NUM_BANDS ); + mvr2r( hSpar->hMdDec->mixer_mat_prev[4][0][0], hSpar->hMdDec->mixer_mat_prev[3][0][0], IVAS_MAX_FB_MIXER_OUT_CH * IVAS_MAX_FB_MIXER_IN_CH * IVAS_MAX_NUM_BANDS ); + + for ( out_ch = 0; out_ch < numch_out; out_ch++ ) + { + for ( in_ch = 0; in_ch < numch_in; in_ch++ ) + { + for ( b = 0; b < num_spar_bands; b++ ) + { + hSpar->hMdDec->mixer_mat_prev[4][out_ch][in_ch][b] = hSpar->hMdDec->mixer_mat[out_ch][in_ch][b + subframe * IVAS_MAX_NUM_BANDS]; + } + } + } +#endif + /* Create prototypes */ if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) { - for ( ts = firstSlot; ts < slotEnd; ts++ ) +#ifdef JBM_TSM_ON_TCS + for ( ts = 0; ts < hSpar->subframe_nbslots[subframe]; ts++ ) +#else + for ( ts = 0; ts < CLDFB_SLOTS_PER_SUBFRAME; ts++ ) +#endif { if ( st_ivas->nchan_transport == 1 ) /* Dual mono */ { @@ -198,6 +387,10 @@ void ivas_sba_prototype_renderer( } } +#ifdef JBM_TSM_ON_TCS + hSpar->subframes_rendered++; + hSpar->slots_rendered += hSpar->subframe_nbslots[subframe]; +#endif pop_wmops(); return; diff --git a/lib_rend/ivas_stat_rend.h b/lib_rend/ivas_stat_rend.h index 62c7fa4f929a5f8c5d4cf2a4189dbf29dfba4834..0a75275a002695fbcad6846f40b26987bbffc17c 100644 --- a/lib_rend/ivas_stat_rend.h +++ b/lib_rend/ivas_stat_rend.h @@ -140,9 +140,7 @@ typedef struct ivas_dirac_dec_binaural_data_structure uint16_t useSubframeMode; /* 0 = process in 20 ms frames, 1 = process in 5 ms subframes */ uint16_t useTdDecorr; ivas_td_decorr_state_t *hTdDecorr; -#ifdef NOKIA_PARAMBIN_REQULARIZATION float reqularizationFactor; -#endif } DIRAC_DEC_BIN_DATA, *DIRAC_DEC_BIN_HANDLE; @@ -230,7 +228,11 @@ typedef struct EFAP typedef struct ivas_orient_trk_state_t { +#ifdef FIX_439_OTR_PARAMS + HEAD_ORIENT_TRK_T orientation_tracking; +#else OTR_TRACKING_T trackingType; +#endif float centerAdaptationRate; float offCenterAdaptationRate; float adaptationAngle; @@ -250,7 +252,7 @@ typedef struct { int8_t headRotEnabled; IVAS_QUATERNION headPositions[RENDERER_HEAD_POSITIONS_PER_FRAME]; - IVAS_POSITION Pos[RENDERER_HEAD_POSITIONS_PER_FRAME]; + IVAS_VECTOR3 Pos[RENDERER_HEAD_POSITIONS_PER_FRAME]; float crossfade[L_FRAME48k / RENDERER_HEAD_POSITIONS_PER_FRAME]; ivas_orient_trk_state_t *hOrientationTracker; @@ -260,7 +262,7 @@ typedef struct ivas_binaural_head_track_struct { int16_t num_quaternions; IVAS_QUATERNION Quaternions[MAX_PARAM_SPATIAL_SUBFRAMES]; - IVAS_POSITION Pos[MAX_PARAM_SPATIAL_SUBFRAMES]; + IVAS_VECTOR3 Pos[MAX_PARAM_SPATIAL_SUBFRAMES]; float Rmat[3][3]; float Rmat_prev[3][3]; @@ -268,15 +270,8 @@ typedef struct ivas_binaural_head_track_struct uint8_t lrSwitchedCurrent; float lrSwitchInterpVal; -#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS -#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS_OPT 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]; -#else - float chEneIIR[2][CLDFB_NO_CHANNELS_MAX]; - float procChEneIIR[2][CLDFB_NO_CHANNELS_MAX]; -#endif -#endif int16_t shd_rot_max_order; ivas_orient_trk_state_t *OrientationTracker; @@ -613,6 +608,7 @@ typedef struct float mem_hrf_left[SFX_SPAT_BIN_MAX_FILTER_LENGTH - 1]; float mem_hrf_right[SFX_SPAT_BIN_MAX_FILTER_LENGTH - 1]; float Gain; + float prevGain; } TDREND_SRC_t; /* Top level TD binaural renderer handle */ @@ -711,6 +707,10 @@ typedef struct ivas_hrtfs_crend_structure { HRTFS_DATA *hHRTF_hrir_combined; HRTFS_DATA *hHRTF_hrir_hoa3; +#ifdef UPDATE_SBA_FILTER + HRTFS_DATA *hHRTF_hrir_hoa2; + HRTFS_DATA *hHRTF_hrir_foa; +#endif HRTFS_DATA *hHRTF_brir_combined; } HRTFS_CREND, *HRTFS_CREND_HANDLE; @@ -721,17 +721,43 @@ typedef struct ivas_hrtfs_crend_structure typedef struct ivas_hrtfs_fastconv_struct { float FASTCONV_HRIR_latency_s; +#ifdef UPDATE_SBA_FILTER + float leftHRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]; + float leftHRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]; + float rightHRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]; + float rightHRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]; +#else 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]; +#endif float FASTCONV_HOA3_latency_s; +#ifdef UPDATE_SBA_FILTER + float leftHRIRReal_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS]; + float leftHRIRImag_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS]; + float rightHRIRReal_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS]; + float rightHRIRImag_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS]; +#else 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]; +#endif +#ifdef UPDATE_SBA_FILTER + float FASTCONV_HOA2_latency_s; + float leftHRIRReal_HOA2[BINAURAL_CONVBANDS][9][BINAURAL_NTAPS]; + float leftHRIRImag_HOA2[BINAURAL_CONVBANDS][9][BINAURAL_NTAPS]; + float rightHRIRReal_HOA2[BINAURAL_CONVBANDS][9][BINAURAL_NTAPS]; + float rightHRIRImag_HOA2[BINAURAL_CONVBANDS][9][BINAURAL_NTAPS]; + float FASTCONV_FOA_latency_s; + float leftHRIRReal_FOA[BINAURAL_CONVBANDS][4][BINAURAL_NTAPS]; + float leftHRIRImag_FOA[BINAURAL_CONVBANDS][4][BINAURAL_NTAPS]; + float rightHRIRReal_FOA[BINAURAL_CONVBANDS][4][BINAURAL_NTAPS]; + float rightHRIRImag_FOA[BINAURAL_CONVBANDS][4][BINAURAL_NTAPS]; +#endif 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]; diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c index 3d2420632d86ccac487ab5aeb6737bb9afb2631d..edb495e2e5cb6b4afe0f17a39681ad4770df0e0b 100644 --- a/lib_rend/lib_rend.c +++ b/lib_rend/lib_rend.c @@ -118,6 +118,8 @@ typedef struct CREND_WRAPPER_HANDLE crendWrapper; REVERB_HANDLE hReverb; rotation_matrix rot_mat_prev; + int16_t nonDiegeticPan; + float nonDiegeticPanGain; } input_ism; typedef struct @@ -144,6 +146,8 @@ typedef struct CREND_WRAPPER_HANDLE crendWrapper; REVERB_HANDLE hReverb; rotation_gains rot_gains_prev; + int16_t nonDiegeticPan; + float nonDiegeticPanGain; lfe_routing lfeRouting; } input_mc; @@ -1010,6 +1014,7 @@ static IVAS_REND_AudioObjectPosition defaultObjectPosition( pos.radius = 1.0f; pos.yaw = 0.0f; pos.pitch = 0.0f; + pos.non_diegetic_flag = 0; return pos; } @@ -1615,7 +1620,16 @@ static ivas_error updateMcPanGainsForMcOut( inputMc->base.inConfig == IVAS_REND_AUDIO_CONFIG_MONO || inputMc->base.inConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) { - error = initMcPanGainsWithEfap( inputMc, outConfig ); + if ( ( inputMc->base.inConfig == IVAS_REND_AUDIO_CONFIG_MONO ) && ( inputMc->nonDiegeticPan ) ) + { + inputMc->panGains[0][0] = ( inputMc->nonDiegeticPanGain + 1.f ) * 0.5f; + inputMc->panGains[0][1] = 1.f - inputMc->panGains[0][0]; + error = IVAS_ERR_OK; + } + else + { + error = initMcPanGainsWithEfap( inputMc, outConfig ); + } } else if ( outConfig == IVAS_REND_AUDIO_CONFIG_MONO ) { @@ -2195,6 +2209,8 @@ static ivas_error initMasaDummyDecForMcOut( output_config = getIvasAudioConfigFromRendAudioConfig( outConfig ); decDummy->hDecoderConfig->output_config = output_config; + decDummy->sba_analysis_order = 1; + 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() */ decDummy->sba_mode = SBA_MODE_NONE; /* Todo Nokia: This is done to prevent ivas_dirac_dec_config() to not use uninitialized value. It could be considered if this should not be even accessed when not in SBA. */ decDummy->mc_mode = MC_MODE_NONE; /* Todo Nokia: This should be also refactored in such way that it is not checked if not in MC mode */ @@ -2222,9 +2238,7 @@ static ivas_error initMasaDummyDecForMcOut( { return error; } -#ifdef FIX_390_EXT_REND_MASA_META_COPY decDummy->hDirAC->dirac_bs_md_write_idx = 0; -#endif if ( decDummy->renderer_type == RENDERER_STEREO_PARAMETRIC ) { @@ -2284,6 +2298,8 @@ static ivas_error initMasaDummyDecForSbaOut( decDummy->sba_mode = SBA_MODE_NONE; /* Todo Nokia: This is done to prevent ivas_dirac_dec_config() to not use uninitialized value. It could be considered if this should not be even accessed when not in SBA. */ decDummy->mc_mode = MC_MODE_NONE; /* Todo Nokia: This should be also refactored in such way that it is not checked if not in MC mode */ + decDummy->sba_analysis_order = 1; + ivas_output_init( &( decDummy->hOutSetup ), output_config ); ivas_output_init( &( decDummy->hIntSetup ), output_config ); decDummy->renderer_type = RENDERER_DIRAC; @@ -2301,9 +2317,7 @@ static ivas_error initMasaDummyDecForSbaOut( { return error; } -#ifdef FIX_390_EXT_REND_MASA_META_COPY decDummy->hDirAC->dirac_bs_md_write_idx = 0; -#endif numCldfbAnalyses = decDummy->nchan_transport; numCldfbSyntheses = decDummy->hDecoderConfig->nchan_out; @@ -2352,6 +2366,8 @@ static ivas_error initMasaDummyDecForBinauralOut( output_config = decDummy->hDecoderConfig->output_config; + decDummy->sba_analysis_order = 1; + 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() */ decDummy->sba_mode = SBA_MODE_NONE; /* Todo Nokia: This is done to prevent ivas_dirac_dec_config() to not use uninitialized value. It could be considered if this should not be even accessed when not in SBA. */ decDummy->mc_mode = MC_MODE_NONE; /* Todo Nokia: This should be also refactored in such way that it is not checked if not in MC mode */ @@ -2372,9 +2388,7 @@ static ivas_error initMasaDummyDecForBinauralOut( { return error; } -#ifdef FIX_390_EXT_REND_MASA_META_COPY decDummy->hDirAC->dirac_bs_md_write_idx = 0; -#endif if ( ( error = ivas_dirac_dec_binaural_copy_hrtfs( &decDummy->hHrtfParambin ) ) != IVAS_ERR_OK ) { @@ -2453,6 +2467,9 @@ static DecoderDummy *initDecoderDummy( decDummy->hDecoderConfig->output_Fs = sampleRate; decDummy->hDecoderConfig->nchan_out = numOutChannels; decDummy->hDecoderConfig->Opt_Headrotation = 0; +#ifdef JBM_TSM_ON_TCS + decDummy->hDecoderConfig->voip_active = 0; +#endif decDummy->hBinRenderer = NULL; decDummy->hEFAPdata = NULL; @@ -2464,10 +2481,18 @@ static DecoderDummy *initDecoderDummy( decDummy->hMasa = NULL; decDummy->hDiracDecBin = NULL; decDummy->hQMetaData = NULL; +#ifdef FIX_482_DUMMYDEC_INIT + decDummy->hHrtfParambin = NULL; + decDummy->hHeadTrackData = NULL; + decDummy->hDirAC = NULL; +#endif +#ifdef JBM_TSM_ON_TCS + decDummy->hTcBuffer = NULL; +#endif 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 ) + if ( getAudioConfigType( outConfig ) == IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL ) { decDummy->hHeadTrackData = malloc( sizeof( HEAD_TRACK_DATA ) ); /* Initialise Rmat_prev to I, Rmat will be computed later */ @@ -2477,6 +2502,19 @@ static DecoderDummy *initDecoderDummy( decDummy->hHeadTrackData->Rmat_prev[i][i] = 1.0f; } +#ifdef FIX_482_DUMMYDEC_INIT + set_zero( decDummy->hHeadTrackData->chEneIIR[0], MASA_FREQUENCY_BANDS ); + set_zero( decDummy->hHeadTrackData->chEneIIR[1], MASA_FREQUENCY_BANDS ); + set_zero( decDummy->hHeadTrackData->procChEneIIR[0], MASA_FREQUENCY_BANDS ); + set_zero( decDummy->hHeadTrackData->procChEneIIR[1], MASA_FREQUENCY_BANDS ); + for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ ) + { + decDummy->hHeadTrackData->Quaternions[i].w = 1.0f; + decDummy->hHeadTrackData->Quaternions[i].x = 0.0f; + decDummy->hHeadTrackData->Quaternions[i].y = 0.0f; + decDummy->hHeadTrackData->Quaternions[i].z = 0.0f; + } +#endif decDummy->hHeadTrackData->num_quaternions = 0; decDummy->hHeadTrackData->lrSwitchInterpVal = 0.0f; decDummy->hHeadTrackData->lrSwitchedCurrent = 0; @@ -2500,6 +2538,11 @@ static DecoderDummy *initDecoderDummy( decDummy->hRenderConfig = NULL; } +#ifdef JBM_TSM_ON_TCS + /* get a default TC buffer, needed for some renderers */ + ivas_jbm_dec_tc_buffer_open( decDummy, TC_BUFFER_MODE_NONE, 0, 0, 0, 1 ); +#endif + decDummy->renderer_type = RENDERER_DISABLE; return decDummy; @@ -2607,6 +2650,11 @@ static void freeDecoderDummy( /* Parametric binaural renderer handle */ ivas_dirac_dec_close_binaural_data( &pDecDummy->hDiracDecBin ); +#ifdef JBM_TSM_ON_TCS + /* TC buffer */ + ivas_jbm_dec_tc_buffer_close( &pDecDummy->hTcBuffer ); +#endif + free( pDecDummy ); pDecDummy = NULL; @@ -2629,7 +2677,9 @@ static void clearInputMasa( ivas_error IVAS_REND_Open( IVAS_REND_HANDLE *phIvasRend, const int32_t outputSampleRate, - const IVAS_REND_AudioConfig outConfig ) + const IVAS_REND_AudioConfig outConfig, + const int16_t nonDiegeticPan, + const float nonDiegeticPanGain ) { int16_t i; IVAS_REND_HANDLE hIvasRend; @@ -2699,6 +2749,8 @@ ivas_error IVAS_REND_Open( hIvasRend->inputsIsm[i].crendWrapper = NULL; hIvasRend->inputsIsm[i].hReverb = NULL; hIvasRend->inputsIsm[i].tdRendWrapper.hBinRendererTd = NULL; + hIvasRend->inputsIsm[i].nonDiegeticPan = nonDiegeticPan; + hIvasRend->inputsIsm[i].nonDiegeticPanGain = nonDiegeticPanGain; } for ( i = 0; i < RENDERER_MAX_MC_INPUTS; ++i ) @@ -2708,6 +2760,8 @@ ivas_error IVAS_REND_Open( hIvasRend->inputsMc[i].crendWrapper = NULL; hIvasRend->inputsMc[i].hReverb = NULL; hIvasRend->inputsMc[i].tdRendWrapper.hBinRendererTd = NULL; + hIvasRend->inputsMc[i].nonDiegeticPan = nonDiegeticPan; + hIvasRend->inputsMc[i].nonDiegeticPanGain = nonDiegeticPanGain; } for ( i = 0; i < RENDERER_MAX_SBA_INPUTS; ++i ) @@ -3657,20 +3711,14 @@ ivas_error IVAS_REND_FeedInputMasaMetadata( *-------------------------------------------------------------------*/ ivas_error IVAS_REND_InitConfig( - IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ -#ifdef FIX_392_LATE_REVERB + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ const IVAS_REND_AudioConfig outAudioConfig /* i : output audioConfig */ -#else - const bool rendererConfigEnabled /* i : flag indicating if a renderer configuration file was supplied */ -#endif ) { ivas_error error; -#ifdef FIX_392_LATE_REVERB bool rendererConfigEnabled; rendererConfigEnabled = ( getAudioConfigType( outAudioConfig ) == IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL ); -#endif if ( rendererConfigEnabled ) { @@ -3687,11 +3735,7 @@ ivas_error IVAS_REND_InitConfig( { return error; } -#ifdef FIX_392_LATE_REVERB if ( ( error = ivas_render_config_init_from_rom( &hIvasRend->hRendererConfig, outAudioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) ) != IVAS_ERR_OK ) -#else - if ( ( error = ivas_render_config_init_from_rom( &hIvasRend->hRendererConfig, hIvasRend->rendererConfigEnabled ) ) != IVAS_ERR_OK ) -#endif { return error; } @@ -3744,6 +3788,9 @@ int16_t IVAS_REND_GetRenderConfig( hRCout->room_acoustics.nBands = hRCin->roomAcoustics.nBands; hRCout->room_acoustics.acousticPreDelay = hRCin->roomAcoustics.acousticPreDelay; hRCout->room_acoustics.inputPreDelay = hRCin->roomAcoustics.inputPreDelay; +#ifdef FIX_463_TD_RENDERER_DIRECTIVITY_RESET + mvr2r( hRCin->directivity, hRCout->directivity, 3 ); +#endif 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 ); @@ -3770,9 +3817,8 @@ int16_t IVAS_REND_FeedRenderConfig( { return IVAS_ERR_UNEXPECTED_NULL_POINTER; } - hRenderConfig = hIvasRend->hRendererConfig; - mvr2r( renderConfig.directivity, hRenderConfig->directivity, 3 ); + #ifdef DEBUGGING hRenderConfig->renderer_type_override = RENDER_TYPE_OVERRIDE_NONE; if ( renderConfig.renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV ) @@ -3793,6 +3839,7 @@ int16_t IVAS_REND_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 ); return IVAS_ERR_OK; } @@ -3807,7 +3854,7 @@ int16_t IVAS_REND_FeedRenderConfig( ivas_error IVAS_REND_SetHeadRotation( 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_POSITION Pos[RENDERER_HEAD_POSITIONS_PER_FRAME] /* i : listener positions for next rendering call */ + const IVAS_VECTOR3 Pos[RENDERER_HEAD_POSITIONS_PER_FRAME] /* i : listener positions for next rendering call */ ) { int16_t i; @@ -3861,9 +3908,16 @@ ivas_error IVAS_REND_SetHeadRotation( ivas_error IVAS_REND_SetOrientationTrackingMode( IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ - const uint8_t otrMode /* i : Orientation tracking mode */ +#ifdef FIX_439_OTR_PARAMS + const HEAD_ORIENT_TRK_T orientation_tracking /* i : Head orientation tracking type */ +#else + const uint8_t otrMode /* i : Orientation tracking mode */ +#endif ) { +#ifdef FIX_439_OTR_PARAMS + return ivas_orient_trk_SetTrackingType( hIvasRend->headRotData.hOrientationTracker, orientation_tracking ); +#else OTR_TRACKING_T mode; ivas_error error; @@ -3898,6 +3952,7 @@ ivas_error IVAS_REND_SetOrientationTrackingMode( } return IVAS_ERR_OK; +#endif } @@ -4366,6 +4421,13 @@ static ivas_error renderIsmToBinauralRoom( IVAS_REND_AudioBuffer tmpMcBuffer; IVAS_REND_AudioObjectPosition rotatedPos; const IVAS_REND_HeadRotData *headRotData; +#ifdef JBM_TSM_ON_TCS + float *p_tmpRendBuffer[MAX_OUTPUT_CHANNELS]; + for ( i = 0; i < MAX_OUTPUT_CHANNELS; i++ ) + { + p_tmpRendBuffer[i] = tmpRendBuffer[i]; + } +#endif push_wmops( "renderIsmToBinauralRoom" ); @@ -4465,8 +4527,13 @@ static ivas_error renderIsmToBinauralRoom( copyBufferTo2dArray( tmpMcBuffer, tmpRendBuffer ); +#ifdef JBM_TSM_ON_TCS + if ( ( error = ivas_rend_crendProcess( ismInput->crendWrapper, AUDIO_CONFIG_7_1_4, AUDIO_CONFIG_BINAURAL_ROOM, + NULL, NULL, NULL, NULL, p_tmpRendBuffer, *ismInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK ) +#else 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 ) ) != IVAS_ERR_OK ) +#endif { return error; } @@ -4493,17 +4560,26 @@ static ivas_error renderIsmToMc( /* TODO(sgi): Possible optimization: less processing needed if position didn't change */ if ( *ismInput->base.ctx.pOutConfig == IVAS_REND_AUDIO_CONFIG_STEREO ) { - 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 ( ismInput->nonDiegeticPan ) + { + previousPanGains[0] = currentPanGains[0] = ( ismInput->nonDiegeticPanGain + 1.f ) * 0.5f; + previousPanGains[1] = currentPanGains[1] = 1.f - currentPanGains[0]; + error = IVAS_ERR_OK; + } + else + { + 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] ); + } } else { @@ -4726,6 +4802,15 @@ static ivas_error renderMcToBinaural( ivas_error error; IVAS_REND_AudioBuffer tmpRotBuffer; +#ifdef JBM_TSM_ON_TCS + float *p_tmpRendBuffer[MAX_OUTPUT_CHANNELS]; + int16_t i; + for ( i = 0; i < MAX_OUTPUT_CHANNELS; i++ ) + { + p_tmpRendBuffer[i] = tmpRendBuffer[i]; + } +#endif + push_wmops( "renderMcToBinaural" ); headRotEnabled = mcInput->base.ctx.pHeadRotData->headRotEnabled; @@ -4765,8 +4850,13 @@ static ivas_error renderMcToBinaural( } /* call CREND */ +#ifdef JBM_TSM_ON_TCS + if ( ( error = ivas_rend_crendProcess( mcInput->crendWrapper, getIvasAudioConfigFromRendAudioConfig( mcInput->base.inConfig ), getIvasAudioConfigFromRendAudioConfig( outConfig ), + NULL, NULL, NULL, NULL, p_tmpRendBuffer, *mcInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK ) +#else if ( ( error = ivas_rend_crendProcess( mcInput->crendWrapper, getIvasAudioConfigFromRendAudioConfig( mcInput->base.inConfig ), getIvasAudioConfigFromRendAudioConfig( outConfig ), NULL, NULL, NULL, NULL, tmpRendBuffer, *mcInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK ) +#endif { return error; } @@ -4796,6 +4886,15 @@ static ivas_error renderMcToBinauralRoom( ivas_error error; IVAS_REND_AudioBuffer tmpRotBuffer; +#ifdef JBM_TSM_ON_TCS + float *p_tmpRendBuffer[MAX_OUTPUT_CHANNELS]; + int16_t i; + for ( i = 0; i < MAX_OUTPUT_CHANNELS; i++ ) + { + p_tmpRendBuffer[i] = tmpRendBuffer[i]; + } +#endif + push_wmops( "renderMcToBinauralRoom" ); headRotEnabled = mcInput->base.ctx.pHeadRotData->headRotEnabled; @@ -4835,8 +4934,13 @@ static ivas_error renderMcToBinauralRoom( } /* call CREND */ +#ifdef JBM_TSM_ON_TCS + if ( ( error = ivas_rend_crendProcess( mcInput->crendWrapper, getIvasAudioConfigFromRendAudioConfig( mcInput->base.inConfig ), getIvasAudioConfigFromRendAudioConfig( outConfig ), + NULL, NULL, NULL, NULL, p_tmpRendBuffer, *mcInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK ) +#else if ( ( error = ivas_rend_crendProcess( mcInput->crendWrapper, getIvasAudioConfigFromRendAudioConfig( mcInput->base.inConfig ), getIvasAudioConfigFromRendAudioConfig( outConfig ), NULL, NULL, NULL, NULL, tmpRendBuffer, *mcInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK ) +#endif { return error; } @@ -4869,12 +4973,23 @@ static ivas_error renderMcCustomLsToBinauralRoom( IVAS_REND_AudioBuffer tmpMcBuffer; IVAS_REND_AudioBuffer *tmpBufPtr; +#ifdef JBM_TSM_ON_TCS + float *p_tmpCrendBuffer[MAX_OUTPUT_CHANNELS]; +#endif + push_wmops( "renderMcCustomLsToBinauralRoom" ); tmpRotBuffer = outAudio; /* avoid compilation warning */ headRotEnabled = mcInput->base.ctx.pHeadRotData->headRotEnabled; +#ifdef JBM_TSM_ON_TCS + for ( i = 0; i < MAX_OUTPUT_CHANNELS; i++ ) + { + p_tmpCrendBuffer[i] = tmpCrendBuffer[i]; + } +#endif + /* apply rotation */ if ( headRotEnabled ) { @@ -4908,8 +5023,13 @@ static ivas_error renderMcCustomLsToBinauralRoom( copyBufferTo2dArray( tmpMcBuffer, tmpCrendBuffer ); /* call CREND */ +#ifdef JBM_TSM_ON_TCS + if ( ( error = ivas_rend_crendProcess( mcInput->crendWrapper, AUDIO_CONFIG_7_1_4, getIvasAudioConfigFromRendAudioConfig( outConfig ), NULL, NULL, NULL, NULL, + p_tmpCrendBuffer, *mcInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK ) +#else if ( ( error = ivas_rend_crendProcess( mcInput->crendWrapper, AUDIO_CONFIG_7_1_4, getIvasAudioConfigFromRendAudioConfig( outConfig ), NULL, NULL, NULL, NULL, tmpCrendBuffer, *mcInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK ) +#endif { return error; } @@ -5112,8 +5232,20 @@ static ivas_error renderSbaToBinaural( ivas_error error; IVAS_REND_AudioBuffer tmpRotBuffer; +#ifdef JBM_TSM_ON_TCS + float *p_tmpCrendBuffer[MAX_OUTPUT_CHANNELS]; + int16_t i; +#endif + push_wmops( "renderSbaToBinaural" ); +#ifdef JBM_TSM_ON_TCS + for ( i = 0; i < MAX_OUTPUT_CHANNELS; i++ ) + { + p_tmpCrendBuffer[i] = tmpCrendBuffer[i]; + } +#endif + /* apply rotation */ if ( sbaInput->base.ctx.pHeadRotData->headRotEnabled ) { @@ -5137,8 +5269,13 @@ static ivas_error renderSbaToBinaural( } /* call CREND */ +#ifdef JBM_TSM_ON_TCS + if ( ( error = ivas_rend_crendProcess( sbaInput->crendWrapper, getIvasAudioConfigFromRendAudioConfig( sbaInput->base.inConfig ), getIvasAudioConfigFromRendAudioConfig( outConfig ), + NULL, NULL, NULL, NULL, p_tmpCrendBuffer, *sbaInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK ) +#else if ( ( error = ivas_rend_crendProcess( sbaInput->crendWrapper, getIvasAudioConfigFromRendAudioConfig( sbaInput->base.inConfig ), getIvasAudioConfigFromRendAudioConfig( outConfig ), NULL, NULL, NULL, NULL, tmpCrendBuffer, *sbaInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK ) +#endif { return error; } @@ -5164,10 +5301,21 @@ static ivas_error renderSbaToBinauralRoom( IVAS_REND_AudioBuffer tmpMcBuffer; IVAS_REND_AudioBuffer *tmpBufPtr; +#ifdef JBM_TSM_ON_TCS + float *p_tmpCrendBuffer[MAX_OUTPUT_CHANNELS]; +#endif + tmpRotBuffer = outAudio; /* avoid compilation warning */ push_wmops( "renderSbaToBinauralRoom" ); +#ifdef JBM_TSM_ON_TCS + for ( i = 0; i < MAX_OUTPUT_CHANNELS; i++ ) + { + p_tmpCrendBuffer[i] = tmpCrendBuffer[i]; + } +#endif + headRotEnabled = sbaInput->base.ctx.pHeadRotData->headRotEnabled; /* apply rotation */ @@ -5206,8 +5354,13 @@ static ivas_error renderSbaToBinauralRoom( copyBufferTo2dArray( tmpMcBuffer, tmpCrendBuffer ); /* call CREND */ +#ifdef JBM_TSM_ON_TCS + if ( ( error = ivas_rend_crendProcess( sbaInput->crendWrapper, AUDIO_CONFIG_7_1_4, getIvasAudioConfigFromRendAudioConfig( outConfig ), + NULL, NULL, NULL, NULL, p_tmpCrendBuffer, *sbaInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK ) +#else if ( ( error = ivas_rend_crendProcess( sbaInput->crendWrapper, AUDIO_CONFIG_7_1_4, getIvasAudioConfigFromRendAudioConfig( outConfig ), NULL, NULL, NULL, NULL, tmpCrendBuffer, *sbaInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK ) +#endif { return error; } @@ -5308,61 +5461,38 @@ static void copyMasaMetadataToDiracRenderer( DIRAC_DEC_HANDLE hDirAC ) { int16_t band, sf, bin; -#ifdef FIX_390_EXT_REND_MASA_META_COPY int16_t meta_write_index; -#endif hDirAC->numSimultaneousDirections = meta->descriptive_meta.numberOfDirections + 1; for ( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ ) { -#ifdef FIX_390_EXT_REND_MASA_META_COPY meta_write_index = ( hDirAC->dirac_bs_md_write_idx + sf ) % hDirAC->dirac_md_buffer_length; -#endif for ( band = 0; band < MASA_MAXIMUM_CODING_SUBBANDS; band++ ) { for ( bin = MASA_band_grouping_24[band]; bin < MASA_band_grouping_24[band + 1]; bin++ ) { -#ifdef FIX_390_EXT_REND_MASA_META_COPY 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]; -#else - 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]; -#endif if ( hDirAC->numSimultaneousDirections == 2 ) { -#ifdef FIX_390_EXT_REND_MASA_META_COPY 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]; -#else - 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]; -#endif } } } } -#ifdef FIX_390_EXT_REND_MASA_META_COPY hDirAC->dirac_bs_md_write_idx = ( hDirAC->dirac_bs_md_write_idx + MAX_PARAM_SPATIAL_SUBFRAMES ) % hDirAC->dirac_md_buffer_length; -#endif return; } @@ -5383,7 +5513,11 @@ static void renderMasaToMc( } else { +#ifdef JBM_TSM_ON_TCS + ivas_dirac_dec( masaInput->decDummy, tmpBuffer, masaInput->base.inputBuffer.config.numChannels ); +#else ivas_dirac_dec( masaInput->decDummy, tmpBuffer, masaInput->base.inputBuffer.config.numChannels, NULL, NULL, -1 ); +#endif } accumulate2dArrayToBuffer( tmpBuffer, &outAudio ); @@ -5400,7 +5534,11 @@ static void renderMasaToSba( copyBufferTo2dArray( masaInput->base.inputBuffer, tmpBuffer ); copyMasaMetadataToDiracRenderer( &masaInput->masaMetadata, masaInput->decDummy->hDirAC ); +#ifdef JBM_TSM_ON_TCS + ivas_dirac_dec( masaInput->decDummy, tmpBuffer, masaInput->base.inputBuffer.config.numChannels ); +#else ivas_dirac_dec( masaInput->decDummy, tmpBuffer, masaInput->base.inputBuffer.config.numChannels, NULL, NULL, -1 ); +#endif accumulate2dArrayToBuffer( tmpBuffer, &outAudio ); diff --git a/lib_rend/lib_rend.h b/lib_rend/lib_rend.h index ec4c05a6d676aac8b1a0fb98d156ee8ef110de82..727a0d8928bbb18d67de68a351407aa85d4ea2f8 100644 --- a/lib_rend/lib_rend.h +++ b/lib_rend/lib_rend.h @@ -134,7 +134,9 @@ typedef uint16_t IVAS_REND_InputId; ivas_error IVAS_REND_Open( IVAS_REND_HANDLE *phIvasRend, /* i/o: Pointer to renderer handle */ const int32_t outputSampleRate, /* i : output sampling rate */ - const IVAS_REND_AudioConfig outConfig /* i : output audio config */ + const IVAS_REND_AudioConfig outConfig, /* i : output audio config */ + const int16_t nonDiegeticPan, /* i : non-diegetic object flag */ + const float nonDiegeticPanGain /* i : non-diegetic panning gain */ ); /* Note: this will reset custom LFE routings set for any MC input */ @@ -228,12 +230,8 @@ ivas_error IVAS_REND_FeedInputMasaMetadata( ); ivas_error IVAS_REND_InitConfig( - IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ -#ifdef FIX_392_LATE_REVERB - const IVAS_REND_AudioConfig outAudioConfig /* i : output audioConfig */ -#else - const bool rendererConfigEnabled /* i : flag indicating if a renderer configuration file was supplied */ -#endif + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_REND_AudioConfig outAudioConfig /* i : output audioConfig */ ); int16_t IVAS_REND_GetRenderConfig( @@ -249,12 +247,16 @@ int16_t IVAS_REND_FeedRenderConfig( ivas_error IVAS_REND_SetHeadRotation( 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_POSITION Pos[RENDERER_HEAD_POSITIONS_PER_FRAME] /* i : listener positions for next rendering call */ + const IVAS_VECTOR3 Pos[RENDERER_HEAD_POSITIONS_PER_FRAME] /* i : listener positions for next rendering call */ ); ivas_error IVAS_REND_SetOrientationTrackingMode( IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ - const uint8_t otrMode /* i : Orientation tracking mode */ +#ifdef FIX_439_OTR_PARAMS + const HEAD_ORIENT_TRK_T orientation_tracking /* i : Head orientation tracking type */ +#else + const uint8_t otrMode /* i : Orientation tracking mode */ +#endif ); ivas_error IVAS_REND_SetReferenceRotation( diff --git a/lib_util/audio_file_writer.c b/lib_util/audio_file_writer.c index 81084dbd95b686d52477327b948ada136225f42f..0ed64d02c59f8a5b3a19c74c9e4986895ad6c5f1 100644 --- a/lib_util/audio_file_writer.c +++ b/lib_util/audio_file_writer.c @@ -151,7 +151,6 @@ ivas_error AudioFileWriter_write( uint32_t numSamples ) { ivas_error error = IVAS_ERR_OK; - if ( self->rawFile ) { if ( fwrite( samples, sizeof( int16_t ), numSamples, self->rawFile ) != numSamples ) diff --git a/lib_util/cmdln_parser.c b/lib_util/cmdln_parser.c index 200b8c86e9bf77bf6c38f39b0f444e4da097e59b..6ac2b0ec2d0ebf5e58c7637c5c00e3e813dd4444 100644 --- a/lib_util/cmdln_parser.c +++ b/lib_util/cmdln_parser.c @@ -31,6 +31,7 @@ *******************************************************************************************************/ #include "cmdln_parser.h" +#include "cmdl_tools.h" #include #include #include @@ -119,7 +120,7 @@ static int16_t initOpts( static int8_t stringLooksLikeOption( const char *str ) { - if ( str[0] == '-' ) + if ( ( str[0] == '-' ) && is_number( str ) == false ) { return 1; } @@ -130,7 +131,7 @@ static int8_t stringLooksLikeOption( static const char *stringToOptionName( const char *str ) { - while ( *str == '-' ) + while ( ( *str == '-' ) && ( ( str[1] != '0' ) || ( str[1] != '1' ) ) ) { ++str; } @@ -268,7 +269,7 @@ static const char *getBasename( static int32_t totalOptionNameLength( const OptionProps opt ) { - return strlen( opt.match ) + strlen( opt.matchShort ); + return (int32_t) ( strlen( opt.match ) + strlen( opt.matchShort ) ); } static void printWhitespace( diff --git a/lib_util/head_rotation_file_reader.c b/lib_util/head_rotation_file_reader.c index 02f14be9247c62fb5ba80701fab7de6d96a49c84..0283c292334daec7e88a2ffa6f54eb790f455257 100644 --- a/lib_util/head_rotation_file_reader.c +++ b/lib_util/head_rotation_file_reader.c @@ -94,7 +94,7 @@ ivas_error HeadRotationFileReader_open( ivas_error HeadRotationFileReading( HeadRotFileReader *headRotReader, /* i/o: HeadRotFileReader handle */ IVAS_QUATERNION *pQuaternion, /* o : head-tracking data */ - IVAS_POSITION *pPos /* o : listener position */ + IVAS_VECTOR3 *pPos /* o : listener position */ ) { float w, x, y, z; diff --git a/lib_util/head_rotation_file_reader.h b/lib_util/head_rotation_file_reader.h index 4794aeba45b2d17e2c7552112ff292741ca9655d..52b97ae1c3db0417fb308b47b484bb0b11feea61 100644 --- a/lib_util/head_rotation_file_reader.h +++ b/lib_util/head_rotation_file_reader.h @@ -60,7 +60,7 @@ ivas_error HeadRotationFileReader_open( ivas_error HeadRotationFileReading( HeadRotFileReader *headRotReader, /* i/o: HeadRotFileReader handle */ IVAS_QUATERNION *pQuaternion, /* o : head-tracking data */ - IVAS_POSITION *pPos /* o : listener position */ + IVAS_VECTOR3 *pPos /* o : listener position */ ); /*-----------------------------------------------------------------------* diff --git a/lib_util/hrtf_file_reader.c b/lib_util/hrtf_file_reader.c index 501a71ba482b8498f338edd549d0a9abbc41cc1e..47132419f349e23cd6edd3c408e670107dff9c69 100644 --- a/lib_util/hrtf_file_reader.c +++ b/lib_util/hrtf_file_reader.c @@ -195,7 +195,12 @@ static ivas_error check_hrtf_binary_header( } /* Check the output format of the decoder */ + +#ifdef UPDATE_SBA_FILTER + if ( ( hrtf_header->input_cfg != BINAURAL_INPUT_AUDIO_CONFIG_COMBINED ) && ( hrtf_header->input_cfg != BINAURAL_INPUT_AUDIO_CONFIG_HOA3 ) && ( hrtf_header->input_cfg != BINAURAL_INPUT_AUDIO_CONFIG_HOA2 ) && ( hrtf_header->input_cfg != BINAURAL_INPUT_AUDIO_CONFIG_FOA ) && ( hrtf_header->input_cfg != BINAURAL_INPUT_AUDIO_CONFIG_UNDEFINED ) ) +#else 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 ) ) +#endif { return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Header of HRTF binary file not compliant (input audio configuration)" ); } @@ -981,6 +986,31 @@ static ivas_error init_fastconv_HRTF_handle( set_zero( hHrtf->rightHRIRImag_HOA3[i][j], BINAURAL_NTAPS ); } } +#ifdef UPDATE_SBA_FILTER + hHrtf->FASTCONV_HOA2_latency_s = 0; + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < 9; j++ ) + { + set_zero( hHrtf->leftHRIRReal_HOA2[i][j], BINAURAL_NTAPS ); + set_zero( hHrtf->leftHRIRImag_HOA2[i][j], BINAURAL_NTAPS ); + set_zero( hHrtf->rightHRIRReal_HOA2[i][j], BINAURAL_NTAPS ); + set_zero( hHrtf->rightHRIRImag_HOA2[i][j], BINAURAL_NTAPS ); + } + } + hHrtf->FASTCONV_FOA_latency_s = 0; + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < 4; j++ ) + { + set_zero( hHrtf->leftHRIRReal_FOA[i][j], BINAURAL_NTAPS ); + set_zero( hHrtf->leftHRIRImag_FOA[i][j], BINAURAL_NTAPS ); + set_zero( hHrtf->rightHRIRReal_FOA[i][j], BINAURAL_NTAPS ); + set_zero( hHrtf->rightHRIRImag_FOA[i][j], BINAURAL_NTAPS ); + } + } +#endif + hHrtf->FASTCONV_BRIR_latency_s = 0; for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) @@ -1085,7 +1115,11 @@ static ivas_error create_fastconv_HRTF_from_rawdata( } } } +#ifdef UPDATE_SBA_FILTER + else if ( rend_type == RENDERER_BINAURAL_FASTCONV && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA3 ) +#else if ( rend_type == RENDERER_BINAURAL_FASTCONV && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA ) +#endif { /* HRIR_HOA3 */ ( *hHRTF )->FASTCONV_HOA3_latency_s = *( (float *) ( hrtf_data_rptr ) ); @@ -1136,8 +1170,116 @@ static ivas_error create_fastconv_HRTF_from_rawdata( } } } +#ifdef UPDATE_SBA_FILTER + else if ( rend_type == RENDERER_BINAURAL_FASTCONV && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA2 ) + { + /* HRIR_HOA2 */ + ( *hHRTF )->FASTCONV_HOA2_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_HOA2[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_HOA2[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_HOA2[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_HOA2[i][j], hrtf_data_rptr, BINAURAL_NTAPS * sizeof( float ) ); + hrtf_data_rptr += BINAURAL_NTAPS * sizeof( float ); + } + } + } + else if ( rend_type == RENDERER_BINAURAL_FASTCONV && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_FOA ) + { + /* HRIR_FOA */ + ( *hHRTF )->FASTCONV_FOA_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_FOA[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_FOA[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_FOA[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_FOA[i][j], hrtf_data_rptr, BINAURAL_NTAPS * sizeof( float ) ); + hrtf_data_rptr += BINAURAL_NTAPS * sizeof( float ); + } + } + } +#endif /* BRIR */ +#ifdef UPDATE_SBA_FILTER + else if ( rend_type == RENDERER_BINAURAL_FASTCONV_ROOM && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED ) +#else if ( rend_type == RENDERER_BINAURAL_FASTCONV_ROOM && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED ) +#endif { ( *hHRTF )->FASTCONV_BRIR_latency_s = *( (float *) ( hrtf_data_rptr ) ); hrtf_data_rptr += sizeof( float ); @@ -1495,10 +1637,24 @@ ivas_error create_SetOfHRTF_from_binary( { hHRTF = &( ( *hSetOfHRTF ).hHRTF_hrir_combined ); } +#ifdef UPDATE_SBA_FILTER + else if ( hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA3 ) +#else else if ( hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA ) +#endif { hHRTF = &( ( *hSetOfHRTF ).hHRTF_hrir_hoa3 ); } +#ifdef UPDATE_SBA_FILTER + else if ( hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA2 ) + { + hHRTF = &( ( *hSetOfHRTF ).hHRTF_hrir_hoa2 ); + } + else if ( hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_FOA ) + { + hHRTF = &( ( *hSetOfHRTF ).hHRTF_hrir_foa ); + } +#endif } else if ( hrtf_header.rend_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) { @@ -1605,6 +1761,10 @@ ivas_error destroy_SetOfHRTF( { destroy_HRTF( &( hSetOfHRTF->hHRTF_hrir_combined ) ); destroy_HRTF( &( hSetOfHRTF->hHRTF_hrir_hoa3 ) ); +#ifdef UPDATE_SBA_FILTER + destroy_HRTF( &( hSetOfHRTF->hHRTF_hrir_hoa2 ) ); + destroy_HRTF( &( hSetOfHRTF->hHRTF_hrir_foa ) ); +#endif destroy_HRTF( &( hSetOfHRTF->hHRTF_brir_combined ) ); } diff --git a/lib_util/ism_file_reader.c b/lib_util/ism_file_reader.c index 0aeca6d6a06e36cdf8df76f6971670d356fb0923..7054d2081bc8b4f59ceef6574eb71efc08ac0dfd 100644 --- a/lib_util/ism_file_reader.c +++ b/lib_util/ism_file_reader.c @@ -35,10 +35,9 @@ #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 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) */ +#define NUM_ISM_METADATA_PER_LINE 8 /* Number of ISM metadata per line in a metadata file */ +#define NUM_MIN_ISM_METADATA 1 /* Minimum number of metadata parameters (azimuth) */ struct IsmFileReader @@ -96,7 +95,7 @@ ivas_error IsmFileReader_readNextFrame( { 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 }; + const float meta_prm_default[NUM_ISM_METADATA_PER_LINE] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f }; char *char_ptr; int16_t i; FILE *file; @@ -135,22 +134,12 @@ ivas_error IsmFileReader_readNextFrame( meta_prm[i++] = (float) atof( char_ptr ); } -#ifdef FIX_379_EXT_METADATA /* Verify the number of metadata values. */ if ( i < NUM_MIN_ISM_METADATA || char_ptr != NULL ) { /* Invalid number of metadata parameters (2-7 supported) */ return IVAS_ERR_ISM_FILE_READER_INVALID_METADATA_FORMAT; } -#else - /* Check if minimum number of metadata values were read. Additional values are ignored. */ - if ( i < NUM_MIN_ISM_METADATA ) - { - /* Not enough values provided in one line */ - return IVAS_ERR_ISM_FILE_READER_INVALID_METADATA_FORMAT; - } -#endif - ismMetadata->azimuth = meta_prm[0]; ismMetadata->elevation = meta_prm[1]; @@ -159,8 +148,14 @@ ivas_error IsmFileReader_readNextFrame( ismMetadata->gainFactor = meta_prm[4]; ismMetadata->yaw = meta_prm[5]; ismMetadata->pitch = meta_prm[6]; + ismMetadata->non_diegetic_flag = (int16_t) meta_prm[7]; /* verify whether the read metadata values are in an expected range */ + if ( ( ismMetadata->non_diegetic_flag ) != 0 && ( ismMetadata->non_diegetic_flag != 1 ) ) + { + return IVAS_ERR_ISM_INVALID_METADATA_VALUE; + } + if ( ismMetadata->azimuth > 180 || ismMetadata->azimuth < -180 ) { return IVAS_ERR_ISM_INVALID_METADATA_VALUE; @@ -171,11 +166,7 @@ ivas_error IsmFileReader_readNextFrame( return IVAS_ERR_ISM_INVALID_METADATA_VALUE; } -#ifdef FIX_379_EXT_METADATA if ( ismMetadata->radius < 0 ) /* Negative radius not supported. Max quantized radius = (2^ISM_RADIUS_NBITS-1)*0.25 = 15.75 */ -#else - if ( ismMetadata->radius < 0 ) // Ivas_fmToDo: to be reviewed -#endif { return IVAS_ERR_ISM_INVALID_METADATA_VALUE; } diff --git a/lib_util/ism_file_writer.c b/lib_util/ism_file_writer.c index b29386282b016342c147f0c60775a8b9eb314ba4..470b02e698b61da0d4f3dbb375fcd6c312cfe9e0 100644 --- a/lib_util/ism_file_writer.c +++ b/lib_util/ism_file_writer.c @@ -63,7 +63,7 @@ ivas_error IsmFileWriter_open( strncpy( metadata_filename_loc, filePathWav, sizeof( metadata_filename_loc ) - 1 ); 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; + const int32_t maxNumCharactersToAppend = (int32_t) ( sizeof( metadata_filename_loc ) - strlen( metadata_filename_loc ) - 1 ); strncat( metadata_filename_loc, ext_meta, maxNumCharactersToAppend ); strcpy( filePath, metadata_filename_loc ); @@ -114,11 +114,7 @@ ivas_error IsmFileWriter_writeFrame( file = ismWriter->file; /* IVAS_fmToDo: work in progress; currently position_azimuth, position_elevation, position_radius, spread, gain_factor */ -#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 ); - + snprintf( char_buff, sizeof( char_buff ), "%+07.2f,%+06.2f,%05.2f,%06.2f,%04.2f,%+07.2f,%+06.2f,%d\n", ismMetadata.azimuth, ismMetadata.elevation, ismMetadata.radius, ismMetadata.spread, ismMetadata.gainFactor, ismMetadata.yaw, ismMetadata.pitch, ismMetadata.non_diegetic_flag ); if ( file ) { fputs( char_buff, file ); diff --git a/lib_util/masa_file_reader.c b/lib_util/masa_file_reader.c index 19f12182f3ab11246cbe74ff5ddf2eec45a0ca89..90756a39b1ec5dcb33c3c2034f832ba5f1d9042e 100644 --- a/lib_util/masa_file_reader.c +++ b/lib_util/masa_file_reader.c @@ -84,7 +84,7 @@ MasaFileReader *MasaFileReader_open( *------------------------------------------------------------------------*/ IVAS_MASA_METADATA_HANDLE MasaFileReader_getMetadataHandle( - MasaFileReader *self /* i/o: MasaFileReader handle */ + MasaFileReader *self /* i/o: MasaFileReader handle */ ) { if ( self == NULL ) @@ -95,12 +95,13 @@ IVAS_MASA_METADATA_HANDLE MasaFileReader_getMetadataHandle( return &self->metadataFrame; } + +#ifndef HR_METADATA /*------------------------------------------------------------------------- * deindex_sph_idx() * * deindex the MASA metadata from the input metadata file *------------------------------------------------------------------------*/ - static void deindex_sph_idx( const uint16_t sphIndex, /* i : Spherical index */ const SPHERICAL_GRID_DATA *gridData, /* i : Prepared spherical grid */ @@ -249,6 +250,7 @@ static void deindex_sph_idx( return; } +#endif /*------------------------------------------------------------------------- @@ -342,6 +344,9 @@ ivas_error MasaFileReader_readNextFrame( for ( b = 0; b < MASA_FREQUENCY_BANDS; b++ ) { deindex_sph_idx( readIndex[b], &self->sph_grid16, &( hMeta->directional_meta[i].elevation[j][b] ), &( hMeta->directional_meta[i].azimuth[j][b] ) ); +#ifdef HR_METADATA + hMeta->directional_meta[i].spherical_index[j][b] = readIndex[b]; +#endif } /* Direct-to-total ratio */ @@ -412,7 +417,7 @@ ivas_error MasaFileReader_readNextFrame( *------------------------------------------------------------------------*/ void MasaFileReader_close( - MasaFileReader **selfPtr /* i/o: pointer to MasaFileReader handle */ + MasaFileReader **selfPtr /* i/o: pointer to MasaFileReader handle */ ) { if ( selfPtr == NULL || *selfPtr == NULL ) diff --git a/lib_util/masa_file_writer.c b/lib_util/masa_file_writer.c index 5667968ece8b39c4a1a8ecc783a9efcea63b2011..e7f3aca0b69b6089973f63ca433d33df36aa73c6 100644 --- a/lib_util/masa_file_writer.c +++ b/lib_util/masa_file_writer.c @@ -32,15 +32,12 @@ #include "masa_file_writer.h" #include "ivas_stat_com.h" -#ifdef FIX_350_MASA_DELAY_COMP #include "ivas_stat_dec.h" -#endif #include "ivas_cnst.h" #include #include #include -#ifdef FIX_350_MASA_DELAY_COMP typedef struct masaMetaDelayStorage { MASA_DECRIPTIVE_META descriptiveMeta; @@ -51,24 +48,18 @@ typedef struct masaMetaDelayStorage uint8_t diffuseToTotalRatio[DELAY_MASA_PARAM_DEC_SFR][MASA_FREQUENCY_BANDS]; } MASA_META_DELAY_STORAGE; -#endif struct MasaFileWriter { FILE *file; char *file_path; -#ifdef FIX_350_MASA_DELAY_COMP MASA_META_DELAY_STORAGE *delayStorage; -#endif }; /*-----------------------------------------------------------------------* * Local constants *-----------------------------------------------------------------------*/ -#ifndef FIX_350_MASA_DELAY_COMP -#define SPH_IDX_FRONT ( MASA_NO_POINTS_EQUATOR / 2 ) /* Spherical index corresponding to front direction for setting as default value */ -#endif /*-----------------------------------------------------------------------* * Local functions @@ -93,7 +84,6 @@ static void getExtMasaMetadataFileName( return; } -#ifdef FIX_350_MASA_DELAY_COMP 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 */ @@ -150,7 +140,6 @@ static void delayMasaMetadata( return; } -#endif /*---------------------------------------------------------------------* * MasaFileWriter_open() @@ -159,11 +148,9 @@ static void delayMasaMetadata( *---------------------------------------------------------------------*/ ivas_error MasaFileWriter_open( - const char *outputWavFilename, /* i : name of the output audio file */ -#ifdef FIX_350_MASA_DELAY_COMP + const char *outputWavFilename, /* i : name of the output audio file */ const bool delayCompensationEnabled, /* i : is delay compensation enabled */ -#endif - MasaFileWriter **masaWriter /* o : MasaFileWriter handle */ + MasaFileWriter **masaWriter /* o : MasaFileWriter handle */ ) { MasaFileWriter *self; @@ -189,12 +176,10 @@ ivas_error MasaFileWriter_open( self->file_path = calloc( sizeof( char ), strlen( filePath ) + 1 ); strcpy( self->file_path, filePath ); -#ifdef FIX_350_MASA_DELAY_COMP if ( !delayCompensationEnabled ) { self->delayStorage = calloc( sizeof( MASA_META_DELAY_STORAGE ), 1 ); } -#endif *masaWriter = self; @@ -209,12 +194,8 @@ ivas_error MasaFileWriter_open( *---------------------------------------------------------------------*/ ivas_error MasaFileWriter_writeFrame( - MasaFileWriter *self, /* i/o: MasaFileWriter handle */ -#ifdef FIX_350_MASA_DELAY_COMP + MasaFileWriter *self, /* i/o: MasaFileWriter handle */ MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta /* i/o: MASA ext out meta handle to be written */ -#else - IVAS_MASA_QMETADATA_HANDLE hMasaQMetadata /* i/o: MASA qMetadata handle to be written */ -#endif ) { if ( self == NULL ) @@ -222,29 +203,10 @@ ivas_error MasaFileWriter_writeFrame( return IVAS_ERR_UNEXPECTED_NULL_POINTER; } -#ifdef FIX_350_MASA_DELAY_COMP uint16_t descMetaTemp = 0; int16_t i, sf, dir, numDirections; uint8_t writeTempOther[MASA_FREQUENCY_BANDS]; -#else - 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]; - 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; -#endif - -#ifdef FIX_350_MASA_DELAY_COMP + /* 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. */ @@ -280,47 +242,6 @@ ivas_error MasaFileWriter_writeFrame( descMetaTemp += hMasaExtOutMeta->descriptiveMeta.channelAngle << 6u; /* 6 LSB remain at zero */ } -#else - /* 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; - } - - if ( fwrite( &( descMeta.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 += descMeta.transportDefinition << 9u; - descMetaTemp += descMeta.channelAngle << 6u; - descMetaTemp += descMeta.channelDistance; - } - else if ( descMeta.sourceFormat == 0x2 ) - { - descMetaTemp += descMeta.channelLayout << 9u; - /* 9 LSB remain at zero */ - } - else if ( descMeta.sourceFormat == 0x3 ) - { - descMetaTemp += descMeta.transportDefinition << 9u; - descMetaTemp += descMeta.channelAngle << 6u; - /* 6 LSB remain at zero */ - } -#endif if ( fwrite( &( descMetaTemp ), sizeof( uint16_t ), 1, self->file ) != 1 ) { @@ -332,73 +253,19 @@ ivas_error MasaFileWriter_writeFrame( for ( dir = 0; dir < numDirections; dir++ ) { /* Spherical index */ -#ifdef FIX_350_MASA_DELAY_COMP if ( fwrite( hMasaExtOutMeta->directionIndex[dir][sf], sizeof( uint16_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS ) -#else - 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 ) -#endif { return IVAS_ERR_FAILED_FILE_WRITE; } /* Direct-to-total ratio */ -#ifdef FIX_350_MASA_DELAY_COMP if ( fwrite( hMasaExtOutMeta->directToTotalRatio[dir][sf], sizeof( uint8_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS ) -#else - 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 ) -#endif { return IVAS_ERR_FAILED_FILE_WRITE; } /* Spread coherence */ -#ifdef FIX_350_MASA_DELAY_COMP if ( fwrite( hMasaExtOutMeta->spreadCoherence[dir][sf], sizeof( uint8_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS ) -#else - 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 ) -#endif { return IVAS_ERR_FAILED_FILE_WRITE; } @@ -406,72 +273,23 @@ ivas_error MasaFileWriter_writeFrame( /* Common spatial meta */ /* Diffuse-to-total ratio = 1 - sum(direct-to-total ratios) */ -#ifdef FIX_350_MASA_DELAY_COMP if ( fwrite( hMasaExtOutMeta->diffuseToTotalRatio[sf], sizeof( uint8_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS ) -#else - 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 ) -#endif { return IVAS_ERR_FAILED_FILE_WRITE; } /* Surround coherence */ -#ifdef FIX_350_MASA_DELAY_COMP if ( fwrite( hMasaExtOutMeta->surroundCoherence[sf], sizeof( uint8_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS ) -#else - /* 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 ) -#endif { return IVAS_ERR_FAILED_FILE_WRITE; } /* Remainder-to-total ratio */ /* This is zero after codec */ -#ifdef FIX_350_MASA_DELAY_COMP for ( i = 0; i < MASA_FREQUENCY_BANDS; i++ ) { writeTempOther[i] = 0u; } -#else - for ( b_new = 0; b_new < MASA_FREQUENCY_BANDS; b_new++ ) - { - writeTempOther[b_new] = 0u; - } -#endif if ( fwrite( writeTempOther, sizeof( uint8_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS ) { @@ -500,9 +318,7 @@ void MasaFileWriter_close( fclose( ( *selfPtr )->file ); free( ( *selfPtr )->file_path ); -#ifdef FIX_350_MASA_DELAY_COMP free( ( *selfPtr )->delayStorage ); -#endif free( *selfPtr ); *selfPtr = NULL; diff --git a/lib_util/masa_file_writer.h b/lib_util/masa_file_writer.h index cb7d8f3d1efdb608e5e880be8a18a49bd43bffec..62aa8c6b48c0c990138621689f05fc665cabe914 100644 --- a/lib_util/masa_file_writer.h +++ b/lib_util/masa_file_writer.h @@ -35,9 +35,7 @@ #include #include "options.h" -#ifdef FIX_350_MASA_DELAY_COMP #include -#endif #include "common_api_types.h" @@ -45,20 +43,14 @@ struct MasaFileWriter; typedef struct MasaFileWriter MasaFileWriter; ivas_error MasaFileWriter_open( - const char *outputWavFilename, /* i : name of the output audio file */ -#ifdef FIX_350_MASA_DELAY_COMP + const char *outputWavFilename, /* i : name of the output audio file */ const bool delayCompensationEnabled, /* i : is delay compensation enabled */ -#endif - MasaFileWriter **masaWriter /* o : MasaFileWriter handle */ + MasaFileWriter **masaWriter /* o : MasaFileWriter handle */ ); ivas_error MasaFileWriter_writeFrame( - MasaFileWriter *self, /* i/o: MasaFileWriter handle */ -#ifdef FIX_350_MASA_DELAY_COMP + MasaFileWriter *self, /* i/o: MasaFileWriter handle */ MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta /* i/o: MASA ext out meta handle to be written */ -#else - IVAS_MASA_QMETADATA_HANDLE hMasaQMetadata /* i/o: MASA qMetadata handle to be written */ -#endif ); void MasaFileWriter_close( diff --git a/lib_util/tinywaveout_c.h b/lib_util/tinywaveout_c.h index d0531eb6653c47288f7db1b6f1c84d454f55227d..b82c0cd131a20a9fea782b08e523ebdb56ac6e3d 100644 --- a/lib_util/tinywaveout_c.h +++ b/lib_util/tinywaveout_c.h @@ -490,6 +490,49 @@ static int32_t WriteWavShort( return __TWO_SUCCESS; } +#ifdef DEBUG_JBM +/* this function expects values in the 16 bit range +-32767/8 */ +static int32_t WriteWavFloat( + WAVEFILEOUT *self, + float sampleBuffer[], + uint32_t nSamples ) +{ + uint32_t i; + int32_t err = __TWO_SUCCESS; + + if ( !self ) + { + return __TWO_ERROR; + } + if ( !sampleBuffer ) + { + return __TWO_ERROR; + } + if ( __dataSizeChk( self, nSamples * sizeof( float ) ) ) + { + return __TWO_ERROR; + } + + for ( i = 0; i < nSamples; i++ ) + { + if ( self->bps == 32 ) + { + err = __WriteSample32( self, sampleBuffer[i] / 32768.0f ); + } + else + { + err = __TWO_ERROR; + } + if ( err != __TWO_SUCCESS ) + { + return err; + } + } + + return __TWO_SUCCESS; +} +#endif + static int32_t CloseWav( WAVEFILEOUT *self ) { diff --git a/lib_util/tsm_scale_file_reader.c b/lib_util/tsm_scale_file_reader.c new file mode 100644 index 0000000000000000000000000000000000000000..fbd1824d9dfd4d7219ad72c18549bc19a9d016a9 --- /dev/null +++ b/lib_util/tsm_scale_file_reader.c @@ -0,0 +1,148 @@ +/****************************************************************************************************** + + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. 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 "tsm_scale_file_reader.h" +#include "cmdl_tools.h" +#include +#include +#include + +struct TsmScaleFileReader +{ + FILE *file; + char *file_path; + bool fileRewind; +}; + + +/*---------------------------------------------------------------------* + * TsmScaleFileReader_open() + * + * Allocates memory for an TsmScaleFileReader and opens the file at given path for reading. + *---------------------------------------------------------------------*/ + +/*! r: JbmFileReader handle */ +TsmScaleFileReader *TsmScaleFileReader_open( + const char *filePath /* i : path to CA config file */ +) +{ + TsmScaleFileReader *self; + FILE *file; + + if ( !filePath ) + { + return NULL; + } + + file = fopen( filePath, "rb" ); + + if ( !file ) + { + return NULL; + } + + self = calloc( sizeof( TsmScaleFileReader ), 1 ); + self->file = file; + self->file_path = calloc( sizeof( char ), strlen( filePath ) + 1 ); + strcpy( self->file_path, filePath ); + + return self; +} + + +/*---------------------------------------------------------------------* + * TsmScaleFileReader_readScale() + * + * Read TSM scale entry + *---------------------------------------------------------------------*/ + +ivas_error TsmScaleFileReader_readScale( + TsmScaleFileReader *self, /* i/o: TsmScaleFileReader handle */ + int16_t *scale /* o : scale */ +) +{ + int tmp; + if ( 1 != fscanf( self->file, "%d", &tmp ) ) + { + if ( feof( self->file ) ) + { + rewind( self->file ); + self->fileRewind = true; + return TsmScaleFileReader_readScale( self, scale ); + } + return IVAS_ERR_FAILED_FILE_PARSE; + } + *scale = (int16_t) tmp; + return IVAS_ERR_OK; +} + + +/*---------------------------------------------------------------------* + * JbmFileReader_close() + * + * De-allocates all underlying memory of an JbmFileReader. + *---------------------------------------------------------------------*/ + +void TsmScaleFileReader_close( + TsmScaleFileReader **selfPtr /* i/o: pointer to JbmFileReader handle */ +) +{ + if ( selfPtr == NULL || *selfPtr == NULL ) + { + return; + } + + fclose( ( *selfPtr )->file ); + free( ( *selfPtr )->file_path ); + free( *selfPtr ); + *selfPtr = NULL; + + return; +} + + +/*---------------------------------------------------------------------* + * JbmFileReader_getFilePath() + * + *---------------------------------------------------------------------*/ + +const char *TsmScaleFileReader_getFilePath( + TsmScaleFileReader *self /* i/o: JbmFileReader handle */ +) +{ + if ( self == NULL ) + { + return NULL; + } + + return self->file_path; +} diff --git a/scripts/pyaudio3dtools/quaternions/__init__.py b/lib_util/tsm_scale_file_reader.h similarity index 62% rename from scripts/pyaudio3dtools/quaternions/__init__.py rename to lib_util/tsm_scale_file_reader.h index 8f1f04c36906bb9a43d1c3226aca6eced4f63498..7a795a25cb27316f36acef8bb07dfe67c6dcbf4c 100644 --- a/scripts/pyaudio3dtools/quaternions/__init__.py +++ b/lib_util/tsm_scale_file_reader.h @@ -1,6 +1,5 @@ -#!/usr/bin/env python3 +/****************************************************************************************************** -""" (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, @@ -28,17 +27,41 @@ 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. -""" -""" -Quaternions -==== +*******************************************************************************************************/ -Provides - Handling of quaternions in the same conventions as in IVAS and the Matlab scripts +#ifndef IVAS_TSM_SCALE_FILE_READER_H +#define IVAS_TSM_SCALE_FILE_READER_H -Imports -------- -functions -""" -from . import functions +#include +#include "common_api_types.h" +#include "ivas_error.h" + +/* clang-format off */ + +typedef struct TsmScaleFileReader TsmScaleFileReader; + + +/*! r: TsmScaleFileReader handle */ +TsmScaleFileReader *TsmScaleFileReader_open( + const char *filePath /* i : path to TSM scale file */ +); + +ivas_error TsmScaleFileReader_readScale( + TsmScaleFileReader* self, /* i/o: TsmScaleFileReader handle */ + int16_t *scale /* o : next scale */ +); + +void TsmScaleFileReader_close( + TsmScaleFileReader **selfPtr /* i/o: pointer to TsmScaleFileReader handle */ +); + +/*! r: path to the currently opened file or NULL if `self` is NULL */ +const char *TsmScaleFileReader_getFilePath( + TsmScaleFileReader* self /* i/o: TsmScaleFileReader handle */ +); + + +/* clang-format on */ + +#endif /* IVAS_TSM_SCALE_FILE_READER_H */ diff --git a/readme.txt b/readme.txt index c566c78ea233901d72fc367809458787ddc2e9fa..21a5a19e7940665f7cf537520a0cf248466d22e7 100644 --- a/readme.txt +++ b/readme.txt @@ -123,32 +123,33 @@ should have the following structure: |-- Workspace_msvc |-- apps |-- lib_com -....|-- lib_debug + |-- lib_debug |-- lib_dec |-- lib_enc + |-- lib_rend |-- lib_util |-- scripts -....|-- work_in_progress - |-- readme_OSS.txt - `-- readme.txt + |-- tests + |-- readme.txt The package includes a Makefile for gcc, which has been verified on 32-bit Linux systems. The code can be compiled by entering the directory -"c-code" and typing the command: make. The resulting encoder/decoder -executables are named "IVAS_cod" and "IVAS_dec". Both reside in the c-code -directory. +"c-code" and typing the command: make. The resulting encoder/decoder/renderer +executables are named "IVAS_cod", "IVAS_dec", and "IVAS_rend". All reside +in the c-code directory. The package also includes a solution-file for Microsoft Visual Studio 2017 (x86). To compile the code, please open "Workspace_msvc\Workspace_msvc.sln" and build "encoder" for the encoder and "decoder" for the decoder executable. The resulting -encoder/decoder executables are named "IVAS_cod.exe" and "IVAS_dec.exe". Both reside -in the c-code directory. +encoder/decoder/renderer executables are named "IVAS_cod.exe", "IVAS_dec.exe", +and "IVAS_rend.exe". All reside in the c-code directory. RUNNING THE SOFTWARE ==================== The usage of the "IVAS_cod" program is as follows: +-------------------------------------------------- Usage: IVAS_cod.exe [Options] R Fs input_file bitstream_file @@ -161,9 +162,9 @@ R : Bitrate in bps, for AMR-WB IO modes R = (6600, 8850, 12650, 14250, 15850, 18250, 19850, 23050, 23850) 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) + 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 @@ -179,17 +180,17 @@ bitstream_file : Output bitstream filename 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) +-stereo : Stereo format +-ism [+]Ch Files : ISM format + where Ch specifies the number of ISMs (1-4) + where positive (+) indicates extended metadata (only 64 kbps and up) 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 Channels File : MASA format - where Channels specifies the number of input/transport channels (1 or 2): +-masa Ch File : MASA format + where Ch 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 @@ -213,13 +214,13 @@ EVS mono is default, for IVAS choose one of the following: -stereo, -ism, -sba, -mime : Mime output bitstream file format The encoder produces TS26.445 Annex.2.6 Mime Storage Format, (not RFC4867 Mime Format). default output bitstream file format is G.192 --agc op : SBA Adaptive gain control, op = (0, 1), by default op is 0 or deactivated -bypass mode : SBA PCA by-pass, mode = (1, 2), 1 = PCA off, 2 = signal adaptive, default is 1 -q : Quiet mode, no frame counters default is deactivated The usage of the "IVAS_dec" program is as follows: +-------------------------------------------------- Usage for EVS: IVAS_dec.exe [Options] Fs bitstream_file output_file Usage for IVAS: IVAS_dec.exe [Options] OutputConf Fs bitstream_file output_file @@ -264,17 +265,16 @@ Options: -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 +-non_diegetic_pan P : panning mono non-diegetic sound to stereo -90<= P <=90, + left or l or 90->left, right or r or -90->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), - + + +The usage of the "IVAS_rend" program is as follows: +--------------------------------------------------- + +TBD MULTICHANNEL LOUDSPEAKER INPUT / OUTPUT CONFIGURATIONS @@ -359,7 +359,7 @@ stv2MASA2TC48c.wav - 2 channels (2 MASA transport channel), 48000 Hz, 48000 Hz, For the MASA operation modes, in addition the following metadata files -are required: +located in /scripts/testv/ folder are required: stv1MASA1TC48c.met stv1MASA1TC48n.met @@ -375,7 +375,7 @@ available at https://www.3gpp.org/ftp/TSG_SA/WG4_CODEC/TSGS4_118-e/Docs/S4-220443.zip For the ISM operation modes, in addition the following metadata files -are required: +located at /scripts/testv/ folder are required: stvISM1.csv stvISM2.csv @@ -384,21 +384,40 @@ stvISM4.csv These are comma separated files (csv) which indicate the per object position in the format: -frame azimuth, elevation, distance (unit circle), spread, gain +frame azimuth, elevation, radius, spread, gain, yaw, pitch, non-diegetic with the following meaning: -| Parameter | format, value range | meaning ------------------------------------------------------------------------------------ -| azimuth | float, [-180,180[ | azimuth; positive indicates left ------------------------------------------------------------------------------------ -| elevation | float, [-90,90] | elevation; positive indicates up ------------------------------------------------------------------------------------ -| 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 ------------------------------------------------------------------------------------ +| Parameter | format, value range | meaning +--------------------------------------------------------------------------------------------------- +| azimuth | float, [-180,180] | azimuth; positive indicates left; default: 0 +--------------------------------------------------------------------------------------------------- +| elevation | float, [-90,90] | elevation; positive indicates up; default: 0 +--------------------------------------------------------------------------------------------------- +| radius | float, [0, 15.75] | radius (extended metadata); default: 1 +--------------------------------------------------------------------------------------------------- +| spread | float, [0,360] | spread in angles from 0...360 deg; default: 0 +--------------------------------------------------------------------------------------------------- +| gain | float, [0,1] | gain; default: 1 +--------------------------------------------------------------------------------------------------- +| yaw | float, [-180,180] | yaw (extended metadata); positive indicates left; default: 0 +--------------------------------------------------------------------------------------------------- +| pitch | float, [-90,90] | pitch (extended metadata); positive indicates up; default: 0 +--------------------------------------------------------------------------------------------------- +| non-diegetic | float*, [0 1] | Flag for activation of non-diegetic rendering; default: 0 +| | if Flag is set to 1, panning gain is specified by azimuth. +| | Value between [-90,90], 90 left, -90 right, 0 center +--------------------------------------------------------------------------------------------------- +*Read as float value for convenience, but used as an integer flag internally. + +The metadata reader accepts 1-8 values specified per line. If a value is not specified, the default +value is assumed. + +For the HRTF filter File option, external HRTF filter Files are available in folder +/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data : + +ivas_binaural_16kHz.bin +ivas_binaural_32kHz.bin +ivas_binaural_48kHz.bin For the Head rotation operation modes, external trajectory files are available: @@ -409,6 +428,9 @@ headrot_case01_3000_q.csv headrot_case02_3000_q.csv headrot_case03_3000_q.csv +For Reference vector specified by external trajectory file, example files are available at +/scripts/trajectories folder. + For the Renderer configuration option operation modes, external configuration files are available: @@ -421,5 +443,6 @@ config_renderer.cfg ================== Additional scripts for item generation and codec testing are available -in the directory scripts. Please refer to scripts/README.md for -additional documentation. +in the directories scripts and tests. Please refer to scripts/README.md, resp. +tests/README.md for additional documentation. + diff --git a/scripts/README.md b/scripts/README.md index fec54ffeac8a7929b329d55ecb72641eb79b0e22..4e8a9b366451700c6acd9a23cb7198235297b290 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -38,7 +38,6 @@ title: Python scripts for Testing the IVAS code and Generating test items - [Python scripts for Testing the IVAS code and Generating test items](#python-scripts-for-testing-the-ivas-code-and-generating-test-items) - [Contents](#contents) - [0. Requirements](#0-requirements) - - [- numpy and scipy for `generate_test_items.py`, `testBitexact.py` and `self_test.py`](#--numpy-and-scipy-for-generate_test_itemspy-testbitexactpy-and-self_testpy) - [1. Scripts and classes for testing IVAS code](#1--scripts-and-classes-for-testing-ivas-code) - [1.1 Classes](#11-classes) - [1.2 Output directory structure](#12-output-directory-structure) @@ -49,16 +48,6 @@ title: Python scripts for Testing the IVAS code and Generating test items - [`IvasBuildAndRunChecks.py`](#ivasbuildandruncheckspy) - [`testBitexact.py`](#testbitexactpy) - [`self_test.py`](#self_testpy) - - [2. Script for generating listening test items](#2-script-for-generating-listening-test-items) - - [2.1. `generate_test_items.py`](#21-generate_test_itemspy) - - [2.2. Test configuration file](#22-test-configuration-file) - - [2.3. Supported test conditions](#23-supported-test-conditions) - - [2.4. Supported input/output/rendered audio formats](#24-supported-inputoutputrendered-audio-formats) - - [2.5. Processing](#25-processing) - - [2.6. Renderer Metadata definition](#26-renderer-metadata-definition) - - [3. Script for converting formats and binauralizing](#3-script-for-converting-formats-and-binauralizing) - - [3.1. Binauralizing with head rotation](#31-binauralizing-with-head-rotation) - - [3.2. Generating binaural reference signals](#32-generating-binaural-reference-signals) --- @@ -441,216 +430,3 @@ Missing reference conditions and the test conditions are then generated and the reference and test conditions are compared. ----- - - -## 2. Script for generating listening test items - -The `generate_test_items.py` python script helps to quickly setup listening tests with multiple (pre-)processing and post-processing options. - -### 2.1. `generate_test_items.py` - -Script for generating (listening) test items. - -``` -usage: generate_test_items.py [-h] -i INFILE [INFILE ...] - -Generate test items - -optional arguments: - -h, --help show this help message and exit - -i INFILE [INFILE ...], --infile INFILE [INFILE ...] - Configuration file(s): FILE1.json FILE2.json ... -``` - -Example how to call it: - -``` - python3 .\generate_test_items.py -i .\examples\my_test_config.json -``` - -Where `my_test_config.json` is a test configuration file in json format with fields explained in next section. - -### 2.2. Test configuration file - -This is the main file to edit in order to change global configuration options, detailed below. - -*NOTE: Paths specified in the JSON file are relative to the working directory where the script is executed from, NOT the location of the JSON file itself. It is possible (and recommended!) to use absolute paths instead to avoid confusion.* - -| key | values (example) | default | description | -|---------------------------|:------------------:|:-------------:|-----------------------------------------------| -| name | "my_test" | Required | name of the test session | -| author | "myself" | | Author of the configuration file (optional) | -| date | 20210205 | | Date of creation (optional) | -| | | | | -| enable_multiprocessing | True/False | True | Enables multiprocessing, recommended to set to True to make things fast. | -| delete_tmp | True/False | False | Enables deletion of temporary directories (containing intermediate processing files, bitstreams and per-item logfiles etc.). | -| | | | | -| input_path | ./my_items/ | Required | Input directory with *.WAV, *.PCM or *.TXT files to process | -| preproc_input | True/False | False | Whether to execute preprocessing on the input files | -| in_format | HOA3 | Required | Input format for the conditions to generate, see spatial_audio_format | -| in_fs | 32000 | 48000 | Input sampling rate for conditions to generate (assumed to be sampling-rate of input PCM files to process) | -| input_select | ["in", "file2"] | Required | Filenames to filter in the input directory, can be a single value, an array or null. Only compares filenames (therefore "in" in this array would match both "in.wav" and "in.pcm") | -| | | | | -| concatenate_input | True/False | False | Whether to (horizontally) concatenate files in the input directory | -| concat_silence_ms | [1000, 1000] | [0, 0] | Specifies the pre- and post-silence duration to pad concatenation with in ms. If a single value is specified it will be used for BOTH pre- and post-padding | -| preproc_loudness | -26 | | Loudness to preprocess input to (dBov / LKFS depending on tool). Only processed if preproc_input is True. | -| | | | | -| output_path | ./out/ | | Output root directory hosting generated items & log | -| out_fs | 48000 | 48000 | Output sampling rate for conditions to generate | -| output_loudness | -26 | | Loudness level for output file (dBov / LKFS depending on tool). | -| | | | | -| renderer_format | 7_1_4 or CICP19 | Required | Format to be rendered (using offline rendering, will be bypassed if = out_format) | -| binaural_rendered | True/False | False | Extra binauralization of the rendered outputs (using offline rendering) | -| include_LFE | True/False | False | Whether to include LFE in binural rendering | -| gain_factor | float value | 1.0 | Gain factor to be applied to LFE channel | -| loudness_tool | "sv56demo" | "bs1770demo" | Tool to use for loudness adjustment. Currently only sv56demo and bs1770demo are supported for appropriate format configurations. Optionally can be a path to the binary. | -| | | | | -| lt_mode | "MUSHRA" | | Automatically generates a NAME.ltg file with generate_lt_file.py in output_path according to the specified mode | -| conditions_to_generate | ["ref", "ivas"] | Required | list of conditions to be generated, for ivas and evs, multiple conditions can be specified with an \_ separator (i.e. "ivas_branch", "ivas_trunk" etc.) | -| | | | | -| ref | | | | -| - out_fc | 32000 | 48000 | cut-off frequency to be applied to the reference condition in post | -| ivas | | | | -| - bitrates | [16400, 128000] | Required | Bitrate(s) used for IVAS encoder | -| - enc_fs | 48000 | 48000 | Sampling rate for input to the encoder (pre-processing) | -| - max_band | wb, swb, fb etc. | FB | Maximum encoded bandwidth | -| - out_format | 7_1_4 or CICP19 | Required | Output format for IVAS, see spatial_audio_format | -| - dec_fs | 48000 | 48000 | Sampling rate for decoder output | -| - dtx | True/False | False | Enable DTX mode | -| - head_tracking | True/False | False | Enable head tracking | -| - ht_file | | "./trajectories/full_circle_in_15s" | Head rotation file | -| - plc | True/False | False | Enables forward error correction `IVAS_dec -FEC X` | -| - plc_rate | 0-10 | 10 | Percentage of erased frames | -| - cod_bin | "../../../IVAS_cod"| "../IVAS_cod" | path to encoder binary | -| - dec_bin | "../../../IVAS_dec"| "../IVAS_dec" | path to decoder binary | -| - cod_opt | ["-ucct", "1"] | | list of additional encoder options | -| - dec_opt | ["-q"] | | list of additional decoder options | -| evs | | | | -| - bitrates | [13200, 164000] | Required | Bitrate used for multi-stream EVS condition per stream/channel | -| - enc_fs | 48000 | 48000 | Sampling rate for input to the encoder (pre-processing) | -| - max_band | wb, swb, fb etc. | FB | Maximum encoded bandwidth | -| - dec_fs | 48000 | 480000 | Sampling rate for decoder output | -| - dtx | True/False | False | Enable DTX mode | -| - cod_bin | ../../../IVAS_cod | "../IVAS_cod" | path to binary | -| - dec_bin | ../../../IVAS_dec | "../IVAS_dec" | path to binary | -| | | | | - ---- -### 2.3. Supported test conditions - -The following conditions are the conditions which can be generated currently by `generate_test_items.py`. - -| Supported conditions | Description | -|:--------------------:|-----------------------------------------------------------| -| ref | Uncoded (reference) | -| lp3k5 | Uncoded low-passed at 3.5 kHz (anchor) | -| lp7k | Uncoded low-passed at 7 kHz (anchor) | -| evs_mono | Coded with multi-stream EVS codec, !!metadata not coded!! | -| ivas | Coded with IVAS codec | - - -Multiple conditions for evs_mono and ivas can be specified by using underscore separators e.g. `"ivas_1" : {...}, "ivas_2" : {...}` -(also see `test_SBA.json` for an example) - ---- - -### 2.4. Supported input/output/rendered audio formats - -| spatial_audio_format | Input/Ouput/Rendered | Description | -|--------------------------------------------------|----------------------|------------------------------------------------| -| MONO | yes/yes/yes | mono signals | -| STEREO | yes/yes/yes | stereo signals | -| ISM or ISMx | yes/no/no | Objects with metadata, description using renderer metadata | -| MASA or MASAx | yes/no/no | mono or stereo signals with spatial metadata !!!metadata must share same basename as waveform file but with .met extension!!! | -| FOA/HOA2/HOA3 or PLANAR(FOA/HOAx) | yes/yes/yes | Ambisonic signals or planar ambisonic signals | -| BINAURAL/BINAURAL_ROOM | no/yes/yes | Binaural signals | -| 5_1/5_1_2/5_1_4/7_1/7_1_4 or CICP[6/12/14/16/19] | yes/yes/yes | Multi-channel signals for predefined loudspeaker layout | -| META | yes/yes/no | Audio scene described by a renderer config | - ---- - -### 2.5. Processing - -The processing chain is as follows: - -1. Preprocessing - - **Condition**: `preproc_input == true` - - Input files converted to `in_format` -2. Processing - - **Condition**: Performed depending on key in `conditions_to_generate` - - Coding/decoding from `in_format` to `out_format` -3. Postprocessing - 1. Rendering to `renderer_format` - - **Condition**: `out_format != renderer_format` - - output files converted from `out_format` to `renderer_format` - 1. Binaural Rendering - - **Condition**: `binaural_rendered == true` and `out_format` is not a BINAURAL type - - output files converted from `out_format` to `BINAURAL` - ---- - -### 2.6. Renderer Metadata definition - -To run, the renderer requires a config file describing the input scene.The expected format of the config file is as follows: - ---- - -- Line 1: Path to a "multitrack" audio file. This should be a single multichannel wav/pcm file that contains all input audio. For example channels 1-4 can be an FOA scene,channel 5 - an object and channels 6-11 - a 5.1 channel bed. If the path is not absolute, it is considered relative to the renderer executable, not the config file. This path has lower priority than the one given on the command line: *The path in the config file is ignored if the --inputAudio argument to the renderer executable is specified.* - ---- - -- Line 2: Contains number of inputs. An input can either be an Ambisonics scene, anobject or a channel bed.This is NOT the total number of channels in the input audio file.The renderer currently supports simultaneously: *Up to 2 SBA inputs, Up to 2 MC inputs* Up to 16 ISM inputsThese limits can be freely changed with pre-processor macros, if needed. - ---- -- Following lines: -Define each of the inputs. Inputs can be listed in any order - they are NOT required to be listed in the same order as in the audio file. -Input definitions: - - First line of an input definition contains the input type: SBA, MC or ISM.Following lines depend on the input type:SBAIndex of the first channel of this input in the multitrack file (1-indexed)Ambisonics orderMCIndex of the first channel of this input in the multitrack file (1-indexed)CICP index of the speaker layoutISMIndex of this input's audio in the multitrack file (1-indexed)Path to ISM metadata file (if not absolute, relative to executable location)ORISMIndex of this input's audio in the multitrack file (1-indexed)Number N of positions defined, followed by N lines in form: -stay in position for x frames, azimuth, elevation(ISM position metadata defined this way is looped if there are more framesof audio than given positions) - ---- -Example config -The following example defines a scene with 4 inputs: *ISM with trajectory defined in a separate file. Channel 12 in the input file.* Ambisonics, order 1. Channels 1-4 in the input audio file. *CICP6 channel bed. Channels 5-10 in the input audio file.* ISM with 2 defined positions (-90,0) and (90,0). Channel 11 in the input file. The object will start at position (-90,0) and stay there for 5 frames, then move to (90,0) and stay there for 5 frames. This trajectory is looped over the duration of the input audio file. - -``` -./input_audio.wav4ISM12path/to/IVAS_ISM_metadata.csv -3 -SBA -1 -1 -MC -5 -6 -ISM -1 -1 -25,-90,05,90, -``` - -## 3. Script for converting formats and binauralizing - -The script audio3dtools.py can convert between different input and output formats and binauralize signals. - -Execute `python -m pyaudio3dtools.audio3dtools --help` for usage. - -### 3.1. Binauralizing with head rotation - -This example binauralizes a HOA3 signal with a head-rotation trajectory. Head rotation is peformed in SHD. It is supported for HOA3 and META input formats. For META input format, the audioscene is first prerendered to HOA3 and then rotated and binauralized. - -``` -python -m pyaudio3dtools.audio3dtools -i hoa3_input.wav -o . -F BINAURAL -T .\trajectories\full_circle_in_15s -``` - -### 3.2. Generating binaural reference signals - -Currently MC input signals are supported. The reference processing can be activated by selecting BINAURAL[_ROOM]_REF as output format. The signals are generated by convolving the channels with the filters from the database that are closes to the current position of the virtual LS. All interpolation methods supported by numpy can be chosen between the measured points along the trajectory. - -``` -python -m pyaudio3dtools.audio3dtools -i cicp6_input.wav -o . -F BINAURAL_REF -T .\trajectories\full_circle_in_15s -``` - -### 3.3. Rendering ISM to Custom loudspeakers with auxiliary binaural output -ISM metadata can either be specified via an input text file in the Renderer Metadata definition format, or via the commandline using the same style as IVAS: -``` -python -m pyaudio3dtools.audio3dtools -i ism2.wav -f ISM2 -m ism1.csv NULL -F 7_1_4 -o . -b -T .\trajectories\full_circle_in_15s -``` diff --git a/scripts/batch_comp_audio.py b/scripts/batch_comp_audio.py index 72ae3fcc7d6a506aea3d94386f0a02e5b77e1af1..97e9f8f54840f22f71fddb44ebd0bddd8fa486ce 100755 --- a/scripts/batch_comp_audio.py +++ b/scripts/batch_comp_audio.py @@ -96,10 +96,9 @@ def main(args): if not args.diffs_only or diff > 0: if diff == 0.0: - label = "\033[00;32m[OKAY]\033[00;00m" + label = "[OKAY]" else: - label = "\033[00;31m[FAIL]\033[00;00m" - + label = "[FAIL]" result = f"{label} Max. diff (PCM) for file {f}: {diff}" if args.verbose and diff != 0.0: @@ -108,10 +107,10 @@ def main(args): print(result, file=out_file) - if num_files_diff > 0: - print(f"{num_files_diff} files differ/don't exist", file=out_file) - else: - print(f"All files are bitexact", file=out_file) + if num_files_diff > 0: + print(f"{num_files_diff} files differ/don't exist", file=out_file) + else: + print(f"All files are bitexact", file=out_file) def compare_files(f, fol1, fol2, outputs_dict): diff --git a/scripts/binauralRenderer_interface/CMakeLists.txt b/scripts/binauralRenderer_interface/CMakeLists.txt deleted file mode 100644 index 99d62c94172a328e0621e872bd097ef63e5929f4..0000000000000000000000000000000000000000 --- a/scripts/binauralRenderer_interface/CMakeLists.txt +++ /dev/null @@ -1,103 +0,0 @@ -cmake_minimum_required(VERSION 3.0) - -project(generate_crend_ivas_tables) - -set(EXTERNALS_PATH ${PROJECT_SOURCE_DIR}/Externals) -set(IVAS_TRUNK_PATH "${PROJECT_SOURCE_DIR}/../..") -set(IVAS_TRUNK_UTIL_PATH ${IVAS_TRUNK_PATH}/lib_util) -set(IVAS_TRUNK_DEC_PATH ${IVAS_TRUNK_PATH}/lib_dec) -set(IVAS_TRUNK_REND_PATH ${IVAS_TRUNK_PATH}/lib_rend) -set(IVAS_TRUNK_ENC_PATH ${IVAS_TRUNK_PATH}/lib_enc) -set(IVAS_TRUNK_COM_PATH ${IVAS_TRUNK_PATH}/lib_com) -set(IVAS_TRUNK_DEBUG_PATH ${IVAS_TRUNK_PATH}/lib_debug) - -if(WIN32) - find_path(ZLIB_DIR "zlib.h" ${EXTERNALS_PATH}/zlib/zlib-1.2.12) - - if(ZLIB_DIR) - else() - set(ZLIB_DIR ${EXTERNALS_PATH}/zlib) - find_package(Python3 REQUIRED) - - if(Python3_Interpreter_FOUND) - execute_process(COMMAND ${Python3_EXECUTABLE} resolve_build_dep.py - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} - RESULT_VARIABLE py_result OUTPUT_VARIABLE ZLIB_DIR) - set(ZLIB_DIR ${PROJECT_SOURCE_DIR} ${ZLIB_DIR}) - endif() - - message(STATUS " ZLIB_DIR: ${ZLIB_DIR}") - endif() -endif() - -if(WIN32) - add_subdirectory(${ZLIB_DIR}) - set(ZLIB_INCLUDE_DIRS ${ZLIB_DIR} ${PROJECT_BINARY_DIR}/Externals/zlib/zlib-1.2.12) - set(zlib zlibstatic) - target_include_directories(example PUBLIC ${ZLIB_INCLUDE_DIRS}) - target_include_directories(minigzip PUBLIC ${ZLIB_INCLUDE_DIRS}) -endif() - -if(UNIX) - find_package(ZLIB) - - if(ZLIB_FOUND) - message(${ZLIB_INCLUDE_DIRS}) - message(${ZLIB_LIBRARIES}) - set(zlib ${ZLIB_LIBRARIES}) - else() - message(FATAL_ERROR "Zlib not found") - endif() -endif() - -find_path(SOFA_READER_DIR "libmysofa.pc.cmake" ${EXTERNALS_PATH}/libmysofa) - -if(SOFA_READER_DIR) -else() - set(SOFA_READER_DIR ${EXTERNALS_PATH}/libmysofa) - set(GIT_URL https://github.com/hoene/libmysofa.git) - execute_process(COMMAND git clone ${GIT_URL} ${EXTERNALS_PATH}/libmysofa) -endif() - -include_directories(${SOFA_READER_DIR}/src ${ZLIB_INCLUDE_DIRS} ${IVAS_TRUNK_UTIL_PATH} ${IVAS_TRUNK_ENC_PATH} ${IVAS_TRUNK_DEC_PATH} ${IVAS_TRUNK_REND_PATH} ${IVAS_TRUNK_COM_PATH} ${IVAS_TRUNK_DEBUG_PATH}) - -option(BUILD_TESTS "Build test programs" OFF) -option(BUILD_SHARED_LIBS "Build shared library" OFF) -add_subdirectory(${SOFA_READER_DIR}) -set(SOURCE_FILES_C - ${PROJECT_SOURCE_DIR}/ivas_crend_binaural_filter_design.c - ${IVAS_TRUNK_COM_PATH}/basop32.c - ${IVAS_TRUNK_COM_PATH}/basop_mpy.c - ${IVAS_TRUNK_COM_PATH}/enh40.c - ${IVAS_TRUNK_COM_PATH}/fft.c - ${IVAS_TRUNK_COM_PATH}/fft_rel.c - ${IVAS_TRUNK_COM_PATH}/ifft_rel.c - ${IVAS_TRUNK_COM_PATH}/ivas_mdft_imdft.c - ${IVAS_TRUNK_COM_PATH}/rom_com.c - ${IVAS_TRUNK_COM_PATH}/ivas_rom_com.c - ${IVAS_TRUNK_COM_PATH}/tools.c - ${IVAS_TRUNK_COM_PATH}/tns_base.c -) - -set(SOURCE_FILES_H - ${PROJECT_SOURCE_DIR}/ivas_crend_binaural_filter_design.c - ${SOFA_READER_DIR}/src/hrtf/mysofa.h - ${IVAS_TRUNK_REND_PATH}/ivas_stat_rend.h - ${IVAS_TRUNK_DEC_PATH}/ivas_stat_dec.h - ${IVAS_TRUNK_DEC_PATH}/stat_dec.h - ${IVAS_TRUNK_COM_PATH}/options.h - ${IVAS_TRUNK_COM_PATH}/ivas_cnst.h - ${IVAS_TRUNK_COM_PATH}/cnst.h - ${IVAS_TRUNK_COM_PATH}/prot.h - ${IVAS_TRUNK_COM_PATH}/ivas_prot.h - ${IVAS_TRUNK_COM_PATH}/common_api_types.h -) - -add_library(${PROJECT_NAME}_lib STATIC ${SOURCE_FILES_C} ${SOURCE_FILES_H}) - -add_executable(${PROJECT_NAME} generate_crend_ivas_tables_from_sofa.c) -target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_lib mysofa-static ${zlib}) - -if(WIN32) - add_compile_definitions(_CRT_SECURE_NO_WARNINGS) -endif() diff --git a/scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_48000_dolby_SBA1.sofa b/scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_48000_dolby_SBA1.sofa new file mode 100644 index 0000000000000000000000000000000000000000..7c30b0de53d5f79843a060a72cb6254b313d1d44 --- /dev/null +++ b/scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_48000_dolby_SBA1.sofa @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be90326a0196b802502d2d93dcaacc2bcec15f6d79f1b8d4c7e69564f32e1132 +size 46952 diff --git a/scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_48000_dolby_SBA2.sofa b/scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_48000_dolby_SBA2.sofa new file mode 100644 index 0000000000000000000000000000000000000000..9d91f9a04dcb0004dfb1b8bb407d8281a09c48ad --- /dev/null +++ b/scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_48000_dolby_SBA2.sofa @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6acd3ec4d8e0d586dac663b53124a90be699244fa21107d553fca00af00fa373 +size 51905 diff --git a/scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_48000_dolby_SBA3.sofa b/scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_48000_dolby_SBA3.sofa new file mode 100644 index 0000000000000000000000000000000000000000..74e60618a02e695974dfdd09f1b85ab5dc1f18db --- /dev/null +++ b/scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_48000_dolby_SBA3.sofa @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:872b1d794d77f1987a38f20cc3cb5627aee67bfd01ed7a50ab3514e0accedea5 +size 58924 diff --git a/scripts/binauralRenderer_interface/Table_Format_Converter/CMakeLists.txt b/scripts/binauralRenderer_interface/Table_Format_Converter/CMakeLists.txt deleted file mode 100644 index 259e3b97b6abc67129aca82147929a3841848e2a..0000000000000000000000000000000000000000 --- a/scripts/binauralRenderer_interface/Table_Format_Converter/CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ -cmake_minimum_required(VERSION 3.6) - -project(tables_format_converter) - -if(WIN32) - # MSVC compiler flags - add_definitions( - -D_CRT_SECURE_NO_WARNINGS - ) - - # CMake sets /W3 by default, until CMake version 3.15. Instead of setting /W4 separately, replace in existing settings - string(REGEX REPLACE "/W3" "/W4" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") -endif() - -set(IVAS_PATH "${PROJECT_SOURCE_DIR}/../../..") -set(IVAS_UTIL_PATH ${IVAS_PATH}/lib_util) -set(IVAS_DEC_PATH ${IVAS_PATH}/lib_dec) -set(IVAS_ENC_PATH ${IVAS_PATH}/lib_enc) -set(IVAS_COM_PATH ${IVAS_PATH}/lib_com) -set(IVAS_REND_PATH ${IVAS_PATH}/lib_rend) -set(IVAS_DEBUG_PATH ${IVAS_PATH}/lib_debug) - -include_directories(${IVAS_UTIL_PATH} ${IVAS_ENC_PATH} ${IVAS_DEC_PATH} ${IVAS_COM_PATH} ${IVAS_REND_PATH} ${IVAS_DEBUG_PATH}) - -set(SOURCE_FILES_C - ${IVAS_REND_PATH}/ivas_rom_binauralRenderer.c - ${IVAS_REND_PATH}/ivas_rom_binaural_crend_head.c) - -set(SOURCE_FILES_H - ${IVAS_REND_PATH}/ivas_rom_binauralRenderer.h - ${IVAS_REND_PATH}/ivas_rom_binaural_crend_head.h) - -add_library(${PROJECT_NAME}_lib STATIC ${SOURCE_FILES_C} ${SOURCE_FILES_H}) - -add_executable(${PROJECT_NAME} generate_tables_from_rom_to_bin.c) -target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_lib) diff --git a/scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c b/scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c index 5f08aebc52c25ce746198902559839b38f2734b5..6d6df44a1225bb43013e4d2834f67c157926e079 100644 --- a/scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c +++ b/scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c @@ -66,8 +66,12 @@ #define DEFAULT_BIN_FILE_EXT ".bin" #define IVAS_NB_RENDERER_TYPE 7 -#define IVAS_NB_AUDIO_CONFIG 2 -#define IVAS_NB_SAMPLERATE 3 +#ifdef UPDATE_SBA_FILTER +#define IVAS_NB_AUDIO_CONFIG 4 +#else +#define IVAS_NB_AUDIO_CONFIG 2 +#endif +#define IVAS_NB_SAMPLERATE 3 const RENDERER_TYPE rend_types[IVAS_NB_RENDERER_TYPE] = { RENDERER_BINAURAL_FASTCONV, @@ -80,8 +84,15 @@ const RENDERER_TYPE rend_types[IVAS_NB_RENDERER_TYPE] = { }; const BINAURAL_INPUT_AUDIO_CONFIG input_cfgs[IVAS_NB_AUDIO_CONFIG] = { BINAURAL_INPUT_AUDIO_CONFIG_COMBINED, +#ifdef UPDATE_SBA_FILTER + BINAURAL_INPUT_AUDIO_CONFIG_HOA3, + BINAURAL_INPUT_AUDIO_CONFIG_HOA2, + BINAURAL_INPUT_AUDIO_CONFIG_FOA +#else BINAURAL_INPUT_AUDIO_CONFIG_HOA +#endif }; + const int32_t sample_rates[IVAS_NB_SAMPLERATE] = { 48000, 32000, 16000 }; /* Hz */ /* 8000 Hz not supported by mdft */ #ifdef FILE_HEADER @@ -346,7 +357,7 @@ int main( int argc, char *argv[] ) setOfHRTF[nbHRTF] = create_hrtf_tdrend( freq_ptr[k], &hrtf_size ); if ( hrtf_size == -1 ) { - fprintf( stderr, "Creation of HRTF (%d, %d, %d) failed!\n\n", rend_types[i], input_cfgs[j], freq_ptr[k] ); + fprintf( stderr, "Creation of HRTF (%d, %d) failed!\n\n", rend_types[i], freq_ptr[k] ); for ( l = 0; l < nbHRTF; l++ ) { free( setOfHRTF[l] ); @@ -957,7 +968,11 @@ char *create_hrtf_fastconv( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CONFIG cldfb_nchan_max = CLDFB_NO_CHANNELS_MAX; } } +#ifdef UPDATE_SBA_FILTER + else if ( input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA3 ) +#else else if ( input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA ) +#endif { if ( rend_type == RENDERER_BINAURAL_FASTCONV_ROOM ) { @@ -969,6 +984,32 @@ char *create_hrtf_fastconv( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CONFIG hrtf_channels = HRTF_SH_CHANNELS; num_taps = BINAURAL_NTAPS; } +#ifdef UPDATE_SBA_FILTER + else if ( input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA2 ) + { + if ( rend_type == RENDERER_BINAURAL_FASTCONV_ROOM ) + { + /* No HOA2 BRIRs */ + return NULL; + } + + latency_s = FASTCONV_HOA2_latency_s; + hrtf_channels = 9; + num_taps = BINAURAL_NTAPS; + } + else if ( input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_FOA ) + { + if ( rend_type == RENDERER_BINAURAL_FASTCONV_ROOM ) + { + /* No HOA2 BRIRs */ + return NULL; + } + + latency_s = FASTCONV_FOA_latency_s; + hrtf_channels = 4; + num_taps = BINAURAL_NTAPS; + } +#endif else { fprintf( stderr, "Unsupported renderer type in create_hrtf_fastconv()\n\n" ); @@ -1080,7 +1121,11 @@ char *create_hrtf_fastconv( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CONFIG } } // HRIR_HOA3 +#ifdef UPDATE_SBA_FILTER + else if ( rend_type == RENDERER_BINAURAL_FASTCONV && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA3 ) +#else else if ( rend_type == RENDERER_BINAURAL_FASTCONV && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA ) +#endif { memcpy( hrtf_wptr, &( latency_s ), sizeof( float ) ); // latency_s => float hrtf_wptr += sizeof( float ); @@ -1125,6 +1170,99 @@ char *create_hrtf_fastconv( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CONFIG } } } +#ifdef UPDATE_SBA_FILTER + else if ( rend_type == RENDERER_BINAURAL_FASTCONV && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA2 ) + { + memcpy( hrtf_wptr, &( latency_s ), sizeof( float ) ); // latency_s => float + hrtf_wptr += sizeof( float ); + + memcpy( hrtf_wptr, &( hrtf_channels ), sizeof( uint16_t ) ); // hrtf_channels => uint16_t + hrtf_wptr += sizeof( uint16_t ); + + memcpy( hrtf_wptr, &( num_taps ), sizeof( uint16_t ) ); // num_taps => uint16_t + hrtf_wptr += sizeof( uint16_t ); + + data_size_tmp = num_taps * sizeof( float ); + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < hrtf_channels; j++ ) + { + memcpy( hrtf_wptr, &leftHRIRReal_HOA2[i][j], data_size_tmp ); + hrtf_wptr += data_size_tmp; + } + } + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < hrtf_channels; j++ ) + { + memcpy( hrtf_wptr, &leftHRIRImag_HOA2[i][j], data_size_tmp ); + hrtf_wptr += data_size_tmp; + } + } + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < hrtf_channels; j++ ) + { + memcpy( hrtf_wptr, &rightHRIRReal_HOA2[i][j], data_size_tmp ); + hrtf_wptr += data_size_tmp; + } + } + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < hrtf_channels; j++ ) + { + memcpy( hrtf_wptr, &rightHRIRImag_HOA2[i][j], data_size_tmp ); + hrtf_wptr += data_size_tmp; + } + } + } + // FOA + else if ( rend_type == RENDERER_BINAURAL_FASTCONV && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_FOA ) + { + memcpy( hrtf_wptr, &( latency_s ), sizeof( float ) ); // latency_s => float + hrtf_wptr += sizeof( float ); + + memcpy( hrtf_wptr, &( hrtf_channels ), sizeof( uint16_t ) ); // hrtf_channels => uint16_t + hrtf_wptr += sizeof( uint16_t ); + + memcpy( hrtf_wptr, &( num_taps ), sizeof( uint16_t ) ); // num_taps => uint16_t + hrtf_wptr += sizeof( uint16_t ); + + data_size_tmp = num_taps * sizeof( float ); + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < hrtf_channels; j++ ) + { + memcpy( hrtf_wptr, &leftHRIRReal_FOA[i][j], data_size_tmp ); + hrtf_wptr += data_size_tmp; + } + } + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < hrtf_channels; j++ ) + { + memcpy( hrtf_wptr, &leftHRIRImag_FOA[i][j], data_size_tmp ); + hrtf_wptr += data_size_tmp; + } + } + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < hrtf_channels; j++ ) + { + memcpy( hrtf_wptr, &rightHRIRReal_FOA[i][j], data_size_tmp ); + hrtf_wptr += data_size_tmp; + } + } + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < hrtf_channels; j++ ) + { + memcpy( hrtf_wptr, &rightHRIRImag_FOA[i][j], data_size_tmp ); + hrtf_wptr += data_size_tmp; + } + } + } +#endif // BRIR else if ( rend_type == RENDERER_BINAURAL_FASTCONV_ROOM && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED ) { @@ -1329,7 +1467,7 @@ int16_t get_crend_hrtf_tables( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CON { if ( frequency == 48000 ) { - hrtf_table_ptrs_out.latency_s = &CRendBin_Combined_HRIR_latency_s; + hrtf_table_ptrs_out.latency_s = (float *) &CRendBin_Combined_HRIR_latency_s; hrtf_table_ptrs_out.num_iterations = (uint16_t *) ( &CRendBin_Combined_HRIR_num_iterations_48kHz ); hrtf_table_ptrs_out.pIndex_frequency_max = (uint16_t *) ( &CRendBin_Combined_HRIR_pIndex_frequency_max_48kHz ); hrtf_table_ptrs_out.num_iterations_diffuse = (uint16_t *) ( &CRendBin_Combined_HRIR_num_iterations_diffuse_48kHz ); @@ -1347,7 +1485,7 @@ int16_t get_crend_hrtf_tables( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CON } else if ( frequency == 32000 ) { - hrtf_table_ptrs_out.latency_s = &CRendBin_Combined_HRIR_latency_s; + hrtf_table_ptrs_out.latency_s = (float *) &CRendBin_Combined_HRIR_latency_s; hrtf_table_ptrs_out.num_iterations = (uint16_t *) ( &CRendBin_Combined_HRIR_num_iterations_32kHz ); hrtf_table_ptrs_out.pIndex_frequency_max = (uint16_t *) ( &CRendBin_Combined_HRIR_pIndex_frequency_max_32kHz ); hrtf_table_ptrs_out.num_iterations_diffuse = (uint16_t *) ( &CRendBin_Combined_HRIR_num_iterations_diffuse_32kHz ); @@ -1365,7 +1503,7 @@ int16_t get_crend_hrtf_tables( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CON } else if ( frequency == 16000 ) { - hrtf_table_ptrs_out.latency_s = &CRendBin_Combined_HRIR_latency_s; + hrtf_table_ptrs_out.latency_s = (float *) &CRendBin_Combined_HRIR_latency_s; hrtf_table_ptrs_out.num_iterations = (uint16_t *) ( &CRendBin_Combined_HRIR_num_iterations_16kHz ); hrtf_table_ptrs_out.pIndex_frequency_max = (uint16_t *) ( &CRendBin_Combined_HRIR_pIndex_frequency_max_16kHz ); hrtf_table_ptrs_out.num_iterations_diffuse = (uint16_t *) ( &CRendBin_Combined_HRIR_num_iterations_diffuse_16kHz ); @@ -1389,11 +1527,15 @@ int16_t get_crend_hrtf_tables( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CON hrtf_table_dims_out.max_num_iterations_diffuse = 0; hrtf_table_dims_out.max_total_num_fsamp_per_iteration_diff = 0;*/ } +#ifdef UPDATE_SBA_FILTER + else if ( input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA3 ) +#else else if ( input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA ) +#endif { if ( frequency == 48000 ) { - hrtf_table_ptrs_out.latency_s = &CRendBin_HOA3_HRIR_latency_s; + hrtf_table_ptrs_out.latency_s = (float *) &CRendBin_HOA3_HRIR_latency_s; hrtf_table_ptrs_out.num_iterations = (uint16_t *) ( &CRendBin_HOA3_HRIR_num_iterations_48kHz ); hrtf_table_ptrs_out.pIndex_frequency_max = (uint16_t *) ( &CRendBin_HOA3_HRIR_pIndex_frequency_max_48kHz ); hrtf_table_ptrs_out.num_iterations_diffuse = (uint16_t *) ( &CRendBin_HOA3_HRIR_num_iterations_diffuse_48kHz ); @@ -1407,11 +1549,12 @@ int16_t get_crend_hrtf_tables( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CON hrtf_table_dims_out.max_num_iterations = CRendBin_HOA3_HRIR_max_num_iterations_48kHz; + result = 0; } else if ( frequency == 32000 ) { - hrtf_table_ptrs_out.latency_s = &CRendBin_HOA3_HRIR_latency_s; + hrtf_table_ptrs_out.latency_s = (float *) &CRendBin_HOA3_HRIR_latency_s; hrtf_table_ptrs_out.num_iterations = (uint16_t *) ( &CRendBin_HOA3_HRIR_num_iterations_32kHz ); hrtf_table_ptrs_out.pIndex_frequency_max = (uint16_t *) ( &CRendBin_HOA3_HRIR_pIndex_frequency_max_32kHz ); hrtf_table_ptrs_out.num_iterations_diffuse = (uint16_t *) ( &CRendBin_HOA3_HRIR_num_iterations_diffuse_32kHz ); @@ -1429,7 +1572,7 @@ int16_t get_crend_hrtf_tables( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CON } else if ( frequency == 16000 ) { - hrtf_table_ptrs_out.latency_s = &CRendBin_HOA3_HRIR_latency_s; + hrtf_table_ptrs_out.latency_s = (float *) &CRendBin_HOA3_HRIR_latency_s; hrtf_table_ptrs_out.num_iterations = (uint16_t *) ( &CRendBin_HOA3_HRIR_num_iterations_16kHz ); hrtf_table_ptrs_out.pIndex_frequency_max = (uint16_t *) ( &CRendBin_HOA3_HRIR_pIndex_frequency_max_16kHz ); hrtf_table_ptrs_out.num_iterations_diffuse = (uint16_t *) ( &CRendBin_HOA3_HRIR_num_iterations_diffuse_16kHz ); @@ -1453,6 +1596,118 @@ int16_t get_crend_hrtf_tables( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CON hrtf_table_dims_out.max_num_iterations_diffuse = 0; hrtf_table_dims_out.max_total_num_fsamp_per_iteration_diff = 0;*/ } +#ifdef UPDATE_SBA_FILTER + else if ( input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA2 ) + { + if ( frequency == 48000 ) + { + hrtf_table_ptrs_out.latency_s = (float *) &CRendBin_HOA2_HRIR_latency_s; + hrtf_table_ptrs_out.num_iterations = (uint16_t *) ( &CRendBin_HOA2_HRIR_num_iterations_48kHz ); + hrtf_table_ptrs_out.pIndex_frequency_max = (uint16_t *) ( &CRendBin_HOA2_HRIR_pIndex_frequency_max_48kHz ); + hrtf_table_ptrs_out.num_iterations_diffuse = (uint16_t *) ( &CRendBin_HOA2_HRIR_num_iterations_diffuse_48kHz ); + hrtf_table_ptrs_out.pIndex_frequency_max_diffuse = (uint16_t *) ( &CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_48kHz ); + hrtf_table_ptrs_out.index_frequency_max_diffuse = (uint16_t *) ( &CRendBin_HOA2_HRIR_index_frequency_max_diffuse_48kHz ); + hrtf_table_ptrs_out.inv_diffuse_weight = (float *) ( &CRendBin_HOA2_HRIR_inv_diffuse_weight_48kHz ); + hrtf_table_ptrs_out.coeff_re = (float *) ( &CRendBin_HOA2_HRIR_coeff_re_48kHz ); + hrtf_table_ptrs_out.coeff_im = (float *) ( &CRendBin_HOA2_HRIR_coeff_im_48kHz ); + hrtf_table_ptrs_out.coeff_diffuse_re = (float *) ( &CRendBin_HOA2_HRIR_coeff_diffuse_re_48kHz ); + hrtf_table_ptrs_out.coeff_diffuse_im = (float *) ( &CRendBin_HOA2_HRIR_coeff_diffuse_im_48kHz ); + + hrtf_table_dims_out.max_num_iterations = CRendBin_HOA2_HRIR_max_num_iterations_48kHz; + result = 0; + } + else if ( frequency == 32000 ) + { + hrtf_table_ptrs_out.latency_s = (float *) &CRendBin_HOA2_HRIR_latency_s; + hrtf_table_ptrs_out.num_iterations = (uint16_t *) ( &CRendBin_HOA2_HRIR_num_iterations_32kHz ); + hrtf_table_ptrs_out.pIndex_frequency_max = (uint16_t *) ( &CRendBin_HOA2_HRIR_pIndex_frequency_max_32kHz ); + hrtf_table_ptrs_out.num_iterations_diffuse = (uint16_t *) ( &CRendBin_HOA2_HRIR_num_iterations_diffuse_32kHz ); + hrtf_table_ptrs_out.pIndex_frequency_max_diffuse = (uint16_t *) ( &CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_32kHz ); + hrtf_table_ptrs_out.index_frequency_max_diffuse = (uint16_t *) ( &CRendBin_HOA2_HRIR_index_frequency_max_diffuse_32kHz ); + hrtf_table_ptrs_out.inv_diffuse_weight = (float *) ( &CRendBin_HOA2_HRIR_inv_diffuse_weight_32kHz ); + hrtf_table_ptrs_out.coeff_re = (float *) ( &CRendBin_HOA2_HRIR_coeff_re_32kHz ); + hrtf_table_ptrs_out.coeff_im = (float *) ( &CRendBin_HOA2_HRIR_coeff_im_32kHz ); + hrtf_table_ptrs_out.coeff_diffuse_re = (float *) ( &CRendBin_HOA2_HRIR_coeff_diffuse_re_32kHz ); + hrtf_table_ptrs_out.coeff_diffuse_im = (float *) ( &CRendBin_HOA2_HRIR_coeff_diffuse_im_32kHz ); + + hrtf_table_dims_out.max_num_iterations = CRendBin_HOA2_HRIR_max_num_iterations_32kHz; + result = 0; + } + else if ( frequency == 16000 ) + { + hrtf_table_ptrs_out.latency_s = (float *) &CRendBin_HOA2_HRIR_latency_s; + hrtf_table_ptrs_out.num_iterations = (uint16_t *) ( &CRendBin_HOA2_HRIR_num_iterations_16kHz ); + hrtf_table_ptrs_out.pIndex_frequency_max = (uint16_t *) ( &CRendBin_HOA2_HRIR_pIndex_frequency_max_16kHz ); + hrtf_table_ptrs_out.num_iterations_diffuse = (uint16_t *) ( &CRendBin_HOA2_HRIR_num_iterations_diffuse_16kHz ); + hrtf_table_ptrs_out.pIndex_frequency_max_diffuse = (uint16_t *) ( &CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_16kHz ); + hrtf_table_ptrs_out.index_frequency_max_diffuse = (uint16_t *) ( &CRendBin_HOA2_HRIR_index_frequency_max_diffuse_16kHz ); + hrtf_table_ptrs_out.inv_diffuse_weight = (float *) ( &CRendBin_HOA2_HRIR_inv_diffuse_weight_16kHz ); + hrtf_table_ptrs_out.coeff_re = (float *) ( &CRendBin_HOA2_HRIR_coeff_re_16kHz ); + hrtf_table_ptrs_out.coeff_im = (float *) ( &CRendBin_HOA2_HRIR_coeff_im_16kHz ); + hrtf_table_ptrs_out.coeff_diffuse_re = (float *) ( &CRendBin_HOA2_HRIR_coeff_diffuse_re_16kHz ); + hrtf_table_ptrs_out.coeff_diffuse_im = (float *) ( &CRendBin_HOA2_HRIR_coeff_diffuse_im_16kHz ); + + hrtf_table_dims_out.max_num_iterations = CRendBin_HOA2_HRIR_max_num_iterations_16kHz; + result = 0; + } + hrtf_table_dims_out.max_num_ir = 9; + } + else if ( input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_FOA ) + { + if ( frequency == 48000 ) + { + hrtf_table_ptrs_out.latency_s = (float *) &CRendBin_FOA_HRIR_latency_s; + hrtf_table_ptrs_out.num_iterations = (uint16_t *) ( &CRendBin_FOA_HRIR_num_iterations_48kHz ); + hrtf_table_ptrs_out.pIndex_frequency_max = (uint16_t *) ( &CRendBin_FOA_HRIR_pIndex_frequency_max_48kHz ); + hrtf_table_ptrs_out.num_iterations_diffuse = (uint16_t *) ( &CRendBin_FOA_HRIR_num_iterations_diffuse_48kHz ); + hrtf_table_ptrs_out.pIndex_frequency_max_diffuse = (uint16_t *) ( &CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_48kHz ); + hrtf_table_ptrs_out.index_frequency_max_diffuse = (uint16_t *) ( &CRendBin_FOA_HRIR_index_frequency_max_diffuse_48kHz ); + hrtf_table_ptrs_out.inv_diffuse_weight = (float *) ( &CRendBin_FOA_HRIR_inv_diffuse_weight_48kHz ); + hrtf_table_ptrs_out.coeff_re = (float *) ( &CRendBin_FOA_HRIR_coeff_re_48kHz ); + hrtf_table_ptrs_out.coeff_im = (float *) ( &CRendBin_FOA_HRIR_coeff_im_48kHz ); + hrtf_table_ptrs_out.coeff_diffuse_re = (float *) ( &CRendBin_FOA_HRIR_coeff_diffuse_re_48kHz ); + hrtf_table_ptrs_out.coeff_diffuse_im = (float *) ( &CRendBin_FOA_HRIR_coeff_diffuse_im_48kHz ); + + hrtf_table_dims_out.max_num_iterations = CRendBin_FOA_HRIR_max_num_iterations_48kHz; + result = 0; + } + else if ( frequency == 32000 ) + { + hrtf_table_ptrs_out.latency_s = (float *) &CRendBin_FOA_HRIR_latency_s; + hrtf_table_ptrs_out.num_iterations = (uint16_t *) ( &CRendBin_FOA_HRIR_num_iterations_32kHz ); + hrtf_table_ptrs_out.pIndex_frequency_max = (uint16_t *) ( &CRendBin_FOA_HRIR_pIndex_frequency_max_32kHz ); + hrtf_table_ptrs_out.num_iterations_diffuse = (uint16_t *) ( &CRendBin_FOA_HRIR_num_iterations_diffuse_32kHz ); + hrtf_table_ptrs_out.pIndex_frequency_max_diffuse = (uint16_t *) ( &CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_32kHz ); + hrtf_table_ptrs_out.index_frequency_max_diffuse = (uint16_t *) ( &CRendBin_FOA_HRIR_index_frequency_max_diffuse_32kHz ); + hrtf_table_ptrs_out.inv_diffuse_weight = (float *) ( &CRendBin_FOA_HRIR_inv_diffuse_weight_32kHz ); + hrtf_table_ptrs_out.coeff_re = (float *) ( &CRendBin_FOA_HRIR_coeff_re_32kHz ); + hrtf_table_ptrs_out.coeff_im = (float *) ( &CRendBin_FOA_HRIR_coeff_im_32kHz ); + hrtf_table_ptrs_out.coeff_diffuse_re = (float *) ( &CRendBin_FOA_HRIR_coeff_diffuse_re_32kHz ); + hrtf_table_ptrs_out.coeff_diffuse_im = (float *) ( &CRendBin_FOA_HRIR_coeff_diffuse_im_32kHz ); + + hrtf_table_dims_out.max_num_iterations = CRendBin_FOA_HRIR_max_num_iterations_32kHz; + result = 0; + } + else if ( frequency == 16000 ) + { + hrtf_table_ptrs_out.latency_s = (float *) &CRendBin_FOA_HRIR_latency_s; + hrtf_table_ptrs_out.num_iterations = (uint16_t *) ( &CRendBin_FOA_HRIR_num_iterations_16kHz ); + hrtf_table_ptrs_out.pIndex_frequency_max = (uint16_t *) ( &CRendBin_FOA_HRIR_pIndex_frequency_max_16kHz ); + hrtf_table_ptrs_out.num_iterations_diffuse = (uint16_t *) ( &CRendBin_FOA_HRIR_num_iterations_diffuse_16kHz ); + hrtf_table_ptrs_out.pIndex_frequency_max_diffuse = (uint16_t *) ( &CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_16kHz ); + hrtf_table_ptrs_out.index_frequency_max_diffuse = (uint16_t *) ( &CRendBin_FOA_HRIR_index_frequency_max_diffuse_16kHz ); + hrtf_table_ptrs_out.inv_diffuse_weight = (float *) ( &CRendBin_FOA_HRIR_inv_diffuse_weight_16kHz ); + hrtf_table_ptrs_out.coeff_re = (float *) ( &CRendBin_FOA_HRIR_coeff_re_16kHz ); + hrtf_table_ptrs_out.coeff_im = (float *) ( &CRendBin_FOA_HRIR_coeff_im_16kHz ); + hrtf_table_ptrs_out.coeff_diffuse_re = (float *) ( &CRendBin_FOA_HRIR_coeff_diffuse_re_16kHz ); + hrtf_table_ptrs_out.coeff_diffuse_im = (float *) ( &CRendBin_FOA_HRIR_coeff_diffuse_im_16kHz ); + + hrtf_table_dims_out.max_num_iterations = CRendBin_FOA_HRIR_max_num_iterations_16kHz; + result = 0; + } + hrtf_table_dims_out.max_num_ir = 4; + } +#endif } else if ( rend_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) { @@ -1460,7 +1715,7 @@ int16_t get_crend_hrtf_tables( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CON { if ( frequency == 48000 ) { - hrtf_table_ptrs_out.latency_s = &CRendBin_Combined_BRIR_latency_s; + hrtf_table_ptrs_out.latency_s = (float *) &CRendBin_Combined_BRIR_latency_s; hrtf_table_ptrs_out.num_iterations = (uint16_t *) ( &CRendBin_Combined_BRIR_num_iterations_48kHz ); hrtf_table_ptrs_out.pIndex_frequency_max = (uint16_t *) ( &CRendBin_Combined_BRIR_pIndex_frequency_max_48kHz ); hrtf_table_ptrs_out.num_iterations_diffuse = (uint16_t *) ( &CRendBin_Combined_BRIR_num_iterations_diffuse_48kHz ); @@ -1478,7 +1733,7 @@ int16_t get_crend_hrtf_tables( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CON } else if ( frequency == 32000 ) { - hrtf_table_ptrs_out.latency_s = &CRendBin_Combined_BRIR_latency_s; + hrtf_table_ptrs_out.latency_s = (float *) &CRendBin_Combined_BRIR_latency_s; hrtf_table_ptrs_out.num_iterations = (uint16_t *) ( &CRendBin_Combined_BRIR_num_iterations_32kHz ); hrtf_table_ptrs_out.pIndex_frequency_max = (uint16_t *) ( &CRendBin_Combined_BRIR_pIndex_frequency_max_32kHz ); hrtf_table_ptrs_out.num_iterations_diffuse = (uint16_t *) ( &CRendBin_Combined_BRIR_num_iterations_diffuse_32kHz ); @@ -1496,7 +1751,7 @@ int16_t get_crend_hrtf_tables( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CON } else if ( frequency == 16000 ) { - hrtf_table_ptrs_out.latency_s = &CRendBin_Combined_BRIR_latency_s; + hrtf_table_ptrs_out.latency_s = (float *) &CRendBin_Combined_BRIR_latency_s; hrtf_table_ptrs_out.num_iterations = (uint16_t *) ( &CRendBin_Combined_BRIR_num_iterations_16kHz ); hrtf_table_ptrs_out.pIndex_frequency_max = (uint16_t *) ( &CRendBin_Combined_BRIR_pIndex_frequency_max_16kHz ); hrtf_table_ptrs_out.num_iterations_diffuse = (uint16_t *) ( &CRendBin_Combined_BRIR_num_iterations_diffuse_16kHz ); @@ -1520,7 +1775,11 @@ int16_t get_crend_hrtf_tables( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CON hrtf_table_dims_out.max_num_iterations_diffuse = 0; hrtf_table_dims_out.max_total_num_fsamp_per_iteration_diff = 0;*/ } +#ifdef UPDATE_SBA_FILTER + else if ( ( input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA3 ) || ( input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA2 ) || ( input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_FOA ) ) +#else else if ( input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA ) +#endif { result = 0; } @@ -1596,6 +1855,7 @@ int16_t get_crend_hrtf_tables( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CON } } + // Copy the results if ( ( result == 0 ) && ( hrtf_table_ptrs != NULL ) ) { diff --git a/scripts/binauralRenderer_interface/Table_Format_Converter/table_format_converter_readme.txt b/scripts/binauralRenderer_interface/Table_Format_Converter/tables_format_converter_readme.txt similarity index 95% rename from scripts/binauralRenderer_interface/Table_Format_Converter/table_format_converter_readme.txt rename to scripts/binauralRenderer_interface/Table_Format_Converter/tables_format_converter_readme.txt index dda6738a9ae8ea0be8f875ef85b36fa0489b916b..8648ecb2e68fdcfc48d5da1b11e472af7a688e9d 100644 --- a/scripts/binauralRenderer_interface/Table_Format_Converter/table_format_converter_readme.txt +++ b/scripts/binauralRenderer_interface/Table_Format_Converter/tables_format_converter_readme.txt @@ -57,4 +57,4 @@ Options : -input_td_file_name : Name of input td file (without extension .bin, default = 'hrfilter_model'). For example : -table_format_converter(.exe) -output_file_path './' -48 -input_td_file_path './../../../td_object_renderer/hrtf_data/Orange_53/' -input_td_file_name 'hrfilter_model_v002' \ No newline at end of file +tables_format_converter(.exe) -output_file_path './' -48 -input_td_file_path './../../../td_object_renderer/hrtf_data/Orange_53/' -input_td_file_name 'hrfilter_model_v002' \ No newline at end of file diff --git a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin index b9a35aa26bc7f15ba44e953fa83c2d8187b657bb..980668c27e1882fb0c132062a37fcd29ca8e91ed 100644 --- a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin +++ b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81d8c14bf10697a0353c15986fde3432df1b6909ea2d122ce3599b3655237d71 -size 2074176 +oid sha256:07d2de62c345650f19a404001c5502e64f72277e6c689064e204a7031779bc0e +size 2072948 diff --git a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin index 992a1c61fa8ed95135a85384bed269b083e76259..9659006ef602a63827eb5e19fdc2490d6670ff9d 100644 --- a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin +++ b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16b993a0af01bf8b8289e554452e6d2c98e7b977bf2a40f0afd3ca7498d39f8b -size 2578388 +oid sha256:d2c8461458ca23f86f592acf102edfec4eb80bbb935bb324e04ab1c535d0dd94 +size 2573320 diff --git a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin index eaf5d445febfbea1a8684f56179927b5aaad710b..d2dee97c348e2f3a82f307b0d10b77bacc8a267f 100644 --- a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin +++ b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a29e9692bd5be5e93358db63159f55851d12f66c0382ff14afb642090427685 -size 2860964 +oid sha256:80043c85556218c5444c87aa2a86498ab4158fc40c6f4c3190caa182af1553e5 +size 2852056 diff --git a/scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c b/scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c index 5c2f0a457f62b6905fdc9f28b6617619f2e415b9..1a84c0227d9e7eb694d8376fd641797ba19489b5 100644 --- a/scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c +++ b/scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c @@ -63,7 +63,7 @@ #define FORMAT_FLOAT "%8.6f" #define NUM_SAMPLES_PER_LINES 96 #define DECLARATION_NAME "CRendBin" -#define TAB_WITH_SPACE_OR_NOT " " /* "\t" */ +#define TAB_WITH_SPACE_OR_NOT " " /* "\t" */ int32_t sample_rates[3] = { DEFAULT_SAMPLERATE, 32000, 16000 }; /* Hz */ /* 8000 Hz not supported by mdft */ @@ -193,6 +193,7 @@ int main( int argc, char *argv[] ) bool no_optim = false; int sym_hrir = -1; int notEndingWithSeparator = 0; + char *sofa_name = NULL; int i = 1; /* Optional arguments */ @@ -241,112 +242,26 @@ int main( int argc, char *argv[] ) else if ( strcmp( to_upper( argv[i] ), "-RIGHT" ) == 0 ) { sym_hrir = 1; - i++; - } - else - { - fprintf( stderr, "Unknown option: %s\n\n", argv[i] ); - usage_gen_crend_tables(); - return -1; - } - } - -#ifndef USE_SYMETRIC_HRIR_FILTERS - sym_hrir = -1; -#endif - - if ( ( strlen( argv[i] ) != 1 ) && ( strlen( argv[i] ) != 2 ) ) - { - fprintf( stderr, "Unknown option: %s need to specify frame length in ms\n\n", argv[i] ); - usage_gen_crend_tables(); - if ( lib_rend_path ) - free( lib_rend_path ); -#ifdef MIXER_CONV_BINARY_FILE_311 - if ( binary_path ) - free( binary_path ); -#endif // MIXER_CONV_BINARY_FILE_311 - return -1; - } - frame_len_ms = atoi( argv[i] ); - i++; - - if ( ( frame_len_ms != 5 ) && ( frame_len_ms != 20 ) ) - { - fprintf( stderr, "Unknown option: %s need to specify frame length in ms 5 or 20\n\n", argv[i] ); - usage_gen_crend_tables(); - if ( lib_rend_path ) - free( lib_rend_path ); -#ifdef MIXER_CONV_BINARY_FILE_311 - if ( binary_path ) - free( binary_path ); -#endif // MIXER_CONV_BINARY_FILE_311 - return -1; - } - - rom_file_name = (char *) malloc( sizeof( char ) * strlen( ROM_FILE_NAME ) + 1 ); - if ( rom_file_name ) - { - strncpy( rom_file_name, ROM_FILE_NAME, strlen( ROM_FILE_NAME ) ); - rom_file_name[strlen( ROM_FILE_NAME )] = '\0'; - } - else - { - fprintf( stderr, "Memory issue for rom file temporary name\n\n" ); - usage_gen_crend_tables(); - if ( lib_rend_path ) - free( lib_rend_path ); -#ifdef MIXER_CONV_BINARY_FILE_311 - if ( binary_path ) - free( binary_path ); -#endif // MIXER_CONV_BINARY_FILE_311 - return -1; - } - -#ifdef MIXER_CONV_BINARY_FILE_311 - binary_file_name = (char *) malloc( sizeof( char ) * strlen( BINARY_FILE_NAME ) + 1 ); - if ( binary_file_name ) - { - strncpy( binary_file_name, BINARY_FILE_NAME, strlen( BINARY_FILE_NAME ) ); - binary_file_name[strlen( BINARY_FILE_NAME )] = '\0'; - } - else - { - fprintf( stderr, "Memory issue for binary file temporary name\n\n" ); - usage_gen_crend_tables(); - if ( lib_rend_path ) - free( lib_rend_path ); - if ( binary_path ) - free( binary_path ); - - return -1; - } -#endif // MIXER_CONV_BINARY_FILE_311 - - if ( lib_rend_path ) - { - c_file_path = (char *) malloc( sizeof( char ) * ( strlen( lib_rend_path ) + strlen( ROM_FILE_NAME ) + 2 + 1 + notEndingWithSeparator ) ); - if ( c_file_path ) - { - if ( notEndingWithSeparator ) + else if ( strcmp( to_upper( argv[i] ), "-ADD_DEFINE" ) == 0 ) { -#ifdef WIN32 - sprintf( c_file_path, "%s\\%s.c", lib_rend_path, ROM_FILE_NAME ); -#else - sprintf( c_file_path, "%s/%s.c", lib_rend_path, ROM_FILE_NAME ); -#endif + add_define = true; + i++; } else { -#ifdef WIN32 - sprintf( c_file_path, "%s%s.c", lib_rend_path, ROM_FILE_NAME ); -#else - sprintf( c_file_path, "%s%s.c", lib_rend_path, ROM_FILE_NAME ); -#endif + fprintf( stderr, "Unknown option: %s\n\n", argv[i] ); + usage_gen_crend_tables(); + return -1; } } - else + +#ifndef USE_SYMETRIC_HRIR_FILTERS + sym_hrir = -1; +#endif + + if ( ( strlen( argv[i] ) != 1 ) && ( strlen( argv[i] ) != 2 ) ) { - fprintf( stderr, "Memory issue for c file path\n\n" ); + fprintf( stderr, "Unknown option: %s need to specify frame length in ms\n\n", argv[i] ); usage_gen_crend_tables(); if ( lib_rend_path ) free( lib_rend_path ); @@ -356,13 +271,13 @@ int main( int argc, char *argv[] ) #endif // MIXER_CONV_BINARY_FILE_311 return -1; } - fp = fopen( c_file_path, "w" ); - if ( fp == NULL ) + frame_len_ms = atoi( argv[i] ); + i++; + + if ( ( frame_len_ms != 5 ) && ( frame_len_ms != 20 ) ) { - fprintf( stderr, "Wrong lib_rend path: %s\n\n", lib_rend_path ); + fprintf( stderr, "Unknown option: %s need to specify frame length in ms 5 or 20\n\n", argv[i] ); usage_gen_crend_tables(); - if ( c_file_path ) - free( c_file_path ); if ( lib_rend_path ) free( lib_rend_path ); #ifdef MIXER_CONV_BINARY_FILE_311 @@ -371,34 +286,17 @@ int main( int argc, char *argv[] ) #endif // MIXER_CONV_BINARY_FILE_311 return -1; } - fclose( fp ); - h_file_path = (char *) malloc( sizeof( char ) * ( strlen( lib_rend_path ) + strlen( ROM_FILE_NAME ) + 2 + 1 + notEndingWithSeparator ) ); - if ( h_file_path ) + rom_file_name = (char *) malloc( sizeof( char ) * strlen( ROM_FILE_NAME ) + 1 ); + if ( rom_file_name ) { - if ( notEndingWithSeparator ) - { -#ifdef WIN32 - sprintf( h_file_path, "%s\\%s.h", lib_rend_path, ROM_FILE_NAME ); -#else - sprintf( h_file_path, "%s/%s.h", lib_rend_path, ROM_FILE_NAME ); -#endif - } - else - { -#ifdef WIN32 - sprintf( h_file_path, "%s\\%s.h", lib_rend_path, ROM_FILE_NAME ); -#else - sprintf( h_file_path, "%s/%s.h", lib_rend_path, ROM_FILE_NAME ); -#endif - } + strncpy( rom_file_name, ROM_FILE_NAME, strlen( ROM_FILE_NAME ) ); + rom_file_name[strlen( ROM_FILE_NAME )] = '\0'; } else { - fprintf( stderr, "Memory issue: for header file path\n\n" ); + fprintf( stderr, "Memory issue for rom file temporary name\n\n" ); usage_gen_crend_tables(); - if ( c_file_path ) - free( c_file_path ); if ( lib_rend_path ) free( lib_rend_path ); #ifdef MIXER_CONV_BINARY_FILE_311 @@ -407,301 +305,453 @@ int main( int argc, char *argv[] ) #endif // MIXER_CONV_BINARY_FILE_311 return -1; } - fp = fopen( h_file_path, "w" ); - if ( fp == NULL ) + +#ifdef MIXER_CONV_BINARY_FILE_311 + binary_file_name = (char *) malloc( sizeof( char ) * strlen( BINARY_FILE_NAME ) + 1 ); + if ( binary_file_name ) + { + strncpy( binary_file_name, BINARY_FILE_NAME, strlen( BINARY_FILE_NAME ) ); + binary_file_name[strlen( BINARY_FILE_NAME )] = '\0'; + } + else { - fprintf( stderr, "Wrong lib_rend path: %s\n\n", lib_rend_path ); + fprintf( stderr, "Memory issue for binary file temporary name\n\n" ); usage_gen_crend_tables(); - if ( h_file_path ) - free( h_file_path ); - if ( c_file_path ) - free( c_file_path ); if ( lib_rend_path ) free( lib_rend_path ); -#ifdef MIXER_CONV_BINARY_FILE_311 if ( binary_path ) free( binary_path ); -#endif // MIXER_CONV_BINARY_FILE_311 + return -1; } - fclose( fp ); - } - -#ifdef MIXER_CONV_BINARY_FILE_311 +#endif // MIXER_CONV_BINARY_FILE_311 - if ( binary_path ) - { - binary_file_path = (char *) malloc( sizeof( char ) * ( strlen( binary_path ) + strlen( BINARY_FILE_NAME ) + 2 + 1 + notEndingWithSeparator ) ); - if ( binary_file_path ) + if ( lib_rend_path ) { - if ( notEndingWithSeparator ) + c_file_path = (char *) malloc( sizeof( char ) * ( strlen( lib_rend_path ) + strlen( ROM_FILE_NAME ) + 2 + 1 + notEndingWithSeparator ) ); + if ( c_file_path ) { + if ( notEndingWithSeparator ) + { #ifdef WIN32 - sprintf( binary_file_path, "%s\\%s", binary_path, BINARY_FILE_NAME ); + sprintf( c_file_path, "%s\\%s.c", lib_rend_path, ROM_FILE_NAME ); #else - sprintf( binary_file_path, "%s/%s", binary_path, BINARY_FILE_NAME ); + sprintf( c_file_path, "%s/%s.c", lib_rend_path, ROM_FILE_NAME ); #endif + } + else + { +#ifdef WIN32 + sprintf( c_file_path, "%s%s.c", lib_rend_path, ROM_FILE_NAME ); +#else + sprintf( c_file_path, "%s%s.c", lib_rend_path, ROM_FILE_NAME ); +#endif + } } else { + fprintf( stderr, "Memory issue for c file path\n\n" ); + usage_gen_crend_tables(); + if ( lib_rend_path ) + free( lib_rend_path ); +#ifdef MIXER_CONV_BINARY_FILE_311 + if ( binary_path ) + free( binary_path ); +#endif // MIXER_CONV_BINARY_FILE_311 + return -1; + } + fp = fopen( c_file_path, "w" ); + if ( fp == NULL ) + { + fprintf( stderr, "Wrong lib_rend path: %s\n\n", lib_rend_path ); + usage_gen_crend_tables(); + if ( c_file_path ) + free( c_file_path ); + if ( lib_rend_path ) + free( lib_rend_path ); +#ifdef MIXER_CONV_BINARY_FILE_311 + if ( binary_path ) + free( binary_path ); +#endif // MIXER_CONV_BINARY_FILE_311 + return -1; + } + fclose( fp ); + + h_file_path = (char *) malloc( sizeof( char ) * ( strlen( lib_rend_path ) + strlen( ROM_FILE_NAME ) + 2 + 1 + notEndingWithSeparator ) ); + if ( h_file_path ) + { + if ( notEndingWithSeparator ) + { +#ifdef WIN32 + sprintf( h_file_path, "%s\\%s.h", lib_rend_path, ROM_FILE_NAME ); +#else + sprintf( h_file_path, "%s/%s.h", lib_rend_path, ROM_FILE_NAME ); +#endif + } + else + { #ifdef WIN32 - sprintf( binary_file_path, "%s%s", binary_path, BINARY_FILE_NAME ); + sprintf( h_file_path, "%s\\%s.h", lib_rend_path, ROM_FILE_NAME ); #else - sprintf( binary_file_path, "%s%s", binary_path, BINARY_FILE_NAME ); + sprintf( h_file_path, "%s/%s.h", lib_rend_path, ROM_FILE_NAME ); #endif + } } + else + { + fprintf( stderr, "Memory issue: for header file path\n\n" ); + usage_gen_crend_tables(); + if ( c_file_path ) + free( c_file_path ); + if ( lib_rend_path ) + free( lib_rend_path ); +#ifdef MIXER_CONV_BINARY_FILE_311 + if ( binary_path ) + free( binary_path ); +#endif // MIXER_CONV_BINARY_FILE_311 + return -1; + } + fp = fopen( h_file_path, "w" ); + if ( fp == NULL ) + { + fprintf( stderr, "Wrong lib_rend path: %s\n\n", lib_rend_path ); + usage_gen_crend_tables(); + if ( h_file_path ) + free( h_file_path ); + if ( c_file_path ) + free( c_file_path ); + if ( lib_rend_path ) + free( lib_rend_path ); +#ifdef MIXER_CONV_BINARY_FILE_311 + if ( binary_path ) + free( binary_path ); +#endif // MIXER_CONV_BINARY_FILE_311 + return -1; + } + fclose( fp ); } - else - { - fprintf( stderr, "Memory issue for binary file path\n\n" ); - usage_gen_crend_tables(); - if ( h_file_path ) - free( h_file_path ); - if ( c_file_path ) - free( c_file_path ); - if ( lib_rend_path ) - free( lib_rend_path ); - if ( binary_path ) - free( binary_path ); - return -1; - } - fp = fopen( binary_file_path, "wb" ); - if ( fp == NULL ) + +#ifdef MIXER_CONV_BINARY_FILE_311 + + if ( binary_path ) { - fprintf( stderr, "Wrong binary path: %s\n\n", binary_path ); - usage_gen_crend_tables(); + binary_file_path = (char *) malloc( sizeof( char ) * ( strlen( binary_path ) + strlen( BINARY_FILE_NAME ) + 2 + 1 + notEndingWithSeparator ) ); if ( binary_file_path ) - free( binary_file_path ); - if ( h_file_path ) - free( h_file_path ); - if ( c_file_path ) - free( c_file_path ); - if ( lib_rend_path ) - free( lib_rend_path ); - if ( binary_path ) - free( binary_path ); - return -1; + { + if ( notEndingWithSeparator ) + { +#ifdef WIN32 + sprintf( binary_file_path, "%s\\%s", binary_path, BINARY_FILE_NAME ); +#else + sprintf( binary_file_path, "%s/%s", binary_path, BINARY_FILE_NAME ); +#endif + } + else + { +#ifdef WIN32 + sprintf( binary_file_path, "%s%s", binary_path, BINARY_FILE_NAME ); +#else + sprintf( binary_file_path, "%s%s", binary_path, BINARY_FILE_NAME ); +#endif + } + } + else + { + fprintf( stderr, "Memory issue for binary file path\n\n" ); + usage_gen_crend_tables(); + if ( h_file_path ) + free( h_file_path ); + if ( c_file_path ) + free( c_file_path ); + if ( lib_rend_path ) + free( lib_rend_path ); + if ( binary_path ) + free( binary_path ); + return -1; + } + fp = fopen( binary_file_path, "wb" ); + if ( fp == NULL ) + { + fprintf( stderr, "Wrong binary path: %s\n\n", binary_path ); + usage_gen_crend_tables(); + if ( binary_file_path ) + free( binary_file_path ); + if ( h_file_path ) + free( h_file_path ); + if ( c_file_path ) + free( c_file_path ); + if ( lib_rend_path ) + free( lib_rend_path ); + if ( binary_path ) + free( binary_path ); + return -1; + } + fclose( fp ); + remove( binary_file_path ); } - fclose( fp ); - remove( binary_file_path ); - } #endif // MIXER_CONV_BINARY_FILE_311 - if ( c_file_path == NULL ) - { - size_t len = ( strlen( ROM_FILE_NAME ) + 5 + ( no_optim ? strlen( "_no_optim" ) : 0 ) + ( ( sym_hrir >= 0 ) ? ( sym_hrir ? strlen( "_right" ) : strlen( "_left" ) ) : 0 ) + 2 + 1 ); - c_file_path = (char *) malloc( sizeof( char ) * len ); - sprintf( c_file_path, "%s_%02dms%s%s.c", ROM_FILE_NAME, frame_len_ms, ( no_optim ? "_no_optim" : "" ), ( ( sym_hrir >= 0 ) ? ( sym_hrir ? "_right" : "_left" ) : "" ) ); - c_file_path[len - 1] = '\0'; - } - if ( h_file_path == NULL ) - { - size_t len = ( strlen( ROM_FILE_NAME ) + 5 + ( no_optim ? strlen( "_no_optim" ) : 0 ) + ( ( sym_hrir >= 0 ) ? ( sym_hrir ? strlen( "_right" ) : strlen( "_left" ) ) : 0 ) + 2 + 1 ); - h_file_path = (char *) malloc( sizeof( char ) * len ); - sprintf( h_file_path, "%s_%02dms%s%s.h", ROM_FILE_NAME, frame_len_ms, ( no_optim ? "_no_optim" : "" ), ( ( sym_hrir >= 0 ) ? ( sym_hrir ? "_right" : "_left" ) : "" ) ); - h_file_path[len - 1] = '\0'; - } + if ( c_file_path == NULL ) + { + size_t len = ( strlen( ROM_FILE_NAME ) + 5 + ( no_optim ? strlen( "_no_optim" ) : 0 ) + ( ( sym_hrir >= 0 ) ? ( sym_hrir ? strlen( "_right" ) : strlen( "_left" ) ) : 0 ) + 2 + 1 ); + c_file_path = (char *) malloc( sizeof( char ) * len ); + sprintf( c_file_path, "%s_%02dms%s%s.c", ROM_FILE_NAME, frame_len_ms, ( no_optim ? "_no_optim" : "" ), ( ( sym_hrir >= 0 ) ? ( sym_hrir ? "_right" : "_left" ) : "" ) ); + c_file_path[len - 1] = '\0'; + } + if ( h_file_path == NULL ) + { + size_t len = ( strlen( ROM_FILE_NAME ) + 5 + ( no_optim ? strlen( "_no_optim" ) : 0 ) + ( ( sym_hrir >= 0 ) ? ( sym_hrir ? strlen( "_right" ) : strlen( "_left" ) ) : 0 ) + 2 + 1 ); + h_file_path = (char *) malloc( sizeof( char ) * len ); + sprintf( h_file_path, "%s_%02dms%s%s.h", ROM_FILE_NAME, frame_len_ms, ( no_optim ? "_no_optim" : "" ), ( ( sym_hrir >= 0 ) ? ( sym_hrir ? "_right" : "_left" ) : "" ) ); + h_file_path[len - 1] = '\0'; + } #ifdef MIXER_CONV_BINARY_FILE_311 - if ( binary_file_path == NULL ) - { - size_t len = ( strlen( BINARY_FILE_NAME ) + 5 + ( no_optim ? strlen( "_no_optim" ) : 0 ) + 2 + 1 ); - binary_file_path = (char *) malloc( sizeof( char ) * len ); - sprintf( binary_file_path, "%s_%02dms%s", BINARY_FILE_NAME, frame_len_ms, ( no_optim ? "_no_optim" : "" ) ); - binary_file_path[len - 1] = '\0'; - } + if ( binary_file_path == NULL ) + { + size_t len = ( strlen( BINARY_FILE_NAME ) + 5 + ( no_optim ? strlen( "_no_optim" ) : 0 ) + 2 + 1 ); + binary_file_path = (char *) malloc( sizeof( char ) * len ); + sprintf( binary_file_path, "%s_%02dms%s", BINARY_FILE_NAME, frame_len_ms, ( no_optim ? "_no_optim" : "" ) ); + binary_file_path[len - 1] = '\0'; + } #endif // MIXER_CONV_BINARY_FILE_311 - FILE *fpt = fopen( TEMPLTATE_C_ROM_FILE_NAME, "rb" ); + FILE *fpt = fopen( TEMPLTATE_C_ROM_FILE_NAME, "rb" ); - if ( fpt ) - { - fseek( fpt, 0, SEEK_END ); - size_t fsize = ftell( fpt ); - fseek( fpt, 0, SEEK_SET ); - char *tmpc = (char *) malloc( fsize + 1 ); - size_t ret = fread( tmpc, fsize, 1, fpt ); - tmpc[fsize] = '\0'; - if ( ret * fsize == fsize ) + if ( fpt ) { - fp = fopen( c_file_path, "wb" ); - if ( fp ) + fseek( fpt, 0, SEEK_END ); + size_t fsize = ftell( fpt ); + fseek( fpt, 0, SEEK_SET ); + char *tmpc = (char *) malloc( fsize + 1 ); + size_t ret = fread( tmpc, fsize, 1, fpt ); + tmpc[fsize] = '\0'; + if ( ret * fsize == fsize ) { - fwrite( tmpc, fsize, 1, fp ); - fclose( fp ); - } + fp = fopen( c_file_path, "wb" ); + if ( fp ) + { + fwrite( tmpc, fsize, 1, fp ); + fclose( fp ); + } - fp = fopen( h_file_path, "wb" ); - if ( fp ) - { - fwrite( tmpc, fsize, 1, fp ); - fclose( fp ); + fp = fopen( h_file_path, "wb" ); + if ( fp ) + { + fwrite( tmpc, fsize, 1, fp ); + fclose( fp ); + } } - } - fclose( fpt ); - } - fp = fopen( h_file_path, "a" ); - if ( fp ) - { - fprintf( fp, "\n#ifndef _%s_\n", to_upper( rom_file_name ) ); - fprintf( fp, "#define _%s_\n", to_upper( rom_file_name ) ); - fprintf( fp, "\n#include \n#include \"cnst.h\"\n#include \"ivas_cnst.h\"\n" ); - fclose( fp ); - } + fclose( fpt ); + } + fp = fopen( h_file_path, "a" ); + if ( fp ) + { + fprintf( fp, "\n#ifndef _%s_\n", to_upper( rom_file_name ) ); + fprintf( fp, "#define _%s_\n", to_upper( rom_file_name ) ); + fprintf( fp, "\n#include \n#include \"cnst.h\"\n#include \"ivas_cnst.h\"\n" ); + fclose( fp ); + } - fp = fopen( c_file_path, "a" ); - if ( fp ) - { - fprintf( fp, "\n#include \n#include \n#include \"cnst.h\"\n#include \"ivas_cnst.h\"\n\n#define WMC_TOOL_SKIP\n" ); - fclose( fp ); - } + fp = fopen( c_file_path, "a" ); + if ( fp ) + { + fprintf( fp, "\n#include \n#include \n#include \"cnst.h\"\n#include \"ivas_cnst.h\"\n\n#define WMC_TOOL_SKIP\n" ); + fclose( fp ); + } - int err = 0; - int current_sym_hrir = sym_hrir; - for ( ; i < argc; i++ ) - { - const char *cTmp = argv[i]; - current_sym_hrir = sym_hrir; - if ( ( argv[i + 1] != NULL ) && ( argv[i + 1][0] == '-' ) ) + int err = 0; + int current_sym_hrir = sym_hrir; + for ( ; i < argc; i++ ) { - if ( strcmp( to_upper( argv[i + 1] ), "-LEFT" ) == 0 ) + const char *cTmp = argv[i]; + current_sym_hrir = sym_hrir; + if ( ( argv[i + 1] != NULL ) && ( argv[i + 1][0] == '-' ) ) { - current_sym_hrir = 0; - i++; + if ( strcmp( to_upper( argv[i + 1] ), "-LEFT" ) == 0 ) + { + current_sym_hrir = 0; + i++; + } + else if ( strcmp( to_upper( argv[i + 1] ), "-RIGHT" ) == 0 ) + { + current_sym_hrir = 1; + i++; + } + else + { + fprintf( stderr, "Unknown option: %s need to specify frame length in ms 5 or 20\n\n", argv[i + 1] ); + usage_gen_crend_tables(); + if ( lib_rend_path ) + free( lib_rend_path ); + return -1; + } } - else if ( strcmp( to_upper( argv[i + 1] ), "-RIGHT" ) == 0 ) +#ifndef USE_SYMETRIC_HRIR_FILTERS + current_sym_hrir = -1; +#endif + + err = generate_crend_ivas_tables_from_sofa( cTmp, no_optim, current_sym_hrir ); + if ( add_define ) { - current_sym_hrir = 1; - i++; + fp = fopen( c_file_path, "a" ); + if ( fp ) + { + sofa_name = strrchr( argv[i], '/' ); + size_t size_path = strlen( sofa_name ); + sofa_name = malloc( sizeof( char ) * size_path - 5 ); + strncpy( sofa_name, strrchr( argv[i], '/' ) + 1, size_path - 5 ); + sofa_name[size_path - 6] = '\0'; + fprintf( fp, "\n#ifdef USE_%s\n", to_upper( sofa_name ) ); + fclose( fp ); + } + fp = fopen( h_file_path, "a" ); + if ( fp ) + { + fprintf( fp, "\n#ifdef USE_%s\n", to_upper( sofa_name ) ); + fclose( fp ); + } } - else + err = generate_crend_ivas_tables_from_sofa( argv[i], no_optim ); + if ( err != 0 ) + return err; + if ( add_define ) { - fprintf( stderr, "Unknown option: %s need to specify frame length in ms 5 or 20\n\n", argv[i + 1] ); - usage_gen_crend_tables(); - if ( lib_rend_path ) - free( lib_rend_path ); - return -1; + fp = fopen( c_file_path, "a" ); + if ( fp ) + { + fprintf( fp, "\n#endif /* USE_%s */\n", to_upper( sofa_name ) ); + fclose( fp ); + } + fp = fopen( h_file_path, "a" ); + if ( fp ) + { + fprintf( fp, "\n#endif /* USE_%s */\n", to_upper( sofa_name ) ); + fclose( fp ); + } } } -#ifndef USE_SYMETRIC_HRIR_FILTERS - current_sym_hrir = -1; -#endif - - err = generate_crend_ivas_tables_from_sofa( cTmp, no_optim, current_sym_hrir ); - if ( err != 0 ) - return err; - } - fp = fopen( h_file_path, "a" ); - if ( fp ) - { - fprintf( fp, "\n#endif /* _%s_ */\n", to_upper( rom_file_name ) ); - fclose( fp ); - } + fp = fopen( h_file_path, "a" ); + if ( fp ) + { + fprintf( fp, "\n#endif /* _%s_ */\n", to_upper( rom_file_name ) ); + fclose( fp ); + } - fp = fopen( c_file_path, "a" ); - if ( fp ) - { - fprintf( fp, "\n\n" ); - fclose( fp ); - } + fp = fopen( c_file_path, "a" ); + if ( fp ) + { + fprintf( fp, "\n\n" ); + fclose( fp ); + } - if ( c_file_path ) - free( c_file_path ); - if ( h_file_path ) - free( h_file_path ); - if ( rom_file_name ) - free( rom_file_name ); + if ( c_file_path ) + free( c_file_path ); + if ( h_file_path ) + free( h_file_path ); + if ( rom_file_name ) + free( rom_file_name ); #ifdef MIXER_CONV_BINARY_FILE_311 - if ( binary_file_path ) - free( binary_file_path ); - if ( binary_file_name ) - free( binary_file_name ); + if ( binary_file_path ) + free( binary_file_path ); + if ( binary_file_name ) + free( binary_file_name ); #endif // MIXER_CONV_BINARY_FILE_311 - return err; -} + return err; + } -struct MYSOFA_ARRAY *mysofa_getVariable( struct MYSOFA_VARIABLE *attr, char *name ) -{ - while ( attr ) + struct MYSOFA_ARRAY *mysofa_getVariable( struct MYSOFA_VARIABLE * attr, char *name ) { - if ( attr->name && !strcmp( name, attr->name ) ) + while ( attr ) { - return attr->value; + if ( attr->name && !strcmp( name, attr->name ) ) + { + return attr->value; + } + attr = attr->next; } - attr = attr->next; + return NULL; } - return NULL; -} -int generate_crend_ivas_tables_from_sofa( const char *file_path, bool no_optim, int16_t sym_hrir ) -{ - char *sofa_file_path = NULL; - int err; - int i, indSR; - unsigned ui; - - struct MYSOFA_EASY *hrtf = (struct MYSOFA_EASY *) malloc( sizeof( struct MYSOFA_EASY ) ); - if ( !hrtf ) - return 1234; - memset( hrtf, 0, sizeof( struct MYSOFA_EASY ) ); - - /*------------------------------------------------------------------------------------------* - * Parse command line and initialize renderer - *------------------------------------------------------------------------------------------*/ - /* Optional arguments */ - sofa_file_path = (char *) malloc( sizeof( char ) * ( strlen( file_path ) + 1 ) ); - if ( sofa_file_path == NULL ) + int generate_crend_ivas_tables_from_sofa( const char *file_path, bool no_optim, int16_t sym_hrir ) { - fprintf( stderr, "Cannot alloc sofa_file_path !\n\n" ); - return -1; - } - strcpy( sofa_file_path, file_path ); + char *sofa_file_path = NULL; + int err; + int i, indSR; + unsigned ui; - hrtf->hrtf = mysofa_load( sofa_file_path, &err ); - if ( !hrtf->hrtf ) - { - mysofa_close( hrtf ); - fprintf( stderr, "Cannot open file %s!\n\n", sofa_file_path ); - usage_gen_crend_tables(); - free( sofa_file_path ); + struct MYSOFA_EASY *hrtf = (struct MYSOFA_EASY *) malloc( sizeof( struct MYSOFA_EASY ) ); + if ( !hrtf ) + return 1234; + memset( hrtf, 0, sizeof( struct MYSOFA_EASY ) ); - return err; - } - hrtf->lookup = NULL; - hrtf->neighborhood = NULL; - hrtf->fir = NULL; + /*------------------------------------------------------------------------------------------* + * Parse command line and initialize renderer + *------------------------------------------------------------------------------------------*/ + /* Optional arguments */ + sofa_file_path = (char *) malloc( sizeof( char ) * ( strlen( file_path ) + 1 ) ); + if ( sofa_file_path == NULL ) + { + fprintf( stderr, "Cannot alloc sofa_file_path !\n\n" ); + return -1; + } + strcpy( sofa_file_path, file_path ); + hrtf->hrtf = mysofa_load( sofa_file_path, &err ); + if ( !hrtf->hrtf ) + { + mysofa_close( hrtf ); + fprintf( stderr, "Cannot open file %s!\n\n", sofa_file_path ); + usage_gen_crend_tables(); + free( sofa_file_path ); - if ( hrtf->hrtf->DataDelay.elements == hrtf->hrtf->M * hrtf->hrtf->R ) - { - mysofa_close( hrtf ); - fprintf( stderr, "Wrong file unsupported format delay metadata %s!\n\n", sofa_file_path ); - usage_gen_crend_tables(); - free( sofa_file_path ); + return err; + } + hrtf->lookup = NULL; + hrtf->neighborhood = NULL; + hrtf->fir = NULL; - return -1; - } - if ( hrtf->hrtf->DataSamplingRate.elements > 0 ) - { - int hasWantedSampleRate = 0; - for ( ui = 0; ui < hrtf->hrtf->DataSamplingRate.elements; ui++ ) + if ( hrtf->hrtf->DataDelay.elements == hrtf->hrtf->M * hrtf->hrtf->R ) + { + mysofa_close( hrtf ); + fprintf( stderr, "Wrong file unsupported format delay metadata %s!\n\n", sofa_file_path ); + usage_gen_crend_tables(); + free( sofa_file_path ); + + return -1; + } + + if ( hrtf->hrtf->DataSamplingRate.elements > 0 ) { - if ( hrtf->hrtf->DataSamplingRate.values[ui] == DEFAULT_SAMPLERATE ) + int hasWantedSampleRate = 0; + for ( ui = 0; ui < hrtf->hrtf->DataSamplingRate.elements; ui++ ) { - hasWantedSampleRate = 1; - break; + if ( hrtf->hrtf->DataSamplingRate.values[ui] == DEFAULT_SAMPLERATE ) + { + hasWantedSampleRate = 1; + break; + } + } + if ( hasWantedSampleRate == 0 ) + { + mysofa_close( hrtf ); + fprintf( stderr, "Wrong file with wrong sample rate %s!\n\n", sofa_file_path ); + usage_gen_crend_tables(); + free( sofa_file_path ); + + return -1; } } - if ( hasWantedSampleRate == 0 ) + else { mysofa_close( hrtf ); fprintf( stderr, "Wrong file with wrong sample rate %s!\n\n", sofa_file_path ); @@ -710,655 +760,659 @@ int generate_crend_ivas_tables_from_sofa( const char *file_path, bool no_optim, return -1; } - } - else - { - mysofa_close( hrtf ); - fprintf( stderr, "Wrong file with wrong sample rate %s!\n\n", sofa_file_path ); - usage_gen_crend_tables(); - free( sofa_file_path ); - return -1; - } + /* err = mysofa_check( hrtf->hrtf ); + if ( err != MYSOFA_OK ) + { + mysofa_close( hrtf ); + return err; + }*/ + + struct ivas_layout_config lscfg; + + if ( hrtf->hrtf->M == 4 ) + get_ls_layout_config( IVAS_DEC_OUTPUT_FOA, &lscfg ); + else if ( hrtf->hrtf->M == 9 ) + get_ls_layout_config( IVAS_DEC_OUTPUT_HOA2, &lscfg ); + else if ( hrtf->hrtf->M == 16 ) + get_ls_layout_config( IVAS_DEC_OUTPUT_HOA3, &lscfg ); + else if ( hrtf->hrtf->M == 6 ) + get_ls_layout_config( IVAS_DEC_OUTPUT_5_1, &lscfg ); + else if ( ( hrtf->hrtf->M == 8 ) && ( strstr( sofa_file_path, "710" ) != 0 ) ) + get_ls_layout_config( IVAS_DEC_OUTPUT_7_1, &lscfg ); + else if ( ( hrtf->hrtf->M == 8 ) && ( strstr( sofa_file_path, "512" ) != 0 ) ) + get_ls_layout_config( IVAS_DEC_OUTPUT_5_1_2, &lscfg ); + else if ( hrtf->hrtf->M == 10 ) + get_ls_layout_config( IVAS_DEC_OUTPUT_5_1_4, &lscfg ); + else if ( hrtf->hrtf->M == 12 ) + get_ls_layout_config( IVAS_DEC_OUTPUT_7_1_4, &lscfg ); + else + get_ls_layout_config( IVAS_DEC_OUTPUT_EXT, &lscfg ); - /* err = mysofa_check( hrtf->hrtf ); - if ( err != MYSOFA_OK ) - { - mysofa_close( hrtf ); - return err; - }*/ - - struct ivas_layout_config lscfg; - - if ( hrtf->hrtf->M == 4 ) - get_ls_layout_config( IVAS_DEC_OUTPUT_FOA, &lscfg ); - else if ( hrtf->hrtf->M == 9 ) - get_ls_layout_config( IVAS_DEC_OUTPUT_HOA2, &lscfg ); - else if ( hrtf->hrtf->M == 16 ) - get_ls_layout_config( IVAS_DEC_OUTPUT_HOA3, &lscfg ); - else if ( hrtf->hrtf->M == 6 ) - get_ls_layout_config( IVAS_DEC_OUTPUT_5_1, &lscfg ); - else if ( ( hrtf->hrtf->M == 8 ) && ( strstr( sofa_file_path, "710" ) != 0 ) ) - get_ls_layout_config( IVAS_DEC_OUTPUT_7_1, &lscfg ); - else if ( ( hrtf->hrtf->M == 8 ) && ( strstr( sofa_file_path, "512" ) != 0 ) ) - get_ls_layout_config( IVAS_DEC_OUTPUT_5_1_2, &lscfg ); - else if ( hrtf->hrtf->M == 10 ) - get_ls_layout_config( IVAS_DEC_OUTPUT_5_1_4, &lscfg ); - else if ( hrtf->hrtf->M == 12 ) - get_ls_layout_config( IVAS_DEC_OUTPUT_7_1_4, &lscfg ); - else - get_ls_layout_config( IVAS_DEC_OUTPUT_EXT, &lscfg ); - - /* general information about the loaded HRTF set */ - fprintf( stderr, "Number of HRTFs: %d\n", hrtf->hrtf->M ); - fprintf( stderr, "Filter length: %d samples\n", hrtf->hrtf->N ); - fprintf( stderr, "Database: %s\n", mysofa_getAttribute( hrtf->hrtf->attributes, "DatabaseName" ) ); - fprintf( stderr, "Listener: %s\n", mysofa_getAttribute( hrtf->hrtf->attributes, "ListenerShortName" ) ); - - struct MYSOFA_ARRAY *latency_s = mysofa_getVariable( hrtf->hrtf->variables, "latencys" ); - - if ( lscfg.isloudspeaker && ( lscfg.nb_channel > 11 ) ) - { - mysofa_tocartesian( hrtf->hrtf ); + /* general information about the loaded HRTF set */ + fprintf( stderr, "Number of HRTFs: %d\n", hrtf->hrtf->M ); + fprintf( stderr, "Filter length: %d samples\n", hrtf->hrtf->N ); + fprintf( stderr, "Database: %s\n", mysofa_getAttribute( hrtf->hrtf->attributes, "DatabaseName" ) ); + fprintf( stderr, "Listener: %s\n", mysofa_getAttribute( hrtf->hrtf->attributes, "ListenerShortName" ) ); - hrtf->lookup = mysofa_lookup_init( hrtf->hrtf ); - if ( hrtf->lookup == NULL ) - { - err = MYSOFA_INTERNAL_ERROR; - mysofa_close( hrtf ); - free( sofa_file_path ); + struct MYSOFA_ARRAY *latency_s = mysofa_getVariable( hrtf->hrtf->variables, "latencys" ); - return err; - } - hrtf->neighborhood = mysofa_neighborhood_init( hrtf->hrtf, hrtf->lookup ); - fprintf( stderr, "Radius min: %f, max: %f\n", hrtf->lookup->radius_min, hrtf->lookup->radius_max ); - } - /* get index to a position given in t (in spherical) */ - int *index_pos = (int *) malloc( sizeof( int ) * lscfg.nb_channel ); - uint32_t maxDel48kHz = 0; - if ( index_pos == NULL ) - { - mysofa_close( hrtf ); - free( sofa_file_path ); - fprintf( stderr, "Cannot alloc sofa_file_path !\n\n" ); - return -1; - } - for ( i = 0; i < lscfg.nb_channel; i++ ) - { if ( lscfg.isloudspeaker && ( lscfg.nb_channel > 11 ) ) { - float t[3], a[3]; - t[0] = lscfg.azi[i]; /* azimuth in deg */ - t[1] = lscfg.ele[i]; /* elevation in deg */ - t[2] = hrtf->lookup->radius_min; /* radius in m */ - fprintf( stderr, "Wanted Position: %f, %f, %f\n", t[0], t[1], t[2] ); - mysofa_s2c( t ); - int nearest = mysofa_lookup( hrtf->lookup, t ); - a[0] = hrtf->hrtf->SourcePosition.values[3 * nearest]; - a[1] = hrtf->hrtf->SourcePosition.values[3 * nearest + 1]; - a[2] = hrtf->hrtf->SourcePosition.values[3 * nearest + 2]; - if ( fabs( t[0] - a[0] ) > MAX_DIFF_AZI ) - { - mysofa_close( hrtf ); - fprintf( stderr, "Nearest position to far from target incomplete sofa file\n" ); - free( sofa_file_path ); - free( index_pos ); - return -1; - } - if ( fabs( t[1] - a[1] ) > MAX_DIFF_ELE ) + mysofa_tocartesian( hrtf->hrtf ); + + hrtf->lookup = mysofa_lookup_init( hrtf->hrtf ); + if ( hrtf->lookup == NULL ) { + err = MYSOFA_INTERNAL_ERROR; mysofa_close( hrtf ); - fprintf( stderr, "Nearest position to far from target incomplete sofa file\n" ); free( sofa_file_path ); - return -1; + + return err; } - mysofa_c2s( a ); - if ( a[0] > 180 ) - a[0] -= 360; - if ( a[0] < -180 ) - a[0] += 360; - fprintf( stderr, "Nearest Position: %f, %f, %f\n", a[0], a[1], a[2] ); - fprintf( stderr, "Nearest position found at: %d\n", nearest ); - index_pos[i] = nearest; + hrtf->neighborhood = mysofa_neighborhood_init( hrtf->hrtf, hrtf->lookup ); + fprintf( stderr, "Radius min: %f, max: %f\n", hrtf->lookup->radius_min, hrtf->lookup->radius_max ); } - else + /* get index to a position given in t (in spherical) */ + int *index_pos = (int *) malloc( sizeof( int ) * lscfg.nb_channel ); + uint32_t maxDel48kHz = 0; + if ( index_pos == NULL ) { - index_pos[i] = i; + mysofa_close( hrtf ); + free( sofa_file_path ); + fprintf( stderr, "Cannot alloc sofa_file_path !\n\n" ); + return -1; } - /* get the HRIR for the position given in t */ - uint32_t size = (uint32_t) hrtf->hrtf->R; - uint32_t delL = 0, delR = 0; - if ( hrtf->hrtf->DataDelay.elements == ( hrtf->hrtf->M * hrtf->hrtf->R ) ) + for ( i = 0; i < lscfg.nb_channel; i++ ) { - size = hrtf->hrtf->R; - // if ( sym_hrir <= 0 ) - delL = (uint32_t) roundf( hrtf->hrtf->DataDelay.values[index_pos[i] * size] * DEFAULT_SAMPLERATE ); - if ( maxDel48kHz < delL ) - maxDel48kHz = delL; - // if ( sym_hrir != 0 ) - delR = (uint32_t) roundf( hrtf->hrtf->DataDelay.values[index_pos[i] * size + 1] * DEFAULT_SAMPLERATE ); - if ( maxDel48kHz < delR ) - maxDel48kHz = delR; + if ( lscfg.isloudspeaker && ( lscfg.nb_channel > 11 ) ) + { + float t[3], a[3]; + t[0] = lscfg.azi[i]; /* azimuth in deg */ + t[1] = lscfg.ele[i]; /* elevation in deg */ + t[2] = hrtf->lookup->radius_min; /* radius in m */ + fprintf( stderr, "Wanted Position: %f, %f, %f\n", t[0], t[1], t[2] ); + mysofa_s2c( t ); + int nearest = mysofa_lookup( hrtf->lookup, t ); + a[0] = hrtf->hrtf->SourcePosition.values[3 * nearest]; + a[1] = hrtf->hrtf->SourcePosition.values[3 * nearest + 1]; + a[2] = hrtf->hrtf->SourcePosition.values[3 * nearest + 2]; + if ( fabs( t[0] - a[0] ) > MAX_DIFF_AZI ) + { + mysofa_close( hrtf ); + fprintf( stderr, "Nearest position to far from target incomplete sofa file\n" ); + free( sofa_file_path ); + free( index_pos ); + return -1; + } + if ( fabs( t[1] - a[1] ) > MAX_DIFF_ELE ) + { + mysofa_close( hrtf ); + fprintf( stderr, "Nearest position to far from target incomplete sofa file\n" ); + free( sofa_file_path ); + return -1; + } + mysofa_c2s( a ); + if ( a[0] > 180 ) + a[0] -= 360; + if ( a[0] < -180 ) + a[0] += 360; + fprintf( stderr, "Nearest Position: %f, %f, %f\n", a[0], a[1], a[2] ); + fprintf( stderr, "Nearest position found at: %d\n", nearest ); + index_pos[i] = nearest; + } + else + { + index_pos[i] = i; + } + /* get the HRIR for the position given in t */ + uint32_t size = (uint32_t) hrtf->hrtf->R; + uint32_t delL = 0, delR = 0; + if ( hrtf->hrtf->DataDelay.elements == ( hrtf->hrtf->M * hrtf->hrtf->R ) ) + { + size = hrtf->hrtf->R; + // if ( sym_hrir <= 0 ) + delL = (uint32_t) roundf( hrtf->hrtf->DataDelay.values[index_pos[i] * size] * DEFAULT_SAMPLERATE ); + if ( maxDel48kHz < delL ) + maxDel48kHz = delL; + // if ( sym_hrir != 0 ) + delR = (uint32_t) roundf( hrtf->hrtf->DataDelay.values[index_pos[i] * size + 1] * DEFAULT_SAMPLERATE ); + if ( maxDel48kHz < delR ) + maxDel48kHz = delR; + } } - } - - size_t len_ls_cfg_name = strlen( lscfg.name ); - double latency_48k = 0; - float latency_48k_optim = 0; + size_t len_ls_cfg_name = strlen( lscfg.name ); - for ( indSR = 0; indSR < sizeof( sample_rates ) / sizeof( float ); indSR++ ) - { + double latency_48k = 0; + float latency_48k_optim = 0; - uint16_t frame_len = L_FRAME48k; - int32_t maxDel = maxDel48kHz * DEFAULT_SAMPLERATE / sample_rates[indSR]; - switch ( sample_rates[indSR] ) + for ( indSR = 0; indSR < sizeof( sample_rates ) / sizeof( float ); indSR++ ) { - case 8000: - frame_len = L_FRAME8k; - break; - case 16000: - frame_len = L_FRAME16k; - break; - case 32000: - frame_len = L_FRAME32k; - break; - case 48000: - default: - frame_len = L_FRAME48k; - break; - } - if ( frame_len_ms == 5 ) - frame_len = frame_len >> 2; - if ( sample_rates[indSR] != DEFAULT_SAMPLERATE ) - { - char *file_path = (char *) malloc( sizeof( char ) * ( strlen( sofa_file_path ) + 1 ) ); - strcpy( file_path, sofa_file_path ); - char *fstr = strstr( file_path, "48000" ); - if ( fstr ) + uint16_t frame_len = L_FRAME48k; + int32_t maxDel = maxDel48kHz * DEFAULT_SAMPLERATE / sample_rates[indSR]; + switch ( sample_rates[indSR] ) + { + case 8000: + frame_len = L_FRAME8k; + break; + case 16000: + frame_len = L_FRAME16k; + break; + case 32000: + frame_len = L_FRAME32k; + break; + case 48000: + default: + frame_len = L_FRAME48k; + break; + } + if ( frame_len_ms == 5 ) + frame_len = frame_len >> 2; + + if ( sample_rates[indSR] != DEFAULT_SAMPLERATE ) { - switch ( sample_rates[indSR] ) + char *file_path = (char *) malloc( sizeof( char ) * ( strlen( sofa_file_path ) + 1 ) ); + strcpy( file_path, sofa_file_path ); + char *fstr = strstr( file_path, "48000" ); + if ( fstr ) + { + switch ( sample_rates[indSR] ) + { + case 32000: + strncpy( fstr, "32000", 5 ); + break; + case 16000: + strncpy( fstr, "16000", 5 ); + break; + default: + break; + } + } + else + { + strcpy( file_path, "" ); + } + FILE *fp = fopen( file_path, "rb" ); + if ( fp ) + { + fclose( fp ); + + mysofa_close( hrtf ); + hrtf = (struct MYSOFA_EASY *) malloc( sizeof( struct MYSOFA_EASY ) ); + if ( !hrtf ) + return 1234; + memset( hrtf, 0, sizeof( struct MYSOFA_EASY ) ); + hrtf->hrtf = mysofa_load( file_path, &err ); + } + else + { + mysofa_close( hrtf ); + hrtf = (struct MYSOFA_EASY *) malloc( sizeof( struct MYSOFA_EASY ) ); + if ( !hrtf ) + return 1234; + memset( hrtf, 0, sizeof( struct MYSOFA_EASY ) ); + hrtf->hrtf = mysofa_load( sofa_file_path, &err ); + mysofa_resample( hrtf->hrtf, (float) sample_rates[indSR] ); + } + latency_s = mysofa_getVariable( hrtf->hrtf->variables, "latencys" ); + if ( file_path ) + free( file_path ); + } + + struct ivas_hrtf_t *ivas_hrtf = NULL; + ivas_hrtf = malloc( sizeof( ivas_hrtf_t ) ); + memset( ivas_hrtf, 0, sizeof( ivas_hrtf_t ) ); + ivas_hrtf->I = hrtf->hrtf->I; + ivas_hrtf->m = lscfg.nb_channel; + ivas_hrtf->N = hrtf->hrtf->N + maxDel; + ivas_hrtf->R = hrtf->hrtf->R; + ivas_hrtf->sampling_rate = sample_rates[indSR]; + + int32_t ind_max_ir = hrtf->hrtf->N; + uint32_t delL = 0, delR = 0; + unsigned size = hrtf->hrtf->R; + double max_ir_l = 0; + double max_ir_r = 0; + int32_t ind_max_l = hrtf->hrtf->N; + int32_t ind_max_r = hrtf->hrtf->N; + double tmpf; + size = (uint32_t) hrtf->hrtf->N * hrtf->hrtf->R; + + for ( i = 0; i < lscfg.nb_channel; i++ ) + { + max_ir_l = 0; + max_ir_r = 0; + ind_max_l = hrtf->hrtf->N; + ind_max_r = hrtf->hrtf->N; + + if ( hrtf->hrtf->DataDelay.elements == hrtf->hrtf->M * hrtf->hrtf->R ) + { + // if ( sym_hrir <= 0 ) + delL = (uint32_t) roundf( hrtf->hrtf->DataDelay.values[index_pos[i] * size] * DEFAULT_SAMPLERATE ); + // if ( sym_hrir != 0 ) + delR = (uint32_t) roundf( hrtf->hrtf->DataDelay.values[index_pos[i] * size + 1] * DEFAULT_SAMPLERATE ); + } + + // if ( sym_hrir <= 0 ) + // { + ivas_hrtf->data_ir[i][0] = (double *) malloc( sizeof( double ) * ( ivas_hrtf->N ) ); + memset( ivas_hrtf->data_ir[i][0], 0, sizeof( double ) * ivas_hrtf->N ); + for ( unsigned n = 0; n < hrtf->hrtf->N; n++ ) + { + ivas_hrtf->data_ir[i][0][n + delL] = hrtf->hrtf->DataIR.values[size * index_pos[i] + n]; + tmpf = fabs( hrtf->hrtf->DataIR.values[index_pos[i] * size + n] ); + if ( tmpf > max_ir_l ) + { + max_ir_l = tmpf; + ind_max_l = n + delL; + } + } + // } + // if ( sym_hrir != 0 ) + // { + ivas_hrtf->data_ir[i][1] = (double *) malloc( sizeof( double ) * ( ivas_hrtf->N ) ); + memset( ivas_hrtf->data_ir[i][1], 0, sizeof( double ) * ivas_hrtf->N ); + for ( unsigned n = 0; n < hrtf->hrtf->N; n++ ) { - case 32000: - strncpy( fstr, "32000", 5 ); - break; - case 16000: - strncpy( fstr, "16000", 5 ); - break; - default: - break; + ivas_hrtf->data_ir[i][1][n + delR] = hrtf->hrtf->DataIR.values[size * index_pos[i] + hrtf->hrtf->N + n]; + tmpf = fabs( hrtf->hrtf->DataIR.values[size * index_pos[i] + hrtf->hrtf->N + n] ); + if ( tmpf > max_ir_r ) + { + max_ir_r = tmpf; + ind_max_r = n + delR; + } + } + // } + if ( ind_max_ir > ind_max_l ) + { + ind_max_ir = ind_max_l; + } + if ( ind_max_ir > ind_max_r ) + { + ind_max_ir = ind_max_r; } } - else + + if ( sample_rates[indSR] == DEFAULT_SAMPLERATE ) { - strcpy( file_path, "" ); + latency_48k = (double) ind_max_ir / (double) sample_rates[indSR]; } - FILE *fp = fopen( file_path, "rb" ); - if ( fp ) + ivas_hrtf->latency_s[0] = (double *) malloc( sizeof( double ) ); + if ( latency_s == NULL ) { - fclose( fp ); - - mysofa_close( hrtf ); - hrtf = (struct MYSOFA_EASY *) malloc( sizeof( struct MYSOFA_EASY ) ); - if ( !hrtf ) - return 1234; - memset( hrtf, 0, sizeof( struct MYSOFA_EASY ) ); - hrtf->hrtf = mysofa_load( file_path, &err ); + ivas_hrtf->latency_s[0][0] = latency_48k; } else { - mysofa_close( hrtf ); - hrtf = (struct MYSOFA_EASY *) malloc( sizeof( struct MYSOFA_EASY ) ); - if ( !hrtf ) - return 1234; - memset( hrtf, 0, sizeof( struct MYSOFA_EASY ) ); - hrtf->hrtf = mysofa_load( sofa_file_path, &err ); - mysofa_resample( hrtf->hrtf, (float) sample_rates[indSR] ); - } - latency_s = mysofa_getVariable( hrtf->hrtf->variables, "latencys" ); - if ( file_path ) - free( file_path ); - } - - struct ivas_hrtf_t *ivas_hrtf = NULL; - ivas_hrtf = malloc( sizeof( ivas_hrtf_t ) ); - memset( ivas_hrtf, 0, sizeof( ivas_hrtf_t ) ); - ivas_hrtf->I = hrtf->hrtf->I; - ivas_hrtf->m = lscfg.nb_channel; - ivas_hrtf->N = hrtf->hrtf->N + maxDel; - ivas_hrtf->R = hrtf->hrtf->R; - ivas_hrtf->sampling_rate = sample_rates[indSR]; - - int32_t ind_max_ir = hrtf->hrtf->N; - uint32_t delL = 0, delR = 0; - unsigned size = hrtf->hrtf->R; - double max_ir_l = 0; - double max_ir_r = 0; - int32_t ind_max_l = hrtf->hrtf->N; - int32_t ind_max_r = hrtf->hrtf->N; - double tmpf; - size = (uint32_t) hrtf->hrtf->N * hrtf->hrtf->R; + if ( fabs( latency_s->values[0] - (float) latency_48k ) > 1e-6f ) + { + fprintf( stderr, "Warning : At sample rate %ld latency in sofa file and computed are different sofa = %f, computed = %lf\n", (long) sample_rates[indSR], latency_s->values[0], latency_48k ); + } + ivas_hrtf->latency_s[0][0] = latency_s->values[0]; + } - for ( i = 0; i < lscfg.nb_channel; i++ ) - { - max_ir_l = 0; - max_ir_r = 0; - ind_max_l = hrtf->hrtf->N; - ind_max_r = hrtf->hrtf->N; + HRTFS_DATA hrtf_data = { 0 }; - if ( hrtf->hrtf->DataDelay.elements == hrtf->hrtf->M * hrtf->hrtf->R ) + int32_t index_start, index_end, max_ir_len; + + hrtf_data.max_num_ir = ivas_hrtf->m; + + ivas_get_hrtf_lens( ivas_hrtf, -1, &hrtf_data, frame_len ); + if ( sample_rates[indSR] != DEFAULT_SAMPLERATE ) { - // if ( sym_hrir <= 0 ) - delL = (uint32_t) roundf( hrtf->hrtf->DataDelay.values[index_pos[i] * size] * DEFAULT_SAMPLERATE ); - // if ( sym_hrir != 0 ) - delR = (uint32_t) roundf( hrtf->hrtf->DataDelay.values[index_pos[i] * size + 1] * DEFAULT_SAMPLERATE ); + hrtf_data.latency_s = latency_48k_optim; } - // if ( sym_hrir <= 0 ) - // { - ivas_hrtf->data_ir[i][0] = (double *) malloc( sizeof( double ) * ( ivas_hrtf->N ) ); - memset( ivas_hrtf->data_ir[i][0], 0, sizeof( double ) * ivas_hrtf->N ); - for ( unsigned n = 0; n < hrtf->hrtf->N; n++ ) + if ( ( hrtf_data.num_iterations[0][sym_hrir < 0 ? 0 : sym_hrir] > 2 ) && ( no_optim == false ) ) { - ivas_hrtf->data_ir[i][0][n + delL] = hrtf->hrtf->DataIR.values[size * index_pos[i] + n]; - tmpf = fabs( hrtf->hrtf->DataIR.values[index_pos[i] * size + n] ); - if ( tmpf > max_ir_l ) - { - max_ir_l = tmpf; - ind_max_l = n + delL; - } + ivas_crend_binaural_filter_design_compute_filters_params( ivas_hrtf, -1, frame_len, &hrtf_data, &index_start, &index_end, &max_ir_len ); + ivas_crend_binaural_filter_design_set_hrtf_fr( ivas_hrtf, -1, frame_len, &hrtf_data, index_start, index_end, &max_ir_len ); } - // } - // if ( sym_hrir != 0 ) - // { - ivas_hrtf->data_ir[i][1] = (double *) malloc( sizeof( double ) * ( ivas_hrtf->N ) ); - memset( ivas_hrtf->data_ir[i][1], 0, sizeof( double ) * ivas_hrtf->N ); - for ( unsigned n = 0; n < hrtf->hrtf->N; n++ ) + else { - ivas_hrtf->data_ir[i][1][n + delR] = hrtf->hrtf->DataIR.values[size * index_pos[i] + hrtf->hrtf->N + n]; - tmpf = fabs( hrtf->hrtf->DataIR.values[size * index_pos[i] + hrtf->hrtf->N + n] ); - if ( tmpf > max_ir_r ) - { - max_ir_r = tmpf; - ind_max_r = n + delR; - } + ivas_set_hrtf_fr( &hrtf_data, sym_hrir, ivas_hrtf, frame_len ); } - // } - if ( ind_max_ir > ind_max_l ) + +#ifdef UPDATE_SBA_FILTER + hrtf_data.latency_s += 0.000000001f; +#endif + + if ( ( hrtf_data.num_iterations[0][sym_hrir < 0 ? 0 : sym_hrir] > 2 ) ) { - ind_max_ir = ind_max_l; + strcpy( &lscfg.name[len_ls_cfg_name], "_BRIR" ); } - if ( ind_max_ir > ind_max_r ) + else { - ind_max_ir = ind_max_r; + strcpy( &lscfg.name[len_ls_cfg_name], "_HRIR" ); } - } - if ( sample_rates[indSR] == DEFAULT_SAMPLERATE ) - { - latency_48k = (double) ind_max_ir / (double) sample_rates[indSR]; - } - ivas_hrtf->latency_s[0] = (double *) malloc( sizeof( double ) ); - if ( latency_s == NULL ) - { - ivas_hrtf->latency_s[0][0] = latency_48k; - } - else - { - if ( fabs( latency_s->values[0] - (float) latency_48k ) > 1e-6f ) + if ( sample_rates[indSR] == DEFAULT_SAMPLERATE ) { - fprintf( stderr, "Warning : At sample rate %ld latency in sofa file and computed are different sofa = %f, computed = %lf\n", (long) sample_rates[indSR], latency_s->values[0], latency_48k ); + latency_48k_optim = hrtf_data.latency_s; + } + + if ( sym_hrir >= 0 ) + { + HRTFS_DATA *hrtf_sym = NULL; + ivas_crend_binaural_filter_design_convert_filters_to_sum_diff( &hrtf_data, sym_hrir, frame_len, lscfg, &hrtf_sym ); + update_h_file( hrtf_sym, lscfg, sample_rates[indSR], frame_len, sym_hrir ); + update_c_file( hrtf_sym, lscfg, sample_rates[indSR], frame_len, sym_hrir ); + ivas_hrtf_close( hrtf_sym ); + } + else + { + update_h_file( &hrtf_data, lscfg, sample_rates[indSR], frame_len, sym_hrir ); + update_c_file( &hrtf_data, lscfg, sample_rates[indSR], frame_len, sym_hrir ); } - ivas_hrtf->latency_s[0][0] = latency_s->values[0]; - } - HRTFS_DATA hrtf_data = { 0 }; - int32_t index_start, index_end, max_ir_len; +#ifdef MIXER_CONV_BINARY_FILE_311 - hrtf_data.max_num_ir = ivas_hrtf->m; + write_binary_file( &hrtf_data, lscfg, sample_rates[indSR], frame_len, sym_hrir ); - ivas_get_hrtf_lens( ivas_hrtf, -1, &hrtf_data, frame_len ); - if ( sample_rates[indSR] != DEFAULT_SAMPLERATE ) - { - hrtf_data.latency_s = latency_48k_optim; - } +#endif // MIXER_CONV_BINARY_FILE_311 - if ( ( hrtf_data.num_iterations[0][sym_hrir < 0 ? 0 : sym_hrir] > 2 ) && ( no_optim == false ) ) - { - ivas_crend_binaural_filter_design_compute_filters_params( ivas_hrtf, -1, frame_len, &hrtf_data, &index_start, &index_end, &max_ir_len ); - ivas_crend_binaural_filter_design_set_hrtf_fr( ivas_hrtf, -1, frame_len, &hrtf_data, index_start, index_end, &max_ir_len ); - } - else - { - ivas_set_hrtf_fr( &hrtf_data, sym_hrir, ivas_hrtf, frame_len ); + if ( ivas_hrtf->latency_s[0] ) + { + free( ivas_hrtf->latency_s[0] ); + ivas_hrtf->latency_s[0] = NULL; + } + for ( int i = 0; i < lscfg.nb_channel; i++ ) + { + if ( ivas_hrtf->data_ir[i][0] ) + { + free( ivas_hrtf->data_ir[i][0] ); + ivas_hrtf->data_ir[i][0] = NULL; + } + if ( ivas_hrtf->data_ir[i][1] ) + { + free( ivas_hrtf->data_ir[i][1] ); + ivas_hrtf->data_ir[i][1] = NULL; + } + } + free( ivas_hrtf ); + ivas_hrtf_close( &hrtf_data ); } + /* close the file */ + mysofa_close( hrtf ); + if ( sofa_file_path ) + free( sofa_file_path ); + if ( index_pos ) + free( index_pos ); -#ifdef FIX_BINAURAL_DELAY_PRECISION - hrtf_data.latency_s += 0.000000001f; -#endif + return 0; + } - if ( ( hrtf_data.num_iterations[0][sym_hrir < 0 ? 0 : sym_hrir] > 2 ) ) - { - strcpy( &lscfg.name[len_ls_cfg_name], "_BRIR" ); - } - else - { - strcpy( &lscfg.name[len_ls_cfg_name], "_HRIR" ); - } + /*---------------------------------------------------------------------* + *write_array_float_to_file(); + *---------------------------------------------------------------------*/ + void write_array_float_to_file( FILE * fp, float *vec, int32_t size_vec, int32_t sample_per_ligne, const char *format, const int num_tab, const char *tab ) + { + int32_t k, l, num_iter, remaining_samples; + int16_t i; - if ( sample_rates[indSR] == DEFAULT_SAMPLERATE ) + if ( vec == NULL ) { - latency_48k_optim = hrtf_data.latency_s; + fprintf( fp, "NULL" ); + return; } - if ( sym_hrir >= 0 ) + num_iter = size_vec / sample_per_ligne; + remaining_samples = size_vec % sample_per_ligne; + if ( remaining_samples == 0 ) { - HRTFS_DATA *hrtf_sym = NULL; - ivas_crend_binaural_filter_design_convert_filters_to_sum_diff( &hrtf_data, sym_hrir, frame_len, lscfg, &hrtf_sym ); - update_h_file( hrtf_sym, lscfg, sample_rates[indSR], frame_len, sym_hrir ); - update_c_file( hrtf_sym, lscfg, sample_rates[indSR], frame_len, sym_hrir ); - ivas_hrtf_close( hrtf_sym ); + num_iter--; + remaining_samples = sample_per_ligne; } - else + for ( i = 0; i < num_tab; i++ ) { - update_h_file( &hrtf_data, lscfg, sample_rates[indSR], frame_len, sym_hrir ); - update_c_file( &hrtf_data, lscfg, sample_rates[indSR], frame_len, sym_hrir ); + fprintf( fp, "%s", tab ); } + fprintf( fp, "{" ); - -#ifdef MIXER_CONV_BINARY_FILE_311 - - write_binary_file( &hrtf_data, lscfg, sample_rates[indSR], frame_len, sym_hrir ); - -#endif // MIXER_CONV_BINARY_FILE_311 - - if ( ivas_hrtf->latency_s[0] ) - { - free( ivas_hrtf->latency_s[0] ); - ivas_hrtf->latency_s[0] = NULL; - } - for ( int i = 0; i < lscfg.nb_channel; i++ ) + for ( k = 0; k < num_iter; k++ ) { - if ( ivas_hrtf->data_ir[i][0] ) + if ( k != 0 ) { - free( ivas_hrtf->data_ir[i][0] ); - ivas_hrtf->data_ir[i][0] = NULL; + for ( i = 0; i < num_tab; i++ ) + { + fprintf( fp, "%s", tab ); + } } - if ( ivas_hrtf->data_ir[i][1] ) + for ( l = 0; l < sample_per_ligne; l++ ) { - free( ivas_hrtf->data_ir[i][1] ); - ivas_hrtf->data_ir[i][1] = NULL; + fprintf( fp, format, vec[k * sample_per_ligne + l] ); + fprintf( fp, "f, " ); } + fprintf( fp, "\n" ); } - free( ivas_hrtf ); - ivas_hrtf_close( &hrtf_data ); - } - /* close the file */ - mysofa_close( hrtf ); - if ( sofa_file_path ) - free( sofa_file_path ); - if ( index_pos ) - free( index_pos ); - - return 0; -} - -/*---------------------------------------------------------------------* - *write_array_float_to_file(); - *---------------------------------------------------------------------*/ -void write_array_float_to_file( FILE *fp, float *vec, int32_t size_vec, int32_t sample_per_ligne, const char *format, const int num_tab, const char *tab ) -{ - int32_t k, l, num_iter, remaining_samples; - int16_t i; - - if ( vec == NULL ) - { - fprintf( fp, "NULL" ); - return; - } - - num_iter = size_vec / sample_per_ligne; - remaining_samples = size_vec % sample_per_ligne; - if ( remaining_samples == 0 ) - { - num_iter--; - remaining_samples = sample_per_ligne; - } - for ( i = 0; i < num_tab; i++ ) - { - fprintf( fp, "%s", tab ); - } - fprintf( fp, "{" ); - - for ( k = 0; k < num_iter; k++ ) - { - if ( k != 0 ) + for ( i = 0; i < num_tab; i++ ) { - for ( i = 0; i < num_tab; i++ ) - { - fprintf( fp, "%s", tab ); - } + fprintf( fp, "%s", tab ); } - for ( l = 0; l < sample_per_ligne; l++ ) + for ( l = 0; l < remaining_samples - 1; l++ ) { fprintf( fp, format, vec[k * sample_per_ligne + l] ); fprintf( fp, "f, " ); } - fprintf( fp, "\n" ); - } - for ( i = 0; i < num_tab; i++ ) - { - fprintf( fp, "%s", tab ); - } - for ( l = 0; l < remaining_samples - 1; l++ ) - { fprintf( fp, format, vec[k * sample_per_ligne + l] ); - fprintf( fp, "f, " ); + fprintf( fp, "f}" ); } - fprintf( fp, format, vec[k * sample_per_ligne + l] ); - fprintf( fp, "f}" ); -} - -/*---------------------------------------------------------------------* - *write_array_float_to_file(); - *---------------------------------------------------------------------*/ -void write_array_uint16_to_file( FILE *fp, uint16_t *vec, int32_t size_vec, int32_t sample_per_ligne, const int num_tab, const char *tab ) -{ - int32_t k, l, num_iter, remaining_samples; - int16_t i; - if ( vec == NULL ) + /*---------------------------------------------------------------------* + *write_array_float_to_file(); + *---------------------------------------------------------------------*/ + void write_array_uint16_to_file( FILE * fp, uint16_t * vec, int32_t size_vec, int32_t sample_per_ligne, const int num_tab, const char *tab ) { - fprintf( fp, "NULL" ); - return; - } + int32_t k, l, num_iter, remaining_samples; + int16_t i; - num_iter = size_vec / sample_per_ligne; - remaining_samples = size_vec % sample_per_ligne; - if ( remaining_samples == 0 ) - { - num_iter--; - remaining_samples = sample_per_ligne; - } - for ( i = 0; i < num_tab; i++ ) - { - fprintf( fp, "%s", tab ); - } + if ( vec == NULL ) + { + fprintf( fp, "NULL" ); + return; + } - fprintf( fp, "{" ); - for ( k = 0; k < num_iter; k++ ) - { - if ( k != 0 ) + num_iter = size_vec / sample_per_ligne; + remaining_samples = size_vec % sample_per_ligne; + if ( remaining_samples == 0 ) + { + num_iter--; + remaining_samples = sample_per_ligne; + } + for ( i = 0; i < num_tab; i++ ) + { + fprintf( fp, "%s", tab ); + } + + fprintf( fp, "{" ); + for ( k = 0; k < num_iter; k++ ) { - for ( i = 0; i < num_tab; i++ ) + if ( k != 0 ) + { + for ( i = 0; i < num_tab; i++ ) + { + fprintf( fp, "%s", tab ); + } + } + for ( l = 0; l < sample_per_ligne; l++ ) { - fprintf( fp, "%s", tab ); + fprintf( fp, "%u", vec[k * sample_per_ligne + l] ); + fprintf( fp, ", " ); } + fprintf( fp, "\n" ); + } + for ( i = 0; i < num_tab; i++ ) + { + fprintf( fp, "%s", tab ); } - for ( l = 0; l < sample_per_ligne; l++ ) + for ( l = 0; l < remaining_samples - 1; l++ ) { fprintf( fp, "%u", vec[k * sample_per_ligne + l] ); fprintf( fp, ", " ); } - fprintf( fp, "\n" ); - } - for ( i = 0; i < num_tab; i++ ) - { - fprintf( fp, "%s", tab ); - } - for ( l = 0; l < remaining_samples - 1; l++ ) - { fprintf( fp, "%u", vec[k * sample_per_ligne + l] ); - fprintf( fp, ", " ); - } - fprintf( fp, "%u", vec[k * sample_per_ligne + l] ); - for ( i = 0; i < num_tab; i++ ) - { - fprintf( fp, "%s", tab ); + for ( i = 0; i < num_tab; i++ ) + { + fprintf( fp, "%s", tab ); + } + fprintf( fp, "}" ); } - fprintf( fp, "}" ); -} -/*---------------------------------------------------------------------* - *update_c_file(); - *---------------------------------------------------------------------*/ -void update_c_file( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, const int32_t samplerate, const int16_t frame_len, const int16_t sym_hrir ) -{ + /*---------------------------------------------------------------------* + *update_c_file(); + *---------------------------------------------------------------------*/ + void update_c_file( HRTFS_DATA * hrtf, struct ivas_layout_config lscfg, const int32_t samplerate, const int16_t frame_len, const int16_t sym_hrir ) + { - FILE *fp = fopen( c_file_path, "a" ); - int16_t i, j, nb_ear; - uint32_t *pTotalNumFreqSampPerIterations[2], maxTotalNumFreqSampPerIterations; - uint32_t pTotalNumFreqSampPerIterationsDiffuse[2], maxTotalNumFreqSampPerIterationsDiffuse; + FILE *fp = fopen( c_file_path, "a" ); + int16_t i, j, nb_ear; + uint32_t *pTotalNumFreqSampPerIterations[2], maxTotalNumFreqSampPerIterations; + uint32_t pTotalNumFreqSampPerIterationsDiffuse[2], maxTotalNumFreqSampPerIterationsDiffuse; - if ( fp == NULL ) - return; - if ( hrtf == NULL ) - return; + if ( fp == NULL ) + return; + if ( hrtf == NULL ) + return; - pTotalNumFreqSampPerIterations[0] = malloc( sizeof( uint32_t ) * hrtf->max_num_ir ); - pTotalNumFreqSampPerIterations[1] = malloc( sizeof( uint32_t ) * hrtf->max_num_ir ); + pTotalNumFreqSampPerIterations[0] = malloc( sizeof( uint32_t ) * hrtf->max_num_ir ); + pTotalNumFreqSampPerIterations[1] = malloc( sizeof( uint32_t ) * hrtf->max_num_ir ); - maxTotalNumFreqSampPerIterations = 0; - for ( i = 0; i < hrtf->max_num_ir; i++ ) - { - pTotalNumFreqSampPerIterations[0][i] = 0; - pTotalNumFreqSampPerIterations[1][i] = 0; - if ( sym_hrir <= 0 ) + maxTotalNumFreqSampPerIterations = 0; + for ( i = 0; i < hrtf->max_num_ir; i++ ) { - for ( j = 0; j < hrtf->num_iterations[i][0]; j++ ) + pTotalNumFreqSampPerIterations[0][i] = 0; + pTotalNumFreqSampPerIterations[1][i] = 0; + if ( sym_hrir <= 0 ) { - pTotalNumFreqSampPerIterations[0][i] += hrtf->pIndex_frequency_max[i][0][j]; + for ( j = 0; j < hrtf->num_iterations[i][0]; j++ ) + { + pTotalNumFreqSampPerIterations[0][i] += hrtf->pIndex_frequency_max[i][0][j]; + } + if ( maxTotalNumFreqSampPerIterations < pTotalNumFreqSampPerIterations[0][i] ) + { + maxTotalNumFreqSampPerIterations = pTotalNumFreqSampPerIterations[0][i]; + } } - if ( maxTotalNumFreqSampPerIterations < pTotalNumFreqSampPerIterations[0][i] ) + if ( sym_hrir != 0 ) { - maxTotalNumFreqSampPerIterations = pTotalNumFreqSampPerIterations[0][i]; + for ( j = 0; j < hrtf->num_iterations[i][1]; j++ ) + { + pTotalNumFreqSampPerIterations[1][i] += hrtf->pIndex_frequency_max[i][1][j]; + } + if ( maxTotalNumFreqSampPerIterations < pTotalNumFreqSampPerIterations[1][i] ) + { + maxTotalNumFreqSampPerIterations = pTotalNumFreqSampPerIterations[1][i]; + } } } - if ( sym_hrir != 0 ) + + pTotalNumFreqSampPerIterationsDiffuse[0] = 0; + pTotalNumFreqSampPerIterationsDiffuse[1] = 0; + maxTotalNumFreqSampPerIterationsDiffuse = 0; + if ( sym_hrir <= 0 ) { - for ( j = 0; j < hrtf->num_iterations[i][1]; j++ ) + for ( j = 0; j < hrtf->num_iterations_diffuse[0]; j++ ) { - pTotalNumFreqSampPerIterations[1][i] += hrtf->pIndex_frequency_max[i][1][j]; + pTotalNumFreqSampPerIterationsDiffuse[0] += hrtf->pIndex_frequency_max_diffuse[0][j]; } - if ( maxTotalNumFreqSampPerIterations < pTotalNumFreqSampPerIterations[1][i] ) + if ( maxTotalNumFreqSampPerIterationsDiffuse < pTotalNumFreqSampPerIterationsDiffuse[0] ) { - maxTotalNumFreqSampPerIterations = pTotalNumFreqSampPerIterations[1][i]; + maxTotalNumFreqSampPerIterationsDiffuse = pTotalNumFreqSampPerIterationsDiffuse[0]; } } - } - - pTotalNumFreqSampPerIterationsDiffuse[0] = 0; - pTotalNumFreqSampPerIterationsDiffuse[1] = 0; - maxTotalNumFreqSampPerIterationsDiffuse = 0; - if ( sym_hrir <= 0 ) - { - for ( j = 0; j < hrtf->num_iterations_diffuse[0]; j++ ) - { - pTotalNumFreqSampPerIterationsDiffuse[0] += hrtf->pIndex_frequency_max_diffuse[0][j]; - } - if ( maxTotalNumFreqSampPerIterationsDiffuse < pTotalNumFreqSampPerIterationsDiffuse[0] ) + if ( sym_hrir != 0 ) { - maxTotalNumFreqSampPerIterationsDiffuse = pTotalNumFreqSampPerIterationsDiffuse[0]; - } - } - if ( sym_hrir != 0 ) - { - for ( j = 0; j < hrtf->num_iterations_diffuse[1]; j++ ) - { - pTotalNumFreqSampPerIterationsDiffuse[1] += hrtf->pIndex_frequency_max_diffuse[1][j]; - } - if ( maxTotalNumFreqSampPerIterationsDiffuse < pTotalNumFreqSampPerIterationsDiffuse[1] ) - { - maxTotalNumFreqSampPerIterationsDiffuse = pTotalNumFreqSampPerIterationsDiffuse[1]; + for ( j = 0; j < hrtf->num_iterations_diffuse[1]; j++ ) + { + pTotalNumFreqSampPerIterationsDiffuse[1] += hrtf->pIndex_frequency_max_diffuse[1][j]; + } + if ( maxTotalNumFreqSampPerIterationsDiffuse < pTotalNumFreqSampPerIterationsDiffuse[1] ) + { + maxTotalNumFreqSampPerIterationsDiffuse = pTotalNumFreqSampPerIterationsDiffuse[1]; + } } - } - nb_ear = sym_hrir < 0 ? 2 : 1; - if ( samplerate == DEFAULT_SAMPLERATE ) - { - /* float latency_s; */ - fprintf( fp, "\n\n/********************** %s_%s **********************/\n", DECLARATION_NAME, lscfg.name ); + nb_ear = sym_hrir < 0 ? 2 : 1; + if ( samplerate == DEFAULT_SAMPLERATE ) + { + /* float latency_s; */ + fprintf( fp, "\n\n/********************** %s_%s **********************/\n", DECLARATION_NAME, lscfg.name ); #ifdef USE_SYMETRIC_HRIR_FILTERS - fprintf( fp, "\nconst uint16_t %s_%s_Use_Symetric_Filters = %d; /* 0 not symetric, 1 left, 2 right */", DECLARATION_NAME, lscfg.name, sym_hrir + 1 ); + fprintf( fp, "\nconst uint16_t %s_%s_Use_Symetric_Filters = %d; /* 0 not symetric, 1 left, 2 right */", DECLARATION_NAME, lscfg.name, sym_hrir + 1 ); #endif #ifdef FIX_BINAURAL_DELAY_PRECISION - fprintf( fp, "\n#ifdef FIX_BINAURAL_DELAY_PRECISION\nconst float %s_%s_latency_s = %10.9ff;\n#else", DECLARATION_NAME, lscfg.name, hrtf->latency_s ); - fprintf( fp, "\nconst float %s_%s_latency_s = %16.15ff;\n#endif", DECLARATION_NAME, lscfg.name, hrtf->latency_s - 0.000000001f ); +#ifdef UPDATE_SBA_FILTER + fprintf( fp, "\n#ifdef FIX_BINAURAL_DELAY_PRECISION\nconst float %s_%s_latency_s = %10.9ff;\n#else", DECLARATION_NAME, lscfg.name, hrtf->latency_s ); + fprintf( fp, "\nconst float %s_%s_latency_s = %16.15ff;\n#endif", DECLARATION_NAME, lscfg.name, hrtf->latency_s - 0.000000001f ); #else - fprintf( fp, "\nconst float %s_%s_latency_s = %16.15ff;", DECLARATION_NAME, lscfg.name, hrtf->latency_s ); + fprintf( fp, "\nconst float %s_%s_latency_s = %16.15ff;", DECLARATION_NAME, lscfg.name, hrtf->latency_s ); #endif - } + } - fprintf( fp, "\n\n/* Sample Rate = %ld */\n", (long) samplerate ); + fprintf( fp, "\n\n/* Sample Rate = %ld */\n", (long) samplerate ); - /* int16_t max_num_iterations; */ - fprintf( fp, "\nconst int16_t %s_%s_max_num_iterations_%2dkHz = %d;", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_iterations ); - /* uint16_t num_iterations[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS];*/ - if ( sym_hrir < 0 ) - { - fprintf( fp, "\nconst uint16_t %s_%s_num_iterations_%2dkHz[%d][BINAURAL_CHANNELS]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir ); - } - else - { - fprintf( fp, "\nconst uint16_t %s_%s_num_iterations_%2dkHz[%d][%d]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, nb_ear ); - } - for ( i = 0; i < hrtf->max_num_ir - 1; i++ ) - { + /* int16_t max_num_iterations; */ + fprintf( fp, "\nconst int16_t %s_%s_max_num_iterations_%2dkHz = %d;", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_iterations ); + /* uint16_t num_iterations[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS];*/ + if ( sym_hrir < 0 ) + { + fprintf( fp, "\nconst uint16_t %s_%s_num_iterations_%2dkHz[%d][BINAURAL_CHANNELS]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir ); + } + else + { + fprintf( fp, "\nconst uint16_t %s_%s_num_iterations_%2dkHz[%d][%d]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, nb_ear ); + } + for ( i = 0; i < hrtf->max_num_ir - 1; i++ ) + { + if ( nb_ear == 2 ) + fprintf( fp, "{%u, %u}, ", hrtf->num_iterations[i][0], hrtf->num_iterations[i][1] ); + else + fprintf( fp, "{%u}, ", hrtf->num_iterations[i][sym_hrir] ); + } if ( nb_ear == 2 ) - fprintf( fp, "{%u, %u}, ", hrtf->num_iterations[i][0], hrtf->num_iterations[i][1] ); + fprintf( fp, "{%u, %u} ", hrtf->num_iterations[i][0], hrtf->num_iterations[i][1] ); else - fprintf( fp, "{%u}, ", hrtf->num_iterations[i][sym_hrir] ); - } - if ( nb_ear == 2 ) - fprintf( fp, "{%u, %u} ", hrtf->num_iterations[i][0], hrtf->num_iterations[i][1] ); - else - fprintf( fp, "{%u} ", hrtf->num_iterations[i][sym_hrir] ); + fprintf( fp, "{%u} ", hrtf->num_iterations[i][sym_hrir] ); - fprintf( fp, "};" ); + fprintf( fp, "};" ); - /* uint16_t num_iterations_diffuse[BINAURAL_CHANNELS];*/ - if ( nb_ear == 2 ) - fprintf( fp, "\nconst uint16_t %s_%s_num_iterations_diffuse_%2dkHz[BINAURAL_CHANNELS] = {%u, %u};", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->num_iterations_diffuse[0], hrtf->num_iterations_diffuse[1] ); - else - fprintf( fp, "\nconst uint16_t %s_%s_num_iterations_diffuse_%2dkHz[%d] = {%u};", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear, hrtf->num_iterations_diffuse[sym_hrir] ); + /* uint16_t num_iterations_diffuse[BINAURAL_CHANNELS];*/ + if ( nb_ear == 2 ) + fprintf( fp, "\nconst uint16_t %s_%s_num_iterations_diffuse_%2dkHz[BINAURAL_CHANNELS] = {%u, %u};", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->num_iterations_diffuse[0], hrtf->num_iterations_diffuse[1] ); + else + fprintf( fp, "\nconst uint16_t %s_%s_num_iterations_diffuse_%2dkHz[%d] = {%u};", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear, hrtf->num_iterations_diffuse[sym_hrir] ); - /*uint16_t *pIndex_frequency_max[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS]; */ - if ( sym_hrir < 0 ) - { - fprintf( fp, "\nconst uint16_t %s_%s_pIndex_frequency_max_%2dkHz[%d][BINAURAL_CHANNELS][%d]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, hrtf->max_num_iterations ); - } - else - { - fprintf( fp, "\nconst uint16_t %s_%s_pIndex_frequency_max_%2dkHz[%d][%d][%d]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, nb_ear, hrtf->max_num_iterations ); - } - for ( i = 0; i < hrtf->max_num_ir - 1; i++ ) - { + /*uint16_t *pIndex_frequency_max[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS]; */ + if ( sym_hrir < 0 ) + { + fprintf( fp, "\nconst uint16_t %s_%s_pIndex_frequency_max_%2dkHz[%d][BINAURAL_CHANNELS][%d]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, hrtf->max_num_iterations ); + } + else + { + fprintf( fp, "\nconst uint16_t %s_%s_pIndex_frequency_max_%2dkHz[%d][%d][%d]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, nb_ear, hrtf->max_num_iterations ); + } + for ( i = 0; i < hrtf->max_num_ir - 1; i++ ) + { + fprintf( fp, "{" ); + if ( hrtf->pIndex_frequency_max[i][0] && ( sym_hrir <= 0 ) ) + { + write_array_uint16_to_file( fp, hrtf->pIndex_frequency_max[i][0], hrtf->max_num_iterations, hrtf->max_num_iterations, 0, TAB_WITH_SPACE_OR_NOT ); + if ( nb_ear == 2 ) + fprintf( fp, "," ); + } + if ( hrtf->pIndex_frequency_max[i][1] && ( sym_hrir != 0 ) ) + { + write_array_uint16_to_file( fp, hrtf->pIndex_frequency_max[i][1], hrtf->max_num_iterations, hrtf->max_num_iterations, 0, TAB_WITH_SPACE_OR_NOT ); + } + fprintf( fp, "}," ); + } fprintf( fp, "{" ); if ( hrtf->pIndex_frequency_max[i][0] && ( sym_hrir <= 0 ) ) { @@ -1370,83 +1424,86 @@ void update_c_file( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, const int { write_array_uint16_to_file( fp, hrtf->pIndex_frequency_max[i][1], hrtf->max_num_iterations, hrtf->max_num_iterations, 0, TAB_WITH_SPACE_OR_NOT ); } - fprintf( fp, "}," ); - } - fprintf( fp, "{" ); - if ( hrtf->pIndex_frequency_max[i][0] && ( sym_hrir <= 0 ) ) - { - write_array_uint16_to_file( fp, hrtf->pIndex_frequency_max[i][0], hrtf->max_num_iterations, hrtf->max_num_iterations, 0, TAB_WITH_SPACE_OR_NOT ); - if ( nb_ear == 2 ) - fprintf( fp, "," ); - } - if ( hrtf->pIndex_frequency_max[i][1] && ( sym_hrir != 0 ) ) - { - write_array_uint16_to_file( fp, hrtf->pIndex_frequency_max[i][1], hrtf->max_num_iterations, hrtf->max_num_iterations, 0, TAB_WITH_SPACE_OR_NOT ); - } - fprintf( fp, "}" ); - fprintf( fp, "};" ); + fprintf( fp, "}" ); + fprintf( fp, "};" ); - /* uint16_t index_frequency_max_diffuse; */ - fprintf( fp, "\nconst uint16_t %s_%s_index_frequency_max_diffuse_%2dkHz = %d;", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->index_frequency_max_diffuse ); + /* uint16_t index_frequency_max_diffuse; */ + fprintf( fp, "\nconst uint16_t %s_%s_index_frequency_max_diffuse_%2dkHz = %d;", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->index_frequency_max_diffuse ); - /* float inv_diffuse_weight[MAX_INTERN_CHANNELS]; */ - fprintf( fp, "\nconst float %s_%s_inv_diffuse_weight_%2dkHz[%u]=", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir ); - write_array_float_to_file( fp, hrtf->inv_diffuse_weight, hrtf->max_num_ir, hrtf->max_num_ir, FORMAT_FLOAT, 0, TAB_WITH_SPACE_OR_NOT ); - fprintf( fp, ";" ); + /* float inv_diffuse_weight[MAX_INTERN_CHANNELS]; */ + fprintf( fp, "\nconst float %s_%s_inv_diffuse_weight_%2dkHz[%u]=", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir ); + write_array_float_to_file( fp, hrtf->inv_diffuse_weight, hrtf->max_num_ir, hrtf->max_num_ir, FORMAT_FLOAT, 0, TAB_WITH_SPACE_OR_NOT ); + fprintf( fp, ";" ); - /* uint16_t *pIndex_frequency_max_diffuse[BINAURAL_CHANNELS];*/ - if ( hrtf->pIndex_frequency_max_diffuse[0] == NULL ) - { - if ( sym_hrir < 0 ) - { - fprintf( fp, "\nconst uint16_t *%s_%s_pIndex_frequency_max_diffuse_%2dkHz[BINAURAL_CHANNELS]=%s;", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear == 2 ? "{NULL,NULL}" : "{NULL}" ); - } - else - { - fprintf( fp, "\nconst uint16_t *%s_%s_pIndex_frequency_max_diffuse_%2dkHz[%d]=%s;", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear, nb_ear == 2 ? "{NULL,NULL}" : "{NULL}" ); - } - } - else - { - if ( sym_hrir <= 0 ) + /* uint16_t *pIndex_frequency_max_diffuse[BINAURAL_CHANNELS];*/ + if ( hrtf->pIndex_frequency_max_diffuse[0] == NULL ) { if ( sym_hrir < 0 ) { - fprintf( fp, "\nconst uint16_t %s_%s_pIndex_frequency_max_diffuse_%2dkHz[BINAURAL_CHANNELS][%u]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, ( hrtf->num_iterations_diffuse[0] > hrtf->num_iterations_diffuse[1] ) ? hrtf->num_iterations_diffuse[0] : hrtf->num_iterations_diffuse[1] ); + fprintf( fp, "\nconst uint16_t *%s_%s_pIndex_frequency_max_diffuse_%2dkHz[BINAURAL_CHANNELS]=%s;", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear == 2 ? "{NULL,NULL}" : "{NULL}" ); } else { - fprintf( fp, "\nconst uint16_t %s_%s_pIndex_frequency_max_diffuse_%2dkHz[%d][%u]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear, ( hrtf->num_iterations_diffuse[0] > hrtf->num_iterations_diffuse[1] ) ? hrtf->num_iterations_diffuse[0] : hrtf->num_iterations_diffuse[1] ); + fprintf( fp, "\nconst uint16_t *%s_%s_pIndex_frequency_max_diffuse_%2dkHz[%d]=%s;", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear, nb_ear == 2 ? "{NULL,NULL}" : "{NULL}" ); } + } + else + { + if ( sym_hrir <= 0 ) + { + if ( sym_hrir < 0 ) + { + fprintf( fp, "\nconst uint16_t %s_%s_pIndex_frequency_max_diffuse_%2dkHz[BINAURAL_CHANNELS][%u]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, ( hrtf->num_iterations_diffuse[0] > hrtf->num_iterations_diffuse[1] ) ? hrtf->num_iterations_diffuse[0] : hrtf->num_iterations_diffuse[1] ); + } + else + { + fprintf( fp, "\nconst uint16_t %s_%s_pIndex_frequency_max_diffuse_%2dkHz[%d][%u]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear, ( hrtf->num_iterations_diffuse[0] > hrtf->num_iterations_diffuse[1] ) ? hrtf->num_iterations_diffuse[0] : hrtf->num_iterations_diffuse[1] ); + } - if ( hrtf->pIndex_frequency_max_diffuse[0] && ( sym_hrir <= 0 ) ) + if ( hrtf->pIndex_frequency_max_diffuse[0] && ( sym_hrir <= 0 ) ) + { + write_array_uint16_to_file( fp, hrtf->pIndex_frequency_max_diffuse[0], hrtf->num_iterations_diffuse[0], hrtf->num_iterations_diffuse[0], 0, TAB_WITH_SPACE_OR_NOT ); + if ( nb_ear == 2 ) + fprintf( fp, "," ); + } + } + if ( sym_hrir != 0 ) { - write_array_uint16_to_file( fp, hrtf->pIndex_frequency_max_diffuse[0], hrtf->num_iterations_diffuse[0], hrtf->num_iterations_diffuse[0], 0, TAB_WITH_SPACE_OR_NOT ); - if ( nb_ear == 2 ) - fprintf( fp, "," ); + if ( hrtf->pIndex_frequency_max_diffuse[1] && ( sym_hrir != 0 ) ) + { + write_array_uint16_to_file( fp, hrtf->pIndex_frequency_max_diffuse[1], hrtf->num_iterations_diffuse[1], hrtf->num_iterations_diffuse[1], 0, TAB_WITH_SPACE_OR_NOT ); + } } + fprintf( fp, "};" ); } - if ( sym_hrir != 0 ) + + /* float *pOut_to_bin[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS];*/ + if ( sym_hrir < 0 ) + { + fprintf( fp, "\nconst float %s_%s_coeff_re_%2dkHz[%d][BINAURAL_CHANNELS][%u]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, maxTotalNumFreqSampPerIterations ); + } + else { - if ( hrtf->pIndex_frequency_max_diffuse[1] && ( sym_hrir != 0 ) ) + fprintf( fp, "\nconst float %s_%s_coeff_re_%2dkHz[%d][%d][%u]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, nb_ear, maxTotalNumFreqSampPerIterations ); + } + for ( i = 0; i < hrtf->max_num_ir - 1; i++ ) + { + fprintf( fp, "\n%s{\n", TAB_WITH_SPACE_OR_NOT ); + if ( hrtf->pOut_to_bin_re[i][0] && ( sym_hrir <= 0 ) ) + { + write_array_float_to_file( fp, hrtf->pOut_to_bin_re[i][0], pTotalNumFreqSampPerIterations[0][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT ); + } + if ( nb_ear == 2 ) + fprintf( fp, ",\n" ); + if ( hrtf->pOut_to_bin_re[i][1] && ( sym_hrir != 0 ) ) { - write_array_uint16_to_file( fp, hrtf->pIndex_frequency_max_diffuse[1], hrtf->num_iterations_diffuse[1], hrtf->num_iterations_diffuse[1], 0, TAB_WITH_SPACE_OR_NOT ); + write_array_float_to_file( fp, hrtf->pOut_to_bin_re[i][1], pTotalNumFreqSampPerIterations[1][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT ); } + if ( nb_ear == 2 ) + fprintf( fp, "\n%s},", TAB_WITH_SPACE_OR_NOT ); + else + fprintf( fp, "%s},", TAB_WITH_SPACE_OR_NOT ); } - fprintf( fp, "};" ); - } - - /* float *pOut_to_bin[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS];*/ - if ( sym_hrir < 0 ) - { - fprintf( fp, "\nconst float %s_%s_coeff_re_%2dkHz[%d][BINAURAL_CHANNELS][%u]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, maxTotalNumFreqSampPerIterations ); - } - else - { - fprintf( fp, "\nconst float %s_%s_coeff_re_%2dkHz[%d][%d][%u]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, nb_ear, maxTotalNumFreqSampPerIterations ); - } - for ( i = 0; i < hrtf->max_num_ir - 1; i++ ) - { fprintf( fp, "\n%s{\n", TAB_WITH_SPACE_OR_NOT ); if ( hrtf->pOut_to_bin_re[i][0] && ( sym_hrir <= 0 ) ) { @@ -1459,1113 +1516,1097 @@ void update_c_file( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, const int write_array_float_to_file( fp, hrtf->pOut_to_bin_re[i][1], pTotalNumFreqSampPerIterations[1][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT ); } if ( nb_ear == 2 ) - fprintf( fp, "\n%s},", TAB_WITH_SPACE_OR_NOT ); + fprintf( fp, "\n%s}", TAB_WITH_SPACE_OR_NOT ); else - fprintf( fp, "%s},", TAB_WITH_SPACE_OR_NOT ); - } - fprintf( fp, "\n%s{\n", TAB_WITH_SPACE_OR_NOT ); - if ( hrtf->pOut_to_bin_re[i][0] && ( sym_hrir <= 0 ) ) - { - write_array_float_to_file( fp, hrtf->pOut_to_bin_re[i][0], pTotalNumFreqSampPerIterations[0][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT ); - } - if ( nb_ear == 2 ) - fprintf( fp, ",\n" ); - if ( hrtf->pOut_to_bin_re[i][1] && ( sym_hrir != 0 ) ) - { - write_array_float_to_file( fp, hrtf->pOut_to_bin_re[i][1], pTotalNumFreqSampPerIterations[1][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT ); - } - if ( nb_ear == 2 ) - fprintf( fp, "\n%s}", TAB_WITH_SPACE_OR_NOT ); - else - fprintf( fp, "%s}", TAB_WITH_SPACE_OR_NOT ); - fprintf( fp, "\n};" ); + fprintf( fp, "%s}", TAB_WITH_SPACE_OR_NOT ); + fprintf( fp, "\n};" ); - if ( sym_hrir < 0 ) - { - fprintf( fp, "\nconst float %s_%s_coeff_im_%2dkHz[%d][BINAURAL_CHANNELS][%u]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, maxTotalNumFreqSampPerIterations ); - } - else - { - fprintf( fp, "\nconst float %s_%s_coeff_im_%2dkHz[%d][%d][%u]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, nb_ear, maxTotalNumFreqSampPerIterations ); - } - for ( i = 0; i < hrtf->max_num_ir - 1; i++ ) - { - fprintf( fp, "\n%s{\n", TAB_WITH_SPACE_OR_NOT ); - if ( hrtf->pOut_to_bin_im[i][0] && ( sym_hrir <= 0 ) ) - { - write_array_float_to_file( fp, hrtf->pOut_to_bin_im[i][0], pTotalNumFreqSampPerIterations[0][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT ); - } - if ( nb_ear == 2 ) - fprintf( fp, ",\n" ); - if ( hrtf->pOut_to_bin_im[i][1] && ( sym_hrir != 0 ) ) - { - write_array_float_to_file( fp, hrtf->pOut_to_bin_im[i][1], pTotalNumFreqSampPerIterations[1][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT ); - } - if ( nb_ear == 2 ) - fprintf( fp, "\n%s},", TAB_WITH_SPACE_OR_NOT ); - else - fprintf( fp, "%s},", TAB_WITH_SPACE_OR_NOT ); - } - fprintf( fp, "\n%s{\n", TAB_WITH_SPACE_OR_NOT ); - if ( hrtf->pOut_to_bin_im[i][0] && ( sym_hrir <= 0 ) ) - { - write_array_float_to_file( fp, hrtf->pOut_to_bin_im[i][0], pTotalNumFreqSampPerIterations[0][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT ); - } - if ( nb_ear == 2 ) - fprintf( fp, ",\n" ); - if ( hrtf->pOut_to_bin_im[i][1] && ( sym_hrir != 0 ) ) - { - write_array_float_to_file( fp, hrtf->pOut_to_bin_im[i][1], pTotalNumFreqSampPerIterations[1][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT ); - } - if ( nb_ear == 2 ) - fprintf( fp, "\n%s}", TAB_WITH_SPACE_OR_NOT ); - else - fprintf( fp, "%s}", TAB_WITH_SPACE_OR_NOT ); - fprintf( fp, "\n};" ); - - /* float *pOut_to_bin_diffuse_re[BINAURAL_CHANNELS];*/ - if ( hrtf->pOut_to_bin_diffuse_re[0] == NULL ) - { if ( sym_hrir < 0 ) { - fprintf( fp, "\nconst float *%s_%s_coeff_diffuse_re_%2dkHz[BINAURAL_CHANNELS]=%s;", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear == 2 ? "{NULL,NULL}" : "{NULL}" ); + fprintf( fp, "\nconst float %s_%s_coeff_im_%2dkHz[%d][BINAURAL_CHANNELS][%u]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, maxTotalNumFreqSampPerIterations ); } else { - fprintf( fp, "\nconst float *%s_%s_coeff_diffuse_re_%2dkHz[%d]=%s;", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear, nb_ear == 2 ? "{NULL,NULL}" : "{NULL}" ); + fprintf( fp, "\nconst float %s_%s_coeff_im_%2dkHz[%d][%d][%u]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, nb_ear, maxTotalNumFreqSampPerIterations ); } - } - else - { - if ( sym_hrir < 0 ) - { - fprintf( fp, "\nconst float %s_%s_coeff_diffuse_re_%2dkHz[BINAURAL_CHANNELS][%u]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, maxTotalNumFreqSampPerIterationsDiffuse ); - } - else + for ( i = 0; i < hrtf->max_num_ir - 1; i++ ) { - fprintf( fp, "\nconst float %s_%s_coeff_diffuse_re_%2dkHz[%d][%u]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear, maxTotalNumFreqSampPerIterationsDiffuse ); + fprintf( fp, "\n%s{\n", TAB_WITH_SPACE_OR_NOT ); + if ( hrtf->pOut_to_bin_im[i][0] && ( sym_hrir <= 0 ) ) + { + write_array_float_to_file( fp, hrtf->pOut_to_bin_im[i][0], pTotalNumFreqSampPerIterations[0][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT ); + } + if ( nb_ear == 2 ) + fprintf( fp, ",\n" ); + if ( hrtf->pOut_to_bin_im[i][1] && ( sym_hrir != 0 ) ) + { + write_array_float_to_file( fp, hrtf->pOut_to_bin_im[i][1], pTotalNumFreqSampPerIterations[1][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT ); + } + if ( nb_ear == 2 ) + fprintf( fp, "\n%s},", TAB_WITH_SPACE_OR_NOT ); + else + fprintf( fp, "%s},", TAB_WITH_SPACE_OR_NOT ); } - if ( hrtf->pOut_to_bin_diffuse_re[0] ) + fprintf( fp, "\n%s{\n", TAB_WITH_SPACE_OR_NOT ); + if ( hrtf->pOut_to_bin_im[i][0] && ( sym_hrir <= 0 ) ) { - write_array_float_to_file( fp, hrtf->pOut_to_bin_diffuse_re[0], pTotalNumFreqSampPerIterationsDiffuse[0], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT ); + write_array_float_to_file( fp, hrtf->pOut_to_bin_im[i][0], pTotalNumFreqSampPerIterations[0][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT ); } if ( nb_ear == 2 ) fprintf( fp, ",\n" ); - if ( hrtf->pOut_to_bin_diffuse_re[1] ) + if ( hrtf->pOut_to_bin_im[i][1] && ( sym_hrir != 0 ) ) { - write_array_float_to_file( fp, hrtf->pOut_to_bin_diffuse_re[1], pTotalNumFreqSampPerIterationsDiffuse[1], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT ); + write_array_float_to_file( fp, hrtf->pOut_to_bin_im[i][1], pTotalNumFreqSampPerIterations[1][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT ); } if ( nb_ear == 2 ) - fprintf( fp, "\n};" ); + fprintf( fp, "\n%s}", TAB_WITH_SPACE_OR_NOT ); else - fprintf( fp, "};" ); - } + fprintf( fp, "%s}", TAB_WITH_SPACE_OR_NOT ); + fprintf( fp, "\n};" ); - /* float *pOut_to_bin_diffuse_im[BINAURAL_CHANNELS];*/ - if ( hrtf->pOut_to_bin_diffuse_im[0] == NULL ) - { - if ( sym_hrir < 0 ) + /* float *pOut_to_bin_diffuse_re[BINAURAL_CHANNELS];*/ + if ( hrtf->pOut_to_bin_diffuse_re[0] == NULL ) { - fprintf( fp, "\nconst float *%s_%s_coeff_diffuse_im_%2dkHz[BINAURAL_CHANNELS]=%s;", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear == 2 ? "{NULL,NULL}" : "{NULL}" ); + if ( sym_hrir < 0 ) + { + fprintf( fp, "\nconst float *%s_%s_coeff_diffuse_re_%2dkHz[BINAURAL_CHANNELS]=%s;", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear == 2 ? "{NULL,NULL}" : "{NULL}" ); + } + else + { + fprintf( fp, "\nconst float *%s_%s_coeff_diffuse_re_%2dkHz[%d]=%s;", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear, nb_ear == 2 ? "{NULL,NULL}" : "{NULL}" ); + } } else { - fprintf( fp, "\nconst float *%s_%s_coeff_diffuse_im_%2dkHz[%d]=%s;", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear, nb_ear == 2 ? "{NULL,NULL}" : "{NULL}" ); + if ( sym_hrir < 0 ) + { + fprintf( fp, "\nconst float %s_%s_coeff_diffuse_re_%2dkHz[BINAURAL_CHANNELS][%u]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, maxTotalNumFreqSampPerIterationsDiffuse ); + } + else + { + fprintf( fp, "\nconst float %s_%s_coeff_diffuse_re_%2dkHz[%d][%u]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear, maxTotalNumFreqSampPerIterationsDiffuse ); + } + if ( hrtf->pOut_to_bin_diffuse_re[0] ) + { + write_array_float_to_file( fp, hrtf->pOut_to_bin_diffuse_re[0], pTotalNumFreqSampPerIterationsDiffuse[0], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT ); + } + if ( nb_ear == 2 ) + fprintf( fp, ",\n" ); + if ( hrtf->pOut_to_bin_diffuse_re[1] ) + { + write_array_float_to_file( fp, hrtf->pOut_to_bin_diffuse_re[1], pTotalNumFreqSampPerIterationsDiffuse[1], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT ); + } + if ( nb_ear == 2 ) + fprintf( fp, "\n};" ); + else + fprintf( fp, "};" ); } - } - else - { - if ( sym_hrir < 0 ) + + /* float *pOut_to_bin_diffuse_im[BINAURAL_CHANNELS];*/ + if ( hrtf->pOut_to_bin_diffuse_im[0] == NULL ) { - fprintf( fp, "\nconst float %s_%s_coeff_diffuse_im_%2dkHz[BINAURAL_CHANNELS][%u]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, maxTotalNumFreqSampPerIterationsDiffuse ); + if ( sym_hrir < 0 ) + { + fprintf( fp, "\nconst float *%s_%s_coeff_diffuse_im_%2dkHz[BINAURAL_CHANNELS]=%s;", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear == 2 ? "{NULL,NULL}" : "{NULL}" ); + } + else + { + fprintf( fp, "\nconst float *%s_%s_coeff_diffuse_im_%2dkHz[%d]=%s;", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear, nb_ear == 2 ? "{NULL,NULL}" : "{NULL}" ); + } } else { - fprintf( fp, "\nconst float %s_%s_coeff_diffuse_im_%2dkHz[%d][%u]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear, maxTotalNumFreqSampPerIterationsDiffuse ); + if ( sym_hrir < 0 ) + { + fprintf( fp, "\nconst float %s_%s_coeff_diffuse_im_%2dkHz[BINAURAL_CHANNELS][%u]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, maxTotalNumFreqSampPerIterationsDiffuse ); + } + else + { + fprintf( fp, "\nconst float %s_%s_coeff_diffuse_im_%2dkHz[%d][%u]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear, maxTotalNumFreqSampPerIterationsDiffuse ); + } + if ( hrtf->pOut_to_bin_diffuse_im[0] ) + { + write_array_float_to_file( fp, hrtf->pOut_to_bin_diffuse_im[0], pTotalNumFreqSampPerIterationsDiffuse[0], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT ); + } + if ( nb_ear == 2 ) + fprintf( fp, ",\n" ); + if ( hrtf->pOut_to_bin_diffuse_im[1] ) + { + write_array_float_to_file( fp, hrtf->pOut_to_bin_diffuse_im[1], pTotalNumFreqSampPerIterationsDiffuse[1], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT ); + } + if ( nb_ear == 2 ) + fprintf( fp, "\n};" ); + else + fprintf( fp, "};" ); } - if ( hrtf->pOut_to_bin_diffuse_im[0] ) + + if ( fp ) + fclose( fp ); + + if ( pTotalNumFreqSampPerIterations[0] ) { - write_array_float_to_file( fp, hrtf->pOut_to_bin_diffuse_im[0], pTotalNumFreqSampPerIterationsDiffuse[0], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT ); + free( pTotalNumFreqSampPerIterations[0] ); } - if ( nb_ear == 2 ) - fprintf( fp, ",\n" ); - if ( hrtf->pOut_to_bin_diffuse_im[1] ) + if ( pTotalNumFreqSampPerIterations[1] ) { - write_array_float_to_file( fp, hrtf->pOut_to_bin_diffuse_im[1], pTotalNumFreqSampPerIterationsDiffuse[1], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT ); + free( pTotalNumFreqSampPerIterations[1] ); } - if ( nb_ear == 2 ) - fprintf( fp, "\n};" ); - else - fprintf( fp, "};" ); - } - if ( fp ) - fclose( fp ); - - if ( pTotalNumFreqSampPerIterations[0] ) - { - free( pTotalNumFreqSampPerIterations[0] ); - } - if ( pTotalNumFreqSampPerIterations[1] ) - { - free( pTotalNumFreqSampPerIterations[1] ); + return; } - return; -} + /*---------------------------------------------------------------------* + *update_h_file(); + *---------------------------------------------------------------------*/ + void update_h_file( HRTFS_DATA * hrtf, struct ivas_layout_config lscfg, const int32_t samplerate, const int16_t frame_len, const int16_t sym_hrir ) + { + uint16_t i, j, nb_ear; + uint32_t *pTotalNumFreqSampPerIterations[2], maxTotalNumFreqSampPerIterations; + uint32_t pTotalNumFreqSampPerIterationsDiffuse[2], maxTotalNumFreqSampPerIterationsDiffuse; -/*---------------------------------------------------------------------* - *update_h_file(); - *---------------------------------------------------------------------*/ -void update_h_file( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, const int32_t samplerate, const int16_t frame_len, const int16_t sym_hrir ) -{ - uint16_t i, j, nb_ear; - uint32_t *pTotalNumFreqSampPerIterations[2], maxTotalNumFreqSampPerIterations; - uint32_t pTotalNumFreqSampPerIterationsDiffuse[2], maxTotalNumFreqSampPerIterationsDiffuse; + pTotalNumFreqSampPerIterations[0] = malloc( sizeof( float ) * hrtf->max_num_ir ); + pTotalNumFreqSampPerIterations[1] = malloc( sizeof( float ) * hrtf->max_num_ir ); + FILE *fp = fopen( h_file_path, "a" ); - pTotalNumFreqSampPerIterations[0] = malloc( sizeof( float ) * hrtf->max_num_ir ); - pTotalNumFreqSampPerIterations[1] = malloc( sizeof( float ) * hrtf->max_num_ir ); - FILE *fp = fopen( h_file_path, "a" ); + if ( fp == NULL ) + return; + if ( hrtf == NULL ) + return; - if ( fp == NULL ) - return; - if ( hrtf == NULL ) - return; + nb_ear = sym_hrir < 0 ? 2 : 1; + maxTotalNumFreqSampPerIterations = 0; + for ( i = 0; i < hrtf->max_num_ir; i++ ) + { + pTotalNumFreqSampPerIterations[0][i] = 0; + pTotalNumFreqSampPerIterations[1][i] = 0; + if ( sym_hrir <= 0 ) + { + for ( j = 0; j < hrtf->num_iterations[i][0]; j++ ) + { + pTotalNumFreqSampPerIterations[0][i] += hrtf->pIndex_frequency_max[i][0][j]; + } + if ( maxTotalNumFreqSampPerIterations < pTotalNumFreqSampPerIterations[0][i] ) + { + maxTotalNumFreqSampPerIterations = pTotalNumFreqSampPerIterations[0][i]; + } + } + if ( sym_hrir != 0 ) + { + for ( j = 0; j < hrtf->num_iterations[i][1]; j++ ) + { + pTotalNumFreqSampPerIterations[1][i] += hrtf->pIndex_frequency_max[i][1][j]; + } + if ( maxTotalNumFreqSampPerIterations < pTotalNumFreqSampPerIterations[1][i] ) + { + maxTotalNumFreqSampPerIterations = pTotalNumFreqSampPerIterations[1][i]; + } + } + } - nb_ear = sym_hrir < 0 ? 2 : 1; - maxTotalNumFreqSampPerIterations = 0; - for ( i = 0; i < hrtf->max_num_ir; i++ ) - { - pTotalNumFreqSampPerIterations[0][i] = 0; - pTotalNumFreqSampPerIterations[1][i] = 0; + pTotalNumFreqSampPerIterationsDiffuse[0] = 0; + pTotalNumFreqSampPerIterationsDiffuse[1] = 0; + maxTotalNumFreqSampPerIterationsDiffuse = 0; if ( sym_hrir <= 0 ) { - for ( j = 0; j < hrtf->num_iterations[i][0]; j++ ) + for ( j = 0; j < hrtf->num_iterations_diffuse[0]; j++ ) { - pTotalNumFreqSampPerIterations[0][i] += hrtf->pIndex_frequency_max[i][0][j]; + pTotalNumFreqSampPerIterationsDiffuse[0] += hrtf->pIndex_frequency_max_diffuse[0][j]; } - if ( maxTotalNumFreqSampPerIterations < pTotalNumFreqSampPerIterations[0][i] ) + if ( maxTotalNumFreqSampPerIterationsDiffuse < pTotalNumFreqSampPerIterationsDiffuse[0] ) { - maxTotalNumFreqSampPerIterations = pTotalNumFreqSampPerIterations[0][i]; + maxTotalNumFreqSampPerIterationsDiffuse = pTotalNumFreqSampPerIterationsDiffuse[0]; } } if ( sym_hrir != 0 ) { - for ( j = 0; j < hrtf->num_iterations[i][1]; j++ ) + for ( j = 0; j < hrtf->num_iterations_diffuse[1]; j++ ) { - pTotalNumFreqSampPerIterations[1][i] += hrtf->pIndex_frequency_max[i][1][j]; + pTotalNumFreqSampPerIterationsDiffuse[1] += hrtf->pIndex_frequency_max_diffuse[1][j]; } - if ( maxTotalNumFreqSampPerIterations < pTotalNumFreqSampPerIterations[1][i] ) + if ( maxTotalNumFreqSampPerIterationsDiffuse < pTotalNumFreqSampPerIterationsDiffuse[1] ) { - maxTotalNumFreqSampPerIterations = pTotalNumFreqSampPerIterations[1][i]; + maxTotalNumFreqSampPerIterationsDiffuse = pTotalNumFreqSampPerIterationsDiffuse[1]; } } - } - pTotalNumFreqSampPerIterationsDiffuse[0] = 0; - pTotalNumFreqSampPerIterationsDiffuse[1] = 0; - maxTotalNumFreqSampPerIterationsDiffuse = 0; - if ( sym_hrir <= 0 ) - { - for ( j = 0; j < hrtf->num_iterations_diffuse[0]; j++ ) - { - pTotalNumFreqSampPerIterationsDiffuse[0] += hrtf->pIndex_frequency_max_diffuse[0][j]; - } - if ( maxTotalNumFreqSampPerIterationsDiffuse < pTotalNumFreqSampPerIterationsDiffuse[0] ) + if ( samplerate == DEFAULT_SAMPLERATE ) { - maxTotalNumFreqSampPerIterationsDiffuse = pTotalNumFreqSampPerIterationsDiffuse[0]; - } - } - if ( sym_hrir != 0 ) - { - for ( j = 0; j < hrtf->num_iterations_diffuse[1]; j++ ) - { - pTotalNumFreqSampPerIterationsDiffuse[1] += hrtf->pIndex_frequency_max_diffuse[1][j]; - } - if ( maxTotalNumFreqSampPerIterationsDiffuse < pTotalNumFreqSampPerIterationsDiffuse[1] ) - { - maxTotalNumFreqSampPerIterationsDiffuse = pTotalNumFreqSampPerIterationsDiffuse[1]; - } - } - - if ( samplerate == DEFAULT_SAMPLERATE ) - { - /* float latency_s; */ - fprintf( fp, "\n\n/********************** %s_%s **********************/\n", DECLARATION_NAME, lscfg.name ); + /* float latency_s; */ + fprintf( fp, "\n\n/********************** %s_%s **********************/\n", DECLARATION_NAME, lscfg.name ); #ifdef USE_SYMETRIC_HRIR_FILTERS - fprintf( fp, "\nextern uint16_t %s_%s_Use_Symetric_Filters;", DECLARATION_NAME, lscfg.name ); + fprintf( fp, "\nextern uint16_t %s_%s_Use_Symetric_Filters;", DECLARATION_NAME, lscfg.name ); #endif - fprintf( fp, "\nextern float %s_%s_latency_s;", DECLARATION_NAME, lscfg.name ); - } + fprintf( fp, "\nextern float %s_%s_latency_s;", DECLARATION_NAME, lscfg.name ); + } - fprintf( fp, "\n\n/* Sample Rate = %ld */\n", (long) samplerate ); + fprintf( fp, "\n\n/* Sample Rate = %ld */\n", (long) samplerate ); - /* int16_t max_num_iterations; */ - fprintf( fp, "\nextern int16_t %s_%s_max_num_iterations_%2dkHz;", DECLARATION_NAME, lscfg.name, samplerate / 1000 ); - /* uint16_t num_iterations[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS];*/ - if ( sym_hrir < 0 ) - fprintf( fp, "\nextern uint16_t %s_%s_num_iterations_%2dkHz[%d][BINAURAL_CHANNELS];", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir ); - else - fprintf( fp, "\nextern uint16_t %s_%s_num_iterations_%2dkHz[%d][%d];", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, nb_ear ); + /* int16_t max_num_iterations; */ + fprintf( fp, "\nextern int16_t %s_%s_max_num_iterations_%2dkHz;", DECLARATION_NAME, lscfg.name, samplerate / 1000 ); + /* uint16_t num_iterations[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS];*/ + if ( sym_hrir < 0 ) + fprintf( fp, "\nextern uint16_t %s_%s_num_iterations_%2dkHz[%d][BINAURAL_CHANNELS];", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir ); + else + fprintf( fp, "\nextern uint16_t %s_%s_num_iterations_%2dkHz[%d][%d];", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, nb_ear ); - /* uint16_t num_iterations_diffuse[BINAURAL_CHANNELS];*/ - if ( sym_hrir < 0 ) - fprintf( fp, "\nextern uint16_t %s_%s_num_iterations_diffuse_%2dkHz[BINAURAL_CHANNELS];", DECLARATION_NAME, lscfg.name, samplerate / 1000 ); - else - fprintf( fp, "\nextern uint16_t %s_%s_num_iterations_diffuse_%2dkHz[%d];", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear ); + /* uint16_t num_iterations_diffuse[BINAURAL_CHANNELS];*/ + if ( sym_hrir < 0 ) + fprintf( fp, "\nextern uint16_t %s_%s_num_iterations_diffuse_%2dkHz[BINAURAL_CHANNELS];", DECLARATION_NAME, lscfg.name, samplerate / 1000 ); + else + fprintf( fp, "\nextern uint16_t %s_%s_num_iterations_diffuse_%2dkHz[%d];", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear ); - /*uint16_t *pIndex_frequency_max[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS]; */ - if ( sym_hrir < 0 ) - fprintf( fp, "\nextern uint16_t %s_%s_pIndex_frequency_max_%2dkHz[%d][BINAURAL_CHANNELS][%d];", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, hrtf->max_num_iterations ); - else - fprintf( fp, "\nextern uint16_t %s_%s_pIndex_frequency_max_%2dkHz[%d][%d][%d];", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, nb_ear, hrtf->max_num_iterations ); + /*uint16_t *pIndex_frequency_max[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS]; */ + if ( sym_hrir < 0 ) + fprintf( fp, "\nextern uint16_t %s_%s_pIndex_frequency_max_%2dkHz[%d][BINAURAL_CHANNELS][%d];", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, hrtf->max_num_iterations ); + else + fprintf( fp, "\nextern uint16_t %s_%s_pIndex_frequency_max_%2dkHz[%d][%d][%d];", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, nb_ear, hrtf->max_num_iterations ); - /* uint16_t index_frequency_max_diffuse; */ - fprintf( fp, "\nextern uint16_t %s_%s_index_frequency_max_diffuse_%2dkHz;", DECLARATION_NAME, lscfg.name, samplerate / 1000 ); + /* uint16_t index_frequency_max_diffuse; */ + fprintf( fp, "\nextern uint16_t %s_%s_index_frequency_max_diffuse_%2dkHz;", DECLARATION_NAME, lscfg.name, samplerate / 1000 ); - /* float inv_diffuse_weight[MAX_INTERN_CHANNELS]; */ - fprintf( fp, "\nextern float %s_%s_inv_diffuse_weight_%2dkHz[%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir ); + /* float inv_diffuse_weight[MAX_INTERN_CHANNELS]; */ + fprintf( fp, "\nextern float %s_%s_inv_diffuse_weight_%2dkHz[%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir ); - /* uint16_t *pIndex_frequency_max_diffuse[BINAURAL_CHANNELS];*/ - if ( hrtf->pIndex_frequency_max_diffuse[0] == NULL ) - { - fprintf( fp, "\nextern uint16_t *%s_%s_pIndex_frequency_max_diffuse_%2dkHz[BINAURAL_CHANNELS];", DECLARATION_NAME, lscfg.name, samplerate / 1000 ); - } - else - { - if ( sym_hrir < 0 ) + /* uint16_t *pIndex_frequency_max_diffuse[BINAURAL_CHANNELS];*/ + if ( hrtf->pIndex_frequency_max_diffuse[0] == NULL ) { - fprintf( fp, "\nextern uint16_t %s_%s_pIndex_frequency_max_diffuse_%2dkHz[BINAURAL_CHANNELS][%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, ( hrtf->num_iterations_diffuse[0] > hrtf->num_iterations_diffuse[1] ) ? hrtf->num_iterations_diffuse[0] : hrtf->num_iterations_diffuse[1] ); + fprintf( fp, "\nextern uint16_t *%s_%s_pIndex_frequency_max_diffuse_%2dkHz[BINAURAL_CHANNELS];", DECLARATION_NAME, lscfg.name, samplerate / 1000 ); } else { - fprintf( fp, "\nextern uint16_t %s_%s_pIndex_frequency_max_diffuse_%2dkHz[%d][%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear, ( hrtf->num_iterations_diffuse[0] > hrtf->num_iterations_diffuse[1] ) ? hrtf->num_iterations_diffuse[0] : hrtf->num_iterations_diffuse[1] ); + if ( sym_hrir < 0 ) + { + fprintf( fp, "\nextern uint16_t %s_%s_pIndex_frequency_max_diffuse_%2dkHz[BINAURAL_CHANNELS][%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, ( hrtf->num_iterations_diffuse[0] > hrtf->num_iterations_diffuse[1] ) ? hrtf->num_iterations_diffuse[0] : hrtf->num_iterations_diffuse[1] ); + } + else + { + fprintf( fp, "\nextern uint16_t %s_%s_pIndex_frequency_max_diffuse_%2dkHz[%d][%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear, ( hrtf->num_iterations_diffuse[0] > hrtf->num_iterations_diffuse[1] ) ? hrtf->num_iterations_diffuse[0] : hrtf->num_iterations_diffuse[1] ); + } } - } - - /* float *pOut_to_bin[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS];*/ - if ( sym_hrir < 0 ) - { - fprintf( fp, "\nextern float %s_%s_coeff_re_%2dkHz[%d][BINAURAL_CHANNELS][%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, maxTotalNumFreqSampPerIterations ); - fprintf( fp, "\nextern float %s_%s_coeff_im_%2dkHz[%d][BINAURAL_CHANNELS][%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, maxTotalNumFreqSampPerIterations ); - } - else - { - fprintf( fp, "\nextern float %s_%s_coeff_re_%2dkHz[%d][%d][%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, nb_ear, maxTotalNumFreqSampPerIterations ); - fprintf( fp, "\nextern float %s_%s_coeff_im_%2dkHz[%d][%d][%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, nb_ear, maxTotalNumFreqSampPerIterations ); - } - /* float *pOut_to_bin_diffuse_re[BINAURAL_CHANNELS];*/ - if ( hrtf->pOut_to_bin_diffuse_re[0] == NULL ) - { + /* float *pOut_to_bin[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS];*/ if ( sym_hrir < 0 ) { - fprintf( fp, "\nextern float *%s_%s_coeff_diffuse_re_%2dkHz[BINAURAL_CHANNELS];", DECLARATION_NAME, lscfg.name, samplerate / 1000 ); + fprintf( fp, "\nextern float %s_%s_coeff_re_%2dkHz[%d][BINAURAL_CHANNELS][%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, maxTotalNumFreqSampPerIterations ); + fprintf( fp, "\nextern float %s_%s_coeff_im_%2dkHz[%d][BINAURAL_CHANNELS][%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, maxTotalNumFreqSampPerIterations ); } else { - fprintf( fp, "\nextern float *%s_%s_coeff_diffuse_re_%2dkHz[%d];", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear ); + fprintf( fp, "\nextern float %s_%s_coeff_re_%2dkHz[%d][%d][%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, nb_ear, maxTotalNumFreqSampPerIterations ); + fprintf( fp, "\nextern float %s_%s_coeff_im_%2dkHz[%d][%d][%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir, nb_ear, maxTotalNumFreqSampPerIterations ); } - } - else - { - if ( sym_hrir < 0 ) + + /* float *pOut_to_bin_diffuse_re[BINAURAL_CHANNELS];*/ + if ( hrtf->pOut_to_bin_diffuse_re[0] == NULL ) { - fprintf( fp, "\nextern float %s_%s_coeff_diffuse_re_%2dkHz[BINAURAL_CHANNELS][%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, maxTotalNumFreqSampPerIterationsDiffuse ); + if ( sym_hrir < 0 ) + { + fprintf( fp, "\nextern float *%s_%s_coeff_diffuse_re_%2dkHz[BINAURAL_CHANNELS];", DECLARATION_NAME, lscfg.name, samplerate / 1000 ); + } + else + { + fprintf( fp, "\nextern float *%s_%s_coeff_diffuse_re_%2dkHz[%d];", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear ); + } } else { - fprintf( fp, "\nextern float %s_%s_coeff_diffuse_re_%2dkHz[%d][%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear, maxTotalNumFreqSampPerIterationsDiffuse ); + if ( sym_hrir < 0 ) + { + fprintf( fp, "\nextern float %s_%s_coeff_diffuse_re_%2dkHz[BINAURAL_CHANNELS][%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, maxTotalNumFreqSampPerIterationsDiffuse ); + } + else + { + fprintf( fp, "\nextern float %s_%s_coeff_diffuse_re_%2dkHz[%d][%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear, maxTotalNumFreqSampPerIterationsDiffuse ); + } } - } - /* float *pOut_to_bin_diffuse_im[BINAURAL_CHANNELS];*/ - if ( hrtf->pOut_to_bin_diffuse_im[0] == NULL ) - { - if ( sym_hrir < 0 ) + /* float *pOut_to_bin_diffuse_im[BINAURAL_CHANNELS];*/ + if ( hrtf->pOut_to_bin_diffuse_im[0] == NULL ) { - fprintf( fp, "\nextern float *%s_%s_coeff_diffuse_im_%2dkHz[BINAURAL_CHANNELS];", DECLARATION_NAME, lscfg.name, samplerate / 1000 ); + if ( sym_hrir < 0 ) + { + fprintf( fp, "\nextern float *%s_%s_coeff_diffuse_im_%2dkHz[BINAURAL_CHANNELS];", DECLARATION_NAME, lscfg.name, samplerate / 1000 ); + } + else + { + fprintf( fp, "\nextern float *%s_%s_coeff_diffuse_im_%2dkHz[%d];", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear ); + } } else { - fprintf( fp, "\nextern float *%s_%s_coeff_diffuse_im_%2dkHz[%d];", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear ); + if ( sym_hrir < 0 ) + { + fprintf( fp, "\nextern float %s_%s_coeff_diffuse_im_%2dkHz[BINAURAL_CHANNELS][%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, maxTotalNumFreqSampPerIterationsDiffuse ); + } + else + { + fprintf( fp, "\nextern float %s_%s_coeff_diffuse_im_%2dkHz[%d][%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear, maxTotalNumFreqSampPerIterationsDiffuse ); + } } - } - else - { - if ( sym_hrir < 0 ) + + if ( fp ) + fclose( fp ); + + if ( pTotalNumFreqSampPerIterations[0] ) { - fprintf( fp, "\nextern float %s_%s_coeff_diffuse_im_%2dkHz[BINAURAL_CHANNELS][%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, maxTotalNumFreqSampPerIterationsDiffuse ); + free( pTotalNumFreqSampPerIterations[0] ); } - else + if ( pTotalNumFreqSampPerIterations[1] ) { - fprintf( fp, "\nextern float %s_%s_coeff_diffuse_im_%2dkHz[%d][%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, nb_ear, maxTotalNumFreqSampPerIterationsDiffuse ); + free( pTotalNumFreqSampPerIterations[1] ); } + return; } - if ( fp ) - fclose( fp ); - - if ( pTotalNumFreqSampPerIterations[0] ) - { - free( pTotalNumFreqSampPerIterations[0] ); - } - if ( pTotalNumFreqSampPerIterations[1] ) - { - free( pTotalNumFreqSampPerIterations[1] ); - } - return; -} - #ifdef MIXER_CONV_BINARY_FILE_311 -/*---------------------------------------------------------------------* - * get_tables_dimensions(); - *---------------------------------------------------------------------*/ -void get_binary_tables_dimensions( HRTFS_DATA *hrtf, int16_t sym_hrir, crend_hrtf_tables_dimensions *hrtf_table_dims /*OUT*/ ) -{ - int16_t iIR, iIter, iChan; - uint16_t total_num_fsamp_per_iteration, total_num_fsamp_per_iteration_diff; + /*---------------------------------------------------------------------* + * get_tables_dimensions(); + *---------------------------------------------------------------------*/ + void get_binary_tables_dimensions( HRTFS_DATA * hrtf, int16_t sym_hrir, crend_hrtf_tables_dimensions * hrtf_table_dims /*OUT*/ ) + { + int16_t iIR, iIter, iChan; + uint16_t total_num_fsamp_per_iteration, total_num_fsamp_per_iteration_diff; #ifdef USE_SYMETRIC_HRIR_FILTERS - int16_t nb_ear, iEar; - nb_ear = sym_hrir < 0 ? 2 : 1; + int16_t nb_ear, iEar; + nb_ear = sym_hrir < 0 ? 2 : 1; #endif - memset( hrtf_table_dims, 0x00, sizeof( crend_hrtf_tables_dimensions ) ); + memset( hrtf_table_dims, 0x00, sizeof( crend_hrtf_tables_dimensions ) ); - hrtf_table_dims->max_num_ir = hrtf->max_num_ir; - hrtf_table_dims->max_num_iterations = hrtf->max_num_iterations; + hrtf_table_dims->max_num_ir = hrtf->max_num_ir; + hrtf_table_dims->max_num_iterations = hrtf->max_num_iterations; // hrtf_table_dims->max_num_iterations_diffuse = 0; #ifdef USE_SYMETRIC_HRIR_FILTERS - for ( iChan = 0; iChan < nb_ear; iChan++ ) - { - iEar = nb_ear == 2 ? iChan : sym_hrir; - if ( hrtf_table_dims->max_num_iterations_diffuse < hrtf->num_iterations_diffuse[iEar] ) + for ( iChan = 0; iChan < nb_ear; iChan++ ) { - hrtf_table_dims->max_num_iterations_diffuse = hrtf->num_iterations_diffuse[iEar]; + iEar = nb_ear == 2 ? iChan : sym_hrir; + if ( hrtf_table_dims->max_num_iterations_diffuse < hrtf->num_iterations_diffuse[iEar] ) + { + hrtf_table_dims->max_num_iterations_diffuse = hrtf->num_iterations_diffuse[iEar]; + } } - } #else - for ( iChan = 0; iChan < BINAURAL_CHANNELS; iChan++ ) - { - if ( hrtf_table_dims->max_num_iterations_diffuse < hrtf->num_iterations_diffuse[iChan] ) + for ( iChan = 0; iChan < BINAURAL_CHANNELS; iChan++ ) { - hrtf_table_dims->max_num_iterations_diffuse = hrtf->num_iterations_diffuse[iChan]; + if ( hrtf_table_dims->max_num_iterations_diffuse < hrtf->num_iterations_diffuse[iChan] ) + { + hrtf_table_dims->max_num_iterations_diffuse = hrtf->num_iterations_diffuse[iChan]; + } } - } #endif - // hrtf_table_dims->max_total_num_fsamp_per_iteration = 0; - for ( iIR = 0; iIR < hrtf->max_num_ir; iIR++ ) - { + // hrtf_table_dims->max_total_num_fsamp_per_iteration = 0; + for ( iIR = 0; iIR < hrtf->max_num_ir; iIR++ ) + { +#ifdef USE_SYMETRIC_HRIR_FILTERS + for ( iChan = 0; iChan < nb_ear; iChan++ ) + { + total_num_fsamp_per_iteration = 0; + iEar = nb_ear == 2 ? iChan : sym_hrir; + for ( iIter = 0; iIter < hrtf->num_iterations[iIR][iEar]; iIter++ ) + { + total_num_fsamp_per_iteration += hrtf->pIndex_frequency_max[iIR][iEar][iIter]; + } + if ( hrtf_table_dims->max_total_num_fsamp_per_iteration < total_num_fsamp_per_iteration ) + { + hrtf_table_dims->max_total_num_fsamp_per_iteration = total_num_fsamp_per_iteration; + } + } +#else + for ( iChan = 0; iChan < BINAURAL_CHANNELS; iChan++ ) + { + total_num_fsamp_per_iteration = 0; + for ( iIter = 0; iIter < hrtf->num_iterations[iIR][iChan]; iIter++ ) + { + total_num_fsamp_per_iteration += hrtf->pIndex_frequency_max[iIR][iChan][iIter]; + } + if ( hrtf_table_dims->max_total_num_fsamp_per_iteration < total_num_fsamp_per_iteration ) + { + hrtf_table_dims->max_total_num_fsamp_per_iteration = total_num_fsamp_per_iteration; + } + } +#endif + } + + // hrtf_table_dims->max_total_num_fsamp_per_iteration_diff = 0; #ifdef USE_SYMETRIC_HRIR_FILTERS for ( iChan = 0; iChan < nb_ear; iChan++ ) { - total_num_fsamp_per_iteration = 0; + total_num_fsamp_per_iteration_diff = 0; iEar = nb_ear == 2 ? iChan : sym_hrir; - for ( iIter = 0; iIter < hrtf->num_iterations[iIR][iEar]; iIter++ ) + for ( iIter = 0; iIter < hrtf->num_iterations_diffuse[iEar]; iIter++ ) { - total_num_fsamp_per_iteration += hrtf->pIndex_frequency_max[iIR][iEar][iIter]; + total_num_fsamp_per_iteration_diff += hrtf->pIndex_frequency_max_diffuse[iEar][iIter]; } - if ( hrtf_table_dims->max_total_num_fsamp_per_iteration < total_num_fsamp_per_iteration ) + if ( hrtf_table_dims->max_total_num_fsamp_per_iteration_diff < total_num_fsamp_per_iteration_diff ) { - hrtf_table_dims->max_total_num_fsamp_per_iteration = total_num_fsamp_per_iteration; + hrtf_table_dims->max_total_num_fsamp_per_iteration_diff = total_num_fsamp_per_iteration_diff; } } #else for ( iChan = 0; iChan < BINAURAL_CHANNELS; iChan++ ) { - total_num_fsamp_per_iteration = 0; - for ( iIter = 0; iIter < hrtf->num_iterations[iIR][iChan]; iIter++ ) + total_num_fsamp_per_iteration_diff = 0; + + for ( iIter = 0; iIter < hrtf->num_iterations_diffuse[iChan]; iIter++ ) { - total_num_fsamp_per_iteration += hrtf->pIndex_frequency_max[iIR][iChan][iIter]; + total_num_fsamp_per_iteration_diff += hrtf->pIndex_frequency_max_diffuse[iChan][iIter]; } - if ( hrtf_table_dims->max_total_num_fsamp_per_iteration < total_num_fsamp_per_iteration ) + if ( hrtf_table_dims->max_total_num_fsamp_per_iteration_diff < total_num_fsamp_per_iteration_diff ) { - hrtf_table_dims->max_total_num_fsamp_per_iteration = total_num_fsamp_per_iteration; + hrtf_table_dims->max_total_num_fsamp_per_iteration_diff = total_num_fsamp_per_iteration_diff; } } #endif } - // hrtf_table_dims->max_total_num_fsamp_per_iteration_diff = 0; -#ifdef USE_SYMETRIC_HRIR_FILTERS - for ( iChan = 0; iChan < nb_ear; iChan++ ) - { - total_num_fsamp_per_iteration_diff = 0; - iEar = nb_ear == 2 ? iChan : sym_hrir; - for ( iIter = 0; iIter < hrtf->num_iterations_diffuse[iEar]; iIter++ ) - { - total_num_fsamp_per_iteration_diff += hrtf->pIndex_frequency_max_diffuse[iEar][iIter]; - } - if ( hrtf_table_dims->max_total_num_fsamp_per_iteration_diff < total_num_fsamp_per_iteration_diff ) - { - hrtf_table_dims->max_total_num_fsamp_per_iteration_diff = total_num_fsamp_per_iteration_diff; - } - } -#else - for ( iChan = 0; iChan < BINAURAL_CHANNELS; iChan++ ) + /*---------------------------------------------------------------------* + * compute_binary_size(); + *---------------------------------------------------------------------*/ + uint32_t compute_binary_size( HRTFS_DATA * hrtf, int16_t sym_hrir, crend_hrtf_tables_dimensions * hrtf_table_dims ) { - total_num_fsamp_per_iteration_diff = 0; - - for ( iIter = 0; iIter < hrtf->num_iterations_diffuse[iChan]; iIter++ ) - { - total_num_fsamp_per_iteration_diff += hrtf->pIndex_frequency_max_diffuse[iChan][iIter]; - } - if ( hrtf_table_dims->max_total_num_fsamp_per_iteration_diff < total_num_fsamp_per_iteration_diff ) - { - hrtf_table_dims->max_total_num_fsamp_per_iteration_diff = total_num_fsamp_per_iteration_diff; - } - } -#endif -} - -/*---------------------------------------------------------------------* - * compute_binary_size(); - *---------------------------------------------------------------------*/ -uint32_t compute_binary_size( HRTFS_DATA *hrtf, int16_t sym_hrir, crend_hrtf_tables_dimensions *hrtf_table_dims ) -{ - int16_t iIR, iIter, iChan; - uint32_t hrtf_data_size; + int16_t iIR, iIter, iChan; + uint32_t hrtf_data_size; #ifdef USE_SYMETRIC_HRIR_FILTERS - int16_t nb_ear, iEar; - nb_ear = sym_hrir < 0 ? 2 : 1; + int16_t nb_ear, iEar; + nb_ear = sym_hrir < 0 ? 2 : 1; #endif - hrtf_data_size = 0; + hrtf_data_size = 0; - hrtf_data_size += sizeof( float ); // latency_s - hrtf_data_size += sizeof( uint16_t ); // max_num_ir - hrtf_data_size += sizeof( uint16_t ); // BINAURAL_CHANNELS - hrtf_data_size += sizeof( int16_t ); // max_num_iterations - hrtf_data_size += hrtf->max_num_ir * BINAURAL_CHANNELS * sizeof( uint16_t ); // num_iterations - hrtf_data_size += hrtf->max_num_ir * BINAURAL_CHANNELS * hrtf->max_num_iterations * sizeof( uint16_t ); // pIndex_frequency_max + hrtf_data_size += sizeof( float ); // latency_s + hrtf_data_size += sizeof( uint16_t ); // max_num_ir + hrtf_data_size += sizeof( uint16_t ); // BINAURAL_CHANNELS + hrtf_data_size += sizeof( int16_t ); // max_num_iterations + hrtf_data_size += hrtf->max_num_ir * BINAURAL_CHANNELS * sizeof( uint16_t ); // num_iterations + hrtf_data_size += hrtf->max_num_ir * BINAURAL_CHANNELS * hrtf->max_num_iterations * sizeof( uint16_t ); // pIndex_frequency_max - hrtf_data_size += sizeof( int16_t ); // max_num_iterations_diffuse + hrtf_data_size += sizeof( int16_t ); // max_num_iterations_diffuse - if ( hrtf_table_dims->max_num_iterations_diffuse != 0 ) - { + if ( hrtf_table_dims->max_num_iterations_diffuse != 0 ) + { #ifdef USE_SYMETRIC_HRIR_FILTERS - hrtf_data_size += nb_ear * sizeof( uint16_t ); // num_iterations_diffuse + hrtf_data_size += nb_ear * sizeof( uint16_t ); // num_iterations_diffuse #else - hrtf_data_size += BINAURAL_CHANNELS * sizeof( uint16_t ); // num_iterations_diffuse + hrtf_data_size += BINAURAL_CHANNELS * sizeof( uint16_t ); // num_iterations_diffuse #endif - // The size of pIndex_frequency_max_diffuse depends on num_iterations_diffuse + // The size of pIndex_frequency_max_diffuse depends on num_iterations_diffuse #ifdef USE_SYMETRIC_HRIR_FILTERS - for ( iChan = 0; iChan < nb_ear; iChan++ ) - { - iEar = nb_ear == 2 ? iChan : sym_hrir; - hrtf_data_size += hrtf->num_iterations_diffuse[iEar] * sizeof( uint16_t ); - } + for ( iChan = 0; iChan < nb_ear; iChan++ ) + { + iEar = nb_ear == 2 ? iChan : sym_hrir; + hrtf_data_size += hrtf->num_iterations_diffuse[iEar] * sizeof( uint16_t ); + } #else - for ( iChan = 0; iChan < BINAURAL_CHANNELS; iChan++ ) - { - hrtf_data_size += hrtf->num_iterations_diffuse[iChan] * sizeof( uint16_t ); - } + for ( iChan = 0; iChan < BINAURAL_CHANNELS; iChan++ ) + { + hrtf_data_size += hrtf->num_iterations_diffuse[iChan] * sizeof( uint16_t ); + } #endif - } + } - hrtf_data_size += sizeof( uint16_t ); // index_frequency_max_diffuse - hrtf_data_size += hrtf->max_num_ir * sizeof( float ); // inv_diffuse_weight + hrtf_data_size += sizeof( uint16_t ); // index_frequency_max_diffuse + hrtf_data_size += hrtf->max_num_ir * sizeof( float ); // inv_diffuse_weight - hrtf_data_size += sizeof( uint16_t ); // max_total_num_fsamp_per_iteration + hrtf_data_size += sizeof( uint16_t ); // max_total_num_fsamp_per_iteration - // The sizes of coeff_re & coeff_im depend on pIndex_frequency_max - for ( iIR = 0; iIR < hrtf->max_num_ir; iIR++ ) - { -#ifdef USE_SYMETRIC_HRIR_FILTERS - for ( iChan = 0; iChan < nb_ear; iChan++ ) + // The sizes of coeff_re & coeff_im depend on pIndex_frequency_max + for ( iIR = 0; iIR < hrtf->max_num_ir; iIR++ ) { - iEar = nb_ear == 2 ? iChan : sym_hrir; - for ( iIter = 0; iIter < hrtf->num_iterations[iIR][iEar]; iIter++ ) +#ifdef USE_SYMETRIC_HRIR_FILTERS + for ( iChan = 0; iChan < nb_ear; iChan++ ) { - hrtf_data_size += 2 * hrtf->pIndex_frequency_max[iIR][iEar][iIter] * sizeof( float ); // 2* : re & im + iEar = nb_ear == 2 ? iChan : sym_hrir; + for ( iIter = 0; iIter < hrtf->num_iterations[iIR][iEar]; iIter++ ) + { + hrtf_data_size += 2 * hrtf->pIndex_frequency_max[iIR][iEar][iIter] * sizeof( float ); // 2* : re & im + } } - } #else - for ( iChan = 0; iChan < BINAURAL_CHANNELS; iChan++ ) - { - for ( iIter = 0; iIter < hrtf->num_iterations[iIR][iChan]; iIter++ ) + for ( iChan = 0; iChan < BINAURAL_CHANNELS; iChan++ ) { - hrtf_data_size += 2 * hrtf->pIndex_frequency_max[iIR][iChan][iIter] * sizeof( float ); // 2* : re & im + for ( iIter = 0; iIter < hrtf->num_iterations[iIR][iChan]; iIter++ ) + { + hrtf_data_size += 2 * hrtf->pIndex_frequency_max[iIR][iChan][iIter] * sizeof( float ); // 2* : re & im + } } - } #endif - } + } - hrtf_data_size += sizeof( uint16_t ); // max_total_num_fsamp_per_iteration_diff - if ( hrtf_table_dims->max_total_num_fsamp_per_iteration_diff != 0 ) - { - // The sizes of coeff_diffuse_re & coeff_diffuse_im depend on pIndex_frequency_max -#ifdef USE_SYMETRIC_HRIR_FILTERS - for ( iChan = 0; iChan < nb_ear; iChan++ ) + hrtf_data_size += sizeof( uint16_t ); // max_total_num_fsamp_per_iteration_diff + if ( hrtf_table_dims->max_total_num_fsamp_per_iteration_diff != 0 ) { - iEar = nb_ear == 2 ? iChan : sym_hrir; - for ( iIter = 0; iIter < hrtf->num_iterations_diffuse[iEar]; iIter++ ) + // The sizes of coeff_diffuse_re & coeff_diffuse_im depend on pIndex_frequency_max +#ifdef USE_SYMETRIC_HRIR_FILTERS + for ( iChan = 0; iChan < nb_ear; iChan++ ) { - hrtf_data_size += 2 * hrtf->pIndex_frequency_max_diffuse[iEar][iIter] * sizeof( float ); // 2* : re & im + iEar = nb_ear == 2 ? iChan : sym_hrir; + for ( iIter = 0; iIter < hrtf->num_iterations_diffuse[iEar]; iIter++ ) + { + hrtf_data_size += 2 * hrtf->pIndex_frequency_max_diffuse[iEar][iIter] * sizeof( float ); // 2* : re & im + } } - } #else - for ( iChan = 0; iChan < BINAURAL_CHANNELS; iChan++ ) - { - for ( iIter = 0; iIter < hrtf->num_iterations_diffuse[iChan]; iIter++ ) + for ( iChan = 0; iChan < BINAURAL_CHANNELS; iChan++ ) { - hrtf_data_size += 2 * hrtf->pIndex_frequency_max_diffuse[iChan][iIter] * sizeof( float ); // 2* : re & im + for ( iIter = 0; iIter < hrtf->num_iterations_diffuse[iChan]; iIter++ ) + { + hrtf_data_size += 2 * hrtf->pIndex_frequency_max_diffuse[iChan][iIter] * sizeof( float ); // 2* : re & im + } } - } #endif - } + } - return hrtf_data_size; -} + return hrtf_data_size; + } -/*---------------------------------------------------------------------* - * write_binary_file(); - *---------------------------------------------------------------------*/ -void write_binary_file( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, const int32_t samplerate, const int16_t frame_len, int16_t sym_hrir ) -{ - FILE *output_binary_file; + /*---------------------------------------------------------------------* + * write_binary_file(); + *---------------------------------------------------------------------*/ + void write_binary_file( HRTFS_DATA * hrtf, struct ivas_layout_config lscfg, const int32_t samplerate, const int16_t frame_len, int16_t sym_hrir ) + { + FILE *output_binary_file; - int16_t iIR, iIter, iChan, iTap; - uint32_t data_size_tmp; - float *coeff_rptr; - char tmpStr[64]; + int16_t iIR, iIter, iChan, iTap; + uint32_t data_size_tmp; + float *coeff_rptr; + char tmpStr[64]; #ifdef USE_SYMETRIC_HRIR_FILTERS - int16_t nb_ear, iEar; - nb_ear = sym_hrir < 0 ? 2 : 1; + int16_t nb_ear, iEar; + nb_ear = sym_hrir < 0 ? 2 : 1; #endif - crend_hrtf_tables_dimensions hrtf_table_dims; + crend_hrtf_tables_dimensions hrtf_table_dims; - uint32_t hrtf_data_size; - char *hrtf_bin = NULL, *hrtf_bin_wptr; + uint32_t hrtf_data_size; + char *hrtf_bin = NULL, *hrtf_bin_wptr; - char *binary_file_full_path; + char *binary_file_full_path; - if ( hrtf == NULL ) - return; + if ( hrtf == NULL ) + return; - /* Binary file - block description : + /* Binary file - block description : - latency_s => float + latency_s => float - max_num_ir => uint16_t - BINAURAL_CHANNELS => uint16_t (BINAURAL_CHANNELS) + max_num_ir => uint16_t + BINAURAL_CHANNELS => uint16_t (BINAURAL_CHANNELS) - max_num_iterations => int16_t - num_iterations => uint16_t[max_num_ir][BINAURAL_CHANNELS] - pIndex_frequency_max => uint16_t[max_num_ir][BINAURAL_CHANNELS][max_num_iterations] (Pointer) + max_num_iterations => int16_t + num_iterations => uint16_t[max_num_ir][BINAURAL_CHANNELS] + pIndex_frequency_max => uint16_t[max_num_ir][BINAURAL_CHANNELS][max_num_iterations] (Pointer) - max_num_iterations_diffuse => int16_t - num_iterations_diffuse => uint16_t[BINAURAL_CHANNELS] - pIndex_frequency_max_diffuse => uint16_t[BINAURAL_CHANNELS][max_num_iterations_diffuse] (Pointer) + max_num_iterations_diffuse => int16_t + num_iterations_diffuse => uint16_t[BINAURAL_CHANNELS] + pIndex_frequency_max_diffuse => uint16_t[BINAURAL_CHANNELS][max_num_iterations_diffuse] (Pointer) - index_frequency_max_diffuse => uint16_t - inv_diffuse_weight => float[max_num_ir] + index_frequency_max_diffuse => uint16_t + inv_diffuse_weight => float[max_num_ir] - max_total_num_fsamp_per_iteration => uint16_t - coeff_re => float[max_num_ir][BINAURAL_CHANNELS][max_total_num_fsamp_per_iteration] (Pointer) - coeff_im => float[max_num_ir][BINAURAL_CHANNELS][max_total_num_fsamp_per_iteration] (Pointer) + max_total_num_fsamp_per_iteration => uint16_t + coeff_re => float[max_num_ir][BINAURAL_CHANNELS][max_total_num_fsamp_per_iteration] (Pointer) + coeff_im => float[max_num_ir][BINAURAL_CHANNELS][max_total_num_fsamp_per_iteration] (Pointer) - max_total_num_fsamp_per_iteration_diff => uint16_t - coeff_diffuse_re => float[BINAURAL_CHANNELS][max_total_num_fsamp_per_iteration] (Pointer) - coeff_diffuse_im => float[BINAURAL_CHANNELS][max_total_num_fsamp_per_iteration] (Pointer) - */ + max_total_num_fsamp_per_iteration_diff => uint16_t + coeff_diffuse_re => float[BINAURAL_CHANNELS][max_total_num_fsamp_per_iteration] (Pointer) + coeff_diffuse_im => float[BINAURAL_CHANNELS][max_total_num_fsamp_per_iteration] (Pointer) + */ - get_binary_tables_dimensions( hrtf, sym_hrir, &hrtf_table_dims ); + get_binary_tables_dimensions( hrtf, sym_hrir, &hrtf_table_dims ); - hrtf_data_size = compute_binary_size( hrtf, sym_hrir, &hrtf_table_dims ); + hrtf_data_size = compute_binary_size( hrtf, sym_hrir, &hrtf_table_dims ); - hrtf_bin = NULL; - hrtf_bin = (char *) malloc( hrtf_data_size ); - if ( hrtf_bin == NULL ) - return; - memset( hrtf_bin, 0x00, hrtf_data_size ); - hrtf_bin_wptr = hrtf_bin; + hrtf_bin = NULL; + hrtf_bin = (char *) malloc( hrtf_data_size ); + if ( hrtf_bin == NULL ) + return; + memset( hrtf_bin, 0x00, hrtf_data_size ); + hrtf_bin_wptr = hrtf_bin; - // Write the HRTF raw data + // Write the HRTF raw data - memcpy( hrtf_bin_wptr, &( hrtf->latency_s ), sizeof( float ) ); // latency_s - hrtf_bin_wptr += sizeof( float ); + memcpy( hrtf_bin_wptr, &( hrtf->latency_s ), sizeof( float ) ); // latency_s + hrtf_bin_wptr += sizeof( float ); - memcpy( hrtf_bin_wptr, &( hrtf->max_num_ir ), sizeof( uint16_t ) ); // max_num_ir - hrtf_bin_wptr += sizeof( uint16_t ); + memcpy( hrtf_bin_wptr, &( hrtf->max_num_ir ), sizeof( uint16_t ) ); // max_num_ir + hrtf_bin_wptr += sizeof( uint16_t ); #ifdef USE_SYMETRIC_HRIR_FILTERS - uint16_t nchan_bin = nb_ear; + uint16_t nchan_bin = nb_ear; #else - uint16_t nchan_bin = BINAURAL_CHANNELS; + uint16_t nchan_bin = BINAURAL_CHANNELS; #endif - memcpy( hrtf_bin_wptr, &nchan_bin, sizeof( uint16_t ) ); // BINAURAL_CHANNELS - hrtf_bin_wptr += sizeof( uint16_t ); + memcpy( hrtf_bin_wptr, &nchan_bin, sizeof( uint16_t ) ); // BINAURAL_CHANNELS + hrtf_bin_wptr += sizeof( uint16_t ); - memcpy( hrtf_bin_wptr, &( hrtf->max_num_iterations ), sizeof( int16_t ) ); // max_num_iterations - hrtf_bin_wptr += sizeof( int16_t ); + memcpy( hrtf_bin_wptr, &( hrtf->max_num_iterations ), sizeof( int16_t ) ); // max_num_iterations + hrtf_bin_wptr += sizeof( int16_t ); #ifdef USE_SYMETRIC_HRIR_FILTERS - data_size_tmp = hrtf->max_num_ir * nb_ear * sizeof( uint16_t ); + data_size_tmp = hrtf->max_num_ir * nb_ear * sizeof( uint16_t ); #else - data_size_tmp = hrtf->max_num_ir * BINAURAL_CHANNELS * sizeof( uint16_t ); + data_size_tmp = hrtf->max_num_ir * BINAURAL_CHANNELS * sizeof( uint16_t ); #endif - memcpy( hrtf_bin_wptr, hrtf->num_iterations, data_size_tmp ); // num_iterations - hrtf_bin_wptr += data_size_tmp; + memcpy( hrtf_bin_wptr, hrtf->num_iterations, data_size_tmp ); // num_iterations + hrtf_bin_wptr += data_size_tmp; - // pIndex_frequency_max - data_size_tmp = hrtf->max_num_iterations * sizeof( uint16_t ); - for ( int iIR = 0; iIR < hrtf->max_num_ir; iIR++ ) - { -#ifdef USE_SYMETRIC_HRIR_FILTERS - for ( iChan = 0; iChan < nb_ear; iChan++ ) + // pIndex_frequency_max + data_size_tmp = hrtf->max_num_iterations * sizeof( uint16_t ); + for ( int iIR = 0; iIR < hrtf->max_num_ir; iIR++ ) { - iEar = nb_ear == 2 ? iChan : sym_hrir; - memcpy( hrtf_bin_wptr, hrtf->pIndex_frequency_max[iIR][iEar], data_size_tmp ); - hrtf_bin_wptr += data_size_tmp; - } +#ifdef USE_SYMETRIC_HRIR_FILTERS + for ( iChan = 0; iChan < nb_ear; iChan++ ) + { + iEar = nb_ear == 2 ? iChan : sym_hrir; + memcpy( hrtf_bin_wptr, hrtf->pIndex_frequency_max[iIR][iEar], data_size_tmp ); + hrtf_bin_wptr += data_size_tmp; + } #else - for ( iChan = 0; iChan < BINAURAL_CHANNELS; iChan++ ) - { - memcpy( hrtf_bin_wptr, hrtf->pIndex_frequency_max[iIR][iChan], data_size_tmp ); - hrtf_bin_wptr += data_size_tmp; - } + for ( iChan = 0; iChan < BINAURAL_CHANNELS; iChan++ ) + { + memcpy( hrtf_bin_wptr, hrtf->pIndex_frequency_max[iIR][iChan], data_size_tmp ); + hrtf_bin_wptr += data_size_tmp; + } #endif - } + } - memcpy( hrtf_bin_wptr, &( hrtf_table_dims.max_num_iterations_diffuse ), sizeof( int16_t ) ); // max_num_iterations_diffuse - hrtf_bin_wptr += sizeof( int16_t ); + memcpy( hrtf_bin_wptr, &( hrtf_table_dims.max_num_iterations_diffuse ), sizeof( int16_t ) ); // max_num_iterations_diffuse + hrtf_bin_wptr += sizeof( int16_t ); - if ( hrtf_table_dims.max_num_iterations_diffuse != 0 ) - { + if ( hrtf_table_dims.max_num_iterations_diffuse != 0 ) + { #ifdef USE_SYMETRIC_HRIR_FILTERS - data_size_tmp = nb_ear * sizeof( uint16_t ); + data_size_tmp = nb_ear * sizeof( uint16_t ); #else - data_size_tmp = BINAURAL_CHANNELS * sizeof( uint16_t ); + data_size_tmp = BINAURAL_CHANNELS * sizeof( uint16_t ); #endif - memcpy( hrtf_bin_wptr, hrtf->num_iterations_diffuse, data_size_tmp ); // num_iterations_diffuse - hrtf_bin_wptr += data_size_tmp; + memcpy( hrtf_bin_wptr, hrtf->num_iterations_diffuse, data_size_tmp ); // num_iterations_diffuse + hrtf_bin_wptr += data_size_tmp; - // pIndex_frequency_max_diffuse (the size depends on num_iterations_diffuse) + // pIndex_frequency_max_diffuse (the size depends on num_iterations_diffuse) #ifdef USE_SYMETRIC_HRIR_FILTERS - for ( iChan = 0; iChan < nb_ear; iChan++ ) - { - iEar = nb_ear == 2 ? iChan : sym_hrir; - data_size_tmp = hrtf->num_iterations_diffuse[iEar] * sizeof( uint16_t ); - memcpy( hrtf_bin_wptr, hrtf->pIndex_frequency_max_diffuse[iEar], data_size_tmp ); - hrtf_bin_wptr += data_size_tmp; - } + for ( iChan = 0; iChan < nb_ear; iChan++ ) + { + iEar = nb_ear == 2 ? iChan : sym_hrir; + data_size_tmp = hrtf->num_iterations_diffuse[iEar] * sizeof( uint16_t ); + memcpy( hrtf_bin_wptr, hrtf->pIndex_frequency_max_diffuse[iEar], data_size_tmp ); + hrtf_bin_wptr += data_size_tmp; + } #else - for ( iChan = 0; iChan < BINAURAL_CHANNELS; iChan++ ) - { - data_size_tmp = hrtf->num_iterations_diffuse[iChan] * sizeof( uint16_t ); - memcpy( hrtf_bin_wptr, hrtf->pIndex_frequency_max_diffuse[iChan], data_size_tmp ); - hrtf_bin_wptr += data_size_tmp; - } + for ( iChan = 0; iChan < BINAURAL_CHANNELS; iChan++ ) + { + data_size_tmp = hrtf->num_iterations_diffuse[iChan] * sizeof( uint16_t ); + memcpy( hrtf_bin_wptr, hrtf->pIndex_frequency_max_diffuse[iChan], data_size_tmp ); + hrtf_bin_wptr += data_size_tmp; + } #endif - } + } - memcpy( hrtf_bin_wptr, &( hrtf->index_frequency_max_diffuse ), sizeof( uint16_t ) ); // index_frequency_max_diffuse - hrtf_bin_wptr += sizeof( uint16_t ); + memcpy( hrtf_bin_wptr, &( hrtf->index_frequency_max_diffuse ), sizeof( uint16_t ) ); // index_frequency_max_diffuse + hrtf_bin_wptr += sizeof( uint16_t ); - data_size_tmp = hrtf->max_num_ir * sizeof( float ); - // memcpy( hrtf_bin_wptr, hrtf->inv_diffuse_weight, data_size_tmp ); // inv_diffuse_weight - for ( iIR = 0; iIR < hrtf->max_num_ir; iIR++ ) - { - sprintf( tmpStr, FORMAT_FLOAT, hrtf->inv_diffuse_weight[iIR] ); - sscanf( tmpStr, "%f", &( (float *) hrtf_bin_wptr )[iIR] ); - } - hrtf_bin_wptr += data_size_tmp; + data_size_tmp = hrtf->max_num_ir * sizeof( float ); + // memcpy( hrtf_bin_wptr, hrtf->inv_diffuse_weight, data_size_tmp ); // inv_diffuse_weight + for ( iIR = 0; iIR < hrtf->max_num_ir; iIR++ ) + { + sprintf( tmpStr, FORMAT_FLOAT, hrtf->inv_diffuse_weight[iIR] ); + sscanf( tmpStr, "%f", &( (float *) hrtf_bin_wptr )[iIR] ); + } + hrtf_bin_wptr += data_size_tmp; - memcpy( hrtf_bin_wptr, &( hrtf_table_dims.max_total_num_fsamp_per_iteration ), sizeof( uint16_t ) ); // max_total_num_fsamp_per_iteration - hrtf_bin_wptr += sizeof( uint16_t ); + memcpy( hrtf_bin_wptr, &( hrtf_table_dims.max_total_num_fsamp_per_iteration ), sizeof( uint16_t ) ); // max_total_num_fsamp_per_iteration + hrtf_bin_wptr += sizeof( uint16_t ); - // pOut_to_bin_re (The size depends on pIndex_frequency_max) - for ( iIR = 0; iIR < hrtf->max_num_ir; iIR++ ) - { -#ifdef USE_SYMETRIC_HRIR_FILTERS - for ( iChan = 0; iChan < nb_ear; iChan++ ) + // pOut_to_bin_re (The size depends on pIndex_frequency_max) + for ( iIR = 0; iIR < hrtf->max_num_ir; iIR++ ) { - iEar = nb_ear == 2 ? iChan : sym_hrir; - coeff_rptr = hrtf->pOut_to_bin_re[iIR][iEar]; - for ( iIter = 0; iIter < hrtf->num_iterations[iIR][iEar]; iIter++ ) +#ifdef USE_SYMETRIC_HRIR_FILTERS + for ( iChan = 0; iChan < nb_ear; iChan++ ) { - data_size_tmp = hrtf->pIndex_frequency_max[iIR][iEar][iIter] * sizeof( float ); - // memcpy( hrtf_bin_wptr, coeff_rptr, data_size_tmp ); - for ( iTap = 0; iTap < hrtf->pIndex_frequency_max[iIR][iEar][iIter]; iTap++ ) + iEar = nb_ear == 2 ? iChan : sym_hrir; + coeff_rptr = hrtf->pOut_to_bin_re[iIR][iEar]; + for ( iIter = 0; iIter < hrtf->num_iterations[iIR][iEar]; iIter++ ) { - //( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap]; - sprintf( tmpStr, FORMAT_FLOAT, coeff_rptr[iTap] ); - sscanf( tmpStr, "%f", &( ( (float *) hrtf_bin_wptr )[iTap] ) ); + data_size_tmp = hrtf->pIndex_frequency_max[iIR][iEar][iIter] * sizeof( float ); + // memcpy( hrtf_bin_wptr, coeff_rptr, data_size_tmp ); + for ( iTap = 0; iTap < hrtf->pIndex_frequency_max[iIR][iEar][iIter]; iTap++ ) + { + //( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap]; + sprintf( tmpStr, FORMAT_FLOAT, coeff_rptr[iTap] ); + sscanf( tmpStr, "%f", &( ( (float *) hrtf_bin_wptr )[iTap] ) ); + } + hrtf_bin_wptr += data_size_tmp; + coeff_rptr += hrtf->pIndex_frequency_max[iIR][iEar][iIter]; } - hrtf_bin_wptr += data_size_tmp; - coeff_rptr += hrtf->pIndex_frequency_max[iIR][iEar][iIter]; } - } #else - for ( iChan = 0; iChan < BINAURAL_CHANNELS; iChan++ ) - { - coeff_rptr = hrtf->pOut_to_bin_re[iIR][iChan]; - for ( iIter = 0; iIter < hrtf->num_iterations[iIR][iChan]; iIter++ ) + for ( iChan = 0; iChan < BINAURAL_CHANNELS; iChan++ ) { - data_size_tmp = hrtf->pIndex_frequency_max[iIR][iChan][iIter] * sizeof( float ); - // memcpy( hrtf_bin_wptr, coeff_rptr, data_size_tmp ); - for ( iTap = 0; iTap < hrtf->pIndex_frequency_max[iIR][iChan][iIter]; iTap++ ) + coeff_rptr = hrtf->pOut_to_bin_re[iIR][iChan]; + for ( iIter = 0; iIter < hrtf->num_iterations[iIR][iChan]; iIter++ ) { - //( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap]; - sprintf( tmpStr, FORMAT_FLOAT, coeff_rptr[iTap] ); - sscanf( tmpStr, "%f", &( ( (float *) hrtf_bin_wptr )[iTap] ) ); + data_size_tmp = hrtf->pIndex_frequency_max[iIR][iChan][iIter] * sizeof( float ); + // memcpy( hrtf_bin_wptr, coeff_rptr, data_size_tmp ); + for ( iTap = 0; iTap < hrtf->pIndex_frequency_max[iIR][iChan][iIter]; iTap++ ) + { + //( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap]; + sprintf( tmpStr, FORMAT_FLOAT, coeff_rptr[iTap] ); + sscanf( tmpStr, "%f", &( ( (float *) hrtf_bin_wptr )[iTap] ) ); + } + hrtf_bin_wptr += data_size_tmp; + coeff_rptr += hrtf->pIndex_frequency_max[iIR][iChan][iIter]; } - hrtf_bin_wptr += data_size_tmp; - coeff_rptr += hrtf->pIndex_frequency_max[iIR][iChan][iIter]; } - } #endif - } + } - // pOut_to_bin_im (The size depends on pIndex_frequency_max) - for ( iIR = 0; iIR < hrtf->max_num_ir; iIR++ ) - { -#ifdef USE_SYMETRIC_HRIR_FILTERS - for ( iChan = 0; iChan < nb_ear; iChan++ ) + // pOut_to_bin_im (The size depends on pIndex_frequency_max) + for ( iIR = 0; iIR < hrtf->max_num_ir; iIR++ ) { - iEar = nb_ear == 2 ? iChan : sym_hrir; - coeff_rptr = hrtf->pOut_to_bin_im[iIR][iEar]; - for ( iIter = 0; iIter < hrtf->num_iterations[iIR][iEar]; iIter++ ) +#ifdef USE_SYMETRIC_HRIR_FILTERS + for ( iChan = 0; iChan < nb_ear; iChan++ ) { - data_size_tmp = hrtf->pIndex_frequency_max[iIR][iEar][iIter] * sizeof( float ); - // memcpy( hrtf_bin_wptr, coeff_rptr, data_size_tmp ); - for ( iTap = 0; iTap < hrtf->pIndex_frequency_max[iIR][iEar][iIter]; iTap++ ) + iEar = nb_ear == 2 ? iChan : sym_hrir; + coeff_rptr = hrtf->pOut_to_bin_im[iIR][iEar]; + for ( iIter = 0; iIter < hrtf->num_iterations[iIR][iEar]; iIter++ ) { - //( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap]; - sprintf( tmpStr, FORMAT_FLOAT, coeff_rptr[iTap] ); - sscanf( tmpStr, "%f", &( ( (float *) hrtf_bin_wptr )[iTap] ) ); + data_size_tmp = hrtf->pIndex_frequency_max[iIR][iEar][iIter] * sizeof( float ); + // memcpy( hrtf_bin_wptr, coeff_rptr, data_size_tmp ); + for ( iTap = 0; iTap < hrtf->pIndex_frequency_max[iIR][iEar][iIter]; iTap++ ) + { + //( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap]; + sprintf( tmpStr, FORMAT_FLOAT, coeff_rptr[iTap] ); + sscanf( tmpStr, "%f", &( ( (float *) hrtf_bin_wptr )[iTap] ) ); + } + hrtf_bin_wptr += data_size_tmp; + coeff_rptr += hrtf->pIndex_frequency_max[iIR][iEar][iIter]; } - hrtf_bin_wptr += data_size_tmp; - coeff_rptr += hrtf->pIndex_frequency_max[iIR][iEar][iIter]; } - } #else - for ( iChan = 0; iChan < BINAURAL_CHANNELS; iChan++ ) - { - coeff_rptr = hrtf->pOut_to_bin_im[iIR][iChan]; - for ( iIter = 0; iIter < hrtf->num_iterations[iIR][iChan]; iIter++ ) + for ( iChan = 0; iChan < BINAURAL_CHANNELS; iChan++ ) { - data_size_tmp = hrtf->pIndex_frequency_max[iIR][iChan][iIter] * sizeof( float ); - // memcpy( hrtf_bin_wptr, coeff_rptr, data_size_tmp ); - for ( iTap = 0; iTap < hrtf->pIndex_frequency_max[iIR][iChan][iIter]; iTap++ ) + coeff_rptr = hrtf->pOut_to_bin_im[iIR][iChan]; + for ( iIter = 0; iIter < hrtf->num_iterations[iIR][iChan]; iIter++ ) { - //( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap]; - sprintf( tmpStr, FORMAT_FLOAT, coeff_rptr[iTap] ); - sscanf( tmpStr, "%f", &( ( (float *) hrtf_bin_wptr )[iTap] ) ); + data_size_tmp = hrtf->pIndex_frequency_max[iIR][iChan][iIter] * sizeof( float ); + // memcpy( hrtf_bin_wptr, coeff_rptr, data_size_tmp ); + for ( iTap = 0; iTap < hrtf->pIndex_frequency_max[iIR][iChan][iIter]; iTap++ ) + { + //( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap]; + sprintf( tmpStr, FORMAT_FLOAT, coeff_rptr[iTap] ); + sscanf( tmpStr, "%f", &( ( (float *) hrtf_bin_wptr )[iTap] ) ); + } + hrtf_bin_wptr += data_size_tmp; + coeff_rptr += hrtf->pIndex_frequency_max[iIR][iChan][iIter]; } - hrtf_bin_wptr += data_size_tmp; - coeff_rptr += hrtf->pIndex_frequency_max[iIR][iChan][iIter]; } - } #endif - } + } - memcpy( hrtf_bin_wptr, &( hrtf_table_dims.max_total_num_fsamp_per_iteration_diff ), sizeof( uint16_t ) ); // max_total_num_fsamp_per_iteration_diff - hrtf_bin_wptr += sizeof( uint16_t ); + memcpy( hrtf_bin_wptr, &( hrtf_table_dims.max_total_num_fsamp_per_iteration_diff ), sizeof( uint16_t ) ); // max_total_num_fsamp_per_iteration_diff + hrtf_bin_wptr += sizeof( uint16_t ); - if ( hrtf_table_dims.max_total_num_fsamp_per_iteration_diff != 0 ) - { - // pOut_to_bin_diffuse_re : The size depends on pIndex_frequency_max_diffuse -#ifdef USE_SYMETRIC_HRIR_FILTERS - for ( iChan = 0; iChan < nb_ear; iChan++ ) + if ( hrtf_table_dims.max_total_num_fsamp_per_iteration_diff != 0 ) { - iEar = nb_ear == 2 ? iChan : sym_hrir; - coeff_rptr = hrtf->pOut_to_bin_diffuse_re[iEar]; - for ( iIter = 0; iIter < hrtf->num_iterations_diffuse[iEar]; iIter++ ) + // pOut_to_bin_diffuse_re : The size depends on pIndex_frequency_max_diffuse +#ifdef USE_SYMETRIC_HRIR_FILTERS + for ( iChan = 0; iChan < nb_ear; iChan++ ) { - data_size_tmp = hrtf->pIndex_frequency_max_diffuse[iEar][iIter] * sizeof( float ); - // memcpy( hrtf_bin_wptr, coeff_rptr, data_size_tmp ); - for ( iTap = 0; iTap < hrtf->pIndex_frequency_max_diffuse[iEar][iIter]; iTap++ ) + iEar = nb_ear == 2 ? iChan : sym_hrir; + coeff_rptr = hrtf->pOut_to_bin_diffuse_re[iEar]; + for ( iIter = 0; iIter < hrtf->num_iterations_diffuse[iEar]; iIter++ ) { - //( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap]; - sprintf( tmpStr, FORMAT_FLOAT, coeff_rptr[iTap] ); - sscanf( tmpStr, "%f", &( ( (float *) hrtf_bin_wptr )[iTap] ) ); + data_size_tmp = hrtf->pIndex_frequency_max_diffuse[iEar][iIter] * sizeof( float ); + // memcpy( hrtf_bin_wptr, coeff_rptr, data_size_tmp ); + for ( iTap = 0; iTap < hrtf->pIndex_frequency_max_diffuse[iEar][iIter]; iTap++ ) + { + //( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap]; + sprintf( tmpStr, FORMAT_FLOAT, coeff_rptr[iTap] ); + sscanf( tmpStr, "%f", &( ( (float *) hrtf_bin_wptr )[iTap] ) ); + } + hrtf_bin_wptr += data_size_tmp; + coeff_rptr += hrtf->pIndex_frequency_max_diffuse[iEar][iIter]; } - hrtf_bin_wptr += data_size_tmp; - coeff_rptr += hrtf->pIndex_frequency_max_diffuse[iEar][iIter]; } - } - // pOut_to_bin_diffuse_im : The size depends on pIndex_frequency_max_diffuse - for ( iChan = 0; iChan < nb_ear; iChan++ ) - { - iEar = nb_ear == 2 ? iChan : sym_hrir; - coeff_rptr = hrtf->pOut_to_bin_diffuse_im[iEar]; - for ( iIter = 0; iIter < hrtf->num_iterations_diffuse[iEar]; iIter++ ) + // pOut_to_bin_diffuse_im : The size depends on pIndex_frequency_max_diffuse + for ( iChan = 0; iChan < nb_ear; iChan++ ) { - data_size_tmp = hrtf->pIndex_frequency_max_diffuse[iEar][iIter] * sizeof( float ); - // memcpy( hrtf_bin_wptr, coeff_rptr, data_size_tmp ); - for ( iTap = 0; iTap < hrtf->pIndex_frequency_max_diffuse[iEar][iIter]; iTap++ ) + iEar = nb_ear == 2 ? iChan : sym_hrir; + coeff_rptr = hrtf->pOut_to_bin_diffuse_im[iEar]; + for ( iIter = 0; iIter < hrtf->num_iterations_diffuse[iEar]; iIter++ ) { - //( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap]; - sprintf( tmpStr, FORMAT_FLOAT, coeff_rptr[iTap] ); - sscanf( tmpStr, "%f", &( ( (float *) hrtf_bin_wptr )[iTap] ) ); + data_size_tmp = hrtf->pIndex_frequency_max_diffuse[iEar][iIter] * sizeof( float ); + // memcpy( hrtf_bin_wptr, coeff_rptr, data_size_tmp ); + for ( iTap = 0; iTap < hrtf->pIndex_frequency_max_diffuse[iEar][iIter]; iTap++ ) + { + //( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap]; + sprintf( tmpStr, FORMAT_FLOAT, coeff_rptr[iTap] ); + sscanf( tmpStr, "%f", &( ( (float *) hrtf_bin_wptr )[iTap] ) ); + } + hrtf_bin_wptr += data_size_tmp; + coeff_rptr += hrtf->pIndex_frequency_max_diffuse[iEar][iIter]; } - hrtf_bin_wptr += data_size_tmp; - coeff_rptr += hrtf->pIndex_frequency_max_diffuse[iEar][iIter]; } - } #else - for ( iChan = 0; iChan < BINAURAL_CHANNELS; iChan++ ) - { - coeff_rptr = hrtf->pOut_to_bin_diffuse_re[iChan]; - for ( iIter = 0; iIter < hrtf->num_iterations_diffuse[iChan]; iIter++ ) + for ( iChan = 0; iChan < BINAURAL_CHANNELS; iChan++ ) { - data_size_tmp = hrtf->pIndex_frequency_max_diffuse[iChan][iIter] * sizeof( float ); - // memcpy( hrtf_bin_wptr, coeff_rptr, data_size_tmp ); - for ( iTap = 0; iTap < hrtf->pIndex_frequency_max_diffuse[iChan][iIter]; iTap++ ) + coeff_rptr = hrtf->pOut_to_bin_diffuse_re[iChan]; + for ( iIter = 0; iIter < hrtf->num_iterations_diffuse[iChan]; iIter++ ) { - //( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap]; - sprintf( tmpStr, FORMAT_FLOAT, coeff_rptr[iTap] ); - sscanf( tmpStr, "%f", &( ( (float *) hrtf_bin_wptr )[iTap] ) ); + data_size_tmp = hrtf->pIndex_frequency_max_diffuse[iChan][iIter] * sizeof( float ); + // memcpy( hrtf_bin_wptr, coeff_rptr, data_size_tmp ); + for ( iTap = 0; iTap < hrtf->pIndex_frequency_max_diffuse[iChan][iIter]; iTap++ ) + { + //( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap]; + sprintf( tmpStr, FORMAT_FLOAT, coeff_rptr[iTap] ); + sscanf( tmpStr, "%f", &( ( (float *) hrtf_bin_wptr )[iTap] ) ); + } + hrtf_bin_wptr += data_size_tmp; + coeff_rptr += hrtf->pIndex_frequency_max_diffuse[iChan][iIter]; } - hrtf_bin_wptr += data_size_tmp; - coeff_rptr += hrtf->pIndex_frequency_max_diffuse[iChan][iIter]; } - } - // pOut_to_bin_diffuse_im : The size depends on pIndex_frequency_max_diffuse - for ( iChan = 0; iChan < BINAURAL_CHANNELS; iChan++ ) - { - coeff_rptr = hrtf->pOut_to_bin_diffuse_im[iChan]; - for ( iIter = 0; iIter < hrtf->num_iterations_diffuse[iChan]; iIter++ ) + // pOut_to_bin_diffuse_im : The size depends on pIndex_frequency_max_diffuse + for ( iChan = 0; iChan < BINAURAL_CHANNELS; iChan++ ) { - data_size_tmp = hrtf->pIndex_frequency_max_diffuse[iChan][iIter] * sizeof( float ); - // memcpy( hrtf_bin_wptr, coeff_rptr, data_size_tmp ); - for ( iTap = 0; iTap < hrtf->pIndex_frequency_max_diffuse[iChan][iIter]; iTap++ ) + coeff_rptr = hrtf->pOut_to_bin_diffuse_im[iChan]; + for ( iIter = 0; iIter < hrtf->num_iterations_diffuse[iChan]; iIter++ ) { - //( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap]; - sprintf( tmpStr, FORMAT_FLOAT, coeff_rptr[iTap] ); - sscanf( tmpStr, "%f", &( ( (float *) hrtf_bin_wptr )[iTap] ) ); + data_size_tmp = hrtf->pIndex_frequency_max_diffuse[iChan][iIter] * sizeof( float ); + // memcpy( hrtf_bin_wptr, coeff_rptr, data_size_tmp ); + for ( iTap = 0; iTap < hrtf->pIndex_frequency_max_diffuse[iChan][iIter]; iTap++ ) + { + //( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap]; + sprintf( tmpStr, FORMAT_FLOAT, coeff_rptr[iTap] ); + sscanf( tmpStr, "%f", &( ( (float *) hrtf_bin_wptr )[iTap] ) ); + } + hrtf_bin_wptr += data_size_tmp; + coeff_rptr += hrtf->pIndex_frequency_max_diffuse[iChan][iIter]; } - hrtf_bin_wptr += data_size_tmp; - coeff_rptr += hrtf->pIndex_frequency_max_diffuse[iChan][iIter]; } - } #endif - } + } - binary_file_full_path = (char *) malloc( sizeof( char ) * ( strlen( binary_file_path ) + strlen( lscfg.name ) + ( sym_hrir < 0 ? 0 : ( sym_hrir == 0 ? strlen( "_left" ) : strlen( "_right" ) ) ) + - +1 + 1 + 1 + 2 + 7 + 1 ) ); - sprintf( binary_file_full_path, "%s_%s%s_%ikHz.bin", binary_file_path, lscfg.name, sym_hrir < 0 ? "" : ( sym_hrir == 0 ? "_left" : "_right" ), - samplerate / 1000 ); + binary_file_full_path = (char *) malloc( sizeof( char ) * ( strlen( binary_file_path ) + strlen( lscfg.name ) + ( sym_hrir < 0 ? 0 : ( sym_hrir == 0 ? strlen( "_left" ) : strlen( "_right" ) ) ) + + +1 + 1 + 1 + 2 + 7 + 1 ) ); + sprintf( binary_file_full_path, "%s_%s%s_%ikHz.bin", binary_file_path, lscfg.name, sym_hrir < 0 ? "" : ( sym_hrir == 0 ? "_left" : "_right" ), + samplerate / 1000 ); + + output_binary_file = fopen( binary_file_full_path, "wb" ); + if ( output_binary_file == NULL ) + { + free( hrtf_bin ); + return; + } + fwrite( hrtf_bin, hrtf_data_size, 1, output_binary_file ); + fclose( output_binary_file ); - output_binary_file = fopen( binary_file_full_path, "wb" ); - if ( output_binary_file == NULL ) - { free( hrtf_bin ); - return; + free( binary_file_full_path ); } - fwrite( hrtf_bin, hrtf_data_size, 1, output_binary_file ); - fclose( output_binary_file ); - - free( hrtf_bin ); - free( binary_file_full_path ); -} #endif // MIXER_CONV_BINARY_FILE_311 -/*---------------------------------------------------------------------* - * to_upper() - * - * Capitalize all letters of a string. - * (normally to_upper() function would be used but it does not work in Unix) - *---------------------------------------------------------------------*/ -char *to_upper( - char *str ) -{ - int16_t i; - char *p = str; - - i = 0; - while ( str[i] != 0 ) + /*---------------------------------------------------------------------* + * to_upper() + * + * Capitalize all letters of a string. + * (normally to_upper() function would be used but it does not work in Unix) + *---------------------------------------------------------------------*/ + char *to_upper( + char *str ) { - if ( str[i] >= 'a' && str[i] <= 'z' ) + int16_t i; + char *p = str; + + i = 0; + while ( str[i] != 0 ) { - str[i] -= 0x20; + if ( str[i] >= 'a' && str[i] <= 'z' ) + { + str[i] -= 0x20; + } + i++; } - i++; - } - - return p; -} - -/*---------------------------------------------------------------------* - *get_ls_layout_config( IVAS_DEC_OUTPUT_CONFIG ls_layout_config, struct ivas_layout_config *ls_struct ) - * fill ls_struct with proper values depending on ls_layout_config - *---------------------------------------------------------------------*/ -void get_ls_layout_config( IVAS_DEC_AUDIO_CONFIG ls_layout_config, struct ivas_layout_config *ls_struct ) -{ - int16_t ind, curComp = 0; - int16_t nbCompForCurrentOrder = 1; - int16_t curOrder = 0; - memset( ls_struct, 0, sizeof( struct ivas_layout_config ) ); - switch ( ls_layout_config ) - { - case IVAS_DEC_OUTPUT_FOA: - strcpy( ls_struct->name, "FOA" ); - ls_struct->nb_channel = 4; - ls_struct->isloudspeaker = 0; - ls_struct->sba_order = 1; - ls_struct->num_lfe = 0; - memset( ls_struct->lfe_index, -1, sizeof( int16_t ) * 2 ); - break; - case IVAS_DEC_OUTPUT_HOA2: - strcpy( ls_struct->name, "HOA2" ); - ls_struct->nb_channel = 9; - ls_struct->isloudspeaker = 0; - ls_struct->sba_order = 2; - ls_struct->num_lfe = 0; - memset( ls_struct->lfe_index, -1, sizeof( int16_t ) * 2 ); - break; - case IVAS_DEC_OUTPUT_HOA3: - strcpy( ls_struct->name, "HOA3" ); - ls_struct->nb_channel = 16; - ls_struct->isloudspeaker = 0; - ls_struct->sba_order = 3; - ls_struct->num_lfe = 0; - memset( ls_struct->lfe_index, -1, sizeof( int16_t ) * 2 ); - break; - case IVAS_DEC_OUTPUT_MONO: - strcpy( ls_struct->name, "MONO" ); - ls_struct->nb_channel = 1; - ls_struct->isloudspeaker = 1; - ls_struct->sba_order = -1; - ls_struct->num_lfe = 0; - memset( ls_struct->lfe_index, -1, sizeof( int16_t ) * 2 ); - break; - case IVAS_DEC_OUTPUT_STEREO: - strcpy( ls_struct->name, "STEREO" ); - ls_struct->nb_channel = 2; - memcpy( ls_struct->azi, ls_azimuth_CICP2, sizeof( float ) * ls_struct->nb_channel ); - ls_struct->isloudspeaker = 1; - ls_struct->sba_order = -1; - ls_struct->num_lfe = 0; - memset( ls_struct->lfe_index, -1, sizeof( int16_t ) * 2 ); - break; - case IVAS_DEC_OUTPUT_5_1: - strcpy( ls_struct->name, "5_1" ); - ls_struct->nb_channel = 5; - ls_struct->isloudspeaker = 1; - ls_struct->sba_order = -1; - ls_struct->num_lfe = 1; - ls_struct->lfe_index[0] = 3; - ls_struct->lfe_index[1] = -1; - ls_struct->gain_lfe = GAIN_LFE; - memcpy( ls_struct->azi, ls_azimuth_CICP6, sizeof( float ) * ls_struct->nb_channel ); - break; - case IVAS_DEC_OUTPUT_7_1: - strcpy( ls_struct->name, "7_1" ); - ls_struct->nb_channel = 7; - ls_struct->isloudspeaker = 1; - ls_struct->sba_order = -1; - ls_struct->num_lfe = 1; - ls_struct->lfe_index[0] = 3; - ls_struct->lfe_index[1] = -1; - ls_struct->gain_lfe = GAIN_LFE; - memcpy( ls_struct->azi, ls_azimuth_CICP12, sizeof( float ) * ls_struct->nb_channel ); - break; - case IVAS_DEC_OUTPUT_5_1_2: - strcpy( ls_struct->name, "5_1_2" ); - ls_struct->nb_channel = 7; - ls_struct->isloudspeaker = 1; - ls_struct->sba_order = -1; - ls_struct->num_lfe = 1; - ls_struct->lfe_index[1] = -1; - ls_struct->gain_lfe = GAIN_LFE; - memcpy( ls_struct->azi, ls_azimuth_CICP14, sizeof( float ) * ls_struct->nb_channel ); - break; - case IVAS_DEC_OUTPUT_5_1_4: - strcpy( ls_struct->name, "5_1_4" ); - ls_struct->nb_channel = 9; - ls_struct->isloudspeaker = 1; - ls_struct->sba_order = -1; - ls_struct->num_lfe = 1; - ls_struct->lfe_index[0] = 3; - ls_struct->lfe_index[1] = -1; - ls_struct->gain_lfe = GAIN_LFE; - memcpy( ls_struct->azi, ls_azimuth_CICP16, sizeof( float ) * ls_struct->nb_channel ); - break; - case IVAS_DEC_OUTPUT_7_1_4: - strcpy( ls_struct->name, "7_1_4" ); - ls_struct->nb_channel = 11; - ls_struct->isloudspeaker = 1; - ls_struct->sba_order = -1; - ls_struct->num_lfe = 1; - ls_struct->lfe_index[0] = 3; - ls_struct->lfe_index[1] = -1; - ls_struct->gain_lfe = GAIN_LFE; - memcpy( ls_struct->azi, ls_azimuth_CICP19, sizeof( float ) * ls_struct->nb_channel ); - break; - case IVAS_DEC_OUTPUT_EXT: - default: - { - const float tmp_azi[15] = { 30, -30, 0, 135, -135, 110, -110, 90, -90, 30, -30, 110, -110, 135, -135 }; - const float tmp_ele[15] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, 35, 35, 35, 35, 35 }; - strcpy( ls_struct->name, "Combined" ); - ls_struct->nb_channel = 15; - memcpy( ls_struct->azi, tmp_azi, sizeof( float ) * ls_struct->nb_channel ); - memcpy( ls_struct->ele, tmp_ele, sizeof( float ) * ls_struct->nb_channel ); - ls_struct->isloudspeaker = 1; - ls_struct->sba_order = -1; - ls_struct->num_lfe = 1; - ls_struct->lfe_index[0] = 3; - ls_struct->lfe_index[1] = -1; - ls_struct->gain_lfe = GAIN_LFE; - } - break; + return p; } - if ( ls_struct->isloudspeaker ) + + /*---------------------------------------------------------------------* + *get_ls_layout_config( IVAS_DEC_OUTPUT_CONFIG ls_layout_config, struct ivas_layout_config *ls_struct ) + * fill ls_struct with proper values depending on ls_layout_config + *---------------------------------------------------------------------*/ + void get_ls_layout_config( IVAS_DEC_AUDIO_CONFIG ls_layout_config, struct ivas_layout_config * ls_struct ) { - for ( ind = 0; ind < ls_struct->nb_channel; ind++ ) + int16_t ind, curComp = 0; + int16_t nbCompForCurrentOrder = 1; + int16_t curOrder = 0; + memset( ls_struct, 0, sizeof( struct ivas_layout_config ) ); + + switch ( ls_layout_config ) { - ls_struct->sum_diff[ind] = ( ls_struct->azi[ind] >= 0 ) ? 0 : 1; - if ( ind < 2 ) - { - ls_struct->sum_diff_pair[ind] = ind == 0 ? 1 : 0; - } - else if ( ind == 2 ) - { - ls_struct->sum_diff_pair[ind] = 2; - } - else + case IVAS_DEC_OUTPUT_FOA: + strcpy( ls_struct->name, "FOA" ); + ls_struct->nb_channel = 4; + ls_struct->isloudspeaker = 0; + ls_struct->sba_order = 1; + ls_struct->num_lfe = 0; + memset( ls_struct->lfe_index, -1, sizeof( int16_t ) * 2 ); + break; + case IVAS_DEC_OUTPUT_HOA2: + strcpy( ls_struct->name, "HOA2" ); + ls_struct->nb_channel = 9; + ls_struct->isloudspeaker = 0; + ls_struct->sba_order = 2; + ls_struct->num_lfe = 0; + memset( ls_struct->lfe_index, -1, sizeof( int16_t ) * 2 ); + break; + case IVAS_DEC_OUTPUT_HOA3: + strcpy( ls_struct->name, "HOA3" ); + ls_struct->nb_channel = 16; + ls_struct->isloudspeaker = 0; + ls_struct->sba_order = 3; + ls_struct->num_lfe = 0; + memset( ls_struct->lfe_index, -1, sizeof( int16_t ) * 2 ); + break; + case IVAS_DEC_OUTPUT_MONO: + strcpy( ls_struct->name, "MONO" ); + ls_struct->nb_channel = 1; + ls_struct->isloudspeaker = 1; + ls_struct->sba_order = -1; + ls_struct->num_lfe = 0; + memset( ls_struct->lfe_index, -1, sizeof( int16_t ) * 2 ); + break; + case IVAS_DEC_OUTPUT_STEREO: + strcpy( ls_struct->name, "STEREO" ); + ls_struct->nb_channel = 2; + memcpy( ls_struct->azi, ls_azimuth_CICP2, sizeof( float ) * ls_struct->nb_channel ); + ls_struct->isloudspeaker = 1; + ls_struct->sba_order = -1; + ls_struct->num_lfe = 0; + memset( ls_struct->lfe_index, -1, sizeof( int16_t ) * 2 ); + break; + case IVAS_DEC_OUTPUT_5_1: + strcpy( ls_struct->name, "5_1" ); + ls_struct->nb_channel = 5; + ls_struct->isloudspeaker = 1; + ls_struct->sba_order = -1; + ls_struct->num_lfe = 1; + ls_struct->lfe_index[0] = 3; + ls_struct->lfe_index[1] = -1; + ls_struct->gain_lfe = GAIN_LFE; + memcpy( ls_struct->azi, ls_azimuth_CICP6, sizeof( float ) * ls_struct->nb_channel ); + break; + case IVAS_DEC_OUTPUT_7_1: + strcpy( ls_struct->name, "7_1" ); + ls_struct->nb_channel = 7; + ls_struct->isloudspeaker = 1; + ls_struct->sba_order = -1; + ls_struct->num_lfe = 1; + ls_struct->lfe_index[0] = 3; + ls_struct->lfe_index[1] = -1; + ls_struct->gain_lfe = GAIN_LFE; + memcpy( ls_struct->azi, ls_azimuth_CICP12, sizeof( float ) * ls_struct->nb_channel ); + break; + case IVAS_DEC_OUTPUT_5_1_2: + strcpy( ls_struct->name, "5_1_2" ); + ls_struct->nb_channel = 7; + ls_struct->isloudspeaker = 1; + ls_struct->sba_order = -1; + ls_struct->num_lfe = 1; + ls_struct->lfe_index[1] = -1; + ls_struct->gain_lfe = GAIN_LFE; + memcpy( ls_struct->azi, ls_azimuth_CICP14, sizeof( float ) * ls_struct->nb_channel ); + break; + case IVAS_DEC_OUTPUT_5_1_4: + strcpy( ls_struct->name, "5_1_4" ); + ls_struct->nb_channel = 9; + ls_struct->isloudspeaker = 1; + ls_struct->sba_order = -1; + ls_struct->num_lfe = 1; + ls_struct->lfe_index[0] = 3; + ls_struct->lfe_index[1] = -1; + ls_struct->gain_lfe = GAIN_LFE; + memcpy( ls_struct->azi, ls_azimuth_CICP16, sizeof( float ) * ls_struct->nb_channel ); + break; + case IVAS_DEC_OUTPUT_7_1_4: + strcpy( ls_struct->name, "7_1_4" ); + ls_struct->nb_channel = 11; + ls_struct->isloudspeaker = 1; + ls_struct->sba_order = -1; + ls_struct->num_lfe = 1; + ls_struct->lfe_index[0] = 3; + ls_struct->lfe_index[1] = -1; + ls_struct->gain_lfe = GAIN_LFE; + memcpy( ls_struct->azi, ls_azimuth_CICP19, sizeof( float ) * ls_struct->nb_channel ); + break; + case IVAS_DEC_OUTPUT_EXT: + default: { - ls_struct->sum_diff_pair[ind] = ind % 2 ? ind + 1 : ind - 1; + const float tmp_azi[15] = { 30, -30, 0, 135, -135, 110, -110, 90, -90, 30, -30, 110, -110, 135, -135 }; + const float tmp_ele[15] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, 35, 35, 35, 35, 35 }; + strcpy( ls_struct->name, "Combined" ); + ls_struct->nb_channel = 15; + memcpy( ls_struct->azi, tmp_azi, sizeof( float ) * ls_struct->nb_channel ); + memcpy( ls_struct->ele, tmp_ele, sizeof( float ) * ls_struct->nb_channel ); + ls_struct->isloudspeaker = 1; + ls_struct->sba_order = -1; + ls_struct->num_lfe = 1; + ls_struct->lfe_index[0] = 3; + ls_struct->lfe_index[1] = -1; + ls_struct->gain_lfe = GAIN_LFE; } + break; } - } - else - { - for ( ind = 0; ind < ls_struct->nb_channel; ind++ ) + if ( ls_struct->isloudspeaker ) { - if ( curComp < curOrder ) + for ( ind = 0; ind < ls_struct->nb_channel; ind++ ) { - ls_struct->sum_diff[ind] = 1; + ls_struct->sum_diff[ind] = ( ls_struct->azi[ind] >= 0 ) ? 0 : 1; + if ( ind < 2 ) + { + ls_struct->sum_diff_pair[ind] = ind == 0 ? 1 : 0; + } + else if ( ind == 2 ) + { + ls_struct->sum_diff_pair[ind] = 2; + } + else + { + ls_struct->sum_diff_pair[ind] = ind % 2 ? ind + 1 : ind - 1; + } } - else + } + else + { + for ( ind = 0; ind < ls_struct->nb_channel; ind++ ) { - ls_struct->sum_diff[ind] = 0; - } + if ( curComp < curOrder ) + { + ls_struct->sum_diff[ind] = 1; + } + else + { + ls_struct->sum_diff[ind] = 0; + } - curComp++; - if ( curComp == nbCompForCurrentOrder ) - { - curOrder++; - curComp = 0; - nbCompForCurrentOrder = 2 * curOrder + 1; + curComp++; + if ( curComp == nbCompForCurrentOrder ) + { + curOrder++; + curComp = 0; + nbCompForCurrentOrder = 2 * curOrder + 1; + } } } - } - return; -} + return; + } diff --git a/scripts/config/ci_linux.json b/scripts/config/ci_linux.json index 6bca2663d97b51ce5d632a329187122aaa92affe..1cb11417522c52ac297ddd41afe57f113efc8beb 100644 --- a/scripts/config/ci_linux.json +++ b/scripts/config/ci_linux.json @@ -10,8 +10,8 @@ "SBA": "/usr/local/testv/stv3OA48c.wav", "MASA1TC1DIR": "/usr/local/testv/stv1MASA1TC48c.wav", "MASA1TC2DIR": "/usr/local/testv/stv2MASA1TC48c.wav", - "MASA2TC1DIR": "/usr/local/testv/stv1MASA2TC48c.wav.wav", - "MASA2TC2DIR": "/usr/local/testv/stv2MASA2TC48c.wav.wav", + "MASA2TC1DIR": "/usr/local/testv/stv1MASA2TC48c.wav", + "MASA2TC2DIR": "/usr/local/testv/stv2MASA2TC48c.wav", "5_1": "/usr/local/testv/stv51MC48c.wav", "5_1_2": "/usr/local/testv/stv512MC48c.wav", "5_1_4": "/usr/local/testv/stv514MC48c.wav", diff --git a/scripts/config/ivas_modes.json b/scripts/config/ivas_modes.json index 0e4ef469d9ec36a97c513394609921375f57d1f9..d4f1e107cc6c2a798920a8874115ed24f5902f9d 100644 --- a/scripts/config/ivas_modes.json +++ b/scripts/config/ivas_modes.json @@ -964,6 +964,44 @@ ] } }, + "MASA_1TC_1DIR_b{bitrate}_{bandwidth}_rs": { + "encmodeoption": [ + "-masa", + "1" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "MASA1TC1DIR", + "table_name": "MASA 1TC 1DIR@{table_bitrate} kbps RS {bandwidth}", + "nummetadata": 1, + "metadatafilenames": [ + "{item}.met" + ], + "rs": true, + "amr": false, + "mono": false, + "bitrates": { + "wb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "swb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "fb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + } + } + + }, "MASA_2TC_1DIR_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-masa", @@ -1034,6 +1072,46 @@ ] } }, + "MASA_2TC_1DIR_b{bitrate}_{bandwidth}_rs": { + "encmodeoption": [ + "-masa", + "2" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "MASA2TC1DIR", + "table_name": "MASA 2TC 1DIR@{table_bitrate} kbps {bandwidth}", + "nummetadata": 1, + "metadatafilenames": [ + "{item}.met" + ], + "rs": true, + "amr": false, + "mono": false, + "rs": true, + "amr": false, + "mono": false, + "bitrates": { + "wb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "swb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "fb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + } + } + }, "MASA_1TC_2DIR_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-masa", @@ -1813,7 +1891,7 @@ "table_name": "ISM1@{table_bitrate} kbps {bandwidth}", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -1851,6 +1929,39 @@ ] } }, + "ISM1_b{bitrate}_{bandwidth}_rs": { + "encmodeoption": [ + "-ism", + "1" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "EXT": [] + }, + "in_config": "ISM1", + "table_name": "ISM1@{table_bitrate} RS kbps {bandwidth}", + "nummetadata": 1, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": true, + "amr": false, + "mono": false, + "bitrates": { + "wb": { + "all": "{sw_files_path}/sw_13k2_128k.bin" + }, + "swb": { + "all": "{sw_files_path}/sw_13k2_128k.bin" + }, + "fb": { + "all": "{sw_files_path}/sw_32k_128k.bin" + } + } + }, "ISM1_b{bitrate}_dtx_{bandwidth}_cbr": { "encmodeoption": [ "-ism", @@ -1868,7 +1979,7 @@ "table_name": "ISM1@{table_bitrate} kbps DTX {bandwidth}", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -1924,7 +2035,7 @@ "table_name": "ISM2@{table_bitrate} kbps {bandwidth}", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -1986,7 +2097,7 @@ "table_name": "ISM2@{table_bitrate} kbps DTX {bandwidth}", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -2030,6 +2141,39 @@ 256000 ] } + }, + "ISM2_b{bitrate}_{bandwidth}_rs": { + "encmodeoption": [ + "-ism", + "2" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "EXT": [] + }, + "in_config": "ISM2", + "table_name": "ISM2@{table_bitrate} kbps RS {bandwidth}", + "nummetadata": 2, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": true, + "amr": false, + "mono": false, + "bitrates": { + "wb": { + "all": "{sw_files_path}/sw_16k4_256k.bin" + }, + "swb": { + "all": "{sw_files_path}/sw_16k4_256k.bin" + }, + "fb": { + "all": "{sw_files_path}/sw_32k_256k.bin" + } + } } }, "ISM3": { @@ -2049,7 +2193,7 @@ "table_name": "ISM3@{table_bitrate} kbps {bandwidth}", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -2112,7 +2256,7 @@ "table_name": "ISM3@{table_bitrate} kbps DTX {bandwidth}", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -2157,6 +2301,39 @@ 384000 ] } + }, + "ISM3_b{bitrate}_{bandwidth}_rs": { + "encmodeoption": [ + "-ism", + "3" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "EXT": [] + }, + "in_config": "ISM3", + "table_name": "ISM3@{table_bitrate} kbps {bandwidth}", + "nummetadata": 3, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": true, + "amr": false, + "mono": false, + "bitrates": { + "wb": { + "all": "{sw_files_path}/sw_24k4_384k.bin" + }, + "swb": { + "all": "{sw_files_path}/sw_24k4_384k.bin" + }, + "fb": { + "all": "{sw_files_path}/sw_32k_384k.bin" + } + } } }, "ISM4": { @@ -2176,7 +2353,7 @@ "table_name": "ISM4@{table_bitrate} kbps {bandwidth}", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -2242,7 +2419,7 @@ "table_name": "ISM4@{table_bitrate} kbps DTX {bandwidth}", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -2290,8 +2467,461 @@ 512000 ] } + }, + "ISM4_b{bitrate}_{bandwidth}_rs": { + "encmodeoption": [ + "-ism", + "4" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "EXT": [] + }, + "in_config": "ISM4", + "table_name": "ISM4@{table_bitrate} kbps RS {bandwidth}", + "nummetadata": 4, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": true, + "amr": false, + "mono": false, + "bitrates": { + "wb": { + "all": "{sw_files_path}/sw_24k4_384k.bin" + }, + "swb": { + "all": "{sw_files_path}/sw_24k4_384k.bin" + }, + "fb": { + "all": "{sw_files_path}/sw_32k_384k.bin" + } + } } }, + "ISM+1": { + "ISM+1_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-ism", + "+1" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "EXT": [] + }, + "in_config": "ISM1", + "table_name": "ISM+1@{table_bitrate} kbps {bandwidth}", + "nummetadata": 1, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 64000, + 80000, + 96000, + 128000 + ], + "swb": [ + 64000, + 80000, + 96000, + 128000 + ], + "fb": [ + 64000, + 80000, + 96000, + 128000 + ] + } + }, + "ISM+1_b{bitrate}_dtx_{bandwidth}_cbr": { + "encmodeoption": [ + "-ism", + "+1" + ], + "encoptions": [ + "-dtx", + "-max_band", + "{bandwidth}" + ], + "dec": { + "EXT": [] + }, + "in_config": "ISM1", + "table_name": "ISM+1@{table_bitrate} kbps DTX {bandwidth}", + "nummetadata": 1, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 64000, + 80000, + 96000, + 128000 + ], + "swb": [ + 64000, + 80000, + 96000, + 128000 + ], + "fb": [ + 64000, + 80000, + 96000, + 128000 + ] + } + } + }, + "ISM+2": { + "ISM+2_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-ism", + "+2" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "EXT": [] + }, + "in_config": "ISM2", + "table_name": "ISM+2@{table_bitrate} kbps {bandwidth}", + "nummetadata": 2, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000 + ], + "swb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000 + ], + "fb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000 + ] + } + }, + "ISM+2_b{bitrate}_dtx_{bandwidth}_cbr": { + "encmodeoption": [ + "-dtx", + "-ism", + "+2" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "EXT": [] + }, + "in_config": "ISM2", + "table_name": "ISM+2@{table_bitrate} kbps DTX {bandwidth}", + "nummetadata": 2, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000 + ], + "swb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000 + ], + "fb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000 + ] + } + } + }, + "ISM+3": { + "ISM+3_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-ism", + "+3" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "EXT": [] + }, + "in_config": "ISM3", + "table_name": "ISM+3@{table_bitrate} kbps {bandwidth}", + "nummetadata": 3, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000 + ], + "swb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000 + ], + "fb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000 + ] + } + }, + "ISM+3_b{bitrate}_dtx_{bandwidth}_cbr": { + "encmodeoption": [ + "-dtx", + "-ism", + "+3" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "EXT": [] + }, + "in_config": "ISM3", + "table_name": "ISM+3@{table_bitrate} kbps DTX {bandwidth}", + "nummetadata": 3, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000 + ], + "swb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000 + ], + "fb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000 + ] + } + } + }, + "ISM+4": { + "ISM+4_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-ism", + "+4" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "EXT": [] + }, + "in_config": "ISM4", + "table_name": "ISM+4@{table_bitrate} kbps {bandwidth}", + "nummetadata": 4, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ], + "swb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ], + "fb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ] + } + }, + "ISM+4_b{bitrate}_dtx_{bandwidth}_cbr": { + "encmodeoption": [ + "-dtx", + "-ism", + "+4" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "EXT": [] + }, + "in_config": "ISM4", + "table_name": "ISM+4@{table_bitrate} kbps DTX {bandwidth}", + "nummetadata": 4, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ], + "swb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ], + "fb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ] + } + } + }, "stereo": { "stereo_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ diff --git a/scripts/config/ivas_modes_debug.json b/scripts/config/ivas_modes_debug.json index 769ed791ea64008ea2c8b28b3ffdbc398ba84765..bbd63d224ce3f0ca5d75dd6b040b91dcdbbda6fd 100644 --- a/scripts/config/ivas_modes_debug.json +++ b/scripts/config/ivas_modes_debug.json @@ -12117,7 +12117,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12141,7 +12141,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12165,7 +12165,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12189,7 +12189,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12213,7 +12213,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12237,7 +12237,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12261,7 +12261,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12285,7 +12285,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12309,7 +12309,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12333,7 +12333,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12357,7 +12357,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12381,7 +12381,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12405,7 +12405,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12429,7 +12429,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12453,7 +12453,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12477,7 +12477,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12501,7 +12501,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12525,7 +12525,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12549,7 +12549,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12573,7 +12573,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12597,7 +12597,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12621,7 +12621,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12645,7 +12645,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12669,7 +12669,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12693,7 +12693,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12717,7 +12717,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12741,7 +12741,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12765,7 +12765,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12789,7 +12789,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12813,7 +12813,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12837,7 +12837,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12861,7 +12861,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12885,7 +12885,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12909,7 +12909,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12933,7 +12933,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12958,7 +12958,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -12983,7 +12983,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13008,7 +13008,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13033,7 +13033,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13058,7 +13058,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13083,7 +13083,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13108,7 +13108,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13133,7 +13133,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13158,7 +13158,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13183,7 +13183,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13208,7 +13208,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13233,7 +13233,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13258,7 +13258,7 @@ "bw": "wb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13283,7 +13283,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13308,7 +13308,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13333,7 +13333,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13358,7 +13358,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13383,7 +13383,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13408,7 +13408,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13433,7 +13433,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13458,7 +13458,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13483,7 +13483,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13508,7 +13508,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13533,7 +13533,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13558,7 +13558,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13583,7 +13583,7 @@ "bw": "swb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13608,7 +13608,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13633,7 +13633,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13658,7 +13658,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13683,7 +13683,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13708,7 +13708,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13733,7 +13733,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13758,7 +13758,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13783,7 +13783,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13808,7 +13808,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13833,7 +13833,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13858,7 +13858,7 @@ "bw": "fb", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13884,7 +13884,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13908,7 +13908,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13932,7 +13932,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13956,7 +13956,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -13980,7 +13980,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14004,7 +14004,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14028,7 +14028,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14052,7 +14052,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14076,7 +14076,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14100,7 +14100,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14124,7 +14124,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14148,7 +14148,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14172,7 +14172,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14196,7 +14196,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14220,7 +14220,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14244,7 +14244,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14268,7 +14268,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14292,7 +14292,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14316,7 +14316,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14340,7 +14340,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14364,7 +14364,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14388,7 +14388,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14412,7 +14412,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14436,7 +14436,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14460,7 +14460,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14484,7 +14484,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14508,7 +14508,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14532,7 +14532,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14556,7 +14556,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14580,7 +14580,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14604,7 +14604,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14628,7 +14628,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14653,7 +14653,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14678,7 +14678,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14703,7 +14703,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14728,7 +14728,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14753,7 +14753,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14778,7 +14778,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14803,7 +14803,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14828,7 +14828,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14853,7 +14853,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14878,7 +14878,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14903,7 +14903,7 @@ "bw": "wb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14928,7 +14928,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14953,7 +14953,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -14978,7 +14978,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15003,7 +15003,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15028,7 +15028,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15053,7 +15053,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15078,7 +15078,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15103,7 +15103,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15128,7 +15128,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15153,7 +15153,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15178,7 +15178,7 @@ "bw": "swb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15203,7 +15203,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15228,7 +15228,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15253,7 +15253,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15278,7 +15278,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15303,7 +15303,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15328,7 +15328,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15353,7 +15353,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15378,7 +15378,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15403,7 +15403,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15428,7 +15428,7 @@ "bw": "fb", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15454,7 +15454,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15478,7 +15478,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15502,7 +15502,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15526,7 +15526,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15550,7 +15550,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15574,7 +15574,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15598,7 +15598,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15622,7 +15622,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15646,7 +15646,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15670,7 +15670,7 @@ "bw": "wb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15694,7 +15694,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15718,7 +15718,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15742,7 +15742,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15766,7 +15766,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15790,7 +15790,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15814,7 +15814,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15838,7 +15838,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15862,7 +15862,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15886,7 +15886,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15910,7 +15910,7 @@ "bw": "swb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15934,7 +15934,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15958,7 +15958,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -15982,7 +15982,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16006,7 +16006,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16030,7 +16030,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16054,7 +16054,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16078,7 +16078,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16102,7 +16102,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16126,7 +16126,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16150,7 +16150,7 @@ "bw": "fb", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16176,7 +16176,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16200,7 +16200,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16224,7 +16224,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16248,7 +16248,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16272,7 +16272,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16296,7 +16296,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16320,7 +16320,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16344,7 +16344,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16368,7 +16368,7 @@ "bw": "wb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16392,7 +16392,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16416,7 +16416,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16440,7 +16440,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16464,7 +16464,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16488,7 +16488,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16512,7 +16512,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16536,7 +16536,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16560,7 +16560,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16584,7 +16584,7 @@ "bw": "swb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16608,7 +16608,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16632,7 +16632,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16656,7 +16656,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16680,7 +16680,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16704,7 +16704,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16728,7 +16728,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16752,7 +16752,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16776,7 +16776,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -16800,7 +16800,7 @@ "bw": "fb", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm index 70f0ef6b3661f32bfb97529d154c850ef4d6c320..81fe3cff88cee088f0ac88a1dcc0a6c5924957c9 100644 --- a/scripts/config/self_test.prm +++ b/scripts/config/self_test.prm @@ -419,6 +419,15 @@ ../IVAS_dec HOA3 48 bit testv/stv4ISM48s.wav_brate_sw_48-48_DTX_hoa3.tst +// 4 ISM with extended metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation, directivity configuration, random FEC at 5% +../IVAS_cod -ism +4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit +../IVAS_dec -fec 5 -render_config testv/config_directivity.cfg -t testv/headrot_case04_3000_q.csv BINAURAL 48 bit testv/stv+4ISM48s.wav_256000_48-48_binaural_file_TDHR_DirConfig_FEC5.tst + +// 4 ISM with and without extended metadata bitrate switching from 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL out +../IVAS_cod -dtx -ism +4 testv/stvISM1.csv NULL testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv4ISM48s.wav bit +../IVAS_dec BINAURAL 48 bit testv/stv+4ISM48s.wav_brate_sw_48-48_DTX_binaural.tst + + // SBA at 13.2 kbps, 32kHz in, 32kHz out, HOA3 out ../IVAS_cod -sba 3 13200 32 testv/stv3OA32c.wav bit ../IVAS_dec HOA3 32 bit testv/stv3OA32c.wav_SBA_13200_32-32_HOA3.tst @@ -891,6 +900,14 @@ ../IVAS_cod -mc 7_1_4 96000 48 testv/stv714MC48c.wav bit ../IVAS_dec -fec 5 5_1 48 bit testv/stv714MC48c.wav_MC714_96000_48-48_5_1_FEC5.tst +// Multi-channel 7_1_4 at 160 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -mc 7_1_4 160000 48 testv/stv714MC48c.wav bit +../IVAS_dec BINAURAL 48 bit testv/stv714MC48c.wav_MC714_160000_48-48_MC_binaural.tst + +// Multi-channel 7_1_4 at 160 kbps, 48kHz in, 48kHz out, 7_1_4 out +../IVAS_cod -mc 7_1_4 160000 48 testv/stv714MC48c.wav bit +../IVAS_dec 7_1_4 48 bit testv/stv714MC48c.wav_MC714_160000_48-48_MC714.tst + // Multi-channel 5_1_2 at 32 kbps, 48kHz in, 48kHz out, STEREO out, random FEC at 5% ../IVAS_cod -mc 5_1_2 32000 48 testv/stv512MC48c.wav bit ../IVAS_dec -fec 5 STEREO 48 bit testv/stv512MC48c.wav_MC714_32000_48-48_Stereo.tst @@ -1007,3 +1024,14 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit ../IVAS_cod -mc 5_1 384000 48 testv/stv51MC48c.wav bit networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0 ../IVAS_dec -Tracefile tracefile_dec -VOIP 7_1_4 48 netsimoutput testv/stv51MC48c.wav_MC51_384000_48-48_7_1_4_JBM5.tst + + + +// NON DIEGETiC PAN at 60 kbps, 48kHz in, 48kHz out, STEREO out +../IVAS_cod 64000 48 testv/stv48c.wav bit +../IVAS_dec -non_diegetic_pan -0.5 48 bit testv/stv48c.pcm_MONO_64000_48-48_STEREO_NON-DIEGETIC-PAN_-0.5.tst + +// 4 ISM with extended metadata and non diegetic pan object switching bitrate 256 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL out +../IVAS_cod -dtx -ism +4 testv/stvISM1.csv NULL testv/stvISM_with_no_diegetic_switch.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit +../IVAS_dec BINAURAL 48 bit testv/stv+4ISM48s+non_diegetic_pan.wav_brate_256000-48_DTX_binaural.tst + diff --git a/scripts/cut_bs.py b/scripts/cut_bs.py index 5fee9845e743fb26b0f3552b09e26b31cf3d0954..c0ae6e19330bd70f8e04ee7e67a56e062689043d 100755 --- a/scripts/cut_bs.py +++ b/scripts/cut_bs.py @@ -35,11 +35,12 @@ import argparse import os.path import sys -SID_BITS = {35, 48, 88, 100} +#SID_BITS = {35, 48, 88, 100} +SID_BITS = {35, 48, 104} SYNC_WORDS = {b"!k", b" k"} -def cut_bs(fp, fp_out, start_frame=0, start_with_sid=False): +def cut_bs(fp, fp_out, start_frame = 0, start_with_sid = False): # cut until start frame fr_cnt = 0 cut_cnt = 0 @@ -86,7 +87,6 @@ def cut_bs(fp, fp_out, start_frame=0, start_with_sid=False): fp_out.write(n_bits_bs) fp_out.write(fp.read(n_bits * 2)) fr_cnt += 1 - return (fr_cnt, cut_cnt) diff --git a/scripts/prepare_instrumentation.sh b/scripts/prepare_instrumentation.sh index c748f19aca4745df84b90a3e7132235fdfa36555..70d69874968d26e078a7ce5b65b1e2c5ec5b5bee 100755 --- a/scripts/prepare_instrumentation.sh +++ b/scripts/prepare_instrumentation.sh @@ -103,7 +103,8 @@ find $targetdir -name "*.[ch]" -exec sed -i.bak -e "s/\(0x[0-9a-fA-F]*\)UL/\(\(u # 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" >> /dev/null +"tools/$system/wmc_tool" -m "$targetdir/apps/decoder.c" "$targetdir/lib_dec/*.c" >> /dev/null +"tools/$system/wmc_tool" -m "$targetdir/apps/renderer.c" "$targetdir/lib_rend/*.c" >> /dev/null # automatically enable #define WMOPS in options.h sed -i.bak -e "s/\/\*[[:space:]]*\(#define[[:space:]]*WMOPS\)[[:space:]]*\*\//\1/g" $targetdir/lib_com/options.h diff --git a/scripts/prepare_mem_dryrun.py b/scripts/prepare_mem_dryrun.py old mode 100644 new mode 100755 index 21f5b8114592067bdb0b9d04d00fa9bb20c22227..20da546c198953c47a9848806a8d1b106d65c478 --- a/scripts/prepare_mem_dryrun.py +++ b/scripts/prepare_mem_dryrun.py @@ -1,4 +1,4 @@ -#!/bin/python3 +#!/usr/bin/env python3 import re, os, fnmatch @@ -16,6 +16,7 @@ for d in dirs: with open(fileIn, 'r') as f_in: lines = f_in.readlines() with open(fileIn, 'w') as f_out: + skip = 0 for line in lines: if re.search(r'#define\W+WMC_TOOL_SKIP', line): skip = 1 diff --git a/scripts/pyaudio3dtools/BRIRs_mat/IIS_BRIR_officialMPEG_222UC_SBA3.mat b/scripts/pyaudio3dtools/BRIRs_mat/IIS_BRIR_officialMPEG_222UC_SBA3.mat deleted file mode 100644 index 5bc7464f7f5e8e76cd848e52e2c389cfd722b6f3..0000000000000000000000000000000000000000 --- a/scripts/pyaudio3dtools/BRIRs_mat/IIS_BRIR_officialMPEG_222UC_SBA3.mat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b41a527b6ba22b4c100265655ca801ee4d2dba3c3e03dc58f7cc5d99e397d2c3 -size 11795531 diff --git a/scripts/pyaudio3dtools/BRIRs_mat/IIS_BRIR_officialMPEG_222UC_combined.mat b/scripts/pyaudio3dtools/BRIRs_mat/IIS_BRIR_officialMPEG_222UC_combined.mat deleted file mode 100644 index 61ba946617a5c35cb56e32814b40f4e728ecdafd..0000000000000000000000000000000000000000 --- a/scripts/pyaudio3dtools/BRIRs_mat/IIS_BRIR_officialMPEG_222UC_combined.mat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:081a9053c8b04831d97e6f18d641d4737b2c23b076778a9b41c7b3a41d954c32 -size 6348446 diff --git a/scripts/pyaudio3dtools/BRIRs_mat/IIS_BRIR_officialMPEG_222UC_full.mat b/scripts/pyaudio3dtools/BRIRs_mat/IIS_BRIR_officialMPEG_222UC_full.mat deleted file mode 100644 index 440c8aedd677937f558767742a7b5a66ea13bb61..0000000000000000000000000000000000000000 --- a/scripts/pyaudio3dtools/BRIRs_mat/IIS_BRIR_officialMPEG_222UC_full.mat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0544d1cf80a7cceb156760107d81b10fd787807bb0ea1e74e9aeb552474b3373 -size 13233924 diff --git a/scripts/pyaudio3dtools/EFAP.py b/scripts/pyaudio3dtools/EFAP.py deleted file mode 100644 index dcc615355ed32dcbc06990d090d08cffaf9a29c0..0000000000000000000000000000000000000000 --- a/scripts/pyaudio3dtools/EFAP.py +++ /dev/null @@ -1,929 +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. -""" - -import argparse -import os -from enum import Enum -from itertools import combinations -from typing import Optional, Tuple, Union - -import numpy as np - - -def wrap_angles( - azi: float, ele: float, clip_ele: Optional[bool] = False -) -> Tuple[float, float]: - """ - Wrap angles to (-180, 180] azimuth and [-90, 90] elevation - Takes into account hemisphere flips from large elevation changes unless clip_ele is specified - """ - if clip_ele: - ele = min(max(ele, -90), 90) - - if ele != 0 and ele % 90 == 0: - # if elevation is a multiple of 90, azimuth is irrelevant since we are at a pole - azi = 0 - while np.abs(ele) > 90: - ele -= 360 - else: - # wrap elevation value - while np.abs(ele) > 90: - # flip azimuth to other hemisphere - azi += 180 - - # compensate elevation accordingly - if ele > 90: - ele -= 180 - elif ele < -90: - ele += 180 - - # wrap azimuth value - while np.abs(azi) > 180: - azi = (azi + 180) % 360 - if azi < 0: - azi += 360 - azi -= 180 - - # set -180 azimuth to 180 - if azi == -180: - azi = 180 - - return azi, ele - - -class EfapDmxType(Enum): - NONE = 0 - AMPLITUDE = 1 - INTENSITY = 2 - - -class EfapVertex: - """ - Vertex data structure for EFAP - Initialises a vertex from the given spherical coordinate pair, with a flag specifying if it is a ghost loudspeaker - - - Parameters - ---------- - azi : float - Azimuth of vertex - ele : float - Elevation of vertex - is_ghost : bool - Whether the vertex is a ghost, default is False - dmx_type : EfapDmxType - Downmix type for ghost vertices - """ - - def __init__( - self, - azi: float, - ele: float, - is_ghost: Optional[bool] = False, - dmx_type: Optional[EfapDmxType] = EfapDmxType.INTENSITY, - ): - self.azi, self.ele = wrap_angles(azi, ele) - self.pos = np.array( - [ - np.cos(np.deg2rad(azi)) * np.cos(np.deg2rad(ele)), - np.sin(np.deg2rad(azi)) * np.cos(np.deg2rad(ele)), - np.sin(np.deg2rad(ele)), - ] - ) - - idx_azi = np.round(np.abs(90 - np.abs(self.azi))) - idx_ele = 90 - np.round(np.abs(self.ele)) - self.index = ( - idx_azi + 181 * idx_ele - ) # vertices on the median plane have lowest index - - self.is_ghost = is_ghost - self.dmx_type = dmx_type - - def __str__(self): - str_ = f"a{self.azi}e{self.ele}" - if self.is_ghost: - str_ += "*" - return str_ - - def __lt__(self, other): - return self.index < other.index - - -class EFAP: - """ - EFAP data structure - - Initialise EFAP data for computing panning gains - - - Parameters - ---------- - azimuths : np.ndarray - Azimuth positions of the loudspeaker array - elevations : npndarray - Elevation postions of the loudspeaker array - intensity_panning : bool - Whether intensity panning is enabled or not - - Examples - -------- - - >>> from EFAP import EFAP - >>> panner = EFAP([30, -30, 0, 110, -110], [0, 0, 0, 0, 0], False) - >>> panner.pan(15, 45) - array([0.66742381, 0.19069252, 0.66742381, 0.19069252, 0.19069252]) - - """ - - _EFAP_HULL_TOL = 1e-4 # tolerance for a point to be added to the convex hull - _EFAP_MAX_AZI_GAP = 160 # maximum allowed angular gap in the middle layer - _EFAP_POLAR_ELE = 90 # elevation of north / south poles (zenith / nadir) - _EFAP_THRESH_COPLANAR = 1e-3 # tolerance for points to be considered coplanar - _EFAP_THRESH_MID_LAYER = 45 # elevation threshold for loudspeakers to be considered as in the middle layer - _EFAP_THRESH_POLES = 1e-6 # tolerance for a vertex to be considered polar - _EFAP_THRESH_TRI = 1e-10 # tolerance for a point to be inside a triangle - - def __init__( - self, - azimuths: Union[list, np.ndarray], - elevations: Union[list, np.ndarray], - intensity_panning: Optional[bool] = False, - ): - # validation - azimuths = np.array(azimuths) - elevations = np.array(elevations) - if np.squeeze(azimuths).ndim > 1: - raise ValueError("Too many dimensions for loudspeaker azimuth array") - if np.squeeze(elevations).ndim > 1: - raise ValueError("Too many dimensions for loudspeaker elevations array") - if azimuths.shape != elevations.shape: - raise ValueError("Mismatch between loudspeaker azimuths and elevations") - - # set EFIP flag - self.intensity_panning = intensity_panning - - # initialise vertices and add ghost loudspeakers if needed - self.verts = np.array( - [EfapVertex(azi, ele) for azi, ele in zip(azimuths, elevations)] - ) - self._add_ghost_speakers() - - # formulate initial tetrahedron for the convex hull - self._init_simplex() - - # add the remaining vertices to the convex hull in order of their index - for i in np.argsort(self.verts): - if self.verts[i] not in self.verts[self.tris]: - self._add_vertex_to_hull(i) - - # compute downmix matrix with remapped ghost speakers - self._remap_ghost_speakers() - - # set vertices near poles to have NaN azimuth - for v in self.verts: - if ( - v.ele > self._EFAP_POLAR_ELE - self._EFAP_THRESH_POLES - or v.ele < self._EFAP_THRESH_POLES - self._EFAP_POLAR_ELE - ): - v.azi = np.nan - - # combine triangles into polygons - self._tri2poly() - - def _add_ghost_speakers(self) -> None: - """ - Add ghost loudspeakers at the poles, or to fill large horizontal gaps - """ - ele = [v.ele for v in self.verts] - - dmx_type = EfapDmxType.INTENSITY - - # add ghost loudspeakers at the poles if necessary - if max(ele) < self._EFAP_POLAR_ELE: - - if self.intensity_panning: - if max(ele) > self._EFAP_THRESH_MID_LAYER: - dmx_type = EfapDmxType.NONE - else: - dmx_type = EfapDmxType.AMPLITUDE - - self.verts = np.append(self.verts, EfapVertex(0, 90, True, dmx_type)) - - if min(ele) > -self._EFAP_POLAR_ELE: - - if self.intensity_panning: - if min(ele) < -self._EFAP_THRESH_MID_LAYER: - dmx_type = EfapDmxType.NONE - else: - dmx_type = EfapDmxType.AMPLITUDE - - self.verts = np.append(self.verts, EfapVertex(0, -90, True, dmx_type)) - - # check for large gaps in the middle horizontal layer - mid_spkrs = [ - v.azi for v in self.verts if np.abs(v.ele) < self._EFAP_THRESH_MID_LAYER - ] - - # no speakers in middle layer; add a triangle of ghost speakers - if not mid_spkrs: - self.verts = np.append( - self.verts, - [ - EfapVertex(0, 0, True), - EfapVertex(180, 0, True), - EfapVertex(240, 0, True), - ], - ) - # only one speaker in the threshold; add two ghost speakers to form a triangle - elif len(mid_spkrs) == 1: - self.verts = np.append( - self.verts, - [ - EfapVertex(mid_spkrs[0] + 120, 0, True), - EfapVertex(mid_spkrs[0] + 240, 0, True), - ], - ) - # search for and fill gaps greater than MAX_AZI_GAP - else: - mid_spkrs = np.sort(mid_spkrs) - angle_diff = np.diff(np.concatenate([mid_spkrs, [mid_spkrs[0] + 360]])) - sectors = np.ceil(angle_diff / self._EFAP_MAX_AZI_GAP) - - for i, s in enumerate(sectors): - if s > 1: - new_diff = angle_diff[i] / s - num_new = s - 1 - for k in range(int(num_new)): - new_azi = mid_spkrs[i] + (k + 1) * new_diff - self.verts = np.append(self.verts, EfapVertex(new_azi, 0, True)) - - def _init_simplex(self) -> None: - """ - Create an initial tetrahedron / simplex for the convex hull from 4 vertices - """ - # take the first vertex as seed - t = [0] - - # attempt to form an edge with non-zero length - for i, v in enumerate(self.verts): - if ( - v.azi != self.verts[t[0]].azi or v.ele != self.verts[t[0]].ele - ) and i not in t: - t.append(i) - break - else: - raise ValueError("Vertices are conincident!") - - # attempt to form a triangle with non-zero area - for i, v in enumerate(self.verts): - if ( - np.linalg.norm( - np.cross( - self.verts[t[1]].pos - self.verts[t[0]].pos, - v.pos - self.verts[t[0]].pos, - ), - 2, - ) - > self._EFAP_HULL_TOL - and i not in t - ): - t.append(i) - break - else: - raise ValueError("Vertices are colinear!") - - # attempt to form a tetrahedron with non-zero volume - for i, v in enumerate(self.verts): - if ( - np.abs( - np.dot( - np.cross( - self.verts[t[1]].pos - self.verts[t[0]].pos, - self.verts[t[2]].pos - self.verts[t[0]].pos, - ), - v.pos - self.verts[t[0]].pos, - ) - ) - ) > self._EFAP_HULL_TOL and i not in t: - t.append(i) - break - else: - raise ValueError("Vertices are coplanar!") - - # create a list of the triangles of the initial simplex / tetrahedron - t = np.array(t) - self.tris = np.array([t[[0, 1, 2]], t[[0, 1, 3]], t[[0, 2, 3]], t[[1, 2, 3]]]) - - # orient the triangle surface planes outwards from the centroid - self.centroid = np.mean([self.verts[i].pos for i in t], axis=0) - for i, tri in enumerate(self.tris): - self.tris[i, :] = self._flip_plane(tri) - - def _add_vertex_to_hull(self, idx_new_vert: int) -> None: - """ - Add a vertex to the convex hull and update the list of triangles in the hull - """ - # compute the centroid of the current convex hull - self.centroid = np.mean( - [self.verts[i].pos for i in np.unique(self.tris)], axis=0 - ) - - tris_new = [] - visible = [] - - # find which hull surfaces are visible from the new vertex - for i, tri in enumerate(self.tris): - if self._vertex_dist(tri, idx_new_vert) > -1e-6: - visible.append(i) - else: - tris_new.append(tri) - - tris_new = np.array(tris_new) - visible = np.array(visible, dtype=int) - - # find edges of the visible hull surfaces - max_vert = np.amax(self.tris[visible]) + 1 - counter = np.zeros([max_vert, max_vert]) - for i, tri in enumerate(self.tris[visible]): - surface = np.append(tri, tri[0]) - for n in range(3): - a = surface[n] - b = surface[n + 1] - counter[a, b] = counter[a, b] + 1 - - counter += counter.T - - edges = [] - for a in range(max_vert - 1): - for b in range(a + 1, max_vert): - if counter[a, b] == 1: - edges.append([a, b]) - edges = np.vstack(edges) - - # break the edges visible from the new vertex and add the new triangle - for e in edges: - tris_new = np.vstack( - [tris_new, self._flip_plane(np.append(e, idx_new_vert))] - ) - - # update the list of triangles in the convex hull - self.tris = tris_new - - def _remap_ghost_speakers(self) -> None: - """ - Remove unused ghost speakers and compute a downmix matrix for the rest - """ - # find ghosts that are not part of the convex hull - ghosts = [i for i, v in enumerate(self.verts) if v.is_ghost] - unused_ghosts = np.compress( - np.isin(ghosts, np.unique(self.tris), invert=True), ghosts - ) - - if unused_ghosts.size > 0: - # remove the unused ghosts from the triangle array and also adjust indices - self.tris[self.tris > unused_ghosts.min()] -= unused_ghosts.size - # delete them from the vertex array - self.verts = np.delete(self.verts, unused_ghosts) - - # generate initial sound energy distribution matrix - n_vtx = len(self.verts) - n_ghost = len(ghosts) - len(unused_ghosts) - - M = np.eye(n_vtx) - for i, v in enumerate(self.verts): - if v.is_ghost: - neighbours = self._get_neighbours(i) - M[:, i] = np.zeros(n_vtx) - M[neighbours, i] = np.ones(len(neighbours)) / len(neighbours) - - # re-distribute sound energy from ghosts - M2 = M.copy() - for i, v in enumerate(self.verts): - if v.is_ghost: - vec = M[:, i] - while np.sum(vec[-n_ghost:]) > 1e-4: - vec = M @ vec - M2[:, i] = vec - - self.dmx_mat = M2[:-n_ghost, :] - - # amplitude downmix for real loudspeakers - self.dmx_mat[:, :-n_ghost] = np.sqrt(self.dmx_mat[:, :-n_ghost]) - - # distribute ghosts according to downmix type - for i, v in enumerate(self.verts): - if v.is_ghost: - if v.dmx_type == EfapDmxType.NONE: - self.dmx_mat[:, i] = 0 - elif v.dmx_type == EfapDmxType.AMPLITUDE: - pass - else: - self.dmx_mat[:, i] = np.sqrt(self.dmx_mat[:, i]) - - def _tri2poly(self) -> None: - """ - Merge hull triangles into polygons if they are coplanar - """ - polys = [] - - for tri in self.tris: - # find all vertices coplanar with this triangle (including those already in the triangle) - new_poly = np.array( - [ - i - for i, _ in enumerate(self.verts) - if np.abs(self._vertex_dist(tri, i)) < self._EFAP_THRESH_COPLANAR - ] - ) - - # check if we already found this polygon as a complete subset - is_subset = [ - i for i, poly in enumerate(polys) if np.all(np.isin(new_poly, poly)) - ] - is_superset = [ - i for i, poly in enumerate(polys) if np.all(np.isin(poly, new_poly)) - ] - - if is_subset: - continue - elif is_superset: - # remove the other polygon since it will be replaced by the superset polygon - polys_new = [p for i, p in enumerate(polys) if i not in is_superset] - polys = polys_new - - # orient the polygon plane in the same direction as the triangle - P1 = self.verts[tri[0]].pos - P2 = self.verts[tri[1]].pos - P3 = self.verts[tri[2]].pos - - # first base vector - U = P2 - P1 - U = U / np.linalg.norm(U) - - # second base vector - V = P3 - P2 - V = V - np.dot(U, V) * U - V = V / np.linalg.norm(V) - - # center of the first triangle - M = np.mean([P1, P2, P3], axis=0) - - # sort vertices - azi = np.zeros_like(new_poly, dtype=float) - for i, idx_v in enumerate(new_poly): - P = self.verts[idx_v].pos - M - X = np.dot(P, U) - Y = np.dot(P, V) - azi[i] = np.arctan2(Y, X) - - idx = np.argsort(azi) - new_poly = new_poly[idx] - - # add the polygon to the main list - polys.append(new_poly) - - self.polys = polys - - def _pan_EFAP_poly( - self, azimuth: float, elevation: float, poly: np.ndarray, mod: int - ) -> np.ndarray: - """ - Compute panning gains for each vertex in the given polygon - - - Parameters - ---------- - azimuth : float - Azimuth of requested panning position - elevation : float - Elevation of requested panning position - poly : np.ndarray - Array of vertices defining the polygon - - Returns - ------- - poly_gain: np.ndarray - Gains for each vertex in the polygon - """ - poly_gain = np.zeros_like(poly, dtype=float) - - P = np.array([azimuth, elevation]) - # search for the triangle of the polygon in which P belongs - for i in range(1, poly.size + 1): - A = np.array([self.verts[poly[i - 1]].azi, self.verts[poly[i - 1]].ele]) - for j in range(i, poly.size - 2 + i): - idx1 = 1 + (j % poly.size) - idx2 = 1 + (idx1 % poly.size) - B = np.array( - [self.verts[poly[idx1 - 1]].azi, self.verts[poly[idx1 - 1]].ele] - ) - C = np.array( - [self.verts[poly[idx2 - 1]].azi, self.verts[poly[idx2 - 1]].ele] - ) - - if mod: - if not np.isnan(A[0]): - A[0] %= mod - if not np.isnan(B[0]): - B[0] %= mod - if not np.isnan(C[0]): - C[0] %= mod - - if self._in_triangle(P, A, B, C): - N = np.transpose([B[1] - C[1], C[0] - B[0]]) - N = N / np.dot(N, B - A) - poly_gain[i - 1] = 1 - np.dot(P - A, N) - - """ DEBUGGING / TODO """ - # set gains <= -60dB to 0 - poly_gain[np.abs(poly_gain) < 1e-6] = 0 - - return poly_gain - - """ geometric / math helper functions """ - - def _get_neighbours(self, idx_vert: int) -> np.ndarray: - """ - Find triangles containing the given vertex index (neighbouring vertices) - """ - n = self.tris[np.any(np.isin(self.tris, idx_vert), axis=1)] - return np.unique(n[n != idx_vert]) - - def _get_azi_ele(self, idx_vert: int) -> Tuple[float, float]: - """ - Return a tuple of (azi, ele) for a vertex at the given index - """ - return self.verts[idx_vert].azi, self.verts[idx_vert].ele - - def _in_polygon( - self, azimuth: float, elevation: float, poly: np.ndarray - ) -> Tuple[bool, int]: - """ - Determine whether the panning position lies within the given polygon - by iteratively checking its triangles - - Parameters - ---------- - azimuth : float - Azimuth of requested panning position - elevation : float - Elevation of requested panning position - poly : np.ndarray - Array of vertices defining the polygon - - Returns - ------- - in_polygon, mod: Tuple[bool, int] - Flag indicating whether the point is inside the given polygon - Value of wrapping required if used - """ - azi = [self.verts[v].azi for v in poly] - - P = np.array([azimuth, elevation]) - - for tri in combinations(poly, 3): - A = np.array(self._get_azi_ele(tri[0])) - B = np.array(self._get_azi_ele(tri[1])) - C = np.array(self._get_azi_ele(tri[2])) - if self._in_triangle(P, A, B, C): - return True, None - - # if the azimuth difference is large, perform the 2D check again with azimuths wrapped to (-360, 0] and [0, 360) - if np.nanmax(azi) - np.nanmin(azi) > 180: - for tri in combinations(poly, 3): - A = np.array(self._get_azi_ele(tri[0])) - B = np.array(self._get_azi_ele(tri[1])) - C = np.array(self._get_azi_ele(tri[2])) - if not np.isnan(A[0]): - A[0] %= 360 - if not np.isnan(B[0]): - B[0] %= 360 - if not np.isnan(C[0]): - C[0] %= 360 - if self._in_triangle(P, A, B, C): - return True, 360 - - for tri in combinations(poly, 3): - A = np.array(self._get_azi_ele(tri[0])) - B = np.array(self._get_azi_ele(tri[1])) - C = np.array(self._get_azi_ele(tri[2])) - if not np.isnan(A[0]): - A[0] %= -360 - if not np.isnan(B[0]): - B[0] %= -360 - if not np.isnan(C[0]): - C[0] %= -360 - if self._in_triangle(P, A, B, C): - return True, -360 - - return False, None - - def _in_triangle( - self, P: np.ndarray, A: np.ndarray, B: np.ndarray, C: np.ndarray - ) -> bool: - """ - Determine whether the panning position lies within the given triangle - - Parameters - ---------- - P : float - Point under test - A : float - First vertex of the triangle - B : float - Second vertex of the triangle - C : float - Third vertex of the triangle - - - Returns - ------- - bool - Flag indicating whether the point is inside the given triangle - """ - if np.isnan(A[0]): - A[0] = P[0] - - if np.isnan(B[0]): - B[0] = P[0] - - if np.isnan(C[0]): - C[0] = P[0] - - tmpMat = np.transpose([B - A, C - A]) - if (1 / np.linalg.cond(tmpMat)) < self._EFAP_THRESH_TRI: - return False - - Minv = np.linalg.inv(tmpMat) - S = Minv @ (P - A) - - if ( - S[0] < -self._EFAP_THRESH_TRI - or S[1] < -self._EFAP_THRESH_TRI - or S[0] + S[1] > 1 + self._EFAP_THRESH_TRI - ): - return False - - return True - - def _vertex_dist(self, surface: np.ndarray, idx_vert: int) -> float: - """ - Compute the distance of a vertex from a given plane - - Parameters - ---------- - surface : np.ndarray - Array of 3 ordered vertices defining the plane and its orientation - idx_vert: int - Index of the vertex to compute the distance for - - Returns - ------- - float - Distance of the vertex from the given plane - """ - return self._point_plane_dist( - self.verts[surface[0]].pos, - self.verts[surface[1]].pos, - self.verts[surface[2]].pos, - self.verts[idx_vert].pos, - ) - - def _point_plane_dist( - self, P1: np.ndarray, P2: np.ndarray, P3: np.ndarray, X: np.ndarray - ) -> float: - """ - Compute the distance of a vertex from a plane defined by three points - - Parameters - ---------- - P1 : np.ndarray - Cartesian coordinates of the first point - P2 : np.ndarray - Cartesian coordinates of the second point - P3 : np.ndarray - Cartesian coordinates of the third point - X: np.ndarray - Cartesian coordinates of the vertex - - Returns - ------- - float - Distance of the vertex from the given plane - """ - - if np.all(X == P1) or np.all(X == P2) or np.all(X == P3): - return 0 - else: - N = np.cross(P1 - P2, P1 - P3) - return np.dot(X - P1, N / np.linalg.norm(N)) - - def _flip_plane(self, surface: np.ndarray) -> np.ndarray: - """ - Flip the orientation of a plane (invert normal vector) - - Parameters - ---------- - surface : np.ndarray - Array of 3 ordered vertices defining the plane and its orientation - - Returns - ------- - surface : np.ndarray - Reordered vertices with plane normal pointing outwards from the hull centroid - """ - if ( - self._point_plane_dist( - self.verts[surface[0]].pos, - self.verts[surface[1]].pos, - self.verts[surface[2]].pos, - self.centroid, - ) - > 0 - ): - surface = np.flip(surface.copy()) - - return surface - - def _compute_gains_point(self, azimuth: float, elevation: float) -> np.ndarray: - """ - Compute gains for the requested panning position - - - Parameters - ---------- - azimuth : float - Azimuth of requested panning position - elevation : float - Elevation of requested panning position - - Returns - ------- - gains: np.ndarray - Panning gains for the loudspeaker layout - """ - if np.isnan(azimuth) or np.isnan(elevation): - raise ValueError(f"Angles cannot be NaNs : ({azimuth}, {elevation})") - - azimuth, elevation = wrap_angles(azimuth, elevation) - point_pos = [ - np.cos(np.deg2rad(azimuth)) * np.cos(np.deg2rad(elevation)), - np.sin(np.deg2rad(azimuth)) * np.cos(np.deg2rad(elevation)), - np.sin(np.deg2rad(elevation)), - ] - - # filter the polygon list with a quick 2d check - found_polys = [] - for poly in self.polys: - in_poly, mod = self._in_polygon(azimuth, elevation, poly) - if in_poly: - found_polys.append((poly, mod)) - - if not found_polys: - raise AssertionError("Unexpected error during panning") - - # find a visible polygon with the smallest distance - dist = [] - - for poly, mod in found_polys: - surface = self.verts[poly] - d = self._point_plane_dist( - surface[0].pos, - surface[1].pos, - surface[2].pos, - point_pos, - ) - if d >= 0: - dist.append(d) - else: - dist.append(np.inf) - - found_poly, mod = found_polys[np.argmin(dist)] - - # compute gains for the polygon vertices - poly_gain = self._pan_EFAP_poly(azimuth, elevation, found_poly, mod) - - # downmix ghost loudspeakers - gains = np.zeros(self.verts.size) - gains[found_poly] = poly_gain / np.linalg.norm(poly_gain) - gains = gains @ self.dmx_mat.T - gains = gains / np.linalg.norm(gains) - - if self.intensity_panning: - gains = np.sqrt(gains / np.sum(gains)) - - return gains - - """ public functions """ - - def pan( - self, azimuths: float, elevations: float, intensity_panning: bool = False - ) -> np.ndarray: - """ - Compute gains for the requested panning position - - - Parameters - ---------- - azimuth : float - Azimuth of requested panning position - elevation : float - Elevation of requested panning position - intensity_panning : bool - Flag whether to use intensity panning (Default is False == amplitude panning) - - Returns - ------- - gains: np.ndarray - Panning gains for the loudspeaker layout - """ - azimuths = np.array(azimuths) - elevations = np.array(elevations) - if azimuths.size == 1 and elevations.size == 1: - return self._compute_gains_point(azimuths, elevations) - elif np.squeeze(azimuths).ndim == 1 and np.squeeze(elevations).ndim == 1: - gains = [] - for a, e in zip(azimuths, elevations): - gains.append(self._compute_gains_point(a, e)) - return np.vstack(gains) - else: - raise ValueError( - "Azimuth and Elevation arrays cannot have more than one dimension and must be of equal size" - ) - - -def main(args): - """ - Parses a speaker layout text file and prints the panning gains - for the requested position - - - Parameters - ---------- - args : tuple - Command line arguments - - """ - - speaker_positions = np.loadtxt( - os.path.abspath(args.input), delimiter=",", max_rows=2 - ) - panner = EFAP(speaker_positions[0, :], speaker_positions[1, :], args.efip) - print(panner.pan(args.azimuth, args.elevation)) - - -if __name__ == "__main__": - parser = argparse.ArgumentParser(description="Edge-Fading Amplitude Panning") - parser.add_argument( - "-i", - "--input", - metavar="layout_file", - required=True, - type=str, - help="IVAS compatible loudspeaker layout file (Loudspeaker azimuths in first line, elevations in second, subsequent lines are ignored)", - ) - parser.add_argument( - "-efip", - "-intensity_panning", - default=False, - action="store_true", - help="Intensity panning mode (EFIP)", - ) - parser.add_argument( - "azimuth", - type=float, - help="Azimuth of direction to compute panning gains for (positive-left)", - ) - parser.add_argument( - "elevation", - type=float, - help="Elevation of direction to compute panning gains for (positive-up)", - ) - args = parser.parse_args() - main(args) diff --git a/scripts/pyaudio3dtools/HRIRs_mat/ORANGE_HRIR_53_48000_SBA3.mat b/scripts/pyaudio3dtools/HRIRs_mat/ORANGE_HRIR_53_48000_SBA3.mat deleted file mode 100644 index 0d113a34af498f3c981c6e2d4a59e8dc304851c6..0000000000000000000000000000000000000000 --- a/scripts/pyaudio3dtools/HRIRs_mat/ORANGE_HRIR_53_48000_SBA3.mat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:02c8a25178b36399054c1802f00bb5a8739f3ac950c21b0c760c046b1dba530d -size 36201 diff --git a/scripts/pyaudio3dtools/HRIRs_mat/ORANGE_HRIR_53_48000_combined.mat b/scripts/pyaudio3dtools/HRIRs_mat/ORANGE_HRIR_53_48000_combined.mat deleted file mode 100644 index e52e031e8c2858501b29b36344144fd9d03f9760..0000000000000000000000000000000000000000 --- a/scripts/pyaudio3dtools/HRIRs_mat/ORANGE_HRIR_53_48000_combined.mat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9660be83192f7babb4f67e19653a94bc02cee7b3071065880cf618547c19d842 -size 20138 diff --git a/scripts/pyaudio3dtools/HRIRs_mat/ORANGE_HRIR_53_48000_full.mat b/scripts/pyaudio3dtools/HRIRs_mat/ORANGE_HRIR_53_48000_full.mat deleted file mode 100644 index f2c22c39ec4f7f176f82f3a198b3ac91954d98fa..0000000000000000000000000000000000000000 --- a/scripts/pyaudio3dtools/HRIRs_mat/ORANGE_HRIR_53_48000_full.mat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05ae461fc303c8498d5912ebe37cd1601c077c2505baf3da3dbe12b37e8f2cf0 -size 14097574 diff --git a/scripts/pyaudio3dtools/__init__.py b/scripts/pyaudio3dtools/__init__.py index 9870fb6620c859e7e7195c8dae52d16d67841713..33a5d39126901fd6a7f2b2d04168d09cf83ad151 100644 --- a/scripts/pyaudio3dtools/__init__.py +++ b/scripts/pyaudio3dtools/__init__.py @@ -43,10 +43,5 @@ class from . import ( audioarray, audiofile, - binauralrenderer, - hoadecoder, - spatialaudioconvert, spatialaudioformat, - spatialmetadata, ) -from .EFAP import EFAP diff --git a/scripts/pyaudio3dtools/audio3dtools.py b/scripts/pyaudio3dtools/audio3dtools.py index e6c03d7b73a8a068cb4c8f531ddef371ba22085c..cfb7acb9f566d7c4a31b6607c120d2bc5571022e 100755 --- a/scripts/pyaudio3dtools/audio3dtools.py +++ b/scripts/pyaudio3dtools/audio3dtools.py @@ -36,8 +36,6 @@ import os from pyaudio3dtools import ( audiofile, - binauralrenderer, - spatialaudioconvert, spatialaudioformat, ) @@ -47,245 +45,10 @@ logger.setLevel(logging.DEBUG) def main(): - parser = argparse.ArgumentParser( - description="Audio3DTools: Convert/Manipulate spatial audio files." + print( + f"These scripts have been deprecated! Please check out and use the latest version from https://forge.3gpp.org/rep/ivas-codec-pc/ivas-processing-scripts.git" ) - """ Required arguments """ - parser.add_argument( - "-i", - "--infiles", - required=True, - type=str, - help="input file *.wav or *.pcm or directory", - default=None, - ) - parser.add_argument( - "-o", - "--outdir", - required=True, - type=str, - help="output file *.wav or directory", - default="out", - ) - parser.add_argument( - "-f", - "--informat", - required=True, - type=str, - metavar="INFORMAT", - help="Input format (use -l/-L for a list)", - default=None, - ) - - """ Additional arguments """ - parser.add_argument( - "-F", - "--outformat", - type=str, - metavar="OUTFORMAT", - help="Output format (default = %(default)s, same as input format). Can be a custom loudspeaker layout file.", - default=None, - ) - parser.add_argument( - "-s", - "--infs", - type=int, - help="Input sampling rate (Hz) (default = %(default)s, deduced for input file)", - default=None, - ) - parser.add_argument( - "-S", - "--outfs", - type=int, - help="Output sampling rate (Hz) (default = %(default)s, same as input)", - default=None, - ) - parser.add_argument( - "-c", - "--inchan", - type=int, - help="Input number of channels (default = %(default)s, deduced for input file)", - default=None, - ) - parser.add_argument( - "-m", - "--metadata", - type=str, - nargs="+", - help="list of input metadata files (only relevant for ISM and MASA input)", - default=None, - ) - parser.add_argument( - "-fc", - "--outfc", - type=int, - help="Cut-off freq for eventual low-pass filtering (default = %(default)s)", - default=None, - ) - parser.add_argument( - "-T", - "--trajectory", - type=str, - help="Head-tracking trajectory file (default = %(default)s)", - default=None, - ) - parser.add_argument( - "-n", - "--normalize", - default=None, - type=int, - help="Normalize to given loudness with --LOUDNESS_TOOL (default = %(default)s)", - ) - - """ Miscellaneous or meta arguments """ - parser.add_argument( - "-b", - "--binaural", - help="Binauralize output *in addition to converting to output format", - action="store_true", - ) - parser.add_argument( - "--binaural_dataset", - type=str, - help="Dataset to use for binaural rendering (default = %(default)s)", - choices=["orange51", "orange52", "orange53", "orange54", "sadie"], - default="orange53", - ) - parser.add_argument( - "-l", - "--list", - help="list all supported spatial audio formats", - action="store_true", - ) - parser.add_argument( - "-L", - "--long", - help="list all supported spatial audio formats with long description", - action="store_true", - ) - parser.add_argument( - "-lt", - "--loudness_tool", - default="bs1770demo", - type=str, - help="Loudness tool to use: bs1770demo [default] or sv56demo (tool must be in $PATH or a path to the binary)", - ) - parser.add_argument( - "-rn", - "--dont-rename", - help="Disable default behaviour of renaming output files _.", - action="store_true", - ) - args = parser.parse_args() - - # Set up logging handlers - console_handler = logging.StreamHandler() - console_handler.setLevel(logging.INFO) - console_handler.setFormatter(logging.Formatter("%(message)s")) - - # Configure loggers - LOGGER_FORMAT = "%(asctime)s | %(name)-12s | %(levelname)-8s | %(message)s" - LOGGER_DATEFMT = "%m-%d %H:%M" - logging.basicConfig( - format=LOGGER_FORMAT, - datefmt=LOGGER_DATEFMT, - level=logging.INFO, - 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===") - spatialaudioformat.Format.list_all(args.long) - - elif args.infiles is not None: - logger.info("===Convert spatial audio file===") - # Input folder can be a path, a file or a list of files - if os.path.isdir(args.infiles): - path = args.infiles - audio_list = [ - os.path.join(path, f) for f in os.listdir(path) if f.endswith((".wav")) - ] - else: - audio_list = [args.infiles] - - outdir = args.outdir - _, output_ext = os.path.splitext(os.path.basename(outdir)) - if (len(audio_list) == 1) and ( - (output_ext.lower() == ".wav") or (output_ext.lower() == ".pcm") - ): - outfile = outdir - else: - outfile = None - if not os.path.exists(outdir): - os.makedirs(outdir) - - for infile in audio_list: - logger.info(f" process {infile}") - - _, input_ext = os.path.splitext(os.path.basename(infile)) - - if outfile is None: - outfile = os.path.basename(infile) - if not args.dont_rename: - if args.outformat is not None: - outfile = outfile.replace(input_ext, f"_{args.outformat}.wav") - else: - outfile = outfile.replace(input_ext, ".out.wav") - outfile = os.path.join(outdir, outfile) - - spatialaudioconvert.spatial_audio_convert( - infile, - outfile, - in_format=args.informat, - in_fs=args.infs, - in_nchans=args.inchan, - in_meta_files=args.metadata, - out_format=args.outformat, - out_fs=args.outfs, - out_fc=args.outfc, - output_loudness=args.normalize, - loudness_tool=args.loudness_tool, - trajectory=args.trajectory, - binaural_dataset=args.binaural_dataset, - ) - - logger.info(f" Output {outfile}") - - if args.binaural: - if args.outformat.startswith("BINAURAL"): - raise SystemExit( - "BINAURAL output format can not be binauralized again!" - ) - - _, output_ext = os.path.splitext(os.path.basename(outfile)) - outfile_bin = outfile.replace(output_ext, "_BINAURAL.wav") - logger.info(f" Output binaural {outfile_bin}") - - spatialaudioconvert.spatial_audio_convert( - in_file=outfile, - out_file=outfile_bin, - in_format=args.outformat, - in_fs=args.outfs, - in_meta_files=args.metadata, - out_format="BINAURAL", - output_loudness=args.normalize, - loudness_tool=args.loudness_tool, - trajectory=args.trajectory, - binaural_dataset=args.binaural_dataset, - ) - - outfile = None - else: - raise Exception( - "Input file must be provided for conversion and audio manipulation." - ) - if __name__ == "__main__": main() diff --git a/scripts/pyaudio3dtools/audioarray.py b/scripts/pyaudio3dtools/audioarray.py index 87fc50b4632de86fd9e88c4042980cf76fd64f38..740c40c3c6fda3cdc9f0112d3dfbfad9c6f5e1dc 100644 --- a/scripts/pyaudio3dtools/audioarray.py +++ b/scripts/pyaudio3dtools/audioarray.py @@ -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, per_frame: bool=True) -> dict: +def compare(ref: np.ndarray, test: np.ndarray, fs: int, per_frame: bool = True) -> dict: """Compare two audio arrays Parameters @@ -250,7 +250,7 @@ def compare(ref: np.ndarray, test: np.ndarray, fs: int, per_frame: bool=True) -> "nsamples_diff_percentage": 0.0, "first_diff_pos_sample": -1, "first_diff_pos_channel": -1, - "first_diff_pos_frame": -1 + "first_diff_pos_frame": -1, } if per_frame: result["max_abs_diff_pos_frame"] = 0 @@ -269,7 +269,7 @@ def compare(ref: np.ndarray, test: np.ndarray, fs: int, per_frame: bool=True) -> 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], @@ -454,7 +454,9 @@ def get_framewise(x: np.ndarray, chunk_size: int, zero_pad=False) -> np.ndarray: if x.shape[0] % chunk_size: last_chunk = x[n_frames * chunk_size :, :] if zero_pad: - yield np.pad(last_chunk, [[0, chunk_size - (x.shape[0] % chunk_size)], [0, 0]]) + yield np.pad( + last_chunk, [[0, chunk_size - (x.shape[0] % chunk_size)], [0, 0]] + ) else: yield last_chunk diff --git a/scripts/pyaudio3dtools/audiofile.py b/scripts/pyaudio3dtools/audiofile.py index 77be42285fc7cfe3b0a8fccede6c3d8006a37a0a..5b6ffcdced2c3dadee3224d98d960123df002ec3 100644 --- a/scripts/pyaudio3dtools/audiofile.py +++ b/scripts/pyaudio3dtools/audiofile.py @@ -695,7 +695,6 @@ def print_plot_play(x: np.ndarray, fs: int, text: Optional[str] = "") -> None: def get_wav_file_info(filename: str) -> dict: - """ Get the format information from a WAV file. Return a dictionary with the format information @@ -713,7 +712,6 @@ def get_wav_file_info(filename: str) -> dict: fid = open(filename, "rb") try: - riff = fid.read(4) if riff == b"RIFF": @@ -769,7 +767,9 @@ def get_wav_file_info(filename: str) -> dict: if __name__ == "__main__": import argparse - parser = argparse.ArgumentParser(description="Tool for basic operations on audio files") + parser = argparse.ArgumentParser( + description="Tool for basic operations on audio files" + ) subparsers = parser.add_subparsers() def pre_trim_wrapper(pre_trim_args): @@ -779,14 +779,21 @@ if __name__ == "__main__": 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"]) + 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 = 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) @@ -799,7 +806,8 @@ if __name__ == "__main__": 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)" + "convert", + help="Convert file format (output file extension determines output format)", ) parser_convert.add_argument("input_file") parser_convert.add_argument("output_file") diff --git a/scripts/pyaudio3dtools/binauralrenderer.py b/scripts/pyaudio3dtools/binauralrenderer.py deleted file mode 100644 index 2567b433db993e0029b66cccc477a44d34ae110b..0000000000000000000000000000000000000000 --- a/scripts/pyaudio3dtools/binauralrenderer.py +++ /dev/null @@ -1,782 +0,0 @@ -#!/usr/bin/env python3 - -""" - (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. 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 logging -import os -import timeit -from typing import Tuple - -import numpy as np -import scipy.interpolate as interp -import scipy.io as sio -import scipy.signal as sig -from pyaudio3dtools.rotation import rotateHOA, rotateISM, rotateMC - -from pyaudio3dtools import audioarray, spatialaudioformat, spatialaudioconvert -from pyaudio3dtools.constants import * - -main_logger = logging.getLogger("__main__") -logger = main_logger.getChild(__name__) -logger.setLevel(logging.DEBUG) - -"""" Helper functions """ - - -def NS2SA(fs, x): - return int(int(fs / 100) * ((x) / 100) / 100000) - - -def read_hrirs_from_mat( - hrirs_path: str = "/HRIRs_mat/ORANGE_HRIR_53_48000_combined.mat", -) -> np.ndarray: - """Read HRIRs from Matlab dictionary file mat - - Parameters - ---------- - hrirs_path: str - HRTFs file name (.mat) - - Returns - ------- - IR: np.ndarray - array of impulse responses - SourcePosition: np.ndarray - array of source positions corresponding to the impulse responses - - """ - script_path = os.path.dirname(os.path.abspath(__file__)) - hrirs_filename = script_path + hrirs_path - - mat_contents = sio.loadmat(hrirs_filename) - IR = mat_contents["IR"] - try: - SourcePosition = mat_contents["SourcePosition"] - except KeyError: - SourcePosition = None - - logger.debug(f"Loaded HRIRs: {hrirs_filename}, {IR.shape[0]} by {IR.shape[1]}") - - return IR, SourcePosition - - -def get_IR( - in_spfmt: spatialaudioformat.Format, - out_spfmt: spatialaudioformat.Format, - dataset: str, -) -> Tuple[np.ndarray, np.ndarray, float]: - """get_IR - - Parameters - ---------- - in_spfmt: spatialaudioformat - input spatial audio format - out_spfmt: spatialaudioformat - output spatial audio format - dataset: str - name of the HRIRs or BRIRs dataset - - Returns - ------- - IR: np.ndarray - desired impulse response array - SourcePosition: np.ndarray - source positions of corresponding IRs - - """ - # override for BRIRs, currently only one option - if out_spfmt.name == "BINAURAL_ROOM": - dataset = "mozart_iis" - - # dataset file prefix - if dataset.lower().startswith("sadie"): - prefix = "/HRIRs_mat/SADIE_II_D2_48K_24bit_256tap" - elif dataset.lower().startswith("orange"): - prefix = f"/HRIRs_mat/ORANGE_HRIR_{dataset.replace('_full', '')[-2:]}_48000" - elif dataset.lower().startswith("mozart"): - prefix = "/BRIRs_mat/IIS_BRIR_officialMPEG_222UC" - else: - raise ValueError(f"Unsupported dataset '{dataset}' for HRIRs") - - # dataset file suffix - if in_spfmt.name.startswith("ISM") or in_spfmt.altname.startswith("CUSTOM_LS"): - suffix = "full.mat" - elif in_spfmt.isloudspeaker and in_spfmt.nchannels > 1: - suffix = "combined.mat" - elif in_spfmt.ambi_order > 0 or in_spfmt.name.upper() == "MONO": - suffix = "SBA3.mat" - else: - raise ValueError( - f"Unsupported format '{in_spfmt.name}' for dataset '{dataset}' for HRIRs" - ) - - IR, SourcePosition = read_hrirs_from_mat("_".join([prefix, suffix])) - - latency_smp = float(np.min(np.argmax(np.sum(np.abs(IR), axis=(1)), axis=(0)))) - - if in_spfmt.name.startswith("MONO"): - IR = IR[:, :, :1] # use omni/W from SBA - elif in_spfmt.name.startswith("STEREO"): - IR = IR[:, :, :2] # use L and R channels - elif in_spfmt.isloudspeaker and not in_spfmt.altname.startswith("CUSTOM_LS"): - # extract positions from the combined file - tmp_spfmt = spatialaudioformat.Format("COMBINED") - IR_tmp = IR.copy() - IR = np.zeros([IR_tmp.shape[0], IR_tmp.shape[1], in_spfmt.nchannels]) - - ir_index = 0 - for i in range(tmp_spfmt.nchannels): - for j in range(in_spfmt.nchannels): - if ( - tmp_spfmt.ls_azi[i] == in_spfmt.ls_azi[j] - and tmp_spfmt.ls_ele[i] == in_spfmt.ls_ele[j] - ): - if j != in_spfmt.lfe_index[0]: - IR[:, :, ir_index] = IR_tmp[:, :, i] - ir_index += 1 - - return IR, SourcePosition, latency_smp - - -def FindFilter(SourcePosition: np.ndarray, azi: float, ele: float) -> int: - """Find measurement closest to the selected direction, - reimplemented roughly along the lines of ConvBinauralRenderer.m - - Parameters - ---------- - SourcePosition: np.ndarray - Source IR positions - azi: float - desired response azimuth - ele: float - desired response elevation - - Returns - ------- - i_dir: int - index of nearest SourcePosition - """ - if azi < 0: - azi = azi + 360.0 - - if ele < 0: - ele = ele + 360.0 - - delta_azi = np.deg2rad(np.abs(azi - SourcePosition[:, 0])) - dist = np.arccos( - np.sin(np.deg2rad(SourcePosition[:, 2])) * np.sin(np.deg2rad(ele)) - + np.cos(np.deg2rad(SourcePosition[:, 1])) - * np.cos(np.deg2rad(ele)) - * np.cos(delta_azi) - ) - - i_dir = np.argmin(dist) - - # print('Direction closest to {}, {} is {} with angles {}, {} and distance {}\n'.format( - # azi, ele, i_dir, SourcePosition[i_dir,0], SourcePosition[i_dir,1], dist[i_dir] - # ) - # ) - - return i_dir - - -""" Core binaural rendering functions """ - - -def binaural_fftconv( - x: np.ndarray, IR: np.ndarray, nchannels: int, lfe_index: list = [] -) -> np.ndarray: - """Binauralization using fft convolution - - Parameters - ---------- - x: np array - input multi-channel array - IR: np array - HRIRs array - nchannels: int - maximum number of channels to process - lfe_index: list - list of LFE channel indices - - Returns - ------- - y: np.ndarray - output convolved signal array - - """ - y = np.zeros([x.shape[0], 2]) - for chan_idx in range(min(x.shape[1], nchannels)): - if chan_idx not in lfe_index: - y[:, 0] = np.add( - y[:, 0], - sig.fftconvolve( - x[:, chan_idx].astype(float), IR[:, 0, chan_idx] - ).astype(float)[: x.shape[0]], - ) - y[:, 1] = np.add( - y[:, 1], - sig.fftconvolve( - x[:, chan_idx].astype(float), IR[:, 1, chan_idx] - ).astype(float)[: x.shape[0]], - ) - else: - logger.debug(f" Mute LFE channel of index: {str(chan_idx)}") - - return y - - -def binaural_fftconv_framewise( - x: np.ndarray, - IR: np.ndarray, - SourcePosition: np.ndarray, - azi: np.ndarray = None, - ele: np.ndarray = None, - frame_len: int = (IVAS_FRAME_LEN_MS // 4) * 48, - interp_method="linear", - verbose=False, -) -> np.ndarray: - """Binauralization using fft convolution with frame-wise processing - supports rotation on trajectories with interpolation between measured Source - positions, reimplemented roughly along the lines of ConvBinauralRenderer.m - - Parameters - ---------- - x: np.ndarray - input multi-channel array - IR: np.ndarray - HRIRs array - SourcePosition: np.ndarray - positions of the source in the measurements in IR - azi: np.ndarray - azimuth angles for all frames - ele: np.ndarray - elevation angles for all frames - frame_len: int - frame length, optional, default = (IVAS_FRAME_LEN_MS // 4) * 48000 - interp_method: - interpolation method, optional, default = linear - - - Returns - ------- - y: np.ndarray - output binaural signal array - - """ - - sig_len = x.shape[0] - frame_len = (IVAS_FRAME_LEN_MS // 4) * 48 - N_frames = int(sig_len / frame_len) - - N_HRIR_taps = IR.shape[2] - - if azi is None or ele is None: - azi = np.repeat([0.0], N_frames) - ele = np.repeat([0.0], N_frames) - elif len(azi) < N_frames or len(ele) < N_frames: - azi = np.concatenate( - [np.repeat(azi, N_frames // len(azi)), azi[: N_frames % len(azi)]] - ) - ele = np.concatenate( - [np.repeat(ele, N_frames // len(ele)), ele[: N_frames % len(ele)]] - ) - - iGs = np.zeros([N_frames + 1], dtype=int) - mGs = np.zeros([N_frames + 1], dtype=int) - - # store trajectory as a sequence of indices of source positions - # on the HRTF database in a compressed format such that, for - # each new measurement point the trajectory hits, the sample index - # is stored in mGs and the index of the measurement in iG - # the number of measurement points hit by the trajectory is nsp - isp = 0 - iGs[0] = FindFilter(SourcePosition, azi[0], ele[0]) - mGs[0] = 0 - for i_frame in range(1, N_frames): - iG = FindFilter(SourcePosition, azi[i_frame], ele[i_frame]) - if iG != iGs[isp]: - isp += 1 - iGs[isp] = iG - mGs[isp] = i_frame * frame_len + 1 - nsp = isp + 1 - - # set last fence post explicitly - if mGs[nsp] < sig_len: - iGs[nsp] = iG - mGs[nsp] = sig_len - nsp = nsp + 1 - - T_rev = frame_len + N_HRIR_taps - 1 - N_rev = int(np.ceil(T_rev / frame_len)) - - if verbose: - print(" N_rev = ", N_rev) - - fastcode = True - if N_rev > 5: - if verbose: - print( - " __ __ ___ ___ _ _ ___ _ _ ___ " - ) - print( - r" \ \ / / / \ | _ \ | \| | |_ _| | \| | / __|" - ) - print( - r" \ \/\/ / | - | | / | . | | | | . | | (_ |" - ) - print( - r" \_/\_/ |_|_| |_|_\ |_|\_| |___| |_|\_| \___|" - ) - print( - " " - ) - print( - " You are using very long filters! This will be slooooow and use a lot of memory!" - ) - else: - fastcode = False - - if fastcode and verbose: - print( - " __ __ ___ ___ _ _ ___ _ _ ___ " - ) - print( - r" \ \ / / / \ | _ \ | \| | |_ _| | \| | / __|" - ) - print( - r" \ \/\/ / | - | | / | . | | | | . | | (_ |" - ) - print( - r" \_/\_/ |_|_| |_|_\ |_|\_| |___| |_|\_| \___|" - ) - print( - " " - ) - print( - " To speed up the otherwise extremely slow calculation, we only calculate the " - ) - print( - " responses of the latest frame with the latest filters instead of the full " - ) - print( - " integrals. This is much faster but much more prone to clicks. Inspect your " - ) - print( - " output signals carefully! To change this behavior, go to binauralrenderer.py " - ) - print( - " and set fastcode to False. " - ) - - y = np.zeros([sig_len + T_rev, 2]) - y0 = np.zeros([N_rev, sig_len + T_rev, 2]) - - fade_in = np.arange(frame_len) / (frame_len - 1) - fade_in = fade_in[:, np.newaxis] - fade_out = 1.0 - fade_in - - for i_ear in [0, 1]: - - Gs = IR[ - iGs[0:nsp], i_ear, : - ] # Green's function along the trajectory sampled by the measurement points - interp_G = interp.interp1d( - mGs[0:nsp], Gs, kind=interp_method, axis=0 - ) # interpolator for Green's function between those points - - G = interp_G(np.arange(0, sig_len, frame_len)) - - t0 = timeit.default_timer() - - if fastcode: - for i_frame in range(N_frames): - - i1 = i_frame * frame_len - i2 = (i_frame + 1) * frame_len - i2p = i1 + T_rev - - fade_out = np.linspace(0.0, 1.0, T_rev, endpoint=False) - fade_in = 1.0 - fade_out - - for j_frame in [0, 1]: - G_n_m = G[min(j_frame + i_frame, N_frames - 1), :] - y0[j_frame, i1:i2p, i_ear] = sig.oaconvolve( - np.squeeze(x[i1:i2]), G_n_m - ) - - y[i1:i2p, i_ear] = ( - np.squeeze(fade_out) * y0[0, i1:i2p, i_ear] - + np.squeeze(fade_in) * y0[1, i1:i2p, i_ear] - ) - - t1 = timeit.default_timer() - fps = (i_frame + 1) / (t1 - t0) - eta = (2 * N_frames - (i_frame + 1) + i_ear * N_frames) / fps - - if verbose: - print( - " Frame {}/{} on ear {}/2 done at {: 3.1f} fps, ETA {: 6.0f} s ".format( - i_frame + 1, N_frames, i_ear + 1, fps, eta - ), - end="\r", - ) - - else: - for i_frame in range(N_frames): - - i1 = i_frame * frame_len - i2 = (i_frame + 1) * frame_len - i2p = i1 + T_rev - - y0[:] = 0.0 - for j_frame in range( - max(0, i_frame - N_rev), min(i_frame + 1, N_frames) - ): - - j1 = j_frame * frame_len - j2 = (j_frame + 1) * frame_len - j2p = j1 + T_rev - - G0 = G[i_frame] - G1 = G[min(i_frame + 1, N_frames - 1)] - - y0[0, j1:j2p, i_ear] += sig.oaconvolve(np.squeeze(x[j1:j2]), G0) - y0[1, j1:j2p, i_ear] += sig.oaconvolve(np.squeeze(x[j1:j2]), G1) - - y[i1:i2, i_ear] = ( - np.squeeze(fade_out) * y0[0, i1:i2, i_ear] - + np.squeeze(fade_in) * y0[1, i1:i2, i_ear] - ) - - t1 = timeit.default_timer() - fps = (i_frame + 1) / (t1 - t0) - eta = (2 * N_frames - (i_frame + 1) + i_ear * N_frames) / fps - - if verbose: - print( - " Frame {}/{} on ear {}/2 done at {: 3.1f} fps, ETA {: 6.0f} s ".format( - i_frame + 1, N_frames, i_ear + 1, fps, eta - ), - end="\r", - ) - - if verbose: - print("") - - return y[0:sig_len] - - -def binaural_render_LFE( - x: np.ndarray, - fs: int = 48000, - lfe_index: list = [3], - LFE_gain: float = 10 ** (5.5 / 20), - latency_smp: int = 0, -) -> np.ndarray: - """ - Extract LFE from the given input and render - it binaurally, accounting for delay of the - """ - - lfe = x[:, lfe_index].copy() - - # if there is more than one LFE sum them into one - if lfe.shape[1] > 1: - lfe = np.sum(lfe, axis=1) - - # TODO tmu - disabled temporarily here, disabled in C - lfe_delay_ns = 0 - """ - # 120 Hz low-pass filtering for LFE using IVAS filter coefficients - if fs == 48000: - lfe = sig.sosfilt(IVAS_LPF_4_BUTTER_48K_SOS, lfe, axis=0) - else: - raise NotImplementedError("Only 48 kHz supported at the moment!") - - # 3.5ms LP filter delay from IVAS ROM - lfe_delay_ns = 0.0035 * 1e9 - lfe_delay_smp = round(lfe_delay_ns * fs / 1e9) - - # Delay LFE by the same amount as the HRTF delay - lfe = np.roll(lfe, round(latency_smp), axis=0) - lfe[0 : round(latency_smp), :] = 0 - """ - - # apply gain - lfe *= LFE_gain - - # duplicate for each binaural channel - lfe = np.hstack([lfe, lfe]) - - return lfe, lfe_delay_ns - - -""" Format specific wrapper functions """ - - -def render_custom_ls_binaural( - x: np.ndarray, - fs: int, - in_spfmt: spatialaudioformat.Format, - out_spfmt: spatialaudioformat.Format, - IR: np.ndarray, - SourcePosition: np.ndarray, - trajectory: np.ndarray, -) -> np.ndarray: - - ls_azi_all = in_spfmt.ls_azi - ls_ele_all = in_spfmt.ls_ele - lfe_index_all = in_spfmt.lfe_index - - logger.info(" Processing channels on custom LS layout") - azis = ", ".join([f"{a:7.2f}" for a in ls_azi_all]) - eles = ", ".join([f"{e:7.2f}" for e in ls_ele_all]) - logger.info(f" azi: {azis}") - logger.info(f" ele: {eles}") - logger.info(f" lfe_index: {lfe_index_all}") - - if out_spfmt.name == "BINAURAL_ROOM": - tmp_spfmt = spatialaudioformat.Format("7_1_4") - x = spatialaudioconvert.convert_mc(x, in_spfmt, tmp_spfmt) - ls_azi_all = tmp_spfmt.ls_azi - ls_ele_all = tmp_spfmt.ls_ele - lfe_index_all = tmp_spfmt.lfe_index - logger.info(f" {in_spfmt.name} -> {tmp_spfmt.name} -> {out_spfmt.name}") - - frame_len = (IVAS_FRAME_LEN_MS // 4) * (fs // 1000) - sig_len = x.shape[0] - N_frames = int(sig_len / frame_len) - - i_ls = 0 - y = np.zeros([sig_len, 2]) - for i_chan in range(x.shape[1]): - - # skip LFE - if i_chan in lfe_index_all: - continue - - # skip silent (or very low volume) channels - if np.allclose(x[:, i_chan], 0.0, atol=32.0): - continue - - ls_azi = np.repeat(ls_azi_all[i_ls], N_frames) - ls_ele = np.repeat(ls_ele_all[i_ls], N_frames) - - azi, ele = rotateISM(ls_azi, ls_ele, trajectory=trajectory) - - y += binaural_fftconv_framewise( - x[:, i_chan], - IR, - SourcePosition, - frame_len=frame_len, - azi=azi, - ele=ele, - verbose=False, - ) - i_ls += 1 - - return y - - -def render_ism_binaural( - x: np.ndarray, - fs: int, - IR: np.ndarray, - SourcePosition: np.ndarray, - trajectory: np.ndarray, - in_pos: np.ndarray, -) -> np.ndarray: - - frame_len = (IVAS_FRAME_LEN_MS // 4) * (fs // 1000) - sig_len = x.shape[0] - N_frames = int(sig_len / frame_len) - - # get ISM metadata and repeat it nsubframe times - pos_data = [] - for pos in in_pos: - pos_data.extend( - [pos["azimuth"], pos["elevation"]] for _ in range(pos["use_for_frames"]) - ) - pos_data = np.array(pos_data) - pos_data = np.repeat(pos_data, 4, axis=0) - - # extract positions only according to the audio duration - pos_data = pos_data[:N_frames, :] - - azi, ele = rotateISM(pos_data[:, 0], pos_data[:, 1], trajectory=trajectory) - - y = np.zeros([sig_len, 2]) - y += binaural_fftconv_framewise( - x, - IR, - SourcePosition, - frame_len=frame_len, - azi=azi, - ele=ele, - verbose=False, - ) - - return y - - -def render_masa_binaural( - x: np.ndarray, - fs: int, - in_spfmt: spatialaudioformat.Format, - IR: np.ndarray, - SourcePosition: np.ndarray, - trajectory: np.ndarray, -): - y = x[:, :2] - # TODO - return y - - -def render_ambi_ls_binaural( - x: np.ndarray, - fs: int, - in_spfmt: spatialaudioformat.Format, - IR: np.ndarray, - trajectory: np.ndarray, -) -> np.ndarray: - - y = x[:] - if trajectory is not None: - if in_spfmt.ambi_order > 0: - y = rotateHOA(y, trajectory) - if in_spfmt.isloudspeaker: - y = rotateMC(y, trajectory, in_spfmt) - - y = binaural_fftconv(y, IR, in_spfmt.nchannels, in_spfmt.lfe_index) - - return y - - -""" Wrapper function for generic binaural rendering """ - - -def binaural_rendering( - x: np.ndarray, - in_spfmt: spatialaudioformat.Format, - out_spfmt: spatialaudioformat.Format, - dataset: str = "orange53", - fs: int = 48000, - trajectory: str = None, - include_LFE: bool = False, - LFE_gain: float = 10 ** (5.5 / 20), - in_pos: dict = None, -): - """Binaural rendering - - Parameters - ---------- - x: np array - input multi-channel array - in_spfmt_name: str - name of input spatial format - dataset: str - name of the HRIRs or BRIRs dataset - fs: int - input/output sampling-rate (default 48kHz) - trajectory: str - path to trajectory file - - Returns - ------- - y: np.ndarray - output binaural signal array - - """ - - if trajectory is not None: - logger.info( - " performing rotation along trajectory from file {}".format(trajectory) - ) - - # resample to 48 kHz - y = audioarray.resample(x, fs, 48000) - delay_total_ns = 0 - - # get IR corresponding to the input and output formats - IR, SourcePosition, latency_smp = get_IR(in_spfmt, out_spfmt, dataset) - delay_total_ns += latency_smp / float(fs) * 1e9 - - # prepare LFE signal to be added to output - if include_LFE and in_spfmt.isloudspeaker and in_spfmt.lfe_index: - lfe, lfe_delay_ns = binaural_render_LFE( - x, 48000, in_spfmt.lfe_index, LFE_gain, latency_smp - ) - delay_total_ns += lfe_delay_ns - - # get binauralized signal based on format - if in_spfmt.altname.startswith("CUSTOM_LS"): - y = render_custom_ls_binaural( - x, fs, in_spfmt, out_spfmt, IR, SourcePosition, trajectory - ) - elif in_spfmt.name.startswith("ISM"): - if not in_pos: - raise ValueError("ISM metadata empty!") - y = render_ism_binaural( - x, - fs, - IR, - SourcePosition, - trajectory, - in_pos, - ) - elif in_spfmt.name.startswith("MASA"): - y = render_masa_binaural(x, fs, in_spfmt, IR, SourcePosition, trajectory) - elif in_spfmt.ambi_order > 0 or in_spfmt.isloudspeaker: - y = render_ambi_ls_binaural(x, fs, in_spfmt, IR, trajectory) - else: - raise NotImplementedError( - f"{in_spfmt.name} -> {out_spfmt.name}: format conversion not implemented" - ) - - # add LFE signal to output - if include_LFE and in_spfmt.isloudspeaker and in_spfmt.lfe_index: - # delay the binauralized signal by the LFE delay - lfe_delay_smp = NS2SA(fs, int(lfe_delay_ns)) - y = np.roll(y, lfe_delay_smp, axis=0) - y[0:lfe_delay_smp, :] = 0 - y += lfe - - # delay compensation - delay_total_smp = NS2SA(fs, delay_total_ns) - y = np.roll(y, -delay_total_smp, axis=0) - if delay_total_smp > 0: - y[-delay_total_smp:, :] = 0 - - # resample back to original rate - y = audioarray.resample(y, 48000, fs) - - return y diff --git a/scripts/pyaudio3dtools/hoadecoder.py b/scripts/pyaudio3dtools/hoadecoder.py deleted file mode 100644 index c37ceb3bdcf6f04a91308583ac3d5c9df76c12a5..0000000000000000000000000000000000000000 --- a/scripts/pyaudio3dtools/hoadecoder.py +++ /dev/null @@ -1,186 +0,0 @@ -#!/usr/bin/env python3 - -""" - (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. 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 logging -import os -from typing import Optional - -import numpy as np -from scipy.special import lpmv - -from pyaudio3dtools import spatialaudioformat -from pyaudio3dtools.constants import T_DESIGN_11_AZI, T_DESIGN_11_ELE -from pyaudio3dtools.EFAP import EFAP - -main_logger = logging.getLogger("__main__") -logger = main_logger.getChild(__name__) -logger.setLevel(logging.DEBUG) - - -def get_hoa_mtx( - ambi_order: int, - spkrlayout: spatialaudioformat, - norm: Optional[str] = "sn3d", - rE_weight: Optional[bool] = False, - intensity_panning: Optional[bool] = True, -) -> np.ndarray: - nharm = spatialaudioformat.Format.nchannels_from_ambiorder(ambi_order) - if spkrlayout.name == "MONO": - mtx_hoa_dec = np.zeros([1, nharm]) - mtx_hoa_dec[0, 0] = 1 - elif spkrlayout.name == "STEREO": - mtx_hoa_dec = np.zeros([2, nharm]) - # Cardioids +/- 90 degrees - mtx_hoa_dec[0, 0] = 0.5 - mtx_hoa_dec[0, 1] = 0.5 - mtx_hoa_dec[1, 0] = 0.5 - mtx_hoa_dec[1, 1] = -0.5 - elif spkrlayout.isloudspeaker: - Y_td = getRSH( - T_DESIGN_11_AZI, - T_DESIGN_11_ELE, - ambi_order, - norm="ortho", - ) - Y_td *= np.sqrt(4 * np.pi) - - n_ls_woLFE = spkrlayout.nchannels - len(spkrlayout.lfe_index) - ls_azi_woLFE = np.delete(spkrlayout.ls_azi, spkrlayout.lfe_index).astype(float) - ls_ele_woLFE = np.delete(spkrlayout.ls_ele, spkrlayout.lfe_index).astype(float) - - panner = EFAP(ls_azi_woLFE, ls_ele_woLFE, intensity_panning) - G_td = panner.pan(T_DESIGN_11_AZI, T_DESIGN_11_ELE) - - mtx_hoa_dec = (G_td.T @ Y_td.T) / T_DESIGN_11_AZI.size - - if norm == "sn3d": - mtx_hoa_dec = mtx_hoa_dec @ np.diag(sn2n(ambi_order)) - elif norm == "ortho": - mtx_hoa_dec *= np.sqrt(4 * np.pi) - - if rE_weight: - a_n = rE_weight(ambi_order) - nrg_pre = np.sqrt(len(n_ls_woLFE) / np.sum(a_n**2)) - mtx_hoa_dec = mtx_hoa_dec @ np.diag(a_n) * nrg_pre - - mtx_hoa_dec = np.insert( - mtx_hoa_dec, spkrlayout.lfe_index, np.zeros(nharm), axis=0 - ) - else: - raise ValueError( - f"Unsupported spatial audio format for ALLRAD: {spkrlayout.name}" - ) - - return mtx_hoa_dec - - -def hoa_linear_decoding(signal_in: np.ndarray, mtx_hoa_dec: np.ndarray) -> np.ndarray: - if not signal_in.shape[1] == mtx_hoa_dec.shape[1]: - raise Exception( - "Input number of channels must be equal to renderer matrix second dimension" - ) - - signal_out = np.dot(signal_in, mtx_hoa_dec.transpose()) - - logger.debug(f"Signal out: {signal_out.shape[0]} by {signal_out.shape[1]}") - - return signal_out - - -def rE_weight(order: int) -> np.ndarray: - return np.array( - [ - lpmv(0, l, np.cos(np.deg2rad(137.9) / (order + 1.51))) - for l in range(order + 1) - for _ in range(-l, l + 1) - ] - ).T - - -def n2sn(order: int) -> np.ndarray: - return np.array( - [1.0 / np.sqrt(2 * l + 1) for l in range(order + 1) for _ in range(-l, l + 1)] - ) - - -def sn2n(order: int) -> np.ndarray: - return np.array( - [np.sqrt(2 * l + 1) for l in range(order + 1) for _ in range(-l, l + 1)] - ) - - -def getRSH( - azi: np.ndarray, - ele: np.ndarray, - ambi_order: int, - norm: Optional[str] = "sn3d", - degrees: Optional[bool] = True, -) -> np.ndarray: - """ - Returns real spherical harmonic response for the given position(s) - """ - if degrees: - azi = np.deg2rad(azi) - ele = np.deg2rad(ele) - - LM = np.array([(l, m) for l in range(ambi_order + 1) for m in range(-l, l + 1)]) - - response = np.zeros([LM.shape[0], azi.shape[0]]) - - # trig_term * legendre * uncondon - for i, (l, m) in enumerate(LM): - # N3D norm - response[i, :] = np.sqrt( - ((2 * l + 1) * np.math.factorial(l - np.abs(m))) - / (4 * np.pi * np.math.factorial(l + np.abs(m))) - ) - - # trig term - if m < 0: - response[i, :] *= np.sqrt(2) * np.sin(azi * np.abs(m)) - elif m == 0: - pass # response[i,:] *= 1 - else: - response[i, :] *= np.sqrt(2) * np.cos(azi * m) - - # legendre polynomial - response[i, :] *= lpmv(np.abs(m), l, np.sin(ele)) * ((-1) ** np.abs(m)) - - if norm == "sn3d": - response *= np.sqrt(4 * np.pi) - response[:] = np.diag(n2sn(ambi_order)) @ response - elif norm == "n3d": - response *= np.sqrt(4 * np.pi) - else: - pass # ortho - - return response diff --git a/scripts/pyaudio3dtools/masarenderer.py b/scripts/pyaudio3dtools/masarenderer.py deleted file mode 100644 index ff9a3612a4f86ba7211708be81f678aadf5141a2..0000000000000000000000000000000000000000 --- a/scripts/pyaudio3dtools/masarenderer.py +++ /dev/null @@ -1,112 +0,0 @@ -#!/usr/bin/env python3 - -""" - (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. 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 os -import shutil -import subprocess as sp -from tempfile import TemporaryDirectory - -import numpy as np - -from pyaudio3dtools.audiofile import readfile, writefile -from pyaudio3dtools.spatialaudioformat import Format - - -def render_masa( - in_sig: str, - in_meta: str, - in_spfmt: Format, - out_spfmt: Format, -) -> np.ndarray: - """Python wrapper for masaRenderer binaray - - Parameters - ---------- - in_sig: np.ndarray - Input signal with MASA transport channels - in_meta: str - Input MASA metadata file - in_spfmt: Format - Input spatial audio format - out_spfmt: Format - Output spatial audio format - - Returns - ------- - out_sig: np.ndarray - Rendered signal - fs : int - Sampling frequency (always 48 kHz for masaRenderer) - """ - - if shutil.which("masaRenderer") is None: - raise FileNotFoundError("The masaRenderer binary was not found in path!") - - with TemporaryDirectory() as tmp_dir: - MASA_RENDERER_CMD = [ - "masaRenderer", - "", # outputMode -LS51, -LS714 or BINAURAL - "", # input PCM - in_meta[0], - "", # output PCM - ] - - cmd = MASA_RENDERER_CMD[:] - if out_spfmt.name.startswith("BINAURAL"): - cmd[1] = "-BINAURAL" - out_nchan = 2 - elif out_spfmt.name == "5_1": - cmd[1] = "-LS51" - out_nchan = 6 - else: - cmd[1] = "-LS714" - out_nchan = 12 - - tmp_in = os.path.join(tmp_dir, "tmp_masa_in.pcm") - tmp_out = os.path.join(tmp_dir, "tmp_masa_out.pcm") - - cmd[2] = tmp_in - cmd[4] = tmp_out - - writefile(tmp_in, in_sig, 48000) - - try: - result = sp.run(cmd, check=True, capture_output=True, text=True) - except sp.CalledProcessError as e: - raise SystemError( - f"Command returned non-zero exit status ({e.returncode}): {' '.join(e.cmd)}\n{e.stderr}\n{e.stdout}" - ) - - out_sig, _ = readfile(tmp_out, out_nchan, 48000) - - return out_sig diff --git a/scripts/pyaudio3dtools/quaternions/functions.py b/scripts/pyaudio3dtools/quaternions/functions.py deleted file mode 100644 index 6b30ccb5ee0e269cde63149b78ee15a5dbab332f..0000000000000000000000000000000000000000 --- a/scripts/pyaudio3dtools/quaternions/functions.py +++ /dev/null @@ -1,183 +0,0 @@ -#!/usr/bin/env python3 - -""" - (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. 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. -""" - -from typing import Tuple -import numpy as np - - -def Quat2Euler(quat: np.ndarray, degrees: bool = True): - "Convert Quaternion to Euler angles" - - sinr = +2.0 * (quat[..., 0] * quat[..., 1] + quat[..., 2] * quat[..., 3]) - cosr = +1.0 - 2.0 * (quat[..., 1] * quat[..., 1] + quat[..., 2] * quat[..., 2]) - roll = np.arctan2(sinr, cosr) - - sinp = +2.0 * (quat[..., 0] * quat[..., 2] - quat[..., 3] * quat[..., 1]) - pitch = np.where(np.fabs(sinp) >= 1, np.copysign(np.pi / 2, sinp), np.arcsin(sinp)) - - siny = +2.0 * (quat[..., 0] * quat[..., 3] + quat[..., 1] * quat[..., 2]) - cosy = +1.0 - 2.0 * (quat[..., 2] * quat[..., 2] + quat[..., 3] * quat[..., 3]) - yaw = np.arctan2(siny, cosy) - - ypr = np.array([yaw, pitch, roll]).T - - if degrees: - ypr = np.rad2deg(ypr) - - return ypr - - -def Euler2Quat(ypr: np.ndarray, degrees: bool = True): - "Convert Euler angles to Quaternion" - - if degrees: - ypr = np.deg2rad(ypr) - - if len(ypr.shape) == 2: - N_quat = ypr.shape[0] - quat = np.zeros([N_quat, 4]) - yaw = ypr[:, 0] - pitch = ypr[:, 1] - roll = ypr[:, 2] - else: - quat = np.zeros([4]) - yaw = ypr[0] - pitch = ypr[1] - roll = ypr[2] - - c1 = np.cos(0.5 * yaw) - c2 = np.cos(0.5 * pitch) - c3 = np.cos(0.5 * roll) - - s1 = np.sin(0.5 * yaw) - s2 = np.sin(0.5 * pitch) - s3 = np.sin(0.5 * roll) - - quat[..., 0] = c3 * c2 * c1 + s3 * s2 * s1 - quat[..., 1] = s3 * c2 * c1 - c3 * s2 * s1 - quat[..., 2] = s3 * c2 * s1 + c3 * s2 * c1 - quat[..., 3] = c3 * c2 * s1 - s3 * s2 * c1 - - return quat - - -def Quat2RotMat(quat: np.ndarray): - "Convert quaternion to rotation matrix" - - R = np.zeros([3, 3]) - - if quat[0] != -3: - - # Quaternions - # formula taken from ivas_rotation.c - - R[0, 0] = ( - quat[0] * quat[0] - + quat[1] * quat[1] - - quat[2] * quat[2] - - quat[3] * quat[3] - ) - R[0, 1] = 2.0 * (quat[1] * quat[2] - quat[0] * quat[3]) - R[0, 2] = 2.0 * (quat[1] * quat[3] + quat[0] * quat[2]) - - R[1, 0] = 2.0 * (quat[1] * quat[2] + quat[0] * quat[3]) - R[1, 1] = ( - quat[0] * quat[0] - - quat[1] * quat[1] - + quat[2] * quat[2] - - quat[3] * quat[3] - ) - R[1, 2] = 2.0 * (quat[2] * quat[3] - quat[0] * quat[1]) - - R[2, 0] = 2.0 * (quat[1] * quat[3] - quat[0] * quat[2]) - R[2, 1] = 2.0 * (quat[2] * quat[3] + quat[0] * quat[1]) - R[2, 2] = ( - quat[0] * quat[0] - - quat[1] * quat[1] - - quat[2] * quat[2] - + quat[3] * quat[3] - ) - - else: - - # 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 - # - # formula taken from ivas_rotation.c - - c1 = np.cos(quat[3] / 180.0 * np.pi) - c2 = np.cos(quat[2] / 180.0 * np.pi) - c3 = np.cos(quat[1] / 180.0 * np.pi) - - s1 = np.sin(quat[3] / 180.0 * np.pi) - s2 = np.sin(-quat[2] / 180.0 * np.pi) - s3 = np.sin(quat[1] / 180.0 * np.pi) - - R[0, 0] = c2 * c3 - R[0, 1] = -c2 * s3 - R[0, 2] = s2 - - R[1, 0] = c1 * s3 + c3 * s1 * s2 - R[1, 1] = c1 * c3 - s1 * s2 * s3 - R[1, 2] = -c2 * s1 - - R[2, 0] = s1 * s3 - c1 * c3 * s2 - R[2, 1] = c3 * s1 + c1 * s2 * s3 - R[2, 2] = c1 * c2 - - return R - - -def rotateAziEle( - azi: float, ele: float, R: np.ndarray, is_planar: bool = False -) -> Tuple[float, float]: - w = np.cos(np.deg2rad(ele)) - dv = np.array( - [ - w * np.cos(np.deg2rad(azi)), - w * np.sin(np.deg2rad(azi)), - np.sin(np.deg2rad(ele)), - ] - ) - - dv_rot = R @ dv - - azi = np.rad2deg(np.arctan2(dv_rot[1], dv_rot[0])) - if is_planar: - ele = 0 - else: - ele = np.rad2deg(np.arctan2(dv_rot[2], np.sqrt(np.sum(dv_rot[:2] ** 2)))) - - return azi, ele diff --git a/scripts/pyaudio3dtools/rotation.py b/scripts/pyaudio3dtools/rotation.py deleted file mode 100644 index cbd76aef3fe468378674cd13dc5de12f4ef60c02..0000000000000000000000000000000000000000 --- a/scripts/pyaudio3dtools/rotation.py +++ /dev/null @@ -1,346 +0,0 @@ -#!/usr/bin/env python3 - -""" - (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. 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 numpy as np - -from pyaudio3dtools import EFAP, spatialaudioformat -from pyaudio3dtools.constants import * -from pyaudio3dtools.quaternions.functions import Quat2RotMat, rotateAziEle - -######################################################################### -# Helper functions used by Ruedenberg, -# an implementation of the algorithm in -# Ivanic, J. & Ruedenberg, K., J. Phys. Chem. 100, 6342 (1996) -# translated from ivas_rotation.c -######################################################################### - - -def SHrot_p( - i: int, l: int, a: int, b: int, SHrotmat: np.ndarray, R_lm1: np.ndarray -) -> float: - """Helper function to calculate the ps""" - - ri1 = SHrotmat[i + 1 + 1][1 + 1 + 1] - rim1 = SHrotmat[i + 1 + 1][-1 + 1 + 1] - ri0 = SHrotmat[i + 1 + 1][0 + 1 + 1] - - if b == -l: - R_lm1_1 = R_lm1[a + l - 1][0] - R_lm1_2 = R_lm1[a + l - 1][2 * l - 2] - p = ri1 * R_lm1_1 + rim1 * R_lm1_2 - else: - if b == l: - R_lm1_1 = R_lm1[a + l - 1][2 * l - 2] - R_lm1_2 = R_lm1[a + l - 1][0] - p = ri1 * R_lm1_1 - rim1 * R_lm1_2 - else: - R_lm1_1 = R_lm1[a + l - 1][b + l - 1] - p = ri0 * R_lm1_1 - - return p - - -def SHrot_u(l: int, m: int, n: int, SHrotmat: np.ndarray, R_lm1: np.ndarray) -> float: - """Helper function to calculate the us""" - return SHrot_p(0, l, m, n, SHrotmat, R_lm1) - - -def SHrot_v(l: int, m: int, n: int, SHrotmat: np.ndarray, R_lm1: np.ndarray) -> float: - """Helper function to calculate the vs""" - - 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 - else: - if m > 0: - d = 1.0 if (m == 1) else 0.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 * np.sqrt(1.0 + d) - p1 * (1.0 - d) - else: - d = 1.0 if (m == -1) else 0.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 * (1.0 - d) + p1 * np.sqrt(1.0 + d) - - -def SHrot_w(l: int, m: int, n: int, SHrotmat: np.ndarray, R_lm1: np.ndarray) -> float: - """Helper function to calculate the w""" - if m == 0: - raise ValueError("ERROR should not be called\n") - 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) - return 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) - return p0 - p1 - - -######################################## -# SHD rotation matrix calculation -# translated from ivas_rotation.c -######################################## -def SHrotmatgen(R: np.ndarray, order: int = 3) -> np.ndarray: - """Calculate SHD roatation matrix from that in real space - - Parameters: - ---------- - R: np.ndarray - real-space rotation matrix - - order: Optional[int] - Ambisonics order, default = 3 - - Returns: - ---------- - SHrotmat: np.ndarray - SHD rotation matrix - - """ - dim = (order + 1) * (order + 1) - - SHrotmat = np.zeros([dim, dim]) - R_lm1 = np.zeros([dim, dim]) - R_l = np.zeros([dim, dim]) - - SHrotmat[0][0] = 1.0 - - SHrotmat[1][1] = R[1][1] - SHrotmat[1][2] = R[1][2] - SHrotmat[1][3] = R[1][0] - - SHrotmat[2][1] = R[2][1] - SHrotmat[2][2] = R[2][2] - SHrotmat[2][3] = R[2][0] - - SHrotmat[3][1] = R[0][1] - SHrotmat[3][2] = R[0][2] - SHrotmat[3][3] = R[0][0] - - for i in range(2 * 1 + 1): - for j in range(2 * 1 + 1): - R_lm1[i][j] = SHrotmat[i + 1][j + 1] - - band_idx = 4 - for l in range(2, order + 1): - - R_l[:, :] = 0.0 - - for m in range(-l, l + 1): - - d = 1 if (m == 0) else 0 - absm = abs(m) - sql2mm2 = np.sqrt((l * l - m * m)) - sqdabsm = np.sqrt(((1 + d) * (l + absm - 1) * (l + absm))) - sqlabsm = np.sqrt(((l - absm - 1) * (l - absm))) - - for n in range(-l, l + 1): - if abs(n) == l: - sqdenom = np.sqrt((2 * l) * (2 * l - 1)) - else: - sqdenom = np.sqrt(l * l - n * n) - - u = sql2mm2 / sqdenom - v = sqdabsm / sqdenom * (1 - 2 * d) * 0.5 - w = sqlabsm / sqdenom * (1 - d) * (-0.5) - - if u != 0: - u = u * SHrot_u(l, m, n, SHrotmat, R_lm1) - if v != 0: - v = v * SHrot_v(l, m, n, SHrotmat, R_lm1) - if w != 0: - w = w * SHrot_w(l, m, n, SHrotmat, R_lm1) - R_l[m + l][n + l] = u + v + w - - for i in range(2 * l + 1): - for j in range(2 * l + 1): - SHrotmat[band_idx + i][band_idx + j] = R_l[i][j] - - for i in range(2 * l + 1): - for j in range(2 * l + 1): - R_lm1[i][j] = R_l[i][j] - - band_idx += 2 * l + 1 - - return SHrotmat - - -def rotateHOA(x: np.ndarray, trajectory: str) -> np.ndarray: - """Rotate HOA signal by applying a rotation matrix calculated from the current quaternion - in each subframe - - Parameters: - ---------- - x: np.ndarray - input signal upto HOA3 - trajectory: str - path to trajectory file - - Returns: - ---------- - y: np.ndarray - rotated HOA signal - """ - - trj_data = np.genfromtxt(trajectory, delimiter=",") - trj_frames = trj_data.shape[0] - - sig_len = x.shape[0] - sig_dim = x.shape[1] - frame_len = (IVAS_FRAME_LEN_MS // 4) * 48 - N_frames = int(sig_len / frame_len) - - if sig_dim not in [4, 9, 16]: - raise ValueError("rotateHOA can only handle FOA, HOA2 or HOA3 signals!") - - y = np.zeros([sig_len, sig_dim]) - - fade_in = np.arange(frame_len) / (frame_len - 1) - fade_in = fade_in[:, np.newaxis] - fade_out = 1.0 - fade_in - - R = np.eye(sig_dim) - R_old = np.eye(sig_dim) - for i_frame in range(N_frames): - - i1 = i_frame * frame_len - i2 = (i_frame + 1) * frame_len - - q1 = trj_data[i_frame % trj_frames, :] - R_r = Quat2RotMat(q1) - R[:, :] = SHrotmatgen(R_r, order=int(np.sqrt(sig_dim)) - 1) - - frame_in = x[i1:i2, :] - frame_out = y[i1:i2, :] - - frame_out[:, :] = (fade_in * frame_in @ R.T) + (fade_out * frame_in @ R_old.T) - - R_old[:, :] = R.copy() - - return y - - -def rotateISM( - azi: np.ndarray, - ele: np.ndarray, - trajectory: str = None, -) -> tuple: - - if trajectory is None: - return azi, ele - - trj_data = np.genfromtxt(trajectory, delimiter=",") - trj_frames = trj_data.shape[0] - - N_frames = azi.shape[0] - if ele.shape[0] != azi.shape[0]: - raise ValueError("Inconsistent input in azi and ele") - - azi_rot = np.zeros([N_frames]) - ele_rot = np.zeros([N_frames]) - - for i_frame in range(N_frames): - q = trj_data[i_frame % trj_frames, :] - azi_rot[i_frame], ele_rot[i_frame] = rotateAziEle( - azi[i_frame], ele[i_frame], Quat2RotMat(q) - ) - - return azi_rot, ele_rot - - -def rotateMC(x: np.ndarray, trajectory: str, layout: spatialaudioformat) -> np.ndarray: - """Rotate MC signal by applying a rotation matrix calculated from the current quaternion - in each subframe - - Parameters: - ---------- - x: np.ndarray - input multichannel signal - trajectory: str - path to trajectory file - - Returns: - ---------- - y: np.ndarray - rotated multichannel signal - """ - - # TODO needs optimization, currently slow - trj_data = np.genfromtxt(trajectory, delimiter=",") - trj_frames = trj_data.shape[0] - - sig_len = x.shape[0] - sig_dim = x.shape[1] - frame_len = (IVAS_FRAME_LEN_MS // 4) * 48 - N_frames = int(sig_len / frame_len) - - y = np.zeros([sig_len, sig_dim]) - - # TODO LFE handling here - panner = EFAP.EFAP(layout.ls_azi, layout.ls_ele) - - fade_in = np.arange(frame_len) / (frame_len - 1) - fade_in = fade_in[:, np.newaxis] - fade_out = 1.0 - fade_in - - R = np.eye(layout.nchannels) - R_old = np.eye(layout.nchannels) - - for i_frame in range(N_frames): - - start = i_frame * frame_len - end = (i_frame + 1) * frame_len - - q = trj_data[i_frame % trj_frames, :] - - rotated_pos = np.array( - [ - rotateAziEle(a, e, Quat2RotMat(q)) - for a, e in zip(layout.ls_azi, layout.ls_ele) - ] - ) - 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 - - frame_in = x[start:end, :] - frame_out = y[start:end, :] - - frame_out[:, :] = (fade_in * frame_in @ R) + (fade_out * frame_in @ R_old) - - R_old = R.copy() - - return y diff --git a/scripts/pyaudio3dtools/spatialaudioconvert.py b/scripts/pyaudio3dtools/spatialaudioconvert.py deleted file mode 100644 index 0040f28acea8ca519189f920a1bc516ecf1991ca..0000000000000000000000000000000000000000 --- a/scripts/pyaudio3dtools/spatialaudioconvert.py +++ /dev/null @@ -1,570 +0,0 @@ -#!/usr/bin/env python3 - -""" - (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. 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 logging -import os -import warnings -from typing import Optional, Tuple - -import numpy as np - -from pyaudio3dtools import ( - EFAP, - audioarray, - audiofile, - binauralrenderer, - hoadecoder, - masarenderer, - spatialaudioformat, - spatialmetadata, -) -from pyaudio3dtools.constants import * - -main_logger = logging.getLogger("__main__") -logger = main_logger.getChild(__name__) -logger.setLevel(logging.DEBUG) - - -def spatial_audio_convert( - in_file: str, - out_file: str, - in_format: Optional[str] = None, - in_fs: Optional[int] = None, - in_nchans: Optional[int] = None, - in_meta_files: Optional[list] = None, - out_format: Optional[str] = None, - out_fs: Optional[int] = None, - out_fc: Optional[int] = None, - output_loudness: Optional[int] = None, - loudness_tool: Optional[str] = None, - limit_output: Optional[bool] = False, - cut_preamble_s: Optional[int] = None, - trajectory: Optional[str] = None, - bin_rend_include_LFE: Optional[bool] = True, - bin_rend_LFE_gain: Optional[float] = 10 ** (5.5 / 20), - binaural_dataset: Optional[str] = "orange53", -) -> Tuple[np.ndarray, int]: - """ - Spatial audio conversion between various formats - - Parameters - ---------- - in_file: str - input filename - out_file: str - output filename - - in_format: Optional[str] - input spatial audio format - in_fs: Optional[int] - input sampling frequency - in_nchans: Optional[int] - input number of channels (deduced for .wav) - - out_format: Optional[str] - output spatial audio format - out_fs: Optional[int] - output sampling frequency - out_fc: Optional[int] - output cutoff frequency (low-pass filtering) - - output_loudness: Optional[int] - Loudness level in LKFS/dBov - loudness_tool: Optional[str] - Loudness tool to use. Must be in $PATH. - Supported tools: - ITU-R BS.1770-4 / "bs1770demo" (default) - ITU-T P.56 / "sv56demo" - - limit_output: Optional[bool] - flag whether to apply limiting to the output - cut_preamble_s: Optional[int] - preamble to cut in seconds - - trajectory: Optional[str] - head rotation trajectory file (for binaural rendering) - bin_rend_include_LFE: Optional[bool] - flag to include LFE in binaural rendering - bin_rend_LFE_gain: Optional[float] - gain to apply for LFE in binaural rendering - binaural_dataset: Optional[str] - dataset for binaural HRIR or BRIRs - - Returns - ------- - out_sig : np.ndarray - output signal - out_fs : int - output sampling frequency - """ - - """ get spatial input and audio format configurations """ - if in_format is None: - if in_nchans is not None: - in_format = spatialaudioformat.Format.detect_format(in_nchans) - in_spfmt = spatialaudioformat.Format(in_format) - logger.info(f" Input spatial audio format detected: {in_format}") - else: - logger.info(f" Input spatial audio format: {in_format}") - in_spfmt = spatialaudioformat.Format(in_format) - - if out_format is None: - out_format = in_format - logger.info( - f" Output spatial audio format not specified, defaulting to pass-through: {out_format}" - ) - out_spfmt = spatialaudioformat.Format(out_format) - - """ read input file """ - # Input is either waveform file (.pcm or .wav) or iis metadata (.txt) - _, input_ext = os.path.splitext(os.path.basename(in_file)) - - if input_ext == ".pcm": - if in_fs is None: - if out_fs: - in_fs = out_fs - else: - raise ValueError("Input and output fs not defined.") - if in_nchans is None: - if in_spfmt is not None: - in_nchans = in_spfmt.nchannels - else: - raise ValueError( - "Number of input channels not defined and can't be deduced." - ) - in_sig, in_fs = audiofile.readfile(in_file, fs=in_fs, nchannels=in_nchans) - elif input_ext == ".wav": - in_sig, in_fs = audiofile.readfile(in_file) - if in_format is None: - in_format = spatialaudioformat.Format.detect_format(in_sig.shape[1]) - in_spfmt = spatialaudioformat.Format(in_format) - - # Adjust number of channels if case of HOA, zeroed vert channels if planar - if in_spfmt.ambi_order > 0: - in_sig = audioarray.convert(in_sig, out_nchans=in_spfmt.nchannels) - elif input_ext == ".txt": - metadata_obj = spatialmetadata.Metadata(in_file, audio_fs=in_fs) - in_sig, in_fs = metadata_obj.get_audio_array() - if in_spfmt.name != "META": - logger.info( - f" {in_spfmt.name} specified with .txt input file: overriding to META format" - ) - in_format = "META" - in_spfmt = spatialaudioformat.Format(in_format) - else: - raise Exception(f"Not supported file {input_ext}") - _, in_nchans = in_sig.shape - - """ convert metadata based formats (ISM / META) directly to output format """ - if in_spfmt.name.startswith("META") or in_spfmt.name.startswith("ISM"): - if out_spfmt.name.startswith("META"): - raise Exception("out format must be specified for META (.txt) or ISM input") - - if in_spfmt.name.startswith("ISM"): - if in_meta_files is None: - raise ValueError( - f"Please specify a list of metadata files for {in_spfmt.name}" - ) - if len(in_meta_files) != int(in_spfmt.name[-1]): - raise ValueError( - f"Mismatch between number of streams and number of specified metadata files for {in_spfmt.name}" - ) - - # initialise metadata object for ISM - metadata_obj = spatialmetadata.Metadata() - metadata_obj.init_for_ism(in_file, in_fs, in_nchans, in_meta_files) - - # TODO decide on reference path for BINAURAL_ROOM - if out_spfmt.name.startswith("BINAURAL_ROOM"): - in_format = "7_1_4" - else: - in_format = out_format - in_spfmt = spatialaudioformat.Format(in_format) - - else: - # set input format to output format - # render_meta() handles all conversions - in_format = out_format - in_spfmt = out_spfmt - - in_sig = render_meta( - metadata_obj, - in_spfmt, - dataset=binaural_dataset, - fs=in_fs, - trajectory=trajectory, - include_LFE=bin_rend_include_LFE, - LFE_gain=bin_rend_LFE_gain, - ) - - """ cut preamble """ - if cut_preamble_s is not None: - samples_to_cut = int(cut_preamble_s * in_fs) - if samples_to_cut > 0: - logger.info(f" Cut preample by {samples_to_cut} samples") - in_sig = audioarray.cut(in_sig, (samples_to_cut, -1)) - - """ zero non-planar input ambisonics channels """ - if in_spfmt.ambi_order > 0 and in_spfmt.isplanar: - in_sig = spatialaudioformat.Format.zero_vert_hoa_channels(in_sig) - - """ Spatial audio format conversion """ - out_sig = in_sig - if (in_spfmt.name != out_spfmt.name) and not ( - in_spfmt.isheadphones and out_spfmt.isheadphones - ): - logger.info(f" {in_spfmt.name} -> {out_spfmt.name}") - - # binaural output (except MASA) - if out_spfmt.name.startswith("BINAURAL") and not in_spfmt.name.startswith( - "MASA" - ): - out_sig = binauralrenderer.binaural_rendering( - in_sig, - in_spfmt, - out_spfmt, - dataset=binaural_dataset, - fs=in_fs, - trajectory=trajectory, - include_LFE=bin_rend_include_LFE, - LFE_gain=bin_rend_LFE_gain, - ) - # non-binaural outputs - # HOA conversion - elif in_spfmt.ambi_order > 0: - out_sig = convert_sba(in_sig, in_spfmt, out_spfmt) - - # MC conversion - elif in_spfmt.isloudspeaker: - out_sig = convert_mc(in_sig, in_spfmt, out_spfmt) - - # MASA conversion - elif in_spfmt.name.startswith("MASA"): - out_sig = convert_masa(in_sig, in_fs, in_meta_files, in_spfmt, out_spfmt) - else: - raise NotImplementedError( - f"{in_spfmt.name} -> {out_spfmt.name}: format conversion not implemented" - ) - - """ zero non-planar output ambisonics channels """ - if out_spfmt.ambi_order > 0 and out_spfmt.isplanar: - out_sig = spatialaudioformat.Format.zero_vert_hoa_channels(out_sig) - - """ resampling """ - if (out_fs is not None) and (out_fs != in_fs): - out_sig = audioarray.resample(out_sig, in_fs, out_fs) - else: - out_fs = in_fs - - """ low-pass filtering """ - if out_fc is not None: - logger.info(f" Low-pass filter ({out_fc}Hz)") - out_sig = audioarray.lpfilter(out_sig, out_fc, out_fs) - - """ limiting """ - if limit_output: - logger.info(" apply limiter") - audioarray.limiter(out_sig, out_fs) - - """ loudness normalization """ - if output_loudness: - _, scale_factor = audiofile.loudnessinfo( - out_sig, - out_fs, - out_format, - output_loudness=output_loudness, - loudness_tool=loudness_tool, - ) - out_sig *= scale_factor - - audiofile.writefile(out_file, out_sig, out_fs) - - return out_sig, out_fs - - -def convert_sba( - in_sig: np.ndarray, - in_spfmt: spatialaudioformat.Format, - out_spfmt: spatialaudioformat.Format, -) -> np.ndarray: - """Convert an ambisonics signal to the requested output format""" - # HOA -> LS - if out_spfmt.isloudspeaker: - HOA2LS = hoadecoder.get_hoa_mtx(in_spfmt.ambi_order, out_spfmt) - return hoadecoder.hoa_linear_decoding(in_sig, HOA2LS) - # HOA -> HOA - elif out_spfmt.ambi_order > 0: - return audioarray.convert(in_sig, in_fs=None, out_nchans=out_spfmt.nchannels) - else: - raise NotImplementedError( - f"{in_spfmt.name} -> {out_spfmt.name}: format conversion not implemented" - ) - - -def convert_mc( - in_sig: np.ndarray, - in_spfmt: spatialaudioformat.Format, - out_spfmt: spatialaudioformat.Format, -) -> np.ndarray: - """Convert a multichannel signal to the requested output format""" - # MC -> LS - 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: - ls_azi_woLFE = np.delete(out_spfmt.ls_azi, out_spfmt.lfe_index).astype( - float - ) - ls_ele_woLFE = np.delete(out_spfmt.ls_ele, out_spfmt.lfe_index).astype( - float - ) - - panner = EFAP.EFAP(ls_azi_woLFE, ls_ele_woLFE) - - MC2LS = np.vstack( - [ - panner.pan(a, e).T - for i, (a, e) in enumerate(zip(in_spfmt.ls_azi, in_spfmt.ls_ele)) - if i not in in_spfmt.lfe_index - ] - ) - # TODO tmu : implement configurable LFE handling - # pass-through for LFE - MC2LS = np.insert(MC2LS, in_spfmt.lfe_index, 0, axis=0) - MC2LS = np.insert(MC2LS, out_spfmt.lfe_index, 0, axis=1) - MC2LS[in_spfmt.lfe_index, out_spfmt.lfe_index] = 1 - - # TODO tmu temporarily disable LFE rendering to MONO/STEREO - if out_spfmt.name == "MONO" or out_spfmt.name == "STEREO": - MC2LS[in_spfmt.lfe_index, :] = 0 - return in_sig @ MC2LS - # MC -> HOA - elif out_spfmt.ambi_order > 0: - # SH response for loudspeaker positions - MC2HOA = np.hstack( - [ - hoadecoder.getRSH([a], [e], out_spfmt.ambi_order) - for a, e in zip(in_spfmt.ls_azi, in_spfmt.ls_ele) - ] - ).T - - # do not add LFE to output - MC2HOA[in_spfmt.lfe_index] = 0 - - return in_sig @ MC2HOA - else: - raise NotImplementedError( - f"{in_spfmt.name} -> {out_spfmt.name}: format conversion not implemented" - ) - - -def convert_ism( - in_sig: np.ndarray, - in_fs: int, - in_pos: dict, - in_spfmt: spatialaudioformat.Format, - out_spfmt: spatialaudioformat.Format, -) -> np.ndarray: - """Convert an ISM signal to the requested output format""" - pos_data = [] - for pos in in_pos: - pos_data.extend( - [pos["azimuth"], pos["elevation"]] for _ in range(pos["use_for_frames"]) - ) - pos_data = np.array(pos_data) - pos_frames = pos_data.shape[0] - - sig_len = in_sig.shape[0] - frame_len = IVAS_FRAME_LEN_MS * (in_fs // 1000) - - out_sig = np.zeros([sig_len, out_spfmt.nchannels]) - - fade_in = np.arange(frame_len) / (frame_len - 1) - fade_in = fade_in[:, np.newaxis] - fade_out = 1.0 - fade_in - - if out_spfmt.isloudspeaker: - ls_azi_woLFE = np.delete(out_spfmt.ls_azi, out_spfmt.lfe_index) - ls_ele_woLFE = np.delete(out_spfmt.ls_ele, out_spfmt.lfe_index) - panner = EFAP.EFAP(ls_azi_woLFE, ls_ele_woLFE) - - gains_old = None - - for i_frame, (in_frame, out_frame) in enumerate( - zip( - audioarray.get_framewise(in_sig, frame_len), - audioarray.get_framewise(out_sig, frame_len), - ) - ): - # update the crossfade if we have a smaller last frame - if out_frame.shape[0] != frame_len: - frame_size = out_frame.shape[0] - fade_in = np.arange(frame_size) / (frame_size - 1) - fade_in = fade_in[:, np.newaxis] - fade_out = 1.0 - fade_in - - pos = EFAP.wrap_angles(*pos_data[i_frame % pos_frames, :], clip_ele=True) - - # ISM -> MC - if out_spfmt.isloudspeaker: - gains = panner.pan(pos[0], pos[1]) - gains = np.insert(gains, out_spfmt.lfe_index, 0) - gains = gains[:, np.newaxis] - # ISM -> HOA - elif out_spfmt.ambi_order > 0: - 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" - ) - - if gains_old is None: - gains_old = gains.copy() - - out_frame[:] = (fade_in * in_frame @ gains.T) + ( - fade_out * in_frame @ gains_old.T - ) - - gains_old = gains.copy() - - return out_sig - - -def convert_masa( - in_sig: np.ndarray, - in_fs: int, - in_meta: str, - in_spfmt: spatialaudioformat.Format, - out_spfmt: spatialaudioformat.Format, -) -> np.ndarray: - """Convert a MASA signal to the requested output format""" - - if in_fs != 48000: - raise ValueError(f"{in_spfmt.name} rendering only support for 48kHz!") - - tmp_spfmt = out_spfmt - - # MASA -> LS - if out_spfmt.isloudspeaker: - if not (out_spfmt.name == "5_1" or out_spfmt.name == "7_1_4"): - tmp_spfmt = spatialaudioformat.Format("7_1_4") - warnings.warn( - f"{out_spfmt.name} not natively supported by masaRenderer, using {tmp_spfmt.name} as intermediate format" - ) - # MASA -> HOA - elif out_spfmt.ambi_order > 0: - tmp_spfmt = spatialaudioformat.Format("7_1_4") - warnings.warn( - f"{out_spfmt.name} not natively supported by masaRenderer, using {tmp_spfmt.name} as intermediate format" - ) - elif out_spfmt.name == "BINAURAL": - warnings.warn( - f"Using masaRenderer for rendering; any binaural_dataset setting will be ignored!" - ) - else: - raise NotImplementedError( - f"{in_spfmt.name} -> {out_spfmt.name}: format conversion not implemented" - ) - - out_sig = masarenderer.render_masa(in_sig, in_meta, in_spfmt, tmp_spfmt) - - # conversion done - if tmp_spfmt.name == out_spfmt.name: - return out_sig - # only rendered an intermediate format, more conversion needed - else: - return convert_mc(out_sig, tmp_spfmt, out_spfmt) - - -def render_meta( - metadata_obj: spatialmetadata.Metadata, - dest_fmt: spatialaudioformat.Format, - dataset: str, - fs: int, - trajectory: str, - include_LFE: bool = False, - LFE_gain: float = 10 ** (5.5 / 20), -) -> np.ndarray: - """Render mixed scene metadata to the desired format""" - - logger.info(f" META -> {dest_fmt.name}") - - out_sig = np.zeros([metadata_obj.audio_array.shape[0], dest_fmt.nchannels]) - - for object in metadata_obj.objects: - # extract object signal - start = object["track_index"] - stop = start + object["nb_tracks"] - obj_sig = metadata_obj.audio_array[:, start:stop] - # apply gain - if hasattr(object, "gain"): - obj_sig *= object["gain"] - - if dest_fmt.name.startswith("BINAURAL"): - if object["input_type"] == "ism": - src_format = spatialaudioformat.Format(f"ISM") - positions = object["positions"] - if object["input_type"] == "sba": - src_format = spatialaudioformat.Format(f"SBA{object['order']}") - positions = None - elif object["input_type"] == "mc": - src_format = spatialaudioformat.Format(f"CICP{object['cicp_index']}") - positions = None - - out_sig += binauralrenderer.binaural_rendering( - obj_sig, - src_format, - dest_fmt, - dataset=dataset, - fs=fs, - trajectory=trajectory, - include_LFE=include_LFE, - LFE_gain=LFE_gain, - in_pos=positions, - ) - else: - if object["input_type"] == "ism": - src_format = spatialaudioformat.Format("ISM") - out_sig += convert_ism( - obj_sig, fs, object["positions"], src_format, dest_fmt - ) - elif object["input_type"] == "sba": - src_format = object["format"] - out_sig += convert_sba(obj_sig, src_format, dest_fmt) - elif object["input_type"] == "mc": - src_format = object["format"] - out_sig += convert_mc(obj_sig, src_format, dest_fmt) - - return out_sig diff --git a/scripts/pyaudio3dtools/spatialmetadata.py b/scripts/pyaudio3dtools/spatialmetadata.py deleted file mode 100644 index 3cf1338d4fb45ce47f04b4fc905a418a576059c1..0000000000000000000000000000000000000000 --- a/scripts/pyaudio3dtools/spatialmetadata.py +++ /dev/null @@ -1,492 +0,0 @@ -#!/usr/bin/env python3 - -""" - (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. 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 logging -import math -import os -from typing import Optional, TextIO - -import numpy as np - -from pyaudio3dtools import audioarray, audiofile, spatialaudioformat - -main_logger = logging.getLogger("__main__") -logger = main_logger.getChild(__name__) -logger.setLevel(logging.DEBUG) - - -class Metadata: - def __init__( - self, - metadata_path: Optional[str] = None, - metadata_format: Optional[str] = "iis", - audio_wav_path: Optional[str] = None, - audio_fs: Optional[int] = 48000, - ): - """ - Spatial Metadata - - Parameters - ---------- - metadata_path: Optional[str] - path to metadata file - metadata_format: Optional[str] - format for metadata file, supported: ["iis", "ivas_ism"] - audio_wav_path: Optional[str] - path to corresponding audio files - audio_fs: Optional[int] - audio sampling frequency - - Returns - ------- - self - - """ - - self._delete_all() - if audio_fs is None: - audio_fs = 48000 - self.audio_fs = audio_fs - - # init from input file - if metadata_path is not None and os.path.isfile(metadata_path): - self.read_metadata(metadata_path, metadata_format, audio_wav_path) - - def _delete_all(self) -> None: - self.objects = [] # list of audio objects - self.nb_objects = 0 # Number of objects - self.nb_tracks = 0 # Number of tracks - self.audio_wav = [] # list of wav files - self.audio_array = np.zeros([1, 0]) - self.nb_frames = 0 # Number of frames - - def read_metadata( - self, - metadata_path: str, - metadata_format: str = "iis", - audio_wav_path: Optional[str] = None, - ) -> None: - if metadata_format == "iis": - with open(metadata_path, "r") as file_in: - dirname = os.path.dirname(metadata_path) - self.audio_wav.append(os.path.join(dirname, file_in.readline().strip())) - nb_new_objects = int(file_in.readline()) - - for _ in range(nb_new_objects): - in_type = file_in.readline().strip() - - if in_type.lower() == "ism": - self.objects.append(read_ism_input(file_in, dirname)) - elif in_type.lower() == "sba": - self.objects.append(read_sba_input(file_in)) - elif in_type.lower() == "mc": - self.objects.append(read_mc_input(file_in)) - else: - raise ValueError("Unknown input type in metadata file") - - self._append_audio_array(self.audio_wav[-1]) - self.nb_objects += 1 - - elif metadata_format == "ivas_ism": - if audio_wav_path is None: - raise FileNotFoundError("Wave file not specified!") - - self.audio_wav.append(audio_wav_path) - self.objects.append( - read_ism_ivas_data(metadata_path, object_index=self.nb_objects) - ) - self._append_audio_array(self.audio_wav[-1]) - self.nb_objects += 1 - else: - raise ValueError("Metadata: unknown metadata format") - - def write_metadata( - self, - metadata_path: str, - metadata_format: str = "iis", - audio_output_path: Optional[str] = None, - max_objects: Optional[int] = None, - ) -> list: - metadata_out_list = [] - - if metadata_format == "iis": - with open(metadata_path, "w") as file_out: - if audio_output_path is not None: - file_out.write(f"{audio_output_path}\n") - dirname = os.path.dirname(metadata_path) - self.write_audio_array(os.path.join(dirname, audio_output_path)) - - file_out.write(f"{str(self.nb_objects)}\n") - for object_index in range(self.nb_objects): - if self.objects[object_index]["input_type"] == "ism": - write_ism_input( - file_out, - self.objects[object_index], - metadata_path, - num_frames=self.nb_frames, - ) - elif self.objects[object_index]["input_type"] == "sba": - write_sba_input(file_out, self.objects[object_index]) - elif self.objects[object_index]["input_type"] == "mc": - write_mc_input(file_out, self.objects[object_index]) - else: - raise ValueError("Unknown input type in metadata file") - - metadata_out_list.append(file_out.name) - - elif metadata_format == "ivas_ism": - outfilename, output_ext = os.path.splitext(os.path.basename(metadata_path)) - x = np.zeros([1, 0]) - - for object_index in range(self.nb_objects): - if self.objects[object_index]["input_type"] == "ism": - # Prepare audio wavefrom - if audio_output_path is not None: - chan_start = self.objects[object_index]["track_index"] - chan_end = chan_start + self.objects[object_index]["nb_tracks"] - if x.shape[1] == 0: - x = self.audio_array[:, chan_start:chan_end] - else: - x = np.append( - x, self.audio_array[:, chan_start:chan_end], axis=1 - ) - - # Write positions - with open( - metadata_path.replace( - output_ext, - str(self.objects[object_index]["track_index"]) + output_ext, - ), - "w", - ) as file_out: - write_ism_ivas_data( - file_out, - self.objects[object_index], - num_frames=self.nb_frames, - ) - metadata_out_list.append(file_out.name) - - if (max_objects is not None) and ( - len(metadata_out_list) >= max_objects - ): - break - - # Write audio waveform - if audio_output_path is not None: - audiofile.writefile(audio_output_path, x, fs=self.audio_fs) - - return metadata_out_list - - def print_info(self) -> None: - print(f"Number of objects in the scene: {self.nb_objects}") - for object_index in range(self.nb_objects): - print(f" Object #{object_index} Type: {self.objects[object_index]}") - - def _append_audio_array(self, audio_wav=None, fs=48000, nchan=1, object_index=None): - if audio_wav is None: - audio_wav = self.audio_wav[-1] - if object_index is None: - object_index = -1 - - x, fs = audiofile.readfile(audio_wav, fs=fs, nchannels=nchan) - logger.debug(f"Append {audio_wav}: {x.shape[0]} by {x.shape[1]}") - - # Select appropriate channels & resample if necessary - chan_start = self.objects[object_index]["track_index"] - chan_end = chan_start + self.objects[object_index]["nb_tracks"] - logger.debug(f" channels from {chan_start} to {chan_end}") - x = x[:, chan_start:chan_end] - x = audioarray.resample(x, fs, self.audio_fs) - - # Append array and update track index - self.objects[object_index]["track_index"] = self.audio_array.shape[1] - if self.audio_array.shape[1] == 0: - self.audio_array = x - else: - len_min = min([self.audio_array.shape[0], x.shape[0]]) - self.audio_array = np.append( - self.audio_array[:len_min][:], x[:len_min][:], axis=1 - ) - - self.nb_tracks = self.nb_tracks + x.shape[1] - self.nb_frames = math.ceil(50.0 * self.audio_array.shape[0] / self.audio_fs) - - # init with list of ISM metadata files - def init_for_ism( - self, - in_file: str, - in_fs: int, - in_nchan: int, - metadata_files: list, - ) -> None: - self.audio_wav.append(in_file) - - for csv in metadata_files: - self.objects.append(read_ism_ivas_data(csv, object_index=self.nb_objects)) - self.objects[-1]["track_index"] = self.nb_objects - self._append_audio_array(self.audio_wav[-1], fs=in_fs, nchan=in_nchan) - self.nb_objects += 1 - - # Get audio array with sampling rate - def get_audio_array(self): - return self.audio_array, self.audio_fs - - # Set audio array from file - def set_audio_array(self, audio_path, fs=None): - if fs is None: - fs = self.audio_fs - audiofile.readfile(audio_path, self.audio_array, fs) - self.audio_fs = fs - - # Write in file audio array - def write_audio_array(self, audio_path): - audiofile.writefile(audio_path, self.audio_array, fs=self.audio_fs) - - -################################################## -# Helper functions for IIS metadata -################################################## -def read_ism_input(file_handle: TextIO, dirname: str) -> dict: - """ - Read ISM Input (IIS metadata format) - - Parameters - ---------- - file_handle: TextIO - file pointer - dirname: str - root directory used to read csv files - - Returns - ------- - dict - ISM dictionary with positions - """ - ism = {"input_type": "ism"} - ism["track_index"] = int(file_handle.readline()) - 1 - ism["nb_tracks"] = 1 - ism["positions"] = [] - ism["gain"] = 1 - line = file_handle.readline() - - try: - ism["num_positions"] = int(line) - for _ in range(ism["num_positions"]): - [use_for_frames, azimuth, elevation] = ( - file_handle.readline().strip().split(",") - ) - pos = {} - pos["use_for_frames"] = int(use_for_frames) - pos["azimuth"] = int(azimuth) - pos["elevation"] = int(elevation) - ism["positions"].append(pos) - ism["gain"] = read_gain_value(file_handle) - except: - meta_csv = os.path.join(dirname, line.strip()) - pos_idx = 0 - with open(meta_csv) as file_handle: - for line in file_handle: - current_values = line.strip().split(",") - pos = {} - pos["use_for_frames"] = 1 - pos["azimuth"] = float(current_values[0]) - pos["elevation"] = float(current_values[1]) - ism["positions"].append(pos) - pos_idx += 1 - - ism["num_positions"] = pos_idx - - return ism - - -def write_ism_input( - file_handle: TextIO, - ism_dict: dict, - metadata_path: Optional[str] = None, - num_frames: Optional[int] = None, -) -> None: - """ - Write ISM Input (IIS metadata format) - - Parameters - ---------- - file_handle: TextIO - file pointer - ism_dict: dict - ISM dictionnary with positions - metadata_path: Optional[str] - if given positions writen cvs format - num_frame: Optional[int] - number of frames to be written - - Returns - ------- - None - """ - file_handle.write("ISM\n") - track_index = ism_dict["track_index"] - file_handle.write(f"{str(track_index + 1)}\n") - - if metadata_path is None: - num_positions = ism_dict["num_positions"] - file_handle.write(f"{str(num_positions)}\n") - - positions = ism_dict["positions"] - for pos_idx in range(ism_dict["num_positions"]): - use_for_frames = positions[pos_idx]["use_for_frames"] - azimuth = round(positions[pos_idx]["azimuth"]) - elevation = round(positions[pos_idx]["elevation"]) - - file_handle.write(f"{use_for_frames:04d},{azimuth:+03d},{elevation:+03d}\n") - else: - # Write filename - _, extname = os.path.splitext(metadata_path) - dirname = os.path.dirname(metadata_path) - basename = os.path.basename(metadata_path).replace( - extname, "." + str(track_index) + ".csv" - ) - file_handle.write(f"{basename}\n") - # Write positions - with open(os.path.join(dirname, basename), "w") as file_out: - write_ism_ivas_data(file_out, ism_dict, num_frames=num_frames) - - -def read_sba_input(file_handle: TextIO) -> dict: - sba = {"input_type": "sba"} - sba["track_index"] = int(file_handle.readline()) - 1 - sba["format"] = spatialaudioformat.Format(f"SBA{int(file_handle.readline())}") - sba["order"] = sba["format"].ambi_order - sba["nb_tracks"] = (sba["order"] + 1) ** 2 - sba["gain"] = read_gain_value(file_handle) - return sba - - -def write_sba_input(file_handle: TextIO, sba_dict: dict) -> None: - file_handle.write("SBA\n") - track_index = sba_dict["track_index"] - file_handle.write(f"{str(track_index + 1)}\n") - order = sba_dict["order"] - file_handle.write(f"{str(order)}\n") - - -def read_mc_input(file_handle: TextIO) -> dict: - mc = {"input_type": "mc"} - mc["track_index"] = int(file_handle.readline()) - 1 - mc["format"] = spatialaudioformat.Format(file_handle.readline().strip()) - mc["nb_tracks"] = mc["format"].nchannels - mc["gain"] = read_gain_value(file_handle) - return mc - - -def write_mc_input(file_handle: TextIO, mc_dict: dict) -> None: - file_handle.write("MC\n") - track_index = mc_dict["track_index"] - file_handle.write(f"{str(track_index + 1)}\n") - name = mc_dict["format"].name - file_handle.write(f"{name}\n") - - -def read_gain_value(file_handle: TextIO) -> float: - original_pos = file_handle.tell() - gain = file_handle.readline().lower() - if gain.startswith("gain_db"): - gain = float(gain.replace("gain_db", "")) - return 10 ** (gain / 20) - else: - file_handle.seek(original_pos) - return 1 - - -################################################## -# Helper functions for ISM IVAS metadata -################################################## -def read_ism_ivas_data(metadata_path: str, object_index: int = 0) -> None: - ism = {"input_type": "ism"} - ism["track_index"] = 0 - ism["num_positions"] = 0 - ism["nb_tracks"] = 1 - ism["positions"] = [] - - pos_idx = 0 - - try: - with open(metadata_path) as file_handle: - for line in file_handle: - current_values = line.strip().split(",") - pos = {} - pos["use_for_frames"] = 1 - pos["azimuth"] = float(current_values[0]) - pos["elevation"] = float(current_values[1]) - ism["positions"].append(pos) - pos_idx += 1 - except FileNotFoundError: - # TODO in case of NULL metadata we can also spread the objects spatially - pos = {} - pos["use_for_frames"] = 1 - pos["azimuth"] = 0.0 - pos["elevation"] = 0.0 - ism["positions"].append(pos) - pos_idx += 1 - - ism["num_positions"] = pos_idx - return ism - - -def write_ism_ivas_data( - file_handle: TextIO, ism_dict: dict, num_frames: Optional[int] = None -) -> None: - positions = ism_dict["positions"] - - if num_frames is None: - num_frames = 0 - for pos_idx in range(len(positions)): - num_frames += positions[pos_idx]["use_for_frames"] - - # Constants for all positions - distance = 1.0 - spread = 0.0 - gain = 1.0 - pos_idx = 0 - pos_used_times = 0 - for _ in range(num_frames): - azimuth = float(positions[pos_idx]["azimuth"]) - elevation = float(positions[pos_idx]["elevation"]) - - file_handle.write( - f"{azimuth:+07.2f},{elevation:+06.2f},{distance:05.2f},{spread:06.2f},{gain:04.2f}\n" - ) - - pos_used_times += 1 - - if pos_used_times == positions[pos_idx]["use_for_frames"]: - pos_idx = (pos_idx + 1) % len(positions) - pos_used_times = 0 diff --git a/scripts/pyivastest/IvasModeAnalyzer.py b/scripts/pyivastest/IvasModeAnalyzer.py index fed4f29ecdcbf16219db68176a62e366d8944d5d..7e6d40b2e588a1cf33d0a2f0eb1ce71eeb78b3e4 100644 --- a/scripts/pyivastest/IvasModeAnalyzer.py +++ b/scripts/pyivastest/IvasModeAnalyzer.py @@ -187,8 +187,9 @@ class IvasModeAnalyzer(IvasModeCollector): all_log_files = os.listdir(log_dir) for mode in self.flat_mode_list: for f in all_log_files: + search_string = re.escape("_{}".format(mode)) if ( - re.search("_{}".format(mode), f) + re.search(search_string, f) and os.path.splitext(f)[1] == LOG_FILE_EXT ): # this is a log file belonging to the ivas_format @@ -958,6 +959,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/IvasScriptsCommon.py b/scripts/pyivastest/IvasScriptsCommon.py index 3df9994170a1cdfb3b4957b4bd6f7363f08a612d..681e6b1b7f4c1a0b35122be3467464223631db8b 100644 --- a/scripts/pyivastest/IvasScriptsCommon.py +++ b/scripts/pyivastest/IvasScriptsCommon.py @@ -631,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/pyprocessing/__init__.py b/scripts/pyprocessing/__init__.py deleted file mode 100644 index 5e7b5aa892d9f45d2eed18386bf8aa8889cb4900..0000000000000000000000000000000000000000 --- a/scripts/pyprocessing/__init__.py +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env python3 - -""" - (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. 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. -""" - -""" -pyprocessing -==== - -Provides - Methods for processing/coding 3D audio - -Imports -------- -functions -class -""" -from . import evs, ivas, prepost_processing, processing, processing_configs, utils diff --git a/scripts/pyprocessing/evs.py b/scripts/pyprocessing/evs.py deleted file mode 100644 index 6de86f2a27b2a69adf3d1567a165207b7618dfde..0000000000000000000000000000000000000000 --- a/scripts/pyprocessing/evs.py +++ /dev/null @@ -1,238 +0,0 @@ -#!/usr/bin/env python3 - -""" - (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. 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 logging -import os - -from pyaudio3dtools import audiofile, spatialaudioformat, spatialmetadata -from pyaudio3dtools.spatialaudioconvert import render_meta - -from pyprocessing import utils -from pyprocessing.processing import Processing - -main_logger = logging.getLogger("__main__") -logger = main_logger.getChild(__name__) -logger.setLevel(logging.DEBUG) - - -class EVS(Processing): - def __init__( - self, - in_format: str, - out_format: str, - bitrate: int, - in_fs: int = 48000, - **kwargs, - ): - super().__init__() - for k, v in kwargs.items(): - setattr(self, k, v) - self.in_format = spatialaudioformat.Format(in_format) - self.out_format = spatialaudioformat.Format(out_format) - if isinstance(bitrate, int): - self.bitrate = [bitrate] - if self.in_format.nchannels > 0: - self.bitrate = [bitrate] * self.in_format.nchannels - elif isinstance(bitrate, list): - self.bitrate = bitrate - if self.in_format.nchannels > 0: - self.bitrate.extend([0] * (self.in_format.nchannels - len(bitrate))) - self.in_fs = in_fs - self.exec_enc = utils.get_exec_path(kwargs["cod_bin"]) - self.exec_dec = utils.get_exec_path(kwargs["dec_bin"]) - - if in_format != out_format: - raise ValueError(f"EVS_: output format must be equal to input format.") - if not os.path.exists(self.exec_enc): - raise FileNotFoundError( - f"The EVS encoder binary was not found at the given path: {self.exec_enc}" - ) - if not os.path.exists(self.exec_dec): - raise FileNotFoundError( - f"The EVS decoder binary was not found at the given path: {self.exec_dec}" - ) - - def process(self, input_path: str, output_path: str, tmp_path: str) -> None: - logger.debug(f"EVS {input_path} -> {output_path}") - # Read input file - _, input_ext = os.path.splitext(os.path.basename(input_path)) - _, output_ext = os.path.splitext(os.path.basename(output_path)) - if input_ext == ".txt": - metadata_obj = spatialmetadata.Metadata(input_path, audio_fs=self.in_fs) - input_multi_channels = output_path.replace(output_ext, ".pcm") - if self.in_format.name[:3] == "ISM": - # extract IVAS ISM metadata and - input_csv = output_path.replace(output_ext, ".csv") - metadata_files = metadata_obj.write_metadata( - input_csv, "ivas_ism", input_multi_channels, max_objects=4 - ) - # change number of ISM - self.in_format.name = "ISM" + str(len(metadata_files)) - self.in_format = spatialaudioformat.Format(self.in_format.name[:4]) - if len(self.bitrate) < len(metadata_files): - self.bitrate.extend( - [self.bitrate[-1]] * (len(metadata_files) - len(self.bitrate)) - ) - else: - in_sig, fs = metadata_obj.get_audio_array() - in_sig = render_meta(metadata_obj, self.in_spfmt) - audiofile.writefile(input_multi_channels, in_sig, self.in_fs) - elif input_ext == ".wav" or input_ext == ".pcm": - input_multi_channels = input_path - else: - raise ValueError(f"EVS: invalid audio input extension: {input_ext}") - - # Split the corresponding channels at enc_fs - split_chans_in = [] - for idx in range(self.in_format.nchannels): - split_chans_in.append( - output_path.replace(output_ext, "." + str(idx) + ".pcm") - ) - - audiofile.splitfiles( - input_multi_channels, - split_chans_in, - in_nchans=self.in_format.nchannels, - in_fs=self.in_fs, - out_fs=self.enc_fs, - ) - - # Zero vertical Ambi channels if planar - mute_next_chan = -1 - if self.in_format.ambi_order > 0 and self.in_format.isplanar: - mute_chans_enum = enumerate(self.in_format.get_vert_hoa_channels()) - _, mute_next_chan = next(mute_chans_enum) - - # run processing - split_chans_out = [] - for idx, split_in in enumerate(split_chans_in): - split_bs = split_in.replace(".pcm", ".bs") - split_out = split_in.replace(".pcm", ".dec.pcm") - - # Zero vertical Ambi channels if planar - if idx == mute_next_chan: - audiofile.mutefile(split_in, split_in, in_fs=self.enc_fs, in_nchans=1) - try: - _, mute_next_chan = next(mute_chans_enum) - except: - pass - - if self.bitrate[idx] > 0: - self.enc(split_in, split_bs, self.bitrate[idx]) - self.dec(split_bs, split_out) - else: - # zero channel - audiofile.convertfile( - split_in, split_out, in_fs=self.enc_fs, out_fs=self.dec_fs - ) - audiofile.mutefile(split_out, split_out, in_fs=self.dec_fs, in_nchans=1) - - split_chans_out.append(split_out) - - # Output file: combine waveform files into one output, and optinaly write iis metadata - if output_ext == ".pcm" or output_ext == ".wav": - audiofile.combinefiles( - split_chans_out, output_path, in_fs=self.dec_fs, out_fs=self.dec_fs - ) - elif output_ext == ".txt": - output_wav = output_path.replace(output_ext, ".wav") - if self.in_format.name[:3] == "ISM": - # Write new metadata - metadata_out_obj = spatialmetadata.Metadata(audio_fs=self.dec_fs) - for idx in range(self.in_format.nchannels): - logger.debug( - "EVS_mono Read metadata " - + metadata_files[idx] - + " with audio file " - + split_chans_out[idx] - ) - metadata_out_obj.read_metadata( - metadata_files[idx], - metadata_format="ivas_ism", - audio_wav_path=split_chans_out[idx], - ) - metadata_out_obj.write_metadata( - output_path, - metadata_format="iis", - audio_output_path=os.path.basename(output_wav), - ) - else: - # pass-trhough mode, rewrite only audio waveform with decoded file - audiofile.combinefiles( - split_chans_out, output_wav, in_fs=self.dec_fs, out_fs=self.dec_fs - ) - metadata_obj.write_metadata(output_path, metadata_format="iis") - else: - raise ValueError(f"EVS: invalid audio input extension: {output_ext}") - - def enc(self, input_wav: str, output_bs: str, bitrate: int) -> None: - input_pcm = output_bs.replace(".bs", ".pcm") - audiofile.convertfile(input_wav, input_pcm, out_nchans=1, out_fs=self.in_fs) - - cmd = [self.exec_enc] - if self.dtx: - cmd.append("-dtx") - - if self.cod_opt: - cmd.extend(self.cod_opt) - - cmd.extend( - [ - "-max_band", - self.max_band, - str(bitrate), - str(self.enc_fs // 1000), - input_pcm, - output_bs, - ] - ) - Processing.run(cmd) - - def dec(self, input_bs: str, output_wav: str) -> None: - cmd = [self.exec_dec] - - if self.dec_opt: - cmd.extend(self.dec_opt) - - cmd.extend([str(self.dec_fs // 1000), input_bs, output_wav]) - Processing.run(cmd) - - def get_processing_file_paths(self, template_out_file: str, input_ext: str) -> list: - if input_ext == ".wav" or input_ext == ".pcm": - return [template_out_file.replace(".wav", "_evs_mono.wav")] - elif input_ext == ".txt": - return [template_out_file.replace(".wav", "_evs_mono.txt")] - else: - raise ValueError(f"EVS: invalid audio input extension: {input_ext}") - - def get_total_bit_rate(self): - return sum(self.bitrate) diff --git a/scripts/pyprocessing/ivas.py b/scripts/pyprocessing/ivas.py deleted file mode 100644 index 0f182fd1fbf98f5a8daa31f69426bd351c8d73fb..0000000000000000000000000000000000000000 --- a/scripts/pyprocessing/ivas.py +++ /dev/null @@ -1,200 +0,0 @@ -#!/usr/bin/env python3 - -""" - (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. 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 logging -import os -from typing import Optional - -from pyaudio3dtools import audiofile, spatialaudioformat, spatialmetadata -from pyaudio3dtools.spatialaudioconvert import render_meta - -from pyprocessing import utils -from pyprocessing.processing import Processing - -main_logger = logging.getLogger("__main__") -logger = main_logger.getChild(__name__) -logger.setLevel(logging.DEBUG) - - -class IVAS(Processing): - def __init__(self, in_format: str, bitrate: int, in_fs: int = 48000, **kwargs): - super().__init__() - for k, v in kwargs.items(): - setattr(self, k, v) - self.in_format = spatialaudioformat.Format(in_format) - self.bitrate = bitrate - self.in_fs = in_fs - self.out_format = spatialaudioformat.Format(kwargs["out_format"]) - self.exec_enc = utils.get_exec_path(kwargs["cod_bin"]) - self.exec_dec = utils.get_exec_path(kwargs["dec_bin"]) - self.ht_file = os.path.abspath(self.ht_file) - - if self.out_format.name == "ISM": - self.out_format.name = "EXT" - - if not os.path.exists(self.exec_enc): - raise FileNotFoundError( - f"The IVAS encoder binary was not found at the given path: {self.exec_enc}" - ) - if not os.path.exists(self.exec_dec): - raise FileNotFoundError( - f"The IVAS decoder binary was not found at the given path: {self.exec_dec}" - ) - - def process(self, input_path: str, output_path: str, tmp_path: str) -> None: - logger.debug(f"IVAS {input_path} -> {output_path}") - - _, output_ext = os.path.splitext(os.path.basename(output_path)) - if output_ext == ".wav": - output_bs = output_path.replace(".wav", ".bs") - else: - raise ValueError(f"IVAS: invalid audio input extension: {output_ext}") - - self.enc(input_path, output_bs) - self.dec(output_bs, output_path) - - def enc(self, input_path: str, output_bs: str) -> None: - logger.debug(f"IVAS encoder {input_path} -> {output_bs}") - - # Only resample and convert if wav, otherwise supposed pcm to be sampled at self.in_fs - _, input_ext = os.path.splitext(os.path.basename(input_path)) - metadata_files = [] - - # for MASA suppose that metadata file as same basename and location as input file - if self.in_format.name.lower()[:4] == "masa": - metadata_files.append(input_path.replace(input_ext, ".met")) - - # Support input file wav, pcm and txt (metadata iis) - if (input_ext == ".wav") or (input_ext == ".pcm"): - input_pcm = output_bs.replace(".bs", ".pcm") - audiofile.convertfile( - input_path, - input_pcm, - in_fs=self.in_fs, - out_fs=self.enc_fs, - in_nchans=self.in_format.nchannels, - out_nchans=self.in_format.nchannels, - ) - elif input_ext == ".txt": - metadata_obj = spatialmetadata.Metadata(input_path, audio_fs=self.enc_fs) - input_pcm = output_bs.replace(".bs", ".pcm") - input_csv = output_bs.replace(".bs", ".csv") - if self.in_format.name[:3] == "ISM": - # extract IVAS ISM metadata and - metadata_files = metadata_obj.write_metadata( - input_csv, "ivas_ism", input_pcm, max_objects=4 - ) - - # change number of ISM - self.in_format.name = "ISM" + str(len(metadata_files)) - self.in_format = spatialaudioformat.Format(self.in_format.name[:4]) - else: - in_sig = render_meta(metadata_obj, self.in_spfmt) - audiofile.writefile(input_pcm, in_sig, self.enc_fs) - else: - raise ValueError(f"IVAS: invalid audio input extension: {input_ext}") - - cmd = [self.exec_enc] - if self.dtx: - cmd.append("-dtx") - - if self.cod_opt: - cmd.extend(self.cod_opt) - - cmd.extend( - [ - *IVAS.parse_config(self.in_format, metadata_files), - "-max_band", - self.max_band, - str(self.bitrate), - str(self.enc_fs // 1000), - input_pcm, - output_bs, - ] - ) - Processing.run(cmd) - - def dec(self, input_bs: str, output_wav: str) -> None: - logger.debug(f"IVAS decoder {input_bs} -> {output_wav}") - - cmd = [self.exec_dec] - if self.head_tracking: - cmd.extend(["-T", self.ht_file]) - - if self.plc: - cmd.extend(["-FEC", str(self.plc_rate)]) - - if self.dec_opt: - cmd.extend(self.dec_opt) - - cmd.extend( - [ - self.out_format.name, - str(self.dec_fs // 1000), - input_bs, - output_wav, - ] - ) - Processing.run(cmd) - - @staticmethod - def parse_config(spformat: spatialaudioformat, metadata_files: Optional[list] = []): - name = spformat.name.lower() - - if name == "mono": - return [""] - elif name == "stereo": - return ["-stereo"] - elif name.startswith("ism"): - # replace any missing files with NULL - while len(metadata_files) < int(name[-1]): - metadata_files.append("NULL") - return ["-ism", name[-1]] + metadata_files[: int(name[-1])] - elif name.startswith("masa"): - return ["-masa", name[-1], metadata_files[0]] - elif spformat.ambi_order > 0: - if spformat.isplanar: - return ["-sba", f"-{spformat.ambi_order}"] - else: - return ["-sba", f"+{spformat.ambi_order}"] - elif spformat.isloudspeaker: - return ["-mc", name] - - raise ValueError(f"IVAS: Invalid input config: {spformat}") - - def get_processing_file_paths( - self, template_out_file: str, input_ext: Optional[str] = None - ) -> list: - return [template_out_file.replace(".wav", "_ivas.wav")] - - def get_total_bit_rate(self): - return self.bitrate diff --git a/scripts/pyprocessing/prepost_processing.py b/scripts/pyprocessing/prepost_processing.py deleted file mode 100644 index 3ea7411cea8e4d282b98661a55eda7c7496ad8d1..0000000000000000000000000000000000000000 --- a/scripts/pyprocessing/prepost_processing.py +++ /dev/null @@ -1,220 +0,0 @@ -#!/usr/bin/env python3 - -""" - (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. 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 json -import logging -import os -import shutil -from typing import Optional - -from pyaudio3dtools import ( - audioarray, - audiofile, - binauralrenderer, - spatialaudioconvert, - spatialaudioformat, -) - -from pyprocessing import utils -from pyprocessing.processing import Processing - -main_logger = logging.getLogger("__main__") -logger = main_logger.getChild(__name__) -logger.setLevel(logging.DEBUG) - - -class PreProcessing(Processing): - def __init__( - self, - out_format: str, - out_fs: int = 48000, - out_fc: Optional[int] = None, - output_loudness: Optional[int] = None, - loudness_tool: Optional[str] = "bs1770demo", - ): - super().__init__() - self.out_format = out_format - self.out_fs = out_fs - self.fc = out_fc - self.output_loudness = output_loudness - self.loudness_tool = loudness_tool - - def process(self, input_path: str, output_path: str, tmp_path: str): - output_nickname = utils.get_nickname(output_path) - logger.info( - f" Pre Processing: convert to {self.out_format} : {output_nickname}" - ) - - try: - spatialaudioconvert.spatial_audio_convert( - input_path, - tmp_path, - out_format=self.out_format, - out_fs=self.out_fs, - output_loudness=self.output_loudness, - loudness_tool=self.loudness_tool, - ) - except Exception as e: - logger.info( - f" Pre Processing: by-pass : {output_nickname}. Encountered exception {e}" - ) - else: - shutil.move(tmp_path, output_path) - - def get_processing_file_paths( - self, template_out_file: str, input_ext: Optional[str] = None - ) -> list: - return [template_out_file.replace(".wav", "_pre.wav")] - - -class PostProcessing(Processing): - def __init__( - self, - in_format: str, - out_format: str, - in_fs: int = 48000, - out_fs: int = 48000, - out_fc: Optional[int] = None, - binaural_rendered: bool = False, - limit_output: bool = False, - cut_preamble: float = 0.0, - split_file_path: str = "", - bin_rend_include_LFE: bool = False, - bin_rend_LFE_gain: Optional[float] = 10 ** (5.5 / 20), - binaural_dataset: Optional[str] = "orange53", - output_loudness: Optional[int] = None, - loudness_tool: Optional[str] = "bs1770demo", - ): - super().__init__() - self.in_spfmt = spatialaudioformat.Format(in_format=in_format) - self.out_spfmt = spatialaudioformat.Format(in_format=out_format) - - self.in_fs = in_fs - self.out_fs = out_fs - self.fc = out_fc - self.binaural_rendered = binaural_rendered - self.cut_preamble = cut_preamble - self.split_file_path = split_file_path - self.bin_rend_include_LFE = bin_rend_include_LFE - self.bin_rend_LFE_gain = bin_rend_LFE_gain - self.binaural_dataset = binaural_dataset - self.limit_output = limit_output - self.output_loudness = output_loudness - self.loudness_tool = loudness_tool - - def process(self, input_path: str, output_path: str, tmp_path: str): - output_nickname = utils.get_nickname(output_path) - logger.info( - f" Post Processing: {self.in_spfmt.name} -> {self.out_spfmt.name} : {output_nickname}" - ) - - # Spatial audio format conversion - spatialaudioconvert.spatial_audio_convert( - input_path, - tmp_path, - in_format=self.in_spfmt.name, - out_format=self.out_spfmt.name, - in_fs=self.in_fs, - out_fs=self.out_fs, - out_fc=self.fc, - cut_preamble_s=self.cut_preamble, - limit_output=self.limit_output, - bin_rend_include_LFE=self.bin_rend_include_LFE, - bin_rend_LFE_gain=self.bin_rend_LFE_gain, - output_loudness=self.output_loudness, - loudness_tool=self.loudness_tool, - binaural_dataset=self.binaural_dataset, - ) - shutil.move(tmp_path, output_path) - - # Binaural rendering - if self.binaural_rendered and "BINAURAL" not in self.out_spfmt.name: - out_sig, fs = audiofile.readfile(output_path) - bin_sig = binauralrenderer.binaural_rendering( - out_sig, - self.out_spfmt, - spatialaudioformat.Format("BINAURAL"), - fs=fs, - include_LFE=self.bin_rend_include_LFE, - LFE_gain=self.bin_rend_LFE_gain, - ) - output_binaural_wav = output_path.replace(".wav", "_BINAURAL.wav") - logger.info( - f" Rendering {self.out_spfmt.name} -> BINAURAL : {output_nickname[:-4]}_BINAURAL.wav" - ) - if self.limit_output: - logger.info(f" limiting") - audioarray.limiter(bin_sig, self.out_fs) - audiofile.writefile(output_binaural_wav, bin_sig, self.out_fs) - - # split file - if self.split_file_path: - # check for the split info - split_file_name = os.path.join( - self.split_file_path, - "".join( - [ - os.path.basename(output_path) - .replace(".wav", "") - .replace("_post", ""), - ".split", - ] - ), - ) - if os.path.exists(split_file_name): - fp = open(split_file_name, "r") - splits = json.load(fp) - fp.close - n_splits = len(splits) - 1 - for split_idx in range(n_splits): - output_path_split = output_path.replace( - ".wav", f"_split{split_idx}.wav" - ) - start = int(splits[split_idx] * self.out_fs) - stop = int(splits[split_idx + 1] * self.out_fs) - split_sig = audioarray.cut(out_sig, (start, stop)) - audiofile.writefile(output_path_split, split_sig, self.out_fs) - if (self.binaural_rendered is True) and ( - self.out_spfmt.name != "BINAURAL" - ): - output_bin_wav_split = output_binaural_wav.replace( - ".wav", f"_split{split_idx}.wav" - ) - split_sig = audioarray.cut(bin_sig, (start, stop)) - audiofile.writefile( - output_bin_wav_split, split_sig, self.out_fs - ) - - def get_processing_file_paths( - self, template_out_file: str, input_ext: Optional[str] = None - ) -> list: - return [template_out_file.replace(".wav", "_post.wav")] diff --git a/scripts/pyprocessing/processing.py b/scripts/pyprocessing/processing.py deleted file mode 100644 index a0533b2b4edead2b7f699c39b14eebdf56e84227..0000000000000000000000000000000000000000 --- a/scripts/pyprocessing/processing.py +++ /dev/null @@ -1,123 +0,0 @@ -#!/usr/bin/env python3 - -""" - (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. 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 logging -import os -import subprocess -from abc import ABC, abstractmethod - -global_print_cmd_only = False -main_logger = logging.getLogger("__main__") -logger = main_logger.getChild(__name__) -logger.setLevel(logging.DEBUG) - - -class Processing(ABC): - def __init__(self): - pass - - @abstractmethod - def process(self, input_path: str, output_path: str, tmp_path: str) -> None: - pass - - @abstractmethod - def get_processing_file_paths(self, template_out_file: str) -> list: - pass - - @staticmethod - def run(cmd: list) -> None: - Processing.print_cmd(cmd) - - if not global_print_cmd_only: - try: - result = subprocess.run(cmd, check=True, capture_output=True, text=True) - except subprocess.CalledProcessError as e: - logger.debug(f"Command returned non-zero exit status : {e.returncode}") - logger.debug(e.stderr) - logger.debug(e.stdout) - raise SystemError( - f"Command returned non-zero exit status ({e.returncode}): {' '.join(e.cmd)}\n{e.stderr}\n{e.stdout}" - ) - - logger.debug(result.stderr) - logger.debug(result.stdout) - - @staticmethod - def run_python(cmd: list) -> None: - Processing.print_cmd(cmd) - - if not global_print_cmd_only: - result = subprocess.run( - ["python3"] + cmd, check=True, capture_output=True, text=True - ) - logger.debug(result.stderr) - logger.debug(str(result.stdout)) - - @staticmethod - def print_cmd(cmd: list) -> None: - cmd[:] = [i if i is not None else "MISSING" for i in cmd] - logger.debug(f"Running command: {' '.join(cmd)}") - if "MISSING" in cmd: - logger.error("Missing arg in command") - raise ValueError("Missing arg in command") - - -def process_chain( - proc_chain: list, - input_path: str, - output_wav: str, - tmp_folder_path: str = os.path.abspath("tmp"), -) -> None: - tmp_file_template_name = os.path.join(tmp_folder_path, os.path.basename(output_wav)) - - # Prepare a chain of of input/tmp/output files - processing_paths = [input_path] - for p in proc_chain: - _, input_ext = os.path.splitext(processing_paths[-1]) - processing_paths.extend( - p.get_processing_file_paths(tmp_file_template_name, input_ext=input_ext) - ) - - # Temporary files if needed - tmp_processing_paths = processing_paths[:] - tmp_path_iter = iter(tmp_processing_paths) - next(tmp_path_iter) - - # Replace last with real output - processing_paths[-1] = output_wav - in_path_iter = iter(processing_paths) - out_path_iter = iter(processing_paths) - next(out_path_iter) - - # go through processing chain - for p in proc_chain: - p.process(next(in_path_iter), next(out_path_iter), next(tmp_path_iter)) diff --git a/scripts/pyprocessing/processing_configs.py b/scripts/pyprocessing/processing_configs.py deleted file mode 100644 index 255f183c6decc1d8d84243aa61d7f4dfc32f581d..0000000000000000000000000000000000000000 --- a/scripts/pyprocessing/processing_configs.py +++ /dev/null @@ -1,375 +0,0 @@ -#!/usr/bin/env python3 - -""" - (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. 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 json -import logging -import os - -from pyprocessing.evs import EVS -from pyprocessing.ivas import IVAS -from pyprocessing.prepost_processing import PostProcessing, PreProcessing -from pyprocessing.utils import list_audio - -main_logger = logging.getLogger("__main__") -logger = main_logger.getChild(__name__) -logger.setLevel(logging.DEBUG) - -# Parse a JSON file into class and perform necessary validation -class test_config: - def __init__(self, filename: str): - # Open and read configuration test file - with open(filename, "r") as fp: - config_dict = json.load(fp) - - # Init lists of conditions and associated folders - self.list_of_conditions = list() - self.output_folders = list() - self.tmp_folders = list() - - # Set defaults - self._set_defaults() - - # Set/override class attributes based on JSON file and update internal dict - for key, value in config_dict.items(): - # update subdictionaries in case of ivas and evs - if key.startswith("ivas"): - setattr(self, key, self.DEFAULTS_ivas.copy()) - getattr(self, key).update(value) - self.dict[key] = self.DEFAULTS_ivas.copy() - self.dict[key].update(value) - elif key.startswith("evs"): - setattr(self, key, self.DEFAULTS_evs.copy()) - getattr(self, key).update(value) - self.dict[key] = self.DEFAULTS_evs.copy() - self.dict[key].update(value) - # avoid overwriting the whole subkey, merge instead - elif hasattr(self, key) and isinstance(getattr(self, key), dict): - for k, v in value.items(): - getattr(self, key)[k] = v - self.dict[key][k] = v - else: - setattr(self, key, value) - self.dict[key] = value - - # Check required keys - REQUIRED_KEYS = [ - "name", - "input_path", - "output_path", - "in_format", - "renderer_format", - "conditions_to_generate", - ] - REQUIRED_KEYS_IVAS = ["bitrates", "out_format"] - REQUIRED_KEYS_EVS = ["bitrates"] - MISSING_KEYS = list() - - for key in REQUIRED_KEYS: - if not hasattr(self, key): - MISSING_KEYS.append(key) - elif not getattr(self, key): - MISSING_KEYS.append(key) - - for condition in self.conditions_to_generate: - if condition.startswith("ivas"): - if not hasattr(self, condition): - raise SystemExit( - f"Definition not found for condition {condition}, but was specified in conditions to generate" - ) - else: - for key in REQUIRED_KEYS_IVAS: - if getattr(self, condition).get(key, None) is None: - MISSING_KEYS.append(f"{condition}:{key}") - elif condition.startswith("evs"): - if not hasattr(self, condition): - raise SystemExit( - f"Definition not found for condition {condition}, but was specified in conditions to generate" - ) - else: - for key in REQUIRED_KEYS_EVS: - if getattr(self, condition).get(key, None) is None: - MISSING_KEYS.append(f"{condition}:{key}") - - # Report missing keys to the user - if len(MISSING_KEYS) > 0: - raise KeyError( - f"The following key(s) must be specified in {filename} : {MISSING_KEYS}" - ) - - # Remove DEFAULTS_ keys from dict and self - for key in list(self.dict.keys()): - if key.startswith("DEFAULTS_"): - delattr(self, key) - self.dict.pop(key, None) - - # Store the updated JSON for later output - self.json_out = json.dumps(self.dict, indent=4) - - # Concatenation options - if self.concatenate_input: - if len(self.concat_silence_ms): - self.concat_silence_pre = self.concat_silence_ms[0] - self.concat_silence_post = self.concat_silence_ms[1] - else: - self.concat_silence_pre = self.concat_silence_ms - self.concat_silence_post = self.concat_silence_ms - - # Pre-processing - if self.preproc_input: - self.list_of_conditions.append(self._get_condition_definition("preproc", 0)) - - # Check input directory for items - self.items_list = list_audio( - self.input_path, absolute=True, select_list=self.input_select - ) - - if self.items_list is None or len(self.items_list) == 0: - raise SystemExit( - f"Directory {self.input_path} is either blank, does not exist or all files were filtered out." - ) - - # Check if concatenation is required - if self.concatenate_input and any( - [i.endswith(".txt") for i in self.items_list] - ): - raise SystemExit("Concatenation for text files is unsupported") - - # Go through conditions to generate - for cond in self.conditions_to_generate: - try: - bitrates = getattr(self, cond)["bitrates"] - # If single value, convert to list for convenience - if not hasattr(bitrates, "__len__") and not isinstance(bitrates, str): - bitrates = [bitrates] - for b in bitrates: - if isinstance(b, list): - self.list_of_conditions.append( - self._get_condition_definition(cond, [int(x) for x in b]) - ) - else: - self.list_of_conditions.append( - self._get_condition_definition(cond, int(b)) - ) - bitrate_label = str( - self.list_of_conditions[-1]["proc_chain"][ - 0 - ].get_total_bit_rate() - ) - self.list_of_conditions[-1]["id"] = f"{cond}_{bitrate_label}" - except: - self.list_of_conditions.append(self._get_condition_definition(cond, 0)) - - # create output and temporary folder names for the conditions - for list_cond in self.list_of_conditions: - self.output_folders.append(os.path.join(self.output_path, list_cond["id"])) - self.tmp_folders.append( - os.path.join(self.output_path, "tmp_" + list_cond["id"]) - ) - - def __repr__(self): - return str(vars(self)) - - # default values to enable a sparse JSON input file - update if adding new keys - def _set_defaults(self): - DEFAULT_CONFIG = { - # general options - "enable_multiprocessing": True, - "delete_tmp": False, - # input/preprocessing options - "preproc_input": False, - "input_select": None, - "concatenate_input": False, - "concat_silence_ms": [0, 0], - # sampling rates - "in_fs": 48000, - "out_fs": 48000, - # binaural rendering - "binaural_rendered": False, - "bin_rend_include_LFE": False, - "bin_rend_LFE_gain": 10 ** (5.5 / 20), - "binaural_dataset": "orange53", - # apply limiter in the postprocessing - "limit_output": False, - # loudness adjustments - "preproc_loudness": None, - "output_loudness": None, - "loudness_tool": "bs1770demo", - # condition-specific values - "ref": {"out_fc": 48000}, - "DEFAULTS_ivas": { - "cod_bin": "../IVAS_cod", - "dec_bin": "../IVAS_dec", - "cod_opt": None, - "dec_opt": None, - "enc_fs": 48000, - "dec_fs": 48000, - "max_band": "FB", - "dtx": False, - # head tracking - "head_tracking": False, - "ht_file": "./trajectories/full_circle_in_15s", - # BER/FER - "plc": False, - "plc_rate": 10, - }, - "DEFAULTS_evs": { - "cod_bin": "../IVAS_cod", - "dec_bin": "../IVAS_dec", - "cod_opt": None, - "dec_opt": None, - "enc_fs": 48000, - "dec_fs": 48000, - "max_band": "FB", - "dtx": False, - }, - } - - # needed to output JSON later - self.dict = DEFAULT_CONFIG - - # set defaults from above dict - for key, value in DEFAULT_CONFIG.items(): - setattr(self, key, value) - - # Definitions of processing chains (edit with care) - def _get_condition_definition(self, cond: str, bitrate: int) -> dict: - definition = dict(id=cond, proc_chain=[]) - - if cond.startswith("preproc"): - definition["proc_chain"].extend( - [ - PreProcessing( - out_format=self.in_format, - out_fs=self.in_fs, - output_loudness=self.preproc_loudness, - loudness_tool=self.loudness_tool, - ) - ] - ) - elif cond.startswith("ref"): - definition["proc_chain"].extend( - [ - PostProcessing( - in_format=self.in_format, - out_format=self.renderer_format, - in_fs=self.in_fs, - out_fs=self.out_fs, - out_fc=self.ref["out_fc"], - binaural_rendered=self.binaural_rendered, - bin_rend_include_LFE=self.bin_rend_include_LFE, - bin_rend_LFE_gain=self.bin_rend_LFE_gain, - binaural_dataset=self.binaural_dataset, - limit_output=self.limit_output, - output_loudness=self.output_loudness, - loudness_tool=self.loudness_tool, - ) - ] - ) - elif cond.startswith("lp3k5"): - definition["proc_chain"].extend( - [ - PostProcessing( - in_format=self.in_format, - out_format=self.renderer_format, - in_fs=self.in_fs, - out_fs=self.out_fs, - out_fc=3500, - binaural_rendered=self.binaural_rendered, - binaural_dataset=self.binaural_dataset, - limit_output=self.limit_output, - output_loudness=self.output_loudness, - loudness_tool=self.loudness_tool, - ) - ] - ) - elif cond.startswith("lp7k"): - definition["proc_chain"].extend( - [ - PostProcessing( - in_format=self.in_format, - out_format=self.renderer_format, - in_fs=self.in_fs, - out_fs=self.out_fs, - out_fc=7000, - binaural_rendered=self.binaural_rendered, - binaural_dataset=self.binaural_dataset, - limit_output=self.limit_output, - output_loudness=self.output_loudness, - loudness_tool=self.loudness_tool, - ) - ] - ) - elif cond.startswith("evs"): - definition["proc_chain"].extend( - [ - EVS( - in_format=self.in_format, - out_format=self.in_format, - bitrate=bitrate, - in_fs=self.in_fs, - **getattr(self, cond), - ), - PostProcessing( - in_format=self.in_format, - out_format=self.renderer_format, - in_fs=getattr(self, cond)["dec_fs"], - out_fs=self.out_fs, - binaural_rendered=self.binaural_rendered, - binaural_dataset=self.binaural_dataset, - limit_output=self.limit_output, - ), - ] - ) - elif cond.startswith("ivas"): - definition["proc_chain"].extend( - [ - IVAS( - in_format=self.in_format, - bitrate=bitrate, - in_fs=self.in_fs, - **getattr(self, cond), - ), - PostProcessing( - in_format=getattr(self, cond)["out_format"], - out_format=self.renderer_format, - in_fs=getattr(self, cond)["dec_fs"], - out_fs=self.out_fs, - binaural_rendered=self.binaural_rendered, - binaural_dataset=self.binaural_dataset, - limit_output=self.limit_output, - ), - ] - ) - else: - raise SystemExit(f"Invalid condition: {cond}") - - return definition diff --git a/scripts/pyprocessing/utils.py b/scripts/pyprocessing/utils.py deleted file mode 100644 index e62840fd1367ef536ee9213065c535598fcf35ca..0000000000000000000000000000000000000000 --- a/scripts/pyprocessing/utils.py +++ /dev/null @@ -1,148 +0,0 @@ -#!/usr/bin/env python3 - -""" - (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. 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 logging -import os -import platform -import shutil -from typing import Union - -""" -Directory/path handling -""" - -ALLOWED_INPUT_EXT = (".wav", ".pcm", ".txt") -main_logger = logging.getLogger("__main__") -logger = main_logger.getChild(__name__) -logger.setLevel(logging.DEBUG) - -# Creates a directory at the given path if it does not exist already -def create_dir(path: str) -> None: - if not os.path.exists(path): - os.makedirs(path) - - -def delete_dir(path: str) -> None: - if os.path.exists(path) and os.path.isdir(path): - logger.debug(f"Deleting path {path}") - shutil.rmtree(path) - - -class DirManager: - """ - Context manager that creates directories if not already present and - automatically cleans up (i.e. deletes) all specified paths - """ - - def __init__( - self, create_paths: Union[str, list], delete_paths: Union[str, list] = list() - ): - self.create_paths = ( - create_paths if type(create_paths) == list else [create_paths] - ) - self.delete_paths = ( - delete_paths if type(delete_paths) == list else [delete_paths] - ) - - def __enter__(self): - for path in self.create_paths: - create_dir(path) - - def __exit__(self, exc_type, exc_value, exc_traceback): - for path in self.delete_paths: - if path in self.create_paths: - delete_dir(path) - else: - print( - "Attempting to delete a tmp dir that was not in create_paths. Do not delete." - ) - - -def list_audio(path: str, absolute: bool = False, select_list: list = None) -> list: - """ - Return list with all files with ALLOWED_INPUT_EXT found under the given path. - - If path is a directory, all files in it are included, if it is a file, just the file - will be in the list. If a select list is provided, files are filtered accordingly. - """ - audio_list = list() - - if os.path.exists(path): - if os.path.isdir(path): - if absolute: - audio_list = [ - os.path.join(path, f) - for f in os.listdir(path) - if f.endswith(ALLOWED_INPUT_EXT) - ] - else: - audio_list = [ - f for f in os.listdir(path) if f.endswith(ALLOWED_INPUT_EXT) - ] - else: - if not absolute: - path = os.path.basename(path) - ext = os.path.splitext(path)[-1].lower() - if ext in ALLOWED_INPUT_EXT: - audio_list.append(path) - - # Filter according to select list - if select_list is not None: - if hasattr(select_list, "__len__") and not isinstance(select_list, str): - select_set = set([os.path.splitext(i)[0] for i in select_list]) - else: - select_set = [os.path.splitext(select_list)[0]] - - audio_list_orig = audio_list - audio_list = [] - for f in audio_list_orig: - f_name = os.path.splitext(os.path.basename(f))[0] - if any(x in f_name for x in select_set): - audio_list.append(f) - - return audio_list - - -def get_exec_path(path: str) -> str: - if platform.system() == "Windows" and os.path.splitext(path)[1] != ".exe": - exe = ".exe" - else: - exe = "" - - return f"{os.path.abspath(path)}{exe}" - - -def get_nickname(path: str) -> str: - nickname = os.path.join( - os.path.basename(os.path.dirname(path)), os.path.basename(path) - ) - return nickname diff --git a/scripts/runIvasCodec.py b/scripts/runIvasCodec.py index 070fb8e4f04da261e273fc0a1576c6ab5533cb6b..f96758e5be8d99b7fece0049e027eef277b40e4f 100755 --- a/scripts/runIvasCodec.py +++ b/scripts/runIvasCodec.py @@ -34,6 +34,7 @@ import os.path import platform import sys import logging +import shutil from pyivastest import IvasScriptsCommon, IvasModeRunner import pyivastest.constants as constants @@ -81,6 +82,11 @@ class RunIvasCodec(IvasScriptsCommon.IvasScript): help="Decoder binary name (default {})".format(default_dec), default=default_dec, ) + self.parser.add_argument( + "--fail_log_dir", + help="Move logs of failed modes to dir (default none)", + default=None, + ) def run(self): self.parse_args() @@ -137,10 +143,19 @@ class RunIvasCodec(IvasScriptsCommon.IvasScript): self.logger.console(" Encoder: {}".format(bin_enc), logging.INFO) self.logger.console(" Decoder: {}".format(bin_dec), logging.INFO) + runner.run() self.logger.console(" ") + fail_log_dir=None + if self.args["fail_log_dir"] is not None: + fail_log_dir = os.path.realpath(self.args["fail_log_dir"]) + if not(os.path.exists(fail_log_dir)): + os.makedirs(fail_log_dir) for r in runner.results: self.logger.console(r[0]) + if fail_log_dir is not None: + shutil.copy(r[3],fail_log_dir) + self.logger.console(" ") diff --git a/scripts/self_test.py b/scripts/self_test.py index 2be585882b1dd4b322a9fd64aaae02d86159e5d6..d7118832db57d14fad8db5451230c3ab79ae5de2 100755 --- a/scripts/self_test.py +++ b/scripts/self_test.py @@ -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", diff --git a/scripts/switchPaths/sw_13k2_128k.bin b/scripts/switchPaths/sw_13k2_128k.bin new file mode 100644 index 0000000000000000000000000000000000000000..7309ee26ab59fbbfaf4889e1163b97628a0ef565 --- /dev/null +++ b/scripts/switchPaths/sw_13k2_128k.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9ddf71b27bcd47d5f37abb6c62146ff4fb5a848cd85605d4df87a9cc4b1d1e0 +size 60000 diff --git a/scripts/switchPaths/sw_13k2_256k.bin b/scripts/switchPaths/sw_13k2_256k.bin new file mode 100644 index 0000000000000000000000000000000000000000..1d0c3fac28a5f752f12830674f1864f6ac1e971b --- /dev/null +++ b/scripts/switchPaths/sw_13k2_256k.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05fd8870e43b0eb349d5e9b3bb939574b71d3e7630940a10d6767cae2c6c4a3c +size 60000 diff --git a/scripts/switchPaths/sw_16k4_128k.bin b/scripts/switchPaths/sw_16k4_128k.bin new file mode 100644 index 0000000000000000000000000000000000000000..1e85a18b77c031b534476e37465cdf5ca76a6472 --- /dev/null +++ b/scripts/switchPaths/sw_16k4_128k.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e07f8c6be0e08ed96b15c9a3daa2811ef0b596dc08cc687bce1f0ca8e49969b +size 60000 diff --git a/scripts/switchPaths/sw_16k4_256k.bin b/scripts/switchPaths/sw_16k4_256k.bin new file mode 100644 index 0000000000000000000000000000000000000000..47bc9c9aa35a39376bffd6059fb41e54123f2dc0 --- /dev/null +++ b/scripts/switchPaths/sw_16k4_256k.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7dedd5a20cbc5594ec869b13b3e9774efd6394ad5d5b64a4e98210447c3a75ba +size 60000 diff --git a/scripts/switchPaths/sw_24k4_256k_1.bin b/scripts/switchPaths/sw_24k4_256k_1.bin new file mode 100644 index 0000000000000000000000000000000000000000..e2852619262f36e617038034a42807364fae28ed --- /dev/null +++ b/scripts/switchPaths/sw_24k4_256k_1.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf5b303299209bdd4f7e007d1190c7957b17ab3ee399570f1bb87d27f3fec092 +size 60000 diff --git a/scripts/switchPaths/sw_24k4_384k.bin b/scripts/switchPaths/sw_24k4_384k.bin new file mode 100644 index 0000000000000000000000000000000000000000..781e3023b26710b65400686883f8502e1c683253 --- /dev/null +++ b/scripts/switchPaths/sw_24k4_384k.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e3e7599638d3792d851a5bdc13b85d6b401ebc9724795562b1a5d25fc2c3bc6 +size 60000 diff --git a/scripts/switchPaths/sw_24k4_512k.bin b/scripts/switchPaths/sw_24k4_512k.bin new file mode 100644 index 0000000000000000000000000000000000000000..dcc58dbdc6a2b4801563dcbab3b87d76cb180b5c --- /dev/null +++ b/scripts/switchPaths/sw_24k4_512k.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2369edc21bdf3440ceaf21de16698e38cf50c246ddf04878a5961538dded11ad +size 60000 diff --git a/scripts/switchPaths/sw_32k_128k.bin b/scripts/switchPaths/sw_32k_128k.bin new file mode 100644 index 0000000000000000000000000000000000000000..fc4b81e0c3d2f57cc7241c75c37d64fbcec9f909 --- /dev/null +++ b/scripts/switchPaths/sw_32k_128k.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdb0da661cb08cc546c3761afa1d778d2c7aa04df61b608ae4301e31867dcc2e +size 60000 diff --git a/scripts/switchPaths/sw_32k_256k.bin b/scripts/switchPaths/sw_32k_256k.bin new file mode 100644 index 0000000000000000000000000000000000000000..46b1e17cd4bb30aa1b3fd5ed82c7b1ac1702824a --- /dev/null +++ b/scripts/switchPaths/sw_32k_256k.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61dacf79a7582edb83c151c300392efb719f08762a963da29f9b7665305a8c5f +size 60000 diff --git a/scripts/switchPaths/sw_32k_384k.bin b/scripts/switchPaths/sw_32k_384k.bin new file mode 100644 index 0000000000000000000000000000000000000000..088edfacbffdb508a96b89d434cf5298081a6b21 --- /dev/null +++ b/scripts/switchPaths/sw_32k_384k.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77f6e7b141b16bd21005c5169cd9bc8b7b2c96df379ce9e74788717c66b9130f +size 60000 diff --git a/scripts/switchPaths/sw_32k_512k.bin b/scripts/switchPaths/sw_32k_512k.bin new file mode 100644 index 0000000000000000000000000000000000000000..d385f3a890804eedaafdc308233954e106e9f2c4 --- /dev/null +++ b/scripts/switchPaths/sw_32k_512k.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a6eb4080fce3bc1a7ba20cfc8ef3e8ff981ebce5de7c8e45bbc12edf7f21d0c +size 60000 diff --git a/scripts/testv/config_directivity.cfg b/scripts/testv/config_directivity.cfg new file mode 100644 index 0000000000000000000000000000000000000000..94807d688ce642a6fd5aff7d7a958e4f4fa7127b --- /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 0000000000000000000000000000000000000000..9f90e9e38b368eabccd6d1f04be84c3d5c51c7fb --- /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/stvISM1.csv b/scripts/testv/stvISM1.csv index 8d729654c4cbfbc2034d285f98f1f7824d3a868c..9100a52238a17843ed9bd03fc3ded73440efb2d2 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,0 +4.80,0.00,0.02,0.00,1.00,0.00,-4.80,0 +9.60,0.00,0.04,0.00,1.00,0.00,4.80,0 +14.40,0.00,0.06,0.00,1.00,0.00,-9.60,0 +19.20,0.00,0.09,0.00,1.00,0.00,14.40,0 +24.00,0.00,0.11,0.00,1.00,0.00,-14.40,0 +28.80,0.00,0.13,0.00,1.00,0.00,19.20,0 +33.60,0.00,0.15,0.00,1.00,0.00,-24.00,0 +38.40,0.00,0.17,0.00,1.00,0.00,24.00,0 +43.20,0.00,0.19,0.00,1.00,0.00,-28.80,0 +48.00,0.00,0.21,0.00,1.00,0.00,33.60,0 +52.80,0.00,0.23,0.00,1.00,0.00,-33.60,0 +57.60,0.00,0.26,0.00,1.00,0.00,38.40,0 +62.40,0.00,0.28,0.00,1.00,4.80,-38.40,0 +67.20,0.00,0.30,0.00,1.00,4.80,38.40,0 +72.00,0.00,0.32,0.00,1.00,4.80,-43.20,0 +76.80,0.00,0.34,0.00,1.00,9.60,43.20,0 +81.60,0.00,0.36,0.00,1.00,19.20,-43.20,0 +86.40,0.00,0.38,0.00,1.00,134.40,43.20,0 +91.20,0.00,0.41,0.00,1.00,168.00,-43.20,0 +96.00,0.00,0.43,0.00,1.00,172.80,43.20,0 +100.80,0.00,0.45,0.00,1.00,177.60,-43.20,0 +105.60,0.00,0.47,0.00,1.00,177.60,43.20,0 +110.40,0.00,0.49,0.00,1.00,177.60,-43.20,0 +115.20,0.00,0.51,0.00,1.00,177.60,38.40,0 +120.00,0.00,0.53,0.00,1.00,177.60,-38.40,0 +124.80,0.00,0.56,0.00,1.00,177.60,33.60,0 +129.60,0.00,0.58,0.00,1.00,177.60,-33.60,0 +134.40,0.00,0.60,0.00,1.00,177.60,28.80,0 +139.20,0.00,0.62,0.00,1.00,177.60,-28.80,0 +144.00,0.00,0.64,0.00,1.00,177.60,24.00,0 +148.80,0.00,0.66,0.00,1.00,177.60,-19.20,0 +153.60,0.00,0.68,0.00,1.00,177.60,19.20,0 +158.40,0.00,0.70,0.00,1.00,177.60,-14.40,0 +163.20,0.00,0.73,0.00,1.00,177.60,9.60,0 +168.00,0.00,0.75,0.00,1.00,177.60,-9.60,0 +172.80,0.00,0.77,0.00,1.00,177.60,4.80,0 +177.60,0.00,0.79,0.00,1.00,-177.60,-0.00,0 +-177.60,0.00,0.81,0.00,1.00,-177.60,-0.00,0 +-172.80,0.00,0.83,0.00,1.00,-177.60,4.80,0 +-168.00,0.00,0.85,0.00,1.00,-177.60,-9.60,0 +-163.20,0.00,0.88,0.00,1.00,-177.60,9.60,0 +-158.40,0.00,0.90,0.00,1.00,-177.60,-14.40,0 +-153.60,0.00,0.92,0.00,1.00,-177.60,19.20,0 +-148.80,0.00,0.94,0.00,1.00,-177.60,-19.20,0 +-144.00,0.00,0.96,0.00,1.00,-177.60,24.00,0 +-139.20,0.00,0.98,0.00,1.00,-177.60,-28.80,0 +-134.40,0.00,1.00,0.00,1.00,-177.60,28.80,0 +-129.60,0.00,1.03,0.00,1.00,-177.60,-33.60,0 +-124.80,0.00,1.05,0.00,1.00,-177.60,33.60,0 +-120.00,0.00,1.07,0.00,1.00,-177.60,-38.40,0 +-115.20,0.00,1.09,0.00,1.00,-177.60,38.40,0 +-110.40,0.00,1.11,0.00,1.00,-177.60,-43.20,0 +-105.60,0.00,1.13,0.00,1.00,-172.80,43.20,0 +-100.80,0.00,1.15,0.00,1.00,-168.00,-43.20,0 +-96.00,0.00,1.17,0.00,1.00,-134.40,43.20,0 +-91.20,0.00,1.20,0.00,1.00,-19.20,-43.20,0 +-86.40,0.00,1.22,0.00,1.00,-9.60,43.20,0 +-81.60,0.00,1.24,0.00,1.00,-4.80,-43.20,0 +-76.80,0.00,1.26,0.00,1.00,-4.80,43.20,0 +-72.00,0.00,1.28,0.00,1.00,-4.80,-43.20,0 +-67.20,0.00,1.30,0.00,1.00,-0.00,38.40,0 +-62.40,0.00,1.32,0.00,1.00,-0.00,-38.40,0 +-57.60,0.00,1.35,0.00,1.00,-0.00,38.40,0 +-52.80,0.00,1.37,0.00,1.00,-0.00,-33.60,0 +-48.00,0.00,1.39,0.00,1.00,-0.00,33.60,0 +-43.20,0.00,1.41,0.00,1.00,-0.00,-28.80,0 +-38.40,0.00,1.43,0.00,1.00,-0.00,24.00,0 +-33.60,0.00,1.45,0.00,1.00,-0.00,-24.00,0 +-28.80,0.00,1.47,0.00,1.00,-0.00,19.20,0 +-24.00,0.00,1.50,0.00,1.00,-0.00,-14.40,0 +-19.20,0.00,1.52,0.00,1.00,-0.00,14.40,0 +-14.40,0.00,1.54,0.00,1.00,-0.00,-9.60,0 +-9.60,0.00,1.56,0.00,1.00,-0.00,4.80,0 +-4.80,0.00,1.58,0.00,1.00,-0.00,-4.80,0 +0.00,0.00,1.60,0.00,1.00,-0.00,0.00,0 +4.80,-0.00,1.62,0.00,1.00,-0.00,-4.80,0 +9.60,-0.00,1.64,0.00,1.00,-0.00,4.80,0 +14.40,-0.00,1.67,0.00,1.00,-0.00,-9.60,0 +19.20,-0.00,1.69,0.00,1.00,-0.00,14.40,0 +24.00,-0.00,1.71,0.00,1.00,-0.00,-14.40,0 +28.80,-0.00,1.73,0.00,1.00,-0.00,19.20,0 +33.60,-4.80,1.75,0.00,1.00,-4.80,-19.20,0 +38.40,-4.80,1.77,0.00,1.00,-4.80,24.00,0 +43.20,-4.80,1.79,0.00,1.00,-4.80,-24.00,0 +48.00,-4.80,1.82,0.00,1.00,-4.80,28.80,0 +52.80,-4.80,1.84,0.00,1.00,-4.80,-28.80,0 +57.60,-4.80,1.86,0.00,1.00,-4.80,33.60,0 +62.40,-4.80,1.88,0.00,1.00,-9.60,-33.60,0 +67.20,-4.80,1.90,0.00,1.00,-9.60,38.40,0 +72.00,-4.80,1.92,0.00,1.00,-14.40,-38.40,0 +76.80,-4.80,1.94,0.00,1.00,-24.00,38.40,0 +81.60,-4.80,1.97,0.00,1.00,-43.20,-38.40,0 +86.40,-4.80,1.99,0.00,1.00,-110.40,38.40,0 +91.20,-4.80,2.01,0.00,1.00,-148.80,-38.40,0 +96.00,-4.80,2.03,0.00,1.00,-163.20,38.40,0 +100.80,-4.80,2.05,0.00,1.00,-168.00,-38.40,0 +105.60,-4.80,2.07,0.00,1.00,-172.80,38.40,0 +110.40,-4.80,2.09,0.00,1.00,-172.80,-38.40,0 +115.20,-4.80,2.11,0.00,1.00,-172.80,33.60,0 +120.00,-4.80,2.14,0.00,1.00,-172.80,-33.60,0 +124.80,-4.80,2.16,0.00,1.00,-177.60,33.60,0 +129.60,-4.80,2.18,0.00,1.00,-177.60,-28.80,0 +134.40,-4.80,2.20,0.00,1.00,-177.60,28.80,0 +139.20,-4.80,2.22,0.00,1.00,-177.60,-24.00,0 +144.00,-4.80,2.24,0.00,1.00,-177.60,24.00,0 +148.80,-4.80,2.26,0.00,1.00,-177.60,-19.20,0 +153.60,-0.00,2.29,0.00,1.00,-177.60,14.40,0 +158.40,-0.00,2.31,0.00,1.00,-177.60,-14.40,0 +163.20,-0.00,2.33,0.00,1.00,-177.60,9.60,0 +168.00,-0.00,2.35,0.00,1.00,-177.60,-9.60,0 +172.80,-0.00,2.37,0.00,1.00,-177.60,4.80,0 +177.60,-0.00,2.39,0.00,1.00,177.60,-0.00,0 +-177.60,0.00,2.41,0.00,1.00,177.60,-0.00,0 +-172.80,0.00,2.44,0.00,1.00,177.60,4.80,0 +-168.00,0.00,2.46,0.00,1.00,177.60,-9.60,0 +-163.20,0.00,2.48,0.00,1.00,177.60,9.60,0 +-158.40,0.00,2.50,0.00,1.00,177.60,-14.40,0 +-153.60,0.00,2.52,0.00,1.00,177.60,14.40,0 +-148.80,4.80,2.54,0.00,1.00,177.60,-19.20,0 +-144.00,4.80,2.56,0.00,1.00,177.60,24.00,0 +-139.20,4.80,2.58,0.00,1.00,177.60,-24.00,0 +-134.40,4.80,2.61,0.00,1.00,177.60,28.80,0 +-129.60,4.80,2.63,0.00,1.00,172.80,-28.80,0 +-124.80,4.80,2.65,0.00,1.00,172.80,33.60,0 +-120.00,4.80,2.67,0.00,1.00,172.80,-33.60,0 +-115.20,4.80,2.69,0.00,1.00,172.80,33.60,0 +-110.40,4.80,2.71,0.00,1.00,168.00,-38.40,0 +-105.60,4.80,2.73,0.00,1.00,163.20,38.40,0 +-100.80,4.80,2.76,0.00,1.00,148.80,-38.40,0 +-96.00,4.80,2.78,0.00,1.00,110.40,38.40,0 +-91.20,4.80,2.80,0.00,1.00,43.20,-38.40,0 +-86.40,4.80,2.82,0.00,1.00,24.00,38.40,0 +-81.60,4.80,2.84,0.00,1.00,14.40,-38.40,0 +-76.80,4.80,2.86,0.00,1.00,9.60,38.40,0 +-72.00,4.80,2.88,0.00,1.00,9.60,-38.40,0 +-67.20,4.80,2.91,0.00,1.00,4.80,38.40,0 +-62.40,4.80,2.93,0.00,1.00,4.80,-33.60,0 +-57.60,4.80,2.95,0.00,1.00,4.80,33.60,0 +-52.80,4.80,2.97,0.00,1.00,4.80,-28.80,0 +-48.00,4.80,2.99,0.00,1.00,4.80,28.80,0 +-43.20,4.80,3.01,0.00,1.00,4.80,-24.00,0 +-38.40,4.80,3.03,0.00,1.00,0.00,24.00,0 +-33.60,4.80,3.05,0.00,1.00,0.00,-19.20,0 +-28.80,0.00,3.08,0.00,1.00,0.00,19.20,0 +-24.00,0.00,3.10,0.00,1.00,0.00,-14.40,0 +-19.20,0.00,3.12,0.00,1.00,0.00,14.40,0 +-14.40,0.00,3.14,0.00,1.00,0.00,-9.60,0 +-9.60,0.00,3.16,0.00,1.00,0.00,4.80,0 +-4.80,0.00,3.18,0.00,1.00,0.00,-4.80,0 +0.00,0.00,3.20,0.00,1.00,-0.00,0.00,0 +4.80,-0.00,3.23,0.00,1.00,-0.00,-4.80,0 +9.60,-0.00,3.25,0.00,1.00,-0.00,4.80,0 +14.40,-0.00,3.27,0.00,1.00,-4.80,-9.60,0 +19.20,-4.80,3.29,0.00,1.00,-4.80,9.60,0 +24.00,-4.80,3.31,0.00,1.00,-4.80,-14.40,0 +28.80,-4.80,3.33,0.00,1.00,-4.80,14.40,0 +33.60,-4.80,3.35,0.00,1.00,-4.80,-19.20,0 +38.40,-4.80,3.38,0.00,1.00,-9.60,19.20,0 +43.20,-4.80,3.40,0.00,1.00,-9.60,-24.00,0 +48.00,-4.80,3.42,0.00,1.00,-9.60,24.00,0 +52.80,-9.60,3.44,0.00,1.00,-14.40,-28.80,0 +57.60,-9.60,3.46,0.00,1.00,-14.40,28.80,0 +62.40,-9.60,3.48,0.00,1.00,-19.20,-28.80,0 +67.20,-9.60,3.50,0.00,1.00,-24.00,33.60,0 +72.00,-9.60,3.52,0.00,1.00,-33.60,-33.60,0 +76.80,-9.60,3.55,0.00,1.00,-43.20,33.60,0 +81.60,-9.60,3.57,0.00,1.00,-67.20,-33.60,0 +86.40,-9.60,3.59,0.00,1.00,-96.00,33.60,0 +91.20,-9.60,3.61,0.00,1.00,-124.80,-33.60,0 +96.00,-9.60,3.63,0.00,1.00,-144.00,33.60,0 +100.80,-9.60,3.65,0.00,1.00,-153.60,-33.60,0 +105.60,-9.60,3.67,0.00,1.00,-158.40,33.60,0 +110.40,-9.60,3.70,0.00,1.00,-163.20,-33.60,0 +115.20,-9.60,3.72,0.00,1.00,-168.00,33.60,0 +120.00,-9.60,3.74,0.00,1.00,-168.00,-28.80,0 +124.80,-9.60,3.76,0.00,1.00,-168.00,28.80,0 +129.60,-9.60,3.78,0.00,1.00,-172.80,-28.80,0 +134.40,-4.80,3.80,0.00,1.00,-172.80,24.00,0 +139.20,-4.80,3.82,0.00,1.00,-172.80,-24.00,0 +144.00,-4.80,3.85,0.00,1.00,-172.80,19.20,0 +148.80,-4.80,3.87,0.00,1.00,-177.60,-19.20,0 +153.60,-4.80,3.89,0.00,1.00,-177.60,14.40,0 +158.40,-4.80,3.91,0.00,1.00,-177.60,-14.40,0 +163.20,-4.80,3.93,0.00,1.00,-177.60,9.60,0 +168.00,-0.00,3.95,0.00,1.00,-177.60,-4.80,0 +172.80,-0.00,3.97,0.00,1.00,-177.60,4.80,0 +177.60,-0.00,3.99,0.00,1.00,177.60,-0.00,0 +-177.60,0.00,4.02,0.00,1.00,177.60,-0.00,0 +-172.80,0.00,4.04,0.00,1.00,177.60,4.80,0 +-168.00,0.00,4.06,0.00,1.00,177.60,-4.80,0 +-163.20,4.80,4.08,0.00,1.00,177.60,9.60,0 +-158.40,4.80,4.10,0.00,1.00,177.60,-14.40,0 +-153.60,4.80,4.12,0.00,1.00,172.80,14.40,0 +-148.80,4.80,4.14,0.00,1.00,172.80,-19.20,0 +-144.00,4.80,4.17,0.00,1.00,172.80,19.20,0 +-139.20,4.80,4.19,0.00,1.00,172.80,-24.00,0 +-134.40,4.80,4.21,0.00,1.00,168.00,24.00,0 +-129.60,9.60,4.23,0.00,1.00,168.00,-28.80,0 +-124.80,9.60,4.25,0.00,1.00,168.00,28.80,0 +-120.00,9.60,4.27,0.00,1.00,163.20,-28.80,0 +-115.20,9.60,4.29,0.00,1.00,158.40,33.60,0 +-110.40,9.60,4.32,0.00,1.00,153.60,-33.60,0 +-105.60,9.60,4.34,0.00,1.00,144.00,33.60,0 +-100.80,9.60,4.36,0.00,1.00,124.80,-33.60,0 +-96.00,9.60,4.38,0.00,1.00,96.00,33.60,0 +-91.20,9.60,4.40,0.00,1.00,67.20,-33.60,0 +-86.40,9.60,4.42,0.00,1.00,43.20,33.60,0 +-81.60,9.60,4.44,0.00,1.00,33.60,-33.60,0 +-76.80,9.60,4.46,0.00,1.00,24.00,33.60,0 +-72.00,9.60,4.49,0.00,1.00,19.20,-33.60,0 +-67.20,9.60,4.51,0.00,1.00,14.40,33.60,0 +-62.40,9.60,4.53,0.00,1.00,14.40,-28.80,0 +-57.60,9.60,4.55,0.00,1.00,9.60,28.80,0 +-52.80,9.60,4.57,0.00,1.00,9.60,-28.80,0 +-48.00,4.80,4.59,0.00,1.00,9.60,24.00,0 +-43.20,4.80,4.61,0.00,1.00,4.80,-24.00,0 +-38.40,4.80,4.64,0.00,1.00,4.80,19.20,0 +-33.60,4.80,4.66,0.00,1.00,4.80,-19.20,0 +-28.80,4.80,4.68,0.00,1.00,4.80,14.40,0 +-24.00,4.80,4.70,0.00,1.00,4.80,-14.40,0 +-19.20,4.80,4.72,0.00,1.00,0.00,9.60,0 +-14.40,0.00,4.74,0.00,1.00,0.00,-9.60,0 +-9.60,0.00,4.76,0.00,1.00,0.00,4.80,0 +-4.80,0.00,4.79,0.00,1.00,0.00,-4.80,0 +0.00,0.00,4.81,0.00,1.00,-0.00,0.00,0 +4.80,-0.00,4.83,0.00,1.00,-0.00,-4.80,0 +9.60,-0.00,4.85,0.00,1.00,-4.80,4.80,0 +14.40,-4.80,4.87,0.00,1.00,-4.80,-9.60,0 +19.20,-4.80,4.89,0.00,1.00,-4.80,9.60,0 +24.00,-4.80,4.91,0.00,1.00,-4.80,-9.60,0 +28.80,-4.80,4.93,0.00,1.00,-9.60,14.40,0 +33.60,-9.60,4.96,0.00,1.00,-9.60,-14.40,0 +38.40,-9.60,4.98,0.00,1.00,-14.40,19.20,0 +43.20,-9.60,5.00,0.00,1.00,-14.40,-19.20,0 +48.00,-9.60,5.02,0.00,1.00,-14.40,24.00,0 +52.80,-9.60,5.04,0.00,1.00,-19.20,-24.00,0 +57.60,-14.40,5.06,0.00,1.00,-24.00,24.00,0 +62.40,-14.40,5.08,0.00,1.00,-28.80,-28.80,0 +67.20,-14.40,5.11,0.00,1.00,-33.60,28.80,0 +72.00,-14.40,5.13,0.00,1.00,-43.20,-28.80,0 +76.80,-14.40,5.15,0.00,1.00,-57.60,28.80,0 +81.60,-14.40,5.17,0.00,1.00,-76.80,-28.80,0 +86.40,-14.40,5.19,0.00,1.00,-96.00,28.80,0 +91.20,-14.40,5.21,0.00,1.00,-115.20,-28.80,0 +96.00,-14.40,5.23,0.00,1.00,-129.60,28.80,0 +100.80,-14.40,5.26,0.00,1.00,-139.20,-28.80,0 +105.60,-14.40,5.28,0.00,1.00,-148.80,28.80,0 +110.40,-14.40,5.30,0.00,1.00,-153.60,-28.80,0 +115.20,-14.40,5.32,0.00,1.00,-158.40,28.80,0 +120.00,-14.40,5.34,0.00,1.00,-163.20,-24.00,0 +124.80,-9.60,5.36,0.00,1.00,-163.20,24.00,0 +129.60,-9.60,5.38,0.00,1.00,-168.00,-24.00,0 +134.40,-9.60,5.40,0.00,1.00,-168.00,19.20,0 +139.20,-9.60,5.43,0.00,1.00,-172.80,-19.20,0 +144.00,-9.60,5.45,0.00,1.00,-172.80,19.20,0 +148.80,-9.60,5.47,0.00,1.00,-172.80,-14.40,0 +153.60,-4.80,5.49,0.00,1.00,-172.80,14.40,0 +158.40,-4.80,5.51,0.00,1.00,-177.60,-9.60,0 +163.20,-4.80,5.53,0.00,1.00,-177.60,9.60,0 +168.00,-4.80,5.55,0.00,1.00,-177.60,-4.80,0 +172.80,-0.00,5.58,0.00,1.00,-177.60,4.80,0 +177.60,-0.00,5.60,0.00,1.00,177.60,-0.00,0 +-177.60,0.00,5.62,0.00,1.00,177.60,-0.00,0 +-172.80,0.00,5.64,0.00,1.00,177.60,4.80,0 +-168.00,4.80,5.66,0.00,1.00,177.60,-4.80,0 +-163.20,4.80,5.68,0.00,1.00,172.80,9.60,0 +-158.40,4.80,5.70,0.00,1.00,172.80,-9.60,0 +-153.60,4.80,5.72,0.00,1.00,172.80,14.40,0 +-148.80,9.60,5.75,0.00,1.00,172.80,-14.40,0 +-144.00,9.60,5.77,0.00,1.00,168.00,19.20,0 +-139.20,9.60,5.79,0.00,1.00,168.00,-19.20,0 +-134.40,9.60,5.81,0.00,1.00,163.20,19.20,0 +-129.60,9.60,5.83,0.00,1.00,163.20,-24.00,0 +-124.80,9.60,5.85,0.00,1.00,158.40,24.00,0 +-120.00,14.40,5.87,0.00,1.00,153.60,-24.00,0 +-115.20,14.40,5.90,0.00,1.00,148.80,28.80,0 +-110.40,14.40,5.92,0.00,1.00,139.20,-28.80,0 +-105.60,14.40,5.94,0.00,1.00,129.60,28.80,0 +-100.80,14.40,5.96,0.00,1.00,115.20,-28.80,0 +-96.00,14.40,5.98,0.00,1.00,96.00,28.80,0 +-91.20,14.40,6.00,0.00,1.00,76.80,-28.80,0 +-86.40,14.40,6.02,0.00,1.00,57.60,28.80,0 +-81.60,14.40,6.05,0.00,1.00,43.20,-28.80,0 +-76.80,14.40,6.07,0.00,1.00,33.60,28.80,0 +-72.00,14.40,6.09,0.00,1.00,28.80,-28.80,0 +-67.20,14.40,6.11,0.00,1.00,24.00,28.80,0 +-62.40,14.40,6.13,0.00,1.00,19.20,-28.80,0 +-57.60,14.40,6.15,0.00,1.00,14.40,24.00,0 +-52.80,9.60,6.17,0.00,1.00,14.40,-24.00,0 +-48.00,9.60,6.19,0.00,1.00,14.40,24.00,0 +-43.20,9.60,6.22,0.00,1.00,9.60,-19.20,0 +-38.40,9.60,6.24,0.00,1.00,9.60,19.20,0 +-33.60,9.60,6.26,0.00,1.00,4.80,-14.40,0 +-28.80,4.80,6.28,0.00,1.00,4.80,14.40,0 +-24.00,4.80,6.30,0.00,1.00,4.80,-9.60,0 +-19.20,4.80,6.32,0.00,1.00,4.80,9.60,0 +-14.40,4.80,6.34,0.00,1.00,0.00,-9.60,0 +-9.60,0.00,6.37,0.00,1.00,0.00,4.80,0 +-4.80,0.00,6.39,0.00,1.00,0.00,-4.80,0 +0.00,0.00,6.41,0.00,1.00,-0.00,0.00,0 +4.80,-0.00,6.43,0.00,1.00,-4.80,-0.00,0 +9.60,-4.80,6.45,0.00,1.00,-4.80,4.80,0 +14.40,-4.80,6.47,0.00,1.00,-4.80,-4.80,0 +19.20,-4.80,6.49,0.00,1.00,-9.60,9.60,0 +24.00,-9.60,6.52,0.00,1.00,-9.60,-9.60,0 +28.80,-9.60,6.54,0.00,1.00,-9.60,14.40,0 +33.60,-9.60,6.56,0.00,1.00,-14.40,-14.40,0 +38.40,-9.60,6.58,0.00,1.00,-14.40,14.40,0 +43.20,-14.40,6.60,0.00,1.00,-19.20,-19.20,0 +48.00,-14.40,6.62,0.00,1.00,-24.00,19.20,0 +52.80,-14.40,6.64,0.00,1.00,-24.00,-19.20,0 +57.60,-14.40,6.66,0.00,1.00,-28.80,19.20,0 +62.40,-19.20,6.69,0.00,1.00,-38.40,-24.00,0 +67.20,-19.20,6.71,0.00,1.00,-43.20,24.00,0 +72.00,-19.20,6.73,0.00,1.00,-52.80,-24.00,0 +76.80,-19.20,6.75,0.00,1.00,-62.40,24.00,0 +81.60,-19.20,6.77,0.00,1.00,-76.80,-24.00,0 +86.40,-19.20,6.79,0.00,1.00,-96.00,24.00,0 +91.20,-19.20,6.81,0.00,1.00,-110.40,-24.00,0 +96.00,-19.20,6.84,0.00,1.00,-120.00,24.00,0 +100.80,-19.20,6.86,0.00,1.00,-134.40,-24.00,0 +105.60,-19.20,6.88,0.00,1.00,-139.20,24.00,0 +110.40,-19.20,6.90,0.00,1.00,-148.80,-24.00,0 +115.20,-19.20,6.92,0.00,1.00,-153.60,24.00,0 +120.00,-14.40,6.94,0.00,1.00,-158.40,-24.00,0 +124.80,-14.40,6.96,0.00,1.00,-158.40,19.20,0 +129.60,-14.40,6.99,0.00,1.00,-163.20,-19.20,0 +134.40,-14.40,7.01,0.00,1.00,-163.20,19.20,0 +139.20,-14.40,7.03,0.00,1.00,-168.00,-14.40,0 +144.00,-9.60,7.05,0.00,1.00,-168.00,14.40,0 +148.80,-9.60,7.07,0.00,1.00,-172.80,-14.40,0 +153.60,-9.60,7.09,0.00,1.00,-172.80,9.60,0 +158.40,-4.80,7.11,0.00,1.00,-172.80,-9.60,0 +163.20,-4.80,7.13,0.00,1.00,-177.60,9.60,0 +168.00,-4.80,7.16,0.00,1.00,-177.60,-4.80,0 +172.80,-0.00,7.18,0.00,1.00,-177.60,4.80,0 +177.60,-0.00,7.20,0.00,1.00,177.60,-0.00,0 +-177.60,0.00,7.22,0.00,1.00,177.60,-0.00,0 +-172.80,0.00,7.24,0.00,1.00,177.60,4.80,0 +-168.00,4.80,7.26,0.00,1.00,172.80,-4.80,0 +-163.20,4.80,7.28,0.00,1.00,172.80,9.60,0 +-158.40,4.80,7.31,0.00,1.00,172.80,-9.60,0 +-153.60,9.60,7.33,0.00,1.00,168.00,9.60,0 +-148.80,9.60,7.35,0.00,1.00,168.00,-14.40,0 +-144.00,9.60,7.37,0.00,1.00,163.20,14.40,0 +-139.20,14.40,7.39,0.00,1.00,163.20,-14.40,0 +-134.40,14.40,7.41,0.00,1.00,158.40,19.20,0 +-129.60,14.40,7.43,0.00,1.00,158.40,-19.20,0 +-124.80,14.40,7.46,0.00,1.00,153.60,19.20,0 +-120.00,14.40,7.48,0.00,1.00,148.80,-24.00,0 +-115.20,19.20,7.50,0.00,1.00,139.20,24.00,0 +-110.40,19.20,7.52,0.00,1.00,134.40,-24.00,0 +-105.60,19.20,7.54,0.00,1.00,120.00,24.00,0 +-100.80,19.20,7.56,0.00,1.00,110.40,-24.00,0 +-96.00,19.20,7.58,0.00,1.00,96.00,24.00,0 +-91.20,19.20,7.60,0.00,1.00,76.80,-24.00,0 +-86.40,19.20,7.63,0.00,1.00,62.40,24.00,0 +-81.60,19.20,7.65,0.00,1.00,52.80,-24.00,0 +-76.80,19.20,7.67,0.00,1.00,43.20,24.00,0 +-72.00,19.20,7.69,0.00,1.00,38.40,-24.00,0 +-67.20,19.20,7.71,0.00,1.00,28.80,24.00,0 +-62.40,19.20,7.73,0.00,1.00,24.00,-24.00,0 +-57.60,14.40,7.75,0.00,1.00,24.00,19.20,0 +-52.80,14.40,7.78,0.00,1.00,19.20,-19.20,0 +-48.00,14.40,7.80,0.00,1.00,14.40,19.20,0 +-43.20,14.40,7.82,0.00,1.00,14.40,-19.20,0 +-38.40,9.60,7.84,0.00,1.00,9.60,14.40,0 +-33.60,9.60,7.86,0.00,1.00,9.60,-14.40,0 +-28.80,9.60,7.88,0.00,1.00,9.60,14.40,0 +-24.00,9.60,7.90,0.00,1.00,4.80,-9.60,0 +-19.20,4.80,7.93,0.00,1.00,4.80,9.60,0 +-14.40,4.80,7.95,0.00,1.00,4.80,-4.80,0 +-9.60,4.80,7.97,0.00,1.00,0.00,4.80,0 +-4.80,0.00,7.99,0.00,1.00,0.00,-0.00,0 +0.00,0.00,8.01,0.00,1.00,-0.00,0.00,0 +4.80,-0.00,8.03,0.00,1.00,-4.80,-0.00,0 +9.60,-4.80,8.05,0.00,1.00,-4.80,4.80,0 +14.40,-4.80,8.07,0.00,1.00,-9.60,-4.80,0 +19.20,-9.60,8.10,0.00,1.00,-9.60,4.80,0 +24.00,-9.60,8.12,0.00,1.00,-14.40,-9.60,0 +28.80,-9.60,8.14,0.00,1.00,-14.40,9.60,0 +33.60,-14.40,8.16,0.00,1.00,-19.20,-9.60,0 +33.60,-14.40,8.18,0.00,1.00,-19.20,14.40,0 +38.40,-14.40,8.20,0.00,1.00,-24.00,-14.40,0 +43.20,-19.20,8.22,0.00,1.00,-28.80,14.40,0 +48.00,-19.20,8.25,0.00,1.00,-33.60,-14.40,0 +57.60,-19.20,8.27,0.00,1.00,-38.40,19.20,0 +62.40,-19.20,8.29,0.00,1.00,-43.20,-19.20,0 +67.20,-24.00,8.31,0.00,1.00,-48.00,19.20,0 +72.00,-24.00,8.33,0.00,1.00,-57.60,-19.20,0 +76.80,-24.00,8.35,0.00,1.00,-67.20,19.20,0 +81.60,-24.00,8.37,0.00,1.00,-81.60,-19.20,0 +86.40,-24.00,8.40,0.00,1.00,-91.20,19.20,0 +91.20,-24.00,8.42,0.00,1.00,-105.60,-19.20,0 +96.00,-24.00,8.44,0.00,1.00,-115.20,19.20,0 +100.80,-24.00,8.46,0.00,1.00,-124.80,-19.20,0 +105.60,-24.00,8.48,0.00,1.00,-134.40,19.20,0 +110.40,-24.00,8.50,0.00,1.00,-139.20,-19.20,0 +115.20,-19.20,8.52,0.00,1.00,-144.00,19.20,0 +120.00,-19.20,8.54,0.00,1.00,-148.80,-19.20,0 +129.60,-19.20,8.57,0.00,1.00,-153.60,19.20,0 +134.40,-19.20,8.59,0.00,1.00,-158.40,-14.40,0 +139.20,-19.20,8.61,0.00,1.00,-163.20,14.40,0 +144.00,-14.40,8.63,0.00,1.00,-163.20,-14.40,0 +148.80,-14.40,8.65,0.00,1.00,-168.00,14.40,0 +148.80,-14.40,8.67,0.00,1.00,-168.00,-9.60,0 +153.60,-9.60,8.69,0.00,1.00,-172.80,9.60,0 +158.40,-9.60,8.72,0.00,1.00,-172.80,-9.60,0 +163.20,-4.80,8.74,0.00,1.00,-177.60,4.80,0 +168.00,-4.80,8.76,0.00,1.00,-177.60,-4.80,0 +172.80,-4.80,8.78,0.00,1.00,-177.60,4.80,0 +177.60,-0.00,8.80,0.00,1.00,177.60,-0.00,0 +-177.60,0.00,8.82,0.00,1.00,177.60,-0.00,0 +-172.80,4.80,8.84,0.00,1.00,177.60,4.80,0 +-168.00,4.80,8.87,0.00,1.00,172.80,-4.80,0 +-163.20,4.80,8.89,0.00,1.00,172.80,4.80,0 +-158.40,9.60,8.91,0.00,1.00,168.00,-9.60,0 +-153.60,9.60,8.93,0.00,1.00,168.00,9.60,0 +-148.80,14.40,8.95,0.00,1.00,163.20,-9.60,0 +-148.80,14.40,8.97,0.00,1.00,163.20,14.40,0 +-144.00,14.40,8.99,0.00,1.00,158.40,-14.40,0 +-139.20,19.20,9.01,0.00,1.00,153.60,14.40,0 +-134.40,19.20,9.04,0.00,1.00,148.80,-14.40,0 +-129.60,19.20,9.06,0.00,1.00,144.00,19.20,0 +-120.00,19.20,9.08,0.00,1.00,139.20,-19.20,0 +-115.20,19.20,9.10,0.00,1.00,134.40,19.20,0 +-110.40,24.00,9.12,0.00,1.00,124.80,-19.20,0 +-105.60,24.00,9.14,0.00,1.00,115.20,19.20,0 +-100.80,24.00,9.16,0.00,1.00,105.60,-19.20,0 +-96.00,24.00,9.19,0.00,1.00,91.20,19.20,0 +-91.20,24.00,9.21,0.00,1.00,81.60,-19.20,0 +-86.40,24.00,9.23,0.00,1.00,67.20,19.20,0 +-81.60,24.00,9.25,0.00,1.00,57.60,-19.20,0 +-76.80,24.00,9.27,0.00,1.00,48.00,19.20,0 +-72.00,24.00,9.29,0.00,1.00,43.20,-19.20,0 +-67.20,24.00,9.31,0.00,1.00,38.40,19.20,0 +-62.40,19.20,9.34,0.00,1.00,33.60,-19.20,0 +-57.60,19.20,9.36,0.00,1.00,28.80,19.20,0 +-48.00,19.20,9.38,0.00,1.00,24.00,-14.40,0 +-43.20,19.20,9.40,0.00,1.00,19.20,14.40,0 +-38.40,14.40,9.42,0.00,1.00,19.20,-14.40,0 +-33.60,14.40,9.44,0.00,1.00,14.40,14.40,0 +-33.60,14.40,9.46,0.00,1.00,14.40,-9.60,0 +-28.80,9.60,9.48,0.00,1.00,9.60,9.60,0 +-24.00,9.60,9.51,0.00,1.00,9.60,-9.60,0 +-19.20,9.60,9.53,0.00,1.00,4.80,4.80,0 +-14.40,4.80,9.55,0.00,1.00,4.80,-4.80,0 +-9.60,4.80,9.57,0.00,1.00,0.00,4.80,0 +-4.80,0.00,9.59,0.00,1.00,0.00,-0.00,0 +0.00,0.00,9.61,0.00,1.00,-0.00,0.00,0 +4.80,-0.00,9.63,0.00,1.00,-4.80,-0.00,0 +9.60,-4.80,9.66,0.00,1.00,-4.80,4.80,0 +14.40,-4.80,9.68,0.00,1.00,-9.60,-4.80,0 +19.20,-9.60,9.70,0.00,1.00,-9.60,4.80,0 +19.20,-9.60,9.72,0.00,1.00,-14.40,-4.80,0 +24.00,-14.40,9.74,0.00,1.00,-19.20,9.60,0 +28.80,-14.40,9.76,0.00,1.00,-19.20,-9.60,0 +33.60,-19.20,9.78,0.00,1.00,-24.00,9.60,0 +38.40,-19.20,9.81,0.00,1.00,-28.80,-9.60,0 +43.20,-19.20,9.83,0.00,1.00,-33.60,9.60,0 +48.00,-24.00,9.85,0.00,1.00,-38.40,-14.40,0 +52.80,-24.00,9.87,0.00,1.00,-43.20,14.40,0 +57.60,-24.00,9.89,0.00,1.00,-48.00,-14.40,0 +62.40,-24.00,9.91,0.00,1.00,-52.80,14.40,0 +72.00,-28.80,9.93,0.00,1.00,-62.40,-14.40,0 +76.80,-28.80,9.95,0.00,1.00,-72.00,14.40,0 +81.60,-28.80,9.98,0.00,1.00,-81.60,-14.40,0 +86.40,-28.80,10.00,0.00,1.00,-91.20,14.40,0 +91.20,-28.80,10.02,0.00,1.00,-100.80,-14.40,0 +96.00,-28.80,10.04,0.00,1.00,-110.40,14.40,0 +100.80,-28.80,10.06,0.00,1.00,-120.00,-14.40,0 +105.60,-28.80,10.08,0.00,1.00,-129.60,14.40,0 +115.20,-28.80,10.10,0.00,1.00,-134.40,-14.40,0 +120.00,-24.00,10.13,0.00,1.00,-139.20,14.40,0 +124.80,-24.00,10.15,0.00,1.00,-144.00,-14.40,0 +129.60,-24.00,10.17,0.00,1.00,-148.80,14.40,0 +134.40,-24.00,10.19,0.00,1.00,-153.60,-14.40,0 +139.20,-19.20,10.21,0.00,1.00,-158.40,9.60,0 +144.00,-19.20,10.23,0.00,1.00,-163.20,-9.60,0 +148.80,-14.40,10.25,0.00,1.00,-163.20,9.60,0 +153.60,-14.40,10.28,0.00,1.00,-168.00,-9.60,0 +158.40,-14.40,10.30,0.00,1.00,-168.00,4.80,0 +163.20,-9.60,10.32,0.00,1.00,-172.80,-4.80,0 +163.20,-9.60,10.34,0.00,1.00,-172.80,4.80,0 +168.00,-4.80,10.36,0.00,1.00,-177.60,-4.80,0 +172.80,-4.80,10.38,0.00,1.00,-177.60,0.00,0 +177.60,-0.00,10.40,0.00,1.00,177.60,-0.00,0 +-177.60,0.00,10.42,0.00,1.00,177.60,-0.00,0 +-172.80,4.80,10.45,0.00,1.00,172.80,0.00,0 +-168.00,4.80,10.47,0.00,1.00,172.80,-4.80,0 +-163.20,9.60,10.49,0.00,1.00,168.00,4.80,0 +-163.20,9.60,10.51,0.00,1.00,168.00,-4.80,0 +-158.40,14.40,10.53,0.00,1.00,163.20,4.80,0 +-153.60,14.40,10.55,0.00,1.00,163.20,-9.60,0 +-148.80,14.40,10.57,0.00,1.00,158.40,9.60,0 +-144.00,19.20,10.60,0.00,1.00,153.60,-9.60,0 +-139.20,19.20,10.62,0.00,1.00,148.80,9.60,0 +-134.40,24.00,10.64,0.00,1.00,144.00,-14.40,0 +-129.60,24.00,10.66,0.00,1.00,139.20,14.40,0 +-124.80,24.00,10.68,0.00,1.00,134.40,-14.40,0 +-120.00,24.00,10.70,0.00,1.00,129.60,14.40,0 +-115.20,28.80,10.72,0.00,1.00,120.00,-14.40,0 +-105.60,28.80,10.74,0.00,1.00,110.40,14.40,0 +-100.80,28.80,10.77,0.00,1.00,100.80,-14.40,0 +-96.00,28.80,10.79,0.00,1.00,91.20,14.40,0 +-91.20,28.80,10.81,0.00,1.00,81.60,-14.40,0 +-86.40,28.80,10.83,0.00,1.00,72.00,14.40,0 +-81.60,28.80,10.85,0.00,1.00,62.40,-14.40,0 +-76.80,28.80,10.87,0.00,1.00,52.80,14.40,0 +-72.00,28.80,10.89,0.00,1.00,48.00,-14.40,0 +-62.40,24.00,10.92,0.00,1.00,43.20,14.40,0 +-57.60,24.00,10.94,0.00,1.00,38.40,-14.40,0 +-52.80,24.00,10.96,0.00,1.00,33.60,14.40,0 +-48.00,24.00,10.98,0.00,1.00,28.80,-14.40,0 +-43.20,19.20,11.00,0.00,1.00,24.00,9.60,0 +-38.40,19.20,11.02,0.00,1.00,19.20,-9.60,0 +-33.60,19.20,11.04,0.00,1.00,19.20,9.60,0 +-28.80,14.40,11.07,0.00,1.00,14.40,-9.60,0 +-24.00,14.40,11.09,0.00,1.00,9.60,9.60,0 +-19.20,9.60,11.11,0.00,1.00,9.60,-4.80,0 +-19.20,9.60,11.13,0.00,1.00,4.80,4.80,0 +-14.40,4.80,11.15,0.00,1.00,4.80,-4.80,0 +-9.60,4.80,11.17,0.00,1.00,0.00,4.80,0 +-4.80,0.00,11.19,0.00,1.00,0.00,-0.00,0 +0.00,0.00,11.21,0.00,1.00,-4.80,0.00,0 +4.80,-4.80,11.24,0.00,1.00,-4.80,-0.00,0 +9.60,-4.80,11.26,0.00,1.00,-9.60,0.00,0 +14.40,-9.60,11.28,0.00,1.00,-9.60,-4.80,0 +14.40,-9.60,11.30,0.00,1.00,-14.40,4.80,0 +19.20,-14.40,11.32,0.00,1.00,-14.40,-4.80,0 +24.00,-14.40,11.34,0.00,1.00,-19.20,4.80,0 +28.80,-19.20,11.36,0.00,1.00,-24.00,-4.80,0 +33.60,-19.20,11.39,0.00,1.00,-28.80,4.80,0 +38.40,-24.00,11.41,0.00,1.00,-28.80,-9.60,0 +43.20,-24.00,11.43,0.00,1.00,-33.60,9.60,0 +48.00,-24.00,11.45,0.00,1.00,-38.40,-9.60,0 +52.80,-28.80,11.47,0.00,1.00,-48.00,9.60,0 +57.60,-28.80,11.49,0.00,1.00,-52.80,-9.60,0 +62.40,-28.80,11.51,0.00,1.00,-57.60,9.60,0 +67.20,-33.60,11.54,0.00,1.00,-67.20,-9.60,0 +72.00,-33.60,11.56,0.00,1.00,-76.80,9.60,0 +81.60,-33.60,11.58,0.00,1.00,-81.60,-9.60,0 +86.40,-33.60,11.60,0.00,1.00,-91.20,9.60,0 +91.20,-33.60,11.62,0.00,1.00,-100.80,-9.60,0 +96.00,-33.60,11.64,0.00,1.00,-110.40,9.60,0 +100.80,-33.60,11.66,0.00,1.00,-115.20,-9.60,0 +110.40,-33.60,11.68,0.00,1.00,-124.80,9.60,0 +115.20,-33.60,11.71,0.00,1.00,-129.60,-9.60,0 +120.00,-28.80,11.73,0.00,1.00,-139.20,9.60,0 +124.80,-28.80,11.75,0.00,1.00,-144.00,-9.60,0 +129.60,-28.80,11.77,0.00,1.00,-148.80,9.60,0 +134.40,-24.00,11.79,0.00,1.00,-153.60,-9.60,0 +139.20,-24.00,11.81,0.00,1.00,-153.60,9.60,0 +144.00,-19.20,11.83,0.00,1.00,-158.40,-9.60,0 +148.80,-19.20,11.86,0.00,1.00,-163.20,4.80,0 +153.60,-14.40,11.88,0.00,1.00,-163.20,-4.80,0 +158.40,-14.40,11.90,0.00,1.00,-168.00,4.80,0 +163.20,-9.60,11.92,0.00,1.00,-172.80,-4.80,0 +168.00,-9.60,11.94,0.00,1.00,-172.80,4.80,0 +168.00,-4.80,11.96,0.00,1.00,-177.60,-0.00,0 +172.80,-4.80,11.98,0.00,1.00,-177.60,0.00,0 +177.60,-0.00,12.01,0.00,1.00,177.60,-0.00,0 +-177.60,0.00,12.03,0.00,1.00,177.60,-0.00,0 +-172.80,4.80,12.05,0.00,1.00,172.80,0.00,0 +-168.00,4.80,12.07,0.00,1.00,172.80,-0.00,0 +-168.00,9.60,12.09,0.00,1.00,168.00,4.80,0 +-163.20,9.60,12.11,0.00,1.00,163.20,-4.80,0 +-158.40,14.40,12.13,0.00,1.00,163.20,4.80,0 +-153.60,14.40,12.15,0.00,1.00,158.40,-4.80,0 +-148.80,19.20,12.18,0.00,1.00,153.60,4.80,0 +-144.00,19.20,12.20,0.00,1.00,153.60,-9.60,0 +-139.20,24.00,12.22,0.00,1.00,148.80,9.60,0 +-134.40,24.00,12.24,0.00,1.00,144.00,-9.60,0 +-129.60,28.80,12.26,0.00,1.00,139.20,9.60,0 +-124.80,28.80,12.28,0.00,1.00,129.60,-9.60,0 +-120.00,28.80,12.30,0.00,1.00,124.80,9.60,0 +-115.20,33.60,12.33,0.00,1.00,115.20,-9.60,0 +-110.40,33.60,12.35,0.00,1.00,110.40,9.60,0 +-100.80,33.60,12.37,0.00,1.00,100.80,-9.60,0 +-96.00,33.60,12.39,0.00,1.00,91.20,9.60,0 +-91.20,33.60,12.41,0.00,1.00,81.60,-9.60,0 +-86.40,33.60,12.43,0.00,1.00,76.80,9.60,0 +-81.60,33.60,12.45,0.00,1.00,67.20,-9.60,0 +-72.00,33.60,12.48,0.00,1.00,57.60,9.60,0 +-67.20,33.60,12.50,0.00,1.00,52.80,-9.60,0 +-62.40,28.80,12.52,0.00,1.00,48.00,9.60,0 +-57.60,28.80,12.54,0.00,1.00,38.40,-9.60,0 +-52.80,28.80,12.56,0.00,1.00,33.60,9.60,0 +-48.00,24.00,12.58,0.00,1.00,28.80,-9.60,0 +-43.20,24.00,12.60,0.00,1.00,28.80,9.60,0 +-38.40,24.00,12.62,0.00,1.00,24.00,-9.60,0 +-33.60,19.20,12.65,0.00,1.00,19.20,4.80,0 +-28.80,19.20,12.67,0.00,1.00,14.40,-4.80,0 +-24.00,14.40,12.69,0.00,1.00,14.40,4.80,0 +-19.20,14.40,12.71,0.00,1.00,9.60,-4.80,0 +-14.40,9.60,12.73,0.00,1.00,9.60,4.80,0 +-14.40,9.60,12.75,0.00,1.00,4.80,-4.80,0 +-9.60,4.80,12.77,0.00,1.00,4.80,0.00,0 +-4.80,4.80,12.80,0.00,1.00,0.00,-0.00,0 +0.00,0.00,12.82,0.00,1.00,-4.80,0.00,0 +4.80,-4.80,12.84,0.00,1.00,-4.80,-0.00,0 +9.60,-4.80,12.86,0.00,1.00,-9.60,0.00,0 +9.60,-9.60,12.88,0.00,1.00,-9.60,-0.00,0 +14.40,-9.60,12.90,0.00,1.00,-14.40,0.00,0 +19.20,-14.40,12.92,0.00,1.00,-19.20,-4.80,0 +24.00,-19.20,12.95,0.00,1.00,-24.00,4.80,0 +28.80,-19.20,12.97,0.00,1.00,-24.00,-4.80,0 +33.60,-24.00,12.99,0.00,1.00,-28.80,4.80,0 +38.40,-24.00,13.01,0.00,1.00,-33.60,-4.80,0 +43.20,-28.80,13.03,0.00,1.00,-38.40,4.80,0 +48.00,-28.80,13.05,0.00,1.00,-43.20,-4.80,0 +52.80,-33.60,13.07,0.00,1.00,-48.00,4.80,0 +57.60,-33.60,13.09,0.00,1.00,-52.80,-4.80,0 +62.40,-33.60,13.12,0.00,1.00,-62.40,4.80,0 +67.20,-38.40,13.14,0.00,1.00,-67.20,-4.80,0 +72.00,-38.40,13.16,0.00,1.00,-76.80,4.80,0 +81.60,-38.40,13.18,0.00,1.00,-86.40,-4.80,0 +86.40,-38.40,13.20,0.00,1.00,-91.20,4.80,0 +91.20,-38.40,13.22,0.00,1.00,-100.80,-4.80,0 +96.00,-38.40,13.24,0.00,1.00,-105.60,4.80,0 +105.60,-38.40,13.27,0.00,1.00,-115.20,-4.80,0 +110.40,-38.40,13.29,0.00,1.00,-120.00,4.80,0 +115.20,-33.60,13.31,0.00,1.00,-129.60,-4.80,0 +120.00,-33.60,13.33,0.00,1.00,-134.40,4.80,0 +124.80,-33.60,13.35,0.00,1.00,-139.20,-4.80,0 +129.60,-28.80,13.37,0.00,1.00,-144.00,4.80,0 +134.40,-28.80,13.39,0.00,1.00,-148.80,-4.80,0 +139.20,-24.00,13.42,0.00,1.00,-153.60,4.80,0 +144.00,-24.00,13.44,0.00,1.00,-158.40,-4.80,0 +148.80,-19.20,13.46,0.00,1.00,-158.40,4.80,0 +153.60,-19.20,13.48,0.00,1.00,-163.20,-4.80,0 +158.40,-14.40,13.50,0.00,1.00,-168.00,4.80,0 +163.20,-14.40,13.52,0.00,1.00,-168.00,-4.80,0 +168.00,-9.60,13.54,0.00,1.00,-172.80,0.00,0 +172.80,-9.60,13.56,0.00,1.00,-177.60,-0.00,0 +172.80,-4.80,13.59,0.00,1.00,-177.60,0.00,0 +177.60,-0.00,13.61,0.00,1.00,177.60,-0.00,0 +-177.60,0.00,13.63,0.00,1.00,177.60,-0.00,0 +-172.80,4.80,13.65,0.00,1.00,172.80,0.00,0 +-172.80,9.60,13.67,0.00,1.00,168.00,-0.00,0 +-168.00,9.60,13.69,0.00,1.00,168.00,0.00,0 +-163.20,14.40,13.71,0.00,1.00,163.20,-4.80,0 +-158.40,14.40,13.74,0.00,1.00,158.40,4.80,0 +-153.60,19.20,13.76,0.00,1.00,158.40,-4.80,0 +-148.80,19.20,13.78,0.00,1.00,153.60,4.80,0 +-144.00,24.00,13.80,0.00,1.00,148.80,-4.80,0 +-139.20,24.00,13.82,0.00,1.00,144.00,4.80,0 +-134.40,28.80,13.84,0.00,1.00,139.20,-4.80,0 +-129.60,28.80,13.86,0.00,1.00,134.40,4.80,0 +-124.80,33.60,13.89,0.00,1.00,129.60,-4.80,0 +-120.00,33.60,13.91,0.00,1.00,120.00,4.80,0 +-115.20,33.60,13.93,0.00,1.00,115.20,-4.80,0 +-110.40,38.40,13.95,0.00,1.00,105.60,4.80,0 +-105.60,38.40,13.97,0.00,1.00,100.80,-4.80,0 +-96.00,38.40,13.99,0.00,1.00,91.20,4.80,0 +-91.20,38.40,14.01,0.00,1.00,86.40,-4.80,0 +-86.40,38.40,14.03,0.00,1.00,76.80,4.80,0 +-81.60,38.40,14.06,0.00,1.00,67.20,-4.80,0 +-72.00,38.40,14.08,0.00,1.00,62.40,4.80,0 +-67.20,38.40,14.10,0.00,1.00,52.80,-4.80,0 +-62.40,33.60,14.12,0.00,1.00,48.00,4.80,0 +-57.60,33.60,14.14,0.00,1.00,43.20,-4.80,0 +-52.80,33.60,14.16,0.00,1.00,38.40,4.80,0 +-48.00,28.80,14.18,0.00,1.00,33.60,-4.80,0 +-43.20,28.80,14.21,0.00,1.00,28.80,4.80,0 +-38.40,24.00,14.23,0.00,1.00,24.00,-4.80,0 +-33.60,24.00,14.25,0.00,1.00,24.00,4.80,0 +-28.80,19.20,14.27,0.00,1.00,19.20,-4.80,0 +-24.00,19.20,14.29,0.00,1.00,14.40,4.80,0 +-19.20,14.40,14.31,0.00,1.00,9.60,-4.80,0 +-14.40,9.60,14.33,0.00,1.00,9.60,0.00,0 +-9.60,9.60,14.36,0.00,1.00,4.80,-0.00,0 +-9.60,4.80,14.38,0.00,1.00,4.80,0.00,0 +-4.80,4.80,14.40,0.00,1.00,0.00,-0.00,0 +0.00,0.00,14.42,0.00,1.00,-4.80,0.00,0 +4.80,-4.80,14.44,0.00,1.00,-4.80,-0.00,0 +4.80,-4.80,14.46,0.00,1.00,-9.60,0.00,0 +9.60,-9.60,14.48,0.00,1.00,-14.40,-0.00,0 +14.40,-14.40,14.50,0.00,1.00,-14.40,0.00,0 +19.20,-14.40,14.53,0.00,1.00,-19.20,-0.00,0 +24.00,-19.20,14.55,0.00,1.00,-24.00,0.00,0 +24.00,-24.00,14.57,0.00,1.00,-28.80,-0.00,0 +28.80,-24.00,14.59,0.00,1.00,-33.60,0.00,0 +33.60,-28.80,14.61,0.00,1.00,-38.40,-0.00,0 +38.40,-28.80,14.63,0.00,1.00,-43.20,0.00,0 +43.20,-33.60,14.65,0.00,1.00,-48.00,-0.00,0 +48.00,-33.60,14.68,0.00,1.00,-52.80,0.00,0 +52.80,-38.40,14.70,0.00,1.00,-57.60,-0.00,0 +62.40,-38.40,14.72,0.00,1.00,-62.40,0.00,0 +67.20,-38.40,14.74,0.00,1.00,-72.00,-0.00,0 +72.00,-43.20,14.76,0.00,1.00,-76.80,0.00,0 +76.80,-43.20,14.78,0.00,1.00,-86.40,-0.00,0 +86.40,-43.20,14.80,0.00,1.00,-91.20,0.00,0 +91.20,-43.20,14.83,0.00,1.00,-100.80,-0.00,0 +96.00,-43.20,14.85,0.00,1.00,-105.60,0.00,0 +105.60,-43.20,14.87,0.00,1.00,-110.40,-0.00,0 +110.40,-43.20,14.89,0.00,1.00,-120.00,0.00,0 +115.20,-38.40,14.91,0.00,1.00,-124.80,-0.00,0 +124.80,-38.40,14.93,0.00,1.00,-129.60,0.00,0 +129.60,-38.40,14.95,0.00,1.00,-134.40,-0.00,0 +134.40,-33.60,14.97,0.00,1.00,-139.20,0.00,0 +139.20,-33.60,15.00,0.00,1.00,-144.00,-0.00,0 +144.00,-28.80,15.02,0.00,1.00,-148.80,0.00,0 +148.80,-28.80,15.04,0.00,1.00,-153.60,-0.00,0 +153.60,-24.00,15.06,0.00,1.00,-158.40,0.00,0 +158.40,-19.20,15.08,0.00,1.00,-163.20,-0.00,0 +158.40,-19.20,15.10,0.00,1.00,-163.20,0.00,0 +163.20,-14.40,15.12,0.00,1.00,-168.00,-0.00,0 +168.00,-9.60,15.15,0.00,1.00,-172.80,0.00,0 +172.80,-9.60,15.17,0.00,1.00,-172.80,-0.00,0 +172.80,-4.80,15.19,0.00,1.00,-177.60,0.00,0 +177.60,-0.00,15.21,0.00,1.00,177.60,-0.00,0 +-177.60,0.00,15.23,0.00,1.00,172.80,-0.00,0 +-172.80,4.80,15.25,0.00,1.00,172.80,0.00,0 +-172.80,9.60,15.27,0.00,1.00,168.00,-0.00,0 +-168.00,9.60,15.30,0.00,1.00,163.20,0.00,0 +-163.20,14.40,15.32,0.00,1.00,163.20,-0.00,0 +-158.40,19.20,15.34,0.00,1.00,158.40,0.00,0 +-158.40,19.20,15.36,0.00,1.00,153.60,-0.00,0 +-153.60,24.00,15.38,0.00,1.00,148.80,0.00,0 +-148.80,28.80,15.40,0.00,1.00,144.00,-0.00,0 +-144.00,28.80,15.42,0.00,1.00,139.20,0.00,0 +-139.20,33.60,15.44,0.00,1.00,134.40,-0.00,0 +-134.40,33.60,15.47,0.00,1.00,129.60,0.00,0 +-129.60,38.40,15.49,0.00,1.00,124.80,-0.00,0 +-124.80,38.40,15.51,0.00,1.00,120.00,0.00,0 +-115.20,38.40,15.53,0.00,1.00,110.40,-0.00,0 +-110.40,43.20,15.55,0.00,1.00,105.60,0.00,0 +-105.60,43.20,15.57,0.00,1.00,100.80,-0.00,0 +-96.00,43.20,15.59,0.00,1.00,91.20,0.00,0 +-91.20,43.20,15.62,0.00,1.00,86.40,-0.00,0 +-86.40,43.20,15.64,0.00,1.00,76.80,0.00,0 +-76.80,43.20,15.66,0.00,1.00,72.00,-0.00,0 +-72.00,43.20,15.68,0.00,1.00,62.40,0.00,0 +-67.20,38.40,15.70,0.00,1.00,57.60,-0.00,0 +-62.40,38.40,15.72,0.00,1.00,52.80,0.00,0 +-52.80,38.40,15.74,0.00,1.00,48.00,-0.00,0 +-48.00,33.60,15.77,0.00,1.00,43.20,0.00,0 +-43.20,33.60,15.79,0.00,1.00,38.40,-0.00,0 +-38.40,28.80,15.81,0.00,1.00,33.60,0.00,0 +-33.60,28.80,15.83,0.00,1.00,28.80,-0.00,0 +-28.80,24.00,15.85,0.00,1.00,24.00,0.00,0 +-24.00,24.00,15.87,0.00,1.00,19.20,-0.00,0 +-24.00,19.20,15.89,0.00,1.00,14.40,0.00,0 +-19.20,14.40,15.91,0.00,1.00,14.40,-0.00,0 +-14.40,14.40,15.94,0.00,1.00,9.60,0.00,0 +-9.60,9.60,15.96,0.00,1.00,4.80,-0.00,0 +-4.80,4.80,15.98,0.00,1.00,4.80,0.00,0 +-4.80,4.80,16.00,0.00,1.00,0.00,-0.00,0 +0.00,0.00,16.00,0.00,1.00,-4.80,0.00,0 +4.80,-4.80,15.98,0.00,1.00,-4.80,0.00,0 +4.80,-4.80,15.96,0.00,1.00,-9.60,-0.00,0 +9.60,-9.60,15.94,0.00,1.00,-14.40,0.00,0 +14.40,-14.40,15.91,0.00,1.00,-19.20,-0.00,0 +14.40,-19.20,15.89,0.00,1.00,-24.00,0.00,0 +19.20,-19.20,15.87,0.00,1.00,-24.00,-0.00,0 +24.00,-24.00,15.85,0.00,1.00,-28.80,0.00,0 +28.80,-28.80,15.83,0.00,1.00,-33.60,-0.00,0 +33.60,-28.80,15.81,0.00,1.00,-38.40,0.00,0 +38.40,-33.60,15.79,0.00,1.00,-43.20,-0.00,0 +43.20,-38.40,15.77,0.00,1.00,-48.00,0.00,0 +48.00,-38.40,15.74,0.00,1.00,-52.80,-4.80,0 +52.80,-43.20,15.72,0.00,1.00,-62.40,4.80,0 +57.60,-43.20,15.70,0.00,1.00,-67.20,-4.80,0 +62.40,-43.20,15.68,0.00,1.00,-72.00,4.80,0 +72.00,-48.00,15.66,0.00,1.00,-76.80,-4.80,0 +76.80,-48.00,15.64,0.00,1.00,-86.40,4.80,0 +86.40,-48.00,15.62,0.00,1.00,-91.20,-4.80,0 +91.20,-48.00,15.59,0.00,1.00,-96.00,4.80,0 +100.80,-48.00,15.57,0.00,1.00,-105.60,-4.80,0 +105.60,-48.00,15.55,0.00,1.00,-110.40,4.80,0 +110.40,-48.00,15.53,0.00,1.00,-115.20,-4.80,0 +120.00,-43.20,15.51,0.00,1.00,-124.80,4.80,0 +124.80,-43.20,15.49,0.00,1.00,-129.60,-4.80,0 +129.60,-38.40,15.47,0.00,1.00,-134.40,4.80,0 +134.40,-38.40,15.44,0.00,1.00,-139.20,-4.80,0 +139.20,-33.60,15.42,0.00,1.00,-144.00,0.00,0 +144.00,-33.60,15.40,0.00,1.00,-148.80,-0.00,0 +148.80,-28.80,15.38,0.00,1.00,-153.60,0.00,0 +153.60,-24.00,15.36,0.00,1.00,-158.40,-0.00,0 +158.40,-24.00,15.34,0.00,1.00,-158.40,0.00,0 +163.20,-19.20,15.32,0.00,1.00,-163.20,-0.00,0 +163.20,-14.40,15.30,0.00,1.00,-168.00,0.00,0 +168.00,-14.40,15.27,0.00,1.00,-172.80,-0.00,0 +172.80,-9.60,15.25,0.00,1.00,-172.80,0.00,0 +172.80,-4.80,15.23,0.00,1.00,-177.60,-0.00,0 +177.60,-0.00,15.21,0.00,1.00,177.60,0.00,0 +-177.60,0.00,15.19,0.00,1.00,172.80,0.00,0 +-172.80,4.80,15.17,0.00,1.00,172.80,-0.00,0 +-172.80,9.60,15.15,0.00,1.00,168.00,0.00,0 +-168.00,14.40,15.12,0.00,1.00,163.20,-0.00,0 +-163.20,14.40,15.10,0.00,1.00,158.40,0.00,0 +-163.20,19.20,15.08,0.00,1.00,158.40,-0.00,0 +-158.40,24.00,15.06,0.00,1.00,153.60,0.00,0 +-153.60,24.00,15.04,0.00,1.00,148.80,-0.00,0 +-148.80,28.80,15.02,0.00,1.00,144.00,0.00,0 +-144.00,33.60,15.00,0.00,1.00,139.20,-0.00,0 +-139.20,33.60,14.97,0.00,1.00,134.40,0.00,0 +-134.40,38.40,14.95,0.00,1.00,129.60,-4.80,0 +-129.60,38.40,14.93,0.00,1.00,124.80,4.80,0 +-124.80,43.20,14.91,0.00,1.00,115.20,-4.80,0 +-120.00,43.20,14.89,0.00,1.00,110.40,4.80,0 +-110.40,48.00,14.87,0.00,1.00,105.60,-4.80,0 +-105.60,48.00,14.85,0.00,1.00,96.00,4.80,0 +-100.80,48.00,14.83,0.00,1.00,91.20,-4.80,0 +-91.20,48.00,14.80,0.00,1.00,86.40,4.80,0 +-86.40,48.00,14.78,0.00,1.00,76.80,-4.80,0 +-76.80,48.00,14.76,0.00,1.00,72.00,4.80,0 +-72.00,48.00,14.74,0.00,1.00,67.20,-4.80,0 +-62.40,43.20,14.72,0.00,1.00,62.40,4.80,0 +-57.60,43.20,14.70,0.00,1.00,52.80,-4.80,0 +-52.80,43.20,14.68,0.00,1.00,48.00,4.80,0 +-48.00,38.40,14.65,0.00,1.00,43.20,-4.80,0 +-43.20,38.40,14.63,0.00,1.00,38.40,0.00,0 +-38.40,33.60,14.61,0.00,1.00,33.60,-0.00,0 +-33.60,28.80,14.59,0.00,1.00,28.80,0.00,0 +-28.80,28.80,14.57,0.00,1.00,24.00,-0.00,0 +-24.00,24.00,14.55,0.00,1.00,24.00,0.00,0 +-19.20,19.20,14.53,0.00,1.00,19.20,-0.00,0 +-14.40,19.20,14.50,0.00,1.00,14.40,0.00,0 +-14.40,14.40,14.48,0.00,1.00,9.60,-0.00,0 +-9.60,9.60,14.46,0.00,1.00,4.80,0.00,0 +-4.80,4.80,14.44,0.00,1.00,4.80,-0.00,0 +-4.80,4.80,14.42,0.00,1.00,0.00,0.00,0 +0.00,0.00,14.40,0.00,1.00,-4.80,0.00,0 +4.80,-4.80,14.38,0.00,1.00,-9.60,0.00,0 +4.80,-9.60,14.36,0.00,1.00,-9.60,-0.00,0 +9.60,-9.60,14.33,0.00,1.00,-14.40,0.00,0 +9.60,-14.40,14.31,0.00,1.00,-19.20,-4.80,0 +14.40,-19.20,14.29,0.00,1.00,-24.00,4.80,0 +19.20,-24.00,14.27,0.00,1.00,-28.80,-4.80,0 +24.00,-24.00,14.25,0.00,1.00,-33.60,4.80,0 +24.00,-28.80,14.23,0.00,1.00,-38.40,-4.80,0 +28.80,-33.60,14.21,0.00,1.00,-43.20,4.80,0 +33.60,-38.40,14.18,0.00,1.00,-48.00,-4.80,0 +38.40,-38.40,14.16,0.00,1.00,-52.80,4.80,0 +43.20,-43.20,14.14,0.00,1.00,-57.60,-4.80,0 +48.00,-43.20,14.12,0.00,1.00,-62.40,4.80,0 +52.80,-48.00,14.10,0.00,1.00,-67.20,-4.80,0 +62.40,-48.00,14.08,0.00,1.00,-72.00,9.60,0 +67.20,-52.80,14.06,0.00,1.00,-81.60,-9.60,0 +76.80,-52.80,14.03,0.00,1.00,-86.40,9.60,0 +86.40,-52.80,14.01,0.00,1.00,-91.20,-9.60,0 +91.20,-52.80,13.99,0.00,1.00,-96.00,9.60,0 +100.80,-52.80,13.97,0.00,1.00,-105.60,-9.60,0 +105.60,-52.80,13.95,0.00,1.00,-110.40,9.60,0 +115.20,-48.00,13.93,0.00,1.00,-115.20,-9.60,0 +120.00,-48.00,13.91,0.00,1.00,-120.00,9.60,0 +129.60,-48.00,13.89,0.00,1.00,-124.80,-4.80,0 +134.40,-43.20,13.86,0.00,1.00,-129.60,4.80,0 +139.20,-43.20,13.84,0.00,1.00,-134.40,-4.80,0 +144.00,-38.40,13.82,0.00,1.00,-139.20,4.80,0 +148.80,-33.60,13.80,0.00,1.00,-144.00,-4.80,0 +153.60,-33.60,13.78,0.00,1.00,-148.80,4.80,0 +158.40,-28.80,13.76,0.00,1.00,-153.60,-4.80,0 +158.40,-24.00,13.74,0.00,1.00,-158.40,4.80,0 +163.20,-19.20,13.71,0.00,1.00,-163.20,-4.80,0 +168.00,-19.20,13.69,0.00,1.00,-168.00,4.80,0 +168.00,-14.40,13.67,0.00,1.00,-172.80,-0.00,0 +172.80,-9.60,13.65,0.00,1.00,-172.80,0.00,0 +177.60,-4.80,13.63,0.00,1.00,-177.60,-0.00,0 +177.60,-0.00,13.61,0.00,1.00,177.60,0.00,0 +-177.60,0.00,13.59,0.00,1.00,172.80,0.00,0 +-177.60,4.80,13.56,0.00,1.00,172.80,-0.00,0 +-172.80,9.60,13.54,0.00,1.00,168.00,0.00,0 +-168.00,14.40,13.52,0.00,1.00,163.20,-0.00,0 +-168.00,19.20,13.50,0.00,1.00,158.40,4.80,0 +-163.20,19.20,13.48,0.00,1.00,153.60,-4.80,0 +-158.40,24.00,13.46,0.00,1.00,148.80,4.80,0 +-158.40,28.80,13.44,0.00,1.00,144.00,-4.80,0 +-153.60,33.60,13.42,0.00,1.00,139.20,4.80,0 +-148.80,33.60,13.39,0.00,1.00,134.40,-4.80,0 +-144.00,38.40,13.37,0.00,1.00,129.60,4.80,0 +-139.20,43.20,13.35,0.00,1.00,124.80,-4.80,0 +-134.40,43.20,13.33,0.00,1.00,120.00,4.80,0 +-129.60,48.00,13.31,0.00,1.00,115.20,-4.80,0 +-120.00,48.00,13.29,0.00,1.00,110.40,9.60,0 +-115.20,48.00,13.27,0.00,1.00,105.60,-9.60,0 +-105.60,52.80,13.24,0.00,1.00,96.00,9.60,0 +-100.80,52.80,13.22,0.00,1.00,91.20,-9.60,0 +-91.20,52.80,13.20,0.00,1.00,86.40,9.60,0 +-86.40,52.80,13.18,0.00,1.00,81.60,-9.60,0 +-76.80,52.80,13.16,0.00,1.00,72.00,9.60,0 +-67.20,52.80,13.14,0.00,1.00,67.20,-9.60,0 +-62.40,48.00,13.12,0.00,1.00,62.40,9.60,0 +-52.80,48.00,13.09,0.00,1.00,57.60,-4.80,0 +-48.00,43.20,13.07,0.00,1.00,52.80,4.80,0 +-43.20,43.20,13.05,0.00,1.00,48.00,-4.80,0 +-38.40,38.40,13.03,0.00,1.00,43.20,4.80,0 +-33.60,38.40,13.01,0.00,1.00,38.40,-4.80,0 +-28.80,33.60,12.99,0.00,1.00,33.60,4.80,0 +-24.00,28.80,12.97,0.00,1.00,28.80,-4.80,0 +-24.00,24.00,12.95,0.00,1.00,24.00,4.80,0 +-19.20,24.00,12.92,0.00,1.00,19.20,-4.80,0 +-14.40,19.20,12.90,0.00,1.00,14.40,4.80,0 +-9.60,14.40,12.88,0.00,1.00,9.60,-4.80,0 +-9.60,9.60,12.86,0.00,1.00,9.60,0.00,0 +-4.80,9.60,12.84,0.00,1.00,4.80,-0.00,0 +-4.80,4.80,12.82,0.00,1.00,0.00,0.00,0 +0.00,0.00,12.80,0.00,1.00,-4.80,0.00,0 +4.80,-4.80,12.77,0.00,1.00,-9.60,0.00,0 +4.80,-9.60,12.75,0.00,1.00,-14.40,-0.00,0 +9.60,-14.40,12.73,0.00,1.00,-14.40,4.80,0 +9.60,-14.40,12.71,0.00,1.00,-19.20,-4.80,0 +14.40,-19.20,12.69,0.00,1.00,-24.00,4.80,0 +14.40,-24.00,12.67,0.00,1.00,-28.80,-4.80,0 +19.20,-28.80,12.65,0.00,1.00,-33.60,4.80,0 +24.00,-33.60,12.62,0.00,1.00,-38.40,-9.60,0 +28.80,-33.60,12.60,0.00,1.00,-43.20,9.60,0 +28.80,-38.40,12.58,0.00,1.00,-48.00,-9.60,0 +33.60,-43.20,12.56,0.00,1.00,-52.80,9.60,0 +38.40,-43.20,12.54,0.00,1.00,-57.60,-9.60,0 +48.00,-48.00,12.52,0.00,1.00,-62.40,9.60,0 +52.80,-52.80,12.50,0.00,1.00,-67.20,-9.60,0 +57.60,-52.80,12.48,0.00,1.00,-72.00,9.60,0 +67.20,-57.60,12.45,0.00,1.00,-81.60,-14.40,0 +76.80,-57.60,12.43,0.00,1.00,-86.40,14.40,0 +81.60,-57.60,12.41,0.00,1.00,-91.20,-14.40,0 +91.20,-57.60,12.39,0.00,1.00,-96.00,14.40,0 +100.80,-57.60,12.37,0.00,1.00,-100.80,-14.40,0 +110.40,-57.60,12.35,0.00,1.00,-110.40,14.40,0 +115.20,-52.80,12.33,0.00,1.00,-115.20,-14.40,0 +124.80,-52.80,12.30,0.00,1.00,-120.00,9.60,0 +129.60,-48.00,12.28,0.00,1.00,-124.80,-9.60,0 +139.20,-48.00,12.26,0.00,1.00,-129.60,9.60,0 +144.00,-43.20,12.24,0.00,1.00,-134.40,-9.60,0 +148.80,-38.40,12.22,0.00,1.00,-139.20,9.60,0 +153.60,-38.40,12.20,0.00,1.00,-144.00,-9.60,0 +153.60,-33.60,12.18,0.00,1.00,-148.80,9.60,0 +158.40,-28.80,12.15,0.00,1.00,-153.60,-9.60,0 +163.20,-24.00,12.13,0.00,1.00,-158.40,4.80,0 +163.20,-24.00,12.11,0.00,1.00,-163.20,-4.80,0 +168.00,-19.20,12.09,0.00,1.00,-168.00,4.80,0 +172.80,-14.40,12.07,0.00,1.00,-168.00,-4.80,0 +172.80,-9.60,12.05,0.00,1.00,-172.80,4.80,0 +177.60,-4.80,12.03,0.00,1.00,-177.60,-0.00,0 +177.60,-0.00,12.01,0.00,1.00,177.60,0.00,0 +-177.60,0.00,11.98,0.00,1.00,172.80,0.00,0 +-177.60,4.80,11.96,0.00,1.00,168.00,-0.00,0 +-172.80,9.60,11.94,0.00,1.00,168.00,4.80,0 +-172.80,14.40,11.92,0.00,1.00,163.20,-4.80,0 +-168.00,19.20,11.90,0.00,1.00,158.40,4.80,0 +-163.20,24.00,11.88,0.00,1.00,153.60,-4.80,0 +-163.20,24.00,11.86,0.00,1.00,148.80,4.80,0 +-158.40,28.80,11.83,0.00,1.00,144.00,-9.60,0 +-153.60,33.60,11.81,0.00,1.00,139.20,9.60,0 +-153.60,38.40,11.79,0.00,1.00,134.40,-9.60,0 +-148.80,38.40,11.77,0.00,1.00,129.60,9.60,0 +-144.00,43.20,11.75,0.00,1.00,124.80,-9.60,0 +-139.20,48.00,11.73,0.00,1.00,120.00,9.60,0 +-129.60,48.00,11.71,0.00,1.00,115.20,-9.60,0 +-124.80,52.80,11.68,0.00,1.00,110.40,9.60,0 +-115.20,52.80,11.66,0.00,1.00,100.80,-14.40,0 +-110.40,57.60,11.64,0.00,1.00,96.00,14.40,0 +-100.80,57.60,11.62,0.00,1.00,91.20,-14.40,0 +-91.20,57.60,11.60,0.00,1.00,86.40,14.40,0 +-81.60,57.60,11.58,0.00,1.00,81.60,-14.40,0 +-76.80,57.60,11.56,0.00,1.00,72.00,14.40,0 +-67.20,57.60,11.54,0.00,1.00,67.20,-14.40,0 +-57.60,52.80,11.51,0.00,1.00,62.40,9.60,0 +-52.80,52.80,11.49,0.00,1.00,57.60,-9.60,0 +-48.00,48.00,11.47,0.00,1.00,52.80,9.60,0 +-38.40,43.20,11.45,0.00,1.00,48.00,-9.60,0 +-33.60,43.20,11.43,0.00,1.00,43.20,9.60,0 +-28.80,38.40,11.41,0.00,1.00,38.40,-9.60,0 +-28.80,33.60,11.39,0.00,1.00,33.60,9.60,0 +-24.00,33.60,11.36,0.00,1.00,28.80,-9.60,0 +-19.20,28.80,11.34,0.00,1.00,24.00,4.80,0 +-14.40,24.00,11.32,0.00,1.00,19.20,-4.80,0 +-14.40,19.20,11.30,0.00,1.00,14.40,4.80,0 +-9.60,14.40,11.28,0.00,1.00,14.40,-4.80,0 +-9.60,14.40,11.26,0.00,1.00,9.60,4.80,0 +-4.80,9.60,11.24,0.00,1.00,4.80,-0.00,0 +-4.80,4.80,11.21,0.00,1.00,0.00,0.00,0 +0.00,0.00,11.19,0.00,1.00,-4.80,0.00,0 +0.00,-4.80,11.17,0.00,1.00,-9.60,0.00,0 +4.80,-9.60,11.15,0.00,1.00,-14.40,-4.80,0 +4.80,-14.40,11.13,0.00,1.00,-19.20,4.80,0 +9.60,-19.20,11.11,0.00,1.00,-19.20,-4.80,0 +9.60,-19.20,11.09,0.00,1.00,-24.00,4.80,0 +14.40,-24.00,11.07,0.00,1.00,-28.80,-9.60,0 +19.20,-28.80,11.04,0.00,1.00,-33.60,9.60,0 +19.20,-33.60,11.02,0.00,1.00,-38.40,-9.60,0 +24.00,-38.40,11.00,0.00,1.00,-43.20,9.60,0 +28.80,-43.20,10.98,0.00,1.00,-48.00,-14.40,0 +33.60,-43.20,10.96,0.00,1.00,-52.80,14.40,0 +38.40,-48.00,10.94,0.00,1.00,-57.60,-14.40,0 +43.20,-52.80,10.92,0.00,1.00,-62.40,14.40,0 +48.00,-52.80,10.89,0.00,1.00,-72.00,-14.40,0 +52.80,-57.60,10.87,0.00,1.00,-76.80,14.40,0 +62.40,-57.60,10.85,0.00,1.00,-81.60,-19.20,0 +72.00,-62.40,10.83,0.00,1.00,-86.40,19.20,0 +81.60,-62.40,10.81,0.00,1.00,-91.20,-19.20,0 +91.20,-62.40,10.79,0.00,1.00,-96.00,19.20,0 +100.80,-62.40,10.77,0.00,1.00,-100.80,-19.20,0 +110.40,-62.40,10.74,0.00,1.00,-105.60,19.20,0 +120.00,-57.60,10.72,0.00,1.00,-115.20,-14.40,0 +129.60,-57.60,10.70,0.00,1.00,-120.00,14.40,0 +134.40,-52.80,10.68,0.00,1.00,-124.80,-14.40,0 +139.20,-48.00,10.66,0.00,1.00,-129.60,14.40,0 +144.00,-48.00,10.64,0.00,1.00,-134.40,-14.40,0 +148.80,-43.20,10.62,0.00,1.00,-139.20,14.40,0 +153.60,-38.40,10.60,0.00,1.00,-144.00,-14.40,0 +158.40,-33.60,10.57,0.00,1.00,-148.80,9.60,0 +163.20,-33.60,10.55,0.00,1.00,-153.60,-9.60,0 +163.20,-28.80,10.53,0.00,1.00,-158.40,9.60,0 +168.00,-24.00,10.51,0.00,1.00,-163.20,-9.60,0 +168.00,-19.20,10.49,0.00,1.00,-163.20,4.80,0 +172.80,-14.40,10.47,0.00,1.00,-168.00,-4.80,0 +172.80,-9.60,10.45,0.00,1.00,-172.80,4.80,0 +177.60,-4.80,10.42,0.00,1.00,-177.60,-0.00,0 +177.60,-0.00,10.40,0.00,1.00,177.60,0.00,0 +-177.60,0.00,10.38,0.00,1.00,172.80,0.00,0 +-177.60,4.80,10.36,0.00,1.00,168.00,-0.00,0 +-172.80,9.60,10.34,0.00,1.00,163.20,4.80,0 +-172.80,14.40,10.32,0.00,1.00,163.20,-4.80,0 +-168.00,19.20,10.30,0.00,1.00,158.40,4.80,0 +-168.00,24.00,10.28,0.00,1.00,153.60,-9.60,0 +-163.20,28.80,10.25,0.00,1.00,148.80,9.60,0 +-163.20,33.60,10.23,0.00,1.00,144.00,-9.60,0 +-158.40,33.60,10.21,0.00,1.00,139.20,9.60,0 +-153.60,38.40,10.19,0.00,1.00,134.40,-14.40,0 +-148.80,43.20,10.17,0.00,1.00,129.60,14.40,0 +-144.00,48.00,10.15,0.00,1.00,124.80,-14.40,0 +-139.20,48.00,10.13,0.00,1.00,120.00,14.40,0 +-134.40,52.80,10.10,0.00,1.00,115.20,-14.40,0 +-129.60,57.60,10.08,0.00,1.00,105.60,14.40,0 +-120.00,57.60,10.06,0.00,1.00,100.80,-14.40,0 +-110.40,62.40,10.04,0.00,1.00,96.00,19.20,0 +-100.80,62.40,10.02,0.00,1.00,91.20,-19.20,0 +-91.20,62.40,10.00,0.00,1.00,86.40,19.20,0 +-81.60,62.40,9.98,0.00,1.00,81.60,-19.20,0 +-72.00,62.40,9.95,0.00,1.00,76.80,19.20,0 +-62.40,57.60,9.93,0.00,1.00,72.00,-19.20,0 +-52.80,57.60,9.91,0.00,1.00,62.40,14.40,0 +-48.00,52.80,9.89,0.00,1.00,57.60,-14.40,0 +-43.20,52.80,9.87,0.00,1.00,52.80,14.40,0 +-38.40,48.00,9.85,0.00,1.00,48.00,-14.40,0 +-33.60,43.20,9.83,0.00,1.00,43.20,14.40,0 +-28.80,43.20,9.81,0.00,1.00,38.40,-14.40,0 +-24.00,38.40,9.78,0.00,1.00,33.60,9.60,0 +-19.20,33.60,9.76,0.00,1.00,28.80,-9.60,0 +-19.20,28.80,9.74,0.00,1.00,24.00,9.60,0 +-14.40,24.00,9.72,0.00,1.00,19.20,-9.60,0 +-9.60,19.20,9.70,0.00,1.00,19.20,4.80,0 +-9.60,19.20,9.68,0.00,1.00,14.40,-4.80,0 +-4.80,14.40,9.66,0.00,1.00,9.60,4.80,0 +-4.80,9.60,9.63,0.00,1.00,4.80,-4.80,0 +-0.00,4.80,9.61,0.00,1.00,0.00,0.00,0 +0.00,0.00,9.59,0.00,1.00,-4.80,0.00,0 +0.00,-4.80,9.57,0.00,1.00,-9.60,0.00,0 +4.80,-9.60,9.55,0.00,1.00,-14.40,-4.80,0 +4.80,-14.40,9.53,0.00,1.00,-19.20,4.80,0 +9.60,-19.20,9.51,0.00,1.00,-24.00,-4.80,0 +9.60,-24.00,9.48,0.00,1.00,-28.80,9.60,0 +14.40,-24.00,9.46,0.00,1.00,-33.60,-9.60,0 +14.40,-28.80,9.44,0.00,1.00,-33.60,14.40,0 +19.20,-33.60,9.42,0.00,1.00,-38.40,-14.40,0 +19.20,-38.40,9.40,0.00,1.00,-43.20,14.40,0 +24.00,-43.20,9.38,0.00,1.00,-48.00,-14.40,0 +28.80,-48.00,9.36,0.00,1.00,-57.60,19.20,0 +33.60,-52.80,9.34,0.00,1.00,-62.40,-19.20,0 +38.40,-52.80,9.31,0.00,1.00,-67.20,19.20,0 +43.20,-57.60,9.29,0.00,1.00,-72.00,-19.20,0 +48.00,-62.40,9.27,0.00,1.00,-76.80,19.20,0 +57.60,-62.40,9.25,0.00,1.00,-81.60,-19.20,0 +67.20,-67.20,9.23,0.00,1.00,-86.40,24.00,0 +81.60,-67.20,9.21,0.00,1.00,-91.20,-24.00,0 +91.20,-67.20,9.19,0.00,1.00,-96.00,24.00,0 +105.60,-67.20,9.16,0.00,1.00,-100.80,-24.00,0 +115.20,-67.20,9.14,0.00,1.00,-105.60,24.00,0 +124.80,-62.40,9.12,0.00,1.00,-110.40,-19.20,0 +134.40,-57.60,9.10,0.00,1.00,-115.20,19.20,0 +139.20,-57.60,9.08,0.00,1.00,-120.00,-19.20,0 +144.00,-52.80,9.06,0.00,1.00,-129.60,19.20,0 +148.80,-48.00,9.04,0.00,1.00,-134.40,-19.20,0 +153.60,-43.20,9.01,0.00,1.00,-139.20,19.20,0 +158.40,-43.20,8.99,0.00,1.00,-144.00,-14.40,0 +163.20,-38.40,8.97,0.00,1.00,-148.80,14.40,0 +163.20,-33.60,8.95,0.00,1.00,-148.80,-14.40,0 +168.00,-28.80,8.93,0.00,1.00,-153.60,9.60,0 +168.00,-24.00,8.91,0.00,1.00,-158.40,-9.60,0 +172.80,-19.20,8.89,0.00,1.00,-163.20,9.60,0 +172.80,-14.40,8.87,0.00,1.00,-168.00,-4.80,0 +177.60,-9.60,8.84,0.00,1.00,-172.80,4.80,0 +177.60,-4.80,8.82,0.00,1.00,-177.60,-4.80,0 +177.60,-0.00,8.80,0.00,1.00,177.60,0.00,0 +-177.60,0.00,8.78,0.00,1.00,172.80,0.00,0 +-177.60,4.80,8.76,0.00,1.00,168.00,-4.80,0 +-177.60,9.60,8.74,0.00,1.00,163.20,4.80,0 +-172.80,14.40,8.72,0.00,1.00,158.40,-4.80,0 +-172.80,19.20,8.69,0.00,1.00,153.60,9.60,0 +-168.00,24.00,8.67,0.00,1.00,148.80,-9.60,0 +-168.00,28.80,8.65,0.00,1.00,148.80,9.60,0 +-163.20,33.60,8.63,0.00,1.00,144.00,-14.40,0 +-163.20,38.40,8.61,0.00,1.00,139.20,14.40,0 +-158.40,43.20,8.59,0.00,1.00,134.40,-14.40,0 +-153.60,43.20,8.57,0.00,1.00,129.60,19.20,0 +-148.80,48.00,8.54,0.00,1.00,120.00,-19.20,0 +-144.00,52.80,8.52,0.00,1.00,115.20,19.20,0 +-139.20,57.60,8.50,0.00,1.00,110.40,-19.20,0 +-134.40,57.60,8.48,0.00,1.00,105.60,19.20,0 +-124.80,62.40,8.46,0.00,1.00,100.80,-19.20,0 +-115.20,67.20,8.44,0.00,1.00,96.00,24.00,0 +-105.60,67.20,8.42,0.00,1.00,91.20,-24.00,0 +-91.20,67.20,8.40,0.00,1.00,86.40,24.00,0 +-81.60,67.20,8.37,0.00,1.00,81.60,-24.00,0 +-67.20,67.20,8.35,0.00,1.00,76.80,24.00,0 +-57.60,62.40,8.33,0.00,1.00,72.00,-19.20,0 +-48.00,62.40,8.31,0.00,1.00,67.20,19.20,0 +-43.20,57.60,8.29,0.00,1.00,62.40,-19.20,0 +-38.40,52.80,8.27,0.00,1.00,57.60,19.20,0 +-33.60,52.80,8.25,0.00,1.00,48.00,-19.20,0 +-28.80,48.00,8.22,0.00,1.00,43.20,19.20,0 +-24.00,43.20,8.20,0.00,1.00,38.40,-14.40,0 +-19.20,38.40,8.18,0.00,1.00,33.60,14.40,0 +-19.20,33.60,8.16,0.00,1.00,33.60,-14.40,0 +-14.40,28.80,8.14,0.00,1.00,28.80,14.40,0 +-14.40,24.00,8.12,0.00,1.00,24.00,-9.60,0 +-9.60,24.00,8.10,0.00,1.00,19.20,9.60,0 +-9.60,19.20,8.07,0.00,1.00,14.40,-4.80,0 +-4.80,14.40,8.05,0.00,1.00,9.60,4.80,0 +-4.80,9.60,8.03,0.00,1.00,4.80,-4.80,0 +-0.00,4.80,8.01,0.00,1.00,0.00,0.00,0 +0.00,0.00,7.99,0.00,1.00,-4.80,0.00,0 +0.00,-4.80,7.97,0.00,1.00,-9.60,0.00,0 +4.80,-9.60,7.95,0.00,1.00,-14.40,-4.80,0 +4.80,-14.40,7.93,0.00,1.00,-19.20,4.80,0 +4.80,-19.20,7.90,0.00,1.00,-24.00,-9.60,0 +9.60,-24.00,7.88,0.00,1.00,-28.80,9.60,0 +9.60,-28.80,7.86,0.00,1.00,-33.60,-14.40,0 +9.60,-33.60,7.84,0.00,1.00,-38.40,14.40,0 +14.40,-38.40,7.82,0.00,1.00,-43.20,-14.40,0 +14.40,-38.40,7.80,0.00,1.00,-48.00,19.20,0 +19.20,-43.20,7.78,0.00,1.00,-52.80,-19.20,0 +24.00,-48.00,7.75,0.00,1.00,-57.60,19.20,0 +24.00,-52.80,7.73,0.00,1.00,-62.40,-24.00,0 +28.80,-57.60,7.71,0.00,1.00,-67.20,24.00,0 +38.40,-62.40,7.69,0.00,1.00,-72.00,-24.00,0 +43.20,-62.40,7.67,0.00,1.00,-76.80,24.00,0 +52.80,-67.20,7.65,0.00,1.00,-81.60,-24.00,0 +62.40,-72.00,7.63,0.00,1.00,-86.40,28.80,0 +76.80,-72.00,7.60,0.00,1.00,-91.20,-28.80,0 +96.00,-72.00,7.58,0.00,1.00,-96.00,28.80,0 +110.40,-72.00,7.56,0.00,1.00,-100.80,-28.80,0 +120.00,-67.20,7.54,0.00,1.00,-105.60,28.80,0 +134.40,-67.20,7.52,0.00,1.00,-110.40,-24.00,0 +139.20,-62.40,7.50,0.00,1.00,-115.20,24.00,0 +148.80,-57.60,7.48,0.00,1.00,-120.00,-24.00,0 +153.60,-57.60,7.46,0.00,1.00,-124.80,24.00,0 +158.40,-52.80,7.43,0.00,1.00,-129.60,-24.00,0 +158.40,-48.00,7.41,0.00,1.00,-134.40,19.20,0 +163.20,-43.20,7.39,0.00,1.00,-139.20,-19.20,0 +163.20,-38.40,7.37,0.00,1.00,-144.00,19.20,0 +168.00,-33.60,7.35,0.00,1.00,-148.80,-14.40,0 +168.00,-28.80,7.33,0.00,1.00,-153.60,14.40,0 +172.80,-24.00,7.31,0.00,1.00,-158.40,-9.60,0 +172.80,-19.20,7.28,0.00,1.00,-163.20,9.60,0 +172.80,-14.40,7.26,0.00,1.00,-168.00,-9.60,0 +177.60,-9.60,7.24,0.00,1.00,-172.80,4.80,0 +177.60,-4.80,7.22,0.00,1.00,-177.60,-4.80,0 +177.60,-0.00,7.20,0.00,1.00,177.60,0.00,0 +-177.60,0.00,7.18,0.00,1.00,172.80,0.00,0 +-177.60,4.80,7.16,0.00,1.00,168.00,-4.80,0 +-177.60,9.60,7.13,0.00,1.00,163.20,4.80,0 +-172.80,14.40,7.11,0.00,1.00,158.40,-9.60,0 +-172.80,19.20,7.09,0.00,1.00,153.60,9.60,0 +-172.80,24.00,7.07,0.00,1.00,148.80,-9.60,0 +-168.00,28.80,7.05,0.00,1.00,144.00,14.40,0 +-168.00,33.60,7.03,0.00,1.00,139.20,-14.40,0 +-163.20,38.40,7.01,0.00,1.00,134.40,19.20,0 +-163.20,43.20,6.99,0.00,1.00,129.60,-19.20,0 +-158.40,48.00,6.96,0.00,1.00,124.80,19.20,0 +-158.40,52.80,6.94,0.00,1.00,120.00,-24.00,0 +-153.60,57.60,6.92,0.00,1.00,115.20,24.00,0 +-148.80,57.60,6.90,0.00,1.00,110.40,-24.00,0 +-139.20,62.40,6.88,0.00,1.00,105.60,24.00,0 +-134.40,67.20,6.86,0.00,1.00,100.80,-24.00,0 +-120.00,67.20,6.84,0.00,1.00,96.00,28.80,0 +-110.40,72.00,6.81,0.00,1.00,91.20,-28.80,0 +-96.00,72.00,6.79,0.00,1.00,86.40,28.80,0 +-76.80,72.00,6.77,0.00,1.00,81.60,-28.80,0 +-62.40,72.00,6.75,0.00,1.00,76.80,28.80,0 +-52.80,67.20,6.73,0.00,1.00,72.00,-24.00,0 +-43.20,62.40,6.71,0.00,1.00,67.20,24.00,0 +-38.40,62.40,6.69,0.00,1.00,62.40,-24.00,0 +-28.80,57.60,6.66,0.00,1.00,57.60,24.00,0 +-24.00,52.80,6.64,0.00,1.00,52.80,-24.00,0 +-24.00,48.00,6.62,0.00,1.00,48.00,19.20,0 +-19.20,43.20,6.60,0.00,1.00,43.20,-19.20,0 +-14.40,38.40,6.58,0.00,1.00,38.40,19.20,0 +-14.40,38.40,6.56,0.00,1.00,33.60,-14.40,0 +-9.60,33.60,6.54,0.00,1.00,28.80,14.40,0 +-9.60,28.80,6.52,0.00,1.00,24.00,-14.40,0 +-9.60,24.00,6.49,0.00,1.00,19.20,9.60,0 +-4.80,19.20,6.47,0.00,1.00,14.40,-9.60,0 +-4.80,14.40,6.45,0.00,1.00,9.60,4.80,0 +-4.80,9.60,6.43,0.00,1.00,4.80,-4.80,0 +-0.00,4.80,6.41,0.00,1.00,0.00,0.00,0 +0.00,0.00,6.39,0.00,1.00,-4.80,0.00,0 +0.00,-4.80,6.37,0.00,1.00,-9.60,4.80,0 +0.00,-9.60,6.34,0.00,1.00,-14.40,-4.80,0 +4.80,-14.40,6.32,0.00,1.00,-19.20,9.60,0 +4.80,-19.20,6.30,0.00,1.00,-24.00,-9.60,0 +4.80,-24.00,6.28,0.00,1.00,-28.80,14.40,0 +4.80,-28.80,6.26,0.00,1.00,-33.60,-14.40,0 +9.60,-33.60,6.24,0.00,1.00,-38.40,19.20,0 +9.60,-38.40,6.22,0.00,1.00,-43.20,-19.20,0 +14.40,-43.20,6.19,0.00,1.00,-48.00,19.20,0 +14.40,-48.00,6.17,0.00,1.00,-52.80,-24.00,0 +14.40,-52.80,6.15,0.00,1.00,-57.60,24.00,0 +19.20,-57.60,6.13,0.00,1.00,-62.40,-28.80,0 +24.00,-57.60,6.11,0.00,1.00,-67.20,28.80,0 +28.80,-62.40,6.09,0.00,1.00,-72.00,-28.80,0 +33.60,-67.20,6.07,0.00,1.00,-76.80,28.80,0 +43.20,-72.00,6.05,0.00,1.00,-81.60,-28.80,0 +57.60,-72.00,6.02,0.00,1.00,-86.40,33.60,0 +76.80,-76.80,6.00,0.00,1.00,-91.20,-33.60,0 +96.00,-76.80,5.98,0.00,1.00,-96.00,33.60,0 +115.20,-76.80,5.96,0.00,1.00,-100.80,-33.60,0 +129.60,-72.00,5.94,0.00,1.00,-105.60,28.80,0 +139.20,-72.00,5.92,0.00,1.00,-110.40,-28.80,0 +148.80,-67.20,5.90,0.00,1.00,-115.20,28.80,0 +153.60,-62.40,5.87,0.00,1.00,-120.00,-28.80,0 +158.40,-57.60,5.85,0.00,1.00,-124.80,28.80,0 +163.20,-52.80,5.83,0.00,1.00,-129.60,-24.00,0 +163.20,-48.00,5.81,0.00,1.00,-134.40,24.00,0 +168.00,-43.20,5.79,0.00,1.00,-139.20,-24.00,0 +168.00,-38.40,5.77,0.00,1.00,-144.00,19.20,0 +172.80,-33.60,5.75,0.00,1.00,-148.80,-19.20,0 +172.80,-28.80,5.72,0.00,1.00,-153.60,14.40,0 +172.80,-24.00,5.70,0.00,1.00,-158.40,-14.40,0 +172.80,-19.20,5.68,0.00,1.00,-163.20,9.60,0 +177.60,-14.40,5.66,0.00,1.00,-168.00,-9.60,0 +177.60,-9.60,5.64,0.00,1.00,-172.80,4.80,0 +177.60,-4.80,5.62,0.00,1.00,-177.60,-4.80,0 +177.60,-0.00,5.60,0.00,1.00,177.60,0.00,0 +-177.60,0.00,5.58,0.00,1.00,172.80,0.00,0 +-177.60,4.80,5.55,0.00,1.00,168.00,-4.80,0 +-177.60,9.60,5.53,0.00,1.00,163.20,4.80,0 +-177.60,14.40,5.51,0.00,1.00,158.40,-9.60,0 +-172.80,19.20,5.49,0.00,1.00,153.60,9.60,0 +-172.80,24.00,5.47,0.00,1.00,148.80,-14.40,0 +-172.80,28.80,5.45,0.00,1.00,144.00,14.40,0 +-172.80,33.60,5.43,0.00,1.00,139.20,-19.20,0 +-168.00,38.40,5.40,0.00,1.00,134.40,19.20,0 +-168.00,43.20,5.38,0.00,1.00,129.60,-24.00,0 +-163.20,48.00,5.36,0.00,1.00,124.80,24.00,0 +-163.20,52.80,5.34,0.00,1.00,120.00,-24.00,0 +-158.40,57.60,5.32,0.00,1.00,115.20,28.80,0 +-153.60,62.40,5.30,0.00,1.00,110.40,-28.80,0 +-148.80,67.20,5.28,0.00,1.00,105.60,28.80,0 +-139.20,72.00,5.26,0.00,1.00,100.80,-28.80,0 +-129.60,72.00,5.23,0.00,1.00,96.00,28.80,0 +-115.20,76.80,5.21,0.00,1.00,91.20,-33.60,0 +-96.00,76.80,5.19,0.00,1.00,86.40,33.60,0 +-76.80,76.80,5.17,0.00,1.00,81.60,-33.60,0 +-57.60,72.00,5.15,0.00,1.00,76.80,33.60,0 +-43.20,72.00,5.13,0.00,1.00,72.00,-28.80,0 +-33.60,67.20,5.11,0.00,1.00,67.20,28.80,0 +-28.80,62.40,5.08,0.00,1.00,62.40,-28.80,0 +-24.00,57.60,5.06,0.00,1.00,57.60,28.80,0 +-19.20,57.60,5.04,0.00,1.00,52.80,-28.80,0 +-14.40,52.80,5.02,0.00,1.00,48.00,24.00,0 +-14.40,48.00,5.00,0.00,1.00,43.20,-24.00,0 +-14.40,43.20,4.98,0.00,1.00,38.40,19.20,0 +-9.60,38.40,4.96,0.00,1.00,33.60,-19.20,0 +-9.60,33.60,4.93,0.00,1.00,28.80,19.20,0 +-4.80,28.80,4.91,0.00,1.00,24.00,-14.40,0 +-4.80,24.00,4.89,0.00,1.00,19.20,14.40,0 +-4.80,19.20,4.87,0.00,1.00,14.40,-9.60,0 +-4.80,14.40,4.85,0.00,1.00,9.60,9.60,0 +-0.00,9.60,4.83,0.00,1.00,4.80,-4.80,0 +-0.00,4.80,4.81,0.00,1.00,0.00,4.80,0 +0.00,0.00,4.79,0.00,1.00,-4.80,0.00,0 +0.00,-4.80,4.76,0.00,1.00,-9.60,4.80,0 +0.00,-9.60,4.74,0.00,1.00,-14.40,-4.80,0 +0.00,-14.40,4.72,0.00,1.00,-19.20,9.60,0 +4.80,-19.20,4.70,0.00,1.00,-24.00,-9.60,0 +4.80,-24.00,4.68,0.00,1.00,-28.80,14.40,0 +4.80,-28.80,4.66,0.00,1.00,-33.60,-14.40,0 +4.80,-33.60,4.64,0.00,1.00,-38.40,19.20,0 +4.80,-38.40,4.61,0.00,1.00,-43.20,-24.00,0 +9.60,-43.20,4.59,0.00,1.00,-48.00,24.00,0 +9.60,-48.00,4.57,0.00,1.00,-52.80,-24.00,0 +9.60,-52.80,4.55,0.00,1.00,-57.60,28.80,0 +14.40,-57.60,4.53,0.00,1.00,-62.40,-28.80,0 +14.40,-62.40,4.51,0.00,1.00,-67.20,33.60,0 +19.20,-67.20,4.49,0.00,1.00,-72.00,-33.60,0 +24.00,-72.00,4.46,0.00,1.00,-76.80,33.60,0 +33.60,-72.00,4.44,0.00,1.00,-81.60,-33.60,0 +43.20,-76.80,4.42,0.00,1.00,-86.40,38.40,0 +67.20,-81.60,4.40,0.00,1.00,-91.20,-38.40,0 +96.00,-81.60,4.38,0.00,1.00,-96.00,38.40,0 +124.80,-81.60,4.36,0.00,1.00,-100.80,-38.40,0 +144.00,-76.80,4.34,0.00,1.00,-105.60,33.60,0 +153.60,-72.00,4.32,0.00,1.00,-110.40,-33.60,0 +158.40,-67.20,4.29,0.00,1.00,-115.20,33.60,0 +163.20,-62.40,4.27,0.00,1.00,-120.00,-33.60,0 +168.00,-57.60,4.25,0.00,1.00,-124.80,28.80,0 +168.00,-52.80,4.23,0.00,1.00,-129.60,-28.80,0 +168.00,-48.00,4.21,0.00,1.00,-134.40,28.80,0 +172.80,-43.20,4.19,0.00,1.00,-139.20,-24.00,0 +172.80,-38.40,4.17,0.00,1.00,-144.00,24.00,0 +172.80,-33.60,4.14,0.00,1.00,-148.80,-19.20,0 +172.80,-28.80,4.12,0.00,1.00,-153.60,19.20,0 +177.60,-24.00,4.10,0.00,1.00,-158.40,-14.40,0 +177.60,-19.20,4.08,0.00,1.00,-163.20,14.40,0 +177.60,-14.40,4.06,0.00,1.00,-168.00,-9.60,0 +177.60,-9.60,4.04,0.00,1.00,-172.80,4.80,0 +177.60,-4.80,4.02,0.00,1.00,-177.60,-4.80,0 +177.60,-0.00,3.99,0.00,1.00,177.60,0.00,0 +-177.60,0.00,3.97,0.00,1.00,172.80,0.00,0 +-177.60,4.80,3.95,0.00,1.00,168.00,-4.80,0 +-177.60,9.60,3.93,0.00,1.00,163.20,4.80,0 +-177.60,14.40,3.91,0.00,1.00,158.40,-9.60,0 +-177.60,19.20,3.89,0.00,1.00,153.60,14.40,0 +-177.60,24.00,3.87,0.00,1.00,148.80,-14.40,0 +-172.80,28.80,3.85,0.00,1.00,144.00,19.20,0 +-172.80,33.60,3.82,0.00,1.00,139.20,-19.20,0 +-172.80,38.40,3.80,0.00,1.00,134.40,24.00,0 +-172.80,43.20,3.78,0.00,1.00,129.60,-24.00,0 +-168.00,48.00,3.76,0.00,1.00,124.80,28.80,0 +-168.00,52.80,3.74,0.00,1.00,120.00,-28.80,0 +-168.00,57.60,3.72,0.00,1.00,115.20,28.80,0 +-163.20,62.40,3.70,0.00,1.00,110.40,-33.60,0 +-158.40,67.20,3.67,0.00,1.00,105.60,33.60,0 +-153.60,72.00,3.65,0.00,1.00,100.80,-33.60,0 +-144.00,76.80,3.63,0.00,1.00,96.00,33.60,0 +-124.80,81.60,3.61,0.00,1.00,91.20,-38.40,0 +-96.00,81.60,3.59,0.00,1.00,86.40,38.40,0 +-67.20,81.60,3.57,0.00,1.00,81.60,-38.40,0 +-43.20,76.80,3.55,0.00,1.00,76.80,38.40,0 +-33.60,72.00,3.52,0.00,1.00,72.00,-33.60,0 +-24.00,72.00,3.50,0.00,1.00,67.20,33.60,0 +-19.20,67.20,3.48,0.00,1.00,62.40,-33.60,0 +-14.40,62.40,3.46,0.00,1.00,57.60,33.60,0 +-14.40,57.60,3.44,0.00,1.00,52.80,-28.80,0 +-9.60,52.80,3.42,0.00,1.00,48.00,28.80,0 +-9.60,48.00,3.40,0.00,1.00,43.20,-24.00,0 +-9.60,43.20,3.38,0.00,1.00,38.40,24.00,0 +-4.80,38.40,3.35,0.00,1.00,33.60,-24.00,0 +-4.80,33.60,3.33,0.00,1.00,28.80,19.20,0 +-4.80,28.80,3.31,0.00,1.00,24.00,-14.40,0 +-4.80,24.00,3.29,0.00,1.00,19.20,14.40,0 +-4.80,19.20,3.27,0.00,1.00,14.40,-9.60,0 +-0.00,14.40,3.25,0.00,1.00,9.60,9.60,0 +-0.00,9.60,3.23,0.00,1.00,4.80,-4.80,0 +-0.00,4.80,3.20,0.00,1.00,0.00,4.80,0 +0.00,0.00,3.18,0.00,1.00,-4.80,0.00,0 +0.00,-4.80,3.16,0.00,1.00,-9.60,4.80,0 +0.00,-9.60,3.14,0.00,1.00,-14.40,-4.80,0 +0.00,-14.40,3.12,0.00,1.00,-19.20,9.60,0 +0.00,-19.20,3.10,0.00,1.00,-24.00,-14.40,0 +0.00,-24.00,3.08,0.00,1.00,-28.80,14.40,0 +0.00,-28.80,3.05,0.00,1.00,-33.60,-19.20,0 +0.00,-33.60,3.03,0.00,1.00,-38.40,19.20,0 +4.80,-38.40,3.01,0.00,1.00,-43.20,-24.00,0 +4.80,-43.20,2.99,0.00,1.00,-48.00,28.80,0 +4.80,-48.00,2.97,0.00,1.00,-52.80,-28.80,0 +4.80,-52.80,2.95,0.00,1.00,-57.60,33.60,0 +4.80,-57.60,2.93,0.00,1.00,-62.40,-33.60,0 +4.80,-62.40,2.91,0.00,1.00,-67.20,33.60,0 +9.60,-67.20,2.88,0.00,1.00,-72.00,-38.40,0 +9.60,-72.00,2.86,0.00,1.00,-76.80,38.40,0 +14.40,-76.80,2.84,0.00,1.00,-81.60,-38.40,0 +24.00,-81.60,2.82,0.00,1.00,-86.40,43.20,0 +43.20,-86.40,2.80,0.00,1.00,-91.20,-43.20,0 +110.40,-86.40,2.78,0.00,1.00,-96.00,43.20,0 +148.80,-81.60,2.76,0.00,1.00,-100.80,-43.20,0 +163.20,-76.80,2.73,0.00,1.00,-105.60,38.40,0 +168.00,-72.00,2.71,0.00,1.00,-110.40,-38.40,0 +172.80,-67.20,2.69,0.00,1.00,-115.20,38.40,0 +172.80,-62.40,2.67,0.00,1.00,-120.00,-38.40,0 +172.80,-57.60,2.65,0.00,1.00,-124.80,33.60,0 +172.80,-52.80,2.63,0.00,1.00,-129.60,-33.60,0 +177.60,-48.00,2.61,0.00,1.00,-134.40,28.80,0 +177.60,-43.20,2.58,0.00,1.00,-139.20,-28.80,0 +177.60,-38.40,2.56,0.00,1.00,-144.00,24.00,0 +177.60,-33.60,2.54,0.00,1.00,-148.80,-24.00,0 +177.60,-28.80,2.52,0.00,1.00,-153.60,19.20,0 +177.60,-24.00,2.50,0.00,1.00,-158.40,-19.20,0 +177.60,-19.20,2.48,0.00,1.00,-163.20,14.40,0 +177.60,-14.40,2.46,0.00,1.00,-168.00,-9.60,0 +177.60,-9.60,2.44,0.00,1.00,-172.80,9.60,0 +177.60,-4.80,2.41,0.00,1.00,-177.60,-4.80,0 +177.60,-0.00,2.39,0.00,1.00,177.60,0.00,0 +-177.60,0.00,2.37,0.00,1.00,172.80,0.00,0 +-177.60,4.80,2.35,0.00,1.00,168.00,-4.80,0 +-177.60,9.60,2.33,0.00,1.00,163.20,9.60,0 +-177.60,14.40,2.31,0.00,1.00,158.40,-9.60,0 +-177.60,19.20,2.29,0.00,1.00,153.60,14.40,0 +-177.60,24.00,2.26,0.00,1.00,148.80,-19.20,0 +-177.60,28.80,2.24,0.00,1.00,144.00,19.20,0 +-177.60,33.60,2.22,0.00,1.00,139.20,-24.00,0 +-177.60,38.40,2.20,0.00,1.00,134.40,24.00,0 +-177.60,43.20,2.18,0.00,1.00,129.60,-28.80,0 +-177.60,48.00,2.16,0.00,1.00,124.80,28.80,0 +-172.80,52.80,2.14,0.00,1.00,120.00,-33.60,0 +-172.80,57.60,2.11,0.00,1.00,115.20,33.60,0 +-172.80,62.40,2.09,0.00,1.00,110.40,-38.40,0 +-172.80,67.20,2.07,0.00,1.00,105.60,38.40,0 +-168.00,72.00,2.05,0.00,1.00,100.80,-38.40,0 +-163.20,76.80,2.03,0.00,1.00,96.00,38.40,0 +-148.80,81.60,2.01,0.00,1.00,91.20,-43.20,0 +-110.40,86.40,1.99,0.00,1.00,86.40,43.20,0 +-43.20,86.40,1.97,0.00,1.00,81.60,-43.20,0 +-24.00,81.60,1.94,0.00,1.00,76.80,43.20,0 +-14.40,76.80,1.92,0.00,1.00,72.00,-38.40,0 +-9.60,72.00,1.90,0.00,1.00,67.20,38.40,0 +-9.60,67.20,1.88,0.00,1.00,62.40,-38.40,0 +-4.80,62.40,1.86,0.00,1.00,57.60,33.60,0 +-4.80,57.60,1.84,0.00,1.00,52.80,-33.60,0 +-4.80,52.80,1.82,0.00,1.00,48.00,33.60,0 +-4.80,48.00,1.79,0.00,1.00,43.20,-28.80,0 +-4.80,43.20,1.77,0.00,1.00,38.40,28.80,0 +-4.80,38.40,1.75,0.00,1.00,33.60,-24.00,0 +-0.00,33.60,1.73,0.00,1.00,28.80,19.20,0 +-0.00,28.80,1.71,0.00,1.00,24.00,-19.20,0 +-0.00,24.00,1.69,0.00,1.00,19.20,14.40,0 +-0.00,19.20,1.67,0.00,1.00,14.40,-14.40,0 +-0.00,14.40,1.64,0.00,1.00,9.60,9.60,0 +-0.00,9.60,1.62,0.00,1.00,4.80,-4.80,0 +-0.00,4.80,1.60,0.00,1.00,0.00,4.80,0 +-0.00,0.00,1.58,0.00,1.00,-4.80,0.00,0 +-0.00,-4.80,1.56,0.00,1.00,-9.60,4.80,0 +-0.00,-9.60,1.54,0.00,1.00,-14.40,-4.80,0 +-0.00,-14.40,1.52,0.00,1.00,-19.20,9.60,0 +-0.00,-19.20,1.50,0.00,1.00,-24.00,-14.40,0 +-0.00,-24.00,1.47,0.00,1.00,-28.80,19.20,0 +-0.00,-28.80,1.45,0.00,1.00,-33.60,-19.20,0 +-0.00,-33.60,1.43,0.00,1.00,-38.40,24.00,0 +-0.00,-38.40,1.41,0.00,1.00,-43.20,-28.80,0 +-0.00,-43.20,1.39,0.00,1.00,-48.00,28.80,0 +-0.00,-48.00,1.37,0.00,1.00,-52.80,-33.60,0 +-0.00,-52.80,1.35,0.00,1.00,-57.60,33.60,0 +-0.00,-57.60,1.32,0.00,1.00,-62.40,-38.40,0 +-0.00,-62.40,1.30,0.00,1.00,-67.20,38.40,0 +-4.80,-67.20,1.28,0.00,1.00,-72.00,-43.20,0 +-4.80,-72.00,1.26,0.00,1.00,-76.80,43.20,0 +-4.80,-76.80,1.24,0.00,1.00,-81.60,-43.20,0 +-9.60,-81.60,1.22,0.00,1.00,-86.40,43.20,0 +-19.20,-86.40,1.20,0.00,1.00,-91.20,-48.00,0 +-134.40,-86.40,1.17,0.00,1.00,-96.00,48.00,0 +-168.00,-81.60,1.15,0.00,1.00,-100.80,-48.00,0 +-172.80,-76.80,1.13,0.00,1.00,-105.60,43.20,0 +-177.60,-72.00,1.11,0.00,1.00,-110.40,-43.20,0 +-177.60,-67.20,1.09,0.00,1.00,-115.20,43.20,0 +-177.60,-62.40,1.07,0.00,1.00,-120.00,-38.40,0 +-177.60,-57.60,1.05,0.00,1.00,-124.80,38.40,0 +-177.60,-52.80,1.03,0.00,1.00,-129.60,-38.40,0 +-177.60,-48.00,1.00,0.00,1.00,-134.40,33.60,0 +-177.60,-43.20,0.98,0.00,1.00,-139.20,-28.80,0 +-177.60,-38.40,0.96,0.00,1.00,-144.00,28.80,0 +-177.60,-33.60,0.94,0.00,1.00,-148.80,-24.00,0 +-177.60,-28.80,0.92,0.00,1.00,-153.60,24.00,0 +-177.60,-24.00,0.90,0.00,1.00,-158.40,-19.20,0 +-177.60,-19.20,0.88,0.00,1.00,-163.20,14.40,0 +-177.60,-14.40,0.85,0.00,1.00,-168.00,-14.40,0 +-177.60,-9.60,0.83,0.00,1.00,-172.80,9.60,0 +-177.60,-4.80,0.81,0.00,1.00,-177.60,-4.80,0 +-177.60,-0.00,0.79,0.00,1.00,177.60,0.00,0 +177.60,0.00,0.77,0.00,1.00,172.80,0.00,0 +177.60,4.80,0.75,0.00,1.00,168.00,-4.80,0 +177.60,9.60,0.73,0.00,1.00,163.20,9.60,0 +177.60,14.40,0.70,0.00,1.00,158.40,-14.40,0 +177.60,19.20,0.68,0.00,1.00,153.60,14.40,0 +177.60,24.00,0.66,0.00,1.00,148.80,-19.20,0 +177.60,28.80,0.64,0.00,1.00,144.00,24.00,0 +177.60,33.60,0.62,0.00,1.00,139.20,-24.00,0 +177.60,38.40,0.60,0.00,1.00,134.40,28.80,0 +177.60,43.20,0.58,0.00,1.00,129.60,-28.80,0 +177.60,48.00,0.56,0.00,1.00,124.80,33.60,0 +177.60,52.80,0.53,0.00,1.00,120.00,-38.40,0 +177.60,57.60,0.51,0.00,1.00,115.20,38.40,0 +177.60,62.40,0.49,0.00,1.00,110.40,-38.40,0 +177.60,67.20,0.47,0.00,1.00,105.60,43.20,0 +177.60,72.00,0.45,0.00,1.00,100.80,-43.20,0 +172.80,76.80,0.43,0.00,1.00,96.00,43.20,0 +168.00,81.60,0.41,0.00,1.00,91.20,-48.00,0 +134.40,86.40,0.38,0.00,1.00,86.40,48.00,0 +19.20,86.40,0.36,0.00,1.00,81.60,-48.00,0 +9.60,81.60,0.34,0.00,1.00,76.80,43.20,0 +4.80,76.80,0.32,0.00,1.00,72.00,-43.20,0 +4.80,72.00,0.30,0.00,1.00,67.20,43.20,0 +4.80,67.20,0.28,0.00,1.00,62.40,-43.20,0 +0.00,62.40,0.26,0.00,1.00,57.60,38.40,0 +0.00,57.60,0.23,0.00,1.00,52.80,-38.40,0 +0.00,52.80,0.21,0.00,1.00,48.00,33.60,0 +0.00,48.00,0.19,0.00,1.00,43.20,-33.60,0 +0.00,43.20,0.17,0.00,1.00,38.40,28.80,0 +0.00,38.40,0.15,0.00,1.00,33.60,-28.80,0 +0.00,33.60,0.13,0.00,1.00,28.80,24.00,0 +0.00,28.80,0.11,0.00,1.00,24.00,-19.20,0 +0.00,24.00,0.09,0.00,1.00,19.20,19.20,0 +0.00,19.20,0.06,0.00,1.00,14.40,-14.40,0 +0.00,14.40,0.04,0.00,1.00,9.60,9.60,0 +0.00,9.60,0.02,0.00,1.00,4.80,-4.80,0 +0.00,4.80,0.00,0.00,1.00,0.00,4.80,0 diff --git a/scripts/testv/stvISM2.csv b/scripts/testv/stvISM2.csv index dcd3fee39c2a449df4d955626a7148aaecba3fab..f5c6b1f25e71755e1b34e7ce7f6a8913f3e1a85f 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 +0.00,9.60,15.98,0.00,1.00,-177.60,4.80,0 +0.00,14.40,15.96,0.00,1.00,4.80,9.60,0 +0.00,19.20,15.94,0.00,1.00,-168.00,14.40,0 +0.00,24.00,15.91,0.00,1.00,14.40,19.20,0 +0.00,28.80,15.89,0.00,1.00,-163.20,24.00,0 +0.00,33.60,15.87,0.00,1.00,19.20,28.80,0 +0.00,38.40,15.85,0.00,1.00,-153.60,33.60,0 +0.00,43.20,15.83,0.00,1.00,28.80,38.40,0 +0.00,48.00,15.81,0.00,1.00,-148.80,43.20,0 +0.00,52.80,15.79,0.00,1.00,38.40,48.00,0 +0.00,57.60,15.77,0.00,1.00,-139.20,52.80,0 +0.00,62.40,15.74,0.00,1.00,48.00,57.60,0 +4.80,67.20,15.72,0.00,1.00,-124.80,62.40,0 +4.80,72.00,15.70,0.00,1.00,57.60,67.20,0 +4.80,76.80,15.68,0.00,1.00,-115.20,72.00,0 +9.60,81.60,15.66,0.00,1.00,72.00,76.80,0 +19.20,86.40,15.64,0.00,1.00,-100.80,81.60,0 +134.40,86.40,15.62,0.00,1.00,86.40,86.40,0 +168.00,81.60,15.59,0.00,1.00,-86.40,89.20,0 +172.80,76.80,15.57,0.00,1.00,100.80,86.40,0 +177.60,72.00,15.55,0.00,1.00,-76.80,81.60,0 +177.60,67.20,15.53,0.00,1.00,110.40,76.80,0 +177.60,62.40,15.51,0.00,1.00,-62.40,72.00,0 +177.60,57.60,15.49,0.00,1.00,124.80,67.20,0 +177.60,52.80,15.47,0.00,1.00,-52.80,62.40,0 +177.60,48.00,15.44,0.00,1.00,134.40,57.60,0 +177.60,43.20,15.42,0.00,1.00,-38.40,52.80,0 +177.60,38.40,15.40,0.00,1.00,144.00,48.00,0 +177.60,33.60,15.38,0.00,1.00,-33.60,43.20,0 +177.60,28.80,15.36,0.00,1.00,153.60,38.40,0 +177.60,24.00,15.34,0.00,1.00,-24.00,33.60,0 +177.60,19.20,15.32,0.00,1.00,158.40,28.80,0 +177.60,14.40,15.30,0.00,1.00,-14.40,24.00,0 +177.60,9.60,15.27,0.00,1.00,168.00,19.20,0 +177.60,4.80,15.25,0.00,1.00,-9.60,14.40,0 +177.60,0.00,15.23,0.00,1.00,172.80,9.60,0 +-177.60,-0.00,15.21,0.00,1.00,-0.00,4.80,0 +-177.60,-4.80,15.19,0.00,1.00,-177.60,-0.00,0 +-177.60,-9.60,15.17,0.00,1.00,4.80,-4.80,0 +-177.60,-14.40,15.15,0.00,1.00,-172.80,-9.60,0 +-177.60,-19.20,15.12,0.00,1.00,14.40,-14.40,0 +-177.60,-24.00,15.10,0.00,1.00,-163.20,-19.20,0 +-177.60,-28.80,15.08,0.00,1.00,19.20,-24.00,0 +-177.60,-33.60,15.06,0.00,1.00,-158.40,-28.80,0 +-177.60,-38.40,15.04,0.00,1.00,28.80,-33.60,0 +-177.60,-43.20,15.02,0.00,1.00,-148.80,-38.40,0 +-177.60,-48.00,15.00,0.00,1.00,33.60,-48.00,0 +-177.60,-52.80,14.97,0.00,1.00,-139.20,-48.00,0 +-177.60,-57.60,14.95,0.00,1.00,43.20,-52.80,0 +-177.60,-62.40,14.93,0.00,1.00,-129.60,-57.60,0 +-177.60,-67.20,14.91,0.00,1.00,57.60,-62.40,0 +-177.60,-72.00,14.89,0.00,1.00,-120.00,-67.20,0 +-172.80,-76.80,14.87,0.00,1.00,67.20,-76.80,0 +-168.00,-81.60,14.85,0.00,1.00,-105.60,-76.80,0 +-134.40,-86.40,14.83,0.00,1.00,81.60,-86.40,0 +-19.20,-86.40,14.80,0.00,1.00,-91.20,-89.20,0 +-9.60,-81.60,14.78,0.00,1.00,96.00,-86.40,0 +-4.80,-76.80,14.76,0.00,1.00,-76.80,-81.60,0 +-4.80,-72.00,14.74,0.00,1.00,110.40,-76.80,0 +-4.80,-67.20,14.72,0.00,1.00,-67.20,-72.00,0 +-0.00,-62.40,14.70,0.00,1.00,120.00,-67.20,0 +-0.00,-57.60,14.68,0.00,1.00,-52.80,-62.40,0 +-0.00,-52.80,14.65,0.00,1.00,129.60,-57.60,0 +-0.00,-48.00,14.63,0.00,1.00,-43.20,-52.80,0 +-0.00,-43.20,14.61,0.00,1.00,144.00,-48.00,0 +-0.00,-38.40,14.59,0.00,1.00,-33.60,-43.20,0 +-0.00,-33.60,14.57,0.00,1.00,148.80,-38.40,0 +-0.00,-28.80,14.55,0.00,1.00,-24.00,-33.60,0 +-0.00,-24.00,14.53,0.00,1.00,158.40,-28.80,0 +-0.00,-19.20,14.50,0.00,1.00,-19.20,-24.00,0 +-0.00,-14.40,14.48,0.00,1.00,168.00,-19.20,0 +-0.00,-9.60,14.46,0.00,1.00,-9.60,-14.40,0 +-0.00,-4.80,14.44,0.00,1.00,172.80,-9.60,0 +-0.00,0.00,14.42,0.00,1.00,-4.80,-4.80,0 +-0.00,4.80,14.40,0.00,1.00,0.00,0.00,0 +-0.00,9.60,14.38,0.00,1.00,-177.60,4.80,0 +-0.00,14.40,14.36,0.00,1.00,9.60,9.60,0 +-0.00,19.20,14.33,0.00,1.00,-168.00,14.40,0 +-0.00,24.00,14.31,0.00,1.00,14.40,19.20,0 +-0.00,28.80,14.29,0.00,1.00,-163.20,24.00,0 +-0.00,33.60,14.27,0.00,1.00,24.00,28.80,0 +-4.80,38.40,14.25,0.00,1.00,-153.60,33.60,0 +-4.80,43.20,14.23,0.00,1.00,28.80,38.40,0 +-4.80,48.00,14.21,0.00,1.00,-144.00,43.20,0 +-4.80,52.80,14.18,0.00,1.00,38.40,48.00,0 +-4.80,57.60,14.16,0.00,1.00,-134.40,52.80,0 +-4.80,62.40,14.14,0.00,1.00,48.00,57.60,0 +-9.60,67.20,14.12,0.00,1.00,-124.80,62.40,0 +-9.60,72.00,14.10,0.00,1.00,62.40,67.20,0 +-14.40,76.80,14.08,0.00,1.00,-115.20,72.00,0 +-24.00,81.60,14.06,0.00,1.00,72.00,76.80,0 +-43.20,86.40,14.03,0.00,1.00,-100.80,81.60,0 +-110.40,86.40,14.01,0.00,1.00,86.40,86.40,0 +-148.80,81.60,13.99,0.00,1.00,-86.40,86.40,0 +-163.20,76.80,13.97,0.00,1.00,96.00,81.60,0 +-168.00,72.00,13.95,0.00,1.00,-76.80,76.80,0 +-172.80,67.20,13.93,0.00,1.00,110.40,72.00,0 +-172.80,62.40,13.91,0.00,1.00,-62.40,67.20,0 +-172.80,57.60,13.89,0.00,1.00,120.00,62.40,0 +-172.80,52.80,13.86,0.00,1.00,-52.80,57.60,0 +-177.60,48.00,13.84,0.00,1.00,134.40,52.80,0 +-177.60,43.20,13.82,0.00,1.00,-43.20,48.00,0 +-177.60,38.40,13.80,0.00,1.00,144.00,43.20,0 +-177.60,33.60,13.78,0.00,1.00,-33.60,38.40,0 +-177.60,28.80,13.76,0.00,1.00,148.80,33.60,0 +-177.60,24.00,13.74,0.00,1.00,-24.00,28.80,0 +-177.60,19.20,13.71,0.00,1.00,158.40,24.00,0 +-177.60,14.40,13.69,0.00,1.00,-19.20,19.20,0 +-177.60,9.60,13.67,0.00,1.00,168.00,14.40,0 +-177.60,4.80,13.65,0.00,1.00,-9.60,9.60,0 +-177.60,0.00,13.63,0.00,1.00,172.80,4.80,0 +177.60,-0.00,13.61,0.00,1.00,-0.00,0.00,0 +177.60,-4.80,13.59,0.00,1.00,-177.60,-0.00,0 +177.60,-9.60,13.56,0.00,1.00,4.80,-4.80,0 +177.60,-14.40,13.54,0.00,1.00,-172.80,-9.60,0 +177.60,-19.20,13.52,0.00,1.00,14.40,-14.40,0 +177.60,-24.00,13.50,0.00,1.00,-163.20,-19.20,0 +177.60,-28.80,13.48,0.00,1.00,19.20,-24.00,0 +177.60,-33.60,13.46,0.00,1.00,-153.60,-28.80,0 +177.60,-38.40,13.44,0.00,1.00,28.80,-33.60,0 +177.60,-43.20,13.42,0.00,1.00,-148.80,-38.40,0 +177.60,-48.00,13.39,0.00,1.00,38.40,-43.20,0 +172.80,-52.80,13.37,0.00,1.00,-139.20,-48.00,0 +172.80,-57.60,13.35,0.00,1.00,48.00,-52.80,0 +172.80,-62.40,13.33,0.00,1.00,-124.80,-57.60,0 +172.80,-67.20,13.31,0.00,1.00,57.60,-62.40,0 +168.00,-72.00,13.29,0.00,1.00,-115.20,-67.20,0 +163.20,-76.80,13.27,0.00,1.00,72.00,-72.00,0 +148.80,-81.60,13.24,0.00,1.00,-105.60,-76.80,0 +110.40,-86.40,13.22,0.00,1.00,81.60,-81.60,0 +43.20,-86.40,13.20,0.00,1.00,-91.20,-86.40,0 +24.00,-81.60,13.18,0.00,1.00,96.00,-86.40,0 +14.40,-76.80,13.16,0.00,1.00,-76.80,-81.60,0 +9.60,-72.00,13.14,0.00,1.00,105.60,-76.80,0 +9.60,-67.20,13.12,0.00,1.00,-67.20,-72.00,0 +4.80,-62.40,13.09,0.00,1.00,120.00,-67.20,0 +4.80,-57.60,13.07,0.00,1.00,-57.60,-62.40,0 +4.80,-52.80,13.05,0.00,1.00,129.60,-57.60,0 +4.80,-48.00,13.03,0.00,1.00,-43.20,-52.80,0 +4.80,-43.20,13.01,0.00,1.00,139.20,-48.00,0 +4.80,-38.40,12.99,0.00,1.00,-33.60,-43.20,0 +0.00,-33.60,12.97,0.00,1.00,148.80,-38.40,0 +0.00,-28.80,12.95,0.00,1.00,-28.80,-33.60,0 +0.00,-24.00,12.92,0.00,1.00,158.40,-28.80,0 +0.00,-19.20,12.90,0.00,1.00,-19.20,-24.00,0 +0.00,-14.40,12.88,0.00,1.00,163.20,-19.20,0 +0.00,-9.60,12.86,0.00,1.00,-9.60,-14.40,0 +0.00,-4.80,12.84,0.00,1.00,172.80,-9.60,0 +0.00,0.00,12.82,0.00,1.00,-4.80,-4.80,0 +-0.00,4.80,12.80,0.00,1.00,0.00,0.00,0 +-0.00,9.60,12.77,0.00,1.00,-177.60,4.80,0 +-0.00,14.40,12.75,0.00,1.00,9.60,9.60,0 +-4.80,19.20,12.73,0.00,1.00,-168.00,14.40,0 +-4.80,24.00,12.71,0.00,1.00,14.40,19.20,0 +-4.80,28.80,12.69,0.00,1.00,-158.40,24.00,0 +-4.80,33.60,12.67,0.00,1.00,24.00,28.80,0 +-4.80,38.40,12.65,0.00,1.00,-153.60,33.60,0 +-9.60,43.20,12.62,0.00,1.00,33.60,38.40,0 +-9.60,48.00,12.60,0.00,1.00,-144.00,43.20,0 +-9.60,52.80,12.58,0.00,1.00,43.20,48.00,0 +-14.40,57.60,12.56,0.00,1.00,-134.40,52.80,0 +-14.40,62.40,12.54,0.00,1.00,52.80,57.60,0 +-19.20,67.20,12.52,0.00,1.00,-124.80,62.40,0 +-24.00,72.00,12.50,0.00,1.00,62.40,67.20,0 +-33.60,72.00,12.48,0.00,1.00,-110.40,72.00,0 +-43.20,76.80,12.45,0.00,1.00,72.00,72.00,0 +-67.20,81.60,12.43,0.00,1.00,-100.80,76.80,0 +-96.00,81.60,12.41,0.00,1.00,86.40,81.60,0 +-124.80,81.60,12.39,0.00,1.00,-86.40,81.60,0 +-144.00,76.80,12.37,0.00,1.00,96.00,76.80,0 +-153.60,72.00,12.35,0.00,1.00,-76.80,76.80,0 +-158.40,67.20,12.33,0.00,1.00,110.40,72.00,0 +-163.20,62.40,12.30,0.00,1.00,-67.20,67.20,0 +-168.00,57.60,12.28,0.00,1.00,120.00,62.40,0 +-168.00,52.80,12.26,0.00,1.00,-52.80,57.60,0 +-168.00,48.00,12.24,0.00,1.00,129.60,52.80,0 +-172.80,43.20,12.22,0.00,1.00,-43.20,48.00,0 +-172.80,38.40,12.20,0.00,1.00,139.20,43.20,0 +-172.80,33.60,12.18,0.00,1.00,-33.60,38.40,0 +-172.80,28.80,12.15,0.00,1.00,148.80,33.60,0 +-177.60,24.00,12.13,0.00,1.00,-24.00,28.80,0 +-177.60,19.20,12.11,0.00,1.00,158.40,24.00,0 +-177.60,14.40,12.09,0.00,1.00,-19.20,19.20,0 +-177.60,9.60,12.07,0.00,1.00,168.00,14.40,0 +-177.60,4.80,12.05,0.00,1.00,-9.60,9.60,0 +-177.60,0.00,12.03,0.00,1.00,172.80,4.80,0 +177.60,-0.00,12.01,0.00,1.00,-0.00,0.00,0 +177.60,-4.80,11.98,0.00,1.00,-177.60,-0.00,0 +177.60,-9.60,11.96,0.00,1.00,4.80,-4.80,0 +177.60,-14.40,11.94,0.00,1.00,-168.00,-9.60,0 +177.60,-19.20,11.92,0.00,1.00,14.40,-14.40,0 +177.60,-24.00,11.90,0.00,1.00,-163.20,-19.20,0 +172.80,-28.80,11.88,0.00,1.00,24.00,-24.00,0 +172.80,-33.60,11.86,0.00,1.00,-153.60,-28.80,0 +172.80,-38.40,11.83,0.00,1.00,28.80,-33.60,0 +172.80,-43.20,11.81,0.00,1.00,-144.00,-38.40,0 +168.00,-48.00,11.79,0.00,1.00,38.40,-43.20,0 +168.00,-52.80,11.77,0.00,1.00,-134.40,-48.00,0 +168.00,-57.60,11.75,0.00,1.00,48.00,-52.80,0 +163.20,-62.40,11.73,0.00,1.00,-124.80,-57.60,0 +158.40,-67.20,11.71,0.00,1.00,62.40,-62.40,0 +153.60,-72.00,11.68,0.00,1.00,-115.20,-67.20,0 +144.00,-76.80,11.66,0.00,1.00,72.00,-72.00,0 +124.80,-81.60,11.64,0.00,1.00,-100.80,-76.80,0 +96.00,-81.60,11.62,0.00,1.00,81.60,-76.80,0 +67.20,-81.60,11.60,0.00,1.00,-91.20,-81.60,0 +43.20,-76.80,11.58,0.00,1.00,96.00,-81.60,0 +33.60,-72.00,11.56,0.00,1.00,-81.60,-76.80,0 +24.00,-72.00,11.54,0.00,1.00,105.60,-72.00,0 +19.20,-67.20,11.51,0.00,1.00,-67.20,-72.00,0 +14.40,-62.40,11.49,0.00,1.00,115.20,-67.20,0 +14.40,-57.60,11.47,0.00,1.00,-57.60,-62.40,0 +9.60,-52.80,11.45,0.00,1.00,129.60,-57.60,0 +9.60,-48.00,11.43,0.00,1.00,-48.00,-52.80,0 +9.60,-43.20,11.41,0.00,1.00,139.20,-48.00,0 +4.80,-38.40,11.39,0.00,1.00,-38.40,-43.20,0 +4.80,-33.60,11.36,0.00,1.00,148.80,-38.40,0 +4.80,-28.80,11.34,0.00,1.00,-28.80,-33.60,0 +4.80,-24.00,11.32,0.00,1.00,153.60,-28.80,0 +4.80,-19.20,11.30,0.00,1.00,-19.20,-24.00,0 +0.00,-14.40,11.28,0.00,1.00,163.20,-19.20,0 +0.00,-9.60,11.26,0.00,1.00,-9.60,-14.40,0 +0.00,-4.80,11.24,0.00,1.00,172.80,-9.60,0 +0.00,0.00,11.21,0.00,1.00,-4.80,-4.80,0 +-0.00,4.80,11.19,0.00,1.00,0.00,0.00,0 +-0.00,9.60,11.17,0.00,1.00,-177.60,4.80,0 +-4.80,14.40,11.15,0.00,1.00,9.60,9.60,0 +-4.80,19.20,11.13,0.00,1.00,-168.00,14.40,0 +-4.80,24.00,11.11,0.00,1.00,14.40,19.20,0 +-4.80,28.80,11.09,0.00,1.00,-158.40,24.00,0 +-9.60,33.60,11.07,0.00,1.00,24.00,28.80,0 +-9.60,38.40,11.04,0.00,1.00,-148.80,33.60,0 +-14.40,43.20,11.02,0.00,1.00,33.60,38.40,0 +-14.40,48.00,11.00,0.00,1.00,-139.20,43.20,0 +-14.40,52.80,10.98,0.00,1.00,43.20,48.00,0 +-19.20,57.60,10.96,0.00,1.00,-129.60,52.80,0 +-24.00,57.60,10.94,0.00,1.00,52.80,52.80,0 +-28.80,62.40,10.92,0.00,1.00,-120.00,57.60,0 +-33.60,67.20,10.89,0.00,1.00,62.40,62.40,0 +-43.20,72.00,10.87,0.00,1.00,-110.40,67.20,0 +-57.60,72.00,10.85,0.00,1.00,76.80,72.00,0 +-76.80,76.80,10.83,0.00,1.00,-100.80,72.00,0 +-96.00,76.80,10.81,0.00,1.00,86.40,76.80,0 +-115.20,76.80,10.79,0.00,1.00,-86.40,76.80,0 +-129.60,72.00,10.77,0.00,1.00,96.00,76.80,0 +-139.20,72.00,10.74,0.00,1.00,-76.80,72.00,0 +-148.80,67.20,10.72,0.00,1.00,105.60,67.20,0 +-153.60,62.40,10.70,0.00,1.00,-67.20,67.20,0 +-158.40,57.60,10.68,0.00,1.00,120.00,62.40,0 +-163.20,52.80,10.66,0.00,1.00,-57.60,57.60,0 +-163.20,48.00,10.64,0.00,1.00,129.60,52.80,0 +-168.00,43.20,10.62,0.00,1.00,-48.00,48.00,0 +-168.00,38.40,10.60,0.00,1.00,139.20,43.20,0 +-172.80,33.60,10.57,0.00,1.00,-38.40,38.40,0 +-172.80,28.80,10.55,0.00,1.00,148.80,33.60,0 +-172.80,24.00,10.53,0.00,1.00,-28.80,28.80,0 +-172.80,19.20,10.51,0.00,1.00,158.40,24.00,0 +-177.60,14.40,10.49,0.00,1.00,-19.20,19.20,0 +-177.60,9.60,10.47,0.00,1.00,163.20,14.40,0 +-177.60,4.80,10.45,0.00,1.00,-9.60,9.60,0 +-177.60,0.00,10.42,0.00,1.00,172.80,4.80,0 +177.60,-0.00,10.40,0.00,1.00,-0.00,0.00,0 +177.60,-4.80,10.38,0.00,1.00,-177.60,-0.00,0 +177.60,-9.60,10.36,0.00,1.00,4.80,-4.80,0 +177.60,-14.40,10.34,0.00,1.00,-168.00,-9.60,0 +172.80,-19.20,10.32,0.00,1.00,14.40,-14.40,0 +172.80,-24.00,10.30,0.00,1.00,-163.20,-19.20,0 +172.80,-28.80,10.28,0.00,1.00,24.00,-24.00,0 +172.80,-33.60,10.25,0.00,1.00,-153.60,-28.80,0 +168.00,-38.40,10.23,0.00,1.00,33.60,-33.60,0 +168.00,-43.20,10.21,0.00,1.00,-144.00,-38.40,0 +163.20,-48.00,10.19,0.00,1.00,43.20,-43.20,0 +163.20,-52.80,10.17,0.00,1.00,-134.40,-48.00,0 +158.40,-57.60,10.15,0.00,1.00,52.80,-52.80,0 +153.60,-62.40,10.13,0.00,1.00,-124.80,-57.60,0 +148.80,-67.20,10.10,0.00,1.00,62.40,-62.40,0 +139.20,-72.00,10.08,0.00,1.00,-115.20,-67.20,0 +129.60,-72.00,10.06,0.00,1.00,72.00,-67.20,0 +115.20,-76.80,10.04,0.00,1.00,-100.80,-72.00,0 +96.00,-76.80,10.02,0.00,1.00,81.60,-76.80,0 +76.80,-76.80,10.00,0.00,1.00,-91.20,-76.80,0 +57.60,-72.00,9.98,0.00,1.00,96.00,-76.80,0 +43.20,-72.00,9.95,0.00,1.00,-81.60,-72.00,0 +33.60,-67.20,9.93,0.00,1.00,105.60,-72.00,0 +28.80,-62.40,9.91,0.00,1.00,-67.20,-67.20,0 +24.00,-57.60,9.89,0.00,1.00,115.20,-62.40,0 +19.20,-57.60,9.87,0.00,1.00,-57.60,-57.60,0 +14.40,-52.80,9.85,0.00,1.00,124.80,-52.80,0 +14.40,-48.00,9.83,0.00,1.00,-48.00,-52.80,0 +14.40,-43.20,9.81,0.00,1.00,134.40,-48.00,0 +9.60,-38.40,9.78,0.00,1.00,-38.40,-43.20,0 +9.60,-33.60,9.76,0.00,1.00,144.00,-38.40,0 +4.80,-28.80,9.74,0.00,1.00,-28.80,-33.60,0 +4.80,-24.00,9.72,0.00,1.00,153.60,-28.80,0 +4.80,-19.20,9.70,0.00,1.00,-19.20,-24.00,0 +4.80,-14.40,9.68,0.00,1.00,163.20,-19.20,0 +0.00,-9.60,9.66,0.00,1.00,-14.40,-14.40,0 +0.00,-4.80,9.63,0.00,1.00,172.80,-9.60,0 +0.00,0.00,9.61,0.00,1.00,-4.80,-4.80,0 +-0.00,4.80,9.59,0.00,1.00,0.00,0.00,0 +-4.80,9.60,9.57,0.00,1.00,-177.60,4.80,0 +-4.80,14.40,9.55,0.00,1.00,9.60,9.60,0 +-4.80,19.20,9.53,0.00,1.00,-168.00,14.40,0 +-9.60,24.00,9.51,0.00,1.00,19.20,19.20,0 +-9.60,28.80,9.48,0.00,1.00,-158.40,24.00,0 +-9.60,33.60,9.46,0.00,1.00,24.00,28.80,0 +-14.40,38.40,9.44,0.00,1.00,-148.80,33.60,0 +-14.40,38.40,9.42,0.00,1.00,33.60,33.60,0 +-19.20,43.20,9.40,0.00,1.00,-139.20,38.40,0 +-24.00,48.00,9.38,0.00,1.00,43.20,43.20,0 +-24.00,52.80,9.36,0.00,1.00,-129.60,48.00,0 +-28.80,57.60,9.34,0.00,1.00,52.80,52.80,0 +-38.40,62.40,9.31,0.00,1.00,-120.00,57.60,0 +-43.20,62.40,9.29,0.00,1.00,67.20,62.40,0 +-52.80,67.20,9.27,0.00,1.00,-110.40,62.40,0 +-62.40,72.00,9.25,0.00,1.00,76.80,67.20,0 +-76.80,72.00,9.23,0.00,1.00,-100.80,67.20,0 +-96.00,72.00,9.21,0.00,1.00,86.40,72.00,0 +-110.40,72.00,9.19,0.00,1.00,-86.40,72.00,0 +-120.00,67.20,9.16,0.00,1.00,96.00,72.00,0 +-134.40,67.20,9.14,0.00,1.00,-76.80,67.20,0 +-139.20,62.40,9.12,0.00,1.00,105.60,67.20,0 +-148.80,57.60,9.10,0.00,1.00,-67.20,62.40,0 +-153.60,57.60,9.08,0.00,1.00,115.20,57.60,0 +-158.40,52.80,9.06,0.00,1.00,-57.60,52.80,0 +-158.40,48.00,9.04,0.00,1.00,129.60,52.80,0 +-163.20,43.20,9.01,0.00,1.00,-48.00,48.00,0 +-163.20,38.40,8.99,0.00,1.00,139.20,43.20,0 +-168.00,33.60,8.97,0.00,1.00,-38.40,38.40,0 +-168.00,28.80,8.95,0.00,1.00,148.80,33.60,0 +-172.80,24.00,8.93,0.00,1.00,-28.80,28.80,0 +-172.80,19.20,8.91,0.00,1.00,153.60,24.00,0 +-172.80,14.40,8.89,0.00,1.00,-19.20,19.20,0 +-177.60,9.60,8.87,0.00,1.00,163.20,14.40,0 +-177.60,4.80,8.84,0.00,1.00,-9.60,9.60,0 +-177.60,0.00,8.82,0.00,1.00,172.80,4.80,0 +177.60,-0.00,8.80,0.00,1.00,-0.00,0.00,0 +177.60,-4.80,8.78,0.00,1.00,-177.60,-0.00,0 +177.60,-9.60,8.76,0.00,1.00,4.80,-4.80,0 +172.80,-14.40,8.74,0.00,1.00,-168.00,-9.60,0 +172.80,-19.20,8.72,0.00,1.00,14.40,-14.40,0 +172.80,-24.00,8.69,0.00,1.00,-158.40,-19.20,0 +168.00,-28.80,8.67,0.00,1.00,24.00,-24.00,0 +168.00,-33.60,8.65,0.00,1.00,-153.60,-28.80,0 +163.20,-38.40,8.63,0.00,1.00,33.60,-33.60,0 +163.20,-43.20,8.61,0.00,1.00,-144.00,-38.40,0 +158.40,-48.00,8.59,0.00,1.00,43.20,-43.20,0 +158.40,-52.80,8.57,0.00,1.00,-134.40,-48.00,0 +153.60,-57.60,8.54,0.00,1.00,52.80,-52.80,0 +148.80,-57.60,8.52,0.00,1.00,-124.80,-52.80,0 +139.20,-62.40,8.50,0.00,1.00,62.40,-57.60,0 +134.40,-67.20,8.48,0.00,1.00,-110.40,-62.40,0 +120.00,-67.20,8.46,0.00,1.00,72.00,-67.20,0 +110.40,-72.00,8.44,0.00,1.00,-100.80,-67.20,0 +96.00,-72.00,8.42,0.00,1.00,81.60,-72.00,0 +76.80,-72.00,8.40,0.00,1.00,-91.20,-72.00,0 +62.40,-72.00,8.37,0.00,1.00,96.00,-72.00,0 +52.80,-67.20,8.35,0.00,1.00,-81.60,-67.20,0 +43.20,-62.40,8.33,0.00,1.00,105.60,-67.20,0 +38.40,-62.40,8.31,0.00,1.00,-72.00,-62.40,0 +28.80,-57.60,8.29,0.00,1.00,115.20,-62.40,0 +24.00,-52.80,8.27,0.00,1.00,-57.60,-57.60,0 +24.00,-48.00,8.25,0.00,1.00,124.80,-52.80,0 +19.20,-43.20,8.22,0.00,1.00,-48.00,-48.00,0 +14.40,-38.40,8.20,0.00,1.00,134.40,-43.20,0 +14.40,-38.40,8.18,0.00,1.00,-38.40,-38.40,0 +9.60,-33.60,8.16,0.00,1.00,144.00,-33.60,0 +9.60,-28.80,8.14,0.00,1.00,-28.80,-33.60,0 +9.60,-24.00,8.12,0.00,1.00,153.60,-28.80,0 +4.80,-19.20,8.10,0.00,1.00,-24.00,-24.00,0 +4.80,-14.40,8.07,0.00,1.00,163.20,-19.20,0 +4.80,-9.60,8.05,0.00,1.00,-14.40,-14.40,0 +0.00,-4.80,8.03,0.00,1.00,172.80,-9.60,0 +0.00,0.00,8.01,0.00,1.00,-4.80,-4.80,0 +-0.00,4.80,7.99,0.00,1.00,0.00,0.00,0 +-4.80,9.60,7.97,0.00,1.00,-177.60,4.80,0 +-4.80,14.40,7.95,0.00,1.00,9.60,9.60,0 +-9.60,19.20,7.93,0.00,1.00,-168.00,14.40,0 +-9.60,24.00,7.90,0.00,1.00,19.20,19.20,0 +-14.40,24.00,7.88,0.00,1.00,-158.40,24.00,0 +-14.40,28.80,7.86,0.00,1.00,28.80,24.00,0 +-19.20,33.60,7.84,0.00,1.00,-148.80,28.80,0 +-19.20,38.40,7.82,0.00,1.00,38.40,33.60,0 +-24.00,43.20,7.80,0.00,1.00,-139.20,38.40,0 +-28.80,48.00,7.78,0.00,1.00,48.00,43.20,0 +-33.60,52.80,7.75,0.00,1.00,-129.60,48.00,0 +-38.40,52.80,7.73,0.00,1.00,57.60,52.80,0 +-43.20,57.60,7.71,0.00,1.00,-120.00,52.80,0 +-48.00,62.40,7.69,0.00,1.00,67.20,57.60,0 +-57.60,62.40,7.67,0.00,1.00,-110.40,62.40,0 +-67.20,67.20,7.65,0.00,1.00,76.80,62.40,0 +-81.60,67.20,7.63,0.00,1.00,-100.80,62.40,0 +-91.20,67.20,7.60,0.00,1.00,86.40,67.20,0 +-105.60,67.20,7.58,0.00,1.00,-86.40,67.20,0 +-115.20,67.20,7.56,0.00,1.00,96.00,67.20,0 +-124.80,62.40,7.54,0.00,1.00,-76.80,62.40,0 +-134.40,57.60,7.52,0.00,1.00,105.60,62.40,0 +-139.20,57.60,7.50,0.00,1.00,-67.20,57.60,0 +-144.00,52.80,7.48,0.00,1.00,115.20,57.60,0 +-148.80,48.00,7.46,0.00,1.00,-57.60,52.80,0 +-153.60,43.20,7.43,0.00,1.00,124.80,48.00,0 +-158.40,43.20,7.41,0.00,1.00,-48.00,43.20,0 +-163.20,38.40,7.39,0.00,1.00,134.40,38.40,0 +-163.20,33.60,7.37,0.00,1.00,-38.40,38.40,0 +-168.00,28.80,7.35,0.00,1.00,144.00,33.60,0 +-168.00,24.00,7.33,0.00,1.00,-28.80,28.80,0 +-172.80,19.20,7.31,0.00,1.00,153.60,24.00,0 +-172.80,14.40,7.28,0.00,1.00,-19.20,19.20,0 +-177.60,9.60,7.26,0.00,1.00,163.20,14.40,0 +-177.60,4.80,7.24,0.00,1.00,-9.60,9.60,0 +-177.60,0.00,7.22,0.00,1.00,172.80,4.80,0 +177.60,-0.00,7.20,0.00,1.00,-0.00,0.00,0 +177.60,-4.80,7.18,0.00,1.00,-177.60,-0.00,0 +177.60,-9.60,7.16,0.00,1.00,4.80,-4.80,0 +172.80,-14.40,7.13,0.00,1.00,-168.00,-9.60,0 +172.80,-19.20,7.11,0.00,1.00,14.40,-14.40,0 +168.00,-24.00,7.09,0.00,1.00,-158.40,-19.20,0 +168.00,-28.80,7.07,0.00,1.00,24.00,-24.00,0 +163.20,-33.60,7.05,0.00,1.00,-148.80,-28.80,0 +163.20,-38.40,7.03,0.00,1.00,33.60,-33.60,0 +158.40,-43.20,7.01,0.00,1.00,-139.20,-38.40,0 +153.60,-43.20,6.99,0.00,1.00,43.20,-38.40,0 +148.80,-48.00,6.96,0.00,1.00,-129.60,-43.20,0 +144.00,-52.80,6.94,0.00,1.00,52.80,-48.00,0 +139.20,-57.60,6.92,0.00,1.00,-120.00,-52.80,0 +134.40,-57.60,6.90,0.00,1.00,62.40,-57.60,0 +124.80,-62.40,6.88,0.00,1.00,-110.40,-57.60,0 +115.20,-67.20,6.86,0.00,1.00,72.00,-62.40,0 +105.60,-67.20,6.84,0.00,1.00,-100.80,-62.40,0 +91.20,-67.20,6.81,0.00,1.00,81.60,-67.20,0 +81.60,-67.20,6.79,0.00,1.00,-91.20,-67.20,0 +67.20,-67.20,6.77,0.00,1.00,96.00,-67.20,0 +57.60,-62.40,6.75,0.00,1.00,-81.60,-62.40,0 +48.00,-62.40,6.73,0.00,1.00,105.60,-62.40,0 +43.20,-57.60,6.71,0.00,1.00,-72.00,-62.40,0 +38.40,-52.80,6.69,0.00,1.00,115.20,-57.60,0 +33.60,-52.80,6.66,0.00,1.00,-62.40,-52.80,0 +28.80,-48.00,6.64,0.00,1.00,124.80,-52.80,0 +24.00,-43.20,6.62,0.00,1.00,-52.80,-48.00,0 +19.20,-38.40,6.60,0.00,1.00,134.40,-43.20,0 +19.20,-33.60,6.58,0.00,1.00,-43.20,-38.40,0 +14.40,-28.80,6.56,0.00,1.00,144.00,-33.60,0 +14.40,-24.00,6.54,0.00,1.00,-33.60,-28.80,0 +9.60,-24.00,6.52,0.00,1.00,153.60,-24.00,0 +9.60,-19.20,6.49,0.00,1.00,-24.00,-24.00,0 +4.80,-14.40,6.47,0.00,1.00,163.20,-19.20,0 +4.80,-9.60,6.45,0.00,1.00,-14.40,-14.40,0 +0.00,-4.80,6.43,0.00,1.00,172.80,-9.60,0 +0.00,0.00,6.41,0.00,1.00,-4.80,-4.80,0 +-0.00,4.80,6.39,0.00,1.00,0.00,0.00,0 +-4.80,9.60,6.37,0.00,1.00,-177.60,4.80,0 +-4.80,14.40,6.34,0.00,1.00,9.60,9.60,0 +-9.60,19.20,6.32,0.00,1.00,-168.00,14.40,0 +-9.60,19.20,6.30,0.00,1.00,19.20,14.40,0 +-14.40,24.00,6.28,0.00,1.00,-158.40,19.20,0 +-19.20,28.80,6.26,0.00,1.00,28.80,24.00,0 +-19.20,33.60,6.24,0.00,1.00,-148.80,28.80,0 +-24.00,38.40,6.22,0.00,1.00,38.40,33.60,0 +-28.80,43.20,6.19,0.00,1.00,-139.20,38.40,0 +-33.60,43.20,6.17,0.00,1.00,48.00,38.40,0 +-38.40,48.00,6.15,0.00,1.00,-129.60,43.20,0 +-43.20,52.80,6.13,0.00,1.00,57.60,48.00,0 +-48.00,52.80,6.11,0.00,1.00,-120.00,52.80,0 +-52.80,57.60,6.09,0.00,1.00,67.20,52.80,0 +-62.40,57.60,6.07,0.00,1.00,-110.40,57.60,0 +-72.00,62.40,6.05,0.00,1.00,76.80,57.60,0 +-81.60,62.40,6.02,0.00,1.00,-100.80,62.40,0 +-91.20,62.40,6.00,0.00,1.00,86.40,62.40,0 +-100.80,62.40,5.98,0.00,1.00,-86.40,62.40,0 +-110.40,62.40,5.96,0.00,1.00,96.00,62.40,0 +-120.00,57.60,5.94,0.00,1.00,-76.80,57.60,0 +-129.60,57.60,5.92,0.00,1.00,105.60,57.60,0 +-134.40,52.80,5.90,0.00,1.00,-67.20,57.60,0 +-139.20,48.00,5.87,0.00,1.00,115.20,52.80,0 +-144.00,48.00,5.85,0.00,1.00,-57.60,48.00,0 +-148.80,43.20,5.83,0.00,1.00,124.80,48.00,0 +-153.60,38.40,5.81,0.00,1.00,-48.00,43.20,0 +-158.40,33.60,5.79,0.00,1.00,134.40,38.40,0 +-163.20,33.60,5.77,0.00,1.00,-38.40,33.60,0 +-163.20,28.80,5.75,0.00,1.00,144.00,28.80,0 +-168.00,24.00,5.72,0.00,1.00,-28.80,28.80,0 +-168.00,19.20,5.70,0.00,1.00,153.60,24.00,0 +-172.80,14.40,5.68,0.00,1.00,-19.20,19.20,0 +-172.80,9.60,5.66,0.00,1.00,163.20,14.40,0 +-177.60,4.80,5.64,0.00,1.00,-9.60,9.60,0 +-177.60,0.00,5.62,0.00,1.00,172.80,4.80,0 +177.60,-0.00,5.60,0.00,1.00,-0.00,0.00,0 +177.60,-4.80,5.58,0.00,1.00,-177.60,-0.00,0 +172.80,-9.60,5.55,0.00,1.00,4.80,-4.80,0 +172.80,-14.40,5.53,0.00,1.00,-168.00,-9.60,0 +168.00,-19.20,5.51,0.00,1.00,14.40,-14.40,0 +168.00,-24.00,5.49,0.00,1.00,-158.40,-19.20,0 +163.20,-28.80,5.47,0.00,1.00,24.00,-24.00,0 +163.20,-33.60,5.45,0.00,1.00,-148.80,-28.80,0 +158.40,-33.60,5.43,0.00,1.00,33.60,-28.80,0 +153.60,-38.40,5.40,0.00,1.00,-139.20,-33.60,0 +148.80,-43.20,5.38,0.00,1.00,43.20,-38.40,0 +144.00,-48.00,5.36,0.00,1.00,-129.60,-43.20,0 +139.20,-48.00,5.34,0.00,1.00,52.80,-48.00,0 +134.40,-52.80,5.32,0.00,1.00,-120.00,-48.00,0 +129.60,-57.60,5.30,0.00,1.00,62.40,-52.80,0 +120.00,-57.60,5.28,0.00,1.00,-110.40,-57.60,0 +110.40,-62.40,5.26,0.00,1.00,72.00,-57.60,0 +100.80,-62.40,5.23,0.00,1.00,-100.80,-57.60,0 +91.20,-62.40,5.21,0.00,1.00,81.60,-62.40,0 +81.60,-62.40,5.19,0.00,1.00,-91.20,-62.40,0 +72.00,-62.40,5.17,0.00,1.00,96.00,-62.40,0 +62.40,-57.60,5.15,0.00,1.00,-81.60,-62.40,0 +52.80,-57.60,5.13,0.00,1.00,105.60,-57.60,0 +48.00,-52.80,5.11,0.00,1.00,-72.00,-57.60,0 +43.20,-52.80,5.08,0.00,1.00,115.20,-52.80,0 +38.40,-48.00,5.06,0.00,1.00,-62.40,-52.80,0 +33.60,-43.20,5.04,0.00,1.00,124.80,-48.00,0 +28.80,-43.20,5.02,0.00,1.00,-52.80,-43.20,0 +24.00,-38.40,5.00,0.00,1.00,134.40,-38.40,0 +19.20,-33.60,4.98,0.00,1.00,-43.20,-38.40,0 +19.20,-28.80,4.96,0.00,1.00,144.00,-33.60,0 +14.40,-24.00,4.93,0.00,1.00,-33.60,-28.80,0 +9.60,-19.20,4.91,0.00,1.00,153.60,-24.00,0 +9.60,-19.20,4.89,0.00,1.00,-24.00,-19.20,0 +4.80,-14.40,4.87,0.00,1.00,163.20,-14.40,0 +4.80,-9.60,4.85,0.00,1.00,-14.40,-14.40,0 +0.00,-4.80,4.83,0.00,1.00,172.80,-9.60,0 +0.00,0.00,4.81,0.00,1.00,-4.80,-4.80,0 +-4.80,4.80,4.79,0.00,1.00,0.00,0.00,0 +-4.80,9.60,4.76,0.00,1.00,-177.60,4.80,0 +-9.60,14.40,4.74,0.00,1.00,9.60,9.60,0 +-9.60,14.40,4.72,0.00,1.00,-168.00,9.60,0 +-14.40,19.20,4.70,0.00,1.00,19.20,14.40,0 +-14.40,24.00,4.68,0.00,1.00,-158.40,19.20,0 +-19.20,28.80,4.66,0.00,1.00,28.80,24.00,0 +-24.00,33.60,4.64,0.00,1.00,-148.80,28.80,0 +-28.80,33.60,4.61,0.00,1.00,38.40,28.80,0 +-28.80,38.40,4.59,0.00,1.00,-139.20,33.60,0 +-33.60,43.20,4.57,0.00,1.00,48.00,38.40,0 +-38.40,43.20,4.55,0.00,1.00,-129.60,43.20,0 +-48.00,48.00,4.53,0.00,1.00,57.60,43.20,0 +-52.80,52.80,4.51,0.00,1.00,-120.00,48.00,0 +-57.60,52.80,4.49,0.00,1.00,67.20,48.00,0 +-67.20,57.60,4.46,0.00,1.00,-110.40,52.80,0 +-76.80,57.60,4.44,0.00,1.00,76.80,52.80,0 +-81.60,57.60,4.42,0.00,1.00,-100.80,57.60,0 +-91.20,57.60,4.40,0.00,1.00,86.40,57.60,0 +-100.80,57.60,4.38,0.00,1.00,-86.40,57.60,0 +-110.40,57.60,4.36,0.00,1.00,96.00,57.60,0 +-115.20,52.80,4.34,0.00,1.00,-76.80,52.80,0 +-124.80,52.80,4.32,0.00,1.00,105.60,52.80,0 +-129.60,48.00,4.29,0.00,1.00,-67.20,52.80,0 +-139.20,48.00,4.27,0.00,1.00,115.20,48.00,0 +-144.00,43.20,4.25,0.00,1.00,-57.60,48.00,0 +-148.80,38.40,4.23,0.00,1.00,124.80,43.20,0 +-153.60,38.40,4.21,0.00,1.00,-48.00,38.40,0 +-153.60,33.60,4.19,0.00,1.00,134.40,38.40,0 +-158.40,28.80,4.17,0.00,1.00,-38.40,33.60,0 +-163.20,24.00,4.14,0.00,1.00,144.00,28.80,0 +-163.20,24.00,4.12,0.00,1.00,-28.80,24.00,0 +-168.00,19.20,4.10,0.00,1.00,153.60,24.00,0 +-172.80,14.40,4.08,0.00,1.00,-19.20,19.20,0 +-172.80,9.60,4.06,0.00,1.00,163.20,14.40,0 +-177.60,4.80,4.04,0.00,1.00,-9.60,9.60,0 +-177.60,0.00,4.02,0.00,1.00,172.80,4.80,0 +177.60,-0.00,3.99,0.00,1.00,-0.00,0.00,0 +177.60,-4.80,3.97,0.00,1.00,-177.60,-0.00,0 +172.80,-9.60,3.95,0.00,1.00,4.80,-4.80,0 +172.80,-14.40,3.93,0.00,1.00,-168.00,-9.60,0 +168.00,-19.20,3.91,0.00,1.00,14.40,-14.40,0 +163.20,-24.00,3.89,0.00,1.00,-158.40,-19.20,0 +163.20,-24.00,3.87,0.00,1.00,24.00,-24.00,0 +158.40,-28.80,3.85,0.00,1.00,-148.80,-24.00,0 +153.60,-33.60,3.82,0.00,1.00,33.60,-28.80,0 +153.60,-38.40,3.80,0.00,1.00,-139.20,-33.60,0 +148.80,-38.40,3.78,0.00,1.00,43.20,-38.40,0 +144.00,-43.20,3.76,0.00,1.00,-129.60,-38.40,0 +139.20,-48.00,3.74,0.00,1.00,52.80,-43.20,0 +129.60,-48.00,3.72,0.00,1.00,-120.00,-48.00,0 +124.80,-52.80,3.70,0.00,1.00,62.40,-48.00,0 +115.20,-52.80,3.67,0.00,1.00,-110.40,-52.80,0 +110.40,-57.60,3.65,0.00,1.00,72.00,-52.80,0 +100.80,-57.60,3.63,0.00,1.00,-100.80,-52.80,0 +91.20,-57.60,3.61,0.00,1.00,81.60,-57.60,0 +81.60,-57.60,3.59,0.00,1.00,-91.20,-57.60,0 +76.80,-57.60,3.57,0.00,1.00,96.00,-57.60,0 +67.20,-57.60,3.55,0.00,1.00,-81.60,-57.60,0 +57.60,-52.80,3.52,0.00,1.00,105.60,-52.80,0 +52.80,-52.80,3.50,0.00,1.00,-72.00,-52.80,0 +48.00,-48.00,3.48,0.00,1.00,115.20,-48.00,0 +38.40,-43.20,3.46,0.00,1.00,-62.40,-48.00,0 +33.60,-43.20,3.44,0.00,1.00,124.80,-43.20,0 +28.80,-38.40,3.42,0.00,1.00,-52.80,-43.20,0 +28.80,-33.60,3.40,0.00,1.00,134.40,-38.40,0 +24.00,-33.60,3.38,0.00,1.00,-43.20,-33.60,0 +19.20,-28.80,3.35,0.00,1.00,144.00,-28.80,0 +14.40,-24.00,3.33,0.00,1.00,-33.60,-28.80,0 +14.40,-19.20,3.31,0.00,1.00,153.60,-24.00,0 +9.60,-14.40,3.29,0.00,1.00,-24.00,-19.20,0 +9.60,-14.40,3.27,0.00,1.00,163.20,-14.40,0 +4.80,-9.60,3.25,0.00,1.00,-14.40,-9.60,0 +4.80,-4.80,3.23,0.00,1.00,172.80,-9.60,0 +0.00,0.00,3.20,0.00,1.00,-4.80,-4.80,0 +-4.80,4.80,3.18,0.00,1.00,0.00,0.00,0 +-4.80,9.60,3.16,0.00,1.00,-177.60,4.80,0 +-9.60,9.60,3.14,0.00,1.00,9.60,9.60,0 +-9.60,14.40,3.12,0.00,1.00,-168.00,9.60,0 +-14.40,19.20,3.10,0.00,1.00,19.20,14.40,0 +-19.20,24.00,3.08,0.00,1.00,-158.40,19.20,0 +-24.00,24.00,3.05,0.00,1.00,28.80,24.00,0 +-24.00,28.80,3.03,0.00,1.00,-148.80,24.00,0 +-28.80,33.60,3.01,0.00,1.00,38.40,28.80,0 +-33.60,38.40,2.99,0.00,1.00,-139.20,33.60,0 +-38.40,38.40,2.97,0.00,1.00,48.00,33.60,0 +-43.20,43.20,2.95,0.00,1.00,-129.60,38.40,0 +-48.00,43.20,2.93,0.00,1.00,57.60,43.20,0 +-52.80,48.00,2.91,0.00,1.00,-120.00,43.20,0 +-62.40,48.00,2.88,0.00,1.00,67.20,48.00,0 +-67.20,52.80,2.86,0.00,1.00,-110.40,48.00,0 +-76.80,52.80,2.84,0.00,1.00,76.80,48.00,0 +-86.40,52.80,2.82,0.00,1.00,-100.80,52.80,0 +-91.20,52.80,2.80,0.00,1.00,86.40,52.80,0 +-100.80,52.80,2.78,0.00,1.00,-86.40,52.80,0 +-105.60,52.80,2.76,0.00,1.00,96.00,52.80,0 +-115.20,48.00,2.73,0.00,1.00,-76.80,48.00,0 +-120.00,48.00,2.71,0.00,1.00,105.60,48.00,0 +-129.60,48.00,2.69,0.00,1.00,-67.20,48.00,0 +-134.40,43.20,2.67,0.00,1.00,115.20,43.20,0 +-139.20,43.20,2.65,0.00,1.00,-57.60,43.20,0 +-144.00,38.40,2.63,0.00,1.00,124.80,38.40,0 +-148.80,33.60,2.61,0.00,1.00,-48.00,38.40,0 +-153.60,33.60,2.58,0.00,1.00,134.40,33.60,0 +-158.40,28.80,2.56,0.00,1.00,-38.40,28.80,0 +-158.40,24.00,2.54,0.00,1.00,144.00,28.80,0 +-163.20,19.20,2.52,0.00,1.00,-28.80,24.00,0 +-168.00,19.20,2.50,0.00,1.00,153.60,19.20,0 +-168.00,14.40,2.48,0.00,1.00,-19.20,14.40,0 +-172.80,9.60,2.46,0.00,1.00,163.20,14.40,0 +-177.60,4.80,2.44,0.00,1.00,-9.60,9.60,0 +-177.60,0.00,2.41,0.00,1.00,172.80,4.80,0 +177.60,-0.00,2.39,0.00,1.00,-0.00,0.00,0 +177.60,-4.80,2.37,0.00,1.00,-177.60,-0.00,0 +172.80,-9.60,2.35,0.00,1.00,4.80,-4.80,0 +168.00,-14.40,2.33,0.00,1.00,-168.00,-9.60,0 +168.00,-19.20,2.31,0.00,1.00,14.40,-14.40,0 +163.20,-19.20,2.29,0.00,1.00,-158.40,-14.40,0 +158.40,-24.00,2.26,0.00,1.00,24.00,-19.20,0 +158.40,-28.80,2.24,0.00,1.00,-148.80,-24.00,0 +153.60,-33.60,2.22,0.00,1.00,33.60,-28.80,0 +148.80,-33.60,2.20,0.00,1.00,-139.20,-28.80,0 +144.00,-38.40,2.18,0.00,1.00,43.20,-33.60,0 +139.20,-43.20,2.16,0.00,1.00,-129.60,-38.40,0 +134.40,-43.20,2.14,0.00,1.00,52.80,-38.40,0 +129.60,-48.00,2.11,0.00,1.00,-120.00,-43.20,0 +120.00,-48.00,2.09,0.00,1.00,62.40,-43.20,0 +115.20,-48.00,2.07,0.00,1.00,-110.40,-48.00,0 +105.60,-52.80,2.05,0.00,1.00,72.00,-48.00,0 +100.80,-52.80,2.03,0.00,1.00,-100.80,-48.00,0 +91.20,-52.80,2.01,0.00,1.00,81.60,-52.80,0 +86.40,-52.80,1.99,0.00,1.00,-91.20,-52.80,0 +76.80,-52.80,1.97,0.00,1.00,96.00,-52.80,0 +67.20,-52.80,1.94,0.00,1.00,-81.60,-52.80,0 +62.40,-48.00,1.92,0.00,1.00,105.60,-48.00,0 +52.80,-48.00,1.90,0.00,1.00,-72.00,-48.00,0 +48.00,-43.20,1.88,0.00,1.00,115.20,-48.00,0 +43.20,-43.20,1.86,0.00,1.00,-62.40,-43.20,0 +38.40,-38.40,1.84,0.00,1.00,124.80,-43.20,0 +33.60,-38.40,1.82,0.00,1.00,-52.80,-38.40,0 +28.80,-33.60,1.79,0.00,1.00,134.40,-33.60,0 +24.00,-28.80,1.77,0.00,1.00,-43.20,-33.60,0 +24.00,-24.00,1.75,0.00,1.00,144.00,-28.80,0 +19.20,-24.00,1.73,0.00,1.00,-33.60,-24.00,0 +14.40,-19.20,1.71,0.00,1.00,153.60,-24.00,0 +9.60,-14.40,1.69,0.00,1.00,-24.00,-19.20,0 +9.60,-9.60,1.67,0.00,1.00,163.20,-14.40,0 +4.80,-9.60,1.64,0.00,1.00,-14.40,-9.60,0 +4.80,-4.80,1.62,0.00,1.00,172.80,-9.60,0 +0.00,0.00,1.60,0.00,1.00,-4.80,-4.80,0 +-4.80,4.80,1.58,0.00,1.00,0.00,0.00,0 +-4.80,4.80,1.56,0.00,1.00,-177.60,4.80,0 +-9.60,9.60,1.54,0.00,1.00,9.60,4.80,0 +-14.40,14.40,1.52,0.00,1.00,-168.00,9.60,0 +-14.40,19.20,1.50,0.00,1.00,19.20,14.40,0 +-19.20,19.20,1.47,0.00,1.00,-158.40,19.20,0 +-24.00,24.00,1.45,0.00,1.00,28.80,19.20,0 +-28.80,28.80,1.43,0.00,1.00,-148.80,24.00,0 +-33.60,28.80,1.41,0.00,1.00,38.40,28.80,0 +-38.40,33.60,1.39,0.00,1.00,-139.20,28.80,0 +-43.20,38.40,1.37,0.00,1.00,48.00,33.60,0 +-48.00,38.40,1.35,0.00,1.00,-129.60,33.60,0 +-52.80,43.20,1.32,0.00,1.00,57.60,38.40,0 +-57.60,43.20,1.30,0.00,1.00,-120.00,38.40,0 +-62.40,43.20,1.28,0.00,1.00,67.20,43.20,0 +-72.00,48.00,1.26,0.00,1.00,-110.40,43.20,0 +-76.80,48.00,1.24,0.00,1.00,76.80,43.20,0 +-86.40,48.00,1.22,0.00,1.00,-100.80,48.00,0 +-91.20,48.00,1.20,0.00,1.00,86.40,48.00,0 +-100.80,48.00,1.17,0.00,1.00,-86.40,48.00,0 +-105.60,48.00,1.15,0.00,1.00,96.00,48.00,0 +-110.40,48.00,1.13,0.00,1.00,-76.80,48.00,0 +-120.00,43.20,1.11,0.00,1.00,105.60,43.20,0 +-124.80,43.20,1.09,0.00,1.00,-67.20,43.20,0 +-129.60,38.40,1.07,0.00,1.00,115.20,43.20,0 +-134.40,38.40,1.05,0.00,1.00,-57.60,38.40,0 +-139.20,33.60,1.03,0.00,1.00,124.80,38.40,0 +-144.00,33.60,1.00,0.00,1.00,-48.00,33.60,0 +-148.80,28.80,0.98,0.00,1.00,134.40,33.60,0 +-153.60,24.00,0.96,0.00,1.00,-38.40,28.80,0 +-158.40,24.00,0.94,0.00,1.00,144.00,24.00,0 +-163.20,19.20,0.92,0.00,1.00,-28.80,24.00,0 +-163.20,14.40,0.90,0.00,1.00,153.60,19.20,0 +-168.00,14.40,0.88,0.00,1.00,-19.20,14.40,0 +-172.80,9.60,0.85,0.00,1.00,163.20,14.40,0 +-172.80,4.80,0.83,0.00,1.00,-9.60,9.60,0 +-177.60,0.00,0.81,0.00,1.00,172.80,4.80,0 +177.60,-0.00,0.79,0.00,1.00,-0.00,0.00,0 +172.80,-4.80,0.77,0.00,1.00,-177.60,-0.00,0 +172.80,-9.60,0.75,0.00,1.00,4.80,-4.80,0 +168.00,-14.40,0.73,0.00,1.00,-168.00,-9.60,0 +163.20,-14.40,0.70,0.00,1.00,14.40,-14.40,0 +163.20,-19.20,0.68,0.00,1.00,-158.40,-14.40,0 +158.40,-24.00,0.66,0.00,1.00,24.00,-19.20,0 +153.60,-24.00,0.64,0.00,1.00,-148.80,-24.00,0 +148.80,-28.80,0.62,0.00,1.00,33.60,-24.00,0 +144.00,-33.60,0.60,0.00,1.00,-139.20,-28.80,0 +139.20,-33.60,0.58,0.00,1.00,43.20,-33.60,0 +134.40,-38.40,0.56,0.00,1.00,-129.60,-33.60,0 +129.60,-38.40,0.53,0.00,1.00,52.80,-38.40,0 +124.80,-43.20,0.51,0.00,1.00,-120.00,-38.40,0 +120.00,-43.20,0.49,0.00,1.00,62.40,-43.20,0 +110.40,-48.00,0.47,0.00,1.00,-110.40,-43.20,0 +105.60,-48.00,0.45,0.00,1.00,72.00,-43.20,0 +100.80,-48.00,0.43,0.00,1.00,-100.80,-48.00,0 +91.20,-48.00,0.41,0.00,1.00,81.60,-48.00,0 +86.40,-48.00,0.38,0.00,1.00,-91.20,-48.00,0 +76.80,-48.00,0.36,0.00,1.00,96.00,-48.00,0 +72.00,-48.00,0.34,0.00,1.00,-81.60,-48.00,0 +62.40,-43.20,0.32,0.00,1.00,105.60,-43.20,0 +57.60,-43.20,0.30,0.00,1.00,-72.00,-43.20,0 +52.80,-43.20,0.28,0.00,1.00,115.20,-43.20,0 +48.00,-38.40,0.26,0.00,1.00,-62.40,-38.40,0 +43.20,-38.40,0.23,0.00,1.00,124.80,-38.40,0 +38.40,-33.60,0.21,0.00,1.00,-52.80,-33.60,0 +33.60,-28.80,0.19,0.00,1.00,134.40,-33.60,0 +28.80,-28.80,0.17,0.00,1.00,-43.20,-28.80,0 +24.00,-24.00,0.15,0.00,1.00,144.00,-28.80,0 +19.20,-19.20,0.13,0.00,1.00,-33.60,-24.00,0 +14.40,-19.20,0.11,0.00,1.00,153.60,-19.20,0 +14.40,-14.40,0.09,0.00,1.00,-24.00,-19.20,0 +9.60,-9.60,0.06,0.00,1.00,163.20,-14.40,0 +4.80,-4.80,0.04,0.00,1.00,-14.40,-9.60,0 +4.80,-4.80,0.02,0.00,1.00,172.80,-4.80,0 +0.00,0.00,0.00,0.00,1.00,-4.80,-4.80,0 +-4.80,4.80,0.00,0.00,1.00,0.00,0.00,0 +-4.80,4.80,0.02,0.00,1.00,-177.60,4.80,0 +-9.60,9.60,0.04,0.00,1.00,9.60,4.80,0 +-14.40,14.40,0.06,0.00,1.00,-168.00,9.60,0 +-19.20,14.40,0.09,0.00,1.00,19.20,14.40,0 +-24.00,19.20,0.11,0.00,1.00,-158.40,14.40,0 +-24.00,24.00,0.13,0.00,1.00,28.80,19.20,0 +-28.80,24.00,0.15,0.00,1.00,-148.80,24.00,0 +-33.60,28.80,0.17,0.00,1.00,38.40,24.00,0 +-38.40,28.80,0.19,0.00,1.00,-139.20,28.80,0 +-43.20,33.60,0.21,0.00,1.00,48.00,28.80,0 +-48.00,33.60,0.23,0.00,1.00,-129.60,33.60,0 +-52.80,38.40,0.26,0.00,1.00,57.60,33.60,0 +-62.40,38.40,0.28,0.00,1.00,-120.00,38.40,0 +-67.20,38.40,0.30,0.00,1.00,67.20,38.40,0 +-72.00,43.20,0.32,0.00,1.00,-110.40,38.40,0 +-76.80,43.20,0.34,0.00,1.00,76.80,38.40,0 +-86.40,43.20,0.36,0.00,1.00,-100.80,43.20,0 +-91.20,43.20,0.38,0.00,1.00,86.40,43.20,0 +-96.00,43.20,0.41,0.00,1.00,-86.40,43.20,0 +-105.60,43.20,0.43,0.00,1.00,96.00,43.20,0 +-110.40,43.20,0.45,0.00,1.00,-76.80,43.20,0 +-115.20,38.40,0.47,0.00,1.00,105.60,38.40,0 +-124.80,38.40,0.49,0.00,1.00,-67.20,38.40,0 +-129.60,38.40,0.51,0.00,1.00,115.20,38.40,0 +-134.40,33.60,0.53,0.00,1.00,-57.60,33.60,0 +-139.20,33.60,0.56,0.00,1.00,124.80,33.60,0 +-144.00,28.80,0.58,0.00,1.00,-48.00,28.80,0 +-148.80,28.80,0.60,0.00,1.00,134.40,28.80,0 +-153.60,24.00,0.62,0.00,1.00,-38.40,24.00,0 +-158.40,19.20,0.64,0.00,1.00,144.00,24.00,0 +-158.40,19.20,0.66,0.00,1.00,-28.80,19.20,0 +-163.20,14.40,0.68,0.00,1.00,153.60,19.20,0 +-168.00,9.60,0.70,0.00,1.00,-19.20,14.40,0 +-172.80,9.60,0.73,0.00,1.00,163.20,9.60,0 +-172.80,4.80,0.75,0.00,1.00,-9.60,9.60,0 +-177.60,0.00,0.77,0.00,1.00,172.80,4.80,0 +177.60,-0.00,0.79,0.00,1.00,-0.00,0.00,0 +172.80,-4.80,0.81,0.00,1.00,-177.60,-0.00,0 +172.80,-9.60,0.83,0.00,1.00,4.80,-4.80,0 +168.00,-9.60,0.85,0.00,1.00,-168.00,-9.60,0 +163.20,-14.40,0.88,0.00,1.00,14.40,-9.60,0 +158.40,-19.20,0.90,0.00,1.00,-158.40,-14.40,0 +158.40,-19.20,0.92,0.00,1.00,24.00,-19.20,0 +153.60,-24.00,0.94,0.00,1.00,-148.80,-19.20,0 +148.80,-28.80,0.96,0.00,1.00,33.60,-24.00,0 +144.00,-28.80,0.98,0.00,1.00,-139.20,-24.00,0 +139.20,-33.60,1.00,0.00,1.00,43.20,-28.80,0 +134.40,-33.60,1.03,0.00,1.00,-129.60,-28.80,0 +129.60,-38.40,1.05,0.00,1.00,52.80,-33.60,0 +124.80,-38.40,1.07,0.00,1.00,-120.00,-33.60,0 +115.20,-38.40,1.09,0.00,1.00,62.40,-38.40,0 +110.40,-43.20,1.11,0.00,1.00,-110.40,-38.40,0 +105.60,-43.20,1.13,0.00,1.00,72.00,-38.40,0 +96.00,-43.20,1.15,0.00,1.00,-100.80,-43.20,0 +91.20,-43.20,1.17,0.00,1.00,81.60,-43.20,0 +86.40,-43.20,1.20,0.00,1.00,-91.20,-43.20,0 +76.80,-43.20,1.22,0.00,1.00,96.00,-43.20,0 +72.00,-43.20,1.24,0.00,1.00,-81.60,-43.20,0 +67.20,-38.40,1.26,0.00,1.00,105.60,-38.40,0 +62.40,-38.40,1.28,0.00,1.00,-72.00,-38.40,0 +52.80,-38.40,1.30,0.00,1.00,115.20,-38.40,0 +48.00,-33.60,1.32,0.00,1.00,-62.40,-38.40,0 +43.20,-33.60,1.35,0.00,1.00,124.80,-33.60,0 +38.40,-28.80,1.37,0.00,1.00,-52.80,-33.60,0 +33.60,-28.80,1.39,0.00,1.00,134.40,-28.80,0 +28.80,-24.00,1.41,0.00,1.00,-43.20,-28.80,0 +24.00,-24.00,1.43,0.00,1.00,144.00,-24.00,0 +24.00,-19.20,1.45,0.00,1.00,-33.60,-24.00,0 +19.20,-14.40,1.47,0.00,1.00,153.60,-19.20,0 +14.40,-14.40,1.50,0.00,1.00,-24.00,-14.40,0 +9.60,-9.60,1.52,0.00,1.00,163.20,-14.40,0 +4.80,-4.80,1.54,0.00,1.00,-14.40,-9.60,0 +4.80,-4.80,1.56,0.00,1.00,172.80,-4.80,0 +0.00,0.00,1.58,0.00,1.00,-4.80,-4.80,0 +-4.80,4.80,1.60,0.00,1.00,0.00,0.00,0 +-9.60,4.80,1.62,0.00,1.00,-177.60,4.80,0 +-9.60,9.60,1.64,0.00,1.00,9.60,4.80,0 +-14.40,9.60,1.67,0.00,1.00,-168.00,9.60,0 +-19.20,14.40,1.69,0.00,1.00,19.20,9.60,0 +-24.00,19.20,1.71,0.00,1.00,-158.40,14.40,0 +-28.80,19.20,1.73,0.00,1.00,28.80,19.20,0 +-33.60,24.00,1.75,0.00,1.00,-148.80,19.20,0 +-38.40,24.00,1.77,0.00,1.00,38.40,24.00,0 +-43.20,28.80,1.79,0.00,1.00,-139.20,24.00,0 +-48.00,28.80,1.82,0.00,1.00,48.00,28.80,0 +-52.80,33.60,1.84,0.00,1.00,-129.60,28.80,0 +-57.60,33.60,1.86,0.00,1.00,57.60,28.80,0 +-62.40,33.60,1.88,0.00,1.00,-120.00,33.60,0 +-67.20,38.40,1.90,0.00,1.00,67.20,33.60,0 +-72.00,38.40,1.92,0.00,1.00,-110.40,33.60,0 +-81.60,38.40,1.94,0.00,1.00,76.80,38.40,0 +-86.40,38.40,1.97,0.00,1.00,-100.80,38.40,0 +-91.20,38.40,1.99,0.00,1.00,86.40,38.40,0 +-96.00,38.40,2.01,0.00,1.00,-86.40,38.40,0 +-105.60,38.40,2.03,0.00,1.00,96.00,38.40,0 +-110.40,38.40,2.05,0.00,1.00,-76.80,38.40,0 +-115.20,33.60,2.07,0.00,1.00,105.60,33.60,0 +-120.00,33.60,2.09,0.00,1.00,-67.20,33.60,0 +-124.80,33.60,2.11,0.00,1.00,115.20,33.60,0 +-129.60,28.80,2.14,0.00,1.00,-57.60,33.60,0 +-134.40,28.80,2.16,0.00,1.00,124.80,28.80,0 +-139.20,24.00,2.18,0.00,1.00,-48.00,28.80,0 +-144.00,24.00,2.20,0.00,1.00,134.40,24.00,0 +-148.80,19.20,2.22,0.00,1.00,-38.40,24.00,0 +-153.60,19.20,2.24,0.00,1.00,144.00,19.20,0 +-158.40,14.40,2.26,0.00,1.00,-28.80,19.20,0 +-163.20,14.40,2.29,0.00,1.00,153.60,14.40,0 +-168.00,9.60,2.31,0.00,1.00,-19.20,14.40,0 +-172.80,9.60,2.33,0.00,1.00,163.20,9.60,0 +-172.80,4.80,2.35,0.00,1.00,-9.60,9.60,0 +-177.60,0.00,2.37,0.00,1.00,172.80,4.80,0 +177.60,-0.00,2.39,0.00,1.00,-0.00,0.00,0 +172.80,-4.80,2.41,0.00,1.00,-177.60,-0.00,0 +172.80,-9.60,2.44,0.00,1.00,4.80,-4.80,0 +168.00,-9.60,2.46,0.00,1.00,-168.00,-9.60,0 +163.20,-14.40,2.48,0.00,1.00,14.40,-9.60,0 +158.40,-14.40,2.50,0.00,1.00,-158.40,-14.40,0 +153.60,-19.20,2.52,0.00,1.00,24.00,-14.40,0 +148.80,-19.20,2.54,0.00,1.00,-148.80,-19.20,0 +144.00,-24.00,2.56,0.00,1.00,33.60,-19.20,0 +139.20,-24.00,2.58,0.00,1.00,-139.20,-24.00,0 +134.40,-28.80,2.61,0.00,1.00,43.20,-24.00,0 +129.60,-28.80,2.63,0.00,1.00,-129.60,-28.80,0 +124.80,-33.60,2.65,0.00,1.00,52.80,-28.80,0 +120.00,-33.60,2.67,0.00,1.00,-120.00,-33.60,0 +115.20,-33.60,2.69,0.00,1.00,62.40,-33.60,0 +110.40,-38.40,2.71,0.00,1.00,-110.40,-33.60,0 +105.60,-38.40,2.73,0.00,1.00,72.00,-33.60,0 +96.00,-38.40,2.76,0.00,1.00,-100.80,-38.40,0 +91.20,-38.40,2.78,0.00,1.00,81.60,-38.40,0 +86.40,-38.40,2.80,0.00,1.00,-91.20,-38.40,0 +81.60,-38.40,2.82,0.00,1.00,96.00,-38.40,0 +72.00,-38.40,2.84,0.00,1.00,-81.60,-38.40,0 +67.20,-38.40,2.86,0.00,1.00,105.60,-38.40,0 +62.40,-33.60,2.88,0.00,1.00,-72.00,-33.60,0 +57.60,-33.60,2.91,0.00,1.00,115.20,-33.60,0 +52.80,-33.60,2.93,0.00,1.00,-62.40,-33.60,0 +48.00,-28.80,2.95,0.00,1.00,124.80,-28.80,0 +43.20,-28.80,2.97,0.00,1.00,-52.80,-28.80,0 +38.40,-24.00,2.99,0.00,1.00,134.40,-28.80,0 +33.60,-24.00,3.01,0.00,1.00,-43.20,-24.00,0 +28.80,-19.20,3.03,0.00,1.00,144.00,-24.00,0 +24.00,-19.20,3.05,0.00,1.00,-33.60,-19.20,0 +19.20,-14.40,3.08,0.00,1.00,153.60,-19.20,0 +14.40,-9.60,3.10,0.00,1.00,-24.00,-14.40,0 +9.60,-9.60,3.12,0.00,1.00,163.20,-9.60,0 +9.60,-4.80,3.14,0.00,1.00,-14.40,-9.60,0 +4.80,-4.80,3.16,0.00,1.00,172.80,-4.80,0 +0.00,0.00,3.18,0.00,1.00,-4.80,-4.80,0 +-4.80,4.80,3.20,0.00,1.00,0.00,0.00,0 +-9.60,4.80,3.23,0.00,1.00,-177.60,4.80,0 +-14.40,9.60,3.25,0.00,1.00,9.60,4.80,0 +-14.40,9.60,3.27,0.00,1.00,-168.00,9.60,0 +-19.20,14.40,3.29,0.00,1.00,19.20,9.60,0 +-24.00,14.40,3.31,0.00,1.00,-158.40,14.40,0 +-28.80,19.20,3.33,0.00,1.00,28.80,14.40,0 +-33.60,19.20,3.35,0.00,1.00,-148.80,19.20,0 +-38.40,24.00,3.38,0.00,1.00,38.40,19.20,0 +-43.20,24.00,3.40,0.00,1.00,-139.20,19.20,0 +-48.00,24.00,3.42,0.00,1.00,48.00,24.00,0 +-52.80,28.80,3.44,0.00,1.00,-129.60,24.00,0 +-57.60,28.80,3.46,0.00,1.00,57.60,28.80,0 +-62.40,28.80,3.48,0.00,1.00,-120.00,28.80,0 +-67.20,33.60,3.50,0.00,1.00,67.20,28.80,0 +-72.00,33.60,3.52,0.00,1.00,-110.40,28.80,0 +-81.60,33.60,3.55,0.00,1.00,76.80,33.60,0 +-86.40,33.60,3.57,0.00,1.00,-100.80,33.60,0 +-91.20,33.60,3.59,0.00,1.00,86.40,33.60,0 +-96.00,33.60,3.61,0.00,1.00,-86.40,33.60,0 +-100.80,33.60,3.63,0.00,1.00,96.00,33.60,0 +-110.40,33.60,3.65,0.00,1.00,-76.80,33.60,0 +-115.20,33.60,3.67,0.00,1.00,105.60,28.80,0 +-120.00,28.80,3.70,0.00,1.00,-67.20,28.80,0 +-124.80,28.80,3.72,0.00,1.00,115.20,28.80,0 +-129.60,28.80,3.74,0.00,1.00,-57.60,28.80,0 +-134.40,24.00,3.76,0.00,1.00,124.80,24.00,0 +-139.20,24.00,3.78,0.00,1.00,-48.00,24.00,0 +-144.00,19.20,3.80,0.00,1.00,134.40,24.00,0 +-148.80,19.20,3.82,0.00,1.00,-38.40,19.20,0 +-153.60,14.40,3.85,0.00,1.00,144.00,19.20,0 +-158.40,14.40,3.87,0.00,1.00,-28.80,14.40,0 +-163.20,9.60,3.89,0.00,1.00,153.60,14.40,0 +-168.00,9.60,3.91,0.00,1.00,-19.20,9.60,0 +-168.00,4.80,3.93,0.00,1.00,163.20,9.60,0 +-172.80,4.80,3.95,0.00,1.00,-9.60,4.80,0 +-177.60,0.00,3.97,0.00,1.00,172.80,4.80,0 +177.60,-0.00,3.99,0.00,1.00,-0.00,0.00,0 +172.80,-4.80,4.02,0.00,1.00,-177.60,-0.00,0 +168.00,-4.80,4.04,0.00,1.00,4.80,-4.80,0 +168.00,-9.60,4.06,0.00,1.00,-168.00,-4.80,0 +163.20,-9.60,4.08,0.00,1.00,14.40,-9.60,0 +158.40,-14.40,4.10,0.00,1.00,-158.40,-9.60,0 +153.60,-14.40,4.12,0.00,1.00,24.00,-14.40,0 +148.80,-19.20,4.14,0.00,1.00,-148.80,-14.40,0 +144.00,-19.20,4.17,0.00,1.00,33.60,-19.20,0 +139.20,-24.00,4.19,0.00,1.00,-139.20,-19.20,0 +134.40,-24.00,4.21,0.00,1.00,43.20,-24.00,0 +129.60,-28.80,4.23,0.00,1.00,-129.60,-24.00,0 +124.80,-28.80,4.25,0.00,1.00,52.80,-24.00,0 +120.00,-28.80,4.27,0.00,1.00,-120.00,-28.80,0 +115.20,-33.60,4.29,0.00,1.00,62.40,-28.80,0 +110.40,-33.60,4.32,0.00,1.00,-110.40,-28.80,0 +100.80,-33.60,4.34,0.00,1.00,72.00,-28.80,0 +96.00,-33.60,4.36,0.00,1.00,-100.80,-33.60,0 +91.20,-33.60,4.38,0.00,1.00,81.60,-33.60,0 +86.40,-33.60,4.40,0.00,1.00,-91.20,-33.60,0 +81.60,-33.60,4.42,0.00,1.00,96.00,-33.60,0 +72.00,-33.60,4.44,0.00,1.00,-81.60,-33.60,0 +67.20,-33.60,4.46,0.00,1.00,105.60,-33.60,0 +62.40,-28.80,4.49,0.00,1.00,-72.00,-28.80,0 +57.60,-28.80,4.51,0.00,1.00,115.20,-28.80,0 +52.80,-28.80,4.53,0.00,1.00,-62.40,-28.80,0 +48.00,-24.00,4.55,0.00,1.00,124.80,-28.80,0 +43.20,-24.00,4.57,0.00,1.00,-52.80,-24.00,0 +38.40,-24.00,4.59,0.00,1.00,134.40,-24.00,0 +33.60,-19.20,4.61,0.00,1.00,-43.20,-19.20,0 +28.80,-19.20,4.64,0.00,1.00,144.00,-19.20,0 +24.00,-14.40,4.66,0.00,1.00,-33.60,-19.20,0 +19.20,-14.40,4.68,0.00,1.00,153.60,-14.40,0 +14.40,-9.60,4.70,0.00,1.00,-24.00,-14.40,0 +14.40,-9.60,4.72,0.00,1.00,163.20,-9.60,0 +9.60,-4.80,4.74,0.00,1.00,-14.40,-9.60,0 +4.80,-4.80,4.76,0.00,1.00,172.80,-4.80,0 +0.00,0.00,4.79,0.00,1.00,-4.80,-4.80,0 +-4.80,0.00,4.81,0.00,1.00,0.00,0.00,0 +-9.60,4.80,4.83,0.00,1.00,-177.60,0.00,0 +-14.40,4.80,4.85,0.00,1.00,9.60,4.80,0 +-19.20,9.60,4.87,0.00,1.00,-168.00,4.80,0 +-19.20,9.60,4.89,0.00,1.00,19.20,9.60,0 +-24.00,14.40,4.91,0.00,1.00,-158.40,9.60,0 +-28.80,14.40,4.93,0.00,1.00,28.80,14.40,0 +-33.60,19.20,4.96,0.00,1.00,-148.80,14.40,0 +-38.40,19.20,4.98,0.00,1.00,38.40,14.40,0 +-43.20,19.20,5.00,0.00,1.00,-139.20,19.20,0 +-48.00,24.00,5.02,0.00,1.00,48.00,19.20,0 +-52.80,24.00,5.04,0.00,1.00,-129.60,24.00,0 +-57.60,24.00,5.06,0.00,1.00,57.60,24.00,0 +-62.40,24.00,5.08,0.00,1.00,-120.00,24.00,0 +-72.00,28.80,5.11,0.00,1.00,67.20,24.00,0 +-76.80,28.80,5.13,0.00,1.00,-110.40,24.00,0 +-81.60,28.80,5.15,0.00,1.00,76.80,28.80,0 +-86.40,28.80,5.17,0.00,1.00,-100.80,28.80,0 +-91.20,28.80,5.19,0.00,1.00,86.40,28.80,0 +-96.00,28.80,5.21,0.00,1.00,-86.40,28.80,0 +-100.80,28.80,5.23,0.00,1.00,96.00,28.80,0 +-105.60,28.80,5.26,0.00,1.00,-76.80,28.80,0 +-115.20,28.80,5.28,0.00,1.00,105.60,28.80,0 +-120.00,24.00,5.30,0.00,1.00,-67.20,24.00,0 +-124.80,24.00,5.32,0.00,1.00,115.20,24.00,0 +-129.60,24.00,5.34,0.00,1.00,-57.60,24.00,0 +-134.40,24.00,5.36,0.00,1.00,124.80,24.00,0 +-139.20,19.20,5.38,0.00,1.00,-48.00,19.20,0 +-144.00,19.20,5.40,0.00,1.00,134.40,19.20,0 +-148.80,14.40,5.43,0.00,1.00,-38.40,19.20,0 +-153.60,14.40,5.45,0.00,1.00,144.00,14.40,0 +-158.40,14.40,5.47,0.00,1.00,-28.80,14.40,0 +-163.20,9.60,5.49,0.00,1.00,153.60,9.60,0 +-163.20,9.60,5.51,0.00,1.00,-19.20,9.60,0 +-168.00,4.80,5.53,0.00,1.00,163.20,9.60,0 +-172.80,4.80,5.55,0.00,1.00,-9.60,4.80,0 +-177.60,0.00,5.58,0.00,1.00,172.80,4.80,0 +177.60,-0.00,5.60,0.00,1.00,-0.00,0.00,0 +172.80,-4.80,5.62,0.00,1.00,-177.60,-0.00,0 +168.00,-4.80,5.64,0.00,1.00,4.80,-4.80,0 +163.20,-9.60,5.66,0.00,1.00,-168.00,-4.80,0 +163.20,-9.60,5.68,0.00,1.00,14.40,-9.60,0 +158.40,-14.40,5.70,0.00,1.00,-158.40,-9.60,0 +153.60,-14.40,5.72,0.00,1.00,24.00,-9.60,0 +148.80,-14.40,5.75,0.00,1.00,-148.80,-14.40,0 +144.00,-19.20,5.77,0.00,1.00,33.60,-14.40,0 +139.20,-19.20,5.79,0.00,1.00,-139.20,-19.20,0 +134.40,-24.00,5.81,0.00,1.00,43.20,-19.20,0 +129.60,-24.00,5.83,0.00,1.00,-129.60,-19.20,0 +124.80,-24.00,5.85,0.00,1.00,52.80,-24.00,0 +120.00,-24.00,5.87,0.00,1.00,-120.00,-24.00,0 +115.20,-28.80,5.90,0.00,1.00,62.40,-24.00,0 +105.60,-28.80,5.92,0.00,1.00,-110.40,-24.00,0 +100.80,-28.80,5.94,0.00,1.00,72.00,-28.80,0 +96.00,-28.80,5.96,0.00,1.00,-100.80,-28.80,0 +91.20,-28.80,5.98,0.00,1.00,81.60,-28.80,0 +86.40,-28.80,6.00,0.00,1.00,-91.20,-28.80,0 +81.60,-28.80,6.02,0.00,1.00,96.00,-28.80,0 +76.80,-28.80,6.05,0.00,1.00,-81.60,-28.80,0 +72.00,-28.80,6.07,0.00,1.00,105.60,-28.80,0 +62.40,-24.00,6.09,0.00,1.00,-72.00,-24.00,0 +57.60,-24.00,6.11,0.00,1.00,115.20,-24.00,0 +52.80,-24.00,6.13,0.00,1.00,-62.40,-24.00,0 +48.00,-24.00,6.15,0.00,1.00,124.80,-24.00,0 +43.20,-19.20,6.17,0.00,1.00,-52.80,-24.00,0 +38.40,-19.20,6.19,0.00,1.00,134.40,-19.20,0 +33.60,-19.20,6.22,0.00,1.00,-43.20,-19.20,0 +28.80,-14.40,6.24,0.00,1.00,144.00,-14.40,0 +24.00,-14.40,6.26,0.00,1.00,-33.60,-14.40,0 +19.20,-9.60,6.28,0.00,1.00,153.60,-14.40,0 +19.20,-9.60,6.30,0.00,1.00,-24.00,-9.60,0 +14.40,-4.80,6.32,0.00,1.00,163.20,-9.60,0 +9.60,-4.80,6.34,0.00,1.00,-14.40,-4.80,0 +4.80,-0.00,6.37,0.00,1.00,172.80,-4.80,0 +0.00,0.00,6.39,0.00,1.00,-4.80,-0.00,0 +-4.80,0.00,6.41,0.00,1.00,0.00,0.00,0 +-9.60,4.80,6.43,0.00,1.00,-177.60,0.00,0 +-14.40,4.80,6.45,0.00,1.00,9.60,4.80,0 +-19.20,9.60,6.47,0.00,1.00,-168.00,4.80,0 +-24.00,9.60,6.49,0.00,1.00,19.20,9.60,0 +-28.80,9.60,6.52,0.00,1.00,-158.40,9.60,0 +-33.60,14.40,6.54,0.00,1.00,28.80,9.60,0 +-33.60,14.40,6.56,0.00,1.00,-148.80,14.40,0 +-38.40,14.40,6.58,0.00,1.00,38.40,14.40,0 +-43.20,19.20,6.60,0.00,1.00,-139.20,14.40,0 +-48.00,19.20,6.62,0.00,1.00,48.00,14.40,0 +-57.60,19.20,6.64,0.00,1.00,-129.60,19.20,0 +-62.40,19.20,6.66,0.00,1.00,57.60,19.20,0 +-67.20,24.00,6.69,0.00,1.00,-120.00,19.20,0 +-72.00,24.00,6.71,0.00,1.00,67.20,19.20,0 +-76.80,24.00,6.73,0.00,1.00,-110.40,24.00,0 +-81.60,24.00,6.75,0.00,1.00,76.80,24.00,0 +-86.40,24.00,6.77,0.00,1.00,-100.80,24.00,0 +-91.20,24.00,6.79,0.00,1.00,86.40,24.00,0 +-96.00,24.00,6.81,0.00,1.00,-86.40,24.00,0 +-100.80,24.00,6.84,0.00,1.00,96.00,24.00,0 +-105.60,24.00,6.86,0.00,1.00,-76.80,24.00,0 +-110.40,24.00,6.88,0.00,1.00,105.60,24.00,0 +-115.20,19.20,6.90,0.00,1.00,-67.20,19.20,0 +-120.00,19.20,6.92,0.00,1.00,115.20,19.20,0 +-129.60,19.20,6.94,0.00,1.00,-57.60,19.20,0 +-134.40,19.20,6.96,0.00,1.00,124.80,19.20,0 +-139.20,19.20,6.99,0.00,1.00,-48.00,19.20,0 +-144.00,14.40,7.01,0.00,1.00,134.40,14.40,0 +-148.80,14.40,7.03,0.00,1.00,-38.40,14.40,0 +-148.80,14.40,7.05,0.00,1.00,144.00,14.40,0 +-153.60,9.60,7.07,0.00,1.00,-28.80,9.60,0 +-158.40,9.60,7.09,0.00,1.00,153.60,9.60,0 +-163.20,4.80,7.11,0.00,1.00,-19.20,9.60,0 +-168.00,4.80,7.13,0.00,1.00,163.20,4.80,0 +-172.80,4.80,7.16,0.00,1.00,-9.60,4.80,0 +-177.60,0.00,7.18,0.00,1.00,172.80,4.80,0 +177.60,-0.00,7.20,0.00,1.00,-0.00,0.00,0 +172.80,-4.80,7.22,0.00,1.00,-177.60,-0.00,0 +168.00,-4.80,7.24,0.00,1.00,4.80,-4.80,0 +163.20,-4.80,7.26,0.00,1.00,-168.00,-4.80,0 +158.40,-9.60,7.28,0.00,1.00,14.40,-4.80,0 +153.60,-9.60,7.31,0.00,1.00,-158.40,-9.60,0 +148.80,-14.40,7.33,0.00,1.00,24.00,-9.60,0 +148.80,-14.40,7.35,0.00,1.00,-148.80,-9.60,0 +144.00,-14.40,7.37,0.00,1.00,33.60,-14.40,0 +139.20,-19.20,7.39,0.00,1.00,-139.20,-14.40,0 +134.40,-19.20,7.41,0.00,1.00,43.20,-14.40,0 +129.60,-19.20,7.43,0.00,1.00,-129.60,-19.20,0 +120.00,-19.20,7.46,0.00,1.00,52.80,-19.20,0 +115.20,-19.20,7.48,0.00,1.00,-120.00,-19.20,0 +110.40,-24.00,7.50,0.00,1.00,62.40,-19.20,0 +105.60,-24.00,7.52,0.00,1.00,-110.40,-19.20,0 +100.80,-24.00,7.54,0.00,1.00,72.00,-24.00,0 +96.00,-24.00,7.56,0.00,1.00,-100.80,-24.00,0 +91.20,-24.00,7.58,0.00,1.00,81.60,-24.00,0 +86.40,-24.00,7.60,0.00,1.00,-91.20,-24.00,0 +81.60,-24.00,7.63,0.00,1.00,96.00,-24.00,0 +76.80,-24.00,7.65,0.00,1.00,-81.60,-24.00,0 +72.00,-24.00,7.67,0.00,1.00,105.60,-24.00,0 +67.20,-24.00,7.69,0.00,1.00,-72.00,-24.00,0 +62.40,-19.20,7.71,0.00,1.00,115.20,-19.20,0 +57.60,-19.20,7.73,0.00,1.00,-62.40,-19.20,0 +48.00,-19.20,7.75,0.00,1.00,124.80,-19.20,0 +43.20,-19.20,7.78,0.00,1.00,-52.80,-19.20,0 +38.40,-14.40,7.80,0.00,1.00,134.40,-14.40,0 +33.60,-14.40,7.82,0.00,1.00,-43.20,-14.40,0 +33.60,-14.40,7.84,0.00,1.00,144.00,-14.40,0 +28.80,-9.60,7.86,0.00,1.00,-33.60,-14.40,0 +24.00,-9.60,7.88,0.00,1.00,153.60,-9.60,0 +19.20,-9.60,7.90,0.00,1.00,-24.00,-9.60,0 +14.40,-4.80,7.93,0.00,1.00,163.20,-9.60,0 +9.60,-4.80,7.95,0.00,1.00,-14.40,-4.80,0 +4.80,-0.00,7.97,0.00,1.00,172.80,-4.80,0 +0.00,0.00,7.99,0.00,1.00,-4.80,-0.00,0 +-4.80,0.00,8.01,0.00,1.00,0.00,0.00,0 +-9.60,4.80,8.03,0.00,1.00,-177.60,0.00,0 +-14.40,4.80,8.05,0.00,1.00,9.60,4.80,0 +-19.20,4.80,8.07,0.00,1.00,-168.00,4.80,0 +-24.00,9.60,8.10,0.00,1.00,19.20,4.80,0 +-28.80,9.60,8.12,0.00,1.00,-158.40,9.60,0 +-33.60,9.60,8.14,0.00,1.00,24.00,9.60,0 +-38.40,9.60,8.16,0.00,1.00,-148.80,9.60,0 +-43.20,14.40,8.18,0.00,1.00,33.60,9.60,0 +-48.00,14.40,8.20,0.00,1.00,-139.20,14.40,0 +-52.80,14.40,8.22,0.00,1.00,43.20,14.40,0 +-57.60,14.40,8.25,0.00,1.00,-129.60,14.40,0 +-62.40,19.20,8.27,0.00,1.00,52.80,14.40,0 +-67.20,19.20,8.29,0.00,1.00,-120.00,14.40,0 +-72.00,19.20,8.31,0.00,1.00,62.40,14.40,0 +-76.80,19.20,8.33,0.00,1.00,-110.40,19.20,0 +-81.60,19.20,8.35,0.00,1.00,76.80,19.20,0 +-86.40,19.20,8.37,0.00,1.00,-100.80,19.20,0 +-91.20,19.20,8.40,0.00,1.00,86.40,19.20,0 +-96.00,19.20,8.42,0.00,1.00,-86.40,19.20,0 +-100.80,19.20,8.44,0.00,1.00,96.00,19.20,0 +-105.60,19.20,8.46,0.00,1.00,-76.80,19.20,0 +-110.40,19.20,8.48,0.00,1.00,105.60,19.20,0 +-115.20,19.20,8.50,0.00,1.00,-67.20,19.20,0 +-120.00,14.40,8.52,0.00,1.00,120.00,14.40,0 +-124.80,14.40,8.54,0.00,1.00,-57.60,14.40,0 +-129.60,14.40,8.57,0.00,1.00,129.60,14.40,0 +-134.40,14.40,8.59,0.00,1.00,-48.00,14.40,0 +-139.20,14.40,8.61,0.00,1.00,139.20,14.40,0 +-144.00,9.60,8.63,0.00,1.00,-38.40,9.60,0 +-148.80,9.60,8.65,0.00,1.00,148.80,9.60,0 +-153.60,9.60,8.67,0.00,1.00,-28.80,9.60,0 +-158.40,4.80,8.69,0.00,1.00,158.40,9.60,0 +-163.20,4.80,8.72,0.00,1.00,-19.20,4.80,0 +-168.00,4.80,8.74,0.00,1.00,163.20,4.80,0 +-172.80,0.00,8.76,0.00,1.00,-9.60,4.80,0 +-177.60,0.00,8.78,0.00,1.00,172.80,0.00,0 +177.60,-0.00,8.80,0.00,1.00,-0.00,0.00,0 +172.80,-0.00,8.82,0.00,1.00,-177.60,-0.00,0 +168.00,-4.80,8.84,0.00,1.00,4.80,-0.00,0 +163.20,-4.80,8.87,0.00,1.00,-168.00,-4.80,0 +158.40,-4.80,8.89,0.00,1.00,14.40,-4.80,0 +153.60,-9.60,8.91,0.00,1.00,-158.40,-4.80,0 +148.80,-9.60,8.93,0.00,1.00,24.00,-9.60,0 +144.00,-9.60,8.95,0.00,1.00,-153.60,-9.60,0 +139.20,-14.40,8.97,0.00,1.00,33.60,-9.60,0 +134.40,-14.40,8.99,0.00,1.00,-144.00,-9.60,0 +129.60,-14.40,9.01,0.00,1.00,43.20,-14.40,0 +124.80,-14.40,9.04,0.00,1.00,-134.40,-14.40,0 +120.00,-14.40,9.06,0.00,1.00,52.80,-14.40,0 +115.20,-19.20,9.08,0.00,1.00,-124.80,-14.40,0 +110.40,-19.20,9.10,0.00,1.00,62.40,-14.40,0 +105.60,-19.20,9.12,0.00,1.00,-110.40,-19.20,0 +100.80,-19.20,9.14,0.00,1.00,72.00,-19.20,0 +96.00,-19.20,9.16,0.00,1.00,-100.80,-19.20,0 +91.20,-19.20,9.19,0.00,1.00,81.60,-19.20,0 +86.40,-19.20,9.21,0.00,1.00,-91.20,-19.20,0 +81.60,-19.20,9.23,0.00,1.00,96.00,-19.20,0 +76.80,-19.20,9.25,0.00,1.00,-81.60,-19.20,0 +72.00,-19.20,9.27,0.00,1.00,105.60,-19.20,0 +67.20,-19.20,9.29,0.00,1.00,-72.00,-19.20,0 +62.40,-19.20,9.31,0.00,1.00,115.20,-14.40,0 +57.60,-14.40,9.34,0.00,1.00,-57.60,-14.40,0 +52.80,-14.40,9.36,0.00,1.00,124.80,-14.40,0 +48.00,-14.40,9.38,0.00,1.00,-48.00,-14.40,0 +43.20,-14.40,9.40,0.00,1.00,134.40,-14.40,0 +38.40,-9.60,9.42,0.00,1.00,-38.40,-14.40,0 +33.60,-9.60,9.44,0.00,1.00,144.00,-9.60,0 +28.80,-9.60,9.46,0.00,1.00,-28.80,-9.60,0 +24.00,-9.60,9.48,0.00,1.00,153.60,-9.60,0 +19.20,-4.80,9.51,0.00,1.00,-24.00,-9.60,0 +14.40,-4.80,9.53,0.00,1.00,163.20,-4.80,0 +9.60,-4.80,9.55,0.00,1.00,-14.40,-4.80,0 +4.80,-0.00,9.57,0.00,1.00,172.80,-4.80,0 +0.00,0.00,9.59,0.00,1.00,-4.80,-0.00,0 +-4.80,0.00,9.61,0.00,1.00,0.00,0.00,0 +-9.60,0.00,9.63,0.00,1.00,-177.60,0.00,0 +-14.40,4.80,9.66,0.00,1.00,9.60,0.00,0 +-19.20,4.80,9.68,0.00,1.00,-168.00,4.80,0 +-24.00,4.80,9.70,0.00,1.00,14.40,4.80,0 +-28.80,4.80,9.72,0.00,1.00,-158.40,4.80,0 +-33.60,9.60,9.74,0.00,1.00,24.00,4.80,0 +-38.40,9.60,9.76,0.00,1.00,-148.80,9.60,0 +-43.20,9.60,9.78,0.00,1.00,33.60,9.60,0 +-48.00,9.60,9.81,0.00,1.00,-139.20,9.60,0 +-52.80,9.60,9.83,0.00,1.00,43.20,9.60,0 +-57.60,14.40,9.85,0.00,1.00,-129.60,9.60,0 +-62.40,14.40,9.87,0.00,1.00,52.80,9.60,0 +-67.20,14.40,9.89,0.00,1.00,-120.00,9.60,0 +-72.00,14.40,9.91,0.00,1.00,62.40,14.40,0 +-76.80,14.40,9.93,0.00,1.00,-110.40,14.40,0 +-81.60,14.40,9.95,0.00,1.00,76.80,14.40,0 +-86.40,14.40,9.98,0.00,1.00,-100.80,14.40,0 +-91.20,14.40,10.00,0.00,1.00,86.40,14.40,0 +-96.00,14.40,10.02,0.00,1.00,-86.40,14.40,0 +-100.80,14.40,10.04,0.00,1.00,96.00,14.40,0 +-105.60,14.40,10.06,0.00,1.00,-76.80,14.40,0 +-110.40,14.40,10.08,0.00,1.00,110.40,14.40,0 +-115.20,14.40,10.10,0.00,1.00,-67.20,14.40,0 +-120.00,14.40,10.13,0.00,1.00,120.00,9.60,0 +-124.80,9.60,10.15,0.00,1.00,-57.60,9.60,0 +-129.60,9.60,10.17,0.00,1.00,129.60,9.60,0 +-134.40,9.60,10.19,0.00,1.00,-48.00,9.60,0 +-139.20,9.60,10.21,0.00,1.00,139.20,9.60,0 +-144.00,9.60,10.23,0.00,1.00,-38.40,9.60,0 +-148.80,9.60,10.25,0.00,1.00,148.80,9.60,0 +-153.60,4.80,10.28,0.00,1.00,-28.80,4.80,0 +-158.40,4.80,10.30,0.00,1.00,158.40,4.80,0 +-163.20,4.80,10.32,0.00,1.00,-19.20,4.80,0 +-168.00,4.80,10.34,0.00,1.00,168.00,4.80,0 +-172.80,0.00,10.36,0.00,1.00,-9.60,4.80,0 +-177.60,0.00,10.38,0.00,1.00,172.80,0.00,0 +177.60,-0.00,10.40,0.00,1.00,-0.00,0.00,0 +172.80,-0.00,10.42,0.00,1.00,-177.60,-0.00,0 +168.00,-4.80,10.45,0.00,1.00,4.80,-0.00,0 +163.20,-4.80,10.47,0.00,1.00,-168.00,-4.80,0 +158.40,-4.80,10.49,0.00,1.00,14.40,-4.80,0 +153.60,-4.80,10.51,0.00,1.00,-163.20,-4.80,0 +148.80,-9.60,10.53,0.00,1.00,24.00,-4.80,0 +144.00,-9.60,10.55,0.00,1.00,-153.60,-4.80,0 +139.20,-9.60,10.57,0.00,1.00,33.60,-9.60,0 +134.40,-9.60,10.60,0.00,1.00,-144.00,-9.60,0 +129.60,-9.60,10.62,0.00,1.00,43.20,-9.60,0 +124.80,-9.60,10.64,0.00,1.00,-134.40,-9.60,0 +120.00,-14.40,10.66,0.00,1.00,52.80,-9.60,0 +115.20,-14.40,10.68,0.00,1.00,-124.80,-9.60,0 +110.40,-14.40,10.70,0.00,1.00,62.40,-9.60,0 +105.60,-14.40,10.72,0.00,1.00,-115.20,-14.40,0 +100.80,-14.40,10.74,0.00,1.00,72.00,-14.40,0 +96.00,-14.40,10.77,0.00,1.00,-100.80,-14.40,0 +91.20,-14.40,10.79,0.00,1.00,81.60,-14.40,0 +86.40,-14.40,10.81,0.00,1.00,-91.20,-14.40,0 +81.60,-14.40,10.83,0.00,1.00,96.00,-14.40,0 +76.80,-14.40,10.85,0.00,1.00,-81.60,-14.40,0 +72.00,-14.40,10.87,0.00,1.00,105.60,-14.40,0 +67.20,-14.40,10.89,0.00,1.00,-67.20,-14.40,0 +62.40,-14.40,10.92,0.00,1.00,115.20,-14.40,0 +57.60,-14.40,10.94,0.00,1.00,-57.60,-9.60,0 +52.80,-9.60,10.96,0.00,1.00,124.80,-9.60,0 +48.00,-9.60,10.98,0.00,1.00,-48.00,-9.60,0 +43.20,-9.60,11.00,0.00,1.00,134.40,-9.60,0 +38.40,-9.60,11.02,0.00,1.00,-38.40,-9.60,0 +33.60,-9.60,11.04,0.00,1.00,144.00,-9.60,0 +28.80,-4.80,11.07,0.00,1.00,-28.80,-9.60,0 +24.00,-4.80,11.09,0.00,1.00,153.60,-4.80,0 +19.20,-4.80,11.11,0.00,1.00,-19.20,-4.80,0 +14.40,-4.80,11.13,0.00,1.00,163.20,-4.80,0 +9.60,-0.00,11.15,0.00,1.00,-14.40,-4.80,0 +4.80,-0.00,11.17,0.00,1.00,172.80,-0.00,0 +0.00,0.00,11.19,0.00,1.00,-4.80,-0.00,0 +-4.80,0.00,11.21,0.00,1.00,0.00,0.00,0 +-9.60,0.00,11.24,0.00,1.00,-177.60,0.00,0 +-14.40,0.00,11.26,0.00,1.00,9.60,0.00,0 +-19.20,4.80,11.28,0.00,1.00,-168.00,0.00,0 +-24.00,4.80,11.30,0.00,1.00,14.40,4.80,0 +-28.80,4.80,11.32,0.00,1.00,-158.40,4.80,0 +-33.60,4.80,11.34,0.00,1.00,24.00,4.80,0 +-38.40,4.80,11.36,0.00,1.00,-153.60,4.80,0 +-43.20,4.80,11.39,0.00,1.00,33.60,4.80,0 +-48.00,4.80,11.41,0.00,1.00,-144.00,4.80,0 +-52.80,9.60,11.43,0.00,1.00,43.20,4.80,0 +-57.60,9.60,11.45,0.00,1.00,-134.40,4.80,0 +-62.40,9.60,11.47,0.00,1.00,52.80,4.80,0 +-67.20,9.60,11.49,0.00,1.00,-124.80,9.60,0 +-72.00,9.60,11.51,0.00,1.00,62.40,9.60,0 +-76.80,9.60,11.54,0.00,1.00,-110.40,9.60,0 +-81.60,9.60,11.56,0.00,1.00,72.00,9.60,0 +-86.40,9.60,11.58,0.00,1.00,-100.80,9.60,0 +-91.20,9.60,11.60,0.00,1.00,86.40,9.60,0 +-96.00,9.60,11.62,0.00,1.00,-86.40,9.60,0 +-100.80,9.60,11.64,0.00,1.00,96.00,9.60,0 +-105.60,9.60,11.66,0.00,1.00,-76.80,9.60,0 +-110.40,9.60,11.68,0.00,1.00,110.40,9.60,0 +-115.20,9.60,11.71,0.00,1.00,-67.20,9.60,0 +-120.00,9.60,11.73,0.00,1.00,120.00,9.60,0 +-124.80,9.60,11.75,0.00,1.00,-52.80,9.60,0 +-129.60,9.60,11.77,0.00,1.00,129.60,4.80,0 +-134.40,4.80,11.79,0.00,1.00,-43.20,4.80,0 +-139.20,4.80,11.81,0.00,1.00,139.20,4.80,0 +-144.00,4.80,11.83,0.00,1.00,-33.60,4.80,0 +-148.80,4.80,11.86,0.00,1.00,148.80,4.80,0 +-153.60,4.80,11.88,0.00,1.00,-24.00,4.80,0 +-158.40,4.80,11.90,0.00,1.00,158.40,4.80,0 +-163.20,4.80,11.92,0.00,1.00,-19.20,4.80,0 +-168.00,0.00,11.94,0.00,1.00,168.00,4.80,0 +-172.80,0.00,11.96,0.00,1.00,-9.60,0.00,0 +-177.60,0.00,11.98,0.00,1.00,172.80,0.00,0 +177.60,-0.00,12.01,0.00,1.00,-0.00,0.00,0 +172.80,-0.00,12.03,0.00,1.00,-177.60,-0.00,0 +168.00,-0.00,12.05,0.00,1.00,4.80,-0.00,0 +163.20,-4.80,12.07,0.00,1.00,-168.00,-0.00,0 +158.40,-4.80,12.09,0.00,1.00,14.40,-4.80,0 +153.60,-4.80,12.11,0.00,1.00,-163.20,-4.80,0 +148.80,-4.80,12.13,0.00,1.00,24.00,-4.80,0 +144.00,-4.80,12.15,0.00,1.00,-153.60,-4.80,0 +139.20,-4.80,12.18,0.00,1.00,28.80,-4.80,0 +134.40,-4.80,12.20,0.00,1.00,-144.00,-4.80,0 +129.60,-9.60,12.22,0.00,1.00,38.40,-4.80,0 +124.80,-9.60,12.24,0.00,1.00,-134.40,-4.80,0 +120.00,-9.60,12.26,0.00,1.00,48.00,-4.80,0 +115.20,-9.60,12.28,0.00,1.00,-124.80,-9.60,0 +110.40,-9.60,12.30,0.00,1.00,57.60,-9.60,0 +105.60,-9.60,12.33,0.00,1.00,-115.20,-9.60,0 +100.80,-9.60,12.35,0.00,1.00,72.00,-9.60,0 +96.00,-9.60,12.37,0.00,1.00,-105.60,-9.60,0 +91.20,-9.60,12.39,0.00,1.00,81.60,-9.60,0 +86.40,-9.60,12.41,0.00,1.00,-91.20,-9.60,0 +81.60,-9.60,12.43,0.00,1.00,96.00,-9.60,0 +76.80,-9.60,12.45,0.00,1.00,-81.60,-9.60,0 +72.00,-9.60,12.48,0.00,1.00,105.60,-9.60,0 +67.20,-9.60,12.50,0.00,1.00,-67.20,-9.60,0 +62.40,-9.60,12.52,0.00,1.00,120.00,-9.60,0 +57.60,-9.60,12.54,0.00,1.00,-57.60,-9.60,0 +52.80,-9.60,12.56,0.00,1.00,129.60,-4.80,0 +48.00,-4.80,12.58,0.00,1.00,-48.00,-4.80,0 +43.20,-4.80,12.60,0.00,1.00,139.20,-4.80,0 +38.40,-4.80,12.62,0.00,1.00,-38.40,-4.80,0 +33.60,-4.80,12.65,0.00,1.00,148.80,-4.80,0 +28.80,-4.80,12.67,0.00,1.00,-28.80,-4.80,0 +24.00,-4.80,12.69,0.00,1.00,158.40,-4.80,0 +19.20,-4.80,12.71,0.00,1.00,-19.20,-4.80,0 +14.40,-0.00,12.73,0.00,1.00,163.20,-4.80,0 +9.60,-0.00,12.75,0.00,1.00,-9.60,-0.00,0 +4.80,-0.00,12.77,0.00,1.00,172.80,-0.00,0 +0.00,0.00,12.80,0.00,1.00,-4.80,-0.00,0 +-4.80,0.00,12.82,0.00,1.00,0.00,0.00,0 +-9.60,0.00,12.84,0.00,1.00,-177.60,0.00,0 +-14.40,0.00,12.86,0.00,1.00,9.60,0.00,0 +-19.20,0.00,12.88,0.00,1.00,-168.00,0.00,0 +-24.00,0.00,12.90,0.00,1.00,14.40,0.00,0 +-28.80,0.00,12.92,0.00,1.00,-163.20,0.00,0 +-33.60,4.80,12.95,0.00,1.00,24.00,0.00,0 +-38.40,4.80,12.97,0.00,1.00,-153.60,0.00,0 +-43.20,4.80,12.99,0.00,1.00,28.80,0.00,0 +-48.00,4.80,13.01,0.00,1.00,-144.00,4.80,0 +-52.80,4.80,13.03,0.00,1.00,38.40,4.80,0 +-57.60,4.80,13.05,0.00,1.00,-134.40,4.80,0 +-62.40,4.80,13.07,0.00,1.00,48.00,4.80,0 +-67.20,4.80,13.09,0.00,1.00,-124.80,4.80,0 +-72.00,4.80,13.12,0.00,1.00,62.40,4.80,0 +-76.80,4.80,13.14,0.00,1.00,-115.20,4.80,0 +-81.60,4.80,13.16,0.00,1.00,72.00,4.80,0 +-86.40,4.80,13.18,0.00,1.00,-100.80,4.80,0 +-91.20,4.80,13.20,0.00,1.00,86.40,4.80,0 +-96.00,4.80,13.22,0.00,1.00,-86.40,4.80,0 +-100.80,4.80,13.24,0.00,1.00,96.00,4.80,0 +-105.60,4.80,13.27,0.00,1.00,-76.80,4.80,0 +-110.40,4.80,13.29,0.00,1.00,110.40,4.80,0 +-115.20,4.80,13.31,0.00,1.00,-62.40,4.80,0 +-120.00,4.80,13.33,0.00,1.00,120.00,4.80,0 +-124.80,4.80,13.35,0.00,1.00,-52.80,4.80,0 +-129.60,4.80,13.37,0.00,1.00,134.40,4.80,0 +-134.40,4.80,13.39,0.00,1.00,-43.20,4.80,0 +-139.20,4.80,13.42,0.00,1.00,144.00,4.80,0 +-144.00,4.80,13.44,0.00,1.00,-33.60,0.00,0 +-148.80,4.80,13.46,0.00,1.00,153.60,0.00,0 +-153.60,0.00,13.48,0.00,1.00,-24.00,0.00,0 +-158.40,0.00,13.50,0.00,1.00,158.40,0.00,0 +-163.20,0.00,13.52,0.00,1.00,-14.40,0.00,0 +-168.00,0.00,13.54,0.00,1.00,168.00,0.00,0 +-172.80,0.00,13.56,0.00,1.00,-9.60,0.00,0 +-177.60,0.00,13.59,0.00,1.00,172.80,0.00,0 +177.60,-0.00,13.61,0.00,1.00,-0.00,0.00,0 +172.80,-0.00,13.63,0.00,1.00,-177.60,-0.00,0 +168.00,-0.00,13.65,0.00,1.00,4.80,-0.00,0 +163.20,-0.00,13.67,0.00,1.00,-172.80,-0.00,0 +158.40,-0.00,13.69,0.00,1.00,14.40,-0.00,0 +153.60,-0.00,13.71,0.00,1.00,-163.20,-0.00,0 +148.80,-4.80,13.74,0.00,1.00,19.20,-0.00,0 +144.00,-4.80,13.76,0.00,1.00,-153.60,-0.00,0 +139.20,-4.80,13.78,0.00,1.00,28.80,-0.00,0 +134.40,-4.80,13.80,0.00,1.00,-148.80,-0.00,0 +129.60,-4.80,13.82,0.00,1.00,38.40,-4.80,0 +124.80,-4.80,13.84,0.00,1.00,-139.20,-4.80,0 +120.00,-4.80,13.86,0.00,1.00,48.00,-4.80,0 +115.20,-4.80,13.89,0.00,1.00,-129.60,-4.80,0 +110.40,-4.80,13.91,0.00,1.00,57.60,-4.80,0 +105.60,-4.80,13.93,0.00,1.00,-115.20,-4.80,0 +100.80,-4.80,13.95,0.00,1.00,67.20,-4.80,0 +96.00,-4.80,13.97,0.00,1.00,-105.60,-4.80,0 +91.20,-4.80,13.99,0.00,1.00,81.60,-4.80,0 +86.40,-4.80,14.01,0.00,1.00,-91.20,-4.80,0 +81.60,-4.80,14.03,0.00,1.00,96.00,-4.80,0 +76.80,-4.80,14.06,0.00,1.00,-76.80,-4.80,0 +72.00,-4.80,14.08,0.00,1.00,105.60,-4.80,0 +67.20,-4.80,14.10,0.00,1.00,-67.20,-4.80,0 +62.40,-4.80,14.12,0.00,1.00,120.00,-4.80,0 +57.60,-4.80,14.14,0.00,1.00,-52.80,-4.80,0 +52.80,-4.80,14.16,0.00,1.00,129.60,-4.80,0 +48.00,-4.80,14.18,0.00,1.00,-43.20,-4.80,0 +43.20,-4.80,14.21,0.00,1.00,139.20,-4.80,0 +38.40,-4.80,14.23,0.00,1.00,-33.60,-4.80,0 +33.60,-4.80,14.25,0.00,1.00,148.80,-0.00,0 +28.80,-0.00,14.27,0.00,1.00,-28.80,-0.00,0 +24.00,-0.00,14.29,0.00,1.00,158.40,-0.00,0 +19.20,-0.00,14.31,0.00,1.00,-19.20,-0.00,0 +14.40,-0.00,14.33,0.00,1.00,163.20,-0.00,0 +9.60,-0.00,14.36,0.00,1.00,-9.60,-0.00,0 +4.80,-0.00,14.38,0.00,1.00,172.80,-0.00,0 +0.00,0.00,14.40,0.00,1.00,-4.80,-0.00,0 +-4.80,0.00,14.42,0.00,1.00,0.00,0.00,0 +-9.60,0.00,14.44,0.00,1.00,-177.60,-0.00,0 +-14.40,0.00,14.46,0.00,1.00,4.80,-0.00,0 +-19.20,0.00,14.48,0.00,1.00,-168.00,-0.00,0 +-24.00,0.00,14.50,0.00,1.00,14.40,-0.00,0 +-28.80,0.00,14.53,0.00,1.00,-163.20,-0.00,0 +-33.60,0.00,14.55,0.00,1.00,19.20,-0.00,0 +-38.40,0.00,14.57,0.00,1.00,-153.60,-0.00,0 +-43.20,0.00,14.59,0.00,1.00,28.80,-0.00,0 +-48.00,0.00,14.61,0.00,1.00,-148.80,-0.00,0 +-52.80,0.00,14.63,0.00,1.00,38.40,-0.00,0 +-57.60,0.00,14.65,0.00,1.00,-139.20,-0.00,0 +-62.40,0.00,14.68,0.00,1.00,48.00,-0.00,0 +-67.20,0.00,14.70,0.00,1.00,-124.80,-0.00,0 +-72.00,0.00,14.72,0.00,1.00,57.60,-0.00,0 +-76.80,0.00,14.74,0.00,1.00,-115.20,-0.00,0 +-81.60,0.00,14.76,0.00,1.00,72.00,-0.00,0 +-86.40,0.00,14.78,0.00,1.00,-100.80,-0.00,0 +-91.20,0.00,14.80,0.00,1.00,86.40,-0.00,0 +-96.00,0.00,14.83,0.00,1.00,-86.40,-0.00,0 +-100.80,0.00,14.85,0.00,1.00,100.80,-0.00,0 +-105.60,0.00,14.87,0.00,1.00,-76.80,-0.00,0 +-110.40,0.00,14.89,0.00,1.00,110.40,-0.00,0 +-115.20,0.00,14.91,0.00,1.00,-62.40,-0.00,0 +-120.00,0.00,14.93,0.00,1.00,124.80,-0.00,0 +-124.80,0.00,14.95,0.00,1.00,-48.00,-0.00,0 +-129.60,0.00,14.97,0.00,1.00,134.40,-0.00,0 +-134.40,0.00,15.00,0.00,1.00,-38.40,-0.00,0 +-139.20,0.00,15.02,0.00,1.00,144.00,-0.00,0 +-144.00,0.00,15.04,0.00,1.00,-28.80,-0.00,0 +-148.80,0.00,15.06,0.00,1.00,153.60,-0.00,0 +-153.60,0.00,15.08,0.00,1.00,-24.00,-0.00,0 +-158.40,0.00,15.10,0.00,1.00,163.20,-0.00,0 +-163.20,0.00,15.12,0.00,1.00,-14.40,-0.00,0 +-168.00,0.00,15.15,0.00,1.00,168.00,-0.00,0 +-172.80,0.00,15.17,0.00,1.00,-9.60,-0.00,0 +-177.60,0.00,15.19,0.00,1.00,172.80,-0.00,0 +177.60,0.00,15.21,0.00,1.00,-0.00,-0.00,0 +172.80,0.00,15.23,0.00,1.00,-177.60,0.00,0 +168.00,0.00,15.25,0.00,1.00,4.80,0.00,0 +163.20,0.00,15.27,0.00,1.00,-172.80,0.00,0 +158.40,0.00,15.30,0.00,1.00,9.60,0.00,0 +153.60,0.00,15.32,0.00,1.00,-163.20,0.00,0 +148.80,0.00,15.34,0.00,1.00,19.20,0.00,0 +144.00,0.00,15.36,0.00,1.00,-158.40,0.00,0 +139.20,0.00,15.38,0.00,1.00,28.80,0.00,0 +134.40,0.00,15.40,0.00,1.00,-148.80,0.00,0 +129.60,0.00,15.42,0.00,1.00,33.60,0.00,0 +124.80,0.00,15.44,0.00,1.00,-139.20,0.00,0 +120.00,0.00,15.47,0.00,1.00,43.20,0.00,0 +115.20,0.00,15.49,0.00,1.00,-129.60,0.00,0 +110.40,0.00,15.51,0.00,1.00,57.60,0.00,0 +105.60,0.00,15.53,0.00,1.00,-120.00,0.00,0 +100.80,0.00,15.55,0.00,1.00,67.20,0.00,0 +96.00,0.00,15.57,0.00,1.00,-105.60,0.00,0 +91.20,0.00,15.59,0.00,1.00,81.60,0.00,0 +86.40,0.00,15.62,0.00,1.00,-91.20,0.00,0 +81.60,0.00,15.64,0.00,1.00,96.00,0.00,0 +76.80,0.00,15.66,0.00,1.00,-76.80,0.00,0 +72.00,0.00,15.68,0.00,1.00,110.40,0.00,0 +67.20,0.00,15.70,0.00,1.00,-67.20,0.00,0 +62.40,0.00,15.72,0.00,1.00,120.00,0.00,0 +57.60,0.00,15.74,0.00,1.00,-52.80,0.00,0 +52.80,0.00,15.77,0.00,1.00,134.40,0.00,0 +48.00,0.00,15.79,0.00,1.00,-43.20,0.00,0 +43.20,0.00,15.81,0.00,1.00,144.00,0.00,0 +38.40,0.00,15.83,0.00,1.00,-33.60,0.00,0 +33.60,0.00,15.85,0.00,1.00,153.60,0.00,0 +28.80,0.00,15.87,0.00,1.00,-24.00,0.00,0 +24.00,0.00,15.89,0.00,1.00,158.40,0.00,0 +19.20,0.00,15.91,0.00,1.00,-19.20,0.00,0 +14.40,0.00,15.94,0.00,1.00,168.00,0.00,0 +9.60,0.00,15.96,0.00,1.00,-9.60,0.00,0 +4.80,0.00,15.98,0.00,1.00,172.80,0.00,0 +0.00,0.00,16.00,0.00,1.00,-4.80,0.00,0 diff --git a/scripts/testv/stvISM3.csv b/scripts/testv/stvISM3.csv index d2474d78fd398460c53b0715771184a40bbbd60c..14eee9b693b536fa2fd22d2813d7f588b8930b06 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,0 +-177.60,-4.80,16.00,0.00,1.00,-0.00,0.00,0 +4.80,4.80,0.02,0.00,1.00,-0.00,0.00,0 +-168.00,-9.60,15.98,0.00,1.00,-0.00,0.00,0 +14.40,14.40,0.04,0.00,1.00,-0.00,0.00,0 +-163.20,-14.40,15.96,0.00,1.00,-0.00,0.00,0 +19.20,19.20,0.06,0.00,1.00,-0.00,0.00,0 +-153.60,-24.00,15.94,0.00,1.00,-0.00,0.00,0 +28.80,24.00,0.09,0.00,1.00,-0.00,0.00,0 +-148.80,-28.80,15.91,0.00,1.00,-0.00,0.00,0 +38.40,33.60,0.11,0.00,1.00,-0.00,0.00,0 +-139.20,-33.60,15.89,0.00,1.00,-0.00,0.00,0 +48.00,38.40,0.13,0.00,1.00,-0.00,0.00,0 +-124.80,-38.40,15.87,0.00,1.00,-0.00,0.00,0 +57.60,38.40,0.15,0.00,1.00,-0.00,0.00,0 +-115.20,-43.20,15.85,0.00,1.00,-0.00,0.00,0 +72.00,43.20,0.17,0.00,1.00,-0.00,0.00,0 +-100.80,-43.20,15.83,0.00,1.00,-0.00,0.00,0 +86.40,43.20,0.19,0.00,1.00,-0.00,0.00,0 +-86.40,-43.20,15.81,0.00,1.00,-177.60,0.00,0 +100.80,43.20,0.21,0.00,1.00,-177.60,0.00,0 +-76.80,-43.20,15.79,0.00,1.00,-177.60,0.00,0 +110.40,43.20,0.23,0.00,1.00,-177.60,0.00,0 +-62.40,-43.20,15.77,0.00,1.00,-177.60,0.00,0 +124.80,38.40,0.26,0.00,1.00,-177.60,0.00,0 +-52.80,-38.40,15.74,0.00,1.00,177.60,0.00,0 +134.40,33.60,0.28,0.00,1.00,177.60,0.00,0 +-38.40,-33.60,15.72,0.00,1.00,177.60,0.00,0 +144.00,28.80,0.30,0.00,1.00,177.60,0.00,0 +-33.60,-28.80,15.70,0.00,1.00,177.60,0.00,0 +153.60,24.00,0.32,0.00,1.00,177.60,0.00,0 +-24.00,-19.20,15.68,0.00,1.00,177.60,0.00,0 +158.40,19.20,0.34,0.00,1.00,177.60,0.00,0 +-14.40,-14.40,15.66,0.00,1.00,177.60,0.00,0 +168.00,9.60,0.36,0.00,1.00,177.60,0.00,0 +-9.60,-9.60,15.64,0.00,1.00,177.60,0.00,0 +172.80,4.80,0.38,0.00,1.00,177.60,0.00,0 +-0.00,-0.00,15.62,0.00,1.00,177.60,0.00,0 +-177.60,-0.00,0.41,0.00,1.00,-177.60,0.00,0 +4.80,4.80,15.59,0.00,1.00,-177.60,0.00,0 +-172.80,-9.60,0.43,0.00,1.00,-177.60,0.00,0 +14.40,9.60,15.57,0.00,1.00,-177.60,0.00,0 +-163.20,-14.40,0.45,0.00,1.00,-177.60,0.00,0 +19.20,19.20,15.55,0.00,1.00,-177.60,0.00,0 +-158.40,-19.20,0.47,0.00,1.00,-177.60,0.00,0 +28.80,24.00,15.53,0.00,1.00,-177.60,0.00,0 +-148.80,-28.80,0.49,0.00,1.00,-177.60,0.00,0 +33.60,28.80,15.51,0.00,1.00,-177.60,0.00,0 +-139.20,-33.60,0.51,0.00,1.00,-177.60,0.00,0 +43.20,33.60,15.49,0.00,1.00,-177.60,0.00,0 +-129.60,-38.40,0.53,0.00,1.00,-177.60,0.00,0 +57.60,38.40,15.47,0.00,1.00,177.60,0.00,0 +-120.00,-43.20,0.56,0.00,1.00,177.60,0.00,0 +67.20,43.20,15.44,0.00,1.00,177.60,0.00,0 +-105.60,-43.20,0.58,0.00,1.00,177.60,0.00,0 +81.60,43.20,15.42,0.00,1.00,177.60,0.00,0 +-91.20,-43.20,0.60,0.00,1.00,177.60,0.00,0 +96.00,43.20,15.40,0.00,1.00,0.00,0.00,0 +-76.80,-43.20,0.62,0.00,1.00,0.00,0.00,0 +110.40,43.20,15.38,0.00,1.00,0.00,0.00,0 +-67.20,-43.20,0.64,0.00,1.00,0.00,0.00,0 +120.00,38.40,15.36,0.00,1.00,0.00,0.00,0 +-52.80,-38.40,0.66,0.00,1.00,0.00,0.00,0 +129.60,38.40,15.34,0.00,1.00,0.00,0.00,0 +-43.20,-33.60,0.68,0.00,1.00,0.00,0.00,0 +144.00,33.60,15.32,0.00,1.00,0.00,0.00,0 +-33.60,-28.80,0.70,0.00,1.00,0.00,0.00,0 +148.80,24.00,15.30,0.00,1.00,0.00,0.00,0 +-24.00,-24.00,0.73,0.00,1.00,0.00,0.00,0 +158.40,19.20,15.27,0.00,1.00,0.00,0.00,0 +-19.20,-14.40,0.75,0.00,1.00,0.00,0.00,0 +168.00,14.40,15.25,0.00,1.00,0.00,0.00,0 +-9.60,-9.60,0.77,0.00,1.00,0.00,0.00,0 +172.80,4.80,15.23,0.00,1.00,0.00,0.00,0 +-4.80,-4.80,0.79,0.00,1.00,0.00,0.00,0 +0.00,0.00,15.21,0.00,1.00,0.00,0.00,0 +-177.60,-4.80,0.81,0.00,1.00,0.00,-0.00,0 +9.60,4.80,15.19,0.00,1.00,0.00,-0.00,0 +-168.00,-9.60,0.83,0.00,1.00,0.00,-0.00,0 +14.40,14.40,15.17,0.00,1.00,0.00,-0.00,0 +-163.20,-14.40,0.85,0.00,1.00,0.00,-0.00,0 +24.00,19.20,15.15,0.00,1.00,4.80,-0.00,0 +-153.60,-19.20,0.88,0.00,1.00,4.80,-4.80,0 +28.80,24.00,15.12,0.00,1.00,4.80,-4.80,0 +-144.00,-24.00,0.90,0.00,1.00,4.80,-4.80,0 +38.40,28.80,15.10,0.00,1.00,4.80,-4.80,0 +-134.40,-28.80,0.92,0.00,1.00,4.80,-4.80,0 +48.00,33.60,15.08,0.00,1.00,9.60,-4.80,0 +-124.80,-33.60,0.94,0.00,1.00,9.60,-4.80,0 +62.40,38.40,15.06,0.00,1.00,9.60,-4.80,0 +-115.20,-38.40,0.96,0.00,1.00,14.40,-4.80,0 +72.00,38.40,15.04,0.00,1.00,19.20,-4.80,0 +-100.80,-38.40,0.98,0.00,1.00,28.80,-4.80,0 +86.40,38.40,15.02,0.00,1.00,52.80,-4.80,0 +-86.40,-38.40,1.00,0.00,1.00,105.60,-4.80,0 +96.00,38.40,15.00,0.00,1.00,139.20,-4.80,0 +-76.80,-38.40,1.03,0.00,1.00,158.40,-4.80,0 +110.40,38.40,14.97,0.00,1.00,163.20,-4.80,0 +-62.40,-38.40,1.05,0.00,1.00,168.00,-4.80,0 +120.00,33.60,14.95,0.00,1.00,168.00,-4.80,0 +-52.80,-33.60,1.07,0.00,1.00,172.80,-4.80,0 +134.40,33.60,14.93,0.00,1.00,172.80,-4.80,0 +-43.20,-28.80,1.09,0.00,1.00,172.80,-4.80,0 +144.00,28.80,14.91,0.00,1.00,172.80,-4.80,0 +-33.60,-24.00,1.11,0.00,1.00,177.60,-4.80,0 +148.80,24.00,14.89,0.00,1.00,177.60,-4.80,0 +-24.00,-19.20,1.13,0.00,1.00,177.60,-4.80,0 +158.40,14.40,14.87,0.00,1.00,177.60,-0.00,0 +-19.20,-14.40,1.15,0.00,1.00,177.60,-0.00,0 +168.00,9.60,14.85,0.00,1.00,177.60,-0.00,0 +-9.60,-9.60,1.17,0.00,1.00,177.60,-0.00,0 +172.80,4.80,14.83,0.00,1.00,177.60,-0.00,0 +-0.00,-0.00,1.20,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,14.80,0.00,1.00,-177.60,0.00,0 +4.80,4.80,1.22,0.00,1.00,-177.60,0.00,0 +-172.80,-9.60,14.78,0.00,1.00,-177.60,0.00,0 +14.40,9.60,1.24,0.00,1.00,-177.60,0.00,0 +-163.20,-14.40,14.76,0.00,1.00,-177.60,0.00,0 +19.20,14.40,1.26,0.00,1.00,-177.60,0.00,0 +-153.60,-19.20,14.74,0.00,1.00,-177.60,4.80,0 +28.80,24.00,1.28,0.00,1.00,-177.60,4.80,0 +-148.80,-24.00,14.72,0.00,1.00,-177.60,4.80,0 +38.40,28.80,1.30,0.00,1.00,-172.80,4.80,0 +-139.20,-28.80,14.70,0.00,1.00,-172.80,4.80,0 +48.00,33.60,1.32,0.00,1.00,-172.80,4.80,0 +-124.80,-33.60,14.68,0.00,1.00,-172.80,4.80,0 +57.60,33.60,1.35,0.00,1.00,-168.00,4.80,0 +-115.20,-38.40,14.65,0.00,1.00,-168.00,4.80,0 +72.00,38.40,1.37,0.00,1.00,-163.20,4.80,0 +-105.60,-38.40,14.63,0.00,1.00,-158.40,4.80,0 +81.60,38.40,1.39,0.00,1.00,-139.20,4.80,0 +-91.20,-38.40,14.61,0.00,1.00,-105.60,4.80,0 +96.00,38.40,1.41,0.00,1.00,-52.80,4.80,0 +-76.80,-38.40,14.59,0.00,1.00,-28.80,4.80,0 +105.60,38.40,1.43,0.00,1.00,-19.20,4.80,0 +-67.20,-38.40,14.57,0.00,1.00,-14.40,4.80,0 +120.00,38.40,1.45,0.00,1.00,-9.60,4.80,0 +-57.60,-33.60,14.55,0.00,1.00,-9.60,4.80,0 +129.60,33.60,1.47,0.00,1.00,-9.60,4.80,0 +-43.20,-28.80,14.53,0.00,1.00,-4.80,4.80,0 +139.20,28.80,1.50,0.00,1.00,-4.80,4.80,0 +-33.60,-24.00,14.50,0.00,1.00,-4.80,4.80,0 +148.80,24.00,1.52,0.00,1.00,-4.80,4.80,0 +-28.80,-19.20,14.48,0.00,1.00,-4.80,4.80,0 +158.40,19.20,1.54,0.00,1.00,-4.80,0.00,0 +-19.20,-14.40,14.46,0.00,1.00,-0.00,0.00,0 +163.20,14.40,1.56,0.00,1.00,-0.00,0.00,0 +-9.60,-9.60,14.44,0.00,1.00,-0.00,0.00,0 +172.80,4.80,1.58,0.00,1.00,-0.00,0.00,0 +-4.80,-4.80,14.42,0.00,1.00,-0.00,0.00,0 +0.00,0.00,1.60,0.00,1.00,0.00,0.00,0 +-177.60,-4.80,14.40,0.00,1.00,0.00,-0.00,0 +9.60,4.80,1.62,0.00,1.00,0.00,-0.00,0 +-168.00,-9.60,14.38,0.00,1.00,4.80,-0.00,0 +14.40,9.60,1.64,0.00,1.00,4.80,-4.80,0 +-158.40,-14.40,14.36,0.00,1.00,4.80,-4.80,0 +24.00,14.40,1.67,0.00,1.00,4.80,-4.80,0 +-153.60,-19.20,14.33,0.00,1.00,4.80,-4.80,0 +33.60,19.20,1.69,0.00,1.00,9.60,-4.80,0 +-144.00,-24.00,14.31,0.00,1.00,9.60,-4.80,0 +43.20,24.00,1.71,0.00,1.00,9.60,-4.80,0 +-134.40,-28.80,14.29,0.00,1.00,14.40,-9.60,0 +52.80,28.80,1.73,0.00,1.00,14.40,-9.60,0 +-124.80,-28.80,14.27,0.00,1.00,19.20,-9.60,0 +62.40,33.60,1.75,0.00,1.00,24.00,-9.60,0 +-110.40,-33.60,14.25,0.00,1.00,28.80,-9.60,0 +72.00,33.60,1.77,0.00,1.00,33.60,-9.60,0 +-100.80,-33.60,14.23,0.00,1.00,48.00,-9.60,0 +86.40,33.60,1.79,0.00,1.00,67.20,-9.60,0 +-86.40,-33.60,14.21,0.00,1.00,96.00,-9.60,0 +96.00,33.60,1.82,0.00,1.00,120.00,-9.60,0 +-76.80,-33.60,14.18,0.00,1.00,139.20,-9.60,0 +110.40,33.60,1.84,0.00,1.00,148.80,-9.60,0 +-67.20,-33.60,14.16,0.00,1.00,153.60,-9.60,0 +120.00,33.60,1.86,0.00,1.00,158.40,-9.60,0 +-52.80,-28.80,14.14,0.00,1.00,163.20,-9.60,0 +129.60,28.80,1.88,0.00,1.00,168.00,-9.60,0 +-43.20,-28.80,14.12,0.00,1.00,168.00,-9.60,0 +139.20,24.00,1.90,0.00,1.00,168.00,-4.80,0 +-33.60,-24.00,14.10,0.00,1.00,172.80,-4.80,0 +148.80,19.20,1.92,0.00,1.00,172.80,-4.80,0 +-24.00,-19.20,14.08,0.00,1.00,172.80,-4.80,0 +158.40,14.40,1.94,0.00,1.00,177.60,-4.80,0 +-19.20,-14.40,14.06,0.00,1.00,177.60,-4.80,0 +168.00,9.60,1.97,0.00,1.00,177.60,-4.80,0 +-9.60,-4.80,14.03,0.00,1.00,177.60,-0.00,0 +172.80,4.80,1.99,0.00,1.00,177.60,-0.00,0 +-0.00,-0.00,14.01,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,2.01,0.00,1.00,-177.60,0.00,0 +4.80,4.80,13.99,0.00,1.00,-177.60,0.00,0 +-168.00,-4.80,2.03,0.00,1.00,-177.60,0.00,0 +14.40,9.60,13.97,0.00,1.00,-177.60,4.80,0 +-163.20,-14.40,2.05,0.00,1.00,-177.60,4.80,0 +24.00,14.40,13.95,0.00,1.00,-177.60,4.80,0 +-153.60,-19.20,2.07,0.00,1.00,-172.80,4.80,0 +28.80,19.20,13.93,0.00,1.00,-172.80,4.80,0 +-144.00,-24.00,2.09,0.00,1.00,-172.80,4.80,0 +38.40,24.00,13.91,0.00,1.00,-168.00,4.80,0 +-134.40,-28.80,2.11,0.00,1.00,-168.00,9.60,0 +48.00,28.80,13.89,0.00,1.00,-168.00,9.60,0 +-124.80,-28.80,2.14,0.00,1.00,-163.20,9.60,0 +62.40,33.60,13.86,0.00,1.00,-158.40,9.60,0 +-115.20,-33.60,2.16,0.00,1.00,-153.60,9.60,0 +72.00,33.60,13.84,0.00,1.00,-148.80,9.60,0 +-100.80,-33.60,2.18,0.00,1.00,-139.20,9.60,0 +81.60,33.60,13.82,0.00,1.00,-120.00,9.60,0 +-91.20,-33.60,2.20,0.00,1.00,-96.00,9.60,0 +96.00,33.60,13.80,0.00,1.00,-67.20,9.60,0 +-81.60,-33.60,2.22,0.00,1.00,-48.00,9.60,0 +105.60,33.60,13.78,0.00,1.00,-33.60,9.60,0 +-67.20,-33.60,2.24,0.00,1.00,-28.80,9.60,0 +115.20,33.60,13.76,0.00,1.00,-24.00,9.60,0 +-57.60,-28.80,2.26,0.00,1.00,-19.20,9.60,0 +129.60,28.80,13.74,0.00,1.00,-14.40,9.60,0 +-48.00,-28.80,2.29,0.00,1.00,-14.40,9.60,0 +139.20,24.00,13.71,0.00,1.00,-9.60,4.80,0 +-38.40,-24.00,2.31,0.00,1.00,-9.60,4.80,0 +148.80,19.20,13.69,0.00,1.00,-9.60,4.80,0 +-28.80,-19.20,2.33,0.00,1.00,-4.80,4.80,0 +153.60,14.40,13.67,0.00,1.00,-4.80,4.80,0 +-19.20,-14.40,2.35,0.00,1.00,-4.80,4.80,0 +163.20,9.60,13.65,0.00,1.00,-4.80,4.80,0 +-9.60,-9.60,2.37,0.00,1.00,-4.80,0.00,0 +172.80,4.80,13.63,0.00,1.00,-0.00,0.00,0 +-4.80,-4.80,2.39,0.00,1.00,-0.00,0.00,0 +0.00,0.00,13.61,0.00,1.00,0.00,0.00,0 +-177.60,-4.80,2.41,0.00,1.00,0.00,-0.00,0 +9.60,4.80,13.59,0.00,1.00,4.80,-0.00,0 +-168.00,-9.60,2.44,0.00,1.00,4.80,-4.80,0 +14.40,9.60,13.56,0.00,1.00,4.80,-4.80,0 +-158.40,-9.60,2.46,0.00,1.00,4.80,-4.80,0 +24.00,14.40,13.54,0.00,1.00,9.60,-4.80,0 +-148.80,-14.40,2.48,0.00,1.00,9.60,-9.60,0 +33.60,19.20,13.52,0.00,1.00,9.60,-9.60,0 +-139.20,-19.20,2.50,0.00,1.00,14.40,-9.60,0 +43.20,24.00,13.50,0.00,1.00,14.40,-9.60,0 +-129.60,-24.00,2.52,0.00,1.00,19.20,-9.60,0 +52.80,24.00,13.48,0.00,1.00,19.20,-14.40,0 +-120.00,-28.80,2.54,0.00,1.00,24.00,-14.40,0 +62.40,28.80,13.46,0.00,1.00,28.80,-14.40,0 +-110.40,-28.80,2.56,0.00,1.00,38.40,-14.40,0 +76.80,28.80,13.44,0.00,1.00,48.00,-14.40,0 +-100.80,-28.80,2.58,0.00,1.00,57.60,-14.40,0 +86.40,28.80,13.42,0.00,1.00,76.80,-14.40,0 +-86.40,-28.80,2.61,0.00,1.00,96.00,-14.40,0 +96.00,28.80,13.39,0.00,1.00,115.20,-14.40,0 +-76.80,-28.80,2.63,0.00,1.00,129.60,-14.40,0 +105.60,28.80,13.37,0.00,1.00,139.20,-14.40,0 +-67.20,-28.80,2.65,0.00,1.00,144.00,-14.40,0 +120.00,28.80,13.35,0.00,1.00,153.60,-14.40,0 +-57.60,-24.00,2.67,0.00,1.00,158.40,-14.40,0 +129.60,24.00,13.33,0.00,1.00,158.40,-9.60,0 +-48.00,-24.00,2.69,0.00,1.00,163.20,-9.60,0 +139.20,19.20,13.31,0.00,1.00,168.00,-9.60,0 +-38.40,-19.20,2.71,0.00,1.00,168.00,-9.60,0 +148.80,19.20,13.29,0.00,1.00,168.00,-9.60,0 +-28.80,-14.40,2.73,0.00,1.00,172.80,-9.60,0 +158.40,14.40,13.27,0.00,1.00,172.80,-4.80,0 +-19.20,-9.60,2.76,0.00,1.00,172.80,-4.80,0 +163.20,9.60,13.24,0.00,1.00,177.60,-4.80,0 +-9.60,-4.80,2.78,0.00,1.00,177.60,-4.80,0 +172.80,4.80,13.22,0.00,1.00,177.60,-0.00,0 +-0.00,-0.00,2.80,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,13.20,0.00,1.00,-177.60,0.00,0 +4.80,4.80,2.82,0.00,1.00,-177.60,0.00,0 +-168.00,-4.80,13.18,0.00,1.00,-177.60,4.80,0 +14.40,9.60,2.84,0.00,1.00,-177.60,4.80,0 +-163.20,-9.60,13.16,0.00,1.00,-172.80,4.80,0 +24.00,14.40,2.86,0.00,1.00,-172.80,4.80,0 +-153.60,-14.40,13.14,0.00,1.00,-172.80,9.60,0 +33.60,19.20,2.88,0.00,1.00,-168.00,9.60,0 +-144.00,-19.20,13.12,0.00,1.00,-168.00,9.60,0 +43.20,19.20,2.91,0.00,1.00,-168.00,9.60,0 +-134.40,-24.00,13.09,0.00,1.00,-163.20,9.60,0 +52.80,24.00,2.93,0.00,1.00,-158.40,9.60,0 +-124.80,-24.00,13.07,0.00,1.00,-158.40,14.40,0 +62.40,28.80,2.95,0.00,1.00,-153.60,14.40,0 +-115.20,-28.80,13.05,0.00,1.00,-144.00,14.40,0 +72.00,28.80,2.97,0.00,1.00,-139.20,14.40,0 +-100.80,-28.80,13.03,0.00,1.00,-129.60,14.40,0 +81.60,28.80,2.99,0.00,1.00,-115.20,14.40,0 +-91.20,-28.80,13.01,0.00,1.00,-96.00,14.40,0 +96.00,28.80,3.01,0.00,1.00,-76.80,14.40,0 +-81.60,-28.80,12.99,0.00,1.00,-57.60,14.40,0 +105.60,28.80,3.03,0.00,1.00,-48.00,14.40,0 +-67.20,-28.80,12.97,0.00,1.00,-38.40,14.40,0 +115.20,28.80,3.05,0.00,1.00,-28.80,14.40,0 +-57.60,-28.80,12.95,0.00,1.00,-24.00,14.40,0 +124.80,24.00,3.08,0.00,1.00,-19.20,14.40,0 +-48.00,-24.00,12.92,0.00,1.00,-19.20,9.60,0 +134.40,24.00,3.10,0.00,1.00,-14.40,9.60,0 +-38.40,-19.20,12.90,0.00,1.00,-14.40,9.60,0 +144.00,19.20,3.12,0.00,1.00,-9.60,9.60,0 +-28.80,-14.40,12.88,0.00,1.00,-9.60,9.60,0 +153.60,14.40,3.14,0.00,1.00,-9.60,4.80,0 +-19.20,-9.60,12.86,0.00,1.00,-4.80,4.80,0 +163.20,9.60,3.16,0.00,1.00,-4.80,4.80,0 +-14.40,-9.60,12.84,0.00,1.00,-4.80,4.80,0 +172.80,4.80,3.18,0.00,1.00,-4.80,0.00,0 +-4.80,-4.80,12.82,0.00,1.00,-0.00,0.00,0 +0.00,0.00,3.20,0.00,1.00,0.00,0.00,0 +-177.60,-0.00,12.80,0.00,1.00,0.00,-0.00,0 +9.60,4.80,3.23,0.00,1.00,4.80,-4.80,0 +-168.00,-4.80,12.77,0.00,1.00,4.80,-4.80,0 +19.20,9.60,3.25,0.00,1.00,4.80,-4.80,0 +-158.40,-9.60,12.75,0.00,1.00,9.60,-9.60,0 +24.00,14.40,3.27,0.00,1.00,9.60,-9.60,0 +-148.80,-14.40,12.73,0.00,1.00,14.40,-9.60,0 +33.60,14.40,3.29,0.00,1.00,14.40,-9.60,0 +-139.20,-19.20,12.71,0.00,1.00,19.20,-14.40,0 +43.20,19.20,3.31,0.00,1.00,19.20,-14.40,0 +-129.60,-19.20,12.69,0.00,1.00,24.00,-14.40,0 +52.80,19.20,3.33,0.00,1.00,28.80,-14.40,0 +-120.00,-24.00,12.67,0.00,1.00,33.60,-19.20,0 +67.20,24.00,3.35,0.00,1.00,38.40,-19.20,0 +-110.40,-24.00,12.65,0.00,1.00,43.20,-19.20,0 +76.80,24.00,3.38,0.00,1.00,52.80,-19.20,0 +-100.80,-24.00,12.62,0.00,1.00,67.20,-19.20,0 +86.40,24.00,3.40,0.00,1.00,76.80,-19.20,0 +-86.40,-24.00,12.60,0.00,1.00,96.00,-19.20,0 +96.00,24.00,3.42,0.00,1.00,105.60,-19.20,0 +-76.80,-24.00,12.58,0.00,1.00,120.00,-19.20,0 +105.60,24.00,3.44,0.00,1.00,129.60,-19.20,0 +-67.20,-24.00,12.56,0.00,1.00,139.20,-19.20,0 +115.20,24.00,3.46,0.00,1.00,144.00,-19.20,0 +-57.60,-24.00,12.54,0.00,1.00,148.80,-14.40,0 +129.60,19.20,3.48,0.00,1.00,153.60,-14.40,0 +-48.00,-19.20,12.52,0.00,1.00,158.40,-14.40,0 +139.20,19.20,3.50,0.00,1.00,163.20,-14.40,0 +-38.40,-14.40,12.50,0.00,1.00,163.20,-14.40,0 +148.80,14.40,3.52,0.00,1.00,168.00,-9.60,0 +-28.80,-14.40,12.48,0.00,1.00,168.00,-9.60,0 +153.60,9.60,3.55,0.00,1.00,172.80,-9.60,0 +-19.20,-9.60,12.45,0.00,1.00,172.80,-4.80,0 +163.20,9.60,3.57,0.00,1.00,172.80,-4.80,0 +-9.60,-4.80,12.43,0.00,1.00,177.60,-4.80,0 +172.80,4.80,3.59,0.00,1.00,177.60,-0.00,0 +-0.00,-0.00,12.41,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,3.61,0.00,1.00,-177.60,0.00,0 +4.80,4.80,12.39,0.00,1.00,-177.60,0.00,0 +-168.00,-4.80,3.63,0.00,1.00,-177.60,4.80,0 +14.40,9.60,12.37,0.00,1.00,-172.80,4.80,0 +-158.40,-9.60,3.65,0.00,1.00,-172.80,4.80,0 +24.00,9.60,12.35,0.00,1.00,-172.80,9.60,0 +-153.60,-14.40,3.67,0.00,1.00,-168.00,9.60,0 +33.60,14.40,12.33,0.00,1.00,-168.00,9.60,0 +-144.00,-14.40,3.70,0.00,1.00,-163.20,14.40,0 +43.20,19.20,12.30,0.00,1.00,-163.20,14.40,0 +-134.40,-19.20,3.72,0.00,1.00,-158.40,14.40,0 +52.80,19.20,12.28,0.00,1.00,-153.60,14.40,0 +-124.80,-24.00,3.74,0.00,1.00,-148.80,14.40,0 +62.40,24.00,12.26,0.00,1.00,-144.00,19.20,0 +-110.40,-24.00,3.76,0.00,1.00,-139.20,19.20,0 +72.00,24.00,12.24,0.00,1.00,-129.60,19.20,0 +-100.80,-24.00,3.78,0.00,1.00,-120.00,19.20,0 +81.60,24.00,12.22,0.00,1.00,-105.60,19.20,0 +-91.20,-24.00,3.80,0.00,1.00,-96.00,19.20,0 +96.00,24.00,12.20,0.00,1.00,-76.80,19.20,0 +-81.60,-24.00,3.82,0.00,1.00,-67.20,19.20,0 +105.60,24.00,12.18,0.00,1.00,-52.80,19.20,0 +-72.00,-24.00,3.85,0.00,1.00,-43.20,19.20,0 +115.20,24.00,12.15,0.00,1.00,-38.40,19.20,0 +-57.60,-24.00,3.87,0.00,1.00,-33.60,19.20,0 +124.80,19.20,12.13,0.00,1.00,-28.80,14.40,0 +-48.00,-19.20,3.89,0.00,1.00,-24.00,14.40,0 +134.40,19.20,12.11,0.00,1.00,-19.20,14.40,0 +-38.40,-19.20,3.91,0.00,1.00,-19.20,14.40,0 +144.00,14.40,12.09,0.00,1.00,-14.40,9.60,0 +-28.80,-14.40,3.93,0.00,1.00,-14.40,9.60,0 +153.60,14.40,12.07,0.00,1.00,-9.60,9.60,0 +-24.00,-9.60,3.95,0.00,1.00,-9.60,9.60,0 +163.20,9.60,12.05,0.00,1.00,-4.80,4.80,0 +-14.40,-4.80,3.97,0.00,1.00,-4.80,4.80,0 +172.80,4.80,12.03,0.00,1.00,-4.80,4.80,0 +-4.80,-0.00,3.99,0.00,1.00,-0.00,0.00,0 +0.00,0.00,12.01,0.00,1.00,0.00,0.00,0 +-177.60,-0.00,4.02,0.00,1.00,0.00,-0.00,0 +9.60,4.80,11.98,0.00,1.00,4.80,-4.80,0 +-168.00,-4.80,4.04,0.00,1.00,4.80,-4.80,0 +19.20,4.80,11.96,0.00,1.00,9.60,-9.60,0 +-158.40,-9.60,4.06,0.00,1.00,9.60,-9.60,0 +28.80,9.60,11.94,0.00,1.00,14.40,-9.60,0 +-148.80,-9.60,4.08,0.00,1.00,14.40,-14.40,0 +38.40,14.40,11.92,0.00,1.00,19.20,-14.40,0 +-139.20,-14.40,4.10,0.00,1.00,19.20,-14.40,0 +48.00,14.40,11.90,0.00,1.00,24.00,-19.20,0 +-129.60,-14.40,4.12,0.00,1.00,28.80,-19.20,0 +57.60,19.20,11.88,0.00,1.00,33.60,-19.20,0 +-120.00,-19.20,4.14,0.00,1.00,38.40,-19.20,0 +67.20,19.20,11.86,0.00,1.00,43.20,-24.00,0 +-110.40,-19.20,4.17,0.00,1.00,52.80,-24.00,0 +76.80,19.20,11.83,0.00,1.00,62.40,-24.00,0 +-100.80,-19.20,4.19,0.00,1.00,72.00,-24.00,0 +86.40,19.20,11.81,0.00,1.00,81.60,-24.00,0 +-86.40,-19.20,4.21,0.00,1.00,91.20,-24.00,0 +96.00,19.20,11.79,0.00,1.00,105.60,-24.00,0 +-76.80,-19.20,4.23,0.00,1.00,115.20,-24.00,0 +105.60,19.20,11.77,0.00,1.00,124.80,-24.00,0 +-67.20,-19.20,4.25,0.00,1.00,134.40,-24.00,0 +115.20,19.20,11.75,0.00,1.00,139.20,-19.20,0 +-57.60,-19.20,4.27,0.00,1.00,144.00,-19.20,0 +124.80,19.20,11.73,0.00,1.00,148.80,-19.20,0 +-48.00,-14.40,4.29,0.00,1.00,153.60,-19.20,0 +134.40,14.40,11.71,0.00,1.00,158.40,-19.20,0 +-38.40,-14.40,4.32,0.00,1.00,158.40,-14.40,0 +144.00,14.40,11.68,0.00,1.00,163.20,-14.40,0 +-28.80,-9.60,4.34,0.00,1.00,168.00,-14.40,0 +153.60,9.60,11.66,0.00,1.00,168.00,-9.60,0 +-19.20,-9.60,4.36,0.00,1.00,172.80,-9.60,0 +163.20,4.80,11.64,0.00,1.00,172.80,-4.80,0 +-9.60,-4.80,4.38,0.00,1.00,172.80,-4.80,0 +172.80,4.80,11.62,0.00,1.00,177.60,-4.80,0 +-0.00,-0.00,4.40,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,11.60,0.00,1.00,-177.60,0.00,0 +4.80,4.80,4.42,0.00,1.00,-177.60,4.80,0 +-168.00,-4.80,11.58,0.00,1.00,-172.80,4.80,0 +14.40,4.80,4.44,0.00,1.00,-172.80,4.80,0 +-158.40,-9.60,11.56,0.00,1.00,-172.80,9.60,0 +24.00,9.60,4.46,0.00,1.00,-168.00,9.60,0 +-148.80,-9.60,11.54,0.00,1.00,-168.00,14.40,0 +33.60,14.40,4.49,0.00,1.00,-163.20,14.40,0 +-139.20,-14.40,11.51,0.00,1.00,-158.40,14.40,0 +43.20,14.40,4.51,0.00,1.00,-158.40,19.20,0 +-129.60,-14.40,11.49,0.00,1.00,-153.60,19.20,0 +52.80,19.20,4.53,0.00,1.00,-148.80,19.20,0 +-120.00,-19.20,11.47,0.00,1.00,-144.00,19.20,0 +62.40,19.20,4.55,0.00,1.00,-139.20,19.20,0 +-110.40,-19.20,11.45,0.00,1.00,-134.40,24.00,0 +72.00,19.20,4.57,0.00,1.00,-124.80,24.00,0 +-100.80,-19.20,11.43,0.00,1.00,-115.20,24.00,0 +81.60,19.20,4.59,0.00,1.00,-105.60,24.00,0 +-91.20,-19.20,11.41,0.00,1.00,-91.20,24.00,0 +96.00,19.20,4.61,0.00,1.00,-81.60,24.00,0 +-81.60,-19.20,11.39,0.00,1.00,-72.00,24.00,0 +105.60,19.20,4.64,0.00,1.00,-62.40,24.00,0 +-72.00,-19.20,11.36,0.00,1.00,-52.80,24.00,0 +115.20,19.20,4.66,0.00,1.00,-43.20,24.00,0 +-62.40,-19.20,11.34,0.00,1.00,-38.40,19.20,0 +124.80,19.20,4.68,0.00,1.00,-33.60,19.20,0 +-52.80,-14.40,11.32,0.00,1.00,-28.80,19.20,0 +134.40,14.40,4.70,0.00,1.00,-24.00,19.20,0 +-43.20,-14.40,11.30,0.00,1.00,-19.20,14.40,0 +144.00,14.40,4.72,0.00,1.00,-19.20,14.40,0 +-33.60,-9.60,11.28,0.00,1.00,-14.40,14.40,0 +153.60,9.60,4.74,0.00,1.00,-14.40,9.60,0 +-24.00,-9.60,11.26,0.00,1.00,-9.60,9.60,0 +163.20,4.80,4.76,0.00,1.00,-9.60,9.60,0 +-14.40,-4.80,11.24,0.00,1.00,-4.80,4.80,0 +172.80,4.80,4.79,0.00,1.00,-4.80,4.80,0 +-4.80,-0.00,11.21,0.00,1.00,-0.00,0.00,0 +0.00,0.00,4.81,0.00,1.00,0.00,0.00,0 +-177.60,-0.00,11.19,0.00,1.00,0.00,-0.00,0 +9.60,4.80,4.83,0.00,1.00,4.80,-4.80,0 +-168.00,-4.80,11.17,0.00,1.00,4.80,-4.80,0 +19.20,4.80,4.85,0.00,1.00,9.60,-9.60,0 +-158.40,-4.80,11.15,0.00,1.00,14.40,-9.60,0 +28.80,9.60,4.87,0.00,1.00,14.40,-14.40,0 +-148.80,-9.60,11.13,0.00,1.00,19.20,-14.40,0 +38.40,9.60,4.89,0.00,1.00,19.20,-19.20,0 +-139.20,-9.60,11.11,0.00,1.00,24.00,-19.20,0 +48.00,9.60,4.91,0.00,1.00,28.80,-19.20,0 +-129.60,-14.40,11.09,0.00,1.00,33.60,-24.00,0 +57.60,14.40,4.93,0.00,1.00,38.40,-24.00,0 +-120.00,-14.40,11.07,0.00,1.00,43.20,-24.00,0 +67.20,14.40,4.96,0.00,1.00,48.00,-24.00,0 +-110.40,-14.40,11.04,0.00,1.00,57.60,-28.80,0 +76.80,14.40,4.98,0.00,1.00,62.40,-28.80,0 +-100.80,-14.40,11.02,0.00,1.00,72.00,-28.80,0 +86.40,14.40,5.00,0.00,1.00,81.60,-28.80,0 +-86.40,-14.40,11.00,0.00,1.00,91.20,-28.80,0 +96.00,14.40,5.02,0.00,1.00,100.80,-28.80,0 +-76.80,-14.40,10.98,0.00,1.00,110.40,-28.80,0 +105.60,14.40,5.04,0.00,1.00,120.00,-28.80,0 +-67.20,-14.40,10.96,0.00,1.00,129.60,-28.80,0 +115.20,14.40,5.06,0.00,1.00,134.40,-24.00,0 +-57.60,-14.40,10.94,0.00,1.00,139.20,-24.00,0 +124.80,14.40,5.08,0.00,1.00,144.00,-24.00,0 +-48.00,-14.40,10.92,0.00,1.00,148.80,-24.00,0 +134.40,9.60,5.11,0.00,1.00,153.60,-19.20,0 +-38.40,-9.60,10.89,0.00,1.00,158.40,-19.20,0 +144.00,9.60,5.13,0.00,1.00,158.40,-14.40,0 +-28.80,-9.60,10.87,0.00,1.00,163.20,-14.40,0 +153.60,4.80,5.15,0.00,1.00,168.00,-14.40,0 +-19.20,-4.80,10.85,0.00,1.00,168.00,-9.60,0 +163.20,4.80,5.17,0.00,1.00,172.80,-9.60,0 +-9.60,-4.80,10.83,0.00,1.00,172.80,-4.80,0 +172.80,0.00,5.19,0.00,1.00,177.60,-4.80,0 +-0.00,-0.00,10.81,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,5.21,0.00,1.00,-177.60,0.00,0 +4.80,0.00,10.79,0.00,1.00,-177.60,4.80,0 +-168.00,-4.80,5.23,0.00,1.00,-172.80,4.80,0 +14.40,4.80,10.77,0.00,1.00,-172.80,9.60,0 +-158.40,-4.80,5.26,0.00,1.00,-168.00,9.60,0 +24.00,4.80,10.74,0.00,1.00,-168.00,14.40,0 +-148.80,-9.60,5.28,0.00,1.00,-163.20,14.40,0 +33.60,9.60,10.72,0.00,1.00,-158.40,14.40,0 +-139.20,-9.60,5.30,0.00,1.00,-158.40,19.20,0 +43.20,9.60,10.70,0.00,1.00,-153.60,19.20,0 +-129.60,-14.40,5.32,0.00,1.00,-148.80,24.00,0 +52.80,14.40,10.68,0.00,1.00,-144.00,24.00,0 +-120.00,-14.40,5.34,0.00,1.00,-139.20,24.00,0 +62.40,14.40,10.66,0.00,1.00,-134.40,24.00,0 +-110.40,-14.40,5.36,0.00,1.00,-129.60,28.80,0 +72.00,14.40,10.64,0.00,1.00,-120.00,28.80,0 +-100.80,-14.40,5.38,0.00,1.00,-110.40,28.80,0 +81.60,14.40,10.62,0.00,1.00,-100.80,28.80,0 +-91.20,-14.40,5.40,0.00,1.00,-91.20,28.80,0 +96.00,14.40,10.60,0.00,1.00,-81.60,28.80,0 +-81.60,-14.40,5.43,0.00,1.00,-72.00,28.80,0 +105.60,14.40,10.57,0.00,1.00,-62.40,28.80,0 +-72.00,-14.40,5.45,0.00,1.00,-57.60,28.80,0 +115.20,14.40,10.55,0.00,1.00,-48.00,24.00,0 +-62.40,-14.40,5.47,0.00,1.00,-43.20,24.00,0 +124.80,14.40,10.53,0.00,1.00,-38.40,24.00,0 +-52.80,-14.40,5.49,0.00,1.00,-33.60,24.00,0 +134.40,9.60,10.51,0.00,1.00,-28.80,19.20,0 +-43.20,-9.60,5.51,0.00,1.00,-24.00,19.20,0 +144.00,9.60,10.49,0.00,1.00,-19.20,19.20,0 +-33.60,-9.60,5.53,0.00,1.00,-19.20,14.40,0 +153.60,9.60,10.47,0.00,1.00,-14.40,14.40,0 +-24.00,-4.80,5.55,0.00,1.00,-14.40,9.60,0 +163.20,4.80,10.45,0.00,1.00,-9.60,9.60,0 +-14.40,-4.80,5.58,0.00,1.00,-4.80,4.80,0 +172.80,4.80,10.42,0.00,1.00,-4.80,4.80,0 +-4.80,-0.00,5.60,0.00,1.00,-0.00,0.00,0 +0.00,0.00,10.40,0.00,1.00,0.00,0.00,0 +-177.60,-0.00,5.62,0.00,1.00,4.80,-4.80,0 +9.60,0.00,10.38,0.00,1.00,4.80,-4.80,0 +-168.00,-4.80,5.64,0.00,1.00,9.60,-9.60,0 +19.20,4.80,10.36,0.00,1.00,9.60,-9.60,0 +-158.40,-4.80,5.66,0.00,1.00,14.40,-14.40,0 +28.80,4.80,10.34,0.00,1.00,19.20,-14.40,0 +-148.80,-4.80,5.68,0.00,1.00,19.20,-19.20,0 +38.40,4.80,10.32,0.00,1.00,24.00,-19.20,0 +-139.20,-9.60,5.70,0.00,1.00,28.80,-24.00,0 +48.00,9.60,10.30,0.00,1.00,33.60,-24.00,0 +-129.60,-9.60,5.72,0.00,1.00,38.40,-24.00,0 +57.60,9.60,10.28,0.00,1.00,43.20,-28.80,0 +-120.00,-9.60,5.75,0.00,1.00,48.00,-28.80,0 +67.20,9.60,10.25,0.00,1.00,52.80,-28.80,0 +-110.40,-9.60,5.77,0.00,1.00,57.60,-33.60,0 +76.80,9.60,10.23,0.00,1.00,67.20,-33.60,0 +-100.80,-9.60,5.79,0.00,1.00,76.80,-33.60,0 +86.40,9.60,10.21,0.00,1.00,81.60,-33.60,0 +-86.40,-9.60,5.81,0.00,1.00,91.20,-33.60,0 +96.00,9.60,10.19,0.00,1.00,100.80,-33.60,0 +-76.80,-9.60,5.83,0.00,1.00,110.40,-33.60,0 +105.60,9.60,10.17,0.00,1.00,115.20,-33.60,0 +-67.20,-9.60,5.85,0.00,1.00,124.80,-33.60,0 +115.20,9.60,10.15,0.00,1.00,129.60,-28.80,0 +-57.60,-9.60,5.87,0.00,1.00,134.40,-28.80,0 +124.80,9.60,10.13,0.00,1.00,139.20,-28.80,0 +-48.00,-9.60,5.90,0.00,1.00,144.00,-24.00,0 +134.40,9.60,10.10,0.00,1.00,148.80,-24.00,0 +-38.40,-9.60,5.92,0.00,1.00,153.60,-19.20,0 +144.00,4.80,10.08,0.00,1.00,158.40,-19.20,0 +-28.80,-4.80,5.94,0.00,1.00,163.20,-14.40,0 +153.60,4.80,10.06,0.00,1.00,163.20,-14.40,0 +-19.20,-4.80,5.96,0.00,1.00,168.00,-9.60,0 +163.20,4.80,10.04,0.00,1.00,172.80,-9.60,0 +-9.60,-0.00,5.98,0.00,1.00,172.80,-4.80,0 +172.80,0.00,10.02,0.00,1.00,177.60,-4.80,0 +-0.00,-0.00,6.00,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,10.00,0.00,1.00,-177.60,0.00,0 +4.80,0.00,6.02,0.00,1.00,-177.60,4.80,0 +-168.00,-0.00,9.98,0.00,1.00,-172.80,4.80,0 +14.40,4.80,6.05,0.00,1.00,-172.80,9.60,0 +-158.40,-4.80,9.95,0.00,1.00,-168.00,9.60,0 +24.00,4.80,6.07,0.00,1.00,-163.20,14.40,0 +-148.80,-4.80,9.93,0.00,1.00,-163.20,14.40,0 +33.60,4.80,6.09,0.00,1.00,-158.40,19.20,0 +-139.20,-9.60,9.91,0.00,1.00,-153.60,19.20,0 +43.20,9.60,6.11,0.00,1.00,-148.80,24.00,0 +-129.60,-9.60,9.89,0.00,1.00,-144.00,24.00,0 +52.80,9.60,6.13,0.00,1.00,-139.20,28.80,0 +-120.00,-9.60,9.87,0.00,1.00,-134.40,28.80,0 +62.40,9.60,6.15,0.00,1.00,-129.60,28.80,0 +-110.40,-9.60,9.85,0.00,1.00,-124.80,33.60,0 +72.00,9.60,6.17,0.00,1.00,-115.20,33.60,0 +-100.80,-9.60,9.83,0.00,1.00,-110.40,33.60,0 +81.60,9.60,6.19,0.00,1.00,-100.80,33.60,0 +-91.20,-9.60,9.81,0.00,1.00,-91.20,33.60,0 +96.00,9.60,6.22,0.00,1.00,-81.60,33.60,0 +-81.60,-9.60,9.78,0.00,1.00,-76.80,33.60,0 +105.60,9.60,6.24,0.00,1.00,-67.20,33.60,0 +-72.00,-9.60,9.76,0.00,1.00,-57.60,33.60,0 +115.20,9.60,6.26,0.00,1.00,-52.80,28.80,0 +-62.40,-9.60,9.74,0.00,1.00,-48.00,28.80,0 +124.80,9.60,6.28,0.00,1.00,-43.20,28.80,0 +-52.80,-9.60,9.72,0.00,1.00,-38.40,24.00,0 +134.40,9.60,6.30,0.00,1.00,-33.60,24.00,0 +-43.20,-9.60,9.70,0.00,1.00,-28.80,24.00,0 +144.00,4.80,6.32,0.00,1.00,-24.00,19.20,0 +-33.60,-4.80,9.68,0.00,1.00,-19.20,19.20,0 +153.60,4.80,6.34,0.00,1.00,-19.20,14.40,0 +-24.00,-4.80,9.66,0.00,1.00,-14.40,14.40,0 +163.20,4.80,6.37,0.00,1.00,-9.60,9.60,0 +-14.40,-4.80,9.63,0.00,1.00,-9.60,9.60,0 +172.80,0.00,6.39,0.00,1.00,-4.80,4.80,0 +-4.80,-0.00,9.61,0.00,1.00,-4.80,4.80,0 +0.00,0.00,6.41,0.00,1.00,0.00,0.00,0 +-177.60,-0.00,9.59,0.00,1.00,4.80,-4.80,0 +9.60,0.00,6.43,0.00,1.00,4.80,-4.80,0 +-168.00,-0.00,9.57,0.00,1.00,9.60,-9.60,0 +19.20,0.00,6.45,0.00,1.00,14.40,-9.60,0 +-158.40,-4.80,9.55,0.00,1.00,14.40,-14.40,0 +28.80,4.80,6.47,0.00,1.00,19.20,-19.20,0 +-148.80,-4.80,9.53,0.00,1.00,24.00,-19.20,0 +38.40,4.80,6.49,0.00,1.00,24.00,-24.00,0 +-139.20,-4.80,9.51,0.00,1.00,28.80,-24.00,0 +48.00,4.80,6.52,0.00,1.00,33.60,-28.80,0 +-129.60,-4.80,9.48,0.00,1.00,38.40,-28.80,0 +57.60,4.80,6.54,0.00,1.00,43.20,-33.60,0 +-120.00,-4.80,9.46,0.00,1.00,48.00,-33.60,0 +67.20,4.80,6.56,0.00,1.00,57.60,-33.60,0 +-110.40,-4.80,9.44,0.00,1.00,62.40,-38.40,0 +76.80,4.80,6.58,0.00,1.00,67.20,-38.40,0 +-100.80,-4.80,9.42,0.00,1.00,76.80,-38.40,0 +86.40,4.80,6.60,0.00,1.00,86.40,-38.40,0 +-86.40,-4.80,9.40,0.00,1.00,91.20,-38.40,0 +96.00,4.80,6.62,0.00,1.00,100.80,-38.40,0 +-76.80,-4.80,9.38,0.00,1.00,105.60,-38.40,0 +105.60,4.80,6.64,0.00,1.00,115.20,-38.40,0 +-67.20,-4.80,9.36,0.00,1.00,120.00,-33.60,0 +115.20,4.80,6.66,0.00,1.00,124.80,-33.60,0 +-57.60,-4.80,9.34,0.00,1.00,134.40,-33.60,0 +124.80,4.80,6.69,0.00,1.00,139.20,-28.80,0 +-48.00,-4.80,9.31,0.00,1.00,144.00,-28.80,0 +134.40,4.80,6.71,0.00,1.00,148.80,-24.00,0 +-38.40,-4.80,9.29,0.00,1.00,153.60,-24.00,0 +144.00,4.80,6.73,0.00,1.00,153.60,-19.20,0 +-28.80,-4.80,9.27,0.00,1.00,158.40,-19.20,0 +153.60,4.80,6.75,0.00,1.00,163.20,-14.40,0 +-19.20,-4.80,9.25,0.00,1.00,168.00,-14.40,0 +163.20,0.00,6.77,0.00,1.00,168.00,-9.60,0 +-9.60,-0.00,9.23,0.00,1.00,172.80,-9.60,0 +172.80,0.00,6.79,0.00,1.00,177.60,-4.80,0 +-0.00,-0.00,9.21,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,6.81,0.00,1.00,-177.60,0.00,0 +4.80,0.00,9.19,0.00,1.00,-177.60,4.80,0 +-168.00,-0.00,6.84,0.00,1.00,-172.80,9.60,0 +14.40,0.00,9.16,0.00,1.00,-168.00,9.60,0 +-158.40,-4.80,6.86,0.00,1.00,-168.00,14.40,0 +24.00,4.80,9.14,0.00,1.00,-163.20,14.40,0 +-148.80,-4.80,6.88,0.00,1.00,-158.40,19.20,0 +33.60,4.80,9.12,0.00,1.00,-153.60,19.20,0 +-139.20,-4.80,6.90,0.00,1.00,-153.60,24.00,0 +43.20,4.80,9.10,0.00,1.00,-148.80,24.00,0 +-129.60,-4.80,6.92,0.00,1.00,-144.00,28.80,0 +52.80,4.80,9.08,0.00,1.00,-139.20,28.80,0 +-120.00,-4.80,6.94,0.00,1.00,-134.40,33.60,0 +62.40,4.80,9.06,0.00,1.00,-124.80,33.60,0 +-110.40,-4.80,6.96,0.00,1.00,-120.00,33.60,0 +72.00,4.80,9.04,0.00,1.00,-115.20,38.40,0 +-100.80,-4.80,6.99,0.00,1.00,-105.60,38.40,0 +81.60,4.80,9.01,0.00,1.00,-100.80,38.40,0 +-91.20,-4.80,7.01,0.00,1.00,-91.20,38.40,0 +96.00,4.80,8.99,0.00,1.00,-86.40,38.40,0 +-81.60,-4.80,7.03,0.00,1.00,-76.80,38.40,0 +105.60,4.80,8.97,0.00,1.00,-67.20,38.40,0 +-72.00,-4.80,7.05,0.00,1.00,-62.40,38.40,0 +115.20,4.80,8.95,0.00,1.00,-57.60,33.60,0 +-62.40,-4.80,7.07,0.00,1.00,-48.00,33.60,0 +124.80,4.80,8.93,0.00,1.00,-43.20,33.60,0 +-52.80,-4.80,7.09,0.00,1.00,-38.40,28.80,0 +134.40,4.80,8.91,0.00,1.00,-33.60,28.80,0 +-43.20,-4.80,7.11,0.00,1.00,-28.80,24.00,0 +144.00,4.80,8.89,0.00,1.00,-24.00,24.00,0 +-33.60,-4.80,7.13,0.00,1.00,-24.00,19.20,0 +153.60,4.80,8.87,0.00,1.00,-19.20,19.20,0 +-24.00,-4.80,7.16,0.00,1.00,-14.40,14.40,0 +163.20,0.00,8.84,0.00,1.00,-14.40,9.60,0 +-14.40,-0.00,7.18,0.00,1.00,-9.60,9.60,0 +172.80,0.00,8.82,0.00,1.00,-4.80,4.80,0 +-4.80,-0.00,7.20,0.00,1.00,-4.80,4.80,0 +0.00,0.00,8.80,0.00,1.00,0.00,0.00,0 +-177.60,-0.00,7.22,0.00,1.00,4.80,-4.80,0 +9.60,0.00,8.78,0.00,1.00,4.80,-4.80,0 +-168.00,-0.00,7.24,0.00,1.00,9.60,-9.60,0 +19.20,0.00,8.76,0.00,1.00,14.40,-14.40,0 +-158.40,-0.00,7.26,0.00,1.00,19.20,-14.40,0 +28.80,0.00,8.74,0.00,1.00,19.20,-19.20,0 +-148.80,-0.00,7.28,0.00,1.00,24.00,-24.00,0 +38.40,0.00,8.72,0.00,1.00,28.80,-24.00,0 +-139.20,-0.00,7.31,0.00,1.00,33.60,-28.80,0 +48.00,0.00,8.69,0.00,1.00,38.40,-28.80,0 +-129.60,-0.00,7.33,0.00,1.00,43.20,-33.60,0 +57.60,0.00,8.67,0.00,1.00,48.00,-33.60,0 +-120.00,-0.00,7.35,0.00,1.00,52.80,-38.40,0 +67.20,0.00,8.65,0.00,1.00,57.60,-38.40,0 +-110.40,-0.00,7.37,0.00,1.00,62.40,-38.40,0 +76.80,0.00,8.63,0.00,1.00,72.00,-43.20,0 +-100.80,-0.00,7.39,0.00,1.00,76.80,-43.20,0 +86.40,0.00,8.61,0.00,1.00,86.40,-43.20,0 +-86.40,-0.00,7.41,0.00,1.00,91.20,-43.20,0 +96.00,0.00,8.59,0.00,1.00,100.80,-43.20,0 +-76.80,-0.00,7.43,0.00,1.00,105.60,-43.20,0 +105.60,0.00,8.57,0.00,1.00,110.40,-43.20,0 +-67.20,-0.00,7.46,0.00,1.00,120.00,-38.40,0 +115.20,0.00,8.54,0.00,1.00,124.80,-38.40,0 +-57.60,-0.00,7.48,0.00,1.00,129.60,-38.40,0 +124.80,0.00,8.52,0.00,1.00,134.40,-33.60,0 +-48.00,-0.00,7.50,0.00,1.00,139.20,-33.60,0 +134.40,0.00,8.50,0.00,1.00,144.00,-28.80,0 +-38.40,-0.00,7.52,0.00,1.00,148.80,-28.80,0 +144.00,0.00,8.48,0.00,1.00,153.60,-24.00,0 +-28.80,-0.00,7.54,0.00,1.00,158.40,-19.20,0 +153.60,0.00,8.46,0.00,1.00,163.20,-19.20,0 +-19.20,-0.00,7.56,0.00,1.00,163.20,-14.40,0 +163.20,0.00,8.44,0.00,1.00,168.00,-9.60,0 +-9.60,-0.00,7.58,0.00,1.00,172.80,-9.60,0 +172.80,0.00,8.42,0.00,1.00,172.80,-4.80,0 +-0.00,-0.00,7.60,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,8.40,0.00,1.00,-177.60,0.00,0 +4.80,0.00,7.63,0.00,1.00,-172.80,4.80,0 +-168.00,-0.00,8.37,0.00,1.00,-172.80,9.60,0 +14.40,0.00,7.65,0.00,1.00,-168.00,9.60,0 +-158.40,-0.00,8.35,0.00,1.00,-163.20,14.40,0 +24.00,0.00,7.67,0.00,1.00,-163.20,19.20,0 +-148.80,-0.00,8.33,0.00,1.00,-158.40,19.20,0 +33.60,0.00,7.69,0.00,1.00,-153.60,24.00,0 +-139.20,-0.00,8.31,0.00,1.00,-148.80,28.80,0 +43.20,0.00,7.71,0.00,1.00,-144.00,28.80,0 +-129.60,-0.00,8.29,0.00,1.00,-139.20,33.60,0 +52.80,0.00,7.73,0.00,1.00,-134.40,33.60,0 +-120.00,-0.00,8.27,0.00,1.00,-129.60,38.40,0 +62.40,0.00,7.75,0.00,1.00,-124.80,38.40,0 +-110.40,-0.00,8.25,0.00,1.00,-120.00,38.40,0 +72.00,0.00,7.78,0.00,1.00,-110.40,43.20,0 +-100.80,-0.00,8.22,0.00,1.00,-105.60,43.20,0 +81.60,0.00,7.80,0.00,1.00,-100.80,43.20,0 +-91.20,-0.00,8.20,0.00,1.00,-91.20,43.20,0 +96.00,0.00,7.82,0.00,1.00,-86.40,43.20,0 +-81.60,-0.00,8.18,0.00,1.00,-76.80,43.20,0 +105.60,0.00,7.84,0.00,1.00,-72.00,43.20,0 +-72.00,-0.00,8.16,0.00,1.00,-62.40,38.40,0 +115.20,0.00,7.86,0.00,1.00,-57.60,38.40,0 +-62.40,-0.00,8.14,0.00,1.00,-52.80,38.40,0 +124.80,0.00,7.88,0.00,1.00,-48.00,33.60,0 +-52.80,-0.00,8.12,0.00,1.00,-43.20,33.60,0 +134.40,0.00,7.90,0.00,1.00,-38.40,28.80,0 +-43.20,-0.00,8.10,0.00,1.00,-33.60,28.80,0 +144.00,0.00,7.93,0.00,1.00,-28.80,24.00,0 +-33.60,-0.00,8.07,0.00,1.00,-24.00,24.00,0 +153.60,0.00,7.95,0.00,1.00,-19.20,19.20,0 +-24.00,-0.00,8.05,0.00,1.00,-19.20,14.40,0 +163.20,0.00,7.97,0.00,1.00,-14.40,14.40,0 +-14.40,-0.00,8.03,0.00,1.00,-9.60,9.60,0 +172.80,0.00,7.99,0.00,1.00,-4.80,4.80,0 +-4.80,-0.00,8.01,0.00,1.00,-4.80,4.80,0 +0.00,0.00,8.01,0.00,1.00,0.00,0.00,0 +-177.60,0.00,7.99,0.00,1.00,4.80,-4.80,0 +9.60,-0.00,8.03,0.00,1.00,4.80,-4.80,0 +-168.00,0.00,7.97,0.00,1.00,9.60,-9.60,0 +19.20,-0.00,8.05,0.00,1.00,14.40,-14.40,0 +-158.40,0.00,7.95,0.00,1.00,19.20,-19.20,0 +28.80,-0.00,8.07,0.00,1.00,24.00,-19.20,0 +-148.80,0.00,7.93,0.00,1.00,24.00,-24.00,0 +38.40,-0.00,8.10,0.00,1.00,28.80,-28.80,0 +-139.20,0.00,7.90,0.00,1.00,33.60,-28.80,0 +48.00,-0.00,8.12,0.00,1.00,38.40,-33.60,0 +-129.60,0.00,7.88,0.00,1.00,43.20,-38.40,0 +57.60,-4.80,8.14,0.00,1.00,48.00,-38.40,0 +-120.00,4.80,7.86,0.00,1.00,52.80,-43.20,0 +67.20,-4.80,8.16,0.00,1.00,62.40,-43.20,0 +-110.40,4.80,7.84,0.00,1.00,67.20,-43.20,0 +76.80,-4.80,8.18,0.00,1.00,72.00,-48.00,0 +-100.80,4.80,7.82,0.00,1.00,76.80,-48.00,0 +86.40,-4.80,8.20,0.00,1.00,86.40,-48.00,0 +-86.40,4.80,7.80,0.00,1.00,91.20,-48.00,0 +96.00,-4.80,8.22,0.00,1.00,96.00,-48.00,0 +-76.80,4.80,7.78,0.00,1.00,105.60,-48.00,0 +105.60,-4.80,8.25,0.00,1.00,110.40,-48.00,0 +-67.20,4.80,7.75,0.00,1.00,115.20,-43.20,0 +115.20,-4.80,8.27,0.00,1.00,120.00,-43.20,0 +-57.60,4.80,7.73,0.00,1.00,129.60,-38.40,0 +124.80,-4.80,8.29,0.00,1.00,134.40,-38.40,0 +-48.00,0.00,7.71,0.00,1.00,139.20,-33.60,0 +134.40,-0.00,8.31,0.00,1.00,144.00,-33.60,0 +-38.40,0.00,7.69,0.00,1.00,148.80,-28.80,0 +144.00,-0.00,8.33,0.00,1.00,153.60,-24.00,0 +-28.80,0.00,7.67,0.00,1.00,153.60,-24.00,0 +153.60,-0.00,8.35,0.00,1.00,158.40,-19.20,0 +-19.20,0.00,7.65,0.00,1.00,163.20,-14.40,0 +163.20,-0.00,8.37,0.00,1.00,168.00,-14.40,0 +-9.60,0.00,7.63,0.00,1.00,172.80,-9.60,0 +172.80,-0.00,8.40,0.00,1.00,172.80,-4.80,0 +-0.00,0.00,7.60,0.00,1.00,177.60,-0.00,0 +-177.60,0.00,8.42,0.00,1.00,-177.60,0.00,0 +4.80,-0.00,7.58,0.00,1.00,-172.80,4.80,0 +-168.00,0.00,8.44,0.00,1.00,-172.80,9.60,0 +14.40,-0.00,7.56,0.00,1.00,-168.00,14.40,0 +-158.40,0.00,8.46,0.00,1.00,-163.20,14.40,0 +24.00,-0.00,7.54,0.00,1.00,-158.40,19.20,0 +-148.80,0.00,8.48,0.00,1.00,-153.60,24.00,0 +33.60,-0.00,7.52,0.00,1.00,-153.60,24.00,0 +-139.20,0.00,8.50,0.00,1.00,-148.80,28.80,0 +43.20,-0.00,7.50,0.00,1.00,-144.00,33.60,0 +-129.60,0.00,8.52,0.00,1.00,-139.20,33.60,0 +52.80,-4.80,7.48,0.00,1.00,-134.40,38.40,0 +-120.00,4.80,8.54,0.00,1.00,-129.60,38.40,0 +62.40,-4.80,7.46,0.00,1.00,-120.00,43.20,0 +-110.40,4.80,8.57,0.00,1.00,-115.20,43.20,0 +72.00,-4.80,7.43,0.00,1.00,-110.40,48.00,0 +-100.80,4.80,8.59,0.00,1.00,-105.60,48.00,0 +81.60,-4.80,7.41,0.00,1.00,-96.00,48.00,0 +-91.20,4.80,8.61,0.00,1.00,-91.20,48.00,0 +96.00,-4.80,7.39,0.00,1.00,-86.40,48.00,0 +-81.60,4.80,8.63,0.00,1.00,-76.80,48.00,0 +105.60,-4.80,7.37,0.00,1.00,-72.00,48.00,0 +-72.00,4.80,8.65,0.00,1.00,-67.20,43.20,0 +115.20,-4.80,7.35,0.00,1.00,-62.40,43.20,0 +-62.40,4.80,8.67,0.00,1.00,-52.80,43.20,0 +124.80,-4.80,7.33,0.00,1.00,-48.00,38.40,0 +-52.80,0.00,8.69,0.00,1.00,-43.20,38.40,0 +134.40,-0.00,7.31,0.00,1.00,-38.40,33.60,0 +-43.20,0.00,8.72,0.00,1.00,-33.60,28.80,0 +144.00,-0.00,7.28,0.00,1.00,-28.80,28.80,0 +-33.60,0.00,8.74,0.00,1.00,-24.00,24.00,0 +153.60,-0.00,7.26,0.00,1.00,-24.00,19.20,0 +-24.00,0.00,8.76,0.00,1.00,-19.20,19.20,0 +163.20,-0.00,7.24,0.00,1.00,-14.40,14.40,0 +-14.40,0.00,8.78,0.00,1.00,-9.60,9.60,0 +172.80,-0.00,7.22,0.00,1.00,-4.80,4.80,0 +-4.80,0.00,8.80,0.00,1.00,-4.80,4.80,0 +0.00,0.00,7.20,0.00,1.00,0.00,0.00,0 +-177.60,0.00,8.82,0.00,1.00,4.80,-4.80,0 +9.60,-0.00,7.18,0.00,1.00,9.60,-9.60,0 +-168.00,0.00,8.84,0.00,1.00,9.60,-9.60,0 +19.20,-4.80,7.16,0.00,1.00,14.40,-14.40,0 +-158.40,4.80,8.87,0.00,1.00,19.20,-19.20,0 +28.80,-4.80,7.13,0.00,1.00,24.00,-24.00,0 +-148.80,4.80,8.89,0.00,1.00,28.80,-24.00,0 +38.40,-4.80,7.11,0.00,1.00,33.60,-28.80,0 +-139.20,4.80,8.91,0.00,1.00,38.40,-33.60,0 +48.00,-4.80,7.09,0.00,1.00,43.20,-38.40,0 +-129.60,4.80,8.93,0.00,1.00,48.00,-38.40,0 +57.60,-4.80,7.07,0.00,1.00,52.80,-43.20,0 +-120.00,4.80,8.95,0.00,1.00,57.60,-43.20,0 +67.20,-4.80,7.05,0.00,1.00,62.40,-48.00,0 +-110.40,9.60,8.97,0.00,1.00,67.20,-48.00,0 +76.80,-9.60,7.03,0.00,1.00,72.00,-52.80,0 +-100.80,9.60,8.99,0.00,1.00,81.60,-52.80,0 +86.40,-9.60,7.01,0.00,1.00,86.40,-52.80,0 +-86.40,9.60,9.01,0.00,1.00,91.20,-52.80,0 +96.00,-9.60,6.99,0.00,1.00,96.00,-52.80,0 +-76.80,9.60,9.04,0.00,1.00,105.60,-52.80,0 +105.60,-9.60,6.96,0.00,1.00,110.40,-48.00,0 +-67.20,9.60,9.06,0.00,1.00,115.20,-48.00,0 +115.20,-4.80,6.94,0.00,1.00,120.00,-48.00,0 +-57.60,4.80,9.08,0.00,1.00,124.80,-43.20,0 +124.80,-4.80,6.92,0.00,1.00,129.60,-43.20,0 +-48.00,4.80,9.10,0.00,1.00,134.40,-38.40,0 +134.40,-4.80,6.90,0.00,1.00,139.20,-33.60,0 +-38.40,4.80,9.12,0.00,1.00,144.00,-33.60,0 +144.00,-4.80,6.88,0.00,1.00,148.80,-28.80,0 +-28.80,4.80,9.14,0.00,1.00,153.60,-24.00,0 +153.60,-4.80,6.86,0.00,1.00,158.40,-19.20,0 +-19.20,4.80,9.16,0.00,1.00,163.20,-19.20,0 +163.20,-0.00,6.84,0.00,1.00,168.00,-14.40,0 +-9.60,0.00,9.19,0.00,1.00,168.00,-9.60,0 +172.80,-0.00,6.81,0.00,1.00,172.80,-4.80,0 +-0.00,0.00,9.21,0.00,1.00,177.60,-0.00,0 +-177.60,0.00,6.79,0.00,1.00,-177.60,0.00,0 +4.80,-0.00,9.23,0.00,1.00,-172.80,4.80,0 +-168.00,0.00,6.77,0.00,1.00,-168.00,9.60,0 +14.40,-0.00,9.25,0.00,1.00,-168.00,14.40,0 +-158.40,4.80,6.75,0.00,1.00,-163.20,19.20,0 +24.00,-4.80,9.27,0.00,1.00,-158.40,19.20,0 +-148.80,4.80,6.73,0.00,1.00,-153.60,24.00,0 +33.60,-4.80,9.29,0.00,1.00,-148.80,28.80,0 +-139.20,4.80,6.71,0.00,1.00,-144.00,33.60,0 +43.20,-4.80,9.31,0.00,1.00,-139.20,33.60,0 +-129.60,4.80,6.69,0.00,1.00,-134.40,38.40,0 +52.80,-4.80,9.34,0.00,1.00,-129.60,43.20,0 +-120.00,4.80,6.66,0.00,1.00,-124.80,43.20,0 +62.40,-4.80,9.36,0.00,1.00,-120.00,48.00,0 +-110.40,9.60,6.64,0.00,1.00,-115.20,48.00,0 +72.00,-9.60,9.38,0.00,1.00,-110.40,48.00,0 +-100.80,9.60,6.62,0.00,1.00,-105.60,52.80,0 +81.60,-9.60,9.40,0.00,1.00,-96.00,52.80,0 +-91.20,9.60,6.60,0.00,1.00,-91.20,52.80,0 +96.00,-9.60,9.42,0.00,1.00,-86.40,52.80,0 +-81.60,9.60,6.58,0.00,1.00,-81.60,52.80,0 +105.60,-9.60,9.44,0.00,1.00,-72.00,52.80,0 +-72.00,9.60,6.56,0.00,1.00,-67.20,48.00,0 +115.20,-4.80,9.46,0.00,1.00,-62.40,48.00,0 +-62.40,4.80,6.54,0.00,1.00,-57.60,43.20,0 +124.80,-4.80,9.48,0.00,1.00,-52.80,43.20,0 +-52.80,4.80,6.52,0.00,1.00,-48.00,38.40,0 +134.40,-4.80,9.51,0.00,1.00,-43.20,38.40,0 +-43.20,4.80,6.49,0.00,1.00,-38.40,33.60,0 +144.00,-4.80,9.53,0.00,1.00,-33.60,28.80,0 +-33.60,4.80,6.47,0.00,1.00,-28.80,24.00,0 +153.60,-4.80,9.55,0.00,1.00,-24.00,24.00,0 +-24.00,4.80,6.45,0.00,1.00,-19.20,19.20,0 +163.20,-4.80,9.57,0.00,1.00,-14.40,14.40,0 +-14.40,0.00,6.43,0.00,1.00,-9.60,9.60,0 +172.80,-0.00,9.59,0.00,1.00,-9.60,9.60,0 +-4.80,0.00,6.41,0.00,1.00,-4.80,4.80,0 +0.00,0.00,9.61,0.00,1.00,0.00,0.00,0 +-177.60,0.00,6.39,0.00,1.00,4.80,-4.80,0 +9.60,-0.00,9.63,0.00,1.00,9.60,-9.60,0 +-168.00,4.80,6.37,0.00,1.00,14.40,-14.40,0 +19.20,-4.80,9.66,0.00,1.00,14.40,-14.40,0 +-158.40,4.80,6.34,0.00,1.00,19.20,-19.20,0 +28.80,-4.80,9.68,0.00,1.00,24.00,-24.00,0 +-148.80,4.80,6.32,0.00,1.00,28.80,-28.80,0 +38.40,-9.60,9.70,0.00,1.00,33.60,-33.60,0 +-139.20,9.60,6.30,0.00,1.00,38.40,-33.60,0 +48.00,-9.60,9.72,0.00,1.00,43.20,-38.40,0 +-129.60,9.60,6.28,0.00,1.00,48.00,-43.20,0 +57.60,-9.60,9.74,0.00,1.00,52.80,-43.20,0 +-120.00,9.60,6.26,0.00,1.00,57.60,-48.00,0 +67.20,-9.60,9.76,0.00,1.00,62.40,-52.80,0 +-110.40,9.60,6.24,0.00,1.00,67.20,-52.80,0 +76.80,-14.40,9.78,0.00,1.00,76.80,-57.60,0 +-100.80,14.40,6.22,0.00,1.00,81.60,-57.60,0 +86.40,-14.40,9.81,0.00,1.00,86.40,-57.60,0 +-86.40,14.40,6.19,0.00,1.00,91.20,-57.60,0 +96.00,-14.40,9.83,0.00,1.00,96.00,-57.60,0 +-76.80,14.40,6.17,0.00,1.00,100.80,-57.60,0 +105.60,-14.40,9.85,0.00,1.00,110.40,-52.80,0 +-67.20,9.60,6.15,0.00,1.00,115.20,-52.80,0 +115.20,-9.60,9.87,0.00,1.00,120.00,-48.00,0 +-57.60,9.60,6.13,0.00,1.00,124.80,-48.00,0 +124.80,-9.60,9.89,0.00,1.00,129.60,-43.20,0 +-48.00,9.60,6.11,0.00,1.00,134.40,-38.40,0 +134.40,-9.60,9.91,0.00,1.00,139.20,-38.40,0 +-38.40,9.60,6.09,0.00,1.00,144.00,-33.60,0 +144.00,-9.60,9.93,0.00,1.00,148.80,-28.80,0 +-28.80,4.80,6.07,0.00,1.00,153.60,-24.00,0 +153.60,-4.80,9.95,0.00,1.00,158.40,-24.00,0 +-19.20,4.80,6.05,0.00,1.00,163.20,-19.20,0 +163.20,-4.80,9.98,0.00,1.00,168.00,-14.40,0 +-9.60,4.80,6.02,0.00,1.00,168.00,-9.60,0 +172.80,-0.00,10.00,0.00,1.00,172.80,-4.80,0 +-0.00,0.00,6.00,0.00,1.00,177.60,-0.00,0 +-177.60,0.00,10.02,0.00,1.00,-177.60,0.00,0 +4.80,-0.00,5.98,0.00,1.00,-172.80,4.80,0 +-168.00,4.80,10.04,0.00,1.00,-168.00,9.60,0 +14.40,-4.80,5.96,0.00,1.00,-168.00,14.40,0 +-158.40,4.80,10.06,0.00,1.00,-163.20,19.20,0 +24.00,-4.80,5.94,0.00,1.00,-158.40,24.00,0 +-148.80,4.80,10.08,0.00,1.00,-153.60,24.00,0 +33.60,-9.60,5.92,0.00,1.00,-148.80,28.80,0 +-139.20,9.60,10.10,0.00,1.00,-144.00,33.60,0 +43.20,-9.60,5.90,0.00,1.00,-139.20,38.40,0 +-129.60,9.60,10.13,0.00,1.00,-134.40,38.40,0 +52.80,-9.60,5.87,0.00,1.00,-129.60,43.20,0 +-120.00,9.60,10.15,0.00,1.00,-124.80,48.00,0 +62.40,-9.60,5.85,0.00,1.00,-120.00,48.00,0 +-110.40,9.60,10.17,0.00,1.00,-115.20,52.80,0 +72.00,-14.40,5.83,0.00,1.00,-110.40,52.80,0 +-100.80,14.40,10.19,0.00,1.00,-100.80,57.60,0 +81.60,-14.40,5.81,0.00,1.00,-96.00,57.60,0 +-91.20,14.40,10.21,0.00,1.00,-91.20,57.60,0 +96.00,-14.40,5.79,0.00,1.00,-86.40,57.60,0 +-81.60,14.40,10.23,0.00,1.00,-81.60,57.60,0 +105.60,-14.40,5.77,0.00,1.00,-76.80,57.60,0 +-72.00,9.60,10.25,0.00,1.00,-67.20,52.80,0 +115.20,-9.60,5.75,0.00,1.00,-62.40,52.80,0 +-62.40,9.60,10.28,0.00,1.00,-57.60,48.00,0 +124.80,-9.60,5.72,0.00,1.00,-52.80,43.20,0 +-52.80,9.60,10.30,0.00,1.00,-48.00,43.20,0 +134.40,-9.60,5.70,0.00,1.00,-43.20,38.40,0 +-43.20,9.60,10.32,0.00,1.00,-38.40,33.60,0 +144.00,-9.60,5.68,0.00,1.00,-33.60,33.60,0 +-33.60,4.80,10.34,0.00,1.00,-28.80,28.80,0 +153.60,-4.80,5.66,0.00,1.00,-24.00,24.00,0 +-24.00,4.80,10.36,0.00,1.00,-19.20,19.20,0 +163.20,-4.80,5.64,0.00,1.00,-14.40,14.40,0 +-14.40,4.80,10.38,0.00,1.00,-14.40,14.40,0 +172.80,-0.00,5.62,0.00,1.00,-9.60,9.60,0 +-4.80,0.00,10.40,0.00,1.00,-4.80,4.80,0 +0.00,0.00,5.60,0.00,1.00,0.00,0.00,0 +-177.60,0.00,10.42,0.00,1.00,4.80,-4.80,0 +9.60,-4.80,5.58,0.00,1.00,9.60,-9.60,0 +-168.00,4.80,10.45,0.00,1.00,14.40,-14.40,0 +19.20,-4.80,5.55,0.00,1.00,19.20,-19.20,0 +-158.40,4.80,10.47,0.00,1.00,19.20,-19.20,0 +28.80,-9.60,5.53,0.00,1.00,24.00,-24.00,0 +-148.80,9.60,10.49,0.00,1.00,28.80,-28.80,0 +38.40,-9.60,5.51,0.00,1.00,33.60,-33.60,0 +-139.20,9.60,10.51,0.00,1.00,38.40,-38.40,0 +48.00,-14.40,5.49,0.00,1.00,43.20,-43.20,0 +-129.60,14.40,10.53,0.00,1.00,48.00,-43.20,0 +57.60,-14.40,5.47,0.00,1.00,52.80,-48.00,0 +-120.00,14.40,10.55,0.00,1.00,57.60,-52.80,0 +67.20,-14.40,5.45,0.00,1.00,62.40,-52.80,0 +-110.40,14.40,10.57,0.00,1.00,72.00,-57.60,0 +76.80,-19.20,5.43,0.00,1.00,76.80,-57.60,0 +-100.80,19.20,10.60,0.00,1.00,81.60,-62.40,0 +86.40,-19.20,5.40,0.00,1.00,86.40,-62.40,0 +-86.40,19.20,10.62,0.00,1.00,91.20,-62.40,0 +96.00,-19.20,5.38,0.00,1.00,96.00,-62.40,0 +-76.80,19.20,10.64,0.00,1.00,100.80,-62.40,0 +105.60,-14.40,5.36,0.00,1.00,105.60,-57.60,0 +-67.20,14.40,10.66,0.00,1.00,110.40,-57.60,0 +115.20,-14.40,5.34,0.00,1.00,120.00,-52.80,0 +-57.60,14.40,10.68,0.00,1.00,124.80,-48.00,0 +124.80,-14.40,5.32,0.00,1.00,129.60,-48.00,0 +-48.00,14.40,10.70,0.00,1.00,134.40,-43.20,0 +134.40,-14.40,5.30,0.00,1.00,139.20,-38.40,0 +-38.40,9.60,10.72,0.00,1.00,144.00,-33.60,0 +144.00,-9.60,5.28,0.00,1.00,148.80,-33.60,0 +-28.80,9.60,10.74,0.00,1.00,153.60,-28.80,0 +153.60,-9.60,5.26,0.00,1.00,158.40,-24.00,0 +-19.20,4.80,10.77,0.00,1.00,158.40,-19.20,0 +163.20,-4.80,5.23,0.00,1.00,163.20,-14.40,0 +-9.60,4.80,10.79,0.00,1.00,168.00,-9.60,0 +172.80,-0.00,5.21,0.00,1.00,172.80,-4.80,0 +-0.00,0.00,10.81,0.00,1.00,177.60,-0.00,0 +-177.60,0.00,5.19,0.00,1.00,-177.60,0.00,0 +4.80,-0.00,10.83,0.00,1.00,-172.80,4.80,0 +-168.00,4.80,5.17,0.00,1.00,-168.00,9.60,0 +14.40,-4.80,10.85,0.00,1.00,-163.20,14.40,0 +-158.40,4.80,5.15,0.00,1.00,-158.40,19.20,0 +24.00,-9.60,10.87,0.00,1.00,-158.40,24.00,0 +-148.80,9.60,5.13,0.00,1.00,-153.60,28.80,0 +33.60,-9.60,10.89,0.00,1.00,-148.80,33.60,0 +-139.20,9.60,5.11,0.00,1.00,-144.00,33.60,0 +43.20,-14.40,10.92,0.00,1.00,-139.20,38.40,0 +-129.60,14.40,5.08,0.00,1.00,-134.40,43.20,0 +52.80,-14.40,10.94,0.00,1.00,-129.60,48.00,0 +-120.00,14.40,5.06,0.00,1.00,-124.80,48.00,0 +62.40,-14.40,10.96,0.00,1.00,-120.00,52.80,0 +-110.40,14.40,5.04,0.00,1.00,-110.40,57.60,0 +72.00,-14.40,10.98,0.00,1.00,-105.60,57.60,0 +-100.80,19.20,5.02,0.00,1.00,-100.80,62.40,0 +81.60,-19.20,11.00,0.00,1.00,-96.00,62.40,0 +-91.20,19.20,5.00,0.00,1.00,-91.20,62.40,0 +96.00,-19.20,11.02,0.00,1.00,-86.40,62.40,0 +-81.60,19.20,4.98,0.00,1.00,-81.60,62.40,0 +105.60,-19.20,11.04,0.00,1.00,-76.80,57.60,0 +-72.00,14.40,4.96,0.00,1.00,-72.00,57.60,0 +115.20,-14.40,11.07,0.00,1.00,-62.40,52.80,0 +-62.40,14.40,4.93,0.00,1.00,-57.60,52.80,0 +124.80,-14.40,11.09,0.00,1.00,-52.80,48.00,0 +-52.80,14.40,4.91,0.00,1.00,-48.00,43.20,0 +134.40,-14.40,11.11,0.00,1.00,-43.20,43.20,0 +-43.20,9.60,4.89,0.00,1.00,-38.40,38.40,0 +144.00,-9.60,11.13,0.00,1.00,-33.60,33.60,0 +-33.60,9.60,4.87,0.00,1.00,-28.80,28.80,0 +153.60,-9.60,11.15,0.00,1.00,-24.00,24.00,0 +-24.00,4.80,4.85,0.00,1.00,-19.20,19.20,0 +163.20,-4.80,11.17,0.00,1.00,-19.20,19.20,0 +-14.40,4.80,4.83,0.00,1.00,-14.40,14.40,0 +172.80,-4.80,11.19,0.00,1.00,-9.60,9.60,0 +-4.80,0.00,4.81,0.00,1.00,-4.80,4.80,0 +0.00,0.00,11.21,0.00,1.00,0.00,0.00,0 +-177.60,0.00,4.79,0.00,1.00,4.80,-4.80,0 +9.60,-4.80,11.24,0.00,1.00,9.60,-9.60,0 +-168.00,4.80,4.76,0.00,1.00,14.40,-14.40,0 +19.20,-4.80,11.26,0.00,1.00,19.20,-19.20,0 +-158.40,9.60,4.74,0.00,1.00,24.00,-24.00,0 +28.80,-9.60,11.28,0.00,1.00,28.80,-24.00,0 +-148.80,14.40,4.72,0.00,1.00,33.60,-28.80,0 +38.40,-14.40,11.30,0.00,1.00,38.40,-33.60,0 +-139.20,14.40,4.70,0.00,1.00,43.20,-38.40,0 +48.00,-14.40,11.32,0.00,1.00,48.00,-43.20,0 +-129.60,19.20,4.68,0.00,1.00,52.80,-48.00,0 +57.60,-19.20,11.34,0.00,1.00,57.60,-52.80,0 +-120.00,19.20,4.66,0.00,1.00,62.40,-52.80,0 +67.20,-19.20,11.36,0.00,1.00,67.20,-57.60,0 +-110.40,19.20,4.64,0.00,1.00,72.00,-62.40,0 +76.80,-19.20,11.39,0.00,1.00,76.80,-62.40,0 +-100.80,24.00,4.61,0.00,1.00,81.60,-67.20,0 +86.40,-24.00,11.41,0.00,1.00,86.40,-67.20,0 +-86.40,24.00,4.59,0.00,1.00,91.20,-67.20,0 +96.00,-24.00,11.43,0.00,1.00,96.00,-67.20,0 +-76.80,24.00,4.57,0.00,1.00,100.80,-67.20,0 +105.60,-19.20,11.45,0.00,1.00,105.60,-62.40,0 +-67.20,19.20,4.55,0.00,1.00,110.40,-57.60,0 +115.20,-19.20,11.47,0.00,1.00,115.20,-57.60,0 +-57.60,19.20,4.53,0.00,1.00,120.00,-52.80,0 +124.80,-19.20,11.49,0.00,1.00,124.80,-48.00,0 +-48.00,19.20,4.51,0.00,1.00,129.60,-43.20,0 +134.40,-14.40,11.51,0.00,1.00,134.40,-43.20,0 +-38.40,14.40,4.49,0.00,1.00,139.20,-38.40,0 +144.00,-14.40,11.54,0.00,1.00,144.00,-33.60,0 +-28.80,9.60,4.46,0.00,1.00,148.80,-28.80,0 +153.60,-9.60,11.56,0.00,1.00,153.60,-24.00,0 +-19.20,9.60,4.44,0.00,1.00,158.40,-19.20,0 +163.20,-4.80,11.58,0.00,1.00,163.20,-14.40,0 +-9.60,4.80,4.42,0.00,1.00,168.00,-9.60,0 +172.80,-4.80,11.60,0.00,1.00,172.80,-4.80,0 +-0.00,0.00,4.40,0.00,1.00,177.60,-0.00,0 +-177.60,0.00,11.62,0.00,1.00,-177.60,0.00,0 +4.80,-4.80,4.38,0.00,1.00,-172.80,4.80,0 +-168.00,4.80,11.64,0.00,1.00,-168.00,9.60,0 +14.40,-4.80,4.36,0.00,1.00,-163.20,14.40,0 +-158.40,9.60,11.66,0.00,1.00,-158.40,19.20,0 +24.00,-9.60,4.34,0.00,1.00,-153.60,24.00,0 +-148.80,9.60,11.68,0.00,1.00,-148.80,28.80,0 +33.60,-14.40,4.32,0.00,1.00,-144.00,33.60,0 +-139.20,14.40,11.71,0.00,1.00,-139.20,38.40,0 +43.20,-14.40,4.29,0.00,1.00,-134.40,43.20,0 +-129.60,19.20,11.73,0.00,1.00,-129.60,43.20,0 +52.80,-19.20,4.27,0.00,1.00,-124.80,48.00,0 +-120.00,19.20,11.75,0.00,1.00,-120.00,52.80,0 +62.40,-19.20,4.25,0.00,1.00,-115.20,57.60,0 +-110.40,19.20,11.77,0.00,1.00,-110.40,57.60,0 +72.00,-19.20,4.23,0.00,1.00,-105.60,62.40,0 +-100.80,24.00,11.79,0.00,1.00,-100.80,67.20,0 +81.60,-24.00,4.21,0.00,1.00,-96.00,67.20,0 +-91.20,24.00,11.81,0.00,1.00,-91.20,67.20,0 +96.00,-24.00,4.19,0.00,1.00,-86.40,67.20,0 +-81.60,24.00,11.83,0.00,1.00,-81.60,67.20,0 +105.60,-19.20,4.17,0.00,1.00,-76.80,62.40,0 +-72.00,19.20,11.86,0.00,1.00,-72.00,62.40,0 +115.20,-19.20,4.14,0.00,1.00,-67.20,57.60,0 +-62.40,19.20,11.88,0.00,1.00,-62.40,52.80,0 +124.80,-19.20,4.12,0.00,1.00,-57.60,52.80,0 +-52.80,19.20,11.90,0.00,1.00,-52.80,48.00,0 +134.40,-14.40,4.10,0.00,1.00,-48.00,43.20,0 +-43.20,14.40,11.92,0.00,1.00,-43.20,38.40,0 +144.00,-14.40,4.08,0.00,1.00,-38.40,33.60,0 +-33.60,14.40,11.94,0.00,1.00,-33.60,28.80,0 +153.60,-9.60,4.06,0.00,1.00,-28.80,24.00,0 +-24.00,9.60,11.96,0.00,1.00,-24.00,24.00,0 +163.20,-4.80,4.04,0.00,1.00,-19.20,19.20,0 +-14.40,4.80,11.98,0.00,1.00,-14.40,14.40,0 +172.80,-4.80,4.02,0.00,1.00,-9.60,9.60,0 +-4.80,0.00,12.01,0.00,1.00,-4.80,4.80,0 +0.00,0.00,3.99,0.00,1.00,0.00,0.00,0 +-177.60,0.00,12.03,0.00,1.00,4.80,-4.80,0 +9.60,-4.80,3.97,0.00,1.00,9.60,-9.60,0 +-168.00,4.80,12.05,0.00,1.00,14.40,-14.40,0 +19.20,-9.60,3.95,0.00,1.00,19.20,-19.20,0 +-158.40,9.60,12.07,0.00,1.00,24.00,-24.00,0 +24.00,-14.40,3.93,0.00,1.00,28.80,-28.80,0 +-148.80,14.40,12.09,0.00,1.00,33.60,-33.60,0 +33.60,-14.40,3.91,0.00,1.00,38.40,-38.40,0 +-139.20,19.20,12.11,0.00,1.00,43.20,-38.40,0 +43.20,-19.20,3.89,0.00,1.00,48.00,-43.20,0 +-129.60,19.20,12.13,0.00,1.00,52.80,-48.00,0 +52.80,-24.00,3.87,0.00,1.00,57.60,-52.80,0 +-120.00,24.00,12.15,0.00,1.00,62.40,-57.60,0 +62.40,-24.00,3.85,0.00,1.00,67.20,-62.40,0 +-110.40,24.00,12.18,0.00,1.00,72.00,-62.40,0 +76.80,-24.00,3.82,0.00,1.00,76.80,-67.20,0 +-100.80,28.80,12.20,0.00,1.00,81.60,-72.00,0 +86.40,-28.80,3.80,0.00,1.00,86.40,-72.00,0 +-86.40,28.80,12.22,0.00,1.00,91.20,-72.00,0 +96.00,-28.80,3.78,0.00,1.00,96.00,-72.00,0 +-76.80,28.80,12.24,0.00,1.00,100.80,-67.20,0 +105.60,-24.00,3.76,0.00,1.00,105.60,-67.20,0 +-67.20,24.00,12.26,0.00,1.00,110.40,-62.40,0 +120.00,-24.00,3.74,0.00,1.00,115.20,-57.60,0 +-57.60,24.00,12.28,0.00,1.00,120.00,-57.60,0 +129.60,-24.00,3.72,0.00,1.00,124.80,-52.80,0 +-48.00,19.20,12.30,0.00,1.00,129.60,-48.00,0 +139.20,-19.20,3.70,0.00,1.00,134.40,-43.20,0 +-38.40,19.20,12.33,0.00,1.00,139.20,-38.40,0 +148.80,-14.40,3.67,0.00,1.00,144.00,-33.60,0 +-28.80,14.40,12.35,0.00,1.00,148.80,-28.80,0 +158.40,-9.60,3.65,0.00,1.00,153.60,-24.00,0 +-19.20,9.60,12.37,0.00,1.00,158.40,-19.20,0 +163.20,-9.60,3.63,0.00,1.00,163.20,-14.40,0 +-9.60,4.80,12.39,0.00,1.00,168.00,-9.60,0 +172.80,-4.80,3.61,0.00,1.00,172.80,-4.80,0 +-0.00,0.00,12.41,0.00,1.00,177.60,-0.00,0 +-177.60,0.00,3.59,0.00,1.00,-177.60,0.00,0 +4.80,-4.80,12.43,0.00,1.00,-172.80,4.80,0 +-168.00,4.80,3.57,0.00,1.00,-168.00,9.60,0 +14.40,-9.60,12.45,0.00,1.00,-163.20,14.40,0 +-158.40,9.60,3.55,0.00,1.00,-158.40,19.20,0 +24.00,-9.60,12.48,0.00,1.00,-153.60,24.00,0 +-153.60,14.40,3.52,0.00,1.00,-148.80,28.80,0 +33.60,-14.40,12.50,0.00,1.00,-144.00,33.60,0 +-144.00,19.20,3.50,0.00,1.00,-139.20,38.40,0 +43.20,-19.20,12.52,0.00,1.00,-134.40,43.20,0 +-134.40,19.20,3.48,0.00,1.00,-129.60,48.00,0 +52.80,-24.00,12.54,0.00,1.00,-124.80,52.80,0 +-124.80,24.00,3.46,0.00,1.00,-120.00,57.60,0 +62.40,-24.00,12.56,0.00,1.00,-115.20,57.60,0 +-110.40,24.00,3.44,0.00,1.00,-110.40,62.40,0 +72.00,-24.00,12.58,0.00,1.00,-105.60,67.20,0 +-100.80,28.80,3.42,0.00,1.00,-100.80,67.20,0 +81.60,-28.80,12.60,0.00,1.00,-96.00,72.00,0 +-91.20,28.80,3.40,0.00,1.00,-91.20,72.00,0 +96.00,-28.80,12.62,0.00,1.00,-86.40,72.00,0 +-81.60,28.80,3.38,0.00,1.00,-81.60,72.00,0 +105.60,-24.00,12.65,0.00,1.00,-76.80,67.20,0 +-72.00,24.00,3.35,0.00,1.00,-72.00,62.40,0 +115.20,-24.00,12.67,0.00,1.00,-67.20,62.40,0 +-57.60,24.00,3.33,0.00,1.00,-62.40,57.60,0 +124.80,-24.00,12.69,0.00,1.00,-57.60,52.80,0 +-48.00,19.20,3.31,0.00,1.00,-52.80,48.00,0 +134.40,-19.20,12.71,0.00,1.00,-48.00,43.20,0 +-38.40,19.20,3.29,0.00,1.00,-43.20,38.40,0 +144.00,-14.40,12.73,0.00,1.00,-38.40,38.40,0 +-28.80,14.40,3.27,0.00,1.00,-33.60,33.60,0 +153.60,-14.40,12.75,0.00,1.00,-28.80,28.80,0 +-24.00,9.60,3.25,0.00,1.00,-24.00,24.00,0 +163.20,-9.60,12.77,0.00,1.00,-19.20,19.20,0 +-14.40,4.80,3.23,0.00,1.00,-14.40,14.40,0 +172.80,-4.80,12.80,0.00,1.00,-9.60,9.60,0 +-4.80,0.00,3.20,0.00,1.00,-4.80,4.80,0 +0.00,0.00,12.82,0.00,1.00,0.00,0.00,0 +-177.60,4.80,3.18,0.00,1.00,4.80,-4.80,0 +9.60,-4.80,12.84,0.00,1.00,9.60,-9.60,0 +-168.00,9.60,3.16,0.00,1.00,14.40,-14.40,0 +14.40,-9.60,12.86,0.00,1.00,19.20,-19.20,0 +-158.40,14.40,3.14,0.00,1.00,24.00,-24.00,0 +24.00,-14.40,12.88,0.00,1.00,28.80,-28.80,0 +-148.80,19.20,3.12,0.00,1.00,33.60,-33.60,0 +33.60,-19.20,12.90,0.00,1.00,38.40,-38.40,0 +-139.20,19.20,3.10,0.00,1.00,43.20,-43.20,0 +43.20,-24.00,12.92,0.00,1.00,48.00,-48.00,0 +-129.60,24.00,3.08,0.00,1.00,52.80,-52.80,0 +52.80,-28.80,12.95,0.00,1.00,57.60,-57.60,0 +-120.00,28.80,3.05,0.00,1.00,62.40,-57.60,0 +62.40,-28.80,12.97,0.00,1.00,67.20,-62.40,0 +-110.40,28.80,3.03,0.00,1.00,72.00,-67.20,0 +76.80,-28.80,12.99,0.00,1.00,76.80,-72.00,0 +-100.80,33.60,3.01,0.00,1.00,81.60,-72.00,0 +86.40,-33.60,13.01,0.00,1.00,86.40,-76.80,0 +-86.40,33.60,2.99,0.00,1.00,91.20,-76.80,0 +96.00,-33.60,13.03,0.00,1.00,96.00,-76.80,0 +-76.80,28.80,2.97,0.00,1.00,100.80,-72.00,0 +110.40,-28.80,13.05,0.00,1.00,105.60,-72.00,0 +-67.20,28.80,2.95,0.00,1.00,110.40,-67.20,0 +120.00,-28.80,13.07,0.00,1.00,115.20,-62.40,0 +-57.60,28.80,2.93,0.00,1.00,120.00,-57.60,0 +129.60,-24.00,13.09,0.00,1.00,124.80,-52.80,0 +-48.00,24.00,2.91,0.00,1.00,129.60,-48.00,0 +139.20,-24.00,13.12,0.00,1.00,134.40,-43.20,0 +-38.40,19.20,2.88,0.00,1.00,139.20,-38.40,0 +148.80,-19.20,13.14,0.00,1.00,144.00,-33.60,0 +-28.80,14.40,2.86,0.00,1.00,148.80,-28.80,0 +158.40,-14.40,13.16,0.00,1.00,153.60,-24.00,0 +-19.20,9.60,2.84,0.00,1.00,158.40,-19.20,0 +168.00,-9.60,13.18,0.00,1.00,163.20,-14.40,0 +-9.60,4.80,2.82,0.00,1.00,168.00,-9.60,0 +172.80,-4.80,13.20,0.00,1.00,172.80,-4.80,0 +-0.00,0.00,2.80,0.00,1.00,177.60,-0.00,0 +-177.60,0.00,13.22,0.00,1.00,-177.60,0.00,0 +4.80,-4.80,2.78,0.00,1.00,-172.80,4.80,0 +-168.00,4.80,13.24,0.00,1.00,-168.00,9.60,0 +14.40,-9.60,2.76,0.00,1.00,-163.20,14.40,0 +-163.20,9.60,13.27,0.00,1.00,-158.40,19.20,0 +24.00,-14.40,2.73,0.00,1.00,-153.60,24.00,0 +-153.60,14.40,13.29,0.00,1.00,-148.80,28.80,0 +33.60,-19.20,2.71,0.00,1.00,-144.00,33.60,0 +-144.00,19.20,13.31,0.00,1.00,-139.20,38.40,0 +43.20,-24.00,2.69,0.00,1.00,-134.40,43.20,0 +-134.40,24.00,13.33,0.00,1.00,-129.60,48.00,0 +52.80,-24.00,2.67,0.00,1.00,-124.80,52.80,0 +-124.80,28.80,13.35,0.00,1.00,-120.00,57.60,0 +62.40,-28.80,2.65,0.00,1.00,-115.20,62.40,0 +-115.20,28.80,13.37,0.00,1.00,-110.40,67.20,0 +72.00,-28.80,2.63,0.00,1.00,-105.60,72.00,0 +-100.80,28.80,13.39,0.00,1.00,-100.80,72.00,0 +81.60,-33.60,2.61,0.00,1.00,-96.00,76.80,0 +-91.20,33.60,13.42,0.00,1.00,-91.20,76.80,0 +96.00,-33.60,2.58,0.00,1.00,-86.40,76.80,0 +-81.60,33.60,13.44,0.00,1.00,-81.60,72.00,0 +105.60,-28.80,2.56,0.00,1.00,-76.80,72.00,0 +-67.20,28.80,13.46,0.00,1.00,-72.00,67.20,0 +115.20,-28.80,2.54,0.00,1.00,-67.20,62.40,0 +-57.60,28.80,13.48,0.00,1.00,-62.40,57.60,0 +124.80,-28.80,2.52,0.00,1.00,-57.60,57.60,0 +-48.00,24.00,13.50,0.00,1.00,-52.80,52.80,0 +134.40,-24.00,2.50,0.00,1.00,-48.00,48.00,0 +-38.40,19.20,13.52,0.00,1.00,-43.20,43.20,0 +144.00,-19.20,2.48,0.00,1.00,-38.40,38.40,0 +-28.80,19.20,13.54,0.00,1.00,-33.60,33.60,0 +153.60,-14.40,2.46,0.00,1.00,-28.80,28.80,0 +-19.20,14.40,13.56,0.00,1.00,-24.00,24.00,0 +163.20,-9.60,2.44,0.00,1.00,-19.20,19.20,0 +-14.40,9.60,13.59,0.00,1.00,-14.40,14.40,0 +172.80,-4.80,2.41,0.00,1.00,-9.60,9.60,0 +-4.80,4.80,13.61,0.00,1.00,-4.80,4.80,0 +0.00,0.00,2.39,0.00,1.00,0.00,0.00,0 +-177.60,4.80,13.63,0.00,1.00,4.80,-4.80,0 +9.60,-4.80,2.37,0.00,1.00,9.60,-9.60,0 +-168.00,9.60,13.65,0.00,1.00,14.40,-14.40,0 +14.40,-9.60,2.35,0.00,1.00,19.20,-19.20,0 +-158.40,14.40,13.67,0.00,1.00,24.00,-24.00,0 +24.00,-14.40,2.33,0.00,1.00,28.80,-28.80,0 +-153.60,19.20,13.69,0.00,1.00,33.60,-33.60,0 +33.60,-24.00,2.31,0.00,1.00,38.40,-38.40,0 +-144.00,24.00,13.71,0.00,1.00,43.20,-43.20,0 +43.20,-24.00,2.29,0.00,1.00,48.00,-48.00,0 +-134.40,28.80,13.74,0.00,1.00,52.80,-52.80,0 +52.80,-28.80,2.26,0.00,1.00,57.60,-57.60,0 +-124.80,33.60,13.76,0.00,1.00,62.40,-62.40,0 +62.40,-33.60,2.24,0.00,1.00,67.20,-67.20,0 +-110.40,33.60,13.78,0.00,1.00,72.00,-72.00,0 +72.00,-33.60,2.22,0.00,1.00,76.80,-72.00,0 +-100.80,38.40,13.80,0.00,1.00,81.60,-76.80,0 +86.40,-38.40,2.20,0.00,1.00,86.40,-81.60,0 +-86.40,38.40,13.82,0.00,1.00,91.20,-81.60,0 +96.00,-38.40,2.18,0.00,1.00,96.00,-81.60,0 +-76.80,33.60,13.84,0.00,1.00,100.80,-76.80,0 +110.40,-33.60,2.16,0.00,1.00,105.60,-72.00,0 +-67.20,33.60,13.86,0.00,1.00,110.40,-67.20,0 +120.00,-33.60,2.14,0.00,1.00,115.20,-62.40,0 +-52.80,28.80,13.89,0.00,1.00,120.00,-57.60,0 +129.60,-28.80,2.11,0.00,1.00,124.80,-52.80,0 +-43.20,28.80,13.91,0.00,1.00,129.60,-48.00,0 +139.20,-24.00,2.09,0.00,1.00,134.40,-43.20,0 +-33.60,24.00,13.93,0.00,1.00,139.20,-38.40,0 +148.80,-19.20,2.07,0.00,1.00,144.00,-33.60,0 +-24.00,19.20,13.95,0.00,1.00,148.80,-28.80,0 +158.40,-14.40,2.05,0.00,1.00,153.60,-24.00,0 +-19.20,14.40,13.97,0.00,1.00,158.40,-19.20,0 +168.00,-9.60,2.03,0.00,1.00,163.20,-14.40,0 +-9.60,4.80,13.99,0.00,1.00,168.00,-9.60,0 +172.80,-4.80,2.01,0.00,1.00,172.80,-4.80,0 +-0.00,0.00,14.01,0.00,1.00,177.60,-0.00,0 +-177.60,0.00,1.99,0.00,1.00,-177.60,0.00,0 +4.80,-4.80,14.03,0.00,1.00,-172.80,4.80,0 +-168.00,4.80,1.97,0.00,1.00,-168.00,9.60,0 +14.40,-9.60,14.06,0.00,1.00,-163.20,14.40,0 +-163.20,14.40,1.94,0.00,1.00,-158.40,19.20,0 +24.00,-14.40,14.08,0.00,1.00,-153.60,24.00,0 +-153.60,19.20,1.92,0.00,1.00,-148.80,28.80,0 +28.80,-19.20,14.10,0.00,1.00,-144.00,33.60,0 +-144.00,24.00,1.90,0.00,1.00,-139.20,38.40,0 +38.40,-24.00,14.12,0.00,1.00,-134.40,43.20,0 +-134.40,28.80,1.88,0.00,1.00,-129.60,48.00,0 +48.00,-28.80,14.14,0.00,1.00,-124.80,52.80,0 +-124.80,28.80,1.86,0.00,1.00,-120.00,57.60,0 +57.60,-33.60,14.16,0.00,1.00,-115.20,62.40,0 +-115.20,33.60,1.84,0.00,1.00,-110.40,67.20,0 +72.00,-33.60,14.18,0.00,1.00,-105.60,72.00,0 +-105.60,33.60,1.82,0.00,1.00,-100.80,76.80,0 +81.60,-38.40,14.21,0.00,1.00,-96.00,81.60,0 +-91.20,38.40,1.79,0.00,1.00,-91.20,81.60,0 +96.00,-38.40,14.23,0.00,1.00,-86.40,81.60,0 +-81.60,38.40,1.77,0.00,1.00,-81.60,76.80,0 +105.60,-33.60,14.25,0.00,1.00,-76.80,72.00,0 +-67.20,33.60,1.75,0.00,1.00,-72.00,72.00,0 +120.00,-33.60,14.27,0.00,1.00,-67.20,67.20,0 +-57.60,33.60,1.73,0.00,1.00,-62.40,62.40,0 +129.60,-28.80,14.29,0.00,1.00,-57.60,57.60,0 +-48.00,28.80,1.71,0.00,1.00,-52.80,52.80,0 +139.20,-24.00,14.31,0.00,1.00,-48.00,48.00,0 +-38.40,24.00,1.69,0.00,1.00,-43.20,43.20,0 +148.80,-24.00,14.33,0.00,1.00,-38.40,38.40,0 +-28.80,19.20,1.67,0.00,1.00,-33.60,33.60,0 +158.40,-14.40,14.36,0.00,1.00,-28.80,28.80,0 +-19.20,14.40,1.64,0.00,1.00,-24.00,24.00,0 +163.20,-9.60,14.38,0.00,1.00,-19.20,19.20,0 +-9.60,9.60,1.62,0.00,1.00,-14.40,14.40,0 +172.80,-4.80,14.40,0.00,1.00,-9.60,9.60,0 +-4.80,4.80,1.60,0.00,1.00,-4.80,4.80,0 +0.00,0.00,14.42,0.00,1.00,0.00,0.00,0 +-177.60,4.80,1.58,0.00,1.00,4.80,-4.80,0 +9.60,-4.80,14.44,0.00,1.00,9.60,-9.60,0 +-168.00,9.60,1.56,0.00,1.00,14.40,-14.40,0 +14.40,-14.40,14.46,0.00,1.00,19.20,-19.20,0 +-163.20,14.40,1.54,0.00,1.00,24.00,-24.00,0 +24.00,-19.20,14.48,0.00,1.00,28.80,-28.80,0 +-153.60,19.20,1.52,0.00,1.00,33.60,-33.60,0 +28.80,-24.00,14.50,0.00,1.00,38.40,-38.40,0 +-144.00,28.80,1.50,0.00,1.00,43.20,-43.20,0 +38.40,-28.80,14.53,0.00,1.00,48.00,-48.00,0 +-134.40,33.60,1.47,0.00,1.00,52.80,-52.80,0 +48.00,-33.60,14.55,0.00,1.00,57.60,-57.60,0 +-124.80,33.60,1.45,0.00,1.00,62.40,-62.40,0 +62.40,-38.40,14.57,0.00,1.00,67.20,-67.20,0 +-115.20,38.40,1.43,0.00,1.00,72.00,-72.00,0 +72.00,-38.40,14.59,0.00,1.00,76.80,-76.80,0 +-100.80,43.20,1.41,0.00,1.00,81.60,-81.60,0 +86.40,-43.20,14.61,0.00,1.00,86.40,-86.40,0 +-86.40,43.20,1.39,0.00,1.00,91.20,-86.40,0 +96.00,-43.20,14.63,0.00,1.00,96.00,-81.60,0 +-76.80,38.40,1.37,0.00,1.00,100.80,-76.80,0 +110.40,-38.40,14.65,0.00,1.00,105.60,-72.00,0 +-62.40,38.40,1.35,0.00,1.00,110.40,-67.20,0 +120.00,-38.40,14.68,0.00,1.00,115.20,-62.40,0 +-52.80,33.60,1.32,0.00,1.00,120.00,-57.60,0 +134.40,-33.60,14.70,0.00,1.00,124.80,-52.80,0 +-43.20,28.80,1.30,0.00,1.00,129.60,-48.00,0 +144.00,-28.80,14.72,0.00,1.00,134.40,-43.20,0 +-33.60,24.00,1.28,0.00,1.00,139.20,-38.40,0 +153.60,-24.00,14.74,0.00,1.00,144.00,-33.60,0 +-24.00,19.20,1.26,0.00,1.00,148.80,-28.80,0 +158.40,-19.20,14.76,0.00,1.00,153.60,-24.00,0 +-14.40,14.40,1.24,0.00,1.00,158.40,-19.20,0 +168.00,-9.60,14.78,0.00,1.00,163.20,-14.40,0 +-9.60,9.60,1.22,0.00,1.00,168.00,-9.60,0 +172.80,-4.80,14.80,0.00,1.00,172.80,-4.80,0 +-0.00,0.00,1.20,0.00,1.00,177.60,-0.00,0 +-177.60,0.00,14.83,0.00,1.00,-177.60,0.00,0 +4.80,-4.80,1.17,0.00,1.00,-172.80,4.80,0 +-172.80,9.60,14.85,0.00,1.00,-168.00,9.60,0 +14.40,-9.60,1.15,0.00,1.00,-163.20,14.40,0 +-163.20,14.40,14.87,0.00,1.00,-158.40,19.20,0 +19.20,-19.20,1.13,0.00,1.00,-153.60,24.00,0 +-153.60,19.20,14.89,0.00,1.00,-148.80,28.80,0 +28.80,-24.00,1.11,0.00,1.00,-144.00,33.60,0 +-148.80,24.00,14.91,0.00,1.00,-139.20,38.40,0 +38.40,-28.80,1.09,0.00,1.00,-134.40,43.20,0 +-139.20,28.80,14.93,0.00,1.00,-129.60,48.00,0 +48.00,-33.60,1.07,0.00,1.00,-124.80,52.80,0 +-129.60,33.60,14.95,0.00,1.00,-120.00,57.60,0 +57.60,-38.40,1.05,0.00,1.00,-115.20,62.40,0 +-115.20,38.40,14.97,0.00,1.00,-110.40,67.20,0 +67.20,-38.40,1.03,0.00,1.00,-105.60,72.00,0 +-105.60,38.40,15.00,0.00,1.00,-100.80,76.80,0 +81.60,-43.20,1.00,0.00,1.00,-96.00,81.60,0 +-91.20,43.20,15.02,0.00,1.00,-91.20,86.40,0 +96.00,-43.20,0.98,0.00,1.00,-86.40,86.40,0 +-76.80,43.20,15.04,0.00,1.00,-81.60,81.60,0 +105.60,-38.40,0.96,0.00,1.00,-76.80,76.80,0 +-67.20,38.40,15.06,0.00,1.00,-72.00,72.00,0 +120.00,-38.40,0.94,0.00,1.00,-67.20,67.20,0 +-52.80,33.60,15.08,0.00,1.00,-62.40,62.40,0 +129.60,-33.60,0.92,0.00,1.00,-57.60,57.60,0 +-43.20,33.60,15.10,0.00,1.00,-52.80,52.80,0 +139.20,-28.80,0.90,0.00,1.00,-48.00,48.00,0 +-33.60,28.80,15.12,0.00,1.00,-43.20,43.20,0 +148.80,-24.00,0.88,0.00,1.00,-38.40,38.40,0 +-28.80,19.20,15.15,0.00,1.00,-33.60,33.60,0 +158.40,-19.20,0.85,0.00,1.00,-28.80,28.80,0 +-19.20,14.40,15.17,0.00,1.00,-24.00,24.00,0 +163.20,-14.40,0.83,0.00,1.00,-19.20,19.20,0 +-9.60,9.60,15.19,0.00,1.00,-14.40,14.40,0 +172.80,-4.80,0.81,0.00,1.00,-9.60,9.60,0 +-4.80,4.80,15.21,0.00,1.00,-4.80,4.80,0 +0.00,0.00,0.79,0.00,1.00,0.00,0.00,0 +-177.60,4.80,15.23,0.00,1.00,4.80,-4.80,0 +4.80,-4.80,0.77,0.00,1.00,9.60,-9.60,0 +-168.00,9.60,15.25,0.00,1.00,14.40,-14.40,0 +14.40,-14.40,0.75,0.00,1.00,19.20,-19.20,0 +-163.20,19.20,15.27,0.00,1.00,24.00,-24.00,0 +19.20,-19.20,0.73,0.00,1.00,28.80,-28.80,0 +-153.60,24.00,15.30,0.00,1.00,33.60,-33.60,0 +28.80,-28.80,0.70,0.00,1.00,38.40,-38.40,0 +-148.80,28.80,15.32,0.00,1.00,43.20,-43.20,0 +38.40,-33.60,0.68,0.00,1.00,48.00,-48.00,0 +-139.20,33.60,15.34,0.00,1.00,52.80,-52.80,0 +48.00,-38.40,0.66,0.00,1.00,57.60,-57.60,0 +-124.80,38.40,15.36,0.00,1.00,62.40,-62.40,0 +57.60,-43.20,0.64,0.00,1.00,67.20,-67.20,0 +-115.20,43.20,15.38,0.00,1.00,72.00,-72.00,0 +72.00,-43.20,0.62,0.00,1.00,76.80,-76.80,0 +-100.80,43.20,15.40,0.00,1.00,81.60,-81.60,0 +86.40,-48.00,0.60,0.00,1.00,86.40,-86.40,0 +-86.40,48.00,15.42,0.00,1.00,91.20,-86.40,0 +100.80,-48.00,0.58,0.00,1.00,96.00,-81.60,0 +-76.80,43.20,15.44,0.00,1.00,100.80,-76.80,0 +110.40,-43.20,0.56,0.00,1.00,105.60,-72.00,0 +-62.40,43.20,15.47,0.00,1.00,110.40,-67.20,0 +124.80,-38.40,0.53,0.00,1.00,115.20,-62.40,0 +-48.00,38.40,15.49,0.00,1.00,120.00,-57.60,0 +134.40,-38.40,0.51,0.00,1.00,124.80,-52.80,0 +-38.40,33.60,15.51,0.00,1.00,129.60,-48.00,0 +144.00,-28.80,0.49,0.00,1.00,134.40,-43.20,0 +-28.80,28.80,15.53,0.00,1.00,139.20,-38.40,0 +153.60,-24.00,0.47,0.00,1.00,144.00,-33.60,0 +-24.00,24.00,15.55,0.00,1.00,148.80,-28.80,0 +163.20,-19.20,0.45,0.00,1.00,153.60,-24.00,0 +-14.40,14.40,15.57,0.00,1.00,158.40,-19.20,0 +168.00,-14.40,0.43,0.00,1.00,163.20,-14.40,0 +-9.60,9.60,15.59,0.00,1.00,168.00,-9.60,0 +172.80,-4.80,0.41,0.00,1.00,172.80,-4.80,0 +-0.00,0.00,15.62,0.00,1.00,177.60,-0.00,0 +-177.60,0.00,0.38,0.00,1.00,-177.60,0.00,0 +4.80,-4.80,15.64,0.00,1.00,-172.80,4.80,0 +-172.80,9.60,0.36,0.00,1.00,-168.00,9.60,0 +9.60,-14.40,15.66,0.00,1.00,-163.20,14.40,0 +-163.20,14.40,0.34,0.00,1.00,-158.40,19.20,0 +19.20,-19.20,15.68,0.00,1.00,-153.60,24.00,0 +-158.40,24.00,0.32,0.00,1.00,-148.80,28.80,0 +28.80,-24.00,15.70,0.00,1.00,-144.00,33.60,0 +-148.80,28.80,0.30,0.00,1.00,-139.20,38.40,0 +33.60,-28.80,15.72,0.00,1.00,-134.40,43.20,0 +-139.20,33.60,0.28,0.00,1.00,-129.60,48.00,0 +43.20,-38.40,15.74,0.00,1.00,-124.80,52.80,0 +-129.60,38.40,0.26,0.00,1.00,-120.00,57.60,0 +57.60,-38.40,15.77,0.00,1.00,-115.20,62.40,0 +-120.00,43.20,0.23,0.00,1.00,-110.40,67.20,0 +67.20,-43.20,15.79,0.00,1.00,-105.60,72.00,0 +-105.60,43.20,0.21,0.00,1.00,-100.80,76.80,0 +81.60,-48.00,15.81,0.00,1.00,-96.00,81.60,0 +-91.20,48.00,0.19,0.00,1.00,-91.20,86.40,0 +96.00,-48.00,15.83,0.00,1.00,-86.40,86.40,0 +-76.80,43.20,0.17,0.00,1.00,-81.60,81.60,0 +110.40,-43.20,15.85,0.00,1.00,-76.80,76.80,0 +-67.20,43.20,0.15,0.00,1.00,-72.00,72.00,0 +120.00,-43.20,15.87,0.00,1.00,-67.20,67.20,0 +-52.80,38.40,0.13,0.00,1.00,-62.40,62.40,0 +134.40,-38.40,15.89,0.00,1.00,-57.60,57.60,0 +-43.20,33.60,0.11,0.00,1.00,-52.80,52.80,0 +144.00,-33.60,15.91,0.00,1.00,-48.00,48.00,0 +-33.60,28.80,0.09,0.00,1.00,-43.20,43.20,0 +153.60,-28.80,15.94,0.00,1.00,-38.40,38.40,0 +-24.00,24.00,0.06,0.00,1.00,-33.60,33.60,0 +158.40,-19.20,15.96,0.00,1.00,-28.80,28.80,0 +-19.20,19.20,0.04,0.00,1.00,-24.00,24.00,0 +168.00,-14.40,15.98,0.00,1.00,-19.20,19.20,0 +-9.60,9.60,0.02,0.00,1.00,-14.40,14.40,0 +172.80,-4.80,16.00,0.00,1.00,-9.60,9.60,0 +-4.80,4.80,0.00,0.00,1.00,-4.80,4.80,0 diff --git a/scripts/testv/stvISM4.csv b/scripts/testv/stvISM4.csv index 6318155a25063eee0dbf035a8ad94ca5ddac9c21..8a14c3413ddd2dd47415bf6de3e19631f65f8f6c 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 +-0.00,4.80,0.06,0.00,1.00,4.80,9.60,0 +-0.00,9.60,0.13,0.00,1.00,9.60,14.40,0 +-0.00,14.40,0.19,0.00,1.00,14.40,19.20,0 +-0.00,19.20,0.26,0.00,1.00,19.20,24.00,0 +-0.00,24.00,0.32,0.00,1.00,24.00,28.80,0 +-0.00,28.80,0.39,0.00,1.00,28.80,33.60,0 +-0.00,33.60,0.45,0.00,1.00,33.60,38.40,0 +-0.00,38.40,0.51,0.00,1.00,38.40,43.20,0 +-0.00,43.20,0.58,0.00,1.00,43.20,48.00,0 +-0.00,48.00,0.64,0.00,1.00,48.00,52.80,0 +-0.00,52.80,0.71,0.00,1.00,52.80,57.60,0 +-0.00,57.60,0.77,0.00,1.00,57.60,62.40,0 +-0.00,62.40,0.84,0.00,1.00,62.40,67.20,0 +-0.00,67.20,0.90,0.00,1.00,67.20,72.00,0 +-0.00,72.00,0.96,0.00,1.00,72.00,76.80,0 +-0.00,76.80,1.03,0.00,1.00,76.80,81.60,0 +-0.00,81.60,1.09,0.00,1.00,81.60,86.40,0 +-0.00,86.40,1.16,0.00,1.00,86.40,86.40,0 +-177.60,89.20,1.22,0.00,1.00,91.20,81.60,0 +-177.60,86.40,1.29,0.00,1.00,96.00,76.80,0 +-177.60,81.60,1.35,0.00,1.00,100.80,72.00,0 +-177.60,76.80,1.41,0.00,1.00,105.60,67.20,0 +-177.60,72.00,1.48,0.00,1.00,110.40,62.40,0 +-177.60,67.20,1.54,0.00,1.00,115.20,57.60,0 +177.60,62.40,1.61,0.00,1.00,120.00,52.80,0 +177.60,57.60,1.67,0.00,1.00,124.80,48.00,0 +177.60,52.80,1.73,0.00,1.00,129.60,43.20,0 +177.60,48.00,1.80,0.00,1.00,134.40,38.40,0 +177.60,43.20,1.86,0.00,1.00,139.20,33.60,0 +177.60,38.40,1.93,0.00,1.00,144.00,28.80,0 +177.60,33.60,1.99,0.00,1.00,148.80,24.00,0 +177.60,28.80,2.06,0.00,1.00,153.60,19.20,0 +177.60,24.00,2.12,0.00,1.00,158.40,14.40,0 +177.60,19.20,2.18,0.00,1.00,163.20,9.60,0 +177.60,14.40,2.25,0.00,1.00,168.00,4.80,0 +177.60,9.60,2.31,0.00,1.00,172.80,0.00,0 +177.60,4.80,2.38,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,2.44,0.00,1.00,-177.60,-4.80,0 +-177.60,-4.80,2.51,0.00,1.00,-172.80,-9.60,0 +-177.60,-9.60,2.57,0.00,1.00,-168.00,-14.40,0 +-177.60,-14.40,2.63,0.00,1.00,-163.20,-19.20,0 +-177.60,-19.20,2.70,0.00,1.00,-158.40,-24.00,0 +-177.60,-24.00,2.76,0.00,1.00,-153.60,-28.80,0 +-177.60,-28.80,2.83,0.00,1.00,-148.80,-33.60,0 +-177.60,-33.60,2.89,0.00,1.00,-144.00,-38.40,0 +-177.60,-38.40,2.96,0.00,1.00,-139.20,-43.20,0 +-177.60,-48.00,3.02,0.00,1.00,-134.40,-48.00,0 +-177.60,-48.00,3.08,0.00,1.00,-129.60,-52.80,0 +-177.60,-52.80,3.15,0.00,1.00,-124.80,-57.60,0 +-177.60,-57.60,3.21,0.00,1.00,-120.00,-62.40,0 +177.60,-62.40,3.28,0.00,1.00,-115.20,-67.20,0 +177.60,-67.20,3.34,0.00,1.00,-110.40,-72.00,0 +177.60,-76.80,3.41,0.00,1.00,-105.60,-76.80,0 +177.60,-76.80,3.47,0.00,1.00,-100.80,-81.60,0 +177.60,-86.40,3.53,0.00,1.00,-96.00,-86.40,0 +177.60,-89.20,3.60,0.00,1.00,-91.20,-86.40,0 +0.00,-86.40,3.66,0.00,1.00,-86.40,-81.60,0 +0.00,-81.60,3.73,0.00,1.00,-81.60,-76.80,0 +0.00,-76.80,3.79,0.00,1.00,-76.80,-72.00,0 +0.00,-72.00,3.86,0.00,1.00,-72.00,-67.20,0 +0.00,-67.20,3.92,0.00,1.00,-67.20,-62.40,0 +0.00,-62.40,3.98,0.00,1.00,-62.40,-57.60,0 +0.00,-57.60,4.05,0.00,1.00,-57.60,-52.80,0 +0.00,-52.80,4.11,0.00,1.00,-52.80,-48.00,0 +0.00,-48.00,4.18,0.00,1.00,-48.00,-43.20,0 +0.00,-43.20,4.24,0.00,1.00,-43.20,-38.40,0 +0.00,-38.40,4.31,0.00,1.00,-38.40,-33.60,0 +0.00,-33.60,4.37,0.00,1.00,-33.60,-28.80,0 +0.00,-28.80,4.43,0.00,1.00,-28.80,-24.00,0 +0.00,-24.00,4.50,0.00,1.00,-24.00,-19.20,0 +0.00,-19.20,4.56,0.00,1.00,-19.20,-14.40,0 +0.00,-14.40,4.63,0.00,1.00,-14.40,-9.60,0 +0.00,-9.60,4.69,0.00,1.00,-9.60,-4.80,0 +0.00,-4.80,4.76,0.00,1.00,-4.80,0.00,0 +0.00,0.00,4.82,0.00,1.00,0.00,4.80,0 +0.00,4.80,4.88,0.00,1.00,4.80,9.60,0 +0.00,9.60,4.95,0.00,1.00,9.60,14.40,0 +0.00,14.40,5.01,0.00,1.00,14.40,19.20,0 +0.00,19.20,5.08,0.00,1.00,19.20,24.00,0 +0.00,24.00,5.14,0.00,1.00,24.00,28.80,0 +4.80,28.80,5.20,0.00,1.00,28.80,33.60,0 +4.80,33.60,5.27,0.00,1.00,33.60,38.40,0 +4.80,38.40,5.33,0.00,1.00,38.40,43.20,0 +4.80,43.20,5.40,0.00,1.00,43.20,48.00,0 +4.80,48.00,5.46,0.00,1.00,48.00,52.80,0 +4.80,52.80,5.53,0.00,1.00,52.80,57.60,0 +9.60,57.60,5.59,0.00,1.00,57.60,62.40,0 +9.60,62.40,5.65,0.00,1.00,62.40,67.20,0 +9.60,67.20,5.72,0.00,1.00,67.20,72.00,0 +14.40,72.00,5.78,0.00,1.00,72.00,76.80,0 +19.20,76.80,5.85,0.00,1.00,76.80,81.60,0 +28.80,81.60,5.91,0.00,1.00,81.60,86.40,0 +52.80,86.40,5.98,0.00,1.00,86.40,86.40,0 +105.60,86.40,6.04,0.00,1.00,91.20,81.60,0 +139.20,81.60,6.10,0.00,1.00,96.00,76.80,0 +158.40,76.80,6.17,0.00,1.00,100.80,72.00,0 +163.20,72.00,6.23,0.00,1.00,105.60,67.20,0 +168.00,67.20,6.30,0.00,1.00,110.40,62.40,0 +168.00,62.40,6.36,0.00,1.00,115.20,57.60,0 +172.80,57.60,6.43,0.00,1.00,120.00,52.80,0 +172.80,52.80,6.49,0.00,1.00,124.80,48.00,0 +172.80,48.00,6.55,0.00,1.00,129.60,43.20,0 +172.80,43.20,6.62,0.00,1.00,134.40,38.40,0 +177.60,38.40,6.68,0.00,1.00,139.20,33.60,0 +177.60,33.60,6.75,0.00,1.00,144.00,28.80,0 +177.60,28.80,6.81,0.00,1.00,148.80,24.00,0 +177.60,24.00,6.88,0.00,1.00,153.60,19.20,0 +177.60,19.20,6.94,0.00,1.00,158.40,14.40,0 +177.60,14.40,7.00,0.00,1.00,163.20,9.60,0 +177.60,9.60,7.07,0.00,1.00,168.00,4.80,0 +177.60,4.80,7.13,0.00,1.00,172.80,0.00,0 +177.60,0.00,7.20,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,7.26,0.00,1.00,-177.60,-4.80,0 +-177.60,-4.80,7.33,0.00,1.00,-172.80,-9.60,0 +-177.60,-9.60,7.39,0.00,1.00,-168.00,-14.40,0 +-177.60,-14.40,7.45,0.00,1.00,-163.20,-19.20,0 +-177.60,-19.20,7.52,0.00,1.00,-158.40,-24.00,0 +-177.60,-24.00,7.58,0.00,1.00,-153.60,-28.80,0 +-177.60,-28.80,7.65,0.00,1.00,-148.80,-33.60,0 +-177.60,-33.60,7.71,0.00,1.00,-144.00,-38.40,0 +-177.60,-38.40,7.78,0.00,1.00,-139.20,-43.20,0 +-172.80,-43.20,7.84,0.00,1.00,-134.40,-48.00,0 +-172.80,-48.00,7.90,0.00,1.00,-129.60,-52.80,0 +-172.80,-52.80,7.97,0.00,1.00,-124.80,-57.60,0 +-172.80,-57.60,8.03,0.00,1.00,-120.00,-62.40,0 +-168.00,-62.40,8.10,0.00,1.00,-115.20,-67.20,0 +-168.00,-67.20,8.16,0.00,1.00,-110.40,-72.00,0 +-163.20,-72.00,8.22,0.00,1.00,-105.60,-76.80,0 +-158.40,-76.80,8.29,0.00,1.00,-100.80,-81.60,0 +-139.20,-81.60,8.35,0.00,1.00,-96.00,-86.40,0 +-105.60,-86.40,8.42,0.00,1.00,-91.20,-86.40,0 +-52.80,-86.40,8.48,0.00,1.00,-86.40,-81.60,0 +-28.80,-81.60,8.55,0.00,1.00,-81.60,-76.80,0 +-19.20,-76.80,8.61,0.00,1.00,-76.80,-72.00,0 +-14.40,-72.00,8.67,0.00,1.00,-72.00,-67.20,0 +-9.60,-67.20,8.74,0.00,1.00,-67.20,-62.40,0 +-9.60,-62.40,8.80,0.00,1.00,-62.40,-57.60,0 +-9.60,-57.60,8.87,0.00,1.00,-57.60,-52.80,0 +-4.80,-52.80,8.93,0.00,1.00,-52.80,-48.00,0 +-4.80,-48.00,9.00,0.00,1.00,-48.00,-43.20,0 +-4.80,-43.20,9.06,0.00,1.00,-43.20,-38.40,0 +-4.80,-38.40,9.12,0.00,1.00,-38.40,-33.60,0 +-4.80,-33.60,9.19,0.00,1.00,-33.60,-28.80,0 +-4.80,-28.80,9.25,0.00,1.00,-28.80,-24.00,0 +-0.00,-24.00,9.32,0.00,1.00,-24.00,-19.20,0 +-0.00,-19.20,9.38,0.00,1.00,-19.20,-14.40,0 +-0.00,-14.40,9.45,0.00,1.00,-14.40,-9.60,0 +-0.00,-9.60,9.51,0.00,1.00,-9.60,-4.80,0 +-0.00,-4.80,9.57,0.00,1.00,-4.80,0.00,0 +0.00,0.00,9.64,0.00,1.00,0.00,4.80,0 +0.00,4.80,9.70,0.00,1.00,4.80,9.60,0 +0.00,9.60,9.77,0.00,1.00,9.60,14.40,0 +4.80,14.40,9.83,0.00,1.00,14.40,19.20,0 +4.80,19.20,9.90,0.00,1.00,19.20,24.00,0 +4.80,24.00,9.96,0.00,1.00,24.00,28.80,0 +4.80,28.80,10.02,0.00,1.00,28.80,33.60,0 +4.80,33.60,10.09,0.00,1.00,33.60,38.40,0 +9.60,38.40,10.15,0.00,1.00,38.40,43.20,0 +9.60,43.20,10.22,0.00,1.00,43.20,48.00,0 +9.60,48.00,10.28,0.00,1.00,48.00,52.80,0 +14.40,52.80,10.35,0.00,1.00,52.80,57.60,0 +14.40,57.60,10.41,0.00,1.00,57.60,62.40,0 +19.20,62.40,10.47,0.00,1.00,62.40,67.20,0 +24.00,67.20,10.54,0.00,1.00,67.20,72.00,0 +28.80,72.00,10.60,0.00,1.00,72.00,72.00,0 +33.60,72.00,10.67,0.00,1.00,76.80,76.80,0 +48.00,76.80,10.73,0.00,1.00,81.60,81.60,0 +67.20,81.60,10.80,0.00,1.00,86.40,81.60,0 +96.00,81.60,10.86,0.00,1.00,91.20,81.60,0 +120.00,76.80,10.92,0.00,1.00,96.00,76.80,0 +139.20,76.80,10.99,0.00,1.00,100.80,72.00,0 +148.80,72.00,11.05,0.00,1.00,105.60,67.20,0 +153.60,67.20,11.12,0.00,1.00,110.40,62.40,0 +158.40,62.40,11.18,0.00,1.00,115.20,57.60,0 +163.20,57.60,11.24,0.00,1.00,120.00,52.80,0 +168.00,52.80,11.31,0.00,1.00,124.80,48.00,0 +168.00,48.00,11.37,0.00,1.00,129.60,43.20,0 +168.00,43.20,11.44,0.00,1.00,134.40,38.40,0 +172.80,38.40,11.50,0.00,1.00,139.20,33.60,0 +172.80,33.60,11.57,0.00,1.00,144.00,28.80,0 +172.80,28.80,11.63,0.00,1.00,148.80,24.00,0 +177.60,24.00,11.69,0.00,1.00,153.60,19.20,0 +177.60,19.20,11.76,0.00,1.00,158.40,14.40,0 +177.60,14.40,11.82,0.00,1.00,163.20,9.60,0 +177.60,9.60,11.89,0.00,1.00,168.00,4.80,0 +177.60,4.80,11.95,0.00,1.00,172.80,0.00,0 +177.60,0.00,12.02,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,12.08,0.00,1.00,-177.60,-4.80,0 +-177.60,-4.80,12.14,0.00,1.00,-172.80,-9.60,0 +-177.60,-9.60,12.21,0.00,1.00,-168.00,-14.40,0 +-177.60,-14.40,12.27,0.00,1.00,-163.20,-19.20,0 +-177.60,-19.20,12.34,0.00,1.00,-158.40,-24.00,0 +-177.60,-24.00,12.40,0.00,1.00,-153.60,-28.80,0 +-172.80,-28.80,12.47,0.00,1.00,-148.80,-33.60,0 +-172.80,-33.60,12.53,0.00,1.00,-144.00,-38.40,0 +-172.80,-38.40,12.59,0.00,1.00,-139.20,-43.20,0 +-168.00,-43.20,12.66,0.00,1.00,-134.40,-48.00,0 +-168.00,-48.00,12.72,0.00,1.00,-129.60,-52.80,0 +-168.00,-52.80,12.79,0.00,1.00,-124.80,-57.60,0 +-163.20,-57.60,12.85,0.00,1.00,-120.00,-62.40,0 +-158.40,-62.40,12.92,0.00,1.00,-115.20,-67.20,0 +-153.60,-67.20,12.98,0.00,1.00,-110.40,-72.00,0 +-148.80,-72.00,13.04,0.00,1.00,-105.60,-76.80,0 +-139.20,-76.80,13.11,0.00,1.00,-100.80,-81.60,0 +-120.00,-76.80,13.17,0.00,1.00,-96.00,-81.60,0 +-96.00,-81.60,13.24,0.00,1.00,-91.20,-81.60,0 +-67.20,-81.60,13.30,0.00,1.00,-86.40,-76.80,0 +-48.00,-76.80,13.37,0.00,1.00,-81.60,-72.00,0 +-33.60,-72.00,13.43,0.00,1.00,-76.80,-72.00,0 +-28.80,-72.00,13.49,0.00,1.00,-72.00,-67.20,0 +-24.00,-67.20,13.56,0.00,1.00,-67.20,-62.40,0 +-19.20,-62.40,13.62,0.00,1.00,-62.40,-57.60,0 +-14.40,-57.60,13.69,0.00,1.00,-57.60,-52.80,0 +-14.40,-52.80,13.75,0.00,1.00,-52.80,-48.00,0 +-9.60,-48.00,13.82,0.00,1.00,-48.00,-43.20,0 +-9.60,-43.20,13.88,0.00,1.00,-43.20,-38.40,0 +-9.60,-38.40,13.94,0.00,1.00,-38.40,-33.60,0 +-4.80,-33.60,14.01,0.00,1.00,-33.60,-28.80,0 +-4.80,-28.80,14.07,0.00,1.00,-28.80,-24.00,0 +-4.80,-24.00,14.14,0.00,1.00,-24.00,-19.20,0 +-4.80,-19.20,14.20,0.00,1.00,-19.20,-14.40,0 +-4.80,-14.40,14.27,0.00,1.00,-14.40,-9.60,0 +-0.00,-9.60,14.33,0.00,1.00,-9.60,-4.80,0 +-0.00,-4.80,14.39,0.00,1.00,-4.80,0.00,0 +0.00,0.00,14.46,0.00,1.00,0.00,4.80,0 +0.00,4.80,14.52,0.00,1.00,4.80,9.60,0 +4.80,9.60,14.59,0.00,1.00,9.60,14.40,0 +4.80,14.40,14.65,0.00,1.00,14.40,19.20,0 +4.80,19.20,14.71,0.00,1.00,19.20,24.00,0 +4.80,24.00,14.78,0.00,1.00,24.00,28.80,0 +9.60,28.80,14.84,0.00,1.00,28.80,33.60,0 +9.60,33.60,14.91,0.00,1.00,33.60,38.40,0 +9.60,38.40,14.97,0.00,1.00,38.40,43.20,0 +14.40,43.20,15.04,0.00,1.00,43.20,48.00,0 +14.40,48.00,15.10,0.00,1.00,48.00,52.80,0 +19.20,52.80,15.16,0.00,1.00,52.80,57.60,0 +19.20,52.80,15.23,0.00,1.00,57.60,57.60,0 +24.00,57.60,15.29,0.00,1.00,62.40,62.40,0 +28.80,62.40,15.36,0.00,1.00,67.20,67.20,0 +38.40,67.20,15.42,0.00,1.00,72.00,72.00,0 +48.00,72.00,15.49,0.00,1.00,76.80,72.00,0 +57.60,72.00,15.55,0.00,1.00,81.60,76.80,0 +76.80,76.80,15.61,0.00,1.00,86.40,76.80,0 +96.00,76.80,15.68,0.00,1.00,91.20,76.80,0 +115.20,76.80,15.74,0.00,1.00,96.00,72.00,0 +129.60,72.00,15.81,0.00,1.00,100.80,72.00,0 +139.20,67.20,15.87,0.00,1.00,105.60,67.20,0 +144.00,67.20,15.94,0.00,1.00,110.40,62.40,0 +153.60,62.40,16.00,0.00,1.00,115.20,57.60,0 +158.40,57.60,16.00,0.00,1.00,120.00,52.80,0 +158.40,52.80,15.94,0.00,1.00,124.80,48.00,0 +163.20,48.00,15.87,0.00,1.00,129.60,43.20,0 +168.00,43.20,15.81,0.00,1.00,134.40,38.40,0 +168.00,38.40,15.74,0.00,1.00,139.20,33.60,0 +168.00,33.60,15.68,0.00,1.00,144.00,28.80,0 +172.80,28.80,15.61,0.00,1.00,148.80,24.00,0 +172.80,24.00,15.55,0.00,1.00,153.60,19.20,0 +172.80,19.20,15.49,0.00,1.00,158.40,14.40,0 +177.60,14.40,15.42,0.00,1.00,163.20,9.60,0 +177.60,9.60,15.36,0.00,1.00,168.00,4.80,0 +177.60,4.80,15.29,0.00,1.00,172.80,0.00,0 +177.60,0.00,15.23,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,15.16,0.00,1.00,-177.60,-4.80,0 +-177.60,-4.80,15.10,0.00,1.00,-172.80,-9.60,0 +-177.60,-9.60,15.04,0.00,1.00,-168.00,-14.40,0 +-177.60,-14.40,14.97,0.00,1.00,-163.20,-19.20,0 +-172.80,-19.20,14.91,0.00,1.00,-158.40,-24.00,0 +-172.80,-24.00,14.84,0.00,1.00,-153.60,-28.80,0 +-172.80,-28.80,14.78,0.00,1.00,-148.80,-33.60,0 +-168.00,-33.60,14.71,0.00,1.00,-144.00,-38.40,0 +-168.00,-38.40,14.65,0.00,1.00,-139.20,-43.20,0 +-168.00,-43.20,14.59,0.00,1.00,-134.40,-48.00,0 +-163.20,-48.00,14.52,0.00,1.00,-129.60,-52.80,0 +-158.40,-52.80,14.46,0.00,1.00,-124.80,-57.60,0 +-158.40,-57.60,14.39,0.00,1.00,-120.00,-62.40,0 +-153.60,-62.40,14.33,0.00,1.00,-115.20,-67.20,0 +-144.00,-67.20,14.27,0.00,1.00,-110.40,-72.00,0 +-139.20,-67.20,14.20,0.00,1.00,-105.60,-72.00,0 +-129.60,-72.00,14.14,0.00,1.00,-100.80,-76.80,0 +-115.20,-76.80,14.07,0.00,1.00,-96.00,-76.80,0 +-96.00,-76.80,14.01,0.00,1.00,-91.20,-76.80,0 +-76.80,-76.80,13.94,0.00,1.00,-86.40,-72.00,0 +-57.60,-72.00,13.88,0.00,1.00,-81.60,-72.00,0 +-48.00,-72.00,13.82,0.00,1.00,-76.80,-67.20,0 +-38.40,-67.20,13.75,0.00,1.00,-72.00,-62.40,0 +-28.80,-62.40,13.69,0.00,1.00,-67.20,-57.60,0 +-24.00,-57.60,13.62,0.00,1.00,-62.40,-57.60,0 +-19.20,-52.80,13.56,0.00,1.00,-57.60,-52.80,0 +-19.20,-52.80,13.49,0.00,1.00,-52.80,-48.00,0 +-14.40,-48.00,13.43,0.00,1.00,-48.00,-43.20,0 +-14.40,-43.20,13.37,0.00,1.00,-43.20,-38.40,0 +-9.60,-38.40,13.30,0.00,1.00,-38.40,-33.60,0 +-9.60,-33.60,13.24,0.00,1.00,-33.60,-28.80,0 +-9.60,-28.80,13.17,0.00,1.00,-28.80,-24.00,0 +-4.80,-24.00,13.11,0.00,1.00,-24.00,-19.20,0 +-4.80,-19.20,13.04,0.00,1.00,-19.20,-14.40,0 +-4.80,-14.40,12.98,0.00,1.00,-14.40,-9.60,0 +-4.80,-9.60,12.92,0.00,1.00,-9.60,-4.80,0 +-0.00,-4.80,12.85,0.00,1.00,-4.80,0.00,0 +0.00,0.00,12.79,0.00,1.00,0.00,4.80,0 +0.00,4.80,12.72,0.00,1.00,4.80,9.60,0 +4.80,9.60,12.66,0.00,1.00,9.60,14.40,0 +4.80,14.40,12.59,0.00,1.00,14.40,19.20,0 +4.80,19.20,12.53,0.00,1.00,19.20,24.00,0 +9.60,24.00,12.47,0.00,1.00,24.00,28.80,0 +9.60,28.80,12.40,0.00,1.00,28.80,33.60,0 +14.40,33.60,12.34,0.00,1.00,33.60,38.40,0 +14.40,33.60,12.27,0.00,1.00,38.40,38.40,0 +19.20,38.40,12.21,0.00,1.00,43.20,43.20,0 +19.20,43.20,12.14,0.00,1.00,48.00,48.00,0 +24.00,48.00,12.08,0.00,1.00,52.80,52.80,0 +28.80,52.80,12.02,0.00,1.00,57.60,57.60,0 +33.60,57.60,11.95,0.00,1.00,62.40,62.40,0 +38.40,62.40,11.89,0.00,1.00,67.20,62.40,0 +43.20,62.40,11.82,0.00,1.00,72.00,67.20,0 +52.80,67.20,11.76,0.00,1.00,76.80,72.00,0 +67.20,67.20,11.69,0.00,1.00,81.60,72.00,0 +76.80,72.00,11.63,0.00,1.00,86.40,72.00,0 +96.00,72.00,11.57,0.00,1.00,91.20,72.00,0 +105.60,72.00,11.50,0.00,1.00,96.00,67.20,0 +120.00,67.20,11.44,0.00,1.00,100.80,67.20,0 +129.60,67.20,11.37,0.00,1.00,105.60,62.40,0 +139.20,62.40,11.31,0.00,1.00,110.40,57.60,0 +144.00,57.60,11.24,0.00,1.00,115.20,57.60,0 +148.80,52.80,11.18,0.00,1.00,120.00,52.80,0 +153.60,52.80,11.12,0.00,1.00,124.80,48.00,0 +158.40,48.00,11.05,0.00,1.00,129.60,43.20,0 +163.20,43.20,10.99,0.00,1.00,134.40,38.40,0 +163.20,38.40,10.92,0.00,1.00,139.20,33.60,0 +168.00,33.60,10.86,0.00,1.00,144.00,28.80,0 +168.00,28.80,10.80,0.00,1.00,148.80,24.00,0 +172.80,24.00,10.73,0.00,1.00,153.60,19.20,0 +172.80,19.20,10.67,0.00,1.00,158.40,14.40,0 +172.80,14.40,10.60,0.00,1.00,163.20,9.60,0 +177.60,9.60,10.54,0.00,1.00,168.00,4.80,0 +177.60,4.80,10.47,0.00,1.00,172.80,0.00,0 +177.60,0.00,10.41,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,10.35,0.00,1.00,-177.60,-4.80,0 +-177.60,-4.80,10.28,0.00,1.00,-172.80,-9.60,0 +-177.60,-9.60,10.22,0.00,1.00,-168.00,-14.40,0 +-172.80,-14.40,10.15,0.00,1.00,-163.20,-19.20,0 +-172.80,-19.20,10.09,0.00,1.00,-158.40,-24.00,0 +-172.80,-24.00,10.02,0.00,1.00,-153.60,-28.80,0 +-168.00,-28.80,9.96,0.00,1.00,-148.80,-33.60,0 +-168.00,-33.60,9.90,0.00,1.00,-144.00,-38.40,0 +-163.20,-38.40,9.83,0.00,1.00,-139.20,-43.20,0 +-163.20,-43.20,9.77,0.00,1.00,-134.40,-48.00,0 +-158.40,-48.00,9.70,0.00,1.00,-129.60,-52.80,0 +-153.60,-52.80,9.64,0.00,1.00,-124.80,-57.60,0 +-148.80,-52.80,9.57,0.00,1.00,-120.00,-57.60,0 +-144.00,-57.60,9.51,0.00,1.00,-115.20,-62.40,0 +-139.20,-62.40,9.45,0.00,1.00,-110.40,-67.20,0 +-129.60,-67.20,9.38,0.00,1.00,-105.60,-67.20,0 +-120.00,-67.20,9.32,0.00,1.00,-100.80,-72.00,0 +-105.60,-72.00,9.25,0.00,1.00,-96.00,-72.00,0 +-96.00,-72.00,9.19,0.00,1.00,-91.20,-72.00,0 +-76.80,-72.00,9.12,0.00,1.00,-86.40,-72.00,0 +-67.20,-67.20,9.06,0.00,1.00,-81.60,-67.20,0 +-52.80,-67.20,9.00,0.00,1.00,-76.80,-62.40,0 +-43.20,-62.40,8.93,0.00,1.00,-72.00,-62.40,0 +-38.40,-62.40,8.87,0.00,1.00,-67.20,-57.60,0 +-33.60,-57.60,8.80,0.00,1.00,-62.40,-52.80,0 +-28.80,-52.80,8.74,0.00,1.00,-57.60,-48.00,0 +-24.00,-48.00,8.67,0.00,1.00,-52.80,-43.20,0 +-19.20,-43.20,8.61,0.00,1.00,-48.00,-38.40,0 +-19.20,-38.40,8.55,0.00,1.00,-43.20,-38.40,0 +-14.40,-33.60,8.48,0.00,1.00,-38.40,-33.60,0 +-14.40,-33.60,8.42,0.00,1.00,-33.60,-28.80,0 +-9.60,-28.80,8.35,0.00,1.00,-28.80,-24.00,0 +-9.60,-24.00,8.29,0.00,1.00,-24.00,-19.20,0 +-4.80,-19.20,8.22,0.00,1.00,-19.20,-14.40,0 +-4.80,-14.40,8.16,0.00,1.00,-14.40,-9.60,0 +-4.80,-9.60,8.10,0.00,1.00,-9.60,-4.80,0 +-0.00,-4.80,8.03,0.00,1.00,-4.80,0.00,0 +0.00,0.00,7.97,0.00,1.00,0.00,4.80,0 +0.00,4.80,7.90,0.00,1.00,4.80,9.60,0 +4.80,9.60,7.84,0.00,1.00,9.60,14.40,0 +4.80,14.40,7.78,0.00,1.00,14.40,19.20,0 +9.60,19.20,7.71,0.00,1.00,19.20,24.00,0 +9.60,24.00,7.65,0.00,1.00,24.00,24.00,0 +14.40,24.00,7.58,0.00,1.00,28.80,28.80,0 +14.40,28.80,7.52,0.00,1.00,33.60,33.60,0 +19.20,33.60,7.45,0.00,1.00,33.60,38.40,0 +19.20,38.40,7.39,0.00,1.00,38.40,43.20,0 +24.00,43.20,7.33,0.00,1.00,43.20,48.00,0 +28.80,48.00,7.26,0.00,1.00,48.00,52.80,0 +33.60,52.80,7.20,0.00,1.00,57.60,52.80,0 +38.40,52.80,7.13,0.00,1.00,62.40,57.60,0 +43.20,57.60,7.07,0.00,1.00,67.20,62.40,0 +52.80,62.40,7.00,0.00,1.00,72.00,62.40,0 +62.40,62.40,6.94,0.00,1.00,76.80,67.20,0 +72.00,62.40,6.88,0.00,1.00,81.60,67.20,0 +81.60,67.20,6.81,0.00,1.00,86.40,67.20,0 +91.20,67.20,6.75,0.00,1.00,91.20,67.20,0 +105.60,67.20,6.68,0.00,1.00,96.00,67.20,0 +115.20,62.40,6.62,0.00,1.00,100.80,62.40,0 +124.80,62.40,6.55,0.00,1.00,105.60,57.60,0 +134.40,57.60,6.49,0.00,1.00,110.40,57.60,0 +139.20,57.60,6.43,0.00,1.00,115.20,52.80,0 +144.00,52.80,6.36,0.00,1.00,120.00,48.00,0 +148.80,48.00,6.30,0.00,1.00,129.60,43.20,0 +153.60,43.20,6.23,0.00,1.00,134.40,43.20,0 +158.40,38.40,6.17,0.00,1.00,139.20,38.40,0 +158.40,38.40,6.10,0.00,1.00,144.00,33.60,0 +163.20,33.60,6.04,0.00,1.00,148.80,28.80,0 +168.00,28.80,5.98,0.00,1.00,148.80,24.00,0 +168.00,24.00,5.91,0.00,1.00,153.60,19.20,0 +172.80,19.20,5.85,0.00,1.00,158.40,14.40,0 +172.80,14.40,5.78,0.00,1.00,163.20,9.60,0 +172.80,9.60,5.72,0.00,1.00,168.00,4.80,0 +177.60,4.80,5.65,0.00,1.00,172.80,0.00,0 +177.60,0.00,5.59,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,5.53,0.00,1.00,-177.60,-4.80,0 +-177.60,-4.80,5.46,0.00,1.00,-172.80,-9.60,0 +-172.80,-9.60,5.40,0.00,1.00,-168.00,-14.40,0 +-172.80,-14.40,5.33,0.00,1.00,-163.20,-19.20,0 +-172.80,-19.20,5.27,0.00,1.00,-158.40,-24.00,0 +-168.00,-24.00,5.20,0.00,1.00,-153.60,-28.80,0 +-168.00,-28.80,5.14,0.00,1.00,-148.80,-33.60,0 +-163.20,-33.60,5.08,0.00,1.00,-148.80,-38.40,0 +-158.40,-38.40,5.01,0.00,1.00,-144.00,-43.20,0 +-158.40,-38.40,4.95,0.00,1.00,-139.20,-43.20,0 +-153.60,-43.20,4.88,0.00,1.00,-134.40,-48.00,0 +-148.80,-48.00,4.82,0.00,1.00,-129.60,-52.80,0 +-144.00,-52.80,4.76,0.00,1.00,-120.00,-57.60,0 +-139.20,-57.60,4.69,0.00,1.00,-115.20,-57.60,0 +-134.40,-57.60,4.63,0.00,1.00,-110.40,-62.40,0 +-124.80,-62.40,4.56,0.00,1.00,-105.60,-67.20,0 +-115.20,-62.40,4.50,0.00,1.00,-100.80,-67.20,0 +-105.60,-67.20,4.43,0.00,1.00,-96.00,-67.20,0 +-91.20,-67.20,4.37,0.00,1.00,-91.20,-67.20,0 +-81.60,-67.20,4.31,0.00,1.00,-86.40,-67.20,0 +-72.00,-62.40,4.24,0.00,1.00,-81.60,-62.40,0 +-62.40,-62.40,4.18,0.00,1.00,-76.80,-62.40,0 +-52.80,-62.40,4.11,0.00,1.00,-72.00,-57.60,0 +-43.20,-57.60,4.05,0.00,1.00,-67.20,-52.80,0 +-38.40,-52.80,3.98,0.00,1.00,-62.40,-52.80,0 +-33.60,-52.80,3.92,0.00,1.00,-57.60,-48.00,0 +-28.80,-48.00,3.86,0.00,1.00,-48.00,-43.20,0 +-24.00,-43.20,3.79,0.00,1.00,-43.20,-38.40,0 +-19.20,-38.40,3.73,0.00,1.00,-38.40,-33.60,0 +-19.20,-33.60,3.66,0.00,1.00,-33.60,-28.80,0 +-14.40,-28.80,3.60,0.00,1.00,-33.60,-24.00,0 +-14.40,-24.00,3.53,0.00,1.00,-28.80,-24.00,0 +-9.60,-24.00,3.47,0.00,1.00,-24.00,-19.20,0 +-9.60,-19.20,3.41,0.00,1.00,-19.20,-14.40,0 +-4.80,-14.40,3.34,0.00,1.00,-14.40,-9.60,0 +-4.80,-9.60,3.28,0.00,1.00,-9.60,-4.80,0 +-0.00,-4.80,3.21,0.00,1.00,-4.80,0.00,0 +0.00,0.00,3.15,0.00,1.00,0.00,4.80,0 +0.00,4.80,3.08,0.00,1.00,4.80,9.60,0 +4.80,9.60,3.02,0.00,1.00,9.60,14.40,0 +4.80,14.40,2.96,0.00,1.00,14.40,19.20,0 +9.60,14.40,2.89,0.00,1.00,19.20,19.20,0 +14.40,19.20,2.83,0.00,1.00,19.20,24.00,0 +14.40,24.00,2.76,0.00,1.00,24.00,28.80,0 +19.20,28.80,2.70,0.00,1.00,28.80,33.60,0 +19.20,33.60,2.63,0.00,1.00,33.60,38.40,0 +24.00,38.40,2.57,0.00,1.00,38.40,43.20,0 +28.80,38.40,2.51,0.00,1.00,43.20,43.20,0 +33.60,43.20,2.44,0.00,1.00,48.00,48.00,0 +38.40,48.00,2.38,0.00,1.00,52.80,52.80,0 +43.20,52.80,2.31,0.00,1.00,57.60,52.80,0 +48.00,52.80,2.25,0.00,1.00,62.40,57.60,0 +57.60,57.60,2.18,0.00,1.00,72.00,57.60,0 +62.40,57.60,2.12,0.00,1.00,76.80,62.40,0 +72.00,62.40,2.06,0.00,1.00,81.60,62.40,0 +81.60,62.40,1.99,0.00,1.00,86.40,62.40,0 +91.20,62.40,1.93,0.00,1.00,91.20,62.40,0 +100.80,62.40,1.86,0.00,1.00,96.00,62.40,0 +110.40,57.60,1.80,0.00,1.00,100.80,57.60,0 +120.00,57.60,1.73,0.00,1.00,105.60,57.60,0 +129.60,57.60,1.67,0.00,1.00,115.20,52.80,0 +134.40,52.80,1.61,0.00,1.00,120.00,48.00,0 +139.20,48.00,1.54,0.00,1.00,124.80,48.00,0 +144.00,48.00,1.48,0.00,1.00,129.60,43.20,0 +148.80,43.20,1.41,0.00,1.00,134.40,38.40,0 +153.60,38.40,1.35,0.00,1.00,139.20,33.60,0 +158.40,33.60,1.29,0.00,1.00,144.00,33.60,0 +158.40,28.80,1.22,0.00,1.00,148.80,28.80,0 +163.20,28.80,1.16,0.00,1.00,153.60,24.00,0 +168.00,24.00,1.09,0.00,1.00,158.40,19.20,0 +168.00,19.20,1.03,0.00,1.00,163.20,14.40,0 +172.80,14.40,0.96,0.00,1.00,163.20,9.60,0 +172.80,9.60,0.90,0.00,1.00,168.00,4.80,0 +177.60,4.80,0.84,0.00,1.00,172.80,0.00,0 +177.60,0.00,0.77,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,0.71,0.00,1.00,-177.60,-4.80,0 +-177.60,-4.80,0.64,0.00,1.00,-172.80,-9.60,0 +-172.80,-9.60,0.58,0.00,1.00,-168.00,-14.40,0 +-172.80,-14.40,0.51,0.00,1.00,-163.20,-19.20,0 +-168.00,-19.20,0.45,0.00,1.00,-163.20,-24.00,0 +-168.00,-24.00,0.39,0.00,1.00,-158.40,-28.80,0 +-163.20,-28.80,0.32,0.00,1.00,-153.60,-33.60,0 +-158.40,-28.80,0.26,0.00,1.00,-148.80,-33.60,0 +-158.40,-33.60,0.19,0.00,1.00,-144.00,-38.40,0 +-153.60,-38.40,0.13,0.00,1.00,-139.20,-43.20,0 +-148.80,-43.20,0.06,0.00,1.00,-134.40,-48.00,0 +-144.00,-48.00,0.00,0.00,1.00,-129.60,-48.00,0 +-139.20,-48.00,0.00,0.00,1.00,-124.80,-52.80,0 +-134.40,-52.80,0.16,0.00,1.00,-120.00,-57.60,0 +-129.60,-57.60,0.32,0.00,1.00,-115.20,-57.60,0 +-120.00,-57.60,0.48,0.00,1.00,-105.60,-62.40,0 +-110.40,-57.60,0.65,0.00,1.00,-100.80,-62.40,0 +-100.80,-62.40,0.81,0.00,1.00,-96.00,-62.40,0 +-91.20,-62.40,0.97,0.00,1.00,-91.20,-62.40,0 +-81.60,-62.40,1.13,0.00,1.00,-86.40,-62.40,0 +-72.00,-62.40,1.29,0.00,1.00,-81.60,-57.60,0 +-62.40,-57.60,1.45,0.00,1.00,-76.80,-57.60,0 +-57.60,-57.60,1.62,0.00,1.00,-72.00,-52.80,0 +-48.00,-52.80,1.78,0.00,1.00,-62.40,-52.80,0 +-43.20,-52.80,1.94,0.00,1.00,-57.60,-48.00,0 +-38.40,-48.00,2.10,0.00,1.00,-52.80,-43.20,0 +-33.60,-43.20,2.26,0.00,1.00,-48.00,-43.20,0 +-28.80,-38.40,2.42,0.00,1.00,-43.20,-38.40,0 +-24.00,-38.40,2.59,0.00,1.00,-38.40,-33.60,0 +-19.20,-33.60,2.75,0.00,1.00,-33.60,-28.80,0 +-19.20,-28.80,2.91,0.00,1.00,-28.80,-24.00,0 +-14.40,-24.00,3.07,0.00,1.00,-24.00,-19.20,0 +-14.40,-19.20,3.23,0.00,1.00,-19.20,-19.20,0 +-9.60,-14.40,3.39,0.00,1.00,-19.20,-14.40,0 +-4.80,-14.40,3.56,0.00,1.00,-14.40,-9.60,0 +-4.80,-9.60,3.72,0.00,1.00,-9.60,-4.80,0 +-0.00,-4.80,3.88,0.00,1.00,-4.80,0.00,0 +0.00,0.00,4.04,0.00,1.00,0.00,4.80,0 +4.80,4.80,4.20,0.00,1.00,4.80,9.60,0 +4.80,9.60,4.36,0.00,1.00,9.60,14.40,0 +9.60,9.60,4.53,0.00,1.00,14.40,14.40,0 +9.60,14.40,4.69,0.00,1.00,14.40,19.20,0 +14.40,19.20,4.85,0.00,1.00,19.20,24.00,0 +19.20,24.00,5.01,0.00,1.00,24.00,28.80,0 +19.20,28.80,5.17,0.00,1.00,28.80,33.60,0 +24.00,28.80,5.33,0.00,1.00,33.60,33.60,0 +28.80,33.60,5.49,0.00,1.00,38.40,38.40,0 +33.60,38.40,5.66,0.00,1.00,43.20,43.20,0 +38.40,43.20,5.82,0.00,1.00,48.00,43.20,0 +43.20,43.20,5.98,0.00,1.00,52.80,48.00,0 +48.00,48.00,6.14,0.00,1.00,57.60,52.80,0 +52.80,48.00,6.30,0.00,1.00,62.40,52.80,0 +57.60,52.80,6.46,0.00,1.00,67.20,57.60,0 +67.20,52.80,6.63,0.00,1.00,72.00,57.60,0 +76.80,57.60,6.79,0.00,1.00,81.60,57.60,0 +81.60,57.60,6.95,0.00,1.00,86.40,57.60,0 +91.20,57.60,7.11,0.00,1.00,91.20,57.60,0 +100.80,57.60,7.27,0.00,1.00,96.00,57.60,0 +110.40,52.80,7.43,0.00,1.00,100.80,52.80,0 +115.20,52.80,7.60,0.00,1.00,110.40,52.80,0 +124.80,52.80,7.76,0.00,1.00,115.20,48.00,0 +129.60,48.00,7.92,0.00,1.00,120.00,48.00,0 +134.40,48.00,8.08,0.00,1.00,124.80,43.20,0 +139.20,43.20,8.24,0.00,1.00,129.60,38.40,0 +144.00,38.40,8.40,0.00,1.00,134.40,38.40,0 +148.80,38.40,8.57,0.00,1.00,139.20,33.60,0 +153.60,33.60,8.73,0.00,1.00,144.00,28.80,0 +158.40,28.80,8.89,0.00,1.00,148.80,24.00,0 +163.20,24.00,9.05,0.00,1.00,153.60,24.00,0 +163.20,24.00,9.21,0.00,1.00,158.40,19.20,0 +168.00,19.20,9.37,0.00,1.00,163.20,14.40,0 +172.80,14.40,9.54,0.00,1.00,168.00,9.60,0 +172.80,9.60,9.70,0.00,1.00,168.00,4.80,0 +177.60,4.80,9.86,0.00,1.00,172.80,0.00,0 +177.60,0.00,10.02,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,10.18,0.00,1.00,-177.60,-4.80,0 +-177.60,-4.80,10.34,0.00,1.00,-172.80,-9.60,0 +-172.80,-9.60,10.51,0.00,1.00,-168.00,-14.40,0 +-172.80,-14.40,10.67,0.00,1.00,-168.00,-19.20,0 +-168.00,-19.20,10.83,0.00,1.00,-163.20,-24.00,0 +-163.20,-24.00,10.99,0.00,1.00,-158.40,-24.00,0 +-163.20,-24.00,11.15,0.00,1.00,-153.60,-28.80,0 +-158.40,-28.80,11.31,0.00,1.00,-148.80,-33.60,0 +-153.60,-33.60,11.47,0.00,1.00,-144.00,-38.40,0 +-148.80,-38.40,11.64,0.00,1.00,-139.20,-38.40,0 +-144.00,-38.40,11.80,0.00,1.00,-134.40,-43.20,0 +-139.20,-43.20,11.96,0.00,1.00,-129.60,-48.00,0 +-134.40,-48.00,12.12,0.00,1.00,-124.80,-48.00,0 +-129.60,-48.00,12.28,0.00,1.00,-120.00,-52.80,0 +-124.80,-52.80,12.44,0.00,1.00,-115.20,-52.80,0 +-115.20,-52.80,12.61,0.00,1.00,-110.40,-57.60,0 +-110.40,-52.80,12.77,0.00,1.00,-100.80,-57.60,0 +-100.80,-57.60,12.93,0.00,1.00,-96.00,-57.60,0 +-91.20,-57.60,13.09,0.00,1.00,-91.20,-57.60,0 +-81.60,-57.60,13.25,0.00,1.00,-86.40,-57.60,0 +-76.80,-57.60,13.41,0.00,1.00,-81.60,-57.60,0 +-67.20,-52.80,13.58,0.00,1.00,-72.00,-52.80,0 +-57.60,-52.80,13.74,0.00,1.00,-67.20,-52.80,0 +-52.80,-48.00,13.90,0.00,1.00,-62.40,-48.00,0 +-48.00,-48.00,14.06,0.00,1.00,-57.60,-43.20,0 +-43.20,-43.20,14.22,0.00,1.00,-52.80,-43.20,0 +-38.40,-43.20,14.38,0.00,1.00,-48.00,-38.40,0 +-33.60,-38.40,14.55,0.00,1.00,-43.20,-33.60,0 +-28.80,-33.60,14.71,0.00,1.00,-38.40,-33.60,0 +-24.00,-28.80,14.87,0.00,1.00,-33.60,-28.80,0 +-19.20,-28.80,15.03,0.00,1.00,-28.80,-24.00,0 +-19.20,-24.00,15.19,0.00,1.00,-24.00,-19.20,0 +-14.40,-19.20,15.35,0.00,1.00,-19.20,-14.40,0 +-9.60,-14.40,15.52,0.00,1.00,-14.40,-14.40,0 +-9.60,-9.60,15.68,0.00,1.00,-14.40,-9.60,0 +-4.80,-9.60,15.84,0.00,1.00,-9.60,-4.80,0 +-4.80,-4.80,16.00,0.00,1.00,-4.80,0.00,0 +0.00,0.00,16.00,0.00,1.00,0.00,4.80,0 +4.80,4.80,15.84,0.00,1.00,4.80,9.60,0 +4.80,9.60,15.68,0.00,1.00,9.60,9.60,0 +9.60,9.60,15.52,0.00,1.00,9.60,14.40,0 +14.40,14.40,15.35,0.00,1.00,14.40,19.20,0 +14.40,19.20,15.19,0.00,1.00,19.20,24.00,0 +19.20,24.00,15.03,0.00,1.00,24.00,24.00,0 +24.00,24.00,14.87,0.00,1.00,28.80,28.80,0 +24.00,28.80,14.71,0.00,1.00,33.60,33.60,0 +28.80,33.60,14.55,0.00,1.00,38.40,38.40,0 +33.60,33.60,14.38,0.00,1.00,43.20,38.40,0 +38.40,38.40,14.22,0.00,1.00,48.00,43.20,0 +43.20,43.20,14.06,0.00,1.00,52.80,43.20,0 +48.00,43.20,13.90,0.00,1.00,57.60,48.00,0 +57.60,48.00,13.74,0.00,1.00,62.40,48.00,0 +62.40,48.00,13.58,0.00,1.00,67.20,52.80,0 +67.20,48.00,13.41,0.00,1.00,72.00,52.80,0 +76.80,52.80,13.25,0.00,1.00,81.60,52.80,0 +86.40,52.80,13.09,0.00,1.00,86.40,52.80,0 +91.20,52.80,12.93,0.00,1.00,91.20,52.80,0 +100.80,52.80,12.77,0.00,1.00,96.00,52.80,0 +105.60,48.00,12.61,0.00,1.00,105.60,48.00,0 +115.20,48.00,12.44,0.00,1.00,110.40,48.00,0 +120.00,48.00,12.28,0.00,1.00,115.20,48.00,0 +124.80,43.20,12.12,0.00,1.00,120.00,43.20,0 +134.40,43.20,11.96,0.00,1.00,124.80,43.20,0 +139.20,38.40,11.80,0.00,1.00,129.60,38.40,0 +144.00,38.40,11.64,0.00,1.00,134.40,33.60,0 +148.80,33.60,11.47,0.00,1.00,139.20,33.60,0 +153.60,28.80,11.31,0.00,1.00,144.00,28.80,0 +153.60,28.80,11.15,0.00,1.00,148.80,24.00,0 +158.40,24.00,10.99,0.00,1.00,153.60,19.20,0 +163.20,19.20,10.83,0.00,1.00,158.40,19.20,0 +168.00,14.40,10.67,0.00,1.00,163.20,14.40,0 +168.00,14.40,10.51,0.00,1.00,168.00,9.60,0 +172.80,9.60,10.34,0.00,1.00,172.80,4.80,0 +177.60,4.80,10.18,0.00,1.00,172.80,0.00,0 +177.60,0.00,10.02,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,9.86,0.00,1.00,-177.60,-4.80,0 +-177.60,-4.80,9.70,0.00,1.00,-172.80,-9.60,0 +-172.80,-9.60,9.54,0.00,1.00,-172.80,-14.40,0 +-168.00,-14.40,9.37,0.00,1.00,-168.00,-19.20,0 +-168.00,-14.40,9.21,0.00,1.00,-163.20,-19.20,0 +-163.20,-19.20,9.05,0.00,1.00,-158.40,-24.00,0 +-158.40,-24.00,8.89,0.00,1.00,-153.60,-28.80,0 +-153.60,-28.80,8.73,0.00,1.00,-148.80,-33.60,0 +-153.60,-28.80,8.57,0.00,1.00,-144.00,-33.60,0 +-148.80,-33.60,8.40,0.00,1.00,-139.20,-38.40,0 +-144.00,-38.40,8.24,0.00,1.00,-134.40,-43.20,0 +-139.20,-38.40,8.08,0.00,1.00,-129.60,-43.20,0 +-134.40,-43.20,7.92,0.00,1.00,-124.80,-48.00,0 +-124.80,-43.20,7.76,0.00,1.00,-120.00,-48.00,0 +-120.00,-48.00,7.60,0.00,1.00,-115.20,-48.00,0 +-115.20,-48.00,7.43,0.00,1.00,-110.40,-52.80,0 +-105.60,-48.00,7.27,0.00,1.00,-105.60,-52.80,0 +-100.80,-52.80,7.11,0.00,1.00,-96.00,-52.80,0 +-91.20,-52.80,6.95,0.00,1.00,-91.20,-52.80,0 +-86.40,-52.80,6.79,0.00,1.00,-86.40,-52.80,0 +-76.80,-52.80,6.63,0.00,1.00,-81.60,-52.80,0 +-67.20,-48.00,6.46,0.00,1.00,-72.00,-48.00,0 +-62.40,-48.00,6.30,0.00,1.00,-67.20,-48.00,0 +-57.60,-48.00,6.14,0.00,1.00,-62.40,-43.20,0 +-48.00,-43.20,5.98,0.00,1.00,-57.60,-43.20,0 +-43.20,-43.20,5.82,0.00,1.00,-52.80,-38.40,0 +-38.40,-38.40,5.66,0.00,1.00,-48.00,-38.40,0 +-33.60,-33.60,5.49,0.00,1.00,-43.20,-33.60,0 +-28.80,-33.60,5.33,0.00,1.00,-38.40,-28.80,0 +-24.00,-28.80,5.17,0.00,1.00,-33.60,-24.00,0 +-24.00,-24.00,5.01,0.00,1.00,-28.80,-24.00,0 +-19.20,-24.00,4.85,0.00,1.00,-24.00,-19.20,0 +-14.40,-19.20,4.69,0.00,1.00,-19.20,-14.40,0 +-14.40,-14.40,4.53,0.00,1.00,-14.40,-9.60,0 +-9.60,-9.60,4.36,0.00,1.00,-9.60,-9.60,0 +-4.80,-9.60,4.20,0.00,1.00,-9.60,-4.80,0 +-4.80,-4.80,4.04,0.00,1.00,-4.80,0.00,0 +0.00,0.00,3.88,0.00,1.00,0.00,4.80,0 +4.80,4.80,3.72,0.00,1.00,4.80,4.80,0 +4.80,4.80,3.56,0.00,1.00,4.80,9.60,0 +9.60,9.60,3.39,0.00,1.00,9.60,14.40,0 +14.40,14.40,3.23,0.00,1.00,14.40,19.20,0 +19.20,19.20,3.07,0.00,1.00,19.20,19.20,0 +19.20,19.20,2.91,0.00,1.00,24.00,24.00,0 +24.00,24.00,2.75,0.00,1.00,24.00,28.80,0 +28.80,28.80,2.59,0.00,1.00,28.80,28.80,0 +33.60,28.80,2.42,0.00,1.00,33.60,33.60,0 +38.40,33.60,2.26,0.00,1.00,38.40,38.40,0 +43.20,33.60,2.10,0.00,1.00,43.20,38.40,0 +48.00,38.40,1.94,0.00,1.00,48.00,43.20,0 +52.80,38.40,1.78,0.00,1.00,52.80,43.20,0 +57.60,43.20,1.62,0.00,1.00,62.40,43.20,0 +62.40,43.20,1.45,0.00,1.00,67.20,48.00,0 +72.00,43.20,1.29,0.00,1.00,72.00,48.00,0 +76.80,48.00,1.13,0.00,1.00,76.80,48.00,0 +86.40,48.00,0.97,0.00,1.00,86.40,48.00,0 +91.20,48.00,0.81,0.00,1.00,91.20,48.00,0 +100.80,48.00,0.65,0.00,1.00,96.00,48.00,0 +105.60,48.00,0.48,0.00,1.00,105.60,48.00,0 +110.40,43.20,0.32,0.00,1.00,110.40,43.20,0 +120.00,43.20,0.16,0.00,1.00,115.20,43.20,0 +124.80,43.20,0.00,0.00,1.00,124.80,38.40,0 +129.60,38.40,0.00,0.00,1.00,129.60,38.40,0 +134.40,38.40,0.04,0.00,1.00,134.40,33.60,0 +139.20,33.60,0.08,0.00,1.00,139.20,33.60,0 +144.00,33.60,0.12,0.00,1.00,144.00,28.80,0 +148.80,28.80,0.16,0.00,1.00,148.80,24.00,0 +153.60,24.00,0.20,0.00,1.00,153.60,24.00,0 +158.40,24.00,0.24,0.00,1.00,158.40,19.20,0 +163.20,19.20,0.28,0.00,1.00,158.40,14.40,0 +163.20,14.40,0.32,0.00,1.00,163.20,14.40,0 +168.00,14.40,0.36,0.00,1.00,168.00,9.60,0 +172.80,9.60,0.40,0.00,1.00,172.80,4.80,0 +172.80,4.80,0.44,0.00,1.00,172.80,0.00,0 +177.60,0.00,0.48,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,0.52,0.00,1.00,-177.60,-4.80,0 +-172.80,-4.80,0.56,0.00,1.00,-172.80,-9.60,0 +-172.80,-9.60,0.60,0.00,1.00,-172.80,-14.40,0 +-168.00,-14.40,0.64,0.00,1.00,-168.00,-14.40,0 +-163.20,-14.40,0.68,0.00,1.00,-163.20,-19.20,0 +-163.20,-19.20,0.72,0.00,1.00,-158.40,-24.00,0 +-158.40,-24.00,0.76,0.00,1.00,-158.40,-24.00,0 +-153.60,-24.00,0.80,0.00,1.00,-153.60,-28.80,0 +-148.80,-28.80,0.84,0.00,1.00,-148.80,-33.60,0 +-144.00,-33.60,0.88,0.00,1.00,-144.00,-33.60,0 +-139.20,-33.60,0.92,0.00,1.00,-139.20,-38.40,0 +-134.40,-38.40,0.96,0.00,1.00,-134.40,-38.40,0 +-129.60,-38.40,1.00,0.00,1.00,-129.60,-43.20,0 +-124.80,-43.20,1.04,0.00,1.00,-124.80,-43.20,0 +-120.00,-43.20,1.08,0.00,1.00,-115.20,-48.00,0 +-110.40,-43.20,1.12,0.00,1.00,-110.40,-48.00,0 +-105.60,-48.00,1.16,0.00,1.00,-105.60,-48.00,0 +-100.80,-48.00,1.20,0.00,1.00,-96.00,-48.00,0 +-91.20,-48.00,1.24,0.00,1.00,-91.20,-48.00,0 +-86.40,-48.00,1.28,0.00,1.00,-86.40,-48.00,0 +-76.80,-48.00,1.32,0.00,1.00,-76.80,-48.00,0 +-72.00,-43.20,1.36,0.00,1.00,-72.00,-43.20,0 +-62.40,-43.20,1.40,0.00,1.00,-67.20,-43.20,0 +-57.60,-43.20,1.44,0.00,1.00,-62.40,-43.20,0 +-52.80,-38.40,1.48,0.00,1.00,-52.80,-38.40,0 +-48.00,-38.40,1.52,0.00,1.00,-48.00,-38.40,0 +-43.20,-33.60,1.56,0.00,1.00,-43.20,-33.60,0 +-38.40,-33.60,1.60,0.00,1.00,-38.40,-28.80,0 +-33.60,-28.80,1.64,0.00,1.00,-33.60,-28.80,0 +-28.80,-28.80,1.68,0.00,1.00,-28.80,-24.00,0 +-24.00,-24.00,1.72,0.00,1.00,-24.00,-19.20,0 +-19.20,-19.20,1.76,0.00,1.00,-24.00,-19.20,0 +-19.20,-19.20,1.80,0.00,1.00,-19.20,-14.40,0 +-14.40,-14.40,1.84,0.00,1.00,-14.40,-9.60,0 +-9.60,-9.60,1.88,0.00,1.00,-9.60,-4.80,0 +-4.80,-4.80,1.92,0.00,1.00,-4.80,-4.80,0 +-4.80,-4.80,1.96,0.00,1.00,-4.80,0.00,0 +0.00,0.00,2.01,0.00,1.00,0.00,4.80,0 +4.80,4.80,2.05,0.00,1.00,4.80,4.80,0 +4.80,4.80,2.09,0.00,1.00,4.80,9.60,0 +9.60,9.60,2.13,0.00,1.00,9.60,14.40,0 +14.40,14.40,2.17,0.00,1.00,14.40,14.40,0 +19.20,14.40,2.21,0.00,1.00,14.40,19.20,0 +24.00,19.20,2.25,0.00,1.00,19.20,24.00,0 +24.00,24.00,2.29,0.00,1.00,24.00,24.00,0 +28.80,24.00,2.33,0.00,1.00,28.80,28.80,0 +33.60,28.80,2.37,0.00,1.00,33.60,28.80,0 +38.40,28.80,2.41,0.00,1.00,38.40,33.60,0 +43.20,33.60,2.45,0.00,1.00,43.20,33.60,0 +48.00,33.60,2.49,0.00,1.00,48.00,38.40,0 +52.80,38.40,2.53,0.00,1.00,52.80,38.40,0 +62.40,38.40,2.57,0.00,1.00,57.60,38.40,0 +67.20,38.40,2.61,0.00,1.00,62.40,43.20,0 +72.00,38.40,2.65,0.00,1.00,72.00,43.20,0 +76.80,43.20,2.69,0.00,1.00,76.80,43.20,0 +86.40,43.20,2.73,0.00,1.00,86.40,43.20,0 +91.20,43.20,2.77,0.00,1.00,91.20,43.20,0 +96.00,43.20,2.81,0.00,1.00,100.80,43.20,0 +105.60,43.20,2.85,0.00,1.00,105.60,43.20,0 +110.40,38.40,2.89,0.00,1.00,110.40,38.40,0 +115.20,38.40,2.93,0.00,1.00,120.00,38.40,0 +120.00,38.40,2.97,0.00,1.00,124.80,38.40,0 +129.60,33.60,3.01,0.00,1.00,129.60,33.60,0 +134.40,33.60,3.05,0.00,1.00,134.40,33.60,0 +139.20,28.80,3.09,0.00,1.00,139.20,28.80,0 +144.00,28.80,3.13,0.00,1.00,144.00,28.80,0 +148.80,24.00,3.17,0.00,1.00,148.80,24.00,0 +153.60,24.00,3.21,0.00,1.00,153.60,19.20,0 +153.60,19.20,3.25,0.00,1.00,158.40,19.20,0 +158.40,19.20,3.29,0.00,1.00,163.20,14.40,0 +163.20,14.40,3.33,0.00,1.00,163.20,9.60,0 +168.00,9.60,3.37,0.00,1.00,168.00,9.60,0 +172.80,9.60,3.41,0.00,1.00,172.80,4.80,0 +172.80,4.80,3.45,0.00,1.00,172.80,0.00,0 +177.60,0.00,3.49,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,3.53,0.00,1.00,-177.60,-4.80,0 +-172.80,-4.80,3.57,0.00,1.00,-172.80,-9.60,0 +-172.80,-9.60,3.61,0.00,1.00,-172.80,-9.60,0 +-168.00,-9.60,3.65,0.00,1.00,-168.00,-14.40,0 +-163.20,-14.40,3.69,0.00,1.00,-163.20,-19.20,0 +-158.40,-19.20,3.73,0.00,1.00,-163.20,-19.20,0 +-153.60,-19.20,3.77,0.00,1.00,-158.40,-24.00,0 +-153.60,-24.00,3.81,0.00,1.00,-153.60,-28.80,0 +-148.80,-24.00,3.85,0.00,1.00,-148.80,-28.80,0 +-144.00,-28.80,3.89,0.00,1.00,-144.00,-33.60,0 +-139.20,-28.80,3.93,0.00,1.00,-139.20,-33.60,0 +-134.40,-33.60,3.97,0.00,1.00,-134.40,-38.40,0 +-129.60,-33.60,4.01,0.00,1.00,-129.60,-38.40,0 +-120.00,-38.40,4.05,0.00,1.00,-124.80,-38.40,0 +-115.20,-38.40,4.09,0.00,1.00,-120.00,-43.20,0 +-110.40,-38.40,4.13,0.00,1.00,-110.40,-43.20,0 +-105.60,-43.20,4.17,0.00,1.00,-105.60,-43.20,0 +-96.00,-43.20,4.21,0.00,1.00,-100.80,-43.20,0 +-91.20,-43.20,4.25,0.00,1.00,-91.20,-43.20,0 +-86.40,-43.20,4.29,0.00,1.00,-86.40,-43.20,0 +-76.80,-43.20,4.33,0.00,1.00,-76.80,-43.20,0 +-72.00,-38.40,4.37,0.00,1.00,-72.00,-38.40,0 +-67.20,-38.40,4.41,0.00,1.00,-62.40,-38.40,0 +-62.40,-38.40,4.45,0.00,1.00,-57.60,-38.40,0 +-52.80,-38.40,4.49,0.00,1.00,-52.80,-33.60,0 +-48.00,-33.60,4.53,0.00,1.00,-48.00,-33.60,0 +-43.20,-33.60,4.57,0.00,1.00,-43.20,-28.80,0 +-38.40,-28.80,4.61,0.00,1.00,-38.40,-28.80,0 +-33.60,-28.80,4.65,0.00,1.00,-33.60,-24.00,0 +-28.80,-24.00,4.69,0.00,1.00,-28.80,-24.00,0 +-24.00,-24.00,4.73,0.00,1.00,-24.00,-19.20,0 +-24.00,-19.20,4.77,0.00,1.00,-19.20,-14.40,0 +-19.20,-14.40,4.81,0.00,1.00,-14.40,-14.40,0 +-14.40,-14.40,4.85,0.00,1.00,-14.40,-9.60,0 +-9.60,-9.60,4.89,0.00,1.00,-9.60,-4.80,0 +-4.80,-4.80,4.93,0.00,1.00,-4.80,-4.80,0 +-4.80,-4.80,4.97,0.00,1.00,-4.80,0.00,0 +0.00,0.00,5.01,0.00,1.00,0.00,4.80,0 +4.80,4.80,5.05,0.00,1.00,4.80,4.80,0 +9.60,4.80,5.09,0.00,1.00,4.80,9.60,0 +9.60,9.60,5.13,0.00,1.00,9.60,9.60,0 +14.40,9.60,5.17,0.00,1.00,9.60,14.40,0 +19.20,14.40,5.21,0.00,1.00,14.40,19.20,0 +24.00,19.20,5.25,0.00,1.00,19.20,19.20,0 +28.80,19.20,5.29,0.00,1.00,24.00,24.00,0 +33.60,24.00,5.33,0.00,1.00,24.00,24.00,0 +38.40,24.00,5.37,0.00,1.00,28.80,28.80,0 +43.20,28.80,5.41,0.00,1.00,33.60,28.80,0 +48.00,28.80,5.45,0.00,1.00,38.40,33.60,0 +52.80,28.80,5.49,0.00,1.00,43.20,33.60,0 +57.60,33.60,5.53,0.00,1.00,48.00,33.60,0 +62.40,33.60,5.57,0.00,1.00,52.80,38.40,0 +67.20,33.60,5.61,0.00,1.00,62.40,38.40,0 +72.00,38.40,5.65,0.00,1.00,67.20,38.40,0 +81.60,38.40,5.69,0.00,1.00,76.80,38.40,0 +86.40,38.40,5.73,0.00,1.00,86.40,38.40,0 +91.20,38.40,5.77,0.00,1.00,91.20,38.40,0 +96.00,38.40,5.81,0.00,1.00,100.80,38.40,0 +105.60,38.40,5.85,0.00,1.00,105.60,38.40,0 +110.40,33.60,5.89,0.00,1.00,115.20,33.60,0 +115.20,33.60,5.93,0.00,1.00,120.00,33.60,0 +120.00,33.60,5.97,0.00,1.00,129.60,33.60,0 +124.80,33.60,6.02,0.00,1.00,134.40,28.80,0 +129.60,28.80,6.06,0.00,1.00,139.20,28.80,0 +134.40,28.80,6.10,0.00,1.00,144.00,24.00,0 +139.20,24.00,6.14,0.00,1.00,148.80,24.00,0 +144.00,24.00,6.18,0.00,1.00,153.60,19.20,0 +148.80,19.20,6.22,0.00,1.00,158.40,19.20,0 +153.60,19.20,6.26,0.00,1.00,158.40,14.40,0 +158.40,14.40,6.30,0.00,1.00,163.20,14.40,0 +163.20,14.40,6.34,0.00,1.00,168.00,9.60,0 +168.00,9.60,6.38,0.00,1.00,168.00,9.60,0 +168.00,9.60,6.42,0.00,1.00,172.80,4.80,0 +172.80,4.80,6.46,0.00,1.00,177.60,0.00,0 +177.60,0.00,6.50,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,6.54,0.00,1.00,-177.60,-4.80,0 +-172.80,-4.80,6.58,0.00,1.00,-177.60,-9.60,0 +-168.00,-9.60,6.62,0.00,1.00,-172.80,-9.60,0 +-168.00,-9.60,6.66,0.00,1.00,-168.00,-14.40,0 +-163.20,-14.40,6.70,0.00,1.00,-168.00,-14.40,0 +-158.40,-14.40,6.74,0.00,1.00,-163.20,-19.20,0 +-153.60,-19.20,6.78,0.00,1.00,-158.40,-19.20,0 +-148.80,-19.20,6.82,0.00,1.00,-158.40,-24.00,0 +-144.00,-24.00,6.86,0.00,1.00,-153.60,-24.00,0 +-139.20,-24.00,6.90,0.00,1.00,-148.80,-28.80,0 +-134.40,-28.80,6.94,0.00,1.00,-144.00,-28.80,0 +-129.60,-28.80,6.98,0.00,1.00,-139.20,-33.60,0 +-124.80,-33.60,7.02,0.00,1.00,-134.40,-33.60,0 +-120.00,-33.60,7.06,0.00,1.00,-129.60,-33.60,0 +-115.20,-33.60,7.10,0.00,1.00,-120.00,-38.40,0 +-110.40,-33.60,7.14,0.00,1.00,-115.20,-38.40,0 +-105.60,-38.40,7.18,0.00,1.00,-105.60,-38.40,0 +-96.00,-38.40,7.22,0.00,1.00,-100.80,-38.40,0 +-91.20,-38.40,7.26,0.00,1.00,-91.20,-38.40,0 +-86.40,-38.40,7.30,0.00,1.00,-86.40,-38.40,0 +-81.60,-38.40,7.34,0.00,1.00,-76.80,-38.40,0 +-72.00,-38.40,7.38,0.00,1.00,-67.20,-38.40,0 +-67.20,-33.60,7.42,0.00,1.00,-62.40,-33.60,0 +-62.40,-33.60,7.46,0.00,1.00,-52.80,-33.60,0 +-57.60,-33.60,7.50,0.00,1.00,-48.00,-33.60,0 +-52.80,-28.80,7.54,0.00,1.00,-43.20,-28.80,0 +-48.00,-28.80,7.58,0.00,1.00,-38.40,-28.80,0 +-43.20,-28.80,7.62,0.00,1.00,-33.60,-24.00,0 +-38.40,-24.00,7.66,0.00,1.00,-28.80,-24.00,0 +-33.60,-24.00,7.70,0.00,1.00,-24.00,-19.20,0 +-28.80,-19.20,7.74,0.00,1.00,-24.00,-19.20,0 +-24.00,-19.20,7.78,0.00,1.00,-19.20,-14.40,0 +-19.20,-14.40,7.82,0.00,1.00,-14.40,-9.60,0 +-14.40,-9.60,7.86,0.00,1.00,-9.60,-9.60,0 +-9.60,-9.60,7.90,0.00,1.00,-9.60,-4.80,0 +-9.60,-4.80,7.94,0.00,1.00,-4.80,-4.80,0 +-4.80,-4.80,7.98,0.00,1.00,-4.80,0.00,0 +0.00,0.00,8.02,0.00,1.00,0.00,4.80,0 +4.80,4.80,8.06,0.00,1.00,4.80,4.80,0 +9.60,4.80,8.10,0.00,1.00,4.80,9.60,0 +14.40,9.60,8.14,0.00,1.00,9.60,9.60,0 +14.40,9.60,8.18,0.00,1.00,9.60,14.40,0 +19.20,14.40,8.22,0.00,1.00,14.40,14.40,0 +24.00,14.40,8.26,0.00,1.00,14.40,19.20,0 +28.80,19.20,8.30,0.00,1.00,19.20,19.20,0 +33.60,19.20,8.34,0.00,1.00,24.00,24.00,0 +38.40,19.20,8.38,0.00,1.00,28.80,24.00,0 +43.20,24.00,8.42,0.00,1.00,28.80,24.00,0 +48.00,24.00,8.46,0.00,1.00,33.60,28.80,0 +52.80,28.80,8.50,0.00,1.00,38.40,28.80,0 +57.60,28.80,8.54,0.00,1.00,48.00,28.80,0 +62.40,28.80,8.58,0.00,1.00,52.80,33.60,0 +67.20,28.80,8.62,0.00,1.00,57.60,33.60,0 +76.80,33.60,8.66,0.00,1.00,67.20,33.60,0 +81.60,33.60,8.70,0.00,1.00,76.80,33.60,0 +86.40,33.60,8.74,0.00,1.00,81.60,33.60,0 +91.20,33.60,8.78,0.00,1.00,91.20,33.60,0 +96.00,33.60,8.82,0.00,1.00,100.80,33.60,0 +100.80,33.60,8.86,0.00,1.00,110.40,33.60,0 +110.40,28.80,8.90,0.00,1.00,115.20,33.60,0 +115.20,28.80,8.94,0.00,1.00,124.80,28.80,0 +120.00,28.80,8.98,0.00,1.00,129.60,28.80,0 +124.80,28.80,9.02,0.00,1.00,139.20,28.80,0 +129.60,24.00,9.06,0.00,1.00,144.00,24.00,0 +134.40,24.00,9.10,0.00,1.00,148.80,24.00,0 +139.20,24.00,9.14,0.00,1.00,153.60,19.20,0 +144.00,19.20,9.18,0.00,1.00,153.60,19.20,0 +148.80,19.20,9.22,0.00,1.00,158.40,14.40,0 +153.60,14.40,9.26,0.00,1.00,163.20,14.40,0 +158.40,14.40,9.30,0.00,1.00,163.20,9.60,0 +163.20,9.60,9.34,0.00,1.00,168.00,9.60,0 +168.00,9.60,9.38,0.00,1.00,172.80,4.80,0 +168.00,4.80,9.42,0.00,1.00,172.80,4.80,0 +172.80,4.80,9.46,0.00,1.00,177.60,0.00,0 +177.60,0.00,9.50,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,9.54,0.00,1.00,-177.60,-4.80,0 +-172.80,-4.80,9.58,0.00,1.00,-177.60,-4.80,0 +-168.00,-4.80,9.62,0.00,1.00,-172.80,-9.60,0 +-168.00,-9.60,9.66,0.00,1.00,-172.80,-9.60,0 +-163.20,-9.60,9.70,0.00,1.00,-168.00,-14.40,0 +-158.40,-14.40,9.74,0.00,1.00,-163.20,-14.40,0 +-153.60,-14.40,9.78,0.00,1.00,-163.20,-19.20,0 +-148.80,-19.20,9.82,0.00,1.00,-158.40,-19.20,0 +-144.00,-19.20,9.86,0.00,1.00,-153.60,-24.00,0 +-139.20,-24.00,9.90,0.00,1.00,-153.60,-24.00,0 +-134.40,-24.00,9.94,0.00,1.00,-148.80,-28.80,0 +-129.60,-24.00,9.98,0.00,1.00,-144.00,-28.80,0 +-124.80,-28.80,10.03,0.00,1.00,-139.20,-28.80,0 +-120.00,-28.80,10.07,0.00,1.00,-129.60,-33.60,0 +-115.20,-28.80,10.11,0.00,1.00,-124.80,-33.60,0 +-110.40,-28.80,10.15,0.00,1.00,-115.20,-33.60,0 +-100.80,-33.60,10.19,0.00,1.00,-110.40,-33.60,0 +-96.00,-33.60,10.23,0.00,1.00,-100.80,-33.60,0 +-91.20,-33.60,10.27,0.00,1.00,-91.20,-33.60,0 +-86.40,-33.60,10.31,0.00,1.00,-81.60,-33.60,0 +-81.60,-33.60,10.35,0.00,1.00,-76.80,-33.60,0 +-76.80,-33.60,10.39,0.00,1.00,-67.20,-33.60,0 +-67.20,-28.80,10.43,0.00,1.00,-57.60,-28.80,0 +-62.40,-28.80,10.47,0.00,1.00,-52.80,-28.80,0 +-57.60,-28.80,10.51,0.00,1.00,-48.00,-28.80,0 +-52.80,-28.80,10.55,0.00,1.00,-38.40,-24.00,0 +-48.00,-24.00,10.59,0.00,1.00,-33.60,-24.00,0 +-43.20,-24.00,10.63,0.00,1.00,-28.80,-24.00,0 +-38.40,-19.20,10.67,0.00,1.00,-28.80,-19.20,0 +-33.60,-19.20,10.71,0.00,1.00,-24.00,-19.20,0 +-28.80,-19.20,10.75,0.00,1.00,-19.20,-14.40,0 +-24.00,-14.40,10.79,0.00,1.00,-14.40,-14.40,0 +-19.20,-14.40,10.83,0.00,1.00,-14.40,-9.60,0 +-14.40,-9.60,10.87,0.00,1.00,-9.60,-9.60,0 +-14.40,-9.60,10.91,0.00,1.00,-9.60,-4.80,0 +-9.60,-4.80,10.95,0.00,1.00,-4.80,-4.80,0 +-4.80,-4.80,10.99,0.00,1.00,-4.80,0.00,0 +0.00,0.00,11.03,0.00,1.00,0.00,0.00,0 +4.80,0.00,11.07,0.00,1.00,0.00,4.80,0 +9.60,4.80,11.11,0.00,1.00,4.80,4.80,0 +14.40,4.80,11.15,0.00,1.00,4.80,9.60,0 +19.20,9.60,11.19,0.00,1.00,9.60,9.60,0 +19.20,9.60,11.23,0.00,1.00,9.60,14.40,0 +24.00,14.40,11.27,0.00,1.00,14.40,14.40,0 +28.80,14.40,11.31,0.00,1.00,19.20,19.20,0 +33.60,14.40,11.35,0.00,1.00,19.20,19.20,0 +38.40,19.20,11.39,0.00,1.00,24.00,19.20,0 +43.20,19.20,11.43,0.00,1.00,28.80,24.00,0 +48.00,24.00,11.47,0.00,1.00,33.60,24.00,0 +52.80,24.00,11.51,0.00,1.00,38.40,24.00,0 +57.60,24.00,11.55,0.00,1.00,43.20,24.00,0 +62.40,24.00,11.59,0.00,1.00,48.00,28.80,0 +72.00,24.00,11.63,0.00,1.00,52.80,28.80,0 +76.80,28.80,11.67,0.00,1.00,62.40,28.80,0 +81.60,28.80,11.71,0.00,1.00,72.00,28.80,0 +86.40,28.80,11.75,0.00,1.00,81.60,28.80,0 +91.20,28.80,11.79,0.00,1.00,91.20,28.80,0 +96.00,28.80,11.83,0.00,1.00,100.80,28.80,0 +100.80,28.80,11.87,0.00,1.00,110.40,28.80,0 +105.60,28.80,11.91,0.00,1.00,120.00,28.80,0 +110.40,24.00,11.95,0.00,1.00,129.60,24.00,0 +120.00,24.00,11.99,0.00,1.00,134.40,24.00,0 +124.80,24.00,12.03,0.00,1.00,139.20,24.00,0 +129.60,24.00,12.07,0.00,1.00,144.00,24.00,0 +134.40,19.20,12.11,0.00,1.00,148.80,19.20,0 +139.20,19.20,12.15,0.00,1.00,153.60,19.20,0 +144.00,19.20,12.19,0.00,1.00,158.40,14.40,0 +148.80,14.40,12.23,0.00,1.00,163.20,14.40,0 +153.60,14.40,12.27,0.00,1.00,163.20,14.40,0 +158.40,9.60,12.31,0.00,1.00,168.00,9.60,0 +158.40,9.60,12.35,0.00,1.00,168.00,9.60,0 +163.20,9.60,12.39,0.00,1.00,172.80,4.80,0 +168.00,4.80,12.43,0.00,1.00,172.80,4.80,0 +172.80,4.80,12.47,0.00,1.00,177.60,0.00,0 +177.60,0.00,12.51,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,12.55,0.00,1.00,-177.60,-4.80,0 +-172.80,-4.80,12.59,0.00,1.00,-177.60,-4.80,0 +-168.00,-4.80,12.63,0.00,1.00,-172.80,-9.60,0 +-163.20,-9.60,12.67,0.00,1.00,-172.80,-9.60,0 +-158.40,-9.60,12.71,0.00,1.00,-168.00,-14.40,0 +-158.40,-9.60,12.75,0.00,1.00,-168.00,-14.40,0 +-153.60,-14.40,12.79,0.00,1.00,-163.20,-14.40,0 +-148.80,-14.40,12.83,0.00,1.00,-163.20,-19.20,0 +-144.00,-19.20,12.87,0.00,1.00,-158.40,-19.20,0 +-139.20,-19.20,12.91,0.00,1.00,-153.60,-24.00,0 +-134.40,-19.20,12.95,0.00,1.00,-148.80,-24.00,0 +-129.60,-24.00,12.99,0.00,1.00,-144.00,-24.00,0 +-124.80,-24.00,13.03,0.00,1.00,-139.20,-24.00,0 +-120.00,-24.00,13.07,0.00,1.00,-134.40,-28.80,0 +-110.40,-24.00,13.11,0.00,1.00,-129.60,-28.80,0 +-105.60,-28.80,13.15,0.00,1.00,-120.00,-28.80,0 +-100.80,-28.80,13.19,0.00,1.00,-110.40,-28.80,0 +-96.00,-28.80,13.23,0.00,1.00,-100.80,-28.80,0 +-91.20,-28.80,13.27,0.00,1.00,-91.20,-28.80,0 +-86.40,-28.80,13.31,0.00,1.00,-81.60,-28.80,0 +-81.60,-28.80,13.35,0.00,1.00,-72.00,-28.80,0 +-76.80,-28.80,13.39,0.00,1.00,-62.40,-28.80,0 +-72.00,-24.00,13.43,0.00,1.00,-52.80,-24.00,0 +-62.40,-24.00,13.47,0.00,1.00,-48.00,-24.00,0 +-57.60,-24.00,13.51,0.00,1.00,-43.20,-24.00,0 +-52.80,-24.00,13.55,0.00,1.00,-38.40,-24.00,0 +-48.00,-24.00,13.59,0.00,1.00,-33.60,-19.20,0 +-43.20,-19.20,13.63,0.00,1.00,-28.80,-19.20,0 +-38.40,-19.20,13.67,0.00,1.00,-24.00,-19.20,0 +-33.60,-14.40,13.71,0.00,1.00,-19.20,-14.40,0 +-28.80,-14.40,13.75,0.00,1.00,-19.20,-14.40,0 +-24.00,-14.40,13.79,0.00,1.00,-14.40,-9.60,0 +-19.20,-9.60,13.83,0.00,1.00,-9.60,-9.60,0 +-19.20,-9.60,13.87,0.00,1.00,-9.60,-4.80,0 +-14.40,-4.80,13.91,0.00,1.00,-4.80,-4.80,0 +-9.60,-4.80,13.95,0.00,1.00,-4.80,-0.00,0 +-4.80,-0.00,13.99,0.00,1.00,-0.00,0.00,0 +0.00,0.00,14.04,0.00,1.00,0.00,0.00,0 +4.80,0.00,14.08,0.00,1.00,0.00,4.80,0 +9.60,4.80,14.12,0.00,1.00,4.80,4.80,0 +14.40,4.80,14.16,0.00,1.00,4.80,9.60,0 +19.20,9.60,14.20,0.00,1.00,9.60,9.60,0 +24.00,9.60,14.24,0.00,1.00,9.60,9.60,0 +28.80,9.60,14.28,0.00,1.00,14.40,14.40,0 +33.60,14.40,14.32,0.00,1.00,14.40,14.40,0 +38.40,14.40,14.36,0.00,1.00,19.20,14.40,0 +43.20,14.40,14.40,0.00,1.00,19.20,19.20,0 +48.00,14.40,14.44,0.00,1.00,24.00,19.20,0 +52.80,19.20,14.48,0.00,1.00,28.80,19.20,0 +57.60,19.20,14.52,0.00,1.00,33.60,19.20,0 +62.40,19.20,14.56,0.00,1.00,38.40,24.00,0 +67.20,19.20,14.60,0.00,1.00,43.20,24.00,0 +72.00,24.00,14.64,0.00,1.00,48.00,24.00,0 +76.80,24.00,14.68,0.00,1.00,57.60,24.00,0 +81.60,24.00,14.72,0.00,1.00,67.20,24.00,0 +86.40,24.00,14.76,0.00,1.00,81.60,24.00,0 +91.20,24.00,14.80,0.00,1.00,91.20,24.00,0 +96.00,24.00,14.84,0.00,1.00,105.60,24.00,0 +100.80,24.00,14.88,0.00,1.00,115.20,24.00,0 +105.60,24.00,14.92,0.00,1.00,124.80,24.00,0 +110.40,19.20,14.96,0.00,1.00,134.40,19.20,0 +115.20,19.20,15.00,0.00,1.00,139.20,19.20,0 +120.00,19.20,15.04,0.00,1.00,144.00,19.20,0 +124.80,19.20,15.08,0.00,1.00,148.80,19.20,0 +129.60,19.20,15.12,0.00,1.00,153.60,19.20,0 +134.40,14.40,15.16,0.00,1.00,158.40,14.40,0 +139.20,14.40,15.20,0.00,1.00,163.20,14.40,0 +144.00,14.40,15.24,0.00,1.00,163.20,14.40,0 +148.80,9.60,15.28,0.00,1.00,168.00,9.60,0 +153.60,9.60,15.32,0.00,1.00,168.00,9.60,0 +158.40,9.60,15.36,0.00,1.00,172.80,4.80,0 +163.20,4.80,15.40,0.00,1.00,172.80,4.80,0 +168.00,4.80,15.44,0.00,1.00,177.60,4.80,0 +172.80,4.80,15.48,0.00,1.00,177.60,0.00,0 +177.60,0.00,15.52,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,15.56,0.00,1.00,-177.60,-4.80,0 +-172.80,-4.80,15.60,0.00,1.00,-177.60,-4.80,0 +-168.00,-4.80,15.64,0.00,1.00,-177.60,-4.80,0 +-163.20,-4.80,15.68,0.00,1.00,-172.80,-9.60,0 +-158.40,-9.60,15.72,0.00,1.00,-172.80,-9.60,0 +-153.60,-9.60,15.76,0.00,1.00,-168.00,-14.40,0 +-148.80,-9.60,15.80,0.00,1.00,-168.00,-14.40,0 +-144.00,-14.40,15.84,0.00,1.00,-163.20,-14.40,0 +-139.20,-14.40,15.88,0.00,1.00,-163.20,-19.20,0 +-134.40,-14.40,15.92,0.00,1.00,-158.40,-19.20,0 +-129.60,-19.20,15.96,0.00,1.00,-153.60,-19.20,0 +-124.80,-19.20,16.00,0.00,1.00,-148.80,-19.20,0 +-120.00,-19.20,16.00,0.00,1.00,-144.00,-19.20,0 +-115.20,-19.20,15.96,0.00,1.00,-139.20,-24.00,0 +-110.40,-19.20,15.92,0.00,1.00,-134.40,-24.00,0 +-105.60,-24.00,15.88,0.00,1.00,-124.80,-24.00,0 +-100.80,-24.00,15.84,0.00,1.00,-115.20,-24.00,0 +-96.00,-24.00,15.80,0.00,1.00,-105.60,-24.00,0 +-91.20,-24.00,15.76,0.00,1.00,-91.20,-24.00,0 +-86.40,-24.00,15.72,0.00,1.00,-81.60,-24.00,0 +-81.60,-24.00,15.68,0.00,1.00,-67.20,-24.00,0 +-76.80,-24.00,15.64,0.00,1.00,-57.60,-24.00,0 +-72.00,-24.00,15.60,0.00,1.00,-48.00,-24.00,0 +-67.20,-19.20,15.56,0.00,1.00,-43.20,-19.20,0 +-62.40,-19.20,15.52,0.00,1.00,-38.40,-19.20,0 +-57.60,-19.20,15.48,0.00,1.00,-33.60,-19.20,0 +-52.80,-19.20,15.44,0.00,1.00,-28.80,-19.20,0 +-48.00,-14.40,15.40,0.00,1.00,-24.00,-14.40,0 +-43.20,-14.40,15.36,0.00,1.00,-19.20,-14.40,0 +-38.40,-14.40,15.32,0.00,1.00,-19.20,-14.40,0 +-33.60,-14.40,15.28,0.00,1.00,-14.40,-9.60,0 +-28.80,-9.60,15.24,0.00,1.00,-14.40,-9.60,0 +-24.00,-9.60,15.20,0.00,1.00,-9.60,-9.60,0 +-19.20,-9.60,15.16,0.00,1.00,-9.60,-4.80,0 +-14.40,-4.80,15.12,0.00,1.00,-4.80,-4.80,0 +-9.60,-4.80,15.08,0.00,1.00,-4.80,-0.00,0 +-4.80,-0.00,15.04,0.00,1.00,-0.00,0.00,0 +0.00,0.00,15.00,0.00,1.00,0.00,0.00,0 +4.80,0.00,14.96,0.00,1.00,0.00,4.80,0 +9.60,4.80,14.92,0.00,1.00,4.80,4.80,0 +14.40,4.80,14.88,0.00,1.00,4.80,4.80,0 +19.20,4.80,14.84,0.00,1.00,4.80,9.60,0 +24.00,9.60,14.80,0.00,1.00,9.60,9.60,0 +28.80,9.60,14.76,0.00,1.00,9.60,9.60,0 +33.60,9.60,14.72,0.00,1.00,9.60,9.60,0 +38.40,9.60,14.68,0.00,1.00,14.40,14.40,0 +43.20,14.40,14.64,0.00,1.00,14.40,14.40,0 +48.00,14.40,14.60,0.00,1.00,19.20,14.40,0 +52.80,14.40,14.56,0.00,1.00,24.00,14.40,0 +57.60,14.40,14.52,0.00,1.00,24.00,19.20,0 +62.40,14.40,14.48,0.00,1.00,28.80,19.20,0 +67.20,14.40,14.44,0.00,1.00,38.40,19.20,0 +72.00,19.20,14.40,0.00,1.00,43.20,19.20,0 +76.80,19.20,14.36,0.00,1.00,52.80,19.20,0 +81.60,19.20,14.32,0.00,1.00,62.40,19.20,0 +86.40,19.20,14.28,0.00,1.00,76.80,19.20,0 +91.20,19.20,14.24,0.00,1.00,96.00,19.20,0 +96.00,19.20,14.20,0.00,1.00,110.40,19.20,0 +100.80,19.20,14.16,0.00,1.00,120.00,19.20,0 +105.60,19.20,14.12,0.00,1.00,134.40,19.20,0 +110.40,19.20,14.08,0.00,1.00,139.20,19.20,0 +115.20,14.40,14.04,0.00,1.00,148.80,14.40,0 +120.00,14.40,13.99,0.00,1.00,153.60,14.40,0 +124.80,14.40,13.95,0.00,1.00,158.40,14.40,0 +129.60,14.40,13.91,0.00,1.00,158.40,14.40,0 +134.40,14.40,13.87,0.00,1.00,163.20,14.40,0 +139.20,9.60,13.83,0.00,1.00,163.20,9.60,0 +144.00,9.60,13.79,0.00,1.00,168.00,9.60,0 +148.80,9.60,13.75,0.00,1.00,168.00,9.60,0 +153.60,9.60,13.71,0.00,1.00,172.80,4.80,0 +158.40,4.80,13.67,0.00,1.00,172.80,4.80,0 +163.20,4.80,13.63,0.00,1.00,172.80,4.80,0 +168.00,4.80,13.59,0.00,1.00,177.60,0.00,0 +172.80,0.00,13.55,0.00,1.00,177.60,0.00,0 +177.60,0.00,13.51,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,13.47,0.00,1.00,-177.60,-0.00,0 +-172.80,-0.00,13.43,0.00,1.00,-177.60,-4.80,0 +-168.00,-4.80,13.39,0.00,1.00,-177.60,-4.80,0 +-163.20,-4.80,13.35,0.00,1.00,-172.80,-4.80,0 +-158.40,-4.80,13.31,0.00,1.00,-172.80,-9.60,0 +-153.60,-9.60,13.27,0.00,1.00,-172.80,-9.60,0 +-148.80,-9.60,13.23,0.00,1.00,-168.00,-9.60,0 +-144.00,-9.60,13.19,0.00,1.00,-168.00,-14.40,0 +-139.20,-9.60,13.15,0.00,1.00,-163.20,-14.40,0 +-134.40,-14.40,13.11,0.00,1.00,-163.20,-14.40,0 +-129.60,-14.40,13.07,0.00,1.00,-158.40,-14.40,0 +-124.80,-14.40,13.03,0.00,1.00,-158.40,-14.40,0 +-120.00,-14.40,12.99,0.00,1.00,-153.60,-19.20,0 +-115.20,-14.40,12.95,0.00,1.00,-148.80,-19.20,0 +-110.40,-19.20,12.91,0.00,1.00,-139.20,-19.20,0 +-105.60,-19.20,12.87,0.00,1.00,-134.40,-19.20,0 +-100.80,-19.20,12.83,0.00,1.00,-120.00,-19.20,0 +-96.00,-19.20,12.79,0.00,1.00,-110.40,-19.20,0 +-91.20,-19.20,12.75,0.00,1.00,-96.00,-19.20,0 +-86.40,-19.20,12.71,0.00,1.00,-76.80,-19.20,0 +-81.60,-19.20,12.67,0.00,1.00,-62.40,-19.20,0 +-76.80,-19.20,12.63,0.00,1.00,-52.80,-19.20,0 +-72.00,-19.20,12.59,0.00,1.00,-43.20,-19.20,0 +-67.20,-14.40,12.55,0.00,1.00,-38.40,-19.20,0 +-62.40,-14.40,12.51,0.00,1.00,-28.80,-14.40,0 +-57.60,-14.40,12.47,0.00,1.00,-24.00,-14.40,0 +-52.80,-14.40,12.43,0.00,1.00,-24.00,-14.40,0 +-48.00,-14.40,12.39,0.00,1.00,-19.20,-14.40,0 +-43.20,-14.40,12.35,0.00,1.00,-14.40,-9.60,0 +-38.40,-9.60,12.31,0.00,1.00,-14.40,-9.60,0 +-33.60,-9.60,12.27,0.00,1.00,-9.60,-9.60,0 +-28.80,-9.60,12.23,0.00,1.00,-9.60,-9.60,0 +-24.00,-9.60,12.19,0.00,1.00,-9.60,-4.80,0 +-19.20,-4.80,12.15,0.00,1.00,-4.80,-4.80,0 +-14.40,-4.80,12.11,0.00,1.00,-4.80,-4.80,0 +-9.60,-4.80,12.07,0.00,1.00,-4.80,-0.00,0 +-4.80,-0.00,12.03,0.00,1.00,-0.00,0.00,0 +0.00,0.00,11.99,0.00,1.00,0.00,0.00,0 +4.80,0.00,11.95,0.00,1.00,0.00,0.00,0 +9.60,0.00,11.91,0.00,1.00,0.00,4.80,0 +14.40,4.80,11.87,0.00,1.00,4.80,4.80,0 +19.20,4.80,11.83,0.00,1.00,4.80,4.80,0 +24.00,4.80,11.79,0.00,1.00,4.80,4.80,0 +28.80,4.80,11.75,0.00,1.00,4.80,9.60,0 +33.60,9.60,11.71,0.00,1.00,9.60,9.60,0 +38.40,9.60,11.67,0.00,1.00,9.60,9.60,0 +43.20,9.60,11.63,0.00,1.00,14.40,9.60,0 +48.00,9.60,11.59,0.00,1.00,14.40,9.60,0 +52.80,9.60,11.55,0.00,1.00,14.40,14.40,0 +57.60,9.60,11.51,0.00,1.00,19.20,14.40,0 +62.40,9.60,11.47,0.00,1.00,24.00,14.40,0 +67.20,14.40,11.43,0.00,1.00,28.80,14.40,0 +72.00,14.40,11.39,0.00,1.00,33.60,14.40,0 +76.80,14.40,11.35,0.00,1.00,43.20,14.40,0 +81.60,14.40,11.31,0.00,1.00,57.60,14.40,0 +86.40,14.40,11.27,0.00,1.00,76.80,14.40,0 +91.20,14.40,11.23,0.00,1.00,96.00,14.40,0 +96.00,14.40,11.19,0.00,1.00,115.20,14.40,0 +100.80,14.40,11.15,0.00,1.00,129.60,14.40,0 +105.60,14.40,11.11,0.00,1.00,139.20,14.40,0 +110.40,14.40,11.07,0.00,1.00,148.80,14.40,0 +115.20,9.60,11.03,0.00,1.00,153.60,14.40,0 +120.00,9.60,10.99,0.00,1.00,158.40,9.60,0 +124.80,9.60,10.95,0.00,1.00,163.20,9.60,0 +129.60,9.60,10.91,0.00,1.00,163.20,9.60,0 +134.40,9.60,10.87,0.00,1.00,168.00,9.60,0 +139.20,9.60,10.83,0.00,1.00,168.00,9.60,0 +144.00,9.60,10.79,0.00,1.00,172.80,9.60,0 +148.80,4.80,10.75,0.00,1.00,172.80,4.80,0 +153.60,4.80,10.71,0.00,1.00,172.80,4.80,0 +158.40,4.80,10.67,0.00,1.00,172.80,4.80,0 +163.20,4.80,10.63,0.00,1.00,177.60,4.80,0 +168.00,4.80,10.59,0.00,1.00,177.60,0.00,0 +172.80,0.00,10.55,0.00,1.00,177.60,0.00,0 +177.60,0.00,10.51,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,10.47,0.00,1.00,-177.60,-0.00,0 +-172.80,-0.00,10.43,0.00,1.00,-177.60,-4.80,0 +-168.00,-4.80,10.39,0.00,1.00,-177.60,-4.80,0 +-163.20,-4.80,10.35,0.00,1.00,-177.60,-4.80,0 +-158.40,-4.80,10.31,0.00,1.00,-172.80,-4.80,0 +-153.60,-4.80,10.27,0.00,1.00,-172.80,-9.60,0 +-148.80,-4.80,10.23,0.00,1.00,-172.80,-9.60,0 +-144.00,-9.60,10.19,0.00,1.00,-172.80,-9.60,0 +-139.20,-9.60,10.15,0.00,1.00,-168.00,-9.60,0 +-134.40,-9.60,10.11,0.00,1.00,-168.00,-9.60,0 +-129.60,-9.60,10.07,0.00,1.00,-163.20,-9.60,0 +-124.80,-9.60,10.03,0.00,1.00,-163.20,-14.40,0 +-120.00,-9.60,9.98,0.00,1.00,-158.40,-14.40,0 +-115.20,-9.60,9.94,0.00,1.00,-153.60,-14.40,0 +-110.40,-14.40,9.90,0.00,1.00,-148.80,-14.40,0 +-105.60,-14.40,9.86,0.00,1.00,-139.20,-14.40,0 +-100.80,-14.40,9.82,0.00,1.00,-129.60,-14.40,0 +-96.00,-14.40,9.78,0.00,1.00,-115.20,-14.40,0 +-91.20,-14.40,9.74,0.00,1.00,-96.00,-14.40,0 +-86.40,-14.40,9.70,0.00,1.00,-76.80,-14.40,0 +-81.60,-14.40,9.66,0.00,1.00,-57.60,-14.40,0 +-76.80,-14.40,9.62,0.00,1.00,-43.20,-14.40,0 +-72.00,-14.40,9.58,0.00,1.00,-33.60,-14.40,0 +-67.20,-14.40,9.54,0.00,1.00,-28.80,-14.40,0 +-62.40,-9.60,9.50,0.00,1.00,-24.00,-14.40,0 +-57.60,-9.60,9.46,0.00,1.00,-19.20,-9.60,0 +-52.80,-9.60,9.42,0.00,1.00,-14.40,-9.60,0 +-48.00,-9.60,9.38,0.00,1.00,-14.40,-9.60,0 +-43.20,-9.60,9.34,0.00,1.00,-14.40,-9.60,0 +-38.40,-9.60,9.30,0.00,1.00,-9.60,-9.60,0 +-33.60,-9.60,9.26,0.00,1.00,-9.60,-4.80,0 +-28.80,-4.80,9.22,0.00,1.00,-4.80,-4.80,0 +-24.00,-4.80,9.18,0.00,1.00,-4.80,-4.80,0 +-19.20,-4.80,9.14,0.00,1.00,-4.80,-4.80,0 +-14.40,-4.80,9.10,0.00,1.00,-4.80,-0.00,0 +-9.60,-0.00,9.06,0.00,1.00,-0.00,-0.00,0 +-4.80,-0.00,9.02,0.00,1.00,-0.00,0.00,0 +0.00,0.00,8.98,0.00,1.00,0.00,0.00,0 +4.80,0.00,8.94,0.00,1.00,0.00,0.00,0 +9.60,0.00,8.90,0.00,1.00,0.00,0.00,0 +14.40,0.00,8.86,0.00,1.00,0.00,4.80,0 +19.20,4.80,8.82,0.00,1.00,4.80,4.80,0 +24.00,4.80,8.78,0.00,1.00,4.80,4.80,0 +28.80,4.80,8.74,0.00,1.00,4.80,4.80,0 +33.60,4.80,8.70,0.00,1.00,4.80,4.80,0 +38.40,4.80,8.66,0.00,1.00,4.80,4.80,0 +43.20,4.80,8.62,0.00,1.00,9.60,4.80,0 +48.00,4.80,8.58,0.00,1.00,9.60,9.60,0 +52.80,4.80,8.54,0.00,1.00,9.60,9.60,0 +57.60,4.80,8.50,0.00,1.00,14.40,9.60,0 +62.40,9.60,8.46,0.00,1.00,14.40,9.60,0 +67.20,9.60,8.42,0.00,1.00,19.20,9.60,0 +72.00,9.60,8.38,0.00,1.00,24.00,9.60,0 +76.80,9.60,8.34,0.00,1.00,33.60,9.60,0 +81.60,9.60,8.30,0.00,1.00,43.20,9.60,0 +86.40,9.60,8.26,0.00,1.00,67.20,9.60,0 +91.20,9.60,8.22,0.00,1.00,96.00,9.60,0 +96.00,9.60,8.18,0.00,1.00,124.80,9.60,0 +100.80,9.60,8.14,0.00,1.00,144.00,9.60,0 +105.60,9.60,8.10,0.00,1.00,153.60,9.60,0 +110.40,9.60,8.06,0.00,1.00,158.40,9.60,0 +115.20,9.60,8.02,0.00,1.00,163.20,9.60,0 +120.00,9.60,7.98,0.00,1.00,168.00,9.60,0 +124.80,4.80,7.94,0.00,1.00,168.00,9.60,0 +129.60,4.80,7.90,0.00,1.00,168.00,4.80,0 +134.40,4.80,7.86,0.00,1.00,172.80,4.80,0 +139.20,4.80,7.82,0.00,1.00,172.80,4.80,0 +144.00,4.80,7.78,0.00,1.00,172.80,4.80,0 +148.80,4.80,7.74,0.00,1.00,172.80,4.80,0 +153.60,4.80,7.70,0.00,1.00,177.60,4.80,0 +158.40,4.80,7.66,0.00,1.00,177.60,4.80,0 +163.20,4.80,7.62,0.00,1.00,177.60,0.00,0 +168.00,0.00,7.58,0.00,1.00,177.60,0.00,0 +172.80,0.00,7.54,0.00,1.00,177.60,0.00,0 +177.60,0.00,7.50,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,7.46,0.00,1.00,-177.60,-0.00,0 +-172.80,-0.00,7.42,0.00,1.00,-177.60,-0.00,0 +-168.00,-0.00,7.38,0.00,1.00,-177.60,-4.80,0 +-163.20,-4.80,7.34,0.00,1.00,-177.60,-4.80,0 +-158.40,-4.80,7.30,0.00,1.00,-177.60,-4.80,0 +-153.60,-4.80,7.26,0.00,1.00,-177.60,-4.80,0 +-148.80,-4.80,7.22,0.00,1.00,-172.80,-4.80,0 +-144.00,-4.80,7.18,0.00,1.00,-172.80,-4.80,0 +-139.20,-4.80,7.14,0.00,1.00,-172.80,-4.80,0 +-134.40,-4.80,7.10,0.00,1.00,-172.80,-9.60,0 +-129.60,-4.80,7.06,0.00,1.00,-168.00,-9.60,0 +-124.80,-4.80,7.02,0.00,1.00,-168.00,-9.60,0 +-120.00,-9.60,6.98,0.00,1.00,-168.00,-9.60,0 +-115.20,-9.60,6.94,0.00,1.00,-163.20,-9.60,0 +-110.40,-9.60,6.90,0.00,1.00,-158.40,-9.60,0 +-105.60,-9.60,6.86,0.00,1.00,-153.60,-9.60,0 +-100.80,-9.60,6.82,0.00,1.00,-144.00,-9.60,0 +-96.00,-9.60,6.78,0.00,1.00,-124.80,-9.60,0 +-91.20,-9.60,6.74,0.00,1.00,-96.00,-9.60,0 +-86.40,-9.60,6.70,0.00,1.00,-67.20,-9.60,0 +-81.60,-9.60,6.66,0.00,1.00,-43.20,-9.60,0 +-76.80,-9.60,6.62,0.00,1.00,-33.60,-9.60,0 +-72.00,-9.60,6.58,0.00,1.00,-24.00,-9.60,0 +-67.20,-9.60,6.54,0.00,1.00,-19.20,-9.60,0 +-62.40,-9.60,6.50,0.00,1.00,-14.40,-9.60,0 +-57.60,-4.80,6.46,0.00,1.00,-14.40,-9.60,0 +-52.80,-4.80,6.42,0.00,1.00,-9.60,-4.80,0 +-48.00,-4.80,6.38,0.00,1.00,-9.60,-4.80,0 +-43.20,-4.80,6.34,0.00,1.00,-9.60,-4.80,0 +-38.40,-4.80,6.30,0.00,1.00,-4.80,-4.80,0 +-33.60,-4.80,6.26,0.00,1.00,-4.80,-4.80,0 +-28.80,-4.80,6.22,0.00,1.00,-4.80,-4.80,0 +-24.00,-4.80,6.18,0.00,1.00,-4.80,-4.80,0 +-19.20,-4.80,6.14,0.00,1.00,-4.80,-0.00,0 +-14.40,-0.00,6.10,0.00,1.00,-0.00,-0.00,0 +-9.60,-0.00,6.06,0.00,1.00,-0.00,-0.00,0 +-4.80,-0.00,6.02,0.00,1.00,-0.00,0.00,0 +0.00,0.00,5.97,0.00,1.00,0.00,0.00,0 +4.80,0.00,5.93,0.00,1.00,0.00,0.00,0 +9.60,0.00,5.89,0.00,1.00,0.00,0.00,0 +14.40,0.00,5.85,0.00,1.00,0.00,0.00,0 +19.20,0.00,5.81,0.00,1.00,0.00,0.00,0 +24.00,0.00,5.77,0.00,1.00,0.00,0.00,0 +28.80,0.00,5.73,0.00,1.00,0.00,4.80,0 +33.60,0.00,5.69,0.00,1.00,0.00,4.80,0 +38.40,0.00,5.65,0.00,1.00,4.80,4.80,0 +43.20,4.80,5.61,0.00,1.00,4.80,4.80,0 +48.00,4.80,5.57,0.00,1.00,4.80,4.80,0 +52.80,4.80,5.53,0.00,1.00,4.80,4.80,0 +57.60,4.80,5.49,0.00,1.00,4.80,4.80,0 +62.40,4.80,5.45,0.00,1.00,4.80,4.80,0 +67.20,4.80,5.41,0.00,1.00,9.60,4.80,0 +72.00,4.80,5.37,0.00,1.00,9.60,4.80,0 +76.80,4.80,5.33,0.00,1.00,14.40,4.80,0 +81.60,4.80,5.29,0.00,1.00,24.00,4.80,0 +86.40,4.80,5.25,0.00,1.00,43.20,4.80,0 +91.20,4.80,5.21,0.00,1.00,110.40,4.80,0 +96.00,4.80,5.17,0.00,1.00,148.80,4.80,0 +100.80,4.80,5.13,0.00,1.00,163.20,4.80,0 +105.60,4.80,5.09,0.00,1.00,168.00,4.80,0 +110.40,4.80,5.05,0.00,1.00,172.80,4.80,0 +115.20,4.80,5.01,0.00,1.00,172.80,4.80,0 +120.00,4.80,4.97,0.00,1.00,172.80,4.80,0 +124.80,4.80,4.93,0.00,1.00,172.80,4.80,0 +129.60,4.80,4.89,0.00,1.00,177.60,4.80,0 +134.40,4.80,4.85,0.00,1.00,177.60,4.80,0 +139.20,0.00,4.81,0.00,1.00,177.60,4.80,0 +144.00,0.00,4.77,0.00,1.00,177.60,4.80,0 +148.80,0.00,4.73,0.00,1.00,177.60,0.00,0 +153.60,0.00,4.69,0.00,1.00,177.60,0.00,0 +158.40,0.00,4.65,0.00,1.00,177.60,0.00,0 +163.20,0.00,4.61,0.00,1.00,177.60,0.00,0 +168.00,0.00,4.57,0.00,1.00,177.60,0.00,0 +172.80,0.00,4.53,0.00,1.00,177.60,0.00,0 +177.60,0.00,4.49,0.00,1.00,177.60,-0.00,0 +-177.60,-0.00,4.45,0.00,1.00,-177.60,-0.00,0 +-172.80,-0.00,4.41,0.00,1.00,-177.60,-0.00,0 +-168.00,-0.00,4.37,0.00,1.00,-177.60,-0.00,0 +-163.20,-0.00,4.33,0.00,1.00,-177.60,-0.00,0 +-158.40,-0.00,4.29,0.00,1.00,-177.60,-0.00,0 +-153.60,-0.00,4.25,0.00,1.00,-177.60,-4.80,0 +-148.80,-0.00,4.21,0.00,1.00,-177.60,-4.80,0 +-144.00,-0.00,4.17,0.00,1.00,-177.60,-4.80,0 +-139.20,-0.00,4.13,0.00,1.00,-177.60,-4.80,0 +-134.40,-4.80,4.09,0.00,1.00,-177.60,-4.80,0 +-129.60,-4.80,4.05,0.00,1.00,-177.60,-4.80,0 +-124.80,-4.80,4.01,0.00,1.00,-172.80,-4.80,0 +-120.00,-4.80,3.97,0.00,1.00,-172.80,-4.80,0 +-115.20,-4.80,3.93,0.00,1.00,-172.80,-4.80,0 +-110.40,-4.80,3.89,0.00,1.00,-172.80,-4.80,0 +-105.60,-4.80,3.85,0.00,1.00,-168.00,-4.80,0 +-100.80,-4.80,3.81,0.00,1.00,-163.20,-4.80,0 +-96.00,-4.80,3.77,0.00,1.00,-148.80,-4.80,0 +-91.20,-4.80,3.73,0.00,1.00,-110.40,-4.80,0 +-86.40,-4.80,3.69,0.00,1.00,-43.20,-4.80,0 +-81.60,-4.80,3.65,0.00,1.00,-24.00,-4.80,0 +-76.80,-4.80,3.61,0.00,1.00,-14.40,-4.80,0 +-72.00,-4.80,3.57,0.00,1.00,-9.60,-4.80,0 +-67.20,-4.80,3.53,0.00,1.00,-9.60,-4.80,0 +-62.40,-4.80,3.49,0.00,1.00,-4.80,-4.80,0 +-57.60,-4.80,3.45,0.00,1.00,-4.80,-4.80,0 +-52.80,-4.80,3.41,0.00,1.00,-4.80,-4.80,0 +-48.00,-4.80,3.37,0.00,1.00,-4.80,-4.80,0 +-43.20,-4.80,3.33,0.00,1.00,-4.80,-4.80,0 +-38.40,-0.00,3.29,0.00,1.00,-4.80,-4.80,0 +-33.60,-0.00,3.25,0.00,1.00,-0.00,-0.00,0 +-28.80,-0.00,3.21,0.00,1.00,-0.00,-0.00,0 +-24.00,-0.00,3.17,0.00,1.00,-0.00,-0.00,0 +-19.20,-0.00,3.13,0.00,1.00,-0.00,-0.00,0 +-14.40,-0.00,3.09,0.00,1.00,-0.00,-0.00,0 +-9.60,-0.00,3.05,0.00,1.00,-0.00,-0.00,0 +-4.80,-0.00,3.01,0.00,1.00,-0.00,0.00,0 +0.00,0.00,2.97,0.00,1.00,-0.00,0.00,0 +4.80,-0.00,2.93,0.00,1.00,-0.00,0.00,0 +9.60,-0.00,2.89,0.00,1.00,-0.00,0.00,0 +14.40,-0.00,2.85,0.00,1.00,-0.00,0.00,0 +19.20,-0.00,2.81,0.00,1.00,-0.00,0.00,0 +24.00,-0.00,2.77,0.00,1.00,-0.00,0.00,0 +28.80,-0.00,2.73,0.00,1.00,-0.00,0.00,0 +33.60,-0.00,2.69,0.00,1.00,-0.00,0.00,0 +38.40,-0.00,2.65,0.00,1.00,-0.00,0.00,0 +43.20,-0.00,2.61,0.00,1.00,-0.00,0.00,0 +48.00,-0.00,2.57,0.00,1.00,-0.00,0.00,0 +52.80,-0.00,2.53,0.00,1.00,-0.00,0.00,0 +57.60,-0.00,2.49,0.00,1.00,-0.00,0.00,0 +62.40,-0.00,2.45,0.00,1.00,-0.00,0.00,0 +67.20,-0.00,2.41,0.00,1.00,-4.80,0.00,0 +72.00,-0.00,2.37,0.00,1.00,-4.80,0.00,0 +76.80,-0.00,2.33,0.00,1.00,-4.80,0.00,0 +81.60,-0.00,2.29,0.00,1.00,-9.60,0.00,0 +86.40,-0.00,2.25,0.00,1.00,-19.20,0.00,0 +91.20,-0.00,2.21,0.00,1.00,-134.40,0.00,0 +96.00,-0.00,2.17,0.00,1.00,-168.00,0.00,0 +100.80,-0.00,2.13,0.00,1.00,-172.80,0.00,0 +105.60,-0.00,2.09,0.00,1.00,-177.60,0.00,0 +110.40,-0.00,2.05,0.00,1.00,-177.60,0.00,0 +115.20,-0.00,2.01,0.00,1.00,-177.60,0.00,0 +120.00,-0.00,1.96,0.00,1.00,-177.60,0.00,0 +124.80,-0.00,1.92,0.00,1.00,-177.60,0.00,0 +129.60,-0.00,1.88,0.00,1.00,-177.60,0.00,0 +134.40,-0.00,1.84,0.00,1.00,-177.60,0.00,0 +139.20,-0.00,1.80,0.00,1.00,-177.60,0.00,0 +144.00,-0.00,1.76,0.00,1.00,-177.60,0.00,0 +148.80,-0.00,1.72,0.00,1.00,-177.60,0.00,0 +153.60,-0.00,1.68,0.00,1.00,-177.60,0.00,0 +158.40,-0.00,1.64,0.00,1.00,-177.60,0.00,0 +163.20,-0.00,1.60,0.00,1.00,-177.60,0.00,0 +168.00,-0.00,1.56,0.00,1.00,-177.60,0.00,0 +172.80,-0.00,1.52,0.00,1.00,-177.60,0.00,0 +177.60,-0.00,1.48,0.00,1.00,-177.60,0.00,0 +-177.60,0.00,1.44,0.00,1.00,177.60,0.00,0 +-172.80,0.00,1.40,0.00,1.00,177.60,0.00,0 +-168.00,0.00,1.36,0.00,1.00,177.60,0.00,0 +-163.20,0.00,1.32,0.00,1.00,177.60,0.00,0 +-158.40,0.00,1.28,0.00,1.00,177.60,0.00,0 +-153.60,0.00,1.24,0.00,1.00,177.60,0.00,0 +-148.80,0.00,1.20,0.00,1.00,177.60,0.00,0 +-144.00,0.00,1.16,0.00,1.00,177.60,0.00,0 +-139.20,0.00,1.12,0.00,1.00,177.60,0.00,0 +-134.40,0.00,1.08,0.00,1.00,177.60,0.00,0 +-129.60,0.00,1.04,0.00,1.00,177.60,0.00,0 +-124.80,0.00,1.00,0.00,1.00,177.60,0.00,0 +-120.00,0.00,0.96,0.00,1.00,177.60,0.00,0 +-115.20,0.00,0.92,0.00,1.00,177.60,0.00,0 +-110.40,0.00,0.88,0.00,1.00,177.60,0.00,0 +-105.60,0.00,0.84,0.00,1.00,177.60,0.00,0 +-100.80,0.00,0.80,0.00,1.00,172.80,0.00,0 +-96.00,0.00,0.76,0.00,1.00,168.00,0.00,0 +-91.20,0.00,0.72,0.00,1.00,134.40,0.00,0 +-86.40,0.00,0.68,0.00,1.00,19.20,0.00,0 +-81.60,0.00,0.64,0.00,1.00,9.60,0.00,0 +-76.80,0.00,0.60,0.00,1.00,4.80,0.00,0 +-72.00,0.00,0.56,0.00,1.00,4.80,0.00,0 +-67.20,0.00,0.52,0.00,1.00,4.80,0.00,0 +-62.40,0.00,0.48,0.00,1.00,0.00,0.00,0 +-57.60,0.00,0.44,0.00,1.00,0.00,0.00,0 +-52.80,0.00,0.40,0.00,1.00,0.00,0.00,0 +-48.00,0.00,0.36,0.00,1.00,0.00,0.00,0 +-43.20,0.00,0.32,0.00,1.00,0.00,0.00,0 +-38.40,0.00,0.28,0.00,1.00,0.00,0.00,0 +-33.60,0.00,0.24,0.00,1.00,0.00,0.00,0 +-28.80,0.00,0.20,0.00,1.00,0.00,0.00,0 +-24.00,0.00,0.16,0.00,1.00,0.00,0.00,0 +-19.20,0.00,0.12,0.00,1.00,0.00,0.00,0 +-14.40,0.00,0.08,0.00,1.00,0.00,0.00,0 +-9.60,0.00,0.04,0.00,1.00,0.00,0.00,0 +-4.80,0.00,0.00,0.00,1.00,0.00,0.00,0 diff --git a/scripts/testv/stvISM_with_no_diegetic_switch.csv b/scripts/testv/stvISM_with_no_diegetic_switch.csv new file mode 100644 index 0000000000000000000000000000000000000000..ee0e7976379f1c1bc49ccfbef78a88e5b179820c --- /dev/null +++ b/scripts/testv/stvISM_with_no_diegetic_switch.csv @@ -0,0 +1,1500 @@ +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,0 +-4.42,0.00,1.00,0.00,1.00,0.00,0.00,0 +-8.83,0.00,1.00,0.00,1.00,0.00,0.00,0 +-13.24,0.00,1.00,0.00,1.00,0.00,0.00,0 +-17.64,0.00,1.00,0.00,1.00,0.00,0.00,0 +-22.03,0.00,1.00,0.00,1.00,0.00,0.00,0 +-26.41,0.00,1.00,0.00,1.00,0.00,0.00,0 +-30.77,0.00,1.00,0.00,1.00,0.00,0.00,0 +-35.12,0.00,1.00,0.00,1.00,0.00,0.00,0 +-39.44,0.00,1.00,0.00,1.00,0.00,0.00,0 +-43.74,0.00,1.00,0.00,1.00,0.00,0.00,0 +-48.01,0.00,1.00,0.00,1.00,0.00,0.00,0 +-52.25,0.00,1.00,0.00,1.00,0.00,0.00,0 +-56.46,0.00,1.00,0.00,1.00,0.00,0.00,0 +-60.64,0.00,1.00,0.00,1.00,0.00,0.00,0 +-64.78,0.00,1.00,0.00,1.00,0.00,0.00,0 +-68.88,0.00,1.00,0.00,1.00,0.00,0.00,0 +-72.94,0.00,1.00,0.00,1.00,0.00,0.00,0 +-76.96,0.00,1.00,0.00,1.00,0.00,0.00,0 +-80.93,0.00,1.00,0.00,1.00,0.00,0.00,0 +-84.85,0.00,1.00,0.00,1.00,0.00,0.00,0 +-88.72,0.00,1.00,0.00,1.00,0.00,0.00,0 +-92.54,0.00,1.00,0.00,1.00,0.00,0.00,0 +-96.30,0.00,1.00,0.00,1.00,0.00,0.00,0 +-100.00,0.00,1.00,0.00,1.00,0.00,0.00,0 +-103.65,0.00,1.00,0.00,1.00,0.00,0.00,0 +-107.23,0.00,1.00,0.00,1.00,0.00,0.00,0 +-110.74,0.00,1.00,0.00,1.00,0.00,0.00,0 +-114.19,0.00,1.00,0.00,1.00,0.00,0.00,0 +-117.57,0.00,1.00,0.00,1.00,0.00,0.00,0 +-120.88,0.00,1.00,0.00,1.00,0.00,0.00,0 +-124.12,0.00,1.00,0.00,1.00,0.00,0.00,0 +-127.28,0.00,1.00,0.00,1.00,0.00,0.00,0 +-130.36,0.00,1.00,0.00,1.00,0.00,0.00,0 +-133.37,0.00,1.00,0.00,1.00,0.00,0.00,0 +-136.30,0.00,1.00,0.00,1.00,0.00,0.00,0 +-139.14,0.00,1.00,0.00,1.00,0.00,0.00,0 +-141.90,0.00,1.00,0.00,1.00,0.00,0.00,0 +-144.58,0.00,1.00,0.00,1.00,0.00,0.00,0 +-147.17,0.00,1.00,0.00,1.00,0.00,0.00,0 +-149.66,0.00,1.00,0.00,1.00,0.00,0.00,0 +-152.07,0.00,1.00,0.00,1.00,0.00,0.00,0 +-154.39,0.00,1.00,0.00,1.00,0.00,0.00,0 +-156.62,0.00,1.00,0.00,1.00,0.00,0.00,0 +-158.75,0.00,1.00,0.00,1.00,0.00,0.00,0 +-160.78,0.00,1.00,0.00,1.00,0.00,0.00,0 +-162.72,0.00,1.00,0.00,1.00,0.00,0.00,0 +-164.56,0.00,1.00,0.00,1.00,0.00,0.00,0 +-166.30,0.00,1.00,0.00,1.00,0.00,0.00,0 +-167.94,0.00,1.00,0.00,1.00,0.00,0.00,0 +-169.48,0.00,1.00,0.00,1.00,0.00,0.00,0 +-170.92,0.00,1.00,0.00,1.00,0.00,0.00,0 +-172.25,0.00,1.00,0.00,1.00,0.00,0.00,0 +-173.48,0.00,1.00,0.00,1.00,0.00,0.00,0 +-174.61,0.00,1.00,0.00,1.00,0.00,0.00,0 +-175.63,0.00,1.00,0.00,1.00,0.00,0.00,0 +-176.54,0.00,1.00,0.00,1.00,0.00,0.00,0 +-177.35,0.00,1.00,0.00,1.00,0.00,0.00,0 +-178.05,0.00,1.00,0.00,1.00,0.00,0.00,0 +-178.65,0.00,1.00,0.00,1.00,0.00,0.00,0 +-179.13,0.00,1.00,0.00,1.00,0.00,0.00,0 +-179.51,0.00,1.00,0.00,1.00,0.00,0.00,0 +-179.78,0.00,1.00,0.00,1.00,0.00,0.00,0 +-179.95,0.00,1.00,0.00,1.00,0.00,0.00,0 +-180.00,0.00,1.00,0.00,1.00,0.00,0.00,0 +-179.95,0.00,1.00,0.00,1.00,0.00,0.00,0 +-179.78,0.00,1.00,0.00,1.00,0.00,0.00,0 +-179.51,0.00,1.00,0.00,1.00,0.00,0.00,0 +-179.13,0.00,1.00,0.00,1.00,0.00,0.00,0 +-178.65,0.00,1.00,0.00,1.00,0.00,0.00,0 +-178.05,0.00,1.00,0.00,1.00,0.00,0.00,0 +-177.35,0.00,1.00,0.00,1.00,0.00,0.00,0 +-88.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +-87.81,0.00,1.00,0.00,1.00,0.00,0.00,1 +-87.30,0.00,1.00,0.00,1.00,0.00,0.00,1 +-86.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +-86.12,0.00,1.00,0.00,1.00,0.00,0.00,1 +-85.46,0.00,1.00,0.00,1.00,0.00,0.00,1 +-84.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +-83.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +-83.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-82.28,0.00,1.00,0.00,1.00,0.00,0.00,1 +-81.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +-80.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-79.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +-78.31,0.00,1.00,0.00,1.00,0.00,0.00,1 +-77.20,0.00,1.00,0.00,1.00,0.00,0.00,1 +-76.04,0.00,1.00,0.00,1.00,0.00,0.00,1 +-74.83,0.00,1.00,0.00,1.00,0.00,0.00,1 +-73.58,0.00,1.00,0.00,1.00,0.00,0.00,1 +-72.29,0.00,1.00,0.00,1.00,0.00,0.00,1 +-70.95,0.00,1.00,0.00,1.00,0.00,0.00,1 +-69.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +-68.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-66.69,0.00,1.00,0.00,1.00,0.00,0.00,1 +-65.18,0.00,1.00,0.00,1.00,0.00,0.00,1 +-63.64,0.00,1.00,0.00,1.00,0.00,0.00,1 +-62.06,0.00,1.00,0.00,1.00,0.00,0.00,1 +-60.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +-58.79,0.00,1.00,0.00,1.00,0.00,0.00,1 +-57.10,0.00,1.00,0.00,1.00,0.00,0.00,1 +-55.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +-53.61,0.00,1.00,0.00,1.00,0.00,0.00,1 +-51.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +-50.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-48.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-46.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +-44.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +-42.43,0.00,1.00,0.00,1.00,0.00,0.00,1 +-40.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +-38.48,0.00,1.00,0.00,1.00,0.00,0.00,1 +-36.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +-34.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +-32.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-30.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +-28.23,0.00,1.00,0.00,1.00,0.00,0.00,1 +-26.13,0.00,1.00,0.00,1.00,0.00,0.00,1 +-24.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-21.87,0.00,1.00,0.00,1.00,0.00,0.00,1 +-19.72,0.00,1.00,0.00,1.00,0.00,0.00,1 +-17.56,0.00,1.00,0.00,1.00,0.00,0.00,1 +-15.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-13.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +-11.02,0.00,1.00,0.00,1.00,0.00,0.00,1 +-8.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +-6.62,0.00,1.00,0.00,1.00,0.00,0.00,1 +-4.42,0.00,1.00,0.00,1.00,0.00,0.00,1 +-2.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +2.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +4.42,0.00,1.00,0.00,1.00,0.00,0.00,1 +6.62,0.00,1.00,0.00,1.00,0.00,0.00,1 +8.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +11.02,0.00,1.00,0.00,1.00,0.00,0.00,1 +13.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +15.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +17.56,0.00,1.00,0.00,1.00,0.00,0.00,1 +19.72,0.00,1.00,0.00,1.00,0.00,0.00,1 +21.87,0.00,1.00,0.00,1.00,0.00,0.00,1 +24.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +26.13,0.00,1.00,0.00,1.00,0.00,0.00,1 +28.23,0.00,1.00,0.00,1.00,0.00,0.00,1 +30.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +32.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +34.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +36.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +38.48,0.00,1.00,0.00,1.00,0.00,0.00,1 +40.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +42.43,0.00,1.00,0.00,1.00,0.00,0.00,1 +44.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +46.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +48.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +50.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +51.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +53.61,0.00,1.00,0.00,1.00,0.00,0.00,1 +55.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +57.10,0.00,1.00,0.00,1.00,0.00,0.00,1 +58.79,0.00,1.00,0.00,1.00,0.00,0.00,1 +60.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +62.06,0.00,1.00,0.00,1.00,0.00,0.00,1 +63.64,0.00,1.00,0.00,1.00,0.00,0.00,1 +65.18,0.00,1.00,0.00,1.00,0.00,0.00,1 +66.69,0.00,1.00,0.00,1.00,0.00,0.00,1 +68.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +69.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +70.95,0.00,1.00,0.00,1.00,0.00,0.00,1 +72.29,0.00,1.00,0.00,1.00,0.00,0.00,1 +73.58,0.00,1.00,0.00,1.00,0.00,0.00,1 +74.83,0.00,1.00,0.00,1.00,0.00,0.00,1 +76.04,0.00,1.00,0.00,1.00,0.00,0.00,1 +77.20,0.00,1.00,0.00,1.00,0.00,0.00,1 +78.31,0.00,1.00,0.00,1.00,0.00,0.00,1 +79.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +80.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +81.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +82.28,0.00,1.00,0.00,1.00,0.00,0.00,1 +83.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +83.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +84.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +85.46,0.00,1.00,0.00,1.00,0.00,0.00,1 +86.12,0.00,1.00,0.00,1.00,0.00,0.00,1 +86.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +87.30,0.00,1.00,0.00,1.00,0.00,0.00,1 +87.81,0.00,1.00,0.00,1.00,0.00,0.00,1 +88.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +88.67,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.03,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.76,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.89,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.89,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.76,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.03,0.00,1.00,0.00,1.00,0.00,0.00,1 +88.67,0.00,1.00,0.00,1.00,0.00,0.00,1 +88.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +87.81,0.00,1.00,0.00,1.00,0.00,0.00,1 +87.30,0.00,1.00,0.00,1.00,0.00,0.00,1 +86.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +86.12,0.00,1.00,0.00,1.00,0.00,0.00,1 +85.46,0.00,1.00,0.00,1.00,0.00,0.00,1 +84.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +83.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +83.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +82.28,0.00,1.00,0.00,1.00,0.00,0.00,1 +81.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +80.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +79.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +78.31,0.00,1.00,0.00,1.00,0.00,0.00,1 +77.20,0.00,1.00,0.00,1.00,0.00,0.00,1 +76.04,0.00,1.00,0.00,1.00,0.00,0.00,1 +74.83,0.00,1.00,0.00,1.00,0.00,0.00,1 +73.58,0.00,1.00,0.00,1.00,0.00,0.00,1 +72.29,0.00,1.00,0.00,1.00,0.00,0.00,1 +70.95,0.00,1.00,0.00,1.00,0.00,0.00,1 +69.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +68.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +66.69,0.00,1.00,0.00,1.00,0.00,0.00,1 +65.18,0.00,1.00,0.00,1.00,0.00,0.00,1 +63.64,0.00,1.00,0.00,1.00,0.00,0.00,1 +62.06,0.00,1.00,0.00,1.00,0.00,0.00,1 +60.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +58.79,0.00,1.00,0.00,1.00,0.00,0.00,1 +57.10,0.00,1.00,0.00,1.00,0.00,0.00,1 +55.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +53.61,0.00,1.00,0.00,1.00,0.00,0.00,1 +51.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +50.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +48.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +46.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +44.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +42.43,0.00,1.00,0.00,1.00,0.00,0.00,1 +40.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +38.48,0.00,1.00,0.00,1.00,0.00,0.00,1 +36.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +34.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +32.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +30.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +28.23,0.00,1.00,0.00,1.00,0.00,0.00,1 +26.13,0.00,1.00,0.00,1.00,0.00,0.00,1 +24.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +21.87,0.00,1.00,0.00,1.00,0.00,0.00,1 +19.72,0.00,1.00,0.00,1.00,0.00,0.00,1 +17.56,0.00,1.00,0.00,1.00,0.00,0.00,1 +15.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +13.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +11.02,0.00,1.00,0.00,1.00,0.00,0.00,1 +8.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +6.62,0.00,1.00,0.00,1.00,0.00,0.00,1 +4.42,0.00,1.00,0.00,1.00,0.00,0.00,1 +2.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-2.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +-4.42,0.00,1.00,0.00,1.00,0.00,0.00,1 +-6.62,0.00,1.00,0.00,1.00,0.00,0.00,1 +-8.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +-11.02,0.00,1.00,0.00,1.00,0.00,0.00,1 +-13.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +-15.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-17.56,0.00,1.00,0.00,1.00,0.00,0.00,1 +-19.72,0.00,1.00,0.00,1.00,0.00,0.00,1 +-21.87,0.00,1.00,0.00,1.00,0.00,0.00,1 +-24.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-26.13,0.00,1.00,0.00,1.00,0.00,0.00,1 +-28.23,0.00,1.00,0.00,1.00,0.00,0.00,1 +-30.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +-32.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-34.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +-36.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +-38.48,0.00,1.00,0.00,1.00,0.00,0.00,1 +-40.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +-42.43,0.00,1.00,0.00,1.00,0.00,0.00,1 +-44.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +-46.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +-48.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-50.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-51.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +-53.61,0.00,1.00,0.00,1.00,0.00,0.00,1 +-55.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +-57.10,0.00,1.00,0.00,1.00,0.00,0.00,1 +-58.79,0.00,1.00,0.00,1.00,0.00,0.00,1 +-60.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +-62.06,0.00,1.00,0.00,1.00,0.00,0.00,1 +-63.64,0.00,1.00,0.00,1.00,0.00,0.00,1 +-65.18,0.00,1.00,0.00,1.00,0.00,0.00,1 +-66.69,0.00,1.00,0.00,1.00,0.00,0.00,1 +-68.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-69.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +-70.95,0.00,1.00,0.00,1.00,0.00,0.00,1 +-72.29,0.00,1.00,0.00,1.00,0.00,0.00,1 +-73.58,0.00,1.00,0.00,1.00,0.00,0.00,1 +-74.83,0.00,1.00,0.00,1.00,0.00,0.00,1 +-76.04,0.00,1.00,0.00,1.00,0.00,0.00,1 +-77.20,0.00,1.00,0.00,1.00,0.00,0.00,1 +-78.31,0.00,1.00,0.00,1.00,0.00,0.00,1 +-79.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +-80.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-81.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +-82.28,0.00,1.00,0.00,1.00,0.00,0.00,1 +-83.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-83.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +-84.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +-85.46,0.00,1.00,0.00,1.00,0.00,0.00,1 +-86.12,0.00,1.00,0.00,1.00,0.00,0.00,1 +-86.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +-87.30,0.00,1.00,0.00,1.00,0.00,0.00,1 +-87.81,0.00,1.00,0.00,1.00,0.00,0.00,1 +-88.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +-88.67,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.03,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.76,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.89,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.89,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.76,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.03,0.00,1.00,0.00,1.00,0.00,0.00,1 +-88.67,0.00,1.00,0.00,1.00,0.00,0.00,1 +-88.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +-87.81,0.00,1.00,0.00,1.00,0.00,0.00,1 +-87.30,0.00,1.00,0.00,1.00,0.00,0.00,1 +-86.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +-86.12,0.00,1.00,0.00,1.00,0.00,0.00,1 +-85.46,0.00,1.00,0.00,1.00,0.00,0.00,1 +-84.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +-83.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +-83.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-82.28,0.00,1.00,0.00,1.00,0.00,0.00,1 +-81.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +-80.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-79.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +-78.31,0.00,1.00,0.00,1.00,0.00,0.00,1 +-77.20,0.00,1.00,0.00,1.00,0.00,0.00,1 +-76.04,0.00,1.00,0.00,1.00,0.00,0.00,1 +-74.83,0.00,1.00,0.00,1.00,0.00,0.00,1 +-73.58,0.00,1.00,0.00,1.00,0.00,0.00,1 +-72.29,0.00,1.00,0.00,1.00,0.00,0.00,1 +-70.95,0.00,1.00,0.00,1.00,0.00,0.00,1 +-69.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +-68.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-66.69,0.00,1.00,0.00,1.00,0.00,0.00,1 +-65.18,0.00,1.00,0.00,1.00,0.00,0.00,1 +-63.64,0.00,1.00,0.00,1.00,0.00,0.00,1 +-62.06,0.00,1.00,0.00,1.00,0.00,0.00,1 +-60.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +-58.79,0.00,1.00,0.00,1.00,0.00,0.00,1 +-57.10,0.00,1.00,0.00,1.00,0.00,0.00,1 +-55.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +-53.61,0.00,1.00,0.00,1.00,0.00,0.00,1 +-51.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +-50.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-48.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-46.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +-44.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +-42.43,0.00,1.00,0.00,1.00,0.00,0.00,1 +-40.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +-38.48,0.00,1.00,0.00,1.00,0.00,0.00,1 +-36.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +-34.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +-32.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-30.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +-28.23,0.00,1.00,0.00,1.00,0.00,0.00,1 +-52.25,0.00,1.00,0.00,1.00,0.00,0.00,0 +-48.01,0.00,1.00,0.00,1.00,0.00,0.00,0 +-43.74,0.00,1.00,0.00,1.00,0.00,0.00,0 +-39.44,0.00,1.00,0.00,1.00,0.00,0.00,0 +-35.12,0.00,1.00,0.00,1.00,0.00,0.00,0 +-30.77,0.00,1.00,0.00,1.00,0.00,0.00,0 +-26.41,0.00,1.00,0.00,1.00,0.00,0.00,0 +-22.03,0.00,1.00,0.00,1.00,0.00,0.00,0 +-17.64,0.00,1.00,0.00,1.00,0.00,0.00,0 +-13.24,0.00,1.00,0.00,1.00,0.00,0.00,0 +-8.83,0.00,1.00,0.00,1.00,0.00,0.00,0 +-4.42,0.00,1.00,0.00,1.00,0.00,0.00,0 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,0 +4.42,0.00,1.00,0.00,1.00,0.00,0.00,0 +8.83,0.00,1.00,0.00,1.00,0.00,0.00,0 +13.24,0.00,1.00,0.00,1.00,0.00,0.00,0 +17.64,0.00,1.00,0.00,1.00,0.00,0.00,0 +22.03,0.00,1.00,0.00,1.00,0.00,0.00,0 +26.41,0.00,1.00,0.00,1.00,0.00,0.00,0 +30.77,0.00,1.00,0.00,1.00,0.00,0.00,0 +35.12,0.00,1.00,0.00,1.00,0.00,0.00,0 +39.44,0.00,1.00,0.00,1.00,0.00,0.00,0 +43.74,0.00,1.00,0.00,1.00,0.00,0.00,0 +48.01,0.00,1.00,0.00,1.00,0.00,0.00,0 +52.25,0.00,1.00,0.00,1.00,0.00,0.00,0 +56.46,0.00,1.00,0.00,1.00,0.00,0.00,0 +60.64,0.00,1.00,0.00,1.00,0.00,0.00,0 +64.78,0.00,1.00,0.00,1.00,0.00,0.00,0 +68.88,0.00,1.00,0.00,1.00,0.00,0.00,0 +72.94,0.00,1.00,0.00,1.00,0.00,0.00,0 +76.96,0.00,1.00,0.00,1.00,0.00,0.00,0 +80.93,0.00,1.00,0.00,1.00,0.00,0.00,0 +84.85,0.00,1.00,0.00,1.00,0.00,0.00,0 +88.72,0.00,1.00,0.00,1.00,0.00,0.00,0 +92.54,0.00,1.00,0.00,1.00,0.00,0.00,0 +96.30,0.00,1.00,0.00,1.00,0.00,0.00,0 +100.00,0.00,1.00,0.00,1.00,0.00,0.00,0 +103.65,0.00,1.00,0.00,1.00,0.00,0.00,0 +107.23,0.00,1.00,0.00,1.00,0.00,0.00,0 +110.74,0.00,1.00,0.00,1.00,0.00,0.00,0 +114.19,0.00,1.00,0.00,1.00,0.00,0.00,0 +117.57,0.00,1.00,0.00,1.00,0.00,0.00,0 +120.88,0.00,1.00,0.00,1.00,0.00,0.00,0 +124.12,0.00,1.00,0.00,1.00,0.00,0.00,0 +127.28,0.00,1.00,0.00,1.00,0.00,0.00,0 +130.36,0.00,1.00,0.00,1.00,0.00,0.00,0 +133.37,0.00,1.00,0.00,1.00,0.00,0.00,0 +136.30,0.00,1.00,0.00,1.00,0.00,0.00,0 +139.14,0.00,1.00,0.00,1.00,0.00,0.00,0 +141.90,0.00,1.00,0.00,1.00,0.00,0.00,0 +144.58,0.00,1.00,0.00,1.00,0.00,0.00,0 +147.17,0.00,1.00,0.00,1.00,0.00,0.00,0 +149.66,0.00,1.00,0.00,1.00,0.00,0.00,0 +152.07,0.00,1.00,0.00,1.00,0.00,0.00,0 +154.39,0.00,1.00,0.00,1.00,0.00,0.00,0 +156.62,0.00,1.00,0.00,1.00,0.00,0.00,0 +158.75,0.00,1.00,0.00,1.00,0.00,0.00,0 +160.78,0.00,1.00,0.00,1.00,0.00,0.00,0 +162.72,0.00,1.00,0.00,1.00,0.00,0.00,0 +164.56,0.00,1.00,0.00,1.00,0.00,0.00,0 +166.30,0.00,1.00,0.00,1.00,0.00,0.00,0 +167.94,0.00,1.00,0.00,1.00,0.00,0.00,0 +169.48,0.00,1.00,0.00,1.00,0.00,0.00,0 +170.92,0.00,1.00,0.00,1.00,0.00,0.00,0 +172.25,0.00,1.00,0.00,1.00,0.00,0.00,0 +173.48,0.00,1.00,0.00,1.00,0.00,0.00,0 +174.61,0.00,1.00,0.00,1.00,0.00,0.00,0 +175.63,0.00,1.00,0.00,1.00,0.00,0.00,0 +176.54,0.00,1.00,0.00,1.00,0.00,0.00,0 +177.35,0.00,1.00,0.00,1.00,0.00,0.00,0 +178.05,0.00,1.00,0.00,1.00,0.00,0.00,0 +178.65,0.00,1.00,0.00,1.00,0.00,0.00,0 +179.13,0.00,1.00,0.00,1.00,0.00,0.00,0 +179.51,0.00,1.00,0.00,1.00,0.00,0.00,0 +179.78,0.00,1.00,0.00,1.00,0.00,0.00,0 +179.95,0.00,1.00,0.00,1.00,0.00,0.00,0 +180.00,0.00,1.00,0.00,1.00,0.00,0.00,0 +179.95,0.00,1.00,0.00,1.00,0.00,0.00,0 +179.78,0.00,1.00,0.00,1.00,0.00,0.00,0 +179.51,0.00,1.00,0.00,1.00,0.00,0.00,0 +179.13,0.00,1.00,0.00,1.00,0.00,0.00,0 +178.65,0.00,1.00,0.00,1.00,0.00,0.00,0 +178.05,0.00,1.00,0.00,1.00,0.00,0.00,0 +177.35,0.00,1.00,0.00,1.00,0.00,0.00,0 +176.54,0.00,1.00,0.00,1.00,0.00,0.00,0 +175.63,0.00,1.00,0.00,1.00,0.00,0.00,0 +174.61,0.00,1.00,0.00,1.00,0.00,0.00,0 +173.48,0.00,1.00,0.00,1.00,0.00,0.00,0 +172.25,0.00,1.00,0.00,1.00,0.00,0.00,0 +170.92,0.00,1.00,0.00,1.00,0.00,0.00,0 +169.48,0.00,1.00,0.00,1.00,0.00,0.00,0 +167.94,0.00,1.00,0.00,1.00,0.00,0.00,0 +166.30,0.00,1.00,0.00,1.00,0.00,0.00,0 +164.56,0.00,1.00,0.00,1.00,0.00,0.00,0 +162.72,0.00,1.00,0.00,1.00,0.00,0.00,0 +160.78,0.00,1.00,0.00,1.00,0.00,0.00,0 +158.75,0.00,1.00,0.00,1.00,0.00,0.00,0 +156.62,0.00,1.00,0.00,1.00,0.00,0.00,0 +154.39,0.00,1.00,0.00,1.00,0.00,0.00,0 +152.07,0.00,1.00,0.00,1.00,0.00,0.00,0 +74.83,0.00,1.00,0.00,1.00,0.00,0.00,1 +73.58,0.00,1.00,0.00,1.00,0.00,0.00,1 +72.29,0.00,1.00,0.00,1.00,0.00,0.00,1 +70.95,0.00,1.00,0.00,1.00,0.00,0.00,1 +69.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +68.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +66.69,0.00,1.00,0.00,1.00,0.00,0.00,1 +65.18,0.00,1.00,0.00,1.00,0.00,0.00,1 +63.64,0.00,1.00,0.00,1.00,0.00,0.00,1 +62.06,0.00,1.00,0.00,1.00,0.00,0.00,1 +60.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +58.79,0.00,1.00,0.00,1.00,0.00,0.00,1 +57.10,0.00,1.00,0.00,1.00,0.00,0.00,1 +55.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +53.61,0.00,1.00,0.00,1.00,0.00,0.00,1 +51.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +50.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +48.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +46.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +44.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +42.43,0.00,1.00,0.00,1.00,0.00,0.00,1 +40.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +38.48,0.00,1.00,0.00,1.00,0.00,0.00,1 +36.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +34.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +32.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +30.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +28.23,0.00,1.00,0.00,1.00,0.00,0.00,1 +26.13,0.00,1.00,0.00,1.00,0.00,0.00,1 +24.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +21.87,0.00,1.00,0.00,1.00,0.00,0.00,1 +19.72,0.00,1.00,0.00,1.00,0.00,0.00,1 +17.56,0.00,1.00,0.00,1.00,0.00,0.00,1 +15.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +13.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +11.02,0.00,1.00,0.00,1.00,0.00,0.00,1 +8.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +6.62,0.00,1.00,0.00,1.00,0.00,0.00,1 +4.42,0.00,1.00,0.00,1.00,0.00,0.00,1 +2.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-2.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +-4.42,0.00,1.00,0.00,1.00,0.00,0.00,1 +-6.62,0.00,1.00,0.00,1.00,0.00,0.00,1 +-8.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +-11.02,0.00,1.00,0.00,1.00,0.00,0.00,1 +-13.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +-15.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-17.56,0.00,1.00,0.00,1.00,0.00,0.00,1 +-19.72,0.00,1.00,0.00,1.00,0.00,0.00,1 +-21.87,0.00,1.00,0.00,1.00,0.00,0.00,1 +-24.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-26.13,0.00,1.00,0.00,1.00,0.00,0.00,1 +-28.23,0.00,1.00,0.00,1.00,0.00,0.00,1 +-30.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +-32.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-34.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +-36.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +-38.48,0.00,1.00,0.00,1.00,0.00,0.00,1 +-40.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +-42.43,0.00,1.00,0.00,1.00,0.00,0.00,1 +-44.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +-46.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +-48.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-50.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-51.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +-53.61,0.00,1.00,0.00,1.00,0.00,0.00,1 +-55.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +-57.10,0.00,1.00,0.00,1.00,0.00,0.00,1 +-58.79,0.00,1.00,0.00,1.00,0.00,0.00,1 +-60.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +-62.06,0.00,1.00,0.00,1.00,0.00,0.00,1 +-63.64,0.00,1.00,0.00,1.00,0.00,0.00,1 +-65.18,0.00,1.00,0.00,1.00,0.00,0.00,1 +-66.69,0.00,1.00,0.00,1.00,0.00,0.00,1 +-68.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-69.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +-70.95,0.00,1.00,0.00,1.00,0.00,0.00,1 +-72.29,0.00,1.00,0.00,1.00,0.00,0.00,1 +-73.58,0.00,1.00,0.00,1.00,0.00,0.00,1 +-74.83,0.00,1.00,0.00,1.00,0.00,0.00,1 +-76.04,0.00,1.00,0.00,1.00,0.00,0.00,1 +-77.20,0.00,1.00,0.00,1.00,0.00,0.00,1 +-78.31,0.00,1.00,0.00,1.00,0.00,0.00,1 +-79.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +-80.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-81.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +-82.28,0.00,1.00,0.00,1.00,0.00,0.00,1 +-83.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-83.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +-84.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +-85.46,0.00,1.00,0.00,1.00,0.00,0.00,1 +-86.12,0.00,1.00,0.00,1.00,0.00,0.00,1 +-86.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +-87.30,0.00,1.00,0.00,1.00,0.00,0.00,1 +-87.81,0.00,1.00,0.00,1.00,0.00,0.00,1 +-88.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +-88.67,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.03,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.76,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.89,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.89,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.76,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.03,0.00,1.00,0.00,1.00,0.00,0.00,1 +-88.67,0.00,1.00,0.00,1.00,0.00,0.00,1 +-88.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +-87.81,0.00,1.00,0.00,1.00,0.00,0.00,1 +-87.30,0.00,1.00,0.00,1.00,0.00,0.00,1 +-86.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +-86.12,0.00,1.00,0.00,1.00,0.00,0.00,1 +-85.46,0.00,1.00,0.00,1.00,0.00,0.00,1 +-84.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +-83.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +-83.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-82.28,0.00,1.00,0.00,1.00,0.00,0.00,1 +-81.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +-80.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-79.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +-78.31,0.00,1.00,0.00,1.00,0.00,0.00,1 +-77.20,0.00,1.00,0.00,1.00,0.00,0.00,1 +-76.04,0.00,1.00,0.00,1.00,0.00,0.00,1 +-74.83,0.00,1.00,0.00,1.00,0.00,0.00,1 +-73.58,0.00,1.00,0.00,1.00,0.00,0.00,1 +-72.29,0.00,1.00,0.00,1.00,0.00,0.00,1 +-70.95,0.00,1.00,0.00,1.00,0.00,0.00,1 +-69.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +-68.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-66.69,0.00,1.00,0.00,1.00,0.00,0.00,1 +-65.18,0.00,1.00,0.00,1.00,0.00,0.00,1 +-63.64,0.00,1.00,0.00,1.00,0.00,0.00,1 +-62.06,0.00,1.00,0.00,1.00,0.00,0.00,1 +-60.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +-58.79,0.00,1.00,0.00,1.00,0.00,0.00,1 +-57.10,0.00,1.00,0.00,1.00,0.00,0.00,1 +-55.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +-53.61,0.00,1.00,0.00,1.00,0.00,0.00,1 +-51.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +-50.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-48.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-46.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +-44.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +-42.43,0.00,1.00,0.00,1.00,0.00,0.00,1 +-40.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +-38.48,0.00,1.00,0.00,1.00,0.00,0.00,1 +-36.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +-34.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +-32.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-30.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +-28.23,0.00,1.00,0.00,1.00,0.00,0.00,1 +-26.13,0.00,1.00,0.00,1.00,0.00,0.00,1 +-24.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-21.87,0.00,1.00,0.00,1.00,0.00,0.00,1 +-19.72,0.00,1.00,0.00,1.00,0.00,0.00,1 +-17.56,0.00,1.00,0.00,1.00,0.00,0.00,1 +-15.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-13.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +-11.02,0.00,1.00,0.00,1.00,0.00,0.00,1 +-8.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +-6.62,0.00,1.00,0.00,1.00,0.00,0.00,1 +-4.42,0.00,1.00,0.00,1.00,0.00,0.00,1 +-2.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +2.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +4.42,0.00,1.00,0.00,1.00,0.00,0.00,1 +6.62,0.00,1.00,0.00,1.00,0.00,0.00,1 +8.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +11.02,0.00,1.00,0.00,1.00,0.00,0.00,1 +13.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +15.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +17.56,0.00,1.00,0.00,1.00,0.00,0.00,1 +19.72,0.00,1.00,0.00,1.00,0.00,0.00,1 +21.87,0.00,1.00,0.00,1.00,0.00,0.00,1 +24.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +26.13,0.00,1.00,0.00,1.00,0.00,0.00,1 +28.23,0.00,1.00,0.00,1.00,0.00,0.00,1 +30.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +32.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +34.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +36.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +38.48,0.00,1.00,0.00,1.00,0.00,0.00,1 +40.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +42.43,0.00,1.00,0.00,1.00,0.00,0.00,1 +44.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +46.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +48.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +50.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +51.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +53.61,0.00,1.00,0.00,1.00,0.00,0.00,1 +55.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +57.10,0.00,1.00,0.00,1.00,0.00,0.00,1 +58.79,0.00,1.00,0.00,1.00,0.00,0.00,1 +60.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +62.06,0.00,1.00,0.00,1.00,0.00,0.00,1 +63.64,0.00,1.00,0.00,1.00,0.00,0.00,1 +65.18,0.00,1.00,0.00,1.00,0.00,0.00,1 +66.69,0.00,1.00,0.00,1.00,0.00,0.00,1 +68.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +69.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +70.95,0.00,1.00,0.00,1.00,0.00,0.00,1 +72.29,0.00,1.00,0.00,1.00,0.00,0.00,1 +73.58,0.00,1.00,0.00,1.00,0.00,0.00,1 +74.83,0.00,1.00,0.00,1.00,0.00,0.00,1 +76.04,0.00,1.00,0.00,1.00,0.00,0.00,1 +77.20,0.00,1.00,0.00,1.00,0.00,0.00,1 +78.31,0.00,1.00,0.00,1.00,0.00,0.00,1 +79.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +80.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +81.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +82.28,0.00,1.00,0.00,1.00,0.00,0.00,1 +83.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +83.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +84.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +85.46,0.00,1.00,0.00,1.00,0.00,0.00,1 +86.12,0.00,1.00,0.00,1.00,0.00,0.00,1 +86.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +87.30,0.00,1.00,0.00,1.00,0.00,0.00,1 +87.81,0.00,1.00,0.00,1.00,0.00,0.00,1 +88.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +88.67,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.03,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.76,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.89,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.89,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.76,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.03,0.00,1.00,0.00,1.00,0.00,0.00,1 +88.67,0.00,1.00,0.00,1.00,0.00,0.00,1 +88.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +87.81,0.00,1.00,0.00,1.00,0.00,0.00,1 +87.30,0.00,1.00,0.00,1.00,0.00,0.00,1 +86.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +86.12,0.00,1.00,0.00,1.00,0.00,0.00,1 +85.46,0.00,1.00,0.00,1.00,0.00,0.00,1 +84.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +83.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +83.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +82.28,0.00,1.00,0.00,1.00,0.00,0.00,1 +81.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +80.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +79.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +78.31,0.00,1.00,0.00,1.00,0.00,0.00,1 +77.20,0.00,1.00,0.00,1.00,0.00,0.00,1 +76.04,0.00,1.00,0.00,1.00,0.00,0.00,1 +74.83,0.00,1.00,0.00,1.00,0.00,0.00,1 +73.58,0.00,1.00,0.00,1.00,0.00,0.00,1 +72.29,0.00,1.00,0.00,1.00,0.00,0.00,1 +70.95,0.00,1.00,0.00,1.00,0.00,0.00,1 +69.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +68.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +66.69,0.00,1.00,0.00,1.00,0.00,0.00,1 +65.18,0.00,1.00,0.00,1.00,0.00,0.00,1 +63.64,0.00,1.00,0.00,1.00,0.00,0.00,1 +62.06,0.00,1.00,0.00,1.00,0.00,0.00,1 +60.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +58.79,0.00,1.00,0.00,1.00,0.00,0.00,1 +57.10,0.00,1.00,0.00,1.00,0.00,0.00,1 +55.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +53.61,0.00,1.00,0.00,1.00,0.00,0.00,1 +51.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +50.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +48.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +46.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +44.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +42.43,0.00,1.00,0.00,1.00,0.00,0.00,1 +40.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +38.48,0.00,1.00,0.00,1.00,0.00,0.00,1 +36.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +34.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +32.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +30.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +28.23,0.00,1.00,0.00,1.00,0.00,0.00,1 +26.13,0.00,1.00,0.00,1.00,0.00,0.00,1 +24.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +21.87,0.00,1.00,0.00,1.00,0.00,0.00,1 +19.72,0.00,1.00,0.00,1.00,0.00,0.00,1 +17.56,0.00,1.00,0.00,1.00,0.00,0.00,1 +15.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +13.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +11.02,0.00,1.00,0.00,1.00,0.00,0.00,1 +8.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +6.62,0.00,1.00,0.00,1.00,0.00,0.00,1 +4.42,0.00,1.00,0.00,1.00,0.00,0.00,1 +2.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-2.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +-4.42,0.00,1.00,0.00,1.00,0.00,0.00,1 +-6.62,0.00,1.00,0.00,1.00,0.00,0.00,1 +-8.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +-11.02,0.00,1.00,0.00,1.00,0.00,0.00,1 +-13.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +-15.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-17.56,0.00,1.00,0.00,1.00,0.00,0.00,1 +-19.72,0.00,1.00,0.00,1.00,0.00,0.00,1 +-21.87,0.00,1.00,0.00,1.00,0.00,0.00,1 +-24.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-26.13,0.00,1.00,0.00,1.00,0.00,0.00,1 +-28.23,0.00,1.00,0.00,1.00,0.00,0.00,1 +-30.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +-32.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-34.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +-36.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +-38.48,0.00,1.00,0.00,1.00,0.00,0.00,1 +-40.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +-42.43,0.00,1.00,0.00,1.00,0.00,0.00,1 +-44.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +-46.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +-48.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-50.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-51.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +-53.61,0.00,1.00,0.00,1.00,0.00,0.00,1 +-55.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +-57.10,0.00,1.00,0.00,1.00,0.00,0.00,1 +-58.79,0.00,1.00,0.00,1.00,0.00,0.00,1 +-60.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +-62.06,0.00,1.00,0.00,1.00,0.00,0.00,1 +-63.64,0.00,1.00,0.00,1.00,0.00,0.00,1 +-65.18,0.00,1.00,0.00,1.00,0.00,0.00,1 +-66.69,0.00,1.00,0.00,1.00,0.00,0.00,1 +-68.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-69.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +-70.95,0.00,1.00,0.00,1.00,0.00,0.00,1 +-72.29,0.00,1.00,0.00,1.00,0.00,0.00,1 +-73.58,0.00,1.00,0.00,1.00,0.00,0.00,1 +-74.83,0.00,1.00,0.00,1.00,0.00,0.00,1 +-76.04,0.00,1.00,0.00,1.00,0.00,0.00,1 +-77.20,0.00,1.00,0.00,1.00,0.00,0.00,1 +-78.31,0.00,1.00,0.00,1.00,0.00,0.00,1 +-79.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +-80.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-81.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +-82.28,0.00,1.00,0.00,1.00,0.00,0.00,1 +-83.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-83.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +-84.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +-85.46,0.00,1.00,0.00,1.00,0.00,0.00,1 +-86.12,0.00,1.00,0.00,1.00,0.00,0.00,1 +-86.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +-87.30,0.00,1.00,0.00,1.00,0.00,0.00,1 +-87.81,0.00,1.00,0.00,1.00,0.00,0.00,1 +-88.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +-88.67,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.03,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.76,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.89,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.89,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.76,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.03,0.00,1.00,0.00,1.00,0.00,0.00,1 +-88.67,0.00,1.00,0.00,1.00,0.00,0.00,1 +-88.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +-87.81,0.00,1.00,0.00,1.00,0.00,0.00,1 +-87.30,0.00,1.00,0.00,1.00,0.00,0.00,1 +-86.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +-86.12,0.00,1.00,0.00,1.00,0.00,0.00,1 +-85.46,0.00,1.00,0.00,1.00,0.00,0.00,1 +-84.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +-83.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +-83.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-82.28,0.00,1.00,0.00,1.00,0.00,0.00,1 +-81.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +-80.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-79.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +-78.31,0.00,1.00,0.00,1.00,0.00,0.00,1 +-77.20,0.00,1.00,0.00,1.00,0.00,0.00,1 +-76.04,0.00,1.00,0.00,1.00,0.00,0.00,1 +-74.83,0.00,1.00,0.00,1.00,0.00,0.00,1 +-73.58,0.00,1.00,0.00,1.00,0.00,0.00,1 +-72.29,0.00,1.00,0.00,1.00,0.00,0.00,1 +-70.95,0.00,1.00,0.00,1.00,0.00,0.00,1 +-69.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +-68.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-66.69,0.00,1.00,0.00,1.00,0.00,0.00,1 +-65.18,0.00,1.00,0.00,1.00,0.00,0.00,1 +-63.64,0.00,1.00,0.00,1.00,0.00,0.00,1 +-62.06,0.00,1.00,0.00,1.00,0.00,0.00,1 +-60.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +-58.79,0.00,1.00,0.00,1.00,0.00,0.00,1 +-57.10,0.00,1.00,0.00,1.00,0.00,0.00,1 +-55.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +-53.61,0.00,1.00,0.00,1.00,0.00,0.00,1 +-51.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +-50.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-48.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-46.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +-44.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +-42.43,0.00,1.00,0.00,1.00,0.00,0.00,1 +-40.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +-38.48,0.00,1.00,0.00,1.00,0.00,0.00,1 +-36.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +-34.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +-32.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-30.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +-28.23,0.00,1.00,0.00,1.00,0.00,0.00,1 +-26.13,0.00,1.00,0.00,1.00,0.00,0.00,1 +-24.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-21.87,0.00,1.00,0.00,1.00,0.00,0.00,1 +-19.72,0.00,1.00,0.00,1.00,0.00,0.00,1 +-17.56,0.00,1.00,0.00,1.00,0.00,0.00,1 +-15.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-13.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +-11.02,0.00,1.00,0.00,1.00,0.00,0.00,1 +-8.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +-6.62,0.00,1.00,0.00,1.00,0.00,0.00,1 +-4.42,0.00,1.00,0.00,1.00,0.00,0.00,1 +-2.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +2.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +4.42,0.00,1.00,0.00,1.00,0.00,0.00,1 +6.62,0.00,1.00,0.00,1.00,0.00,0.00,1 +8.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +11.02,0.00,1.00,0.00,1.00,0.00,0.00,1 +13.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +15.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +17.56,0.00,1.00,0.00,1.00,0.00,0.00,1 +19.72,0.00,1.00,0.00,1.00,0.00,0.00,1 +21.87,0.00,1.00,0.00,1.00,0.00,0.00,1 +24.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +26.13,0.00,1.00,0.00,1.00,0.00,0.00,1 +28.23,0.00,1.00,0.00,1.00,0.00,0.00,1 +30.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +32.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +34.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +36.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +38.48,0.00,1.00,0.00,1.00,0.00,0.00,1 +40.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +42.43,0.00,1.00,0.00,1.00,0.00,0.00,1 +44.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +46.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +48.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +50.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +51.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +53.61,0.00,1.00,0.00,1.00,0.00,0.00,1 +55.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +57.10,0.00,1.00,0.00,1.00,0.00,0.00,1 +58.79,0.00,1.00,0.00,1.00,0.00,0.00,1 +60.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +62.06,0.00,1.00,0.00,1.00,0.00,0.00,1 +63.64,0.00,1.00,0.00,1.00,0.00,0.00,1 +65.18,0.00,1.00,0.00,1.00,0.00,0.00,1 +66.69,0.00,1.00,0.00,1.00,0.00,0.00,1 +68.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +69.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +70.95,0.00,1.00,0.00,1.00,0.00,0.00,1 +72.29,0.00,1.00,0.00,1.00,0.00,0.00,1 +73.58,0.00,1.00,0.00,1.00,0.00,0.00,1 +74.83,0.00,1.00,0.00,1.00,0.00,0.00,1 +76.04,0.00,1.00,0.00,1.00,0.00,0.00,1 +77.20,0.00,1.00,0.00,1.00,0.00,0.00,1 +78.31,0.00,1.00,0.00,1.00,0.00,0.00,1 +79.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +80.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +81.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +82.28,0.00,1.00,0.00,1.00,0.00,0.00,1 +83.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +83.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +84.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +85.46,0.00,1.00,0.00,1.00,0.00,0.00,1 +86.12,0.00,1.00,0.00,1.00,0.00,0.00,1 +86.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +87.30,0.00,1.00,0.00,1.00,0.00,0.00,1 +87.81,0.00,1.00,0.00,1.00,0.00,0.00,1 +88.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +88.67,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.03,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.76,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.89,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.89,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.76,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.03,0.00,1.00,0.00,1.00,0.00,0.00,1 +88.67,0.00,1.00,0.00,1.00,0.00,0.00,1 +88.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +87.81,0.00,1.00,0.00,1.00,0.00,0.00,1 +87.30,0.00,1.00,0.00,1.00,0.00,0.00,1 +86.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +86.12,0.00,1.00,0.00,1.00,0.00,0.00,1 +85.46,0.00,1.00,0.00,1.00,0.00,0.00,1 +84.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +83.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +83.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +82.28,0.00,1.00,0.00,1.00,0.00,0.00,1 +81.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +80.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +79.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +78.31,0.00,1.00,0.00,1.00,0.00,0.00,1 +77.20,0.00,1.00,0.00,1.00,0.00,0.00,1 +76.04,0.00,1.00,0.00,1.00,0.00,0.00,1 +74.83,0.00,1.00,0.00,1.00,0.00,0.00,1 +73.58,0.00,1.00,0.00,1.00,0.00,0.00,1 +72.29,0.00,1.00,0.00,1.00,0.00,0.00,1 +70.95,0.00,1.00,0.00,1.00,0.00,0.00,1 +69.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +68.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +66.69,0.00,1.00,0.00,1.00,0.00,0.00,1 +65.18,0.00,1.00,0.00,1.00,0.00,0.00,1 +63.64,0.00,1.00,0.00,1.00,0.00,0.00,1 +62.06,0.00,1.00,0.00,1.00,0.00,0.00,1 +60.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +58.79,0.00,1.00,0.00,1.00,0.00,0.00,1 +57.10,0.00,1.00,0.00,1.00,0.00,0.00,1 +55.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +53.61,0.00,1.00,0.00,1.00,0.00,0.00,1 +51.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +50.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +48.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +46.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +44.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +42.43,0.00,1.00,0.00,1.00,0.00,0.00,1 +40.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +38.48,0.00,1.00,0.00,1.00,0.00,0.00,1 +36.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +34.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +32.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +30.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +28.23,0.00,1.00,0.00,1.00,0.00,0.00,1 +26.13,0.00,1.00,0.00,1.00,0.00,0.00,1 +24.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +21.87,0.00,1.00,0.00,1.00,0.00,0.00,1 +19.72,0.00,1.00,0.00,1.00,0.00,0.00,1 +17.56,0.00,1.00,0.00,1.00,0.00,0.00,1 +15.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +13.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +11.02,0.00,1.00,0.00,1.00,0.00,0.00,1 +8.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +6.62,0.00,1.00,0.00,1.00,0.00,0.00,1 +4.42,0.00,1.00,0.00,1.00,0.00,0.00,1 +2.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-2.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +-4.42,0.00,1.00,0.00,1.00,0.00,0.00,1 +-6.62,0.00,1.00,0.00,1.00,0.00,0.00,1 +-8.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +-11.02,0.00,1.00,0.00,1.00,0.00,0.00,1 +-13.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +-15.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-17.56,0.00,1.00,0.00,1.00,0.00,0.00,1 +-19.72,0.00,1.00,0.00,1.00,0.00,0.00,1 +-21.87,0.00,1.00,0.00,1.00,0.00,0.00,1 +-24.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-26.13,0.00,1.00,0.00,1.00,0.00,0.00,1 +-28.23,0.00,1.00,0.00,1.00,0.00,0.00,1 +-30.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +-32.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-34.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +-36.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +-38.48,0.00,1.00,0.00,1.00,0.00,0.00,1 +-40.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +-42.43,0.00,1.00,0.00,1.00,0.00,0.00,1 +-44.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +-46.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +-48.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-50.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-51.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +-53.61,0.00,1.00,0.00,1.00,0.00,0.00,1 +-55.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +-57.10,0.00,1.00,0.00,1.00,0.00,0.00,1 +-58.79,0.00,1.00,0.00,1.00,0.00,0.00,1 +-60.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +-62.06,0.00,1.00,0.00,1.00,0.00,0.00,1 +-63.64,0.00,1.00,0.00,1.00,0.00,0.00,1 +-65.18,0.00,1.00,0.00,1.00,0.00,0.00,1 +-66.69,0.00,1.00,0.00,1.00,0.00,0.00,1 +-68.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-69.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +-70.95,0.00,1.00,0.00,1.00,0.00,0.00,1 +-72.29,0.00,1.00,0.00,1.00,0.00,0.00,1 +-73.58,0.00,1.00,0.00,1.00,0.00,0.00,1 +-74.83,0.00,1.00,0.00,1.00,0.00,0.00,1 +-76.04,0.00,1.00,0.00,1.00,0.00,0.00,1 +-77.20,0.00,1.00,0.00,1.00,0.00,0.00,1 +-78.31,0.00,1.00,0.00,1.00,0.00,0.00,1 +-79.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +-80.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-81.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +-82.28,0.00,1.00,0.00,1.00,0.00,0.00,1 +-83.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-83.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +-84.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +-85.46,0.00,1.00,0.00,1.00,0.00,0.00,1 +-86.12,0.00,1.00,0.00,1.00,0.00,0.00,1 +-86.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +-87.30,0.00,1.00,0.00,1.00,0.00,0.00,1 +-87.81,0.00,1.00,0.00,1.00,0.00,0.00,1 +-88.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +-88.67,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.03,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.76,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.89,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.89,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.76,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.03,0.00,1.00,0.00,1.00,0.00,0.00,1 +-88.67,0.00,1.00,0.00,1.00,0.00,0.00,1 +-88.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +-87.81,0.00,1.00,0.00,1.00,0.00,0.00,1 +-87.30,0.00,1.00,0.00,1.00,0.00,0.00,1 +-86.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +-86.12,0.00,1.00,0.00,1.00,0.00,0.00,1 +-85.46,0.00,1.00,0.00,1.00,0.00,0.00,1 +-84.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +-83.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +-83.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-82.28,0.00,1.00,0.00,1.00,0.00,0.00,1 +-81.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +-80.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-79.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +-78.31,0.00,1.00,0.00,1.00,0.00,0.00,1 +-77.20,0.00,1.00,0.00,1.00,0.00,0.00,1 +-76.04,0.00,1.00,0.00,1.00,0.00,0.00,1 +-74.83,0.00,1.00,0.00,1.00,0.00,0.00,1 +-73.58,0.00,1.00,0.00,1.00,0.00,0.00,1 +-72.29,0.00,1.00,0.00,1.00,0.00,0.00,1 +-70.95,0.00,1.00,0.00,1.00,0.00,0.00,1 +-69.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +-68.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-66.69,0.00,1.00,0.00,1.00,0.00,0.00,1 +-65.18,0.00,1.00,0.00,1.00,0.00,0.00,1 +-63.64,0.00,1.00,0.00,1.00,0.00,0.00,1 +-62.06,0.00,1.00,0.00,1.00,0.00,0.00,1 +-60.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +-58.79,0.00,1.00,0.00,1.00,0.00,0.00,1 +-57.10,0.00,1.00,0.00,1.00,0.00,0.00,1 +-55.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +-53.61,0.00,1.00,0.00,1.00,0.00,0.00,1 +-51.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +-50.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-48.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-46.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +-44.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +-42.43,0.00,1.00,0.00,1.00,0.00,0.00,1 +-40.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +-38.48,0.00,1.00,0.00,1.00,0.00,0.00,1 +-36.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +-34.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +-32.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-30.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +-28.23,0.00,1.00,0.00,1.00,0.00,0.00,1 +-26.13,0.00,1.00,0.00,1.00,0.00,0.00,1 +-24.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-21.87,0.00,1.00,0.00,1.00,0.00,0.00,1 +-19.72,0.00,1.00,0.00,1.00,0.00,0.00,1 +-17.56,0.00,1.00,0.00,1.00,0.00,0.00,1 +-15.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-13.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +-11.02,0.00,1.00,0.00,1.00,0.00,0.00,1 +-8.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +-6.62,0.00,1.00,0.00,1.00,0.00,0.00,1 +-4.42,0.00,1.00,0.00,1.00,0.00,0.00,1 +-2.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +2.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +4.42,0.00,1.00,0.00,1.00,0.00,0.00,1 +6.62,0.00,1.00,0.00,1.00,0.00,0.00,1 +8.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +11.02,0.00,1.00,0.00,1.00,0.00,0.00,1 +13.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +15.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +17.56,0.00,1.00,0.00,1.00,0.00,0.00,1 +19.72,0.00,1.00,0.00,1.00,0.00,0.00,1 +21.87,0.00,1.00,0.00,1.00,0.00,0.00,1 +24.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +26.13,0.00,1.00,0.00,1.00,0.00,0.00,1 +28.23,0.00,1.00,0.00,1.00,0.00,0.00,1 +30.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +32.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +34.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +36.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +38.48,0.00,1.00,0.00,1.00,0.00,0.00,1 +40.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +42.43,0.00,1.00,0.00,1.00,0.00,0.00,1 +44.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +46.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +48.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +50.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +51.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +53.61,0.00,1.00,0.00,1.00,0.00,0.00,1 +55.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +57.10,0.00,1.00,0.00,1.00,0.00,0.00,1 +58.79,0.00,1.00,0.00,1.00,0.00,0.00,1 +60.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +62.06,0.00,1.00,0.00,1.00,0.00,0.00,1 +63.64,0.00,1.00,0.00,1.00,0.00,0.00,1 +65.18,0.00,1.00,0.00,1.00,0.00,0.00,1 +66.69,0.00,1.00,0.00,1.00,0.00,0.00,1 +68.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +69.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +70.95,0.00,1.00,0.00,1.00,0.00,0.00,1 +72.29,0.00,1.00,0.00,1.00,0.00,0.00,1 +73.58,0.00,1.00,0.00,1.00,0.00,0.00,1 +74.83,0.00,1.00,0.00,1.00,0.00,0.00,1 +76.04,0.00,1.00,0.00,1.00,0.00,0.00,1 +77.20,0.00,1.00,0.00,1.00,0.00,0.00,1 +78.31,0.00,1.00,0.00,1.00,0.00,0.00,1 +79.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +80.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +81.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +82.28,0.00,1.00,0.00,1.00,0.00,0.00,1 +83.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +83.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +84.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +85.46,0.00,1.00,0.00,1.00,0.00,0.00,1 +86.12,0.00,1.00,0.00,1.00,0.00,0.00,1 +86.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +87.30,0.00,1.00,0.00,1.00,0.00,0.00,1 +87.81,0.00,1.00,0.00,1.00,0.00,0.00,1 +88.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +88.67,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.03,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.76,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.89,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.89,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.76,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +89.03,0.00,1.00,0.00,1.00,0.00,0.00,1 +88.67,0.00,1.00,0.00,1.00,0.00,0.00,1 +88.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +87.81,0.00,1.00,0.00,1.00,0.00,0.00,1 +87.30,0.00,1.00,0.00,1.00,0.00,0.00,1 +86.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +86.12,0.00,1.00,0.00,1.00,0.00,0.00,1 +85.46,0.00,1.00,0.00,1.00,0.00,0.00,1 +84.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +83.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +83.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +82.28,0.00,1.00,0.00,1.00,0.00,0.00,1 +81.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +80.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +79.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +78.31,0.00,1.00,0.00,1.00,0.00,0.00,1 +77.20,0.00,1.00,0.00,1.00,0.00,0.00,1 +76.04,0.00,1.00,0.00,1.00,0.00,0.00,1 +74.83,0.00,1.00,0.00,1.00,0.00,0.00,1 +73.58,0.00,1.00,0.00,1.00,0.00,0.00,1 +72.29,0.00,1.00,0.00,1.00,0.00,0.00,1 +70.95,0.00,1.00,0.00,1.00,0.00,0.00,1 +69.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +68.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +66.69,0.00,1.00,0.00,1.00,0.00,0.00,1 +65.18,0.00,1.00,0.00,1.00,0.00,0.00,1 +63.64,0.00,1.00,0.00,1.00,0.00,0.00,1 +62.06,0.00,1.00,0.00,1.00,0.00,0.00,1 +60.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +58.79,0.00,1.00,0.00,1.00,0.00,0.00,1 +57.10,0.00,1.00,0.00,1.00,0.00,0.00,1 +55.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +53.61,0.00,1.00,0.00,1.00,0.00,0.00,1 +51.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +50.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +48.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +46.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +44.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +42.43,0.00,1.00,0.00,1.00,0.00,0.00,1 +40.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +38.48,0.00,1.00,0.00,1.00,0.00,0.00,1 +36.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +34.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +32.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +30.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +28.23,0.00,1.00,0.00,1.00,0.00,0.00,1 +26.13,0.00,1.00,0.00,1.00,0.00,0.00,1 +24.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +21.87,0.00,1.00,0.00,1.00,0.00,0.00,1 +19.72,0.00,1.00,0.00,1.00,0.00,0.00,1 +17.56,0.00,1.00,0.00,1.00,0.00,0.00,1 +15.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +13.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +11.02,0.00,1.00,0.00,1.00,0.00,0.00,1 +8.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +6.62,0.00,1.00,0.00,1.00,0.00,0.00,1 +4.42,0.00,1.00,0.00,1.00,0.00,0.00,1 +2.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +0.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-2.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +-4.42,0.00,1.00,0.00,1.00,0.00,0.00,1 +-6.62,0.00,1.00,0.00,1.00,0.00,0.00,1 +-8.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +-11.02,0.00,1.00,0.00,1.00,0.00,0.00,1 +-13.21,0.00,1.00,0.00,1.00,0.00,0.00,1 +-15.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-17.56,0.00,1.00,0.00,1.00,0.00,0.00,1 +-19.72,0.00,1.00,0.00,1.00,0.00,0.00,1 +-21.87,0.00,1.00,0.00,1.00,0.00,0.00,1 +-24.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-26.13,0.00,1.00,0.00,1.00,0.00,0.00,1 +-28.23,0.00,1.00,0.00,1.00,0.00,0.00,1 +-30.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +-32.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-34.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +-36.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +-38.48,0.00,1.00,0.00,1.00,0.00,0.00,1 +-40.47,0.00,1.00,0.00,1.00,0.00,0.00,1 +-42.43,0.00,1.00,0.00,1.00,0.00,0.00,1 +-44.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +-46.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +-48.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-50.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-51.82,0.00,1.00,0.00,1.00,0.00,0.00,1 +-53.61,0.00,1.00,0.00,1.00,0.00,0.00,1 +-55.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +-57.10,0.00,1.00,0.00,1.00,0.00,0.00,1 +-58.79,0.00,1.00,0.00,1.00,0.00,0.00,1 +-60.44,0.00,1.00,0.00,1.00,0.00,0.00,1 +-62.06,0.00,1.00,0.00,1.00,0.00,0.00,1 +-63.64,0.00,1.00,0.00,1.00,0.00,0.00,1 +-65.18,0.00,1.00,0.00,1.00,0.00,0.00,1 +-66.69,0.00,1.00,0.00,1.00,0.00,0.00,1 +-68.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-69.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +-70.95,0.00,1.00,0.00,1.00,0.00,0.00,1 +-72.29,0.00,1.00,0.00,1.00,0.00,0.00,1 +-73.58,0.00,1.00,0.00,1.00,0.00,0.00,1 +-74.83,0.00,1.00,0.00,1.00,0.00,0.00,1 +-76.04,0.00,1.00,0.00,1.00,0.00,0.00,1 +-77.20,0.00,1.00,0.00,1.00,0.00,0.00,1 +-78.31,0.00,1.00,0.00,1.00,0.00,0.00,1 +-79.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +-80.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-81.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +-82.28,0.00,1.00,0.00,1.00,0.00,0.00,1 +-83.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-83.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +-84.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +-85.46,0.00,1.00,0.00,1.00,0.00,0.00,1 +-86.12,0.00,1.00,0.00,1.00,0.00,0.00,1 +-86.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +-87.30,0.00,1.00,0.00,1.00,0.00,0.00,1 +-87.81,0.00,1.00,0.00,1.00,0.00,0.00,1 +-88.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +-88.67,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.03,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.76,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.89,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +-90.00,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.89,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.76,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.57,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.32,0.00,1.00,0.00,1.00,0.00,0.00,1 +-89.03,0.00,1.00,0.00,1.00,0.00,0.00,1 +-88.67,0.00,1.00,0.00,1.00,0.00,0.00,1 +-88.27,0.00,1.00,0.00,1.00,0.00,0.00,1 +-87.81,0.00,1.00,0.00,1.00,0.00,0.00,1 +-87.30,0.00,1.00,0.00,1.00,0.00,0.00,1 +-86.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +-86.12,0.00,1.00,0.00,1.00,0.00,0.00,1 +-85.46,0.00,1.00,0.00,1.00,0.00,0.00,1 +-84.74,0.00,1.00,0.00,1.00,0.00,0.00,1 +-83.97,0.00,1.00,0.00,1.00,0.00,0.00,1 +-83.15,0.00,1.00,0.00,1.00,0.00,0.00,1 +-82.28,0.00,1.00,0.00,1.00,0.00,0.00,1 +-81.36,0.00,1.00,0.00,1.00,0.00,0.00,1 +-80.39,0.00,1.00,0.00,1.00,0.00,0.00,1 +-79.37,0.00,1.00,0.00,1.00,0.00,0.00,1 +-78.31,0.00,1.00,0.00,1.00,0.00,0.00,1 +-77.20,0.00,1.00,0.00,1.00,0.00,0.00,1 +-76.04,0.00,1.00,0.00,1.00,0.00,0.00,1 +-74.83,0.00,1.00,0.00,1.00,0.00,0.00,1 +-73.58,0.00,1.00,0.00,1.00,0.00,0.00,1 +-72.29,0.00,1.00,0.00,1.00,0.00,0.00,1 +-70.95,0.00,1.00,0.00,1.00,0.00,0.00,1 diff --git a/tests/conftest.py b/tests/conftest.py index ef5f46ffc9c13b590fee7485a18499c6b7daec4f..d7a35a36e03d2c55e7a50aeb1a2e66c482830574 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -196,7 +196,6 @@ class EncoderFrontend: sba_order: Optional[str] = None, dtx_mode: Optional[bool] = False, max_band: Optional[str] = None, - agc_op: Optional[int] = None, bypass_mode: Optional[int] = None, quiet_mode: Optional[bool] = True, add_option_list: Optional[list] = None, @@ -213,9 +212,6 @@ class EncoderFrontend: if max_band is not None: command.extend(["-max_band", max_band]) - if agc_op is not None: - command.extend(["-agc", str(agc_op)]) - if bypass_mode is not None: command.extend(["-bypass", str(bypass_mode)]) diff --git a/tests/renderer/README.md b/tests/renderer/README.md index 9748d8abf1f67f311eab36b6c80d23b19ae9905a..513bd0991164ff1f79e8c3fe0525cb9955f0d51b 100644 --- a/tests/renderer/README.md +++ b/tests/renderer/README.md @@ -1,3 +1,7 @@ +======================================== +THIS FOLDER WILL NOT BE PART OF DELIVERY +======================================== + # External Renderer Tests See also the [contribution page](https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec/-/wikis/Contributions/2-external-renderer) for related presentations. diff --git a/tests/renderer/__init__.py b/tests/renderer/__init__.py index c2c14754b4940b8f4ab39ef87a35a6356e5cab1a..8429fc9e1cd3947c33336e9c8825c7551a1edfd4 100644 --- a/tests/renderer/__init__.py +++ b/tests/renderer/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 Baseline Development Group with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 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. diff --git a/tests/renderer/compare_audio.py b/tests/renderer/compare_audio.py index bf3ce26c93f968ca9bf11d2b17fe7279b4d3d15c..3fc5c064a8e49b44e028b820502f40ab1ca9d619 100644 --- a/tests/renderer/compare_audio.py +++ b/tests/renderer/compare_audio.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 Baseline Development Group with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 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. diff --git a/tests/renderer/constants.py b/tests/renderer/constants.py index e29696adec8b0e1b58a74c69d4939bca4c8faaea..56b4d71e26de32cf12a9f16664808d5f8675a0c6 100644 --- a/tests/renderer/constants.py +++ b/tests/renderer/constants.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 Baseline Development Group with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 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. @@ -94,6 +94,7 @@ FORMAT_TO_FILE_SMOKETEST = { "ISM2": NCHAN_TO_FILE[2], "ISM3": NCHAN_TO_FILE[3], "ISM4": NCHAN_TO_FILE[4], + "NDP_ISM4": NCHAN_TO_FILE[4], # "ISM1": TEST_VECTOR_DIR.joinpath("spectral_test_ism1.txt"), # "ISM2": TEST_VECTOR_DIR.joinpath("spectral_test_ism2.txt"), # "ISM3": TEST_VECTOR_DIR.joinpath("spectral_test_ism3.txt"), @@ -148,6 +149,12 @@ FORMAT_TO_METADATA_FILES = { str(TESTV_DIR.joinpath("stvISM3.csv")), str(TESTV_DIR.joinpath("stvISM4.csv")), ], + "NDP_ISM4": [ + str(TESTV_DIR.joinpath("stvISM1.csv")), + str(TESTV_DIR.joinpath("stvISM2_non-diegetic-pan.csv")), + str(TESTV_DIR.joinpath("stvISM3.csv")), + str(TESTV_DIR.joinpath("stvISM4.csv")), + ], "MASA1": [str(TESTV_DIR.joinpath("stv1MASA1TC48c.met"))], "MASA2": [str(TESTV_DIR.joinpath("stv2MASA2TC48c.met"))], } diff --git a/tests/renderer/data/ism_0a_0e.csv b/tests/renderer/data/ism_0a_0e.csv index 7772c8c9169bc66f5c18ee25f78ce488eac3cc37..56a82f0fe379702d99a715eb2307ebb287590e92 100644 --- a/tests/renderer/data/ism_0a_0e.csv +++ b/tests/renderer/data/ism_0a_0e.csv @@ -1,750 +1,749 @@ -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 -0,0,1,0,1 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 +0,0,1,0,1,0,0,0 diff --git a/tests/renderer/test_renderer.py b/tests/renderer/test_renderer.py index 00ea239714a7239aa4331149d8a4bb9d7eecf309..38b7bbf9e743c4f479790c58a91e782623c806ca 100644 --- a/tests/renderer/test_renderer.py +++ b/tests/renderer/test_renderer.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 Baseline Development Group with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 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. @@ -441,3 +441,20 @@ def test_metadata(test_info, in_fmt, out_fmt): out_fmt, metadata_input=TEST_VECTOR_DIR.joinpath(f"{in_fmt}.txt"), ) + + +""" non diegetic pan """ + + +@pytest.mark.parametrize("out_fmt", ["STEREO"]) +@pytest.mark.parametrize("in_fmt", ["MONO"]) +@pytest.mark.parametrize("non_diegetic_pan", ["0", "-30", "45", "90", "-90"]) +def test_non_diegetic_pan_static(test_info, in_fmt, out_fmt, non_diegetic_pan): + run_renderer(in_fmt, out_fmt, non_diegetic_pan=non_diegetic_pan) + + +@pytest.mark.parametrize("out_fmt", ["STEREO"]) +@pytest.mark.parametrize("in_fmt", ["ISM1"]) +@pytest.mark.parametrize("non_diegetic_pan", ["0", "-30", "45", "90", "-90"]) +def test_non_diegetic_pan_ism_static(test_info, in_fmt, out_fmt, non_diegetic_pan): + run_renderer(in_fmt, out_fmt, non_diegetic_pan=non_diegetic_pan) diff --git a/tests/renderer/test_renderer_be_comparison.py b/tests/renderer/test_renderer_be_comparison.py index 815d7fd640b2d53dd5fffcc5f3402e3a8c552a52..460ded4250421168864976c3941e2c2fbab34561 100644 --- a/tests/renderer/test_renderer_be_comparison.py +++ b/tests/renderer/test_renderer_be_comparison.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 Baseline Development Group with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 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. @@ -203,3 +203,22 @@ def test_metadata(test_info, in_fmt, out_fmt): metadata_input=TEST_VECTOR_DIR.joinpath(f"{in_fmt}.txt"), is_comparetest=True, ) + + +""" non diegetic pan """ + + +# @pytest.mark.parametrize("out_fmt", ["STEREO"]) +# @pytest.mark.parametrize("in_fmt", ["MONO"]) +# @pytest.mark.parametrize("non_diegetic_pan", ["0", "-0.2", "0.5", "1", "-1"]) +# def test_non_diegetic_pan_static(test_info, in_fmt, out_fmt, non_diegetic_pan): +# compare_renderer_vs_mergetarget( +# test_info, in_fmt, out_fmt, non_diegetic_pan=non_diegetic_pan) + + +# @pytest.mark.parametrize("out_fmt", ["STEREO"]) +# @pytest.mark.parametrize("in_fmt", ["ISM1"]) +# @pytest.mark.parametrize("non_diegetic_pan", ["0", "-0.2", "0.5", "1", "-1"]) +# def test_non_diegetic_pan_ism_static(test_info, in_fmt, out_fmt, non_diegetic_pan): +# compare_renderer_vs_mergetarget( +# test_info, in_fmt, out_fmt, non_diegetic_pan=non_diegetic_pan) diff --git a/tests/renderer/utils.py b/tests/renderer/utils.py index d2af91f60cdceb41d6f236cf46abdb94e06e919f..356902ff47674ff111dbe7541bde3bac8e24bf4e 100644 --- a/tests/renderer/utils.py +++ b/tests/renderer/utils.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 Baseline Development Group with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 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. @@ -105,6 +105,7 @@ def run_renderer( metadata_input: Optional[str] = None, in_meta_files: Optional[list] = None, trj_file: Optional[str] = None, + non_diegetic_pan: Optional[str] = None, name_extension: Optional[str] = None, refrot_file: Optional[str] = None, refvec_file: Optional[str] = None, @@ -162,7 +163,11 @@ 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}{refrot_name}{refvec_name}{refveclev_name}{config_name}{name_extension}.wav")) + out_file = str( + output_path_base.joinpath( + f"{in_name}_to_{out_name}{trj_name}{non_diegetic_pan}{refrot_name}{refvec_name}{refveclev_name}{config_name}{name_extension}.wav" + ) + ) cmd = RENDERER_CMD[:] cmd[2] = str(in_file) @@ -178,6 +183,8 @@ def run_renderer( if trj_file is not None: cmd.extend(["-tf", str(trj_file)]) + if non_diegetic_pan is not None: + cmd.extend(["-non_diegetic_pan", str(non_diegetic_pan)]) if refrot_file is not None: cmd.extend(["-rf", str(refrot_file)]) cmd.extend(["-otr", "ref"]) @@ -197,56 +204,6 @@ def run_renderer( return pyaudio3dtools.audiofile.readfile(out_file) - -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: - 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 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 - elif isinstance(in_fmt, Path): - 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}.wav")) - - pyaudio3dtools.spatialaudioconvert.spatial_audio_convert( - in_file, - out_file, - in_format=in_fmt, - out_format=out_fmt, - in_meta_files=in_meta_files, - trajectory=trj_file, - limit_output=True, - ) - - return pyaudio3dtools.audiofile.readfile(out_file) - - def compare_renderer_vs_mergetarget(test_info, in_fmt, out_fmt, **kwargs): ref, ref_fs = run_renderer( in_fmt, diff --git a/tests/test_sba_bs_dec_plc.py b/tests/test_sba_bs_dec_plc.py index 4920a9c59cec4cae613850989fb2802065dbf37a..bead7cda93796a66ea8ba83d5ff487e9d47f7975 100644 --- a/tests/test_sba_bs_dec_plc.py +++ b/tests/test_sba_bs_dec_plc.py @@ -45,9 +45,9 @@ from conftest import DecoderFrontend tag_list = ['stvFOA'] plc_patterns = ['PLperc12mblen5', 'PLperc40mblen50', 'PLperc42mblen2'] dtx_set = ['0', '1'] -ivas_br_list = ['32000', '64000', '96000', '256000'] +ivas_br_list = ['13200','16400','32000', '64000', '96000', '256000'] sampling_rate_list = ['48', '32', '16'] -agc_list = [-1, 0, 1] +gain_list = [0, 1] AbsTol = '0' @@ -73,7 +73,7 @@ def check_and_makedir(dir_path): @pytest.mark.parametrize("tag", tag_list) @pytest.mark.parametrize("plc_pattern", plc_patterns) @pytest.mark.parametrize("fs", sampling_rate_list) -@pytest.mark.parametrize("agc", agc_list) +@pytest.mark.parametrize("gain_flag", gain_list) def test_sba_plc_system( dut_decoder_frontend: DecoderFrontend, test_vector_path, @@ -87,12 +87,19 @@ def test_sba_plc_system( tag, plc_pattern, fs, - agc + gain_flag ): - if dtx == '1' and ivas_br not in ['32000', '64000']: + SID = 0 + if dtx == '1' and ivas_br not in ['13200','16400','24400','32000', '64000']: # skip high bitrates for DTX until DTX issue is resolved pytest.skip() - + if ivas_br == '13200' or ivas_br == '16400': + if dtx == '1' and gain_flag == 0 and fs != '16': + SID = 1 + else: + pytest.skip() + if gain_flag == 1 and ivas_br not in ['13200','16400','24400','32000']: + pytest.skip() tag = tag + fs + 'c' # dec @@ -106,9 +113,10 @@ def test_sba_plc_system( fs, ivas_br, dtx, + SID, plc_pattern, update_ref, - agc, + gain_flag, keep_files, ) @@ -125,17 +133,18 @@ def sba_dec_plc( sampling_rate, ivas_br, dtx, + SID, plc_pattern, update_ref, - agc, + gain_flag, keep_files, ): # ------------ run cmd ------------ tag_out = f"{tag}_ivasbr{ivas_br[:-3]}k_DTX{dtx}" - if agc != -1: - tag_out += f'_AGC{agc}' + if gain_flag == 1: + tag_out += f'_Gain{gain_flag}' plc_tag_out = f"{tag_out}_{plc_pattern}" dut_out_dir = f"{dut_base_path}/sba_bs/raw" @@ -147,6 +156,9 @@ def sba_dec_plc( plc_file = f"{test_vector_path}/{plc_pattern}.g192" ref_in_pkt = f"{reference_path}/sba_bs/pkt/{tag_out}.pkt" ref_in_pkt_dutenc = f"{reference_path}/sba_bs/pkt/{tag_out}_dutenc.pkt" + if SID == 1: + ref_in_pkt = f"{reference_path}/sba_bs/pkt/{tag_out}_SID_cut.pkt" + ref_in_pkt_dutenc = f"{reference_path}/sba_bs/pkt/{tag_out}_SID_dutenc_cut.pkt" dut_out_raw = f"{dut_out_dir}/{plc_tag_out}.raw" ref_out_raw = f"{ref_out_dir}/{plc_tag_out}.raw" diff --git a/tests/test_sba_bs_enc.py b/tests/test_sba_bs_enc.py index 6825ee12ba3d162a21759cbab87d8a8aa8d2aaaa..09baebc9e1ecfb0eb16c6d4b3c9b44c03c492b34 100644 --- a/tests/test_sba_bs_enc.py +++ b/tests/test_sba_bs_enc.py @@ -42,8 +42,9 @@ import pytest from cmp_pcm import cmp_pcm from cut_pcm import cut_samples from conftest import EncoderFrontend, DecoderFrontend - +from cut_bs import cut_bs # params + tag_list = ['stvFOA'] tag_list_HOA2 = ['stv2OA'] tag_list_HOA3 = ['stv3OA'] @@ -53,13 +54,13 @@ 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','sw_24k4_256k.bin'] +ivas_br_FOA = ['13200','16400','32000','64000', '96000', '160000', '256000', '384000', '512000','sw_24k4_256k.bin'] ivas_br_HOA2 = ['256000', '384000', '512000'] ivas_br_HOA3 = ['256000', '384000', '512000'] sample_rate_list = ['48', '32', '16'] bypass_list = [1, 2] -agc_list = [-1, 0, 1] +gain_list = [0, 1] sample_rate_bw_idx_list = [('48', 'SWB'), ('48', 'WB'), ('32', 'WB')] @@ -100,7 +101,7 @@ def test_bypass_enc( ivas_br = '256000' dtx = '0' max_bw = "FB" - agc = -1 + gain_flag = -1 sba_order = "+1" output_config = "FOA" @@ -116,11 +117,12 @@ def test_bypass_enc( fs, ivas_br, dtx, + None, max_bw, bypass, - agc, sba_order, update_ref, + gain_flag, cut_testv=True ) @@ -134,11 +136,12 @@ def test_bypass_enc( fs, ivas_br, dtx, + None, max_bw, bypass, - agc, output_config, update_ref, + gain_flag, keep_files, ) @@ -148,7 +151,7 @@ def test_bypass_enc( @pytest.mark.parametrize("dtx", dtx_set) @pytest.mark.parametrize("tag", tag_list) @pytest.mark.parametrize("fs", sample_rate_list) -@pytest.mark.parametrize("agc", agc_list) +@pytest.mark.parametrize("gain_flag", gain_list) def test_sba_enc_system( dut_encoder_frontend: EncoderFrontend, dut_decoder_frontend: DecoderFrontend, @@ -164,20 +167,27 @@ def test_sba_enc_system( dtx, tag, fs, - agc, + gain_flag, ): - if dtx == '1' and ivas_br not in ['32000', '64000']: + SID = 0 + if dtx == '1' and ivas_br not in ['13200','16400','24400','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() - + if ivas_br == 'sw_24k4_256k.bin' and gain_flag != 1: + pytest.skip() + if ivas_br == '13200' or ivas_br == '16400': + if dtx == '1' and gain_flag == 0 and fs != '16': + SID = 1 + else: + pytest.skip() + if gain_flag == 1 and ivas_br not in ['13200','16400','24400','32000']: + pytest.skip() tag = tag + fs + 'c' max_bw = "FB" bypass = -1 sba_order = "+1" output_config = "FOA" - if agc == 1: + if gain_flag == 1: cut_gain = "16.0" elif dtx == '1': cut_gain = ".004" @@ -195,11 +205,12 @@ def test_sba_enc_system( fs, ivas_br, dtx, + SID, max_bw, bypass, - agc, sba_order, update_ref, + gain_flag, cut_gain=cut_gain, create_dutenc=True, cut_testv=True @@ -215,11 +226,12 @@ def test_sba_enc_system( fs, ivas_br, dtx, + SID, max_bw, bypass, - agc, output_config, update_ref, + gain_flag, keep_files, ) @@ -242,7 +254,7 @@ def test_spar_hoa2_enc_system( ): fs = '48' dtx = '0' - agc = -1 + gain_flag = -1 tag = tag + fs + 'c' max_bw = "FB" @@ -262,11 +274,12 @@ def test_spar_hoa2_enc_system( fs, ivas_br, dtx, + None, max_bw, bypass, - agc, sba_order, update_ref, + gain_flag, ) # dec @@ -279,11 +292,12 @@ def test_spar_hoa2_enc_system( fs, ivas_br, dtx, + None, max_bw, bypass, - agc, output_config, update_ref, + gain_flag, keep_files, ) @@ -306,7 +320,7 @@ def test_spar_hoa3_enc_system( ): fs = '48' dtx = '0' - agc = -1 + gain_flag = -1 tag = tag + fs + 'c' max_bw = "FB" @@ -326,11 +340,12 @@ def test_spar_hoa3_enc_system( fs, ivas_br, dtx, + None, max_bw, bypass, - agc, sba_order, update_ref, + gain_flag, ) # dec @@ -343,11 +358,12 @@ def test_spar_hoa3_enc_system( fs, ivas_br, dtx, + None, max_bw, bypass, - agc, output_config, update_ref, + gain_flag, keep_files, ) @@ -372,16 +388,18 @@ def test_sba_enc_BWforce_system( tag, sample_rate_bw_idx, ): - if dtx == '1' and ivas_br not in ['32000', '64000']: + 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 == '13200' or ivas_br == '16400': + 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' bypass = -1 - agc = -1 + gain_flag = -1 sba_order = "+1" output_config = "FOA" @@ -397,11 +415,12 @@ def test_sba_enc_BWforce_system( fs, ivas_br, dtx, + None, bw, bypass, - agc, sba_order, update_ref, + gain_flag, cut_testv=True ) @@ -415,11 +434,12 @@ def test_sba_enc_BWforce_system( fs, ivas_br, dtx, + None, bw, bypass, - agc, output_config, update_ref, + gain_flag, keep_files, ) @@ -437,11 +457,12 @@ def sba_enc( sampling_rate, ivas_br, dtx, + SID, ivas_max_bw, bypass, - agc, sba_order, update_ref, + gain_flag, cut_gain='1.0', create_dutenc=False, cut_testv=False @@ -466,20 +487,28 @@ def sba_enc( 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}' + if gain_flag == 1: + short_tag_ext += f'_Gain{gain_flag}' + if SID == 1: + short_tag_ext += f'_SID' # we update only bypass = 0/2 (bypass 1 is the same as the baseline) if bypass in [0, 2]: short_tag_ext += f"_pca{bypass}" # to avoid conflicting names in case of parallel test execution, differentiate all cases - long_tag_ext = f"_AGC{agc}" if agc != -1 else "_AGC-unspecified" - long_tag_ext += f"_pca{bypass}" + if gain_flag == 1: + long_tag_ext = f"_Gain{gain_flag}" + else: + long_tag_ext = f"_pca{bypass}" + if SID == 1: + long_tag_ext += f"_SID" dut_pkt_file = f"{dut_out_dir}/{tag_out}{long_tag_ext}.pkt" ref_pkt_file = f"{ref_out_dir}/{tag_out}{short_tag_ext}.pkt" ref_pkt_file_dutenc = f"{ref_out_dir}/{tag_out}{short_tag_ext}_dutenc.pkt" - + if SID == 1: + dut_pkt_file_cut = f"{dut_out_dir}/{tag_out}{long_tag_ext}_cut.pkt" + ref_pkt_file_cut = f"{ref_out_dir}/{tag_out}{short_tag_ext}_cut.pkt" + ref_pkt_file_dutenc_cut = f"{ref_out_dir}/{tag_out}{short_tag_ext}_dutenc_cut.pkt" input_path = f"{test_vector_path}/{tag_in}{in_extension}" - agc_op = agc if agc != -1 else None bypass_mode = bypass if bypass >= 0 else None dtx_mode = dtx == '1' @@ -507,7 +536,6 @@ def sba_enc( ref_pkt_file, sba_order=sba_order, max_band=ivas_max_bw, - agc_op=agc_op, bypass_mode=bypass_mode, dtx_mode=dtx_mode, ) @@ -520,7 +548,6 @@ def sba_enc( ref_pkt_file_dutenc, sba_order=sba_order, max_band=ivas_max_bw, - agc_op=agc_op, bypass_mode=bypass_mode, dtx_mode=dtx_mode, ) @@ -534,12 +561,25 @@ def sba_enc( dut_pkt_file, sba_order=sba_order, max_band=ivas_max_bw, - agc_op=agc_op, bypass_mode=bypass_mode, dtx_mode=dtx_mode, ) - + if SID == 1: + if ref_encoder_path: + with open(ref_pkt_file, "rb") as fp_in: + with open(ref_pkt_file_cut, "wb") as fp_out: + fr_cnt, cut_cnt = cut_bs(fp_in, fp_out, 0, True) + with open(ref_pkt_file_dutenc, "rb") as fp_in: + with open(ref_pkt_file_dutenc_cut, "wb") as fp_out: + fr_cnt, cut_cnt = cut_bs(fp_in, fp_out, 0, True) + os.remove(ref_pkt_file) + os.remove(ref_pkt_file_dutenc) + if update_ref == 0: + with open(dut_pkt_file, "rb") as fp_in: + with open(dut_pkt_file_cut, "wb") as fp_out: + fr_cnt, cut_cnt = cut_bs(fp_in, fp_out, 0, True) + os.remove(dut_pkt_file) def sba_dec( decoder_frontend, ref_decoder_path, @@ -549,11 +589,12 @@ def sba_dec( sampling_rate, ivas_br, dtx, + SID, ivas_max_bw, bypass, - agc, output_config, update_ref, + gain_flag, keep_files, ): @@ -566,16 +607,20 @@ def sba_dec( tag_out = f"{tag}_ivasbr{ivas_br[:-3]}k_DTX{dtx}" short_tag_ext = "" - if agc != -1: - short_tag_ext += f'_AGC{agc}' + if gain_flag == 1: + short_tag_ext += f'_Gain{gain_flag}' # we update only bypass = 0/2 (bypass 1 is the same as the baseline) if bypass in [0, 2]: short_tag_ext += f"_pca{bypass}" - + if SID == 1: + short_tag_ext += f'_SID_cut' # to avoid conflicting names in case of parallel test execution, differentiate all cases - long_tag_ext = f"_AGC{agc}" if agc != -1 else "_AGC-unspecified" - long_tag_ext += f"_pca{bypass}" - + if gain_flag == 1: + long_tag_ext = f"_Gain{gain_flag}" + else: + long_tag_ext = f"_pca{bypass}" + if SID == 1: + long_tag_ext += f"_SID_cut" dut_out_dir = f"{dut_base_path}/sba_bs/raw" ref_out_dir = f"{reference_path}/sba_bs/raw"