diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6d00b37f0adee3da393e90d43e23046c7120dfb4..7ce29dfd65b178d2be3fbaaaaef1cad592537bbc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,6 +49,13 @@ stages: echo "Commit time was $CI_COMMIT_TIMESTAMP" date | xargs echo "System time is" +.print-common-info-windows: &print-common-info-windows + - | + echo "Printing common information for build job." + echo "Current job is run on commit $CI_COMMIT_SHA" + echo "Commit time was $CI_COMMIT_TIMESTAMP" + ("echo 'System time is'", "Get-Date -Format 'dddd dd/MM/yyyy HH:mm K'") | Invoke-Expression + .get-previous-merge-commit-sha: &get-previous-merge-commit-sha - previous_merge_commit=$(git --no-pager log --merges HEAD~1 -n 1 --pretty=format:%H) @@ -156,6 +163,11 @@ stages: tags: - ivas-linux +.build-job-windows: + stage: build + timeout: "4 minutes" + tags: + - ivas-windows # template for test jobs on linux that need the TESTV_DIR .test-job-linux-needs-testv-dir: @@ -172,6 +184,12 @@ stages: exit_codes: - 123 +.build-job-windows-with-check-for-warnings: + extends: .build-job-windows + stage: build + allow_failure: + exit_codes: + - 123 # --------------------------------------------------------------- @@ -262,6 +280,31 @@ build-codec-sanitizers-linux: - *print-common-info - bash ci/build_codec_sanitizers_linux.sh +build-codec-windows-cmake: + extends: + - .build-job-windows-with-check-for-warnings + - .rules-basis + script: + - *print-common-info-windows + - $winoutdata = $null + - cmake -G "Visual Studio 15 2017" . -Bbuild + - cmake --build build -j | tee -variable winoutdata + - $winoutdata | Out-File $BUILD_OUTPUT -Encoding Utf8 + - ("& python ci/check_for_warnings.py '$BUILD_OUTPUT'") | Invoke-Expression + - ("exit $LASTEXITCODE") | Invoke-Expression + +build-codec-windows-msbuild: + extends: + - .build-job-windows-with-check-for-warnings + - .rules-basis + script: + - *print-common-info-windows + - $winoutdata = $null + - MSBuild.exe .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug | tee -variable winoutdata + - $winoutdata | Out-File $BUILD_OUTPUT -Encoding Utf8 + - ("& python ci/check_for_warnings.py '$BUILD_OUTPUT'") | Invoke-Expression + - ("exit $LASTEXITCODE") | Invoke-Expression + # --------------------------------------------------------------- # Test jobs for merge requests # --------------------------------------------------------------- @@ -740,13 +783,13 @@ codec-comparison-on-main-push: .sanitizer-test-schedule-A: extends: - .sanitizer-test-template - timeout: 2 hours 30 minutes sanitizer-test-mono: extends: .sanitizer-test-schedule-A rules: - if: $SANITIZER_SCHEDULE_A + timeout: 2 hour script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py mono mono --tests $SANITIZER_TESTS @@ -756,7 +799,8 @@ sanitizer-test-stereo: rules: - if: $SANITIZER_SCHEDULE_A when: delayed - start_in: 2 hours 30 minutes + start_in: 2 hour + timeout: 2 hour script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py stereo $OUT_FORMATS_CHANNEL_BASED --tests $SANITIZER_TESTS @@ -766,7 +810,8 @@ sanitizer-test-stereodmxevs: rules: - if: $SANITIZER_SCHEDULE_A when: delayed - start_in: 5 hours + start_in: 4 hours + timeout: 2 hour script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py StereoDmxEVS mono --tests $SANITIZER_TESTS @@ -776,7 +821,8 @@ sanitizer-test-ism1: rules: - if: $SANITIZER_SCHEDULE_A when: delayed - start_in: 7 hours 30 minutes + start_in: 6 hours + timeout: 2 hours script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py ISM1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS @@ -786,7 +832,8 @@ sanitizer-test-ism2: rules: - if: $SANITIZER_SCHEDULE_A when: delayed - start_in: 10 hours + start_in: 8 hours + timeout: 3 hours script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py ISM2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS @@ -796,7 +843,8 @@ sanitizer-test-ism3: rules: - if: $SANITIZER_SCHEDULE_A when: delayed - start_in: 12 hours 30 minutes + start_in: 11 hours + timeout: 3 hour script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py ISM3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS @@ -806,7 +854,8 @@ sanitizer-test-ism4: rules: - if: $SANITIZER_SCHEDULE_A when: delayed - start_in: 15 hours + start_in: 14 hours + timeout: 4 hours script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py ISM4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS @@ -816,7 +865,8 @@ sanitizer-test-masa: rules: - if: $SANITIZER_SCHEDULE_A when: delayed - start_in: 17 hours 30 minutes + start_in: 18 hours + timeout: 3 hours script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py MASA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS @@ -1015,7 +1065,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 d55896b03c15d1abb812a1272349ca3bc434a20a..23aa2ae3f0b6722871f7f9d2c37b27e41f46862f 100644 --- a/Workspace_msvc/lib_com.vcxproj +++ b/Workspace_msvc/lib_com.vcxproj @@ -244,9 +244,9 @@ + - diff --git a/Workspace_msvc/lib_com.vcxproj.filters b/Workspace_msvc/lib_com.vcxproj.filters index baa170036182d9c8edf122cf87895890bff4348a..7b6854e7184cd0ec212f9819aa783944db688a6a 100644 --- a/Workspace_msvc/lib_com.vcxproj.filters +++ b/Workspace_msvc/lib_com.vcxproj.filters @@ -379,9 +379,6 @@ common_evs_c - - common_ivas_c - common_ivas_c @@ -466,6 +463,9 @@ common_ivas_c + + common_ivas_c + diff --git a/Workspace_msvc/lib_util.vcxproj b/Workspace_msvc/lib_util.vcxproj index 32bebc753654bfa97481586598e171fdb5e9451b..5b5e5f30ccdc3697e60b72e2b74750fe06e90598 100644 --- a/Workspace_msvc/lib_util.vcxproj +++ b/Workspace_msvc/lib_util.vcxproj @@ -146,6 +146,7 @@ + @@ -167,6 +168,7 @@ + diff --git a/apps/decoder.c b/apps/decoder.c index af9a847aab28d08844bc1860e1b4a3460206c226..22dc235fff728ec606d58391b20e72d04e625efc 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -42,6 +42,7 @@ #include "ls_custom_file_reader.h" #include "hrtf_file_reader.h" #include "head_rotation_file_reader.h" +#include "vector3_pair_file_reader.h" #include "jbm_file_writer.h" #include "evs_rtp_payload.h" #ifdef DEBUGGING @@ -69,9 +70,11 @@ static #define MAX_NUM_OUTPUT_CHANNELS 16 #define MAX_OUTPUT_PCM_BUFFER_SIZE ( MAX_NUM_OUTPUT_CHANNELS * MAX_FRAME_SIZE ) -#define IVAS_PUBLIC_ORIENT_TRK_REF 0 -#define IVAS_PUBLIC_ORIENT_TRK_AVG 1 - +#define IVAS_PUBLIC_ORIENT_TRK_NONE ( 0 ) +#define IVAS_PUBLIC_ORIENT_TRK_REF ( 1 ) +#define IVAS_PUBLIC_ORIENT_TRK_AVG ( 2 ) +#define IVAS_PUBLIC_ORIENT_TRK_REF_VEC ( 3 ) +#define IVAS_PUBLIC_ORIENT_TRK_REF_VEC_LEV ( 4 ) typedef struct { @@ -85,6 +88,10 @@ typedef struct bool voipMode; bool enableHeadRotation; char *headrotTrajFileName; + bool enableReferenceRotation; + char *refrotTrajFileName; + bool enableReferenceVectorTracking; + char *referenceVectorTrajFileName; #ifdef SUPPORT_JBM_TRACEFILE char *jbmTraceFilename; #endif @@ -104,9 +111,6 @@ typedef struct char *renderConfigFilename; #ifdef DEBUGGING -#ifndef REMOVE_FORCE_SUBFRAME_BIN - bool forceSubframeBinauralization; -#endif IVAS_DEC_FORCED_REND_MODE forcedRendMode; #ifdef DEBUG_FOA_AGC FILE *agcBitstream; /* temporary */ @@ -123,7 +127,7 @@ typedef struct static bool parseCmdlIVAS_dec( int16_t argc, char **argv, DecArguments *arg ); static void usage_dec( void ); -static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, HeadRotFileReader *headRotReader, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf ); +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 DEBUGGING static ivas_error printBitstreamInfoVoip( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec ); @@ -149,6 +153,8 @@ int main( LsCustomFileReader *hLsCustomReader = NULL; hrtfFileReader *hrtfReader = NULL; HeadRotFileReader *headRotReader = NULL; + HeadRotFileReader *refRotReader = NULL; + Vector3PairFileReader *referenceVectorReader = NULL; ivas_error error = IVAS_ERR_UNKNOWN; int16_t pcmBuf[MAX_OUTPUT_PCM_BUFFER_SIZE]; RenderConfigReader *renderConfigReader = NULL; @@ -222,7 +228,6 @@ int main( if ( arg.hrtfReaderEnabled ) { -#ifdef FIX_351_HRTF_COMMAND /* sanity check */ if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM ) { @@ -230,13 +235,10 @@ int main( fprintf( stderr, "\nError: HRTF binary file cannot be used in this output configuration.\n\n" ); goto cleanup; } -#endif if ( ( error = hrtfFileReader_open( arg.hrtfFileName, &hrtfReader ) ) != IVAS_ERR_OK ) { -#ifdef FIX_351_HRTF_COMMAND arg.hrtfReaderEnabled = false; -#endif fprintf( stderr, "\nError: Can't open HRTF binary file %s \n\n", arg.hrtfFileName ); goto cleanup; } @@ -248,14 +250,12 @@ int main( if ( arg.enableHeadRotation ) { -#ifdef FIX_351_HRTF_COMMAND /* sanity check */ if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM ) { fprintf( stderr, "\nError: Head-rotation file file cannot be used in this output configuration.\n\n" ); goto cleanup; } -#endif if ( ( error = HeadRotationFileReader_open( arg.headrotTrajFileName, &headRotReader ) ) != IVAS_ERR_OK ) { @@ -264,6 +264,60 @@ int main( } } + /*------------------------------------------------------------------------------------------* + * Open reference rotation file + *------------------------------------------------------------------------------------------*/ + + if ( arg.enableReferenceRotation ) + { + /* sanity check */ + if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM ) + { + fprintf( stderr, "\nError: Reference rotation file cannot be used in this output configuration.\n\n" ); + goto cleanup; + } + + /* sanity check */ + if ( arg.orientation_tracking != IVAS_PUBLIC_ORIENT_TRK_REF ) + { + fprintf( stderr, "\nError: Reference rotation file can be used in '-otr ref' mode only.\n\n" ); + goto cleanup; + } + + if ( ( error = HeadRotationFileReader_open( arg.refrotTrajFileName, &refRotReader ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError: Can't open reference rotation file %s \n\n", arg.refrotTrajFileName ); + goto cleanup; + } + } + + /*------------------------------------------------------------------------------------------* + * Open reference vector trajectory file + *------------------------------------------------------------------------------------------*/ + + if ( arg.enableReferenceVectorTracking ) + { + /* sanity check */ + if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM ) + { + fprintf( stderr, "\nError: Reference vector trajectory file cannot be used in this output configuration.\n\n" ); + goto cleanup; + } + + /* sanity check */ + if ( arg.orientation_tracking != IVAS_PUBLIC_ORIENT_TRK_REF_VEC && arg.orientation_tracking != IVAS_PUBLIC_ORIENT_TRK_REF_VEC_LEV ) + { + fprintf( stderr, "\nError: Reference trajectory file can be used in '-otr ref_vec' or '-otr ref_vec_lev' mode only.\n\n" ); + goto cleanup; + } + + if ( ( error = Vector3PairFileReader_open( arg.referenceVectorTrajFileName, &referenceVectorReader ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError: Can't open reference vector trajectory file %s \n\n", arg.referenceVectorTrajFileName ); + goto cleanup; + } + } + /*------------------------------------------------------------------------------------------* * Open custom loudspeaker layout file *------------------------------------------------------------------------------------------*/ @@ -283,14 +337,12 @@ int main( if ( arg.renderConfigEnabled ) { -#ifdef FIX_351_HRTF_COMMAND /* sanity check */ if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM ) { fprintf( stderr, "\nError: Renderer configuration file cannot be used in this output configuration.\n\n" ); goto cleanup; } -#endif if ( ( error = RenderConfigReader_open( arg.renderConfigFilename, &renderConfigReader ) ) != IVAS_ERR_OK ) { @@ -303,23 +355,7 @@ int main( * Configure the decoder *------------------------------------------------------------------------------------------*/ -#ifdef REMOVE_FORCE_SUBFRAME_BIN if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.renderConfigEnabled ) ) != IVAS_ERR_OK ) -#else -#ifdef DEBUGGING -#ifdef FIX_351_HRTF_COMMAND - if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.renderConfigEnabled, arg.forceSubframeBinauralization ) ) != IVAS_ERR_OK ) -#else - if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.forceSubframeBinauralization ) ) != IVAS_ERR_OK ) -#endif -#else -#ifdef FIX_351_HRTF_COMMAND - if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.renderConfigEnabled ) ) != IVAS_ERR_OK ) -#else - if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation ) ) != IVAS_ERR_OK ) -#endif -#endif -#endif { fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) ); goto cleanup; @@ -425,9 +461,9 @@ int main( IVAS_RENDER_CONFIG_DATA renderConfig; /* sanity check */ - if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM ) + if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL ) { - fprintf( stderr, "\nExternal Renderer Config is supported only when BINAURAL_ROOM is used as output. Exiting. \n\n" ); + fprintf( stderr, "\nExternal Renderer Config is supported only for BINAURAL and BINAURAL_ROOM. Exiting. \n\n" ); goto cleanup; } @@ -530,7 +566,7 @@ int main( } else { - error = decodeG192( arg, hBsReader, headRotReader, hIvasDec, pcmBuf ); + error = decodeG192( arg, hBsReader, headRotReader, refRotReader, referenceVectorReader, hIvasDec, pcmBuf ); } if ( error == IVAS_ERR_OK || error == IVAS_ERR_END_OF_FILE ) @@ -586,7 +622,8 @@ cleanup: CustomLsReader_close( &hLsCustomReader ); hrtfFileReader_close( &hrtfReader ); HeadRotationFileReader_close( &headRotReader ); - + HeadRotationFileReader_close( &refRotReader ); + Vector3PairFileReader_close( &referenceVectorReader ); RenderConfigReader_close( &renderConfigReader ); if ( BS_Reader_Close( &hBsReader ) != IVAS_ERR_OK ) @@ -710,9 +747,6 @@ static bool parseCmdlIVAS_dec( float ftmp; arg->forcedRendMode = IVAS_DEC_FORCE_REND_UNFORCED; -#ifndef REMOVE_FORCE_SUBFRAME_BIN - arg->forceSubframeBinauralization = false; -#endif #ifdef DEBUG_FOA_AGC arg->agcBitstream = NULL; #endif @@ -726,7 +760,11 @@ static bool parseCmdlIVAS_dec( arg->enableHeadRotation = false; arg->headrotTrajFileName = NULL; - arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_REF; + arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_NONE; + arg->enableReferenceRotation = false; + arg->headrotTrajFileName = NULL; + arg->enableReferenceVectorTracking = false; + arg->referenceVectorTrajFileName = NULL; #ifdef SUPPORT_JBM_TRACEFILE arg->jbmTraceFilename = NULL; @@ -864,18 +902,9 @@ static bool parseCmdlIVAS_dec( i++; } } -#ifndef REMOVE_FORCE_SUBFRAME_BIN - else if ( strcmp( argv_to_upper, "-FORCE_SUBFRAME_BIN" ) == 0 ) /* Force binauralization to subframe (5 ms) resolution */ - { - arg->forceSubframeBinauralization = true; - i++; - } -#endif #ifdef DEBUG_MODE_INFO #ifdef DEBUG_MODE_INFO_TWEAK - /*-----------------------------------------------------------------* - * Define additional subfolder for debug info output in ./res - *-----------------------------------------------------------------*/ + /* Define additional subfolder for debug info output in ./res */ else if ( strcmp( argv_to_upper, "-INFO" ) == 0 ) { extern char infoFolder[FILENAME_MAX]; @@ -908,18 +937,16 @@ static bool parseCmdlIVAS_dec( } else if ( strcmp( argv_to_upper, "-OTR" ) == 0 ) { - if ( strlen( argv[i + 1] ) > 3 ) - { - fprintf( stderr, "Error: Invalid orientation tracking type %s \n\n", argv[i + 1] ); - usage_dec(); - return false; - } strncpy( argv_to_upper, argv[i + 1], sizeof( argv_to_upper ) - 1 ); argv_to_upper[sizeof( argv_to_upper ) - 1] = '\0'; to_upper( argv_to_upper ); - if ( strcmp( argv_to_upper, "REF" ) == 0 ) + if ( strcmp( argv_to_upper, "NONE" ) == 0 ) + { + arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_NONE; + } + else if ( strcmp( argv_to_upper, "REF" ) == 0 ) { arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_REF; } @@ -927,6 +954,14 @@ static bool parseCmdlIVAS_dec( { arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_AVG; } + else if ( strcmp( argv_to_upper, "REF_VEC" ) == 0 ) + { + arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_REF_VEC; + } + else if ( strcmp( argv_to_upper, "REF_VEC_LEV" ) == 0 ) + { + arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_REF_VEC_LEV; + } else { fprintf( stderr, "Error: Invalid orientation tracking type %s \n\n", argv[i + 1] ); @@ -935,6 +970,36 @@ static bool parseCmdlIVAS_dec( } i += 2; } + else if ( strcmp( argv_to_upper, "-RF" ) == 0 ) + { + arg->enableReferenceRotation = true; + i++; + + if ( argc - i <= 4 || argv[i][0] == '-' ) + { + fprintf( stderr, "Error: Reference rotation file name not specified!\n\n" ); + usage_dec(); + return false; + } + + arg->refrotTrajFileName = argv[i]; + i++; + } + else if ( strcmp( argv_to_upper, "-RVF" ) == 0 ) + { + arg->enableReferenceVectorTracking = true; + i++; + + if ( argc - i <= 4 || argv[i][0] == '-' ) + { + fprintf( stderr, "Error: reference vector trajectory file name not specified!\n\n" ); + usage_dec(); + return false; + } + + arg->referenceVectorTrajFileName = argv[i]; + i++; + } else if ( strcmp( argv_to_upper, "-RENDER_CONFIG" ) == 0 ) { arg->renderConfigEnabled = true; @@ -1117,13 +1182,20 @@ static void usage_dec( void ) fprintf( stdout, " Format files, the magic word in the mime file is used to determine\n" ); fprintf( stdout, " which of the two supported formats is in use.\n" ); fprintf( stdout, " default bitstream file format is G.192\n" ); - fprintf( stdout, "-T File : Head rotation specified by external trajectory File\n" ); fprintf( stdout, "-hrtf File : HRTF filter File used in BINAURAL output configuration\n" ); + fprintf( stdout, "-T File : Head rotation specified by external trajectory File\n" ); + fprintf( stdout, "-otr tracking_type : Head orientation tracking type: 'none', 'ref', 'avg', 'ref_vec' \n" ); + fprintf( stdout, " or 'ref_vec_lev' (only for binaural rendering)\n" ); + fprintf( stdout, "-rf File : Reference rotation specified by external trajectory file\n" ); + fprintf( stdout, " works only in combination with '-otr ref' mode \n" ); + fprintf( stdout, "-rvf File : Reference vector specified by external trajectory file\n" ); + fprintf( stdout, " works only in combination with '-otr ref_vec' and 'ref_vec_lev' modes\n" ); + fprintf( stdout, "-render_config File : Renderer configuration File\n" ); + fprintf( stdout, "-no_diegetic_pan : panning mono non-diegetic sound to stereo -1<= pan <=1,\n" ); + fprintf( stdout, " left or l or 1->left, right or r or -1->right, center or c or 0->middle\n" ); + fprintf( stdout, "-q : Quiet mode, no frame counter\n" ); + fprintf( stdout, " default is deactivated\n" ); #ifdef DEBUGGING -#ifndef REMOVE_FORCE_SUBFRAME_BIN - fprintf( stdout, "-force_subframe_bin : Forces parametric binauralizer code to use 5 ms time resolution even when\n" ); - fprintf( stdout, " output time resolution is larger.\n" ); -#endif fprintf( stdout, "-FEC X : Insert frame erasures, X = 0-10 is the percentage\n" ); fprintf( stdout, " of erased frames, or X may be the name of binary file or \n" ); fprintf( stdout, " file with G192 headers indicating GOOD FRAME or BAD FRAME\n" ); @@ -1131,12 +1203,6 @@ static void usage_dec( void ) fprintf( stdout, " default is OFF, if this option is not used\n" ); fprintf( stdout, "-force R : Force specific binaural rendering mode, R = (TDREND, CLDFBREND),\n" ); #endif - fprintf( stdout, "-otr tracking_type : head orientation tracking type: 'ref' or 'avg' (only for binaural rendering)\n" ); - fprintf( stdout, "-render_config file : Renderer configuration file\n" ); - fprintf( stdout, "-no_diegetic_pan : panning mono no dietic sound to stereo -1<= pan <=1,\n" ); - fprintf( stdout, " left or l or 1->left, right or r or -1->right, center or c or 0->middle\n" ); - fprintf( stdout, "-q : Quiet mode, no frame counter\n" ); - fprintf( stdout, " default is deactivated\n" ); #ifdef DEBUG_MODE_INFO #ifdef DEBUG_MODE_INFO_TWEAK fprintf( stdout, "-info : specify subfolder name for debug output\n" ); @@ -1181,27 +1247,17 @@ static ivas_error initOnFirstGoodFrame( ivas_error error = IVAS_ERR_UNKNOWN; /* Now delay, number of output channels and frame size are known */ - if ( arg.delayCompensationEnabled ) + if ( ( error = IVAS_DEC_GetDelay( hIvasDec, pFullDelayNumSamples, delayTimeScale ) ) != IVAS_ERR_OK ) { - if ( ( error = IVAS_DEC_GetDelay( hIvasDec, pFullDelayNumSamples, delayTimeScale ) ) != IVAS_ERR_OK ) - { - fprintf( stderr, "\nUnable to get delay of decoder: %s\n", ivas_error_to_string( error ) ); - return error; - } + fprintf( stderr, "\nUnable to get delay of decoder: %s\n", ivas_error_to_string( error ) ); + return error; } - else + + if ( !arg.delayCompensationEnabled ) { -#ifdef BINAURALIZATION_DELAY_REPORT pFullDelayNumSamples[0] = 0; -#else - *pFullDelayNumSamples = 0; -#endif } -#ifdef BINAURALIZATION_DELAY_REPORT *pRemainingDelayNumSamples = pFullDelayNumSamples[0]; -#else - *pRemainingDelayNumSamples = *pFullDelayNumSamples; -#endif if ( ( error = IVAS_DEC_GetNumOutputChannels( hIvasDec, pNumOutChannels ) ) != IVAS_ERR_OK ) { @@ -1297,24 +1353,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; @@ -1322,11 +1369,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; @@ -1348,6 +1391,8 @@ static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, HeadRotFileReader *headRotReader, + HeadRotFileReader *refRotReader, + Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf ) @@ -1365,16 +1410,13 @@ static ivas_error decodeG192( int16_t numInitialBadFrames = 0; /* Number of bad frames received until first good frame is decoded */ int16_t nOutChannels = 0; int16_t delayNumSamples = -1; -#ifdef BINAURALIZATION_DELAY_REPORT int16_t delayNumSamples_orig[3]; /* stores: overall delay, dec+rend delay, and binauralization delay */ -#else - int16_t delayNumSamples_orig = 0; -#endif int16_t nOutSamples = 0; int32_t delayTimeScale = 0; ivas_error error = IVAS_ERR_UNKNOWN; uint16_t numObj = 0; IVAS_DEC_BS_FORMAT bsFormat = IVAS_DEC_BS_UNKOWN; + IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES]; IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS]; for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i ) @@ -1392,9 +1434,7 @@ static ivas_error decodeG192( fprintf( stdout, "\n-- Start the decoder (quiet mode) --\n\n" ); } -#ifdef BINAURALIZATION_DELAY_REPORT delayNumSamples_orig[0] = -1; -#endif #ifdef WMOPS reset_stack(); @@ -1444,24 +1484,58 @@ static ivas_error decodeG192( goto cleanup; } + /* reference vector */ + if ( arg.enableReferenceVectorTracking ) + { + IVAS_VECTOR3 listenerPosition, referencePosition; + if ( ( error = Vector3PairFileReader_read( referenceVectorReader, &listenerPosition, &referencePosition ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError %s while reading listener and reference positions from %s\n", IVAS_DEC_GetErrorMessage( error ), Vector3PairFileReader_getFilePath( referenceVectorReader ) ); + goto cleanup; + } + + if ( ( error = IVAS_DEC_FeedRefVectorData( hIvasDec, listenerPosition, referencePosition ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nIVAS_DEC_FeedRefVectorData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) ); + goto cleanup; + } + } + /* Reference rotation */ + if ( arg.enableReferenceRotation ) + { + IVAS_QUATERNION quaternion; + if ( ( error = HeadRotationFileReading( refRotReader, &quaternion, NULL ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError %s while reading reference rotation from %s\n", IVAS_DEC_GetErrorMessage( error ), HeadRotationFileReader_getFilePath( refRotReader ) ); + goto cleanup; + } + + if ( ( error = IVAS_DEC_FeedRefRotData( hIvasDec, quaternion ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nIVAS_DEC_FeedRefRotData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) ); + goto cleanup; + } + } /* Head-tracking input simulation */ if ( arg.enableHeadRotation ) { IVAS_QUATERNION Quaternions[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES]; - if ( ( error = HeadRotationFileReading( headRotReader, Quaternions, frame ) ) != IVAS_ERR_OK ) + for ( i = 0; i < IVAS_MAX_PARAM_SPATIAL_SUBFRAMES; i++ ) { - fprintf( stderr, "\nError %s while reading head orientation from %s\n", IVAS_DEC_GetErrorMessage( error ), HeadRotationFileReader_getFilePath( headRotReader ) ); - goto cleanup; + if ( ( error = HeadRotationFileReading( headRotReader, &Quaternions[i], &Pos[i] ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError %s while reading head orientation from %s\n", IVAS_DEC_GetErrorMessage( error ), HeadRotationFileReader_getFilePath( headRotReader ) ); + goto cleanup; + } } - if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions ) ) != IVAS_ERR_OK ) + 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; } } - /* Run decoder for one frame (get rendered output) */ if ( ( error = IVAS_DEC_GetSamples( hIvasDec, pcmBuf, &nOutSamples ) ) != IVAS_ERR_OK ) { @@ -1486,11 +1560,7 @@ static ivas_error decodeG192( arg, numInitialBadFrames, nOutSamples, -#ifdef BINAURALIZATION_DELAY_REPORT delayNumSamples_orig, -#else - &delayNumSamples_orig, -#endif &delayNumSamples, &delayTimeScale, &bsFormat, @@ -1529,7 +1599,7 @@ static ivas_error decodeG192( } } - /* Write ISm metadata to external file(s) */ + /* Write ISM metadata to external file(s) */ if ( decodedGoodFrame && arg.outputFormat == IVAS_DEC_OUTPUT_EXT ) { if ( bsFormat == IVAS_DEC_BS_OBJ ) @@ -1559,23 +1629,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; @@ -1604,13 +1665,8 @@ static ivas_error decodeG192( * Add zeros at the end to have equal length of synthesized signals *------------------------------------------------------------------------------------------*/ -#ifdef BINAURALIZATION_DELAY_REPORT memset( pcmBuf, 0, delayNumSamples_orig[0] * nOutChannels * sizeof( int16_t ) ); if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, delayNumSamples_orig[0] * nOutChannels ) ) != IVAS_ERR_OK ) -#else - memset( pcmBuf, 0, delayNumSamples_orig * nOutChannels * sizeof( int16_t ) ); - if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, delayNumSamples_orig * nOutChannels ) ) != IVAS_ERR_OK ) -#endif { fprintf( stderr, "\nError writing output file: %s\n", ivas_error_to_string( error ) ); goto cleanup; @@ -1622,17 +1678,13 @@ static ivas_error decodeG192( if ( !arg.quietModeEnabled ) { -#ifdef BINAURALIZATION_DELAY_REPORT 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[0] / (float) delayTimeScale, delayNumSamples_orig[0], 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 ); } -#else - fprintf( stdout, "\nDecoder delay: %-5u [samples] - Timescale: %5u\n", delayNumSamples_orig, delayTimeScale ); -#endif } /* Print output metadata file name(s) */ @@ -1821,11 +1873,7 @@ static ivas_error decodeVoIP( #endif JbmOffsetFileWriter *jbmOffsetWriter = NULL; -#ifdef BINAURALIZATION_DELAY_REPORT int16_t delayNumSamples_orig[3]; /* stores: overall delay, dec+rend delay, and binauralization delay */ -#else - int16_t delayNumSamples_orig = -1; -#endif int16_t delayNumSamples = -1; int32_t delayTimeScale = -1; @@ -1845,9 +1893,7 @@ static ivas_error decodeVoIP( ismWriters[i] = NULL; } -#ifdef BINAURALIZATION_DELAY_REPORT delayNumSamples_orig[0] = -1; -#endif rtpdumpDepacker.rtpdump = NULL; switch ( arg.inputFormat ) @@ -2044,11 +2090,7 @@ static ivas_error decodeVoIP( arg, numInitialBadFrames, nOutSamples, -#ifdef BINAURALIZATION_DELAY_REPORT delayNumSamples_orig, -#else - &delayNumSamples_orig, -#endif &delayNumSamples, &delayTimeScale, &bsFormat, @@ -2105,13 +2147,8 @@ static ivas_error decodeVoIP( * Add zeros at the end to have equal length of synthesized signals *------------------------------------------------------------------------------------------*/ -#ifdef BINAURALIZATION_DELAY_REPORT memset( pcmBuf, 0, delayNumSamples_orig[0] * nOutChannels * sizeof( int16_t ) ); if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, delayNumSamples_orig[0] * nOutChannels ) ) != IVAS_ERR_OK ) -#else - memset( pcmBuf, 0, delayNumSamples_orig * nOutChannels * sizeof( int16_t ) ); - if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, delayNumSamples_orig * nOutChannels ) ) != IVAS_ERR_OK ) -#endif { fprintf( stderr, "\nError writing output file: %s\n", ivas_error_to_string( error ) ); goto cleanup; @@ -2123,17 +2160,13 @@ static ivas_error decodeVoIP( if ( !arg.quietModeEnabled ) { -#ifdef BINAURALIZATION_DELAY_REPORT 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[0] / (float) delayTimeScale, delayNumSamples_orig[0], 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 ); } -#else - printf( "\nDecoder delay: %5u [samples] - Timescale: %5u\n", delayNumSamples_orig, delayTimeScale ); -#endif } /*------------------------------------------------------------------------------------------* diff --git a/apps/encoder.c b/apps/encoder.c index 5fb6100034ba311d20fffd20ece5ee25bc7a6bd6..91932dd8af40b955e75cf9b66aa16eb6ff2348b9 100644 --- a/apps/encoder.c +++ b/apps/encoder.c @@ -126,6 +126,7 @@ typedef struct #endif #endif bool pca; + bool ism_extended_metadata; } EncArguments; @@ -213,23 +214,6 @@ int main( goto cleanup; } -#ifndef FIX_94_VERIFY_WAV_NUM_CHANNELS - /*------------------------------------------------------------------------------------------* - * Open input audio file - *------------------------------------------------------------------------------------------*/ - int32_t inFileSampleRate = 0; - if ( AudioFileReader_open( &audioReader, arg.inputWavFilename, &inFileSampleRate ) != IVAS_ERR_OK ) - { - fprintf( stderr, "\nCan't open %s\n\n", arg.inputWavFilename ); - goto cleanup; - } - if ( inFileSampleRate != 0 && /* inFileSampleRate will remain zero if input file is raw PCM */ - inFileSampleRate != arg.inputFs ) - { - fprintf( stderr, "Sampling rate mismatch: %d Hz requested, but %d Hz found in file %s\n", arg.inputFs, inFileSampleRate, arg.inputWavFilename ); - goto cleanup; - } -#endif /*------------------------------------------------------------------------------------------* * Open output bitstream file @@ -395,7 +379,7 @@ int main( } break; case IVAS_ENC_INPUT_ISM: - if ( ( error = IVAS_ENC_ConfigureForObjects( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.ism.numObjects ) ) != IVAS_ERR_OK ) + if ( ( error = IVAS_ENC_ConfigureForObjects( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.ism.numObjects, arg.ism_extended_metadata ) ) != IVAS_ERR_OK ) { fprintf( stderr, "\nIVAS_ENC_ConfigureForObjects failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) ); goto cleanup; @@ -452,7 +436,6 @@ int main( goto cleanup; } -#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS /*------------------------------------------------------------------------------------------* * Open input audio file *------------------------------------------------------------------------------------------*/ @@ -511,7 +494,6 @@ int main( fprintf( stderr, "\nError: %s\n", ivas_error_to_string( error ) ); goto cleanup; } -#endif /*------------------------------------------------------------------------------------------* * Open input metadata files @@ -718,7 +700,7 @@ int main( } #endif - /* Read ISm input metadata */ + /* Read ISM input metadata */ for ( i = 0; i < numIsmInputs; ++i ) { if ( ismReaders[i] == NULL ) @@ -895,6 +877,7 @@ static void initArgStruct( EncArguments *arg ) arg->caConfig = IVAS_ENC_GetDefaultChannelAwareConfig(); arg->ca_config_file = NULL; arg->mimeOutput = false; + arg->ism_extended_metadata = false; #ifdef DEBUGGING arg->forcedMode = IVAS_ENC_FORCE_UNFORCED; @@ -1282,6 +1265,11 @@ static bool parseCmdlIVAS_enc( if ( i < argc - 4 ) { + if ( argv[i][0] == '+' ) + { + argv[i]++; + arg->ism_extended_metadata = true; + } if ( !is_digits_only( argv[i] ) ) { fprintf( stderr, "Error: Number of ISM channels must be an integer number!\n\n" ); @@ -1640,7 +1628,6 @@ static void usage_enc( void ) fprintf( stdout, " *VBR mode (average bitrate),\n" ); fprintf( stdout, " for AMR-WB IO modes R = (6600, 8850, 12650, 14250, 15850, 18250,\n" ); fprintf( stdout, " 19850, 23050, 23850) \n" ); -#ifdef ISM_HIGHEST_BITRATE fprintf( stdout, " for IVAS stereo R = (13200, 16400, 24400, 32000, 48000, 64000, 80000, \n" ); fprintf( stdout, " 96000, 128000, 160000, 192000, 256000) \n" ); fprintf( stdout, " for IVAS ISM R = 13200 for 1 ISM, 16400 for 1 ISM and 2 ISM, \n" ); @@ -1648,10 +1635,6 @@ static void usage_enc( void ) fprintf( stdout, " for 2 ISM, 3 ISM and 4 ISM also 160000, 192000, 256000) \n" ); fprintf( stdout, " for 3 ISM and 4 ISM also 384000 \n" ); fprintf( stdout, " for 4 ISM also 512000 \n" ); -#else - fprintf( stdout, " for IVAS stereo & ISm R =(13200, 16400, 24400, 32000, 48000, 64000, 80000, \n" ); - fprintf( stdout, " 96000, 128000, 160000, 192000, 256000) \n" ); -#endif fprintf( stdout, " for IVAS SBA, MASA, MC R=(13200, 16400, 24400, 32000, 48000, 64000, 80000, \n" ); fprintf( stdout, " 96000, 128000, 160000, 192000, 256000, 384000, 512000) \n" ); fprintf( stdout, " Alternatively, R can be a bitrate switching file which consists of R values\n" ); @@ -1665,17 +1648,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, "-ism Channels Files : ISM format \n" ); - fprintf( stdout, " where Channels specifies the number of ISMs (1-4)\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 (+) 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" ); diff --git a/apps/renderer.c b/apps/renderer.c index e7088a4316a8cb22beb8cfcdb120f8d73c045173..be23df8b988728a18f7b1cf1984545d4a7392150 100644 --- a/apps/renderer.c +++ b/apps/renderer.c @@ -42,6 +42,7 @@ #include "cmdl_tools.h" #include "cmdln_parser.h" #include "head_rotation_file_reader.h" +#include "vector3_pair_file_reader.h" #include "hrtf_file_reader.h" #include "ism_file_reader.h" #include "ls_custom_file_reader.h" @@ -130,6 +131,8 @@ typedef struct char inMetadataFilePaths[RENDERER_MAX_ISM_INPUTS][RENDERER_MAX_CLI_ARG_LENGTH]; int16_t numInMetadataFiles; char headRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH]; + char referenceVectorFilePath[RENDERER_MAX_CLI_ARG_LENGTH]; + char referenceRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH]; char customHrtfFilePath[RENDERER_MAX_CLI_ARG_LENGTH]; char renderConfigFilePath[RENDERER_MAX_CLI_ARG_LENGTH]; int8_t orientationTracking; @@ -154,6 +157,7 @@ typedef enum CmdLnOptionId_outputFormat, CmdLnOptionId_sampleRate, CmdLnOptionId_trajFile, + CmdLnOptionId_refRotFile, CmdLnOptionId_customHrtfFile, CmdLnOptionId_renderConfigFile, CmdLnOptionId_noDiegeticPan, @@ -165,6 +169,7 @@ typedef enum CmdLnOptionId_inputMetadata, CmdLnOptionId_listFormats, CmdLnOptionId_inputGain, + CmdLnOptionId_referenceVectorFile, } CmdLnOptionId; static const CmdLnParser_Option cliOptions[] = { @@ -210,6 +215,12 @@ static const CmdLnParser_Option cliOptions[] = { .matchShort = "tf", .description = "Head rotation trajectory file for simulation of head tracking (only for BINAURAL and BINAURAL_ROOM outputs)", }, + { + .id = CmdLnOptionId_refRotFile, + .match = "reference_rotation_file", + .matchShort = "rf", + .description = "Reference rotation trajectory file for simulation of head tracking (only for BINAURAL and BINAURAL_ROOM outputs)", + }, { .id = CmdLnOptionId_customHrtfFile, .match = "custom_hrtf", @@ -232,7 +243,7 @@ static const CmdLnParser_Option cliOptions[] = { .id = CmdLnOptionId_orientationTracking, .match = "tracking_type", .matchShort = "otr", - .description = "Head orientation tracking type: 'ref' or 'avg' (only for BINAURAL and BINAURAL_ROOM) (todo: check implementation)", + .description = "Head orientation tracking type: 'none', 'ref', 'avg' or `ref_vec` or `ref_vec_lev` (only for BINAURAL and BINAURAL_ROOM)", }, { .id = CmdlnOptionId_lfePosition, @@ -268,6 +279,12 @@ static const CmdLnParser_Option cliOptions[] = { .matchShort = "l", .description = "List supported audio formats", }, + { + .id = CmdLnOptionId_referenceVectorFile, + .match = "reference_vector_file", + .matchShort = "rvf", + .description = "Reference vector trajectory file for simulation of head tracking (only for BINAURAL and BINAURAL_ROOM outputs)", + }, }; @@ -494,6 +511,8 @@ int main( { IVAS_REND_HANDLE hIvasRend; HeadRotFileReader *headRotReader = NULL; + Vector3PairFileReader *referenceVectorReader = NULL; + HeadRotFileReader *referenceRotReader = NULL; hrtfFileReader *hrtfFileReader = NULL; IsmPositionProvider *positionProvider; RenderConfigReader *renderConfigReader = NULL; @@ -517,6 +536,7 @@ int main( int32_t delayTimeScale = 0; int16_t i, numChannels; ivas_error error = IVAS_ERR_OK; + IVAS_VECTOR3 Pos[RENDERER_HEAD_POSITIONS_PER_FRAME]; #ifdef WMOPS reset_wmops(); @@ -536,21 +556,52 @@ int main( convert_backslash( args.inputFilePath ); convert_backslash( args.outputFilePath ); convert_backslash( args.headRotationFilePath ); + convert_backslash( args.referenceVectorFilePath ); + convert_backslash( args.referenceRotationFilePath ); convert_backslash( args.inLfePanningMatrixFile ); if ( !isEmptyString( args.headRotationFilePath ) ) { - HeadRotationFileReader_open( args.headRotationFilePath, &headRotReader ); + if ( HeadRotationFileReader_open( args.headRotationFilePath, &headRotReader ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error opening file: %s\n", args.headRotationFilePath ); + exit( -1 ); + } + } + + if ( !isEmptyString( args.referenceRotationFilePath ) ) + { + if ( HeadRotationFileReader_open( args.referenceRotationFilePath, &referenceRotReader ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error opening file: %s\n", args.referenceRotationFilePath ); + exit( -1 ); + } + } + if ( !isEmptyString( args.referenceVectorFilePath ) ) + { + if ( Vector3PairFileReader_open( args.referenceVectorFilePath, &referenceVectorReader ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error opening file: %s\n", args.referenceVectorFilePath ); + exit( -1 ); + } } if ( !isEmptyString( args.customHrtfFilePath ) ) { - hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ); + if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error opening file: %s\n", args.customHrtfFilePath ); + exit( -1 ); + } } if ( !isEmptyString( args.renderConfigFilePath ) ) { - RenderConfigReader_open( args.renderConfigFilePath, &renderConfigReader ); + if ( RenderConfigReader_open( args.renderConfigFilePath, &renderConfigReader ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error opening file: %s\n", args.renderConfigFilePath ); + exit( -1 ); + } } /* Initialize main input files, i.e. audio and metadata */ @@ -565,7 +616,6 @@ int main( setupWithSingleFormatInput( args, audioFilePath, positionProvider, masaReaders ); } -#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS if ( AudioFileReader_open( &audioReader, audioFilePath ) != IVAS_ERR_OK ) { fprintf( stderr, "Error opening file: %s\n", audioFilePath ); @@ -595,7 +645,6 @@ int main( fprintf( stderr, "Sampling rate must be specified on command line when using raw PCM input\n" ); exit( -1 ); } - args.sampleRate = inFileSampleRate; break; default: fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) ); @@ -609,28 +658,6 @@ int main( fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) ); exit( -1 ); } -#else - int32_t inFileSampleRate = 0; - if ( AudioFileReader_open( &audioReader, audioFilePath, &inFileSampleRate ) != IVAS_ERR_OK ) - { - fprintf( stderr, "Error opening file: %s\n", audioFilePath ); - exit( -1 ); - } - if ( args.sampleRate == 0 && inFileSampleRate == 0 ) - { - fprintf( stderr, "Sampling rate must be specified on command line when using raw PCM input\n" ); - exit( -1 ); - } - if ( args.sampleRate != 0 && inFileSampleRate != 0 && args.sampleRate != inFileSampleRate ) - { - fprintf( stderr, "Sampling rate mismatch: %d Hz requested, but %d Hz found in file %s\n", args.sampleRate, inFileSampleRate, args.inputFilePath ); - exit( -1 ); - } - if ( args.sampleRate == 0 ) - { - args.sampleRate = inFileSampleRate; - } -#endif const int16_t frameSize_smpls = (int16_t) ( 20 * args.sampleRate / 1000 ); IVAS_REND_InputId mcIds[RENDERER_MAX_MC_INPUTS] = { 0 }; @@ -645,8 +672,9 @@ int main( } /* === Configure === */ - if ( ( error = IVAS_REND_InitConfig( hIvasRend, strlen( args.renderConfigFilePath ) != 0 ) ) != IVAS_ERR_OK ) + if ( ( error = IVAS_REND_InitConfig( hIvasRend, args.outConfig.audioConfig ) ) != IVAS_ERR_OK ) { + fprintf( stderr, "Error in Renderer Config Init\n" ); exit( -1 ); } @@ -655,9 +683,9 @@ int main( IVAS_RENDER_CONFIG_DATA renderConfig; /* sanity check */ - if ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) + if ( ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) && ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL ) ) { - fprintf( stderr, "\nExternal Renderer Config is supported only when BINAURAL_ROOM is used as output. Exiting. \n" ); + fprintf( stderr, "\nExternal Renderer Config is supported only when BINAURAL or BINAURAL_ROOM is used as output. Exiting. \n" ); exit( -1 ); } @@ -680,6 +708,11 @@ int main( } } + if ( ( error = IVAS_REND_SetOrientationTrackingMode( hIvasRend, args.orientationTracking ) ) != IVAS_ERR_OK ) + { + return error; + } + /* Set up output custom layout configuration */ if ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) { @@ -798,12 +831,7 @@ int main( const int16_t totalNumInChannels = getTotalNumInChannels( hIvasRend, mcIds, ismIds, sbaIds, masaIds ); -#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS if ( inFileNumChannels != 0 /* inFileNumChannels is 0 with raw PCM input */ && totalNumInChannels != inFileNumChannels ) -#else - if ( AudioFileReader_getNumChannels( audioReader ) != 0 /* If input file is raw PCM, audio reader has no info about number of channels */ - && totalNumInChannels != AudioFileReader_getNumChannels( audioReader ) ) -#endif { fprintf( stderr, "Number of channels in input file does not match selected configuration\n" ); exit( -1 ); @@ -884,16 +912,64 @@ int main( ObjectPositionBuffer mtdBuffer; IsmPositionProvider_getNextFrame( positionProvider, &mtdBuffer ); + if ( referenceVectorReader != NULL ) + { + IVAS_VECTOR3 listenerPos, refPos; + if ( ( error = Vector3PairFileReader_read( referenceVectorReader, &listenerPos, &refPos ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) ); + exit( -1 ); + } + if ( ( error = IVAS_REND_SetReferenceVector( hIvasRend, listenerPos, refPos ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) ); + exit( -1 ); + } + } + /* Read from reference rotation trajectory file if specified */ + if ( referenceRotReader != NULL ) + { + IVAS_QUATERNION quaternion; + if ( ( error = HeadRotationFileReading( referenceRotReader, &quaternion, NULL ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error in Head Rotation File Reading: %s\n", ivas_error_to_string( error ) ); + exit( -1 ); + } + + if ( ( error = IVAS_REND_SetReferenceRotation( hIvasRend, quaternion ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error setting Reference Rotation: %s\n", ivas_error_to_string( error ) ); + exit( -1 ); + } + } + /* Read from head rotation trajectory file if specified */ if ( headRotReader != NULL ) { IVAS_QUATERNION quatBuffer[RENDERER_HEAD_POSITIONS_PER_FRAME]; - HeadRotationFileReading( headRotReader, quatBuffer, frame ); - IVAS_REND_SetHeadRotation( hIvasRend, quatBuffer ); + + for ( i = 0; i < RENDERER_HEAD_POSITIONS_PER_FRAME; i++ ) + { + if ( ( error = HeadRotationFileReading( headRotReader, &quatBuffer[i], &Pos[i] ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error in Head Rotation File Reading: %s\n", ivas_error_to_string( error ) ); + exit( -1 ); + } + } + if ( ( error = IVAS_REND_SetHeadRotation( hIvasRend, quatBuffer, Pos ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error setting Head Rotation: %s\n", ivas_error_to_string( error ) ); + exit( -1 ); + } } else { - IVAS_REND_SetHeadRotation( hIvasRend, NULL ); + error = IVAS_REND_SetHeadRotation( hIvasRend, NULL, NULL ); + if ( ( error != IVAS_ERR_OK ) && ( error != IVAS_ERR_INVALID_OUTPUT_FORMAT ) ) // VE: TBC + { + fprintf( stderr, "Error setting Head Rotation: %s\n", ivas_error_to_string( error ) ); + exit( -1 ); + } } for ( i = 0; i < args.inConfig.numMultiChannelBuses; ++i ) @@ -973,7 +1049,11 @@ int main( } } - IVAS_REND_GetSamples( hIvasRend, outBuffer ); + if ( IVAS_REND_GetSamples( hIvasRend, outBuffer ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error in getting samples\n" ); + exit( -1 ); + } int16_t num_out_channels; num_out_channels = outBuffer.config.numChannels; @@ -1065,6 +1145,8 @@ int main( AudioFileReader_close( &audioReader ); AudioFileWriter_close( &audioWriter ); HeadRotationFileReader_close( &headRotReader ); + Vector3PairFileReader_close( &referenceVectorReader ); + HeadRotationFileReader_close( &referenceRotReader ); hrtfFileReader_close( &hrtfFileReader ); IVAS_REND_Close( &hIvasRend ); IsmPositionProvider_close( positionProvider ); @@ -1290,7 +1372,11 @@ static bool parseOrientationTracking( to_upper( value ); - if ( strcmp( value, "REF" ) == 0 ) + if ( strcmp( value, "NONE" ) == 0 ) + { + *tracking_type = IVAS_ORIENT_TRK_NONE; + } + else if ( strcmp( value, "REF" ) == 0 ) { *tracking_type = IVAS_ORIENT_TRK_REF; } @@ -1298,6 +1384,14 @@ static bool parseOrientationTracking( { *tracking_type = IVAS_ORIENT_TRK_AVG; } + else if ( strcmp( value, "REF_VEC" ) == 0 ) + { + *tracking_type = IVAS_ORIENT_TRK_REF_VEC; + } + else if ( strcmp( value, "REF_VEC_LEV" ) == 0 ) + { + *tracking_type = IVAS_ORIENT_TRK_REF_VEC_LEV; + } else { fprintf( stderr, "Error: Invalid orientation tracking type %s \n\n", value ); @@ -1515,10 +1609,12 @@ static CmdlnArgs defaultArgs( args.numInMetadataFiles = 0; clearString( args.headRotationFilePath ); + clearString( args.referenceVectorFilePath ); + clearString( args.referenceRotationFilePath ); clearString( args.customHrtfFilePath ); clearString( args.renderConfigFilePath ); - args.orientationTracking = IVAS_ORIENT_TRK_REF; + args.orientationTracking = IVAS_ORIENT_TRK_NONE; args.noDiegeticPan = 0.0f; args.delayCompensationEnabled = true; @@ -1593,6 +1689,14 @@ static void parseOption( assert( numOptionValues == 1 ); strncpy( args->headRotationFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 ); break; + case CmdLnOptionId_referenceVectorFile: + assert( numOptionValues == 1 ); + strncpy( args->referenceVectorFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 ); + break; + case CmdLnOptionId_refRotFile: + assert( numOptionValues == 1 ); + strncpy( args->referenceRotationFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 ); + break; case CmdLnOptionId_customHrtfFile: assert( numOptionValues == 1 ); strncpy( args->customHrtfFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 ); @@ -1709,12 +1813,15 @@ void getMetadataFromFileReader( if ( ( error = IsmFileReader_readNextFrame( ismReader, &ismMetadata ) ) != IVAS_ERR_OK ) { - fprintf( stderr, "\nError (%s) while reading ism metadata from: %s\n\n", ivas_error_to_string( error ), IsmFileReader_getFilePath( ismReader ) ); + fprintf( stderr, "\nError (%s) while reading ISM metadata from: %s\n\n", ivas_error_to_string( error ), IsmFileReader_getFilePath( ismReader ) ); exit( -1 ); } objectMetadataBuffer->positions[objIdx].azimuth = ismMetadata.azimuth; objectMetadataBuffer->positions[objIdx].elevation = ismMetadata.elevation; + objectMetadataBuffer->positions[objIdx].radius = ismMetadata.radius; + objectMetadataBuffer->positions[objIdx].yaw = ismMetadata.yaw; + objectMetadataBuffer->positions[objIdx].pitch = ismMetadata.pitch; return; } @@ -1769,6 +1876,9 @@ static void IsmPositionProvider_getNextFrame( { objectMetadataBuffer->positions[objIdx].azimuth = 0.0f; objectMetadataBuffer->positions[objIdx].elevation = 0.0f; + objectMetadataBuffer->positions[objIdx].radius = 1.0f; + objectMetadataBuffer->positions[objIdx].yaw = 0.0f; + objectMetadataBuffer->positions[objIdx].pitch = 0.0f; } /* Wrap azimuth to lie within (-180, 180] range */ @@ -1783,6 +1893,18 @@ static void IsmPositionProvider_getNextFrame( /* Clamp elevation to lie within [-90, 90] range (can't be wrapped easily) */ objectMetadataBuffer->positions[objIdx].elevation = min( max( objectMetadataBuffer->positions[objIdx].elevation, -90 ), 90 ); + /* Wrap yaw to lie within (-180, 180] range */ + while ( objectMetadataBuffer->positions[objIdx].yaw < 0.0f ) + { + objectMetadataBuffer->positions[objIdx].yaw += 360.0f; + } + while ( objectMetadataBuffer->positions[objIdx].yaw >= 360.0f ) + { + objectMetadataBuffer->positions[objIdx].yaw -= 360.0f; + } + + /* Clamp pitch to lie within [-90, 90] range (can't be wrapped easily) */ + objectMetadataBuffer->positions[objIdx].pitch = min( max( objectMetadataBuffer->positions[objIdx].pitch, -90 ), 90 ); } ++positionProvider->frameCounter; @@ -2017,33 +2139,26 @@ static void parseObjectPosition( uint16_t *positionDuration ) { char *endptr; + int16_t read_values; + float meta_prm[7] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f }; readNextMetadataChunk( line, "," ); *positionDuration = (uint16_t) strtol( line, &endptr, 10 ); + readNextMetadataChunk( line, "\n" ); - if ( *endptr != '\0' ) - { - fprintf( stderr, "Error reading metadata\n" ); - exit( -1 ); - } - - readNextMetadataChunk( line, "," ); - position->azimuth = strtof( line, &endptr ); - - if ( *endptr != '\0' ) - { - fprintf( stderr, "Error reading metadata\n" ); - exit( -1 ); - } + read_values = (int16_t) sscanf( line, "%f,%f,%f,%f,%f,%f,%f", &meta_prm[0], &meta_prm[1], &meta_prm[2], &meta_prm[3], &meta_prm[4], &meta_prm[5], &meta_prm[6] ); - readNextMetadataChunk( line, "\n" ); - position->elevation = strtof( line, &endptr ); - if ( *endptr != '\0' ) + if ( read_values < 2 ) { fprintf( stderr, "Error reading metadata\n" ); exit( -1 ); } + position->azimuth = meta_prm[0]; + position->elevation = meta_prm[1]; + position->radius = meta_prm[2]; + position->yaw = meta_prm[5]; + position->pitch = meta_prm[6]; return; } 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..852b74fe47d23c5a7a60503370781f5dbb2ae46d 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 @@ -74,7 +75,11 @@ 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) +./scripts/runIvasCodec.py -m $non_ism_modes -p $cfg -U 1 $WORKERS | tee smoke_test_output.txt +./scripts/runIvasCodec.py -m $ism_modes -p $cfg -U 1 $WORKERS $ism_md_cmd | tee smoke_test_output.txt # run the decoding again, but with 15% frame loss ./scripts/runIvasCodec.py -p $cfg -U 1 $WORKERS -D="-fec 15" --decoder_only | tee smoke_test_output_plc.txt 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 e5f72590a60dc700b31ed3d3f6b089f9d6a333b9..0a206fcdb5de316ea3bfc629646888606395e946 100644 --- a/lib_com/bitstream.c +++ b/lib_com/bitstream.c @@ -833,12 +833,6 @@ static ivas_error write_indices_element( /* restore previous pointer position */ pt_stream_loc = pt_stream_backup; } - - /* TODO implemented only for MCT for now */ - if ( ( st_ivas->hEncoderConfig->ivas_format == MC_FORMAT ) && ( st_ivas->mc_mode == MC_MODE_MCT ) && ( element_id * CPE_CHANNELS + n == LFE_CHANNEL ) ) - { - continue; - } #ifdef ENABLE_BITRATE_VERIFICATION total_nb_bits = #endif @@ -1807,7 +1801,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 { diff --git a/lib_com/cldfb.c b/lib_com/cldfb.c index 931fbc723bbc90e7ff6a5fed7fc31c2943b5e887..1490703aeed53e88f6c690fa27b9118425d87ca0 100644 --- a/lib_com/cldfb.c +++ b/lib_com/cldfb.c @@ -883,16 +883,19 @@ void deleteCldfb( { HANDLE_CLDFB_FILTER_BANK hs = *h_cldfb; - if ( hs ) + if ( h_cldfb == NULL || *h_cldfb == NULL ) { - if ( hs->cldfb_state ) - { - free( hs->cldfb_state ); - } - free( hs ); - *h_cldfb = NULL; + return; } + if ( hs->cldfb_state ) + { + free( hs->cldfb_state ); + } + + free( hs ); + *h_cldfb = NULL; + return; } diff --git a/lib_com/cnst.h b/lib_com/cnst.h index db1dc3d8982a768eff807f35d083dbabeae15f58..261ef6f907f1777ec47a9c01f3ff7661b5999b80 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, @@ -1391,6 +1389,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 +1430,12 @@ enum #define CHEAP_NORM_SIZE 161 #define CNA_MAX_BRATE ACELP_13k20 -#define MAX_CNA_NBANDS 12 + +#ifdef FIX_I414_OOA_CNA +#define CNA_INIT_NBANDS 6 +#else +#define MAX_CNA_NBANDS 12 +#endif #define GAIN_Q_OFFSET_EVS 60.f #define GAIN_Q_OFFSET_IVAS 45.f @@ -1513,7 +1533,10 @@ enum #define TOD_NSPEC 80 /* number of spectral bins of the tonal detector */ #define TOD_THR_MASS 0.86f /* initial value for the adaptive threshold of the tonal detector */ #define P2A_FACT 0.9f /* long-term averaging factor for peak-to-average ratio */ -#define THR_P2A 80.0f /* threshold to detect strongly peaky signals */ +#ifdef FIX_SP2A +#define THR_P2A_HIGH 95.0f /* higher threshold to detect strongly peaky signals at low bitrates*/ +#endif +#define THR_P2A 80.0f /* lower threshold to detect strongly peaky signals at higher bitrates */ /*----------------------------------------------------------------------------------* * LD music post-filter constants diff --git a/lib_com/common_api_types.h b/lib_com/common_api_types.h index 8c1e1837f56eda1c02bd16bea4a7bcbaaba8d75e..61c68eae5d5bc8ceeb717b7bd4a7b2cc1112575c 100644 --- a/lib_com/common_api_types.h +++ b/lib_com/common_api_types.h @@ -78,6 +78,8 @@ typedef struct _IVAS_ISM_METADATA float radius; float spread; float gainFactor; + float yaw; + float pitch; } IVAS_ISM_METADATA; typedef struct @@ -86,12 +88,14 @@ typedef struct } IVAS_QUATERNION; +typedef struct +{ + float x, y, z; +} IVAS_VECTOR3; + + 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; @@ -111,6 +115,9 @@ typedef struct { float azimuth; float elevation; + float radius; + float yaw; + float pitch; } IVAS_REND_AudioObjectPosition; typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG @@ -132,6 +139,7 @@ typedef struct _IVAS_RENDER_CONFIG IVAS_RENDER_TYPE_OVERRIDE renderer_type_override; #endif IVAS_ROOM_ACOUSTICS_CONFIG_DATA room_acoustics; + float directivity[3]; } IVAS_RENDER_CONFIG_DATA, *IVAS_RENDER_CONFIG_HANDLE; typedef struct _IVAS_LS_CUSTOM_LAYOUT diff --git a/lib_com/core_com_config.c b/lib_com/core_com_config.c index 120d0876d1f32569cf4bd8afe3b5089af9924789..7f9b385c3f3d38c569307a13f15032c0dcb62582 100644 --- a/lib_com/core_com_config.c +++ b/lib_com/core_com_config.c @@ -247,28 +247,24 @@ int16_t getResq( *-------------------------------------------------------------------*/ int16_t getTnsAllowed( - const int32_t total_brate, /* i : total bitrate */ - const int16_t igf, /* i : flag indicating IGF activity*/ - const int16_t element_mode, /* i : IVAS element mode */ - const MCT_CHAN_MODE mct_chan_mode /* i : MCT channel mode */ + const int32_t total_brate, /* i : total bitrate */ + const int16_t igf, /* i : flag indicating IGF activity*/ + const int16_t element_mode /* i : IVAS element mode */ ) { int16_t tnsAllowed = 0; - if ( mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( igf ) { - if ( igf ) - { - if ( total_brate > HQ_16k40 || ( ( total_brate > HQ_13k20 ) && element_mode == IVAS_CPE_DFT ) ) - { - tnsAllowed = 1; - } - } - else if ( total_brate > HQ_32k ) + if ( total_brate > HQ_16k40 || ( ( total_brate > HQ_13k20 ) && element_mode == IVAS_CPE_DFT ) ) { tnsAllowed = 1; } } + else if ( total_brate > HQ_32k ) + { + tnsAllowed = 1; + } return tnsAllowed; } @@ -411,16 +407,11 @@ int16_t getIgfPresent( const int16_t element_mode, /* i : IVAS element mode */ const int32_t total_brate, /* i : total bitrate */ const int16_t bwidth, /* i : audio bandwidth */ - const int16_t rf_mode, /* i : flag to signal the RF mode */ - const int16_t mct_chan_mode /* i : MCT channel mode */ + const int16_t rf_mode /* i : flag to signal the RF mode */ ) { int16_t igfPresent = 0; - if ( mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - return igfPresent; - } if ( bwidth == SWB ) { @@ -808,9 +799,7 @@ void init_tcx_cfg( const int16_t infoIGFStopFreq, const int16_t element_mode, const int16_t ini_frame, - const int16_t MCT_flag, - const MCT_CHAN_MODE mct_chan_mode /* i : MDCT channel mode */ -) + const int16_t MCT_flag ) { int16_t i; int16_t mdctWindowLength; @@ -840,13 +829,9 @@ void init_tcx_cfg( /* set number of coded lines */ hTcxCfg->tcx_coded_lines = getNumTcxCodedLines( bwidth ); - if ( mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - hTcxCfg->tcx_coded_lines = MCT_LFE_MAX_LINE; - } /* TNS in TCX */ hTcxCfg->pCurrentTnsConfig = NULL; - hTcxCfg->fIsTNSAllowed = getTnsAllowed( total_brate, igf, element_mode, mct_chan_mode ); + hTcxCfg->fIsTNSAllowed = getTnsAllowed( total_brate, igf, element_mode ); if ( hTcxCfg->fIsTNSAllowed ) { diff --git a/lib_com/delay_comp.c b/lib_com/delay_comp.c index 9f8c1c7b9b1530716d207462b021b5b2a5e4bdfe..5557a88606fc789954b3637e793bc0e101f4b89b 100644 --- a/lib_com/delay_comp.c +++ b/lib_com/delay_comp.c @@ -55,10 +55,6 @@ int32_t get_delay( const int32_t io_fs, /* i : input/output sampling frequency */ const IVAS_FORMAT ivas_format, /* i : IVAS format */ HANDLE_CLDFB_FILTER_BANK hCldfb /* i : Handle of Cldfb analysis */ -#ifndef BINAURALIZATION_DELAY_REPORT - , - const int32_t binaural_latency_ns /* i : binaural renderer HRTF delay in ns */ -#endif ) { int32_t delay = 0; @@ -73,12 +69,10 @@ int32_t get_delay( { delay = IVAS_ENC_DELAY_NS; -#ifdef FIX_350_MASA_DELAY_COMP if ( ivas_format == MASA_FORMAT ) { delay = 0; /* All delay is compensated in the decoder with MASA */ } -#endif } if ( ivas_format == SBA_FORMAT ) @@ -110,17 +104,11 @@ int32_t get_delay( delay += IVAS_FB_DEC_DELAY_NS; } -#ifndef BINAURALIZATION_DELAY_REPORT - /* compensate for binauralization delay */ - delay += binaural_latency_ns; -#endif -#ifdef FIX_350_MASA_DELAY_COMP if ( ivas_format == MASA_FORMAT ) { delay += IVAS_ENC_DELAY_NS; /* Compensate also the encoder delay in the decoder with MASA */ } -#endif } } 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/ivas_cnst.h b/lib_com/ivas_cnst.h index 04e11c465660414e70f44006ffa74c8a617ee029..263c5992b062cc0b14d4cdf79c0540c3b9c86636 100644 --- a/lib_com/ivas_cnst.h +++ b/lib_com/ivas_cnst.h @@ -293,7 +293,7 @@ typedef enum /*----------------------------------------------------------------------------------* - * ISm Constants + * ISM Constants *----------------------------------------------------------------------------------*/ #define ISM_NB_BITS_METADATA_NOMINAL ( ( SCE_CORE_16k_LOW_LIMIT - ACELP_16k_LOW_LIMIT ) / FRAMES_PER_SEC ) /* nominal number of metadata bits - used for configuration of Core-Coder modules */ @@ -320,6 +320,13 @@ typedef enum #define ISM_Q_STEP 2.5f #define ISM_Q_STEP_BORDER 5.0f +#define ISM_RADIUS_NBITS 6 +#define ISM_RADIUS_MIN 0.0f +#define ISM_RADIUS_DELTA 0.25f /* Max radius = (2^ISM_RADIUS_NBITS-1)*0.25 = 15.75 */ +#define ISM_EXTENDED_METADATA_BRATE IVAS_64k +#define ISM_EXTENDED_METADATA_BITS 1 +#define ISM_METADATA_RS_MAX_FRAMES 5 /* Number of frames with opposite extended metadata flags before switching */ + /* Parametric ISM */ #define MAX_PARAM_ISM_NBANDS 11 #define MAX_PARAM_ISM_NBANDS_WB 9 @@ -333,11 +340,17 @@ typedef enum #define PARAM_ISM_MAX_CHAN 16 #define PARAM_ISM_HYS_BUF_SIZE 10 -#ifdef PARAM_ISM_DTX_CNG -#define PARAM_ISM_DTX_COH_SCA_BITS 4 -#define PARAM_ISM_DTX_AZI_BITS 5 -#define PARAM_ISM_DTX_ELE_BITS 4 -#endif +/* ISM DTX */ +#define ISM_DTX_COH_SCA_BITS 4 +#define ISM_DTX_AZI_BITS_HIGH 8 +#define ISM_DTX_ELE_BITS_HIGH 7 +#define ISM_Q_STEP_HIGH (ISM_Q_STEP / 2) +#define ISM_Q_STEP_BORDER_HIGH (ISM_Q_STEP_BORDER / 2) +#define ISM_DTX_AZI_BITS_LOW 6 +#define ISM_DTX_ELE_BITS_LOW 5 +#define ISM_Q_STEP_LOW (ISM_Q_STEP * 2) +#define ISM_Q_STEP_BORDER_LOW (ISM_Q_STEP_BORDER * 2) + typedef enum { @@ -347,28 +360,25 @@ typedef enum } ISM_MODE; -/* ISm metadata bitstream */ +/* ISM metadata bitstream */ enum { IND_ISM_NUM_OBJECTS, - IND_ISM_METADATA_FLAG = IND_ISM_NUM_OBJECTS + MAX_NUM_OBJECTS, + IND_ISM_EXTENDED_FLAG = IND_ISM_NUM_OBJECTS + MAX_NUM_OBJECTS, + IND_ISM_METADATA_FLAG, IND_ISM_VAD_FLAG = IND_ISM_METADATA_FLAG + MAX_NUM_OBJECTS, -#ifdef PARAM_ISM_DTX_CNG - IND_ISM_SCE_ID_DTX = IND_ISM_VAD_FLAG + MAX_NUM_OBJECTS, - IND_ISM_NOISY_SPEECH_FLAG, + IND_ISM_NOISY_SPEECH_FLAG = IND_ISM_VAD_FLAG + MAX_NUM_OBJECTS, + IND_ISM_SCE_ID_DTX, IND_ISM_DTX_COH_SCA, -#endif /* ------------- loop for objects -------------- */ -#ifdef PARAM_ISM_DTX_CNG TAG_ISM_LOOP_START = IND_ISM_DTX_COH_SCA + MAX_NUM_OBJECTS, -#else - TAG_ISM_LOOP_START = IND_ISM_VAD_FLAG + MAX_NUM_OBJECTS, - #endif IND_ISM_AZIMUTH_DIFF_FLAG = TAG_ISM_LOOP_START, IND_ISM_AZIMUTH = TAG_ISM_LOOP_START, IND_ISM_ELEVATION_DIFF_FLAG = TAG_ISM_LOOP_START, IND_ISM_ELEVATION = TAG_ISM_LOOP_START, + IND_ISM_RADIUS_DIFF_FLAG = TAG_ISM_LOOP_START, + IND_ISM_RADIUS = TAG_ISM_LOOP_START, TAG_ISM_LOOP_END = TAG_ISM_LOOP_START + 100, /* IVAS_fmToDo: to be reviewed once the final metadata are defined */ /* --------- end of loop for objects ----------- */ @@ -781,11 +791,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 */ /*----------------------------------------------------------------------------------* @@ -819,6 +825,14 @@ enum fea_names #define SNS_LOW_BR_MODE -1 #define SNS_NPTS 16 /* Number of downsampled SNS parameters */ +#ifdef SNS_MSVQ +#define SNS_STEREO_MODE_LR 0 +#define SNS_STEREO_MODE_MS 1 +#define SNS_STEREO_MODE_OFFSET_INDICES 4 +#define SNS_MSVQ_NSTAGES_TCX20 4 +#define SNS_MSVQ_NSTAGES_TCX10 3 +#define SNS_MSVQ_NSTAGES_SIDE 2 +#endif #define MDCT_ST_PLC_FADEOUT_MIN_NOISE_NRG 0.001f #define MDCT_ST_PLC_FADEOUT_MAX_CONC_FRAME 2 * FRAMES_PER_SEC @@ -850,6 +864,9 @@ 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) +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS +#define CLDFB_SLOTS_PER_SUBFRAME ( CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES ) /* Number of CLDFB slots per subframe */ +#endif /*----------------------------------------------------------------------------------* @@ -931,9 +948,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) */ -#endif +#define SPH_IDX_FRONT ( MASA_NO_POINTS_EQUATOR / 2 ) /* Spherical index corresponding to front direction for setting as default value */ #define DIRAC_SLOT_NS 1250000L /* time duration of a time slot, 1.25ms (==DELAY_RENERER_NS/MAX_PARAM_SPATIAL_SUBFRAMES) */ #define DIRAC_SLOT_ENC_NS 5000000L @@ -969,6 +985,7 @@ typedef enum /* 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 @@ -1001,7 +1018,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 @@ -1105,9 +1122,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 @@ -1126,6 +1140,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 @@ -1144,6 +1161,12 @@ 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 + #define LIMIT_ER_ELEVATION_ENC 4 #define LIMIT_ER_SIMPLE_ENC 6 #define LIMIT_USE_COMMON 3 @@ -1172,7 +1195,12 @@ enum #define MASA_STEREO_MIN_BITRATE IVAS_24k4 #define MASA_BIT_REDUCT_PARAM 10 +#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, @@ -1180,6 +1208,11 @@ typedef enum MASA_STEREO_DOWNMIX } MASA_TRANSPORT_SIGNAL_TYPE; +typedef enum +{ + MASA_FRAME_1SF, + MASA_FRAME_4SF +} MASA_FRAME_MODE; /*----------------------------------------------------------------------------------* * Multichannel format @@ -1245,19 +1278,14 @@ typedef enum #define NBBITS_MCT_RATIO 4 #define BITRATE_MCT_RATIO_RANGE ( 1 << NBBITS_MCT_RATIO ) /* Range of the coded bitrate distribution ratio */ -#define LFE_BITS 180 - -#define MCT_LFE_MAX_LINE 24 #define MCT_NUM_BLOCK_DATA_BITS 4 typedef enum { MCT_CHAN_MODE_REGULAR, - MCT_CHAN_MODE_LFE, MCT_CHAN_MODE_IGNORE } MCT_CHAN_MODE; - /*----------------------------------------------------------------------------------* * Parametric MC Constants *----------------------------------------------------------------------------------*/ @@ -1305,6 +1333,9 @@ typedef enum #define PARAM_MC_BAND_TO_MDCT_BAND_RATIO 16 /* Ratio of resolution of CLDFB Bands to MDCT Bands */ #define PARAM_MC_SLOT_ENC_NS 2500000L #define PARAM_MC_MDFT_NO_SLOTS 8 +#ifdef PARAMMC_SHORT_ENC_MDFT +#define PARAM_MC_CLDFB_TO_MDFT_FAC 2 +#endif /*----------------------------------------------------------------------------------* * LFE Coding Constants @@ -1425,7 +1456,11 @@ 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) +#ifdef FIX_421_TD_INT_TUNE +#define MAX_ANGULAR_STEP (0.01f) +#else #define MAX_ANGULAR_STEP (1.0f) +#endif #define MAX_ANGULAR_STEP_INV ( 1.0f / MAX_ANGULAR_STEP ) #define MAX_INTERPOLATION_STEPS 12 @@ -1474,15 +1509,20 @@ typedef enum *----------------------------------------------------------------------------------*/ /* Orientation tracking types */ -#define IVAS_ORIENT_TRK_REF 0 -#define IVAS_ORIENT_TRK_AVG 1 +#define IVAS_ORIENT_TRK_NONE 0 +#define IVAS_ORIENT_TRK_REF 1 +#define IVAS_ORIENT_TRK_AVG 2 +#define IVAS_ORIENT_TRK_REF_VEC 3 +#define IVAS_ORIENT_TRK_REF_VEC_LEV 4 typedef enum { - OTR_TRACKING_NONE = IVAS_ORIENT_TRK_REF-1, /* track orientation relative to external reference orientation (default: yaw=pitch=roll=0) */ // VE: not really used in IVAS (only in unit-test) - OTR_TRACKING_REF_ORIENT = IVAS_ORIENT_TRK_REF, /* track orientation relative to external reference orientation (default: yaw=pitch=roll=0) */ + OTR_TRACKING_NONE = IVAS_ORIENT_TRK_NONE, + OTR_TRACKING_REF_ORIENT = IVAS_ORIENT_TRK_REF, /* track orientation relative to external reference orientation (default: no rotation) */ OTR_TRACKING_AVG_ORIENT = IVAS_ORIENT_TRK_AVG /* track orientation relative to average orientation */ - + , + OTR_TRACKING_REF_VEC = IVAS_ORIENT_TRK_REF_VEC, /* track orientation relative to external reference vector */ + OTR_TRACKING_REF_VEC_LEV = IVAS_ORIENT_TRK_REF_VEC_LEV /* track orientation relative to level component of external reference vector */ } OTR_TRACKING_T; @@ -1510,6 +1550,9 @@ typedef enum #define IVAS_320_PT_LEN 320 #define IVAS_240_PT_LEN 240 #define IVAS_160_PT_LEN 160 +#ifdef PARAMMC_SHORT_ENC_MDFT +#define IVAS_120_PT_LEN 120 +#endif #define IVAS_80_PT_LEN 80 #define IVAS_40_PT_LEN 40 diff --git a/lib_com/ivas_cov_smooth.c b/lib_com/ivas_cov_smooth.c index 57f74fb70ed95ad09f9ab9f5a22ba28f1915015b..b5bd6369c5c41bcd0bb7a7e70183c5aaa533cb8a 100644 --- a/lib_com/ivas_cov_smooth.c +++ b/lib_com/ivas_cov_smooth.c @@ -39,9 +39,7 @@ #include "wmc_auto.h" #include "prot.h" -#ifdef SMOOTH_WITH_TRANS_DET #define BAND_SMOOTH_REST_START_IDX ( 2 ) -#endif /*-----------------------------------------------------------------------------------------* * Function ivas_set_up_cov_smoothing() * @@ -52,19 +50,48 @@ static void ivas_set_up_cov_smoothing( ivas_cov_smooth_state_t *hCovState, ivas_filterbank_t *pFb, const float max_update_rate, - const int16_t min_pool_size -#ifdef COV_SMOOTH_TUNING - , + const int16_t min_pool_size, const int16_t nchan_inp /* i : number of input channels */ -#endif -) + , + const int32_t ivas_total_brate ) { int16_t j, k; + 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]; -#ifdef COV_SMOOTH_TUNING - if ( nchan_inp <= FOA_CHANNELS ) + for ( k = 0; k < active_bins; 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 ) + { + hCovState->pSmoothing_factor[j] = max_update_rate; + } + } + } + else if ( nchan_inp <= FOA_CHANNELS ) { -#endif for ( j = 0; j < pFb->filterbank_num_bands; j++ ) { float update_factor; @@ -82,8 +109,6 @@ static void ivas_set_up_cov_smoothing( hCovState->pSmoothing_factor[j] = max_update_rate; } } - -#ifdef COV_SMOOTH_TUNING } else { @@ -107,7 +132,6 @@ static void ivas_set_up_cov_smoothing( } } } -#endif hCovState->prior_bank_idx = -1; return; @@ -125,6 +149,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; @@ -152,12 +178,7 @@ ivas_error ivas_spar_covar_smooth_enc_open( } } - ivas_set_up_cov_smoothing( hCovState, pFb, cov_smooth_cfg->max_update_rate, cov_smooth_cfg->min_pool_size -#ifdef COV_SMOOTH_TUNING - , - nchan_inp -#endif - ); + ivas_set_up_cov_smoothing( hCovState, pFb, cov_smooth_cfg->max_update_rate, cov_smooth_cfg->min_pool_size, nchan_inp, ivas_total_brate ); *hCovState_out = hCovState; @@ -218,25 +239,17 @@ static void ivas_compute_smooth_cov( const int16_t start_band, const int16_t end_band, const int16_t num_ch, -#ifdef SMOOTH_WITH_TRANS_DET - const int16_t transient_det[2] -#else - const int16_t transient_det -#endif -) + const int16_t transient_det[2] ) { int16_t i, j, k; int16_t prev_idx = hCovState->prior_bank_idx; float factor = 0; -#ifdef SMOOTH_WITH_TRANS_DET int16_t sm_b; int16_t non_sm_b_idx; sm_b = BAND_SMOOTH_REST_START_IDX; -#endif assert( end_band <= pFb->filterbank_num_bands ); -#ifdef SMOOTH_WITH_TRANS_DET if ( prev_idx == -1 || transient_det[1] == 1 ) { for ( i = 0; i < num_ch; i++ ) @@ -277,18 +290,6 @@ static void ivas_compute_smooth_cov( } } } -#else - if ( prev_idx == -1 || transient_det == 1 ) - { - for ( i = 0; i < num_ch; i++ ) - { - for ( k = start_band; k < end_band; k++ ) - { - pCov_buf[i][i][k] += ( hCovState->pSmoothing_factor[k] * fac ); - } - } - } -#endif else if ( prev_idx == 0 ) { for ( i = 0; i < num_ch; i++ ) @@ -329,12 +330,7 @@ void ivas_cov_smooth_process( const int16_t start_band, const int16_t end_band, const int16_t num_ch, -#ifdef SMOOTH_WITH_TRANS_DET - const int16_t transient_det[2] -#else - const int16_t transient_det -#endif -) + const int16_t transient_det[2] ) { int16_t i, j; int16_t num_bands = end_band - start_band; diff --git a/lib_com/ivas_dirac_com.c b/lib_com/ivas_dirac_com.c index 01f133a3b7f2fc2d6bd0c5e24ef94419c0dca733..e4bea78e7933298a895c5542ba684e20d0861301 100644 --- a/lib_com/ivas_dirac_com.c +++ b/lib_com/ivas_dirac_com.c @@ -137,7 +137,9 @@ ivas_error ivas_dirac_config( } hConfig->enc_param_start_band = 0; hConfig->dec_param_estim = FALSE; - +#ifdef FIX_391_SBA + hConfig->dec_param_estim_old = hConfig->dec_param_estim; +#endif 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 ) @@ -259,9 +261,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 diff --git a/lib_com/ivas_error.h b/lib_com/ivas_error.h index b384e8dee563a9c33a470e806c116fecd0eb4fbd..9438ad44a1d309ca433de3e9a420f441e2245dad 100644 --- a/lib_com/ivas_error.h +++ b/lib_com/ivas_error.h @@ -86,9 +86,7 @@ typedef enum IVAS_ERR_ISM_FILE_READER_INVALID_METADATA_FORMAT, IVAS_ERR_ISM_INVALID_METADATA_VALUE, IVAS_ERR_INVALID_MASA_FORMAT_METADATA_FILE, -#ifdef FIX_372_LIB_REND_VALIDATE_IO IVAS_ERR_IO_CONFIG_PAIR_NOT_SUPPORTED, -#endif #ifdef DEBUGGING IVAS_ERR_INVALID_FORCE_MODE, #ifdef DEBUG_AGC_ENCODER_CMD_OPTION @@ -123,10 +121,8 @@ typedef enum IVAS_ERR_BITSTREAM_WRITER_INVALID_FORMAT, IVAS_ERR_BITSTREAM_READER_INVALID_DATA, IVAS_ERR_BITSTREAM_READER_INVALID_FORMAT, -#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS IVAS_ERR_NO_FILE_OPEN, IVAS_ERR_SAMPLING_RATE_UNKNOWN, -#endif /*----------------------------------------* * renderer (lib_rend only) * @@ -171,10 +167,8 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) return "Wrong number of channels"; case IVAS_ERR_INVALID_BUFFER_SIZE: return "Invalid buffer size"; -#ifdef FIX_372_LIB_REND_VALIDATE_IO case IVAS_ERR_IO_CONFIG_PAIR_NOT_SUPPORTED: return "Unsupported input/output config pair"; -#endif case IVAS_ERR_FAILED_FILE_OPEN: return "File open error"; case IVAS_ERR_FAILED_FILE_WRITE: 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 c3389288dedc3c1071630e2c9fa29237ea80ef0e..f42e8bde74b034c7adea51658a258a5ca160ff98 100644 --- a/lib_com/ivas_fb_mixer.c +++ b/lib_com/ivas_fb_mixer.c @@ -156,7 +156,11 @@ ivas_error ivas_fb_set_cfg( { pFb_cfg->fb_latency = NS2SA( sampling_rate, DELAY_FB_1_NS ); pFb_cfg->fade_len = NS2SA( sampling_rate, DELAY_FB_1_NS ); +#ifdef PARAMMC_SHORT_ENC_MDFT + pFb_cfg->prior_input_length = NS2SA( sampling_rate, DELAY_DIRAC_ENC_CMP_NS ) + NS2SA( sampling_rate, PARAM_MC_SLOT_ENC_NS ); +#else pFb_cfg->prior_input_length = NS2SA( sampling_rate, DELAY_DIRAC_ENC_CMP_NS ) + 3 * NS2SA( sampling_rate, PARAM_MC_SLOT_ENC_NS ); +#endif } *pFb_cfg_out = pFb_cfg; @@ -174,11 +178,8 @@ ivas_error ivas_fb_set_cfg( ivas_error ivas_FB_mixer_open( IVAS_FB_MIXER_HANDLE *hFbMixer_out, /* i/o: FB mixer handle */ const int32_t sampling_rate, /* i : sampling rate */ - IVAS_FB_CFG *fb_cfg /* i : FB config. handle */ -#ifdef SBA_BR_SWITCHING_CLEAN_UP - , - const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ -#endif + IVAS_FB_CFG *fb_cfg, /* i : FB config. handle */ + const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ ) { IVAS_FB_MIXER_HANDLE hFbMixer; @@ -190,12 +191,10 @@ ivas_error ivas_FB_mixer_open( frame_len = (int16_t) ( sampling_rate / FRAMES_PER_SEC ); -#ifdef SBA_BR_SWITCHING_CLEAN_UP hFbMixer = *hFbMixer_out; if ( !spar_reconfig_flag ) { -#endif if ( ( hFbMixer = (IVAS_FB_MIXER_HANDLE) malloc( sizeof( IVAS_FB_MIXER_DATA ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" ); @@ -212,9 +211,7 @@ ivas_error ivas_FB_mixer_open( { hFbMixer->pFb = NULL; } -#ifdef SBA_BR_SWITCHING_CLEAN_UP } -#endif if ( fb_cfg->active_w_mixing == -1 ) { @@ -289,10 +286,8 @@ ivas_error ivas_FB_mixer_open( } } -#ifdef SBA_BR_SWITCHING_CLEAN_UP if ( !spar_reconfig_flag ) { -#endif if ( fb_cfg->num_out_chans > 0 ) { const int16_t *pActive_bins_per_band, *pActive_bins_per_band_abs, *pStart_offset, *pStart_offset_abs; @@ -341,25 +336,19 @@ ivas_error ivas_FB_mixer_open( /* ignore all the deeper filter bank stuff for now */ hFbMixer->num_diff_bands = 0; } -#ifdef SBA_BR_SWITCHING_CLEAN_UP } -#endif hFbMixer->fb_cfg = fb_cfg; -#ifdef SBA_BR_SWITCHING_CLEAN_UP set_s( hFbMixer->first_frame, 1, hFbMixer->fb_cfg->num_out_chans ); set_s( hFbMixer->first_frame + hFbMixer->fb_cfg->num_out_chans, 0, IVAS_SPAR_MAX_CH - hFbMixer->fb_cfg->num_out_chans ); if ( !spar_reconfig_flag ) { -#endif if ( ( error = ivas_filterbank_setup( hFbMixer, sampling_rate ) ) != IVAS_ERR_OK ) { return error; } -#ifdef SBA_BR_SWITCHING_CLEAN_UP } -#endif *hFbMixer_out = hFbMixer; @@ -375,11 +364,8 @@ ivas_error ivas_FB_mixer_open( void ivas_FB_mixer_close( IVAS_FB_MIXER_HANDLE *hFbMixer_in, /* i/o: FB mixer handle */ - const int32_t sampling_rate /* i : sampling rate in Hz */ -#ifdef SBA_BR_SWITCHING_CLEAN_UP - , - const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ -#endif + const int32_t sampling_rate, /* i : sampling rate in Hz */ + const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ ) { IVAS_FB_MIXER_HANDLE hFbMixer; @@ -439,10 +425,8 @@ void ivas_FB_mixer_close( hFbMixer->prior_mixer[0][0] = NULL; } -#ifdef SBA_BR_SWITCHING_CLEAN_UP if ( !spar_reconfig_flag ) { -#endif if ( fb_cfg->num_out_chans > 0 ) { num_bands = hFbMixer->pFb->filterbank_num_bands; @@ -476,9 +460,7 @@ void ivas_FB_mixer_close( free( hFbMixer->pFb ); hFbMixer->pFb = NULL; } -#ifdef SBA_BR_SWITCHING_CLEAN_UP } -#endif if ( hFbMixer->fb_cfg != NULL ) { @@ -486,15 +468,11 @@ void ivas_FB_mixer_close( hFbMixer->fb_cfg = NULL; } -#ifdef SBA_BR_SWITCHING_CLEAN_UP if ( !spar_reconfig_flag ) { -#endif free( hFbMixer ); hFbMixer = NULL; -#ifdef SBA_BR_SWITCHING_CLEAN_UP } -#endif } return; @@ -1074,10 +1052,6 @@ static ivas_error ivas_filterbank_setup( IVAS_FB_CFG *pCfg = hFbMixer->fb_cfg; error = IVAS_ERR_OK; -#ifndef SBA_BR_SWITCHING_CLEAN_UP - set_s( hFbMixer->first_frame, 1, pCfg->num_out_chans ); - set_s( hFbMixer->first_frame + pCfg->num_out_chans, 0, IVAS_SPAR_MAX_CH - pCfg->num_out_chans ); -#endif if ( pCfg->num_out_chans > 0 ) { diff --git a/lib_com/ivas_ism_config.c b/lib_com/ivas_ism_com.c similarity index 74% rename from lib_com/ivas_ism_config.c rename to lib_com/ivas_ism_com.c index b22d82a9da0c1dc1cade26bcaa9919b6b28c32a2..38a34a15bdbe3e9a8ec053cd065508c7aaf6764a 100644 --- a/lib_com/ivas_ism_config.c +++ b/lib_com/ivas_ism_com.c @@ -37,6 +37,7 @@ #include "rom_com.h" #include "prot.h" #include "ivas_prot.h" +#include "ivas_stat_com.h" #include "ivas_rom_com.h" #ifdef DEBUGGING #include "debug.h" @@ -50,7 +51,7 @@ #define FRMS_PER_SECOND ( 1000000000 / FRAME_SIZE_NS ) -#define BRATE_ISM_INACTIVE 2450 /* CoreCoder bitrate in ISm inactive frames */ +#define BRATE_ISM_INACTIVE 2450 /* CoreCoder bitrate in ISM inactive frames */ #define BITS_ISM_INACTIVE ( BRATE_ISM_INACTIVE / FRMS_PER_SECOND ) #define BETA_ISM_LOW_IMP 0.6f @@ -87,15 +88,15 @@ static void bitbudget_to_brate( *-------------------------------------------------------------------*/ ivas_error ivas_ism_config( - const int32_t ism_total_brate, /* i : ISms total bitrate */ - const int16_t nchan_transport, /* i : number of transport channels */ - const int16_t num_obj, /* i : number of objects */ - ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ - const int16_t localVAD[MAX_NUM_OBJECTS], /* i : local VAD flag */ - const int16_t ism_imp[], /* i : ISM importance flags */ - int32_t element_brate[], /* o : element bitrate per object */ - int32_t total_brate[], /* o : total bitrate per object */ - int16_t nb_bits_metadata[] /* i/o: number of metadata bits */ + const int32_t ism_total_brate, /* i : ISM total bitrate */ + const int16_t nchan_transport, /* i : number of transport channels */ + const int16_t nchan_ism, /* i : number of objects */ + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + const int16_t localVAD[MAX_NUM_OBJECTS], /* i : local VAD flag */ + const int16_t ism_imp[], /* i : ISM importance flags */ + int32_t element_brate[], /* o : element bitrate per object */ + int32_t total_brate[], /* o : total bitrate per object */ + int16_t nb_bits_metadata[] /* i/o: number of metadata bits */ ) { int16_t ch; @@ -128,10 +129,14 @@ ivas_error ivas_ism_config( bits_element[n_ISms - 1] += bits_ism % n_ISms; bitbudget_to_brate( bits_element, element_brate, n_ISms ); - /* count ISm common signaling bits */ + /* count ISM common signaling bits */ if ( hIsmMeta != NULL ) { - nb_bits_metadata[0] += n_ISms * ISM_METADATA_FLAG_BITS + num_obj; + if ( ism_total_brate >= ISM_EXTENDED_METADATA_BRATE ) + { + nb_bits_metadata[0] += ISM_EXTENDED_METADATA_BITS; + } + nb_bits_metadata[0] += n_ISms * ISM_METADATA_FLAG_BITS + nchan_ism; for ( ch = 0; ch < n_ISms; ch++ ) { @@ -289,7 +294,7 @@ ivas_error ivas_ism_config( #ifdef DEBUGGING if ( bits_CoreCoder[ch] == SID_2k40 / FRAMES_PER_SEC ) { - printf( "\nWarning: ISm bitbudget equal to SID!\n" ); + printf( "\nWarning: ISM bitbudget equal to SID!\n" ); } #endif break; @@ -308,7 +313,7 @@ ivas_error ivas_ism_config( tmpL = sum_l( total_brate, n_ISms ) + bits_side * FRMS_PER_SECOND; if ( sum_l( element_brate, n_ISms ) != tmpL ) { - return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "\nError: Mismatch in ISm bit-budget distribution. Exiting!\n" ); + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "\nError: Mismatch in ISM bit-budget distribution. Exiting!\n" ); } } #endif @@ -320,7 +325,7 @@ ivas_error ivas_ism_config( /*-------------------------------------------------------------------* * ivas_ism_reset_metadata() * - * Reset ISm metadata parameters + * Reset ISM metadata parameters *-------------------------------------------------------------------*/ void ivas_ism_reset_metadata( @@ -329,15 +334,20 @@ void ivas_ism_reset_metadata( { hIsmMeta->azimuth = 0.0f; hIsmMeta->elevation = 0.0f; + hIsmMeta->yaw = 0.0f; + hIsmMeta->pitch = 0.0f; + hIsmMeta->radius = 1.0f; return; } + /*-------------------------------------------------------------------* * ivas_ism_reset_metadata_API() * - * Reset ISm metadata parameters + * Reset ISM metadata parameters *-------------------------------------------------------------------*/ + void ivas_ism_reset_metadata_API( ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle */ ) @@ -348,6 +358,7 @@ void ivas_ism_reset_metadata_API( return; } + /*-------------------------------------------------------------------* * ism_quant_meta() * @@ -356,10 +367,12 @@ void ivas_ism_reset_metadata_API( /*! r: index of the winning codeword */ int16_t ism_quant_meta( - const float val, /* i : scalar value to quantize */ - float *valQ, /* o : quantized value */ - const float borders[], /* i : level borders */ - const int16_t cbsize /* i : codebook size */ + const float val, /* i : scalar value to quantize */ + float *valQ, /* o : quantized value */ + const float borders[], /* i : level borders */ + const float q_step, /* i : quantization step */ + const float q_step_border, /* i : quantization step at the border */ + const int16_t cbsize /* i : codebook size */ ) { int16_t idx, idx_start; @@ -369,19 +382,19 @@ int16_t ism_quant_meta( { qlow = borders[0]; idx_start = 0; - step = ISM_Q_STEP_BORDER; + step = q_step_border; } else if ( val <= borders[2] ) { qlow = borders[1]; - idx_start = (int16_t) ( ( borders[1] - borders[0] ) / ISM_Q_STEP_BORDER ); - step = ISM_Q_STEP; + idx_start = (int16_t) ( ( borders[1] - borders[0] ) / q_step_border ); + step = q_step; } else { qlow = borders[2]; - idx_start = (int16_t) ( cbsize - 1 - ( borders[3] - borders[2] ) / ISM_Q_STEP_BORDER ); - step = ISM_Q_STEP_BORDER; + idx_start = (int16_t) ( cbsize - 1 - ( borders[3] - borders[2] ) / q_step_border ); + step = q_step_border; } idx = idx_start + (int16_t) max( 0.f, min( cbsize - 1, ( ( val - qlow ) / step + 0.5f ) ) ); @@ -399,31 +412,33 @@ int16_t ism_quant_meta( /*! r: dequantized value */ float ism_dequant_meta( - const int16_t idx, /* i : quantizer index */ - const float borders[], /* i : level borders */ - const int16_t cbsize /* i : codebook size */ + const int16_t idx, /* i : quantizer index */ + const float borders[], /* i : level borders */ + const float q_step, /* i : quantization step */ + const float q_step_border, /* i : quantization step at the border */ + const int16_t cbsize /* i : codebook size */ ) { int16_t idx_start; float qlow, step, valQ; - if ( idx <= ( borders[1] - borders[0] ) / ISM_Q_STEP_BORDER ) + if ( idx <= ( borders[1] - borders[0] ) / q_step_border ) { qlow = borders[0]; idx_start = 0; - step = ISM_Q_STEP_BORDER; + step = q_step_border; } - else if ( idx <= cbsize - 1 - ( borders[3] - borders[2] ) / ISM_Q_STEP_BORDER ) + else if ( idx <= cbsize - 1 - ( borders[3] - borders[2] ) / q_step_border ) { qlow = borders[1]; - idx_start = (int16_t) ( ( borders[1] - borders[0] ) / ISM_Q_STEP_BORDER ); - step = ISM_Q_STEP; + idx_start = (int16_t) ( ( borders[1] - borders[0] ) / q_step_border ); + step = q_step; } else { qlow = borders[2]; - idx_start = (int16_t) ( cbsize - 1 - ( borders[3] - borders[2] ) / ISM_Q_STEP_BORDER ); - step = ISM_Q_STEP_BORDER; + idx_start = (int16_t) ( cbsize - 1 - ( borders[3] - borders[2] ) / q_step_border ); + step = q_step_border; } valQ = ( idx - idx_start ) * step + qlow; @@ -440,12 +455,13 @@ float ism_dequant_meta( void ivas_param_ism_config( PARAM_ISM_CONFIG_HANDLE hParamIsm /* i/o: IVAS Param ISM Config Structure */ + , + const int16_t nchan_obj /* i : number of ISM channels */ ) { - int16_t i, num_obj; + int16_t i; hParamIsm->nbands = MAX_PARAM_ISM_NBANDS; - num_obj = hParamIsm->num_obj; for ( i = 0; i < hParamIsm->nbands; i++ ) { @@ -453,7 +469,7 @@ void ivas_param_ism_config( } /* for elevation zero compute the max azi quantization indices */ - for ( i = 0; i < num_obj; i++ ) + for ( i = 0; i < nchan_obj; i++ ) { hParamIsm->last_az_diff[i] = 0; hParamIsm->last_az_sgn[i] = 1; @@ -490,3 +506,96 @@ ISM_MODE ivas_ism_mode_select( return ism_mode; } + + +/*--------------------------------------------------------------- + * ivas_ism_metadata_close() + * + * Deallocate ISM metadata handles + * ---------------------------------------------------------------*/ + +void ivas_ism_metadata_close( + ISM_METADATA_HANDLE hIsmMetaData[] /* i/o : object metadata handles */ +) +{ + int16_t n; + + if ( hIsmMetaData == NULL || hIsmMetaData == NULL ) + { + return; + } + + for ( n = 0; n < MAX_NUM_OBJECTS; n++ ) + { + if ( hIsmMetaData[n] != NULL ) + { + free( hIsmMetaData[n] ); + hIsmMetaData[n] = NULL; + } + } + + return; +} + + +/*-------------------------------------------------------------------* + * update_last_metadata() + * + * Store last metadata values + *-------------------------------------------------------------------*/ + +void update_last_metadata( + const int16_t nchan_ism, /* i : number of objects */ + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + const int16_t updt_flag[] /* i : last metadata update flag */ +) +{ + int16_t ch; + + for ( ch = 0; ch < nchan_ism; ch++ ) + { + if ( updt_flag[ch] == 1 ) + { + hIsmMeta[ch]->last_azimuth = hIsmMeta[ch]->azimuth; + hIsmMeta[ch]->last_elevation = hIsmMeta[ch]->elevation; + } + } + + return; +} + + +/*----------------------------------------------------------------* + * ivas_get_ism_sid_quan_bitbudget() + * + * Set quantization bits based on the number of coded objects + *----------------------------------------------------------------*/ + +void ivas_get_ism_sid_quan_bitbudget( + const int16_t nchan_ism, /* i : number of objects */ + int16_t *nBits_azimuth, /* o : number of Q bits for azimuth */ + int16_t *nBits_elevation, /* o : number of Q bits for elevation */ + float *q_step, /* o : quantization step */ + float *q_step_border, /* o : quantization step at the border */ + int16_t *nBits_coh, /* o : number of Q bits for coherence */ + int16_t *nBits_sce_id /* o : number of Q bits for sce_id_dtx */ +) +{ + *nBits_azimuth = ISM_DTX_AZI_BITS_HIGH; + *nBits_elevation = ISM_DTX_ELE_BITS_HIGH; + *q_step = ISM_Q_STEP_HIGH; + *q_step_border = ISM_Q_STEP_BORDER_HIGH; + *nBits_coh = ISM_DTX_COH_SCA_BITS; + *nBits_sce_id = 1; + + if ( nchan_ism >= 3 ) + { + *nBits_azimuth = ISM_DTX_AZI_BITS_LOW; + *nBits_elevation = ISM_DTX_ELE_BITS_LOW; + *q_step = ISM_Q_STEP_LOW; + *q_step_border = ISM_Q_STEP_BORDER_LOW; + *nBits_sce_id = 2; + } + + return; +} diff --git a/lib_com/ivas_masa_com.c b/lib_com/ivas_masa_com.c index 86f76763780c18891f261df2d28b033dc4a6927a..02d9939dc49ef33e237293183fec208494287dd3 100644 --- a/lib_com/ivas_masa_com.c +++ b/lib_com/ivas_masa_com.c @@ -314,6 +314,8 @@ void masa_sample_rate_band_correction( int16_t *band_mapping, /* i/o: Band mapping used and modified */ IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: QMetadata structure for modification */ const int32_t sampling_rate /* i : Sampling rate */ + , + MASA_DECODER_EXT_OUT_META_HANDLE hExtOutMeta /* i/o: MASA decoder metadata ext out buffer */ ) { uint8_t band, sf; @@ -386,6 +388,203 @@ void masa_sample_rate_band_correction( hQMetaData->twoDirBands[band] = 0; } } + if ( hExtOutMeta != NULL ) + { + /* in decoder, zero the EXT out MASA meta buffer */ + for ( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ ) + { + for ( band = config->numCodingBands; band < MASA_FREQUENCY_BANDS; band++ ) + { + hExtOutMeta->directionIndex[0][sf][band] = SPH_IDX_FRONT; + hExtOutMeta->directToTotalRatio[0][sf][band] = 0u; + hExtOutMeta->spreadCoherence[0][sf][band] = 0u; + + hExtOutMeta->directionIndex[1][sf][band] = SPH_IDX_FRONT; + hExtOutMeta->directToTotalRatio[1][sf][band] = 0u; + hExtOutMeta->spreadCoherence[1][sf][band] = 0u; + + hExtOutMeta->surroundCoherence[sf][band] = 0u; + hExtOutMeta->diffuseToTotalRatio[sf][band] = UINT8_MAX; + } + } + } return; } + +#ifdef HR_METADATA +/* !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 */ + 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( 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; +} + +int16_t quantize_theta( + float x, /* i : theta value to be quantized */ + 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; +} + + +/* !r: index azimuth */ +int16_t quantize_phi_masa( + float phi, /* i : azimuth value */ + 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; +} + +#endif diff --git a/lib_com/ivas_mc_param_com.c b/lib_com/ivas_mc_param_com.c index c6cfe0ed8f6f1760d356351405ea5e4d4c53f276..acf7a8eae2c97e5a2a5092ad5d970c734f126de7 100644 --- a/lib_com/ivas_mc_param_com.c +++ b/lib_com/ivas_mc_param_com.c @@ -141,7 +141,6 @@ void ivas_param_mc_metadata_open( ivas_param_mc_default_icc_map( hMetadataPMC->icc_mapping_conf, hMetadataPMC->icc_mapping[i] ); } - /* init remaining flags and indices */ hMetadataPMC->param_frame_idx = 0; hMetadataPMC->flag_use_adaptive_icc_map = 0; diff --git a/lib_com/ivas_mct_com.c b/lib_com/ivas_mct_com.c index 5ef4d294781b5027c1db1eeeeca326c40078784f..97c5f5dd8c982fda7ff0b57fc6507869fb957d94 100644 --- a/lib_com/ivas_mct_com.c +++ b/lib_com/ivas_mct_com.c @@ -66,11 +66,6 @@ void splitAvailableBitsMCT( int16_t min_chan_bits[MCT_MAX_CHANNELS], min_bits_tot, remaining_bits; int16_t core[MCT_MAX_CHANNELS]; MCT_CHAN_MODE mct_chan_mode[MCT_MAX_CHANNELS]; - int16_t num_lfe; - int16_t lfe_channel; - - num_lfe = 0; - lfe_channel = -1; min_bits_tot = 0; for ( i = 0; i < nchan; i++ ) @@ -85,18 +80,12 @@ void splitAvailableBitsMCT( mct_chan_mode[i] = ( (Decoder_State *) sts[i] )->mct_chan_mode; core[i] = ( (Decoder_State *) sts[i] )->core; } - - if ( mct_chan_mode[i] == MCT_CHAN_MODE_LFE ) - { - num_lfe++; - lfe_channel = i; - assert( lfe_channel == LFE_CHANNEL ); - } } for ( i = 0; i < nchan; i++ ) { - if ( mct_chan_mode[i] != MCT_CHAN_MODE_LFE && mct_chan_mode[i] != MCT_CHAN_MODE_IGNORE ) + if ( + mct_chan_mode[i] != MCT_CHAN_MODE_IGNORE ) { min_chan_bits[i] = 0; @@ -128,7 +117,8 @@ void splitAvailableBitsMCT( bits_frame_channel = &( (Decoder_State *) sts[i] )->bits_frame_channel; } - if ( mct_chan_mode[i] != MCT_CHAN_MODE_LFE && mct_chan_mode[i] != MCT_CHAN_MODE_IGNORE ) + if ( + mct_chan_mode[i] != MCT_CHAN_MODE_IGNORE ) { assert( split_ratio[i] >= 1 && split_ratio[i] < BITRATE_MCT_RATIO_RANGE ); *bits_frame_channel = split_ratio[i] * remaining_bits / BITRATE_MCT_RATIO_RANGE + min_chan_bits[i]; @@ -162,7 +152,8 @@ void splitAvailableBitsMCT( bits_frame_channel = &( (Decoder_State *) sts[i] )->bits_frame_channel; } - if ( mct_chan_mode[i] != MCT_CHAN_MODE_LFE && mct_chan_mode[i] != MCT_CHAN_MODE_IGNORE ) + if ( + mct_chan_mode[i] != MCT_CHAN_MODE_IGNORE ) { *bits_frame_channel -= diff * split_ratio[i] / BITRATE_MCT_RATIO_RANGE; *bits_frame_channel = max( min_chan_bits[i], *bits_frame_channel ); diff --git a/lib_com/ivas_mdft_imdft.c b/lib_com/ivas_mdft_imdft.c index e6f276575e1bc9672abd30b6be0c414e2bd9498d..a9f5bac5320fd73094f64617b505aa32253e7373 100644 --- a/lib_com/ivas_mdft_imdft.c +++ b/lib_com/ivas_mdft_imdft.c @@ -82,6 +82,11 @@ static void ivas_get_mdft_twid_factors( case IVAS_160_PT_LEN: *ppTwid = &ivas_mdft_coeff_cos_twid_160[0]; break; +#ifdef PARAMMC_SHORT_ENC_MDFT + case IVAS_120_PT_LEN: + *ppTwid = &ivas_mdft_coeff_cos_twid_120[0]; + break; +#endif case IVAS_80_PT_LEN: *ppTwid = &ivas_mdft_coeff_cos_twid_80[0]; break; diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h index 6711b998c971fcfad9c904d14a305722ce3936f3..370d440f08fa54844e120fd80ad1a738970d8797 100644 --- a/lib_com/ivas_prot.h +++ b/lib_com/ivas_prot.h @@ -124,7 +124,7 @@ void destroy_cpe_enc( ); void ivas_mct_enc_close( - MCT_ENC_HANDLE hMCT /* i/o: MCT encoder structure */ + MCT_ENC_HANDLE *hMCT /* i/o: MCT encoder structure */ ); ivas_error ivas_corecoder_enc_reconfig( @@ -202,12 +202,7 @@ ivas_error pre_proc_front_ivas( const int16_t front_vad_flag, /* i : front-VAD flag to overwrite VAD decision */ const int16_t force_front_vad, /* i : flag to force VAD decision */ const int16_t front_vad_dtx_flag, /* i : front-VAD DTX flag to overwrite VAD decision*/ -#ifdef LOW_RATE_TRANS_CORE_CODER const int32_t ivas_total_brate /* i : IVAS total bitrate */ -#else - const int32_t ivas_total_brate, /* i : IVAS total bitrate */ - const int16_t ivas_format /* i : IVAS format */ -#endif ); ivas_error pre_proc_ivas( @@ -294,7 +289,7 @@ ivas_error stereo_dmx_evs_init_encoder( ); void stereo_dmx_evs_close_encoder( - STEREO_DMX_EVS_ENC_HANDLE hStereoDmxEVS /* i/o: Stereo downmix for EVS encoder handle */ + STEREO_DMX_EVS_ENC_HANDLE *hStereoDmxEVS /* i/o: Stereo downmix for EVS encoder handle */ ); ivas_error ivas_dec( @@ -504,12 +499,8 @@ void stereo_tcx_core_dec( const int16_t last_element_mode, /* i : last element mode */ const int16_t flag_sec_CNA, /* i : CNA flag for secondary channel */ STEREO_CNG_DEC_HANDLE hStereoCng, /* i : Stereo CNG handle */ - const int16_t nchan_out /* i : number of output channels */ -#ifdef PARAM_ISM_DTX_CNG - , - const IVAS_FORMAT ivas_format, /* i : IVAS format */ - const ISM_MODE ism_mode /* i : ISM mode (only needed if format is ISM) */ -#endif + const int16_t nchan_out, /* i : number of output channels */ + const IVAS_FORMAT ivas_format /* i : IVAS format */ ); void stereo_tcx_init_dec( @@ -747,13 +738,13 @@ void dtx_read_padding_bits( /*----------------------------------------------------------------------------------* - * ISm prototypes + * ISM prototypes *----------------------------------------------------------------------------------*/ ivas_error ivas_ism_config( - const int32_t ism_total_brate, /* i : ISms total bitrate */ - const int16_t num_trans_ch, /* i : number of trans channels */ - const int16_t num_obj, /* i : number of objects */ + const int32_t ism_total_brate, /* i : ISM total bitrate */ + const int16_t nchan_transport, /* i : number of transport channels */ + const int16_t nchan_ism, /* i : number of objects */ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ const int16_t localVAD[MAX_NUM_OBJECTS], /* i : local VAD flag */ const int16_t ism_imp[], /* i : ISM importance flags */ @@ -775,6 +766,8 @@ int16_t ism_quant_meta( const float val, /* i : scalar value to quantize */ float *valQ, /* o : quantized value */ const float borders[], /* i : level borders */ + const float q_step, /* i : quantization step */ + const float q_step_border, /* i : quantization step at the border */ const int16_t cbsize /* i : codebook size */ ); @@ -782,13 +775,18 @@ int16_t ism_quant_meta( float ism_dequant_meta( const int16_t idx, /* i : quantizer index */ const float borders[], /* i : level borders */ + const float q_step, /* i : quantization step */ + const float q_step_border, /* i : quantization step at the border */ const int16_t cbsize /* i : codebook size */ ); ivas_error ivas_set_ism_metadata( ISM_METADATA_HANDLE hIsmMeta, /* o : ISM metadata handle */ const float azimuth, /* i : azimuth value */ - const float elevation /* i : elevation value */ + const float elevation, /* i : elevation value */ + const float radius_meta, /* i : radius */ + const float yaw, /* i : yaw */ + const float pitch /* i : pitch */ ); ivas_error ivas_ism_metadata_enc_create( @@ -811,7 +809,8 @@ ivas_error ivas_ism_enc( ); ivas_error ivas_ism_metadata_enc( - const int32_t ism_total_brate, /* i : ISms total bitrate */ + const int32_t ism_total_brate, /* i : ISM total bitrate */ + const int16_t nchan_ism, /* i : number of ISM channels */ const int16_t nchan_transport, /* i : number of transport channels */ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ SCE_ENC_HANDLE hSCE[], /* i/o: SCE encoder handles */ @@ -819,18 +818,23 @@ ivas_error ivas_ism_metadata_enc( int16_t nb_bits_metadata[], /* o : number of metadata bits */ const int16_t localVAD[], /* i : VAD flag */ const int16_t ism_mode, /* i : ISM mode */ - const PARAM_ISM_CONFIG_HANDLE hParamIsm /* i : Param ISM Config Handle */ + const PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i : Param ISM Config Handle */ + const int16_t ism_extended_metadata_flag /* i : Extended metadata flag */ ); ivas_error ivas_ism_metadata_dec( - const int32_t ism_total_brate, /* i : ISms total bitrate */ + const int32_t ism_total_brate, /* i : ISM total bitrate */ + const int16_t nchan_ism, /* i : number of ISM channels */ int16_t *nchan_transport, /* o : number of transport channels */ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ SCE_DEC_HANDLE hSCE[], /* i/o: SCE decoder handles */ const int16_t bfi, /* i : bfi flag */ - int16_t nb_bits_metadata[], /* o : number of metadata bits */ + int16_t nb_bits_metadata[], /* o : number of metadata bits */ ISM_MODE ism_mode, /* i : ISM mode */ - const PARAM_ISM_CONFIG_HANDLE hParamIsm /* i : Param ISM Config Handle */ + ISM_DTX_DATA_DEC hISMDTX, /* i/o: ISM DTX structure */ + const PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i : Param ISM Config Handle */ + int16_t *ism_extended_metadata_flag, /* i/o: Extended metadata active in renderer */ + int16_t *ism_extmeta_cnt /* i/o: Number of change frames observed */ ); @@ -855,10 +859,14 @@ void ivas_param_ism_enc( ); void ivas_param_ism_enc_close( - DIRAC_ENC_HANDLE hDirAC, /* i/o: encoder DirAC handle */ + DIRAC_ENC_HANDLE *hDirAC, /* i/o: encoder DirAC handle */ const int32_t input_Fs /* i : input sampling_rate */ ); +void ivas_ism_metadata_close( + ISM_METADATA_HANDLE hIsmMetaData[] /* i/o : object metadata handles */ +); + void ivas_param_ism_stereo_dmx( Encoder_Struct *st_ivas, /* i : IVAS encoder structure */ float data[MAX_NUM_OBJECTS][L_FRAME48k], /* i/o: input signal/stereo dmx */ @@ -867,6 +875,8 @@ void ivas_param_ism_stereo_dmx( void ivas_param_ism_config( PARAM_ISM_CONFIG_HANDLE hParamIsm /* i/o: IVAS Param ISM Config Structure */ + , + const int16_t nchan_ism /* i : number of ISM channels */ ); ivas_error ivas_ism_enc_config( @@ -874,8 +884,9 @@ ivas_error ivas_ism_enc_config( ); ivas_error ivas_ism_dec_config( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - const int16_t num_obj /* i : number of objects in the bitstream */ + Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ + , + const ISM_MODE last_ism_mode /* i/o: last ISM mode */ ); ivas_error ivas_param_ism_dec_open( @@ -883,7 +894,7 @@ ivas_error ivas_param_ism_dec_open( ); void ivas_param_ism_dec_close( - DIRAC_DEC_HANDLE hDirAC, /* i/o: decoder DirAC handle */ + DIRAC_DEC_HANDLE *hDirAC, /* i/o: decoder DirAC handle */ const AUDIO_CONFIG output_config /* i : output audio configuration */ ); @@ -897,55 +908,92 @@ void ivas_param_ism_params_to_masa_param_mapping( ); -#ifdef PARAM_ISM_DTX_CNG /*----------------------------------------------------------------------------------* * ISM DTX prototypes *----------------------------------------------------------------------------------*/ ivas_error ivas_ism_dtx_open( - Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */ + Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */ +); + +/*! r: indication of DTX frame */ +int16_t ivas_ism_dtx_enc( + ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */ + SCE_ENC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */ + const int32_t ivas_total_brate, /* i : IVAS total bitrate */ + const int16_t nchan_ism, /* i : number of objects */ + const int16_t nchan_transport, /* i : number of transport channels */ + int16_t vad_flag[MAX_NUM_OBJECTS], /* i : VAD flag */ + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + int16_t md_diff_flag[], /* o : metadata differential flag */ + int16_t *sid_flag /* o : indication of SID frame */ ); ivas_error ivas_ism_dtx_dec( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - int16_t *nb_bits_metadata /* o : number of metadata bits */ + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + int16_t *nb_bits_metadata /* o : number of metadata bits */ ); -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 */ +void ivas_ism_metadata_sid_enc( + ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */ + const int16_t flag_noisy_speech, /* i : noisy speech flag */ + const int16_t nchan_ism, /* i : number of objects */ + const int16_t nchan_transport, /* i : number of transport channels */ + const ISM_MODE ism_mode, /* i : ISM mode */ + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + const int16_t sid_flag, /* i : indication of SID frame */ + const int16_t md_diff_flag[], /* i : metadata differental flag */ + BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */ + int16_t nb_bits_metadata[] /* o : number of metadata bits */ ); -void ivas_param_ism_metadata_dtx_dec( - Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ +void ivas_ism_metadata_sid_dec( + SCE_DEC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */ + const int32_t ism_total_brate, /* i : ISms total bitrate */ + const int16_t bfi, /* i : bfi flag */ + const int16_t nchan_ism, /* i : number of objects */ + const int16_t nchan_transport, /* i : number of transport channels */ + const ISM_MODE ism_mode, /* i : ISM mode */ + int16_t *flag_noisy_speech, /* o : noisy speech flag */ + int16_t *sce_id_dtx, /* o : SCE DTX ID */ + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + int16_t nb_bits_metadata[] /* o : number of metadata bits */ ); void ivas_ism_get_sce_id_dtx( - ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */ - SCE_ENC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */ - const int16_t nchan_transport, /* i : number of transport channels */ - const int16_t input_frame /* i : input frame length per channel */ + ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */ + SCE_ENC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */ + const int16_t nchan_transport, /* i : number of transport channels */ + const int16_t input_frame /* i : input frame length per channel */ ); -void ivas_param_ism_compute_noisy_speech_flag( - Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */ +void ivas_param_ism_compute_noisy_speech_flag( + Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */ ); -/*! 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 */ +void ivas_ism_coh_estim_dtx_enc( + ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */ + SCE_ENC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */ + const int16_t nchan_transport, /* i : number of transport channels */ + const int16_t input_frame /* i : input frame length */ ); -void ivas_ism_coh_estim_dtx_enc( - ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */ - SCE_ENC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */ - const int16_t nchan_transport, /* i : number of transport channels */ - const int16_t input_frame /* i : input frame length */ +void update_last_metadata( + const int16_t nchan_ism, /* i : number of objects */ + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + const int16_t updt_flag[] /* i : last metadata update flag */ +); + +void ivas_get_ism_sid_quan_bitbudget( + const int16_t nchan_ism, /* i : number of objects */ + int16_t *nBits_azimuth, /* o : number of Q bits for azimuth */ + int16_t *nBits_elevation, /* o : number of Q bits for elevation */ + float *q_step, /* o : quantization step */ + float *q_step_border, /* o : quantization step at the border */ + int16_t *nBits_coh, /* o : number of Q bits for coherence */ + int16_t *nBits_sce_id /* o : number of Q bits for sce_id_dtx */ ); -#endif + /*----------------------------------------------------------------------------------* * DFT Stereo prototypes @@ -1115,6 +1163,7 @@ 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 */ + const int16_t sba_mono_flag, /* i : signal mono output for SBA DirAC */ ivas_spar_md_dec_state_t *hMdDec, /* i/o: SPAR MD handle for upmixing */ const int16_t cross_fade_start_offset, /* i : SPAR mixer delay compensation */ const int32_t output_Fs, /* i : Fs for delay calculation */ @@ -1288,9 +1337,9 @@ int16_t adapt_GR_rpg1_ief( /*! r: number of bits written */ int16_t write_GR1( BSTR_ENC_HANDLE hBstr, /* i/o: Encoder bitstream handle */ - const int16_t ind, /* i : bitstream index */ - const int16_t *in, /* i : input vector */ - const int16_t len /* i : vector length */ + const int16_t ind, /* i : bitstream index */ + const int16_t *in, /* i : input vector */ + const int16_t len /* i : vector length */ ); /*! r: number of bits written */ @@ -1866,25 +1915,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, @@ -2134,7 +2179,6 @@ void decoder_tcx_imdct( float synthFB[], const int16_t bfi, /* i : Bad frame indicator */ const int16_t frame_cnt, /* i : frame counter in the super frame */ - const int16_t isLFE, /* i : is LFE */ const int16_t sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */ ); @@ -2343,6 +2387,23 @@ void sns_shape_spectrum( const int16_t L_frame /* i : frame length */ ); +#ifdef SNS_MSVQ +int16_t quantize_sns( + float sns_in[CPE_CHANNELS][NB_DIV][M], + float snsQ_out[CPE_CHANNELS][NB_DIV][M], + Encoder_State **sts, + int16_t *indices, + int16_t *zero_side_flag, + int16_t *sns_stereo_mode +); + +void dequantize_sns( + int16_t indices[CPE_CHANNELS][NPRM_LPC_NEW], + float snsQ_out[CPE_CHANNELS][NB_DIV][M], + Decoder_State **sts +); +#endif + void sns_avq_cod( const float *sns, /* i : Input sns vectors */ const float *snsmid, /* i : Input mid-sns vectors */ @@ -2364,7 +2425,11 @@ void sns_avq_cod_stereo( void sns_avq_dec( int16_t *index, /* i : Quantization indices */ +#ifdef SNS_MSVQ + float SNS_Q[NB_DIV][M], /* o : Quantized SNS vectors */ +#else float *SNS_Q, /* o : Quantized SNS vectors */ +#endif const int16_t numlpc /* i : Number of sets of lpc */ ); @@ -2699,7 +2764,6 @@ void ivas_mdct_core_whitening_enc( int16_t tnsSize[CPE_CHANNELS][NB_DIV], /* o : size of TNS */ int16_t p_param[CPE_CHANNELS][NB_DIV], /* o : pointer to parameter array */ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */ - int16_t *LFE_off, /* o : flag if LFE has content */ const int16_t mct_on, /* i : flag mct block (1) or stereo (0) */ const int16_t nChannels /* i : total number of coded channels */ ); @@ -2717,7 +2781,6 @@ void ivas_mct_core_enc( void ivas_mdct_quant_coder( CPE_ENC_HANDLE hCPE, /* i/o: Encoder CPE handle */ - const int16_t LFE_off, /* i : flag if LFE has content */ int16_t tnsBits[CPE_CHANNELS][NB_DIV], /* i : bits needed for TNS parameters */ int16_t tnsSize[CPE_CHANNELS][NB_DIV], /* i : size of TNS */ int16_t p_param[CPE_CHANNELS][NB_DIV], /* i : pointer to parameter array */ @@ -2768,7 +2831,6 @@ void ivas_mdct_dec_side_bits_frame_channel( int16_t param_lpc[MCT_MAX_CHANNELS][NPRM_LPC_NEW], /* o : lpc_parameters */ int16_t p_param[CPE_CHANNELS][NB_DIV], /* o : pointer to param buffer */ Decoder_State *st0, /* i : pointer to bitstream handle */ - int16_t *LFE_off, /* o : flag if LFE has content */ int16_t nTnsBitsTCX10[CPE_CHANNELS][NB_DIV], /* o : number of bits for TNS */ int16_t param[CPE_CHANNELS][DEC_NPRM_DIV * NB_DIV], /* i/o: parameters buffer */ const int16_t MCT_flag, /* i : hMCT handle allocated (1) or not (0) */ @@ -2788,7 +2850,6 @@ void ivas_mct_side_bits( void ivas_mdct_core_invQ( CPE_DEC_HANDLE hCPE, /* i/o: CPE handle */ - const int16_t LFE_off, /* i : flag if LFE content */ int16_t nTnsBitsTCX10[CPE_CHANNELS][NB_DIV], /* i : number of TNS bits */ int16_t p_param[CPE_CHANNELS][NB_DIV], /* i : pointer to param buffer */ int16_t param_lpc[CPE_CHANNELS][NPRM_LPC_NEW], /* i : lpc parameters */ @@ -2806,14 +2867,12 @@ void ivas_mdct_core_reconstruct( CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */ float *x[][NB_DIV], /* i/o: pointers to synthesis @internal_FS */ float signal_outFB[CPE_CHANNELS][L_FRAME_PLUS], /* o : synthesis @output_FS */ - const int16_t LFE_off, /* i : flag if LFE content */ int16_t fUseTns[CPE_CHANNELS][NB_DIV], /* i : flage TNS enabled */ const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0) */ ); void ivas_mdct_core_tns_ns( CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */ - const int16_t LFE_off, /* i : flag if LFE has content */ int16_t fUseTns[CPE_CHANNELS][NB_DIV], /* i : two entries for each channel in TCX10 */ STnsData tnsData[CPE_CHANNELS][NB_DIV], /* o : TNS parameter */ float *x[CPE_CHANNELS][NB_DIV], /* o : synthesis @internal_FS */ @@ -2837,7 +2896,7 @@ void ivas_mct_dec_mct( void apply_MCT_dec( MCT_DEC_HANDLE hMCT, /* i/o: MCT decoder structure */ Decoder_State **sts, /* i/o: decoder state structure */ - float *x[MCT_MAX_CHANNELS][NB_DIV] /* i/o: decoded and dequan. spect. input to MCT */ + float *x[MCT_MAX_CHANNELS][NB_DIV] /* i/o: decoded and dequan. spect. input to MCT */ ); void mctStereoIGF_dec( @@ -2873,6 +2932,52 @@ ivas_error ivas_qmetadata_enc_encode( IVAS_QMETADATA *hQMetaData /* i/o: q_metadata handle */ ); +#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 */ + int16_t bits_sph_idx, + int16_t bits_sp_coh +); +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 */ + SPHERICAL_GRID_DATA *sph_grid16, /* i: spherical grid for deindexing */ + int16_t bits_sph_idx, + 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 */ +); + + +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 */ + SPHERICAL_GRID_DATA *gridData /* i : generated grid data */ +); + + int16_t quantize_theta( + float x, /* i : theta value to be quantized */ + int16_t no_cb, /* i : number of codewords */ + float *xhat /* o : quantized value */ +); + +/* !r: index azimuth */ + int16_t quantize_phi_masa( + float phi, /* i : azimuth value */ + 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 */ +); +#endif + void reset_metadata_spatial( const IVAS_FORMAT ivas_format, /* i : IVAS format */ BSTR_ENC_HANDLE hMetaData, /* i/o: Metadata bitstream handle */ @@ -2899,6 +3004,8 @@ int16_t ivas_qmetadata_dec_decode( int16_t *index /* i/o: bitstream position */ ); + + /*! r: number of bits read */ int16_t ivas_qmetadata_dec_sid_decode( IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */ @@ -2973,6 +3080,10 @@ 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 + , + int16_t is_hr +#endif ); /* !r: quantized spherical index */ @@ -3121,7 +3232,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( @@ -3135,6 +3246,10 @@ void ivas_sba_config( int16_t *element_mode /* o : element mode of the core coder */ ); +void ivas_sba_set_cna_cng_flag( + Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ +); + ivas_error ivas_sba_dec_reconfigure( Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ ); @@ -3211,6 +3326,10 @@ void ivas_sba_dirac_stereo_config( STEREO_DFT_CONFIG_DATA_HANDLE hConfig /* o : DFT stereo configuration */ ); +int16_t ivas_get_sba_dirac_stereo_flag( + Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ +); + 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 */ @@ -3241,7 +3360,7 @@ ivas_error ivas_dirac_enc_reconfigure( ); void ivas_dirac_enc_close( - DIRAC_ENC_HANDLE hDirAC, /* i/o: encoder DirAC handle */ + DIRAC_ENC_HANDLE *hDirAC, /* i/o: encoder DirAC handle */ const int32_t input_Fs /* i : input sampling_rate */ ); @@ -3293,7 +3412,7 @@ ivas_error ivas_dirac_dec_config( ); void ivas_dirac_dec_close( - DIRAC_DEC_HANDLE hDirAC /* i/o: decoder DirAC handle */ + DIRAC_DEC_HANDLE *hDirAC /* i/o: decoder DirAC handle */ ); void ivas_dirac_dec_read_BS( @@ -3315,10 +3434,27 @@ void ivas_dirac_dec( const int16_t i_sf ); +#ifdef FIX_417_TD_DECORR_BRATE_SW +ivas_error ivas_td_decorr_reconfig_dec( + const IVAS_FORMAT ivas_format, /* i : IVAS format */ + const int32_t ivas_total_brate, /* i : total IVAS bitrate */ + const int16_t nchan_transport, /* i : number of transport channels */ + const int32_t output_Fs, /* i : output sampling rate */ + ivas_td_decorr_state_t **hTdDecorr, /* i/o: TD decorrelator handle */ + uint16_t *useTdDecorr /* i/o: TD decorrelator flag */ +); + +/*! 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 */ +); +#else 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 */ ); +#endif void computeDiffuseness_mdft( float **buffer_intensity[DIRAC_NUM_DIMS], @@ -3418,8 +3554,7 @@ void ivas_dirac_dec_output_synthesis_process_slot( const float *p_Rmat, /* i : rotation matrix */ const VBAP_HANDLE hVBAPdata, /* i : VBAP structure */ const IVAS_OUTPUT_SETUP hOutSetup, /* i : output setup structure */ - const int16_t nchan_transport, /* i : number of transport channels */ - const int16_t index_slot + const int16_t nchan_transport /* i : number of transport channels */ ); void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd( @@ -3472,8 +3607,6 @@ void ivas_dirac_dec_compute_directional_responses( DIRAC_DEC_HANDLE hDirAC, /* i/o: DirAC handle */ const VBAP_HANDLE hVBAPdata, /* i : VBAP structure */ const MASA_DECODER_HANDLE hMasa, /* i : MASA decoder structure */ - const int16_t direction_idx, /* i : index for direction (azi and ele) */ - const int16_t subframe_idx, /* i : subframe index */ const float *surCohRatio, const int16_t shd_rot_max_order, /* i : split-order rotation method */ const float *p_Rmat /* i : rotation matrix */ @@ -3521,7 +3654,7 @@ ivas_error ivas_param_mc_enc_reconfig( ); void ivas_param_mc_enc_close( - PARAM_MC_ENC_HANDLE hParamMC, /* i/o: Parametric MC encoder handle */ + PARAM_MC_ENC_HANDLE *hParamMC, /* i/o: Parametric MC encoder handle */ const int32_t input_Fs /* i : input sampling rate */ ); @@ -3751,18 +3884,14 @@ void FdCngDecodeDiracMDCTStereoSID( ivas_error ivas_spar_enc_open( Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */ -#ifdef SBA_BR_SWITCHING_CLEAN_UP ,const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ -#endif ); void ivas_spar_enc_close( - SPAR_ENC_HANDLE hSpar, /* i/o: SPAR encoder handle */ + SPAR_ENC_HANDLE *hSpar, /* i/o: SPAR encoder handle */ const int32_t input_Fs, /* i : input sampling rate */ - const int16_t nchan_inp /* i : number of input channels */ -#ifdef SBA_BR_SWITCHING_CLEAN_UP - ,const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ -#endif + const int16_t nchan_inp, /* i : number of input channels */ + const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ ); ivas_error ivas_spar_enc( @@ -3774,20 +3903,14 @@ ivas_error ivas_spar_enc( ); ivas_error ivas_spar_dec_open( - Decoder_Struct *st_ivas /* i/o: IVAS decoder handle */ -#ifdef SBA_BR_SWITCHING_CLEAN_UP - , + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ -#endif ); void ivas_spar_dec_close( - SPAR_DEC_HANDLE hSpar, /* i/o: SPAR decoder handle */ - const int32_t output_Fs /* i : output sampling rate */ -#ifdef SBA_BR_SWITCHING_CLEAN_UP - , + SPAR_DEC_HANDLE *hSpar, /* i/o: SPAR decoder handle */ + const int32_t output_Fs, /* i : output sampling rate */ const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ -#endif ); ivas_error ivas_spar_dec( @@ -4011,6 +4134,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( @@ -4024,6 +4149,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, @@ -4067,6 +4193,9 @@ 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 ); ivas_error ivas_spar_md_dec_open( @@ -4110,6 +4239,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( @@ -4139,6 +4270,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( @@ -4157,11 +4290,7 @@ void ivas_enc_cov_handler_process( const int16_t end_band, const int16_t nchan_inp, const int16_t dtx_vad, -#ifdef SMOOTH_WITH_TRANS_DET const int16_t transient_det[2] -#else - const int16_t transient_det -#endif ); ivas_error ivas_spar_covar_smooth_enc_open( @@ -4169,6 +4298,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( @@ -4183,37 +4314,25 @@ void ivas_cov_smooth_process( const int16_t start_band, const int16_t end_band, const int16_t num_ch, -#ifdef SMOOTH_WITH_TRANS_DET const int16_t transient_det[2] -#else - const int16_t transient_det -#endif ); /* Transient detector module */ -ivas_error ivas_transient_det_open( +ivas_error ivas_transient_det_open( ivas_trans_det_state_t **hTranDet, /* i/o: Transient detector handle */ const int32_t sampling_rate /* i : sampling rate */ ); -void ivas_transient_det_close( +void ivas_transient_det_close( ivas_trans_det_state_t **hTranDet /* i/o: Transient detector handle */ ); -#ifdef SMOOTH_WITH_TRANS_DET void ivas_transient_det_process( ivas_trans_det_state_t *hTranDet, /* i/o: SPAR TD handle */ float *pIn_pcm, /* i : input audio channels */ - const int16_t frame_len, /* i : frame length in samples */ + const int16_t frame_len, /* i : frame length in samples */ int16_t transient_det[2] /* o : transient det outputs */ ); -#else -int16_t ivas_transient_det_process( - ivas_trans_det_state_t *hTranDet, /* i/o: Transient detector handle */ - float *pIn_pcm, /* i : input audio channels */ - const int16_t frame_len /* i : frame length in samples */ -); -#endif void ivas_td_decorr_get_ducking_gains( ivas_trans_det_state_t *hTranDet, /* i/o: Transient detector handle */ @@ -4224,14 +4343,14 @@ void ivas_td_decorr_get_ducking_gains( const int16_t tdet_flag ); -ivas_error ivas_td_decorr_dec_open( +ivas_error ivas_td_decorr_dec_open( ivas_td_decorr_state_t **hTdDecorr, /* i/o: TD decorrelator handle */ const int32_t output_Fs, /* i : output sampling rate */ const int16_t nchan_internal, /* i : number of internal channels */ const int16_t ducking_flag /* i : ducking flag */ ); -void ivas_td_decorr_dec_close( +void ivas_td_decorr_dec_close( ivas_td_decorr_state_t **hTdDecorr /* i/o: TD decorrelator handle */ ); @@ -4450,7 +4569,7 @@ ivas_error ivas_masa_dec_open( ); void ivas_masa_dec_close( - MASA_DECODER_HANDLE hMasa /* i/o: MASA metadata structure */ + MASA_DECODER_HANDLE *hMasa /* i/o: MASA metadata structure */ ); ivas_error ivas_masa_decode( @@ -4468,12 +4587,7 @@ 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 + MASA_ENCODER_HANDLE *hMasa /* i/o: MASA metadata structure */ ); void ivas_masa_enc_reconfigure( @@ -4555,6 +4669,7 @@ void masa_sample_rate_band_correction( int16_t *band_mapping, /* i/o: Band mapping used and modified */ IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: QMetadata structure for modification */ const int32_t sampling_rate /* i : sampling rate */ + , MASA_DECODER_EXT_OUT_META_HANDLE hExtOutMeta /* i/o: MASA decoder metadata ext out buffer */ ); void invdct4_transform( @@ -4576,6 +4691,14 @@ void ivas_masa_prerender( const int16_t output_frame /* i : output frame length per channel */ ); +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS +void ivas_spar_param_to_masa_param_mapping( + 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 */ +); +#else 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 */ @@ -4583,6 +4706,7 @@ void ivas_spar_param_to_masa_param_mapping( const int16_t firstSubframe, /* i : First subframe to map */ const int16_t nSubframes /* i : Number of subframes to map */ ); +#endif /*---------------------------------------------------------------------------------* @@ -4652,7 +4776,7 @@ void ivas_ism2sba( float buffer_td[][L_FRAME48k], /* i/o: TD signal buffers */ ISM_RENDERER_HANDLE hIsmRendererData, /* i/o: renderer data */ const ISM_METADATA_HANDLE hIsmMetaData[], /* i : object metadata */ - const int16_t num_objects, /* i : number of objects */ + const int16_t nchan_ism, /* i : number of objects */ const int16_t output_frame, /* i : output frame length per channel */ const int16_t sba_order /* i : SBA order */ ); @@ -4756,7 +4880,7 @@ ivas_error ivas_mcmasa_enc_open( ); void ivas_mcmasa_enc_close( - MCMASA_ENC_HANDLE hMcMasa, /* i/o: encoder McMASA handle */ + MCMASA_ENC_HANDLE *hMcMasa, /* i/o: encoder McMASA handle */ const int32_t input_Fs /* i : input sampling rate */ ); @@ -4879,7 +5003,7 @@ ivas_error ivas_create_lfe_enc( ); void ivas_lfe_enc_close( - LFE_ENC_HANDLE hLFE /* i/o: LFE encoder handle */ + LFE_ENC_HANDLE *hLFE /* i/o: LFE encoder handle */ ); void ivas_lfe_enc( @@ -4896,7 +5020,7 @@ ivas_error ivas_create_lfe_dec( ); void ivas_lfe_dec_close( - LFE_DEC_HANDLE hLFE /* i/o: LFE encoder handle */ + LFE_DEC_HANDLE *hLFE /* i/o: LFE encoder handle */ ); void ivas_lfe_dec( @@ -4971,20 +5095,14 @@ ivas_error ivas_fb_set_cfg( ivas_error ivas_FB_mixer_open( IVAS_FB_MIXER_HANDLE *hFbMixer, /* i/o: FB mixer handle */ const int32_t sampling_rate, /* i : sampling rate */ - IVAS_FB_CFG *fb_cfg /* i : FB config. handle */ -#ifdef SBA_BR_SWITCHING_CLEAN_UP - , + IVAS_FB_CFG *fb_cfg, /* i : FB config. handle */ const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ -#endif ); void ivas_FB_mixer_close( IVAS_FB_MIXER_HANDLE *hFbMixer, /* i/o: FB mixer handle */ - const int32_t sampling_rate /* i : sampling rate in Hz */ -#ifdef SBA_BR_SWITCHING_CLEAN_UP - , + const int32_t sampling_rate, /* i : sampling rate in Hz */ const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ -#endif ); void ivas_fb_mixer_pcm_ingest( diff --git a/lib_com/ivas_rom_com.c b/lib_com/ivas_rom_com.c index f04538c4790ca72f0a52ecd09c9cf9ecf9c4269e..4016fdfe17390bc0300a75f9076543178c3a0f92 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*/}; @@ -903,6 +887,14 @@ 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 */ + /* preferred tuning (3.2/4.9kbps) with/out TDD */ + { 13200, 0, SBA_FOA_ORDER, FB, 24000, 1, WYXZ, 1, 0, + { { 10000, 8300, 13150 } }, + { { 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, + { { 13200, 11500, 16350 } }, + { { 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 }, @@ -2531,7 +2523,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 +2577,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 +2760,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 +4018,30 @@ const float ivas_cos_twiddle_160[IVAS_160_PT_LEN >> 1] = 0.0760120586092433f, 0.0564205163668375f, 0.0368072229413588f, 0.0171797396307788f }; +#ifdef PARAMMC_SHORT_ENC_MDFT +const float ivas_mdft_coeff_cos_twid_120[IVAS_120_PT_LEN + 1] = +{ + 1.0000000000f, 0.9999143276f, 0.9996573250f, 0.9992290362f, 0.9986295348f, 0.9978589232f, 0.9969173337f, + 0.9958049276f, 0.9945218954f, 0.9930684570f, 0.9914448614f, 0.9896513868f, 0.9876883406f, 0.9855560591f, + 0.9832549076f, 0.9807852804f, 0.9781476007f, 0.9753423205f, 0.9723699204f, 0.9692309097f, 0.9659258263f, + 0.9624552365f, 0.9588197349f, 0.9550199445f, 0.9510565163f, 0.9469301295f, 0.9426414911f, 0.9381913359f, + 0.9335804265f, 0.9288095529f, 0.9238795325f, 0.9187912101f, 0.9135454576f, 0.9081431738f, 0.9025852843f, + 0.8968727415f, 0.8910065242f, 0.8849876375f, 0.8788171127f, 0.8724960071f, 0.8660254038f, 0.8594064115f, + 0.8526401644f, 0.8457278217f, 0.8386705679f, 0.8314696123f, 0.8241261886f, 0.8166415552f, 0.8090169944f, + 0.8012538127f, 0.7933533403f, 0.7853169309f, 0.7771459615f, 0.7688418321f, 0.7604059656f, 0.7518398075f, + 0.7431448255f, 0.7343225094f, 0.7253743710f, 0.7163019434f, 0.7071067812f, 0.6977904598f, 0.6883545757f, + 0.6788007455f, 0.6691306064f, 0.6593458151f, 0.6494480483f, 0.6394390020f, 0.6293203910f, 0.6190939493f, + 0.6087614290f, 0.5983246006f, 0.5877852523f, 0.5771451900f, 0.5664062369f, 0.5555702330f, 0.5446390350f, + 0.5336145159f, 0.5224985647f, 0.5112930861f, 0.5000000000f, 0.4886212415f, 0.4771587603f, 0.4656145203f, + 0.4539904997f, 0.4422886902f, 0.4305110968f, 0.4186597375f, 0.4067366431f, 0.3947438564f, 0.3826834324f, + 0.3705574375f, 0.3583679495f, 0.3461170571f, 0.3338068592f, 0.3214394653f, 0.3090169944f, 0.2965415750f, + 0.2840153447f, 0.2714404499f, 0.2588190451f, 0.2461532930f, 0.2334453639f, 0.2206974350f, 0.2079116908f, + 0.1950903220f, 0.1822355255f, 0.1693495038f, 0.1564344650f, 0.1434926220f, 0.1305261922f, 0.1175373975f, + 0.1045284633f, 0.0915016187f, 0.0784590957f, 0.0654031292f, 0.0523359562f, 0.0392598158f, 0.0261769483f, + 0.0130895956f, 0.0000000000f +}; +#endif + const float ivas_sin_twiddle_80[IVAS_80_PT_LEN >> 1] = { -0.00490871880799799f, -0.0441642771270674f, -0.0833517373318975f, -0.122410675199216f, @@ -5530,5 +5592,611 @@ const int16_t ivas_num_active_bands[FB - WB + 1] = IVAS_16K_12BANDS_ACTIVE_BANDS, IVAS_FB_BANDS_12, IVAS_FB_BANDS_12 }; +#ifdef SNS_MSVQ +const int16_t ivas_sns_cdbks_tcx20_levels[SNS_MSVQ_NSTAGES_TCX20] = { 128, 64, 32, 32 }; +const int16_t ivas_sns_cdbks_tcx20_bits[SNS_MSVQ_NSTAGES_TCX20] = { 7, 6, 5, 5 }; + +/* codebooks trained for no adaptive tilt */ +const float ivas_sns_cdbk_tcx20_stage1[ 128 * 16 ] = { + -3.24881770f, -1.99497051f, -0.04725080f, 1.02318508f, 1.51589220f, 1.44649178f, 1.27858728f, 1.15137095f, 0.98029724f, 0.69167126f, 0.33414576f, 0.11759238f, -0.27510520f, -0.63610342f, -1.05394049f, -1.28304590f, + -3.24340413f, -4.15075396f, -2.86242117f, -1.11561919f, 1.12899983f, 1.98341478f, 0.56638511f, -0.05841474f, -0.14875192f, 0.31098029f, 1.87121037f, 0.91347082f, 1.02548459f, 1.98227488f, 1.30278860f, 0.49435585f, + 1.23065598f, 0.87793778f, 0.28294330f, 0.02972172f, 0.42574775f, 0.83386805f, 0.95758438f, 1.21299710f, 1.15042593f, 1.00234403f, 0.60083169f, -0.06520030f, -1.53941239f, -2.26801783f, -2.42116011f, -2.31126766f, + 0.06088614f, 0.02623315f, -0.61781539f, -1.23181247f, -1.40815590f, -1.42831471f, -1.44033232f, -1.33353337f, -0.99555917f, -0.36554180f, 0.55314618f, 1.56114474f, 2.01339157f, 1.99106535f, 1.51097476f, 1.10422329f, + -0.46337128f, -1.76230281f, -2.14514561f, -1.74284853f, -0.74943182f, 0.04642704f, 0.99955801f, 1.04344919f, 1.33994604f, 1.17515394f, 1.38810800f, 1.59087304f, 0.68196542f, -0.13955087f, -0.49622391f, -0.76660607f, + -2.07291483f, -1.16133507f, -1.23972694f, -1.55319745f, -1.53709378f, -0.89687815f, -0.30493476f, 0.53566030f, 0.90463531f, 1.12789938f, 1.18233130f, 1.05231063f, 0.85029894f, 0.96079862f, 1.14041844f, 1.01172838f, + 2.12762247f, 0.85938708f, 0.01404337f, -0.21119526f, -0.23292897f, -0.20800178f, 0.17965021f, 0.51517794f, 0.58450068f, 0.57289696f, 0.08413189f, -0.34604446f, -0.63957268f, -0.82541169f, -1.16686648f, -1.30738935f, + 1.40474083f, 0.32307263f, 0.16419111f, 0.38346550f, 0.50108274f, 0.37590359f, 0.08846238f, -0.23008300f, -0.45942672f, -0.45977478f, -0.43670746f, -0.36727746f, -0.35363526f, -0.33341415f, -0.31539698f, -0.28520292f, + -1.63093109f, 0.32670603f, 1.08393314f, 0.58998372f, 0.53843053f, 0.88612683f, 0.92734321f, 0.85881168f, 0.60801083f, 0.37502839f, -0.29325438f, -0.61636624f, -0.51913318f, -0.70035895f, -0.99754553f, -1.43678500f, + -1.93833343f, -0.69005518f, -0.75170110f, -1.07591216f, -1.13136476f, -0.91057037f, -0.96360579f, -0.81544927f, -0.72636191f, -0.36468519f, 0.13935276f, 1.01589488f, 1.62003238f, 2.00743696f, 2.33078654f, 2.25453582f, + 0.79346182f, 0.75880356f, 0.99941121f, 1.41339988f, 1.42679902f, 1.10135650f, 0.67724856f, 0.16701926f, -0.44226147f, -0.83565024f, -0.96240506f, -0.97710726f, -1.05267194f, -1.07354671f, -1.04194230f, -0.95191489f, + 1.32136151f, -0.10247792f, -0.44723017f, -0.36075427f, -0.71183851f, -0.78401615f, 0.03854040f, 0.61579422f, 0.72990899f, 0.74660263f, 0.27260947f, -0.45511245f, -0.57501743f, -0.20707029f, -0.10728071f, 0.02598055f, + -2.38997175f, -0.94335853f, 0.22486968f, 0.68758389f, 0.77400708f, 0.48551812f, 0.16770824f, 0.18451833f, 0.33722182f, 0.44300618f, 0.45730356f, 0.25903292f, 0.07348018f, -0.18351294f, -0.34985810f, -0.22754861f, + -0.04011386f, -2.74627791f, -2.64617639f, -2.12344376f, -1.04417531f, -1.19773434f, -1.09890378f, -1.14847926f, -1.25163399f, -1.37182360f, -0.92453053f, 0.26852562f, 2.49004087f, 5.03865317f, 3.18845554f, 4.60761675f, + 1.14142799f, 2.34150710f, 1.12597821f, 0.18025034f, -0.06854703f, 0.11882225f, -0.04029384f, -0.10117108f, -1.28130702f, -1.15721800f, 0.11730029f, 0.68335719f, -0.86449861f, -0.91274565f, -0.63726145f, -0.64560064f, + 0.13591417f, 1.45701293f, 0.18328994f, -1.33736241f, -1.63073739f, -1.11748160f, 0.33426081f, 1.38341076f, 1.23963779f, 1.15857921f, -0.19884512f, -0.46649971f, -0.23043753f, -0.16721531f, -0.08938742f, -0.65413930f, + -3.20422583f, -2.18732518f, -1.06476764f, -0.35148934f, 0.10909386f, 0.39065642f, 0.55826648f, 0.44049157f, 0.21409388f, 0.73508456f, 0.80931151f, 0.46688874f, 0.41272044f, 0.76516296f, 1.00398863f, 0.90204888f, + -2.87971458f, -4.23728027f, -0.84454748f, -0.07411834f, 0.21882417f, -1.73386520f, 0.44502397f, -0.29845675f, 0.51877264f, 1.16767994f, -0.80604089f, 1.51749444f, 2.06387385f, 2.42941495f, 1.48054035f, 1.03239888f, + 0.41502416f, 1.92937242f, 2.34493885f, 2.24663449f, 1.97723622f, 1.21219002f, 0.63995779f, 0.11201995f, -0.55860561f, -1.24739776f, -1.54711086f, -1.65155024f, -1.60927011f, -1.56104438f, -1.42473910f, -1.27765585f, + 0.97567115f, -1.33363678f, -2.33351304f, -2.63770798f, -2.22869213f, -1.57504148f, -1.07402035f, -0.47932319f, 0.18065985f, 0.66105619f, 1.18623833f, 1.66207325f, 1.92650802f, 1.89672632f, 1.54070829f, 1.63229361f, + -1.83309029f, -1.12088085f, -0.69053368f, -0.04697322f, 0.16614312f, 0.20653379f, 0.18628141f, 0.29156151f, 0.23415032f, 0.18998435f, 0.46020416f, 0.73218863f, 0.60617333f, 0.33402310f, 0.20549266f, 0.07874144f, + 1.16879643f, -0.94945093f, -1.28153207f, -1.43119528f, -1.63599975f, -1.48906283f, -0.72189452f, 0.19212127f, 0.62604095f, 0.71399312f, 0.84540884f, 0.67919451f, 0.73724815f, 0.94849167f, 0.74181449f, 0.85602585f, + 3.95026110f, 1.56392643f, -0.09370037f, -1.55546296f, -0.28400433f, 2.65160213f, 1.72026891f, -1.03325487f, -2.07533128f, -1.61929448f, -0.37408941f, -0.62936182f, -0.97909452f, -0.16160269f, -0.16361090f, -0.91725088f, + 0.53671249f, -1.03786958f, -1.08801981f, -0.37356699f, -0.22489401f, 0.02309705f, 0.14784551f, 0.19793732f, 0.12472343f, 0.09506024f, 0.05869315f, 0.14383214f, 0.10038818f, 0.25076267f, 0.40789510f, 0.63740306f, + -1.95841389f, 0.03478956f, 1.04981544f, 1.45141888f, 1.01368780f, 1.76553008f, 0.97518033f, 0.87744500f, 1.11998177f, 1.49531245f, 0.43867723f, -1.39588091f, -2.49552623f, -2.06407734f, -1.18465117f, -1.12328885f, + -1.17302983f, 0.17875585f, 0.89193716f, 1.29461477f, 1.14616923f, 0.04577007f, -0.87252250f, -0.55960184f, -0.58720665f, -0.52949712f, -0.37526793f, 0.00605696f, -0.15490600f, 0.06404177f, 0.40280720f, 0.22187871f, + 0.64131376f, 1.75231910f, 2.22508888f, 1.98484418f, 0.78172753f, -0.67005650f, -0.79535378f, 0.16537851f, 0.46442966f, -0.37889506f, -1.24009244f, -0.92537177f, -0.87140953f, -1.04472250f, -1.06971265f, -1.01948730f, + 0.34969434f, 1.41127416f, 0.95134631f, -0.49521902f, -1.13459218f, -1.02414143f, -0.54470763f, 0.04902381f, -0.01765934f, -0.09518271f, -0.07199094f, -0.00398826f, 0.14565429f, 0.17470642f, 0.18302401f, 0.12275814f, + -0.44981302f, -0.20165042f, -0.00073479f, 0.26315901f, 0.44473473f, 0.36317865f, 0.17484972f, 0.03171990f, 0.07343634f, 0.04543774f, -0.09709362f, -0.05624873f, -0.00866747f, -0.02410679f, -0.21651202f, -0.34168925f, + -1.24451525f, -1.23251652f, -1.59614073f, -2.03789978f, -1.96213854f, -1.71444999f, -1.60613134f, -1.51978903f, -1.00014591f, 0.04117804f, 1.34166006f, 2.42925461f, 2.88303472f, 2.83027230f, 2.48737677f, 1.90095093f, + 1.96467234f, 1.49818482f, 0.23737321f, -0.11314831f, -0.14050512f, -0.25201114f, -0.17389748f, -0.07042668f, -0.18426976f, -0.34937744f, -0.42674607f, -0.50442879f, -0.58679768f, -0.52836378f, -0.35445903f, -0.01579900f, + -0.99933612f, 1.11819495f, 1.29449512f, -0.02576221f, -0.61170357f, 0.30864176f, 0.87998806f, 0.96699269f, 0.98082342f, 1.27485776f, 0.52941745f, -1.29529727f, -1.88922976f, -1.36858904f, -0.37094568f, -0.79254774f, + -2.00039877f, -0.30176543f, 0.62981832f, 1.66518235f, 1.71899440f, 1.30408052f, 0.82774193f, 1.00586191f, 0.86017140f, 0.54233910f, -0.13420070f, -0.66585251f, -0.96492148f, -1.18998336f, -1.56871158f, -1.72835605f, + -2.69937742f, -3.72437438f, -3.23623013f, -0.25624354f, 1.96357307f, 2.46814215f, 3.53069303f, -1.06174110f, -1.09336853f, -0.07686535f, 1.29279961f, 1.80354460f, 1.27988399f, -0.42606045f, -0.44754574f, 0.68316996f, + -0.09822772f, 1.26120245f, 1.70052823f, 1.56502837f, 1.15694639f, 0.88838189f, 0.57465867f, 0.31853596f, 0.03466567f, -0.25958767f, -0.49911919f, -0.76007985f, -1.16055649f, -1.53569625f, -1.61195549f, -1.57472513f, + -1.14376495f, -1.43799067f, -1.45325578f, -1.52444742f, -1.38528757f, -1.09797958f, -0.89118095f, -0.62608417f, -0.00250085f, 0.94458366f, 1.51363028f, 1.81223868f, 1.83008829f, 1.56737959f, 1.18148735f, 0.71308420f, + -0.16148812f, -2.04769833f, -2.09471486f, -1.43005703f, -0.50205979f, -0.54822778f, 1.68195446f, 4.00061129f, 1.03275735f, 0.41847912f, 0.66770340f, -0.11822564f, -0.63042447f, -0.32785779f, -0.23825248f, 0.29750055f, + -3.59916102f, -3.16769339f, -2.44843270f, -2.08077491f, -1.31387103f, -0.17348440f, 0.36398119f, 1.21172207f, 1.38864588f, 1.46347831f, 1.46684451f, 1.84157730f, 1.58044756f, 1.35394187f, 1.27155115f, 0.84122764f, + 1.12168796f, 1.77011301f, 0.80501182f, -0.65059510f, -0.86885740f, -0.21223750f, 0.66413611f, 0.77827963f, 0.37800197f, -0.26796888f, -0.97801860f, -0.64966444f, -0.50047252f, -0.44549810f, -0.47750530f, -0.46641261f, + 1.69417025f, 0.14170351f, -0.30309571f, -0.50074499f, -0.60597114f, -0.65756500f, -0.62775844f, -0.41013834f, -0.07761611f, 0.16510349f, 0.25158511f, 0.34758291f, 0.28289899f, 0.29273919f, 0.09829950f, -0.09119332f, + -0.86153928f, 1.09981825f, 0.79441249f, 0.41436072f, 0.25807562f, -0.33355863f, -0.51983659f, -0.25841284f, 0.00191053f, 0.13240503f, 0.19942573f, 0.24363814f, 0.08478089f, -0.15773770f, -0.37897853f, -0.71876393f, + -3.54840520f, -3.31670990f, -2.41138986f, -1.93012869f, -1.20864357f, -0.47291818f, -0.18678664f, 0.02177990f, 0.31458995f, 0.70059621f, 1.23845973f, 1.82707181f, 2.12918865f, 2.27071260f, 2.36659938f, 2.20598371f, + -1.13771731f, 0.39368618f, 0.69608234f, 1.45165188f, 1.41884327f, 1.47720631f, 0.71071536f, 0.51669579f, 0.07379070f, -0.91725636f, -1.46431524f, -2.01818354f, -0.45034354f, -0.20458063f, -0.61685389f, 0.07057863f, + 1.94180196f, -0.43938181f, -1.45235723f, -1.62714803f, -0.56602083f, 0.17861664f, -0.11574800f, -0.55042921f, -0.26385634f, 0.14973980f, 0.40358646f, 0.57744006f, 0.91363053f, 0.71399177f, -0.04044356f, 0.17657766f, + -2.29623160f, 0.37017475f, -0.14625619f, 1.40510672f, -0.18688173f, 0.98162341f, -0.08351923f, 0.30727120f, 0.21088276f, 0.00882905f, 0.20930156f, 0.07859582f, 0.11868622f, 0.19357924f, -0.59940040f, -0.57176126f, + 0.32770546f, -2.17703619f, -2.14694909f, -1.21327174f, -0.09787592f, -0.38390569f, -0.54684876f, -0.76275935f, -1.00614562f, -1.06555455f, -0.70232123f, -0.12667989f, 0.23719344f, 0.82854727f, 3.01646153f, 5.81943998f, + 1.74451794f, 2.61728252f, 2.50084081f, 2.14806463f, 1.03256213f, -0.14230845f, -0.89600957f, -1.26996454f, -1.47590648f, -1.42717085f, -1.20779572f, -0.98498624f, -0.82778555f, -0.73610012f, -0.59428320f, -0.48095729f, + -1.63200590f, 0.23028801f, -0.00907184f, -0.79978843f, -1.00748376f, -0.12526203f, 0.79168097f, 0.90826744f, 0.57548955f, 0.65151547f, 0.37307684f, -0.12047965f, -0.13538324f, 0.00756611f, 0.31705141f, -0.02546129f, + -2.96255244f, -1.89398578f, -1.11705055f, -0.49587679f, -0.64879460f, 0.52145289f, -0.11691144f, 1.02365070f, 0.12124424f, 1.06613244f, 2.03450026f, 1.32855094f, 0.54450823f, -0.09583278f, -0.09304639f, 0.78401059f, + -2.74846388f, -3.29381816f, -1.69589747f, 0.09992536f, 1.19730664f, -0.16362356f, -0.15703004f, 0.55042720f, 0.31568131f, 0.18156842f, 0.68590339f, 1.08986889f, 1.58662197f, 1.58930878f, 0.65286724f, 0.10935410f, + 2.40977200f, 1.75366309f, 0.74979137f, 0.75357579f, 0.58888421f, 0.34045829f, 0.41658500f, 0.41731179f, 0.35825939f, 0.03048901f, -0.69808452f, -1.34206657f, -1.51950247f, -1.45414323f, -1.40318331f, -1.40180996f, + -0.45462369f, -0.79464966f, -0.73449499f, -0.64030961f, -0.59804980f, -0.52688087f, -0.50966580f, -0.32241860f, -0.22751147f, -0.05981052f, 0.18569777f, 0.50293633f, 0.68570837f, 0.93799600f, 1.18364242f, 1.37243415f, + 0.71230959f, -0.15258830f, -0.30639043f, -0.10789426f, 0.13596677f, 0.06139692f, -0.05906250f, -0.09243858f, 0.16058801f, 0.19962984f, -0.02914953f, -0.05986174f, -0.00798730f, -0.03679071f, -0.19035654f, -0.22737122f, + 0.20985119f, 0.67531452f, -0.76482923f, -1.95548615f, -2.01335569f, -1.31859418f, -0.44117933f, 0.43598020f, 0.63898416f, 0.59260283f, 0.59660664f, 0.64364003f, 0.57962656f, 0.72198795f, 0.77431143f, 0.62453906f, + 3.37266827f, 1.16546541f, 0.15487771f, 0.57979973f, 1.63054771f, 1.04524609f, -0.13961184f, -0.53246008f, -0.51061506f, -0.83238697f, -1.04232388f, -0.96061103f, -0.90339873f, -0.99671658f, -1.06027762f, -0.97020325f, + -2.45339028f, 0.22870307f, 0.50079654f, 0.82545821f, -0.45080889f, -0.16537387f, -0.25306064f, -0.33349906f, 0.26143456f, 0.09313222f, 0.86160665f, 0.75164534f, -1.22179547f, -0.18801375f, 1.02457992f, 0.51858541f, + -1.46171297f, 0.63898461f, 2.15634917f, 1.94818588f, 2.12627540f, 1.70759626f, 1.43815259f, 0.82410049f, 0.20479176f, -0.43378728f, -0.89783731f, -1.30555797f, -1.66597981f, -1.80440934f, -1.79291067f, -1.68224086f, + -0.10170911f, 1.63842605f, 2.05629785f, 1.72760611f, 0.13751598f, -1.26847816f, -1.58069540f, -1.04510855f, -0.88231099f, -0.68616151f, -0.59891556f, -0.49054331f, -0.18451655f, 0.19151542f, 0.64619056f, 0.44088718f, + -0.86655238f, 0.59030963f, 1.14256838f, 1.66795450f, 1.50058628f, 1.34944192f, 0.08257813f, 0.24901720f, -0.18852178f, -0.03650931f, -0.27994508f, -1.06110568f, -2.06900429f, -1.73358377f, -0.24057835f, -0.10665549f, + 1.50872779f, 1.31070374f, 0.39357214f, -0.46407462f, -0.92397447f, -1.13436545f, -1.23237146f, -1.13209159f, -1.03095318f, -0.62563255f, -0.17705075f, 0.30244717f, 0.51989500f, 0.80258928f, 0.87034201f, 1.01223693f, + -0.30437289f, -0.88801487f, -0.86107707f, -0.28285107f, 0.28699382f, 0.45911485f, 0.48852566f, 0.45550239f, 0.58082722f, 0.55866427f, 0.31299044f, 0.14102370f, 0.07480087f, -0.08720185f, -0.35323153f, -0.58169395f, + -2.81842263f, -2.50111842f, -2.46829445f, -2.46942172f, -2.16241013f, -1.43881623f, -1.42903221f, -0.83291045f, 0.08734224f, 1.62875243f, 2.38321450f, 2.57841755f, 2.43444406f, 2.45552669f, 2.52427006f, 2.02845861f, + 3.37066045f, 1.49218725f, 0.55470586f, 0.13748306f, -0.13402053f, -0.39589325f, -0.44410867f, -0.48568748f, -0.51085663f, -0.42397560f, -0.53871831f, -0.60800303f, -0.57632384f, -0.50071998f, -0.46558245f, -0.47114696f, + -0.62183100f, 1.32484675f, 1.39280525f, 0.63916764f, 0.07573329f, 0.57096453f, 0.11014546f, -0.13955579f, -0.60839590f, -0.77966466f, -1.07179154f, -1.77671234f, -0.71411508f, 0.13441149f, 0.72184010f, 0.74215154f, + -2.90081845f, -3.29359883f, -1.89249569f, 2.35796037f, 2.47210792f, 0.89083303f, 1.25230145f, 1.03281210f, 1.34506489f, 0.48347288f, -0.08158884f, 0.21388757f, 0.05047384f, -0.37546417f, -0.70672331f, -0.84822525f, + -0.68878586f, -3.17765901f, -2.72677654f, -0.83696096f, 1.93901658f, 2.45806994f, 0.77003930f, 0.58220309f, 0.28500621f, -0.15305225f, 0.53711675f, 0.20321993f, 0.20435459f, 0.27124049f, 0.02126411f, 0.31170327f, + 1.03813940f, 1.60082720f, 1.24608760f, 0.78739775f, 0.96747591f, 1.10068123f, 1.15134869f, 0.74915981f, 0.42167811f, 0.15553718f, -0.33259317f, -0.97385519f, -1.61082594f, -2.05590168f, -2.15737100f, -2.08778582f, + -0.64496025f, 0.35212582f, -0.04908282f, -1.05504457f, -1.19731005f, -0.73315350f, -0.66929749f, -0.60130627f, -0.33236585f, 0.23014025f, 0.69893111f, 1.09565077f, 1.08466375f, 0.94366305f, 0.65639554f, 0.22095053f, + 0.48358349f, -0.37847120f, -1.02753771f, -0.73518795f, -0.11326269f, 0.53003780f, 0.88038488f, 0.88882395f, 0.97329253f, 0.69212641f, 0.87373175f, 0.80871682f, -0.03656343f, -0.94980974f, -1.26081773f, -1.62904720f, + -2.23244251f, -1.79490434f, -1.96001543f, -2.27380061f, -2.07255037f, -1.46415033f, -1.04393033f, 0.20282312f, 1.57244767f, 1.97591827f, 1.77648956f, 1.75160994f, 1.62357252f, 1.47414518f, 1.35930993f, 1.10547779f, + 0.79628045f, 0.95200921f, 0.49234542f, 0.09199320f, -0.05724590f, -0.07118046f, -0.04634766f, -0.00096416f, -0.17970825f, -0.09563800f, -0.01779017f, 0.13120319f, -0.03610489f, -0.35895498f, -0.62415601f, -0.97574095f, + 1.23786391f, -0.05332070f, 0.12142715f, 0.41317442f, 0.15674045f, -0.23609842f, -0.45604039f, -0.60612644f, -0.72063869f, -0.65773356f, -0.45446098f, -0.19856125f, -0.01567566f, 0.31093945f, 0.48567017f, 0.67284050f, + -0.38959317f, 0.48417975f, 0.67846195f, 0.96883427f, 0.97152360f, 0.77479838f, 0.58711345f, 0.71066957f, 0.54730033f, 0.30078955f, -0.00792413f, -0.23889729f, -0.71320215f, -1.17067509f, -1.60334166f, -1.90003738f, + -0.58748774f, -1.47663922f, -1.69196885f, -1.58982061f, -1.20534794f, -0.84425696f, -0.58959522f, -0.30927859f, 0.05320947f, 0.43265601f, 0.78002809f, 1.13478063f, 1.29240277f, 1.39914925f, 1.52607187f, 1.67609674f, + 0.21900175f, 0.90198746f, 1.47152638f, 1.60585024f, 1.28627552f, 0.62955762f, -0.10179136f, -0.53979665f, -0.95849172f, -1.05549774f, -0.93249423f, -0.63224235f, -0.54606380f, -0.47048197f, -0.44721628f, -0.43012290f, + 1.16598857f, -0.44883323f, -0.35990019f, 0.55867022f, 0.76350144f, 0.40336553f, -0.17899520f, -0.32789312f, 0.39266043f, 1.31706823f, 0.14239671f, -1.37351682f, -1.43994906f, -0.44961849f, 0.22694761f, -0.39189263f, + -2.38540927f, -1.62852954f, -0.88269400f, -0.07377225f, 0.58356450f, 0.88990527f, 0.91596948f, 0.64591793f, 0.36616944f, 0.38677852f, 0.46220080f, 0.31194777f, 0.22940934f, 0.16539664f, 0.07914516f, -0.06599966f, + 0.72463355f, -0.52958069f, -1.48068920f, -1.78301927f, -1.84235585f, -1.64970240f, -1.53867955f, -1.38956832f, -1.22397576f, -0.84685537f, -0.05213558f, 1.07240247f, 1.81984926f, 2.69693629f, 2.99963897f, 3.02310102f, + 1.19409909f, 2.68519772f, 1.98964488f, 0.67968388f, -0.01774621f, -0.15701839f, -0.09104235f, 0.24620030f, -0.83163859f, -1.22467182f, -1.23467957f, -1.15083406f, -0.63344301f, -0.72619249f, -0.46989224f, -0.25766714f, + -0.36982280f, 1.17012486f, 0.65527007f, -0.63203416f, -0.41714099f, 0.81639854f, 0.54164978f, 0.77650051f, 0.59880614f, 0.82660687f, -1.04749065f, -0.62911908f, -0.34368981f, -0.45351210f, -0.51314098f, -0.97940604f, + -2.68285677f, -0.85691687f, -0.20235026f, -0.01759520f, -0.00179021f, 0.11451343f, 0.27056934f, 0.20577824f, -0.23029364f, 0.11388472f, -0.05166620f, 0.07283122f, 0.56553984f, 0.81068091f, 1.04931803f, 0.84035365f, + -1.52932955f, -1.34785922f, -0.57071683f, -0.20686289f, 0.08155976f, -0.47381873f, -0.77622457f, -0.57310159f, -0.22137986f, 0.13834100f, 0.49481460f, 0.80177416f, 0.88568748f, 1.02957744f, 1.20356068f, 1.06397834f, + 0.85311314f, 1.33739225f, 1.91363915f, 1.93231248f, 2.08304754f, 1.71778606f, 0.86773094f, 0.43475180f, 0.03661492f, -0.61728713f, -1.15699401f, -1.66982248f, -1.98244609f, -2.00151078f, -1.93416224f, -1.81416574f, + 1.60126279f, -0.81833805f, -1.38880039f, -1.40634796f, -1.32149763f, -1.28036492f, -1.07256373f, -0.72500244f, -0.46550137f, -0.10403512f, 0.28677127f, 0.67644278f, 1.00944110f, 1.34460513f, 1.63359356f, 2.03033498f, + -1.12256198f, -1.95155583f, -1.32316561f, -0.63266570f, -0.15627220f, 0.07123786f, 0.13550620f, 0.25890778f, 0.47783453f, 0.57057758f, 0.68332609f, 0.73453078f, 0.66233264f, 0.62861164f, 0.56744294f, 0.39591321f, + 0.06875844f, -0.77557401f, -1.05293353f, -1.03197877f, -0.85111938f, -0.61756528f, -0.16943921f, 0.22208891f, 0.49771452f, 0.66450860f, 0.73241467f, 0.72611275f, 0.63156506f, 0.52604468f, 0.30774149f, 0.12166125f, + 3.80400584f, 1.75988157f, 0.24665703f, -1.24851564f, -1.25633571f, 0.32422259f, 2.13094918f, 0.70439664f, -1.53713254f, -1.71622823f, -1.08819715f, -0.50716458f, -0.74087437f, -0.99402032f, -0.10491345f, 0.22326928f, + -0.65058475f, -0.32678303f, -0.20547132f, -0.11041511f, -0.11848885f, -0.20790889f, -0.31102714f, -0.27474061f, -0.20625644f, -0.08260245f, 0.09887987f, 0.33251986f, 0.41319745f, 0.49892877f, 0.56061378f, 0.59013885f, + -2.39642240f, -0.73872271f, 0.49057636f, 1.16325658f, 0.79747808f, 1.34021740f, 0.82073194f, 1.17831994f, 1.25881141f, 0.84489551f, -0.77511278f, -1.30893620f, -1.25529283f, -0.65601516f, -0.34679935f, -0.41698601f, + -0.54371008f, 0.45990001f, 0.73230478f, 1.41706822f, 1.07142705f, 0.82233755f, -0.15928811f, -0.34139895f, -0.08643862f, -0.24274513f, -0.48172279f, -0.46452865f, -0.44837803f, -0.43356299f, -0.59008965f, -0.71117480f, + -0.36854343f, 1.40608712f, 2.13291678f, 1.80061219f, 1.15989238f, -0.32896337f, -0.86683083f, -0.45937605f, -0.17796119f, -0.40226921f, -0.30363529f, -1.08494615f, -0.97269428f, -0.91102639f, -0.31526836f, -0.30799363f, + 0.16771127f, 1.28284008f, 0.25724837f, -1.11750032f, -1.04368583f, 0.13121741f, 0.10609539f, 0.02437401f, -0.56098948f, -0.38744327f, 0.07855531f, 0.20548373f, 0.06560664f, 0.24342662f, 0.39885137f, 0.14820870f, + 0.20792769f, -0.15663987f, -0.04445993f, 0.27319064f, 0.51281629f, 0.57962552f, 0.54535177f, 0.41567183f, 0.41718141f, 0.20916435f, -0.10574785f, -0.26957618f, -0.44861183f, -0.55143961f, -0.71969549f, -0.86475851f, + -2.53854175f, -2.10301056f, -1.97482174f, -2.12277877f, -1.80824545f, -1.32660134f, -1.25816793f, -0.90711327f, -0.59056817f, -0.05426883f, 0.60446374f, 1.61001048f, 2.40601840f, 3.00689095f, 3.60110855f, 3.45562566f, + 1.07778822f, 2.19172459f, 1.44013405f, 0.27222350f, 0.03173527f, -0.04691321f, 0.06376916f, 0.63907484f, -0.17949007f, 0.10010871f, -0.52495472f, -0.90729516f, -0.89428983f, -1.02410889f, -1.09546364f, -1.14404292f, + 0.76276530f, 1.59524592f, 1.47474021f, 0.18145014f, 0.13550913f, 0.88510912f, 1.03412929f, 1.01111065f, 0.77539585f, 0.20329499f, -1.35508663f, -1.83340559f, -1.40465488f, -1.14514789f, -1.16420913f, -1.15624650f, + -2.56605999f, -0.69575164f, 0.80693890f, 1.72778867f, 2.34339014f, 2.09042055f, 1.74382199f, 1.18476481f, 0.71416221f, 0.16808900f, -0.19808303f, -0.77842890f, -1.40866559f, -1.73499872f, -1.76586854f, -1.63151971f, + -0.32618212f, -2.76955063f, -2.78043449f, 0.51956703f, 4.34383806f, 1.88716237f, 4.47289205f, -0.68129863f, -1.52511041f, -1.32636741f, 0.65997777f, -0.52682311f, -0.69581956f, -0.43799624f, -0.50098243f, -0.31287245f, + 1.11744895f, 0.76474262f, 0.68913317f, 0.77356058f, 0.73021025f, 0.55480731f, 0.41334472f, 0.23384124f, 0.00040865f, -0.18384701f, -0.30336471f, -0.46628578f, -0.73968976f, -1.02792872f, -1.19473003f, -1.36165137f, + -1.09856438f, -2.65937422f, -2.23447552f, -2.36127808f, -1.92601400f, -1.29606162f, -0.86847602f, -0.41112389f, 0.27059515f, 0.62653494f, 1.25539083f, 2.16718498f, 2.40401093f, 1.97246907f, 1.87623832f, 2.28294385f, + -2.23812017f, -3.37112518f, -3.06489410f, -2.44639779f, -1.77205118f, -0.96847500f, 3.20788062f, 2.74986128f, 2.48376367f, 3.58855607f, 1.46558359f, 0.58208141f, 0.58647621f, -0.03336968f, -0.01161197f, -0.75815742f, + -3.34068874f, -3.31330139f, -3.27624195f, -3.18776773f, -2.60176738f, -1.35466356f, -0.47112724f, 0.80847853f, 1.80958348f, 2.21285031f, 2.26554713f, 2.76880679f, 2.60017886f, 2.04062204f, 1.67575322f, 1.36373732f, + 0.04677635f, 1.13691098f, 1.30914680f, 0.25672818f, 0.15799852f, 0.60568291f, 0.31771628f, 0.07597951f, -0.26589647f, -0.54972118f, -0.86844552f, -0.61094603f, -0.47072310f, -0.40511943f, -0.38309528f, -0.35299238f, + 0.22528620f, 0.31743905f, 0.31483553f, 0.17720192f, 0.16231355f, -0.06831057f, -0.29693139f, -0.45560458f, -0.21127731f, -0.08624191f, -0.20781580f, -0.12232125f, 0.08133224f, 0.09984234f, 0.03187445f, 0.03837752f, + 0.45404525f, 1.31244734f, 1.09193858f, 0.46595512f, 0.31516414f, -0.08250116f, -0.64154502f, -0.86897307f, -0.92275973f, -0.84086567f, -0.63886704f, -0.14652849f, 0.08165072f, 0.18249933f, 0.18288233f, 0.05545734f, + -2.78701578f, -2.31409561f, -1.68556203f, -1.40144529f, -0.74842449f, -0.07375189f, -0.20211385f, 0.09260002f, 0.29898930f, 0.66465229f, 0.75558861f, 0.96729187f, 1.14177838f, 1.55174084f, 1.99705535f, 1.74271247f, + -0.10464683f, -0.94242352f, -0.57955843f, 1.29762166f, 1.68516688f, 1.09852539f, 0.72099378f, 0.51323036f, -0.24285175f, -0.55888513f, -0.50577021f, -0.46366004f, -0.55836815f, -0.58550721f, -0.50078205f, -0.27308479f, + 3.45286440f, 0.59611628f, -0.69351346f, -1.14674518f, -1.07854543f, -0.89938730f, -0.76263547f, -0.52068670f, -0.36216337f, -0.17157688f, -0.01447939f, 0.15778389f, 0.27944020f, 0.35739675f, 0.34083744f, 0.46529411f, + -1.28927442f, 0.10726691f, 0.86158650f, 0.06273348f, -0.04085696f, 1.13928101f, 0.37886132f, 0.13576595f, -0.53530704f, -0.37566277f, -0.10613359f, -0.03059598f, -0.04857175f, -0.00612681f, 0.00516239f, -0.25812835f, + 2.89076531f, -0.04664344f, -1.93237643f, -2.19996964f, -1.86412035f, -1.18315371f, -1.10120931f, -1.31680378f, -1.30399765f, -1.28669610f, -0.94489947f, -0.60614659f, 1.58599312f, 0.95842154f, 2.94815038f, 5.40268579f, + 3.83455417f, 3.13869337f, 1.72510455f, 1.17236146f, 0.33356711f, 0.11348813f, -0.29704182f, -1.13829975f, -1.48383443f, -1.43388842f, -1.35163818f, -1.16938088f, -1.02627819f, -0.92590386f, -0.82058768f, -0.67091549f, + -0.93172509f, 0.85237993f, 1.34276319f, 0.25174685f, -0.79705618f, -0.63895111f, 0.21118680f, 0.97143052f, 0.70458966f, -0.18635616f, -0.52911893f, -1.85150883f, -0.43982599f, 0.04075634f, 0.50586277f, 0.49382650f, + -3.79516923f, -3.31533743f, -1.55672619f, 0.02918112f, 0.69887327f, 0.58481500f, 1.07030510f, 1.26562384f, 1.20349632f, 1.07269840f, 0.89773042f, 0.88137053f, 0.60964812f, 0.28884498f, 0.12262285f, -0.05797732f, + -0.08660073f, -3.36745835f, -3.82012977f, -2.75147711f, -0.36352096f, 0.85747874f, 1.11140604f, 0.65593665f, 0.35792228f, 0.54619342f, 0.99489751f, 1.28924616f, 0.96663509f, 1.40602119f, 1.12645860f, 1.07699149f, + 1.92634136f, 2.07569243f, 1.90024169f, 1.55333140f, 1.00662166f, 0.59662392f, 0.41735113f, 0.03712017f, -0.30033462f, -0.70147399f, -1.26150322f, -1.36946469f, -1.49306813f, -1.53593901f, -1.47859712f, -1.37294294f, + 0.41088895f, -0.68758389f, -0.85837881f, -0.86844724f, -0.85475992f, -0.88373397f, -0.82636157f, -0.54233624f, -0.33497780f, -0.06884329f, 0.24209832f, 0.60199869f, 0.83678079f, 1.05727685f, 1.27867768f, 1.49770152f, + -0.45442780f, -0.39381771f, -0.35575987f, -0.28279611f, -0.03460671f, 0.02188475f, -0.06207990f, -0.02068513f, 0.24104453f, 0.35743869f, 0.26392307f, 0.33209979f, 0.34550175f, 0.24362296f, 0.00439669f, -0.20573886f, + -1.38047831f, 0.78167658f, 0.42055729f, -0.93786054f, -1.72548724f, -1.52410071f, -0.47028251f, 0.81491117f, 0.82382622f, 0.46806997f, 0.95867097f, 0.52433344f, -0.02522016f, 0.39885676f, 0.61128096f, 0.26124617f, + 1.92925285f, 1.70790963f, 1.15526536f, 0.66461298f, 0.67490541f, 0.23892474f, -0.12861693f, -0.33635752f, -0.52286346f, -0.56868795f, -0.86695874f, -0.88842939f, -0.86631615f, -0.80495760f, -0.73812023f, -0.64956301f, + -0.46329214f, 0.55823622f, 0.34966614f, -0.14855330f, -0.35757896f, -0.52459469f, -0.85251369f, -0.95064429f, -0.99468342f, -0.76192580f, -0.41419015f, 0.12436151f, 0.64925405f, 1.13684199f, 1.33630964f, 1.31330685f, + 0.86356450f, 0.34381018f, -0.02085849f, 1.83539444f, 2.32518759f, 1.67398143f, 1.25867313f, 1.20615444f, 0.52697956f, -0.09144588f, -0.76159106f, -1.51187022f, -1.92351238f, -1.95050372f, -1.91438733f, -1.85957587f, + 1.24350337f, 2.40332737f, 1.88241131f, 1.35749721f, -0.42200494f, -1.44428015f, -1.39178301f, -0.93577948f, -0.61036359f, -0.51298915f, -0.79745508f, 0.00259692f, 0.20231677f, -0.31281818f, -0.31072767f, -0.35345154f, + -1.27391584f, 0.23665237f, 1.44085187f, 2.06602253f, 1.71605896f, 0.13376293f, -0.37509412f, 0.40922525f, 0.84118074f, 0.94717998f, -0.77859633f, -1.07717911f, -1.15385313f, -1.14774662f, -0.82654451f, -1.15800495f, + 1.30848084f, 0.08937934f, -0.37852967f, -0.65194579f, -0.75067573f, -0.79649158f, -0.77379985f, -0.60797455f, -0.51295495f, -0.32714998f, -0.08812522f, 0.24492207f, 0.48331843f, 0.72894883f, 0.89967800f, 1.13292004f, + -1.59837663f, -0.80221740f, -0.23176726f, 0.53351299f, 0.66646844f, 0.70631763f, 0.72180374f, 0.68847102f, 0.63073539f, 0.46683184f, 0.29870291f, 0.24285644f, -0.04345483f, -0.36903735f, -0.77735195f, -1.13349493f, + -3.27008180f, -3.34427840f, -3.19628867f, -2.98677397f, -2.40944350f, -1.63513906f, -1.40569428f, -0.88190894f, -0.25273952f, 0.84351501f, 1.96278949f, 2.92570176f, 3.17223429f, 3.47899460f, 3.70716828f, 3.29194486f, + 2.58466208f, 2.01534437f, 1.28252767f, 0.44865967f, -0.33100837f, -0.81011259f, -1.06701187f, -1.12743988f, -1.21505758f, -0.99337144f, -0.66853937f, -0.46093443f, -0.22132067f, 0.00996599f, 0.24481197f, 0.30882455f, + -0.62864502f, 1.04984327f, 1.56877053f, 0.77975000f, 0.01037804f, 0.92352492f, 1.12297462f, 0.76284403f, -0.16106015f, -0.21398417f, -0.62673537f, -1.68917053f, -1.60748063f, -0.79116243f, -0.06290217f, -0.43694470f +}; +const float ivas_sns_cdbk_tcx20_stage2[ 64 * 16 ] = { + -0.14487037f, 0.32346300f, 0.29798679f, -0.52393127f, -0.25671033f, 0.85717754f, -0.09030235f, -0.41110330f, -0.32938564f, -0.36580017f, -0.13142117f, -0.06404494f, 0.10671000f, 0.18731030f, 0.26606878f, 0.27885301f, + 0.52707061f, 0.35016312f, 0.54090507f, 0.82023896f, 0.46675870f, -0.60012182f, -0.76783382f, -0.39198749f, -0.17916696f, -0.17307722f, -0.10507731f, -0.09327542f, -0.12176361f, -0.12715624f, -0.11980175f, -0.02587481f, + -0.71420988f, -0.65927011f, -0.35007906f, -0.01478187f, 0.15375095f, 0.11149616f, 0.08819131f, 0.11537168f, 0.18041243f, 0.28846009f, 0.61920238f, 0.78709602f, 0.49945852f, -0.03863360f, -0.42339912f, -0.64306599f, + -0.81717379f, 0.06122156f, 0.05823003f, 0.10166328f, 0.27940347f, 0.24198679f, 0.13036228f, 0.07594383f, 0.21865219f, 0.19571948f, 0.11860502f, 0.04836758f, -0.03211315f, -0.14926357f, -0.23274285f, -0.29886216f, + -0.68529960f, -0.60305257f, -0.55080408f, -0.31252031f, 0.02732556f, 0.58303818f, 0.67638004f, 0.45008305f, 0.44400610f, 0.24064307f, 0.01598330f, -0.02342002f, -0.05864021f, -0.08903495f, -0.06326312f, -0.05142446f, + 0.89939472f, 0.31232066f, -0.27153630f, -0.52911639f, -0.58173141f, -0.63610440f, -0.61689761f, -0.43424024f, -0.23705022f, -0.00031150f, 0.15363335f, 0.19705513f, 0.25413198f, 0.35648787f, 0.53897823f, 0.59498626f, + 0.29798691f, 0.08114488f, 0.25286730f, -0.14155021f, -0.55163298f, -0.91534601f, -0.57551866f, 0.56064647f, 0.80731933f, -0.19474923f, -0.20126966f, 0.06517040f, 0.06866947f, 0.09059095f, 0.13444783f, 0.22122305f, + -0.19554741f, -1.08027678f, -0.01182563f, 0.56474090f, 0.41996725f, 0.08237738f, 0.08022205f, 0.10168343f, 0.06794579f, -0.08037661f, -0.20594204f, -0.13493371f, -0.05614077f, 0.03317273f, 0.14216415f, 0.27276933f, + -0.23050462f, -0.75246507f, -0.69868854f, -0.48346371f, -0.40917848f, -0.36594095f, -0.07600729f, 0.12198463f, 0.35806061f, 0.42664099f, 0.36253664f, 0.28721164f, 0.28501428f, 0.31580309f, 0.39290382f, 0.46609294f, + -0.67820482f, -0.00872112f, 0.40025028f, 0.70327670f, 0.42493234f, -0.57698003f, -0.97061329f, -0.62910745f, -0.24969320f, -0.09521511f, 0.04433478f, 0.16549806f, 0.17050527f, 0.26401941f, 0.52200672f, 0.51371134f, + 1.15515222f, -0.29885937f, -0.45759359f, -0.16519237f, -0.04117621f, -0.07252194f, -0.02430911f, -0.04766781f, -0.02328497f, -0.05048145f, -0.05153410f, -0.06528098f, -0.04522347f, -0.01163017f, 0.03517569f, 0.16442759f, + 1.26308471f, 0.47631737f, 0.20702857f, 0.04885555f, 0.01820924f, -0.04929548f, -0.00848071f, -0.02414509f, -0.04549576f, -0.16589601f, -0.22069993f, -0.30533811f, -0.30611208f, -0.31300078f, -0.32636395f, -0.24866742f, + -0.64451248f, -0.26649107f, 0.11640199f, 0.09050698f, -0.25875099f, -0.58989672f, -0.18201608f, 0.56293201f, 0.69520096f, 0.55973258f, 0.03137457f, -0.53909145f, -0.42689946f, 0.14106379f, 0.40632407f, 0.30412130f, + 0.15140746f, 0.14125954f, -0.08456824f, -0.13219101f, 0.06042009f, 0.33575532f, 0.35779441f, 0.19239547f, -0.11511443f, -0.41291307f, -0.06796502f, 0.62883409f, 0.54647417f, -0.03056743f, -0.64102233f, -0.92999908f, + -0.20214866f, 0.33358969f, 0.69126333f, 0.34454972f, 0.05105591f, 0.16949466f, 0.15791728f, -0.06633089f, -0.02155995f, 0.20242418f, 0.31712646f, 0.04823767f, -0.30694375f, -0.55917643f, -0.61612875f, -0.54337052f, + 0.11822897f, -0.04039421f, 0.70914148f, 0.55687588f, 0.06691609f, -0.01671241f, 0.38831368f, 0.48498674f, 0.23982281f, -0.11333950f, -0.44950589f, -0.59143612f, -0.55439378f, -0.42178388f, -0.28206333f, -0.09465644f, + -0.14336086f, 0.05638831f, -0.01441642f, -0.42382782f, -0.38698654f, 0.24817171f, 0.77752198f, 0.25906019f, -0.48986881f, -0.97798705f, -0.62796677f, 0.10790457f, 0.39301453f, 0.49075265f, 0.45648021f, 0.27511976f, + 0.57860103f, -0.01948333f, -0.01550826f, 0.52219942f, 0.68939814f, 0.35139876f, -0.01666617f, -0.21673535f, -0.47658403f, -0.68042929f, -0.65034996f, -0.34910948f, -0.19976833f, -0.03318456f, 0.13815711f, 0.37806438f, + 0.37246276f, -0.08878862f, -0.58662283f, -0.58539914f, -0.25552364f, 0.03268078f, 0.23525090f, 0.52779846f, 0.89804404f, 0.85582758f, 0.41881201f, -0.00512611f, -0.24135956f, -0.44973199f, -0.57601809f, -0.55230687f, + -0.32189259f, -0.20721675f, -0.09742343f, -0.05501794f, -0.02597120f, -0.10341441f, -0.07152803f, 0.00321003f, 0.14348106f, 0.13459909f, 0.13417173f, 0.08360042f, 0.09862647f, 0.09372765f, 0.07551569f, 0.11553216f, + 0.23782332f, 0.49257946f, 0.16314649f, -0.21082378f, -0.15908458f, 0.19948076f, 0.80829724f, 0.74048420f, 0.31470714f, -0.11736674f, -0.41702302f, -0.38958905f, -0.30642209f, -0.41287171f, -0.48993898f, -0.45339847f, + -0.64636094f, -0.04385833f, 0.14399510f, -0.43842603f, -0.73607781f, -0.26594508f, 0.62882301f, 0.35001150f, 0.28828962f, 0.02070640f, 0.04274640f, 0.10066767f, 0.01277906f, 0.02855391f, 0.23224313f, 0.28185233f, + 0.47046627f, 0.94887935f, 0.24713839f, -0.23737461f, -0.23876072f, -0.07439994f, -0.09495447f, -0.13384673f, -0.10919962f, 0.11561096f, 0.34750397f, 0.22863541f, -0.07880257f, -0.39830725f, -0.49574485f, -0.49684374f, + -0.40909559f, -0.18655327f, 0.13106838f, 0.38799987f, 0.49861722f, 0.83281701f, 0.69114756f, 0.20069371f, -0.12792677f, -0.35587040f, -0.42614275f, -0.34440943f, -0.28876141f, -0.27425834f, -0.22103645f, -0.10828931f, + -1.18999475f, -0.19958884f, -0.14983643f, 0.01470880f, -0.02795637f, -0.14641321f, -0.31784893f, -0.46245588f, -0.18208072f, 0.19701783f, 0.59261157f, 0.51921614f, 0.35016513f, 0.38054069f, 0.38692917f, 0.23498570f, + 0.09958109f, -0.26177154f, -0.09010091f, 0.31898761f, 0.75461690f, 0.12276914f, -0.81281416f, -0.78184322f, -0.24358470f, 0.82758568f, 0.36579631f, -0.14176577f, -0.08975069f, -0.12652615f, 0.12350150f, -0.06468093f, + 0.08899403f, -0.19355344f, -0.19424186f, -0.07670148f, -0.01129831f, -0.12185644f, -0.22497393f, -0.43014230f, -0.38336267f, -0.26093033f, -0.06975312f, 0.14762185f, 0.34014822f, 0.41134546f, 0.45027987f, 0.52842445f, + 0.21499436f, 0.50168679f, 0.45504898f, 0.25411634f, -0.47901658f, -0.45717782f, -0.14093183f, 0.17265389f, 0.11115764f, -0.41915721f, -0.31922857f, 0.22345448f, 0.48226916f, 0.07143490f, -0.26830399f, -0.40300051f, + 0.12687524f, 0.05171471f, -0.07690770f, 0.26252085f, 0.27712144f, 0.23952572f, 0.03309903f, 0.01500629f, 0.06484326f, 0.06571283f, -0.16817282f, -0.63246792f, -0.98935090f, -0.44804742f, 0.39837118f, 0.78015619f, + -0.27518648f, -0.48420415f, -0.24141667f, 0.57134912f, 0.65714603f, 0.42293616f, -0.10408493f, -0.38791089f, -0.61076554f, -0.57292363f, -0.09457207f, 0.54285737f, 0.61562883f, 0.23132651f, -0.13569709f, -0.13448269f, + -0.44830103f, 0.90540056f, 0.00072142f, -0.39226111f, -0.46186317f, -0.43645456f, -0.37826714f, -0.24360826f, -0.04123674f, 0.14260549f, 0.22801709f, 0.22668095f, 0.21516528f, 0.17002730f, 0.24853909f, 0.26483493f, + 0.82582984f, -0.18396730f, -0.69977925f, -0.51672827f, 0.33935958f, 1.15275754f, 0.74107352f, 0.01951258f, -0.25558033f, -0.43304939f, -0.34099848f, -0.20947442f, -0.14398117f, -0.10182217f, -0.18238069f, -0.01077166f, + -0.05956926f, -0.06776164f, 0.03443600f, -0.24779379f, -0.39446507f, 0.19355305f, 0.85153169f, -0.02976018f, -0.70253585f, 0.23290277f, 0.42513902f, -0.02301892f, -0.00892405f, -0.00056059f, -0.02586520f, -0.17730813f, + -0.10475355f, -0.12240226f, 0.23596905f, 0.84034179f, 1.10352903f, -0.04380181f, -0.55005573f, -0.07517667f, 0.38548284f, 0.23177362f, -0.44010180f, -0.37858708f, -0.16160512f, -0.18482124f, -0.37409253f, -0.36169852f, + -0.66969186f, 0.05371874f, -0.03936352f, -0.29928720f, -0.41624260f, -0.41299981f, -0.08577629f, 0.31675281f, 0.52331795f, 0.62411866f, 0.60734652f, 0.31853824f, 0.22382100f, -0.00426635f, -0.24809569f, -0.49189053f, + 0.42558925f, -0.08740923f, -0.12413315f, 0.07160194f, 0.21621681f, 0.18737853f, 0.20692231f, 0.06594840f, 0.06316038f, -0.01455973f, -0.09736051f, -0.19278266f, -0.20576965f, -0.20479396f, -0.19511934f, -0.11488934f, + 0.36293062f, -0.57831316f, -0.52476107f, -0.18291608f, 0.05956296f, 0.17827873f, 0.56052629f, 0.90619512f, 0.33375509f, -0.31016948f, -0.35518802f, -0.18057272f, -0.07051228f, -0.11858827f, -0.10671145f, 0.02648366f, + -0.47233802f, -0.10696118f, -0.17385597f, -0.31283671f, -0.54242892f, -0.48720345f, -0.41705631f, -0.17742297f, 0.04283104f, -0.05195671f, -0.10468624f, -0.03852503f, 0.06812391f, 0.59475499f, 1.17499043f, 1.00457125f, + 0.33658160f, 0.35011487f, 0.45187233f, -0.02492518f, -0.55350758f, -0.59303580f, -0.31109052f, 0.13779098f, 0.55888251f, 0.84708841f, 0.47270673f, -0.43127783f, -0.54032183f, -0.34904867f, -0.17752966f, -0.17430036f, + 0.44845114f, -0.49717161f, -0.47780018f, 0.51116217f, 0.25239415f, -0.46774617f, -0.37660723f, -0.11699702f, 0.09542037f, -0.01250943f, 0.20050057f, 0.40176439f, 0.32380431f, 0.15297561f, -0.14232876f, -0.29531216f, + 0.58997624f, 0.33423174f, -0.49272429f, -0.77991590f, -0.63691990f, -0.16375248f, 0.20892044f, 0.18843065f, 0.17599488f, 0.14061586f, 0.15322675f, 0.18367503f, 0.13457790f, 0.01264192f, -0.03498125f, -0.01399761f, + 0.11883889f, -0.17653462f, -0.07102121f, -0.16170325f, -0.31396815f, -0.45007863f, -0.66549732f, -0.56194237f, -0.04368741f, 0.74826150f, 1.05944395f, 0.45896665f, 0.13555009f, 0.05510292f, 0.02009383f, -0.15182464f, + 0.07240272f, -0.58533213f, -0.60637060f, -0.30890106f, -0.02128210f, 0.09681284f, 0.16938452f, 0.09862013f, 0.19046479f, 0.19100352f, 0.26416808f, 0.26993362f, 0.23648423f, 0.09763257f, -0.04637479f, -0.11864633f, + 1.00841842f, 0.48487093f, -0.06341281f, -0.08270476f, 0.05744570f, 0.01750478f, -0.34725114f, -0.56805040f, -0.46574885f, -0.30005483f, -0.09520550f, 0.06924440f, 0.18895007f, 0.12019539f, -0.01497133f, -0.00923003f, + -0.11951983f, -0.09981565f, -0.02725746f, -0.30082482f, 0.20230754f, 0.13666509f, -0.43246623f, 0.35244293f, 0.18119722f, 1.02992782f, -0.88125774f, 0.02331986f, 0.31122766f, -0.27229286f, 0.03194423f, -0.13559793f, + 0.30038871f, 0.08947897f, -0.39317595f, -0.46247446f, -0.42411556f, -0.42404287f, -0.31600225f, -0.23970776f, -0.22563637f, -0.14999339f, 0.24040805f, 0.88216954f, 0.90562440f, 0.49896646f, -0.00532430f, -0.27656328f, + -1.03852817f, -0.43685628f, 0.97570249f, 0.40073542f, -0.16567993f, -0.21536660f, 0.12504130f, 0.05185039f, 0.10097880f, 0.11493671f, 0.11604106f, 0.09278894f, 0.06924125f, -0.04393053f, -0.08352009f, -0.06343456f, + 0.63612744f, 0.65518210f, 0.45922163f, 0.32046049f, 0.42927283f, 0.43905062f, 0.21015594f, -0.14220340f, -0.37678678f, -0.46507109f, -0.45569496f, -0.37686899f, -0.32849396f, -0.33044372f, -0.35635326f, -0.31755504f, + 0.41636915f, 0.62005731f, 0.06636205f, -0.59228655f, 0.33311937f, 0.75787668f, 0.00941011f, -0.45161756f, -0.65103077f, -1.10958672f, -1.02188609f, -0.67703448f, 0.33622739f, 1.61684726f, 0.14432118f, 0.20285196f, + -0.54161629f, 0.29651460f, 0.48390239f, 0.54479388f, 0.45539891f, 0.27213590f, -0.06343843f, -0.24873747f, -0.31972562f, -0.38332671f, -0.30589718f, -0.21560606f, -0.11351916f, -0.04853252f, 0.04142231f, 0.14623145f, + -0.21538006f, -0.50670918f, -0.02385513f, 0.35315677f, 0.10824776f, 0.03860134f, 0.48712274f, 0.49283326f, 0.39503514f, 0.30292369f, 0.35920722f, 0.11075640f, -0.28306221f, -0.52442456f, -0.56662428f, -0.52782887f, + 0.24246654f, 0.15496835f, 0.07742345f, -0.00816546f, -0.02214009f, -0.12207666f, -0.09321134f, -0.14020839f, -0.02096415f, 0.02403039f, -0.00227972f, -0.07257466f, -0.06385085f, -0.03120190f, -0.01017645f, 0.08796095f, + 0.55718201f, 0.39817200f, 0.01585643f, -0.42726280f, -0.49946467f, -0.23926890f, 0.12647764f, 0.16539668f, -0.09322228f, -0.28903514f, -0.36248464f, -0.37621498f, -0.21830881f, 0.12546719f, 0.47757747f, 0.63913280f, + 0.07202509f, -0.30917825f, 0.26796130f, 0.18122649f, -0.74238320f, -0.65070972f, 0.20487278f, -0.03910861f, -0.13788223f, -0.13927704f, 0.30951126f, 0.22564689f, 0.18217460f, 0.23128586f, 0.20552209f, 0.13831273f, + 0.81154454f, 0.16848402f, -0.17973760f, -0.10712113f, -0.08562767f, -0.33154566f, -0.24733460f, -0.19259111f, 0.09705231f, 0.36926093f, 0.39058223f, 0.34681425f, 0.16685070f, -0.13716590f, -0.45775544f, -0.61170978f, + -1.33280729f, -0.16122649f, -0.09275794f, 0.58345947f, 0.61239977f, 0.50766167f, 0.06032890f, 0.13414746f, 0.18885722f, 0.13865434f, 0.23772269f, -0.25267260f, -0.54709895f, -0.31230173f, 0.07737009f, 0.15826345f, + -1.08561454f, -0.71787872f, -0.33522393f, 0.09636394f, 0.26521236f, 0.37639836f, 0.31311513f, 0.09537412f, -0.07885832f, -0.23990515f, -0.16502660f, 0.10895014f, 0.26463981f, 0.29732376f, 0.35578048f, 0.44934924f, + -0.29274363f, 0.08361693f, 0.01766194f, -0.22807328f, -0.16950675f, 0.28608384f, 0.00299181f, 0.07025513f, -0.20633117f, 0.48438844f, 0.91263549f, 0.04231580f, -0.66916627f, -0.44689801f, 0.06041835f, 0.05235140f, + 0.18067823f, -0.43833102f, -0.91255750f, -0.38799121f, 0.28155095f, 0.40506215f, 0.07352559f, -0.10582149f, -0.13688260f, -0.20626464f, -0.13280234f, -0.02533342f, 0.03247104f, 0.20876704f, 0.46466759f, 0.69926172f, + 0.51511088f, 0.81421556f, 0.82445640f, 0.01131859f, -0.32041051f, -0.39839079f, -0.43152495f, -0.42594915f, -0.41684800f, -0.38010709f, -0.25091606f, -0.15334343f, -0.03594408f, 0.06862608f, 0.21814936f, 0.36155722f, + -0.74835512f, -0.03907167f, -0.02730968f, 0.01017743f, 0.06598847f, 0.36210429f, 0.29611340f, 0.34006521f, 0.09628113f, -0.15142368f, -0.62878543f, -0.79996695f, -0.45331571f, 0.20593004f, 0.80186308f, 0.66970511f, + -0.25432502f, 0.38418428f, 0.43145928f, 0.30498956f, 0.19189249f, -0.25021553f, -0.53882666f, -0.61584834f, -0.43654724f, -0.03402395f, 0.45760398f, 0.60327277f, 0.53610474f, 0.16098234f, -0.30297334f, -0.63772932f, + -0.42321919f, 0.85086362f, 0.60159420f, 0.08633772f, -0.28445894f, -0.22512885f, 0.23909004f, 0.20046697f, 0.01484137f, -0.11652413f, -0.12017169f, -0.26922922f, -0.26311675f, -0.18921524f, -0.06712212f, -0.03500777f, + 0.58209071f, -0.26533411f, -0.20240535f, 0.27577532f, 0.65478295f, 0.66491349f, 0.41026256f, 0.22123940f, 0.15813271f, 0.07048989f, -0.03133192f, -0.19389440f, -0.34519672f, -0.53017394f, -0.73238212f, -0.73696843f +}; +const float ivas_sns_cdbk_tcx20_stage3[ 32 * 16 ] = { + -0.08443224f, -0.18703635f, -0.02297765f, 0.35108322f, -0.47365404f, 0.60080101f, -0.14560352f, 0.01413276f, 0.01222370f, 0.01369841f, 0.05509108f, 0.03233707f, 0.01187713f, -0.08225931f, -0.08910713f, -0.00617424f, + -0.45134081f, -0.18205893f, -0.21886586f, -0.27082278f, -0.18872267f, -0.08438255f, 0.11808124f, 0.11472340f, 0.08049694f, 0.05868671f, 0.08856118f, 0.10686811f, 0.14792971f, 0.16522330f, 0.21823435f, 0.29738868f, + -0.11328915f, 0.10130429f, -0.14943437f, 0.15645630f, 0.63935450f, 0.37821704f, -0.21310801f, -0.24867988f, -0.01659672f, 0.03328198f, -0.08180066f, -0.05657044f, 0.10906149f, 0.03196869f, -0.22137928f, -0.34878580f, + 0.05458665f, -0.05919364f, -0.13460386f, 0.10683925f, 0.02486665f, -0.03996090f, -0.07800776f, -0.00646458f, -0.21155480f, -0.27387617f, 0.02240932f, 0.70908553f, -0.66258796f, -0.11916859f, 0.46104817f, 0.20658280f, + -0.18236160f, -0.42556974f, -0.01518583f, 0.40249814f, 0.16028064f, -0.31751965f, -0.32775039f, -0.07115151f, 0.14131570f, 0.25092515f, 0.30150209f, 0.11921413f, 0.03049898f, 0.00963513f, -0.00838672f, -0.06794450f, + 0.43233298f, 0.11411029f, -0.14415844f, -0.34176452f, -0.41588457f, -0.29962161f, 0.10637969f, 0.23407196f, 0.10305969f, -0.00062410f, 0.02900924f, 0.03866877f, 0.08640844f, 0.05154612f, 0.00161694f, 0.00484903f, + -0.21512794f, 0.25425865f, 0.27105566f, -0.05213586f, -0.05906940f, -0.26548344f, -0.44413633f, 0.03920286f, 0.46845996f, 0.41236263f, -0.31903770f, -0.32961136f, 0.22647316f, 0.19335126f, -0.03700087f, -0.14356117f, + 0.21924285f, -0.02083234f, -0.21264229f, -0.32008443f, 0.85787441f, -0.31109029f, -0.11710511f, 0.15258065f, -0.05422604f, 0.04703640f, 0.03138786f, 0.00284139f, -0.14128648f, -0.12246651f, -0.12553053f, 0.11430042f, + -0.06983219f, 0.15566395f, 0.00257636f, -0.43107600f, -0.19146497f, 0.19866667f, 0.23130140f, -0.15042179f, -0.31509935f, -0.19492938f, 0.13173040f, 0.34976123f, 0.35522809f, 0.15128504f, -0.03897684f, -0.18441264f, + 0.03835343f, -0.41781092f, -0.09130119f, 0.23649600f, 0.31864720f, 0.31965077f, 0.31997092f, 0.09379415f, -0.07805132f, -0.17350540f, -0.16066354f, -0.15534991f, -0.10595695f, -0.07769963f, -0.06267573f, -0.00389790f, + -0.06072967f, -0.08529762f, -0.25895528f, -0.11410745f, -0.03994694f, 0.00520744f, 0.13029546f, 0.20924505f, 0.20033325f, 0.00128218f, -0.48912530f, -0.29001748f, 0.59798769f, 0.57708579f, -0.00334114f, -0.37991599f, + 0.67709987f, 0.24479940f, 0.09839041f, 0.09240624f, 0.04874621f, -0.07903978f, -0.10677716f, -0.20070119f, -0.12618873f, -0.06680438f, -0.05551493f, -0.11559282f, -0.11011740f, -0.12021879f, -0.12904082f, -0.05144612f, + -0.24390844f, -0.02971498f, 0.26491058f, 0.32477805f, 0.15268137f, -0.03230336f, -0.09305650f, -0.07114758f, -0.26964124f, -0.44939594f, -0.31245133f, 0.05828219f, 0.30712838f, 0.31280972f, 0.10713241f, -0.02610336f, + 0.19735739f, -0.09060264f, 0.00825537f, -0.36599055f, 0.05585799f, 0.37908316f, -0.38413173f, 0.35027949f, 0.34555851f, -0.34241207f, -0.18091006f, 0.16295794f, 0.08399265f, -0.12258257f, -0.08886776f, -0.00784505f, + 0.18552089f, -0.05448505f, -0.06090343f, 0.28995307f, -0.00222442f, -0.38233148f, -0.18031475f, 0.21268787f, 0.02073848f, -0.18932508f, -0.18523794f, -0.18812600f, -0.12671694f, 0.01228197f, 0.22055935f, 0.42792350f, + 0.12799222f, 0.22968936f, 0.03802711f, -0.14099927f, -0.08635323f, 0.16987494f, 0.35348472f, 0.04505467f, -0.26388915f, -0.34916901f, -0.22942166f, -0.17684250f, -0.08724829f, -0.00054213f, 0.12610262f, 0.24423959f, + -0.08038187f, -0.16879152f, -0.00176772f, 0.35376535f, -0.37011098f, -0.36320739f, 0.66636341f, -0.06773157f, -0.07814045f, -0.04765960f, -0.03365673f, 0.02181851f, 0.03254002f, 0.03483427f, 0.02717800f, 0.07494827f, + -0.34868864f, 0.17040333f, 0.25260784f, 0.10076787f, 0.06839398f, -0.02800665f, -0.06848675f, -0.16826923f, -0.07268923f, 0.01087754f, 0.05460110f, 0.00431011f, 0.03885215f, 0.00975901f, -0.01527130f, -0.00916121f, + 0.18571700f, 0.08336153f, 0.02979922f, -0.39409904f, -0.12098272f, 0.43026379f, -0.26722488f, -0.41282119f, 0.02970150f, 0.49897713f, 0.10843837f, -0.24094187f, -0.08115504f, 0.00006204f, 0.10433840f, 0.04656578f, + 0.00538329f, -0.07750994f, -0.10910098f, 0.04048538f, 0.03334399f, 0.28342260f, 0.14581840f, -0.24746813f, -0.34416074f, 0.06151045f, 0.68745611f, 0.19063398f, -0.23771814f, -0.28316033f, -0.12688702f, -0.02204889f, + -0.60521242f, -0.06124017f, 0.11564466f, 0.07475615f, 0.11824730f, 0.14189819f, 0.27204580f, 0.27978428f, 0.25196977f, 0.13866750f, 0.00205101f, -0.10150602f, -0.11644945f, -0.18929950f, -0.17648802f, -0.14486907f, + 0.06856566f, -0.13844197f, -0.26691240f, -0.18845012f, -0.05126065f, 0.00304429f, 0.11414309f, 0.06950182f, 0.19286717f, 0.29037166f, 0.27053650f, 0.17652627f, 0.09171994f, -0.09001258f, -0.24528745f, -0.29691120f, + -0.13004111f, 0.35130055f, 0.29363124f, -0.18853208f, -0.39468716f, -0.19791109f, -0.04383464f, 0.00894901f, 0.12616722f, 0.23070746f, 0.26441755f, 0.01948829f, -0.23089364f, -0.30363455f, -0.02382649f, 0.21869951f, + 0.11164215f, 0.03116967f, -0.06353187f, 0.16924336f, -0.01461062f, -0.19152070f, 0.03686445f, 0.20477538f, -0.03967336f, -0.32744743f, -0.17088429f, 0.63829176f, 0.35280729f, -0.43549735f, -0.27277762f, -0.02885087f, + -0.30725406f, 0.74701729f, -0.39274145f, 0.04302180f, 0.07483049f, -0.03413902f, 0.09344659f, 0.09169015f, 0.04345559f, -0.04477331f, -0.00176985f, -0.03585142f, -0.03405962f, -0.07575575f, -0.09739054f, -0.06972689f, + 0.28265268f, -0.39222951f, -0.42695953f, -0.10897533f, 0.07424889f, 0.08797478f, 0.00908971f, -0.13637855f, -0.12075776f, -0.04977985f, 0.06395383f, 0.09442120f, 0.15174794f, 0.13939497f, 0.13041070f, 0.20118587f, + -0.06637296f, 0.10778732f, -0.07433513f, -0.03524749f, -0.17212396f, -0.11995773f, 0.04291853f, -0.06480863f, -0.07793575f, 0.16559639f, 0.16476497f, -0.45667097f, -0.18714125f, 0.71725922f, 0.42534599f, -0.36907862f, + 0.15419735f, 0.13519411f, 0.37767798f, 0.23431801f, -0.02281061f, -0.05079690f, 0.14170781f, 0.09854410f, 0.01337290f, -0.01979078f, -0.01296254f, -0.03126860f, -0.07566643f, -0.16863998f, -0.32784959f, -0.44522679f, + -0.24074183f, 0.08320241f, 0.21818929f, 0.23760260f, 0.19352113f, 0.17458723f, -0.14563963f, -0.24861723f, -0.22656746f, -0.05362363f, 0.00368164f, -0.25389215f, -0.34172497f, -0.16702059f, 0.23332537f, 0.53371777f, + 0.03933551f, -0.61436501f, 0.74997308f, -0.14605678f, -0.06355008f, -0.07845237f, 0.03677743f, -0.01381658f, 0.03542562f, 0.01940321f, 0.04277388f, 0.01439240f, 0.05417023f, -0.03165523f, -0.04388511f, -0.00047013f, + 0.19660049f, -0.03582845f, -0.21224511f, -0.09633821f, 0.02140122f, 0.06690902f, 0.14753796f, 0.23491232f, 0.40075372f, 0.33318442f, -0.21453422f, -0.44835823f, -0.31995723f, -0.14770359f, -0.02720588f, 0.10087175f, + 0.22313452f, 0.23174662f, 0.13588360f, -0.01979092f, -0.17483898f, -0.36387601f, -0.35104947f, -0.34545228f, -0.17072761f, 0.01654692f, 0.12560464f, 0.14070090f, 0.18025650f, 0.13082045f, 0.10588357f, 0.13515746f +}; +const float ivas_sns_cdbk_tcx20_stage4[ 32 * 16 ] = { + -0.01178932f, -0.08216325f, 0.00009975f, 0.07861932f, 0.10639093f, 0.10607783f, -0.11972309f, 0.01910820f, -0.05635505f, 0.02765448f, -0.08840101f, -0.09623400f, 0.34917350f, -0.19835894f, -0.46938213f, 0.43528268f, + -0.08636054f, 0.13923351f, -0.15932705f, -0.10849641f, -0.02303533f, -0.23968519f, -0.02192257f, 0.50128910f, 0.27139459f, -0.07262939f, -0.06622134f, -0.01073419f, -0.04308095f, -0.05629457f, -0.03175020f, 0.00762044f, + 0.24815560f, 0.14657944f, 0.07172491f, 0.02302382f, 0.01991109f, -0.10204469f, -0.24960876f, -0.07085594f, 0.12223419f, 0.06999865f, 0.10986748f, 0.13492392f, 0.05865008f, -0.10366906f, -0.23987720f, -0.23901358f, + -0.15438243f, -0.04559005f, 0.16760111f, 0.26289859f, 0.24002732f, 0.06333052f, -0.04293731f, 0.16191749f, 0.12993586f, -0.15916904f, -0.24049436f, -0.13688115f, -0.13764233f, -0.11140102f, -0.01899323f, 0.02178000f, + -0.09362153f, -0.06475772f, -0.01949932f, -0.04249530f, -0.05109865f, 0.07410551f, -0.01006480f, 0.04753318f, -0.02781557f, 0.07745214f, 0.06146913f, -0.16546467f, -0.41512457f, 0.10097607f, 0.66727071f, -0.13886467f, + -0.07368760f, 0.36035427f, 0.21605884f, -0.01438276f, -0.11360433f, -0.05644934f, 0.03063785f, -0.05006328f, -0.07521149f, -0.13595728f, -0.01277458f, 0.04492285f, 0.01200858f, -0.04176021f, -0.04570247f, -0.04438907f, + 0.09516185f, -0.01929782f, 0.00494854f, -0.09763747f, -0.07344490f, 0.12994610f, 0.48094184f, -0.48192847f, -0.05573409f, 0.26426544f, -0.27655157f, -0.08642901f, 0.08435032f, 0.13304512f, -0.05782422f, -0.04381160f, + -0.09313450f, 0.05540574f, 0.01201341f, -0.06726039f, -0.10451812f, 0.02669040f, -0.05484815f, 0.07449424f, -0.34344135f, 0.56109258f, -0.27428709f, -0.09301413f, 0.41965904f, -0.13902794f, 0.18473846f, -0.16456202f, + 0.08693855f, 0.01453042f, -0.11107078f, 0.06241724f, 0.10204906f, -0.07064796f, -0.13846291f, 0.08293345f, -0.10757619f, -0.22863306f, 0.03213009f, 0.19644778f, 0.16452805f, 0.34110370f, 0.09006750f, -0.51675482f, + -0.18423905f, 0.01384230f, 0.26714303f, -0.40934167f, 0.39275996f, -0.01237613f, -0.25919307f, -0.08619564f, -0.04046283f, -0.01126873f, -0.01664395f, 0.01744563f, 0.10282249f, 0.09607820f, 0.04998616f, 0.07964328f, + -0.02274322f, 0.17908332f, -0.02788687f, 0.00807798f, -0.14435131f, -0.02676761f, 0.10369709f, -0.23851723f, 0.57714821f, -0.24897036f, -0.18048434f, 0.02001729f, -0.12740088f, -0.09982727f, 0.00840552f, 0.22051971f, + 0.13771932f, -0.17471600f, 0.18563016f, 0.18284665f, 0.11307352f, 0.20075992f, -0.03584593f, -0.25044388f, -0.20529947f, -0.11730357f, 0.05388263f, 0.08544750f, 0.04416102f, -0.02585125f, -0.09278592f, -0.10127474f, + 0.08834726f, 0.11313223f, -0.16483942f, -0.28318232f, -0.23943962f, -0.10440104f, -0.03978272f, -0.07375089f, -0.00562577f, 0.02329676f, 0.14600550f, 0.17681015f, 0.14410817f, 0.09264978f, 0.05695417f, 0.06971767f, + 0.14265864f, -0.42999794f, -0.17884255f, -0.08097949f, -0.04680661f, -0.04620171f, 0.02411542f, 0.04266824f, 0.15894248f, 0.24773695f, 0.15192868f, -0.01414995f, -0.13102813f, -0.07567236f, 0.04332535f, 0.19230306f, + -0.21142675f, -0.18455704f, -0.13706857f, -0.09760966f, -0.00844340f, 0.14865602f, 0.20607338f, 0.12012844f, -0.00914924f, -0.14368559f, -0.00265126f, 0.10043210f, 0.09154737f, 0.03443178f, 0.02422327f, 0.06909914f, + 0.18450361f, 0.00435351f, 0.27864126f, 0.17704943f, -0.20479796f, -0.29862599f, -0.17089168f, -0.09881143f, 0.04783000f, 0.14260548f, -0.02349078f, -0.20487241f, -0.13745683f, 0.05546335f, 0.10019847f, 0.14830206f, + 0.10317471f, -0.16998911f, 0.09734737f, 0.06796242f, -0.01161580f, -0.18371589f, -0.08936939f, 0.07107444f, -0.09565406f, -0.23557438f, 0.42834066f, 0.31175412f, -0.11511657f, -0.28572113f, -0.06889545f, 0.17599802f, + 0.11312034f, 0.08666296f, 0.02086535f, 0.12656018f, -0.12520471f, 0.04702581f, 0.39113807f, 0.09775371f, -0.00094471f, 0.08191930f, 0.07626151f, -0.13554986f, -0.29383511f, -0.25857022f, -0.15738811f, -0.06981449f, + 0.07590872f, 0.10290609f, -0.14618577f, 0.13491216f, 0.33869686f, -0.04072549f, -0.30046897f, -0.07243681f, 0.07180300f, 0.23060158f, 0.21642544f, -0.13575731f, -0.31781641f, -0.19431392f, -0.02233810f, 0.05878895f, + -0.11105764f, -0.05437616f, -0.00379085f, 0.08951467f, 0.39169243f, -0.38233560f, 0.34492699f, -0.09947370f, -0.08648526f, -0.03340088f, -0.02593483f, 0.11572014f, 0.01899877f, -0.03965890f, -0.06421047f, -0.06012863f, + -0.01630162f, 0.17784241f, -0.29989778f, 0.10469439f, 0.14861228f, -0.00722859f, -0.10711587f, -0.18435390f, -0.22539717f, -0.21441284f, 0.00336383f, 0.04362196f, 0.03914130f, 0.10650815f, 0.16959322f, 0.26133027f, + -0.45700261f, 0.07282251f, 0.00944859f, 0.03968330f, -0.02457975f, 0.11148291f, -0.02109853f, -0.18417192f, 0.02503845f, 0.10733751f, 0.21565042f, 0.09727523f, 0.00466877f, -0.01572810f, -0.00245341f, 0.02162664f, + 0.01471341f, -0.09796256f, 0.37685840f, -0.27373841f, -0.22809280f, 0.20207443f, 0.12508033f, 0.16172866f, 0.15442152f, -0.03971152f, -0.03731565f, 0.04320052f, -0.02493079f, -0.08894232f, -0.13155708f, -0.15582618f, + -0.04063466f, 0.14873431f, 0.10076527f, -0.09442471f, 0.02133939f, -0.04747602f, 0.02176493f, 0.52606315f, -0.60183613f, -0.05056878f, 0.18858100f, -0.00936749f, -0.17007143f, -0.00822640f, 0.01473704f, 0.00062041f, + -0.01851982f, 0.07661957f, -0.30452796f, 0.64817852f, -0.21819667f, -0.15094971f, -0.02014064f, 0.04976562f, 0.03988913f, 0.00229505f, -0.01596447f, -0.00497683f, 0.01888521f, 0.00912230f, -0.04741494f, -0.06406442f, + -0.18646693f, -0.25658854f, 0.20567339f, 0.06671960f, -0.24836724f, -0.23737029f, 0.03275858f, 0.09293590f, 0.06861982f, 0.01487215f, 0.10808605f, 0.17546010f, 0.16832370f, 0.12557457f, -0.00949461f, -0.12073619f, + -0.08559046f, -0.16350668f, -0.28729498f, 0.01179878f, 0.06195939f, 0.06121501f, -0.29667937f, -0.19145944f, 0.41150010f, 0.18707789f, -0.21406932f, 0.19248440f, 0.16889573f, 0.10825101f, 0.07412737f, -0.03870938f, + 0.00652202f, -0.15316918f, 0.25343593f, -0.09299964f, -0.22861167f, 0.06865193f, 0.02064443f, -0.10488496f, -0.18017250f, -0.21898191f, -0.08742146f, 0.02608617f, 0.05046582f, 0.08687786f, 0.21515984f, 0.33839723f, + 0.12533507f, 0.27191291f, 0.06056226f, -0.10872799f, 0.01799135f, 0.17589055f, -0.05514906f, -0.01148984f, 0.01373578f, -0.08944541f, -0.35717808f, -0.38014180f, 0.05531840f, 0.30742910f, 0.08016039f, -0.10620357f, + -0.01190022f, -0.24441497f, -0.07461266f, 0.02317252f, 0.05704737f, 0.16442883f, 0.06955004f, 0.05748732f, 0.05251523f, 0.22879327f, 0.21860705f, -0.37376474f, 0.03987437f, 0.33071525f, -0.23228300f, -0.30521565f, + -0.00581916f, 0.24592784f, -0.27266538f, -0.28914327f, 0.09129356f, 0.42079957f, 0.05815983f, 0.01136363f, 0.03980200f, -0.04215296f, 0.01465284f, 0.03859289f, -0.13354970f, -0.16935580f, -0.05814064f, 0.05023468f, + 0.44241891f, -0.06885632f, -0.14130761f, -0.04771012f, -0.00863562f, 0.00586591f, 0.12381405f, 0.08059256f, -0.06764947f, -0.22513354f, -0.10536820f, 0.02669478f, 0.01147300f, -0.01584685f, -0.02845628f, 0.01810479f +}; + +const float *const ivas_sns_cdbks_tcx20[SNS_MSVQ_NSTAGES_TCX20] = { ivas_sns_cdbk_tcx20_stage1, ivas_sns_cdbk_tcx20_stage2, ivas_sns_cdbk_tcx20_stage3, ivas_sns_cdbk_tcx20_stage4 }; + +const float ivas_sns_means_tcx20[M] = { + 0.9155f , 1.2408f , 1.0050f , 0.5846f, + 0.2472f , 0.1902f , 0.0984f , 0.1039f, + -0.0139f , -0.0856f , -0.4157f , -0.6148f, + -0.7026f , -0.7216f , -0.8052f , -1.0262f +}; + +const int16_t ivas_sns_cdbks_tcx10_levels[SNS_MSVQ_NSTAGES_TCX10] = { 128, 32, 8 }; +const int16_t ivas_sns_cdbks_tcx10_bits[SNS_MSVQ_NSTAGES_TCX10] = { 7, 5, 3 }; + +const float ivas_sns_cdbk_tcx10_stage1[ 128 * 16 ] = { + 0.06343891f, -0.00651786f, -0.56994713f, -0.98772396f, -1.35099293f, -1.24848646f, -1.20301995f, -0.81089507f, -0.06563095f, 1.11147581f, 1.73933309f, 1.65859611f, 1.26237806f, 0.68028141f, 0.12449909f, -0.39678907f, + -1.34007175f, -1.50272189f, -2.07958791f, -2.38322761f, -2.22156614f, -1.96435669f, -1.68760863f, -1.23664935f, -0.28772180f, 0.87765579f, 1.83822720f, 1.95281398f, 2.33671266f, 2.76119687f, 2.75790597f, 2.17899850f, + -0.51450332f, 0.69692757f, 1.90898730f, 1.89179379f, 1.41350404f, 0.03604267f, 0.02251128f, -1.04270018f, -0.97981089f, -0.36225564f, 0.14171617f, -0.32050715f, -0.56272675f, -0.38710633f, -0.74842203f, -1.19345103f, + 0.61027733f, -0.25705654f, -0.30960961f, 0.11651829f, 0.08424358f, -0.04474594f, -0.21961636f, -0.26522327f, -0.31681379f, -0.23903185f, -0.07879718f, 0.00383111f, 0.09522293f, 0.15157026f, 0.24747985f, 0.42175137f, + 0.06215930f, 0.74417332f, -0.05737044f, -0.84302341f, -0.79474372f, -0.48758880f, 0.00597663f, 0.39113473f, 0.94133689f, 1.03804127f, 0.53832521f, -0.22235026f, -0.44306288f, -0.22065599f, -0.22880587f, -0.42354568f, + -1.79298887f, -1.27561542f, -0.40453013f, 0.23597108f, 1.02842032f, 1.26211371f, 0.67302878f, 0.34945977f, 0.47749022f, 0.37809966f, 0.32913783f, 0.24544337f, -0.10938763f, -0.26555659f, -0.53889493f, -0.59219154f, + 1.13009762f, 0.63132036f, 0.20308733f, 0.12539517f, -0.05215684f, -0.59255734f, -0.72324525f, -0.47416068f, -0.34730473f, -0.17547668f, -0.01869868f, -0.01336213f, -0.03177292f, -0.01470495f, 0.12726970f, 0.22627027f, + 0.77990892f, 0.11720033f, -0.36217078f, -0.11533103f, -0.09211988f, -0.10379850f, 0.04466728f, 0.23851356f, 0.32838480f, 0.57072608f, 0.78005115f, 0.64032724f, 0.04609407f, -0.53665387f, -1.07338898f, -1.26240993f, + 0.71007500f, 1.67092184f, 0.87004285f, -0.47652190f, -0.41457815f, 1.09228787f, 1.43629613f, 1.29941339f, 0.74914490f, -0.87973861f, -1.00898687f, -0.76690679f, -0.87310138f, -0.89762148f, -1.11083002f, -1.39989674f, + 0.93106313f, -0.58060200f, -1.42018765f, -1.93078113f, -1.40332079f, -1.01406592f, -0.68270775f, -0.12421160f, -0.12818640f, 0.46306788f, 0.74384671f, 1.78170251f, 1.49298768f, 0.36128067f, 0.32905160f, 1.18106291f, + -0.34612942f, -0.05241863f, 0.63278953f, 1.64696186f, 1.83789559f, 1.82381570f, 1.71656555f, 1.45437140f, 1.06980287f, 0.39137818f, -0.16457688f, -0.79497784f, -1.78896933f, -2.38820658f, -2.55386733f, -2.48443600f, + -1.86975241f, -1.08195483f, -0.57202727f, -0.39808906f, -0.40936508f, 0.09703771f, 0.81017115f, 0.38629167f, 0.19481800f, 0.19706778f, -0.03872708f, -0.18683058f, 0.37148725f, 0.91055817f, 0.85929760f, 0.73001606f, + 0.13134993f, -0.43834896f, -0.42233235f, -0.34270675f, -0.42348478f, -0.62064185f, -0.67185252f, -0.57602218f, -0.46183286f, -0.05757593f, 0.38429775f, 0.63679540f, 0.59933007f, 0.44800121f, 0.69922041f, 1.11580320f, + -3.26282616f, -2.43458949f, -1.60312382f, -1.18490625f, -0.63841390f, -0.06739227f, 0.57790279f, 1.01010243f, 0.95682720f, 0.75035821f, 0.76084039f, 0.55166704f, 0.83933875f, 1.36392702f, 1.32925064f, 1.05103737f, + 2.94202112f, 3.01169534f, 2.23272878f, 2.33910012f, 1.97620433f, 1.92572769f, -0.00413067f, -1.30712114f, -1.48714461f, -1.62849896f, -1.56921600f, -1.60110814f, -1.73339679f, -1.81275951f, -1.69381023f, -1.59029306f, + -2.29630904f, -1.61967905f, -0.50968315f, 0.70826746f, 1.31943393f, 1.58078613f, 1.31857322f, 0.52237224f, 0.09330352f, 0.13994471f, 0.02623813f, -0.21467602f, -0.33140340f, -0.32793129f, -0.24016399f, -0.16907333f, + 1.17007844f, 1.46542856f, 1.12327460f, 0.78468376f, 0.28858044f, -0.24345469f, -0.36619581f, -0.30604001f, -0.24486928f, -0.39076408f, -0.42628982f, -0.47126418f, -0.48974406f, -0.58899141f, -0.61209496f, -0.69233731f, + 1.07869290f, -1.09624499f, -1.92296142f, -2.03260639f, -0.72727691f, 0.59938120f, 1.09296276f, -0.23244761f, -0.74213456f, -0.00394467f, 0.65433789f, 0.15922442f, 0.10516506f, 0.08483738f, 1.10833114f, 1.87468404f, + -0.45930662f, 0.49568081f, 0.92195224f, 1.70200988f, 1.24720421f, 1.19845895f, 0.75959352f, 0.23323360f, -0.27099240f, -1.38259199f, -2.25979609f, -0.92875900f, -0.06647214f, -0.58552485f, -0.33254823f, -0.27214292f, + -0.34979667f, 0.75395625f, 0.28769469f, -0.85592098f, -0.65167816f, 0.61099639f, 0.60402617f, 0.14561560f, -0.35073645f, -0.56010271f, -0.46661447f, -0.33527423f, -0.00166125f, 0.46634881f, 0.62977271f, 0.07337395f, + -0.41325825f, -0.71696540f, -0.72218212f, -0.64886200f, -0.33204525f, -0.13777071f, -0.05902665f, 0.08826462f, 0.09668422f, 0.34870144f, 0.76742933f, 1.02820877f, 0.66254418f, 0.26837143f, -0.04920095f, -0.18089312f, + -3.00863529f, -3.40420466f, -1.94263495f, -0.42577604f, 1.34874808f, 1.22039392f, -0.16945247f, -0.55999693f, 0.06330206f, 1.23795253f, 0.30477631f, 0.53425336f, 1.62154688f, 1.44462099f, 0.96061888f, 0.77448714f, + 1.81574209f, 1.72942805f, 0.78817895f, 0.12550764f, -0.50423190f, -0.81032090f, -0.83940826f, -0.95575724f, -0.70482913f, -0.32127670f, -0.08073867f, -0.13170408f, -0.16649118f, -0.08610719f, -0.03381103f, 0.17581953f, + -0.84693001f, -0.20800644f, 0.25371425f, 0.56604831f, 0.68467374f, 0.74501557f, 0.69436428f, 0.53975035f, 0.44393852f, 0.30580817f, 0.06566139f, -0.27742827f, -0.57148395f, -0.67328070f, -0.81658998f, -0.90525565f, + -0.44018762f, 0.22712975f, 1.11402502f, 1.98499541f, 1.52065113f, 0.79057891f, 0.55313940f, 0.32776632f, 0.39113088f, 0.10707747f, -0.20138118f, -0.67412788f, -1.34113027f, -1.39661518f, -1.43118002f, -1.53187281f, + -0.71632657f, -0.79492959f, -1.11328698f, -1.41494496f, -1.48929785f, -1.40383584f, -1.26657215f, -1.11367689f, -0.76426307f, 0.01056535f, 0.85354567f, 1.27473730f, 1.64108006f, 2.08311127f, 2.27822947f, 1.93586484f, + 2.05008554f, 2.18328135f, 1.98567996f, 2.35703511f, 2.27653310f, 2.41056123f, 1.36801069f, 0.12761937f, -0.59913124f, -1.45799255f, -1.89092221f, -1.99613693f, -2.20251841f, -2.33272106f, -2.21702011f, -2.06236397f, + -0.88997509f, -0.45675689f, 0.38059457f, 0.51582524f, 0.11775375f, -0.01509768f, -0.18542670f, -0.33776632f, -0.39018689f, -0.33129536f, -0.13149667f, 0.00113524f, 0.03060501f, 0.32190251f, 0.62848970f, 0.74169479f, + 1.19033790f, 0.59193623f, -0.18758267f, -0.71960274f, -0.81756997f, -0.65024529f, -0.64463404f, -0.82612299f, -0.84513928f, -0.45206413f, -0.04059069f, 0.00434486f, 0.50165507f, 1.00958611f, 0.97568033f, 0.91001135f, + -2.25864394f, -2.18529992f, -1.67272884f, -1.18053068f, -0.96703519f, -0.83661833f, -0.59641534f, -0.08623307f, 0.57868270f, 1.39398557f, 2.00205076f, 1.91429603f, 1.37348845f, 1.02732012f, 0.88340938f, 0.61027091f, + 1.13384373f, 2.01444926f, 1.64076134f, 0.39967630f, 0.11211256f, 0.60599786f, 0.41069653f, -0.08528479f, -0.18299306f, -0.80418851f, -1.03743576f, -1.04941914f, -0.88831874f, -0.76292972f, -0.67716107f, -0.82980704f, + -1.17168042f, -0.44794963f, 0.01219570f, -0.09679638f, 0.01681223f, 0.42983884f, 0.69873962f, 1.14025903f, 1.28455301f, 0.60046712f, -0.18327995f, -0.56883208f, -0.60793720f, -0.38487681f, -0.31833900f, -0.40317432f, + 0.85846316f, 0.89573242f, -0.03759975f, -0.56845446f, -0.63431292f, -0.69230128f, -0.59890012f, -0.27699442f, -0.10781577f, 0.38926803f, 0.44176667f, 0.74409936f, 0.51508281f, -0.44324047f, -0.56579214f, 0.08099815f, + -3.15663729f, -3.79941004f, -3.31993311f, -2.54887019f, -1.08297819f, 1.57490155f, 2.29511481f, 2.21386433f, 2.04448334f, 1.39028095f, 1.22351492f, 1.20294900f, 1.33557966f, 1.22044095f, 0.22504752f, -0.81835038f, + 2.10765319f, 2.66375515f, 1.73697111f, 0.50664812f, -0.22472176f, -0.63409486f, -0.65405139f, -0.71248479f, -0.73053296f, -0.87990271f, -0.82710167f, -0.73244187f, -0.64629112f, -0.47294253f, -0.23431056f, -0.26615160f, + -0.03257826f, 0.53214066f, -0.00109639f, -0.42211164f, -0.51464982f, -0.59747387f, -0.63145473f, -0.49761105f, -0.36163571f, 0.00923799f, 0.32394200f, 0.34648466f, 0.32420111f, 0.44177392f, 0.52684150f, 0.55398991f, + 0.38342101f, 0.05503415f, -0.69210895f, -1.40291256f, -1.20627913f, -0.22810180f, 0.91689677f, 1.67212414f, 1.26349034f, 0.48698570f, 0.10567292f, 0.13423949f, -0.02515828f, -0.41152165f, -0.51320898f, -0.53857267f, + -2.82653388f, -3.73292024f, -3.01554952f, 0.33800837f, 1.63071077f, 3.70049918f, 1.52548217f, -0.51327972f, -0.09119392f, 0.92240352f, 2.33190356f, 1.84268123f, -0.37179294f, -0.94969237f, -1.13179438f, 0.34106773f, + 1.56686851f, 0.88339322f, 0.31264631f, -0.04528796f, -0.42838354f, -0.20342114f, 0.40102389f, 0.54537791f, 0.35383369f, -0.18334298f, -0.75234358f, -0.76217615f, -0.36188398f, -0.46147282f, -0.54662536f, -0.31820590f, + 1.24862641f, 0.57117898f, 0.32856394f, 0.39564440f, 0.31824468f, 0.20893064f, 0.02628416f, -0.15359328f, -0.37616872f, -0.26748355f, -0.12954661f, -0.12215355f, -0.31835718f, -0.55834118f, -0.61233860f, -0.55948996f, + -0.59446013f, 0.48100057f, 1.20941553f, 0.41887505f, 0.63264306f, 1.37297652f, 1.40760513f, 0.91551762f, 0.67322895f, -0.90761879f, -1.23123057f, -0.97622159f, -0.96118737f, -0.53857839f, -0.69473239f, -1.20723297f, + -0.59728936f, -1.63533369f, -2.00769344f, -1.93041740f, -1.52949359f, -0.77428525f, -0.21146300f, 0.18478098f, 0.44962772f, 0.95017605f, 1.24326918f, 1.36658626f, 1.25105966f, 1.00442735f, 1.03660313f, 1.19944572f, + 0.32910504f, 1.16199966f, 2.05499236f, 2.56854877f, 2.45081012f, 1.66017811f, 1.01838813f, 0.51773322f, -0.06505376f, -1.14261830f, -1.77930778f, -1.94467446f, -1.83142606f, -1.76577923f, -1.67433287f, -1.55856482f, + -2.64386625f, -1.44973884f, -0.70503582f, -0.39387129f, -0.07345342f, 0.04530383f, 0.12054861f, 0.18110856f, 0.21747675f, 0.44785123f, 0.60100453f, 0.60149054f, 0.48165166f, 0.67654040f, 0.91879547f, 0.97419414f, + 0.52841759f, -0.23803980f, -0.77847320f, -1.06415798f, -1.29095335f, -0.94613842f, 0.01856631f, 0.57516289f, 0.58685158f, 0.24351075f, -0.23807950f, -0.16772309f, 0.27674343f, 0.40698887f, 0.73162063f, 1.35570347f, + -2.57939825f, -1.65066455f, -0.80960514f, -0.40285025f, -0.02550543f, 0.48071345f, 0.90391140f, 1.61193038f, 1.46090124f, 0.72305123f, 0.34664153f, 0.08297581f, -0.07460306f, 0.06306698f, -0.00946438f, -0.12110157f, + 1.93616583f, 2.87229439f, 2.28910932f, 1.18636717f, 0.28185288f, 0.08337698f, 0.52019726f, -0.70876138f, -1.13139506f, -1.42927692f, -1.07719650f, -0.84569529f, -1.10761102f, -1.14612879f, -0.78606400f, -0.93723475f, + -0.83260061f, -1.02726632f, -0.72610655f, 0.18186308f, 0.34897446f, 0.12845730f, 0.04139028f, 0.52688618f, 0.69166145f, 0.76853602f, 0.83316573f, 0.74702270f, 0.29499833f, -0.33104569f, -0.74851736f, -0.89741947f, + 2.77837874f, 1.31099865f, 0.62870774f, 0.35471489f, 0.05642577f, -0.02869061f, 0.19231930f, 0.50340721f, 0.36258783f, -0.06924684f, -0.52796695f, -0.75396481f, -0.89969036f, -1.23296254f, -1.40215690f, -1.27286039f, + -2.03034497f, -1.73876167f, -1.42952672f, -1.24259095f, -0.92252541f, -0.61137126f, -0.50926746f, -0.37515247f, -0.01804868f, 0.44616051f, 0.86247078f, 1.09558380f, 1.34244283f, 1.77606518f, 1.80302809f, 1.55183866f, + -0.13073542f, 0.74480506f, 1.75612393f, 1.94677409f, 1.45854395f, 0.14973385f, 0.41257896f, 0.78276795f, 0.53033406f, -0.97322979f, -1.31039960f, -1.18457724f, -1.39195239f, -0.74765434f, -0.89874803f, -1.14436551f, + -0.34864040f, 0.37594126f, 1.12760599f, 0.69668388f, 0.42042319f, 0.18779444f, -0.10969643f, -0.21695083f, -0.15889803f, -0.31866683f, -0.31049579f, -0.24646351f, -0.37724204f, -0.33366480f, -0.20076896f, -0.18696143f, + -0.21183487f, 0.60232151f, 0.88716970f, 0.69703105f, 0.10878166f, -0.60737034f, -0.81172315f, -0.92047926f, -0.64811892f, -0.24324457f, 0.15840527f, 0.21438269f, 0.31129327f, 0.53391758f, 0.13740501f, -0.20793704f, + -4.29885487f, -4.07150539f, -2.63799263f, -0.36599561f, 1.44131158f, 1.45858072f, -0.19422385f, -1.06386090f, -0.33862479f, 1.91691551f, 0.64172657f, 0.73115700f, 2.00475202f, 1.65789788f, 1.59229150f, 1.52642575f, + 2.70538594f, 1.21062684f, 0.58857880f, 0.37060452f, 0.32021415f, 0.15108056f, -0.18531087f, -0.47434646f, -0.64590620f, -0.70151444f, -0.68058335f, -0.63299041f, -0.53628956f, -0.62363375f, -0.52279857f, -0.34311771f, + -1.21504940f, -0.39554896f, 0.66755826f, 1.39859234f, 1.07486796f, 1.12290637f, 1.04295204f, 1.14165077f, 1.23441664f, 0.53720217f, -1.08842200f, -1.71470800f, -1.43192570f, -1.01274229f, -0.48508172f, -0.87666906f, + 0.79744189f, 0.76166108f, 0.24454768f, -0.10831092f, 0.07052421f, 0.61249105f, 1.01239329f, 0.92265182f, 0.79053239f, 0.48135056f, 0.14383439f, -0.46575922f, -0.96925167f, -1.31622221f, -1.46252773f, -1.51535724f, + 0.81612871f, -1.33697557f, -1.87521893f, -0.34596308f, 1.89973642f, 0.17905631f, -0.58156390f, -1.21825474f, -1.35128034f, -0.86896364f, -0.55987250f, -0.57592082f, -0.20226923f, 0.35191711f, 1.77194975f, 3.89749413f, + 1.63600586f, 1.88172004f, 2.47282363f, 2.31646225f, 1.68082996f, 0.43732883f, 0.54619537f, 0.53604274f, -0.42499034f, -1.38097531f, -1.67316581f, -1.66333999f, -1.66730967f, -1.61301407f, -1.62366867f, -1.46094527f, + -1.13086259f, -0.59286092f, -0.77851750f, -1.03233519f, -1.00728739f, -0.89574050f, -0.77142682f, -0.49554543f, -0.07881573f, 0.54315382f, 0.97530238f, 1.12272839f, 0.97460042f, 0.97504778f, 1.10466703f, 1.08789246f, + 2.01814493f, 0.44413768f, -0.35041288f, -0.98686383f, -1.26200527f, -1.52732432f, -1.48571248f, -1.19925108f, -0.92116223f, -0.35166881f, 0.13444272f, 0.18334560f, 0.92894956f, 1.08294765f, 1.35106569f, 1.94136698f, + -1.70233870f, -1.07878027f, -0.41699769f, -0.44160483f, -0.44460656f, -0.07853597f, -0.00754784f, 0.33653711f, 1.01426686f, 1.48915964f, 0.89682530f, 0.27439080f, 0.11875833f, 0.11843921f, 0.03694301f, -0.11490828f, + 2.92061289f, 2.48313078f, 1.67219449f, 1.01289511f, 0.89753859f, 0.94593326f, 0.70215728f, 0.23868842f, -0.29061326f, -1.00973596f, -1.40595256f, -1.63034802f, -1.68974684f, -1.71427450f, -1.62221007f, -1.51026992f, + -0.53491548f, -0.78055602f, -0.76775254f, 0.10333314f, 0.89464100f, 1.39260245f, 1.42278905f, 1.08133696f, 0.66191720f, 0.26667076f, 0.06990779f, -0.05792125f, -0.54825802f, -0.97098851f, -1.11014442f, -1.12266153f, + 0.08434699f, -0.45396949f, -0.94011771f, -1.20989965f, -1.27570370f, -1.00735662f, -0.43812010f, 0.32116477f, 0.90682311f, 1.07490930f, 1.04265682f, 0.83531254f, 0.64508330f, 0.31821119f, 0.09966431f, -0.00300507f, + -3.45239663f, -3.47846075f, -3.31323927f, -2.90259299f, -2.36355887f, -1.50192157f, -0.92288952f, -0.22530010f, 0.43258717f, 1.44935400f, 2.42148671f, 2.40769873f, 2.68306011f, 3.17878912f, 2.96783805f, 2.61954501f, + 0.48284645f, 1.41799541f, 1.97243102f, 1.59009976f, 1.22294070f, 0.43320660f, -0.04294311f, -0.31344005f, -0.66525145f, -1.13038241f, -1.07639821f, -0.88736938f, -0.84264379f, -0.79497080f, -0.64026957f, -0.72585115f, + -0.53516472f, -0.76920408f, -0.88526173f, -0.38845075f, -0.11227754f, 0.13805981f, 0.30967527f, 0.39937585f, 0.29135651f, 0.31552367f, 0.32154879f, 0.11114380f, 0.10183365f, 0.23587895f, 0.26513073f, 0.20083182f, + -0.82074713f, 0.00036242f, 0.05382877f, -0.93967714f, -1.34393534f, -0.63769734f, 0.72309703f, 0.71909478f, 0.67996995f, 0.71025231f, 0.03684615f, -0.42385779f, 0.20909277f, 0.74865506f, 0.36478854f, -0.08007303f, + -3.48156475f, -2.62401860f, -1.04625145f, 0.48561624f, 1.08462887f, 1.17430353f, 0.89095108f, 0.61098007f, 0.50455996f, 0.68603781f, 0.79217569f, 0.58623668f, 0.26474313f, 0.08681209f, -0.00104191f, -0.01416800f, + 0.84688039f, 0.96543736f, 0.75181222f, 0.42822852f, 0.24904957f, 0.14177234f, -0.40028407f, -0.85658294f, -0.99971434f, -0.98122097f, -0.75656716f, -0.49934498f, -0.24276416f, 0.09868884f, 0.51868958f, 0.73591908f, + -0.06813618f, -0.46119843f, -0.30096714f, 0.02701580f, 0.39106072f, 0.62007470f, 0.37968778f, 0.26617731f, 0.19689970f, 0.13864013f, 0.13523990f, 0.07059597f, -0.06298216f, -0.21734863f, -0.46878891f, -0.64597009f, + 0.51769554f, 1.42736951f, 1.88530137f, 0.81872770f, 0.32102451f, 1.12825115f, 1.21494458f, 1.01472394f, 0.70810844f, -0.50467729f, -1.98880367f, -2.08711611f, -1.72264586f, -0.93580475f, -0.50571272f, -1.29138527f, + 0.60536537f, -0.70354528f, -1.21617652f, -1.24262631f, -1.19828977f, -1.12565262f, -1.02203112f, -0.75894521f, -0.36826442f, 0.22795933f, 0.70544758f, 0.89015550f, 1.16228260f, 1.29703247f, 1.33542695f, 1.41186140f, + 1.04571798f, 1.61006483f, 1.19302962f, 0.57809989f, 0.71546259f, 1.30149630f, 1.62036473f, 1.44726990f, 1.32882491f, 0.70680094f, -0.39181833f, -1.57019972f, -2.33882246f, -2.53038720f, -2.43836110f, -2.27754281f, + -1.70543716f, -1.02771491f, -0.55943640f, -0.54366014f, 0.38503076f, 1.17876631f, 0.37193454f, -0.12189347f, 0.01303672f, -0.31900986f, -0.63608524f, -0.16956145f, 0.42659413f, 0.80300802f, 1.20767125f, 0.69675704f, + 1.23368326f, -0.17372473f, -0.75359852f, -0.99565343f, -0.84904797f, -0.66289765f, -0.45993622f, -0.17721316f, 0.04972474f, 0.35539595f, 0.55580381f, 0.47907626f, 0.35782172f, 0.37623101f, 0.34327632f, 0.32105845f, + -2.18352213f, -1.61901373f, -1.19957932f, -1.19527760f, -1.04950866f, -0.80750101f, -0.01092868f, 0.85242547f, 1.12490981f, 0.83609667f, 0.69994996f, 0.68985497f, 0.89390672f, 1.14712210f, 1.06776086f, 0.75330468f, + 2.33432113f, 2.91068592f, 2.96537876f, 2.14989074f, 1.35332201f, -0.15166191f, -0.61009155f, -1.11607408f, -1.38841709f, -1.32795548f, -1.18652766f, -1.19841345f, -1.27066378f, -1.28720326f, -1.20653804f, -0.97005218f, + -1.23488338f, -0.82668707f, -0.18190692f, 0.80577567f, 1.40765006f, 1.57572199f, 0.77649472f, 0.06817818f, -0.35316133f, -0.31163295f, -0.22814807f, -0.08516639f, -0.14974413f, -0.40747307f, -0.44196718f, -0.41305033f, + 1.49614141f, 2.17073361f, 1.21828130f, 0.24082715f, -0.04653730f, -0.02674890f, 0.07730547f, -0.75552212f, -0.53247648f, 0.68923075f, 0.51413502f, -1.15304142f, -1.36047405f, -1.08476009f, -0.71333064f, -0.73376398f, + -0.89704242f, -1.73833976f, -1.54624918f, -0.75197415f, -0.28436966f, -0.17513881f, -0.18327761f, -0.08090335f, 0.17526730f, 0.62711579f, 0.87938919f, 0.73687059f, 0.73766468f, 0.77613800f, 0.76077200f, 0.96407748f, + -0.74442989f, 0.06393849f, 0.79593747f, 2.27945407f, 2.65112193f, 2.16937280f, 1.04534068f, 0.40390110f, -0.66651353f, -1.35166042f, -1.46612345f, -0.64581600f, -0.65681647f, -1.60629861f, -1.31557834f, -0.95583049f, + 1.36402643f, 1.80223774f, 0.69837068f, -0.49496040f, -0.78242114f, -0.27168915f, 0.02445085f, -0.20866271f, -0.30035706f, -0.41170635f, -0.35841577f, -0.34242299f, -0.28692410f, -0.02094657f, -0.05934480f, -0.35123483f, + -1.08520561f, -0.84120058f, -0.40604501f, -0.30838475f, -0.39817946f, -0.45244145f, -0.46460261f, -0.31407296f, -0.03689281f, 0.38084328f, 0.75874597f, 0.64589942f, 0.68713572f, 0.85059140f, 0.70295555f, 0.28085506f, + -3.41901495f, -4.05624120f, -2.77833774f, -0.25403214f, 1.87889428f, 1.49402114f, -0.04104013f, -0.12322346f, 0.66403332f, 2.05218773f, 0.76725378f, 0.75987949f, 1.64445951f, 1.18046450f, 0.23904189f, -0.00834539f, + 2.34563559f, 1.85433514f, 0.92188091f, 0.00938003f, -0.66632165f, -1.24128642f, -1.45925477f, -1.45794931f, -1.45009658f, -1.08637380f, -0.53948104f, -0.13215543f, 0.79501605f, 0.54741060f, 0.55538134f, 1.00387907f, + 0.18830608f, 0.82743615f, 0.71353361f, 0.08375013f, 0.72945362f, 1.56781385f, 0.82203061f, -0.15761113f, -1.14514559f, -0.94404839f, -0.45524505f, -0.03539938f, -0.38522988f, -0.55123197f, -0.43254198f, -0.82587158f, + 0.28717168f, 1.26620628f, 1.79284485f, 0.74811924f, 0.75340319f, 0.55244948f, 0.46108770f, 0.62189892f, 0.63524206f, -0.36020964f, -0.49840190f, -0.49783437f, -1.24630499f, -1.48121128f, -1.52882801f, -1.50563245f, + 0.77651863f, -0.09801613f, -0.65368548f, -1.42314584f, -1.95826046f, -2.20248886f, -1.97940063f, -1.63600078f, -1.05805019f, -0.03308653f, 1.18890487f, 1.59425997f, 1.56951997f, 1.72023665f, 1.99206238f, 2.20063258f, + 1.86036810f, 1.95524352f, 1.65802754f, 0.51762484f, 0.32278641f, 1.41534130f, 1.58480385f, 1.00644422f, -0.43304110f, -1.52615221f, -1.54409319f, -1.50951389f, -1.44095494f, -1.33336688f, -1.41459830f, -1.11891940f, + -0.48994782f, -0.25738925f, -0.03744629f, -0.08936731f, -0.21819055f, -0.21749988f, -0.57009207f, -0.68163031f, -0.77904329f, -0.92638722f, -0.49253451f, -0.11015934f, 0.49328977f, 1.25069491f, 1.61419932f, 1.51150480f, + 2.17925129f, 0.65744215f, -0.14102877f, -0.68226531f, -0.86240255f, -0.96233313f, -0.77240075f, -0.60150667f, -0.43620670f, -0.12974041f, 0.06940761f, 0.29313968f, 0.32005914f, 0.04484663f, 0.20342365f, 0.82031433f, + -2.73276927f, -1.95293295f, -1.25302447f, -1.26607638f, -1.03464322f, -0.41097672f, 0.11299908f, 0.61306244f, 1.35234054f, 1.98785456f, 1.65758988f, 0.94482039f, 0.67093436f, 0.60201696f, 0.38959545f, 0.31920903f, + 1.99599002f, 1.78113188f, 1.60094449f, 1.49585133f, 1.05949606f, 0.38027999f, -0.00956917f, -0.37696778f, -0.58734884f, -0.88374264f, -1.14734587f, -1.24114441f, -1.17843206f, -1.09199503f, -0.92371805f, -0.87342960f, + -1.37903570f, -0.79248227f, 0.13536234f, 0.47656459f, 0.43589978f, 0.88461367f, 1.02738581f, 0.55354663f, 0.25049941f, -0.28501314f, -0.80941419f, -0.81019030f, -0.45648923f, 0.11389766f, 0.39621982f, 0.25863532f, + 2.10361489f, 0.37593562f, -0.16944555f, -0.32212923f, -0.22241176f, -0.24351656f, -0.27375398f, 0.02762124f, 0.11073362f, 0.23273069f, 0.27063497f, 0.08607178f, -0.19792432f, -0.48410706f, -0.59195084f, -0.70210352f, + -3.28081022f, -2.84286219f, -2.41405615f, -2.18965898f, -1.85813828f, -1.04835079f, -0.44771380f, 0.59206456f, 1.50301948f, 2.07448941f, 2.16550955f, 1.89856464f, 1.75678779f, 1.60095964f, 1.36941840f, 1.12077632f, + 1.20650745f, 1.87107653f, 1.86883453f, 1.42456949f, 0.48789223f, -0.72412798f, -1.11112426f, -1.49029508f, -1.30798779f, -1.39394685f, -1.21186297f, -0.51923241f, 0.01995250f, 0.34176002f, 0.40195072f, 0.13603383f, + 1.27785134f, 0.88553037f, 0.16900733f, -0.27809430f, -1.01525323f, -1.49395836f, -1.43232130f, -1.19784251f, -0.74210861f, -0.08619940f, 0.47709237f, 0.55331864f, 0.84110624f, 0.88279667f, 0.58250791f, 0.57656718f, + 0.33221429f, 1.11386403f, 0.75316099f, -0.54031614f, -1.07863165f, -0.21932249f, 1.22065947f, 1.15034668f, 1.03141160f, -0.31201434f, -1.38480174f, -0.81360834f, -0.27523041f, 0.24071536f, -0.19254386f, -1.02590322f, + -1.49213877f, -2.62687029f, -1.76800978f, 0.37484393f, 2.24342021f, 1.70797214f, 0.00785579f, -0.16576749f, 0.40170467f, 1.53774796f, 0.29192482f, 0.32972463f, 0.96040034f, 0.07052406f, -0.75744205f, -1.11588939f, + 1.68310221f, 0.62723214f, -0.21848789f, -0.50907306f, -0.77679516f, -0.86027718f, -0.37120564f, 0.20445818f, 0.27312526f, -0.13982446f, -0.56141448f, -0.66669228f, 0.06397763f, 0.19621457f, 0.32877219f, 0.72688794f, + 0.71839263f, 0.21641507f, 0.34358239f, 1.05799089f, 1.05814284f, 0.52787967f, 0.14046002f, 0.11966559f, 0.07361240f, -0.17447064f, -0.37909417f, -0.61722985f, -0.71730019f, -0.79744166f, -0.77133987f, -0.79926472f, + -0.02890014f, 0.92802997f, 1.03744813f, 0.32870919f, 0.07886022f, 0.63362031f, 0.46497182f, 0.14157700f, -0.03057580f, -0.54785692f, -1.11970728f, -1.36023434f, -0.91731394f, 0.07493639f, 0.47210281f, -0.15566707f, + -0.69638941f, -0.91666102f, -1.56178072f, -1.95501706f, -1.82786692f, -1.74880889f, -1.34684465f, 0.11048340f, 1.37545972f, 1.36714659f, 1.44286472f, 1.29857548f, 1.10826459f, 1.56371080f, 1.18624590f, 0.60061806f, + -0.68066861f, 0.38195183f, 1.51822296f, 2.21510524f, 2.33189221f, 1.97513513f, 1.15635207f, 1.51498823f, 1.49065161f, -0.27868821f, -1.78208773f, -2.20070549f, -2.26038069f, -2.05737950f, -1.59696081f, -1.72742716f, + -2.17324712f, -1.42748120f, -0.47105336f, 0.06399853f, -0.10139724f, -0.33208523f, -0.36226578f, -0.45684329f, -0.45421750f, -0.02950979f, 0.57908509f, 0.82823657f, 0.84044612f, 0.96336259f, 1.18058199f, 1.35238916f, + 0.30637595f, -0.07750454f, -0.01603143f, -0.03845729f, -0.46768884f, -0.33028351f, 0.33893858f, 0.66006523f, 0.64603598f, 0.25681503f, -0.24604284f, -0.37133227f, -0.20588021f, -0.28072164f, -0.22555667f, 0.05126849f, + -1.81904207f, -1.97008939f, -1.38138723f, -0.56721565f, 0.08439254f, 0.50012417f, 0.41461731f, 0.70946239f, 0.65844196f, 0.50418711f, 0.67016347f, 0.85608609f, 0.63818532f, 0.38340644f, 0.22816114f, 0.09050718f, + 3.82551321f, 3.02994002f, 1.79732057f, 1.05862951f, 0.33021546f, 0.01969982f, -0.57482284f, -1.10367492f, -1.21202781f, -1.06293594f, -0.97966329f, -1.01767532f, -1.10340104f, -1.13918652f, -1.02503523f, -0.84289579f, + -2.06530906f, -1.02138773f, 0.19121847f, 0.64135688f, 0.47353945f, 0.29125589f, 0.17346435f, 0.09846354f, 0.14173379f, 0.44108119f, 0.42909595f, 0.13671490f, -0.09429711f, 0.06651142f, 0.02429001f, 0.07226851f, + 1.63249192f, 0.94436017f, 0.65530634f, 0.76476367f, 1.10302458f, 1.20701875f, 0.88073298f, 0.43640158f, -0.07220279f, -0.39214092f, -0.60759685f, -0.87296187f, -1.13810886f, -1.40490240f, -1.54422408f, -1.59196182f, + -2.96354446f, -2.66922503f, -2.35080143f, -1.84250497f, -1.24255764f, -0.53451683f, -0.22318900f, 0.15923121f, 0.44185767f, 0.90571587f, 1.20883041f, 1.21786822f, 1.54160670f, 2.22751201f, 2.21090650f, 1.91281110f, + -0.09062710f, 0.80687377f, 1.69510603f, 2.38364009f, 2.08626387f, 1.00304738f, 0.66997543f, 0.04541459f, -0.35848319f, -0.80600051f, -1.65487629f, -2.04562701f, -2.03869244f, -1.11898388f, 0.04427361f, -0.62130392f, + -0.99015493f, -0.47096904f, 0.39660329f, 1.29486538f, 1.58962509f, 0.33608325f, -0.41798602f, -0.54749259f, -0.00991716f, -0.02240745f, -0.93933104f, -0.69735917f, -0.17095973f, 0.19272004f, 0.29655039f, 0.16013060f, + -0.50032252f, -0.00936927f, 0.13895740f, 0.11955067f, -0.00882381f, -0.31634261f, -0.30280409f, -0.10222302f, -0.04951847f, 0.13870349f, 0.43344396f, 0.56559398f, 0.24092822f, -0.05903140f, -0.12616386f, -0.16257807f, + -4.66891396f, -4.62476618f, -2.72504562f, -0.11626174f, 1.38983931f, 1.37676145f, 0.15183709f, -0.07491020f, 0.54070200f, 1.84266982f, 0.65624201f, 0.70100510f, 1.81013255f, 1.75739872f, 0.97189375f, 1.01141647f, + 3.82513926f, 1.74864093f, 0.71663856f, -0.06702053f, -0.46144066f, -0.68679697f, -0.83513366f, -0.69088271f, -0.63484378f, -0.48492965f, -0.30596681f, -0.27767202f, -0.29901877f, -0.55135905f, -0.55561568f, -0.43973879f, + -1.83506374f, -1.72166910f, -0.66010462f, 1.71984506f, 2.40983158f, 1.81667012f, 1.44944523f, 1.31000271f, 0.86661928f, 0.58345030f, -0.05866711f, -0.37487717f, -0.74598532f, -1.38021702f, -1.58454113f, -1.79473786f, + 0.16939787f, 1.05222199f, 0.60925979f, -0.08245082f, -0.05127361f, -0.01958411f, -0.04649851f, 0.11008216f, 0.21213694f, -0.02520358f, -0.00574917f, -0.04591061f, -0.24174211f, -0.38605009f, -0.52417208f, -0.72446423f, + -0.07063893f, -1.74970518f, -1.79098807f, -1.50819293f, -1.06029380f, -1.44474701f, -1.24662095f, -1.20341521f, -1.18506899f, -0.88327503f, -0.47818767f, 0.53478172f, 1.99588317f, 2.01785324f, 2.86156101f, 5.21105441f, + 1.18577996f, 1.82923029f, 2.00218590f, 1.75897045f, 1.55666666f, 1.15213194f, 1.02264996f, 0.58845201f, 0.39345304f, -0.25590088f, -1.11168611f, -1.75581078f, -2.05745836f, -2.20440070f, -2.14031291f, -1.96395016f, + -0.49703383f, -0.62650520f, -0.98853522f, -1.16849765f, -1.02786508f, -0.51447634f, -0.02538523f, 0.08704333f, 0.03359763f, 0.17774887f, 0.30484412f, 0.32520735f, 0.62948522f, 1.14552041f, 1.22336987f, 0.92148234f, + -0.07188198f, 0.18500810f, -0.22096354f, -0.56851679f, -0.98832362f, -1.20304996f, -1.11943691f, -1.09383807f, -0.85446062f, -0.29360582f, 0.44439822f, 0.64306330f, 1.09971537f, 1.50142342f, 1.36382024f, 1.17664847f, + -1.21730935f, -1.48884440f, -1.78500620f, -1.57607634f, -0.82775565f, -0.09612994f, 0.49933981f, 1.06136160f, 1.31463011f, 1.46090638f, 1.14896512f, 0.64320117f, 0.39111587f, 0.36061229f, 0.18325675f, -0.07226660f, + 2.30575156f, 2.37005513f, 1.37776397f, 0.78509487f, 0.18022242f, -0.13093354f, 0.22126477f, -0.11444642f, -0.35716968f, -0.59492665f, -0.35765935f, -0.44655201f, -1.03213345f, -1.27074059f, -1.44000075f, -1.49558947f, + -1.00874079f, -1.64011865f, -1.86084729f, -1.06805908f, 0.07222945f, 1.36179475f, 1.87160360f, 1.76248472f, 1.52374330f, 1.04119855f, 0.73448166f, 0.13768018f, -0.49711929f, -0.73696841f, -0.89885406f, -0.79450886f +}; +const float ivas_sns_cdbk_tcx10_stage2[ 32 * 16 ] = { + 0.30627323f, 0.48836579f, -0.02716944f, -0.47680077f, -0.52992614f, -0.25467720f, -0.13298242f, -0.14929291f, -0.14808149f, 0.08665801f, 0.28830653f, 0.27526330f, 0.09942358f, -0.01755061f, 0.03315580f, 0.15903469f, + 0.40931263f, -0.04412117f, -0.08826419f, 0.38716891f, 0.51515595f, 0.42227845f, 0.34963425f, 0.26800736f, 0.03770000f, -0.19967080f, -0.31044249f, -0.32623294f, -0.38445978f, -0.38085950f, -0.38590829f, -0.26929836f, + -0.16037262f, -0.37557223f, -0.41481262f, -0.12384627f, 0.25702942f, 0.29593484f, 0.04534352f, -0.04349856f, -0.11439445f, -0.20184919f, 0.03250628f, 0.58473249f, 1.07468564f, 0.31789485f, -0.43837532f, -0.73540590f, + -0.72021067f, 0.08601834f, 0.36444345f, 0.07734969f, -0.03855524f, -0.02016363f, 0.22787880f, 0.23660595f, -0.06162934f, -0.60111840f, -0.53416841f, -0.01411490f, 0.31545914f, 0.35328934f, 0.27371155f, 0.05520477f, + 0.17033204f, -0.13395098f, -0.17486207f, -0.16431307f, -0.15028250f, -0.16217158f, 0.20788205f, 0.78892741f, 0.82887028f, 0.27828798f, -0.09961411f, -0.26525390f, -0.29531330f, -0.31862369f, -0.30357092f, -0.20634333f, + 0.66971623f, 0.62862982f, 0.51073654f, 0.36780819f, 0.09494981f, -0.26895298f, -0.43607248f, -0.52929484f, -0.50226353f, -0.28888748f, -0.08077826f, 0.07870787f, -0.04066089f, -0.15014043f, -0.07631337f, 0.02281584f, + -0.14637266f, -0.46934298f, -0.43556714f, -0.11250329f, 0.02177593f, -0.06273200f, -0.10608254f, -0.23883852f, -0.34273025f, -0.21064510f, 0.01000878f, 0.26290329f, 0.36940740f, 0.45606583f, 0.50057089f, 0.50408231f, + -0.63822919f, -0.37848043f, -0.12025765f, 0.46869706f, 0.60287599f, 0.40487467f, 0.32284423f, 0.21760285f, 0.02923608f, 0.00961581f, 0.09146575f, 0.01422525f, -0.19921025f, -0.27268562f, -0.30705403f, -0.24552069f, + 1.00438179f, 0.03452909f, -0.36528888f, -0.16282387f, -0.17507552f, -0.16366972f, 0.01988929f, 0.04208138f, -0.09195065f, -0.12550201f, -0.13827904f, -0.15519976f, -0.13718296f, -0.04187317f, 0.11795197f, 0.33801187f, + -0.29872646f, -0.05673935f, 0.22627715f, 0.35384240f, 0.40583411f, 0.05342130f, -0.33165017f, -0.58372192f, -0.59880799f, -0.13860904f, 0.35292935f, 0.42680564f, 0.12541820f, -0.05244271f, 0.02304693f, 0.09312233f, + -0.62056798f, -0.65569894f, -0.39193684f, -0.23470135f, -0.10487732f, -0.02415277f, 0.10485475f, 0.27475842f, 0.33639795f, 0.28659695f, 0.29816270f, 0.35486347f, 0.22178257f, 0.06294332f, 0.00371302f, 0.08786182f, + -0.24167361f, 0.39335919f, 0.45401345f, -0.01359878f, -0.02799250f, 0.03219280f, -0.03498926f, 0.13917253f, 0.56998817f, 0.30076805f, -0.02861530f, -0.08301223f, -0.23268793f, -0.25582563f, -0.40349390f, -0.56760551f, + -0.25453749f, 0.20141031f, 0.13622118f, 0.02192458f, 0.01884274f, 0.35426017f, 0.30533029f, -0.04383371f, -0.03213904f, 0.48723585f, 0.26916690f, -0.57914714f, -0.86274497f, -0.46431975f, 0.21456299f, 0.22776732f, + 0.10091242f, -0.00486621f, 0.15438553f, 0.58933636f, 0.58327809f, 0.15020643f, -0.13942120f, -0.30560120f, -0.39802935f, -0.42014770f, -0.43506227f, -0.49122908f, -0.24162334f, 0.07789107f, 0.33589368f, 0.44407700f, + -0.86901291f, -0.12649490f, 0.37769660f, 0.32335451f, -0.09778731f, -0.30169760f, -0.11330902f, 0.06975956f, 0.10852794f, 0.10187023f, 0.01908335f, -0.02063501f, -0.02583787f, 0.01976747f, 0.15814638f, 0.37656868f, + 0.04263499f, 0.02090495f, 0.31860242f, 0.23302977f, -0.33090591f, -0.80333458f, -0.73651770f, -0.34102413f, 0.01204330f, 0.27818705f, 0.45925162f, 0.49138398f, 0.30213637f, 0.14165342f, -0.01743260f, -0.07061291f, + -0.33546750f, 0.07559517f, -0.29917689f, -0.73625773f, -0.65250278f, -0.17791468f, 0.36283358f, 0.41870726f, 0.25167625f, 0.10475438f, 0.03036614f, -0.11264997f, 0.02694511f, 0.35023967f, 0.42385566f, 0.26899640f, + 0.35439950f, 0.67540976f, 0.38662754f, 0.00957348f, -0.04081569f, 0.08980026f, 0.24456400f, 0.16454453f, -0.17326799f, -0.44054817f, -0.46528410f, -0.40046956f, -0.28220380f, -0.18741583f, -0.03688613f, 0.10197206f, + 0.42543134f, 0.16124378f, -0.11664388f, -0.16052109f, -0.14380996f, -0.20548992f, -0.07681681f, -0.05550879f, -0.19682147f, -0.44926335f, -0.31008693f, 0.10843293f, 0.56978845f, 0.55547148f, 0.11319503f, -0.21860065f, + -0.29805544f, -0.51653600f, -0.50993841f, -0.23042275f, 0.24667415f, 0.49673729f, 0.44572321f, 0.45012593f, 0.15926189f, -0.25316153f, -0.34302757f, -0.25146569f, -0.04585493f, 0.07882198f, 0.19017230f, 0.38094576f, + 0.32844224f, 0.41193928f, 0.40958218f, 0.23076367f, -0.27298459f, -0.73724149f, -0.33139249f, 0.20850941f, 0.29246785f, 0.02387269f, -0.22298162f, -0.22401730f, -0.10602946f, -0.10948655f, -0.04914188f, 0.14769834f, + -0.17579666f, 0.35780877f, 0.71235588f, 0.55448086f, 0.37958752f, 0.25325181f, 0.00067976f, -0.17449727f, -0.19933258f, -0.18272217f, -0.13825657f, -0.13482936f, -0.26973501f, -0.36527057f, -0.38046021f, -0.23726392f, + 0.18763378f, -0.33806505f, -0.40345471f, -0.16420458f, -0.35258917f, -0.57440801f, -0.40444473f, 0.03937379f, 0.28301143f, 0.24202773f, 0.11450746f, -0.01201630f, 0.15584175f, 0.29186178f, 0.39454798f, 0.54037647f, + 0.22483690f, -0.44980090f, -0.04869487f, 0.59069175f, 0.53952189f, -0.08294351f, -0.50222392f, -0.24118691f, 0.23316504f, 0.15935219f, -0.04441873f, 0.04368785f, -0.01936622f, -0.19829407f, -0.17269697f, -0.03162974f, + 0.86145933f, 0.21872440f, 0.03989593f, 0.02383014f, -0.09253274f, -0.16857595f, -0.11671737f, 0.08021353f, 0.06125647f, 0.12344152f, 0.23383136f, 0.23023986f, 0.00554465f, -0.33666994f, -0.57850362f, -0.58543742f, + 0.51765053f, 0.14453794f, -0.21849231f, -0.46766148f, 0.28518641f, 0.98554209f, 0.04290847f, -0.60417524f, -0.40619174f, 0.07096948f, -0.07934046f, -0.11108689f, 0.01736604f, 0.02182622f, -0.13816306f, -0.06087569f, + 0.48940455f, -0.48846716f, -0.76449136f, -0.43167975f, -0.08214146f, 0.11409731f, 0.23323066f, 0.14717357f, 0.03539665f, 0.18939153f, 0.30742449f, 0.25985980f, 0.09542412f, -0.02333196f, -0.07732568f, -0.00396539f, + -0.11187535f, 0.22479868f, 0.00043228f, -0.32181417f, -0.15096473f, 0.43016822f, 0.70121781f, 0.35219596f, -0.12050155f, -0.23287073f, 0.15265180f, 0.19690580f, -0.06424055f, -0.21596133f, -0.38579166f, -0.45435087f, + -0.22289529f, -0.33733328f, 0.06840735f, 0.09280703f, 0.04636627f, 0.21910935f, -0.03558133f, 0.03650325f, 0.61258277f, 0.50575298f, -0.41287364f, -0.69151766f, -0.55346043f, 0.16231747f, 0.54407303f, -0.03425754f, + -0.01396139f, 0.41256481f, 0.28386076f, -0.13079544f, -0.35049882f, -0.37139357f, -0.26190236f, -0.28543916f, -0.36404168f, -0.41216213f, -0.30446824f, -0.16554805f, 0.07635435f, 0.40718475f, 0.72148357f, 0.75876291f, + -0.78143464f, 0.05520810f, 0.09851993f, -0.35088396f, -0.29183273f, 0.13535467f, 0.10630173f, -0.35151176f, -0.27502696f, 0.15923208f, 0.34325564f, 0.26263384f, 0.39924614f, 0.42088604f, 0.20935571f, -0.13930422f, + -0.20363163f, -0.21557857f, -0.16300691f, -0.04183005f, -0.11100316f, -0.05771045f, 0.03898740f, 0.01316220f, 0.17362802f, 0.74914331f, 0.94477958f, 0.44778038f, -0.09421183f, -0.32736334f, -0.50631884f, -0.64682642f +}; +const float ivas_sns_cdbk_tcx10_stage3[ 8 * 16 ] = { + 0.15213764f, -0.12778955f, 0.09362990f, -0.08343056f, -0.25379718f, 0.12518895f, 0.29943288f, -0.09857322f, -0.34816031f, -0.24349585f, -0.11266650f, -0.05996015f, 0.03254247f, 0.15532134f, 0.23410563f, 0.23551447f, + -0.16242282f, -0.11097776f, -0.31747514f, -0.25628076f, 0.13836003f, 0.29861681f, 0.10506779f, 0.11734717f, 0.26608658f, 0.05454060f, -0.14603348f, -0.19239843f, 0.04173306f, 0.20966631f, 0.07432020f, -0.12015035f, + -0.05086737f, 0.14763099f, -0.10027459f, -0.32093478f, -0.17515530f, -0.18641303f, -0.27141947f, -0.07787662f, 0.00378069f, -0.04285463f, 0.10140687f, 0.34974771f, 0.30832793f, 0.10107726f, 0.07691200f, 0.13691240f, + -0.19149570f, -0.03034820f, 0.22501633f, 0.07949802f, -0.27147765f, -0.19613243f, 0.27922429f, 0.35035416f, 0.10414276f, 0.00614821f, 0.06550601f, 0.11675054f, 0.03695278f, -0.13039057f, -0.22716902f, -0.21657951f, + 0.26536712f, -0.20814302f, -0.25065997f, 0.11971631f, 0.27275427f, 0.17786545f, -0.00254739f, -0.12770659f, -0.22797897f, 0.00768447f, 0.21340357f, 0.19482691f, 0.04586545f, -0.11847485f, -0.17809566f, -0.18387694f, + 0.25667429f, 0.24654641f, 0.10151031f, -0.02938848f, -0.14360442f, -0.13987667f, -0.20754252f, -0.19670735f, 0.17496815f, 0.41594389f, 0.13093074f, -0.20541061f, -0.16236246f, 0.04068170f, -0.03728146f, -0.24508149f, + -0.08722397f, 0.02295918f, 0.00051204f, 0.07408103f, 0.14389321f, 0.06786859f, 0.00359252f, 0.11717038f, 0.08740562f, 0.00119184f, -0.07592203f, -0.11362449f, -0.31422561f, -0.38910675f, -0.02291088f, 0.48433932f, + -0.18216919f, 0.06012195f, 0.24774113f, 0.41673922f, 0.28902704f, -0.14711768f, -0.20580810f, -0.08400793f, -0.06024452f, -0.19915854f, -0.17662518f, -0.08993148f, 0.01116638f, 0.13122555f, 0.08011919f, -0.09107791f +}; + +const float *const ivas_sns_cdbks_tcx10[SNS_MSVQ_NSTAGES_TCX10] = { ivas_sns_cdbk_tcx10_stage1, ivas_sns_cdbk_tcx10_stage2, ivas_sns_cdbk_tcx10_stage3}; + +const float ivas_sns_means_tcx10[M] = { + 0.9510f , 1.1892f , 0.8969f , 0.3467f, + 0.1347f , 0.1074f , 0.0504f , -0.0790f, + -0.1305f , -0.3713f , -0.5611f , -0.5757f, + -0.4801f , -0.4108f , -0.4564f , -0.6112f +}; + +const int16_t ivas_sns_cdbks_side_tcx20_levels[SNS_MSVQ_NSTAGES_SIDE] = { 32, 32 }; +const int16_t ivas_sns_cdbks_side_tcx20_bits[SNS_MSVQ_NSTAGES_SIDE] = { 5, 5 }; +const int16_t ivas_sns_cdbks_side_tcx10_levels[SNS_MSVQ_NSTAGES_SIDE] = { 32, 8 }; +const int16_t ivas_sns_cdbks_side_tcx10_bits[SNS_MSVQ_NSTAGES_SIDE] = { 5, 3 }; + +const float ivas_sns_means_side_tcx20[M] = { + -0.0181f , 0.0044f , 0.0133f , 0.0096f, + 0.0073f , 0.0038f , 0.0058f , 0.0015f, + -0.0046f , -0.0096f , -0.0099f , -0.0173f, + -0.0075f , 0.0049f , 0.0023f , 0.0141f +}; + +const float ivas_sns_cdbks_side_tcx20_stage1[ 32 * 16 ] = { + -0.09561560f, -0.07036320f, 0.02878750f, 0.03511974f, 0.17132389f, -0.03138941f, -0.33178799f, -0.21216198f, -0.04445341f, 0.02221417f, 0.02283919f, 0.03233147f, 0.08941267f, 0.12190493f, 0.12476806f, 0.13706984f, + 0.00109929f, 0.08875231f, 0.22238215f, 0.21457590f, 0.10015343f, 0.04638508f, 0.03393346f, -0.00874452f, -0.04376851f, -0.07742100f, -0.07534945f, -0.10337673f, -0.10407952f, -0.11112585f, -0.09133646f, -0.09207950f, + -0.24818594f, 0.26921203f, 0.44107852f, 0.17248048f, 0.64417785f, 0.17680036f, 0.13990282f, -0.00956079f, 0.26766161f, -0.03617849f, -0.51006953f, -0.14559280f, 0.04585566f, -0.32296828f, -0.43440915f, -0.45020472f, + -0.02603883f, -0.10893371f, -0.10500311f, -0.11573136f, -0.10145701f, 0.08950274f, 0.26393655f, 0.16421642f, 0.06653788f, 0.02055681f, 0.03165200f, -0.00660730f, -0.02920382f, -0.04413712f, -0.04586630f, -0.05342379f, + 0.42792206f, 0.05873236f, -0.03519993f, -0.02404930f, -0.02129021f, -0.02228539f, -0.05794333f, -0.05329147f, -0.02713142f, -0.02536622f, -0.01781476f, -0.04129741f, -0.03786846f, -0.04699464f, -0.04049980f, -0.03562223f, + 0.02055988f, 0.02639971f, 0.00689886f, 0.00418128f, -0.01634280f, 0.00921734f, 0.00364626f, -0.03176210f, -0.04382792f, -0.01247039f, 0.02183370f, -0.00002241f, -0.00402301f, -0.00566646f, 0.00978385f, 0.01159419f, + 0.19157117f, 0.21950742f, 0.18377101f, -0.02875442f, -0.28243126f, -0.54171973f, -0.31264637f, -0.03676636f, 0.00528891f, -0.04001921f, 0.08505054f, 0.06946939f, 0.13428842f, 0.15810925f, 0.11903950f, 0.07624180f, + -0.30190937f, -0.29575446f, -0.26060885f, -0.18754051f, -0.14798754f, -0.10966049f, -0.13245975f, -0.11017279f, -0.08153340f, -0.06447313f, 0.04034392f, 0.17641778f, 0.25731939f, 0.31027339f, 0.40673221f, 0.50101364f, + -0.47842978f, -0.03818905f, 0.07056377f, 0.03300345f, 0.02730699f, 0.05007915f, 0.02893237f, 0.02226785f, 0.04222222f, 0.04128904f, 0.03830734f, 0.01743857f, 0.03607951f, 0.02582752f, 0.04198512f, 0.04131589f, + -0.02242885f, 0.01802990f, -0.00361209f, 0.02714255f, 0.04843318f, 0.04306928f, 0.02675985f, 0.07964815f, 0.10019006f, 0.05262710f, 0.00113825f, -0.04747375f, -0.04988074f, -0.05204562f, -0.09989329f, -0.12170389f, + 0.28967652f, 0.36512749f, 0.38343313f, 0.37459919f, 0.29419461f, 0.21272806f, 0.14963422f, 0.11987446f, -0.00354946f, -0.11817788f, -0.21991893f, -0.37389500f, -0.43897693f, -0.47312318f, -0.36222971f, -0.19939667f, + -0.29847367f, -0.28024953f, -0.23616334f, -0.19456539f, -0.16497910f, -0.12215408f, -0.05213406f, 0.03088777f, 0.11427925f, 0.17777695f, 0.21315635f, 0.18382103f, 0.20758797f, 0.19478448f, 0.14014366f, 0.08628162f, + -0.01005369f, -0.03186180f, -0.07995901f, -0.10893772f, -0.11257191f, -0.10933952f, -0.06260446f, 0.01592879f, 0.06618622f, 0.08792663f, 0.09779631f, 0.06871009f, 0.06158038f, 0.04699408f, 0.04045205f, 0.02975352f, + -0.12591171f, -0.31330699f, -0.09207505f, 0.04353844f, 0.05691547f, 0.02830292f, 0.05190188f, 0.05663181f, 0.05579546f, 0.05136184f, 0.06373287f, 0.03243363f, 0.03631576f, 0.02886726f, 0.02108611f, 0.00441022f, + 0.51424359f, 0.44825357f, 0.27826391f, 0.14692419f, 0.04486213f, 0.01374316f, -0.05577450f, -0.06790050f, -0.10394906f, -0.14111342f, -0.16141165f, -0.18795338f, -0.17689540f, -0.18030471f, -0.19451666f, -0.17647134f, + 0.01250082f, -0.03513855f, -0.10558904f, -0.13589106f, -0.16642959f, -0.12403555f, -0.11639493f, -0.13504470f, -0.12448111f, -0.08902796f, 0.02742439f, 0.14597597f, 0.22586358f, 0.24372767f, 0.18517594f, 0.19136417f, + 0.00690369f, -0.06536790f, -0.04560492f, 0.17183296f, 0.06108150f, -0.14297504f, -0.10743566f, 0.00028842f, -0.00000737f, 0.01948888f, 0.04144583f, 0.01034213f, 0.01186359f, 0.01904016f, 0.01513936f, 0.00396440f, + -0.02696488f, -0.05930555f, -0.05635944f, 0.04417762f, 0.20483421f, 0.24818872f, 0.08337011f, -0.03555721f, -0.04496794f, -0.05268211f, -0.05177582f, -0.06105043f, -0.04493356f, -0.04903822f, -0.04844764f, -0.04948792f, + 0.09934599f, 0.20097988f, 0.02959104f, 0.10059414f, 0.36489123f, 0.42345991f, 0.31306867f, 0.19189664f, 0.02025838f, -0.16920767f, -0.19221388f, -0.36590851f, -0.24124038f, -0.21069901f, -0.24782116f, -0.31699542f, + -0.38302159f, -0.20867958f, -0.06199247f, 0.00929974f, -0.08763027f, 0.01230753f, 0.12845035f, 0.27194101f, 0.35480151f, 0.36726532f, 0.20142240f, -0.03957218f, -0.10891503f, -0.16235951f, -0.15207841f, -0.14123875f, + 0.29448433f, 0.27467021f, 0.21093907f, 0.02636253f, -0.10971996f, -0.06520899f, -0.09114815f, -0.19988466f, -0.25173695f, -0.21777001f, -0.19036007f, -0.10825290f, 0.00468462f, 0.07695453f, 0.14592570f, 0.20006079f, + -0.09613522f, -0.07305197f, 0.23140183f, -0.01276782f, -0.05046178f, -0.03690868f, 0.01854782f, -0.00516658f, -0.01794740f, 0.01127293f, 0.02845775f, 0.00246563f, -0.00285605f, -0.00274282f, 0.00447526f, 0.00141708f, + 0.09853152f, 0.23398475f, 0.15560679f, 0.01939291f, -0.05095939f, -0.10951335f, -0.08366621f, -0.03852663f, -0.00171258f, -0.01619636f, -0.02703945f, -0.04625883f, -0.03573599f, -0.03656223f, -0.03486191f, -0.02648302f, + -0.05407938f, -0.18042914f, -0.31075117f, -0.36223570f, -0.35545274f, -0.26114190f, -0.21540173f, -0.18652814f, -0.10764184f, -0.04326102f, 0.10627938f, 0.32432791f, 0.40043785f, 0.56193174f, 0.40395999f, 0.27998606f, + -0.22375901f, -0.11453094f, -0.06437672f, 0.02966050f, -0.06882505f, -0.02229970f, 0.00519106f, 0.04139490f, -0.21099529f, -0.00965469f, 0.01906172f, 0.06535794f, 0.27085374f, 0.36298568f, 0.13009871f, -0.21016295f, + 0.18023915f, 0.15936182f, 0.13064987f, 0.09848966f, 0.08230524f, 0.11068418f, 0.11168088f, 0.11505046f, 0.13567778f, 0.12259236f, 0.03115883f, -0.14115321f, -0.20420262f, -0.27855554f, -0.34034745f, -0.31363132f, + -0.12817652f, 0.06412346f, 0.23407500f, 0.37946648f, 0.31127015f, 0.27044470f, 0.18591463f, 0.13643852f, 0.07403884f, -0.00928348f, -0.10609226f, -0.26765738f, -0.35056732f, -0.38530570f, -0.26185421f, -0.14683496f, + -0.63004591f, -0.58451443f, -0.16857245f, -0.08058005f, -0.09034904f, 0.00601978f, 0.10036174f, 0.10417477f, 0.14447621f, 0.13945086f, 0.18409447f, 0.20139949f, 0.10118410f, 0.12033491f, 0.20454736f, 0.24801829f, + 0.09650912f, 0.15979369f, -0.02778062f, -0.21860304f, -0.09723043f, 0.03923136f, 0.06141602f, 0.00600025f, -0.03251321f, -0.01956117f, -0.01004770f, -0.01435564f, 0.01114831f, 0.01113413f, 0.01304939f, 0.02180959f, + -0.00555466f, -0.14717213f, -0.37968771f, -0.12250216f, 0.03497204f, 0.13708345f, 0.03564652f, 0.00785509f, 0.04438533f, 0.06495152f, 0.07142555f, 0.05800545f, 0.06370878f, 0.05930816f, 0.05015268f, 0.02742217f, + 0.24931986f, 0.21084678f, 0.15421842f, 0.14679305f, 0.11899038f, 0.10112391f, 0.08120544f, 0.01848917f, -0.03021656f, -0.11872087f, -0.17582510f, -0.27756371f, -0.26300284f, -0.17730239f, -0.07164775f, 0.03329224f, + -0.17764482f, -0.15058551f, -0.12627503f, -0.06547272f, -0.05935809f, -0.01277874f, 0.01723090f, -0.00829920f, -0.02788840f, 0.01142219f, 0.05531784f, 0.04254613f, 0.04730144f, 0.07050022f, 0.15526930f, 0.22871460f +}; + +const float ivas_sns_cdbks_side_tcx20_stage2[ 32 * 16 ] = { + -0.01387178f, 0.00066194f, 0.01705500f, 0.00585076f, 0.05625865f, -0.08189174f, -0.29272907f, 0.00394582f, 0.14068978f, 0.03888049f, 0.01046905f, 0.03828706f, 0.04214951f, 0.02083198f, 0.00583650f, 0.00757601f, + -0.07101791f, -0.10250166f, 0.03818920f, 0.09162373f, 0.11895681f, 0.13465195f, 0.05088923f, -0.11144198f, -0.13846971f, -0.20720284f, -0.25737659f, -0.15071919f, 0.03249921f, 0.08124332f, 0.17587328f, 0.31480317f, + 0.07163217f, 0.02904662f, 0.01959293f, 0.00805967f, 0.02343380f, 0.02069451f, 0.03232257f, 0.02206815f, 0.03462995f, 0.01790113f, -0.03778174f, -0.14048245f, -0.21681559f, -0.11035045f, 0.05755451f, 0.16849432f, + -0.10816723f, -0.02739052f, -0.08241511f, -0.08220118f, -0.07911491f, 0.04976754f, 0.10255540f, 0.23875558f, 0.25687913f, 0.03165525f, -0.15819986f, -0.14652796f, -0.00803674f, -0.00055281f, -0.01439374f, 0.02738701f, + -0.02270156f, 0.02799492f, 0.14119353f, -0.06753253f, -0.07348415f, 0.16270911f, -0.00726861f, -0.06576199f, -0.02852827f, -0.01072544f, -0.02385080f, 0.01259492f, -0.00575096f, -0.00670975f, -0.01412345f, -0.01805497f, + -0.09730804f, -0.09207854f, -0.06155676f, -0.01193574f, 0.00669004f, 0.04165295f, 0.00840306f, -0.01763756f, -0.08511468f, -0.12564582f, -0.06302424f, 0.13694410f, 0.25188182f, 0.15335399f, 0.00198570f, -0.04661036f, + -0.20229607f, 0.27055253f, 0.05937269f, 0.00423687f, 0.02212468f, -0.00979552f, -0.02654450f, -0.02737173f, -0.03263414f, -0.01695365f, -0.02587673f, -0.00157241f, -0.00766337f, -0.00946241f, 0.00474761f, -0.00086382f, + 0.06446543f, -0.26714355f, 0.12269745f, 0.02565502f, -0.00628892f, 0.00430942f, 0.00862473f, -0.00170779f, 0.00617105f, -0.00718104f, -0.01871731f, 0.01193483f, 0.00860795f, 0.00997801f, 0.02026700f, 0.01832765f, + -0.00061741f, -0.03771131f, -0.03643531f, -0.01560727f, 0.00567664f, -0.00566226f, -0.00287572f, 0.03281006f, 0.04750282f, 0.01895354f, -0.01051254f, 0.01765380f, 0.01259038f, 0.00436097f, -0.01332776f, -0.01679868f, + 0.06930783f, 0.05302917f, 0.06102093f, 0.13367091f, 0.13415662f, 0.00542245f, -0.09926086f, -0.18333294f, -0.21849319f, -0.08349384f, 0.02026711f, 0.05881583f, 0.01345789f, 0.01158885f, 0.01962784f, 0.00421544f, + 0.00361302f, -0.05045316f, -0.00509374f, 0.19082766f, -0.18804365f, -0.05470887f, 0.00052718f, -0.02162397f, -0.00194290f, 0.00166374f, 0.00419055f, 0.02490528f, 0.02211515f, 0.02768455f, 0.02704636f, 0.01929285f, + 0.02476472f, -0.00405085f, -0.02659682f, -0.08596413f, -0.06315428f, -0.06855039f, -0.07500519f, -0.05011866f, -0.06108486f, -0.00618761f, 0.05634272f, 0.08835189f, 0.05894742f, 0.06729406f, 0.07762828f, 0.06738369f, + 0.13702164f, 0.08497052f, 0.07105828f, 0.04681336f, 0.02464482f, 0.00482884f, -0.01068152f, -0.00650854f, 0.01424842f, -0.00735400f, -0.04158832f, -0.02704081f, -0.04141575f, -0.06089035f, -0.09289456f, -0.09521199f, + -0.16780678f, 0.06667456f, 0.18201515f, 0.07399154f, -0.01999438f, 0.05535422f, 0.03900328f, -0.12016656f, -0.10793461f, 0.12328733f, 0.37944090f, 0.03265145f, -0.16138072f, -0.15224770f, -0.10548425f, -0.11740339f, + -0.01321210f, -0.01125461f, -0.03726540f, 0.00275729f, -0.04632781f, -0.24449670f, 0.09996640f, 0.11060024f, 0.00843480f, 0.01020953f, 0.01323100f, 0.03866782f, 0.01652133f, 0.01477176f, 0.01931947f, 0.01807687f, + 0.04427139f, 0.07762448f, -0.03500615f, -0.18353333f, 0.15726631f, 0.06121580f, -0.02944487f, -0.01882019f, -0.02386520f, 0.00077271f, -0.01038885f, 0.00869168f, -0.00564164f, -0.00937383f, -0.01500538f, -0.01876296f, + 0.13690793f, 0.01111401f, -0.03351651f, -0.01725554f, -0.07761571f, -0.12250939f, -0.07631311f, -0.01738486f, 0.14254332f, 0.21322328f, 0.14586930f, 0.03233900f, -0.08363281f, -0.12036013f, -0.07612890f, -0.05727984f, + 0.02949784f, -0.12225020f, -0.24763790f, 0.09504104f, 0.18885156f, 0.02619185f, 0.01292378f, 0.03000215f, 0.00909582f, -0.00936785f, -0.02571287f, 0.00889712f, -0.00234566f, -0.00169068f, 0.00871879f, -0.00021486f, + -0.03852054f, -0.03889437f, -0.08884280f, -0.06896184f, 0.02214326f, 0.10225505f, 0.12832898f, 0.08401269f, 0.06576567f, 0.08182152f, 0.07603111f, 0.04006712f, -0.04791395f, -0.09454805f, -0.10354215f, -0.11920167f, + 0.00938218f, 0.04681937f, 0.08173506f, 0.03766262f, 0.00645705f, -0.03830769f, -0.01180921f, 0.28211251f, 0.02788724f, -0.25197511f, -0.12812732f, 0.01575526f, 0.01158131f, -0.01435589f, -0.04416799f, -0.03064940f, + 0.06374854f, 0.12417689f, 0.09544838f, -0.13379816f, -0.26304159f, -0.06323982f, 0.03308697f, 0.06602140f, 0.04869582f, 0.02626429f, 0.00579212f, 0.01966626f, -0.00288156f, -0.00594553f, -0.00083407f, -0.01315989f, + -0.01689007f, -0.05224654f, -0.05732359f, 0.00797541f, -0.01178359f, -0.06878838f, -0.08592686f, -0.01631491f, -0.01215461f, 0.04690048f, 0.18175850f, 0.26923595f, 0.13470179f, -0.02451530f, -0.12744548f, -0.16718270f, + -0.02187075f, -0.05395855f, -0.02263713f, -0.00045869f, 0.07200871f, 0.08343703f, 0.05673476f, -0.01486174f, 0.02824052f, 0.09407959f, 0.06117651f, -0.48782246f, -0.01849447f, 0.15501071f, 0.05869060f, 0.01072538f, + 0.38479396f, -0.04937867f, -0.07935772f, -0.02506650f, -0.02316760f, -0.02067798f, 0.02695150f, -0.00054291f, -0.05256493f, -0.03399701f, -0.04629317f, -0.01085654f, -0.01817534f, -0.02213798f, -0.01605045f, -0.01347864f, + -0.23847427f, -0.06501920f, -0.01803515f, -0.00348509f, 0.04039109f, 0.01940591f, 0.01835329f, 0.03075053f, 0.03001602f, 0.02853897f, 0.01016726f, 0.03707260f, 0.02160199f, 0.03493100f, 0.03506401f, 0.01872098f, + 0.03862266f, 0.02890076f, 0.02592629f, 0.04317070f, 0.03495444f, -0.02192080f, -0.03469867f, -0.01962511f, -0.02362473f, -0.09521267f, -0.13881717f, -0.03271523f, 0.01372571f, 0.05875682f, 0.06459397f, 0.05796305f, + -0.01487374f, 0.01485744f, 0.01264233f, 0.04546350f, 0.00733058f, 0.08289797f, 0.17793293f, 0.03071348f, -0.11739129f, -0.07170388f, -0.04800450f, -0.00719781f, -0.01613242f, -0.02445791f, -0.03329781f, -0.03877884f, + 0.06919396f, -0.04913878f, -0.23414589f, -0.32278902f, -0.15262688f, -0.02830432f, 0.05881428f, 0.05602689f, 0.08630162f, 0.08206753f, 0.05235369f, 0.05459854f, 0.02224523f, 0.07894449f, 0.13055514f, 0.09590365f, + -0.13456165f, -0.02675728f, 0.10718846f, 0.16038985f, 0.13314470f, 0.04370885f, 0.00879630f, 0.02004215f, 0.04004457f, 0.01767300f, -0.03006764f, -0.02489721f, -0.06793547f, -0.08666415f, -0.07647774f, -0.08362676f, + -0.01963376f, -0.05985601f, -0.06123515f, 0.00802984f, 0.03197310f, 0.08198580f, -0.04518129f, -0.25550460f, -0.02763673f, 0.10534295f, 0.06276998f, 0.04687612f, 0.02909544f, 0.03184387f, 0.04253063f, 0.02859974f, + -0.05005194f, 0.08455623f, 0.27160784f, 0.05333258f, -0.06395559f, -0.12989814f, -0.07303311f, -0.05166257f, -0.03661287f, -0.00149673f, -0.00090933f, 0.02163393f, 0.00899793f, -0.00065646f, -0.01328460f, -0.01856715f, + 0.08465235f, 0.18910437f, -0.17964239f, -0.01596332f, -0.01786381f, -0.02173723f, 0.00655794f, -0.00747303f, -0.01909382f, -0.01073786f, -0.01461080f, 0.01419150f, 0.00349640f, -0.00567498f, -0.00358136f, -0.00162392f +}; + +const float *const ivas_sns_cdbks_side_tcx20[SNS_MSVQ_NSTAGES_SIDE] = { ivas_sns_cdbks_side_tcx20_stage1, ivas_sns_cdbks_side_tcx20_stage2 }; + +const float ivas_sns_means_side_tcx10[M] = { + -0.0085f , 0.0070f , 0.0074f , 0.0045f, + -0.0038f , 0.0071f , 0.0040f , -0.0068f, + -0.0104f , -0.0095f , -0.0259f , -0.0163f, + 0.0127f , 0.0087f , 0.0036f , 0.0262f +}; + +const float ivas_sns_cdbks_side_tcx10_stage1[ 32 * 16 ] = { + -0.23085418f, -0.21005449f, -0.18570241f, -0.13606880f, -0.11948469f, -0.10308038f, -0.11104958f, -0.15882089f, -0.13896854f, -0.06621316f, 0.05217852f, 0.11795393f, 0.15762859f, 0.26837024f, 0.37542593f, 0.48873907f, + 0.13745600f, 0.20131847f, 0.22182278f, 0.29526068f, 0.24656821f, 0.13757111f, 0.07460669f, 0.03134436f, -0.06561883f, -0.17480962f, -0.24070771f, -0.31627147f, -0.28865063f, -0.14849001f, -0.03399112f, -0.07740884f, + -0.13299250f, -0.14002491f, -0.11936499f, -0.04179630f, -0.03438902f, 0.04431344f, 0.06951552f, 0.01403797f, 0.05531963f, -0.01394528f, -0.09745552f, 0.00448586f, 0.26823524f, 0.23321159f, 0.06675539f, -0.17590634f, + 0.06191756f, 0.11582434f, 0.13192343f, 0.09527126f, 0.08193836f, 0.01139745f, 0.03044540f, 0.11065563f, 0.07578016f, -0.02083963f, -0.07297648f, -0.08340844f, -0.07282079f, -0.12840160f, -0.18605485f, -0.15065167f, + -0.03483375f, -0.04038755f, -0.07410056f, -0.06961358f, -0.04495163f, -0.12359739f, -0.20954724f, -0.19583867f, -0.14529606f, 0.00841374f, 0.12968518f, 0.22831580f, 0.23147392f, 0.13653895f, 0.09511995f, 0.10861877f, + 0.06658553f, 0.21860187f, 0.09436141f, -0.09071645f, -0.07082980f, 0.04518200f, 0.04859027f, -0.03547180f, -0.06006165f, -0.02756024f, 0.00158143f, -0.01511772f, -0.04477551f, -0.04937419f, -0.04159366f, -0.03940128f, + 0.02864506f, -0.04039106f, -0.15284948f, -0.42538299f, -0.19236357f, 0.03104685f, 0.02253710f, 0.02311004f, 0.04867318f, 0.06745871f, 0.09338212f, 0.09710035f, 0.07856015f, 0.09301454f, 0.11632315f, 0.11113598f, + 0.14528623f, 0.29868967f, 0.46429789f, 0.54323288f, 0.40204138f, 0.26355278f, 0.17207026f, 0.09889195f, -0.00279626f, -0.16206412f, -0.29083020f, -0.40501466f, -0.54537297f, -0.46768767f, -0.27766915f, -0.23662804f, + -0.38143153f, -0.38286102f, -0.37711911f, -0.29609917f, -0.25719669f, -0.20628984f, -0.15545466f, -0.08387721f, -0.03028209f, 0.14307072f, 0.32718172f, 0.40216059f, 0.39369890f, 0.30234268f, 0.29650354f, 0.30565312f, + 0.35958422f, 0.51604595f, 0.41116626f, 0.13914238f, -0.03378266f, -0.13855653f, -0.18788816f, -0.17389274f, -0.14739128f, -0.16521614f, -0.14451729f, -0.13567903f, -0.09514774f, -0.07488226f, -0.06811874f, -0.06086662f, + -0.66004345f, -0.31718869f, -0.22177390f, -0.12449418f, -0.09939825f, 0.07331022f, 0.21408044f, 0.21558931f, 0.11208625f, 0.04257974f, -0.01807639f, 0.09442548f, 0.06053141f, 0.06888331f, 0.20357028f, 0.35591847f, + -0.16304924f, -0.12420037f, -0.04222860f, 0.05588216f, 0.18467874f, 0.32957705f, 0.39156897f, 0.27848510f, 0.13897139f, -0.02741662f, -0.14580317f, -0.19651482f, -0.22072919f, -0.18213237f, -0.12846721f, -0.14862176f, + -0.17887269f, -0.40659902f, -0.02516902f, 0.09601495f, 0.06138763f, 0.02130781f, 0.05102018f, 0.04939750f, 0.05199909f, 0.05639114f, 0.06766195f, 0.07106289f, 0.04938017f, 0.02276475f, 0.00986626f, 0.00238653f, + 0.35668951f, 0.22742896f, -0.06232152f, -0.18667516f, -0.28394315f, -0.31893226f, -0.28501785f, -0.19154472f, -0.14625471f, -0.07293625f, 0.05620192f, 0.15269426f, 0.20840665f, 0.19892856f, 0.16095072f, 0.18632539f, + -0.04935166f, -0.11272268f, 0.08233717f, 0.29988006f, 0.19331526f, 0.14054174f, 0.08680898f, -0.01410902f, -0.04313985f, -0.03494681f, -0.04540697f, -0.07243925f, -0.09250963f, -0.09472804f, -0.10148439f, -0.14204503f, + 0.18485137f, 0.25341568f, 0.21009944f, 0.20568550f, 0.20518381f, 0.27019582f, 0.21216885f, 0.00546777f, -0.00044021f, -0.10735443f, -0.20735090f, -0.14224940f, -0.09351389f, -0.09761419f, -0.36078632f, -0.53775866f, + -0.37281135f, -0.49261999f, -0.36727842f, -0.16577288f, -0.02238290f, 0.00199674f, -0.01679564f, 0.04714198f, 0.10589472f, 0.16394573f, 0.18921056f, 0.20782063f, 0.19861654f, 0.19447370f, 0.17625681f, 0.15230414f, + 0.06686853f, 0.05611921f, 0.03365910f, 0.02756852f, 0.08295478f, 0.06008045f, -0.03273553f, -0.04364718f, -0.01449926f, -0.16865975f, -0.29690154f, -0.15022460f, -0.01812698f, 0.04654261f, 0.11587511f, 0.23512676f, + 0.05629958f, -0.04922929f, -0.24893641f, -0.04282766f, 0.05664299f, 0.06157661f, 0.05406340f, 0.01868661f, -0.00352496f, -0.00155314f, 0.04576544f, 0.04384907f, 0.01829060f, 0.01451148f, 0.01064548f, -0.03425997f, + 0.00489548f, -0.00560306f, 0.00615573f, -0.00441324f, 0.02514502f, 0.02634783f, 0.01098806f, 0.01133668f, 0.06739798f, 0.14368795f, 0.11283267f, 0.01118776f, -0.08555990f, -0.10393666f, -0.11315265f, -0.10730981f, + -0.15112519f, -0.11783557f, -0.13754019f, -0.07632290f, -0.06121828f, -0.06360113f, -0.05018035f, -0.00549590f, 0.05908192f, 0.04630727f, 0.02538631f, -0.00811102f, -0.02567731f, 0.08327373f, 0.21071206f, 0.27234661f, + 0.56834545f, 0.15133540f, -0.01992277f, -0.04770211f, -0.05432411f, -0.02191499f, -0.02550971f, -0.03144176f, -0.02317891f, -0.02811835f, -0.04327235f, -0.06018613f, -0.07647819f, -0.07349573f, -0.08821391f, -0.12592196f, + -0.03137272f, -0.03974785f, -0.03770784f, -0.05600026f, -0.03191645f, -0.04815164f, -0.04304812f, 0.02455638f, 0.06207261f, 0.02331568f, -0.01876696f, -0.04473163f, -0.02498340f, 0.06425271f, 0.11960865f, 0.08262092f, + 0.45973777f, 0.45999547f, 0.38173824f, 0.22785755f, 0.16821465f, 0.17382620f, 0.20517627f, 0.04061839f, -0.12685907f, -0.26643193f, -0.37356030f, -0.36765140f, -0.32336919f, -0.29335060f, -0.29318189f, -0.07275984f, + -0.07969188f, -0.23669686f, -0.42690692f, -0.49932686f, -0.40006183f, -0.28450852f, -0.22942850f, -0.12475617f, -0.03421007f, 0.12993786f, 0.27530393f, 0.32731838f, 0.50859567f, 0.47553443f, 0.32383390f, 0.27506335f, + 0.34046042f, 0.28909102f, 0.17226731f, 0.06244214f, 0.10377957f, 0.13146006f, 0.03081777f, -0.02599206f, -0.11020633f, -0.20031818f, -0.27040991f, -0.19266314f, -0.09502591f, -0.17705982f, -0.16383079f, 0.10518781f, + -0.43345226f, 0.01054419f, 0.06653837f, 0.02899912f, 0.04789640f, 0.03995846f, 0.02631173f, 0.04744618f, 0.05142942f, 0.03249742f, 0.03044055f, 0.03518159f, 0.01592359f, 0.00998224f, -0.00417209f, -0.00552518f, + -0.35779590f, -0.24084024f, -0.08920896f, -0.01964746f, -0.04518980f, 0.07193759f, 0.22722040f, 0.28999718f, 0.39417664f, 0.30171530f, 0.12526317f, 0.00759665f, -0.11081727f, -0.17325866f, -0.19301481f, -0.18813416f, + -0.16184582f, -0.19051919f, -0.19758934f, -0.16274525f, -0.19869541f, -0.22576659f, -0.13506612f, 0.01672518f, 0.13044875f, 0.26035967f, 0.27598891f, 0.22195891f, 0.13262193f, 0.13096192f, 0.10021772f, 0.00294471f, + 0.07825952f, 0.06525092f, 0.17527642f, 0.02096373f, -0.24373383f, -0.29324959f, -0.11558339f, -0.03040273f, 0.01406029f, 0.04150557f, 0.06984124f, 0.07372710f, 0.06551062f, 0.06332513f, 0.02509070f, -0.00984142f, + 0.08701726f, 0.12843394f, 0.16700094f, 0.15034452f, 0.12947411f, -0.01656238f, -0.15483649f, -0.18970569f, -0.18557831f, -0.09352705f, -0.01998975f, -0.00988876f, 0.00753489f, 0.01530672f, 0.00965047f, -0.02467425f, + 0.26197082f, 0.21849905f, 0.21673972f, 0.16654799f, 0.18547759f, 0.16177425f, 0.16111117f, 0.20927596f, 0.18073438f, 0.03535012f, -0.14032550f, -0.22486416f, -0.33259461f, -0.40957544f, -0.38613800f, -0.30398287f +}; + +const float ivas_sns_cdbks_side_tcx10_stage2[ 8 * 16 ] = { + -0.13993218f, -0.02453874f, 0.12672628f, 0.02785695f, 0.06681568f, 0.12811808f, 0.07492973f, -0.01977524f, -0.05822869f, -0.07547464f, -0.06553072f, -0.05473233f, -0.04357434f, -0.00634272f, 0.03406826f, 0.02961442f, + -0.06711216f, -0.11444162f, -0.09789788f, -0.09123304f, -0.12190348f, -0.00995424f, 0.10989921f, 0.11555575f, 0.06002452f, 0.03801973f, 0.02047622f, 0.01721280f, 0.02414692f, 0.02829613f, 0.03827912f, 0.05063187f, + 0.05523005f, 0.03052467f, 0.03910551f, 0.05802321f, 0.02158461f, 0.03249705f, 0.04015871f, -0.00878163f, -0.05597684f, -0.02391125f, 0.03722223f, 0.06349026f, 0.02718346f, -0.07380323f, -0.12743287f, -0.11511406f, + 0.11202279f, 0.20074913f, 0.04546646f, -0.10844616f, -0.14193153f, -0.08529745f, -0.03252409f, 0.03394947f, 0.04414551f, 0.00658101f, -0.01249852f, -0.01845361f, -0.01335408f, -0.01042434f, -0.00769413f, -0.01229041f, + -0.04167890f, -0.07371348f, -0.14826543f, 0.02126701f, 0.16009313f, 0.11910639f, 0.05602141f, 0.08082496f, 0.12544839f, 0.05415940f, -0.03080142f, -0.04070302f, -0.06024186f, -0.07129750f, -0.07769974f, -0.07251926f, + -0.07457123f, -0.04115197f, -0.04049765f, -0.06857318f, -0.04225051f, -0.03861733f, -0.05120942f, -0.08876715f, -0.05537668f, 0.03678654f, 0.09038235f, 0.06681871f, 0.08915640f, 0.13108744f, 0.08129597f, 0.00548771f, + -0.05294641f, 0.03370244f, 0.16024587f, 0.17199155f, 0.02454307f, -0.13278320f, -0.13945295f, -0.04199699f, 0.00678627f, 0.02029543f, 0.00856028f, 0.00137417f, -0.01135502f, -0.03017687f, -0.02257884f, 0.00379131f, + 0.20898804f, -0.01113044f, -0.08488316f, -0.01088633f, 0.03304903f, -0.01306932f, -0.05782260f, -0.07100917f, -0.06682249f, -0.05645623f, -0.04781041f, -0.03500698f, -0.01196148f, 0.03266111f, 0.08176223f, 0.11039842f +}; + +const float *const ivas_sns_cdbks_side_tcx10[SNS_MSVQ_NSTAGES_SIDE] = { ivas_sns_cdbks_side_tcx10_stage1, ivas_sns_cdbks_side_tcx10_stage2 }; + +#endif // SNS_MSVQ /* clang-format on */ diff --git a/lib_com/ivas_rom_com.h b/lib_com/ivas_rom_com.h index 0fea291b30d444282cd3ee13a73c27aa2b0e9bdc..174435448a0d076088d715940899bcc7118949c9 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[]; @@ -293,6 +289,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,6 +319,7 @@ extern const float McMASA_LFEGain_vectors[64]; extern const float ism_azimuth_borders[4]; extern const float ism_elevation_borders[4]; + /*----------------------------------------------------------------------------------* * Param ISM ROM tables *----------------------------------------------------------------------------------*/ @@ -363,6 +365,9 @@ extern const float ivas_cos_twiddle_80[IVAS_80_PT_LEN >> 1]; extern const float ivas_mdft_coeff_cos_twid_240[IVAS_240_PT_LEN + 1]; extern const float ivas_mdft_coeff_cos_twid_160[IVAS_160_PT_LEN + 1]; +#ifdef PARAMMC_SHORT_ENC_MDFT +extern const float ivas_mdft_coeff_cos_twid_120[IVAS_120_PT_LEN + 1]; +#endif extern const float ivas_mdft_coeff_cos_twid_80[IVAS_80_PT_LEN + 1]; extern const float ivas_mdft_coeff_cos_twid_40[IVAS_40_PT_LEN + 1]; extern const float ivas_mdft_coeff_cos_twid_960[IVAS_960_PT_LEN + 1]; @@ -399,5 +404,32 @@ extern const float ivas_fb_resp_cheby_ramp_16del[IVAS_FB_1MS_16K_SAMP + 1]; extern const int16_t ivas_num_active_bands[FB - WB + 1]; +#ifdef SNS_MSVQ +/*------------------------------------------------------------------------------------------* + * SNS MSVQ codebooks and means + *------------------------------------------------------------------------------------------*/ +extern const int16_t ivas_sns_cdbks_tcx20_levels[]; +extern const int16_t ivas_sns_cdbks_tcx20_bits[]; + +extern const int16_t ivas_sns_cdbks_tcx10_levels[]; +extern const int16_t ivas_sns_cdbks_tcx10_bits[]; + +extern const float *const ivas_sns_cdbks_tcx20[]; +extern const float *const ivas_sns_cdbks_tcx10[]; + +extern const float ivas_sns_means_tcx20[]; +extern const float ivas_sns_means_tcx10[]; + +extern const int16_t ivas_sns_cdbks_side_tcx20_levels[]; +extern const int16_t ivas_sns_cdbks_side_tcx20_bits[]; +extern const int16_t ivas_sns_cdbks_side_tcx10_levels[]; +extern const int16_t ivas_sns_cdbks_side_tcx10_bits[]; + +extern const float *const ivas_sns_cdbks_side_tcx20[]; +extern const float ivas_sns_means_side_tcx20[]; +extern const float *const ivas_sns_cdbks_side_tcx10[]; +extern const float ivas_sns_means_side_tcx10[]; +#endif + /* IVAS_ROM_COM_H */ #endif diff --git a/lib_com/ivas_sba_config.c b/lib_com/ivas_sba_config.c index 44131d5bd237793d65aa0c9124e3c777ac6c9625..d307e3e9acc765144cbeff170123ac5f2802ad64 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() diff --git a/lib_com/ivas_spar_com.c b/lib_com/ivas_spar_com.c index cb6ff23fc011ccfe3ca4364a1b38bb2a4143f6e0..481812d22d3ed082870c6a31a1481b3d2dfef2fc 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; @@ -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; @@ -1684,7 +1701,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; @@ -1743,6 +1760,10 @@ void ivas_get_spar_md_from_dirac( { ivas_dirac_dec_get_response( (int16_t) azi_dirac[band][i_ts], (int16_t) ele_dirac[band][i_ts], response_avg, order ); } + 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++ ) @@ -1905,7 +1926,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 ) { diff --git a/lib_com/ivas_stat_com.h b/lib_com/ivas_stat_com.h index 8231588551aa246aa6f71ccd6ccd6ec0c457fc1b..c1e35d822c6d1482513a756a4fce6e3c4c26d04b 100644 --- a/lib_com/ivas_stat_com.h +++ b/lib_com/ivas_stat_com.h @@ -41,9 +41,15 @@ /*----------------------------------------------------------------------------------* - * Declaration of ISm common (encoder & decoder) structure + * Declaration of ISM common (encoder & decoder) structure *----------------------------------------------------------------------------------*/ - +typedef struct +{ + int16_t last_angle1_idx; /* last frame index of coded azimuth/yaw */ + int16_t angle1_diff_cnt; /* FEC counter of consecutive differentially azimuth/yaw coded frames */ + int16_t last_angle2_idx; /* last frame index of coded elevation/pitch */ + int16_t angle2_diff_cnt; /* FEC counter of consecutive differentially elevation/pitch coded frames */ +} ISM_METADATA_ANGLE, *ISM_METADATA_ANGLE_HANDLE; /* ISM metadata handle (storage for one frame of read ISM metadata) */ typedef struct { @@ -52,12 +58,26 @@ typedef struct float azimuth; /* azimuth value read from the input metadata file */ float elevation; /* azimuth value read from the input metadata file */ - - int16_t last_azimuth_idx; /* last frame index of coded azimuth */ - int16_t azimuth_diff_cnt; /* FEC counter of consecutive differentially azimuth coded frames */ - int16_t last_elevation_idx; /* last frame index of coded elevation */ - int16_t elevation_diff_cnt; /* FEC counter of consecutive differentially elevation coded frames */ - + float radius; + float yaw; /* azimuth orientation value read from the input metadata file */ + float pitch; /* elevation orientation value read from the input metadata file */ + ISM_METADATA_ANGLE position_angle; /* Angle structs for azimuth and elevation */ + ISM_METADATA_ANGLE orientation_angle; /* Angle structs for yaw and pitch */ + int16_t last_radius_idx; /* last frame index of coded radius */ + int16_t radius_diff_cnt; /* FEC counter of consecutive differentially radius coded frames */ + + float last_azimuth; /* MD smoothing in DTX- last Q azimuth value */ + float last_elevation; /* MD smoothing in DTX - last Q elevation value */ + float last_true_azimuth; /* MD smoothing in DTX- last true Q azimuth value */ + float last_true_elevation; /* MD smoothing in DTX- last true Q elevation value */ + +#ifdef FIX_387_ISM_MD_FEC + int16_t ism_md_fec_cnt_enc; /* counter of continuous frames where MD are not transmitted */ + int16_t ism_md_inc_diff_cnt; /* counter of continuous frames where MD are transmitted in inactive segments when MD significantly changes */ +#endif +#ifdef FIX_435_ISM_MERGE_BUG + float last_true_radius; /* last true Q radius value */ +#endif } ISM_METADATA_FRAME, *ISM_METADATA_HANDLE; @@ -130,7 +150,6 @@ typedef struct ivas_param_ism_data_structure int16_t nbands; int16_t nblocks[MAX_PARAM_ISM_NBANDS]; int16_t band_grouping[MAX_PARAM_ISM_NBANDS + 1]; - int16_t num_obj; int16_t azi_index[MAX_NUM_OBJECTS]; int16_t ele_index[MAX_NUM_OBJECTS]; @@ -157,6 +176,9 @@ typedef struct ivas_dirac_config_data_struct { int16_t enc_param_start_band; int16_t dec_param_estim; +#ifdef FIX_391_SBA + int16_t dec_param_estim_old; +#endif int16_t nbands; } DIRAC_CONFIG_DATA, *DIRAC_CONFIG_DATA_HANDLE; @@ -403,6 +425,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; @@ -478,7 +503,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 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..0215bfcf56b5b682143cc448e5eaf76d81186556 100644 --- a/lib_com/ivas_td_decorr.c +++ b/lib_com/ivas_td_decorr.c @@ -87,12 +87,111 @@ static const float ivas_three_pow_frac[IVAS_MAX_DECORR_APD_SECTIONS] = { }; +#ifdef FIX_417_TD_DECORR_BRATE_SW +#define IVAS_TDET_DUCK_MULT_FAC_PARA_BIN ( 2.0f ) +#define IVAS_TDET_DUCK_MULT_FAC_PARA_BIN_LOW_BR ( 3.0f ) +#endif + /*------------------------------------------------------------------------------------------* * Local functions declaration *------------------------------------------------------------------------------------------*/ static int16_t ivas_get_APD_filt_orders( const int16_t num_out_chans, const int32_t output_Fs, int16_t *APD_filt_orders ); -static ivas_error ivas_td_decorr_init( ivas_td_decorr_state_t *hTdDecorr, const int16_t num_out_chans, const int16_t ducking_flag ); + +static void ivas_td_decorr_init( ivas_td_decorr_state_t *hTdDecorr, const int16_t num_out_chans, const int16_t ducking_flag ); + + +#ifdef FIX_417_TD_DECORR_BRATE_SW +/*------------------------------------------------------------------------- + * ivas_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; +} +#endif /*------------------------------------------------------------------------- @@ -275,7 +374,7 @@ static int16_t ivas_get_APD_filt_orders( * TD decorr Initialisation function *-----------------------------------------------------------------------------------------*/ -static ivas_error ivas_td_decorr_init( +static void ivas_td_decorr_init( ivas_td_decorr_state_t *hTdDecorr, const int16_t num_out_chans, const int16_t ducking_flag ) @@ -295,7 +394,7 @@ static ivas_error ivas_td_decorr_init( } } - return IVAS_ERR_OK; + return; } diff --git a/lib_com/ivas_transient_det.c b/lib_com/ivas_transient_det.c index e2f2dfb7660404862618811be812c79de2c3b4e2..1e8f53c7ca5a1d17b7d49501169deaf7634914a6 100644 --- a/lib_com/ivas_transient_det.c +++ b/lib_com/ivas_transient_det.c @@ -211,43 +211,17 @@ void ivas_transient_det_close( * * Transient detection process call *-----------------------------------------------------------------------------------------*/ -#ifdef SMOOTH_WITH_TRANS_DET void ivas_transient_det_process( ivas_trans_det_state_t *hTranDet, /* i/o: SPAR TD handle */ float *pIn_pcm, /* i : input audio channels */ const int16_t frame_len, /* i : frame length in samples */ int16_t transient_det[2] /* o: transient det outputs */ ) -#else -int16_t ivas_transient_det_process( - ivas_trans_det_state_t *hTranDet, /* i/o: SPAR TD handle */ - float *pIn_pcm, /* i : input audio channels */ - const int16_t frame_len /* i : frame length in samples */ -) -#endif { -#ifdef SMOOTH_WITH_TRANS_DET float in_duck_gain[L_FRAME48k]; int16_t num_sf, sf, sf_samp, idx; -#else - int16_t trans; -#endif float mem = hTranDet->in_duck_gain; -#ifndef SMOOTH_WITH_TRANS_DET - ivas_td_decorr_get_ducking_gains( hTranDet, pIn_pcm, NULL, NULL, frame_len, IVAS_TDET_ONLY ); - - if ( mem - hTranDet->in_duck_gain > IVAS_TDET_PARM_TRANS_THR ) - { - trans = 1; - } - else - { - trans = 0; - } - - return trans; -#else ivas_td_decorr_get_ducking_gains( hTranDet, pIn_pcm, in_duck_gain, NULL, frame_len, IVAS_TDET_ONLY ); transient_det[0] = 0; @@ -270,7 +244,6 @@ int16_t ivas_transient_det_process( } return; -#endif } @@ -344,9 +317,7 @@ void ivas_td_decorr_get_ducking_gains( for ( i = 0; i < frame_len; i++ ) { in_duck_gain = ivas_calc_duck_gain( in_duck_gain, in_duck_coeff, e_slow[i], e_fast[i], duck_mult_fac ); -#ifdef SMOOTH_WITH_TRANS_DET pIn_duck_gains[i] = in_duck_gain; -#endif } hTranDet->in_duck_gain = in_duck_gain; } 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 03a9f554619d390c521bbc6b493edf00faa0a6de..1429f24a756dd31c34da7a9968783049407ad73b 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -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*/ @@ -114,6 +114,7 @@ /*#define DEBUG_SBA*/ /* debug DIRAC/SPAR in-out */ #ifdef DEBUG_SBA +/*#define DEBUG_LBR_SBA*/ /* debug low bitrate SBA (SPAR+DirAC) */ /*#define DEBUG_SBA_AUDIO_DUMP*/ /* SBA intermediate audio wav file dumping */ /*#define DEBUG_SBA_MD_DUMP*/ /* SBA metadata and variable file dumping */ /*#define DEBUG_SPAR_MD_TARGET_TUNING*/ /* SPAR MD target bitrate tuning debug code */ @@ -134,44 +135,48 @@ #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 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 */ -#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 SBA_BR_SWITCHING_CLEAN_UP /*Issue 114: Clean up changes for the SBA reconfiguation functions*/ -#define LOW_RATE_TRANS_CORE_CODER /* Eri: Activate low-rate-encoding-of-transients contribution for core coder, affects MC, MASA and SBA */ -#define FIX_197_CREND_INTERFACE -#define FIX_329_ENABLE_TD_RENDERER_REVERB_MC /* Eri: Enable reverb for TD renderer for 5.1 and 7.1 with headtracking enabled for IVAS_dec */ -#define FIX_330_ENABLE_TD_RENDERER_REVERB_REND /* Eri: Enable reverb for TD renderer for ISM, 5.1 and 7.1 with headtracking enabled for IVAS_rend */ - -#define FIX_347_DTX_CRASH /* FhG: Fix crash that can happen with DTX */ -#define DISABLE_RES_CHANNELS_MCT /* decode only W and residual for Y when outputting to stereo */ -#define FIX_107_5MS_SUBFRAME_RENDERING -#define REMOVE_FORCE_SUBFRAME_BIN /* Issue 355: remove obsolete "-force_subframe_bin" command-line option. */ - -#define PARAM_ISM_DTX_CNG /* FhG: contribution 9 - DTX-CNG for ParamISM */ - -#define FIX_331_SBA_HBR_HOA_FIXES /* DLB: issue 331 - fix addressing low frequency stuttering with HOA inputs at high bitrates */ -#ifdef FIX_331_SBA_HBR_HOA_FIXES -#define COV_SMOOTH_TUNING -#define SBA_HPF_TUNING_ENC -/*#define SBA_HPF_TUNING_DEC*/ -#define SMOOTH_WITH_TRANS_DET -#endif +#define FIX_ISM_DTX_CNG_BWIDTH_ALT /* VA: issue 396 - alternative fix for bw changes on CNG frames in ISM DTX for objects that use the decoder-side noise estimation */ + +#define FIX_398_MASA_DIRECTION_ALIGNMENT /* Nokia: Issue 398: in 2dir MASA, dynamically adjust directions to be consistent */ +#define REND_DEBUGGING_REVISION /* VA: encapsulate rendering debugging options with DEBUGGING */ +#define FIX_419_ISM_MD_FIX /* VA: Issue 419: fix the upper value limitation for parameter angle1_diff_cnt */ +#define FIX_I414_OOA_CNA /* VA: Issue 414: Fixing out-of-array write operation in stereo CNA */ + + +#define SNS_MSVQ /* FhG: contribution 33 - MSVQ for SNS parameters at stereo mid bitrates */ + +#define FIX_379_GAININTP /* Eri: Adds a gain interpolation for directional/distance gain to handle abrupt changes in metadata (Non BE) */ +#define FIX_387_ISM_MD_FEC /* VA: Issue 387: fix MD discontinuity in ISM FEC */ + +#define FIX_418_SID_BITRATE /* Eri: Issue 418: Using the correct bitrate for unified stereo SID */ +#define PARAMMC_SHORT_ENC_MDFT /* FhG: Issue 410: complexity optimization for parametric Multichannel modes */ +#define FIX_421_TD_INT_TUNE /* Eri: Issue 421: Increase use of interpolation in TD renderer filter transition */ +#define FIX_419_ISM_BRATE_SW_DTX /* VA: issue 419: fix ISM Bitrate Switching with dtx */ +#define FIX_422 /* FhG: Issue 422: re-introduce fix for noisy speech buffer in ParamISM */ + + +#define ERI_MSVQ_CLEANUP /* Eri: Contribution #31 BE modularization of msvq encoder side DCT21&DCT24 within msvq_enc() */ + + +#define FIX_416_ISM_BR_SWITCHING /* FhG: add missing CLDFB reconfig to ISM BR switching */ +#define FIX_SP2A /* VA: Issue 412: Adjust threshold for the S_p2a feature in the tonal detector */ +#define FIX_413_SBA_DTX /* Dlb: Fix for issue 413, SBA DTX CNG in 2TC mode*/ +#define FIX_417_TD_DECORR_BRATE_SW /* VA: Issue 417: fix incorrect use of TD decorrelator in bitrate switching */ +#define FIX_368_SBA_MODE /* Dlb: Fix for issue 368 */ +#define FIX_427_MAXIMUM_S_INDEX /* VA: issue 427: fix return index of function maximum_s() */ +#define FIX_431_PARAMMC_PLC_INTERPOLATOR /* FhG: Issue 431: fix missing interpolator reset for ParamMC PCL */ +#define FIX_391_SBA /* Dlb: Fix for issue 391 for SBA */ + +#define FIX_425_MASA_BRSW_RENDERER /* Nokia: Issue 425: renderer not reconfigure in MASA bitrate switching */ -#define BINAURALIZATION_DELAY_REPORT /* VA: Issue 255 - Changes the way the decoder delay is reported */ -#define FIX_351_HRTF_COMMAND /* VA: Issue 354 - improve "-hrtf" command-line option */ -#define FIX_94_VERIFY_WAV_NUM_CHANNELS /* FhG: Issue 94 - Check if number of channels in input wav file matches encoder/renderer configuration */ -#define ISM_HIGHEST_BITRATE /* VA: Issue 284: Update highest bitrate limit in ISM format */ -#define TUNE_360_OBJECT_WITH_NOISE /* VA: issue 360: consider objects being speech+noise for active speech coding */ -#define FIX_350_MASA_DELAY_COMP /* Nokia: Issue 350: MASA audio/meta delay compensation */ -#define FIX_372_LIB_REND_VALIDATE_IO /* FhG: Issue 372: IVAS_rend segfaults with unsupported I/O configs - add validation checks of I/O config */ +#define EUALER2QUAT_FIX /*Dlb :fix for issue 430 issue in euler2quat, sign of quat y is inverted*/ +#define HR_METADATA /* Nok: encode directional MASA metadata with more bits at 384k and 512k */ -#define FIX_376_SBA_ROTATE /*DLB: Fix for issue 376*/ #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 */ /* ################## End DEVELOPMENT switches ######################### */ /* clang-format on */ diff --git a/lib_com/prot.h b/lib_com/prot.h index 16d069759febe82257afd5e0f3455ca18c7c071f..69bcaa6647e5993a78d229b349a279ab79e90b4d 100644 --- a/lib_com/prot.h +++ b/lib_com/prot.h @@ -681,10 +681,6 @@ int32_t get_delay( const int32_t io_fs, /* i : input/output sampling frequency */ const IVAS_FORMAT ivas_format, /* i : IVAS format */ HANDLE_CLDFB_FILTER_BANK hCldfb /* i : Handle of Cldfb analysis */ -#ifndef BINAURALIZATION_DELAY_REPORT - , - const int32_t binaural_latency_ns /* i : binauralization delay in ns */ -#endif ); void decision_matrix_enc( @@ -2228,18 +2224,15 @@ ivas_error init_encoder( const int16_t idchan, /* i : channel ID */ const int16_t var_SID_rate_flag, /* i : flag for variable SID update rate */ const int16_t interval_SID, /* i : interval for SID update */ - const int16_t vad_only_flag /* i : flag to indicate front-VAD structure */ -#ifdef PARAM_ISM_DTX_CNG - , - const ISM_MODE ism_mode /* i : ISM mode */ -#endif + const int16_t vad_only_flag, /* i : flag to indicate front-VAD structure */ + const ISM_MODE ism_mode /* i : ISM mode */ ); void LPDmem_enc_init( LPD_state_HANDLE hLPDmem /* i/o: LP memories */ ); -void destroy_encoder( +void destroy_cldfb_encoder( Encoder_State *st /* i/o: state structure */ ); ivas_error evs_enc( @@ -2330,7 +2323,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 */ ); @@ -3029,10 +3021,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( @@ -3830,8 +3820,11 @@ void bw_detect( const float signal_in[], /* i : input signal */ float *spectrum, /* i : MDCT spectrum */ const float *enerBuffer /* i : energy buffer */ + , + const int16_t mct_on /* i : flag MCT mode */ ); + void set_bw( const int16_t element_mode, /* i : element mode */ const int32_t element_brate, /* i : element bitrate */ @@ -4504,6 +4497,10 @@ ivas_error acelp_core_dec( const int16_t flag_sec_CNA, /* i : CNA flag for secondary channel */ const int16_t nchan_out, /* i : number of output channels */ STEREO_CNG_DEC_HANDLE hStereoCng /* i : stereo CNG handle */ +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + , + const int16_t read_sid_info /* i : read SID info flag */ +#endif ); void bass_psfilter_init( @@ -4584,10 +4581,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( @@ -5123,7 +5118,7 @@ ivas_error init_decoder( const MC_MODE mc_mode /* i : MC mode */ ); -void destroy_decoder( +void destroy_cldfb_decoder( Decoder_State *st /* o : Decoder static variables structure */ ); @@ -5862,6 +5857,7 @@ ivas_error core_switching_post_dec( float *synth, /* i/o: output synthesis */ float *output, /* i/o: LB synth/upsampled LB synth */ float output_mem[], /* i : OLA memory from last TCX/HQ frame */ + const IVAS_FORMAT ivas_format, /* i : IVAS format */ const int16_t use_cldfb_for_dft, /* i : flag to use of CLDFB for DFT Stereo */ const int16_t output_frame, /* i : frame length */ const int16_t core_switching_flag, /* i : ACELP->HQ switching frame flag */ @@ -7152,8 +7148,7 @@ void WindowSignal( int16_t *L_frame, /* i/o: frame length */ float out[], /* o : output windowed signal */ const int16_t truncate_aldo, /* i : nonzero to truncate long ALDO slope */ - const int16_t fullband, /* i : fullband flag */ - const int16_t isLfe /* i : LFE flag */ + const int16_t fullband /* i : fullband flag */ ); void HBAutocorrelation( @@ -7306,8 +7301,7 @@ void tcx_get_windows( const float **left_win, /* o : left overlap window */ int16_t *right_overlap, /* o : right overlap length */ const float **right_win, /* o : right overlap window */ - const int16_t fullband, /* i : fullband flag */ - const int16_t isLfe /* i : LFE flag */ + const int16_t fullband /* i : fullband flag */ ); void tcx_windowing_analysis( @@ -8059,24 +8053,101 @@ 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 */ + +#ifdef ERI_MSVQ_CLEANUP +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 */ ); +#endif void PulseResynchronization( const float *src_exc, /* i : Input excitation buffer */ @@ -8207,26 +8278,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( @@ -8521,13 +8587,10 @@ void generate_comfort_noise_dec( ); void generate_comfort_noise_dec_hf( - float **bufferReal, /* o : Real part of input bands */ - float **bufferImag, /* o : Imaginary part of input bands */ - HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */ -#ifdef PARAM_ISM_DTX_CNG - , - const int16_t cng_flag /*i : CNG Flag */ -#endif + float **bufferReal, /* o : Real part of input bands */ + float **bufferImag, /* o : Imaginary part of input bands */ + HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */ + const int16_t cng_flag /* i : CNG Flag */ ); void generate_masking_noise( @@ -8990,6 +9053,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 */ @@ -9497,11 +9561,11 @@ void TonalMDCTConceal_SaveTimeSignal( const int16_t numSamples ); void TonalMDCTConceal_Detect( - const TonalMDCTConcealPtr hTonalMDCTConc, /*IN */ - const float pitchLag, /*IN */ - int16_t *umIndices, /*OUT*/ - const PsychoacousticParameters *psychParamsCurrent, /*IN*/ - const int16_t isLfe ); + const TonalMDCTConcealPtr hTonalMDCTConc, /*IN */ + const float pitchLag, /*IN */ + int16_t *umIndices, /*OUT*/ + const PsychoacousticParameters *psychParamsCurrent /*IN*/ +); void TonalMDCTConceal_Apply( TonalMDCTConcealPtr hTonalMDCTConc, /*IN */ @@ -9633,10 +9697,9 @@ int16_t getTcxonly( ); int16_t getTnsAllowed( - const int32_t total_brate, /* i : total bitrate */ - const int16_t igf, /* i : flag indicating IGF activity*/ - const int16_t element_mode, /* i : IVAS element mode */ - const MCT_CHAN_MODE mct_chan_mode /* i : MCT channel mode */ + const int32_t total_brate, /* i : total bitrate */ + const int16_t igf, /* i : flag indicating IGF activity*/ + const int16_t element_mode /* i : IVAS element mode */ ); int16_t getCtxHm( @@ -9678,8 +9741,7 @@ int16_t getIgfPresent( const int16_t element_mode, /* i : IVAS element mode */ const int32_t total_brate, /* i : total bitrate */ const int16_t bwidth, /* i : audio bandwidth */ - const int16_t rf_mode, /* i : flag to signal the RF mode */ - const int16_t mct_chan_mode /* i : MCT channel mode */ + const int16_t rf_mode /* i : flag to signal the RF mode */ ); int16_t getCnaPresent( @@ -9976,6 +10038,5 @@ void init_tcx_cfg( const int16_t infoIGFStopFreq, const int16_t element_mode, const int16_t ini_frame, - const int16_t MCT_flag, /* i : hMCT handle allocated (1) or not (0) */ - const MCT_CHAN_MODE mct_chan_mode /* i : MCT channel mode */ + const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0) */ ); diff --git a/lib_com/rom_com.c b/lib_com/rom_com.c index b0c0c61978cd93adcbd9db91a0c0bf6768d711cb..9c2b49bca20ed1dfff728ec98f4396c89c2eb7e7 100644 --- a/lib_com/rom_com.c +++ b/lib_com/rom_com.c @@ -6036,137 +6036,296 @@ 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 - { - *left_overlap = hTcxCfg->tcx_mdct_window_length; - *left_win = hTcxCfg->tcx_aldo_window_1_trunc; - } + *left_overlap = hTcxCfg->tcx_mdct_window_length; + *left_win = hTcxCfg->tcx_aldo_window_1_trunc; } else { @@ -121,16 +106,8 @@ void tcx_get_windows( } else if ( right_mode == FULL_OVERLAP ) { - if ( isLfe ) - { - *right_overlap = hTcxCfg->tcx_mdct_window_length; - *right_win = hTcxCfg->tcx_mdct_window; - } - else - { - *right_overlap = hTcxCfg->tcx_mdct_window_delay; - *right_win = hTcxCfg->tcx_aldo_window_2; - } + *right_overlap = hTcxCfg->tcx_mdct_window_delay; + *right_win = hTcxCfg->tcx_aldo_window_2; } else { @@ -164,16 +141,8 @@ void tcx_get_windows( } else if ( left_mode == FULL_OVERLAP ) { - if ( isLfe ) - { - *left_overlap = hTcxCfg->tcx_mdct_window_lengthFB; - *left_win = hTcxCfg->tcx_mdct_windowFB; - } - else - { - *left_overlap = hTcxCfg->tcx_mdct_window_lengthFB; - *left_win = hTcxCfg->tcx_aldo_window_1_FB_trunc; - } + *left_overlap = hTcxCfg->tcx_mdct_window_lengthFB; + *left_win = hTcxCfg->tcx_aldo_window_1_FB_trunc; } else { @@ -199,16 +168,8 @@ void tcx_get_windows( } else if ( right_mode == FULL_OVERLAP ) { - if ( isLfe ) - { - *right_overlap = hTcxCfg->tcx_mdct_window_lengthFB; - *right_win = hTcxCfg->tcx_mdct_windowFB; - } - else - { - *right_overlap = hTcxCfg->tcx_mdct_window_delayFB; - *right_win = hTcxCfg->tcx_aldo_window_2_FB; - } + *right_overlap = hTcxCfg->tcx_mdct_window_delayFB; + *right_win = hTcxCfg->tcx_aldo_window_2_FB; } else { @@ -276,8 +237,7 @@ void WindowSignal( int16_t *L_frame, /* i/o: frame length */ float out[], /* o : output windowed signal */ const int16_t truncate_aldo, /* i : nonzero to truncate long ALDO slope */ - const int16_t fullband, /* i : fullband flag */ - const int16_t isLfe /* i : LFE flag */ + const int16_t fullband /* i : fullband flag */ ) { int16_t l, r; @@ -288,7 +248,7 @@ void WindowSignal( * Init * *-----------------------------------------------------------*/ - tcx_get_windows( hTcxCfg, left_overlap_mode, right_overlap_mode, &l, &left_win, &r, &right_win, fullband, isLfe ); + tcx_get_windows( hTcxCfg, left_overlap_mode, right_overlap_mode, &l, &left_win, &r, &right_win, fullband ); /* Init lengths */ @@ -314,7 +274,7 @@ void WindowSignal( tcx_windowing_analysis( in - l / 2 + offset, *L_frame, l, left_win, r, right_win, out ); - if ( left_overlap_mode == FULL_OVERLAP && truncate_aldo && !isLfe ) + if ( left_overlap_mode == FULL_OVERLAP && truncate_aldo ) { /* fade truncated ALDO window to avoid discontinuities */ if ( !fullband ) diff --git a/lib_com/tools.c b/lib_com/tools.c index db7c5a3f8e7a82c0653b81c6ba08031b6abf47a9..46803c8b1ed2f7539bcc20035350f884581734cb 100644 --- a/lib_com/tools.c +++ b/lib_com/tools.c @@ -553,6 +553,9 @@ int16_t maximum_s( { if ( vec[i] > tmp ) { +#ifdef FIX_427_MAXIMUM_S_INDEX + ind = i; +#endif tmp = vec[i]; } } diff --git a/lib_dec/acelp_core_dec.c b/lib_dec/acelp_core_dec.c index 571311ed124250ec488242fa3d6acb6e56a19652..f7b7465028a3f9a29da82a35dd02fa27be3c8500 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,10 @@ ivas_error acelp_core_dec( const int16_t flag_sec_CNA, /* i : CNA flag for secondary channel */ const int16_t nchan_out, /* i : number of output channels */ STEREO_CNG_DEC_HANDLE hStereoCng /* i : stereo CNG handle */ +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + , + const int16_t read_sid_info /* i : read SID info flag */ +#endif ) { float old_exc[L_EXC_DEC], *exc; /* excitation signal buffer */ @@ -512,10 +514,10 @@ ivas_error acelp_core_dec( } else { -#ifdef PARAM_ISM_DTX_CNG - if ( st->core_brate == SID_2k40 && st->element_mode != IVAS_CPE_MDCT && st->read_sid_info ) -#else +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT if ( st->core_brate == SID_2k40 && st->element_mode != IVAS_CPE_MDCT ) +#else + if ( st->core_brate == SID_2k40 && st->element_mode != IVAS_CPE_MDCT && st->read_sid_info ) #endif { FdCng_decodeSID( st ); @@ -532,9 +534,13 @@ ivas_error acelp_core_dec( } ApplyFdCng( syn, NULL, realBuffer, imagBuffer, st, 0, ( st->coder_type == AUDIO && !st->GSC_noisy_speech ) ); } -#ifdef PARAM_ISM_DTX_CNG + +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + if ( !read_sid_info ) +#else if ( !st->read_sid_info ) - // if (!st->read_sid_info && st->cng_paramISM_flag) /* read_sid_info can only be 0 in ParamISM mode */ + // if (!st->read_sid_info && st->cng_ism_flag) /* read_sid_info can only be 0 in ParamISM mode */ +#endif { float noise_lvl_highest; @@ -544,7 +550,6 @@ ivas_error acelp_core_dec( st->hFdCngDec->hFdCngCom->cngNoiseLevel[b] = noise_lvl_highest; } } -#endif generate_comfort_noise_dec( NULL, NULL, st, nchan_out ); @@ -620,11 +625,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 ); } } @@ -656,25 +661,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 */ @@ -1131,11 +1136,7 @@ ivas_error acelp_core_dec( st->lp_noise = st->hFdCngDec->lp_noise; } -#ifdef PARAM_ISM_DTX_CNG - if ( st->element_mode != IVAS_CPE_TD && !st->cng_paramISM_flag ) -#else - if ( st->element_mode != IVAS_CPE_TD ) -#endif + if ( st->element_mode != IVAS_CPE_TD && !st->cng_ism_flag ) { /*Noise estimate*/ ApplyFdCng( syn, NULL, realBuffer, imagBuffer, st, 0, ( st->coder_type == AUDIO && !st->GSC_noisy_speech ) ); @@ -1311,11 +1312,7 @@ ivas_error acelp_core_dec( /*WB/SWB-FD_CNG*/ if ( ( st->core_brate == FRAME_NO_DATA || st->core_brate == SID_2k40 ) && ( st->cng_type == FD_CNG ) && ( st->hFdCngDec->hFdCngCom->numCoreBands < st->cldfbSyn->no_channels ) ) { -#ifdef PARAM_ISM_DTX_CNG - generate_comfort_noise_dec_hf( realBuffer, imagBuffer, st->hFdCngDec->hFdCngCom, st->cng_paramISM_flag ); -#else - generate_comfort_noise_dec_hf( realBuffer, imagBuffer, st->hFdCngDec->hFdCngCom ); -#endif + generate_comfort_noise_dec_hf( realBuffer, imagBuffer, st->hFdCngDec->hFdCngCom, st->cng_ism_flag ); if ( st->hFdCngDec->hFdCngCom->regularStopBand < st->cldfbSyn->no_channels ) { 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 1e238fb52f1603f5638fa7ece5dce5031f73a830..aa8f576cec3f5b277eaf4a1c8b980e6c96f0d167 100644 --- a/lib_dec/core_dec_init.c +++ b/lib_dec/core_dec_init.c @@ -190,7 +190,7 @@ void open_decoder_LPD( { if ( !is_init || st->element_mode != IVAS_CPE_MDCT ) { - init_tcx_cfg( st->hTcxCfg, total_brate, st->sr_core, st->output_Fs, st->L_frame, st->bwidth, st->hTcxDec->L_frameTCX, st->fscale, encoderLookahead, encoderLookaheadFB, st->preemph_fac, st->tcxonly, st->rf_flag, st->igf, st->hIGFDec->infoIGFStopFreq, st->element_mode, st->ini_frame, MCT_flag, st->mct_chan_mode ); + init_tcx_cfg( st->hTcxCfg, total_brate, st->sr_core, st->output_Fs, st->L_frame, st->bwidth, st->hTcxDec->L_frameTCX, st->fscale, encoderLookahead, encoderLookaheadFB, st->preemph_fac, st->tcxonly, st->rf_flag, st->igf, st->hIGFDec->infoIGFStopFreq, st->element_mode, st->ini_frame, MCT_flag ); } else { @@ -670,10 +670,11 @@ void open_decoder_LPD( st->last_tns_active = 0; st->second_last_tns_active = 0; st->second_last_core = -1; - /* TODO: also apply for MCT modes, once issue #24 is solved */ - if ( st->hTcxCfg != NULL && !MCT_flag && st->element_mode != EVS_MONO ) + + if ( st->hTcxCfg != NULL && + st->element_mode != EVS_MONO ) { - st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( is_init ? total_brate : st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode, st->mct_chan_mode ); + 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 a092255a38897557b1260d1cd9860907a810aa15..ef0a12696f448598703f5635ee0b0510f49cec17 100644 --- a/lib_dec/core_dec_switch.c +++ b/lib_dec/core_dec_switch.c @@ -91,7 +91,7 @@ void mode_switch_decoder_LPD( switchWB = 1; /*force init when coming from MODE1*/ } - st->igf = getIgfPresent( st->element_mode, total_brate, bwidth, st->rf_flag, st->mct_chan_mode ); + st->igf = getIgfPresent( st->element_mode, total_brate, bwidth, st->rf_flag ); if ( st->hIGFDec != NULL ) { @@ -140,7 +140,7 @@ void mode_switch_decoder_LPD( if ( st->hTcxCfg != NULL ) { st->hTcxCfg->pCurrentTnsConfig = NULL; - st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( total_brate, st->igf, st->element_mode, st->mct_chan_mode ); + st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( total_brate, st->igf, st->element_mode ); } if ( st->hTcxCfg->fIsTNSAllowed && st->hIGFDec != NULL && st->hTcxCfg != NULL ) diff --git a/lib_dec/core_switching_dec.c b/lib_dec/core_switching_dec.c index c2a3955afba78484d27ac1a564e75a6a9f4d6113..9ae8550e40faf6e4db9ed51c99c883ae38eac6f4 100644 --- a/lib_dec/core_switching_dec.c +++ b/lib_dec/core_switching_dec.c @@ -51,7 +51,7 @@ *---------------------------------------------------------------------*/ static void core_switch_lb_upsamp( Decoder_State *st, float *output ); -static void smoothTransitionMdctStereoDtx( float synth[], const int16_t output_frame, const int16_t delay_comp ); +static void smoothTransitionDtxToTcx( float synth[], const int16_t output_frame, const int16_t delay_comp ); /*---------------------------------------------------------------------* * core_switching_pre_dec() @@ -556,6 +556,7 @@ ivas_error core_switching_post_dec( float *synth, /* i/o: output synthesis */ float *output, /* i/o: LB synth/upsampled LB synth */ float output_mem[], /* i : OLA memory from last TCX/HQ frame */ + const IVAS_FORMAT ivas_format, /* i : IVAS format */ const int16_t use_cldfb_for_dft, /* i : flag to use of CLDFB for DFT Stereo */ const int16_t output_frame, /* i : frame length */ const int16_t core_switching_flag, /* i : ACELP->HQ switching flag */ @@ -677,10 +678,10 @@ ivas_error core_switching_post_dec( synth[i + delay_comp] = ( synth[i + delay_comp] * i + ( tmpDelta - i ) * st->previoussynth[i + delay_comp] ) / tmpDelta; } - if ( st->element_mode == IVAS_CPE_MDCT && st->last_core_brate <= SID_2k40 && st->core_brate > SID_2k40 ) + if ( ( st->element_mode == IVAS_CPE_MDCT || ( ivas_format == ISM_FORMAT && st->core == TCX_20_CORE /* <- means TCX in general, TCX10 is forbidden after ACELP */ ) ) && st->last_core_brate <= SID_2k40 && st->core_brate > SID_2k40 ) { /* smooth transitions to avoid pops in car noise items */ - smoothTransitionMdctStereoDtx( synth, output_frame, delay_comp ); + smoothTransitionDtxToTcx( synth, output_frame, delay_comp ); } /* Reset memories of CLDFBs */ @@ -1245,16 +1246,16 @@ static void core_switch_lb_upsamp( } /*---------------------------------------------------------------------* - * smoothTransitionMdctStereoDtx() + * smoothTransitionDtxToTcx() * - * apply smoothing to the transition part for MDCT-Stereo DTX + * apply smoothing to the transition part for inactive to active transitions in DTX *---------------------------------------------------------------------*/ #define TRANSITION_SMOOTHING_LEN_16k 15 #define TRANSITION_SMOOTHING_LEN_32k 31 #define TRANSITION_SMOOTHING_LEN_48k 47 -static void smoothTransitionMdctStereoDtx( +static void smoothTransitionDtxToTcx( float synth[], /* i/o: synthesis */ const int16_t output_frame, /* i : output frame length */ const int16_t delay_comp /* i : delay compensation in samples */ diff --git a/lib_dec/dec_tcx.c b/lib_dec/dec_tcx.c index 9c8172589405790afab9bd795820260975bbb10b..9896d1d8c024016b4b074c4b25a73a8e5dbe503f 100644 --- a/lib_dec/dec_tcx.c +++ b/lib_dec/dec_tcx.c @@ -107,7 +107,8 @@ void decoder_tcx( decoder_tcx_tns( st, L_frame_glob, L_spec, L_frame, L_frameTCX, &x[0], fUseTns, &tnsData, bfi, frame_cnt, 0 ); decoder_tcx_imdct( st, L_frame_glob, L_frameTCX_glob, L_spec, tcx_offset, tcx_offsetFB, L_frame, L_frameTCX, left_rect, &x[0], &xn_buf[0], MDCT_IV, - fUseTns, &synth[0], &synthFB[0], bfi, frame_cnt, 0, sba_dirac_stereo_flag ); + fUseTns, &synth[0], &synthFB[0], bfi, frame_cnt, + sba_dirac_stereo_flag ); return; } @@ -335,7 +336,8 @@ 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 || st->mct_chan_mode == MCT_CHAN_MODE_LFE ) && ( st->tcxonly ) ) + if ( ( L_frameTCX == hTcxDec->L_frameTCX >> 1 ) && + ( st->tcxonly ) ) { /* Mode decision in PLC @@ -354,7 +356,6 @@ void IMDCT( if ( ( !bfi && hTcxCfg->tcx_last_overlap_mode != FULL_OVERLAP ) || ( bfi && ( hTcxCfg->tcx_last_overlap_mode != FULL_OVERLAP ) && ( hTcxCfg->tcx_curr_overlap_mode != FULL_OVERLAP ) ) ) { - assert( st->mct_chan_mode != MCT_CHAN_MODE_LFE ); /* minimum or half overlap, two transforms, grouping into one window */ L_win = L_frame >> 1; L_ola = ( hTcxCfg->tcx_last_overlap_mode == MIN_OVERLAP ) ? tcx_mdct_window_min_length : tcx_mdct_window_half_length; @@ -392,7 +393,7 @@ void IMDCT( /* To assure that no garbage values are passed to overlap */ set_zero( xn_buf + L_frame + tcx_offset + ( L_ola >> 1 ), overlap - tcx_offset - ( L_ola >> 1 ) ); } - else if ( !bfi && ( frame_cnt == 0 ) && ( hTcxCfg->tcx_curr_overlap_mode == FULL_OVERLAP ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + else if ( !bfi && ( frame_cnt == 0 ) && ( hTcxCfg->tcx_curr_overlap_mode == FULL_OVERLAP ) ) { /* special overlap attempt, two transforms, grouping into one window */ @@ -553,7 +554,9 @@ void IMDCT( /* Window and overlap-add past frame if past frame is TCX */ if ( ( frame_cnt != 0 ) || ( st->last_core_bfi > ACELP_CORE ) ) { - if ( ( ( L_frameTCX == hTcxDec->L_frameTCX >> 1 || st->mct_chan_mode == MCT_CHAN_MODE_LFE ) && ( st->tcxonly ) ) || ( hTcxCfg->tcx_last_overlap_mode == TRANSITION_OVERLAP ) ) + if ( ( ( L_frameTCX == hTcxDec->L_frameTCX >> 1 ) && + ( st->tcxonly ) ) || + ( hTcxCfg->tcx_last_overlap_mode == TRANSITION_OVERLAP ) ) { if ( !bfi && ( frame_cnt > 0 ) && ( index == 0 ) && ( hTcxCfg->tcx_curr_overlap_mode == FULL_OVERLAP ) && ( st->last_core != ACELP_CORE ) ) { @@ -616,7 +619,7 @@ void IMDCT( } } - if ( !aldo && ( ( ( L_frameTCX == hTcxDec->L_frameTCX >> 1 ) && frame_cnt > 0 ) || L_frameTCX != ( hTcxDec->L_frameTCX >> 1 ) ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( !aldo && ( ( ( L_frameTCX == hTcxDec->L_frameTCX >> 1 ) && frame_cnt > 0 ) || L_frameTCX != ( hTcxDec->L_frameTCX >> 1 ) ) ) { /* Compute windowed synthesis in case of switching to ALDO windows in next frame */ mvr2r( xn_buf + L_frame - nz, old_out, nz + overlap ); @@ -1559,7 +1562,6 @@ void decoder_tcx_imdct( float synthFB[], const int16_t bfi, /* i : Bad frame indicator */ const int16_t frame_cnt, /* i : frame counter in the super frame */ - const int16_t isLFE, /* i : is LFE */ const int16_t sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */ ) { @@ -1591,7 +1593,8 @@ void decoder_tcx_imdct( hTcxCfg->tcx_last_overlap_mode = hTcxCfg->tcx_curr_overlap_mode; } - if ( !isLFE && st->igf ) + if ( + st->igf ) { proc = st->hIGFDec->flatteningTrigger; @@ -1689,7 +1692,10 @@ void decoder_tcx_imdct( if ( st->element_mode != IVAS_CPE_DFT && !sba_dirac_stereo_flag ) { - IMDCT( xn_bufFB, hTcxDec->syn_Overl, hTcxDec->syn_Overl_TDAC, xn_buf, st->mct_chan_mode == MCT_CHAN_MODE_LFE ? hTcxCfg->tcx_mdct_window : hTcxCfg->tcx_aldo_window_1_trunc, st->mct_chan_mode == MCT_CHAN_MODE_LFE ? hTcxCfg->tcx_mdct_window : hTcxCfg->tcx_aldo_window_2, hTcxCfg->tcx_mdct_window_half, hTcxCfg->tcx_mdct_window_minimum, hTcxCfg->tcx_mdct_window_trans, hTcxCfg->tcx_mdct_window_half_length, hTcxCfg->tcx_mdct_window_min_length, index, + IMDCT( xn_bufFB, hTcxDec->syn_Overl, hTcxDec->syn_Overl_TDAC, xn_buf, + hTcxCfg->tcx_aldo_window_1_trunc, + hTcxCfg->tcx_aldo_window_2, + hTcxCfg->tcx_mdct_window_half, hTcxCfg->tcx_mdct_window_minimum, hTcxCfg->tcx_mdct_window_trans, hTcxCfg->tcx_mdct_window_half_length, hTcxCfg->tcx_mdct_window_min_length, index, kernelType, left_rect, tcx_offset, overlap, L_frame, L_frameTCX, max( L_frameTCX, L_spec ) >> 1, L_frame_glob, frame_cnt, bfi, st->hHQ_core->old_outLB, 0, st, 0, acelp_zir ); } @@ -1709,7 +1715,9 @@ void decoder_tcx_imdct( if ( st->element_mode != EVS_MONO ) { - IMDCT( x_tmp, hTcxDec->syn_OverlFB, hTcxDec->syn_Overl_TDACFB, xn_bufFB, st->mct_chan_mode == MCT_CHAN_MODE_LFE ? hTcxCfg->tcx_mdct_windowFB : hTcxCfg->tcx_aldo_window_1_FB_trunc, st->mct_chan_mode == MCT_CHAN_MODE_LFE ? hTcxCfg->tcx_mdct_windowFB : hTcxCfg->tcx_aldo_window_2_FB, hTcxCfg->tcx_mdct_window_halfFB, hTcxCfg->tcx_mdct_window_minimumFB, hTcxCfg->tcx_mdct_window_transFB, hTcxCfg->tcx_mdct_window_half_lengthFB, hTcxCfg->tcx_mdct_window_min_lengthFB, index, + IMDCT( x_tmp, hTcxDec->syn_OverlFB, hTcxDec->syn_Overl_TDACFB, xn_bufFB, + hTcxCfg->tcx_aldo_window_1_FB_trunc, hTcxCfg->tcx_aldo_window_2_FB, + hTcxCfg->tcx_mdct_window_halfFB, hTcxCfg->tcx_mdct_window_minimumFB, hTcxCfg->tcx_mdct_window_transFB, hTcxCfg->tcx_mdct_window_half_lengthFB, hTcxCfg->tcx_mdct_window_min_lengthFB, index, kernelType, left_rect, tcx_offsetFB, overlapFB, L_frameTCX, L_frameTCX, max( L_frameTCX, L_spec ) >> 1, L_frameTCX_glob, frame_cnt, bfi, st->hHQ_core->old_out, 1, st, FSCALE_DENOM * L_frameTCX_glob / L_frame_glob, acelp_zir ); } else diff --git a/lib_dec/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_util.c b/lib_dec/er_util.c index 809b0134d9653d91a028804f78eee5468a801782..5326f28e904ef627af30b8f7a4aa926f4a857320 100644 --- a/lib_dec/er_util.c +++ b/lib_dec/er_util.c @@ -318,8 +318,7 @@ int16_t GetPLCModeDecision( { TonalMDCTConceal_Detect( st->hTonalMDCTConc, ( hTcxDec->tcxltp_last_gain_unmodified > 0 ) ? st->old_fpitch : 0, &numIndices, - ( st->element_mode == IVAS_CPE_MDCT ? &( st->hTcxCfg->psychParamsTCX20 ) : st->hTcxCfg->psychParamsCurrent ), - st->mct_chan_mode == MCT_CHAN_MODE_LFE ); + ( st->element_mode == IVAS_CPE_MDCT ? &( st->hTcxCfg->psychParamsTCX20 ) : st->hTcxCfg->psychParamsCurrent ) ); if ( ( numIndices > 10 ) || ( ( numIndices > 5 ) && ( fabs( hTcxDec->tcxltp_third_last_pitch - hTcxDec->tcxltp_second_last_pitch ) < 0.5f ) ) || ( ( numIndices > 0 ) && ( ( st->last_good <= UNVOICED_TRANSITION ) || ( hTcxDec->tcxltp_last_gain_unmodified <= 0.4f ) ) && ( fabs( hTcxDec->tcxltp_third_last_pitch - hTcxDec->tcxltp_second_last_pitch ) < 0.5f ) ) ) { diff --git a/lib_dec/evs_dec.c b/lib_dec/evs_dec.c index 23914302375ae1e39dd2cf8bccdc03c1a485d997..8ea2d71159fd155c3219b3e6ed165ed887d736cb 100644 --- a/lib_dec/evs_dec.c +++ b/lib_dec/evs_dec.c @@ -261,7 +261,11 @@ ivas_error evs_dec( if ( st->core == ACELP_CORE ) { /* ACELP core decoder */ +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + if ( ( error = acelp_core_dec( st, NULL, synth, NULL, bwe_exc_extended, voice_factors, old_syn_12k8_16k, sharpFlag, pitch_buf, &unbits, &sid_bw, NULL, NULL, NULL, 0, EVS_MONO, 0, 0, 1, NULL, 1 ) ) != IVAS_ERR_OK ) +#else if ( ( error = acelp_core_dec( st, NULL, synth, NULL, bwe_exc_extended, voice_factors, old_syn_12k8_16k, sharpFlag, pitch_buf, &unbits, &sid_bw, NULL, NULL, NULL, 0, EVS_MONO, 0, 0, 1, NULL ) ) != IVAS_ERR_OK ) +#endif { return error; } @@ -276,7 +280,7 @@ ivas_error evs_dec( * Postprocessing for ACELP/MDCT core switching *---------------------------------------------------------------------*/ - if ( ( error = core_switching_post_dec( st, synth, NULL, NULL, 0, output_frame, core_switching_flag, 0, -1, EVS_MONO ) ) != IVAS_ERR_OK ) + if ( ( error = core_switching_post_dec( st, synth, NULL, NULL, 0, MONO_FORMAT, output_frame, core_switching_flag, 0, -1, EVS_MONO ) ) != IVAS_ERR_OK ) { return error; } diff --git a/lib_dec/fd_cng_dec.c b/lib_dec/fd_cng_dec.c index 515188369cafb393093b0e59c546038841cfe018..38495a681acd2ffbcc3d2893fc42c45aab9b3a46 100644 --- a/lib_dec/fd_cng_dec.c +++ b/lib_dec/fd_cng_dec.c @@ -158,8 +158,13 @@ void initFdCngDec( hFdCngDec->cna_ILD_LT = 0.0f; hFdCngDec->first_cna_noise_updated = 0; hFdCngDec->first_cna_noise_update_cnt = 0; +#ifdef FIX_I414_OOA_CNA + hFdCngDec->cna_nbands = CNA_INIT_NBANDS; + mvs2s( cna_init_bands, hFdCngDec->cna_band_limits, CNA_INIT_NBANDS + 1 ); +#else hFdCngDec->cna_nbands = 6; mvs2s( cna_init_bands, hFdCngDec->cna_band_limits, MAX_CNA_NBANDS + 1 ); +#endif hFdCngDec->cna_act_fact = 1.0f; hFdCngDec->cna_rescale_fact = 0.0f; hFdCngDec->cna_seed = 5687; @@ -425,7 +430,7 @@ void ApplyFdCng( ( *timeDomainInput( -FLT_MAX ) && *( timeDomainInput + hFdCngCom->frameSize - 1 ) < FLT_MAX && *( timeDomainInput + hFdCngCom->frameSize - 1 ) > ( -FLT_MAX ) ) ) && - ( ( ( ( st->element_mode != IVAS_CPE_TD && st->element_mode != IVAS_CPE_DFT && hFdCngDec->flag_dtx_mode ) || !st->VAD ) && + ( ( ( ( st->element_mode != IVAS_CPE_TD && st->element_mode != IVAS_CPE_DFT && hFdCngDec->flag_dtx_mode ) || !st->VAD || ( st->ini_frame < 100 && st->is_ism_format ) ) && !( st->cng_type == LP_CNG && hFdCngDec->flag_dtx_mode ) && ( is_music == 0 ) ) || ( st->element_mode == IVAS_CPE_TD ) ) && ( !st->BER_detect ) ) @@ -966,10 +971,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; @@ -987,7 +995,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; @@ -1091,11 +1109,7 @@ void generate_comfort_noise_dec( c2 = (float) sqrt( 1 - hFdCngCom->coherence ); seed2 = &( hFdCngCom->seed2 ); -#ifdef PARAM_ISM_DTX_CNG - if ( ( st->element_mode == IVAS_CPE_MDCT && st->idchan == 1 ) || ( st->element_mode == IVAS_SCE && st->cng_paramISM_flag ) ) -#else - if ( st->element_mode == IVAS_CPE_MDCT && st->idchan == 1 ) -#endif + if ( ( st->element_mode == IVAS_CPE_MDCT && st->idchan == 1 ) || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) ) { seed2 = &( hFdCngCom->seed3 ); } @@ -1105,11 +1119,7 @@ void generate_comfort_noise_dec( if ( hFdCngCom->startBand == 0 ) { -#ifdef PARAM_ISM_DTX_CNG - if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_paramISM_flag ) ) -#else - if ( st->element_mode == IVAS_CPE_MDCT ) -#endif + if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) ) { rand_gauss( &tmp1, seed ); rand_gauss( &tmp2, seed2 ); @@ -1134,11 +1144,7 @@ void generate_comfort_noise_dec( for ( ; ptr_level < cngNoiseLevel + hFdCngCom->stopFFTbin - hFdCngCom->startBand; ptr_level++ ) { /* Real part in FFT bins */ -#ifdef PARAM_ISM_DTX_CNG - if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_paramISM_flag ) ) -#else - if ( st->element_mode == IVAS_CPE_MDCT ) -#endif + if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) ) { rand_gauss( &tmp1, seed ); rand_gauss( &tmp2, seed2 ); @@ -1152,11 +1158,7 @@ void generate_comfort_noise_dec( ptr_r += 2; /* Imaginary part in FFT bins */ -#ifdef PARAM_ISM_DTX_CNG - if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_paramISM_flag ) ) -#else - if ( st->element_mode == IVAS_CPE_MDCT ) -#endif + if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) ) { rand_gauss( &tmp1, seed ); rand_gauss( &tmp2, seed2 ); @@ -1234,11 +1236,7 @@ void generate_comfort_noise_dec( for ( i = 0; i < hFdCngCom->numSlots; i++ ) { /* Real part in CLDFB band */ -#ifdef PARAM_ISM_DTX_CNG - if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_paramISM_flag ) ) -#else - if ( st->element_mode == IVAS_CPE_MDCT ) -#endif + if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) ) { rand_gauss( &tmp1, seed ); rand_gauss( &tmp2, seed2 ); @@ -1251,11 +1249,7 @@ void generate_comfort_noise_dec( bufferReal[i][j] *= (float) sqrt( ( scaleCldfb * *ptr_level ) * 0.5f ); /* Imaginary part in CLDFB band */ -#ifdef PARAM_ISM_DTX_CNG - if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_paramISM_flag ) ) -#else - if ( st->element_mode == IVAS_CPE_MDCT ) -#endif + if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) ) { rand_gauss( &tmp1, seed ); rand_gauss( &tmp2, seed2 ); @@ -1352,13 +1346,10 @@ void generate_comfort_noise_dec( *-------------------------------------------------------------------*/ void generate_comfort_noise_dec_hf( - float **bufferReal, /* o : Real part of input bands */ - float **bufferImag, /* o : Imaginary part of input bands */ - HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */ -#ifdef PARAM_ISM_DTX_CNG - , - const int16_t cng_coh_flag /* i : CNG Flag for coherence handling */ -#endif + float **bufferReal, /* o : Real part of input bands */ + float **bufferImag, /* o : Imaginary part of input bands */ + HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */ + const int16_t cng_coh_flag /* i : CNG Flag for coherence handling */ ) { int16_t i, j; @@ -1367,7 +1358,6 @@ void generate_comfort_noise_dec_hf( int16_t *seed = &( hFdCngCom->seed ); float scale = CLDFB_SCALING / hFdCngCom->scalingFactor; -#ifdef PARAM_ISM_DTX_CNG int16_t *seed2 = &( hFdCngCom->seed ); float tmp1, tmp2, c1 = 0.f, c2 = 0.f; @@ -1375,10 +1365,9 @@ void generate_comfort_noise_dec_hf( { seed2 = &( hFdCngCom->seed3 ); - c1 = (float) sqrt( hFdCngCom->coherence ); + c1 = (float) sqrt( hFdCngCom->coherence ); // VE!!!!! all occurences of "(float) sqrt()" should be replaced by "sqrtf()" c2 = (float) sqrt( 1 - hFdCngCom->coherence ); } -#endif ptr_level = hFdCngCom->cngNoiseLevel + hFdCngCom->stopFFTbin - hFdCngCom->startBand; /* @@ -1391,7 +1380,6 @@ void generate_comfort_noise_dec_hf( { for ( i = 0; i < hFdCngCom->numSlots; i++ ) { -#ifdef PARAM_ISM_DTX_CNG if ( cng_coh_flag ) { /* Real part in CLDFB band */ @@ -1415,14 +1403,6 @@ void generate_comfort_noise_dec_hf( rand_gauss( &bufferImag[i][j], seed ); bufferImag[i][j] *= (float) sqrt( ( scale * *ptr_level ) * 0.5f ); } -#else - /* Real part in CLDFB band */ - rand_gauss( &bufferReal[i][j], seed ); - bufferReal[i][j] *= (float) sqrt( ( scale * *ptr_level ) * 0.5f ); - /* Imaginary part in CLDFB band */ - rand_gauss( &bufferImag[i][j], seed ); - bufferImag[i][j] *= (float) sqrt( ( scale * *ptr_level ) * 0.5f ); -#endif } ptr_level++; } @@ -2030,6 +2010,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 ) @@ -2073,7 +2059,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 ); @@ -2117,7 +2103,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( @@ -2132,6 +2118,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++ ) { @@ -2154,7 +2146,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 402fdc78f5449592d418d2baf9ffdacb270d793d..20bc7a0b845325f2517e94c9af43d36e0cf7a5c9 100644 --- a/lib_dec/init_dec.c +++ b/lib_dec/init_dec.c @@ -326,7 +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 ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT || st->element_mode == IVAS_SCE || st->element_mode == EVS_MONO ) ) { if ( ( st->hHQ_core = (HQ_DEC_HANDLE) malloc( sizeof( HQ_DEC_DATA ) ) ) == NULL ) { @@ -519,16 +519,9 @@ ivas_error init_decoder( } /* open synthesis for output sampling rate */ - if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( ( error = openCldfb( &st->cldfbSyn, CLDFB_SYNTHESIS, st->output_Fs, CLDFB_PROTOTYPE_1_25MS ) ) != IVAS_ERR_OK ) { - if ( ( error = openCldfb( &st->cldfbSyn, CLDFB_SYNTHESIS, st->output_Fs, CLDFB_PROTOTYPE_1_25MS ) ) != IVAS_ERR_OK ) - { - return error; - } - } - else - { - st->cldfbSyn = NULL; + return error; } st->cldfbSynHB = NULL; @@ -585,7 +578,7 @@ ivas_error init_decoder( *-----------------------------------------------------------------*/ /* TCX-LTP */ - if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) ) { if ( ( st->hTcxLtpDec = (TCX_LTP_DEC_HANDLE) malloc( sizeof( TCX_LTP_DEC_DATA ) ) ) == NULL ) { @@ -598,7 +591,7 @@ ivas_error init_decoder( } /* TCX core */ - // VE: reduction possible for MCT_CHAN_MODE_LFE channel - see I1-172 + if ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) { if ( ( st->hTcxDec = (TCX_DEC_HANDLE) malloc( sizeof( TCX_DEC_DATA ) ) ) == NULL ) @@ -617,7 +610,7 @@ ivas_error init_decoder( } /* TCX config. data structure */ - if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) ) { if ( ( st->hTcxCfg = (TCX_CONFIG_HANDLE) malloc( sizeof( TCX_config ) ) ) == NULL ) { @@ -630,7 +623,7 @@ ivas_error init_decoder( } /* Tonal MDCT concealment data structure */ - if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) ) { if ( ( st->hTonalMDCTConc = (TonalMDCTConcealPtr) malloc( sizeof( TonalMDCTConceal_INSTANCE ) ) ) == NULL ) { @@ -646,7 +639,7 @@ ivas_error init_decoder( * IGF *-----------------------------------------------------------------*/ - if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) ) { if ( ( st->hIGFDec = (IGF_DEC_INSTANCE_HANDLE) malloc( sizeof( IGFDEC_INSTANCE ) ) ) == NULL ) { @@ -738,10 +731,11 @@ ivas_error init_decoder( st->tdm_LRTD_flag = 0; st->cna_dirac_flag = 0; st->cng_sba_flag = 0; -#ifdef PARAM_ISM_DTX_CNG - st->cng_paramISM_flag = 0; + st->cng_ism_flag = 0; +#ifndef FIX_ISM_DTX_CNG_BWIDTH_ALT st->read_sid_info = 1; /* by default read the sid info from bitstream */ #endif + st->is_ism_format = 0; return error; @@ -772,12 +766,12 @@ void reset_preecho_dec( /*----------------------------------------------------------------------* - * destroy_decoder() + * destroy_cldfb_decoder() * * Free memory which was allocated in init_decoder() *----------------------------------------------------------------------*/ -void destroy_decoder( +void destroy_cldfb_decoder( Decoder_State *st /* o : Decoder static variables structure */ ) { diff --git a/lib_dec/ivas_agc_dec.c b/lib_dec/ivas_agc_dec.c index 1397ce1111f4aadbcc1f3898e427cf742530bf95..72ae68a57b34d61132eee2944adf4b6f27e52a4f 100644 --- a/lib_dec/ivas_agc_dec.c +++ b/lib_dec/ivas_agc_dec.c @@ -142,22 +142,24 @@ void ivas_spar_agc_dec_close( { ivas_agc_dec_state_t *hAgc; + if ( hAgcDec == NULL || *hAgcDec == NULL ) + { + return; + } + hAgc = *hAgcDec; - if ( hAgc != NULL ) - { - free( hAgc->agc_com.winFunc ); - hAgc->agc_com.winFunc = NULL; + free( hAgc->agc_com.winFunc ); + hAgc->agc_com.winFunc = NULL; - free( hAgc->gain_state ); - hAgc->gain_state = NULL; + free( hAgc->gain_state ); + hAgc->gain_state = NULL; - free( hAgc->gain_data ); - hAgc->gain_data = NULL; + free( hAgc->gain_data ); + hAgc->gain_data = NULL; - free( hAgc ); - *hAgcDec = NULL; - } + free( *hAgcDec ); + *hAgcDec = NULL; return; } diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c index 9fcb85ac0c43033df7f1152c8d0eb171fcdfee96..63372cd5ba498174fdd9b69d1e841bbb3afbeaa2 100644 --- a/lib_dec/ivas_binRenderer_internal.c +++ b/lib_dec/ivas_binRenderer_internal.c @@ -426,6 +426,15 @@ static ivas_error ivas_binaural_hrtf_open( * *-------------------------------------------------------------------------*/ +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS +static void ivas_binaural_obtain_DMX( + const int16_t numTimeSlots, + 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] ) +#else static void ivas_binaural_obtain_DMX( const int16_t numTimeSlots, BINAURAL_RENDERER_HANDLE hBinRenderer, /* i/o: fastconv binaural renderer handle */ @@ -433,6 +442,7 @@ static void ivas_binaural_obtain_DMX( 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] ) +#endif { int16_t chIdx, bandIdx, k; @@ -866,8 +876,6 @@ void ivas_binaural_add_LFE( if ( render_lfe ) { -#ifdef FIX_197_CREND_INTERFACE -#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD ) { gain = GAIN_LFE; @@ -876,12 +884,6 @@ void ivas_binaural_add_LFE( { gain = ( ( st_ivas->hCrendWrapper != NULL ) && ( st_ivas->hCrendWrapper->hHrtfCrend != NULL ) ) ? st_ivas->hCrendWrapper->hHrtfCrend->gain_lfe : GAIN_LFE; } -#else - gain = ( ( st_ivas->hCrendWrapper != NULL ) && ( st_ivas->hCrendWrapper->hHrtfCrend != NULL ) ) ? st_ivas->hCrendWrapper->hHrtfCrend->gain_lfe : GAIN_LFE; -#endif -#else - gain = st_ivas->hHrtf != NULL ? st_ivas->hHrtf->gain_lfe : GAIN_LFE; -#endif for ( idx_lfe = 0; idx_lfe < st_ivas->hIntSetup.num_lfe; idx_lfe++ ) { v_multc( output_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], gain, output_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], output_frame ); @@ -1012,7 +1014,6 @@ void ivas_binRenderer( if ( hHeadTrackData->shd_rot_max_order == -1 ) { QuatToRotMat( hHeadTrackData->Quaternions[hHeadTrackData->num_quaternions++], hHeadTrackData->Rmat ); - rotateFrame_shd_cldfb( RealBuffer, ImagBuffer, hHeadTrackData->Rmat, hBinRenderer->hInputSetup->nchan_out_woLFE, 3 ); } else if ( hHeadTrackData->shd_rot_max_order > 0 ) @@ -1038,11 +1039,17 @@ void ivas_binRenderer( /* Obtain the binaural dmx and compute the reverb */ if ( hBinRenderer->hReverb != NULL ) { +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS + 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]; +#else 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]; - +#endif ivas_binaural_obtain_DMX( numTimeSlots, hBinRenderer, RealBuffer, ImagBuffer, inRe, inIm ); for ( chIdx = 0; chIdx < BINAURAL_CHANNELS; chIdx++ ) @@ -1054,7 +1061,11 @@ void ivas_binRenderer( } } +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS + ivas_binaural_reverb_processSubframe( hBinRenderer->hReverb, BINAURAL_CHANNELS, inRe, inIm, reverbRe, reverbIm ); +#else ivas_binaural_reverb_processFrame( hBinRenderer->hReverb, BINAURAL_CHANNELS, inRe, inIm, reverbRe, reverbIm, 0u ); +#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 old mode 100755 new mode 100644 index 49429e0381c4645717e06756add56caf71b1893d..516e027f90db764e863ccec371bbb212e532b0c2 --- a/lib_dec/ivas_core_dec.c +++ b/lib_dec/ivas_core_dec.c @@ -90,6 +90,9 @@ ivas_error ivas_core_dec( int16_t use_cldfb_for_dft; float *p_output_mem; int16_t flag_sec_CNA; +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + int16_t read_sid_info; +#endif int16_t last_element_mode; int16_t nchan_out; float *save_hb_synth; @@ -105,6 +108,9 @@ ivas_error ivas_core_dec( use_cldfb_for_dft = 0; tdm_LRTD_flag = -1; +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + read_sid_info = 1; /* read SID by default */ +#endif if ( hSCE != NULL ) { @@ -116,6 +122,15 @@ ivas_error ivas_core_dec( hStereoTD = NULL; p_output_mem = NULL; nchan_out = 1; +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + if ( st_ivas != NULL && st_ivas->ivas_format == ISM_FORMAT ) + { + if ( st_ivas->hISMDTX.sce_id_dtx != hSCE->sce_id ) + { + read_sid_info = 0; + } + } +#endif } else { @@ -240,11 +255,7 @@ ivas_error ivas_core_dec( hCPE->hStereoCng->flag_cna_fade = 0; } -#ifdef FIX_347_DTX_CRASH if ( sba_dirac_stereo_flag && hSCE && sts[0]->total_brate <= SID_2k40 && sts[0]->cng_type == FD_CNG ) -#else - if ( sba_dirac_stereo_flag && sts[0]->total_brate <= SID_2k40 && sts[0]->cng_type == FD_CNG ) -#endif { save_hb_synth = hSCE->save_hb_synth; } @@ -336,7 +347,11 @@ ivas_error ivas_core_dec( if ( st->core == ACELP_CORE ) { /* ACELP core decoder */ +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + if ( ( error = acelp_core_dec( st, output[n], synth[n], save_hb_synth, bwe_exc_extended[n], voice_factors[n], old_syn_12k8_16k[n], sharpFlag[n], pitch_buf[n], &unbits[n], &sid_bw[n], hStereoTD, tdm_lspQ_PCh, tdm_lsfQ_PCh, use_cldfb_for_dft, last_element_mode, last_element_brate, flag_sec_CNA, nchan_out, hCPE == NULL ? NULL : hCPE->hStereoCng, read_sid_info ) ) != IVAS_ERR_OK ) +#else if ( ( error = acelp_core_dec( st, output[n], synth[n], save_hb_synth, bwe_exc_extended[n], voice_factors[n], old_syn_12k8_16k[n], sharpFlag[n], pitch_buf[n], &unbits[n], &sid_bw[n], hStereoTD, tdm_lspQ_PCh, tdm_lsfQ_PCh, use_cldfb_for_dft, last_element_mode, last_element_brate, flag_sec_CNA, nchan_out, hCPE == NULL ? NULL : hCPE->hStereoCng ) ) != IVAS_ERR_OK ) +#endif { return error; } @@ -345,11 +360,7 @@ ivas_error ivas_core_dec( if ( ( st->core == TCX_20_CORE || st->core == TCX_10_CORE ) && st->element_mode != IVAS_CPE_MDCT ) { /* TCX decoder */ -#ifdef PARAM_ISM_DTX_CNG - 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, st_ivas == NULL ? 0 : st_ivas->ism_mode ); -#else - 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 ); -#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 ) @@ -454,18 +465,14 @@ ivas_error ivas_core_dec( mvr2r( synth[n], hSCE->save_synth, output_frame ); } - if ( ( error = core_switching_post_dec( st, synth[n], output[n], p_output_mem, use_cldfb_for_dft, output_frame, 0 /*core_switching_flag*/, sba_dirac_stereo_flag, nchan_out, ( hCPE != NULL ) ? hCPE->last_element_mode : IVAS_SCE ) ) != IVAS_ERR_OK ) + if ( ( error = core_switching_post_dec( st, synth[n], output[n], p_output_mem, ( st_ivas != NULL ) ? st_ivas->ivas_format : UNDEFINED_FORMAT, use_cldfb_for_dft, output_frame, 0 /*core_switching_flag*/, sba_dirac_stereo_flag, nchan_out, ( hCPE != NULL ) ? hCPE->last_element_mode : IVAS_SCE ) ) != IVAS_ERR_OK ) { return error; } /* for FD-CNG we need the delay compensation in the synth, so do this afterwards */ -#ifdef FIX_347_DTX_CRASH if ( sba_dirac_stereo_flag && hSCE && st->core_brate == SID_2k40 && st->cng_type == FD_CNG ) -#else - if ( sba_dirac_stereo_flag && st->core_brate == SID_2k40 && st->cng_type == FD_CNG ) -#endif { mvr2r( synth[n], hSCE->save_synth, output_frame ); } diff --git a/lib_dec/ivas_corecoder_dec_reconfig.c b/lib_dec/ivas_corecoder_dec_reconfig.c index 492339d6d6d7b83e6316e4c5b6e00d7ccb633b3b..9d15f1bdfc34b2e98ccff7f0b8595648f67f654a 100644 --- a/lib_dec/ivas_corecoder_dec_reconfig.c +++ b/lib_dec/ivas_corecoder_dec_reconfig.c @@ -87,8 +87,8 @@ ivas_error ivas_corecoder_dec_reconfig( *-----------------------------------------------------------------*/ /* remove dummy CPE element for DFT stereo-like upmix */ - if ( ( st_ivas->ivas_format == SBA_FORMAT && sba_dirac_stereo_flag_old && !st_ivas->sba_dirac_stereo_flag ) || - ( st_ivas->ivas_format == MC_FORMAT && last_mc_mode == MC_MODE_MCMASA && sba_dirac_stereo_flag_old && !st_ivas->sba_dirac_stereo_flag ) ) + if ( ( st_ivas->ivas_format == SBA_FORMAT && sba_dirac_stereo_flag_old && nchan_transport_old == 1 && ( !st_ivas->sba_dirac_stereo_flag || st_ivas->nchan_transport > 1 ) ) || + ( st_ivas->ivas_format == MC_FORMAT && last_mc_mode == MC_MODE_MCMASA && sba_dirac_stereo_flag_old && nchan_transport_old == 1 && ( !st_ivas->sba_dirac_stereo_flag || st_ivas->nchan_transport > 1 ) ) ) { st_ivas->hCPE[0]->hCoreCoder[0] = NULL; st_ivas->hCPE[0]->hCoreCoder[1] = NULL; @@ -146,6 +146,21 @@ ivas_error ivas_corecoder_dec_reconfig( for ( cpe_id = st_ivas->nCPE; cpe_id < nCPE_old; cpe_id++ ) { + /* don't deallocate first CPE in case of mono/stereo output of 1 TC SBA, only deallocate core coder */ + if ( cpe_id == 0 && st_ivas->sba_dirac_stereo_flag && sba_dirac_stereo_flag_old ) + { + for ( n = 0; n < CPE_CHANNELS; n++ ) + { + if ( st_ivas->hCPE[cpe_id]->hCoreCoder[n] != NULL ) + { + destroy_core_dec( st_ivas->hCPE[cpe_id]->hCoreCoder[n] ); + + free( st_ivas->hCPE[cpe_id]->hCoreCoder[n] ); + st_ivas->hCPE[cpe_id]->hCoreCoder[n] = NULL; + } + } + continue; + } destroy_cpe_dec( st_ivas->hCPE[cpe_id] ); st_ivas->hCPE[cpe_id] = NULL; } @@ -185,6 +200,11 @@ ivas_error ivas_corecoder_dec_reconfig( return error; } } + if ( st_ivas->sba_dirac_stereo_flag && sba_dirac_stereo_flag_old && st_ivas->nchan_transport == 1 && nSCE_old == 0 ) + { + st_ivas->hCPE[0]->hCoreCoder[0] = st_ivas->hSCE[0]->hCoreCoder[0]; /* don't allocate unnecessary core coder, simply point to core coder of SCE element */ + st_ivas->hCPE[0]->hCoreCoder[1] = NULL; + } for ( cpe_id = 0; cpe_id < nCPE_existing; cpe_id++ ) { @@ -264,9 +284,21 @@ 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 ) ) { - if ( ( error = create_cpe_dec( st_ivas, 0, ivas_total_brate / ( st_ivas->nSCE + st_ivas->nCPE ) ) ) != IVAS_ERR_OK ) + /* if at least one CPE is already available, only allocate DFT Stereo struct */ + if ( st_ivas->nCPE > 0 ) { - return error; + if ( ( error = stereo_dft_dec_create( &( st_ivas->hCPE[0]->hStereoDft ), st_ivas->hCPE[0]->element_brate, st_ivas->hDecoderConfig->output_Fs, st_ivas->sba_dirac_stereo_flag, st_ivas->nchan_transport ) ) != IVAS_ERR_OK ) + { + return error; + } + } + /* otherwise create extra dummy CPE */ + else + { + if ( ( error = create_cpe_dec( st_ivas, 0, ivas_total_brate / ( st_ivas->nSCE + st_ivas->nCPE ) ) ) != IVAS_ERR_OK ) + { + return error; + } } set_f( st_ivas->hCPE[0]->hStereoDft->buff_LBTCX_mem, 0, NS2SA( 16000, STEREO_DFT32MS_OVL_NS ) ); @@ -297,37 +329,9 @@ ivas_error ivas_corecoder_dec_reconfig( * Set CNA/CNG flags *-----------------------------------------------------------------*/ - /// VE: this could be merged with part of ivas_init_decoder() - if ( st_ivas->ivas_format == SBA_FORMAT ) + if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT ) { - if ( st_ivas->sba_mode == SBA_MODE_SPAR && st_ivas->nchan_transport == 1 ) - { - /* skip as done in init function */ - } - else if ( st_ivas->nchan_transport == 1 && ( ( st_ivas->renderer_type == RENDERER_DIRAC && st_ivas->hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) || ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) ) ) - { - st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag = 1; - st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag = 1; - } - else if ( st_ivas->nchan_transport == 2 ) - { - for ( n = 0; n < CPE_CHANNELS; n++ ) - { - st_ivas->hCPE[0]->hCoreCoder[n]->cna_dirac_flag = 0; - st_ivas->hCPE[0]->hCoreCoder[n]->cng_sba_flag = 1; - } - } - else - { - for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) - { - for ( n = 0; n < CPE_CHANNELS; n++ ) - { - st_ivas->hCPE[cpe_id]->hCoreCoder[n]->cna_dirac_flag = 0; - st_ivas->hCPE[cpe_id]->hCoreCoder[n]->cng_sba_flag = 0; - } - } - } + ivas_sba_set_cna_cng_flag( st_ivas ); } /* special case, if the decoder goes from 1TC DTX to 2TC active frame (in case the bitstream started with an SBA SID frame), allocate DTX memories */ @@ -453,7 +457,6 @@ ivas_error ivas_cldfb_dec_reconfig( if ( st_ivas->ivas_format == SBA_FORMAT && nchan_transport_old == 1 && numCldfbAnalyses_old == 2 && st_ivas->nchan_transport > 1 ) { deleteCldfb( &( st_ivas->cldfbAnaDec[1] ) ); - st_ivas->cldfbAnaDec[1] = NULL; numCldfbAnalyses_old--; } @@ -473,7 +476,6 @@ ivas_error ivas_cldfb_dec_reconfig( for ( i = numCldfbAnalyses; i < numCldfbAnalyses_old; i++ ) { deleteCldfb( &( st_ivas->cldfbAnaDec[i] ) ); - st_ivas->cldfbAnaDec[i] = NULL; } } else if ( numCldfbAnalyses_old < numCldfbAnalyses ) @@ -495,7 +497,6 @@ ivas_error ivas_cldfb_dec_reconfig( for ( i = numCldfbSyntheses; i < numCldfbSyntheses_old; i++ ) { deleteCldfb( &( st_ivas->cldfbSynDec[i] ) ); - st_ivas->cldfbSynDec[i] = NULL; } } else if ( numCldfbSyntheses_old < numCldfbSyntheses ) @@ -511,7 +512,7 @@ ivas_error ivas_cldfb_dec_reconfig( } /* CLDFB Interpolation weights */ - if ( st_ivas->sba_mode == SBA_MODE_SPAR && ( numCldfbAnalyses_old != numCldfbAnalyses || numCldfbSyntheses_old != numCldfbSyntheses || nchan_transport_old != st_ivas->nchan_transport ) ) + if ( st_ivas->sba_mode == SBA_MODE_SPAR && ( numCldfbAnalyses_old != numCldfbAnalyses || numCldfbSyntheses_old != numCldfbSyntheses || nchan_transport_old != st_ivas->nchan_transport ) && numCldfbAnalyses != 0 && numCldfbSyntheses != 0 ) { ivas_spar_get_cldfb_gains( st_ivas->hSpar, st_ivas->cldfbAnaDec[0], st_ivas->cldfbSynDec[0], hDecoderConfig ); } diff --git a/lib_dec/ivas_cpe_dec.c b/lib_dec/ivas_cpe_dec.c index ddd4ae363feef98107508958914daa32ca85362b..186d1c4c7daade77a393d4542142f78836852a11 100644 --- a/lib_dec/ivas_cpe_dec.c +++ b/lib_dec/ivas_cpe_dec.c @@ -405,7 +405,7 @@ ivas_error ivas_cpe_dec( } 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 ); } /* synthesis iFFT */ @@ -687,10 +687,6 @@ ivas_error create_cpe_dec( st->total_brate = hCPE->element_brate / ( CPE_CHANNELS ); /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */ st->mct_chan_mode = MCT_CHAN_MODE_REGULAR; - if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT && ( n + cpe_id * CPE_CHANNELS ) == LFE_CHANNEL ) - { - st->mct_chan_mode = MCT_CHAN_MODE_LFE; - } if ( ( error = init_decoder( st, n, st_ivas->mc_mode ) ) != IVAS_ERR_OK ) { @@ -831,8 +827,8 @@ void destroy_cpe_dec( int16_t n; Decoder_State *st; - /* make sure we deallocate a potential distinct hTcxCfg for a MCT LFE channel (can only happen in rs) */ - if ( hCPE->hCoreCoder[1] != NULL && hCPE->hCoreCoder[1]->mct_chan_mode == MCT_CHAN_MODE_LFE && hCPE->hCoreCoder[1]->hTcxCfg != hCPE->hCoreCoder[0]->hTcxCfg ) + /* make sure we deallocate a potential distinct hTcxCfg for a MCT LFE channel (can only happen in rs) */ /*TODO Check this again with LFE clean up!*/ + if ( hCPE->hCoreCoder[1] != NULL && hCPE->hCoreCoder[1]->hTcxCfg != hCPE->hCoreCoder[0]->hTcxCfg ) { hCPE->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_IGNORE; } diff --git a/lib_dec/ivas_dec.c b/lib_dec/ivas_dec.c index ca4666ae769ce3fa3341a149cd01e74072589d6e..11cc33af481fb2cfe01436f4dca4b073509466da 100644 --- a/lib_dec/ivas_dec.c +++ b/lib_dec/ivas_dec.c @@ -140,7 +140,6 @@ ivas_error ivas_dec( else if ( st_ivas->ivas_format == ISM_FORMAT ) { /* Metadata decoding and configuration */ -#ifdef PARAM_ISM_DTX_CNG 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 ) @@ -148,15 +147,20 @@ ivas_error ivas_dec( return error; } } - else -#endif - if ( st_ivas->ism_mode == ISM_MODE_PARAM ) + else if ( st_ivas->ism_mode == ISM_MODE_PARAM ) { - ivas_ism_metadata_dec( ivas_total_brate, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hDirAC->hParamIsm ); + // VE: call ivas_ism_metadata_dec() with 'st_ivas' - TBD + if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt ) ) != IVAS_ERR_OK ) + { + return error; + } } else /* ISM_MODE_DISC */ { - ivas_ism_metadata_dec( ivas_total_brate, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, NULL ); + if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, NULL, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt ) ) != IVAS_ERR_OK ) + { + return error; + } } for ( n = 0; n < st_ivas->nchan_transport; n++ ) @@ -206,10 +210,18 @@ ivas_error ivas_dec( /* Convert to CICPxx; used also for ISM->CICP19->binaural_room rendering */ ivas_ism_render( st_ivas, output, output_frame ); } +#ifdef REND_DEBUGGING_REVISION +#ifdef DEBUGGING else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV ) +#else + else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) +#endif +#else + else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV ) +#endif { /* Convert to Ambisonics; used also for ISM->HOA3->binaural rendering */ - ivas_ism2sba( output, st_ivas->hIsmRendererData, st_ivas->hIsmMetaData, st_ivas->nchan_transport, output_frame, st_ivas->hIntSetup.ambisonics_order ); + ivas_ism2sba( output, st_ivas->hIsmRendererData, st_ivas->hIsmMetaData, st_ivas->nchan_ism, output_frame, st_ivas->hIntSetup.ambisonics_order ); } /* Binaural rendering */ @@ -222,14 +234,10 @@ ivas_error ivas_dec( } else if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) { -#ifdef FIX_197_CREND_INTERFACE 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 ) { return error; } -#else - ivas_crend_process( st_ivas, output ); -#endif ivas_binaural_add_LFE( st_ivas, output_frame, output ); } #ifdef DEBUGGING @@ -302,7 +310,17 @@ ivas_error ivas_dec( return error; } } - +#ifdef DEBUG_LBR_SBA + /* SCE Decoder Output */ + for ( int t = 0; t < 960; t++ ) + { + for ( int c = 0; c < st_ivas->nchan_transport; c++ ) + { + float val = output[c][t] / MAX16B_FLT; + dbgwrite( &val, sizeof( float ), 1, 1, "int_dec_core_out.raw" ); + } + } +#endif #ifdef DEBUG_SBA_AUDIO_DUMP /* Dump audio signal after core-decoding */ ivas_spar_dump_signal_wav( output_frame, NULL, output, st_ivas->nchan_transport, spar_foa_dec_wav[0], "core-decoding" ); @@ -311,10 +329,17 @@ ivas_error ivas_dec( nchan_remapped = st_ivas->nchan_transport; if ( st_ivas->sba_dirac_stereo_flag ) { - nchan_remapped = CPE_CHANNELS; + 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 ); } @@ -327,20 +352,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 ); } @@ -388,7 +400,7 @@ ivas_error ivas_dec( ivas_dirac_dec( st_ivas, output, nchan_remapped, NULL, NULL, -1 ); } } - else if ( !st_ivas->sba_dirac_stereo_flag ) + else if ( !st_ivas->sba_dirac_stereo_flag && nchan_out != 1 ) { ivas_sba_upmixer_renderer( st_ivas, output, output_frame ); /* Note: ivas_sba_linear_renderer() or ivas_dirac_dec() are called internally */ } @@ -400,10 +412,6 @@ ivas_error ivas_dec( /* 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 ); } @@ -433,14 +441,10 @@ ivas_error ivas_dec( /* Rendering */ if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) { -#ifdef FIX_197_CREND_INTERFACE 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 ) { return error; } -#else - ivas_crend_process( st_ivas, output ); -#endif ivas_binaural_add_LFE( st_ivas, output_frame, output ); } diff --git a/lib_dec/ivas_decision_matrix_dec.c b/lib_dec/ivas_decision_matrix_dec.c index 2a99953d23d441566b52f8058d4aaf3194202dce..e5be65ae24dc7204e3eb20cf21e643f4f150f566 100644 --- a/lib_dec/ivas_decision_matrix_dec.c +++ b/lib_dec/ivas_decision_matrix_dec.c @@ -134,7 +134,7 @@ void ivas_decision_matrix_dec( } else if ( st->element_mode == IVAS_SCE && st->low_rate_mode ) { - /* ISm Low-rate mode -> always WB, ACELP core, IC coder_type */ + /* ISM Low-rate mode -> always WB, ACELP core, IC coder_type */ st->core = ACELP_CORE; } else if ( st->element_mode == IVAS_CPE_MDCT ) @@ -167,7 +167,7 @@ void ivas_decision_matrix_dec( { if ( st->element_mode == IVAS_SCE && st->low_rate_mode ) { - /* ISm Low-rate mode */ + /* ISM Low-rate mode */ st->bwidth = WB; st->coder_type = INACTIVE; *sharpFlag = 0; diff --git a/lib_dec/ivas_dirac_dec.c b/lib_dec/ivas_dirac_dec.c index 649cd43b5c5a7973edad50947aa3c002fdecca1a..446ed23bb3b99ccd974e4ef0e4fdfd127bea4c52 100644 --- a/lib_dec/ivas_dirac_dec.c +++ b/lib_dec/ivas_dirac_dec.c @@ -593,10 +593,11 @@ ivas_error ivas_dirac_dec_config( if ( hDirAC->panningConf == DIRAC_PANNING_VBAP ) { - if ( flag_config == DIRAC_RECONFIGURE && st_ivas->hVBAPdata ) + if ( flag_config == DIRAC_RECONFIGURE && st_ivas->hVBAPdata != NULL ) { vbap_free_data( &( st_ivas->hVBAPdata ) ); } + if ( ( error = vbap_init_data( &( st_ivas->hVBAPdata ), ls_azimuth, ls_elevation, nchan_out_woLFE ) ) != IVAS_ERR_OK ) { return error; @@ -604,13 +605,13 @@ ivas_error ivas_dirac_dec_config( } else if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_MONO ) { - if ( flag_config == DIRAC_RECONFIGURE && st_ivas->hVBAPdata ) + if ( flag_config == DIRAC_RECONFIGURE && st_ivas->hVBAPdata != NULL ) { vbap_free_data( &( st_ivas->hVBAPdata ) ); } hDirAC->hoa_decoder = NULL; } - else if ( flag_config == DIRAC_RECONFIGURE && st_ivas->hVBAPdata ) + else if ( flag_config == DIRAC_RECONFIGURE && st_ivas->hVBAPdata != NULL ) { vbap_free_data( &( st_ivas->hVBAPdata ) ); } @@ -819,8 +820,9 @@ 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 +#ifdef FIX_391_SBA + hDirAC->hConfig->dec_param_estim_old = hDirAC->hConfig->dec_param_estim; +#endif if ( st_ivas->mc_mode == MC_MODE_MCMASA ) { hDirAC->dirac_md_buffer_length = MAX_PARAM_SPATIAL_SUBFRAMES; @@ -830,12 +832,6 @@ ivas_error ivas_dirac_dec_config( 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; - } -#endif else { int16_t num_slots_in_subfr; @@ -990,7 +986,153 @@ ivas_error ivas_dirac_dec_config( hDirAC->dithering_seed = DIRAC_DITH_SEED; st_ivas->hDirAC = hDirAC; } +#ifdef FIX_391_SBA + 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->hConfig->dec_param_estim_old != hDirAC->hConfig->dec_param_estim ) ) + { + + 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; + } + if ( hDirAC->diffuseness_vector[i] != NULL ) + { + free( hDirAC->diffuseness_vector[i] ); + hDirAC->diffuseness_vector[i] = NULL; + } + if ( hDirAC->energy_ratio1[i] != NULL ) + { + free( hDirAC->energy_ratio1[i] ); + hDirAC->energy_ratio1[i] = NULL; + } + if ( hDirAC->spreadCoherence[i] != NULL ) + { + free( hDirAC->spreadCoherence[i] ); + hDirAC->spreadCoherence[i] = NULL; + } + if ( hDirAC->surroundingCoherence[i] != NULL ) + { + free( hDirAC->surroundingCoherence[i] ); + hDirAC->surroundingCoherence[i] = 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->energy_ratio1 != NULL ) + { + free( hDirAC->energy_ratio1 ); + hDirAC->energy_ratio1 = NULL; + } + if ( hDirAC->spreadCoherence != NULL ) + { + free( hDirAC->spreadCoherence ); + hDirAC->spreadCoherence = NULL; + } + if ( hDirAC->surroundingCoherence != NULL ) + { + free( hDirAC->surroundingCoherence ); + hDirAC->surroundingCoherence = NULL; + } + } + 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; + 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 ); + } + } + } +#endif return error; } @@ -1002,10 +1144,18 @@ ivas_error ivas_dirac_dec_config( *------------------------------------------------------------------------*/ void ivas_dirac_dec_close( - DIRAC_DEC_HANDLE hDirAC /* i/o: decoder DirAC handle */ + DIRAC_DEC_HANDLE *hDirAC_out /* i/o: decoder DirAC handle */ ) { int16_t i, j; + DIRAC_DEC_HANDLE hDirAC; + + if ( hDirAC_out == NULL || *hDirAC_out == NULL ) + { + return; + } + + hDirAC = *hDirAC_out; /* Config & CLDFB */ if ( hDirAC->hConfig != NULL ) @@ -1225,7 +1375,8 @@ void ivas_dirac_dec_close( ivas_dirac_free_mem( &( hDirAC->stack_mem ) ); - free( hDirAC ); + free( *hDirAC_out ); + *hDirAC_out = NULL; return; } @@ -1705,7 +1856,6 @@ void ivas_qmetadata_to_dirac( 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; @@ -1742,45 +1892,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; @@ -1805,32 +1920,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 */ @@ -1843,7 +1933,6 @@ void ivas_qmetadata_to_dirac( set_zero( hDirAC->spreadCoherence2[meta_write_index], hDirAC->num_freq_bands ); } } -#endif } else /* SBA mode/SID/Zero frame*/ { @@ -2096,6 +2185,7 @@ void ivas_dirac_dec( float *reference_power, *reference_power_smooth; float *onset_filter, *onset_filter_subframe, *p_onset_filter = NULL; uint16_t coherence_flag; + push_wmops( "ivas_dirac_dec" ); /* Initialize aux buffers */ @@ -2171,6 +2261,7 @@ void ivas_dirac_dec( for ( slot_idx = 0; slot_idx < hDirAC->subframe_nbslots; slot_idx++ ) { index_slot = subframe_idx * hDirAC->subframe_nbslots + slot_idx; + /* Todo: This access to azimuth & elevation may use wrong indices as access should probably be based on hDirAC->dirac_read_idx */ rotateAziEle_DirAC( hDirAC->azimuth[index_slot], hDirAC->elevation[index_slot], num_freq_bands, hDirAC->num_freq_bands, p_Rmat ); } } @@ -2196,7 +2287,7 @@ void ivas_dirac_dec( for ( i = 0; i < hDirAC->num_freq_bands; i++ ) { dirEne = hDirAC->h_output_synthesis_psd_state.direct_power_factor[i]; - surCohEner = hDirAC->h_output_synthesis_psd_state.diffuse_power_factor[i] * hDirAC->surroundingCoherence[subframe_idx][i]; + surCohEner = hDirAC->h_output_synthesis_psd_state.diffuse_power_factor[i] * hDirAC->surroundingCoherence[hDirAC->dirac_read_idx][i]; hDirAC->h_output_synthesis_psd_state.diffuse_power_factor[i] -= surCohEner; hDirAC->h_output_synthesis_psd_state.direct_power_factor[i] += surCohEner; @@ -2234,8 +2325,6 @@ void ivas_dirac_dec( ivas_dirac_dec_compute_directional_responses( hDirAC, st_ivas->hVBAPdata, st_ivas->hMasa, - subframe_idx, - subframe_idx, surCohRatio, st_ivas->hHeadTrackData->shd_rot_max_order, p_Rmat ); @@ -2245,8 +2334,6 @@ void ivas_dirac_dec( ivas_dirac_dec_compute_directional_responses( hDirAC, st_ivas->hVBAPdata, st_ivas->hMasa, - subframe_idx, - subframe_idx, surCohRatio, 0, 0 ); @@ -2544,8 +2631,7 @@ void ivas_dirac_dec( p_Rmat, st_ivas->hVBAPdata, hDirAC->hOutSetup, - nchan_transport, - index_slot ); + nchan_transport ); } else { @@ -2555,8 +2641,7 @@ void ivas_dirac_dec( 0, st_ivas->hVBAPdata, hDirAC->hOutSetup, - nchan_transport, - index_slot ); + nchan_transport ); } if ( hDirAC->synthesisConf != DIRAC_SYNTHESIS_GAIN_SHD ) diff --git a/lib_dec/ivas_dirac_output_synthesis_cov.c b/lib_dec/ivas_dirac_output_synthesis_cov.c index 6a79d4563a4a13e141bc0e64f80819dd4ab7af59..a2fc9ee8210be12378d3175c808075fd88ebcd8d 100644 --- a/lib_dec/ivas_dirac_output_synthesis_cov.c +++ b/lib_dec/ivas_dirac_output_synthesis_cov.c @@ -190,7 +190,6 @@ void ivas_dirac_dec_output_synthesis_cov_close( DIRAC_OUTPUT_SYNTHESIS_COV_STATE *h_dirac_output_synthesis_state /* i/o: handle for the covariance synthesis state */ ) { - int16_t idx; /*-----------------------------------------------------------------* diff --git a/lib_dec/ivas_dirac_output_synthesis_dec.c b/lib_dec/ivas_dirac_output_synthesis_dec.c index 3541bc5cfe44b7cd35728ae4bd86534e37ee5e7e..362b63c04b3bba68812fa8b1209dd0f7672d774d 100644 --- a/lib_dec/ivas_dirac_output_synthesis_dec.c +++ b/lib_dec/ivas_dirac_output_synthesis_dec.c @@ -517,8 +517,8 @@ void ivas_dirac_dec_output_synthesis_process_slot( const float *p_Rmat, /* i : rotation matrix */ const VBAP_HANDLE hVBAPdata, /* i : VBAP structure */ const IVAS_OUTPUT_SETUP hOutSetup, /* i : output setup structure */ - const int16_t nchan_transport, /* i : number of transport channels*/ - const int16_t index_slot ) + const int16_t nchan_transport /* i : number of transport channels*/ +) { int16_t num_freq_bands, num_channels_dir; int16_t num_freq_bands_diff, num_channels_diff; @@ -556,8 +556,7 @@ void ivas_dirac_dec_output_synthesis_process_slot( ivas_dirac_dec_compute_directional_responses( hDirAC, hVBAPdata, NULL, - index_slot, - index_slot / MAX_PARAM_SPATIAL_SUBFRAMES, NULL, + NULL, 2, p_Rmat ); @@ -1484,8 +1483,6 @@ void ivas_dirac_dec_compute_directional_responses( DIRAC_DEC_HANDLE hDirAC, /* i/o: DirAC handle */ const VBAP_HANDLE hVBAPdata, /* i : VBAP structure */ const MASA_DECODER_HANDLE hMasa, /* i : MASA decoder structure */ - const int16_t direction_idx, /* i : index for direction (azi and ele), can slot index (>2TCs) or subrame index (<=2TCs) */ - const int16_t subframe_idx, /* i : subframe index */ const float *surCohRatio, const int16_t shd_rot_max_order, /* i : split-order rotation method */ const float *p_Rmat /* i : rotation matrix */ @@ -1522,8 +1519,8 @@ void ivas_dirac_dec_compute_directional_responses( elevation = hDirAC->elevation[hDirAC->dirac_read_idx]; if ( hDirAC->numSimultaneousDirections == 2 ) { - azimuth2 = hDirAC->azimuth2[direction_idx]; - elevation2 = hDirAC->elevation2[direction_idx]; + azimuth2 = hDirAC->azimuth2[hDirAC->dirac_read_idx]; + elevation2 = hDirAC->elevation2[hDirAC->dirac_read_idx]; } codingBand = -1; @@ -1575,17 +1572,18 @@ void ivas_dirac_dec_compute_directional_responses( hDirAC->synthesisConf == DIRAC_SYNTHESIS_PSD_SHD || hDirAC->synthesisConf == DIRAC_SYNTHESIS_MONO ) { /* Synthesize the first direction */ - spreadCoherencePanningHoa( azimuth[k], elevation[k], hDirAC->spreadCoherence[subframe_idx][k], direct_response_hoa, num_channels_dir, hDirAC->hOutSetup.ambisonics_order ); + spreadCoherencePanningHoa( azimuth[k], elevation[k], hDirAC->spreadCoherence[hDirAC->dirac_read_idx][k], direct_response_hoa, num_channels_dir, hDirAC->hOutSetup.ambisonics_order ); /* Synthesize the second direction and combine the gains */ if ( hDirAC->numSimultaneousDirections == 2 ) { - spreadCoherencePanningHoa( azimuth2[k], elevation2[k], hDirAC->spreadCoherence2[subframe_idx][k], direct_response_dir2, num_channels_dir, hDirAC->hOutSetup.ambisonics_order ); + spreadCoherencePanningHoa( azimuth2[k], elevation2[k], hDirAC->spreadCoherence2[hDirAC->dirac_read_idx][k], direct_response_dir2, num_channels_dir, hDirAC->hOutSetup.ambisonics_order ); /* Combine gains from the two directions */ - totalDirect = hDirAC->energy_ratio1[subframe_idx][k] + hDirAC->energy_ratio2[subframe_idx][k] + EPSILON; - directRatio[0] = hDirAC->energy_ratio1[subframe_idx][k] / totalDirect; - directRatio[1] = hDirAC->energy_ratio2[subframe_idx][k] / totalDirect; + totalDirect = hDirAC->energy_ratio1[hDirAC->dirac_read_idx][k] + hDirAC->energy_ratio2[hDirAC->dirac_read_idx][k] + EPSILON; + directRatio[0] = hDirAC->energy_ratio1[hDirAC->dirac_read_idx][k] / totalDirect; + directRatio[1] = hDirAC->energy_ratio2[hDirAC->dirac_read_idx][k] / totalDirect; + for ( l = 0; l < num_channels_dir; l++ ) { direct_response_hoa[l] *= directRatio[0]; @@ -1633,20 +1631,20 @@ void ivas_dirac_dec_compute_directional_responses( else if ( hDirAC->panningConf == DIRAC_PANNING_VBAP ) /*VBAP*/ { /* Synthesize the first direction */ - spreadCoherencePanningVbap( azimuth[k], elevation[k], hDirAC->spreadCoherence[subframe_idx][k], direct_response_ls, num_channels_dir, hVBAPdata ); + spreadCoherencePanningVbap( azimuth[k], elevation[k], hDirAC->spreadCoherence[hDirAC->dirac_read_idx][k], direct_response_ls, num_channels_dir, hVBAPdata ); normalizePanningGains( direct_response_ls, num_channels_dir ); /* Synthesize the second direction and combine the gains */ if ( hDirAC->numSimultaneousDirections == 2 ) { - spreadCoherencePanningVbap( azimuth2[k], elevation2[k], hDirAC->spreadCoherence2[subframe_idx][k], direct_response_dir2, num_channels_dir, hVBAPdata ); + spreadCoherencePanningVbap( azimuth2[k], elevation2[k], hDirAC->spreadCoherence2[hDirAC->dirac_read_idx][k], direct_response_dir2, num_channels_dir, hVBAPdata ); normalizePanningGains( direct_response_dir2, num_channels_dir ); /* Combine gains from the two directions */ - totalDirect = hDirAC->energy_ratio1[subframe_idx][k] + hDirAC->energy_ratio2[subframe_idx][k] + EPSILON; - directRatio[0] = hDirAC->energy_ratio1[subframe_idx][k] / totalDirect; - directRatio[1] = hDirAC->energy_ratio2[subframe_idx][k] / totalDirect; + totalDirect = hDirAC->energy_ratio1[hDirAC->dirac_read_idx][k] + hDirAC->energy_ratio2[hDirAC->dirac_read_idx][k] + EPSILON; + directRatio[0] = hDirAC->energy_ratio1[hDirAC->dirac_read_idx][k] / totalDirect; + directRatio[1] = hDirAC->energy_ratio2[hDirAC->dirac_read_idx][k] / totalDirect; for ( l = 0; l < num_channels_dir; l++ ) { direct_response_ls[l] *= directRatio[0]; diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c index 25813f34b24c4b709ca15ddddc1e9a63ecbea38c..a193ac282337c7ac7d18deead2e03ab4c6aa0720 100644 --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -66,7 +66,7 @@ ivas_error ivas_dec_setup( ) { int16_t k, idx, num_bits_read; - int16_t num_obj, element_mode_flag; + int16_t nchan_ism, element_mode_flag; Decoder_State *st; int32_t ivas_total_brate; ivas_error error; @@ -102,15 +102,20 @@ ivas_error ivas_dec_setup( { /* read the number of objects */ st_ivas->nchan_transport = 1; - num_obj = 1; + nchan_ism = 1; k = (int16_t) ( ( ivas_total_brate / FRAMES_PER_SEC ) - 1 ); - while ( st_ivas->bit_stream[k] && num_obj < MAX_NUM_OBJECTS ) + while ( st_ivas->bit_stream[k] && nchan_ism < MAX_NUM_OBJECTS ) { - num_obj++; + nchan_ism++; k--; } - ivas_ism_dec_config( st_ivas, num_obj ); + st_ivas->nchan_ism = nchan_ism; + + if ( ( error = ivas_ism_dec_config( st_ivas, st_ivas->ism_mode ) ) != IVAS_ERR_OK ) + { + return error; + } } else if ( st_ivas->ivas_format == SBA_FORMAT ) { @@ -223,6 +228,9 @@ ivas_error ivas_dec_setup( case SID_MDCT_STEREO: st_ivas->element_mode_init = IVAS_CPE_MDCT; break; + case SID_ISM: + st_ivas->element_mode_init = IVAS_SCE; + break; case SID_MASA_1TC: st_ivas->element_mode_init = IVAS_SCE; st_ivas->nchan_transport = 1; @@ -250,10 +258,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; @@ -375,8 +380,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; @@ -402,20 +406,6 @@ static ivas_error ivas_read_format( break; case SID_ISM: st_ivas->ivas_format = ISM_FORMAT; -#ifdef PARAM_ISM_DTX_CNG - - if ( st_ivas->ism_mode == ISM_MODE_DISC ) - { - ivas_ism_dec_config( st_ivas, 1 ); /* 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, st_ivas->nSCE ); /* for Param-ISM, we need to generate 2 TCs */ - } -#else - ivas_ism_dec_config( st_ivas, 1 ); /* currently DTX supported for 1ISM only */ -#endif break; case SID_MULTICHANNEL: st_ivas->ivas_format = MC_FORMAT; @@ -501,28 +491,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; } @@ -756,6 +728,53 @@ ivas_error ivas_init_decoder( } } + /*-----------------------------------------------------------------* + * Set head/orientation tracking + *-----------------------------------------------------------------*/ + + if ( st_ivas->hDecoderConfig->Opt_Headrotation ) + { + if ( st_ivas->hDecoderConfig->orientation_tracking == IVAS_ORIENT_TRK_NONE ) + { + if ( ( error = ivas_orient_trk_SetTrackingType( st_ivas->hHeadTrackData->OrientationTracker, OTR_TRACKING_NONE ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else if ( st_ivas->hDecoderConfig->orientation_tracking == IVAS_ORIENT_TRK_AVG ) + { + if ( ( error = ivas_orient_trk_SetTrackingType( st_ivas->hHeadTrackData->OrientationTracker, OTR_TRACKING_AVG_ORIENT ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else if ( st_ivas->hDecoderConfig->orientation_tracking == IVAS_ORIENT_TRK_REF ) + { + if ( ( error = ivas_orient_trk_SetTrackingType( st_ivas->hHeadTrackData->OrientationTracker, OTR_TRACKING_REF_ORIENT ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else if ( st_ivas->hDecoderConfig->orientation_tracking == IVAS_ORIENT_TRK_REF_VEC ) + { + if ( ( error = ivas_orient_trk_SetTrackingType( st_ivas->hHeadTrackData->OrientationTracker, OTR_TRACKING_REF_VEC ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else if ( st_ivas->hDecoderConfig->orientation_tracking == IVAS_ORIENT_TRK_REF_VEC_LEV ) + { + if ( ( error = ivas_orient_trk_SetTrackingType( st_ivas->hHeadTrackData->OrientationTracker, OTR_TRACKING_REF_VEC_LEV ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else + { + return IVAS_ERR_WRONG_MODE; + } + } + /*-----------------------------------------------------------------* * Allocate and initialize SCE/CPE and other handles *-----------------------------------------------------------------*/ @@ -810,11 +829,13 @@ ivas_error ivas_init_decoder( st_ivas->nSCE = st_ivas->nchan_transport; /* "st_ivas->nchan_transport" is known from ivas_dec_setup */ st_ivas->nCPE = 0; + st_ivas->ism_extmeta_active = -1; + st_ivas->ism_extmeta_cnt = 0; if ( st_ivas->ism_mode == ISM_MODE_PARAM ) { - st_ivas->nchan_transport = 2; - st_ivas->nSCE = 2; + st_ivas->nchan_transport = MAX_PARAM_ISM_WAVE; + st_ivas->nSCE = MAX_PARAM_ISM_WAVE; if ( ( error = ivas_param_ism_dec_open( st_ivas ) ) != IVAS_ERR_OK ) { @@ -835,14 +856,18 @@ ivas_error ivas_init_decoder( } reset_indices_dec( st_ivas->hSCE[sce_id]->hCoreCoder[0] ); + + st_ivas->hSCE[sce_id]->hCoreCoder[0]->is_ism_format = 1; } -#ifdef PARAM_ISM_DTX_CNG +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + st_ivas->hISMDTX.sce_id_dtx = 0; +#endif + if ( st_ivas->ism_mode == ISM_MODE_PARAM ) { st_ivas->hSCE[1]->hCoreCoder[0]->hFdCngDec->hFdCngCom->seed3 = st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->seed2; } -#endif } else if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT ) { @@ -863,11 +888,7 @@ ivas_error ivas_init_decoder( { if ( st_ivas->sba_mode == SBA_MODE_SPAR ) { -#ifdef SBA_BR_SWITCHING_CLEAN_UP if ( ( error = ivas_spar_dec_open( st_ivas, 0 ) ) != IVAS_ERR_OK ) -#else - if ( ( error = ivas_spar_dec_open( st_ivas ) ) != IVAS_ERR_OK ) -#endif { return error; } @@ -907,7 +928,7 @@ ivas_error ivas_init_decoder( ivas_dirac_config_bands( band_grouping, IVAS_MAX_NUM_BANDS, (int16_t) ( st_ivas->hDecoderConfig->output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ), st_ivas->hSpar->dirac_to_spar_md_bands, st_ivas->hQMetaData->useLowerBandRes, st_ivas->hSpar->enc_param_start_band, 0 ); } - st_ivas->sba_dirac_stereo_flag = ( output_config == AUDIO_CONFIG_STEREO ); + st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas ); } else /* SBA_MODE_DIRAC */ { @@ -916,7 +937,7 @@ ivas_error ivas_init_decoder( return error; } - st_ivas->sba_dirac_stereo_flag = ( st_ivas->nchan_transport == 1 && output_config == AUDIO_CONFIG_STEREO ); + st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas ); } } @@ -953,7 +974,7 @@ ivas_error ivas_init_decoder( } /* create CPE element for DFT Stereo like upmix */ - if ( st_ivas->sba_dirac_stereo_flag && st_ivas->nchan_transport == 1 ) + if ( st_ivas->sba_dirac_stereo_flag && st_ivas->nCPE == 0 ) { if ( ( error = create_cpe_dec( st_ivas, cpe_id, ivas_total_brate / ( st_ivas->nSCE + st_ivas->nCPE ) ) ) != IVAS_ERR_OK ) { @@ -973,24 +994,7 @@ ivas_error ivas_init_decoder( } /* set CNA/CNG flags */ - if ( st_ivas->sba_mode == SBA_MODE_SPAR && st_ivas->nchan_transport == 1 ) - { - st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag = 0; /* Todo: Check if these can be enabled */ - st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag = 0; - } - else if ( st_ivas->nchan_transport == 1 && ( ( st_ivas->renderer_type == RENDERER_DIRAC && st_ivas->hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) || ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC ) ) ) - { - st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag = 1; - st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag = 1; - } - else if ( st_ivas->nchan_transport == 2 ) - { - for ( n = 0; n < CPE_CHANNELS; n++ ) - { - st_ivas->hCPE[0]->hCoreCoder[n]->cna_dirac_flag = 0; /* Todo: Check if these can be enabled */ - st_ivas->hCPE[0]->hCoreCoder[n]->cng_sba_flag = 1; - } - } + ivas_sba_set_cna_cng_flag( st_ivas ); } else if ( st_ivas->ivas_format == MC_FORMAT ) { @@ -1082,7 +1086,7 @@ ivas_error ivas_init_decoder( return error; } - st_ivas->sba_dirac_stereo_flag = ( st_ivas->nchan_transport == 1 && output_config == AUDIO_CONFIG_STEREO ); + st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas ); if ( st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_MCMASA_MONO_STEREO ) { @@ -1226,29 +1230,10 @@ ivas_error ivas_init_decoder( if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on ) { -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hDecoderConfig->output_config, NULL, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK ) { return error; } -#else -#ifdef FIX_197_CREND_INTERFACE -#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC - if ( ( error = ivas_rend_initCrendWrapper( &st_ivas->hCrendWrapper ) ) != IVAS_ERR_OK ) -#else - if ( ( st_ivas->hCrendWrapper = (CREND_WRAPPER_HANDLE) malloc( sizeof( CREND_WRAPPER ) ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend Wrapper\n" ); - } - if ( ( st_ivas->hCrendWrapper->hCrend = (CREND_HANDLE) malloc( sizeof( CREND_DATA ) ) ) == NULL ) -#endif -#else - if ( ( st_ivas->hCrend = (CREND_HANDLE) malloc( sizeof( CREND_DATA ) ) ) == NULL ) -#endif - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend\n" ); - } -#endif } } else if ( st_ivas->renderer_type == RENDERER_MC ) @@ -1267,7 +1252,6 @@ ivas_error ivas_init_decoder( } else if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) { -#ifdef FIX_197_CREND_INTERFACE if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM && st_ivas->ivas_format == MC_FORMAT && st_ivas->hDecoderConfig->Opt_Headrotation ) { if ( ( error = efap_init_data( &( st_ivas->hEFAPdata ), st_ivas->hIntSetup.ls_azimuth, st_ivas->hIntSetup.ls_elevation, st_ivas->hIntSetup.nchan_out_woLFE, EFAP_MODE_EFAP ) ) != IVAS_ERR_OK ) @@ -1277,18 +1261,12 @@ ivas_error ivas_init_decoder( } if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hDecoderConfig->output_config, - st_ivas->hRenderConfig, st_ivas->hDecoderConfig->Opt_Headrotation, st_ivas->hSetOfHRTF, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK ) + st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK ) { return error; } st_ivas->binaural_latency_ns = st_ivas->hCrendWrapper->binaural_latency_ns; -#else - if ( ivas_crend_open( st_ivas ) != IVAS_ERR_OK ) - { - return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "ivas_crend_open failed" ); - } -#endif } if ( st_ivas->ivas_format == ISM_FORMAT && @@ -1330,13 +1308,6 @@ ivas_error ivas_init_decoder( return error; } - /* 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]; - set_zero( st_ivas->hLFE->prevsynth_buf, LFE_PLC_BUFLEN ); set_zero( st_ivas->hLFE->prior_out_buffer, L_FRAME48k ); } @@ -1372,7 +1343,7 @@ ivas_error ivas_init_decoder( } /* CLDFB Interpolation weights */ - if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR && !st_ivas->sba_dirac_stereo_flag ) + if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR && !st_ivas->sba_dirac_stereo_flag && st_ivas->hDecoderConfig->nchan_out != 1 ) { ivas_spar_get_cldfb_gains( st_ivas->hSpar, st_ivas->cldfbAnaDec[0], st_ivas->cldfbSynDec[0], hDecoderConfig ); } @@ -1400,7 +1371,7 @@ void destroy_core_dec( DEC_CORE_HANDLE hCoreCoder /* i/o: core decoder structure */ ) { - destroy_decoder( hCoreCoder ); + destroy_cldfb_decoder( hCoreCoder ); if ( hCoreCoder->hGSCDec != NULL ) { @@ -1492,7 +1463,7 @@ void destroy_core_dec( hCoreCoder->hTcxDec = NULL; } - if ( hCoreCoder->hTcxCfg != NULL && hCoreCoder->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( hCoreCoder->hTcxCfg != NULL ) { free( hCoreCoder->hTcxCfg ); hCoreCoder->hTcxCfg = NULL; @@ -1594,15 +1565,8 @@ void ivas_initialize_handles_dec( st_ivas->hIsmRendererData = NULL; st_ivas->hBinRendererTd = NULL; st_ivas->hMonoDmxRenderer = NULL; -#ifdef FIX_197_CREND_INTERFACE st_ivas->hCrendWrapper = NULL; -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND st_ivas->hReverb = NULL; -#endif -#else - st_ivas->hCrend = NULL; - st_ivas->hHrtf = NULL; -#endif st_ivas->hSetOfHRTF = NULL; st_ivas->hHrtfFastConv = NULL; st_ivas->hHrtfParambin = NULL; @@ -1627,7 +1591,7 @@ void ivas_destroy_dec( Decoder_Struct *st_ivas /* i/o: IVAS decoder handle */ ) { - int16_t i, n; + int16_t i; /* CLDFB handles */ for ( i = 0; i < MAX_INTERN_CHANNELS; i++ ) @@ -1635,7 +1599,6 @@ void ivas_destroy_dec( if ( st_ivas->cldfbAnaDec[i] != NULL ) { deleteCldfb( &( st_ivas->cldfbAnaDec[i] ) ); - st_ivas->cldfbAnaDec[i] = NULL; } } @@ -1644,7 +1607,6 @@ void ivas_destroy_dec( if ( st_ivas->cldfbSynDec[i] != NULL ) { deleteCldfb( &( st_ivas->cldfbSynDec[i] ) ); - st_ivas->cldfbSynDec[i] = NULL; } } @@ -1674,13 +1636,6 @@ void ivas_destroy_dec( } } - /* LFE handle */ - if ( st_ivas->hLFE != NULL ) - { - ivas_lfe_dec_close( st_ivas->hLFE ); - st_ivas->hLFE = NULL; - } - /* HP20 filter handles */ if ( st_ivas->mem_hp20_out != NULL ) { @@ -1694,16 +1649,9 @@ void ivas_destroy_dec( } /* ISM metadata handles */ - for ( n = 0; n < MAX_NUM_OBJECTS; n++ ) - { - if ( st_ivas->hIsmMetaData[n] != NULL ) - { - free( st_ivas->hIsmMetaData[n] ); - st_ivas->hIsmMetaData[n] = NULL; - } - } + ivas_ism_metadata_close( st_ivas->hIsmMetaData ); - /* ISm renderer handle */ + /* ISM renderer handle */ if ( st_ivas->hIsmRendererData != NULL ) { free( st_ivas->hIsmRendererData ); @@ -1711,30 +1659,18 @@ void ivas_destroy_dec( } /* DirAC handle */ - if ( st_ivas->hDirAC != NULL ) + if ( st_ivas->ivas_format == ISM_FORMAT ) { - if ( st_ivas->ivas_format == ISM_FORMAT ) - { - ivas_param_ism_dec_close( st_ivas->hDirAC, st_ivas->hDecoderConfig->output_config ); - } - else - { - ivas_dirac_dec_close( st_ivas->hDirAC ); - } - st_ivas->hDirAC = NULL; + ivas_param_ism_dec_close( &( st_ivas->hDirAC ), st_ivas->hDecoderConfig->output_config ); } - - /* Spar handle */ - if ( st_ivas->hSpar != NULL ) + else { -#ifdef SBA_BR_SWITCHING_CLEAN_UP - ivas_spar_dec_close( st_ivas->hSpar, st_ivas->hDecoderConfig->output_Fs, 0 ); -#else - ivas_spar_dec_close( st_ivas->hSpar, st_ivas->hDecoderConfig->output_Fs ); -#endif - st_ivas->hSpar = NULL; + ivas_dirac_dec_close( &( st_ivas->hDirAC ) ); } + /* SPAR handle */ + ivas_spar_dec_close( &( st_ivas->hSpar ), st_ivas->hDecoderConfig->output_Fs, 0 ); + /* HOA decoder matrix */ if ( st_ivas->hoa_dec_mtx != NULL ) { @@ -1742,12 +1678,18 @@ void ivas_destroy_dec( st_ivas->hoa_dec_mtx = NULL; } + /* MASA decoder structure */ + ivas_masa_dec_close( &( st_ivas->hMasa ) ); + /* Qmetadata handle */ ivas_qmetadata_close( &st_ivas->hQMetaData ); /* MCT handle */ ivas_mct_dec_close( &st_ivas->hMCT ); + /* LFE handle */ + ivas_lfe_dec_close( &( st_ivas->hLFE ) ); + /* Parametric MC handle */ ivas_param_mc_dec_close( &st_ivas->hParamMC ); @@ -1764,15 +1706,10 @@ void ivas_destroy_dec( ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin ); /* Crend handle */ -#ifdef FIX_197_CREND_INTERFACE ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ) ); -#else - ivas_crend_close( st_ivas ); -#endif -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND + /* Reverb handle */ ivas_reverb_close( &st_ivas->hReverb ); -#endif /* LS config converter handle */ ivas_ls_setup_conversion_close( &st_ivas->hLsSetUpConversion ); @@ -1784,13 +1721,6 @@ void ivas_destroy_dec( st_ivas->hLsSetupCustom = NULL; } - /* MASA decoder structure */ - if ( st_ivas->hMasa != NULL ) - { - ivas_masa_dec_close( st_ivas->hMasa ); - st_ivas->hMasa = NULL; - } - /* Downmix structure */ if ( st_ivas->hMonoDmxRenderer != NULL ) { @@ -1799,11 +1729,7 @@ void ivas_destroy_dec( } /* Head track data handle */ - if ( st_ivas->hHeadTrackData != NULL ) - { - free( st_ivas->hHeadTrackData ); - st_ivas->hHeadTrackData = NULL; - } + ivas_headTrack_close( &st_ivas->hHeadTrackData ); /* Time Domain binaural renderer handle */ if ( st_ivas->hBinRendererTd != NULL ) @@ -1818,22 +1744,13 @@ void ivas_destroy_dec( } /* CRend binaural renderer handle */ - if ( st_ivas->hSetOfHRTF != NULL ) - { - ivas_HRTF_CRend_binary_close( &st_ivas->hSetOfHRTF ); - } + ivas_HRTF_CRend_binary_close( &st_ivas->hSetOfHRTF ); /* Fastconv HRTF filters */ - if ( st_ivas->hHrtfFastConv != NULL ) - { - ivas_HRTF_fastconv_binary_close( &st_ivas->hHrtfFastConv ); - } + ivas_HRTF_fastconv_binary_close( &st_ivas->hHrtfFastConv ); /* Parametric binauralizer HRTF filters */ - if ( st_ivas->hHrtfParambin != NULL ) - { - ivas_HRTF_parambin_binary_close( &st_ivas->hHrtfParambin ); - } + ivas_HRTF_parambin_binary_close( &st_ivas->hHrtfParambin ); /* Config. Renderer */ ivas_render_config_close( &( st_ivas->hRenderConfig ) ); @@ -1855,7 +1772,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 *-------------------------------------------------------------------*/ @@ -2064,7 +1981,7 @@ static ivas_error doSanityChecks_IVAS( /* Verify ISM output configuration */ if ( output_config == AUDIO_CONFIG_INVALID ) { - return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Incorrect output configuration specified for ISm" ); + return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Incorrect output configuration specified for ISM" ); } } else if ( st_ivas->ivas_format == SBA_FORMAT ) @@ -2100,20 +2017,6 @@ static ivas_error doSanityChecks_IVAS( } #ifdef DEBUGGING -#ifndef REMOVE_FORCE_SUBFRAME_BIN - if ( st_ivas->hDecoderConfig->forceSubframeBinauralization ) - { - /* Note about resolution of Binaural Renderers: * - * - Parametric Binaural Renderer: 20 ms by default, can be forced to subframe (5 ms) resolution * - * - FastConv Binaural Renderer: 5 ms by default * - * - TD objects Binaural Renderer: 20 ms by default */ - - if ( !( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM ) || !( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MC_FORMAT || st_ivas->ivas_format == ISM_FORMAT ) ) - { - return IVAS_ERROR( IVAS_ERR_WRONG_PARAMS, "Wrong set-up: Forced subframe resolution parametric binauralization activated for non-binaural output." ); - } - } -#endif if ( ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) && ( ( st_ivas->ivas_format != MC_FORMAT && st_ivas->ivas_format != ISM_FORMAT ) || output_config != AUDIO_CONFIG_BINAURAL || ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_PARAM ) || ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode != MC_MODE_MCT ) ) ) { return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Incorrect output configuration: Time Domain object renderer not supported in this configuration" ); diff --git a/lib_dec/ivas_ism_dec.c b/lib_dec/ivas_ism_dec.c index 0bda9f5ae033f20287d0068835d357d9e9b04d3f..dda939529d0597262156af814db645645614f574 100644 --- a/lib_dec/ivas_ism_dec.c +++ b/lib_dec/ivas_ism_dec.c @@ -49,20 +49,30 @@ static ivas_error ivas_ism_bitrate_switching( Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ const int16_t nchan_transport_old, /* i : last number of transport channels */ - const ISM_MODE last_ism_mode, /* i : last ISM mode */ - const int16_t num_obj /* i : number of objects in the bitstream */ + const ISM_MODE last_ism_mode /* i : last ISM mode */ ) { ivas_error error; int32_t element_brate_tmp[MAX_NUM_OBJECTS]; int16_t nSCE_old, nCPE_old; +#ifdef FIX_416_ISM_BR_SWITCHING + int16_t numCldfbAnalyses_old, numCldfbSyntheses_old, ism_mode; +#endif error = IVAS_ERR_OK; nCPE_old = st_ivas->nCPE; nSCE_old = st_ivas->nSCE; - 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 ) +#ifdef FIX_416_ISM_BR_SWITCHING + /* we have to temporarily set the ism mode back to the old one, otherwise this can give wrong results*/ + ism_mode = st_ivas->ism_mode; + st_ivas->ism_mode = last_ism_mode; + ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old ); + st_ivas->ism_mode = ism_mode; +#endif + + if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->nchan_ism, NULL, NULL, NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK ) { return error; } @@ -113,11 +123,7 @@ static ivas_error ivas_ism_bitrate_switching( if ( st_ivas->ism_mode == ISM_MODE_DISC && last_ism_mode == ISM_MODE_PARAM ) { /* Deallocate the ParamISM struct */ - if ( st_ivas->hDirAC != NULL ) - { - ivas_param_ism_dec_close( st_ivas->hDirAC, st_ivas->hDecoderConfig->output_config ); - st_ivas->hDirAC = NULL; - } + ivas_param_ism_dec_close( &( st_ivas->hDirAC ), st_ivas->hDecoderConfig->output_config ); if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL ) { @@ -151,12 +157,10 @@ static ivas_error ivas_ism_bitrate_switching( ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin ); /* Open Crend Binaural renderer */ -#ifdef FIX_197_CREND_INTERFACE if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hRenderConfig, - st_ivas->hDecoderConfig->Opt_Headrotation, st_ivas->hSetOfHRTF, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK ) { @@ -164,9 +168,6 @@ static ivas_error ivas_ism_bitrate_switching( } st_ivas->binaural_latency_ns = st_ivas->hCrendWrapper->binaural_latency_ns; -#else - ivas_crend_open( st_ivas ); -#endif } } @@ -227,19 +228,21 @@ static ivas_error ivas_ism_bitrate_switching( } /* close the crend binaural renderer */ -#ifdef FIX_197_CREND_INTERFACE ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ) ); -#else - ivas_crend_close( st_ivas ); - - if ( st_ivas->hHrtf != NULL ) - { - st_ivas->hHrtf = NULL; - } -#endif } } +#ifdef FIX_416_ISM_BR_SWITCHING + /*-----------------------------------------------------------------* + * CLDFB instances + *-----------------------------------------------------------------*/ + + if ( ( error = ivas_cldfb_dec_reconfig( st_ivas, nchan_transport_old, numCldfbAnalyses_old, numCldfbSyntheses_old ) ) != IVAS_ERR_OK ) + { + return error; + } +#endif + return error; } @@ -251,14 +254,13 @@ static ivas_error ivas_ism_bitrate_switching( * - reconfigure the ISM format decoder *-------------------------------------------------------------------------*/ -/*! r : ISM format mode */ ivas_error ivas_ism_dec_config( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - const int16_t num_obj /* i : number of objects in the bitstream */ + Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ + , + const ISM_MODE last_ism_mode /* i/o: last ISM mode */ ) { int32_t ivas_total_brate; - ISM_MODE last_ism_mode; ivas_error error; int16_t nchan_transport_old; @@ -266,11 +268,9 @@ ivas_error ivas_ism_dec_config( ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; - /* store last frame ISM mode */ - last_ism_mode = st_ivas->ism_mode; /* Assumes that num of input objects are constant */ - nchan_transport_old = num_obj; + nchan_transport_old = st_ivas->nchan_ism; if ( last_ism_mode == ISM_MODE_PARAM ) { @@ -280,45 +280,55 @@ 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 */ - st_ivas->ism_mode = ivas_ism_mode_select( num_obj, ivas_total_brate ); + st_ivas->ism_mode = ivas_ism_mode_select( st_ivas->nchan_ism, ivas_total_brate ); - st_ivas->nchan_transport = num_obj; + st_ivas->nchan_transport = st_ivas->nchan_ism; if ( st_ivas->ism_mode == ISM_MODE_PARAM ) { - st_ivas->nchan_transport = 2; + st_ivas->nchan_transport = MAX_PARAM_ISM_WAVE; if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) { - st_ivas->hDecoderConfig->nchan_out = num_obj; + st_ivas->hDecoderConfig->nchan_out = st_ivas->nchan_ism; } } if ( st_ivas->ini_active_frame != 0 ) { /* ISM bit-rate switching */ - if ( st_ivas->hDecoderConfig->last_ivas_total_brate != IVAS_SID_5k2 && st_ivas->hDecoderConfig->last_ivas_total_brate != FRAME_NO_DATA ) { if ( ( st_ivas->ism_mode != last_ism_mode ) || ( st_ivas->hDecoderConfig->ivas_total_brate != st_ivas->hDecoderConfig->last_ivas_total_brate ) ) { - ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode, num_obj ); + if ( ( error = ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode ) ) != IVAS_ERR_OK ) + { + return error; + } } } } } else if ( !st_ivas->bfi && ivas_total_brate == IVAS_SID_5k2 ) { -#ifdef PARAM_ISM_DTX_CNG - if ( last_ism_mode == ISM_MODE_PARAM ) + st_ivas->nchan_transport = st_ivas->nchan_ism; + if ( st_ivas->ism_mode == ISM_MODE_PARAM ) { - nchan_transport_old = MAX_PARAM_ISM_WAVE; + st_ivas->nchan_transport = MAX_PARAM_ISM_WAVE; + if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) + { + st_ivas->hDecoderConfig->nchan_out = st_ivas->nchan_ism; + } } - else -#endif + + /* ISM mode switching */ + if ( st_ivas->ism_mode != last_ism_mode ) { - st_ivas->nchan_transport = num_obj; + if ( ( error = ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode ) ) != IVAS_ERR_OK ) + { + return error; + } } } - switch ( num_obj ) + switch ( st_ivas->nchan_ism ) { 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 bd15569f9e26884d2b51cdf78a6ed8909e27b759..935db95eea5708afbf995aaa599ac212607d1094 100644 --- a/lib_dec/ivas_ism_dtx_dec.c +++ b/lib_dec/ivas_ism_dtx_dec.c @@ -39,8 +39,7 @@ #endif #include "wmc_auto.h" - -#ifdef PARAM_ISM_DTX_CNG +#ifndef FIX_ISM_DTX_CNG_BWIDTH_ALT /*-------------------------------------------------------------------* * ivas_ism_preprocessing() * @@ -52,19 +51,14 @@ static void ivas_ism_preprocessing( const int16_t sce_id /* i : SCE # identifier */ ) { - int32_t ivas_total_brate; - SCE_DEC_HANDLE hSCE; Decoder_State *st; - hSCE = st_ivas->hSCE[sce_id]; - st = hSCE->hCoreCoder[0]; + st = st_ivas->hSCE[sce_id]->hCoreCoder[0]; - ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; - - if ( ( ivas_total_brate == IVAS_SID_5k2 || ivas_total_brate == FRAME_NO_DATA ) ) { - /* reset the bitstream to atleast read the cng type and bandwidth for non transmitted SCE */ + /* reset the bitstream to at least read the cng type and bandwidth for non transmitted SCE */ st->bit_stream = st_ivas->hSCE[0]->hCoreCoder[0]->bit_stream; + st->next_bit_pos = 0; /* note: needed in paramISM -> discISM switching */ if ( sce_id == st_ivas->hISMDTX.sce_id_dtx ) { @@ -75,16 +69,12 @@ static void ivas_ism_preprocessing( st->read_sid_info = 0; /* do not read the sid info from bitstream but use the estimated noise */ } - st->cng_paramISM_flag = 1; - } - else - { - st->cng_paramISM_flag = 0; + st->cng_ism_flag = 1; } return; } - +#endif /*-------------------------------------------------------------------* * ivas_ism_dtx_dec() @@ -97,77 +87,115 @@ ivas_error ivas_ism_dtx_dec( int16_t *nb_bits_metadata /* o : number of metadata bits */ ) { - int16_t ch, pos, num_obj, num_obj_prev; + int16_t ch, pos, nchan_ism, nchan_ism_prev; int32_t ivas_total_brate; + int16_t md_diff_flag[MAX_NUM_OBJECTS]; + int16_t idx, flag_noisy_speech, sce_id_dtx; + ISM_MODE last_ism_mode, ism_mode_bstr; + ivas_error error; +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + Decoder_State *st; +#endif ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; - if ( st_ivas->nchan_transport == 1 ) - { - nb_bits_metadata[0] = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC; - return IVAS_ERR_OK; - } - - if ( st_ivas->ism_mode == ISM_MODE_PARAM ) - { - num_obj_prev = st_ivas->hDirAC->hParamIsm->num_obj; - } - else /* ism_mode == ISM_MODE_DISC */ - { - num_obj_prev = st_ivas->nchan_transport; - } + nchan_ism_prev = st_ivas->nchan_ism; - /* read number of objects */ if ( !st_ivas->bfi && ivas_total_brate == IVAS_SID_5k2 ) { - num_obj = 1; + /* read number of objects */ + nchan_ism = 1; pos = (int16_t) ( ( ivas_total_brate / FRAMES_PER_SEC ) - 1 - SID_FORMAT_NBITS ); - while ( get_indice( st_ivas->hSCE[0]->hCoreCoder[0], pos, 1 ) == 1 && num_obj < MAX_NUM_OBJECTS ) + while ( get_indice( st_ivas->hSCE[0]->hCoreCoder[0], pos, 1 ) == 1 && nchan_ism < MAX_NUM_OBJECTS ) { - ( num_obj )++; + ( nchan_ism )++; pos--; } + st_ivas->nchan_ism = nchan_ism; + pos--; - if ( num_obj != num_obj_prev ) + if ( nchan_ism != nchan_ism_prev ) { /* IVAS_fmToDo: more work needed when the number of transported objects is not constant */ return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "wrong number of objects signalled!" ); } - ivas_ism_dec_config( st_ivas, num_obj ); + last_ism_mode = st_ivas->ism_mode; - if ( st_ivas->ism_mode == ISM_MODE_PARAM ) + /* read ism_mode */ + if ( nchan_ism > 2 ) { - st_ivas->hDirAC->hParamIsm->num_obj = num_obj; + pos -= nchan_ism; /* SID metadata flags */ + + idx = get_indice( st_ivas->hSCE[0]->hCoreCoder[0], pos, 1 ); + ism_mode_bstr = (ISM_MODE) ( idx + 1 ); + st_ivas->ism_mode = ism_mode_bstr; } - else /* ism_mode == ISM_MODE_DISC */ + + if ( ( error = ivas_ism_dec_config( st_ivas, last_ism_mode ) ) != IVAS_ERR_OK ) { - st_ivas->nchan_transport = num_obj; + return error; } } else { - num_obj = num_obj_prev; + nchan_ism = nchan_ism_prev; } /* Metadata decoding and dequantization */ - ivas_param_ism_metadata_dtx_dec( st_ivas ); + 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 ); - for ( ch = 0; ch < st_ivas->nchan_transport; ch++ ) + if ( ivas_total_brate == IVAS_SID_5k2 && !st_ivas->bfi ) { - nb_bits_metadata[ch] = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC; + if ( st_ivas->hDirAC != NULL ) + { + st_ivas->hDirAC->hParamIsm->flag_noisy_speech = flag_noisy_speech; + } + + st_ivas->hISMDTX.sce_id_dtx = sce_id_dtx; } + set_s( md_diff_flag, 1, nchan_ism ); + if ( st_ivas->ism_mode == ISM_MODE_PARAM ) + { + for ( ch = 0; ch < nchan_ism; ch++ ) + { + st_ivas->hDirAC->azimuth_values[ch] = st_ivas->hIsmMetaData[ch]->azimuth; + st_ivas->hDirAC->elevation_values[ch] = st_ivas->hIsmMetaData[ch]->elevation; + } + } + + update_last_metadata( nchan_ism, st_ivas->hIsmMetaData, md_diff_flag ); + + st_ivas->hISMDTX.ism_dtx_hangover_cnt = 0; + + if ( ivas_total_brate == IVAS_SID_5k2 && !st_ivas->bfi ) + { + for ( ch = 0; ch < st_ivas->nchan_transport; ch++ ) + { + nb_bits_metadata[ch] = nb_bits_metadata[sce_id_dtx]; + } + } + + if ( !st_ivas->bfi ) { for ( ch = 0; ch < st_ivas->nchan_transport; ch++ ) { - ivas_ism_preprocessing( st_ivas, ch ); +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + st = st_ivas->hSCE[ch]->hCoreCoder[0]; + st->bit_stream = st_ivas->hSCE[0]->hCoreCoder[0]->bit_stream; + st->next_bit_pos = 0; /* note: needed in paramISM -> discISM switching */ + st->cng_ism_flag = 1; + 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 */ +#else + ivas_ism_preprocessing( st_ivas, ch ); // VE: after the acceptance of switches, replace the function call by its content +#endif } } return IVAS_ERR_OK; } -#endif diff --git a/lib_dec/ivas_ism_metadata_dec.c b/lib_dec/ivas_ism_metadata_dec.c index 53c1e9d2e9d4d4e920fa304b9944f9b130940599..7a61424a1fd3d73b6d5e6b51aecabbcf94993fb1 100644 --- a/lib_dec/ivas_ism_metadata_dec.c +++ b/lib_dec/ivas_ism_metadata_dec.c @@ -37,69 +37,143 @@ #include "ivas_rom_com.h" #include "prot.h" #include "ivas_stat_enc.h" +#include #ifdef DEBUGGING #include "debug.h" #endif #include "wmc_auto.h" +/*-----------------------------------------------------------------------* + * Local functions + *-----------------------------------------------------------------------*/ + +static void decode_angle_indices( DEC_CORE_HANDLE st0, ISM_METADATA_ANGLE_HANDLE angle, int16_t *flag_abs_azimuth ); + +static int16_t decode_radius( DEC_CORE_HANDLE st0, int16_t *last_radius_idx, int16_t *flag_abs_radius ); + +/*-------------------------------------------------------------------------* + * Local constants + *-------------------------------------------------------------------------*/ + +#define IVAS_ISM_DTX_HO_MAX 5 + +#define CNG_MD_MAX_DIFF_AZIMUTH 5 +#define CNG_MD_MAX_DIFF_ELEVATION 5 + + +/*-------------------------------------------------------------------* + * ism_metadata_smooth() + * + * Smooth the metadata evolution + *-------------------------------------------------------------------*/ + +static void ism_metadata_smooth( + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + const int32_t ism_total_brate, /* i : ISms total bitrate */ + const int16_t nchan_ism /* i : number of objects */ +) +{ + ISM_METADATA_HANDLE hIsmMetaData; + int16_t ch; + float diff; + + for ( ch = 0; ch < nchan_ism; ch++ ) + { + hIsmMetaData = hIsmMeta[ch]; + + /* smooth azimuth */ + diff = hIsmMetaData->last_true_azimuth - hIsmMetaData->last_azimuth; + + if ( diff > ISM_AZIMUTH_MAX ) + { + diff -= ( ISM_AZIMUTH_MAX - ISM_AZIMUTH_MIN ); + hIsmMetaData->last_azimuth += ( ISM_AZIMUTH_MAX - ISM_AZIMUTH_MIN ); + } + else if ( diff < ISM_AZIMUTH_MIN ) + { + diff += ( ISM_AZIMUTH_MAX - ISM_AZIMUTH_MIN ); + } + + if ( ism_total_brate > IVAS_SID_5k2 && fabsf( diff ) > IVAS_ISM_DTX_HO_MAX * CNG_MD_MAX_DIFF_AZIMUTH ) + { + /* skip the smoothing */ + } + else if ( fabsf( diff ) > CNG_MD_MAX_DIFF_AZIMUTH ) + { + hIsmMetaData->azimuth = hIsmMetaData->last_azimuth + sign( diff ) * CNG_MD_MAX_DIFF_AZIMUTH; + } + else if ( diff != 0 ) + { + hIsmMetaData->azimuth = hIsmMetaData->last_true_azimuth; + } + + if ( hIsmMetaData->azimuth > ISM_AZIMUTH_MAX ) + { + hIsmMetaData->azimuth -= ( ISM_AZIMUTH_MAX - ISM_AZIMUTH_MIN ); + } + + /* smooth elevation */ + diff = hIsmMetaData->last_true_elevation - hIsmMetaData->last_elevation; + + if ( ism_total_brate > IVAS_SID_5k2 && diff > IVAS_ISM_DTX_HO_MAX * CNG_MD_MAX_DIFF_ELEVATION ) + { + /* skip the smoothing */ + } + else if ( fabsf( diff ) > CNG_MD_MAX_DIFF_ELEVATION ) + { + hIsmMetaData->elevation = hIsmMetaData->last_elevation + sign( diff ) * CNG_MD_MAX_DIFF_ELEVATION; + } + } + + return; +} + + /*-------------------------------------------------------------------------* * ivas_ism_metadata_dec() * - * decode and dequantize ISm metadata + * decode and dequantize ISM metadata *-------------------------------------------------------------------------*/ ivas_error ivas_ism_metadata_dec( - const int32_t ism_total_brate, /* i : ISms total bitrate */ - int16_t *nchan_transport, /* o : number of transport channels */ - ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ - SCE_DEC_HANDLE hSCE[], /* i/o: SCE decoder handles */ - const int16_t bfi, /* i : bfi flag */ - int16_t nb_bits_metadata[], /* o : number of metadata bits */ - ISM_MODE ism_mode, /* i : ISM mode */ - const PARAM_ISM_CONFIG_HANDLE hParamIsm /* i : Param ISM Config Handle */ + const int32_t ism_total_brate, /* i : ISM total bitrate */ + const int16_t nchan_ism, /* i : number of ISM channels */ + int16_t *nchan_transport, /* o : number of transport channels */ + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + SCE_DEC_HANDLE hSCE[], /* i/o: SCE decoder handles */ + const int16_t bfi, /* i : bfi flag */ + int16_t nb_bits_metadata[], /* o : number of metadata bits */ + ISM_MODE ism_mode, /* i : ISM mode */ + ISM_DTX_DATA_DEC hISMDTX, /* i/o: ISM DTX structure */ + const PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i : Param ISM Config Handle */ + int16_t *ism_extmeta_active, /* i/o: Extended metadata active in renderer*/ + int16_t *ism_extmeta_cnt /* i/o: Number of change frames observed*/ ) { - int16_t ch, nb_bits_start = 0, last_bit_pos, sgn, diff; + int16_t ch, nb_bits_start = 0, last_bit_pos; + int16_t idx_radius; int32_t element_brate[MAX_NUM_OBJECTS], total_brate[MAX_NUM_OBJECTS]; DEC_CORE_HANDLE st0; - int16_t idx_azimuth, nbits_diff_azimuth, flag_abs_azimuth; - int16_t idx_elevation, nbits_diff_elevation; + int16_t ism_extmeta_bitstream; + float yaw, pitch, radius; + int16_t flag_abs_radius; + int16_t flag_abs_orientation; + int16_t flag_abs_position; + int16_t idx_angle1; + int16_t idx_angle2; int16_t next_bit_pos_orig; uint16_t i, bstr_meta[MAX_BITS_METADATA], *bstr_orig; ISM_METADATA_HANDLE hIsmMetaData; int16_t nchan_transport_prev, ism_metadata_flag_global; int16_t localVAD[MAX_NUM_OBJECTS]; int16_t ism_imp[MAX_NUM_OBJECTS]; - int16_t num_obj = 0, nbands, nblocks; + int16_t nbands, nblocks; + int16_t md_diff_flag[MAX_NUM_OBJECTS]; ivas_error error; - error = IVAS_ERR_OK; - push_wmops( "ism_meta_dec" ); - 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 error; - } /* initialization */ st0 = hSCE[0]->hCoreCoder[0]; @@ -110,6 +184,7 @@ ivas_error ivas_ism_metadata_dec( bstr_orig = st0->bit_stream; next_bit_pos_orig = st0->next_bit_pos; st0->next_bit_pos = 0; + ism_extmeta_bitstream = 0; /* reverse the bitstream for easier reading of indices */ for ( i = 0; i < min( MAX_BITS_METADATA, last_bit_pos ); i++ ) @@ -122,25 +197,21 @@ ivas_error ivas_ism_metadata_dec( if ( !bfi ) { /*----------------------------------------------------------------* - * Read ISm common signaling + * Read ISM common signaling *----------------------------------------------------------------*/ - /* read number of objects */ - num_obj = 1; - while ( get_next_indice( st0, 1 ) == 1 && num_obj < MAX_NUM_OBJECTS ) - { - ( num_obj )++; - } + /* number of objects was read in ivas_dec_setup() */ + st0->next_bit_pos += nchan_ism; - ism_mode = ivas_ism_mode_select( num_obj, ism_total_brate ); + ism_mode = ivas_ism_mode_select( nchan_ism, ism_total_brate ); if ( ism_mode == ISM_MODE_PARAM ) { - hParamIsm->num_obj = num_obj; + *nchan_transport = MAX_PARAM_ISM_WAVE; } else if ( ism_mode == ISM_MODE_DISC ) { - *nchan_transport = num_obj; + *nchan_transport = nchan_ism; } if ( *nchan_transport != nchan_transport_prev ) @@ -149,7 +220,28 @@ ivas_error ivas_ism_metadata_dec( return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "wrong number of objects signalled!" ); } - /* Read ISm present flags (one per object) */ + /* read extended metadata presence flag */ + if ( ism_total_brate >= ISM_EXTENDED_METADATA_BRATE ) + { + ism_extmeta_bitstream = get_next_indice( st0, ISM_EXTENDED_METADATA_BITS ); + } + /* Apply hysteresis in case rate switching causes fluctuation in presence of extended metadata */ + if ( *ism_extmeta_active == -1 || *ism_extmeta_active == ism_extmeta_bitstream ) /* If first frame or bitstream matches internal state */ + { + *ism_extmeta_active = ism_extmeta_bitstream; + *ism_extmeta_cnt = 0; + } + else + { + ( *ism_extmeta_cnt )++; + if ( *ism_extmeta_cnt == ISM_METADATA_RS_MAX_FRAMES ) /* ISM_METADATA_RS_MAX_FRAMES change frames observed - update state */ + { + *ism_extmeta_active = ism_extmeta_bitstream; + *ism_extmeta_cnt = 0; + } + } + + /* Read ISM present flags (one per object) */ for ( ch = 0; ch < *nchan_transport; ch++ ) { ism_imp[ch] = get_next_indice( st0, ISM_METADATA_FLAG_BITS ); @@ -166,7 +258,7 @@ ivas_error ivas_ism_metadata_dec( ism_metadata_flag_global |= hIsmMeta[ch]->ism_metadata_flag; } - for ( ; ch < num_obj; ch++ ) + for ( ; ch < nchan_ism; ch++ ) { hIsmMeta[ch]->ism_metadata_flag = 1; ism_metadata_flag_global |= hIsmMeta[ch]->ism_metadata_flag; @@ -199,166 +291,64 @@ ivas_error ivas_ism_metadata_dec( nb_bits_start = st0->next_bit_pos; } - for ( ch = 0; ch < num_obj; ch++ ) + for ( ch = 0; ch < nchan_ism; ch++ ) { hIsmMetaData = hIsmMeta[ch]; if ( ism_mode == ISM_MODE_DISC ) { nb_bits_start = st0->next_bit_pos; } - - flag_abs_azimuth = 0; + flag_abs_position = 0; + flag_abs_orientation = 0; + flag_abs_radius = 0; if ( hIsmMeta[ch]->ism_metadata_flag ) { - /*----------------------------------------------------------------* - * Azimuth decoding and dequantization - *----------------------------------------------------------------*/ - - /* Decode azimuth index */ - if ( get_next_indice( st0, 1 ) == 1 ) /* azimuth_abs_flag */ - { - idx_azimuth = get_next_indice( st0, ISM_AZIMUTH_NBITS ); - flag_abs_azimuth = 1; - } - else - { - diff = 0; - sgn = 1; - - if ( get_next_indice( st0, 1 ) == 0 ) - { - nbits_diff_azimuth = 1; - } - else - { - nbits_diff_azimuth = 1; - - if ( get_next_indice( st0, 1 ) == 1 ) /* negative sign */ - { - sgn = -1; - } - - nbits_diff_azimuth++; - - /* read until the stop bit */ - while ( ( nbits_diff_azimuth < ISM_AZIMUTH_NBITS - 1 ) && ( get_next_indice( st0, 1 ) == 1 ) ) - { - diff++; - nbits_diff_azimuth++; - } - - if ( nbits_diff_azimuth < ISM_AZIMUTH_NBITS - 1 ) - { - /* count stop bit */ - nbits_diff_azimuth++; - } - } - - idx_azimuth = hIsmMetaData->last_azimuth_idx + sgn * diff; - } - - /* azimuth is on a circle - check for diff coding for -180° -> 180° and vice versa changes */ - if ( idx_azimuth > ( 1 << ISM_AZIMUTH_NBITS ) - 1 ) - { - idx_azimuth -= ( 1 << ISM_AZIMUTH_NBITS ) - 1; /* +180° -> -180° */ - } - else if ( idx_azimuth < 0 ) - { - idx_azimuth += ( 1 << ISM_AZIMUTH_NBITS ) - 1; /* -180° -> +180° */ - } - - /* +180° == -180° */ - if ( idx_azimuth == ( 1 << ISM_AZIMUTH_NBITS ) - 1 ) - { - idx_azimuth = 0; - } - - /* sanity check in case of FER or BER */ - if ( idx_azimuth < 0 || idx_azimuth > ( 1 << ISM_AZIMUTH_NBITS ) - 1 ) - { - idx_azimuth = hIsmMetaData->last_azimuth_idx; - } - - /* Azimuth dequantization */ + decode_angle_indices( st0, &( hIsmMetaData->position_angle ), &flag_abs_position ); + idx_angle1 = hIsmMetaData->position_angle.last_angle1_idx; + idx_angle2 = hIsmMetaData->position_angle.last_angle2_idx; + /* Azimuth/Elevation dequantization */ if ( ism_mode == ISM_MODE_PARAM ) { - hParamIsm->azi_index[ch] = idx_azimuth; + hParamIsm->azi_index[ch] = idx_angle1; + hParamIsm->ele_index[ch] = idx_angle2; } else /* ISM_MODE_DISC */ { - hIsmMetaData->azimuth = ism_dequant_meta( idx_azimuth, ism_azimuth_borders, 1 << ISM_AZIMUTH_NBITS ); - } - - /*----------------------------------------------------------------* - * Elevation decoding and dequantization - *----------------------------------------------------------------*/ + hIsmMetaData->azimuth = ism_dequant_meta( idx_angle1, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS ); + hIsmMetaData->elevation = ism_dequant_meta( idx_angle2, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS ); - /* Decode elevation index */ - if ( flag_abs_azimuth == 0 && get_next_indice( st0, 1 ) == 1 ) /* elevation_abs_flag */ - { - idx_elevation = get_next_indice( st0, ISM_ELEVATION_NBITS ); - } - else - { - diff = 0; - sgn = 1; - - if ( get_next_indice( st0, 1 ) == 0 ) + /* radius/raw/pitch dequantization */ + if ( ism_extmeta_bitstream ) { - nbits_diff_elevation = 1; + decode_angle_indices( st0, &( hIsmMetaData->orientation_angle ), &flag_abs_orientation ); + idx_angle1 = hIsmMetaData->orientation_angle.last_angle1_idx; + idx_angle2 = hIsmMetaData->orientation_angle.last_angle2_idx; + yaw = ism_dequant_meta( idx_angle1, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS ); + pitch = ism_dequant_meta( idx_angle2, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS ); + + idx_radius = decode_radius( st0, &hIsmMetaData->last_radius_idx, &flag_abs_radius ); + radius = usdequant( idx_radius, ISM_RADIUS_MIN, ISM_RADIUS_DELTA ); + if ( *ism_extmeta_active == 1 ) + { + hIsmMetaData->yaw = yaw; + hIsmMetaData->pitch = pitch; + hIsmMetaData->radius = radius; + } } else { - nbits_diff_elevation = 1; - - if ( get_next_indice( st0, 1 ) == 1 ) /* negative sign */ - { - sgn = -1; - } - - nbits_diff_elevation++; - - /* read until the stop bit */ - while ( ( nbits_diff_elevation < ISM_ELEVATION_NBITS ) && ( get_next_indice( st0, 1 ) == 1 ) ) + if ( *ism_extmeta_active == 0 ) { - diff++; - nbits_diff_elevation++; - } - - if ( nbits_diff_elevation < ISM_ELEVATION_NBITS ) - { - /* count stop bit */ - nbits_diff_elevation++; + hIsmMetaData->yaw = 0.0f; + hIsmMetaData->pitch = 0.0f; + hIsmMetaData->radius = 1.0f; } } - - idx_elevation = hIsmMetaData->last_elevation_idx + sgn * diff; - } - - /* sanity check in case of FER or BER */ - if ( idx_elevation < 0 || idx_elevation > ( 1 << ISM_ELEVATION_NBITS ) - 1 ) - { - idx_elevation = hIsmMetaData->last_elevation_idx; - } - - /* Elevation dequantization */ - if ( ism_mode == ISM_MODE_PARAM ) - { - hParamIsm->ele_index[ch] = idx_elevation; } - else /* ISM_MODE_DISC */ - { - hIsmMetaData->elevation = ism_dequant_meta( idx_elevation, ism_elevation_borders, 1 << ISM_ELEVATION_NBITS ); - } - - /*----------------------------------------------------------------* - * Final updates - *----------------------------------------------------------------*/ - - /* updates */ - hIsmMetaData->last_azimuth_idx = idx_azimuth; - hIsmMetaData->last_elevation_idx = idx_elevation; + /* save for smoothing metadata evolution */ + hIsmMetaData->last_true_azimuth = hIsmMetaData->azimuth; + hIsmMetaData->last_true_elevation = hIsmMetaData->elevation; } /* save number of metadata bits read */ @@ -421,12 +411,7 @@ ivas_error ivas_ism_metadata_dec( } else /* BFI */ { - /* "*nISms", "hIsmMeta->azimuth" and "hIsmMeta->elevation" are recycled from the last frame */ - for ( ch = 0; ch < *nchan_transport; ch++ ) - { - hIsmMeta[ch]->ism_metadata_flag = hIsmMeta[ch]->last_ism_metadata_flag; - } - for ( ; ch < num_obj; ch++ ) + for ( ch = 0; ch < nchan_ism; ch++ ) { hIsmMeta[ch]->last_ism_metadata_flag = hIsmMeta[ch]->ism_metadata_flag; } @@ -435,27 +420,29 @@ ivas_error ivas_ism_metadata_dec( if ( ism_mode == ISM_MODE_PARAM ) { - for ( ch = 0; ch < num_obj; ch++ ) + for ( ch = 0; ch < nchan_ism; ch++ ) { hParamIsm->azi_index[ch] = hParamIsm->azi_index[ch] + hParamIsm->last_az_sgn[ch] * hParamIsm->last_az_diff[ch]; - /*hParamIsm->azi_index[ch] = hParamIsm->azi_index[ch] % hParamIsm->az_alpha[ch];*/ - hParamIsm->azi_index[ch] = hParamIsm->azi_index[ch]; hParamIsm->ele_index[ch] = hParamIsm->ele_index[ch] + hParamIsm->last_el_sgn[ch] * hParamIsm->last_el_diff[ch]; - /*hParamIsm->ele_index[ch] = hParamIsm->ele_index[ch] % hParamIsm->ele_alpha;*/ - hParamIsm->ele_index[ch] = hParamIsm->ele_index[ch]; - hIsmMeta[ch]->last_azimuth_idx = hParamIsm->azi_index[ch]; - hIsmMeta[ch]->last_elevation_idx = hParamIsm->ele_index[ch]; + hIsmMeta[ch]->position_angle.last_angle1_idx = hParamIsm->azi_index[ch]; + hIsmMeta[ch]->position_angle.last_angle2_idx = hParamIsm->ele_index[ch]; } } } + if ( hISMDTX.ism_dtx_hangover_cnt < IVAS_ISM_DTX_HO_MAX ) + { + ism_metadata_smooth( hIsmMeta, ism_total_brate, nchan_ism ); + hISMDTX.ism_dtx_hangover_cnt += 1; + } + /*----------------------------------------------------------------* * Configuration and decision about bitrates per channel *----------------------------------------------------------------*/ if ( !bfi ) { - if ( ( error = ivas_ism_config( ism_total_brate, *nchan_transport, num_obj, 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, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata ) ) != IVAS_ERR_OK ) { return error; } @@ -464,9 +451,14 @@ ivas_error ivas_ism_metadata_dec( { hIsmMeta[ch]->last_ism_metadata_flag = hIsmMeta[ch]->ism_metadata_flag; +#ifdef FIX_419_ISM_BRATE_SW_DTX + hSCE[ch]->hCoreCoder[0]->low_rate_mode = 0; +#endif if ( ism_mode == ISM_MODE_DISC ) { +#ifndef FIX_419_ISM_BRATE_SW_DTX hSCE[ch]->hCoreCoder[0]->low_rate_mode = 0; +#endif if ( hIsmMeta[ch]->ism_metadata_flag == 0 && localVAD[ch] == 0 && ism_metadata_flag_global ) { hSCE[ch]->hCoreCoder[0]->low_rate_mode = 1; @@ -477,7 +469,7 @@ ivas_error ivas_ism_metadata_dec( hSCE[ch]->hCoreCoder[0]->total_brate = total_brate[ch]; } - for ( ; ch < num_obj; ch++ ) + for ( ; ch < nchan_ism; ch++ ) { hIsmMeta[ch]->last_ism_metadata_flag = hIsmMeta[ch]->ism_metadata_flag; } @@ -486,32 +478,41 @@ ivas_error ivas_ism_metadata_dec( { for ( ch = 0; ch < *nchan_transport; ch++ ) { - hSCE[ch]->element_brate = hSCE[ch]->last_element_brate; hSCE[ch]->hCoreCoder[0]->total_brate = hSCE[ch]->hCoreCoder[0]->last_total_brate; } } + /*----------------------------------------------------------------* + * Set bitsream pointers + *----------------------------------------------------------------*/ + /* set the bitstream pointer to its original position */ st0->bit_stream = bstr_orig; st0->next_bit_pos = next_bit_pos_orig; - /* set bitstream pointers for each ISm */ + /* set bitstream pointers for each ISM */ for ( ch = 1; ch < *nchan_transport; ch++ ) { hSCE[ch]->hCoreCoder[0]->bit_stream = hSCE[ch - 1]->hCoreCoder[0]->bit_stream + ( hSCE[ch - 1]->hCoreCoder[0]->total_brate / FRAMES_PER_SEC ); } -#ifdef PARAM_ISM_DTX_CNG + /*----------------------------------------------------------------* + * Updates + *----------------------------------------------------------------*/ + + set_s( md_diff_flag, 1, nchan_ism ); + + update_last_metadata( nchan_ism, hIsmMeta, md_diff_flag ); + for ( ch = 0; ch < *nchan_transport; ch++ ) { - hSCE[ch]->hCoreCoder[0]->cng_paramISM_flag = 0; + hSCE[ch]->hCoreCoder[0]->cng_ism_flag = 0; } -#endif pop_wmops(); - return error; + return IVAS_ERR_OK; } @@ -530,17 +531,23 @@ ivas_error ivas_ism_metadata_dec_create( int16_t ch; ivas_error error; - /* allocate ISm metadata handles */ + /* allocate ISM metadata handles */ for ( ch = 0; ch < MAX_NUM_OBJECTS; ch++ ) { if ( ( st_ivas->hIsmMetaData[ch] = (ISM_METADATA_HANDLE) malloc( sizeof( ISM_METADATA_FRAME ) ) ) == NULL ) { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for ISm MetaData\n" ) ); + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for ISM MetaData\n" ) ); } st_ivas->hIsmMetaData[ch]->last_ism_metadata_flag = 0; - st_ivas->hIsmMetaData[ch]->last_azimuth_idx = 0; - st_ivas->hIsmMetaData[ch]->last_elevation_idx = 1 << ( ISM_ELEVATION_NBITS - 1 ); + st_ivas->hIsmMetaData[ch]->position_angle.last_angle1_idx = 0; + st_ivas->hIsmMetaData[ch]->position_angle.last_angle2_idx = 1 << ( ISM_ELEVATION_NBITS - 1 ); + st_ivas->hIsmMetaData[ch]->orientation_angle.last_angle1_idx = 0; + st_ivas->hIsmMetaData[ch]->orientation_angle.last_angle2_idx = 1 << ( ISM_ELEVATION_NBITS - 1 ); + st_ivas->hIsmMetaData[ch]->last_radius_idx = 8; /* Init to radius 1.0 */ + + st_ivas->hIsmMetaData[ch]->last_true_azimuth = 0; + st_ivas->hIsmMetaData[ch]->last_true_elevation = 0; ivas_ism_reset_metadata( st_ivas->hIsmMetaData[ch] ); } @@ -550,5 +557,400 @@ ivas_error ivas_ism_metadata_dec_create( return error; } + st_ivas->hISMDTX.ism_dtx_hangover_cnt = IVAS_ISM_DTX_HO_MAX; + return IVAS_ERR_OK; } + + +/*------------------------------------------------------------------------- + * decode_angle_indices() + * + * Decoding of an angle + *-------------------------------------------------------------------------*/ + +static void decode_angle_indices( + DEC_CORE_HANDLE st0, /* i/o: bitstream handle */ + ISM_METADATA_ANGLE_HANDLE angle, /* i/o: angle handle */ + int16_t *flag_abs_angle1 /* o : Azimuth/yaw encoding mode */ +) +{ + int16_t idx_angle1, nbits_diff_angle1, diff, sgn; + int16_t idx_angle2, nbits_diff_angle2; + + /*----------------------------------------------------------------* + * Azimuth/yaw decoding and dequantization + *----------------------------------------------------------------*/ + + /* Decode azimuth/yaw index */ + if ( get_next_indice( st0, 1 ) == 1 ) /* azimuth_abs_flag */ + { + idx_angle1 = get_next_indice( st0, ISM_AZIMUTH_NBITS ); + *flag_abs_angle1 = 1; + } + else + { + diff = 0; + sgn = 1; + + if ( get_next_indice( st0, 1 ) == 0 ) + { + nbits_diff_angle1 = 1; + } + else + { + nbits_diff_angle1 = 1; + + if ( get_next_indice( st0, 1 ) == 1 ) /* negative sign */ + { + sgn = -1; + } + + nbits_diff_angle1++; + + /* read until the stop bit */ + while ( ( nbits_diff_angle1 < ISM_AZIMUTH_NBITS - 1 ) && ( get_next_indice( st0, 1 ) == 1 ) ) + { + diff++; + nbits_diff_angle1++; + } + + if ( nbits_diff_angle1 < ISM_AZIMUTH_NBITS - 1 ) + { + /* count stop bit */ + nbits_diff_angle1++; + } + } + idx_angle1 = angle->last_angle1_idx + sgn * diff; + } + + /* azimuth/yaw is on a circle - check for diff coding for -180° -> 180° and vice versa changes */ + if ( idx_angle1 > ( 1 << ISM_AZIMUTH_NBITS ) - 1 ) + { + idx_angle1 -= ( 1 << ISM_AZIMUTH_NBITS ) - 1; /* +180° -> -180° */ + } + else if ( idx_angle1 < 0 ) + { + idx_angle1 += ( 1 << ISM_AZIMUTH_NBITS ) - 1; /* -180° -> +180° */ + } + + /* +180° == -180° */ + if ( idx_angle1 == ( 1 << ISM_AZIMUTH_NBITS ) - 1 ) + { + idx_angle1 = 0; + } + + /* sanity check in case of FER or BER */ + if ( idx_angle1 < 0 || idx_angle1 > ( 1 << ISM_AZIMUTH_NBITS ) - 1 ) + { + idx_angle1 = angle->last_angle1_idx; + } + + /*----------------------------------------------------------------* + * Elevation/pitch decoding and dequantization + *----------------------------------------------------------------*/ + + /* Decode elevation/pitch index */ + if ( *flag_abs_angle1 == 0 && get_next_indice( st0, 1 ) == 1 ) /* elevation_abs_flag */ + { + idx_angle2 = get_next_indice( st0, ISM_ELEVATION_NBITS ); + } + else + { + diff = 0; + sgn = 1; + + if ( get_next_indice( st0, 1 ) == 0 ) + { + nbits_diff_angle2 = 1; + } + else + { + nbits_diff_angle2 = 1; + + if ( get_next_indice( st0, 1 ) == 1 ) /* negative sign */ + { + sgn = -1; + } + + nbits_diff_angle2++; + + /* read until the stop bit */ + while ( ( nbits_diff_angle2 < ISM_ELEVATION_NBITS ) && ( get_next_indice( st0, 1 ) == 1 ) ) + { + diff++; + nbits_diff_angle2++; + } + + if ( nbits_diff_angle2 < ISM_ELEVATION_NBITS ) + { + /* count stop bit */ + nbits_diff_angle2++; + } + } + + idx_angle2 = angle->last_angle2_idx + sgn * diff; + } + + /* sanity check in case of FER or BER */ + if ( idx_angle2 < 0 || idx_angle2 > ( 1 << ISM_ELEVATION_NBITS ) - 1 ) + { + idx_angle2 = angle->last_angle2_idx; + } + + /*----------------------------------------------------------------* + * Final updates + *----------------------------------------------------------------*/ + + angle->last_angle1_idx = idx_angle1; + angle->last_angle2_idx = idx_angle2; + + return; +} + + +/*------------------------------------------------------------------------- + * decode_radius() + * + * Radius decoding and dequantization + *-------------------------------------------------------------------------*/ + +static int16_t decode_radius( + DEC_CORE_HANDLE st0, /* i/o: bitstream handle */ + int16_t *last_radius_idx, /* i/o: last radius index */ + int16_t *flag_abs_radius /* o : Radius encoding mode */ +) +{ + int16_t idx_radius, nbits_diff_radius, diff, sgn; + + /* Decode radius index */ + if ( get_next_indice( st0, 1 ) == 1 ) /* elevation_abs_flag */ + { + *flag_abs_radius = 1; + idx_radius = get_next_indice( st0, ISM_RADIUS_NBITS ); + } + else + { + diff = 0; + sgn = 1; + + if ( get_next_indice( st0, 1 ) == 0 ) + { + nbits_diff_radius = 1; + } + else + { + nbits_diff_radius = 1; + + if ( get_next_indice( st0, 1 ) == 1 ) /* negative sign */ + { + sgn = -1; + } + + nbits_diff_radius++; + + /* read until the stop bit */ + while ( ( nbits_diff_radius < ISM_RADIUS_NBITS ) && ( get_next_indice( st0, 1 ) == 1 ) ) + { + diff++; + nbits_diff_radius++; + } + + if ( nbits_diff_radius < ISM_RADIUS_NBITS ) + { + /* count stop bit */ + nbits_diff_radius++; + } + } + idx_radius = *last_radius_idx + sgn * diff; + } + + /* sanity check in case of FER or BER */ + if ( idx_radius < 0 || idx_radius > ( 1 << ISM_RADIUS_NBITS ) - 1 ) + { + idx_radius = *last_radius_idx; + } + + /* Final updates */ + *last_radius_idx = idx_radius; + + return idx_radius; +} + + +/*-------------------------------------------------------------------* + * ivas_ism_metadata_sid_dec() + * + * Decode ISM metadata in SID frame + *-------------------------------------------------------------------*/ + +void ivas_ism_metadata_sid_dec( + SCE_DEC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */ + const int32_t ism_total_brate, /* i : ISms total bitrate */ + const int16_t bfi, /* i : bfi flag */ + const int16_t nchan_ism, /* i : number of objects */ + const int16_t nchan_transport, /* i : number of transport channels*/ + const ISM_MODE ism_mode, /* i : ISM mode */ + int16_t *flag_noisy_speech, /* o : noisy speech flag */ + int16_t *sce_id_dtx, /* o : SCE DTX ID */ + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + int16_t nb_bits_metadata[] /* o : number of metadata bits */ +) +{ + int16_t i, ch, last_bit_pos; + float q_step, q_step_border; + int16_t idx, idx_azimuth, idx_elevation; + int16_t nBits_azimuth, nBits_elevation, nBits_coh, nBits_sce_id; + int16_t md_diff_flag[MAX_NUM_OBJECTS]; + ISM_MODE ism_mode_bstr; + DEC_CORE_HANDLE st0; + ISM_METADATA_HANDLE hIsmMetaData; + int16_t next_bit_pos_orig; + uint16_t bstr_meta[IVAS_SID_5k2 / FRAMES_PER_SEC], *bstr_orig; + + if ( ism_total_brate == FRAME_NO_DATA ) + { + ism_metadata_smooth( hIsmMeta, ism_total_brate, nchan_ism ); + + return; + } + + /* initialization */ + st0 = hSCE[0]->hCoreCoder[0]; + + last_bit_pos = (int16_t) ( ( ism_total_brate / FRAMES_PER_SEC ) - 1 - SID_FORMAT_NBITS ); + bstr_orig = st0->bit_stream; + next_bit_pos_orig = st0->next_bit_pos; + st0->next_bit_pos = 0; + + /* reverse the bitstream for easier reading of indices */ + for ( i = 0; i < min( MAX_BITS_METADATA, last_bit_pos ); i++ ) + { + bstr_meta[i] = st0->bit_stream[last_bit_pos - i]; + } + st0->bit_stream = bstr_meta; + st0->total_brate = ism_total_brate; /* needed for BER detection in get_next_indice() */ + + if ( !bfi ) + { + /*----------------------------------------------------------------* + * ISm common signaling + *----------------------------------------------------------------*/ + + /* number of objects was already read in ivas_ism_get_dtx_dec() */ + /* update the position in the bitstream */ + st0->next_bit_pos += nchan_ism; + + /* read SID metadata flag( one per object ) */ + for ( ch = 0; ch < nchan_ism; ch++ ) + { + md_diff_flag[ch] = get_next_indice( st0, 1 ); + } + + /*----------------------------------------------------------------* + * Set quantization bits based on the number of coded objects + *----------------------------------------------------------------*/ + + ivas_get_ism_sid_quan_bitbudget( nchan_ism, &nBits_azimuth, &nBits_elevation, &q_step, &q_step_border, &nBits_coh, &nBits_sce_id ); + + /*----------------------------------------------------------------* + * Spatial parameters, loop over TCs - 1 + *----------------------------------------------------------------*/ + + *flag_noisy_speech = 0; + *sce_id_dtx = 0; + + /* read ISM mode flag to explicitly signal number of spatial parameters */ + if ( nchan_ism > 2 ) + { + idx = get_next_indice( st0, 1 ); + ism_mode_bstr = (ISM_MODE) ( idx + 1 ); + /* note: ISM mode was already read and used for configuration in in ivas_ism_dtx_dec() */ + + if ( ism_mode_bstr == ISM_MODE_PARAM ) + { + /* read noisy speech flag */ + *flag_noisy_speech = get_next_indice( st0, 1 ); + nBits_sce_id = 1; + } + } + + if ( nchan_transport > 1 ) + { + /* read sce id */ + *sce_id_dtx = get_next_indice( st0, nBits_sce_id ); + + /* decode the coherence */ + for ( ch = 0; ch < nchan_transport; ch++ ) + { + if ( ch == *sce_id_dtx ) + { + hSCE[ch]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence = 1.0f; + continue; + } + + idx = get_next_indice( st0, nBits_coh ); + hSCE[ch]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence = (float) ( idx ) / (float) ( ( 1 << nBits_coh ) - 1 ); + } + } +#ifndef FIX_ISM_DTX_CNG_BWIDTH_ALT + else + { + *sce_id_dtx = 0; + } +#endif + + if ( ism_mode == ISM_MODE_PARAM ) + { + hSCE[*sce_id_dtx]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence = hSCE[!*sce_id_dtx]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence; + } + + /*----------------------------------------------------------------* + * Metadata decoding and dequantization, loop over all objects + *----------------------------------------------------------------*/ + + for ( ch = 0; ch < nchan_ism; ch++ ) + { + hIsmMetaData = hIsmMeta[ch]; + + if ( md_diff_flag[ch] == 1 ) + { + /* Azimuth decoding */ + idx_azimuth = get_next_indice( st0, nBits_azimuth ); + hIsmMetaData->azimuth = ism_dequant_meta( idx_azimuth, ism_azimuth_borders, q_step, q_step_border, 1 << nBits_azimuth ); + + /* Elevation decoding */ + idx_elevation = get_next_indice( st0, nBits_elevation ); + hIsmMetaData->elevation = ism_dequant_meta( idx_elevation, ism_elevation_borders, q_step, q_step_border, 1 << nBits_elevation ); + + /* update last indexes to correspond to active frames coding */ + if ( nBits_azimuth > ISM_AZIMUTH_NBITS ) + { + hIsmMetaData->position_angle.last_angle1_idx = idx_azimuth >> ( nBits_azimuth - ISM_AZIMUTH_NBITS ); + hIsmMetaData->position_angle.last_angle2_idx = idx_elevation >> ( nBits_elevation - ISM_ELEVATION_NBITS ); + } + else + { + hIsmMetaData->position_angle.last_angle1_idx = idx_azimuth << ( ISM_AZIMUTH_NBITS - nBits_azimuth ); + hIsmMetaData->position_angle.last_angle2_idx = idx_elevation << ( ISM_ELEVATION_NBITS - nBits_elevation ); + } + + /* save for smoothing metadata evolution */ + hIsmMetaData->last_true_azimuth = hIsmMetaData->azimuth; + hIsmMetaData->last_true_elevation = hIsmMetaData->elevation; + } + } + + /* take into account padding bits as metadata bits to keep later bitrate checks valid */ + nb_bits_metadata[*sce_id_dtx] = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC; + + /* set the bitstream pointer to its original position */ + st0->bit_stream = bstr_orig; + st0->next_bit_pos = next_bit_pos_orig; + } + + /* smooth the metadata evolution */ + ism_metadata_smooth( hIsmMeta, ism_total_brate, nchan_ism ); + + return; +} diff --git a/lib_dec/ivas_ism_param_dec.c b/lib_dec/ivas_ism_param_dec.c index 81a4744726d7805f543e3d7d2b3feec0c2c9cad2..244bf1f3987925f4b01f3876d3a578d598b9068f 100644 --- a/lib_dec/ivas_ism_param_dec.c +++ b/lib_dec/ivas_ism_param_dec.c @@ -51,6 +51,8 @@ static void ivas_param_ism_dec_dequant_DOA( DIRAC_DEC_HANDLE hDirAC /* i/o: decoder DirAC handle */ + , + const int16_t nchan_ism /* i : number of ISM channels */ ) { int16_t i; @@ -58,13 +60,13 @@ static void ivas_param_ism_dec_dequant_DOA( hParamIsm = hDirAC->hParamIsm; - assert( hParamIsm->num_obj <= MAX_NUM_OBJECTS ); + assert( nchan_ism <= MAX_NUM_OBJECTS ); /* Get the azimuth and elevation values */ - for ( i = 0; i < hParamIsm->num_obj; i++ ) + for ( i = 0; i < nchan_ism; i++ ) { - hDirAC->azimuth_values[i] = ism_dequant_meta( hParamIsm->azi_index[i], ism_azimuth_borders, 1 << ISM_AZIMUTH_NBITS ); - hDirAC->elevation_values[i] = ism_dequant_meta( hParamIsm->ele_index[i], ism_elevation_borders, 1 << ISM_ELEVATION_NBITS ); + hDirAC->azimuth_values[i] = ism_dequant_meta( hParamIsm->azi_index[i], ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS ); + hDirAC->elevation_values[i] = ism_dequant_meta( hParamIsm->ele_index[i], ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS ); } return; @@ -157,10 +159,9 @@ static void ivas_ism_get_proto_matrix( static void ivas_param_ism_compute_mixing_matrix( - DIRAC_DEC_HANDLE hDirAC, /* i/o: decoder DirAC handle */ -#ifdef PARAM_ISM_DTX_CNG + 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 */ -#endif float Cldfb_RealBuffer_in[PARAM_ISM_MAX_DMX][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float Cldfb_ImagBuffer_in[PARAM_ISM_MAX_DMX][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float direct_response[MAX_NUM_OBJECTS][PARAM_ISM_MAX_CHAN], @@ -185,16 +186,12 @@ static void ivas_param_ism_compute_mixing_matrix( proto_matrix = hDirAC->hParamIsmRendering->proto_matrix; - assert( ( hDirAC->hParamIsm->num_obj == 3 ) || ( hDirAC->hParamIsm->num_obj == 4 ) ); + assert( ( nchan_ism == 3 ) || ( nchan_ism == 4 ) ); assert( nchan_transport == 2 ); -#ifdef PARAM_ISM_DTX_CNG if ( hDirAC->hParamIsm->flag_noisy_speech || hISMDTX.dtx_flag ) -#else - if ( hDirAC->hParamIsm->flag_noisy_speech ) -#endif { - num_wave = hDirAC->hParamIsm->num_obj; + num_wave = nchan_ism; } else { @@ -214,11 +211,7 @@ static void ivas_param_ism_compute_mixing_matrix( { set_zero( cy_diag_tmp[w], nchan_out_woLFE ); -#ifdef PARAM_ISM_DTX_CNG if ( hDirAC->hParamIsm->flag_noisy_speech || hISMDTX.dtx_flag ) -#else - if ( hDirAC->hParamIsm->flag_noisy_speech ) -#endif { dir_res_ptr = direct_response[w]; } @@ -257,13 +250,9 @@ static void ivas_param_ism_compute_mixing_matrix( set_zero( cy_diag, nchan_out_woLFE ); for ( w = 0; w < num_wave; w++ ) { -#ifdef PARAM_ISM_DTX_CNG if ( hDirAC->hParamIsm->flag_noisy_speech || hISMDTX.dtx_flag ) -#else - if ( hDirAC->hParamIsm->flag_noisy_speech ) -#endif { - direct_power[w] = ( 1.0f / hDirAC->hParamIsm->num_obj ) * ref_power; + direct_power[w] = ( 1.0f / nchan_ism ) * ref_power; } else { @@ -409,7 +398,6 @@ ivas_error ivas_param_ism_dec_open( IVAS_OUTPUT_SETUP hOutSetup; AUDIO_CONFIG output_config; int32_t output_Fs; - int16_t nchan_out; ivas_error error; error = IVAS_ERR_OK; @@ -438,17 +426,8 @@ ivas_error ivas_param_ism_dec_open( output_Fs = st_ivas->hDecoderConfig->output_Fs; output_config = st_ivas->hDecoderConfig->output_config; - nchan_out = st_ivas->hDecoderConfig->nchan_out; - if ( output_config == AUDIO_CONFIG_EXTERNAL ) - { - hDirAC->hParamIsm->num_obj = nchan_out; - } - else - { - hDirAC->hParamIsm->num_obj = MAX_NUM_OBJECTS; - } - ivas_param_ism_config( hDirAC->hParamIsm ); + ivas_param_ism_config( hDirAC->hParamIsm, st_ivas->nchan_ism ); /*-----------------------------------------------------------------* * set input parameters @@ -480,7 +459,7 @@ ivas_error ivas_param_ism_dec_open( if ( output_config == AUDIO_CONFIG_EXTERNAL ) { /* nchan_out is essential for memory initialization for CLDFB Synthesis */ - st_ivas->hIntSetup.nchan_out_woLFE = hDirAC->hParamIsm->num_obj; + st_ivas->hIntSetup.nchan_out_woLFE = st_ivas->nchan_ism; st_ivas->hIntSetup.is_loudspeaker_setup = 1; } @@ -619,9 +598,7 @@ ivas_error ivas_param_ism_dec_open( } } -#ifdef PARAM_ISM_DTX_CNG st_ivas->hISMDTX.dtx_flag = 0; -#endif st_ivas->hDirAC = hDirAC; @@ -637,11 +614,19 @@ ivas_error ivas_param_ism_dec_open( *-------------------------------------------------------------------------*/ void ivas_param_ism_dec_close( - DIRAC_DEC_HANDLE hDirAC, /* i/o: decoder DirAC handle */ - AUDIO_CONFIG output_config /* i : output audio configuration */ + DIRAC_DEC_HANDLE *hDirAC_out, /* i/o: decoder DirAC handle */ + AUDIO_CONFIG output_config /* i : output audio configuration */ ) { int16_t i; + DIRAC_DEC_HANDLE hDirAC; + + if ( hDirAC_out == NULL || *hDirAC_out == NULL ) + { + return; + } + + hDirAC = *hDirAC_out; /* Config & CLDFB */ if ( hDirAC->hParamIsm != NULL ) @@ -798,7 +783,8 @@ void ivas_param_ism_dec_close( hDirAC->hParamIsmRendering = NULL; } - free( hDirAC ); + free( *hDirAC_out ); + *hDirAC_out = NULL; return; } @@ -817,9 +803,7 @@ void ivas_param_ism_dec( { int16_t ch, nchan_transport, nchan_out, nchan_out_woLFE, i; int16_t subframe_idx, slot_idx, index_slot, bin_idx; -#ifdef PARAM_ISM_DTX_CNG int32_t ivas_total_brate; -#endif /* CLDFB Input Buffers */ float Cldfb_RealBuffer_in[PARAM_ISM_MAX_DMX][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; @@ -846,7 +830,7 @@ void ivas_param_ism_dec( nchan_transport = st_ivas->nchan_transport; if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) { - nchan_out = st_ivas->hDirAC->hParamIsm->num_obj; + nchan_out = st_ivas->nchan_ism; nchan_out_woLFE = nchan_out; st_ivas->hDecoderConfig->nchan_out = nchan_out; } @@ -856,9 +840,7 @@ void ivas_param_ism_dec( nchan_out_woLFE = st_ivas->hIntSetup.nchan_out_woLFE; } -#ifdef PARAM_ISM_DTX_CNG ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; -#endif hSetup = st_ivas->hIntSetup; @@ -866,10 +848,9 @@ void ivas_param_ism_dec( /* Frame-level Processing */ /* De-quantization */ -#ifdef PARAM_ISM_DTX_CNG if ( !( ivas_total_brate == IVAS_SID_5k2 || ivas_total_brate == FRAME_NO_DATA ) ) { - ivas_param_ism_dec_dequant_DOA( hDirAC ); + ivas_param_ism_dec_dequant_DOA( hDirAC, st_ivas->nchan_ism ); ivas_param_ism_dec_dequant_powrat( hDirAC ); st_ivas->hISMDTX.dtx_flag = 0; } @@ -877,15 +858,11 @@ void ivas_param_ism_dec( { st_ivas->hISMDTX.dtx_flag = 1; } -#else - ivas_param_ism_dec_dequant_DOA( hDirAC ); - ivas_param_ism_dec_dequant_powrat( hDirAC ); -#endif /* obtain the direct response using EFAP */ if ( !( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) ) { - for ( i = 0; i < hDirAC->hParamIsm->num_obj; i++ ) + for ( i = 0; i < st_ivas->nchan_ism; i++ ) { efap_determine_gains( st_ivas->hEFAPdata, direct_response[i], hDirAC->azimuth_values[i], hDirAC->elevation_values[i], EFAP_MODE_EFAP ); } @@ -894,7 +871,7 @@ void ivas_param_ism_dec( { int16_t j; - for ( i = 0; i < hDirAC->hParamIsm->num_obj; i++ ) + for ( i = 0; i < st_ivas->nchan_ism; i++ ) { for ( j = 0; j < nchan_out_woLFE; j++ ) { @@ -943,11 +920,7 @@ void ivas_param_ism_dec( } /* Compute mixing matrix */ -#ifdef PARAM_ISM_DTX_CNG - 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 ); -#else - ivas_param_ism_compute_mixing_matrix( hDirAC, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, direct_response, nchan_transport, nchan_out_woLFE, 0, CLDFB_NO_COL_MAX, mixing_matrix ); -#endif + ivas_param_ism_compute_mixing_matrix( st_ivas->nchan_ism, hDirAC, st_ivas->hISMDTX, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, direct_response, nchan_transport, nchan_out_woLFE, 0, CLDFB_NO_COL_MAX, mixing_matrix ); /* subframe loop for synthesis*/ for ( subframe_idx = 0; subframe_idx < hDirAC->nb_subframes; subframe_idx++ ) @@ -1016,7 +989,7 @@ void ivas_param_ism_dec( ivas_param_ism_update_mixing_matrix( hDirAC, mixing_matrix, nchan_transport, nchan_out_woLFE ); /* store MetaData parameters */ - for ( ch = 0; ch < hDirAC->hParamIsm->num_obj; ch++ ) + for ( ch = 0; ch < st_ivas->nchan_ism; ch++ ) { if ( st_ivas->hDirAC->azimuth_values[ch] > 180.0f ) { @@ -1053,19 +1026,16 @@ void ivas_param_ism_params_to_masa_param_mapping( int16_t azimuth[2]; int16_t elevation[2]; float power_ratio[2]; -#ifdef PARAM_ISM_DTX_CNG int32_t ivas_total_brate; -#endif hDirAC = st_ivas->hDirAC; nBins = hDirAC->num_freq_bands; -#ifdef PARAM_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 ) ) { - ivas_param_ism_dec_dequant_DOA( hDirAC ); + ivas_param_ism_dec_dequant_DOA( hDirAC, st_ivas->nchan_ism ); ivas_param_ism_dec_dequant_powrat( hDirAC ); st_ivas->hISMDTX.dtx_flag = 0; } @@ -1073,14 +1043,9 @@ void ivas_param_ism_params_to_masa_param_mapping( { st_ivas->hISMDTX.dtx_flag = 1; } -#else - ivas_param_ism_dec_dequant_DOA( hDirAC ); - ivas_param_ism_dec_dequant_powrat( hDirAC ); -#endif - if ( hDirAC->hParamIsm->num_obj > 1 ) + if ( st_ivas->nchan_ism > 1 ) { -#ifdef PARAM_ISM_DTX_CNG if ( st_ivas->hISMDTX.dtx_flag ) { float energy_ratio; @@ -1142,44 +1107,6 @@ void ivas_param_ism_params_to_masa_param_mapping( } } } -#else - hDirAC->numSimultaneousDirections = 2; - for ( band_idx = 0; band_idx < hDirAC->hParamIsm->nbands; band_idx++ ) - { - brange[0] = hDirAC->hParamIsm->band_grouping[band_idx]; - brange[1] = hDirAC->hParamIsm->band_grouping[band_idx + 1]; - - azimuth[0] = (int16_t) roundf( hDirAC->azimuth_values[hDirAC->hParamIsm->obj_indices[band_idx][0][0]] ); - elevation[0] = (int16_t) roundf( hDirAC->elevation_values[hDirAC->hParamIsm->obj_indices[band_idx][0][0]] ); - power_ratio[0] = hDirAC->power_ratios[band_idx][0][0]; - - azimuth[1] = (int16_t) roundf( hDirAC->azimuth_values[hDirAC->hParamIsm->obj_indices[band_idx][0][1]] ); - elevation[1] = (int16_t) roundf( hDirAC->elevation_values[hDirAC->hParamIsm->obj_indices[band_idx][0][1]] ); - power_ratio[1] = hDirAC->power_ratios[band_idx][0][1]; - - for ( sf_idx = 0; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ ) - { - for ( bin_idx = brange[0]; bin_idx < brange[1]; bin_idx++ ) - { - hDirAC->azimuth[sf_idx][bin_idx] = azimuth[0]; - hDirAC->elevation[sf_idx][bin_idx] = elevation[0]; - hDirAC->energy_ratio1[sf_idx][bin_idx] = power_ratio[0]; - hDirAC->azimuth2[sf_idx][bin_idx] = azimuth[1]; - hDirAC->elevation2[sf_idx][bin_idx] = elevation[1]; - hDirAC->energy_ratio2[sf_idx][bin_idx] = power_ratio[1]; - } - } - } - for ( sf_idx = 0; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ ) - { - for ( bin_idx = 0; bin_idx < nBins; bin_idx++ ) - { - hDirAC->spreadCoherence[sf_idx][bin_idx] = 0.0f; - hDirAC->spreadCoherence2[sf_idx][bin_idx] = 0.0f; - hDirAC->surroundingCoherence[sf_idx][bin_idx] = 0.0; - } - } -#endif } else { @@ -1201,137 +1128,3 @@ void ivas_param_ism_params_to_masa_param_mapping( return; } - - -#ifdef PARAM_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 */ - st0->next_bit_pos += hParamIsm->num_obj; - - /* 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 */ - for ( i = 0; i < hParamIsm->num_obj; i++ ) - { - /* 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 a965a0ffed38a43b5e3472da691aae20348293ff..1e60143cb43e0249d3d146fbf6120be3de2d9656 100644 --- a/lib_dec/ivas_ism_renderer.c +++ b/lib_dec/ivas_ism_renderer.c @@ -107,11 +107,11 @@ void ivas_ism_render( float tmp_output_f[MAX_OUTPUT_CHANNELS][L_FRAME48k]; float gains[MAX_NUM_OBJECTS][MAX_OUTPUT_CHANNELS]; float g1, g2; - int16_t num_objects, nchan_out_woLFE, lfe_index; + int16_t nchan_ism, nchan_out_woLFE, lfe_index; int16_t azimuth, elevation; float Rmat[3][3]; - num_objects = st_ivas->nchan_transport; + nchan_ism = st_ivas->nchan_ism; nchan_out_woLFE = st_ivas->hIntSetup.nchan_out_woLFE; lfe_index = 0; @@ -121,7 +121,7 @@ void ivas_ism_render( set_f( tmp_output_f[j], 0.0f, output_frame ); } - for ( i = 0; i < num_objects; i++ ) + for ( i = 0; i < nchan_ism; i++ ) { mvr2r( output_f[i], input_f[i], output_frame ); } @@ -137,7 +137,7 @@ void ivas_ism_render( QuatToRotMat( st_ivas->hHeadTrackData->Quaternions[st_ivas->hHeadTrackData->num_quaternions++], Rmat ); } - for ( i = 0; i < num_objects; i++ ) + for ( i = 0; i < nchan_ism; i++ ) { if ( st_ivas->intern_config == AUDIO_CONFIG_STEREO ) { diff --git a/lib_dec/ivas_lfe_dec.c b/lib_dec/ivas_lfe_dec.c index 55a68d892ba73518aaad01b8ba2e7c8ea9f569c1..5c250286eedfd2291b691c92b3587f71ea484674 100644 --- a/lib_dec/ivas_lfe_dec.c +++ b/lib_dec/ivas_lfe_dec.c @@ -477,19 +477,25 @@ ivas_error ivas_create_lfe_dec( *-------------------------------------------------------------------------*/ void ivas_lfe_dec_close( - LFE_DEC_HANDLE hLFE /* i/o: LFE decoder handle */ + LFE_DEC_HANDLE *hLFE /* i/o: LFE decoder handle */ ) { - free( hLFE->pWindow_state ); - hLFE->pWindow_state = NULL; + if ( hLFE == NULL || *hLFE == NULL ) + { + return; + } - if ( hLFE->lfe_delay_buf != NULL ) + free( ( *hLFE )->pWindow_state ); + ( *hLFE )->pWindow_state = NULL; + + if ( ( *hLFE )->lfe_delay_buf != NULL ) { - free( hLFE->lfe_delay_buf ); - hLFE->lfe_delay_buf = NULL; + free( ( *hLFE )->lfe_delay_buf ); + ( *hLFE )->lfe_delay_buf = NULL; } - free( hLFE ); + free( ( *hLFE ) ); + ( *hLFE ) = NULL; return; } diff --git a/lib_dec/ivas_masa_dec.c b/lib_dec/ivas_masa_dec.c index b8b7b74ffc51647d6d466e68ea325f111014fd4b..eead75925747f4c74be20decceb7fe52c3047f9e 100644 --- a/lib_dec/ivas_masa_dec.c +++ b/lib_dec/ivas_masa_dec.c @@ -47,22 +47,19 @@ /*-----------------------------------------------------------------------* * 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,9 +192,26 @@ ivas_error ivas_masa_decode( /* Remove already read bits from the bit budget */ hQMetaData->metadata_max_bits -= *nb_bits_read; +#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 ); + } + 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 ); + } + } + else + { - *nb_bits_read += ivas_qmetadata_dec_decode( hQMetaData, st->bit_stream, &st->next_bit_pos ); - +#endif + *nb_bits_read += ivas_qmetadata_dec_decode( hQMetaData, st->bit_stream, &st->next_bit_pos ); +#ifdef HR_METADATA + } +#endif /* Get direction decoding quality. EC 1 and 2 are handled by the default value. */ if ( hQMetaData->ec_flag == 2 ) { @@ -308,12 +322,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 +367,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 ) @@ -392,9 +400,18 @@ ivas_error ivas_masa_dec_open( *-----------------------------------------------------------------------*/ void ivas_masa_dec_close( - MASA_DECODER_HANDLE hMasa /* i/o: MASA metadata structure */ + MASA_DECODER_HANDLE *hMasa_out /* i/o: MASA metadata structure */ ) { + MASA_DECODER_HANDLE hMasa; + + if ( hMasa_out == NULL || *hMasa_out == NULL ) + { + return; + } + + hMasa = *hMasa_out; + /* Free spherical grid memory if in use */ if ( hMasa->data.sph_grid16 != NULL ) { @@ -402,13 +419,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 ) { @@ -436,8 +451,8 @@ void ivas_masa_dec_close( hMasa->hMasaLfeSynth = NULL; } - free( hMasa ); - hMasa = NULL; + free( *hMasa_out ); + *hMasa_out = NULL; return; } @@ -463,6 +478,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; @@ -492,7 +520,15 @@ static ivas_error ivas_masa_dec_config( ivas_set_qmetadata_maxbit_req( st_ivas->hQMetaData, st_ivas->ivas_format ); - masa_sample_rate_band_correction( &( hMasa->config ), hMasa->data.band_mapping, st_ivas->hQMetaData, st_ivas->hDecoderConfig->output_Fs ); + if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) + { + /* need to apply the sampling rate correction also for the EXT output MASA meta buffer */ + masa_sample_rate_band_correction( &( hMasa->config ), hMasa->data.band_mapping, st_ivas->hQMetaData, st_ivas->hDecoderConfig->output_Fs, hMasa->data.extOutMeta ); + } + else + { + masa_sample_rate_band_correction( &( hMasa->config ), hMasa->data.band_mapping, st_ivas->hQMetaData, st_ivas->hDecoderConfig->output_Fs, NULL ); + } return error; } @@ -532,7 +568,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 */ @@ -701,7 +737,7 @@ static uint16_t index_theta_phi_16( return idx_sph; } - +#endif static void index_16bits( IVAS_QMETADATA_HANDLE hQMetaData, @@ -716,8 +752,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 ); } } } @@ -1072,6 +1108,9 @@ ivas_error ivas_masa_dec_reconfigure( uint16_t *bit_stream; Decoder_State **sts; int32_t ivas_total_brate, last_ivas_total_brate; +#ifdef FIX_417_TD_DECORR_BRATE_SW + int16_t numCldfbAnalyses_old, numCldfbSyntheses_old; +#endif ivas_error error; error = IVAS_ERR_OK; @@ -1079,6 +1118,30 @@ ivas_error ivas_masa_dec_reconfigure( ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; last_ivas_total_brate = st_ivas->hDecoderConfig->last_ivas_total_brate; +#ifdef FIX_417_TD_DECORR_BRATE_SW + ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old ); +#endif + +#ifdef FIX_425_MASA_BRSW_RENDERER + /* 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 */ +#endif + /*-----------------------------------------------------------------* * Allocate and initialize SCE/CPE and other handles *-----------------------------------------------------------------*/ @@ -1135,6 +1198,39 @@ ivas_error ivas_masa_dec_reconfigure( } } } +#ifdef FIX_425_MASA_BRSW_RENDERER + 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 ); + } +#endif +#ifdef FIX_417_TD_DECORR_BRATE_SW + /*-----------------------------------------------------------------* + * TD Decorrelator + *-----------------------------------------------------------------*/ + + if ( st_ivas->hDiracDecBin != NULL ) + { + if ( ( error = ivas_td_decorr_reconfig_dec( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hDecoderConfig->output_Fs, &( st_ivas->hDiracDecBin->hTdDecorr ), &( st_ivas->hDiracDecBin->useTdDecorr ) ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + /*-----------------------------------------------------------------* + * CLDFB instances + *-----------------------------------------------------------------*/ + + if ( ( error = ivas_cldfb_dec_reconfig( st_ivas, st_ivas->nchan_transport, numCldfbAnalyses_old, numCldfbSyntheses_old ) ) != IVAS_ERR_OK ) + { + return error; + } + + /*-----------------------------------------------------------------* + * Set-up MASA coding elements and bitrates + *-----------------------------------------------------------------*/ +#endif ivas_masa_set_elements( ivas_total_brate, st_ivas->mc_mode, st_ivas->nchan_transport, st_ivas->hQMetaData, &tmp, &tmp, &tmp ); @@ -1148,6 +1244,212 @@ ivas_error ivas_masa_dec_reconfigure( * Determine MASA metadata from the SPAR metadata *-------------------------------------------------------------------*/ +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS +void ivas_spar_param_to_masa_param_mapping( + 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, 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]; + int16_t *band_grouping; + int16_t band_start, band_end; + float transportSignalEnergies[2][CLDFB_NO_CHANNELS_MAX]; + float transportSignalCrossCorrelation[CLDFB_NO_CHANNELS_MAX]; + float instEne; + float inCovarianceMtx[FOA_CHANNELS][FOA_CHANNELS]; + float foaCovarianceMtx[FOA_CHANNELS][FOA_CHANNELS]; + float Iy, Iz, Ix, E, azi, ele, I, ratio; + float diffuseGainX, diffuseGainY, diffuseGainZ, diffuseGainSum; + + /* Set values */ + hDirAC = st_ivas->hDirAC; + hDirAC->numSimultaneousDirections = 1; + hDiffuseDist = st_ivas->hDirAC->hDiffuseDist; + nchan_transport = st_ivas->nchan_transport; + band_grouping = hDirAC->band_grouping; + dirac_write_idx = hDirAC->dirac_read_idx; /* Mixing matrices, from which MASA meta is determined, already have the delay compensation */ + + /* Init arrays */ + for ( i = 0; i < FOA_CHANNELS; i++ ) + { + set_zero( inCovarianceMtx[i], FOA_CHANNELS ); + } + + /* Delay the SPAR mixing matrices to have them synced with the audio */ + if ( subframe < SPAR_META_DELAY_SUBFRAMES ) + { + mixer_mat_index = subframe + MAX_PARAM_SPATIAL_SUBFRAMES - SPAR_META_DELAY_SUBFRAMES + 1; + 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[subframe][band][i][j] = st_ivas->hSpar->hMdDec->mixer_mat_prev[mixer_mat_index][i][j][band]; + } + } + } + } + else + { + mixer_mat_index = subframe - SPAR_META_DELAY_SUBFRAMES; + 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[subframe][band][i][j] = st_ivas->hSpar->hMdDec->mixer_mat[i][j][band + mixer_mat_index * IVAS_MAX_NUM_BANDS]; + } + } + } + } + + /* Map the mixing matrices from the frequency bands to frequency bins */ + bin = 0; + 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++ ) + { + for ( i = 0; i < FOA_CHANNELS; i++ ) + { + for ( j = 0; j < FOA_CHANNELS; j++ ) + { + mixer_mat_sf_bins_real[subframe][bin][i][j] = mixer_mat_sf_bands_real[subframe][band][i][j]; + } + } + } + } + nBins = bin; + + /* Determine MASA metadata */ + /* 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 ); + + for ( slot = 0; slot < hDirAC->subframe_nbslots; slot++ ) + { + for ( bin = 0; bin < nBins; bin++ ) + { + for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) + { + 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 ) + { + 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 ); + } + + 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 ) + { + inCovarianceMtx[1][1] = transportSignalEnergies[1][bin]; + inCovarianceMtx[0][1] = transportSignalCrossCorrelation[bin]; + inCovarianceMtx[1][0] = inCovarianceMtx[0][1]; + } + + compute_foa_cov_matrix( foaCovarianceMtx, inCovarianceMtx, mixer_mat_sf_bins_real[subframe][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 ) + { + if ( nchan_transport == 1 ) + { + diffuseGainY = fabsf( mixer_mat_sf_bins_real[subframe][bin][1][1] ); + diffuseGainX = fabsf( mixer_mat_sf_bins_real[subframe][bin][3][2] ); + diffuseGainZ = fabsf( mixer_mat_sf_bins_real[subframe][bin][2][3] ); + } + else if ( nchan_transport == 2 ) + { + diffuseGainY = fabsf( mixer_mat_sf_bins_real[subframe][bin][1][1] * transportSignalEnergies[1][bin] ); + diffuseGainX = fabsf( mixer_mat_sf_bins_real[subframe][bin][3][2] * transportSignalEnergies[0][bin] ) + fabsf( mixer_mat_sf_bins_real[subframe][bin][3][1] * transportSignalEnergies[1][bin] ); + diffuseGainZ = fabsf( mixer_mat_sf_bins_real[subframe][bin][2][3] * transportSignalEnergies[0][bin] ) + fabsf( mixer_mat_sf_bins_real[subframe][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[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 ); + } + } + } + + return; +} +#else 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 */ @@ -1366,6 +1668,7 @@ void ivas_spar_param_to_masa_param_mapping( return; } +#endif /* Estimate FOA properties: foaCov = mixMtx * inCov * mixMtx' */ @@ -1407,7 +1710,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, @@ -1539,4 +1841,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 6bfddc78e64bc00e0462095141447baea2dc1637..65748bdf9558532621deff3270e518e416437120 100644 --- a/lib_dec/ivas_mc_param_dec.c +++ b/lib_dec/ivas_mc_param_dec.c @@ -1124,8 +1124,8 @@ void ivas_param_mc_dec_close( hParamMC->hoa_encoder = NULL; } - free( hParamMC ); - hParamMC = NULL; + free( *hParamMC_out ); + *hParamMC_out = NULL; return; } @@ -1328,6 +1328,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; +#ifdef FIX_431_PARAMMC_PLC_INTERPOLATOR + param_mc_compute_interpolator( hMetadataPMC->bAttackPresent, hMetadataPMC->attackIndex, PARAM_MC_MAX_NSLOTS, hParamMC->h_output_synthesis_params.interpolator ); +#endif } pop_wmops(); diff --git a/lib_dec/ivas_mcmasa_dec.c b/lib_dec/ivas_mcmasa_dec.c old mode 100644 new mode 100755 index f6d159083baa56a75cce8d2ae1d633d2dfc85979..59d215e22ca4abfb1e784903fc1bc055efe51da6 --- a/lib_dec/ivas_mcmasa_dec.c +++ b/lib_dec/ivas_mcmasa_dec.c @@ -58,10 +58,7 @@ ivas_error ivas_mcmasa_dec_reconfig( ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; /* close the old MASA instance */ - if ( st_ivas->hMasa != NULL ) - { - ivas_masa_dec_close( st_ivas->hMasa ); - } + ivas_masa_dec_close( &( st_ivas->hMasa ) ); /* get new McMASA settings */ ivas_mcmasa_setNumTransportChannels( &( st_ivas->nchan_transport ), &( st_ivas->element_mode_init ), ivas_total_brate ); @@ -79,7 +76,7 @@ ivas_error ivas_mcmasa_dec_reconfig( return error; } - st_ivas->sba_dirac_stereo_flag = ( st_ivas->nchan_transport == 1 && st_ivas->hOutSetup.output_config == AUDIO_CONFIG_STEREO ); + st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas ); if ( st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_MCMASA_MONO_STEREO ) { @@ -134,6 +131,16 @@ ivas_error ivas_mcmasa_dec_reconfig( } else { +#ifdef FIX_417_TD_DECORR_BRATE_SW + /* if necessary, close/open td-decorrs */ + if ( ( error = ivas_td_decorr_reconfig_dec( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hDecoderConfig->output_Fs, &( st_ivas->hDiracDecBin->hTdDecorr ), &( st_ivas->hDiracDecBin->useTdDecorr ) ) ) != IVAS_ERR_OK ) + { + return error; + } + + /* regularization factor is bitrate-dependent */ + st_ivas->hDiracDecBin->reqularizationFactor = configure_reqularization_factor( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate ); +#else /* the decision for useTdDecorr is done in ivas_dirac_dec_init_binaural_data(). here, comparing against the same condition. */ if ( st_ivas->hDiracDecBin->useTdDecorr != ( ivas_total_brate < IVAS_48k && st_ivas->nchan_transport == 1 ) ) { @@ -144,6 +151,7 @@ ivas_error ivas_mcmasa_dec_reconfig( return error; } } +#endif } } diff --git a/lib_dec/ivas_mct_core_dec.c b/lib_dec/ivas_mct_core_dec.c index 7e11b23c9a91da28664cd07c259ea63e26b6e429..6c5e6575a68a95f7771c605fdddc785335a3e4fc 100644 --- a/lib_dec/ivas_mct_core_dec.c +++ b/lib_dec/ivas_mct_core_dec.c @@ -70,7 +70,7 @@ void ivas_mct_side_bits( Decoder_State *st, *sts[MCT_MAX_CHANNELS]; nf_side_bits = 0; - nChannels = hMCT->nchan_out_woLFE + hMCT->num_lfe; + nChannels = hMCT->nchan_out_woLFE; /*initializations */ for ( cpe_id = 0, i = 0; cpe_id < nCPE; cpe_id++ ) @@ -88,7 +88,8 @@ void ivas_mct_side_bits( for ( ch = 0; ch < nChannels; ch++ ) { st = sts[ch]; - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE || st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -108,15 +109,14 @@ void ivas_mct_side_bits( availableBits = 0; ivas_mct_dec_mct( hMCT, sts, nChannels ); - /* availableBits = ((hMCT->mc_bitrate/50) - sts[0]->next_bit_pos); - availableBits -= NBBITS_MCT_RATIO * nChannels;*/ /*read channel bitrate ratios from bitstream*/ for ( ch = 0; ch < nChannels; ch++ ) { st = sts[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && hMCT->LFE_off ) || st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { chBitRatios[ch] = 0; st->bits_frame_channel = 0; @@ -189,7 +189,7 @@ void ivas_mct_core_dec( * Initializations *--------------------------------------------------------------------------------*/ - nChannels = hMCT->nchan_out_woLFE + hMCT->num_lfe; + nChannels = hMCT->nchan_out_woLFE; /*initializations */ for ( cpe_id = 0, i = 0; cpe_id < nCPE; cpe_id++ ) @@ -203,7 +203,8 @@ void ivas_mct_core_dec( for ( ch = 0, i = 0; ch < nChannels; ch++ ) { - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -232,7 +233,8 @@ void ivas_mct_core_dec( { st = sts[ch]; - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) /*indicates LFE */ + if ( + sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) /*indicates LFE */ { continue; } diff --git a/lib_dec/ivas_mct_dec.c b/lib_dec/ivas_mct_dec.c index 332455974c4bce1eefac40d4e61d6fa1ca7f3e9c..4d6f8343084bf4e1dc02862741c7351cd47389c5 100644 --- a/lib_dec/ivas_mct_dec.c +++ b/lib_dec/ivas_mct_dec.c @@ -106,10 +106,6 @@ ivas_error ivas_mct_dec( } } - if ( !st_ivas->bfi ) - { - hMCT->LFE_off = 0; /* in case of PLC, stick to LFE_off of previous frame; otherwise, the update happens in ivas_mdct_dec_side_bits_frame_channel() */ - } for ( cpe_id = 0; cpe_id < nCPE; cpe_id++ ) { @@ -131,9 +127,9 @@ ivas_error ivas_mct_dec( if ( !st_ivas->bfi ) { - ivas_mdct_dec_side_bits_frame_channel( st_ivas->hCPE[cpe_id], param_lpc[cpe_id], p_param[cpe_id], st_ivas->hCPE[0]->hCoreCoder[0], - &hMCT->LFE_off, nTnsBitsTCX10[cpe_id], param[cpe_id], 1, - ( ( cpe_id + 1 ) * CPE_CHANNELS > st_ivas->nchan_transport ) ); + ivas_mdct_dec_side_bits_frame_channel( st_ivas->hCPE[cpe_id], param_lpc[cpe_id], p_param[cpe_id], st_ivas->hCPE[0]->hCoreCoder[0], nTnsBitsTCX10[cpe_id], param[cpe_id], 1, + ( ( cpe_id + 1 ) * CPE_CHANNELS > hMCT->nchan_out_woLFE ) ); + st_ivas->BER_detect |= st_ivas->hCPE[cpe_id]->hCoreCoder[0]->BER_detect; st_ivas->BER_detect |= st_ivas->hCPE[cpe_id]->hCoreCoder[1]->BER_detect; @@ -156,7 +152,8 @@ ivas_error ivas_mct_dec( set_zero( x[n][1], L_FRAME48k / 2 ); } - ivas_mdct_core_invQ( st_ivas->hCPE[cpe_id], hMCT->LFE_off, nTnsBitsTCX10[cpe_id], p_param[cpe_id], param_lpc[cpe_id], param[cpe_id], + ivas_mdct_core_invQ( st_ivas->hCPE[cpe_id], + nTnsBitsTCX10[cpe_id], p_param[cpe_id], param_lpc[cpe_id], param[cpe_id], fUseTns[cpe_id], tnsData[cpe_id], x, x, Aq[cpe_id], NULL, 1 ); st_ivas->BER_detect |= st_ivas->hCPE[cpe_id]->hCoreCoder[0]->BER_detect; @@ -166,7 +163,6 @@ ivas_error ivas_mct_dec( /* MCT core decoder */ ivas_mct_core_dec( hMCT, st_ivas->hCPE, nCPE, output ); -#ifdef DISABLE_RES_CHANNELS_MCT /* for sba to stereo output disable any further processing for TCs > 2 as it is not needed*/ if ( st_ivas->sba_dirac_stereo_flag ) { @@ -178,7 +174,6 @@ ivas_error ivas_mct_dec( } } } -#endif /* MCT reconstruction and CoreCoder updates */ for ( cpe_id = 0; cpe_id < nCPE; cpe_id++ ) @@ -191,7 +186,8 @@ ivas_error ivas_mct_dec( x[n][1] = &output[n + cpe_id * CPE_CHANNELS][L_FRAME48k / 2]; } - ivas_mdct_core_tns_ns( hCPE, hMCT->LFE_off, fUseTns[cpe_id], tnsData[cpe_id], x, Aq[cpe_id], 1 ); + ivas_mdct_core_tns_ns( hCPE, + fUseTns[cpe_id], tnsData[cpe_id], x, Aq[cpe_id], 1 ); } if ( st_ivas->renderer_type == RENDERER_MC ) @@ -226,7 +222,8 @@ ivas_error ivas_mct_dec( x[n][1] = &output[n + cpe_id * CPE_CHANNELS][L_FRAME48k / 2]; } - ivas_mdct_core_reconstruct( hCPE, x, synth, hMCT->LFE_off, fUseTns[cpe_id], 1 ); + ivas_mdct_core_reconstruct( hCPE, x, synth, + fUseTns[cpe_id], 1 ); /*----------------------------------------------------------------* * CoreCoder Post-processing and updates @@ -234,10 +231,6 @@ ivas_error ivas_mct_dec( for ( n = 0; n < CPE_CHANNELS; n++ ) { - if ( sts[n]->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - break; - } if ( st_ivas->sba_dirac_stereo_flag ) { @@ -245,7 +238,7 @@ ivas_error ivas_mct_dec( } /* Postprocessing for ACELP/MDCT core switching and synchronization */ - if ( ( error = core_switching_post_dec( sts[n], synth[n], output[cpe_id * CPE_CHANNELS + n], hCPE->output_mem[1], 0, output_frame, 0 /*core_switching_flag*/, st_ivas->sba_dirac_stereo_flag, -1, hCPE->last_element_mode ) ) != IVAS_ERR_OK ) + if ( ( error = core_switching_post_dec( sts[n], synth[n], output[cpe_id * CPE_CHANNELS + n], hCPE->output_mem[1], st_ivas->ivas_format, 0, output_frame, 0 /*core_switching_flag*/, st_ivas->sba_dirac_stereo_flag, -1, hCPE->last_element_mode ) ) != IVAS_ERR_OK ) { return error; } @@ -279,6 +272,21 @@ ivas_error ivas_mct_dec( } #endif } + /* move channels after LFE to correct output for multi-channel MCT */ + if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ) + { + float tmp[L_FRAME48k]; + + /*save center channel output*/ + mvr2r( output[hMCT->nchan_out_woLFE - 1], tmp, output_frame ); + + for ( n = hMCT->nchan_out_woLFE - 1; n >= LFE_CHANNEL; n-- ) + { + mvr2r( output[n - 1], output[n + 1], output_frame ); + } + mvr2r( tmp, output[LFE_CHANNEL - 1], output_frame ); + set_zero( output[LFE_CHANNEL], output_frame ); + } #ifdef DEBUG_MODE_INFO for ( cpe_id = 0; cpe_id < nCPE; cpe_id++ ) @@ -314,7 +322,7 @@ ivas_error create_mct_dec( int16_t max_blocks; int16_t cpe_id; - /*-----------------------------------------------------------------* + /*--------------------------------------------------------- --------* * Allocate MCT handle *-----------------------------------------------------------------*/ @@ -328,20 +336,13 @@ ivas_error create_mct_dec( *-----------------------------------------------------------------*/ /* Determine active channels */ - if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ) - { - hMCT->num_lfe = st_ivas->hTransSetup.num_lfe; - hMCT->nchan_out_woLFE = st_ivas->nchan_transport - hMCT->num_lfe; /* LFE channel is coded separately */ - } - else if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC ) + if ( ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC ) || st_ivas->ivas_format == SBA_FORMAT ) { - hMCT->num_lfe = 0; hMCT->nchan_out_woLFE = st_ivas->nchan_transport; } - else if ( st_ivas->ivas_format == SBA_FORMAT ) + else if ( st_ivas->mc_mode == MC_MODE_MCT ) { - hMCT->num_lfe = 0; - hMCT->nchan_out_woLFE = st_ivas->nchan_transport; + hMCT->nchan_out_woLFE = st_ivas->nchan_transport - st_ivas->hTransSetup.num_lfe; } else { @@ -356,14 +357,11 @@ ivas_error create_mct_dec( for ( n = 0; n < CPE_CHANNELS; n++ ) { st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_REGULAR; - if ( ( hMCT->num_lfe > 0 ) && ( ( n + cpe_id * CPE_CHANNELS ) == LFE_CHANNEL ) ) - { - st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_LFE; - } } } /* in case we have an uneven number of transport channels, indicate last channel ID as inactive */ - if ( ( hMCT->nchan_out_woLFE + hMCT->num_lfe ) % 2 ) + if ( ( hMCT->nchan_out_woLFE ) % + 2 ) { st_ivas->hCPE[st_ivas->nCPE - 1]->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_IGNORE; } @@ -443,20 +441,13 @@ ivas_error mct_dec_reconfigure( if ( b_nchan_change ) { /* Determine active channels */ - if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ) + if ( ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC ) || st_ivas->ivas_format == SBA_FORMAT ) { - 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 ) + else if ( st_ivas->mc_mode == MC_MODE_MCT ) { - hMCT->num_lfe = 0; - hMCT->nchan_out_woLFE = st_ivas->nchan_transport; + hMCT->nchan_out_woLFE = st_ivas->nchan_transport - st_ivas->hTransSetup.num_lfe; } else { @@ -470,15 +461,12 @@ ivas_error mct_dec_reconfigure( for ( n = 0; n < CPE_CHANNELS; n++ ) { st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_REGULAR; - if ( ( hMCT->num_lfe > 0 ) && ( ( n + cpe_id * CPE_CHANNELS ) == LFE_CHANNEL ) ) - { - st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_LFE; - } } } /* in case we have an uneven number of transport channels, indicate last channel ID as inactive */ - if ( ( hMCT->nchan_out_woLFE + hMCT->num_lfe ) % 2 ) + if ( ( hMCT->nchan_out_woLFE ) % + 2 ) { st_ivas->hCPE[st_ivas->nCPE - 1]->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_IGNORE; } @@ -495,10 +483,11 @@ ivas_error mct_dec_reconfigure( st->total_brate = st_ivas->hCPE[cpe_id]->element_brate; - if ( !( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) ) + if ( !( + ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) ) { st->bits_frame_nominal = (int16_t) ( st_ivas->hCPE[cpe_id]->element_brate / FRAMES_PER_SEC ); - st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_flag, st->mct_chan_mode ); + st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_flag ); if ( st->igf ) { IGFDecSetMode( st->hIGFDec, st_ivas->hCPE[cpe_id]->element_brate, st->bwidth, st->element_mode, -1, -1, st->rf_flag ); @@ -709,7 +698,7 @@ static ivas_error ivas_mc_dec_reconfig( { nchan_hp20_old = nchan_transport_old; } - st_ivas->sba_dirac_stereo_flag = 0; /* needs to be after getNumChanSynthesis() */ + st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas ); /* renderer might have changed, reselect */ renderer_type_old = st_ivas->renderer_type; @@ -730,24 +719,14 @@ static ivas_error ivas_mc_dec_reconfig( if ( st_ivas->hParamMC != NULL ) { ivas_param_mc_dec_close( &st_ivas->hParamMC ); - st_ivas->hParamMC = NULL; /* remove ls conversion if it was allocated by ParamMC */ ivas_ls_setup_conversion_close( &st_ivas->hLsSetUpConversion ); } /* De-allocate McMasa-related handles */ - if ( st_ivas->hMasa != NULL ) - { - ivas_masa_dec_close( st_ivas->hMasa ); - st_ivas->hMasa = NULL; - } - - if ( st_ivas->hQMetaData != NULL ) - { - ivas_qmetadata_close( &st_ivas->hQMetaData ); - st_ivas->hQMetaData = NULL; - } + 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 ) @@ -783,32 +762,18 @@ static ivas_error ivas_mc_dec_reconfig( } /* De-allocate McMasa-related handles */ - if ( st_ivas->hMasa != NULL ) - { - ivas_masa_dec_close( st_ivas->hMasa ); - st_ivas->hMasa = NULL; - } - - if ( st_ivas->hQMetaData != NULL ) - { - ivas_qmetadata_close( &st_ivas->hQMetaData ); - st_ivas->hQMetaData = NULL; - } + ivas_masa_dec_close( &( st_ivas->hMasa ) ); + ivas_qmetadata_close( &st_ivas->hQMetaData ); if ( last_mc_mode == MC_MODE_MCT ) { if ( st_ivas->hMCT != NULL && st_ivas->nchan_transport <= CPE_CHANNELS ) { ivas_mct_dec_close( &st_ivas->hMCT ); - st_ivas->hMCT = NULL; } /* LFE handle */ - if ( st_ivas->hLFE != NULL ) - { - ivas_lfe_dec_close( st_ivas->hLFE ); - st_ivas->hLFE = NULL; - } + ivas_lfe_dec_close( &( st_ivas->hLFE ) ); } } else if ( st_ivas->mc_mode == MC_MODE_MCMASA ) @@ -842,18 +807,10 @@ static ivas_error ivas_mc_dec_reconfig( if ( last_mc_mode == MC_MODE_MCT ) { - if ( st_ivas->hMCT != NULL ) - { - ivas_mct_dec_close( &st_ivas->hMCT ); - st_ivas->hMCT = NULL; - } + ivas_mct_dec_close( &st_ivas->hMCT ); /* LFE handle */ - if ( st_ivas->hLFE != NULL ) - { - ivas_lfe_dec_close( st_ivas->hLFE ); - st_ivas->hLFE = NULL; - } + ivas_lfe_dec_close( &( st_ivas->hLFE ) ); } } @@ -921,18 +878,8 @@ static ivas_error ivas_mc_dec_reconfig( } } - st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( ivas_total_brate, st->igf, st->element_mode, st->mct_chan_mode ); - } - 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; + st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( ivas_total_brate, st->igf, st->element_mode ); } - if ( st_ivas->mc_mode == MC_MODE_MCMASA ) { uint8_t separateChannelEnabled; @@ -981,6 +928,8 @@ static ivas_error ivas_mc_dec_reconfig( return error; } + +#ifndef FIX_417_TD_DECORR_BRATE_SW /*-----------------------------------------------------------------* * CLDFB instances *-----------------------------------------------------------------*/ @@ -989,7 +938,7 @@ static ivas_error ivas_mc_dec_reconfig( { return error; } - +#endif /*-----------------------------------------------------------------* * Allocate the LFE handle that is coded seperately after the allocation of the core coders *-----------------------------------------------------------------*/ @@ -1015,9 +964,6 @@ static ivas_error ivas_mc_dec_reconfig( return error; } - /* 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]; set_zero( st_ivas->hLFE->prevsynth_buf, LFE_PLC_BUFLEN ); set_zero( st_ivas->hLFE->prior_out_buffer, L_FRAME48k ); @@ -1048,10 +994,9 @@ static ivas_error ivas_mc_dec_reconfig( } } } - else if ( ( st_ivas->renderer_type == RENDERER_DISABLE ) && ( st_ivas->hDirAC != NULL ) ) + else if ( st_ivas->renderer_type == RENDERER_DISABLE && st_ivas->hDirAC != NULL ) { - ivas_dirac_dec_close( st_ivas->hDirAC ); - st_ivas->hDirAC = NULL; + ivas_dirac_dec_close( &( st_ivas->hDirAC ) ); } } @@ -1070,17 +1015,9 @@ static ivas_error ivas_mc_dec_reconfig( ivas_binRenderer_close( &st_ivas->hBinRenderer ); } -#ifdef FIX_197_CREND_INTERFACE if ( ( st_ivas->hCrendWrapper != NULL ) && ( st_ivas->hCrendWrapper->hCrend != NULL ) && ( st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV && st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV_ROOM && ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD || st_ivas->hRenderConfig->roomAcoustics.late_reverb_on == 0 ) ) ) -#else - if ( st_ivas->hCrend != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV && st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV_ROOM && ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD || st_ivas->hRenderConfig->roomAcoustics.late_reverb_on == 0 ) ) ) -#endif { -#ifdef FIX_197_CREND_INTERFACE ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ) ); -#else - ivas_crend_close( st_ivas ); -#endif } if ( st_ivas->hBinRendererTd != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD ) ) @@ -1136,43 +1073,26 @@ static ivas_error ivas_mc_dec_reconfig( return error; } -#ifdef FIX_197_CREND_INTERFACE if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on ) { -#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC if ( ( error = ivas_rend_initCrendWrapper( &st_ivas->hCrendWrapper ) ) != IVAS_ERR_OK ) -#else - if ( ( st_ivas->hCrendWrapper = (CREND_WRAPPER_HANDLE) malloc( sizeof( CREND_WRAPPER ) ) ) == NULL ) -#endif { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend Wrapper\n" ); } -#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC st_ivas->hCrendWrapper->hCrend = NULL; st_ivas->hCrendWrapper->hHrtfCrend = NULL; -#endif if ( ( st_ivas->hCrendWrapper->hCrend = (CREND_HANDLE) malloc( sizeof( CREND_DATA ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend\n" ); } } -#else - if ( st_ivas->hCrend == NULL && st_ivas->hRenderConfig->roomAcoustics.late_reverb_on ) - { - if ( ( st_ivas->hCrend = (CREND_HANDLE) malloc( sizeof( CREND_DATA ) ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend\n" ); - } - } -#endif } -#ifdef FIX_197_CREND_INTERFACE else if ( st_ivas->hCrendWrapper == NULL && ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) ) { if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hDecoderConfig->output_config, - st_ivas->hRenderConfig, st_ivas->hDecoderConfig->Opt_Headrotation, + st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK ) { @@ -1180,15 +1100,6 @@ static ivas_error ivas_mc_dec_reconfig( } st_ivas->binaural_latency_ns = st_ivas->hCrendWrapper->binaural_latency_ns; } -#else - else if ( st_ivas->hCrend == NULL && ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) ) - { - if ( ivas_crend_open( st_ivas ) != IVAS_ERR_OK ) - { - return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "ivas_crend_open failed" ); - } - } -#endif } /* mono/stereo */ else if ( output_config == AUDIO_CONFIG_MONO || output_config == AUDIO_CONFIG_STEREO ) @@ -1212,5 +1123,28 @@ static ivas_error ivas_mc_dec_reconfig( #endif } +#ifdef FIX_417_TD_DECORR_BRATE_SW + /*-----------------------------------------------------------------* + * TD Decorrelator + *-----------------------------------------------------------------*/ + + if ( st_ivas->hDiracDecBin != NULL ) + { + if ( ( error = ivas_td_decorr_reconfig_dec( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hDecoderConfig->output_Fs, &( st_ivas->hDiracDecBin->hTdDecorr ), &( st_ivas->hDiracDecBin->useTdDecorr ) ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + /*-----------------------------------------------------------------* + * CLDFB instances + *-----------------------------------------------------------------*/ + + if ( ( error = ivas_cldfb_dec_reconfig( st_ivas, nchan_transport_old, numCldfbAnalyses_old, numCldfbSyntheses_old ) ) != IVAS_ERR_OK ) + { + return error; + } +#endif + return error; } diff --git a/lib_dec/ivas_mct_dec_mct.c b/lib_dec/ivas_mct_dec_mct.c index 7177785984335e307778d3166401851188d13e81..987a9cc72f25a60b4e820972aeb8ae6c4fcb4b8e 100644 --- a/lib_dec/ivas_mct_dec_mct.c +++ b/lib_dec/ivas_mct_dec_mct.c @@ -49,9 +49,7 @@ static void indexToChannelPair( MCT_DEC_BLOCK_DATA_HANDLE hBlock, const int16_t nChannels, - const int16_t pairIdx, - Decoder_State **sts /* i/o: decoder state structure */ -) + const int16_t pairIdx ) { int16_t ch1, ch2; int16_t tmpIdx = 0; @@ -60,10 +58,6 @@ static void indexToChannelPair( { for ( ch1 = 0; ch1 < ch2; ch1++ ) { - if ( sts[ch1]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch2]->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - continue; - } if ( tmpIdx == pairIdx ) { @@ -105,7 +99,8 @@ void ivas_mct_dec_mct( /*first get core and overlap info for all channels*/ for ( ch = 0; ch < nchan; ch++ ) { - if ( ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE ) && hMCT->currBlockDataCnt && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) + if ( + hMCT->currBlockDataCnt && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { hMCT->mc_global_ild[ch] = get_next_indice( sts[0], SMDCT_GLOBAL_ILD_BITS ); } @@ -119,7 +114,8 @@ void ivas_mct_dec_mct( { for ( ch = 0; ch < nchan; ch++ ) { - if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) + if ( + sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { hMCT->lowE_ch[ch] = get_next_indice( sts[0], 1 ); } @@ -128,7 +124,8 @@ void ivas_mct_dec_mct( for ( ch = 0; ch < nchan; ch++ ) { - if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) + if ( + sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { nchan_active++; } @@ -141,7 +138,7 @@ void ivas_mct_dec_mct( /*get channel pair index from BS*/ channelPairIndex = get_next_indice( sts[0], hMCT->bitsChannelPairIndex ); - indexToChannelPair( hBlock, nchan, channelPairIndex, sts ); + indexToChannelPair( hBlock, nchan, channelPairIndex ); /*point to decoder states of actual channels to read block pair bits*/ p_st[0] = sts[hBlock->ch1]; @@ -170,7 +167,8 @@ static void applyGlobalILD( int16_t nSubframes, L_subframeTCX; float qratio; - for ( ch = 0; ch < ( hMCT->nchan_out_woLFE + hMCT->num_lfe ); ch++ ) + for ( ch = 0; ch < ( hMCT->nchan_out_woLFE ); + ch++ ) { nSubframes = ( sts[ch]->core == TCX_20_CORE ) ? 1 : NB_DIV; L_subframeTCX = sts[ch]->hTcxDec->L_frameTCX / nSubframes; @@ -252,7 +250,7 @@ void mctStereoIGF_dec( float *p_x[CPE_CHANNELS][NB_DIV]; int16_t singleChEle[MCT_MAX_CHANNELS]; - set_s( singleChEle, 1, ( hMCT->nchan_out_woLFE + hMCT->num_lfe ) ); + set_s( singleChEle, 1, ( hMCT->nchan_out_woLFE ) ); for ( b = 0; b < hMCT->currBlockDataCnt; b++ ) { @@ -305,9 +303,10 @@ void mctStereoIGF_dec( } - if ( sum_s( singleChEle, ( hMCT->nchan_out_woLFE + hMCT->num_lfe ) ) != 0 ) + if ( sum_s( singleChEle, ( hMCT->nchan_out_woLFE ) ) != 0 ) { - for ( ch = 0; ch < ( hMCT->nchan_out_woLFE + hMCT->num_lfe ); ch++ ) + for ( ch = 0; ch < ( hMCT->nchan_out_woLFE ); + ch++ ) { if ( singleChEle[ch] ) { @@ -316,7 +315,7 @@ void mctStereoIGF_dec( { continue; } - if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE || st->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } diff --git a/lib_dec/ivas_mdct_core_dec.c b/lib_dec/ivas_mdct_core_dec.c index 7763290f8718b03ab40211b3ce781899be1b1996..843c739fbcb62c46c84ee168f5f6dc6bb8751ac9 100644 --- a/lib_dec/ivas_mdct_core_dec.c +++ b/lib_dec/ivas_mdct_core_dec.c @@ -35,6 +35,9 @@ #include "options.h" #include "prot.h" #include "rom_com.h" +#ifdef SNS_MSVQ +#include "ivas_rom_com.h" +#endif #ifdef DEBUGGING #include "debug.h" #endif @@ -162,22 +165,11 @@ static void dec_prm_tcx_sidebits( getTCXWindowing( st->core, st->last_core, st->element_mode, st->hTcxCfg, st0 ); st->hTcxDec->kernel_type[0] = st->hTcxDec->kernel_type[1] = MDCT_IV; - if ( st->element_mode == IVAS_CPE_MDCT && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) - { - st->hTcxDec->kernel_type[0] = get_next_indice( st0, st->last_core_from_bs != ACELP_CORE ? 2 : 1 ); - if ( st->core == TCX_10_CORE ) - { - st->hTcxDec->kernel_type[1] = 2 * ( st->hTcxDec->kernel_type[0] & 1 ) + get_next_indice( st0, 1 ); - } - } - - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) + st->hTcxDec->kernel_type[0] = get_next_indice( st0, st->last_core_from_bs != ACELP_CORE ? 2 : 1 ); + if ( st->core == TCX_10_CORE ) { - st->hTcxCfg->tcx_curr_overlap_mode = FULL_OVERLAP; - st->hTcxCfg->tcx_last_overlap_mode = FULL_OVERLAP; - st->hTcxCfg->last_aldo = 0; + st->hTcxDec->kernel_type[1] = 2 * ( st->hTcxDec->kernel_type[0] & 1 ) + get_next_indice( st0, 1 ); } - if ( st->core == TCX_20_CORE ) { st->transform_type[0] = st->transform_type[1] = TCX_20; @@ -298,7 +290,6 @@ void ivas_mdct_dec_side_bits_frame_channel( int16_t param_lpc[MCT_MAX_CHANNELS][NPRM_LPC_NEW], /* o : lpc_parameters */ int16_t p_param[CPE_CHANNELS][NB_DIV], /* o : pointer to param buffer */ Decoder_State *st0, /* i : pointer to bitstream handle */ - int16_t *LFE_off, /* o : flag if LFE has content */ int16_t nTnsBitsTCX10[CPE_CHANNELS][NB_DIV], /* o : number of bits for TNS */ int16_t param[CPE_CHANNELS][DEC_NPRM_DIV * NB_DIV], /* i/o: parameters buffer */ const int16_t MCT_flag, /* i : hMCT handle allocated (1) or not (0)*/ @@ -340,11 +331,7 @@ void ivas_mdct_dec_side_bits_frame_channel( continue; } st = sts[ch]; - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - *LFE_off = get_next_indice( st0, 1 ); - } - else if ( MCT_flag ) + if ( MCT_flag ) { tmp = get_next_indice( st0, 1 ); if ( tmp ) @@ -362,7 +349,7 @@ void ivas_mdct_dec_side_bits_frame_channel( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && *LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { sts[ch]->coder_type = INACTIVE; sts[ch]->side_bits_frame_channel = 0; @@ -384,13 +371,113 @@ void ivas_mdct_dec_side_bits_frame_channel( * SNS parameters *--------------------------------------------------------------------------------*/ +#ifdef SNS_MSVQ + sns_low_br_mode = 0; + skipped_first_channel = 0; + if ( !MCT_flag && sts[0]->sr_core == 25600 && ( ( hCPE->element_brate == IVAS_48k || hCPE->element_brate == IVAS_64k ) ) ) + { + param_lpc[0][0] = SNS_STEREO_MODE_LR; + param_lpc[0][1] = SNS_STEREO_MODE_LR; + param_lpc[0][2] = 0; + param_lpc[0][3] = 0; + if ( sts[0]->core == sts[1]->core ) + { + int16_t nSubframes; + nSubframes = ( sts[0]->core == TCX_20_CORE ) ? 1 : NB_DIV; + + for ( int16_t n = 0; n < nSubframes; ++n ) + { + param_lpc[0][n] = get_next_indice( st0, 1 ); + } + + /* zero side flags only get transmitted if needed */ + for ( int16_t n = 0; n < nSubframes; ++n ) + { + if ( param_lpc[0][n] == SNS_STEREO_MODE_MS ) + { + param_lpc[0][n + SNS_STEREO_MODE_OFFSET_INDICES / 2] = get_next_indice( st0, 1 ); + } + } + } + for ( ch = 0; ch < CPE_CHANNELS; ++ch ) + { + int16_t nSubframes; + int16_t idxIndices; + + st = sts[ch]; + nSubframes = ( st->core == TCX_20_CORE ) ? 1 : NB_DIV; + idxIndices = 0; + + for ( int16_t n = 0; n < nSubframes; ++n ) + { + const int16_t is_side = ch == 1 && param_lpc[0][n] == SNS_STEREO_MODE_MS; + const int16_t *bits = ( nSubframes == 1 ) ? ivas_sns_cdbks_tcx20_bits : ivas_sns_cdbks_tcx10_bits; + int16_t nStages = ( ( nSubframes == 1 ) ? SNS_MSVQ_NSTAGES_TCX20 : SNS_MSVQ_NSTAGES_TCX10 ); + + if ( is_side ) + { + /* check for zero-side flag */ + if ( param_lpc[0][n + SNS_STEREO_MODE_OFFSET_INDICES / 2] ) + { + continue; + } + nStages = SNS_MSVQ_NSTAGES_SIDE; + bits = ( nSubframes == 1 ) ? ivas_sns_cdbks_side_tcx20_bits : ivas_sns_cdbks_side_tcx10_bits; + } + for ( int16_t j = 0; j < nStages; ++j ) + { + /* plus one in index for stereo mode storage! */ + param_lpc[ch][j + idxIndices + SNS_STEREO_MODE_OFFSET_INDICES] = get_next_indice( st0, bits[j] ); + } + idxIndices += nStages; + } + } + } + else + { + for ( ch = 0; ch < CPE_CHANNELS; ch++ ) + { + st = sts[ch]; + + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + { + skipped_first_channel = 1; + continue; + } + + start_bit_pos_sns = st0->next_bit_pos; + + if ( ch == 0 || skipped_first_channel ) + { + /* read SNS stereo mode */ + param_lpc[0][0] = get_next_indice( st0, 1 ) << 1; + + /* read low br mode flag (if it is possible to be non-zero) */ + if ( sts[0]->element_brate == IVAS_48k && !( ( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 ) ) ) + { + sns_low_br_mode = get_next_indice( st0, 1 ); + } + } + + tmp = ch; + if ( ch == 1 && param_lpc[0][0] == 2 ) + { + tmp = 3; + } + + getLPCparam( st, ¶m_lpc[ch][0], st0, tmp, sns_low_br_mode && !( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 ) ); + + st->side_bits_frame_channel += st0->next_bit_pos - start_bit_pos_sns; + } + } +#else skipped_first_channel = 0; sns_low_br_mode = 0; for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && *LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { skipped_first_channel = 1; continue; @@ -404,7 +491,7 @@ void ivas_mdct_dec_side_bits_frame_channel( param_lpc[0][0] = get_next_indice( st0, 1 ) << 1; /* read low br mode flag (if it is possible to be non-zero) */ - if ( sts[0]->element_brate == IVAS_48k && !( ( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 ) || sts[1]->mct_chan_mode == MCT_CHAN_MODE_LFE ) ) + if ( sts[0]->element_brate == IVAS_48k && !( ( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 ) ) ) { sns_low_br_mode = get_next_indice( st0, 1 ); } @@ -420,6 +507,7 @@ void ivas_mdct_dec_side_bits_frame_channel( st->side_bits_frame_channel += st0->next_bit_pos - start_bit_pos_sns; } +#endif // SNS_MSVQ } return; @@ -434,7 +522,6 @@ void ivas_mdct_dec_side_bits_frame_channel( void ivas_mdct_core_invQ( CPE_DEC_HANDLE hCPE, /* i/o: CPE handle */ - const int16_t LFE_off, /* i : flag if LFE content */ int16_t nTnsBitsTCX10[CPE_CHANNELS][NB_DIV], /* i : number of TNS bits */ int16_t p_param[CPE_CHANNELS][NB_DIV], /* i : pointer to param buffer */ int16_t param_lpc[CPE_CHANNELS][NPRM_LPC_NEW], /* i : lpc parameters */ @@ -456,7 +543,11 @@ void ivas_mdct_core_invQ( int16_t *prm[CPE_CHANNELS]; /* LPC */ Word16 Aind[CPE_CHANNELS][M + 1]; +#ifdef SNS_MSVQ + float sns[CPE_CHANNELS][NB_DIV][M]; +#else float lsf[CPE_CHANNELS][( NB_DIV + 1 ) * M]; +#endif /* TCX */ float xn_buf[L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX]; int16_t tcx_offset[CPE_CHANNELS]; @@ -521,7 +612,7 @@ void ivas_mdct_core_invQ( { st = sts[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) /* indicates LFE with no content, or odd number of channels */ + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { st->total_brate = st->bits_frame_channel; continue; @@ -575,12 +666,6 @@ void ivas_mdct_core_invQ( /* PLC: [Common: mode decision] * PLC: Decide which Concealment to use. Update pitch lags if needed */ st->core = GetPLCModeDecision( st ); - - /*disable ACELP_PLC for LFE channel */ - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - st->core = st->last_core; - } } if ( ( !st->bfi || st->hTcxCfg->psychParamsCurrent == NULL ) && st->core > ACELP_CORE ) @@ -629,6 +714,33 @@ void ivas_mdct_core_invQ( * LPC PARAMETERS *--------------------------------------------------------------------------------*/ +#ifdef SNS_MSVQ + if ( bfi == 0 ) + { + if ( !MCT_flag && sts[0]->sr_core == 25600 && ( ( hCPE->element_brate == IVAS_48k || hCPE->element_brate == IVAS_64k ) ) ) + { + dequantize_sns( param_lpc, sns, sts ); + } + else + { + if ( sts[0]->core == TCX_20_CORE && sts[1]->core == TCX_20_CORE && sts[0]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) + { + sns_avq_dec_stereo( param_lpc[0], param_lpc[1], &sns[0][0][0], &sns[1][0][0] ); + } + else + { + for ( ch = 0; ch < CPE_CHANNELS; ch++ ) + { + st = sts[ch]; + if ( st->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) + { + sns_avq_dec( param_lpc[ch], sns[ch], st->numlpc ); + } + } + } + } + } +#else if ( bfi == 0 ) { if ( sts[0]->core == TCX_20_CORE && sts[1]->core == TCX_20_CORE && sts[0]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) @@ -647,6 +759,8 @@ void ivas_mdct_core_invQ( } } } +#endif + /*--------------------------------------------------------------* * Rate switching @@ -670,7 +784,7 @@ void ivas_mdct_core_invQ( { st = sts[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) /* indicates LFE with no content, or odd number of channels */ + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { set_f( x[ch][0], 0.f, st->hTcxCfg->tcx_coded_lines ); /* usually set in decoder_tcx_invQ(), needed for concealment */ @@ -690,7 +804,11 @@ void ivas_mdct_core_invQ( /* Stability Factor */ if ( !bfi ) { +#ifdef SNS_MSVQ + mvr2r( sns[ch][k], &Aq[ch][k * M], M ); +#else mvr2r( &lsf[ch][( k + 1 ) * M], &Aq[ch][k * M], M ); +#endif } else { @@ -726,11 +844,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 ); } } - - 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 ); - } } pop_wmops(); @@ -748,7 +861,6 @@ void ivas_mdct_core_reconstruct( CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */ float *x[][NB_DIV], /* i/o: synthesis @internal_FS */ float signal_outFB[CPE_CHANNELS][L_FRAME_PLUS], /* o : synthesis @output_FS */ - const int16_t LFE_off, /* i : flag if LFE content */ int16_t fUseTns[CPE_CHANNELS][NB_DIV], /* i : flage TNS enabled */ const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0)*/ ) @@ -772,7 +884,6 @@ void ivas_mdct_core_reconstruct( int16_t pitch[CPE_CHANNELS][NB_SUBFR16k]; float pit_gain[CPE_CHANNELS][NB_SUBFR16k]; - int16_t isLFE; int16_t skip_decoding; set_f( xn_buf, 0, L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX ); @@ -787,17 +898,11 @@ void ivas_mdct_core_reconstruct( st = sts[ch]; skip_decoding = 0; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) /* indicates LFE with no content, or odd number of channels */ + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { skip_decoding = 1; } - isLFE = 0; - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - isLFE = 1; - } - nSubframes[ch] = ( st->core == TCX_20_CORE ) ? 1 : NB_DIV; synth = synth_buf + st->hTcxDec->old_synth_len; synthFB = synth_bufFB + st->hTcxDec->old_synth_lenFB; @@ -822,7 +927,8 @@ void ivas_mdct_core_reconstruct( decoder_tcx_imdct( st, L_frame_global[ch], L_frame_globalTCX[ch], L_spec[ch], tcx_offset[ch], tcx_offsetFB[ch], L_frame[ch], L_frameTCX[ch], left_rect[ch], &x[ch][k][0], xn_buf, ( ( hCPE->nchan_out == 1 && st->hTcxDec->kernel_type[k] == MDST_IV ) || st->hTcxCfg->tcx_last_overlap_mode == TRANSITION_OVERLAP ) ? MDCT_IV : st->hTcxDec->kernel_type[k], - fUseTns[ch][k], &synth[k * L_frame[ch]], &synthFB[k * L_frameTCX[ch]], bfi, k, isLFE, 0 ); + fUseTns[ch][k], &synth[k * L_frame[ch]], &synthFB[k * L_frameTCX[ch]], bfi, k, + 0 ); } else { @@ -969,7 +1075,6 @@ void ivas_mdct_core_reconstruct( void ivas_mdct_core_tns_ns( CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */ - const int16_t LFE_off, /* i : flag if LFE has content */ int16_t fUseTns[CPE_CHANNELS][NB_DIV], /* i : two entries for each channel in TCX10 */ STnsData tnsData[CPE_CHANNELS][NB_DIV], /* o : TNS parameter */ float *x[CPE_CHANNELS][NB_DIV], /* o : synthesis @internal_FS */ @@ -997,6 +1102,7 @@ void ivas_mdct_core_tns_ns( set_f( xn_buf, 0, L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX ); + /* TNS, ITF, IMDCT and updates */ for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { @@ -1006,7 +1112,8 @@ void ivas_mdct_core_tns_ns( L_frameTCX_glob[ch] = st->hTcxDec->L_frameTCX / nSubframes[ch]; L_spec[ch] = st->hTcxCfg->tcx_coded_lines / nSubframes[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) || ( st->bfi && st->core == ACELP_CORE ) ) /* indicates LFE with no content, or odd number of channels */ + if ( + ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) || ( st->bfi && st->core == ACELP_CORE ) ) /* indicates LFE with no content, or odd number of channels */ { if ( st->hTonalMDCTConc != NULL ) { diff --git a/lib_dec/ivas_objectRenderer_internal.c b/lib_dec/ivas_objectRenderer_internal.c index 8780b4ea98d6397edf69a7ec701bc73a07d6021b..f1c1fc04f207070edf6ba1652ee35d1fa5fe3c77 100644 --- a/lib_dec/ivas_objectRenderer_internal.c +++ b/lib_dec/ivas_objectRenderer_internal.c @@ -54,7 +54,7 @@ ivas_error ivas_td_binaural_open( ) { return ivas_td_binaural_open_unwrap( &st_ivas->hHrtfTD, st_ivas->hDecoderConfig->output_Fs, st_ivas->nchan_transport, st_ivas->ivas_format, - st_ivas->transport_config, st_ivas->hTransSetup, &st_ivas->hBinRendererTd, &st_ivas->binaural_latency_ns ); + st_ivas->transport_config, st_ivas->hRenderConfig->directivity, st_ivas->hTransSetup, &st_ivas->hBinRendererTd, &st_ivas->binaural_latency_ns ); } @@ -72,20 +72,9 @@ ivas_error ivas_td_binaural_renderer( ) { return ivas_td_binaural_renderer_unwrap( -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND st_ivas->hReverb, -#else - st_ivas->hRenderConfig, st_ivas->ini_frame, -#ifdef FIX_197_CREND_INTERFACE - st_ivas->hCrendWrapper, -#else - st_ivas->hCrend, -#endif -#endif st_ivas->transport_config, -#ifndef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - st_ivas->hDecoderConfig->output_Fs, -#endif 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, output, output_frame ); + 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 ); } diff --git a/lib_dec/ivas_out_setup_conversion.c b/lib_dec/ivas_out_setup_conversion.c index 225a1c85b5f9ecdcf444ceebda5552857c6bb4a6..2fb04af8d78f3dda0f1b974a1215b51c46f4bebf 100644 --- a/lib_dec/ivas_out_setup_conversion.c +++ b/lib_dec/ivas_out_setup_conversion.c @@ -600,7 +600,9 @@ void ivas_ls_setup_conversion_process_mdct( { dmxCoeff = hLsSetUpConversion->dmxMtx[chInIdx][chOutIdx]; - if ( !( chInIdx == LFE_CHANNEL && st_ivas->hMCT->LFE_off ) && mct_chan_mode[chInIdx] != MCT_CHAN_MODE_IGNORE ) + if ( + chInIdx != LFE_CHANNEL && + mct_chan_mode[chInIdx] != MCT_CHAN_MODE_IGNORE ) { /* Step 1: Compute the target energy and DMX signal (possible since we have all signals in TCX20 resolution) */ if ( dmxCoeff ) @@ -693,7 +695,9 @@ void ivas_ls_setup_conversion_process_mdct( /* Step 4: Perform equalization */ for ( chInIdx = 0; chInIdx < inChannels; chInIdx++ ) { - if ( !( chInIdx == LFE_CHANNEL && st_ivas->hMCT->LFE_off ) && mct_chan_mode[chInIdx] != MCT_CHAN_MODE_IGNORE ) + if ( + chInIdx != LFE_CHANNEL && + mct_chan_mode[chInIdx] != MCT_CHAN_MODE_IGNORE ) { if ( transform_type[chInIdx][0] == TCX_20 ) { diff --git a/lib_dec/ivas_output_config.c b/lib_dec/ivas_output_config.c index f38e810ce3289158e5f66ac2feb42be54c22d57b..ff73e6aa49d76ad1ebc592efb99a47e3b0afaf15 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; @@ -303,7 +303,7 @@ void ivas_renderer_select( *renderer_type = RENDERER_DIRAC; if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR && - ( output_config != AUDIO_CONFIG_5_1 && output_config != AUDIO_CONFIG_5_1_2 && output_config != AUDIO_CONFIG_5_1_4 && output_config != AUDIO_CONFIG_7_1 && output_config != AUDIO_CONFIG_7_1_4 && output_config != AUDIO_CONFIG_LS_CUSTOM ) ) + ( output_config != AUDIO_CONFIG_5_1 && output_config != AUDIO_CONFIG_5_1_2 && output_config != AUDIO_CONFIG_5_1_4 && output_config != AUDIO_CONFIG_7_1 && output_config != AUDIO_CONFIG_7_1_4 && output_config != AUDIO_CONFIG_LS_CUSTOM && output_config != AUDIO_CONFIG_MONO && output_config != AUDIO_CONFIG_STEREO ) ) { if ( output_config == AUDIO_CONFIG_HOA2 || output_config == AUDIO_CONFIG_FOA ) { @@ -320,7 +320,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 ) || - ( st_ivas->ivas_format == SBA_FORMAT && output_config == AUDIO_CONFIG_STEREO && st_ivas->nchan_transport == 1 ) ) + ( st_ivas->ivas_format == SBA_FORMAT && ( output_config == AUDIO_CONFIG_STEREO || output_config == AUDIO_CONFIG_MONO ) ) ) { *renderer_type = RENDERER_DISABLE; } diff --git a/lib_dec/ivas_qmetadata_dec.c b/lib_dec/ivas_qmetadata_dec.c index 9c6597fdcb881530b248d221ae0934ea93b22882..47eb7917c0d17ea7ea1dd4333310a4a23ab8ddf7 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 + , + int16_t is_hr +#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 + , + int16_t is_hr +#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 + , + int16_t is_hr +#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 + , + int16_t is_hr +#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,44 @@ 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, /* i : 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, /* i : bitstream */ + int16_t *index, + IVAS_QDIRECTION *q_direction ); + +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, + SPHERICAL_GRID_DATA *sph_grid16 /* i: spherical grid for deindexing */ +); +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 */ +); + +/* !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 */ + int16_t nbits_coh ); + +#endif + /*-----------------------------------------------------------------------* * Global function definitions *-----------------------------------------------------------------------*/ @@ -101,6 +159,7 @@ static int16_t decode_fixed_rate_composed_index_coherence( uint16_t *bitstream, * Main function for decoding Spatial Metadata *-----------------------------------------------------------------------*/ + /*! r: number of bits read */ int16_t ivas_qmetadata_dec_decode( IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: hQMetaData handle */ @@ -385,9 +444,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 +500,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 +534,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 +583,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 +622,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 @@ -670,10 +760,332 @@ int16_t ivas_qmetadata_dec_decode( hQMetaData->dir_comp_ratio = 1.0f; } + return ( start_index_0 - *index ); } +#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 */ + SPHERICAL_GRID_DATA *sph_grid16, /* i: spherical grid for deindexing */ + int16_t bits_sph_idx, + int16_t bits_sp_coh ) +{ + 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 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; + + /*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; + 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; + for ( b = 1; b < hQMetaData->numTwoDirBands; b++ ) + { + 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 ); + } + + 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; + } + + + return ( start_index_0 - *index ); +} + +#endif + + /*-----------------------------------------------------------------------* * ivas_qmetadata_dec_sid_decode() * @@ -1036,6 +1448,123 @@ static int16_t ivas_qmetadata_entropy_decode_diffuseness( } +#ifdef HR_METADATA +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 ); +} + +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 + static int16_t ivas_qmetadata_entropy_decode_df_ratio( uint16_t *bitstream, int16_t *index, @@ -1161,7 +1690,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 + , + int16_t is_hr +#endif +) { int16_t b, m; int16_t diff_idx; @@ -1188,7 +1722,18 @@ 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 ( is_hr ) + { + 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 ) { @@ -1198,8 +1743,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 +1800,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 ( is_hr ) + { + 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 ) { @@ -1300,7 +1859,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 ( is_hr ) + { + 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; @@ -1359,7 +1930,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 ( is_hr ) + { + 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; @@ -1477,7 +2060,58 @@ static int16_t ivas_qmetadata_entropy_decode_dir( return ( index_start - *index ); } +#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, + 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 +2123,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 + , + int16_t is_hr +#endif +) { int16_t b, m, azith_alph; int16_t diff_idx; @@ -1507,7 +2146,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 ( is_hr ) + { + 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++ ) { @@ -2548,6 +3198,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 + , + int16_t is_hr +#endif ) { int16_t i, j; @@ -2557,7 +3211,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; if ( coding_subbands_0 <= 5 ) @@ -2612,7 +3268,26 @@ static void decode_spread_coherence( for ( i = 0; i < coding_subbands; i++ ) { var_azi = var( q_direction->band_data[i].azimuth, no_frames ); +#ifdef HR_METADATA + if ( is_hr ) + { + 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,7 +3296,7 @@ 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 ) { @@ -2879,7 +3554,79 @@ static int16_t decode_fixed_rate_composed_index_coherence( return nbits; } +#ifdef HR_METADATA +/* !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 */ + 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() * @@ -2892,6 +3639,10 @@ static int16_t read_coherence_data( 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 + , + int16_t is_hr +#endif ) { int16_t j; @@ -2909,6 +3660,9 @@ 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 +3673,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 ( is_hr ) + { + 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 +3709,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] >> ( is_hr ) ) + 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 +3730,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] >> ( is_hr ) ) + 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 +3747,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 ( is_hr ) + { + 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 +3882,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 */ @@ -3256,7 +4043,162 @@ int16_t read_surround_coherence( return bits_sur_coherence; } +#ifdef HR_METADATA +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..66a2bc56639d6ca0a27c77bbc83050c4dfabc9d1 100644 --- a/lib_dec/ivas_rom_dec.c +++ b/lib_dec/ivas_rom_dec.c @@ -226,7 +226,11 @@ const float dft_win_8k[70] = * stereo CNA tables *------------------------------------------------------------------------*/ +#ifdef FIX_I414_OOA_CNA +const int16_t cna_init_bands[CNA_INIT_NBANDS + 1] = +#else const int16_t cna_init_bands[MAX_CNA_NBANDS + 1] = +#endif { 1, 4, 14, 33, 67, 171, 320 }; diff --git a/lib_dec/ivas_rom_dec.h b/lib_dec/ivas_rom_dec.h index 4366077bbb3b45e0367057e36a01ae93c01512a5..95612634b03e2dd582e1c1f8bce209bb120c9732 100644 --- a/lib_dec/ivas_rom_dec.h +++ b/lib_dec/ivas_rom_dec.h @@ -68,7 +68,11 @@ extern const float dft_win232ms_48k[450]; extern const float dft_win_8k[70]; +#ifdef FIX_I414_OOA_CNA +extern const int16_t cna_init_bands[CNA_INIT_NBANDS + 1]; +#else extern const int16_t cna_init_bands[MAX_CNA_NBANDS + 1]; +#endif extern const float min_smooth_gains1[SBA_DIRAC_STEREO_NUM_BANDS]; extern const float max_smooth_gains1[SBA_DIRAC_STEREO_NUM_BANDS]; diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec.c index 525e775eb9f5361b886a14d07b3bd96f023295bb..ec47273c64dab60414b5bbc9028af72b87581a10 100644 --- a/lib_dec/ivas_sba_dec.c +++ b/lib_dec/ivas_sba_dec.c @@ -46,8 +46,56 @@ #endif #include "wmc_auto.h" + +/*-------------------------------------------------------------------* + * ivas_sba_set_cna_cng_flag() + * + * Set CNA/CNG flags in IVAS SBA decoder + *-------------------------------------------------------------------*/ + +void ivas_sba_set_cna_cng_flag( + Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ +) +{ + int16_t n, cpe_id; + + if ( st_ivas->sba_mode == SBA_MODE_SPAR && st_ivas->nchan_transport == 1 ) + { + /* skip as done in init function */ + /* st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag = 0; */ /* Todo: Check if these can be enabled */ + /* st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag = 0; */ + } + else if ( st_ivas->nchan_transport == 1 && ( ( st_ivas->renderer_type == RENDERER_DIRAC && st_ivas->hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) || ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC ) ) ) + { + 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; + } + } + 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; + } + } + } + + return; +} + + /*-------------------------------------------------------------------* - * ivas_sba_dec_decoder() + * ivas_sba_dec_reconfigure() * * Reconfigure IVAS SBA decoder *-------------------------------------------------------------------*/ @@ -60,233 +108,67 @@ 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; RENDERER_TYPE old_renderer_type; DECODER_CONFIG_HANDLE hDecoderConfig; ivas_error error; -#ifdef SBA_BR_SWITCHING_CLEAN_UP - int16_t band_grouping[IVAS_MAX_NUM_BANDS + 1]; -#endif - error = IVAS_ERR_OK; hDecoderConfig = st_ivas->hDecoderConfig; ivas_total_brate = hDecoderConfig->ivas_total_brate; - last_ivas_total_brate = 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 ); - /*-----------------------------------------------------------------* * 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 ) - { -#ifndef SBA_BR_SWITCHING_CLEAN_UP - ivas_spar_dec_close( st_ivas->hSpar, hDecoderConfig->output_Fs ); -#else - ivas_spar_dec_close( st_ivas->hSpar, hDecoderConfig->output_Fs, 0 ); -#endif - st_ivas->hSpar = NULL; + 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 ) - { - return error; - } - - st_ivas->sba_dirac_stereo_flag = ( st_ivas->nchan_transport == 1 && hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ); - } - else + if ( hSpar != NULL ) { -#ifdef SBA_BR_SWITCHING_CLEAN_UP - int16_t sba_order_internal; -#else - int16_t i, sba_order_internal, nchan_internal; - DIRAC_DEC_HANDLE hDirAC = st_ivas->hDirAC; -#endif - SPAR_DEC_HANDLE hSpar = st_ivas->hSpar; - - sba_order_internal = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); - -#ifndef SBA_BR_SWITCHING_CLEAN_UP - nchan_internal = ivas_sba_get_nchan_metadata( sba_order_internal ); - if ( hSpar != NULL && nchan_transport_old != ivas_get_sba_num_TCs( ivas_total_brate, sba_order_internal ) ) + if ( ( hSpar->hPCA != NULL ) && ( ( hDecoderConfig->ivas_total_brate != PCA_BRATE ) || ( sba_order_internal != 1 ) ) ) { - // VE: dirty patch -> reconfiguration of SPAR modules should be used instead !! - IVAS_FB_CFG *fb_cfg; - int16_t active_w_mixing; - - /* MD handle */ - ivas_spar_md_dec_close( &hSpar->hMdDec ); - - if ( ( error = ivas_spar_md_dec_open( &hSpar->hMdDec, st_ivas->hDecoderConfig, nchan_internal, sba_order_internal, st_ivas->sid_format ) ) != IVAS_ERR_OK ) - { - return error; - } - hSpar->hMdDec->td_decorr_flag = 1; - hSpar->hMdDec->table_idx = -1; - - /* TD decorr. */ - ivas_td_decorr_dec_close( &hSpar->hTdDecorr ); - - if ( ( error = ivas_td_decorr_dec_open( &hSpar->hTdDecorr, hDecoderConfig->output_Fs, nchan_internal, 1 ) ) != IVAS_ERR_OK ) - { - return error; - } - - /* FB mixer handle */ - ivas_FB_mixer_close( &hSpar->hFbMixer, hDecoderConfig->output_Fs ); - - /* set FB config. */ - active_w_mixing = -1; - if ( ( error = ivas_fb_set_cfg( &fb_cfg, SBA_FORMAT, SBA_MODE_SPAR, nchan_internal, nchan_internal, active_w_mixing, hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK ) - { - return error; - } - fb_cfg->pcm_offset = NS2SA( hDecoderConfig->output_Fs, DELAY_FB_1_NS + IVAS_ENC_DELAY_NS + IVAS_DEC_DELAY_NS ); - fb_cfg->remix_order = remix_order_set[hSpar->hMdDec->spar_md_cfg.remix_unmix_order]; - - /* FB mixer handle */ - if ( ( error = ivas_FB_mixer_open( &hSpar->hFbMixer, hDecoderConfig->output_Fs, fb_cfg ) ) != IVAS_ERR_OK ) - { - return error; - } - - /* mixer_mat intitialization */ - for ( i = 0; i < nchan_internal; i++ ) - { - for ( int16_t j = 0; j < nchan_internal; j++ ) - { - for ( int16_t b = 0; b < IVAS_MAX_NUM_BANDS; b++ ) - { - hSpar->hMdDec->mixer_mat[i][j][b] = 0.0f; - for ( int16_t i_ts = 0; i_ts < ( MAX_PARAM_SPATIAL_SUBFRAMES + 1 ); i_ts++ ) - { - hSpar->hMdDec->mixer_mat_prev[i_ts][i][j][b] = 0.0f; - } - } - } - } - hSpar->i_subframe = 0; + free( st_ivas->hSpar->hPCA ); + hSpar->hPCA = NULL; } -#else - if ( hSpar != NULL ) - { - 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 ); - 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 ( nchan_transport_old != ivas_get_sba_num_TCs( ivas_total_brate, sba_order_internal ) ) { - if ( ( error = ivas_spar_dec_open( st_ivas, 0 ) ) != IVAS_ERR_OK ) - { - return error; - } - } - hSpar = st_ivas->hSpar; - st_ivas->sba_dirac_stereo_flag = 0; -#endif -#ifndef SBA_BR_SWITCHING_CLEAN_UP - /* PCA handle */ - if ( hSpar != NULL ) - { - if ( hDecoderConfig->ivas_total_brate == PCA_BRATE && sba_order_internal == 1 ) - { - if ( ( hSpar->hPCA = (PCA_DEC_STATE *) malloc( sizeof( PCA_DEC_STATE ) ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for PCA decoder" ); - } + ivas_spar_dec_close( &( st_ivas->hSpar ), hDecoderConfig->output_Fs, 1 ); - ivas_pca_dec_init( hSpar->hPCA ); - } - else if ( hSpar->hPCA != NULL ) - { - free( st_ivas->hSpar->hPCA ); - hSpar->hPCA = NULL; - } - } - - if ( hSpar == NULL && st_ivas->sba_mode == SBA_MODE_SPAR ) - { - if ( ( error = ivas_spar_dec_open( st_ivas ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_spar_dec_open( st_ivas, 1 ) ) != IVAS_ERR_OK ) { return error; } - - hSpar = st_ivas->hSpar; } - st_ivas->sba_dirac_stereo_flag = 0; - sba_order_internal = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); 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 ); - - if ( hDirAC == NULL && st_ivas->sba_mode == SBA_MODE_DIRAC ) - { - if ( ( error = ivas_dirac_dec_open( st_ivas ) ) != IVAS_ERR_OK ) - { - return error; - } - - hDirAC = st_ivas->hDirAC; - } - - if ( hDirAC != NULL && sba_mode_old == st_ivas->sba_mode ) - { - ivas_dirac_dec_config( st_ivas, DIRAC_RECONFIGURE_MODE ); - } - - 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 ) + } + else + { + if ( ( error = ivas_spar_dec_open( st_ivas, 0 ) ) != IVAS_ERR_OK ) { return error; } -#endif } + hSpar = st_ivas->hSpar; + st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas ); if ( st_ivas->nchan_transport == 1 ) { st_ivas->element_mode_init = IVAS_SCE; @@ -350,9 +232,7 @@ ivas_error ivas_sba_dec_reconfigure( { ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin ); } - -#ifdef SBA_BR_SWITCHING_CLEAN_UP - 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 ) ) ) { DIRAC_CONFIG_FLAG flag_config; @@ -360,10 +240,6 @@ 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 ) @@ -371,65 +247,17 @@ ivas_error ivas_sba_dec_reconfigure( return error; } } - - 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_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ) ) != IVAS_ERR_OK ) { - if ( st_ivas->hDirAC != NULL ) - { - ivas_dirac_dec_close( st_ivas->hDirAC ); - st_ivas->hDirAC = NULL; - } - - st_ivas->hSpar->enc_param_start_band = min( IVAS_MAX_NUM_BANDS, SPAR_DIRAC_SPLIT_START_BAND ); - - ivas_dirac_config_bands( band_grouping, IVAS_MAX_NUM_BANDS, (int16_t) ( st_ivas->hDecoderConfig->output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ), - st_ivas->hSpar->dirac_to_spar_md_bands, st_ivas->hQMetaData->useLowerBandRes, st_ivas->hSpar->enc_param_start_band, 0 ); - } -#else - if ( ( ( st_ivas->renderer_type != RENDERER_DISABLE ) && ( st_ivas->renderer_type != RENDERER_SBA_LINEAR_DEC ) ) || ( sba_mode_old != st_ivas->sba_mode ) ) - { - DIRAC_CONFIG_FLAG flag_config; - - flag_config = DIRAC_OPEN; - if ( st_ivas->hDirAC != NULL ) - { - flag_config = DIRAC_RECONFIGURE; - if ( sba_mode_old != st_ivas->sba_mode && st_ivas->sba_mode != SBA_MODE_SPAR ) - { - flag_config = DIRAC_RECONFIGURE_MODE; - } - } - - if ( ( error = ivas_dirac_dec_config( st_ivas, flag_config ) ) != IVAS_ERR_OK ) - { - return error; - } + return error; } -#endif - - 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 ) { - if ( st_ivas->hDirAC != NULL ) - { - ivas_dirac_dec_close( st_ivas->hDirAC ); - st_ivas->hDirAC = NULL; - } + ivas_dirac_dec_close( &( st_ivas->hDirAC ) ); - if ( st_ivas->hVBAPdata != NULL ) - { - vbap_free_data( &( st_ivas->hVBAPdata ) ); - } + 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; @@ -453,6 +281,20 @@ ivas_error ivas_sba_dec_reconfigure( return error; } +#ifdef FIX_417_TD_DECORR_BRATE_SW + /*-----------------------------------------------------------------* + * TD Decorrelator + *-----------------------------------------------------------------*/ + + if ( st_ivas->hDiracDecBin != NULL ) + { + if ( ( error = ivas_td_decorr_reconfig_dec( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hDecoderConfig->output_Fs, &( st_ivas->hDiracDecBin->hTdDecorr ), &( st_ivas->hDiracDecBin->useTdDecorr ) ) ) != IVAS_ERR_OK ) + { + return error; + } + } +#endif + /*-----------------------------------------------------------------* * CLDFB instances *-----------------------------------------------------------------*/ diff --git a/lib_dec/ivas_sba_dirac_stereo_dec.c b/lib_dec/ivas_sba_dirac_stereo_dec.c index e184654eaa1d36a2c7d0c1da9b82558746a46176..089492048021527ec3d025ab1d6d3b96e25383df 100644 --- a/lib_dec/ivas_sba_dirac_stereo_dec.c +++ b/lib_dec/ivas_sba_dirac_stereo_dec.c @@ -45,6 +45,44 @@ #include "wmc_auto.h" +/*-------------------------------------------------------------------* + * ivas_get_sba_dirac_stereo_flag() + * + * Set sba_dirac_stereo_flag + *-------------------------------------------------------------------*/ + +int16_t ivas_get_sba_dirac_stereo_flag( + Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ +) +{ + int16_t sba_dirac_stereo_flag; + AUDIO_CONFIG output_config; + + sba_dirac_stereo_flag = 0; + output_config = st_ivas->hDecoderConfig->output_config; + + if ( st_ivas->ivas_format == SBA_FORMAT || ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) ) + { + if ( st_ivas->sba_mode == SBA_MODE_SPAR ) + { + if ( output_config == AUDIO_CONFIG_STEREO || ( output_config == AUDIO_CONFIG_MONO && st_ivas->nchan_transport == 1 ) ) + { + sba_dirac_stereo_flag = 1; + } + } + else + { + if ( st_ivas->nchan_transport == 1 && output_config == AUDIO_CONFIG_STEREO ) + { + sba_dirac_stereo_flag = 1; + } + } + } + + return sba_dirac_stereo_flag; +} + + /*-------------------------------------------------------------------* * ivas_sba_dirac_stereo_config() * @@ -453,42 +491,86 @@ 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 */ + const int16_t sba_mono_flag, /* i : flag for mono output */ + const int16_t bwidth, /* i : bandwidth of signal */ const STEREO_DFT_DEC_DATA_HANDLE hStereoDft /* i : Stereo DFT handle for mixing matrix */ ) { int16_t i; + float gp, gm; + float gain_fac; if ( !mcmasa ) { - for ( i = 0; i < output_frame / 2; i++ ) + gain_fac = ( bwidth == FB ) ? 0.25f : 0.33f; /* last matrix element not used for SWB, divide by 3 instead of 4*/ + if ( sba_mono_flag ) { - 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; + gp = hStereoDft->mixer_mat_smooth[0][0][8] + hStereoDft->mixer_mat_smooth[0][0][9] + + hStereoDft->mixer_mat_smooth[0][0][10]; + if ( bwidth == FB ) + { + gp += hStereoDft->mixer_mat_smooth[0][0][11]; + } + for ( i = 0; i < output_frame / 2; i++ ) + { + hb_stereo_synth[0][i] = hb_synth[i] * gain_fac * gp; + } + gp = hStereoDft->mixer_mat_smooth[0][0][8 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][0][9 + IVAS_MAX_NUM_BANDS] + + hStereoDft->mixer_mat_smooth[0][0][10 + IVAS_MAX_NUM_BANDS]; + if ( bwidth == FB ) + { + gp += hStereoDft->mixer_mat_smooth[0][0][11 + IVAS_MAX_NUM_BANDS]; + } + for ( i = output_frame / 2; i < output_frame; i++ ) + { + hb_stereo_synth[0][i] = hb_synth[i] * gain_fac * gp; + } } - for ( i = output_frame / 2; i < output_frame; i++ ) + else { - 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; + gp = hStereoDft->mixer_mat_smooth[0][0][8] + hStereoDft->mixer_mat_smooth[1][0][8] + + hStereoDft->mixer_mat_smooth[0][0][9] + hStereoDft->mixer_mat_smooth[1][0][9] + + hStereoDft->mixer_mat_smooth[0][0][10] + hStereoDft->mixer_mat_smooth[1][0][10]; + if ( bwidth == FB ) + { + gp += hStereoDft->mixer_mat_smooth[0][0][11] + hStereoDft->mixer_mat_smooth[1][0][11]; + } + + gm = hStereoDft->mixer_mat_smooth[0][0][8] - hStereoDft->mixer_mat_smooth[1][0][8] + + hStereoDft->mixer_mat_smooth[0][0][9] - hStereoDft->mixer_mat_smooth[1][0][9] + + hStereoDft->mixer_mat_smooth[0][0][10] - hStereoDft->mixer_mat_smooth[1][0][10]; + if ( bwidth == FB ) + { + gm += hStereoDft->mixer_mat_smooth[0][0][11] - hStereoDft->mixer_mat_smooth[1][0][11]; + } + + for ( i = 0; i < output_frame / 2; i++ ) + { + hb_stereo_synth[0][i] = 0.5f * hb_synth[i] * gain_fac * gp; + hb_stereo_synth[1][i] = 0.5f * hb_synth[i] * gain_fac * gm; + } + + gp = hStereoDft->mixer_mat_smooth[0][0][8 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][0][8 + IVAS_MAX_NUM_BANDS] + + hStereoDft->mixer_mat_smooth[0][0][9 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][0][9 + IVAS_MAX_NUM_BANDS] + + hStereoDft->mixer_mat_smooth[0][0][10 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][0][10 + IVAS_MAX_NUM_BANDS]; + if ( bwidth == FB ) + { + gp += hStereoDft->mixer_mat_smooth[0][0][11 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][0][11 + IVAS_MAX_NUM_BANDS]; + } + + gm = hStereoDft->mixer_mat_smooth[0][0][8 + IVAS_MAX_NUM_BANDS] - hStereoDft->mixer_mat_smooth[1][0][8 + IVAS_MAX_NUM_BANDS] + + hStereoDft->mixer_mat_smooth[0][0][9 + IVAS_MAX_NUM_BANDS] - hStereoDft->mixer_mat_smooth[1][0][9 + IVAS_MAX_NUM_BANDS] + + hStereoDft->mixer_mat_smooth[0][0][10 + IVAS_MAX_NUM_BANDS] - hStereoDft->mixer_mat_smooth[1][0][10 + IVAS_MAX_NUM_BANDS]; + if ( bwidth == FB ) + { + gm += hStereoDft->mixer_mat_smooth[0][0][11 + IVAS_MAX_NUM_BANDS] - hStereoDft->mixer_mat_smooth[1][0][11 + IVAS_MAX_NUM_BANDS]; + } + + for ( i = output_frame / 2; i < output_frame; i++ ) + { + hb_stereo_synth[0][i] = 0.5f * hb_synth[i] * gain_fac * gp; + hb_stereo_synth[1][i] = 0.5f * hb_synth[i] * gain_fac * gm; + } } } else @@ -732,6 +814,7 @@ void ivas_sba_dirac_stereo_dec( ) { int16_t dtx_flag, fd_cng_flag; + int16_t sba_mono_flag; int16_t memOffset; float tmp_buf[NS2SA( 48000, IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS )]; float tmp_synth[L_FRAME16k]; @@ -756,6 +839,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 ); } + sba_mono_flag = ( st_ivas->hDecoderConfig->nchan_out == 1 ) ? 1 : 0; memOffset = NS2SA( output_frame * FRAMES_PER_SEC, IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS ); @@ -794,20 +878,26 @@ void ivas_sba_dirac_stereo_dec( } /* DFT Stereo upmix */ - stereo_dft_dec( hStereoDft, hCPE->hCoreCoder[0], DFT, NULL, NULL, 1, /*st_ivas->sba_dirac_stereo_flag*/ - ( st_ivas->hSpar != NULL && !mcmasa ) ? st_ivas->hSpar->hMdDec : 0, + stereo_dft_dec( hStereoDft, hCPE->hCoreCoder[0], DFT, NULL, NULL, 1 /*st_ivas->sba_dirac_stereo_flag*/, sba_mono_flag, + ( st_ivas->hSpar != NULL && !mcmasa ) ? st_ivas->hSpar->hMdDec : NULL, ( st_ivas->hSpar != NULL && !mcmasa ) ? st_ivas->hSpar->hFbMixer->cross_fade_start_offset : 0, st_ivas->hDecoderConfig->output_Fs, st_ivas->nchan_transport ); /* DFT synthesis */ stereo_dft_dec_synthesize( hCPE, DFT, 0, output[0], output_frame ); - stereo_dft_dec_synthesize( hCPE, DFT, 1, output[1], output_frame ); + if ( !sba_mono_flag ) + { + stereo_dft_dec_synthesize( hCPE, DFT, 1, output[1], output_frame ); + } synchro_synthesis( st_ivas->hDecoderConfig->ivas_total_brate, hCPE, output, output_frame, 1 /*st_ivas->sba_dirac_stereo_flag*/ ); /* output scaling */ - v_multc( output[0], 0.5f, output[0], output_frame ); - v_multc( output[1], 0.5f, output[1], output_frame ); + if ( !sba_mono_flag ) + { + v_multc( output[0], 0.5f, output[0], output_frame ); + v_multc( output[1], 0.5f, output[1], output_frame ); + } /* delay HB synth */ if ( st_ivas->nchan_transport == 1 ) @@ -824,15 +914,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, - ( st_ivas->sba_mode != SBA_MODE_SPAR || mcmasa ), hStereoDft ); + ( st_ivas->sba_mode != SBA_MODE_SPAR || mcmasa ), sba_mono_flag, hSCE->hCoreCoder[0]->bwidth, hStereoDft ); /* add HB to ACELP core */ v_add( output[0], hb_synth_stereo[0], output[0], output_frame ); - v_add( output[1], hb_synth_stereo[1], output[1], output_frame ); + if ( !sba_mono_flag ) + { + v_add( output[1], hb_synth_stereo[1], output[1], output_frame ); - /* apply TD Stereo Filling as is done in ICBWE */ - ivas_sba_dirac_stereo_apply_td_stefi( hStereoDft, output, output_frame, ( st_ivas->sba_mode == SBA_MODE_SPAR && !mcmasa ) ); + /* apply TD Stereo Filling as is done in ICBWE */ + ivas_sba_dirac_stereo_apply_td_stefi( hStereoDft, output, output_frame, ( st_ivas->sba_mode == SBA_MODE_SPAR && !mcmasa ) ); + } } return; diff --git a/lib_dec/ivas_sba_rendering_internal.c b/lib_dec/ivas_sba_rendering_internal.c index bd799f9d5fbff0499d68a83b4c26734f0a779ab9..a80986b39e7a41caf4b8a0844ac63951e90517a0 100644 --- a/lib_dec/ivas_sba_rendering_internal.c +++ b/lib_dec/ivas_sba_rendering_internal.c @@ -282,7 +282,7 @@ void ivas_ism2sba( float buffer_td[][L_FRAME48k], /* i/o: TD signal buffers */ ISM_RENDERER_HANDLE hIsmRendererData, /* i/o: renderer data */ const ISM_METADATA_HANDLE hIsmMetaData[], /* i : object metadata */ - const int16_t num_objects, /* i : number of objects */ + const int16_t nchan_ism, /* i : number of objects */ const int16_t output_frame, /* i : output frame length per channel */ const int16_t sba_order /* i : Ambisonic (SBA) order */ ) @@ -304,7 +304,7 @@ void ivas_ism2sba( set_zero( buffer_tmp[j], output_frame ); } - for ( i = 0; i < num_objects; i++ ) + for ( i = 0; i < nchan_ism; i++ ) { // TODO tmu review when #215 is resolved azimuth = (int16_t) floorf( hIsmMetaData[i]->azimuth + 0.5f ); diff --git a/lib_dec/ivas_sce_dec.c b/lib_dec/ivas_sce_dec.c old mode 100644 new mode 100755 index ac948a59c402df48e298559593200cbe746b7506..9a940b9b6da17e326145e2d9ba39c49e63931ff1 --- a/lib_dec/ivas_sce_dec.c +++ b/lib_dec/ivas_sce_dec.c @@ -77,38 +77,39 @@ 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 PARAM_ISM_DTX_CNG - if ( st_ivas->ism_mode == ISM_MODE_PARAM ) + if ( st_ivas->ivas_format == ISM_FORMAT ) { - st->cng_type = FD_CNG; /* TODO: move to init if possible */ + st->cng_type = FD_CNG; } -#endif /*------------------------------------------------------------------* * Read audio bandwidth info *-----------------------------------------------------------------*/ /* set total_brate - needed in DTX */ - if ( !st_ivas->bfi && ( ivas_total_brate == IVAS_SID_5k2 ) ) + if ( !st_ivas->bfi && ivas_total_brate == IVAS_SID_5k2 ) { st->total_brate = ivas_total_brate - nb_bits_metadata * FRAMES_PER_SEC; assert( st->total_brate == SID_2k40 && "SCE SID must be 2.4kbps!" ); + +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + if ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->hISMDTX.sce_id_dtx != sce_id ) + { + st->total_brate = FRAME_NO_DATA; + } +#endif } +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + else if ( !st_ivas->bfi && ivas_total_brate == FRAME_NO_DATA ) +#else else if ( !st_ivas->bfi && ivas_total_brate <= SID_2k40 ) +#endif { - st->total_brate = ivas_total_brate; + st->total_brate = FRAME_NO_DATA; } - else if ( !st_ivas->bfi && ( last_ivas_total_brate <= SID_2k40 || last_ivas_total_brate == IVAS_SID_5k2 ) ) + else if ( !st_ivas->bfi && st_ivas->ivas_format != ISM_FORMAT && last_ivas_total_brate <= IVAS_SID_5k2 ) { -#ifdef PARAM_ISM_DTX_CNG - /* 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; - } -#else st->total_brate = hSCE->element_brate - nb_bits_metadata * FRAMES_PER_SEC; -#endif } /* read the bandwidth */ @@ -120,7 +121,7 @@ ivas_error ivas_sce_dec( { if ( st->low_rate_mode ) { - /* ISm Low-rate mode -> always WB */ + /* ISM Low-rate mode -> always WB */ st->bwidth = WB; } else if ( hSCE->element_brate < MIN_BRATE_SWB_SCE ) @@ -176,11 +177,22 @@ ivas_error ivas_sce_dec( } /* set "total_brate" */ - if ( !st_ivas->bfi && ( ivas_total_brate == IVAS_SID_5k2 ) ) + if ( !st_ivas->bfi && ivas_total_brate == IVAS_SID_5k2 ) { st->total_brate = ivas_total_brate - nb_bits_metadata * FRAMES_PER_SEC; + +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + if ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->hISMDTX.sce_id_dtx != sce_id ) + { + st->total_brate = FRAME_NO_DATA; + } +#endif } +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + else if ( !st_ivas->bfi && ivas_total_brate == FRAME_NO_DATA ) +#else else if ( !st_ivas->bfi && ivas_total_brate <= SID_2k40 ) +#endif { st->total_brate = ivas_total_brate; } @@ -229,11 +241,7 @@ ivas_error ivas_sce_dec( * Decoder *----------------------------------------------------------------*/ -#ifdef PARAM_ISM_DTX_CNG if ( ( error = ivas_core_dec( st_ivas, hSCE, NULL, NULL, 1, output, outputHB, NULL, st_ivas->sba_dirac_stereo_flag ) ) != IVAS_ERR_OK ) -#else - if ( ( error = ivas_core_dec( NULL, hSCE, NULL, NULL, 1, output, outputHB, NULL, st_ivas->sba_dirac_stereo_flag ) ) != IVAS_ERR_OK ) -#endif { return error; } @@ -364,7 +372,7 @@ ivas_error create_sce_dec( return error; } - if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ) + if ( st_ivas->ivas_format == SBA_FORMAT && ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO || ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO && st_ivas->nchan_transport == 1 ) ) ) { if ( ( error = openCldfb( &st->cldfbSynHB, CLDFB_SYNTHESIS, st->output_Fs, CLDFB_PROTOTYPE_1_25MS ) ) != IVAS_ERR_OK ) { diff --git a/lib_dec/ivas_sns_dec.c b/lib_dec/ivas_sns_dec.c index 7aecb898d139a033876c4916c8ec4aebadeaab30..5e3c38843742139fe76bf21d5344643ce3d54b0c 100644 --- a/lib_dec/ivas_sns_dec.c +++ b/lib_dec/ivas_sns_dec.c @@ -35,6 +35,10 @@ #include "prot.h" #include "ivas_prot.h" #include "rom_com.h" +#ifdef SNS_MSVQ +#include "ivas_rom_com.h" +#include "ivas_cnst.h" +#endif #include "wmc_auto.h" /*------------------------------------------------------------------- @@ -103,14 +107,22 @@ static void sns_2st_dec( *-------------------------------------------------------------------*/ void sns_avq_dec( - int16_t *index, /* i : Quantization indices */ - float *SNS_Q, /* o : Quantized SNS vectors */ + int16_t *index, /* i : Quantization indices */ +#ifdef SNS_MSVQ + float SNS_Q[NB_DIV][M], /* o : Quantized SNS vectors */ +#else + float *SNS_Q, /* o : Quantized SNS vectors */ +#endif const int16_t numlpc /* i : Number of sets of lpc */ ) { int16_t i, nbi, last; int16_t q_type; +#ifdef SNS_MSVQ + /* go from one-based indexing to zero-based indexing */ + last = numlpc - 1; +#else /* Last LPC index */ if ( numlpc == 1 ) { @@ -120,12 +132,18 @@ void sns_avq_dec( { last = M; } +#endif index++; /* Decode last LPC */ +#ifdef SNS_MSVQ + sns_1st_dec( *index++, SNS_Q[last] ); + sns_2st_dec( SNS_Q[last], index ); +#else sns_1st_dec( *index++, &SNS_Q[last] ); sns_2st_dec( &SNS_Q[last], index ); +#endif nbi = 2 + index[0] + index[1]; index += nbi; @@ -136,16 +154,29 @@ void sns_avq_dec( if ( q_type == 0 ) { +#ifdef SNS_MSVQ + sns_1st_dec( *index++, SNS_Q[0] ); + sns_2st_dec( SNS_Q[0], index ); +#else sns_1st_dec( *index++, &SNS_Q[0] ); sns_2st_dec( &SNS_Q[0], index ); +#endif } else if ( q_type == 1 ) { for ( i = 0; i < M; i++ ) { +#ifdef SNS_MSVQ + SNS_Q[0][i] = SNS_Q[0][M + i]; +#else SNS_Q[i] = SNS_Q[M + i]; +#endif } +#ifdef SNS_MSVQ + sns_2st_dec( SNS_Q[0], index ); +#else sns_2st_dec( &SNS_Q[0], index ); +#endif } } @@ -160,10 +191,10 @@ void sns_avq_dec( *-------------------------------------------------------------------*/ void sns_avq_dec_stereo( - int16_t *indexl, /* i : Quantization indices (left channel) */ - int16_t *indexr, /* i : Quantization indices (right channe) */ - float *SNS_Ql, /* o : Quantized SNS vectors (left channel) */ - float *SNS_Qr /* o : Quantized SNS vectors (right channe) */ + int16_t *indexl, /* i : Quantization indices (left channel) */ + int16_t *indexr, /* i : Quantization indices (right channe) */ + float *SNS_Ql, /* o : Quantized SNS vectors (left channel) */ + float *SNS_Qr /* o : Quantized SNS vectors (right channe) */ ) { int16_t i, stereo_mode; @@ -208,3 +239,84 @@ void sns_avq_dec_stereo( return; } + +#ifdef SNS_MSVQ +void dequantize_sns( + int16_t indices[CPE_CHANNELS][NPRM_LPC_NEW], + float snsQ_out[CPE_CHANNELS][NB_DIV][M], + Decoder_State **sts ) +{ + int16_t nSubframes, k, ch; + const float *means; + int16_t sns_stereo_mode[NB_DIV]; + int16_t zero_side_flag[NB_DIV]; + Decoder_State *st; + + sns_stereo_mode[0] = indices[0][0]; + sns_stereo_mode[1] = indices[0][1]; + zero_side_flag[0] = indices[0][2]; + zero_side_flag[1] = indices[0][3]; + + for ( ch = 0; ch < CPE_CHANNELS; ++ch ) + { + int16_t idxIndices; + + st = sts[ch]; + nSubframes = ( st->core == TCX_20_CORE ) ? 1 : NB_DIV; + idxIndices = 0; + + for ( k = 0; k < nSubframes; ++k ) + { + const int16_t is_side = ch == 1 && sns_stereo_mode[k] == SNS_STEREO_MODE_MS; + const float *const *cdbks = ( nSubframes == 1 ) ? ivas_sns_cdbks_tcx20 : ivas_sns_cdbks_tcx10; + int16_t nStages = ( ( nSubframes == 1 ) ? SNS_MSVQ_NSTAGES_TCX20 : SNS_MSVQ_NSTAGES_TCX10 ); + float *snsQ = snsQ_out[ch][k]; + + if ( is_side ) + { + const float *const *side_cdbks = ( st->core == TCX_20_CORE ) ? ivas_sns_cdbks_side_tcx20 : ivas_sns_cdbks_side_tcx10; + if ( zero_side_flag[k] ) + { + set_zero( snsQ, M ); + continue; + } + + nStages = SNS_MSVQ_NSTAGES_SIDE; + means = ( st->core == TCX_20_CORE ) ? ivas_sns_means_side_tcx20 : ivas_sns_means_side_tcx10; + msvq_dec( side_cdbks, NULL, NULL, nStages, M, M, &indices[ch][idxIndices + SNS_STEREO_MODE_OFFSET_INDICES], 0, NULL, snsQ, NULL ); + + v_add( snsQ, means, snsQ, M ); + } + 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 ); + } + } + } + + /* add means back */ + for ( ch = 0; ch < CPE_CHANNELS; ++ch ) + { + st = sts[ch]; + nSubframes = ( st->core == TCX_20_CORE ) ? 1 : NB_DIV; + means = ( st->core == TCX_20_CORE ) ? ivas_sns_means_tcx20 : ivas_sns_means_tcx10; + for ( k = 0; k < nSubframes; ++k ) + { + v_add( snsQ_out[ch][k], means, snsQ_out[ch][k], M ); + } + } +} +#endif // SNS_MSVQ diff --git a/lib_dec/ivas_spar_decoder.c b/lib_dec/ivas_spar_decoder.c index 7515300681b4cf38a149ac22ad0055011a87b224..f0588ae30311554f1ff41efb8ceebba678bb02b1 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 @@ -61,11 +62,8 @@ static void ivas_spar_dec_MD( Decoder_Struct *st_ivas, Decoder_State *st0 ); *------------------------------------------------------------------------*/ ivas_error ivas_spar_dec_open( - Decoder_Struct *st_ivas /* i/o: IVAS decoder handle */ -#ifdef SBA_BR_SWITCHING_CLEAN_UP - , + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ -#endif ) { SPAR_DEC_HANDLE hSpar; @@ -78,20 +76,16 @@ ivas_error ivas_spar_dec_open( error = IVAS_ERR_OK; sba_order_internal = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); num_channels_internal = ivas_sba_get_nchan_metadata( sba_order_internal ); -#ifdef SBA_BR_SWITCHING_CLEAN_UP hSpar = st_ivas->hSpar; if ( !spar_reconfig_flag ) { -#endif /* SPAR decoder handle */ if ( ( hSpar = (SPAR_DEC_HANDLE) malloc( sizeof( SPAR_DEC_DATA ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR decoder" ); } -#ifdef SBA_BR_SWITCHING_CLEAN_UP } -#endif output_Fs = st_ivas->hDecoderConfig->output_Fs; @@ -119,11 +113,7 @@ ivas_error ivas_spar_dec_open( fb_cfg->remix_order = remix_order_set[hSpar->hMdDec->spar_md_cfg.remix_unmix_order]; /* FB mixer handle */ -#ifdef SBA_BR_SWITCHING_CLEAN_UP if ( ( error = ivas_FB_mixer_open( &hSpar->hFbMixer, output_Fs, fb_cfg, spar_reconfig_flag ) ) != IVAS_ERR_OK ) -#else - if ( ( error = ivas_FB_mixer_open( &hSpar->hFbMixer, output_Fs, fb_cfg ) ) != IVAS_ERR_OK ) -#endif { return error; } @@ -197,48 +187,39 @@ ivas_error ivas_spar_dec_open( *------------------------------------------------------------------------*/ void ivas_spar_dec_close( - SPAR_DEC_HANDLE hSpar, /* i/o: SPAR decoder handle */ - const int32_t output_Fs /* i : output sampling rate */ -#ifdef SBA_BR_SWITCHING_CLEAN_UP - , + SPAR_DEC_HANDLE *hSpar, /* i/o: SPAR decoder handle */ + const int32_t output_Fs, /* i : output sampling rate */ const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ -#endif ) { - if ( hSpar != NULL ) + if ( *hSpar == NULL || hSpar == NULL ) { - /* MD handle */ - ivas_spar_md_dec_close( &hSpar->hMdDec ); + return; + } - /* TD decorrelator handle */ - ivas_td_decorr_dec_close( &hSpar->hTdDecorr ); + /* MD handle */ + ivas_spar_md_dec_close( &( *hSpar )->hMdDec ); - /* FB mixer handle */ -#ifdef SBA_BR_SWITCHING_CLEAN_UP - ivas_FB_mixer_close( &hSpar->hFbMixer, output_Fs, spar_reconfig_flag ); -#else - ivas_FB_mixer_close( &hSpar->hFbMixer, output_Fs ); -#endif + /* TD decorrelator handle */ + ivas_td_decorr_dec_close( &( *hSpar )->hTdDecorr ); - /* AGC */ - ivas_spar_agc_dec_close( &hSpar->hAgcDec ); + /* FB mixer handle */ + ivas_FB_mixer_close( &( *hSpar )->hFbMixer, output_Fs, spar_reconfig_flag ); - /* PCA */ - if ( hSpar->hPCA != NULL ) - { - free( hSpar->hPCA ); - hSpar->hPCA = NULL; - } + /* AGC */ + ivas_spar_agc_dec_close( &( *hSpar )->hAgcDec ); -#ifdef SBA_BR_SWITCHING_CLEAN_UP - if ( !spar_reconfig_flag ) - { -#endif - free( hSpar ); - hSpar = NULL; -#ifdef SBA_BR_SWITCHING_CLEAN_UP - } -#endif + /* PCA */ + if ( ( *hSpar )->hPCA != NULL ) + { + free( ( *hSpar )->hPCA ); + ( *hSpar )->hPCA = NULL; + } + + if ( !spar_reconfig_flag ) + { + free( ( *hSpar ) ); + ( *hSpar ) = NULL; } return; @@ -826,57 +807,38 @@ void ivas_spar_get_parameters( weight = ivas_spar_get_cldfb_slot_gain( hSpar, hDecoderConfig, ts, &ts0, &ts1, &weight_20ms ); -#ifdef COV_SMOOTH_TUNING split_band = SPAR_DIRAC_SPLIT_START_BAND; -#else - split_band = hSpar->hMdDec->spar_md.num_bands; -#endif for ( spar_band = 0; spar_band < num_spar_bands; spar_band++ ) { for ( out_ch = 0; out_ch < num_ch_out; out_ch++ ) { -#ifndef COV_SMOOTH_TUNING - for ( in_ch = 0; in_ch < num_ch_in; in_ch++ ) + if ( split_band < IVAS_MAX_NUM_BANDS + /* 20ms cross-fade for Transport channels in all frequency bands */ + && ( 0 == ivas_is_res_channel( out_ch, hSpar->hMdDec->spar_md_cfg.nchan_transport ) ) /* sub-frame processing for missing channels in all frequency bands*/ + ) { -#endif - if ( split_band < IVAS_MAX_NUM_BANDS - /* 20ms cross-fade for Transport channels in all frequency bands */ - && ( 0 == ivas_is_res_channel( out_ch, hSpar->hMdDec->spar_md_cfg.nchan_transport ) ) /* sub-frame processing for missing channels in all frequency bands*/ - ) + for ( in_ch = 0; in_ch < num_ch_in; in_ch++ ) { -#ifdef COV_SMOOTH_TUNING - for ( in_ch = 0; in_ch < num_ch_in; in_ch++ ) + if ( hSpar->i_subframe > 3 ) { -#endif - if ( hSpar->i_subframe > 3 ) - { - par_mat[out_ch][in_ch][spar_band] = ( 1.0f - weight ) * hSpar->hMdDec->mixer_mat_prev[ts0][out_ch][in_ch][spar_band] + - weight * hSpar->hMdDec->mixer_mat_prev[ts1][out_ch][in_ch][spar_band]; - } - else - { - par_mat[out_ch][in_ch][spar_band] = hSpar->hMdDec->mixer_mat[out_ch][in_ch][spar_band]; - } -#ifdef COV_SMOOTH_TUNING + par_mat[out_ch][in_ch][spar_band] = ( 1.0f - weight ) * hSpar->hMdDec->mixer_mat_prev[ts0][out_ch][in_ch][spar_band] + + weight * hSpar->hMdDec->mixer_mat_prev[ts1][out_ch][in_ch][spar_band]; } -#endif - } - else - { -#ifdef COV_SMOOTH_TUNING - for ( in_ch = 0; in_ch < num_ch_in; in_ch++ ) + else { -#endif - /* 20ms Transport channel reconstruction with matching encoder/decoder processing */ - int16_t prev_idx = SPAR_DIRAC_SPLIT_START_BAND < IVAS_MAX_NUM_BANDS ? 1 : 0; /* if SPAR_DIRAC_SPLIT_START_BAND == IVAS_MAX_NUM_BANDS, then the sub-frame mixer_mat delay line is not active */ - par_mat[out_ch][in_ch][spar_band] = ( 1.0f - weight_20ms ) * hSpar->hMdDec->mixer_mat_prev[prev_idx][out_ch][in_ch][spar_band] + weight_20ms * hSpar->hMdDec->mixer_mat[out_ch][in_ch][spar_band]; -#ifdef COV_SMOOTH_TUNING + par_mat[out_ch][in_ch][spar_band] = hSpar->hMdDec->mixer_mat[out_ch][in_ch][spar_band]; } -#endif } -#ifndef COV_SMOOTH_TUNING } -#endif + else + { + for ( in_ch = 0; in_ch < num_ch_in; in_ch++ ) + { + /* 20ms Transport channel reconstruction with matching encoder/decoder processing */ + int16_t prev_idx = SPAR_DIRAC_SPLIT_START_BAND < IVAS_MAX_NUM_BANDS ? 1 : 0; /* if SPAR_DIRAC_SPLIT_START_BAND == IVAS_MAX_NUM_BANDS, then the sub-frame mixer_mat delay line is not active */ + par_mat[out_ch][in_ch][spar_band] = ( 1.0f - weight_20ms ) * hSpar->hMdDec->mixer_mat_prev[prev_idx][out_ch][in_ch][spar_band] + weight_20ms * hSpar->hMdDec->mixer_mat[out_ch][in_ch][spar_band]; + } + } } } @@ -931,6 +893,85 @@ static void ivas_spar_get_skip_mat( } +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; +} + + /*-------------------------------------------------------------------* * ivas_spar_dec_upmixer() * @@ -1133,11 +1174,34 @@ void ivas_spar_dec_upmixer( } } + if ( ( hDecoderConfig->ivas_total_brate < IVAS_24k4 ) && ( ( hDecoderConfig->output_config == AUDIO_CONFIG_HOA2 ) || ( hDecoderConfig->output_config == AUDIO_CONFIG_HOA3 ) ) ) + { + for ( in_ch = 0; in_ch < numch_in; in_ch++ ) + { + ivas_spar_calc_smooth_facs( cldfb_in_ts_re[in_ch], cldfb_in_ts_im[in_ch], num_spar_bands, &hSpar->hFbMixer->pFb->fb_bin_to_band, hSpar->hMdDec->smooth_fac[in_ch], hSpar->hMdDec->smooth_buf[in_ch] ); + } + } + for ( ts = 0; ts < MAX_PARAM_SPATIAL_SUBFRAMES; ts++ ) { /* determine SPAR parameters for this time slots */ ivas_spar_get_parameters( hSpar, hDecoderConfig, ts + i_sf * MAX_PARAM_SPATIAL_SUBFRAMES, numch_out, numch_in, num_spar_bands, mixer_mat ); + if ( ( hDecoderConfig->ivas_total_brate < IVAS_24k4 ) && ( ( hDecoderConfig->output_config == AUDIO_CONFIG_HOA2 ) || ( hDecoderConfig->output_config == AUDIO_CONFIG_HOA3 ) ) ) + { + for ( spar_band = 0; spar_band < num_spar_bands; spar_band++ ) + { + for ( out_ch = 0; out_ch < numch_out; out_ch++ ) + { + for ( in_ch = 0; in_ch < numch_in; in_ch++ ) + { + mixer_mat[out_ch][in_ch][spar_band] = ( 1 - hSpar->hMdDec->smooth_fac[in_ch][spar_band] ) * mixer_mat[out_ch][in_ch][spar_band] + hSpar->hMdDec->smooth_fac[in_ch][spar_band] * hSpar->hMdDec->mixer_mat_prev2[out_ch][in_ch][spar_band]; + hSpar->hMdDec->mixer_mat_prev2[out_ch][in_ch][spar_band] = mixer_mat[out_ch][in_ch][spar_band]; + } + } + } + } + for ( cldfb_band = 0; cldfb_band < num_cldfb_bands; cldfb_band++ ) { float out_re[IVAS_SPAR_MAX_CH]; diff --git a/lib_dec/ivas_spar_md_dec.c b/lib_dec/ivas_spar_md_dec.c index ff6f858d3142e11d5c1e00179b0ff2cd4d1fe721..1552734434d0da8cd218315ed3c92fb59ddd855e 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 sba_order, 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 ); @@ -305,6 +305,7 @@ static void ivas_spar_md_dec_matrix_close( free( hMdDecoder->spar_md.band_coeffs ); hMdDecoder->spar_md.band_coeffs = NULL; } + if ( hMdDecoder->mixer_mat != NULL ) { for ( i = 0; i < num_channels; i++ ) @@ -418,11 +419,8 @@ void ivas_spar_md_dec_close( ivas_spar_md_dec_matrix_close( hMdDecoder, num_channels ); - if ( *hMdDec != NULL ) - { - free( *hMdDec ); - *hMdDec = NULL; - } + free( *hMdDec ); + *hMdDec = NULL; return; } @@ -538,6 +536,25 @@ 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 ); + for ( i = 0; i < IVAS_SPAR_MAX_CH; i++ ) + { + set_zero( hMdDec->smooth_fac[i], IVAS_MAX_NUM_BANDS ); + } + for ( i = 0; i < IVAS_SPAR_MAX_CH; i++ ) + { + for ( j = 0; j < IVAS_MAX_NUM_BANDS; j++ ) + { + set_zero( hMdDec->smooth_buf[i][j], 2 * SBA_DIRAC_NRG_SMOOTH_LONG + 1 ); + } + } + for ( i = 0; i < IVAS_SPAR_MAX_CH; i++ ) + { + for ( j = 0; j < IVAS_SPAR_MAX_CH; j++ ) + { + set_zero( hMdDec->mixer_mat_prev2[i][j], IVAS_MAX_NUM_BANDS ); + } + } + return IVAS_ERR_OK; } @@ -622,7 +639,8 @@ void ivas_spar_md_dec_process( ivas_spar_md_dec_state_t *hMdDec; hMdDec = st_ivas->hSpar->hMdDec; - + int16_t active_w_vlbr; + active_w_vlbr = ( st_ivas->hDecoderConfig->ivas_total_brate < IVAS_24k4 ) ? 1 : 0; 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 ); @@ -673,9 +691,99 @@ void ivas_spar_md_dec_process( } } #endif +#ifdef DEBUG_LBR_SBA + /* Dumping SPAR HOA Coefficients */ + /*char f_name[100]; + int16_t nbands = 12; + int16_t num_subframes = 1; + int16_t num_elements = 7; + int16_t num_block_group = 1; + int16_t byte_size = sizeof( float ); + + sprintf( f_name, "SBA_MD_values_dec_PR.bin" ); + ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false; + + for ( b = 0; b < nbands; b++ ) + { + for ( int16_t sf = 0; sf < num_subframes; sf++ ) + { + for ( int16_t bl = 0; bl < num_block_group; bl++ ) + { + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[0], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[1], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[2], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[3], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[4], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[5], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[6], byte_size, 1, 1, f_name ); + // fprintf(stdout, "%f\t%f\t%f\t%d\t%d\n", dirac_md_kbps, spar_md_kbps, sba_md_kbps, qsi, code_strat ); + } + } + } + nbands = 12; // 6 total, just looking at SPAR + num_subframes = 1; + num_elements = 12; + num_block_group = 1; + byte_size = sizeof( float ); + + sprintf( f_name, "SBA_MD_values_dec_C.bin" ); + ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false; + for ( b = 0; b < nbands; b++ ) + { + for ( int16_t sf = 0; sf < num_subframes; sf++ ) + { + for ( int16_t bl = 0; bl < num_block_group; bl++ ) + { + for ( int16_t p = 0; p < 4; p++ ) + { + for ( int16_t r = 0; r < 3; r++ ) + { + dbgwrite( &hMdDec->spar_md.band_coeffs[b].C_re[p][r], byte_size, 1, 1, f_name ); + } + } + } + } + } + nbands = 12; // 6 total, just looking at SPAR + num_subframes = 1; + num_elements = 4; + num_block_group = 1; + byte_size = sizeof( float ); + + sprintf( f_name, "SBA_MD_values_dec_P.bin" ); + ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false; + + for ( b = 0; b < nbands; b++ ) + { + for ( int16_t sf = 0; sf < num_subframes; sf++ ) + { + for ( int16_t bl = 0; bl < num_block_group; bl++ ) + { + dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[0], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[1], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[2], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[3], byte_size, 1, 1, f_name ); + // fprintf(stdout, "%f\t%f\t%f\t%d\t%d\n", dirac_md_kbps, spar_md_kbps, sba_md_kbps, qsi, code_strat ); + } + } + }*/ +#endif /* SPAR to DirAC conversion */ - ivas_spar_to_dirac( st_ivas, hMdDec, dtx_vad, num_bands_out ); + ivas_spar_to_dirac( st_ivas, hMdDec, dtx_vad, num_bands_out, + bw ); /* set correct number of bands*/ nB = IVAS_MAX_NUM_BANDS; @@ -683,7 +791,129 @@ void ivas_spar_md_dec_process( { nB = nB >> 1; } +#ifdef DEBUG_LBR_SBA + /* Dumping SPAR Coefficients */ + char f_name[100]; + int16_t nbands = 4; // 6 total, just looking at SPAR + int16_t num_subframes = 1; + int16_t num_elements = 6; + int16_t num_block_group = 1; + int16_t byte_size = sizeof( float ); + sprintf( f_name, "SBA_MD_values_dec.bin" ); + ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false; + + for ( b = 0; b < nbands; b++ ) + { + for ( int16_t sf = 0; sf < num_subframes; sf++ ) + { + for ( int16_t bl = 0; bl < num_block_group; bl++ ) + { + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[0], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[1], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[2], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[0], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[1], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[2], byte_size, 1, 1, f_name ); + // fprintf(stdout, "%f\t%f\t%f\t%d\t%d\n", dirac_md_kbps, spar_md_kbps, sba_md_kbps, qsi, code_strat ); + } + } + } +#endif +#ifdef DEBUG_LBR_SBA + /* Dumping SPAR HOA Coefficients */ + /*char f_name[100]; + int16_t nbands = 12; + int16_t num_subframes = 1; + int16_t num_elements = 7; + int16_t num_block_group = 1; + int16_t byte_size = sizeof( float ); + + sprintf( f_name, "SBA_MD_values_dec_PR.bin" ); + ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false; + + for ( b = 0; b < nbands; b++ ) + { + for ( int16_t sf = 0; sf < num_subframes; sf++ ) + { + for ( int16_t bl = 0; bl < num_block_group; bl++ ) + { + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[0], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[1], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[2], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[3], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[4], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[5], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[6], byte_size, 1, 1, f_name ); + // fprintf(stdout, "%f\t%f\t%f\t%d\t%d\n", dirac_md_kbps, spar_md_kbps, sba_md_kbps, qsi, code_strat ); + } + } + } + nbands = 12; // 6 total, just looking at SPAR + num_subframes = 1; + num_elements = 12; + num_block_group = 1; + byte_size = sizeof( float ); + + sprintf( f_name, "SBA_MD_values_dec_C.bin" ); + ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false; + + for ( b = 0; b < nbands; b++ ) + { + for ( int16_t sf = 0; sf < num_subframes; sf++ ) + { + for ( int16_t bl = 0; bl < num_block_group; bl++ ) + { + for ( int16_t p = 0; p < 4; p++ ) + { + for ( int16_t r = 0; r < 3; r++ ) + { + dbgwrite( &hMdDec->spar_md.band_coeffs[b].C_re[p][r], byte_size, 1, 1, f_name ); + } + } + } + } + } + nbands = 12; // 6 total, just looking at SPAR + num_subframes = 1; + num_elements = 4; + num_block_group = 1; + byte_size = sizeof( float ); + + sprintf( f_name, "SBA_MD_values_dec_P.bin" ); + ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false; + + for ( b = 0; b < nbands; b++ ) + { + for ( int16_t sf = 0; sf < num_subframes; sf++ ) + { + for ( int16_t bl = 0; bl < num_block_group; bl++ ) + { + dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[0], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[1], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[2], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[3], byte_size, 1, 1, f_name ); + // fprintf(stdout, "%f\t%f\t%f\t%d\t%d\n", dirac_md_kbps, spar_md_kbps, sba_md_kbps, qsi, code_strat ); + } + } + }*/ +#endif /* expand DirAC MD to all time slots */ for ( i_ts = 1; i_ts < MAX_PARAM_SPATIAL_SUBFRAMES; i_ts++ ) { @@ -709,7 +939,8 @@ void ivas_spar_md_dec_process( } } - ivas_get_spar_matrices( hMdDec, num_bands_out, MAX_PARAM_SPATIAL_SUBFRAMES, bw, dtx_vad, nB, sba_order ); + ivas_get_spar_matrices( hMdDec, num_bands_out, MAX_PARAM_SPATIAL_SUBFRAMES, bw, dtx_vad, nB, sba_order, + active_w_vlbr ); #ifdef DEBUG_SPAR_DIRAC_WRITE_OUT_PRED_PARS { @@ -722,7 +953,10 @@ 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; @@ -954,7 +1188,8 @@ static void ivas_get_spar_matrices( const int16_t bw, const int16_t dtx_vad, const int16_t nB, - const int16_t sba_order ) + const int16_t sba_order, + const int16_t active_w_vlbr ) { int16_t numch_out, num_bands, dmx_ch, split_band; int16_t i, j, k, m, b, i_ts, active_w; @@ -996,10 +1231,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++ ) @@ -1010,12 +1247,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++ ) @@ -1441,6 +1672,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; @@ -1563,6 +1795,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 ) @@ -1572,9 +1805,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; @@ -1583,6 +1828,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 ); @@ -1594,7 +1840,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 { @@ -1645,9 +1892,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; @@ -1738,7 +1988,9 @@ 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; ivas_cell_dim_t pred_cell_dims[IVAS_MAX_NUM_BANDS]; @@ -1753,22 +2005,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 ) { - 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; @@ -1877,7 +2142,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; } @@ -2081,7 +2345,8 @@ 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 ) @@ -2533,6 +2798,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; @@ -2561,12 +2828,13 @@ void ivas_spar_to_dirac( 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; + int16_t active_w_vlbr; + active_w_vlbr = ( st_ivas->hDecoderConfig->ivas_total_brate < IVAS_24k4 ) ? 1 : 0; if ( hDirAC != NULL ) { band_grouping = hDirAC->band_grouping; @@ -2614,7 +2882,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 @@ -2722,13 +2990,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 ) { @@ -2744,7 +3019,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++ ) @@ -2755,9 +3031,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++ ) { @@ -2774,7 +3073,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 4157438f80a1ea635c01b984a77422c03c24ba2f..ad453cd5bdf92aed36d256cbe7482f39cf1a0d27 100644 --- a/lib_dec/ivas_stat_dec.h +++ b/lib_dec/ivas_stat_dec.h @@ -382,7 +382,6 @@ typedef struct stereo_icbwe_dec_data_structure } STEREO_ICBWE_DEC_DATA, *STEREO_ICBWE_DEC_HANDLE; -#ifdef PARAM_ISM_DTX_CNG /*----------------------------------------------------------------------------------* * ISM DTX structure *----------------------------------------------------------------------------------*/ @@ -392,8 +391,9 @@ typedef struct int16_t dtx_flag; int16_t sce_id_dtx; + int16_t ism_dtx_hangover_cnt; /* hangover counter for ISM DTX decoder */ + } ISM_DTX_DATA_DEC; -#endif /*----------------------------------------------------------------------------------* * DirAC decoder structure @@ -574,7 +574,6 @@ typedef struct dirac_output_synthesis_cov_state_structure } DIRAC_OUTPUT_SYNTHESIS_COV_STATE; - /* MASA stereo transport signal type detection structure */ typedef struct { @@ -807,6 +806,10 @@ typedef struct ivas_spar_md_dec_state_t int16_t table_idx; int16_t dtx_vad; int16_t spar_hoa_md_flag; + float smooth_buf[IVAS_SPAR_MAX_CH][IVAS_MAX_NUM_BANDS][2 * SBA_DIRAC_NRG_SMOOTH_LONG + 1]; + float smooth_fac[IVAS_SPAR_MAX_CH][IVAS_MAX_NUM_BANDS]; + float mixer_mat_prev2[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH][IVAS_MAX_NUM_BANDS]; + } ivas_spar_md_dec_state_t; @@ -950,11 +953,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 */ - int16_t LFE_off; + int16_t lowE_ch[MCT_MAX_CHANNELS]; /* note: pointer to local parameter */ uint16_t mc_global_ild[MCT_MAX_CHANNELS]; /* note: pointer to local parameter */ - int16_t num_lfe; - } MCT_DEC_DATA, *MCT_DEC_HANDLE; @@ -970,9 +970,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; - float *prior_out_buffer; + float prior_out_buffer[L_FRAME48k]; - float *prevsynth_buf; + float prevsynth_buf[LFE_PLC_BUFLEN]; float *lfe_delay_buf; int16_t lfe_addl_delay; int16_t bfi_count; @@ -1052,7 +1052,7 @@ typedef struct ivas_binaural_rendering_struct /* Convolution module structure */ BINRENDERER_CONV_MODULE_HANDLE hBinRenConvModule; - /* Variables related to reverb module */ + /* Variables related to reverberator module */ float earlyPartEneCorrection[CLDFB_NO_CHANNELS_MAX]; REVERB_STRUCT_HANDLE hReverb; @@ -1096,7 +1096,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; @@ -1109,16 +1108,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; @@ -1145,18 +1141,13 @@ typedef struct decoder_config_structure int16_t Opt_LsCustom; /* indicates whether loudspeaker custom setup is used */ int16_t Opt_HRTF_binary; /* indicates whether HRTF binary file is used */ int16_t Opt_Headrotation; /* indicates whether head-rotation is used */ -#ifdef FIX_351_HRTF_COMMAND - int16_t Opt_RendConfigCustom; /* indicates whether Renderer configuration custom setup is used */ -#endif - int16_t orientation_tracking; /* indicates orientation tracking type */ + int16_t Opt_RendConfigCustom; /* indicates whether Renderer configuration custom setup is used */ + int16_t orientation_tracking; /* indicates orientation tracking type */ float no_diegetic_pan; int16_t Opt_AMR_WB; /* flag indicating AMR-WB IO mode */ /* temp. development parameters */ #ifdef DEBUGGING -#ifndef REMOVE_FORCE_SUBFRAME_BIN - int16_t forceSubframeBinauralization; /* Flag for forcing Parametric binauralizer to subframe mode */ -#endif int16_t force_rend; /* forced TD/CLDFB binaural renderer (for ISM and MC) */ #endif @@ -1206,9 +1197,7 @@ typedef struct Decoder_Struct /* multichannel modules */ ISM_METADATA_HANDLE hIsmMetaData[MAX_NUM_OBJECTS]; /* ISM metadata handles (storage for one frame of read ISM metadata) */ -#ifdef PARAM_ISM_DTX_CNG ISM_DTX_DATA_DEC hISMDTX; /* ISM DTX structure */ -#endif ISM_RENDERER_HANDLE hIsmRendererData; /* ISM renderer handle */ DIRAC_DEC_HANDLE hDirAC; /* DirAC handle */ SPAR_DEC_HANDLE hSpar; /* SPAR handle */ @@ -1219,6 +1208,7 @@ typedef struct Decoder_Struct LFE_DEC_HANDLE hLFE; /* LFE handle */ ISM_MODE ism_mode; /* ISM format mode */ + int16_t nchan_ism; /* number of ISM channels */ SBA_MODE sba_mode; /* SBA format mode */ MC_MODE mc_mode; /* MC format mode */ int16_t sba_order; /* Ambisonic (SBA) order */ @@ -1238,15 +1228,8 @@ typedef struct Decoder_Struct EFAP_HANDLE hEFAPdata; /* EFAP structure */ VBAP_HANDLE hVBAPdata; /* VBAP structure */ MONO_DOWNMIX_RENDERER_HANDLE hMonoDmxRenderer; /* Mono downmix structure */ -#ifdef FIX_197_CREND_INTERFACE CREND_WRAPPER_HANDLE hCrendWrapper; -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND REVERB_HANDLE hReverb; /* Reverb handle */ -#endif -#else - CREND_HANDLE hCrend; /* Convolution mixer renderer structure */ - HRTFS_HANDLE hHrtf; /* HRTFs handle */ -#endif HRTFS_CREND_HANDLE hSetOfHRTF; /* Set of HRTFs handle (CRend) */ HRTFS_FASTCONV_HANDLE hHrtfFastConv; /* FASTCONV HRTF tables for binaural rendering */ HRTFS_PARAMBIN_HANDLE hHrtfParambin; /* HRTF tables for parametric binauralizer */ @@ -1260,6 +1243,9 @@ typedef struct Decoder_Struct int32_t noClipping; /* number of clipped samples */ #endif int32_t last_active_ivas_total_brate; + int16_t ism_extmeta_active; /* Extended metadata active in decoder */ + int16_t ism_extmeta_cnt; /* Change frame counter for extended metadata */ + } 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..2e31375996857b5ea68e38c8d90cb5b41793cfd8 100644 --- a/lib_dec/ivas_stereo_cng_dec.c +++ b/lib_dec/ivas_stereo_cng_dec.c @@ -90,8 +90,12 @@ void stereo_dft_dec_sid_coh( int16_t bits_tmp; int16_t b; +#ifdef FIX_418_SID_BITRATE + nr_of_sid_stereo_bits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; +#else /* TODO: still use old number of bits to keep bitexactness in output */ nr_of_sid_stereo_bits = ( 4400 /*IVAS_SID_5k2*/ - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; +#endif /* If the coherence is not encoded due to lack of bits set alpha to zero which leads to that the coherence */ /* from the previous frame is used. */ @@ -174,7 +178,9 @@ void stereo_dft_dec_sid_coh( ( *nb_bits )++; } +#ifndef FIX_418_SID_BITRATE dtx_read_padding_bits( st, ( IVAS_SID_5k2 - 4400 ) / FRAMES_PER_SEC ); +#endif return; } diff --git a/lib_dec/ivas_stereo_dft_dec.c b/lib_dec/ivas_stereo_dft_dec.c index f1cbf180bd1974567688e1471629750954237adb..08ca989f3d4a4f4a82ae02805682b96132513da3 100644 --- a/lib_dec/ivas_stereo_dft_dec.c +++ b/lib_dec/ivas_stereo_dft_dec.c @@ -1126,6 +1126,7 @@ 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 */ + 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 */ @@ -1339,6 +1340,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 ) ) { @@ -1410,49 +1412,87 @@ void stereo_dft_dec( if ( nchan_transport == 1 ) { - if ( b == 0 ) + if ( sba_mono_flag ) { - i = 0; + if ( b == 0 ) + { + i = 0; - DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i]; - DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i]; + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i]; + DFT_L[2 * i] = DFT_W; + DFT_R[2 * i] = 0.f; - DFT_L[2 * i] = DFT_W + DFT_Y; - DFT_R[2 * i] = DFT_W - DFT_Y; + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1]; + DFT_L[2 * i + 1] = DFT_W; + DFT_R[2 * i + 1] = 0.f; + } + for ( i = hStereoDft->band_limits[b]; i < min( stop, hStereoDft->band_limits[b + 1] ); i++ ) + { + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i] + ( hStereoDft->mixer_mat_smooth[0][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i]; + DFT_L[2 * i] = DFT_W; + DFT_R[2 * i] = 0.f; - DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1]; - DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1]; + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1] + ( hStereoDft->mixer_mat_smooth[0][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i + 1]; + DFT_L[2 * i + 1] = DFT_W; + DFT_R[2 * i + 1] = 0.f; + } + for ( ; i < hStereoDft->band_limits[b + 1]; i++ ) + { + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i]; + DFT_L[2 * i] = DFT_W; + DFT_R[2 * i] = 0.f; - DFT_L[2 * i + 1] = DFT_W + DFT_Y; - DFT_R[2 * i + 1] = DFT_W - DFT_Y; + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1]; + DFT_L[2 * i + 1] = DFT_W; + DFT_R[2 * i + 1] = 0.f; + } } - for ( i = hStereoDft->band_limits[b]; i < min( stop, hStereoDft->band_limits[b + 1] ); i++ ) + else { - DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i] + ( hStereoDft->mixer_mat_smooth[0][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i]; - DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i] + ( hStereoDft->mixer_mat_smooth[1][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i]; + if ( b == 0 ) + { + i = 0; - DFT_L[2 * i] = DFT_W + DFT_Y; - DFT_R[2 * i] = DFT_W - DFT_Y; + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i]; + DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i]; - DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1] + ( hStereoDft->mixer_mat_smooth[0][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i + 1]; - DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1] + ( hStereoDft->mixer_mat_smooth[1][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i + 1]; + DFT_L[2 * i] = DFT_W + DFT_Y; + DFT_R[2 * i] = DFT_W - DFT_Y; - DFT_L[2 * i + 1] = DFT_W + DFT_Y; - DFT_R[2 * i + 1] = DFT_W - DFT_Y; - } - for ( ; i < hStereoDft->band_limits[b + 1]; i++ ) - { - DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i]; - DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i]; + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1]; + DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1]; - DFT_L[2 * i] = DFT_W + DFT_Y; - DFT_R[2 * i] = DFT_W - DFT_Y; + DFT_L[2 * i + 1] = DFT_W + DFT_Y; + DFT_R[2 * i + 1] = DFT_W - DFT_Y; + } + for ( i = hStereoDft->band_limits[b]; i < min( stop, hStereoDft->band_limits[b + 1] ); i++ ) + { + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i] + ( hStereoDft->mixer_mat_smooth[0][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i]; + DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i] + ( hStereoDft->mixer_mat_smooth[1][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i]; - DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1]; - DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1]; + DFT_L[2 * i] = DFT_W + DFT_Y; + DFT_R[2 * i] = DFT_W - DFT_Y; - DFT_L[2 * i + 1] = DFT_W + DFT_Y; - DFT_R[2 * i + 1] = DFT_W - DFT_Y; + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1] + ( hStereoDft->mixer_mat_smooth[0][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i + 1]; + DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1] + ( hStereoDft->mixer_mat_smooth[1][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i + 1]; + + DFT_L[2 * i + 1] = DFT_W + DFT_Y; + DFT_R[2 * i + 1] = DFT_W - DFT_Y; + } + for ( ; i < hStereoDft->band_limits[b + 1]; i++ ) + { + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i]; + DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i]; + + DFT_L[2 * i] = DFT_W + DFT_Y; + DFT_R[2 * i] = DFT_W - DFT_Y; + + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1]; + DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1]; + + DFT_L[2 * i + 1] = DFT_W + DFT_Y; + DFT_R[2 * i + 1] = DFT_W - DFT_Y; + } } } else if ( nchan_transport >= 2 ) @@ -1556,7 +1596,11 @@ void stereo_dft_dec( if ( hStereoDft->frame_sid_nodata || st0->VAD == 0 ) { +#ifdef FIX_I414_OOA_CNA + hFdCngDec->cna_band_limits[hFdCngDec->cna_nbands] = hStereoDft->band_limits[hFdCngDec->cna_nbands]; +#else hFdCngDec->cna_band_limits[b] = hStereoDft->band_limits[hFdCngDec->cna_nbands]; +#endif } 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 651f6402c6e6de45ecd1cd6f8090d9660983222e..cbeaf2a1e516f0b4d2473fd8f8ca1ff406dd2c2c 100644 --- a/lib_dec/ivas_stereo_mdct_core_dec.c +++ b/lib_dec/ivas_stereo_mdct_core_dec.c @@ -221,7 +221,8 @@ void stereo_mdct_core_dec( if ( !bfi ) { - ivas_mdct_dec_side_bits_frame_channel( hCPE, param_lpc, p_param, hCPE->hCoreCoder[0], NULL, nTnsBitsTCX10, param, 0, 0 ); + ivas_mdct_dec_side_bits_frame_channel( hCPE, param_lpc, p_param, hCPE->hCoreCoder[0], + nTnsBitsTCX10, param, 0, 0 ); if ( sts[0]->igf ) { @@ -252,7 +253,8 @@ void stereo_mdct_core_dec( } } - ivas_mdct_core_invQ( hCPE, 0, nTnsBitsTCX10, p_param, param_lpc, param, fUseTns, tnsData, x_0, x, Aq, ms_mask, 0 ); + ivas_mdct_core_invQ( hCPE, + nTnsBitsTCX10, p_param, param_lpc, param, fUseTns, tnsData, x_0, x, Aq, ms_mask, 0 ); for ( ch = 0; ch < nChannels; ch++ ) { @@ -345,7 +347,8 @@ void stereo_mdct_core_dec( stereo_decoder_tcx( hCPE->hStereoMdct, ms_mask, x_0[1], x[0], x[1], &hCPE->hStereoMdct->mdct_stereo_mode[0], sts[0]->core, sts[1]->core, sts[0]->igf, L_frameTCX[0], L_frameTCX[1], 0, sts[0]->last_core, sts[1]->last_core, 0 ); } - ivas_mdct_core_tns_ns( hCPE, 0, fUseTns, tnsData, x, Aq, 0 ); + ivas_mdct_core_tns_ns( hCPE, + fUseTns, tnsData, x, Aq, 0 ); if ( st_ivas->renderer_type == RENDERER_MC_PARAMMC && ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ) ) { @@ -359,7 +362,8 @@ void stereo_mdct_core_dec( apply_dmx_weights( hCPE, x, sts[0]->transform_type, sts[1]->transform_type ); } - ivas_mdct_core_reconstruct( hCPE, x, signal_outFB_tmp, 0, fUseTns, 0 ); + ivas_mdct_core_reconstruct( hCPE, x, signal_outFB_tmp, + fUseTns, 0 ); mvr2r( signal_out_tmp[0], signal_out[0], L_FRAME48k ); mvr2r( signal_out_tmp[1], signal_out[1], L_FRAME48k ); diff --git a/lib_dec/ivas_stereo_mdct_stereo_dec.c b/lib_dec/ivas_stereo_mdct_stereo_dec.c index cccef8ec84b5553b7761be21f3f2ee9f3ccd9c41..0e788a0821103ce0b6b3e1c8a3891fb9579e3f29 100644 --- a/lib_dec/ivas_stereo_mdct_stereo_dec.c +++ b/lib_dec/ivas_stereo_mdct_stereo_dec.c @@ -468,11 +468,22 @@ ivas_error initMdctStereoDtxData( /* Init FD-CNG */ initFdCngDec( st ); +#ifndef FIX_413_SBA_DTX + if ( ch == 1 && st->cng_sba_flag ) + { + st->hFdCngDec->hFdCngCom->seed += 3; + } +#endif + } +#ifdef FIX_413_SBA_DTX + if ( st->first_CNG == 0 ) + { if ( ch == 1 && st->cng_sba_flag ) { st->hFdCngDec->hFdCngCom->seed += 3; } } +#endif if ( st->cldfbAna == NULL ) { diff --git a/lib_dec/ivas_stereo_switching_dec.c b/lib_dec/ivas_stereo_switching_dec.c index 2e98d358f8d7fd98629285c78947f27a2870353f..0a436ec0d28eec23fc6ba6d080122ca92bbbed81 100644 --- a/lib_dec/ivas_stereo_switching_dec.c +++ b/lib_dec/ivas_stereo_switching_dec.c @@ -969,12 +969,6 @@ ivas_error stereo_memory_dec( for ( i = 0; i < CPE_CHANNELS; ++i ) { deleteFdCngDec( &hCPE->hCoreCoder[i]->hFdCngDec ); - - /* deallocate CLDFB synthesis for LFE channel */ - if ( hCPE->hCoreCoder[i]->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - deleteCldfb( &hCPE->hCoreCoder[i]->cldfbSyn ); - } } } else diff --git a/lib_dec/ivas_tcx_core_dec.c b/lib_dec/ivas_tcx_core_dec.c index 378ddec9aa921002273f5e12022674cc1b4b9819..ab82fb4e07653b0d0900c75137aecd588738b608 100644 --- a/lib_dec/ivas_tcx_core_dec.c +++ b/lib_dec/ivas_tcx_core_dec.c @@ -95,11 +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, st->mct_chan_mode ); - /* TODO: also apply for MCT modes, once issue #24 is solved */ - if ( !MCT_flag && st->element_mode != EVS_MONO ) + st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_flag ); + + if ( + st->element_mode != EVS_MONO ) { - st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode, st->mct_chan_mode ); + st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode ); } if ( hTcxLtpDec != NULL ) { @@ -160,12 +161,8 @@ void stereo_tcx_core_dec( const int16_t last_element_mode, /* i : last element mode */ const int16_t flag_sec_CNA, /* i : CNA flag for secondary channel */ STEREO_CNG_DEC_HANDLE hStereoCng, /* i : Stereo CNG handle */ - const int16_t nchan_out /* i : number of output channels */ -#ifdef PARAM_ISM_DTX_CNG - , - const IVAS_FORMAT ivas_format, /* i : IVAS format */ - const ISM_MODE ism_mode /* i : ISM mode (only needed if format is ISM) */ -#endif + const int16_t nchan_out, /* i : number of output channels */ + const IVAS_FORMAT ivas_format /* i : IVAS format */ ) { int16_t i, k; @@ -729,8 +726,7 @@ void stereo_tcx_core_dec( if ( st->element_mode != IVAS_CPE_TD ) { -#ifdef PARAM_ISM_DTX_CNG - if ( ivas_format == ISM_FORMAT && ism_mode == ISM_MODE_PARAM ) + if ( ivas_format == ISM_FORMAT ) { float buffer[L_FRAME16k]; lerp( signal_outFB, buffer, st->L_frame, hTcxDec->L_frameTCX ); @@ -740,9 +736,6 @@ void stereo_tcx_core_dec( { ApplyFdCng( signal_out, NULL, NULL, NULL, st, st->bfi, 0 ); } -#else - ApplyFdCng( signal_out, NULL, NULL, NULL, st, st->bfi, 0 ); -#endif } /* Generate additional comfort noise to mask potential coding artefacts */ diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index 95f7dca8a71b81d238c148f44b57ae0716a53e1d..ee315bf399d5b22f8ed7716a4d41e6fbe988cdec 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -223,14 +223,7 @@ static void init_decoder_config( hDecoderConfig->Opt_LsCustom = 0; hDecoderConfig->Opt_HRTF_binary = 0; hDecoderConfig->Opt_Headrotation = 0; -#ifdef FIX_351_HRTF_COMMAND hDecoderConfig->Opt_RendConfigCustom = 0; -#endif -#ifndef REMOVE_FORCE_SUBFRAME_BIN -#ifdef DEBUGGING - hDecoderConfig->forceSubframeBinauralization = 0; -#endif -#endif hDecoderConfig->orientation_tracking = orientation_tracking; hDecoderConfig->no_diegetic_pan = no_diegetic_pan; @@ -394,17 +387,8 @@ ivas_error IVAS_DEC_Configure( const IVAS_DEC_AUDIO_CONFIG outputFormat, /* i : output format */ const int16_t customLsOutputEnabled, /* i : enable custom loudspeaker setup handle */ const int16_t hrtfReaderEnabled, /* i : enable HRTF binary file input */ - const int16_t enableHeadRotation /* i : enable head rotation for binaural output */ -#ifdef FIX_351_HRTF_COMMAND - , - const int16_t renderConfigEnabled /* i : enable Renderer config. file for binaural output */ -#endif -#ifndef REMOVE_FORCE_SUBFRAME_BIN -#ifdef DEBUGGING - , - const int16_t forceSubframeBinauralization /* i : enable subframe binauralization */ -#endif -#endif + const int16_t enableHeadRotation, /* i : enable head rotation for binaural output */ + const int16_t renderConfigEnabled /* i : enable Renderer config. file for binaural output */ ) { Decoder_Struct *st_ivas; @@ -450,17 +434,10 @@ ivas_error IVAS_DEC_Configure( hDecoderConfig->nchan_out = audioCfg2channels( hDecoderConfig->output_config ); } -#ifndef REMOVE_FORCE_SUBFRAME_BIN -#ifdef DEBUGGING - hDecoderConfig->forceSubframeBinauralization = forceSubframeBinauralization; -#endif -#endif hDecoderConfig->Opt_LsCustom = customLsOutputEnabled; hDecoderConfig->Opt_Headrotation = enableHeadRotation; hDecoderConfig->Opt_HRTF_binary = hrtfReaderEnabled; -#ifdef FIX_351_HRTF_COMMAND hDecoderConfig->Opt_RendConfigCustom = renderConfigEnabled; -#endif /* Set decoder parameters to initial values */ if ( ( error = ivas_init_decoder_front( st_ivas ) ) != IVAS_ERR_OK ) @@ -848,15 +825,19 @@ ivas_error IVAS_DEC_GetObjectMetadata( { metadata->azimuth = 0.f; metadata->elevation = 0.f; - metadata->radius = 0.f; + metadata->radius = 1.f; metadata->spread = 0.f; metadata->gainFactor = 1.f; + metadata->yaw = 0.f; + metadata->pitch = 0.f; } else { metadata->azimuth = hIsmMeta->azimuth; metadata->elevation = hIsmMeta->elevation; - metadata->radius = 0.f; + metadata->radius = hIsmMeta->radius; + metadata->yaw = hIsmMeta->yaw; + metadata->pitch = hIsmMeta->pitch; metadata->spread = 0.f; metadata->gainFactor = 1.f; } @@ -872,12 +853,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 ) @@ -890,11 +867,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; } @@ -906,14 +879,15 @@ ivas_error IVAS_DEC_GetMasaMetadata( *---------------------------------------------------------------------*/ ivas_error IVAS_DEC_FeedHeadTrackData( - IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ - IVAS_QUATERNION *orientation /* i : head-tracking data */ + IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ + IVAS_QUATERNION *orientation, /* i : head-tracking data, listener orientation */ + IVAS_VECTOR3 *Pos /* i : listener position */ ) { HEAD_TRACK_DATA_HANDLE hHeadTrackData; int16_t i; - if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL ) + if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL || orientation == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; } @@ -928,10 +902,16 @@ ivas_error IVAS_DEC_FeedHeadTrackData( /* Move head-tracking data to the decoder handle */ for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ ) { - hHeadTrackData->Quaternions[i].w = orientation[i].w; - hHeadTrackData->Quaternions[i].x = orientation[i].x; - hHeadTrackData->Quaternions[i].y = orientation[i].y; - hHeadTrackData->Quaternions[i].z = orientation[i].z; + /* check for Euler angle signaling */ + if ( orientation[i].w == -3.0f ) + { + Euler2Quat( deg2rad( orientation[i].x ), deg2rad( orientation[i].y ), deg2rad( orientation[i].z ), &orientation[i] ); + } + + ivas_orient_trk_Process( hHeadTrackData->OrientationTracker, orientation[i], FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES, &hHeadTrackData->Quaternions[i] ); + hHeadTrackData->Pos[i].x = Pos[i].x; + hHeadTrackData->Pos[i].y = Pos[i].y; + hHeadTrackData->Pos[i].z = Pos[i].z; } hIvasDec->st_ivas->hHeadTrackData->num_quaternions = 0; @@ -939,6 +919,58 @@ ivas_error IVAS_DEC_FeedHeadTrackData( return IVAS_ERR_OK; } +/*---------------------------------------------------------------------* + * IVAS_DEC_FeedRefRotData( ) + * + * Feed the decoder with the reference rotation + *---------------------------------------------------------------------*/ + +ivas_error IVAS_DEC_FeedRefRotData( + IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ + IVAS_QUATERNION rotation /* i : reference rotation data */ +) +{ + ivas_orient_trk_state_t *pOtr; + + if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL || hIvasDec->st_ivas->hHeadTrackData == NULL || hIvasDec->st_ivas->hHeadTrackData->OrientationTracker == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + pOtr = hIvasDec->st_ivas->hHeadTrackData->OrientationTracker; + + pOtr->refRot.w = rotation.w; + pOtr->refRot.x = rotation.x; + pOtr->refRot.z = rotation.z; + pOtr->refRot.y = rotation.y; + + return IVAS_ERR_OK; +} + +/*---------------------------------------------------------------------* + * IVAS_DEC_FeedRefVectorData( ) + * + * Feed the decoder with a reference vector spanning from listenerPos + * to refPos. Only available in OTR_TRACKING_REF_POS and + * OTR_TRACKING_REF_POS_LEV modes. + *---------------------------------------------------------------------*/ + +ivas_error IVAS_DEC_FeedRefVectorData( + IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ + const IVAS_VECTOR3 listenerPos, /* i : Listener position */ + const IVAS_VECTOR3 refPos /* i : Reference position */ +) +{ + ivas_orient_trk_state_t *pOtr; + + if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL || hIvasDec->st_ivas->hHeadTrackData == NULL || hIvasDec->st_ivas->hHeadTrackData->OrientationTracker == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + pOtr = hIvasDec->st_ivas->hHeadTrackData->OrientationTracker; + return ivas_orient_trk_SetReferenceVector( pOtr, listenerPos, refPos ); +} /*---------------------------------------------------------------------* * IVAS_DEC_FeedCustomLsData( ) @@ -1122,6 +1154,7 @@ ivas_error IVAS_DEC_GetRenderConfig( mvr2r( hRCin->roomAcoustics.pFc_input, hRCout->room_acoustics.pFc_input, CLDFB_NO_CHANNELS_MAX ); mvr2r( hRCin->roomAcoustics.pAcoustic_rt60, hRCout->room_acoustics.pAcoustic_rt60, CLDFB_NO_CHANNELS_MAX ); mvr2r( hRCin->roomAcoustics.pAcoustic_dsr, hRCout->room_acoustics.pAcoustic_dsr, CLDFB_NO_CHANNELS_MAX ); + mvr2r( hRCin->directivity, hRCout->directivity, 3 ); return IVAS_ERR_OK; } @@ -1166,6 +1199,7 @@ ivas_error IVAS_DEC_FeedRenderConfig( mvr2r( renderConfig.room_acoustics.pFc_input, hRenderConfig->roomAcoustics.pFc_input, CLDFB_NO_CHANNELS_MAX ); mvr2r( renderConfig.room_acoustics.pAcoustic_rt60, hRenderConfig->roomAcoustics.pAcoustic_rt60, CLDFB_NO_CHANNELS_MAX ); mvr2r( renderConfig.room_acoustics.pAcoustic_dsr, hRenderConfig->roomAcoustics.pAcoustic_dsr, CLDFB_NO_CHANNELS_MAX ); + mvr2r( renderConfig.directivity, hRenderConfig->directivity, 3 ); return IVAS_ERR_OK; } @@ -1200,13 +1234,9 @@ ivas_error IVAS_DEC_GetDelay( st_ivas = hIvasDec->st_ivas; hDecoderConfig = st_ivas->hDecoderConfig; -#ifdef BINAURALIZATION_DELAY_REPORT nSamples[1] = NS2SA( hDecoderConfig->output_Fs, get_delay( DEC, hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->cldfbAnaDec[0] ) ); nSamples[2] = (int16_t) roundf( (float) st_ivas->binaural_latency_ns * hDecoderConfig->output_Fs / 1000000000.f ); nSamples[0] = nSamples[1] + nSamples[2]; -#else - *nSamples = (int16_t) roundf( (float) get_delay( DEC, hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->cldfbAnaDec[0], st_ivas->binaural_latency_ns ) * hDecoderConfig->output_Fs / 1000000000.f ); -#endif *timeScale = hDecoderConfig->output_Fs; @@ -1940,7 +1970,6 @@ static ivas_error printConfigInfo_dec( get_channel_config( st_ivas->hDecoderConfig->output_config, &config_str[0] ); fprintf( stdout, "Output configuration: %s\n", config_str ); -#ifdef FIX_351_HRTF_COMMAND if ( st_ivas->hDecoderConfig->Opt_HRTF_binary ) { fprintf( stdout, "HRIR/BRIR file: ON\n" ); @@ -1950,12 +1979,30 @@ static ivas_error printConfigInfo_dec( { fprintf( stdout, "Renderer config. file: ON\n" ); } -#endif if ( st_ivas->hDecoderConfig->Opt_Headrotation ) { fprintf( stdout, "Head rotation: ON\n" ); } + + if ( st_ivas->hDecoderConfig->orientation_tracking != IVAS_ORIENT_TRK_NONE ) + { + switch ( st_ivas->hDecoderConfig->orientation_tracking ) + { + case IVAS_ORIENT_TRK_AVG: + fprintf( stdout, "Orientation tracking: AVG\n" ); + break; + case IVAS_ORIENT_TRK_REF: + fprintf( stdout, "Orientation tracking: REF\n" ); + break; + case IVAS_ORIENT_TRK_REF_VEC: + fprintf( stdout, "Orientation tracking: REF_VEC\n" ); + break; + case IVAS_ORIENT_TRK_REF_VEC_LEV: + fprintf( stdout, "Orientation tracking: REF_VEC_LEV\n" ); + break; + } + } } return IVAS_ERR_OK; diff --git a/lib_dec/lib_dec.h b/lib_dec/lib_dec.h index 36dab5c1f9cd11f6423b9107aa994d7fe24e7144..17af564295cca7d3e47b3affc9f5df7ec90d6fa4 100644 --- a/lib_dec/lib_dec.h +++ b/lib_dec/lib_dec.h @@ -129,17 +129,8 @@ ivas_error IVAS_DEC_Configure( const IVAS_DEC_AUDIO_CONFIG outputFormat, /* i : output format */ const int16_t customLsOutputEnabled, /* i : enable custom loudspeaker setup handle */ const int16_t hrtfReaderEnabled, /* i : enable HRTF binary file input */ - const int16_t enableHeadRotation /* i : enable head rotation for binaural output */ -#ifdef FIX_351_HRTF_COMMAND - ,const int16_t renderConfigEnabled /* i : enable Renderer config. file for binaural output */ -#endif - -#ifndef REMOVE_FORCE_SUBFRAME_BIN -#ifdef DEBUGGING - , - const int16_t forceSubframeBinauralization /* i : enable subframe binauralization */ -#endif -#endif + const int16_t enableHeadRotation, /* i : enable head rotation for binaural output */ + const int16_t renderConfigEnabled /* i : enable Renderer config. file for binaural output */ ); void IVAS_DEC_Close( @@ -175,17 +166,26 @@ 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_QUATERNION *orientation, /* i : head-tracking data */ + IVAS_VECTOR3 *Pos /* i : listener position */ +); + +/*! r: error code */ +ivas_error IVAS_DEC_FeedRefRotData( + IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ + IVAS_QUATERNION rotation /* i : reference rotation data */ +); +/*! r: error code */ +ivas_error IVAS_DEC_FeedRefVectorData( + IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ + const IVAS_VECTOR3 listenerPos, /* i : Listener position */ + const IVAS_VECTOR3 refPos /* i : Reference position */ ); /*! r: error code */ @@ -202,7 +202,7 @@ ivas_error IVAS_DEC_VoIP_FeedFrame( /*! 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 */ + 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 */ #ifdef SUPPORT_JBM_TRACEFILE 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 0950b529f67151e65578f61417c3e9eaae4cbfb7..9d3adbb18193ce2fd2e544a82d52661eb4734214 100644 --- a/lib_dec/stat_dec.h +++ b/lib_dec/stat_dec.h @@ -98,21 +98,30 @@ 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 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 */ +#ifdef FIX_I414_OOA_CNA + float cna_cm[STEREO_DFT_BAND_MAX]; /* stereo CNA - coherence from the last inactive frame */ +#else 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 */ +#endif + 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 */ + +#ifdef FIX_I414_OOA_CNA + int16_t cna_band_limits[STEREO_DFT_BAND_MAX + 1]; /* stereo CNA - band limits used by the CNA in DFT stereo mode */ +#else 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 */ +#endif + 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,10 +1354,11 @@ typedef struct Decoder_State /* MCT Channel mode indication: LFE, ignore channel? */ MCT_CHAN_MODE mct_chan_mode; -#ifdef PARAM_ISM_DTX_CNG - int16_t cng_paramISM_flag; /* CNG in Param-ISM flag */ - int16_t read_sid_info; /* For ParamISM, use the transmitted noise */ + int16_t cng_ism_flag; /* CNG in ISM format flag */ +#ifndef FIX_ISM_DTX_CNG_BWIDTH_ALT + int16_t read_sid_info; /* For ParamISM, use the transmitted noise */ #endif + int16_t is_ism_format; /* Indication whether the codec operates in ISM format */ } Decoder_State, *DEC_CORE_HANDLE; diff --git a/lib_dec/tonalMDCTconcealment.c b/lib_dec/tonalMDCTconcealment.c index cb27b57ebf852b74e91c4da7657f08a1be5c9cb4..041e3a3d2fa493f5b9d66325cfc9baad7e59ef1a 100644 --- a/lib_dec/tonalMDCTconcealment.c +++ b/lib_dec/tonalMDCTconcealment.c @@ -386,15 +386,14 @@ static void CalcMDXT( const TonalMDCTConcealPtr hTonalMDCTConc, const char type, const float *timeSignal, - float *mdxtOutput, - const int16_t isLfe ) + float *mdxtOutput ) { float windowedTimeSignal[L_FRAME_PLUS + 2 * L_MDCT_OVLP_MAX]; int16_t left_overlap, right_overlap; int16_t L_frame; L_frame = hTonalMDCTConc->nSamples; - WindowSignal( hTonalMDCTConc->tcx_cfg, hTonalMDCTConc->tcx_cfg->tcx_offsetFB, FULL_OVERLAP, FULL_OVERLAP, &left_overlap, &right_overlap, timeSignal, &L_frame, windowedTimeSignal, 1, 1, isLfe ); + WindowSignal( hTonalMDCTConc->tcx_cfg, hTonalMDCTConc->tcx_cfg->tcx_offsetFB, FULL_OVERLAP, FULL_OVERLAP, &left_overlap, &right_overlap, timeSignal, &L_frame, windowedTimeSignal, 1, 1 ); if ( type == 'S' ) { @@ -413,8 +412,7 @@ void TonalMDCTConceal_Detect( const TonalMDCTConcealPtr hTonalMDCTConc, const float pitchLag, int16_t *numIndices, - const PsychoacousticParameters *psychParamsCurrent, - const int16_t isLfe ) + const PsychoacousticParameters *psychParamsCurrent ) { float secondLastMDST[L_FRAME_MAX]; /* 32 bits are required */ float secondLastMDCT[L_FRAME_MAX]; /* 32 bits are required */ @@ -431,10 +429,8 @@ void TonalMDCTConceal_Detect( { if ( !hTonalMDCTConc->secondLastBlockData.tonalConcealmentActive ) { - CalcMDXT( hTonalMDCTConc, 'S', hTonalMDCTConc->secondLastPcmOut, secondLastMDST, - isLfe ); - CalcMDXT( hTonalMDCTConc, 'C', hTonalMDCTConc->secondLastPcmOut, secondLastMDCT, - isLfe ); + CalcMDXT( hTonalMDCTConc, 'S', hTonalMDCTConc->secondLastPcmOut, secondLastMDST ); + CalcMDXT( hTonalMDCTConc, 'C', hTonalMDCTConc->secondLastPcmOut, secondLastMDCT ); hTonalMDCTConc->nNonZeroSamples = 0; for ( i = 0; i < hTonalMDCTConc->nSamples; i++ ) { diff --git a/lib_enc/acelp_core_enc.c b/lib_enc/acelp_core_enc.c index 272d36fb9c53484bf7bd4e564c7d5b7db96c42d2..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 */ ) { @@ -314,17 +311,13 @@ ivas_error acelp_core_enc( if ( st->core_brate == SID_2k40 ) { -#ifdef PARAM_ISM_DTX_CNG if ( st->hTdCngEnc != NULL ) { -#endif tmpF = cng_energy( st->element_mode, st->bwidth, st->hDtxEnc->CNG_mode, st->hTdCngEnc->CNG_att, exc, st->L_frame ); i = (int16_t) ( ( tmpF + 2.0f ) * STEP_SID ); i = min( max( i, 0 ), 127 ); st->hTdCngEnc->old_enr_index = i; -#ifdef PARAM_ISM_DTX_CNG } -#endif } } @@ -376,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 ); } /*-----------------------------------------------------------------* @@ -414,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 */ @@ -434,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 ); + push_indice( hBstr, IND_IC_LSF_PRED, beta_index, 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 ); - } -#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 ); @@ -507,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 ); } /*---------------------------------------------------------------* @@ -565,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..f573649d3ce1ef95580e7f1a0e438f49e093cd1e 100644 --- a/lib_enc/acelp_core_switch_enc.c +++ b/lib_enc/acelp_core_switch_enc.c @@ -151,7 +151,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 ); diff --git a/lib_enc/amr_wb_enc.c b/lib_enc/amr_wb_enc.c index 80520d4c38d37b99a347b7262506eee0c39eb7ed..c0c0b4f18e51df211b71704c96ec4d4c6772a236 100644 --- a/lib_enc/amr_wb_enc.c +++ b/lib_enc/amr_wb_enc.c @@ -342,7 +342,8 @@ void amr_wb_enc( * WB, SWB and FB bandwidth detector *----------------------------------------------------------------*/ - bw_detect( st, st->input, NULL, NULL ); + bw_detect( st, st->input, NULL, NULL, + 0 ); /* in AMR_WB IO, limit the maximum band-width to WB */ if ( st->bwidth > WB ) diff --git a/lib_enc/bw_detect.c b/lib_enc/bw_detect.c index 5f46910c57076190a267f7e8f8785b2460431e5b..6de35a211a50ba5e2461bb2f42041346828d5e30 100644 --- a/lib_enc/bw_detect.c +++ b/lib_enc/bw_detect.c @@ -55,8 +55,9 @@ #define ALPHA_BWD 0.75f #define BWD_LT_THRESH 0.6f -#define BWD_COUNT_MAX 100 -#define BWD_COUNT_WIDER_BW 10 +#define BWD_COUNT_MAX 100 +#define BWD_COUNT_WIDER_BW 10 +#define BWD_COUNT_WIDER_BW_MDCT 0 #define CLDFB_ENER_OFFSET 1.6f @@ -71,6 +72,8 @@ void bw_detect( const float signal_in[], /* i : input signal */ float *spectrum, /* i : MDCT spectrum */ const float *enerBuffer /* i : energy buffer */ + , + const int16_t mct_on /* i : flag MCT mode */ ) { int16_t i, j, k, bw_max, bin_width, n_bins; @@ -80,6 +83,13 @@ void bw_detect( const float *pt, *pt1; float max_NB, max_WB, max_SWB, max_FB, mean_NB, mean_WB, mean_SWB, mean_FB; int16_t cldfb_bin_width = 4; + int16_t bwd_count_wider_bw, l_frame; + + bwd_count_wider_bw = BWD_COUNT_WIDER_BW; + if ( st->element_mode == IVAS_CPE_MDCT && ( st->element_brate > IVAS_64k || mct_on ) ) + { + bwd_count_wider_bw = BWD_COUNT_WIDER_BW_MDCT; + } if ( st->input_Fs > 8000 ) { @@ -173,8 +183,14 @@ void bw_detect( } else { - bin_width *= (int16_t) ( ( st->input_Fs / FRAMES_PER_SEC ) / BWD_TOTAL_WIDTH ); - mvr2r( spectrum, spect, (int16_t) ( st->input_Fs / FRAMES_PER_SEC ) ); + l_frame = (int16_t) ( st->input_Fs / FRAMES_PER_SEC ); + if ( st->core == TCX_10_CORE ) + { + l_frame /= 2; + } + + bin_width *= ( l_frame / BWD_TOTAL_WIDTH ); + mvr2r( spectrum, spect, l_frame ); } /*---------------------------------------------------------------------* * compute energy per spectral bins @@ -392,17 +408,17 @@ void bw_detect( /* switching to a higher BW */ if ( st->last_input_bwidth == NB ) { - if ( st->count_WB > BWD_COUNT_WIDER_BW ) + if ( st->count_WB > bwd_count_wider_bw ) { st->input_bwidth = WB; st->count_WB = BWD_COUNT_MAX; - if ( st->count_SWB > BWD_COUNT_WIDER_BW ) + if ( st->count_SWB > bwd_count_wider_bw ) { st->input_bwidth = SWB; st->count_SWB = BWD_COUNT_MAX; - if ( st->count_FB > BWD_COUNT_WIDER_BW ) + if ( st->count_FB > bwd_count_wider_bw ) { st->input_bwidth = FB; st->count_FB = BWD_COUNT_MAX; @@ -413,12 +429,12 @@ void bw_detect( if ( st->last_input_bwidth == WB && st->input_Fs > 16000 ) { - if ( st->count_SWB > BWD_COUNT_WIDER_BW ) + if ( st->count_SWB > bwd_count_wider_bw ) { st->input_bwidth = SWB; st->count_SWB = BWD_COUNT_MAX; - if ( st->count_FB > BWD_COUNT_WIDER_BW ) + if ( st->count_FB > bwd_count_wider_bw ) { st->input_bwidth = FB; st->count_FB = BWD_COUNT_MAX; @@ -428,7 +444,7 @@ void bw_detect( if ( st->last_input_bwidth == SWB && st->input_Fs > 32000 ) { - if ( st->count_FB > BWD_COUNT_WIDER_BW ) + if ( st->count_FB > bwd_count_wider_bw ) { st->input_bwidth = FB; st->count_FB = BWD_COUNT_MAX; @@ -620,22 +636,13 @@ void set_bw_stereo( if ( hCPE->element_mode == IVAS_CPE_MDCT ) { - /* do not check bandwidth in LFE channel */ - if ( sts[0]->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - sts[0]->bwidth = sts[0]->input_bwidth; - } - else if ( sts[1]->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - sts[1]->bwidth = sts[1]->input_bwidth; - } /* ensure that both CPE channels have the same audio band-width */ - else if ( sts[0]->input_bwidth == sts[1]->input_bwidth ) + if ( sts[0]->input_bwidth == sts[1]->input_bwidth ) { sts[0]->bwidth = sts[0]->input_bwidth; sts[1]->bwidth = sts[0]->input_bwidth; } - else if ( sts[0]->input_bwidth != sts[1]->input_bwidth ) + else { sts[0]->bwidth = max( sts[0]->input_bwidth, sts[1]->input_bwidth ); sts[1]->bwidth = max( sts[0]->input_bwidth, sts[1]->input_bwidth ); @@ -672,7 +679,8 @@ int16_t set_bw_mct( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = hCPE[cpe_id]->hCoreCoder[ch]; - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE || st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } diff --git a/lib_enc/cng_enc.c b/lib_enc/cng_enc.c index 04d9e4116621c977f0ae6a60f4c4adc90d259576..14eef260b465b5b7354e7bb06820257f4c2cd160 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 */ diff --git a/lib_enc/cod_tcx.c b/lib_enc/cod_tcx.c index 8c647be38a0c3b96ea33b77f2c66f6e2c743ba9a..ac24d74bf2bf792fe34af0619f0c5fbd5186a946 100644 --- a/lib_enc/cod_tcx.c +++ b/lib_enc/cod_tcx.c @@ -73,7 +73,7 @@ void HBAutocorrelation( * Windowing * *-----------------------------------------------------------*/ - WindowSignal( hTcxCfg, hTcxCfg->tcx_offset, left_overlap_mode, right_overlap_mode, &left_overlap, &right_overlap, speech, &L_frame, xn_buf, 1, 0, 0 ); + WindowSignal( hTcxCfg, hTcxCfg->tcx_offset, left_overlap_mode, right_overlap_mode, &left_overlap, &right_overlap, speech, &L_frame, xn_buf, 1, 0 ); /*-----------------------------------------------------------* * Autocorrelation * @@ -134,11 +134,11 @@ void TNSAnalysisStereo( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; - - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } + hTcxEnc = st->hTcxEnc; nSubframes = ( hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV; @@ -382,8 +382,7 @@ void TNSAnalysisStereo( /* individual decision for each channel */ for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { - - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -465,10 +464,11 @@ void TNSAnalysisStereo( /* we have the decision, set filter data accordingly */ for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } + nSubframes = ( sts[ch]->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV; for ( k = 0; k < nSubframes; k++ ) @@ -501,10 +501,11 @@ void TNSAnalysisStereo( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } + nSubframes = ( st->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV; for ( k = 0; k < nSubframes; k++ ) @@ -970,11 +971,6 @@ void EstimateStereoTCXNoiseLevel( { fac_ns_q = param_core[ch] + n * NPRM_DIV + 1; maxNfCalcBw = min( noiseFillingBorder[ch][n], (int16_t) ( hTcxEnc->measuredBwRatio * (float) L_frame[ch][n] + 0.5f ) ); - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - maxNfCalcBw = min( maxNfCalcBw, MCT_LFE_MAX_LINE ); - } - if ( ( total_brate >= HQ_96k && ( st->element_mode <= IVAS_SCE || st->bwidth < SWB ) ) || total_brate > IVAS_192k ) { fac_ns[ch][n] = 0.0f; @@ -2107,7 +2103,7 @@ void coder_tcx( if ( st->hTcxCfg->tcx_last_overlap_mode == TRANSITION_OVERLAP ) { - WindowSignal( hTcxCfg, hTcxCfg->tcx_offsetFB, hTcxCfg->tcx_last_overlap_mode, hTcxCfg->tcx_curr_overlap_mode, &left_overlap, &right_overlap, st->hTcxEnc->speech_TCX, &L_frame, win, 1, 1, 0 ); + WindowSignal( hTcxCfg, hTcxCfg->tcx_offsetFB, hTcxCfg->tcx_last_overlap_mode, hTcxCfg->tcx_curr_overlap_mode, &left_overlap, &right_overlap, st->hTcxEnc->speech_TCX, &L_frame, win, 1, 1 ); /* Compute MDCT for xn_buf[] */ TCX_MDCT( win, spectrum, left_overlap, L_frame - ( left_overlap + right_overlap ) / 2, right_overlap, st->element_mode ); @@ -2116,7 +2112,7 @@ void coder_tcx( { wtda( st->hTcxEnc->new_speech_TCX, win, NULL, hTcxCfg->tcx_last_overlap_mode, hTcxCfg->tcx_curr_overlap_mode, L_frame ); - WindowSignal( hTcxCfg, hTcxCfg->tcx_offsetFB, hTcxCfg->tcx_last_overlap_mode == ALDO_WINDOW ? FULL_OVERLAP : hTcxCfg->tcx_last_overlap_mode, hTcxCfg->tcx_curr_overlap_mode == ALDO_WINDOW ? FULL_OVERLAP : hTcxCfg->tcx_curr_overlap_mode, &left_overlap, &right_overlap, st->hTcxEnc->speech_TCX, &L_frame, winMDST, 1, 1, 0 ); + WindowSignal( hTcxCfg, hTcxCfg->tcx_offsetFB, hTcxCfg->tcx_last_overlap_mode == ALDO_WINDOW ? FULL_OVERLAP : hTcxCfg->tcx_last_overlap_mode, hTcxCfg->tcx_curr_overlap_mode == ALDO_WINDOW ? FULL_OVERLAP : hTcxCfg->tcx_curr_overlap_mode, &left_overlap, &right_overlap, st->hTcxEnc->speech_TCX, &L_frame, winMDST, 1, 1 ); edct( win, spectrum, L_frame, st->element_mode ); diff --git a/lib_enc/core_enc_init.c b/lib_enc/core_enc_init.c index a87bfefb874d890f08f4f4258c3a964755a08753..774b1398c52a32bba57e2117744381bb9df33648 100644 --- a/lib_enc/core_enc_init.c +++ b/lib_enc/core_enc_init.c @@ -261,7 +261,7 @@ static void init_tcx( hTcxEnc->spectrum[0] = hTcxEnc->spectrum_long; hTcxEnc->spectrum[1] = hTcxEnc->spectrum_long + N_TCX10_MAX; - init_tcx_cfg( st->hTcxCfg, total_brate, st->sr_core, st->input_Fs, st->L_frame, st->bwidth, hTcxEnc->L_frameTCX, st->fscale, st->encoderLookahead_enc, st->encoderLookahead_FB, st->preemph_fac, st->tcxonly, st->rf_mode, st->igf, st->hIGFEnc != NULL ? st->hIGFEnc->infoStopFrequency : 0, st->element_mode, st->ini_frame, MCT_flag, st->mct_chan_mode ); + init_tcx_cfg( st->hTcxCfg, total_brate, st->sr_core, st->input_Fs, st->L_frame, st->bwidth, hTcxEnc->L_frameTCX, st->fscale, st->encoderLookahead_enc, st->encoderLookahead_FB, st->preemph_fac, st->tcxonly, st->rf_mode, st->igf, st->hIGFEnc != NULL ? st->hIGFEnc->infoStopFrequency : 0, st->element_mode, st->ini_frame, MCT_flag ); /* Init TCX target bits correction factor */ hTcxEnc->tcx_target_bits_fac = 1.0f; diff --git a/lib_enc/core_enc_switch.c b/lib_enc/core_enc_switch.c index 14fcac389443b9e5fd358353b5101959384e4292..d6c866d4c56e56a671a6b8b857f98bd106d2333d 100644 --- a/lib_enc/core_enc_switch.c +++ b/lib_enc/core_enc_switch.c @@ -95,7 +95,7 @@ void core_coder_mode_switch( st->bits_frame_nominal = (int16_t) ( (float) st->L_frame / (float) st->fscale * (float) FSCALE_DENOM / 128.0f * (float) st->total_brate / 100.0f + 0.49f ); - st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode, st->mct_chan_mode ); + st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode ); /* switch IGF configuration */ if ( st->igf ) @@ -112,7 +112,7 @@ void core_coder_mode_switch( hTcxEnc->tcx_lpc_shaped_ari = getTcxLpcShapedAri( st->total_brate, st->rf_mode, st->element_mode ); st->hTcxCfg->tcxRateLoopOpt = ( st->hTcxCfg->resq && !st->tcxonly ) ? 1 : st->hTcxCfg->tcxRateLoopOpt; - st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->total_brate, st->igf, st->element_mode, st->mct_chan_mode ); + st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->total_brate, st->igf, st->element_mode ); if ( st->hTcxCfg->fIsTNSAllowed ) { @@ -151,7 +151,7 @@ void core_coder_mode_switch( } else { - st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode, st->mct_chan_mode ); + st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode ); init_coder_ace_plus( st, last_total_brate, MCT_flag ); } diff --git a/lib_enc/dtx.c b/lib_enc/dtx.c index bb477fbd9f797524a41e0bf565f1c6e88846d2fb..08d4316750868e4b72df31b8bf6ec6a11e393a84 100644 --- a/lib_enc/dtx.c +++ b/lib_enc/dtx.c @@ -63,9 +63,12 @@ #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_EVS ACELP_24k40 /* maximum bitrate to which the default DTX is applied in EVS; otherwise DTX is applied only in silence */ +#ifndef FIX_368_SBA_MODE +#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 */ +#else +#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 */ +#endif /*-------------------------------------------------------------------* * Local function prototypes *-------------------------------------------------------------------*/ @@ -86,9 +89,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 +100,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; } diff --git a/lib_enc/evs_enc.c b/lib_enc/evs_enc.c index b90f10359b2eddf3bb4250e421fc41b8fc1bc7f2..da0556dd7215497b3c2151a963a9b0569d306435 100644 --- a/lib_enc/evs_enc.c +++ b/lib_enc/evs_enc.c @@ -242,7 +242,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,7 +686,7 @@ static void configure_core_coder( } } - st->igf = getIgfPresent( 0, st->total_brate, st->bwidth, st->rf_mode, st->mct_chan_mode ); + st->igf = getIgfPresent( 0, st->total_brate, st->bwidth, st->rf_mode ); if ( st->core_brate != SID_2k40 && st->core_brate != FRAME_NO_DATA ) { diff --git a/lib_enc/ext_sig_ana.c b/lib_enc/ext_sig_ana.c index 9e1ad869ab239d34105dbbc93b7573f34a75c87c..80e652cf07c987e48b36c93a601650838efc12a3 100644 --- a/lib_enc/ext_sig_ana.c +++ b/lib_enc/ext_sig_ana.c @@ -215,35 +215,24 @@ void core_signal_analysis_high_bitrate( if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP ) { - if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE ) - { - wtda( hTcxEnc->new_speech_TCX, tcx20Win, NULL, overlap_mode[frameno], overlap_mode[frameno + 1], L_frameTCX ); + wtda( hTcxEnc->new_speech_TCX, tcx20Win, NULL, overlap_mode[frameno], overlap_mode[frameno + 1], L_frameTCX ); - if ( windowed_samples != NULL ) /* store overlap data for later */ - { - assert( frameno == 0 ); - windowed_samples[0] = (float) overlap_mode[frameno]; - windowed_samples[1] = (float) overlap_mode[frameno + 1]; - } - } - else + if ( windowed_samples != NULL ) /* store overlap data for later */ { - /* Windowing of the LFE Signal*/ - WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, overlap_mode[frameno] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno], overlap_mode[frameno + 1] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno + 1], &left_overlap, &right_overlap, &hTcxEnc->speech_TCX[frameno * tcx10SizeFB], &L_subframe, tcx20Win, - st->element_mode != IVAS_CPE_MDCT /* truncate_aldo */, - 1, 1 ); + assert( frameno == 0 ); + windowed_samples[0] = (float) overlap_mode[frameno]; + windowed_samples[1] = (float) overlap_mode[frameno + 1]; } - if ( st->element_mode != IVAS_CPE_MDCT ) { /* Windowing of the 2xTCX5 subframes or 1xTCX10 or 1xTCX20 */ - WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, overlap_mode[frameno] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno], overlap_mode[frameno + 1] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno + 1], &left_overlap, &right_overlap, &hTcxEnc->speech_TCX[frameno * tcx10SizeFB], &L_subframe, mdstWin, 1, 1, 0 ); + WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, overlap_mode[frameno] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno], overlap_mode[frameno + 1] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno + 1], &left_overlap, &right_overlap, &hTcxEnc->speech_TCX[frameno * tcx10SizeFB], &L_subframe, mdstWin, 1, 1 ); } } else { /* Windowing of the 2xTCX5 subframes or 1xTCX10 or 1xTCX20 */ - WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, overlap_mode[frameno], overlap_mode[frameno + 1], &left_overlap, &right_overlap, &hTcxEnc->speech_TCX[frameno * tcx10SizeFB], &L_subframe, tcx20Win, st->element_mode != IVAS_CPE_MDCT, 1, 0 ); + WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, overlap_mode[frameno], overlap_mode[frameno + 1], &left_overlap, &right_overlap, &hTcxEnc->speech_TCX[frameno * tcx10SizeFB], &L_subframe, tcx20Win, st->element_mode != IVAS_CPE_MDCT, 1 ); if ( windowed_samples != NULL ) /* save windowed speech_TCX samples */ { @@ -282,8 +271,7 @@ void core_signal_analysis_high_bitrate( for ( i = 0; i < 2; i++ ) { - assert( st->mct_chan_mode != MCT_CHAN_MODE_LFE ); - WindowSignal( st->hTcxCfg, folding_offset, i == 0 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, i == 1 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, &left_overlap, &right_overlap, tcx20Win + i * tcx5SizeFB, &L_subframe, tcx5Win, st->element_mode != IVAS_CPE_MDCT, 1, 0 ); + WindowSignal( st->hTcxCfg, folding_offset, i == 0 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, i == 1 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, &left_overlap, &right_overlap, tcx20Win + i * tcx5SizeFB, &L_subframe, tcx5Win, st->element_mode != IVAS_CPE_MDCT, 1 ); TCX_MDCT( tcx5Win, hTcxEnc->spectrum[frameno] + i * tcx5SizeFB, left_overlap, L_subframe - ( left_overlap + right_overlap ) / 2, right_overlap, st->element_mode ); @@ -298,7 +286,7 @@ void core_signal_analysis_high_bitrate( { assert( transform_type[frameno] == TCX_10 || transform_type[frameno] == TCX_20 ); - if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP ) { edct( tcx20Win, hTcxEnc->spectrum[frameno], L_subframe, st->element_mode ); @@ -324,12 +312,6 @@ void core_signal_analysis_high_bitrate( v_multc( hTcxEnc->spectrum[frameno] + L_FRAME16k / nSubframes, (float) ( st->bwidth_sw_cnt ) / (float) BWS_TRAN_PERIOD, hTcxEnc->spectrum[frameno] + L_FRAME16k / nSubframes, L_subframe - L_FRAME16k / nSubframes ); } - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - set_f( &hTcxEnc->spectrum[frameno][MCT_LFE_MAX_LINE], 0.f, L_subframe - MCT_LFE_MAX_LINE ); - st->hTcxCfg->tcx_coded_lines = MCT_LFE_MAX_LINE; - } - if ( st->element_mode != IVAS_CPE_MDCT ) { /* For TCX20 at bitrates up to 64 kbps we need the power spectrum */ @@ -345,14 +327,14 @@ void core_signal_analysis_high_bitrate( { L_subframe = L_frameTCX / nSubframes; - if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP ) { wtda_ext( hTcxEnc->new_speech_TCX, mdstWin, overlap_mode[frameno], overlap_mode[frameno + 1], L_frameTCX, 3 ); } else { /* Windowing for the MDST */ - WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, overlap_mode[frameno] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno], overlap_mode[frameno + 1] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno + 1], &left_overlap, &right_overlap, &hTcxEnc->speech_TCX[frameno * tcx10SizeFB], &L_subframe, mdstWin, 0, 1, st->mct_chan_mode == MCT_CHAN_MODE_LFE ); + WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, overlap_mode[frameno] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno], overlap_mode[frameno + 1] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno + 1], &left_overlap, &right_overlap, &hTcxEnc->speech_TCX[frameno * tcx10SizeFB], &L_subframe, mdstWin, 0, 1 ); } if ( transform_type[frameno] == TCX_5 ) @@ -383,8 +365,7 @@ void core_signal_analysis_high_bitrate( for ( i = 0; i < 2; i++ ) { - assert( st->mct_chan_mode != MCT_CHAN_MODE_LFE ); - WindowSignal( st->hTcxCfg, folding_offset, i == 0 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, i == 1 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, &left_overlap, &right_overlap, mdstWin + i * tcx5SizeFB, &L_subframe, tcx5Win, 0, 1, 0 ); + WindowSignal( st->hTcxCfg, folding_offset, i == 0 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, i == 1 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, &left_overlap, &right_overlap, mdstWin + i * tcx5SizeFB, &L_subframe, tcx5Win, 0, 1 ); TCX_MDST( tcx5Win, mdst_spectrum[frameno] + i * tcx5SizeFB, left_overlap, L_subframe - ( left_overlap + right_overlap ) / 2, right_overlap, st->element_mode ); /* high-band gain control in case of BWS */ @@ -396,7 +377,7 @@ void core_signal_analysis_high_bitrate( } else /* transform_type[frameno] != TCX_5 */ { - if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP ) { edst( mdstWin, mdst_spectrum[frameno], L_subframe, st->element_mode ); @@ -421,11 +402,6 @@ void core_signal_analysis_high_bitrate( v_multc( mdst_spectrum[frameno] + L_FRAME16k / nSubframes, (float) ( st->bwidth_sw_cnt ) / (float) BWS_TRAN_PERIOD, mdst_spectrum[frameno] + L_FRAME16k / nSubframes, L_subframe - L_FRAME16k / nSubframes ); } } - - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - set_f( &mdst_spectrum[frameno][MCT_LFE_MAX_LINE], 0.f, L_subframe - MCT_LFE_MAX_LINE ); - } } if ( st->element_mode != IVAS_CPE_MDCT ) diff --git a/lib_enc/fd_cng_enc.c b/lib_enc/fd_cng_enc.c index 5789f0dfd9abb6cc9e10c40fa3c5209bc0bf50d0..d71c24d45c0c8a1d04170f0f884658ab2cccbbcf 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; @@ -708,18 +736,14 @@ void generate_comfort_noise_enc( /* Perform STFT synthesis */ SynthesisSTFT( fftBuffer, timeDomainOutput, hFdCngCom->olapBufferSynth, hFdCngCom->olapWinSyn, tcx_transition, hFdCngCom, -1, -1 ); -#ifdef PARAM_ISM_DTX_CNG if ( st->hTdCngEnc != NULL ) { -#endif /* update CNG excitation energy for LP_CNG */ /* calculate the residual signal energy */ enr = cng_energy( st->element_mode, st->bwidth, st->hDtxEnc->CNG_mode, st->hTdCngEnc->CNG_att, hFdCngCom->exc_cng, hFdCngCom->frameSize ); st->hTdCngEnc->lp_ener = (float) ( 0.8f * st->hTdCngEnc->lp_ener + 0.2f * pow( 2.0f, enr ) ); -#ifdef PARAM_ISM_DTX_CNG } -#endif /* Overlap-add when previous frame is active */ if ( st->last_core_brate > SID_2k40 && st->codec_mode == MODE2 ) @@ -977,6 +1001,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 ) { @@ -1027,7 +1057,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++ ) { @@ -1039,7 +1069,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 ) { @@ -1050,8 +1110,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 ) @@ -1137,6 +1203,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; } @@ -1164,6 +1231,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++ ) @@ -1180,7 +1252,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]; @@ -1188,12 +1260,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 ); @@ -1203,14 +1276,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 ); @@ -1222,7 +1310,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++ ) @@ -1230,7 +1318,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 ); } @@ -1269,6 +1357,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 4bc332fd5e39cbb7acdd1db5e1a9c74c40074127..3fb39b535a79f8da69a5188083fd2c870b3787a4 100644 --- a/lib_enc/hq_core_enc.c +++ b/lib_enc/hq_core_enc.c @@ -116,7 +116,7 @@ void hq_core_enc( left_overlap = -1; right_overlap = -1; - WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, TRANSITION_OVERLAP, FULL_OVERLAP, &left_overlap, &right_overlap, st->hTcxEnc->speech_TCX, &L_spec, wtda_audio, 1, 1, 0 ); + WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, TRANSITION_OVERLAP, FULL_OVERLAP, &left_overlap, &right_overlap, st->hTcxEnc->speech_TCX, &L_spec, wtda_audio, 1, 1 ); TCX_MDCT( wtda_audio, t_audio, left_overlap, L_spec - ( left_overlap + right_overlap ) / 2, right_overlap, st->element_mode ); diff --git a/lib_enc/init_enc.c b/lib_enc/init_enc.c index 683356c6c084d7bb0abd5d72739d18835d46e4c8..9efd3c7f166be25a773de9962c4ace5d943ae60e 100644 --- a/lib_enc/init_enc.c +++ b/lib_enc/init_enc.c @@ -58,11 +58,8 @@ ivas_error init_encoder( const int16_t idchan, /* i : channel ID */ const int16_t var_SID_rate_flag, /* i : flag for variable SID update rate */ const int16_t interval_SID, /* i : interval for SID update */ - const int16_t vad_only_flag /* i : flag to indicate front-VAD structure */ -#ifdef PARAM_ISM_DTX_CNG - , - const ISM_MODE ism_mode /* i : ISM mode */ -#endif + const int16_t vad_only_flag, /* i : flag to indicate front-VAD structure */ + const ISM_MODE ism_mode /* i : ISM mode */ ) { int16_t i; @@ -466,11 +463,7 @@ ivas_error init_encoder( * LP-CNG *-----------------------------------------------------------------*/ -#ifdef PARAM_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 ) ) -#else - if ( ( ( idchan == 0 && st->Opt_DTX_ON && st->element_mode != IVAS_CPE_MDCT ) || st->element_mode == EVS_MONO ) ) -#endif + if ( ( ( idchan == 0 && st->Opt_DTX_ON && st->element_mode != IVAS_CPE_MDCT ) || st->element_mode == EVS_MONO ) && !( ism_mode == ISM_MODE_PARAM || ism_mode == ISM_MODE_DISC ) ) { if ( ( st->hTdCngEnc = (TD_CNG_ENC_HANDLE) malloc( sizeof( TD_CNG_ENC_DATA ) ) ) == NULL ) { @@ -734,7 +727,7 @@ ivas_error init_encoder( * IGF *-----------------------------------------------------------------*/ - if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) ) { if ( ( st->hIGFEnc = (IGF_ENC_INSTANCE_HANDLE) malloc( sizeof( IGF_ENC_INSTANCE ) ) ) == NULL ) { @@ -754,7 +747,7 @@ ivas_error init_encoder( if ( st->codec_mode == MODE2 || st->element_mode > EVS_MONO ) { - st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode, st->mct_chan_mode ); + st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode ); } else { @@ -808,26 +801,18 @@ ivas_error init_encoder( /*-----------------------------------------------------------------* * Transient detector *-----------------------------------------------------------------*/ - - if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( ( st->hTranDet = (TRAN_DET_HANDLE) malloc( sizeof( TRAN_DET_DATA ) ) ) == NULL ) { - if ( ( st->hTranDet = (TRAN_DET_HANDLE) malloc( sizeof( TRAN_DET_DATA ) ) ) == NULL ) - { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Transient Detection\n" ) ); - } + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Transient Detection\n" ) ); + } - if ( st->element_mode > EVS_MONO ) - { - InitTransientDetection( (int16_t) ( st->input_Fs / FRAMES_PER_SEC ), 0, st->hTranDet, 1 ); - } - else - { - InitTransientDetection( (int16_t) ( st->input_Fs / FRAMES_PER_SEC ), NS2SA( st->input_Fs, DELAY_FIR_RESAMPL_NS ), st->hTranDet, 0 ); - } + if ( st->element_mode > EVS_MONO ) + { + InitTransientDetection( (int16_t) ( st->input_Fs / FRAMES_PER_SEC ), 0, st->hTranDet, 1 ); } else { - st->hTranDet = NULL; + InitTransientDetection( (int16_t) ( st->input_Fs / FRAMES_PER_SEC ), NS2SA( st->input_Fs, DELAY_FIR_RESAMPL_NS ), st->hTranDet, 0 ); } /*-----------------------------------------------------------------* @@ -869,32 +854,22 @@ void LPDmem_enc_init( return; } + + /*-----------------------------------------------------------------------* - * destroy_encoder() + * destroy_cldfb_encoder() * * Free memory which was allocated in init_encoder() *-----------------------------------------------------------------------*/ -void destroy_encoder( +void destroy_cldfb_encoder( Encoder_State *st /* i/o: Encoder static variables structure */ ) { - if ( st->cldfbSynTd != NULL ) - { - deleteCldfb( &st->cldfbSynTd ); - } - - if ( st->cldfbAnaEnc != NULL ) - { - deleteCldfb( &st->cldfbAnaEnc ); - } - - if ( st->hFdCngEnc != NULL ) - { - deleteFdCngEnc( &st->hFdCngEnc ); - } + deleteCldfb( &st->cldfbSynTd ); + deleteCldfb( &st->cldfbAnaEnc ); - /* Close Core */ + deleteFdCngEnc( &st->hFdCngEnc ); return; } diff --git a/lib_enc/ivas_agc_enc.c b/lib_enc/ivas_agc_enc.c index f98c22b97e46d286c4a5be8e8df49c9c299d4c48..83dbdad1e183efb3bb5990657633b3c68323b389 100644 --- a/lib_enc/ivas_agc_enc.c +++ b/lib_enc/ivas_agc_enc.c @@ -195,22 +195,24 @@ void ivas_spar_agc_enc_close( { ivas_agc_enc_state_t *hAgc; + if ( hAgcEnc == NULL || *hAgcEnc == NULL ) + { + return; + } + hAgc = *hAgcEnc; - if ( hAgc != NULL ) - { - free( hAgc->agc_com.winFunc ); - hAgc->agc_com.winFunc = NULL; + free( hAgc->agc_com.winFunc ); + hAgc->agc_com.winFunc = NULL; - free( hAgc->gain_state ); - hAgc->gain_state = NULL; + free( hAgc->gain_state ); + hAgc->gain_state = NULL; - free( hAgc->gain_data ); - hAgc->gain_data = NULL; + free( hAgc->gain_data ); + hAgc->gain_data = NULL; - free( hAgc ); - hAgc = NULL; - } + free( *hAgcEnc ); + *hAgcEnc = NULL; return; } diff --git a/lib_enc/ivas_core_enc.c b/lib_enc/ivas_core_enc.c index e53033ab98546480c4d75cce2b2a898d208dbf81..c2627b923bed0d309efd02e639da02d21a894147 100644 --- a/lib_enc/ivas_core_enc.c +++ b/lib_enc/ivas_core_enc.c @@ -219,7 +219,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; } @@ -259,7 +259,8 @@ ivas_error ivas_core_enc( if ( MCT_flag ) { ivas_mdct_core_whitening_enc( hCPE, old_inp_16k, old_wsp, pitch_buf, hMCT->p_mdst_spectrum_long[cpe_id], hMCT->tnsBits[cpe_id], hMCT->p_orig_spectrum_long[cpe_id], - hMCT->tnsSize[cpe_id], hMCT->p_param[cpe_id], hMCT->hBstr, &hMCT->LFE_off, 1, hMCT->nchan_out_woLFE + hMCT->num_lfe ); + hMCT->tnsSize[cpe_id], hMCT->p_param[cpe_id], hMCT->hBstr, + 1, hMCT->nchan_out_woLFE ); } else { @@ -448,6 +449,8 @@ ivas_error ivas_core_enc( dbgwrite( &st->sp_aud_decision1, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "sp_aud_decision1", n, id, ENC ) ); dbgwrite( &st->sp_aud_decision2, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "sp_aud_decision2", n, id, ENC ) ); + dbgwrite( &st->lp_noise, sizeof( float ), 1, input_frame, fname( debug_dir, "lp_noise", n, id, ENC ) ); + #if ( defined DEBUG_MODE_ACELP ) || ( defined DEBUG_MODE_TCX ) if ( st->coder_type == INACTIVE || st->coder_type == UNVOICED ) { diff --git a/lib_enc/ivas_core_pre_proc_front.c b/lib_enc/ivas_core_pre_proc_front.c index 000fbab33ebbabbaaba7787b9a47abc6181da856..cf23ddef539f2e2f7ceeba7997129b0f07829b9c 100644 --- a/lib_enc/ivas_core_pre_proc_front.c +++ b/lib_enc/ivas_core_pre_proc_front.c @@ -107,12 +107,7 @@ ivas_error pre_proc_front_ivas( const int16_t front_vad_flag, /* i : front-VAD flag to overwrite VAD decision */ const int16_t force_front_vad, /* i : flag to force VAD decision */ const int16_t front_vad_dtx_flag, /* i : front-VAD DTX flag to overwrite VAD decision*/ -#ifdef LOW_RATE_TRANS_CORE_CODER - const int32_t ivas_total_brate /* i : IVAS total bitrate - for setting the DTX */ -#else - const int32_t ivas_total_brate, /* i : IVAS total bitrate - for setting the DTX */ - const int16_t ivas_format /* i : IVAS format */ -#endif + const int32_t ivas_total_brate /* i : IVAS total bitrate - for setting the DTX */ ) { @@ -448,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 ) { @@ -491,7 +479,8 @@ ivas_error pre_proc_front_ivas( if ( st->idchan == 0 && element_mode != IVAS_CPE_MDCT ) { - bw_detect( st, st->input, NULL, enerBuffer ); + bw_detect( st, st->input, NULL, enerBuffer, + 0 ); } if ( element_mode != IVAS_CPE_MDCT ) /* in MDCT stereo, set_bw_stereo() is used instead */ @@ -811,11 +800,7 @@ ivas_error pre_proc_front_ivas( } } /* Switch to ACELP for non-harmonic transient signals */ -#ifdef LOW_RATE_TRANS_CORE_CODER else if ( ( ( element_mode >= IVAS_CPE_DFT && element_brate <= IVAS_16k4 ) || ( element_mode == IVAS_SCE && element_brate < SCE_SMC_THR ) ) && ( loc_harm[0] != 1 ) && smc_dec == MUSIC ) -#else - else if ( ( ( ivas_format == STEREO_FORMAT && element_brate <= IVAS_16k4 ) || ( ivas_format == ISM_FORMAT && element_brate < SCE_SMC_THR ) ) && ( loc_harm[0] != 1 ) && smc_dec == MUSIC ) -#endif { if ( element_mode == IVAS_SCE ) { @@ -838,34 +823,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 f419425104264631193decc419d5a668e5dafd3f..080ecc20461198f9cea2cc1670053610499a3202 100644 --- a/lib_enc/ivas_corecoder_enc_reconfig.c +++ b/lib_enc/ivas_corecoder_enc_reconfig.c @@ -211,7 +211,7 @@ ivas_error ivas_corecoder_enc_reconfig( { if ( n_CoreCoder_existing > cpe_id * CPE_CHANNELS + n ) { - mvr2r( st_ivas->hCPE[cpe_id]->hCoreCoder[0]->input_buff, input_buff[( cpe_id - st_ivas->nCPE ) * CPE_CHANNELS + n], len_inp_memory ); /* TODO VoiceAge: Please check if this should be hCoreCoder[n] */ + mvr2r( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->input_buff, input_buff[( cpe_id - st_ivas->nCPE ) * CPE_CHANNELS + n], len_inp_memory ); } } @@ -221,8 +221,7 @@ ivas_error ivas_corecoder_enc_reconfig( if ( st_ivas->nCPE <= 1 && st_ivas->hMCT != NULL ) { - ivas_mct_enc_close( st_ivas->hMCT ); - st_ivas->hMCT = NULL; + ivas_mct_enc_close( &( st_ivas->hMCT ) ); } /* special case, if we have MCT now and had a single CPE before, remove the MDCT Stereo handles */ @@ -378,8 +377,7 @@ ivas_error ivas_corecoder_enc_reconfig( st_ivas->hCPE[0]->hCoreCoder[n]->igf = getIgfPresent( st_ivas->hCPE[0]->hCoreCoder[n]->element_mode, st_ivas->hCPE[0]->hCoreCoder[n]->bits_frame_nominal * FRAMES_PER_SEC, st_ivas->hCPE[0]->hCoreCoder[n]->bwidth, - st_ivas->hCPE[0]->hCoreCoder[n]->rf_mode, - st_ivas->hCPE[0]->hCoreCoder[n]->mct_chan_mode ); + st_ivas->hCPE[0]->hCoreCoder[n]->rf_mode ); if ( st_ivas->hCPE[0]->hCoreCoder[n]->igf ) { @@ -446,8 +444,7 @@ ivas_error ivas_corecoder_enc_reconfig( st_ivas->hCPE[0]->hCoreCoder[n]->igf = getIgfPresent( st_ivas->hCPE[0]->hCoreCoder[n]->element_mode, st_ivas->hCPE[0]->hCoreCoder[n]->bits_frame_nominal * FRAMES_PER_SEC, st_ivas->hCPE[0]->hCoreCoder[n]->bwidth, - st_ivas->hCPE[0]->hCoreCoder[n]->rf_mode, - st_ivas->hCPE[0]->hCoreCoder[n]->mct_chan_mode ); + st_ivas->hCPE[0]->hCoreCoder[n]->rf_mode ); if ( st_ivas->hCPE[0]->hCoreCoder[n]->igf ) { diff --git a/lib_enc/ivas_cpe_enc.c b/lib_enc/ivas_cpe_enc.c index 8339b03399153d04975eaa281f190f842c3ed16e..b60f8be45b3807ced769a80dbe65b106df875963 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,7 +153,10 @@ ivas_error ivas_cpe_enc( } mvr2r( data_f_ch0, sts[0]->input, input_frame ); - mvr2r( data_f_ch1, sts[1]->input, input_frame ); + if ( data_f_ch1 != NULL ) /*this may happen for cases with odd number of channels*/ + { + mvr2r( data_f_ch1, sts[1]->input, input_frame ); + } /*----------------------------------------------------------------* * Stereo technology selection @@ -296,12 +298,14 @@ ivas_error ivas_cpe_enc( { if ( st_ivas->hMCT ) { + int16_t lfe_bits; + lfe_bits = ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ? st_ivas->hLFE->lfe_bits : 0 ); sts[n]->total_brate = hCPE->element_brate; - if ( sts[n]->mct_chan_mode != MCT_CHAN_MODE_LFE ) - { - sts[n]->bits_frame_nominal = (int16_t) ( hCPE->element_brate / FRAMES_PER_SEC ); - sts[n]->bits_frame_channel = (int16_t) ( ( ivas_total_brate / FRAMES_PER_SEC - ( st_ivas->hMCT->num_lfe == FALSE ? 0 : LFE_BITS ) - nb_bits_metadata ) / st_ivas->hMCT->nchan_out_woLFE ); - } + sts[n]->bits_frame_nominal = (int16_t) ( hCPE->element_brate / FRAMES_PER_SEC ); + sts[n]->bits_frame_channel = (int16_t) ( ( ivas_total_brate / FRAMES_PER_SEC - + lfe_bits - + nb_bits_metadata ) / + st_ivas->hMCT->nchan_out_woLFE ); } else { @@ -429,19 +433,11 @@ ivas_error ivas_cpe_enc( for ( n = 0; n < n_CoreChannels; n++ ) { -#ifdef LOW_RATE_TRANS_CORE_CODER error = pre_proc_front_ivas( NULL, hCPE, hCPE->element_brate, nb_bits_metadata, input_frame, n, old_inp_12k8[n], old_inp_16k[n], &ener[n], &relE[n], A[n], Aw[n], epsP[n], lsp_new[n], lsp_mid[n], &vad_hover_flag[n], &attack_flag[n], realBuffer[n], imagBuffer[n], old_wsp[n], pitch_fr[n], voicing_fr[n], &loc_harm[n], &cor_map_sum[n], &vad_flag_dtx[n], enerBuffer[n], fft_buff[n], A[0], lsp_new[0], currFlatness[n], tdm_ratio_idx, fr_bands, Etot_LR, lf_E, localVAD_HE_SAD, band_energies_LR, 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_flag : 0, 0, 0, ivas_total_brate ); -#else - error = pre_proc_front_ivas( NULL, hCPE, hCPE->element_brate, nb_bits_metadata, input_frame, n, old_inp_12k8[n], old_inp_16k[n], - &ener[n], &relE[n], A[n], Aw[n], epsP[n], lsp_new[n], lsp_mid[n], - &vad_hover_flag[n], &attack_flag[n], realBuffer[n], imagBuffer[n], old_wsp[n], pitch_fr[n], voicing_fr[n], &loc_harm[n], &cor_map_sum[n], &vad_flag_dtx[n], enerBuffer[n], - fft_buff[n], A[0], lsp_new[0], currFlatness[n], tdm_ratio_idx, fr_bands, Etot_LR, lf_E, localVAD_HE_SAD, band_energies_LR, 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_flag : 0, 0, 0, - ivas_total_brate, st_ivas->hEncoderConfig->ivas_format ); -#endif if ( error != IVAS_ERR_OK ) { return error; @@ -668,10 +664,7 @@ ivas_error ivas_cpe_enc( /* Store previous attack detection flag */ for ( n = 0; n < CPE_CHANNELS; n++ ) { - if ( sts[n]->mct_chan_mode != MCT_CHAN_MODE_LFE ) - { - sts[n]->hTranDet->transientDetector.prev_bIsAttackPresent = sts[n]->hTranDet->transientDetector.bIsAttackPresent; - } + sts[n]->hTranDet->transientDetector.prev_bIsAttackPresent = sts[n]->hTranDet->transientDetector.bIsAttackPresent; } #ifdef DEBUG_MODE_INFO @@ -835,16 +828,7 @@ ivas_error create_cpe_enc( copy_encoder_config( st_ivas, st, 1 ); st->total_brate = hCPE->element_brate / ( st_ivas->nCPE > 1 ? 1 : CPE_CHANNELS ); /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */ st->mct_chan_mode = MCT_CHAN_MODE_REGULAR; - if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT && ( n + cpe_id * CPE_CHANNELS ) == LFE_CHANNEL ) - { - st->mct_chan_mode = MCT_CHAN_MODE_LFE; - } - -#ifdef PARAM_ISM_DTX_CNG if ( ( error = init_encoder( st, n, hEncoderConfig->var_SID_rate_flag, hEncoderConfig->interval_SID, 0, st_ivas->ism_mode ) ) != IVAS_ERR_OK ) -#else - if ( ( error = init_encoder( st, n, hEncoderConfig->var_SID_rate_flag, hEncoderConfig->interval_SID, 0 ) ) != IVAS_ERR_OK ) -#endif { return error; } diff --git a/lib_enc/ivas_decision_matrix_enc.c b/lib_enc/ivas_decision_matrix_enc.c index 7b4685251f2466d24529b595dacdb60cb409bada..b8949329582e8684a9f1f185d86c71647ab7e807 100644 --- a/lib_enc/ivas_decision_matrix_enc.c +++ b/lib_enc/ivas_decision_matrix_enc.c @@ -114,7 +114,7 @@ void ivas_decision_matrix_enc( if ( st->element_mode == IVAS_SCE && st->low_rate_mode ) { - /* ISm low-rate mode */ + /* ISM low-rate mode */ st->core = ACELP_CORE; st->coder_type = INACTIVE; } @@ -391,7 +391,7 @@ void ivas_signaling_enc( } else if ( st->element_mode == IVAS_SCE && st->low_rate_mode ) { - /* ISm Low-rate mode -> do nothing -> always WB, ACELP core, IC coder_type */ + /* ISM Low-rate mode -> do nothing -> always WB, ACELP core, IC coder_type */ } else if ( ( st->element_mode == IVAS_CPE_MDCT && st->idchan == 1 ) || st->core_brate <= SID_2k40 ) { diff --git a/lib_enc/ivas_dirac_enc.c b/lib_enc/ivas_dirac_enc.c index a143ff37d27439adf9ec2ff991f8a0ec48bd4de3..45ce09bb151e929cce83036f28bfff8d0ca21dad 100644 --- a/lib_enc/ivas_dirac_enc.c +++ b/lib_enc/ivas_dirac_enc.c @@ -104,11 +104,7 @@ ivas_error ivas_dirac_enc_open( return error; } /* Allocate and initialize FB mixer handle */ -#ifdef SBA_BR_SWITCHING_CLEAN_UP if ( ( error = ivas_FB_mixer_open( &( hDirAC->hFbMixer ), input_Fs, fb_cfg, 0 ) ) != IVAS_ERR_OK ) -#else - if ( ( error = ivas_FB_mixer_open( &( hDirAC->hFbMixer ), input_Fs, fb_cfg ) ) != IVAS_ERR_OK ) -#endif { return error; } @@ -249,23 +245,27 @@ ivas_error ivas_dirac_enc_reconfigure( /*------------------------------------------------------------------------- * ivas_dirac_enc_close() * - * Close DirAC + * Close DirAC encoder handle *------------------------------------------------------------------------*/ void ivas_dirac_enc_close( - DIRAC_ENC_HANDLE hDirAC, /* i/o: encoder DirAC handle */ - const int32_t input_Fs /* i : input sampling rate */ + DIRAC_ENC_HANDLE *hDirAC_out, /* i/o: encoder DirAC handle */ + const int32_t input_Fs /* i : input sampling rate */ ) { int16_t i, j; + DIRAC_ENC_HANDLE hDirAC; + + if ( hDirAC_out == NULL || *hDirAC_out == NULL ) + { + return; + } + + hDirAC = *hDirAC_out; if ( hDirAC->hFbMixer != NULL ) { -#ifdef SBA_BR_SWITCHING_CLEAN_UP ivas_FB_mixer_close( &hDirAC->hFbMixer, input_Fs, 0 ); -#else - ivas_FB_mixer_close( &hDirAC->hFbMixer, input_Fs ); -#endif } for ( i = 0; i < DIRAC_MAX_ANA_CHANS; i++ ) @@ -311,7 +311,8 @@ void ivas_dirac_enc_close( hDirAC->hConfig = NULL; } - free( hDirAC ); + free( *hDirAC_out ); + *hDirAC_out = NULL; return; } @@ -487,7 +488,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; diff --git a/lib_enc/ivas_enc.c b/lib_enc/ivas_enc.c index 0500a8e775da18d1c9e0b07ca3285b761ad4909a..bc374f88e59c4cedddc78ceb8cf25ccbf98283d8 100644 --- a/lib_enc/ivas_enc.c +++ b/lib_enc/ivas_enc.c @@ -132,14 +132,11 @@ ivas_error ivas_enc( /* bypass EVS coding in float precision, emulating EVS encoder/decoder delay */ for ( i = 0; i < n; i++ ) { -#ifdef SBA_HPF_TUNING_ENC if ( ( ivas_format == SBA_FORMAT ) && ( st_ivas->sba_mode == SBA_MODE_SPAR ) ) { hp20( data_f[HOA_keep_ind[i]], input_frame, st_ivas->mem_hp20_in[i], input_Fs ); } - else -#endif - if ( !( ivas_format == MC_FORMAT && i == LFE_CHANNEL ) ) /*TODO: is the HPF needed for LFE channel? */ + else if ( !( ivas_format == MC_FORMAT && i == LFE_CHANNEL ) ) /*TODO: is the HPF needed for LFE channel? */ { hp20( data_f[i], input_frame, st_ivas->mem_hp20_in[i], input_Fs ); } @@ -230,13 +227,11 @@ ivas_error ivas_enc( } else { + ivas_masa_estimate_energy( st_ivas->hMasa, data_f, input_frame, st_ivas->nchan_transport ); /* energy-estimation uses TF-resolution: 4x24 */ if ( ( error = ivas_masa_enc_config( st_ivas ) ) != IVAS_ERR_OK ) { return error; } - - ivas_masa_estimate_energy( st_ivas->hMasa, data_f, input_frame, st_ivas->nchan_transport ); - 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 ) { diff --git a/lib_enc/ivas_enc_cov_handler.c b/lib_enc/ivas_enc_cov_handler.c index b70c05e96205010bdbdf0b759ee87dfaed3aadc4..9524fb656fcdf1bcc789b49113b82bd67dd3f45a 100644 --- a/lib_enc/ivas_enc_cov_handler.c +++ b/lib_enc/ivas_enc_cov_handler.c @@ -66,6 +66,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; @@ -83,7 +85,7 @@ ivas_error ivas_spar_covar_enc_open( cov_smooth_cfg.max_update_rate = MAX_UPDATE_RATE; cov_smooth_cfg.min_pool_size = MIN_POOL_SIZE; - 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 +93,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; } @@ -117,17 +119,19 @@ void ivas_spar_covar_enc_close( { ivas_enc_cov_handler_state_t *hCovState; + if ( hCovEnc == NULL || *hCovEnc == NULL ) + { + return; + } + hCovState = *hCovEnc; - if ( hCovState != NULL ) - { - ivas_spar_covar_smooth_enc_close( &hCovState->pCov_state, nchan_inp ); + ivas_spar_covar_smooth_enc_close( &hCovState->pCov_state, nchan_inp ); - ivas_spar_covar_smooth_enc_close( &hCovState->pCov_dtx_state, nchan_inp ); + ivas_spar_covar_smooth_enc_close( &hCovState->pCov_dtx_state, nchan_inp ); - free( hCovState ); - hCovState = NULL; - } + free( *hCovEnc ); + *hCovEnc = NULL; return; } @@ -150,12 +154,7 @@ void ivas_enc_cov_handler_process( const int16_t end_band, const int16_t num_ch, const int16_t dtx_vad, -#ifdef SMOOTH_WITH_TRANS_DET - const int16_t transient_det[2] -#else - const int16_t transient_det -#endif -) + const int16_t transient_det[2] ) { int16_t i, j; int16_t dtx_cov_flag; @@ -218,11 +217,7 @@ void ivas_enc_cov_handler_process( } else { -#ifdef SMOOTH_WITH_TRANS_DET if ( ( transient_det[0] == 0 ) && ( transient_det[1] == 0 ) ) -#else - if ( transient_det == 0 ) -#endif { ivas_cov_smooth_process( hCovEnc->pCov_dtx_state, cov_dtx_real, pFb, start_band, end_band, num_ch, transient_det ); hCovEnc->prior_dtx_present = 1; diff --git a/lib_enc/ivas_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 cce80138cb7202e2384b3304174f8f42d6281afc..36d476723ce069a4789fa7bcdd80b20e1238bbee 100644 --- a/lib_enc/ivas_init_enc.c +++ b/lib_enc/ivas_init_enc.c @@ -184,11 +184,7 @@ int16_t getNumChanAnalysis( n = st_ivas->nSCE + CPE_CHANNELS * st_ivas->nCPE; if ( st_ivas->hEncoderConfig->ivas_format == SBA_FORMAT ) { -#ifdef SBA_HPF_TUNING_ENC n = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order ); -#else - n = DIRAC_MAX_ANA_CHANS; -#endif } else if ( st_ivas->hEncoderConfig->ivas_format == MC_FORMAT && ( st_ivas->mc_mode == MC_MODE_PARAMMC || st_ivas->mc_mode == MC_MODE_MCMASA ) ) { @@ -270,16 +266,14 @@ void ivas_initialize_handles_enc( st_ivas->mem_hp20_in = NULL; - /* ISm metadata handles */ + /* ISM metadata handles */ for ( i = 0; i < MAX_NUM_OBJECTS; i++ ) { st_ivas->hIsmMetaData[i] = NULL; } -#ifdef PARAM_ISM_DTX_CNG /* ISM DTX handle */ st_ivas->hISMDTX = NULL; -#endif /* Q Metadata handle */ st_ivas->hQMetaData = NULL; @@ -345,7 +339,7 @@ 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; @@ -437,15 +431,13 @@ ivas_error ivas_init_encoder( } } -#ifdef PARAM_ISM_DTX_CNG - if ( st_ivas->hEncoderConfig->Opt_DTX_ON && st_ivas->ism_mode == ISM_MODE_PARAM ) + if ( st_ivas->hEncoderConfig->Opt_DTX_ON ) { if ( ( error = ivas_ism_dtx_open( st_ivas ) ) != IVAS_ERR_OK ) { return error; } } -#endif } else if ( ivas_format == SBA_FORMAT || ivas_format == MASA_FORMAT ) { @@ -456,17 +448,12 @@ 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 ) { -#ifdef SBA_BR_SWITCHING_CLEAN_UP if ( ( error = ivas_spar_enc_open( st_ivas, 0 ) ) != IVAS_ERR_OK ) -#else - if ( ( error = ivas_spar_enc_open( st_ivas ) ) != IVAS_ERR_OK ) -#endif { return error; } @@ -737,7 +724,7 @@ void destroy_core_enc( ENC_CORE_HANDLE hCoreCoder /* i/o: core encoder structure */ ) { - destroy_encoder( hCoreCoder ); + destroy_cldfb_encoder( hCoreCoder ); if ( hCoreCoder->hSignalBuf != NULL ) { @@ -928,97 +915,48 @@ void ivas_destroy_enc( } /* ISM metadata handles */ - for ( n = 0; n < MAX_NUM_OBJECTS; n++ ) - { - if ( st_ivas->hIsmMetaData[n] != NULL ) - { - free( st_ivas->hIsmMetaData[n] ); - st_ivas->hIsmMetaData[n] = NULL; - } - } + ivas_ism_metadata_close( st_ivas->hIsmMetaData ); -#ifdef PARAM_ISM_DTX_CNG /* ISM DTX Handle */ if ( st_ivas->hISMDTX != NULL ) { free( st_ivas->hISMDTX ); st_ivas->hISMDTX = NULL; } -#endif /* Q Metadata handle */ ivas_qmetadata_close( &( st_ivas->hQMetaData ) ); /* DirAC handle */ - if ( st_ivas->hDirAC != NULL ) + if ( ivas_format == ISM_FORMAT ) { - if ( ivas_format == ISM_FORMAT ) - { - ivas_param_ism_enc_close( st_ivas->hDirAC, st_ivas->hEncoderConfig->input_Fs ); - } - else - { - ivas_dirac_enc_close( st_ivas->hDirAC, st_ivas->hEncoderConfig->input_Fs ); - } - st_ivas->hDirAC = NULL; + ivas_param_ism_enc_close( &( st_ivas->hDirAC ), st_ivas->hEncoderConfig->input_Fs ); } - - /* SPAR handle */ - if ( st_ivas->hSpar != NULL ) + else { -#ifdef SBA_BR_SWITCHING_CLEAN_UP - ivas_spar_enc_close( st_ivas->hSpar, st_ivas->hEncoderConfig->input_Fs, nchan_inp, 0 ); -#else - ivas_spar_enc_close( st_ivas->hSpar, st_ivas->hEncoderConfig->input_Fs, nchan_inp ); -#endif - st_ivas->hSpar = NULL; + ivas_dirac_enc_close( &( st_ivas->hDirAC ), st_ivas->hEncoderConfig->input_Fs ); } + /* SPAR handle */ + ivas_spar_enc_close( &( st_ivas->hSpar ), st_ivas->hEncoderConfig->input_Fs, nchan_inp, 0 ); + /* MASA handle */ - if ( st_ivas->hMasa != NULL ) - { -#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 - st_ivas->hMasa = NULL; - } + ivas_masa_enc_close( &( st_ivas->hMasa ) ); /* MCT handle */ - if ( st_ivas->hMCT != NULL ) - { - ivas_mct_enc_close( st_ivas->hMCT ); - st_ivas->hMCT = NULL; - } + ivas_mct_enc_close( &( st_ivas->hMCT ) ); + + /* LFE handle */ + ivas_lfe_enc_close( &( st_ivas->hLFE ) ); /* Parametric MC handle */ - if ( st_ivas->hParamMC != NULL ) - { - ivas_param_mc_enc_close( st_ivas->hParamMC, st_ivas->hEncoderConfig->input_Fs ); - st_ivas->hParamMC = NULL; - } + ivas_param_mc_enc_close( &( st_ivas->hParamMC ), st_ivas->hEncoderConfig->input_Fs ); /* Multi-channel MASA handle */ - if ( st_ivas->hMcMasa != NULL ) - { - ivas_mcmasa_enc_close( st_ivas->hMcMasa, st_ivas->hEncoderConfig->input_Fs ); - st_ivas->hMcMasa = NULL; - } + ivas_mcmasa_enc_close( &( st_ivas->hMcMasa ), st_ivas->hEncoderConfig->input_Fs ); /* Stereo downmix for EVS encoder handle */ - if ( st_ivas->hStereoDmxEVS != NULL ) - { - stereo_dmx_evs_close_encoder( st_ivas->hStereoDmxEVS ); - st_ivas->hStereoDmxEVS = NULL; - } - - /* LFE handle */ - if ( st_ivas->hLFE != NULL ) - { - ivas_lfe_enc_close( st_ivas->hLFE ); - st_ivas->hLFE = NULL; - } + stereo_dmx_evs_close_encoder( &( st_ivas->hStereoDmxEVS ) ); /* Encoder configuration handle */ if ( st_ivas->hEncoderConfig != NULL ) diff --git a/lib_enc/ivas_ism_dtx_enc.c b/lib_enc/ivas_ism_dtx_enc.c index 2fea85e44a05fd0f017ea0038928218082d08099..aff8b9a0b6f421e0450d55c51c71dbf84f46af9e 100644 --- a/lib_enc/ivas_ism_dtx_enc.c +++ b/lib_enc/ivas_ism_dtx_enc.c @@ -41,7 +41,14 @@ #endif #include "wmc_auto.h" -#ifdef PARAM_ISM_DTX_CNG + +/*-----------------------------------------------------------------------* + * Local constants + *-----------------------------------------------------------------------*/ + +#define MD_MAX_DIFF_AZIMUTH 10 +#define MD_MAX_DIFF_ELEVATION 10 + /*-------------------------------------------------------------------* * ivas_ism_dtx_open() @@ -67,8 +74,7 @@ ivas_error ivas_ism_dtx_open( hISMDTX->dtx_flag = 0; hISMDTX->sce_id_dtx = 0; - - set_s( hISMDTX->dtx_speech_buffer_enc, 0, PARAM_ISM_HYS_BUF_SIZE ); + hISMDTX->cnt_SID_ISM = -1; for ( i = 0; i < MAX_NUM_OBJECTS; i++ ) { @@ -84,141 +90,207 @@ ivas_error ivas_ism_dtx_open( /*-------------------------------------------------------------------* - * ivas_ism_dtx_enc() + * ivas_ism_get_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 */ + ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */ + SCE_ENC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */ + const int32_t ivas_total_brate, /* i : IVAS total bitrate */ + const int16_t nchan_ism, /* i : number of objects */ + const int16_t nchan_transport, /* i : number of transport channels */ + int16_t vad_flag[MAX_NUM_OBJECTS], /* i : VAD flag */ + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + int16_t md_diff_flag[], /* o : metadata differential flag */ + int16_t *sid_flag /* o : indication of SID frame */ ) { - int16_t i, val, dtx_flag; + int16_t ch, dtx_flag; + int16_t nBits, nBits_MD_max; + int16_t nBits_azimuth, nBits_elevation, nBits_coh, nBits_sce_id; + float lp_noise[MAX_NUM_OBJECTS], lp_noise_variation, lp_noise_mean; + float lp_noise_max; + float tmp1, tmp2; + + /* initialization */ + for ( ch = 0; ch < nchan_transport; ch++ ) + { + hSCE[ch]->hCoreCoder[0]->low_rate_mode = 0; + } - dtx_flag = 0; - *sid_flag = 0; + /*------------------------------------------------------------------* + * compute global ISM DTX flag + *-----------------------------------------------------------------*/ + + /* compute global ISM based on localVAD */ + dtx_flag = 1; + for ( ch = 0; ch < nchan_transport; ch++ ) + { + dtx_flag &= !vad_flag[ch]; + } + + /* compute global ISM based on long-term background noise */ + /* one of the channels is active -> no DTX */ + for ( ch = 0; ch < nchan_transport; ch++ ) + { + lp_noise[ch] = hSCE[ch]->hCoreCoder[0]->lp_noise; + } + + lp_noise_variation = var( lp_noise, nchan_transport ); + lp_noise_mean = mean( lp_noise, nchan_transport ); + + if ( lp_noise_mean > 50 || ( lp_noise_mean > 25 && lp_noise_variation > 32 ) ) + { + dtx_flag = 0; + } + + + /* default DTX is applied at lower bitrates; otherwise DTX is applied only in silence */ + maximum( lp_noise, nchan_transport, &lp_noise_max ); + + if ( !( ( nchan_ism == 1 && ivas_total_brate <= IVAS_24k4 ) || + ( nchan_ism == 2 && ivas_total_brate <= IVAS_48k ) || + ( nchan_ism == 3 && ivas_total_brate <= IVAS_80k ) || + ( nchan_ism == 4 && ivas_total_brate <= IVAS_96k ) || + lp_noise_max < 15 ) ) + { + dtx_flag = 0; + } - /* Move the DTX/CNG speech buffer */ - for ( i = 0; i < ( PARAM_ISM_HYS_BUF_SIZE - 1 ); i++ ) + /*------------------------------------------------------------------* + * Reset the bitstream + *-----------------------------------------------------------------*/ + + if ( dtx_flag ) { - st_ivas->hISMDTX->dtx_speech_buffer_enc[i] = st_ivas->hISMDTX->dtx_speech_buffer_enc[i + 1]; + /* reset the bitstream (IVAS format signaling was already written) */ + reset_indices_enc( hSCE[0]->hCoreCoder[0]->hBstr, MAX_NUM_INDICES ); } - /* 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 ) ) + /*------------------------------------------------------------------* + * decide about SID metadata to be sent or not (per object) + * estimate the MD bit-budget consumption + *-----------------------------------------------------------------*/ + + if ( dtx_flag ) { - /* 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 ) ) + ivas_get_ism_sid_quan_bitbudget( nchan_ism, &nBits_azimuth, &nBits_elevation, &tmp1, &tmp2, &nBits_coh, &nBits_sce_id ); + + nBits = 0; + for ( ch = 0; ch < nchan_ism; ch++ ) { - st_ivas->hISMDTX->dtx_speech_buffer_enc[i] = 0; + /* check difference between current and last metadata */ + md_diff_flag[ch] = 0; + if ( fabsf( hIsmMeta[ch]->azimuth - hIsmMeta[ch]->last_azimuth ) > MD_MAX_DIFF_AZIMUTH ) + { + md_diff_flag[ch] = 1; + } + + if ( fabsf( hIsmMeta[ch]->elevation - hIsmMeta[ch]->last_elevation ) > MD_MAX_DIFF_ELEVATION ) + { + md_diff_flag[ch] = 1; + } + + /* estimate SID metadata bit-budget */ + nBits++; /* number of objects */ + nBits++; /* SID metadata flag */ + if ( md_diff_flag[ch] == 1 ) + { + nBits += nBits_azimuth; + nBits += nBits_elevation; + } } - /* 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 ) ) + /* calculate maximum available MD bit-budget */ + nBits_MD_max = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC; + nBits_MD_max -= SID_FORMAT_NBITS; + if ( nchan_transport > 1 ) { - st_ivas->hISMDTX->dtx_speech_buffer_enc[i] = 0; + nBits_MD_max -= nBits_sce_id; } - /* 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 ) ) + for ( ch = 0; ch < nchan_transport - 1; ch++ ) { - st_ivas->hISMDTX->dtx_speech_buffer_enc[i] = 1; + nBits_MD_max -= nBits_coh; /* coherence */ } - } - else - { - st_ivas->hISMDTX->dtx_speech_buffer_enc[i] = 0; - } - /* Do a decision based on hysteresis */ - st_ivas->hISMDTX->dtx_flag = 1; + if ( nchan_ism > 3 ) + { + nBits_MD_max--; /* ism_mode flag */ + } - 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 ) ) + /* too many metadata bits -> switch to active coding */ + if ( nBits > nBits_MD_max ) { - st_ivas->hISMDTX->dtx_speech_buffer_enc[i] = 1; + dtx_flag = 0; } } - val = sum_s( st_ivas->hISMDTX->dtx_speech_buffer_enc, PARAM_ISM_HYS_BUF_SIZE ); + /*------------------------------------------------------------------* + * set core_brate for all channels + * get 'sid_flag' value + *-----------------------------------------------------------------*/ + + *sid_flag = 0; - if ( val < 7 ) + if ( !dtx_flag ) { - for ( i = 0; i < PARAM_ISM_HYS_BUF_SIZE; i++ ) + /* at least one of the channels is active -> no DTX */ + for ( ch = 0; ch < nchan_transport; ch++ ) { - st_ivas->hISMDTX->dtx_flag = st_ivas->hISMDTX->dtx_flag && st_ivas->hISMDTX->dtx_speech_buffer_enc[i]; + hSCE[ch]->hCoreCoder[0]->core_brate = -1; + set_bw( IVAS_SCE, hSCE[ch]->element_brate, hSCE[ch]->hCoreCoder[0], MODE1 ); } - } - 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; + hISMDTX->cnt_SID_ISM = -1; - /* 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 ) ) + /* IVAS format signaling was erased in dtx() */ + if ( hSCE[0]->hCoreCoder[0]->hBstr->nb_bits_tot == 0 ) { - 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 ); + /* replicate ivas_write_format() */ + push_indice( hSCE[0]->hCoreCoder[0]->hBstr, IND_IVAS_FORMAT, 2 /* == ISM format */, IVAS_FORMAT_SIGNALING_NBITS ); } - - st_ivas->hSCE[1]->hCoreCoder[0]->core_brate = st_ivas->hSCE[0]->hCoreCoder[0]->core_brate; } - else + else /* ism_dtx_flag == 1 */ { - 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 ) ) + for ( ch = 0; ch < nchan_transport; ch++ ) { - 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 ); + hSCE[ch]->hCoreCoder[0]->cng_type = FD_CNG; } - /* 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 ) ) + /* * update the global SID counter */ + hISMDTX->cnt_SID_ISM++; + if ( hISMDTX->cnt_SID_ISM >= hSCE[0]->hCoreCoder[0]->hDtxEnc->max_SID ) { - st_ivas->hSCE[1]->hCoreCoder[0]->core_brate = -1; + /* adaptive SID update interval */ + hSCE[0]->hCoreCoder[0]->hDtxEnc->max_SID = hSCE[0]->hCoreCoder[0]->hDtxEnc->interval_SID; + hISMDTX->cnt_SID_ISM = 0; } - /* 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 ) ) + /* encode SID in one channel only */ + for ( ch = 0; ch < nchan_transport; ch++ ) { - 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 ); + hSCE[ch]->hCoreCoder[0]->core_brate = FRAME_NO_DATA; } - } - if ( st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == SID_2k40 ) - { - *sid_flag = 1; - dtx_flag = 1; + if ( hISMDTX->cnt_SID_ISM == 0 ) + { + hSCE[hISMDTX->sce_id_dtx]->hCoreCoder[0]->core_brate = SID_2k40; + *sid_flag = 1; + } } - if ( st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == FRAME_NO_DATA ) + if ( dtx_flag == 1 && *sid_flag == 0 ) { - dtx_flag = 1; + set_s( md_diff_flag, 0, nchan_transport ); } return dtx_flag; } - /*-------------------------------------------------------------------* * ivas_ism_get_sce_id_dtx() * @@ -289,7 +361,7 @@ void ivas_ism_coh_estim_dtx_enc( { Encoder_State *st, *st_id0; int16_t sce_id, i; - float acorr_ene[PARAM_ISM_MAX_DMX], xcorr_ene; + float acorr_ene[MAX_NUM_OBJECTS], xcorr_ene; if ( nchan_transport == 1 ) { @@ -333,4 +405,3 @@ void ivas_ism_coh_estim_dtx_enc( return; } -#endif diff --git a/lib_enc/ivas_ism_enc.c b/lib_enc/ivas_ism_enc.c index 85b8e0c4aa8092cdaa951dfbde8472bddd650df0..4a56252be876fa73e3a967c469b87caf11f2bd36 100644 --- a/lib_enc/ivas_ism_enc.c +++ b/lib_enc/ivas_ism_enc.c @@ -85,10 +85,8 @@ ivas_error ivas_ism_enc( float Etot_LR[1]; /* total energy; correlation shift */ float lf_E[1][2 * VOIC_BINS]; /* per bin spectrum energy in lf */ int16_t localVAD_HE_SAD[1]; /* local HE VAD */ - int16_t i, nBits; -#ifdef PARAM_ISM_DTX_CNG - int16_t dtx_flag, sid_flag; -#endif + int16_t nchan_ism, dtx_flag, sid_flag, flag_noisy_speech; + int16_t md_diff_flag[MAX_NUM_OBJECTS]; ivas_error error; push_wmops( "ivas_ism_enc" ); @@ -99,10 +97,12 @@ ivas_error ivas_ism_enc( error = IVAS_ERR_OK; -#ifdef PARAM_ISM_DTX_CNG dtx_flag = 0; sid_flag = 0; -#endif + flag_noisy_speech = 0; + + nchan_ism = st_ivas->hEncoderConfig->nchan_ism; + set_s( md_diff_flag, 1, nchan_ism ); /*------------------------------------------------------------------* * Preprocesing @@ -158,39 +158,37 @@ ivas_error ivas_ism_enc( * Front Pre-processing *----------------------------------------------------------------*/ -#ifdef LOW_RATE_TRANS_CORE_CODER error = pre_proc_front_ivas( hSCE, NULL, hSCE->element_brate, nb_bits_metadata[sce_id], input_frame, 0, old_inp_12k8[sce_id][0], old_inp_16k[sce_id][0], &ener[sce_id][0], &relE[sce_id][0], A[sce_id][0], Aw[sce_id][0], epsP[sce_id][0], lsp_new[sce_id][0], lsp_mid[sce_id][0], &vad_hover_flag[sce_id][0], &attack_flag[sce_id][0], realBuffer[sce_id][0], imagBuffer[sce_id][0], old_wsp[sce_id][0], pitch_fr[sce_id][0], voicing_fr[sce_id][0], &loc_harm[sce_id][0], &cor_map_sum[sce_id][0], &vad_flag_dtx[sce_id][0], enerBuffer[sce_id][0], fft_buff[sce_id][0], A[sce_id][0], lsp_new[sce_id][0], currFlatness[0], 0, fr_bands, Etot_LR, lf_E, localVAD_HE_SAD, NULL, 0, 0, 0, 0, st_ivas->hEncoderConfig->ivas_total_brate ); -#else - error = pre_proc_front_ivas( hSCE, NULL, hSCE->element_brate, nb_bits_metadata[sce_id], input_frame, 0, old_inp_12k8[sce_id][0], old_inp_16k[sce_id][0], - &ener[sce_id][0], &relE[sce_id][0], A[sce_id][0], Aw[sce_id][0], epsP[sce_id][0], lsp_new[sce_id][0], lsp_mid[sce_id][0], - &vad_hover_flag[sce_id][0], &attack_flag[sce_id][0], realBuffer[sce_id][0], imagBuffer[sce_id][0], old_wsp[sce_id][0], pitch_fr[sce_id][0], voicing_fr[sce_id][0], &loc_harm[sce_id][0], &cor_map_sum[sce_id][0], &vad_flag_dtx[sce_id][0], enerBuffer[sce_id][0], - fft_buff[sce_id][0], A[sce_id][0], lsp_new[sce_id][0], currFlatness[0], 0, fr_bands, Etot_LR, lf_E, localVAD_HE_SAD, NULL, 0, 0, 0, 0, - st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->hEncoderConfig->ivas_format ); -#endif if ( error != IVAS_ERR_OK ) { return error; } - vad_flag[sce_id] = st->vad_flag; + if ( st_ivas->hEncoderConfig->Opt_DTX_ON ) + { + vad_flag[sce_id] = vad_flag_dtx[sce_id][0]; + } + else + { + vad_flag[sce_id] = st->vad_flag; + } } -#ifdef PARAM_ISM_DTX_CNG /*------------------------------------------------------------------* * DTX analysis *-----------------------------------------------------------------*/ - if ( st_ivas->hEncoderConfig->Opt_DTX_ON && st_ivas->ism_mode == ISM_MODE_PARAM ) + if ( st_ivas->hEncoderConfig->Opt_DTX_ON ) { /* 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 */ - dtx_flag = ivas_ism_dtx_enc( st_ivas, &sid_flag ); + 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 ); if ( sid_flag ) { @@ -199,95 +197,54 @@ ivas_error ivas_ism_enc( } #ifdef DEBUG_MODE_PARAM_ISM - dbgwrite( &( st_ivas->hISMDTX->flag_noisy_speech ), sizeof( int16_t ), 1, 1, "./res/ParamISM_noisy_speech_flag_enc.dat" ); + if ( st_ivas->hDirAC != NULL ) + dbgwrite( &( st_ivas->hDirAC->hParamIsm->flag_noisy_speech ), sizeof( int16_t ), 1, 1, "./res/ParamISM_noisy_speech_flag_enc.dat" ); dbgwrite( &( st_ivas->hISMDTX->dtx_flag ), sizeof( int16_t ), 1, 1, "./res/ParamISM_DTX_CNG_flag_enc.dat" ); + dbgwrite( &( st_ivas->hISMDTX->sce_id_dtx ), sizeof( int16_t ), 1, input_frame, "./res/sce_id_dtx" ); + dbgwrite( &( dtx_flag ), sizeof( int16_t ), 1, input_frame, "./res/dtx_flag" ); #endif } -#endif /*------------------------------------------------------------------* * Analysis of objects, configuration and decision about bitrates per channel * Metadata quantization and encoding *-----------------------------------------------------------------*/ -#ifdef PARAM_ISM_DTX_CNG if ( st_ivas->ism_mode == ISM_MODE_PARAM ) { ivas_param_ism_compute_noisy_speech_flag( st_ivas ); + flag_noisy_speech = st_ivas->hDirAC->hParamIsm->flag_noisy_speech; } if ( dtx_flag ) { - if ( sid_flag ) - { - ivas_param_ism_metadata_dtx_enc( st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, st_ivas->hIsmMetaData, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm ); - } + 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 -#endif - if ( st_ivas->ism_mode == ISM_MODE_PARAM ) + else if ( st_ivas->ism_mode == ISM_MODE_PARAM ) { -#ifndef PARAM_ISM_DTX_CNG - /* Move the Noisy speech buffer */ - for ( i = 0; i < ( PARAM_ISM_HYS_BUF_SIZE - 1 ); i++ ) - { - st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i + 1]; - } - - /* For the current frame, make a decision based on some core-coder flags */ - if ( st_ivas->hSCE[0]->hCoreCoder[0]->flag_noisy_speech_snr && st_ivas->hSCE[1]->hCoreCoder[0]->flag_noisy_speech_snr ) - { - if ( st_ivas->hSCE[0]->hCoreCoder[0]->vad_flag || st_ivas->hSCE[1]->hCoreCoder[0]->vad_flag ) - { - st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = 0; - } - else - { - st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = 1; - } - } - else - { - st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = 0; - } - - /* 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]; - } -#endif - ivas_ism_metadata_enc( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata, vad_flag, st_ivas->ism_mode, st_ivas->hDirAC->hParamIsm ); + // VE: call ivas_ism_metadata_enc() with 'st_ivas' - TBD + ivas_ism_metadata_enc( st_ivas->hEncoderConfig->ivas_total_brate, + nchan_ism, + st_ivas->nchan_transport, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata, vad_flag, st_ivas->ism_mode, st_ivas->hDirAC->hParamIsm, st_ivas->hEncoderConfig->ism_extended_metadata_flag ); } else /* ISM_MODE_DISC */ { - ivas_ism_metadata_enc( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata, vad_flag, st_ivas->ism_mode, NULL ); + ivas_ism_metadata_enc( st_ivas->hEncoderConfig->ivas_total_brate, + nchan_ism, + st_ivas->nchan_transport, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata, vad_flag, st_ivas->ism_mode, NULL, st_ivas->hEncoderConfig->ism_extended_metadata_flag ); } + update_last_metadata( nchan_ism, st_ivas->hIsmMetaData, md_diff_flag ); + /*----------------------------------------------------------------* * Write IVAS format signaling in SID frames *----------------------------------------------------------------*/ st = st_ivas->hSCE[0]->hCoreCoder[0]; - if ( st->core_brate == SID_2k40 ) + if ( sid_flag ) { ivas_write_format_sid( st_ivas->hEncoderConfig->ivas_format, IVAS_SCE, st->hBstr ); - -#ifdef PARAM_ISM_DTX_CNG - if ( st_ivas->ism_mode != ISM_MODE_PARAM ) -#endif - { - /* 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; - } - } } /*------------------------------------------------------------------* @@ -329,9 +286,7 @@ ivas_error ivas_ism_enc( * Encoder *----------------------------------------------------------------*/ -#ifdef PARAM_ISM_DTX_CNG if ( !dtx_flag || ( dtx_flag && sce_id == st_ivas->hISMDTX->sce_id_dtx ) ) -#endif { if ( ( error = ivas_core_enc( hSCE, NULL, NULL, 1, old_inp_12k8[sce_id], old_inp_16k[sce_id], ener[sce_id], A[sce_id], Aw[sce_id], epsP[sce_id], lsp_new[sce_id], lsp_mid[sce_id], vad_hover_flag[sce_id], attack_flag[sce_id], realBuffer[sce_id], imagBuffer[sce_id], old_wsp[sce_id], loc_harm[sce_id], cor_map_sum[sce_id], vad_flag_dtx[sce_id], enerBuffer[sce_id], fft_buff[sce_id], 0, ISM_FORMAT, 0 ) ) != IVAS_ERR_OK ) { @@ -350,7 +305,6 @@ ivas_error ivas_ism_enc( st->hTranDet->transientDetector.prev_bIsAttackPresent = st->hTranDet->transientDetector.bIsAttackPresent; } -#ifdef PARAM_ISM_DTX_CNG if ( dtx_flag ) { for ( sce_id = 0; sce_id < st_ivas->nchan_transport; sce_id++ ) @@ -359,11 +313,45 @@ ivas_error ivas_ism_enc( { st_ivas->hSCE[sce_id]->hCoreCoder[0]->last_core = st_ivas->hSCE[st_ivas->hISMDTX->sce_id_dtx]->hCoreCoder[0]->last_core; st_ivas->hSCE[sce_id]->hCoreCoder[0]->last_core_brate = st_ivas->hSCE[st_ivas->hISMDTX->sce_id_dtx]->hCoreCoder[0]->core_brate; + st_ivas->hSCE[sce_id]->hCoreCoder[0]->last_L_frame = st_ivas->hSCE[st_ivas->hISMDTX->sce_id_dtx]->hCoreCoder[0]->last_L_frame; } } } -#endif +#ifdef DEBUG_MODE_INFO + if ( dtx_flag ) + { + float tmpF; + int16_t id, n; + + n = 0; + for ( sce_id = 0; sce_id < st_ivas->nchan_transport; sce_id++ ) + { + if ( sce_id != st_ivas->hISMDTX->sce_id_dtx ) + { + st = st_ivas->hSCE[sce_id]->hCoreCoder[0]; + id = st->id_element; + + dbgwrite( &st->core, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "core", n, id, ENC ) ); + dbgwrite( &st->extl, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "extl", n, id, ENC ) ); + dbgwrite( &st->bwidth, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "bwidth", n, id, ENC ) ); + tmpF = st->total_brate / 1000.0f; + dbgwrite( &tmpF, sizeof( float ), 1, input_frame, fname( debug_dir, "total_brate", n, id, ENC ) ); + tmpF = st->core_brate / 1000.0f; + dbgwrite( &tmpF, sizeof( float ), 1, input_frame, fname( debug_dir, "core_brate", n, id, ENC ) ); + tmpF = st->extl_brate / 1000.0f; + dbgwrite( &tmpF, sizeof( float ), 1, input_frame, fname( debug_dir, "extl_brate", n, id, ENC ) ); + + dbgwrite( &st->coder_type, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "coder_type", n, id, ENC ) ); + dbgwrite( &st->coder_type_raw, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "coder_type_raw", n, id, ENC ) ); + dbgwrite( &st->vad_flag, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "vad_flag", n, id, ENC ) ); + dbgwrite( &st->localVAD, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "localVAD", n, id, ENC ) ); + + dbgwrite( &st->lp_noise, sizeof( float ), 1, input_frame, fname( debug_dir, "lp_noise", n, id, ENC ) ); + } + } + } +#endif pop_wmops(); return error; @@ -377,7 +365,6 @@ ivas_error ivas_ism_enc( * - reconfigure the ISM format encoder *-------------------------------------------------------------------------*/ -/*! r : ISM format mode */ ivas_error ivas_ism_enc_config( Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */ ) @@ -403,7 +390,7 @@ ivas_error ivas_ism_enc_config( /* Reset and Initialize */ if ( st_ivas->ism_mode == ISM_MODE_PARAM ) { - st_ivas->nchan_transport = 2; + st_ivas->nchan_transport = MAX_PARAM_ISM_WAVE; } else { @@ -437,8 +424,7 @@ ivas_error ivas_ism_enc_config( if ( st_ivas->ism_mode == ISM_MODE_DISC && last_ism_mode == ISM_MODE_PARAM ) { /* Deallocate the memory used by ParamISM when switch to Discrete ISM */ - ivas_param_ism_enc_close( st_ivas->hDirAC, st_ivas->hEncoderConfig->input_Fs ); - st_ivas->hDirAC = NULL; + ivas_param_ism_enc_close( &( st_ivas->hDirAC ), st_ivas->hEncoderConfig->input_Fs ); } } diff --git a/lib_enc/ivas_ism_metadata_enc.c b/lib_enc/ivas_ism_metadata_enc.c index 2c7150b6c3107748a1db8dcf36c5a7a2a55c15fd..a4678d6bbb1dcba739f6876f2e81f806d778c94b 100644 --- a/lib_enc/ivas_ism_metadata_enc.c +++ b/lib_enc/ivas_ism_metadata_enc.c @@ -49,16 +49,33 @@ * Local constants *-----------------------------------------------------------------------*/ -#define ISM_NUM_PARAM 2 /* number of coded metadata parameters */ +#define ISM_NUM_PARAM 5 /* number of coded metadata parameters */ #define ISM_MAX_AZIMUTH_DIFF_IDX ( ISM_AZIMUTH_NBITS - 1 /*zero*/ - 1 /*sign*/ ) #define ISM_MAX_ELEVATION_DIFF_IDX ( ISM_ELEVATION_NBITS - 1 /*zero*/ - 1 /*sign*/ ) +#define ISM_MAX_RADIUS_DIFF_IDX ( ISM_RADIUS_NBITS - 1 /*zero*/ - 1 /*sign*/ ) #define ISM_FEC_MAX 10 - +#ifdef FIX_387_ISM_MD_FEC +#define ISM_MD_FEC_DIFF 10 +#define ISM_MD_INC_DIFF_CNT_MAX 6 +#define ISM_MD_FEC_CNT_MAX 25 +#endif +#ifdef FIX_435_ISM_MERGE_BUG +#define ISM_MD_RAD_FEC_DIFF 1 +#endif #define INTER_OBJECT_PARAM_CHECK ( ( ISM_FEC_MAX / 2 ) - 2 ) /* note: constant must be less than (ISM_FEC_MAX / number of coded parameters) */ +/*-----------------------------------------------------------------------* + * Local function declarations + *-----------------------------------------------------------------------*/ + +static void encode_angle_indices( BSTR_ENC_HANDLE hBstr, ISM_METADATA_ANGLE_HANDLE angle, const int16_t last_ism_metadata_flag, const int16_t ini_frame, const int16_t idx_angle1_abs, const int16_t idx_angle2_abs, int16_t *flag_abs_angle1, int16_t *flag_abs_angle2 ); + +static void encode_radius( BSTR_ENC_HANDLE hBstr, int16_t *last_radius_idx, int16_t *radius_diff_cnt, const int16_t last_ism_metadata_flag, const int16_t idx_radius_abs, int16_t *flag_abs_radius ); + + /*-------------------------------------------------------------------------* * ivas_set_ism_metadata() * @@ -68,7 +85,10 @@ ivas_error ivas_set_ism_metadata( ISM_METADATA_HANDLE hIsmMeta, /* o : ISM metadata handle */ const float azimuth, /* i : azimuth value */ - const float elevation /* i : elevation value */ + const float elevation, /* i : elevation */ + const float radius_meta, /* i : radius */ + const float yaw, /* i : yaw */ + const float pitch /* i : pitch */ ) { if ( hIsmMeta == NULL ) @@ -81,6 +101,9 @@ ivas_error ivas_set_ism_metadata( /* save read metadata parameters to the internal codec structure */ hIsmMeta->azimuth = azimuth; hIsmMeta->elevation = elevation; + hIsmMeta->radius = radius_meta; + hIsmMeta->yaw = yaw; + hIsmMeta->pitch = pitch; return IVAS_ERR_OK; } @@ -89,7 +112,7 @@ ivas_error ivas_set_ism_metadata( /*-------------------------------------------------------------------------* * rate_ism_importance() * - * Rate importance of particular ISm streams + * Rate importance of particular ISM streams *-------------------------------------------------------------------------*/ static void rate_ism_importance( @@ -146,64 +169,53 @@ static void rate_ism_importance( *-------------------------------------------------------------------------*/ ivas_error ivas_ism_metadata_enc( - const int32_t ism_total_brate, /* i : ISms total bitrate */ - const int16_t nchan_transport, /* i : number of transport channels */ - ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ - SCE_ENC_HANDLE hSCE[], /* i/o: SCE encoder handles */ - BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */ - int16_t nb_bits_metadata[], /* o : number of metadata bits */ - const int16_t localVAD[], /* i : VAD flag */ - const int16_t ism_mode, /* i : ISM mode */ - const PARAM_ISM_CONFIG_HANDLE hParamIsm /* i : Param ISM Enc Handle */ + const int32_t ism_total_brate, /* i : ISM total bitrate */ + const int16_t nchan_ism, /* i : number of ISM channels */ + const int16_t nchan_transport, /* i : number of transport channels */ + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + SCE_ENC_HANDLE hSCE[], /* i/o: SCE encoder handles */ + BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */ + int16_t nb_bits_metadata[], /* o : number of metadata bits */ + const int16_t localVAD[], /* i : VAD flag */ + const int16_t ism_mode, /* i : ISM mode */ + const PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i : Param ISM Enc Handle */ + const int16_t ism_extended_metadata_flag /* i : Extended metadata flag */ ) { - int16_t i, ch, nb_bits_start = 0, diff; - int16_t idx_azimuth, idx_azimuth_abs = 0, flag_abs_azimuth[MAX_NUM_OBJECTS], nbits_diff_azimuth; - int16_t idx_elevation, idx_elevation_abs = 0, flag_abs_elevation[MAX_NUM_OBJECTS], nbits_diff_elevation; + int16_t i, ch, nb_bits_start = 0; + int16_t flag_abs_azimuth[MAX_NUM_OBJECTS]; + int16_t flag_abs_elevation[MAX_NUM_OBJECTS]; + int16_t idx_angle1_abs = 0; + int16_t idx_angle2_abs = 0; + int16_t flag_abs_yaw[MAX_NUM_OBJECTS]; + int16_t flag_abs_pitch[MAX_NUM_OBJECTS]; + int16_t idx_radius_abs = 0, flag_abs_radius[MAX_NUM_OBJECTS]; float valQ; ISM_METADATA_HANDLE hIsmMetaData; int32_t element_brate[MAX_NUM_OBJECTS], total_brate[MAX_NUM_OBJECTS]; int16_t ism_metadata_flag_global; int16_t ism_imp[MAX_NUM_OBJECTS]; - int16_t num_obj, nbands, nblocks; + int16_t nbands, nblocks; ivas_error error; error = IVAS_ERR_OK; push_wmops( "ism_meta_enc" ); - if ( ism_mode == ISM_MODE_PARAM ) - { - num_obj = hParamIsm->num_obj; - } - else if ( ism_mode == ISM_MODE_DISC ) - { - num_obj = nchan_transport; - } - else - { - return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: incorrect ISM mode" ); - } - - if ( num_obj == 1 && ( hSCE[0]->hCoreCoder[0]->core_brate == SID_2k40 || hSCE[0]->hCoreCoder[0]->core_brate == FRAME_NO_DATA ) && ism_mode == ISM_MODE_DISC ) - { - /* no metadata encoding in CNG */ - pop_wmops(); - - return error; - } - /* initialization */ ism_metadata_flag_global = 0; set_s( nb_bits_metadata, 0, nchan_transport ); - set_s( flag_abs_azimuth, 0, num_obj ); - set_s( flag_abs_elevation, 0, num_obj ); + set_s( flag_abs_azimuth, 0, nchan_ism ); + set_s( flag_abs_elevation, 0, nchan_ism ); + set_s( flag_abs_yaw, 0, nchan_ism ); + set_s( flag_abs_pitch, 0, nchan_ism ); + set_s( flag_abs_radius, 0, nchan_ism ); /*----------------------------------------------------------------* * Set Metadata presence / importance flag *----------------------------------------------------------------*/ - for ( ch = 0; ch < num_obj; ch++ ) + for ( ch = 0; ch < nchan_ism; ch++ ) { if ( ism_mode == ISM_MODE_PARAM ) { @@ -211,77 +223,85 @@ ivas_error ivas_ism_metadata_enc( } else if ( ism_mode == ISM_MODE_DISC ) { -#ifdef TUNE_360_OBJECT_WITH_NOISE - hIsmMeta[ch]->ism_metadata_flag = localVAD[ch] || hSCE[ch]->hCoreCoder[0]->lp_noise > 10; -#else - hIsmMeta[ch]->ism_metadata_flag = localVAD[ch]; - - if ( hIsmMeta[ch]->ism_metadata_flag == 0 ) +#ifdef FIX_435_ISM_MERGE_BUG + if ( hIsmMeta[ch]->ism_metadata_flag == 1 ) { - /* send metadata even in inactive segments when noise is audible and metadata are changing */ - diff = (int16_t) fabsf( hIsmMeta[ch]->azimuth - ism_dequant_meta( hIsmMeta[ch]->last_azimuth_idx, ism_azimuth_borders, 1 << ISM_AZIMUTH_NBITS ) ); - diff = max( diff, (int16_t) fabsf( hIsmMeta[ch]->elevation - ism_dequant_meta( hIsmMeta[ch]->last_elevation_idx, ism_elevation_borders, 1 << ISM_ELEVATION_NBITS ) ) ); - - if ( hSCE[ch]->hCoreCoder[0]->lp_noise > 15 && diff >= 10 ) + /* 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; +#else + hIsmMeta[ch]->ism_metadata_flag = localVAD[ch] || hSCE[ch]->hCoreCoder[0]->lp_noise > 10; +#endif +#ifdef FIX_387_ISM_MD_FEC + /* in inactive frames, send MD 1) in ISM_MD_INC_DIFF_CNT_MAX consecutive frames when MD significantly change, 2) at least every ISM_MD_FEC_DIFF frames */ + if ( hIsmMeta[ch]->ism_metadata_flag == 0 ) { - hIsmMeta[ch]->ism_metadata_flag = 1; - } - } + 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 ) +#ifdef FIX_435_ISM_MERGE_BUG + || ( fabsf( hIsmMeta[ch]->radius - hIsmMeta[ch]->last_true_radius ) > ISM_MD_RAD_FEC_DIFF ) #endif + ) + { + hIsmMeta[ch]->ism_metadata_flag = 1; + hIsmMeta[ch]->ism_md_inc_diff_cnt = 0; + } + else if ( hIsmMeta[ch]->ism_md_inc_diff_cnt < ISM_MD_INC_DIFF_CNT_MAX ) + { + hIsmMeta[ch]->ism_metadata_flag = 1; - if ( hSCE[ch]->hCoreCoder[0]->tcxonly ) - { - /* at highest bitrates (with TCX core only) metadata are sent in every frame */ - hIsmMeta[ch]->ism_metadata_flag = 1; + if ( hIsmMeta[ch]->ism_md_inc_diff_cnt % 2 == 0 ) + { + hIsmMeta[ch]->position_angle.angle1_diff_cnt = ISM_FEC_MAX; + } + else + { + hIsmMeta[ch]->position_angle.angle2_diff_cnt = ISM_FEC_MAX; + } + } + else if ( hIsmMeta[ch]->ism_md_fec_cnt_enc == ISM_MD_FEC_CNT_MAX ) + { + hIsmMeta[ch]->ism_metadata_flag = 1; + hIsmMeta[ch]->position_angle.angle1_diff_cnt = ISM_FEC_MAX; + } + } +#endif +#ifdef FIX_435_ISM_MERGE_BUG } +#endif } } /*----------------------------------------------------------------* - * Rate importance of particular ISm streams + * Rate importance of particular ISM streams *----------------------------------------------------------------*/ rate_ism_importance( nchan_transport, hIsmMeta, hSCE, ism_imp ); -#ifndef TUNE_360_OBJECT_WITH_NOISE - /* relax the importance decision in "stereo" coding for noisy audio */ - if ( ism_mode == ISM_MODE_DISC && num_obj == 2 ) - { - float diff_F; - if ( hIsmMeta[0]->ism_metadata_flag ^ hIsmMeta[1]->ism_metadata_flag ) - { - for ( ch = 0; ch < num_obj; ch++ ) - { - diff_F = hSCE[ch]->hCoreCoder[0]->lp_speech - hSCE[ch]->hCoreCoder[0]->lp_noise; - - if ( hIsmMeta[ch]->ism_metadata_flag == 0 && diff_F < 25.0f ) - { - hIsmMeta[ch]->ism_metadata_flag = 1; - ism_imp[ch] = ISM_LOW_IMP; - } - } - } - } -#endif /*----------------------------------------------------------------* - * Write ISm common signaling + * Write ISM common signaling *----------------------------------------------------------------*/ /* write number of objects - unary coding */ - for ( ch = 1; ch < num_obj; ch++ ) + for ( ch = 1; ch < nchan_ism; ch++ ) { push_indice( hBstr, IND_ISM_NUM_OBJECTS, 1, 1 ); } push_indice( hBstr, IND_ISM_NUM_OBJECTS, 0, 1 ); - /* write ISm metadata flag (one per object) */ + /* write extended metadata presence flag */ + if ( ism_total_brate >= ISM_EXTENDED_METADATA_BRATE ) + { + push_indice( hBstr, IND_ISM_EXTENDED_FLAG, ism_extended_metadata_flag, ISM_EXTENDED_METADATA_BITS ); + } + + /* write ISM metadata flag (one per object) */ for ( ch = 0; ch < nchan_transport; ch++ ) { push_indice( hBstr, IND_ISM_METADATA_FLAG, ism_imp[ch], ISM_METADATA_FLAG_BITS ); } - for ( ch = 0; ch < num_obj; ch++ ) + for ( ch = 0; ch < nchan_ism; ch++ ) { ism_metadata_flag_global |= hIsmMeta[ch]->ism_metadata_flag; } @@ -313,7 +333,7 @@ ivas_error ivas_ism_metadata_enc( nb_bits_start = hBstr->nb_bits_tot; } - for ( ch = 0; ch < num_obj; ch++ ) + for ( ch = 0; ch < nchan_ism; ch++ ) { hIsmMetaData = hIsmMeta[ch]; if ( ism_mode == ISM_MODE_DISC ) @@ -324,249 +344,50 @@ ivas_error ivas_ism_metadata_enc( if ( hIsmMeta[ch]->ism_metadata_flag ) { /*----------------------------------------------------------------* - * Azimuth quantization and encoding + * Quantize and encode azimuth and elevation *----------------------------------------------------------------*/ - /* Azimuth quantization (quantize azimuth to the AZIMUTH_NBITS-bit index */ if ( ism_mode == ISM_MODE_DISC ) { - idx_azimuth_abs = ism_quant_meta( hIsmMetaData->azimuth, &valQ, ism_azimuth_borders, 1 << ISM_AZIMUTH_NBITS ); - } - else if ( ism_mode == ISM_MODE_PARAM ) - { - idx_azimuth_abs = hParamIsm->azi_index[ch]; - } - idx_azimuth = idx_azimuth_abs; - - nbits_diff_azimuth = 0; - - flag_abs_azimuth[ch] = 0; /* differential coding by default */ - if ( hIsmMetaData->azimuth_diff_cnt == ISM_FEC_MAX /* make differential encoding in ISM_FEC_MAX consecutive frames at maximum (in order to control the decoding in FEC) */ - || hIsmMetaData->last_ism_metadata_flag == 0 /* If last frame had no metadata coded, do not use differential coding */ - ) - { - flag_abs_azimuth[ch] = 1; - } - - /* try differential coding */ - if ( flag_abs_azimuth[ch] == 0 ) - { - diff = idx_azimuth_abs - hIsmMetaData->last_azimuth_idx; - - /* azimuth is on a circle - check for diff coding for -180° -> 180° and vice versa changes */ - if ( abs( diff ) > ( ( 1 << ISM_AZIMUTH_NBITS ) - 1 ) - ISM_MAX_AZIMUTH_DIFF_IDX ) - { - if ( diff > 0 ) - { - diff -= ( 1 << ISM_AZIMUTH_NBITS ) - 1; - } - else - { - diff += ( 1 << ISM_AZIMUTH_NBITS ) - 1; - } - } - - if ( diff == 0 ) - { - idx_azimuth = 0; - nbits_diff_azimuth = 1; - } - else if ( ABSVAL( diff ) < ISM_MAX_AZIMUTH_DIFF_IDX ) /* when diff bits >= abs bits, prefer abs */ - { - idx_azimuth = 1 << 1; - nbits_diff_azimuth = 1; - - if ( diff < 0 ) - { - idx_azimuth += 1; /* negative sign */ - diff *= -1; - } - else - { - idx_azimuth += 0; /* positive sign */ - } - - idx_azimuth = idx_azimuth << diff; - nbits_diff_azimuth++; - - /* unary coding of "diff */ - idx_azimuth += ( ( 1 << diff ) - 1 ); - nbits_diff_azimuth += diff; - - if ( nbits_diff_azimuth < ISM_AZIMUTH_NBITS - 1 ) - { - /* add stop bit - only for codewords shorter than ISM_AZIMUTH_NBITS */ - idx_azimuth = idx_azimuth << 1; - nbits_diff_azimuth++; - } - } - else - { - flag_abs_azimuth[ch] = 1; - } - } - - /* update counter */ - if ( flag_abs_azimuth[ch] == 0 ) - { - hIsmMetaData->azimuth_diff_cnt++; - hIsmMetaData->elevation_diff_cnt = min( hIsmMetaData->elevation_diff_cnt, ISM_FEC_MAX ); + 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 + else /* ISM_MODE_PARAM */ { - hIsmMetaData->azimuth_diff_cnt = 0; + idx_angle1_abs = hParamIsm->azi_index[ch]; + idx_angle2_abs = hParamIsm->ele_index[ch]; } - /* Write azimuth */ - push_indice( hBstr, IND_ISM_AZIMUTH_DIFF_FLAG, flag_abs_azimuth[ch], 1 ); - - if ( flag_abs_azimuth[ch] ) - { - push_indice( hBstr, IND_ISM_AZIMUTH, idx_azimuth, ISM_AZIMUTH_NBITS ); - } - else - { - push_indice( hBstr, IND_ISM_AZIMUTH, idx_azimuth, nbits_diff_azimuth ); - } + encode_angle_indices( hBstr, &( hIsmMetaData->position_angle ), hIsmMetaData->last_ism_metadata_flag, hSCE[0]->hCoreCoder[0]->ini_frame, idx_angle1_abs, idx_angle2_abs, &flag_abs_azimuth[ch], &flag_abs_elevation[ch] ); /*----------------------------------------------------------------* - * Elevation quantization and encoding + * Quantize and encode radius, yaw, and pitch *----------------------------------------------------------------*/ - /* Elevation quantization (quantize azimuth to the ELEVATION_NBITS-bit index */ - if ( ism_mode == ISM_MODE_DISC ) + if ( ism_mode == ISM_MODE_DISC && ism_extended_metadata_flag ) { - idx_elevation_abs = ism_quant_meta( hIsmMetaData->elevation, &valQ, ism_elevation_borders, 1 << ISM_ELEVATION_NBITS ); - } - else /* ISM_MODE_PARAM */ - { - idx_elevation_abs = hParamIsm->ele_index[ch]; - } - idx_elevation = idx_elevation_abs; - - nbits_diff_elevation = 0; - - flag_abs_elevation[ch] = 0; /* differential coding by default */ - if ( hIsmMetaData->elevation_diff_cnt == ISM_FEC_MAX /* make differential encoding in ISM_FEC_MAX consecutive frames at maximum (in order to control the decoding in FEC) */ - || hIsmMetaData->last_ism_metadata_flag == 0 /* If last frame had no metadata coded, do not use differential coding */ - ) - { - flag_abs_elevation[ch] = 1; - } - - /* note: elevation is coded starting from the second frame only (it is meaningless in the init_frame) */ - if ( hSCE[0]->hCoreCoder[0]->ini_frame == 0 ) - { - flag_abs_elevation[ch] = 1; - hIsmMetaData->last_elevation_idx = idx_elevation_abs; - } - - diff = idx_elevation_abs - hIsmMetaData->last_elevation_idx; - - /* avoid absolute coding of elevation if absolute coding was already used for azimuth */ - if ( flag_abs_azimuth[ch] == 1 ) - { - int16_t diff_orig = diff; - - flag_abs_elevation[ch] = 0; - - - if ( diff >= 0 ) - { - diff = min( diff, ISM_MAX_ELEVATION_DIFF_IDX ); - } - else - { - diff = -1 * min( -diff, ISM_MAX_ELEVATION_DIFF_IDX ); - } - - if ( hIsmMetaData->last_ism_metadata_flag == 0 || abs( diff_orig - diff ) > ISM_MAX_ELEVATION_DIFF_IDX ) - { - hIsmMetaData->elevation_diff_cnt = ISM_FEC_MAX - 1; - } - } - - /* try differential coding */ - if ( flag_abs_elevation[ch] == 0 ) - { - if ( diff == 0 ) - { - idx_elevation = 0; - nbits_diff_elevation = 1; - } - else if ( ABSVAL( diff ) <= ISM_MAX_ELEVATION_DIFF_IDX ) - { - idx_elevation = 1 << 1; - nbits_diff_elevation = 1; - - if ( diff < 0 ) - { - idx_elevation += 1; /* negative sign */ - diff *= -1; - } - else - { - idx_elevation += 0; /* positive sign */ - } - - idx_elevation = idx_elevation << diff; - nbits_diff_elevation++; - - /* unary coding of "diff */ - idx_elevation += ( ( 1 << diff ) - 1 ); - nbits_diff_elevation += diff; + 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 ); - if ( nbits_diff_elevation < ISM_ELEVATION_NBITS ) - { - /* add stop bit */ - idx_elevation = idx_elevation << 1; - nbits_diff_elevation++; - } - } - else - { - flag_abs_elevation[ch] = 1; - } + 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] ); } - /* update counter */ - if ( flag_abs_elevation[ch] == 0 ) - { - hIsmMetaData->elevation_diff_cnt++; - hIsmMetaData->elevation_diff_cnt = min( hIsmMetaData->elevation_diff_cnt, ISM_FEC_MAX ); - } - else - { - hIsmMetaData->elevation_diff_cnt = 0; - } - - /* Write elevation */ - if ( flag_abs_azimuth[ch] == 0 ) /* do not write "flag_abs_elevation" if "flag_abs_azimuth == 1" */ - { - push_indice( hBstr, IND_ISM_ELEVATION_DIFF_FLAG, flag_abs_elevation[ch], 1 ); - } - - if ( flag_abs_elevation[ch] ) - { - push_indice( hBstr, IND_ISM_ELEVATION, idx_elevation, ISM_ELEVATION_NBITS ); - } - else - { - push_indice( hBstr, IND_ISM_ELEVATION, idx_elevation, nbits_diff_elevation ); - } - - /*----------------------------------------------------------------* - * Updates - *----------------------------------------------------------------*/ - - hIsmMetaData->last_azimuth_idx = idx_azimuth_abs; - hIsmMetaData->last_elevation_idx = idx_elevation_abs; - /* save number of metadata bits written */ if ( ism_mode == ISM_MODE_DISC ) { nb_bits_metadata[ch] = hBstr->nb_bits_tot - nb_bits_start; } + +#ifdef FIX_387_ISM_MD_FEC + /* Updates */ + hIsmMeta[ch]->last_true_azimuth = hIsmMeta[ch]->azimuth; + hIsmMeta[ch]->last_true_elevation = hIsmMeta[ch]->elevation; +#endif +#ifdef FIX_435_ISM_MERGE_BUG + hIsmMeta[ch]->last_true_radius = hIsmMeta[ch]->radius; +#endif } } @@ -576,12 +397,12 @@ ivas_error ivas_ism_metadata_enc( *----------------------------------------------------------------*/ i = 0; - while ( i == 0 || i < num_obj / INTER_OBJECT_PARAM_CHECK ) + while ( i == 0 || i < nchan_ism / INTER_OBJECT_PARAM_CHECK ) { int16_t num, abs_num, abs_first, abs_next, pos_zero; - int16_t abs_matrice[INTER_OBJECT_PARAM_CHECK * 2]; + int16_t abs_matrice[INTER_OBJECT_PARAM_CHECK * ISM_NUM_PARAM]; - num = min( INTER_OBJECT_PARAM_CHECK, num_obj - i * INTER_OBJECT_PARAM_CHECK ); + num = min( INTER_OBJECT_PARAM_CHECK, nchan_ism - i * INTER_OBJECT_PARAM_CHECK ); i++; set_s( abs_matrice, 0, INTER_OBJECT_PARAM_CHECK * ISM_NUM_PARAM ); @@ -627,12 +448,12 @@ ivas_error ivas_ism_metadata_enc( if ( abs_next % ISM_NUM_PARAM == 0 ) { - hIsmMeta[ch]->azimuth_diff_cnt = abs_num - 1; + hIsmMeta[ch]->position_angle.angle1_diff_cnt = abs_num - 1; } if ( abs_next % ISM_NUM_PARAM == 1 ) { - hIsmMeta[ch]->elevation_diff_cnt = abs_num - 1; + hIsmMeta[ch]->position_angle.angle2_diff_cnt = abs_num - 1; /*hIsmMeta[ch]->elevation_diff_cnt = min( hIsmMeta[ch]->elevation_diff_cnt, ISM_FEC_MAX );*/ } @@ -695,21 +516,39 @@ ivas_error ivas_ism_metadata_enc( * Configuration and decision about bitrates per channel *----------------------------------------------------------------*/ - if ( ( error = ivas_ism_config( ism_total_brate, nchan_transport, num_obj, 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, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata ) ) != IVAS_ERR_OK ) { return error; } - for ( ch = 0; ch < num_obj; ch++ ) + for ( ch = 0; ch < nchan_ism; ch++ ) { hIsmMeta[ch]->last_ism_metadata_flag = hIsmMeta[ch]->ism_metadata_flag; + +#ifdef FIX_387_ISM_MD_FEC + if ( hIsmMeta[ch]->ism_metadata_flag == 0 ) + { + hIsmMeta[ch]->ism_md_fec_cnt_enc++; + } + else + { + hIsmMeta[ch]->ism_md_fec_cnt_enc = 0; + } + hIsmMeta[ch]->ism_md_inc_diff_cnt++; + hIsmMeta[ch]->ism_md_inc_diff_cnt = min( hIsmMeta[ch]->ism_md_inc_diff_cnt, ISM_MD_INC_DIFF_CNT_MAX ); +#endif } for ( ch = 0; ch < nchan_transport; ch++ ) { +#ifdef FIX_419_ISM_BRATE_SW_DTX + hSCE[ch]->hCoreCoder[0]->low_rate_mode = 0; +#endif if ( ism_mode == ISM_MODE_DISC ) { +#ifndef FIX_419_ISM_BRATE_SW_DTX hSCE[ch]->hCoreCoder[0]->low_rate_mode = 0; +#endif if ( hIsmMeta[ch]->ism_metadata_flag == 0 && localVAD[ch] == 0 && ism_metadata_flag_global ) { hSCE[ch]->hCoreCoder[0]->low_rate_mode = 1; @@ -731,6 +570,7 @@ ivas_error ivas_ism_metadata_enc( return error; } + /*------------------------------------------------------------------------- * ivas_ism_metadata_enc_create() * @@ -748,7 +588,7 @@ ivas_error ivas_ism_metadata_enc_create( if ( st_ivas->ism_mode == ISM_MODE_PARAM ) { - nchan_transport = 2; + nchan_transport = MAX_PARAM_ISM_WAVE; } else { @@ -759,21 +599,39 @@ ivas_error ivas_ism_metadata_enc_create( st_ivas->nSCE = nchan_transport; st_ivas->nCPE = 0; - /* allocate ISm metadata handles */ + /* allocate ISM metadata handles */ for ( ch = 0; ch < n_ISms; ch++ ) { if ( ( st_ivas->hIsmMetaData[ch] = (ISM_METADATA_HANDLE) malloc( sizeof( ISM_METADATA_FRAME ) ) ) == NULL ) { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for ISm MetaData\n" ) ); + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for ISM MetaData\n" ) ); } - - st_ivas->hIsmMetaData[ch]->last_azimuth_idx = 0; - st_ivas->hIsmMetaData[ch]->azimuth_diff_cnt = ISM_FEC_MAX; - st_ivas->hIsmMetaData[ch]->last_elevation_idx = 0; - st_ivas->hIsmMetaData[ch]->elevation_diff_cnt = ISM_FEC_MAX - 1; + st_ivas->hIsmMetaData[ch]->position_angle.last_angle1_idx = 0; + st_ivas->hIsmMetaData[ch]->position_angle.angle1_diff_cnt = ISM_FEC_MAX; + st_ivas->hIsmMetaData[ch]->position_angle.last_angle2_idx = 0; + st_ivas->hIsmMetaData[ch]->position_angle.angle2_diff_cnt = ISM_FEC_MAX - 1; + st_ivas->hIsmMetaData[ch]->orientation_angle.last_angle1_idx = 0; + st_ivas->hIsmMetaData[ch]->orientation_angle.angle1_diff_cnt = ISM_FEC_MAX - 2; + st_ivas->hIsmMetaData[ch]->orientation_angle.last_angle2_idx = 0; + st_ivas->hIsmMetaData[ch]->orientation_angle.angle2_diff_cnt = ISM_FEC_MAX - 2; + st_ivas->hIsmMetaData[ch]->last_radius_idx = 0; + st_ivas->hIsmMetaData[ch]->radius_diff_cnt = ISM_FEC_MAX - 2; st_ivas->hIsmMetaData[ch]->last_ism_metadata_flag = 0; ivas_ism_reset_metadata( st_ivas->hIsmMetaData[ch] ); + + st_ivas->hIsmMetaData[ch]->last_azimuth = 0.0f; + st_ivas->hIsmMetaData[ch]->last_elevation = 0.0f; + +#ifdef FIX_387_ISM_MD_FEC + st_ivas->hIsmMetaData[ch]->last_true_azimuth = 0.0f; + st_ivas->hIsmMetaData[ch]->last_true_elevation = 0.0f; + st_ivas->hIsmMetaData[ch]->ism_md_fec_cnt_enc = 0; + st_ivas->hIsmMetaData[ch]->ism_md_inc_diff_cnt = ISM_MD_INC_DIFF_CNT_MAX; +#endif +#ifdef FIX_435_ISM_MERGE_BUG + st_ivas->hIsmMetaData[ch]->last_true_radius = 1.0f; +#endif } 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 ) @@ -783,3 +641,501 @@ ivas_error ivas_ism_metadata_enc_create( return IVAS_ERR_OK; } + + +/*------------------------------------------------------------------------- + * encode_radius() + * + * Radius index encoding + *-------------------------------------------------------------------------*/ + +static void encode_radius( + BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */ + int16_t *last_radius_idx, /* i/o: last radius index */ + int16_t *radius_diff_cnt, /* i/o: radius diff coding counter */ + const int16_t last_ism_metadata_flag, /* last frame ism_metadata_flag */ + const int16_t idx_radius_abs, /* i : Azimuth index */ + int16_t *flag_abs_radius /* o : Radius encoding mode */ +) +{ + int16_t idx_radius, nbits_diff_radius, diff; + + idx_radius = idx_radius_abs; + nbits_diff_radius = 0; + *flag_abs_radius = 0; /* differential coding by default */ + + if ( *radius_diff_cnt == ISM_FEC_MAX /* make differential encoding in ISM_FEC_MAX consecutive frames at maximum (in order to control the decoding in FEC) */ + || last_ism_metadata_flag == 0 /* If last frame had no metadata coded, do not use differential coding */ + ) + { + *flag_abs_radius = 1; + } + + diff = idx_radius_abs - *last_radius_idx; + + /* try differential coding */ + if ( *flag_abs_radius == 0 ) + { + if ( diff == 0 ) + { + idx_radius = 0; + nbits_diff_radius = 1; + } + else if ( ABSVAL( diff ) <= ISM_MAX_RADIUS_DIFF_IDX ) + { + idx_radius = 1 << 1; + nbits_diff_radius = 1; + + if ( diff < 0 ) + { + idx_radius += 1; /* negative sign */ + diff *= -1; + } + else + { + idx_radius += 0; /* positive sign */ + } + + idx_radius = idx_radius << diff; + nbits_diff_radius++; + + /* unary coding of "diff */ + idx_radius += ( ( 1 << diff ) - 1 ); + nbits_diff_radius += diff; + + if ( nbits_diff_radius < ISM_RADIUS_NBITS ) + { + /* add stop bit */ + idx_radius = idx_radius << 1; + nbits_diff_radius++; + } + } + else + { + *flag_abs_radius = 1; + } + } + + /* update counter */ + if ( *flag_abs_radius == 0 ) + { + ( *radius_diff_cnt )++; + *radius_diff_cnt = min( *radius_diff_cnt, ISM_FEC_MAX ); + } + else + { + *radius_diff_cnt = 0; + } + + /* Write radius */ + push_indice( hBstr, IND_ISM_RADIUS_DIFF_FLAG, *flag_abs_radius, 1 ); + + if ( *flag_abs_radius ) + { + push_indice( hBstr, IND_ISM_RADIUS, idx_radius, ISM_RADIUS_NBITS ); + } + else + { + push_indice( hBstr, IND_ISM_RADIUS, idx_radius, nbits_diff_radius ); + } + + /* Updates */ + *last_radius_idx = idx_radius_abs; + + return; +} + + +/*----------------------------------------------------------------* + * encode_angle_indices() + * + * Encoding of an angle + *----------------------------------------------------------------*/ +static void encode_angle_indices( + BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */ + ISM_METADATA_ANGLE_HANDLE angle, /* i/o: angle handle */ + const int16_t last_ism_metadata_flag, /* i : last frame ism_metadata_flag */ + const int16_t ini_frame, /* i : initialization frames counter */ + const int16_t idx_angle1_abs, /* i : Azimuth index */ + const int16_t idx_angle2_abs, /* i : Elevation index */ + int16_t *flag_abs_angle1, /* o : Azimuth/yaw encoding mode */ + int16_t *flag_abs_angle2 /* o : Elevation/pitch encoding mode */ +) +{ + int16_t idx_angle1, nbits_diff_angle1, diff; + int16_t idx_angle2, nbits_diff_angle2; + + /*----------------------------------------------------------------* + * Azimuth/yaw index encoding + *----------------------------------------------------------------*/ + + idx_angle1 = idx_angle1_abs; + + nbits_diff_angle1 = 0; + + *flag_abs_angle1 = 0; /* differential coding by default */ + if ( angle->angle1_diff_cnt == ISM_FEC_MAX /* make differential encoding in ISM_FEC_MAX consecutive frames at maximum (in order to control the decoding in FEC) */ + || last_ism_metadata_flag == 0 /* If last frame had no metadata coded, do not use differential coding */ + ) + { + *flag_abs_angle1 = 1; + } + + /* try differential coding */ + if ( *flag_abs_angle1 == 0 ) + { + diff = idx_angle1_abs - angle->last_angle1_idx; + + /* azimuth is on a circle - check for diff coding for -180° -> 180° and vice versa changes */ + if ( abs( diff ) > ( ( 1 << ISM_AZIMUTH_NBITS ) - 1 ) - ISM_MAX_AZIMUTH_DIFF_IDX ) + { + if ( diff > 0 ) + { + diff -= ( 1 << ISM_AZIMUTH_NBITS ) - 1; + } + else + { + diff += ( 1 << ISM_AZIMUTH_NBITS ) - 1; + } + } + + if ( diff == 0 ) + { + idx_angle1 = 0; + nbits_diff_angle1 = 1; + } + else if ( ABSVAL( diff ) < ISM_MAX_AZIMUTH_DIFF_IDX ) /* when diff bits >= abs bits, prefer abs */ + { + idx_angle1 = 1 << 1; + nbits_diff_angle1 = 1; + + if ( diff < 0 ) + { + idx_angle1 += 1; /* negative sign */ + diff *= -1; + } + else + { + idx_angle1 += 0; /* positive sign */ + } + + idx_angle1 = idx_angle1 << diff; + nbits_diff_angle1++; + + /* unary coding of "diff */ + idx_angle1 += ( ( 1 << diff ) - 1 ); + nbits_diff_angle1 += diff; + + if ( nbits_diff_angle1 < ISM_AZIMUTH_NBITS - 1 ) + { + /* add stop bit - only for codewords shorter than ISM_AZIMUTH_NBITS */ + idx_angle1 = idx_angle1 << 1; + nbits_diff_angle1++; + } + } + else + { + *flag_abs_angle1 = 1; + } + } + + /* update counter */ + if ( *flag_abs_angle1 == 0 ) + { + angle->angle1_diff_cnt++; +#ifdef FIX_419_ISM_MD_FIX + angle->angle1_diff_cnt = min( angle->angle1_diff_cnt, ISM_FEC_MAX ); +#else + angle->angle2_diff_cnt = min( angle->angle2_diff_cnt, ISM_FEC_MAX ); +#endif + } + else + { + angle->angle1_diff_cnt = 0; + } + + /* Write azimuth/yaw */ + push_indice( hBstr, IND_ISM_AZIMUTH_DIFF_FLAG, *flag_abs_angle1, 1 ); + + if ( *flag_abs_angle1 ) + { + push_indice( hBstr, IND_ISM_AZIMUTH, idx_angle1, ISM_AZIMUTH_NBITS ); + } + else + { + push_indice( hBstr, IND_ISM_AZIMUTH, idx_angle1, nbits_diff_angle1 ); + } + + /*----------------------------------------------------------------* + * Elevation/pitch index encoding + *----------------------------------------------------------------*/ + + idx_angle2 = idx_angle2_abs; + nbits_diff_angle2 = 0; + *flag_abs_angle2 = 0; /* differential coding by default */ + if ( angle->angle2_diff_cnt == ISM_FEC_MAX /* make differential encoding in ISM_FEC_MAX consecutive frames at maximum (in order to control the decoding in FEC) */ + || last_ism_metadata_flag == 0 /* If last frame had no metadata coded, do not use differential coding */ + ) + { + *flag_abs_angle2 = 1; + } + + /* note: elevation/pitch is coded starting from the second frame only (it is meaningless in the init_frame) */ + if ( ini_frame == 0 ) + { + *flag_abs_angle2 = 1; + angle->last_angle2_idx = idx_angle2_abs; + } + + diff = idx_angle2_abs - angle->last_angle2_idx; + + /* avoid absolute coding of elevation/pitch if absolute coding was already used for azimuth/yaw */ + if ( *flag_abs_angle1 == 1 ) + { + int16_t diff_orig = diff; + + *flag_abs_angle2 = 0; + + + if ( diff >= 0 ) + { + diff = min( diff, ISM_MAX_ELEVATION_DIFF_IDX ); + } + else + { + diff = -1 * min( -diff, ISM_MAX_ELEVATION_DIFF_IDX ); + } + + if ( last_ism_metadata_flag == 0 || abs( diff_orig - diff ) > ISM_MAX_ELEVATION_DIFF_IDX ) + { + angle->angle2_diff_cnt = ISM_FEC_MAX - 1; + } + } + + /* try differential coding */ + if ( *flag_abs_angle2 == 0 ) + { + if ( diff == 0 ) + { + idx_angle2 = 0; + nbits_diff_angle2 = 1; + } + else if ( ABSVAL( diff ) <= ISM_MAX_ELEVATION_DIFF_IDX ) + { + idx_angle2 = 1 << 1; + nbits_diff_angle2 = 1; + + if ( diff < 0 ) + { + idx_angle2 += 1; /* negative sign */ + diff *= -1; + } + else + { + idx_angle2 += 0; /* positive sign */ + } + + idx_angle2 = idx_angle2 << diff; + nbits_diff_angle2++; + + /* unary coding of "diff */ + idx_angle2 += ( ( 1 << diff ) - 1 ); + nbits_diff_angle2 += diff; + + if ( nbits_diff_angle2 < ISM_ELEVATION_NBITS ) + { + /* add stop bit */ + idx_angle2 = idx_angle2 << 1; + nbits_diff_angle2++; + } + } + else + { + *flag_abs_angle2 = 1; + } + } + + /* update counter */ + if ( *flag_abs_angle2 == 0 ) + { + angle->angle2_diff_cnt++; + angle->angle2_diff_cnt = min( angle->angle2_diff_cnt, ISM_FEC_MAX ); + } + else + { + angle->angle2_diff_cnt = 0; + } + + /* Write elevation */ + if ( *flag_abs_angle1 == 0 ) /* do not write "flag_abs_elevation/pitch" if "flag_abs_azimuth/yaw == 1" */ + { + push_indice( hBstr, IND_ISM_ELEVATION_DIFF_FLAG, *flag_abs_angle2, 1 ); + } + + if ( *flag_abs_angle2 ) + { + push_indice( hBstr, IND_ISM_ELEVATION, idx_angle2, ISM_ELEVATION_NBITS ); + } + else + { + push_indice( hBstr, IND_ISM_ELEVATION, idx_angle2, nbits_diff_angle2 ); + } + + /*----------------------------------------------------------------* + * Updates + *----------------------------------------------------------------*/ + + angle->last_angle1_idx = idx_angle1_abs; + angle->last_angle2_idx = idx_angle2_abs; + + return; +} + + +/*-------------------------------------------------------------------* + * ivas_ism_metadata_sid_enc() + * + * Quantize and encode ISM metadata in SID frame + *-------------------------------------------------------------------*/ + +void ivas_ism_metadata_sid_enc( + ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */ + const int16_t flag_noisy_speech, /* i : noisy speech flag */ + const int16_t nchan_ism, /* i : number of objects */ + const int16_t nchan_transport, /* i : number of transport channels */ + const ISM_MODE ism_mode, /* i : ISM mode */ + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + const int16_t sid_flag, /* i : indication of SID frame */ + const int16_t md_diff_flag[], /* i : metadata differental flag */ + BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */ + int16_t nb_bits_metadata[] /* o : number of metadata bits */ +) +{ + int16_t i, ch, nBits, nBits_start, nBits_unused; + float q_step, q_step_border; + int16_t idx, idx_azimuth, idx_elevation; + int16_t nBits_azimuth, nBits_elevation, nBits_coh, nBits_sce_id; + float valQ; + ISM_METADATA_HANDLE hIsmMetaData; + + if ( sid_flag ) + { + nBits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC; + nBits -= SID_FORMAT_NBITS; + nBits_start = hBstr->nb_bits_tot; + + /*----------------------------------------------------------------* + * Write ISm common signaling + *----------------------------------------------------------------*/ + + /* write number of objects - unary coding */ + for ( ch = 1; ch < nchan_ism; ch++ ) + { + push_indice( hBstr, IND_ISM_NUM_OBJECTS, 1, 1 ); + } + push_indice( hBstr, IND_ISM_NUM_OBJECTS, 0, 1 ); + + /* write SID metadata flag (one per object) */ + for ( ch = 0; ch < nchan_ism; ch++ ) + { + push_indice( hBstr, IND_ISM_METADATA_FLAG, md_diff_flag[ch], 1 ); + } + + /*----------------------------------------------------------------* + * Set quantization bits based on the number of coded objects + *----------------------------------------------------------------*/ + + ivas_get_ism_sid_quan_bitbudget( nchan_ism, &nBits_azimuth, &nBits_elevation, &q_step, &q_step_border, &nBits_coh, &nBits_sce_id ); + + /*----------------------------------------------------------------* + * Spatial parameters, loop over TCs - 1 + *----------------------------------------------------------------*/ + + /* write ISM mode flag to explicitly signal number of spatial parameters */ + if ( nchan_ism > 2 ) + { + if ( ism_mode == ISM_MODE_DISC ) + { + push_indice( hBstr, IND_ISM_VAD_FLAG, 0, 1 ); + } + else + { + push_indice( hBstr, IND_ISM_VAD_FLAG, 1, 1 ); + } + + if ( ism_mode == ISM_MODE_PARAM ) + { + /* write noisy speech flag */ + push_indice( hBstr, IND_ISM_NOISY_SPEECH_FLAG, flag_noisy_speech, 1 ); + nBits_sce_id = 1; + } + } + + if ( nchan_transport > 1 ) + { + /* write sce id */ + push_indice( hBstr, IND_ISM_SCE_ID_DTX, hISMDTX->sce_id_dtx, nBits_sce_id ); + + /* quantize and write coherence */ + for ( ch = 0; ch < nchan_transport; ch++ ) + { + if ( ch == hISMDTX->sce_id_dtx ) + { + continue; + } + + idx = (int16_t) ( hISMDTX->coh[ch] * ( ( 1 << nBits_coh ) - 1 ) + 0.5f ); + assert( ( idx >= 0 ) && ( idx <= ( ( 1 << nBits_coh ) - 1 ) ) ); + push_indice( hBstr, IND_ISM_DTX_COH_SCA, idx, nBits_coh ); + } + } + + /*----------------------------------------------------------------* + * Metadata quantization and coding, loop over all objects + *----------------------------------------------------------------*/ + + for ( ch = 0; ch < nchan_ism; ch++ ) + { + if ( md_diff_flag[ch] == 1 ) + { + hIsmMetaData = hIsmMeta[ch]; + + idx_azimuth = ism_quant_meta( hIsmMetaData->azimuth, &valQ, ism_azimuth_borders, q_step, q_step_border, 1 << nBits_azimuth ); + idx_elevation = ism_quant_meta( hIsmMetaData->elevation, &valQ, ism_elevation_borders, q_step, q_step_border, 1 << nBits_elevation ); + + push_indice( hBstr, IND_ISM_AZIMUTH, idx_azimuth, nBits_azimuth ); + push_indice( hBstr, IND_ISM_ELEVATION, idx_elevation, nBits_elevation ); + + /* update last indexes to correspond to active frames coding */ + if ( nBits_azimuth > ISM_AZIMUTH_NBITS ) + { + hIsmMetaData->position_angle.last_angle1_idx = idx_azimuth >> ( nBits_azimuth - ISM_AZIMUTH_NBITS ); + hIsmMetaData->position_angle.last_angle2_idx = idx_elevation >> ( nBits_elevation - ISM_ELEVATION_NBITS ); + } + else + { + hIsmMetaData->position_angle.last_angle1_idx = idx_azimuth << ( ISM_AZIMUTH_NBITS - nBits_azimuth ); + hIsmMetaData->position_angle.last_angle2_idx = idx_elevation << ( ISM_ELEVATION_NBITS - nBits_elevation ); + } + +#ifdef FIX_387_ISM_MD_FEC + hIsmMetaData->ism_md_fec_cnt_enc = 0; + hIsmMeta[ch]->ism_md_inc_diff_cnt = ISM_MD_INC_DIFF_CNT_MAX; +#endif + } + } + + /* Write unused (padding) bits */ + nBits_unused = nBits - hBstr->nb_bits_tot; + while ( nBits_unused > 0 ) + { + i = min( nBits_unused, 16 ); + push_indice( hBstr, IND_UNUSED, 0, i ); + nBits_unused -= i; + } + + nb_bits_metadata[0] = hBstr->nb_bits_tot - nBits_start; + } + + return; +} diff --git a/lib_enc/ivas_ism_param_enc.c b/lib_enc/ivas_ism_param_enc.c index ef66df5a90cc409d4c634afe68e10eebcaf07ba0..32fb6af515af26caf85c501e63eda9c167bb9abb 100644 --- a/lib_enc/ivas_ism_param_enc.c +++ b/lib_enc/ivas_ism_param_enc.c @@ -47,16 +47,16 @@ static void ivas_param_ism_compute_obj_parameters( + const int16_t nchan_ism, /* i : number of ISM channels */ float reference_power_obj[MAX_NUM_OBJECTS][PARAM_ISM_MDFT_NO_SLOTS][DIRAC_NO_FB_BANDS_MAX], /* i : Reference power */ PARAM_ISM_CONFIG_HANDLE hParamIsm /* i/o: Param ISM Enc Handle */ ) { - int16_t i, b, m, br, mr, num_obj; + int16_t i, b, m, br, mr; int16_t brange_start, brange_end, mrange_start, mrange_end, time_merge_fac; float power_ratios_m[MAX_PARAM_ISM_NBANDS][MAX_PARAM_ISM_NBLOCKS]; - num_obj = hParamIsm->num_obj; - assert( num_obj == 3 || num_obj == 4 ); + assert( nchan_ism == 3 || nchan_ism == 4 ); for ( b = 0; b < hParamIsm->nbands; b++ ) { @@ -81,7 +81,7 @@ static void ivas_param_ism_compute_obj_parameters( /* for each object, sum up reference power within current T/F tile */ - for ( i = 0; i < num_obj; i++ ) + for ( i = 0; i < nchan_ism; i++ ) { for ( mr = mrange_start; mr < mrange_end; mr++ ) { @@ -103,7 +103,8 @@ static void ivas_param_ism_compute_obj_parameters( index_1 = 1; index_2 = 0; } - for ( i = 2; i < num_obj; i++ ) + + for ( i = MAX_PARAM_ISM_WAVE; i < nchan_ism; i++ ) { if ( ref_power_local[i] > ref_power_local[index_1] ) { @@ -149,23 +150,23 @@ static void ivas_param_ism_compute_obj_parameters( static void ivas_param_ism_enc_quantize_DOA( + const int16_t nchan_ism, /* i : number of ISM channels */ ISM_METADATA_HANDLE hIsmMetaData[MAX_NUM_OBJECTS], /* i : ISM metadata */ PARAM_ISM_CONFIG_HANDLE hParamIsm /* i/o: Param ISM encoder handle */ ) { - int16_t i, azi_idx, ele_idx, num_obj; + int16_t i, azi_idx, ele_idx; float valQ; - num_obj = hParamIsm->num_obj; /* Loop over objects */ - for ( i = 0; i < num_obj; i++ ) + for ( i = 0; i < nchan_ism; i++ ) { /* Quantize the elevation and obtain quantized elevation value and index */ - ele_idx = ism_quant_meta( hIsmMetaData[i]->elevation, &valQ, ism_elevation_borders, 1 << ISM_ELEVATION_NBITS ); + ele_idx = ism_quant_meta( hIsmMetaData[i]->elevation, &valQ, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS ); /* Obtain the index of quantized azimuth values */ - azi_idx = ism_quant_meta( hIsmMetaData[i]->azimuth, &valQ, ism_azimuth_borders, 1 << ISM_AZIMUTH_NBITS ); + azi_idx = ism_quant_meta( hIsmMetaData[i]->azimuth, &valQ, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS ); /*Replace azimuth with quantized values */ hIsmMetaData[i]->azimuth = valQ; @@ -191,7 +192,7 @@ void ivas_param_ism_stereo_dmx( const int16_t input_frame /* i : Length of input frame */ ) { - int16_t i, j, num_obj; + int16_t i, j; float alpha, azi_shift, tmp, tmp_1; float cardioid_left[MAX_NUM_OBJECTS], cardioid_right[MAX_NUM_OBJECTS]; float stereo_dmx[2][L_FRAME48k]; @@ -202,14 +203,13 @@ void ivas_param_ism_stereo_dmx( /*Initialization*/ alpha = 0.5; azi_shift = 0; - num_obj = st_ivas->hDirAC->hParamIsm->num_obj; /* Set the stereo dmx to zero */ set_zero( stereo_dmx[0], L_FRAME48k ); set_zero( stereo_dmx[1], L_FRAME48k ); /* Loop over all objects */ - for ( i = 0; i < num_obj; i++ ) + for ( i = 0; i < st_ivas->hEncoderConfig->nchan_ism; i++ ) { hIsmMetaData = st_ivas->hIsmMetaData[i]; @@ -271,8 +271,6 @@ ivas_error ivas_param_ism_enc_open( input_Fs = st_ivas->hEncoderConfig->input_Fs; - /* Assign the number of objects */ - hDirAC->hParamIsm->num_obj = st_ivas->hEncoderConfig->nchan_inp; /* set FB config. */ if ( ( error = ivas_fb_set_cfg( &fb_cfg, ISM_FORMAT, SBA_MODE_NONE, st_ivas->hEncoderConfig->nchan_inp, 0, 0, input_Fs ) ) != IVAS_ERR_OK ) @@ -281,16 +279,12 @@ ivas_error ivas_param_ism_enc_open( } /* Allocate and initialize FB mixer handle */ -#ifdef SBA_BR_SWITCHING_CLEAN_UP if ( ( error = ivas_FB_mixer_open( &( hDirAC->hFbMixer ), input_Fs, fb_cfg, 0 ) ) != IVAS_ERR_OK ) -#else - if ( ( error = ivas_FB_mixer_open( &( hDirAC->hFbMixer ), input_Fs, fb_cfg ) ) != IVAS_ERR_OK ) -#endif { return error; } - ivas_param_ism_config( hDirAC->hParamIsm ); + ivas_param_ism_config( hDirAC->hParamIsm, st_ivas->hEncoderConfig->nchan_inp ); /* Assign memories for Band and Block grouping */ hDirAC->hParamIsm->nbands = MAX_PARAM_ISM_NBANDS; @@ -316,27 +310,29 @@ ivas_error ivas_param_ism_enc_open( /*-------------------------------------------------------------------------* * ivas_param_ism_enc_close() * - * Close Param ISM handle + * Close Param ISM encoder handle *-------------------------------------------------------------------------*/ void ivas_param_ism_enc_close( - DIRAC_ENC_HANDLE hDirAC, /* i/o: encoder DirAC handle */ - const int32_t input_Fs /* i : input sampling_rate */ + DIRAC_ENC_HANDLE *hDirAC, /* i/o: encoder DirAC handle */ + const int32_t input_Fs /* i : input sampling_rate */ ) { -#ifdef SBA_BR_SWITCHING_CLEAN_UP - ivas_FB_mixer_close( &hDirAC->hFbMixer, input_Fs, 0 ); -#else - ivas_FB_mixer_close( &hDirAC->hFbMixer, input_Fs ); -#endif + if ( hDirAC == NULL || *hDirAC == NULL ) + { + return; + } - if ( hDirAC->hParamIsm != NULL ) + ivas_FB_mixer_close( &( *hDirAC )->hFbMixer, input_Fs, 0 ); + + if ( ( *hDirAC )->hParamIsm != NULL ) { - free( hDirAC->hParamIsm ); - hDirAC->hParamIsm = NULL; + free( ( *hDirAC )->hParamIsm ); + ( *hDirAC )->hParamIsm = NULL; } - free( hDirAC ); + free( ( *hDirAC ) ); + ( *hDirAC ) = NULL; return; } @@ -355,6 +351,7 @@ void ivas_param_ism_enc( ) { int16_t i, j, ts, l_ts; + int16_t nchan_ism; int16_t num_time_slots; float *pcm_in[MAX_NUM_OBJECTS]; float fb_RealBuffer[MAX_NUM_OBJECTS][DIRAC_NO_FB_BANDS_MAX]; @@ -365,6 +362,7 @@ void ivas_param_ism_enc( DIRAC_ENC_HANDLE hDirAC; PARAM_ISM_CONFIG_HANDLE hParamIsm; + nchan_ism = st_ivas->hEncoderConfig->nchan_ism; hDirAC = st_ivas->hDirAC; hParamIsm = hDirAC->hParamIsm; @@ -373,7 +371,7 @@ void ivas_param_ism_enc( l_ts = input_frame / PARAM_ISM_MDFT_NO_SLOTS; num_time_slots = PARAM_ISM_MDFT_NO_SLOTS; - for ( i = 0; i < hParamIsm->num_obj; i++ ) + for ( i = 0; i < nchan_ism; i++ ) { pcm_in[i] = &data[i][0]; @@ -382,12 +380,14 @@ void ivas_param_ism_enc( p_fb_RealBuffer[i] = &fb_RealBuffer[i][0]; p_fb_ImagBuffer[i] = &fb_ImagBuffer[i][0]; } + for ( ts = 0; ts < num_time_slots; ts++ ) { ivas_fb_mixer_get_windowed_fr( hDirAC->hFbMixer, pcm_in, p_fb_RealBuffer, p_fb_ImagBuffer, l_ts, l_ts ); + ivas_fb_mixer_update_prior_input( hDirAC->hFbMixer, pcm_in, l_ts ); - for ( i = 0; i < hParamIsm->num_obj; i++ ) + for ( i = 0; i < nchan_ism; i++ ) { pcm_in[i] += l_ts; for ( j = 0; j < DIRAC_NO_FB_BANDS_MAX; j++ ) @@ -396,144 +396,18 @@ void ivas_param_ism_enc( } } } + /* Quantize DOAs */ - ivas_param_ism_enc_quantize_DOA( st_ivas->hIsmMetaData, hParamIsm ); + ivas_param_ism_enc_quantize_DOA( nchan_ism, st_ivas->hIsmMetaData, hParamIsm ); /* Compute object indices and power ratios */ - ivas_param_ism_compute_obj_parameters( reference_power_obj, hParamIsm ); + ivas_param_ism_compute_obj_parameters( nchan_ism, reference_power_obj, hParamIsm ); pop_wmops(); return; } -#ifdef PARAM_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 */ -) -{ - 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 */ - for ( i = 1; i < hParamIsm->num_obj; i++ ) - { - 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 ); - - for ( i = 0; i < hParamIsm->num_obj; i++ ) - { - 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; -} - - /*-------------------------------------------------------------------* * ivas_param_ism_compute_noisy_speech_flag() * @@ -555,7 +429,11 @@ void ivas_param_ism_compute_noisy_speech_flag( /* For the current frame, make a decision based on some core-coder flags */ if ( st_ivas->hSCE[0]->hCoreCoder[0]->flag_noisy_speech_snr && st_ivas->hSCE[1]->hCoreCoder[0]->flag_noisy_speech_snr ) { +#ifdef FIX_422 + if ( st_ivas->hSCE[0]->hCoreCoder[0]->vad_flag || st_ivas->hSCE[1]->hCoreCoder[0]->vad_flag ) +#else if ( st_ivas->hSCE[0]->hCoreCoder[0]->vad_flag && st_ivas->hSCE[1]->hCoreCoder[0]->vad_flag ) +#endif { st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = 0; } @@ -580,4 +458,3 @@ void ivas_param_ism_compute_noisy_speech_flag( return; } -#endif diff --git a/lib_enc/ivas_lfe_enc.c b/lib_enc/ivas_lfe_enc.c index fc16c279ee62d40309caec961f91836c0ef5a5de..a14424774ffec7ed5270d26f8d46926c9568e53e 100644 --- a/lib_enc/ivas_lfe_enc.c +++ b/lib_enc/ivas_lfe_enc.c @@ -460,21 +460,27 @@ ivas_error ivas_create_lfe_enc( *-------------------------------------------------------------------------*/ void ivas_lfe_enc_close( - LFE_ENC_HANDLE hLFE /* i/o: LFE encoder handle */ + LFE_ENC_HANDLE *hLFE /* i/o: LFE encoder handle */ ) { - if ( hLFE->old_wtda_audio != NULL ) + if ( hLFE == NULL || *hLFE == NULL ) { - free( hLFE->old_wtda_audio ); - hLFE->old_wtda_audio = NULL; + return; } - if ( hLFE->pWindow_state ) + + if ( ( *hLFE )->old_wtda_audio != NULL ) + { + free( ( *hLFE )->old_wtda_audio ); + ( *hLFE )->old_wtda_audio = NULL; + } + if ( ( *hLFE )->pWindow_state ) { - free( hLFE->pWindow_state ); - hLFE->pWindow_state = NULL; + free( ( *hLFE )->pWindow_state ); + ( *hLFE )->pWindow_state = NULL; } - free( hLFE ); + free( ( *hLFE ) ); + ( *hLFE ) = NULL; return; } diff --git a/lib_enc/ivas_masa_enc.c b/lib_enc/ivas_masa_enc.c index dca9be401092af394f7a1b08ee95fd50100726cb..5b5363efb3eda26af319e9559d085bfcc877d7b5 100644 --- a/lib_enc/ivas_masa_enc.c +++ b/lib_enc/ivas_masa_enc.c @@ -31,8 +31,8 @@ *******************************************************************************************************/ #include -#include "options.h" #include +#include "options.h" #include "ivas_cnst.h" #include "ivas_prot.h" #include "ivas_rom_com.h" @@ -40,6 +40,7 @@ #include "wmc_auto.h" #include "prot.h" + /*-----------------------------------------------------------------------* * Local function prototypes *-----------------------------------------------------------------------*/ @@ -50,9 +51,9 @@ static void combine_directions( MASA_ENCODER_HANDLE hMasa ); static void find_n_largest( const float *input, int16_t *largestIndices, const int16_t numElements, const int16_t numLargest ); -static void move_metadata_to_qmetadata( MASA_ENCODER_HANDLE hMasa, IVAS_QMETADATA_HANDLE hQMeta ); +static void move_metadata_to_qmetadata( const MASA_ENCODER_HANDLE hMasa, IVAS_QMETADATA_HANDLE hQMeta ); -static void detect_metadata_composition( MASA_ENCODER_HANDLE hMasa, uint8_t *joinedSubframes, uint8_t *coherencePresent, uint8_t *isTwoDir ); +static void detect_metadata_composition( const MASA_ENCODER_HANDLE hMasa, uint8_t *joinedSubframes, uint8_t *coherencePresent, uint8_t *isTwoDir ); static void compensate_energy_ratios( MASA_ENCODER_HANDLE hMasa ); @@ -60,6 +61,24 @@ static int16_t encode_lfe_to_total_energy_ratio( MASA_ENCODER_HANDLE hMasa, BSTR static void reduce_metadata_further( MASA_ENCODER_HANDLE hMasa, IVAS_QMETADATA_HANDLE hqmetadata, const IVAS_FORMAT ivas_format ); +static void average_masa_metadata( MASA_METADATA_FRAME *masaMetadata, float energy[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS] +#ifdef HR_METADATA + , + 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 ); + +static void copy_masa_metadata( const MASA_METADATA_HANDLE hMetaFrom, MASA_METADATA_HANDLE hMetaTo ); + +static uint8_t are_masa_subframes_similar( const MASA_METADATA_HANDLE frame1, const uint8_t sf1_idx, const MASA_METADATA_HANDLE frame2, const uint8_t sf2_idx ); + +static void detect_framing_async( MASA_ENCODER_HANDLE hMasa ); + +#ifdef FIX_398_MASA_DIRECTION_ALIGNMENT +static void masa_metadata_direction_alignment( MASA_ENCODER_HANDLE hMasa ); +#endif /*-----------------------------------------------------------------------* * Local constants @@ -119,16 +138,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; @@ -136,6 +145,18 @@ ivas_error ivas_masa_enc_open( set_zero( hMasa->data.lfeToTotalEnergyRatio, MAX_PARAM_SPATIAL_SUBFRAMES ); hMasa->data.prevq_lfeToTotalEnergyRatio = 0.0f; hMasa->data.prevq_lfeIndex = 0; + + hMasa->data.sync_state.prev_sim_stop = 0; + hMasa->data.sync_state.prev_offset = 0; + hMasa->data.sync_state.frame_mode = MASA_FRAME_4SF; + +#ifdef FIX_398_MASA_DIRECTION_ALIGNMENT + set_zero( hMasa->data.dir_align_state.previous_azi_dir1, MASA_FREQUENCY_BANDS ); + set_zero( hMasa->data.dir_align_state.previous_ele_dir1, MASA_FREQUENCY_BANDS ); + set_zero( hMasa->data.dir_align_state.previous_azi_dir2, MASA_FREQUENCY_BANDS ); + set_zero( hMasa->data.dir_align_state.previous_ele_dir2, MASA_FREQUENCY_BANDS ); +#endif + st_ivas->hMasa = hMasa; return error; @@ -149,33 +170,24 @@ 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 + MASA_ENCODER_HANDLE *hMasa /* i/o: MASA metadata structure */ ) { int16_t i; - for ( i = 0; i < hMasa->data.num_Cldfb_instances; i++ ) + if ( hMasa == NULL || *hMasa == NULL ) { - deleteCldfb( &( hMasa->data.cldfbAnaEnc[i] ) ); + return; } -#ifndef FIX_350_MASA_DELAY_COMP - if ( ivas_format == MASA_FORMAT ) + for ( i = 0; i < ( *hMasa )->data.num_Cldfb_instances; i++ ) { - for ( i = 0; i < nchan_transport; i++ ) - { - free( hMasa->data.delay_buffer[i] ); - hMasa->data.delay_buffer[i] = NULL; - } + deleteCldfb( &( ( *hMasa )->data.cldfbAnaEnc[i] ) ); } -#endif - free( hMasa ); + + free( ( *hMasa ) ); + ( *hMasa ) = NULL; return; } @@ -238,10 +250,18 @@ 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 ); } @@ -305,7 +325,25 @@ 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 ); +#ifdef HR_METADATA + } +#endif *nb_bits_metadata = hMetaData->nb_bits_tot; @@ -408,27 +446,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++ ) { @@ -456,12 +477,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; } @@ -486,6 +501,9 @@ ivas_error ivas_masa_enc_config( 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; ivas_error error; +#ifdef HR_METADATA + SPHERICAL_GRID_DATA *sphGrid; +#endif error = IVAS_ERR_OK; @@ -500,6 +518,37 @@ ivas_error ivas_masa_enc_config( if ( ivas_format == MASA_FORMAT ) { +#ifdef FIX_398_MASA_DIRECTION_ALIGNMENT + masa_metadata_direction_alignment( hMasa ); +#endif + + detect_framing_async( hMasa ); /* detect the offset, set 1sf/4sf mode based on this. potentially also shift the metadata using a history buffer */ + + if ( hMasa->data.sync_state.frame_mode == MASA_FRAME_1SF && hMasa->data.sync_state.prev_offset != 0 ) + { +#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 +#ifdef HR_METADATA + , + sphGrid +#endif + ); + } + /* Inspect metadata for parameter changes that affect coding. */ detect_metadata_composition( hMasa, &joinedSubframes, &coherencePresent, &isActualTwoDir ); hMasa->config.joinedSubframes = joinedSubframes; @@ -508,7 +557,7 @@ ivas_error ivas_masa_enc_config( } else if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) { - /* For mcMASA, these are set only once as this function is called only once. */ + /* For McMASA, these are set only once as this function is called only once. */ hMasa->config.joinedSubframes = 0; hMasa->config.numberOfDirections = 1; } @@ -589,7 +638,7 @@ ivas_error ivas_masa_enc_config( ivas_set_qmetadata_maxbit_req( hQMetaData, ivas_format ); - masa_sample_rate_band_correction( &( hMasa->config ), hMasa->data.band_mapping, hQMetaData, st_ivas->hEncoderConfig->input_Fs ); + masa_sample_rate_band_correction( &( hMasa->config ), hMasa->data.band_mapping, hQMetaData, st_ivas->hEncoderConfig->input_Fs, NULL ); /* Transmit stereo signals using a mono downmix at lowest bitrates */ if ( ivas_format == MASA_FORMAT && st_ivas->nCPE == 1 && st_ivas->hCPE[0]->hStereoDft != NULL && st_ivas->hCPE[0]->hStereoDft->hConfig != NULL ) @@ -699,9 +748,10 @@ static void combine_freqbands_and_subframes( if ( numCodingBands < MASA_FREQUENCY_BANDS ) { + /* reduce metadata *frequency* resolution. time resolution is not touched */ for ( i = 0; i < numDirections; i++ ) { - for ( j = 0; j < numSf; j++ ) + for ( j = 0; j < numSf; j++ ) /* NB: for numSf==1, operates only on first sub-frame */ { for ( k = 0; k < MASA_FREQUENCY_BANDS; k++ ) { @@ -775,7 +825,7 @@ static void combine_freqbands_and_subframes( } } } - else if ( mergeRatiosOverSubframes ) + else if ( mergeRatiosOverSubframes ) /* keep frequency resolution */ { for ( j = 0; j < numSf; j++ ) { @@ -1003,7 +1053,7 @@ static void find_n_largest( static void move_metadata_to_qmetadata( - MASA_ENCODER_HANDLE hMasa, + const MASA_ENCODER_HANDLE hMasa, IVAS_QMETADATA_HANDLE hQMeta ) { int16_t dir, sf, band; @@ -1026,6 +1076,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 ); @@ -1075,18 +1128,19 @@ static void move_metadata_to_qmetadata( /* This function studies parametric MASA metadata to provide information for codec configuration */ static void detect_metadata_composition( - MASA_ENCODER_HANDLE hMasa, /* i : MASA encoder data */ - uint8_t *joinedSubframes, /* o : Result of subframe composition */ - uint8_t *coherencePresent, /* o : Result of coherence presence */ - uint8_t *isTwoDir /* o : Result of two direction check */ + const MASA_ENCODER_HANDLE hMasa, /* i : MASA encoder data */ + uint8_t *joinedSubframes, /* o : Result of subframe composition */ + uint8_t *coherencePresent, /* o : Result of coherence presence */ + uint8_t *isTwoDir /* o : Result of two direction check */ ) { MASA_METADATA_FRAME *hMeta; - int16_t sf, band, dir, numDir; + int8_t sf, band, dir, numDir; int16_t nSubFrames; uint8_t dirValid[2] = { FALSE }; uint8_t cohPresent = FALSE; uint8_t sfDiffer = FALSE; + uint8_t sfSimilar; hMeta = &( hMasa->masaMetadata ); numDir = hMeta->descriptive_meta.numberOfDirections + 1; @@ -1151,52 +1205,14 @@ static void detect_metadata_composition( } /* Check if data over subframes is identical. Check is done by comparing to first subframe. */ - dir = 0; - while ( sfDiffer == FALSE && dir < numDir ) + sfSimilar = TRUE; + sf = 1; + while ( ( sfSimilar == TRUE ) && ( sf < MAX_PARAM_SPATIAL_SUBFRAMES ) ) { - sf = 1; - while ( sfDiffer == FALSE && sf < MAX_PARAM_SPATIAL_SUBFRAMES ) - { - band = 0; - while ( sfDiffer == FALSE && band < MASA_FREQUENCY_BANDS ) - { - float aziDif; - aziDif = fabsf( hMeta->directional_meta[dir].azimuth[sf][band] - hMeta->directional_meta[dir].azimuth[0][band] ); - aziDif = aziDif > 180.0f ? aziDif - 360.0f : aziDif; - if ( aziDif > MASA_ANGLE_TOLERANCE ) - { - sfDiffer = TRUE; - break; - } - - if ( fabsf( hMeta->directional_meta[dir].elevation[sf][band] - hMeta->directional_meta[dir].elevation[0][band] ) > MASA_ANGLE_TOLERANCE ) - { - sfDiffer = TRUE; - break; - } - - if ( fabsf( hMeta->directional_meta[dir].energy_ratio[sf][band] - hMeta->directional_meta[dir].energy_ratio[0][band] ) > MASA_RATIO_TOLERANCE ) - { - sfDiffer = TRUE; - break; - } - - if ( fabsf( hMeta->directional_meta[dir].spread_coherence[sf][band] - hMeta->directional_meta[dir].spread_coherence[0][band] ) > MASA_COHERENCE_TOLERANCE ) - { - sfDiffer = TRUE; - break; - } - - if ( dir == 0 && fabsf( hMeta->common_meta.surround_coherence[sf][band] - hMeta->common_meta.surround_coherence[0][band] ) > MASA_COHERENCE_TOLERANCE ) - { - sfDiffer = TRUE; - } - band++; - } - sf++; - } - dir++; + sfSimilar = are_masa_subframes_similar( hMeta, 0, hMeta, sf ); + sf++; } + sfDiffer = sfSimilar == TRUE ? FALSE : TRUE; /* Further checks can be done with just one subframe if they are identical */ nSubFrames = sfDiffer == TRUE ? MAX_PARAM_SPATIAL_SUBFRAMES : 1; @@ -1740,3 +1756,578 @@ void ivas_masa_enc_reconfigure( return; } + + +/*-------------------------------------------------------------------* + * average_masa_metadata() + * + * Average MASA metadata frame subframe contents: applies aggregation over time + *-------------------------------------------------------------------*/ + +static void average_masa_metadata( + MASA_METADATA_FRAME *hMeta, + float energy[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS] +#ifdef HR_METADATA + , + SPHERICAL_GRID_DATA *Sph_Grid16 +#endif +) +{ + int16_t i, j, k; + float azi_rad, ele_rad; + uint8_t numDirections; + + /* use the nominal values without data-adaptivity */ + numDirections = hMeta->descriptive_meta.numberOfDirections + 1; + + /* azi/ele/nrg into vectors for each sub-frame and band */ + for ( i = 0; i < numDirections; i++ ) + { + for ( k = 0; k < MASA_FREQUENCY_BANDS; k++ ) + { + float x_sum, y_sum, z_sum, energy_sum, vec_len, spread_coh_sum, surr_coh_sum; + + x_sum = 0.0f; + y_sum = 0.0f; + z_sum = 0.0f; + energy_sum = 0.0f; + spread_coh_sum = 0.0f; + surr_coh_sum = 0.0f; + for ( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ ) + { + azi_rad = hMeta->directional_meta[i].azimuth[j][k] / 180.0f * EVS_PI; + ele_rad = hMeta->directional_meta[i].elevation[j][k] / 180.0f * EVS_PI; + vec_len = hMeta->directional_meta[i].energy_ratio[j][k] * energy[j][k]; + + /* energy-weighted sum over subframes */ + x_sum += cosf( azi_rad ) * cosf( ele_rad ) * vec_len; + y_sum += sinf( azi_rad ) * cosf( ele_rad ) * vec_len; + z_sum += sinf( ele_rad ) * vec_len; + + energy_sum += energy[j][k]; + + spread_coh_sum += hMeta->directional_meta[i].spread_coherence[j][k] * energy[j][k]; + if ( i == 0 ) + { + /* this is in common metadata and not in each direction */ + surr_coh_sum += hMeta->common_meta.surround_coherence[j][k] * energy[j][k]; + } + } + + /* the data from the combined sub-frames is written into the first sub-frame band */ + j = 0; + hMeta->directional_meta[i].azimuth[j][k] = atan2f( y_sum, x_sum ) / EVS_PI * 180.0f; + hMeta->directional_meta[i].elevation[j][k] = atan2f( z_sum, sqrtf( x_sum * x_sum + y_sum * y_sum ) ) / EVS_PI * 180.0f; +#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 ); + + hMeta->directional_meta[i].spread_coherence[j][k] = spread_coh_sum / ( energy_sum + EPSILON ); + if ( i == 0 ) + { + hMeta->common_meta.surround_coherence[j][k] = surr_coh_sum / ( energy_sum + EPSILON ); + } + + /* copy the same value to all subframes */ + for ( j = 1; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ ) + { + hMeta->directional_meta[i].azimuth[j][k] = hMeta->directional_meta[i].azimuth[0][k]; + hMeta->directional_meta[i].elevation[j][k] = hMeta->directional_meta[i].elevation[0][k]; + hMeta->directional_meta[i].energy_ratio[j][k] = hMeta->directional_meta[i].energy_ratio[0][k]; + hMeta->directional_meta[i].spread_coherence[j][k] = hMeta->directional_meta[i].spread_coherence[0][k]; + if ( i == 0 ) + { + hMeta->common_meta.surround_coherence[j][k] = hMeta->common_meta.surround_coherence[0][k]; + } + } + } + } + + for ( k = 0; k < MASA_FREQUENCY_BANDS; k++ ) + { + for ( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ ) + { + if ( numDirections == 2 ) + { + hMeta->common_meta.diffuse_to_total_ratio[j][k] = max( 0.0f, 1.0f - hMeta->directional_meta[1].energy_ratio[j][k] - hMeta->directional_meta[0].energy_ratio[j][k] ); + } + else + { + hMeta->common_meta.diffuse_to_total_ratio[j][k] = max( 0.0f, 1.0f - hMeta->directional_meta[0].energy_ratio[j][k] ); + } + hMeta->common_meta.remainder_to_total_ratio[j][k] = 0.0f; + } + } + + return; +} + + +/*-------------------------------------------------------------------* + * copy_masa_metadata_subframe() + * + * Copy MASA metadata frame subframe contents + *-------------------------------------------------------------------*/ + +static void copy_masa_metadata_subframe( + const MASA_METADATA_HANDLE hMetaFrom, /* i : MASA frame metdata to be copied */ + const uint8_t sfFrom, /* i : subframe index of the copy source */ + MASA_METADATA_HANDLE hMetaTo, /* o : MASA frame metadata copy destination */ + const uint8_t sfTo /* i : subframe index of the copy target */ +) +{ + uint8_t dir; + + /* directional metadata */ + for ( dir = 0; dir < MASA_MAXIMUM_DIRECTIONS; dir++ ) + { + mvr2r( hMetaFrom->directional_meta[dir].azimuth[sfFrom], hMetaTo->directional_meta[dir].azimuth[sfTo], MASA_FREQUENCY_BANDS ); + mvr2r( hMetaFrom->directional_meta[dir].elevation[sfFrom], hMetaTo->directional_meta[dir].elevation[sfTo], MASA_FREQUENCY_BANDS ); + mvr2r( hMetaFrom->directional_meta[dir].energy_ratio[sfFrom], hMetaTo->directional_meta[dir].energy_ratio[sfTo], MASA_FREQUENCY_BANDS ); + mvr2r( hMetaFrom->directional_meta[dir].spread_coherence[sfFrom], hMetaTo->directional_meta[dir].spread_coherence[sfTo], MASA_FREQUENCY_BANDS ); + } + + /* common metadata */ + mvr2r( hMetaFrom->common_meta.diffuse_to_total_ratio[sfFrom], hMetaTo->common_meta.diffuse_to_total_ratio[sfTo], MASA_FREQUENCY_BANDS ); + mvr2r( hMetaFrom->common_meta.surround_coherence[sfFrom], hMetaTo->common_meta.surround_coherence[sfTo], MASA_FREQUENCY_BANDS ); + mvr2r( hMetaFrom->common_meta.remainder_to_total_ratio[sfFrom], hMetaTo->common_meta.remainder_to_total_ratio[sfTo], MASA_FREQUENCY_BANDS ); + + return; +} + + +/*-------------------------------------------------------------------* + * copy_masa_metadata() + * + * Copy MASA metada frame contents + *-------------------------------------------------------------------*/ + +static void copy_masa_metadata( + const MASA_METADATA_HANDLE hMetaFrom, /* i : MASA frame metadata to be copied */ + MASA_METADATA_HANDLE hMetaTo /* o : MASA frame metadata copy destination */ +) +{ + uint8_t sf, byte_idx; + + /* descriptive metadata */ + for ( byte_idx = 0; byte_idx < 8; byte_idx++ ) + { + hMetaTo->descriptive_meta.formatDescriptor[byte_idx] = hMetaFrom->descriptive_meta.formatDescriptor[byte_idx]; + } + + hMetaTo->descriptive_meta.numberOfDirections = hMetaFrom->descriptive_meta.numberOfDirections; + hMetaTo->descriptive_meta.numberOfChannels = hMetaFrom->descriptive_meta.numberOfChannels; + hMetaTo->descriptive_meta.sourceFormat = hMetaFrom->descriptive_meta.sourceFormat; + hMetaTo->descriptive_meta.transportDefinition = hMetaFrom->descriptive_meta.transportDefinition; + hMetaTo->descriptive_meta.channelAngle = hMetaFrom->descriptive_meta.channelAngle; + hMetaTo->descriptive_meta.channelDistance = hMetaFrom->descriptive_meta.channelDistance; + hMetaTo->descriptive_meta.channelLayout = hMetaFrom->descriptive_meta.channelLayout; + + /* directional and common metadata */ + for ( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ ) + { + copy_masa_metadata_subframe( hMetaFrom, sf, hMetaTo, sf ); + } + + return; +} + + +/*-------------------------------------------------------------------* + * are_masa_subframes_similar() + * + * Compare the similarity of MASA metadata in two sub-frames + *-------------------------------------------------------------------*/ + +static uint8_t are_masa_subframes_similar( + const MASA_METADATA_HANDLE frame1, /* i : MASA metadata frame 1 */ + const uint8_t sf1_idx, /* i : index of the subframe of frame1 to inspect */ + const MASA_METADATA_HANDLE frame2, /* i : MASA metadata frame 2 */ + const uint8_t sf2_idx /* o : index of the subframe of frame2 to inspect */ +) +{ + uint8_t num_dir; + uint8_t dir; + uint8_t band_idx; + uint8_t sf_differ; + + num_dir = frame1->descriptive_meta.numberOfDirections; + dir = 0; + band_idx = 0; + sf_differ = FALSE; + + if ( num_dir != frame2->descriptive_meta.numberOfDirections ) + { + sf_differ = TRUE; + } + else + { + /* check per-direction metadata */ + dir = 0; + band_idx = 0; + + while ( ( sf_differ == FALSE ) && ( dir <= num_dir ) ) + { + band_idx = 0; + while ( ( sf_differ == FALSE ) && ( band_idx < MASA_FREQUENCY_BANDS ) ) + { + float azi_dif; + azi_dif = fabsf( frame1->directional_meta[dir].azimuth[sf1_idx][band_idx] - frame2->directional_meta[dir].azimuth[sf2_idx][band_idx] ); + azi_dif = azi_dif > 180.0f ? 360.0f - azi_dif : azi_dif; + + if ( azi_dif > MASA_ANGLE_TOLERANCE ) + { + sf_differ = TRUE; + break; + } + + if ( fabsf( frame1->directional_meta[dir].elevation[sf1_idx][band_idx] - frame2->directional_meta[dir].elevation[sf2_idx][band_idx] ) > MASA_ANGLE_TOLERANCE ) + { + sf_differ = TRUE; + break; + } + + if ( fabsf( frame1->directional_meta[dir].energy_ratio[sf1_idx][band_idx] - frame2->directional_meta[dir].energy_ratio[sf2_idx][band_idx] ) > MASA_RATIO_TOLERANCE ) + { + sf_differ = TRUE; + break; + } + + if ( fabsf( frame1->directional_meta[dir].spread_coherence[sf1_idx][band_idx] - frame2->directional_meta[dir].spread_coherence[sf2_idx][band_idx] ) > MASA_COHERENCE_TOLERANCE ) + { + sf_differ = TRUE; + break; + } + + band_idx++; + } + dir++; + } + + /* check the common metadata */ + while ( ( sf_differ == FALSE ) && ( band_idx < MASA_FREQUENCY_BANDS ) ) + { + if ( fabsf( frame1->common_meta.surround_coherence[sf1_idx][band_idx] - frame2->common_meta.surround_coherence[sf2_idx][band_idx] ) > MASA_COHERENCE_TOLERANCE ) + { + sf_differ = TRUE; + break; + } + + band_idx++; + } + } + + /* TODO: a nicer negation */ // VE: ?? + if ( sf_differ ) + { + return FALSE; + } + else + { + return TRUE; + } +} + + +/*-------------------------------------------------------------------* + * detect_framing_async() + * + * Compare the similarity of MASA metadata in two sub-frames + * Analysis result is stored in hMasa->data.sync_state, and + * potentially hMasa->masaMetadata is modified + *-------------------------------------------------------------------*/ + +static void detect_framing_async( + MASA_ENCODER_HANDLE hMasa /* i/o: MASA encoder structure */ +) +{ + MASA_METADATA_HANDLE current_meta; + MASA_METADATA_HANDLE previous_meta; + MASA_SYNC_HANDLE sync_state; + MASA_FRAME_MODE frame_mode; + uint8_t n_sim_start, n_sim_stop, sf_idx; + uint8_t found_offset; + + current_meta = &( hMasa->masaMetadata ); /* metadata from current frame */ + sync_state = &( hMasa->data.sync_state ); /* synchronization structure */ + previous_meta = &( sync_state->previous_metadata ); + + /* check current frame, how many are similar from the start and from the end */ + n_sim_start = 1; + for ( sf_idx = n_sim_start; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ ) + { + if ( are_masa_subframes_similar( current_meta, 0, current_meta, sf_idx ) == TRUE ) + { + n_sim_start = sf_idx + 1; + } + else + { + break; + } + } + + /* number of similar sub-frames starting from the end of the frame */ + if ( n_sim_start == MAX_PARAM_SPATIAL_SUBFRAMES ) /* shortcut */ + { + n_sim_stop = n_sim_start; + } + else + { + n_sim_stop = 1; + for ( sf_idx = 2; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ ) + { + /* we need to check only the two middle sub-frames, as all being the same would have taken the shortcut above */ + if ( are_masa_subframes_similar( current_meta, MAX_PARAM_SPATIAL_SUBFRAMES - 1, current_meta, MAX_PARAM_SPATIAL_SUBFRAMES - sf_idx ) == TRUE ) + { + n_sim_stop = sf_idx; + } + else + { + break; + } + } + } + + frame_mode = MASA_FRAME_4SF; /* default mode: 4sf */ + if ( sync_state->prev_offset > MAX_PARAM_SPATIAL_SUBFRAMES - 2 ) + { + /* earlier offset was large => reset the offset */ + found_offset = 0; + } + else + { + /* keep previous offset unless something else is found. alternatively, we could reset always */ + found_offset = sync_state->prev_offset; + } + + if ( ( n_sim_start == MAX_PARAM_SPATIAL_SUBFRAMES ) && ( n_sim_stop == MAX_PARAM_SPATIAL_SUBFRAMES ) ) + { + /* full frame consists of similar sub-frames */ + frame_mode = MASA_FRAME_1SF; + if ( ( sync_state->prev_sim_stop != 0 ) && ( are_masa_subframes_similar( current_meta, 0, previous_meta, MAX_PARAM_SPATIAL_SUBFRAMES - 1 ) == TRUE ) ) + { + /* > 4 sub-frames of similar data */ + if ( sync_state->prev_sim_stop < 3 ) + { + /* can nicely align the framing with the earlier data and a small offset */ + found_offset = sync_state->prev_sim_stop; + } + else + { + /* too many similar sub-frames to determine the offset accurately => keep earlier value */ + found_offset = sync_state->prev_offset; + } + } + else + { + /* earlier window was different => reset the offset */ + found_offset = 0; + } + } + else if ( n_sim_stop == 3 ) + { + /* first sub-frame different that the rest 3 + => make a risky guess that the future sf would be the same too and we're in an offset case */ + frame_mode = MASA_FRAME_1SF; + found_offset = 3; + } + else if ( ( sync_state->prev_sim_stop > 0 ) && ( are_masa_subframes_similar( current_meta, 0, previous_meta, MAX_PARAM_SPATIAL_SUBFRAMES - 1 ) == TRUE ) ) + { + /* seeing data similar to past */ + if ( ( n_sim_start > 1 ) && ( n_sim_start + sync_state->prev_sim_stop >= MAX_PARAM_SPATIAL_SUBFRAMES ) ) + { + /* with the past, would have at least one long frame similar subframes */ + frame_mode = MASA_FRAME_1SF; + + if ( sync_state->prev_offset == 0 ) + { + found_offset = min( 2, sync_state->prev_sim_stop ); + } + else + { + found_offset = sync_state->prev_offset; + } + } + } + + /* keep the original contents of the frame, but then perform interpolation later */ + /* just copy current frame to storage */ + copy_masa_metadata( current_meta, previous_meta ); + + sync_state->prev_sim_stop = n_sim_stop; + sync_state->prev_offset = found_offset; + sync_state->frame_mode = frame_mode; + + return; +} + + +#ifdef FIX_398_MASA_DIRECTION_ALIGNMENT +/*-------------------------------------------------------------------* + * masa_metadata_direction_alignment() + * + * In 2dir MASA metadata, determine the ordering of the directional + * fields such that the azi/ele change across time is minimized. + *-------------------------------------------------------------------*/ + +static void masa_metadata_direction_alignment( + MASA_ENCODER_HANDLE hMasa /* i/o: MASA encoder handle */ +) +{ + uint8_t band, n_dirs; + + MASA_DIR_ALIGN_HANDLE hAlignState; + MASA_METADATA_HANDLE hMeta; + + hAlignState = &( hMasa->data.dir_align_state ); + hMeta = &( hMasa->masaMetadata ); + + n_dirs = hMeta->descriptive_meta.numberOfDirections + 1; /* 1-based */ + for ( band = 0; band < MASA_FREQUENCY_BANDS; band++ ) + { + uint8_t sf; + float diff_swap, diff_no_swap; + + /* trade 2*(cos+sin) against storing the values between frames */ + float prev_ele_dir1_sin, prev_ele_dir2_sin; + float prev_ele_dir1_cos, prev_ele_dir2_cos; + + prev_ele_dir1_sin = sinf( hAlignState->previous_ele_dir1[band] ); + prev_ele_dir2_sin = sinf( hAlignState->previous_ele_dir2[band] ); + + prev_ele_dir1_cos = cosf( hAlignState->previous_ele_dir1[band] ); + prev_ele_dir2_cos = cosf( hAlignState->previous_ele_dir2[band] ); + + for ( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ ) + { + float azi_rad1, ele_rad1; + float azi_rad2, ele_rad2; + float cos_ele1, cos_ele2; + float sin_ele1, sin_ele2; + + azi_rad1 = hMeta->directional_meta[0].azimuth[sf][band] * PI_OVER_180; + ele_rad1 = hMeta->directional_meta[0].elevation[sf][band] * PI_OVER_180; + + if ( n_dirs > 1 ) + { + azi_rad2 = hMeta->directional_meta[1].azimuth[sf][band] * PI_OVER_180; + ele_rad2 = hMeta->directional_meta[1].elevation[sf][band] * PI_OVER_180; + + /* quick checks to detect constant data and earlier flip */ + if ( fabsf( azi_rad1 - hAlignState->previous_azi_dir1[band] ) < EPSILON && + fabsf( azi_rad2 - hAlignState->previous_azi_dir2[band] ) < EPSILON && + fabsf( ele_rad1 - hAlignState->previous_ele_dir1[band] ) < EPSILON && + fabsf( ele_rad2 - hAlignState->previous_ele_dir2[band] ) < EPSILON ) + { + diff_swap = 1.0f; + diff_no_swap = 0.0f; + /* cached values that will be used for the short-cuts and over-written by the real computations, if done */ + sin_ele1 = prev_ele_dir1_sin; + sin_ele2 = prev_ele_dir2_sin; + cos_ele1 = prev_ele_dir1_cos; + cos_ele2 = prev_ele_dir2_cos; + } + else if ( fabsf( azi_rad1 - hAlignState->previous_azi_dir2[band] ) < EPSILON && + fabsf( azi_rad2 - hAlignState->previous_azi_dir1[band] ) < EPSILON && + fabsf( ele_rad1 - hAlignState->previous_ele_dir2[band] ) < EPSILON && + fabsf( ele_rad2 - hAlignState->previous_ele_dir1[band] ) < EPSILON ) + { + diff_swap = 0.0f; + diff_no_swap = 1.0f; + /* cached values that will be used for the short-cuts and over-written by the real computations, if done */ + sin_ele1 = prev_ele_dir2_sin; + sin_ele2 = prev_ele_dir1_sin; + cos_ele1 = prev_ele_dir2_cos; + cos_ele2 = prev_ele_dir1_cos; + } + else + { + /* angular distance of the two vectors */ + /* pre-compute values for re-use */ + sin_ele1 = sinf( ele_rad1 ); + sin_ele2 = sinf( ele_rad2 ); + + cos_ele1 = cosf( ele_rad1 ); + cos_ele2 = cosf( ele_rad2 ); + + diff_no_swap = acosf( cos_ele1 * prev_ele_dir1_cos * cosf( azi_rad1 - hAlignState->previous_azi_dir1[band] ) + sin_ele1 * prev_ele_dir1_sin ) + + acosf( cos_ele2 * prev_ele_dir2_cos * cosf( azi_rad2 - hAlignState->previous_azi_dir2[band] ) + sin_ele2 * prev_ele_dir2_sin ); + + diff_swap = acosf( cos_ele1 * prev_ele_dir2_cos * cosf( azi_rad1 - hAlignState->previous_azi_dir2[band] ) + sin_ele1 * prev_ele_dir2_sin ) + + acosf( cos_ele2 * prev_ele_dir1_cos * cosf( azi_rad2 - hAlignState->previous_azi_dir1[band] ) + sin_ele2 * prev_ele_dir1_sin ); + } + } + else + { + /* 1dir */ + sin_ele1 = sinf( ele_rad1 ); + cos_ele1 = cosf( ele_rad1 ); + + azi_rad2 = 0.0f; + ele_rad2 = 0.0f; + + sin_ele2 = 0.0f; /* sin(0) */ + cos_ele2 = 1.0f; /* cos(0) */ + + diff_swap = 1.0f; + diff_no_swap = 0.0f; + } + + if ( n_dirs > 1 && diff_no_swap > diff_swap ) + { + /* swap the metadata of the two directions in this TF-tile */ + float tmp_val; + tmp_val = hMeta->directional_meta[0].azimuth[sf][band]; + hMeta->directional_meta[0].azimuth[sf][band] = hMeta->directional_meta[1].azimuth[sf][band]; + hMeta->directional_meta[1].azimuth[sf][band] = tmp_val; + + tmp_val = hMeta->directional_meta[0].elevation[sf][band]; + hMeta->directional_meta[0].elevation[sf][band] = hMeta->directional_meta[1].elevation[sf][band]; + hMeta->directional_meta[1].elevation[sf][band] = tmp_val; + + tmp_val = hMeta->directional_meta[0].energy_ratio[sf][band]; + hMeta->directional_meta[0].energy_ratio[sf][band] = hMeta->directional_meta[1].energy_ratio[sf][band]; + hMeta->directional_meta[1].energy_ratio[sf][band] = tmp_val; + + tmp_val = hMeta->directional_meta[0].spread_coherence[sf][band]; + hMeta->directional_meta[0].spread_coherence[sf][band] = hMeta->directional_meta[1].spread_coherence[sf][band]; + hMeta->directional_meta[1].spread_coherence[sf][band] = tmp_val; + + hAlignState->previous_azi_dir1[band] = azi_rad2; + hAlignState->previous_ele_dir1[band] = ele_rad2; + + hAlignState->previous_azi_dir2[band] = azi_rad1; + hAlignState->previous_ele_dir2[band] = ele_rad1; + + prev_ele_dir1_cos = cos_ele2; + prev_ele_dir1_sin = sin_ele2; + + prev_ele_dir2_cos = cos_ele1; + prev_ele_dir2_sin = sin_ele1; + } + else + { + hAlignState->previous_azi_dir1[band] = azi_rad1; + hAlignState->previous_ele_dir1[band] = ele_rad1; + + hAlignState->previous_azi_dir2[band] = azi_rad2; + hAlignState->previous_ele_dir2[band] = ele_rad2; + + prev_ele_dir1_cos = cos_ele1; + prev_ele_dir1_sin = sin_ele1; + + prev_ele_dir2_cos = cos_ele2; + prev_ele_dir2_sin = sin_ele2; + } + } /* sf */ + } /* band */ + + return; +} +#endif diff --git a/lib_enc/ivas_mc_param_enc.c b/lib_enc/ivas_mc_param_enc.c index 9b1241f234da333c866f7439fb23ad3ae123f270..14eca6afee59ee3596c7c08a743aeb8eade52846 100644 --- a/lib_enc/ivas_mc_param_enc.c +++ b/lib_enc/ivas_mc_param_enc.c @@ -146,11 +146,7 @@ ivas_error ivas_param_mc_enc_open( } /* Allocate and initialize FB mixer handle */ -#ifdef SBA_BR_SWITCHING_CLEAN_UP if ( ( error = ivas_FB_mixer_open( &( hParamMC->hFbMixer ), input_Fs, fb_cfg, 0 ) ) != IVAS_ERR_OK ) -#else - if ( ( error = ivas_FB_mixer_open( &( hParamMC->hFbMixer ), input_Fs, fb_cfg ) ) != IVAS_ERR_OK ) -#endif { return error; } @@ -203,7 +199,11 @@ ivas_error ivas_param_mc_enc_open( /* parameter band grouping: 60 band CLDFB to 240 band MDFT resolution */ for ( i = 0; i < hParamMC->hMetadataPMC.num_parameter_bands + 1; i++ ) { +#ifdef PARAMMC_SHORT_ENC_MDFT + hParamMC->band_grouping[i] *= PARAM_MC_CLDFB_TO_MDFT_FAC; +#else hParamMC->band_grouping[i] *= CLDFB_TO_MDFT_FAC; +#endif } /* set correct coded band width */ @@ -339,7 +339,11 @@ 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++ ) { +#ifdef PARAMMC_SHORT_ENC_MDFT + hParamMC->band_grouping[i] *= PARAM_MC_CLDFB_TO_MDFT_FAC; +#else hParamMC->band_grouping[i] *= CLDFB_TO_MDFT_FAC; +#endif } /* set correct coded band width */ @@ -364,18 +368,20 @@ ivas_error ivas_param_mc_enc_reconfig( *------------------------------------------------------------------------*/ void ivas_param_mc_enc_close( - PARAM_MC_ENC_HANDLE hParamMC, /* i/o: Parametric MC encoder handle */ + PARAM_MC_ENC_HANDLE *hParamMC, /* i/o: Parametric MC encoder handle */ const int32_t sampling_rate ) { - ivas_param_mc_metadata_close( &hParamMC->hMetadataPMC ); + if ( hParamMC == NULL || *hParamMC == NULL ) + { + return; + } -#ifdef SBA_BR_SWITCHING_CLEAN_UP - ivas_FB_mixer_close( &hParamMC->hFbMixer, sampling_rate, 0 ); -#else - ivas_FB_mixer_close( &hParamMC->hFbMixer, sampling_rate ); -#endif + ivas_param_mc_metadata_close( &( *hParamMC )->hMetadataPMC ); - free( hParamMC ); + ivas_FB_mixer_close( &( *hParamMC )->hFbMixer, sampling_rate, 0 ); + + free( ( *hParamMC ) ); + ( *hParamMC ) = NULL; return; } @@ -388,10 +394,10 @@ void ivas_param_mc_enc_close( *------------------------------------------------------------------------*/ void ivas_param_mc_enc( - Encoder_Struct *st_ivas, /* i/o: IVAS Encoder handle */ - BSTR_ENC_HANDLE hMetaData, /* i/o: IVAS Metadata bitstream handle */ - float data_f[][L_FRAME48k], /* i/o: input: CICP6, CICP12, CICP14, CICP16 or CICP19 MC data */ - const int16_t input_frame /* i : input frame length */ + Encoder_Struct *st_ivas, /* i/o: IVAS Encoder handle */ + BSTR_ENC_HANDLE hMetaData, /* i/o: IVAS Metadata bitstream handle */ + float data_f[][L_FRAME48k], /* i/o: input: CICP6, CICP12, CICP14, CICP16 or CICP19 MC data */ + const int16_t input_frame /* i : input frame length */ ) { int16_t k; @@ -684,7 +690,11 @@ static void ivas_param_mc_param_est_enc( for ( ts = start_ts; ts < num_time_slots; ts++ ) { +#ifdef PARAMMC_SHORT_ENC_MDFT + ivas_fb_mixer_get_windowed_fr( hParamMC->hFbMixer, pcm_in, p_slot_frame_f_real, p_slot_frame_f_imag, l_ts, l_ts ); +#else ivas_fb_mixer_get_windowed_fr( hParamMC->hFbMixer, pcm_in, p_slot_frame_f_real, p_slot_frame_f_imag, l_ts, 2 * l_ts ); +#endif ivas_fb_mixer_update_prior_input( hParamMC->hFbMixer, pcm_in, l_ts ); for ( i = 0; i < nchan_input; i++ ) { diff --git a/lib_enc/ivas_mcmasa_enc.c b/lib_enc/ivas_mcmasa_enc.c index 153bc3ecade61d184618543f687084ae52961a7d..8151b33c668ff1a2d382d1747b179bb81c147416 100644 --- a/lib_enc/ivas_mcmasa_enc.c +++ b/lib_enc/ivas_mcmasa_enc.c @@ -194,11 +194,7 @@ ivas_error ivas_mcmasa_enc_open( } /* Allocate and initialize FB mixer handle */ -#ifdef SBA_BR_SWITCHING_CLEAN_UP if ( ( error = ivas_FB_mixer_open( &( hMcMasa->hFbMixer ), input_Fs, fb_cfg, 0 ) ) != IVAS_ERR_OK ) -#else - if ( ( error = ivas_FB_mixer_open( &( hMcMasa->hFbMixer ), input_Fs, fb_cfg ) ) != IVAS_ERR_OK ) -#endif { return error; } @@ -228,11 +224,7 @@ ivas_error ivas_mcmasa_enc_open( return error; } -#ifdef SBA_BR_SWITCHING_CLEAN_UP if ( ( error = ivas_FB_mixer_open( &( hMcMasa->hFbMixerLfe ), input_Fs, fb_cfgLfe, 0 ) ) != IVAS_ERR_OK ) -#else - if ( ( error = ivas_FB_mixer_open( &( hMcMasa->hFbMixerLfe ), input_Fs, fb_cfgLfe ) ) != IVAS_ERR_OK ) -#endif { return error; } @@ -458,12 +450,8 @@ 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 ); + ivas_masa_enc_close( &( st_ivas->hMasa ) ); + ivas_mcmasa_enc_close( &( st_ivas->hMcMasa ), st_ivas->hEncoderConfig->input_Fs ); /* Determine if to separate some channels from the analysis */ ivas_mcmasa_setNumTransportChannels( &( st_ivas->nchan_transport ), &( st_ivas->hEncoderConfig->element_mode_init ), ivas_total_brate ); @@ -491,36 +479,33 @@ ivas_error ivas_mcmasa_enc_reconfig( *--------------------------------------------------------------------------*/ void ivas_mcmasa_enc_close( - MCMASA_ENC_HANDLE hMcMasa, /* i/o: encoder McMASA handle */ - const int32_t input_Fs /* i : input sampling rate */ + MCMASA_ENC_HANDLE *hMcMasa, /* i/o: encoder McMASA handle */ + const int32_t input_Fs /* i : input sampling rate */ ) { int16_t i, j; - if ( hMcMasa->separateChannelEnabled ) + if ( hMcMasa == NULL || *hMcMasa == NULL ) + { + return; + } + + if ( ( *hMcMasa )->separateChannelEnabled ) { - free( hMcMasa->delay_buffer_lfe[0] ); - free( hMcMasa->delay_buffer_lfe[1] ); + free( ( *hMcMasa )->delay_buffer_lfe[0] ); + free( ( *hMcMasa )->delay_buffer_lfe[1] ); for ( i = 0; i < 2; i++ ) { - free( hMcMasa->lfeAnaRingBuffer[i] ); + free( ( *hMcMasa )->lfeAnaRingBuffer[i] ); } } -#ifdef SBA_BR_SWITCHING_CLEAN_UP - ivas_FB_mixer_close( &hMcMasa->hFbMixer, input_Fs, 0 ); -#else - ivas_FB_mixer_close( &hMcMasa->hFbMixer, input_Fs ); -#endif + ivas_FB_mixer_close( &( *hMcMasa )->hFbMixer, input_Fs, 0 ); - if ( !hMcMasa->separateChannelEnabled ) + if ( !( *hMcMasa )->separateChannelEnabled ) { -#ifdef SBA_BR_SWITCHING_CLEAN_UP - ivas_FB_mixer_close( &hMcMasa->hFbMixerLfe, input_Fs, 0 ); -#else - ivas_FB_mixer_close( &hMcMasa->hFbMixerLfe, input_Fs ); -#endif + ivas_FB_mixer_close( &( *hMcMasa )->hFbMixerLfe, input_Fs, 0 ); } /* intensity 3-dim */ @@ -528,35 +513,36 @@ void ivas_mcmasa_enc_close( { for ( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ ) { - free( hMcMasa->direction_vector_m[i][j] ); - hMcMasa->direction_vector_m[i][j] = NULL; + free( ( *hMcMasa )->direction_vector_m[i][j] ); + ( *hMcMasa )->direction_vector_m[i][j] = NULL; } - for ( j = 0; j < hMcMasa->no_col_avg_diff; j++ ) + for ( j = 0; j < ( *hMcMasa )->no_col_avg_diff; j++ ) { - free( hMcMasa->buffer_intensity_real[i][j] ); - hMcMasa->buffer_intensity_real[i][j] = NULL; + free( ( *hMcMasa )->buffer_intensity_real[i][j] ); + ( *hMcMasa )->buffer_intensity_real[i][j] = NULL; } - free( hMcMasa->buffer_intensity_real[i] ); - hMcMasa->buffer_intensity_real[i] = NULL; + free( ( *hMcMasa )->buffer_intensity_real[i] ); + ( *hMcMasa )->buffer_intensity_real[i] = NULL; - free( hMcMasa->direction_vector_m[i] ); - hMcMasa->direction_vector_m[i] = NULL; + free( ( *hMcMasa )->direction_vector_m[i] ); + ( *hMcMasa )->direction_vector_m[i] = NULL; } - for ( j = 0; j < hMcMasa->no_col_avg_diff; j++ ) + for ( j = 0; j < ( *hMcMasa )->no_col_avg_diff; j++ ) { - free( hMcMasa->buffer_intensity_real_vert[j] ); - hMcMasa->buffer_intensity_real_vert[j] = NULL; + free( ( *hMcMasa )->buffer_intensity_real_vert[j] ); + ( *hMcMasa )->buffer_intensity_real_vert[j] = NULL; } - free( hMcMasa->buffer_intensity_real_vert ); - hMcMasa->buffer_intensity_real_vert = NULL; + free( ( *hMcMasa )->buffer_intensity_real_vert ); + ( *hMcMasa )->buffer_intensity_real_vert = NULL; - free( hMcMasa->buffer_energy ); - hMcMasa->buffer_energy = NULL; + free( ( *hMcMasa )->buffer_energy ); + ( *hMcMasa )->buffer_energy = NULL; - free( hMcMasa ); + free( ( *hMcMasa ) ); + ( *hMcMasa ) = NULL; return; } diff --git a/lib_enc/ivas_mct_core_enc.c b/lib_enc/ivas_mct_core_enc.c index 5cbcb57daf4e789f8f308808c5c26b9875083d34..900c5e1653c173f8e149130991e00b0e8b179432 100644 --- a/lib_enc/ivas_mct_core_enc.c +++ b/lib_enc/ivas_mct_core_enc.c @@ -51,7 +51,6 @@ *----------------------------------------------------------*/ static void FindChannelRatio( - MCT_ENC_HANDLE hMCT, /* i/o: MCT encoder structure */ Encoder_State **sts, /* i/o: encoder state structure */ int16_t chBitRatios[MCT_MAX_CHANNELS], /* o : bit-disctribution channel ratios */ const int16_t nChannels /* i : number of channels to be coded */ @@ -69,7 +68,7 @@ static void FindChannelRatio( sum_nrg = 0; for ( i = 0; i < nChannels; i++ ) { - if ( sts[i]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[i]->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( sts[i]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { sum_nrg += nrg[i]; } @@ -78,7 +77,7 @@ static void FindChannelRatio( for ( i = 0; i < nChannels; i++ ) { - if ( sts[i]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[i]->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( sts[i]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { chRatio = nrg[i] * sum_nrg; chBitRatios[i] = min( BITRATE_MCT_RATIO_RANGE - 1, max( 1, (uint16_t) ( BITRATE_MCT_RATIO_RANGE * chRatio + 0.5f ) ) ); @@ -87,15 +86,10 @@ static void FindChannelRatio( { chBitRatios[i] = 0; } - else if ( hMCT->num_lfe ) - { - assert( sts[i]->mct_chan_mode == MCT_CHAN_MODE_LFE ); - chBitRatios[i] = !hMCT->LFE_off; - } } #ifdef DEBUG_MODE_MDCT - for ( i = 0; i < nchan; i++ ) + for ( i = 0; i < nChannels; i++ ) { dbgwrite( &chBitRatios[i], sizeof( int16_t ), 1, 1, "./res/chBitRatio" ); /* dbgwrite(&chRatio[i], sizeof(float),1,1,"./res/chRatio");*/ @@ -237,6 +231,8 @@ void ivas_mct_core_enc( total_side_bits = 0; nCPE = nChannels / CPE_CHANNELS; + + /*in case of odd number of channels*/ if ( ( nCPE * CPE_CHANNELS ) != nChannels ) { nCPE++; @@ -255,7 +251,7 @@ void ivas_mct_core_enc( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { sts[i] = hCPE[cpe_id]->hCoreCoder[ch]; - if ( hCPE[cpe_id]->hCoreCoder[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE || hCPE[cpe_id]->hCoreCoder[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( hCPE[cpe_id]->hCoreCoder[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { i++; continue; @@ -304,7 +300,8 @@ void ivas_mct_core_enc( { st = sts[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && hMCT->LFE_off ) || st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -332,7 +329,8 @@ void ivas_mct_core_enc( for ( ch = 0; ch < nChannels; ch++ ) { - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -379,7 +377,8 @@ void ivas_mct_core_enc( for ( ch = 0; ch < nChannels; ch++ ) { st = sts[ch]; - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -411,7 +410,8 @@ void ivas_mct_core_enc( for ( ch = 0; ch < nChannels; ch++ ) { st = sts[ch]; - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -432,7 +432,8 @@ void ivas_mct_core_enc( for ( ch = 0; ch < nChannels; ch++ ) { st = sts[ch]; - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -445,7 +446,8 @@ void ivas_mct_core_enc( { st = sts[ch]; - if ( ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) && hMCT->LFE_off ) || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -460,7 +462,8 @@ void ivas_mct_core_enc( write_mct_bitstream( sts, hMCT, nChannels ); - FindChannelRatio( hMCT, sts, chBitRatios, nChannels ); + FindChannelRatio( + sts, chBitRatios, nChannels ); nAvailBits = (int16_t) ( ( ivas_total_brate / FRAMES_PER_SEC ) - NBITS_BWIDTH - hMCT->nBitsMCT - lfe_bits ); @@ -488,13 +491,14 @@ void ivas_mct_core_enc( /*substract bits needed for the bitrate ratios */ for ( ch = 0; ch < nChannels; ch++ ) { - if ( ( ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) && hMCT->LFE_off ) || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } nAvailBits -= NBBITS_MCT_RATIO; } - nAvailBits -= total_side_bits + ( hMCT->num_lfe ? 1 : 0 ) + hMCT->nchan_out_woLFE; /* if MC 1 extra bit that was initially send to signal LFE_off */ + nAvailBits -= total_side_bits + hMCT->nchan_out_woLFE; /* if MC 1 extra bit that was initially send to signal LFE_off */ #ifdef DEBUG_MODE_MDCT dbgwrite( &nAvailBits, sizeof( int16_t ), 1, 1, "./res/availBits" ); @@ -508,7 +512,8 @@ void ivas_mct_core_enc( for ( ch = 0; ch < nChannels; ch++ ) { - if ( ( ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) && hMCT->LFE_off ) || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -531,15 +536,11 @@ void ivas_mct_core_enc( { continue; } - - if ( !( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) && hMCT->LFE_off ) ) /* indicates LFE with no content */ - { - st->total_brate = ( st->bits_frame_channel + st->side_bits_frame_channel ) * FRAMES_PER_SEC; + st->total_brate = ( st->bits_frame_channel + st->side_bits_frame_channel ) * FRAMES_PER_SEC; #ifdef DEBUGGING - total_brate += st->total_brate; + total_brate += st->total_brate; #endif - } } #ifdef DEBUGGING if ( hCPE[cpe_id]->hMetaData != NULL ) @@ -551,7 +552,7 @@ void ivas_mct_core_enc( #ifdef DEBUGGING format_bits = ( ivas_format == MC_FORMAT ? IVAS_FORMAT_SIGNALING_NBITS + MC_LS_SETUP_BITS : IVAS_FORMAT_SIGNALING_NBITS_SBA + SBA_ORDER_BITS + SBA_PLANAR_BITS ); - mct_bits += hMCT->nBitsMCT + ( hMCT->num_lfe ? 1 : 0 ) + hMCT->nchan_out_woLFE; + mct_bits += hMCT->nBitsMCT + hMCT->nchan_out_woLFE; assert( ( total_brate + ( NBITS_BWIDTH + format_bits + mct_bits + sba_meta + lfe_bits ) * FRAMES_PER_SEC ) == ivas_total_brate ); #endif diff --git a/lib_enc/ivas_mct_enc.c b/lib_enc/ivas_mct_enc.c index 707e74e32995ee9881271674e49351f991ce5928..f2f5d2346103c6856570ba8b5f66348e772720ef 100644 --- a/lib_enc/ivas_mct_enc.c +++ b/lib_enc/ivas_mct_enc.c @@ -90,7 +90,59 @@ static void set_mct_enc_params( return; } +/*-------------------------------------------------------------------* + * map_input_to_cpe_channels() + * + * for MC_MODE map input channels to cpe channels + * mid channel (ch==2) is mapped to last odd-channel CPE + * all channels after LFE are mapped to cpe_id=1 and onwards + * E.g. for 5_1 and for 3 CPEs: + * cpe_id 0: L=data[0] R=data[1] + * cpe_id 1: L=data[4] R=data[5] + * cpe_id 2: L=data[2] (mid) R=NULL + *-------------------------------------------------------------------*/ +static void map_input_to_cpe_channels( + const Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */ + float *pdata[MAX_INPUT_CHANNELS], /* o: mapped input pointers */ + float data[MCT_MAX_CHANNELS][L_FRAME48k] /* i: input channel data */ +) +{ + int16_t i, n; + + i = 0; + + for ( n = 0; n < LFE_CHANNEL - 1; n++ ) + { + pdata[i] = data[n]; + i++; + } + + if ( st_ivas->hEncoderConfig->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ) + { + for ( n = LFE_CHANNEL + 1; n < st_ivas->nchan_transport; n++ ) + { + pdata[i] = data[n]; + i++; + } + pdata[i] = data[LFE_CHANNEL - 1]; + } + else + { + for ( ; n < st_ivas->nchan_transport; n++ ) + { + pdata[i] = data[n]; + i++; + } + } + /* odd channel CPE*/ + if ( ( st_ivas->nchan_transport < st_ivas->nCPE * CPE_CHANNELS ) || ( st_ivas->mc_mode == MC_MODE_MCT && st_ivas->hMCT->nchan_out_woLFE < st_ivas->nCPE * CPE_CHANNELS ) ) + { + pdata[st_ivas->nCPE * CPE_CHANNELS - 1] = NULL; + } + + return; +} /*-------------------------------------------------------------------* * ivas_mct_enc() * @@ -114,6 +166,7 @@ ivas_error ivas_mct_enc( int16_t max_bwidth; int32_t ivas_total_brate; ivas_error error; + float *pdata[MAX_INPUT_CHANNELS]; error = IVAS_ERR_OK; @@ -143,11 +196,17 @@ ivas_error ivas_mct_enc( hMCT->p_orig_spectrum_long[cpe_id][n] = orig_spectrum_long[cpe_id][n]; hCPE->hCoreCoder[n]->input_bwidth = hCPE->hCoreCoder[n]->last_input_bwidth; /* updated in BWD */ hCPE->hCoreCoder[n]->bwidth = hCPE->hCoreCoder[n]->last_bwidth; /* updated in BWD */ + /* reset channel mode from previous state*/ + if ( ( hCPE->cpe_id * CPE_CHANNELS + n ) >= hMCT->nchan_out_woLFE ) + { + hCPE->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_IGNORE; + } + else + { + hCPE->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_REGULAR; + } } } - - hMCT->LFE_off = 1; /* disable LFE coding by default for the moment */ - /* reconfiguration in case of bitrate switching */ if ( ivas_total_brate != st_ivas->hEncoderConfig->last_ivas_total_brate ) { @@ -163,25 +222,31 @@ ivas_error ivas_mct_enc( /* set coded audio band-width */ switch_bw = set_bw_mct( st_ivas->hCPE, st_ivas->nCPE ); + /*for MC and MCT remove pointer to LFE input that has been processed seperately */ + map_input_to_cpe_channels( st_ivas, pdata, data ); /* pre-processing */ for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) { - if ( ( error = ivas_cpe_enc( st_ivas, cpe_id, data[cpe_id * CPE_CHANNELS], data[cpe_id * CPE_CHANNELS + 1], input_frame, nb_bits_metadata ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_cpe_enc( st_ivas, cpe_id, pdata[cpe_id * CPE_CHANNELS], pdata[cpe_id * CPE_CHANNELS + 1], input_frame, nb_bits_metadata ) ) != IVAS_ERR_OK ) { return error; } } /* joint MCT encoding */ - ivas_mct_core_enc( ivas_format, hMCT, st_ivas->hCPE, hMCT->nchan_out_woLFE + hMCT->num_lfe, ivas_total_brate, switch_bw, - ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ) ? (int16_t) st_ivas->hLFE->lfe_bits : 0, st_ivas->hEncoderConfig->sba_order ); + ivas_mct_core_enc( ivas_format, hMCT, st_ivas->hCPE, + hMCT->nchan_out_woLFE, + ivas_total_brate, switch_bw, + ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ) ? (int16_t) st_ivas->hLFE->lfe_bits : 0, + st_ivas->hEncoderConfig->sba_order ); /* Spectrum quantization and coding */ for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) { hCPE = st_ivas->hCPE[cpe_id]; - ivas_mdct_quant_coder( hCPE, hMCT->LFE_off, hMCT->tnsBits[cpe_id], hMCT->tnsSize[cpe_id], hMCT->p_param[cpe_id], 1 ); + ivas_mdct_quant_coder( hCPE, + hMCT->tnsBits[cpe_id], hMCT->tnsSize[cpe_id], hMCT->p_param[cpe_id], 1 ); /* update input samples buffer (as done in ivas_cpe_enc() for other than MCT coding) */ for ( n = 0; n < CPE_CHANNELS; n++ ) @@ -236,23 +301,18 @@ ivas_error create_mct_enc( if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ) { hMCT->nchan_out_woLFE = st_ivas->hEncoderConfig->nchan_inp - 1; /* LFE channel is coded separately */ - hMCT->num_lfe = TRUE; } else if ( ivas_format == SBA_FORMAT ) { hMCT->nchan_out_woLFE = ivas_get_sba_num_TCs( ivas_total_brate, st_ivas->sba_analysis_order ); - - hMCT->num_lfe = FALSE; } else if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC ) { hMCT->nchan_out_woLFE = ivas_param_mc_getNumTransportChannels( ivas_total_brate, st_ivas->hEncoderConfig->mc_input_setup ); - hMCT->num_lfe = FALSE; } else if ( ivas_format == SBA_FORMAT ) { hMCT->nchan_out_woLFE = ivas_sba_get_nchan( st_ivas->sba_analysis_order, st_ivas->hEncoderConfig->sba_planar ); - hMCT->num_lfe = FALSE; } else { @@ -261,21 +321,17 @@ ivas_error create_mct_enc( cp_bitrate = ivas_total_brate / hMCT->nchan_out_woLFE * CPE_CHANNELS; - /* indicate LFE for appropriate core-coder channel */ for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) { for ( n = 0; n < CPE_CHANNELS; n++ ) { st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_REGULAR; - if ( ( hMCT->num_lfe > 0 ) && ( ( n + cpe_id * CPE_CHANNELS ) == LFE_CHANNEL ) ) - { - st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_LFE; - } } } /* in case we have an uneven number of transport channels, indicate last channel ID as inactive */ - if ( ( hMCT->nchan_out_woLFE + hMCT->num_lfe ) % 2 ) + if ( ( hMCT->nchan_out_woLFE ) % + 2 ) { st_ivas->hCPE[st_ivas->nCPE - 1]->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_IGNORE; } @@ -361,17 +417,14 @@ ivas_error mct_enc_reconfigure( if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ) { hMCT->nchan_out_woLFE = st_ivas->hEncoderConfig->nchan_inp - 1; /* LFE channel is coded separately */ - hMCT->num_lfe = TRUE; } else if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC ) { hMCT->nchan_out_woLFE = ivas_param_mc_getNumTransportChannels( ivas_total_brate, st_ivas->hEncoderConfig->mc_input_setup ); - hMCT->num_lfe = FALSE; } else if ( ivas_format == SBA_FORMAT ) { hMCT->nchan_out_woLFE = st_ivas->nchan_transport; - hMCT->num_lfe = FALSE; } else { @@ -381,22 +434,18 @@ ivas_error mct_enc_reconfigure( cp_bitrate = ivas_total_brate / hMCT->nchan_out_woLFE * CPE_CHANNELS; - /* indicate LFE for appropriate core-coder channel */ for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) { st_ivas->hCPE[cpe_id]->element_brate = cp_bitrate; for ( n = 0; n < CPE_CHANNELS; n++ ) { st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_REGULAR; - if ( ( hMCT->num_lfe > 0 ) && ( ( n + cpe_id * CPE_CHANNELS ) == LFE_CHANNEL ) ) - { - st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_LFE; - } } } /* in case we have an uneven number of transport channels, indicate last channel ID as inactive */ - if ( ( hMCT->nchan_out_woLFE + hMCT->num_lfe ) % 2 ) + if ( ( hMCT->nchan_out_woLFE ) % + 2 ) { st_ivas->hCPE[st_ivas->nCPE - 1]->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_IGNORE; } @@ -413,10 +462,11 @@ ivas_error mct_enc_reconfigure( st->total_brate = st_ivas->hCPE[cpe_id]->element_brate; - if ( !( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) ) + if ( !( + ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) ) { st->bits_frame_nominal = (int16_t) ( st_ivas->hCPE[cpe_id]->element_brate / FRAMES_PER_SEC ); - st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_mode, st->mct_chan_mode ); + st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_mode ); if ( st->igf ) { IGFEncSetMode( st->hIGFEnc, st_ivas->hCPE[cpe_id]->element_brate, st->bwidth, st->element_mode, st->rf_mode ); @@ -499,29 +549,35 @@ ivas_error mct_enc_reconfigure( *-------------------------------------------------------------------------*/ void ivas_mct_enc_close( - MCT_ENC_HANDLE hMCT /* i/o: MCT encoder structure */ + MCT_ENC_HANDLE *hMCT /* i/o: MCT encoder structure */ ) { int16_t n, maxBlocks; - maxBlocks = hMCT->nchan_out_woLFE / 2; + if ( hMCT == NULL || *hMCT == NULL ) + { + return; + } + + maxBlocks = ( *hMCT )->nchan_out_woLFE / 2; for ( n = 0; n < maxBlocks; n++ ) { - if ( hMCT->hBlockData[n] != NULL ) + if ( ( *hMCT )->hBlockData[n] != NULL ) { - if ( hMCT->hBlockData[n]->hStereoMdct != NULL ) + if ( ( *hMCT )->hBlockData[n]->hStereoMdct != NULL ) { - free( hMCT->hBlockData[n]->hStereoMdct ); - hMCT->hBlockData[n]->hStereoMdct = NULL; + free( ( *hMCT )->hBlockData[n]->hStereoMdct ); + ( *hMCT )->hBlockData[n]->hStereoMdct = NULL; } - free( hMCT->hBlockData[n] ); - hMCT->hBlockData[n] = NULL; + free( ( *hMCT )->hBlockData[n] ); + ( *hMCT )->hBlockData[n] = NULL; } } - free( hMCT ); + free( ( *hMCT ) ); + ( *hMCT ) = NULL; return; } @@ -608,34 +664,14 @@ static ivas_error ivas_mc_enc_reconfig( } /*De-allocate handles for other MC modes*/ - if ( st_ivas->hParamMC != NULL ) - { - ivas_param_mc_enc_close( st_ivas->hParamMC, st_ivas->hEncoderConfig->input_Fs ); - st_ivas->hParamMC = NULL; - } + ivas_param_mc_enc_close( &( st_ivas->hParamMC ), st_ivas->hEncoderConfig->input_Fs ); /* De-allocate McMasa-related handles */ - if ( st_ivas->hMcMasa != NULL ) - { - ivas_mcmasa_enc_close( st_ivas->hMcMasa, st_ivas->hEncoderConfig->input_Fs ); - st_ivas->hMcMasa = NULL; - } + ivas_mcmasa_enc_close( &( st_ivas->hMcMasa ), st_ivas->hEncoderConfig->input_Fs ); - 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_masa_enc_close( &( st_ivas->hMasa ) ); - if ( st_ivas->hQMetaData != NULL ) - { - ivas_qmetadata_close( &st_ivas->hQMetaData ); - st_ivas->hQMetaData = NULL; - } + ivas_qmetadata_close( &st_ivas->hQMetaData ); } } else if ( st_ivas->mc_mode == MC_MODE_PARAMMC ) @@ -656,39 +692,26 @@ static ivas_error ivas_mc_enc_reconfig( } /* De-allocate McMasa-related handles */ - if ( st_ivas->hMcMasa != NULL ) - { - ivas_mcmasa_enc_close( st_ivas->hMcMasa, st_ivas->hEncoderConfig->input_Fs ); - st_ivas->hMcMasa = NULL; - } + ivas_mcmasa_enc_close( &( st_ivas->hMcMasa ), st_ivas->hEncoderConfig->input_Fs ); + 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 + ivas_masa_enc_close( &( st_ivas->hMasa ) ); st_ivas->hMasa = NULL; } - if ( st_ivas->hQMetaData != NULL ) - { - ivas_qmetadata_close( &st_ivas->hQMetaData ); - st_ivas->hQMetaData = NULL; - } + ivas_qmetadata_close( &st_ivas->hQMetaData ); /* De-allocate MCT handle if last mode was MCT */ - if ( last_mc_mode == MC_MODE_MCT && st_ivas->hMCT != NULL && st_ivas->nchan_transport <= CPE_CHANNELS ) + if ( last_mc_mode == MC_MODE_MCT && st_ivas->nchan_transport <= CPE_CHANNELS ) { - ivas_mct_enc_close( st_ivas->hMCT ); - st_ivas->hMCT = NULL; + ivas_mct_enc_close( &( st_ivas->hMCT ) ); } if ( last_mc_mode == MC_MODE_MCT && st_ivas->hLFE != NULL ) { /* LFE handle */ - ivas_lfe_enc_close( st_ivas->hLFE ); - st_ivas->hLFE = NULL; + ivas_lfe_enc_close( &( st_ivas->hLFE ) ); } } else if ( st_ivas->mc_mode == MC_MODE_MCMASA ) @@ -721,26 +744,14 @@ static ivas_error ivas_mc_enc_reconfig( } } - if ( st_ivas->hParamMC != NULL ) - { - ivas_param_mc_enc_close( st_ivas->hParamMC, st_ivas->hEncoderConfig->input_Fs ); - st_ivas->hParamMC = NULL; - } + ivas_param_mc_enc_close( &( st_ivas->hParamMC ), st_ivas->hEncoderConfig->input_Fs ); if ( last_mc_mode == MC_MODE_MCT ) { /* LFE handle */ - if ( st_ivas->hLFE != NULL ) - { - ivas_lfe_enc_close( st_ivas->hLFE ); - st_ivas->hLFE = NULL; - } + ivas_lfe_enc_close( &( st_ivas->hLFE ) ); - if ( st_ivas->hMCT != NULL ) - { - ivas_mct_enc_close( st_ivas->hMCT ); - st_ivas->hMCT = NULL; - } + ivas_mct_enc_close( &( st_ivas->hMCT ) ); } } @@ -795,18 +806,10 @@ static ivas_error ivas_mc_enc_reconfig( } } - st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode, st->mct_chan_mode ); + st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode ); /* set last core to TCX20 */ st->last_core = TCX_20_CORE; } - 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; - } - 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 ); diff --git a/lib_enc/ivas_mct_enc_mct.c b/lib_enc/ivas_mct_enc_mct.c index ee0c529b8bab2758c7f97463529bc6ee1db12e90..7ab6206a29169407d4f8a3b2a6c57d7175684b36 100644 --- a/lib_enc/ivas_mct_enc_mct.c +++ b/lib_enc/ivas_mct_enc_mct.c @@ -62,7 +62,7 @@ void getChannelEnergies( for ( ch = 0; ch < nchan; ch++ ) { st = sts[ch]; - if ( st->mct_chan_mode != MCT_CHAN_MODE_IGNORE && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( st->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { nSubframes = ( st->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV; L_subframe = st->hTcxEnc->L_frameTCX / nSubframes; @@ -156,7 +156,7 @@ static void getCorrelationMatrix( int16_t ch1, ch2, n, nchan; float tmp; - nchan = hMCT->nchan_out_woLFE + hMCT->num_lfe; + nchan = hMCT->nchan_out_woLFE; /* correlation */ for ( ch1 = 0; ch1 < nchan; ch1++ ) @@ -166,8 +166,7 @@ static void getCorrelationMatrix( xCorrMatrix[ch1][ch2] = 0; if ( sts[ch1]->core == sts[ch2]->core && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && - sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_LFE && - sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_LFE ) + sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { int16_t nSubframes = ( sts[ch1]->core == TCX_20_CORE ? 1 : NB_DIV ); int16_t L_subframe = sts[ch1]->hTcxEnc->L_frameTCX / nSubframes; @@ -225,9 +224,11 @@ static void getBestCorrelation( *_ch2 = -1; *max_corr = 0.f; - for ( ch1 = 0; ch1 < ( hMCT->nchan_out_woLFE + hMCT->num_lfe ); ch1++ ) + for ( ch1 = 0; ch1 < ( hMCT->nchan_out_woLFE ); + ch1++ ) { - for ( ch2 = ch1 + 1; ch2 < ( hMCT->nchan_out_woLFE + hMCT->num_lfe ); ch2++ ) + for ( ch2 = ch1 + 1; ch2 < ( hMCT->nchan_out_woLFE ); + ch2++ ) { if ( fabsf( *max_corr ) < fabsf( xCorrMatrix[ch1][ch2] ) ) { @@ -308,13 +309,14 @@ static void updateCorrelationMatrix( int16_t ch1, ch2, n; /* correlation: */ - for ( ch1 = 0; ch1 < ( hMCT->nchan_out_woLFE + hMCT->num_lfe ); ch1++ ) + for ( ch1 = 0; ch1 < ( hMCT->nchan_out_woLFE ); + ch1++ ) { - for ( ch2 = ch1; ch2 < ( hMCT->nchan_out_woLFE + hMCT->num_lfe ); ch2++ ) + for ( ch2 = ch1; ch2 < ( hMCT->nchan_out_woLFE ); + ch2++ ) { if ( sts[ch1]->core == sts[ch2]->core && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && - sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_LFE && - sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_LFE ) + sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { int16_t nSubframes = ( sts[ch1]->core == TCX_20_CORE ? 1 : NB_DIV ); @@ -341,9 +343,7 @@ static void updateCorrelationMatrix( static int16_t channelPairToIndex( const int16_t chIdx1, const int16_t chIdx2, - const int16_t nChannels, - Encoder_State **sts /* i/o: encoder state structure */ -) + const int16_t nChannels ) { int16_t ch1, ch2; int16_t pairIdx; @@ -354,11 +354,6 @@ static int16_t channelPairToIndex( { for ( ch1 = 0; ch1 < ch2; ch1++ ) { - if ( sts[ch1]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch2]->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - continue; - } - if ( ch1 == chIdx1 && ch2 == chIdx2 ) { return pairIdx; @@ -398,7 +393,7 @@ static void getGlobalILD( /*calculate total energy without LFE*/ for ( ch = 0; ch < nchan; ch++ ) { - if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { meanE += nrg[ch]; cnt++; @@ -410,7 +405,7 @@ static void getGlobalILD( meanE = max( meanE / cnt, EPSILON ); for ( ch = 0; ch < nchan; ch++ ) { - if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { nSubframes = ( sts[ch]->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV; L_subframe = sts[ch]->hTcxEnc->L_frameTCX / nSubframes; @@ -483,11 +478,11 @@ void apply_MCT_enc( /*Determine active channels*/ for ( ch = 0; ch < nchan; ch++ ) { - if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { count_active_ch++; } - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + else { hMCT->mc_global_ild[ch] = 0; } @@ -508,8 +503,8 @@ void apply_MCT_enc( { for ( ch1 = 0; ch1 < ch2; ch1++ ) { - if ( sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_LFE && - sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && + sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { sumCorrDiff += fabsf( hMCT->lastxCorrMatrix[ch1][ch2] - xCorrMatrix[ch1][ch2] ); } @@ -600,8 +595,7 @@ void apply_MCT_enc( } /* calculate all related values: */ - assert( sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_LFE && - sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_LFE ); + assert( sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ); getBlockValues( sts, ch1, ch2, hMCT->hBlockData[currBlockDataCnt], mdst_spectrum, inv_spectrum, inv_mdst_spectrum ); @@ -686,7 +680,7 @@ void apply_MCT_enc( for ( ch = 0; ch < nchan; ch++ ) { - if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { if ( ( !cpEle[ch] ) || hMCT->currBlockDataCnt == 0 ) { @@ -771,7 +765,8 @@ void write_mct_bitstream( /* first write core info and overlap mode for all channels */ for ( ch = 0; ch < nchan; ch++ ) { - if ( ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE ) && hMCT->currBlockDataCnt && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) + if ( + hMCT->currBlockDataCnt && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { push_next_indice( hBstr, hMCT->mc_global_ild[ch], SMDCT_GLOBAL_ILD_BITS ); } @@ -781,7 +776,8 @@ void write_mct_bitstream( { for ( ch = 0; ch < nchan; ch++ ) { - if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) + if ( + sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { push_next_indice( hBstr, hMCT->lowE_ch[ch], 1 ); } @@ -794,7 +790,7 @@ void write_mct_bitstream( hBlock = hMCT->hBlockData[pair]; /*calculate channel pair index and write it to BS*/ - channelPairIndex = channelPairToIndex( hBlock->ch1, hBlock->ch2, nchan, sts ); + channelPairIndex = channelPairToIndex( hBlock->ch1, hBlock->ch2, nchan ); push_next_indice( hBstr, channelPairIndex, hMCT->bitsChannelPairIndex ); /*point to encoder states of actual channels to write block pair bits*/ @@ -838,7 +834,7 @@ void mctStereoIGF_enc( int16_t singleChEle[MCT_MAX_CHANNELS]; L_subframeTCX = 0; /* to avoid compilation warning */ - set_s( singleChEle, 1, hMCT->nchan_out_woLFE + hMCT->num_lfe ); + set_s( singleChEle, 1, hMCT->nchan_out_woLFE ); for ( b = 0; b < hMCT->currBlockDataCnt; b++ ) { @@ -889,15 +885,17 @@ void mctStereoIGF_enc( } /* channel elements that are coded separately detected */ - if ( sum_s( singleChEle, ( hMCT->nchan_out_woLFE + hMCT->num_lfe ) ) != 0 ) + if ( sum_s( singleChEle, ( hMCT->nchan_out_woLFE ) ) != 0 ) { - for ( ch = 0; ch < ( hMCT->nchan_out_woLFE + hMCT->num_lfe ); ch++ ) + for ( ch = 0; ch < ( hMCT->nchan_out_woLFE ); + ch++ ) { if ( singleChEle[ch] ) { st = sts[ch]; - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE || st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } diff --git a/lib_enc/ivas_mdct_core_enc.c b/lib_enc/ivas_mdct_core_enc.c index 626dcf2631cee1f65518558caaa04e9a58a22919..b1b9389c5e11f7ed9a03d8d8f09850d3929750a3 100644 --- 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,9 @@ #include "prot.h" #include "ivas_prot.h" #include "rom_com.h" +#ifdef SNS_MSVQ +#include "ivas_rom_com.h" +#endif #ifdef DEBUGGING #include "debug.h" #endif @@ -88,15 +92,11 @@ static void enc_prm_pre_mdct( { writeTCXWindowing( hBstr, st->hTcxCfg->tcx_last_overlap_mode ); } - - if ( st->element_mode == IVAS_CPE_MDCT && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + push_next_indice( hBstr, st->hTcxEnc->kernel_type[0], st->last_core != ACELP_CORE ? 2 : 1 ); + if ( st->core == TCX_10_CORE ) { - push_next_indice( hBstr, st->hTcxEnc->kernel_type[0], st->last_core != ACELP_CORE ? 2 : 1 ); - if ( st->core == TCX_10_CORE ) - { - assert( ( st->hTcxEnc->kernel_type[0] & 1 ) == ( st->hTcxEnc->kernel_type[1] >> 1 ) ); - push_next_indice( hBstr, st->hTcxEnc->kernel_type[1] & 1, 1 ); - } + assert( ( st->hTcxEnc->kernel_type[0] & 1 ) == ( st->hTcxEnc->kernel_type[1] >> 1 ) ); + push_next_indice( hBstr, st->hTcxEnc->kernel_type[1] & 1, 1 ); } st->glr_reset = 0; @@ -288,7 +288,7 @@ static void kernel_switch_update_transforms( int16_t i, leftOverlap = 0, rightOverlap = 0; const float *left_win, *right_win; - tcx_get_windows( hTcxCfg, (int16_t) windowedTimeSignal[0], (int16_t) windowedTimeSignal[1], &leftOverlap, &left_win, &rightOverlap, &right_win, 1, 0 ); + tcx_get_windows( hTcxCfg, (int16_t) windowedTimeSignal[0], (int16_t) windowedTimeSignal[1], &leftOverlap, &left_win, &rightOverlap, &right_win, 1 ); if ( speech_TCX != NULL && tcxTransType != TCX_20 && (int16_t) windowedTimeSignal[0] == FULL_OVERLAP && s - leftOverlap > minWindowLen ) { for ( i = minWindowLen; i >= 0; i-- ) /* outer left folding of shortened long ALDO slope */ @@ -311,7 +311,7 @@ static void kernel_switch_update_transforms( s = hTcxCfg->tcx5SizeFB; /* obtain 1st TCX5 again */ nSubframes *= 2; - WindowSignal( hTcxCfg, leftOverlap / 2, RECTANGULAR_OVERLAP, MIN_OVERLAP, &leftOverlap, &rightOverlap, windowedTimeSignal + 2, &s, tcx5Win, 0, 1, 0 ); + WindowSignal( hTcxCfg, leftOverlap / 2, RECTANGULAR_OVERLAP, MIN_OVERLAP, &leftOverlap, &rightOverlap, windowedTimeSignal + 2, &s, tcx5Win, 0, 1 ); kernel_switch_trafo( tcx5Win, sigR, leftOverlap, s /* L_subfr. */ - ( leftOverlap + rightOverlap ) / 2, rightOverlap, kernelType ); if ( kernelType & 1 ) /* 2nd TCX5 is kernelType 3 */ @@ -576,13 +576,18 @@ void ivas_mdct_core_whitening_enc( int16_t tnsSize[CPE_CHANNELS][NB_DIV], /* o : number of tns parameters put into prm */ int16_t p_param[CPE_CHANNELS][NB_DIV], /* o : pointer to the parameter table */ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */ - int16_t *LFE_off, /* o : flag if LFE has zero content */ const int16_t mct_on, /* i : flag mct block (1) or stereo (0) */ const int16_t nChannels /* i : total number of coded channels */ ) { int16_t n, ch, nSubframes, L_subframe, L_subframeTCX, tcx_subframe_coded_lines; float A_q[CPE_CHANNELS][NB_DIV][M + 1]; +#ifdef SNS_MSVQ + int16_t sns_vq_indices[CPE_CHANNELS * NB_DIV * SNS_MSVQ_NSTAGES_TCX10]; + int16_t nbits_sns; + int16_t sns_stereo_mode[NB_DIV]; + int16_t idx; +#endif int16_t param_lpc[CPE_CHANNELS][NPRM_LPC_NEW]; int16_t param_core[CPE_CHANNELS][2 * NPRM_DIV]; int16_t ltpBits[CPE_CHANNELS]; @@ -598,9 +603,12 @@ void ivas_mdct_core_whitening_enc( float scf_q[CPE_CHANNELS][NB_DIV][M]; float chE[2], chE_tot; int8_t sns_low_br_mode; - int8_t skipped_first_channel; int16_t nbits_start_sns; int16_t num_sns; + int8_t skipped_first_channel; +#ifdef SNS_MSVQ + int16_t zero_side_flag[NB_DIV]; +#endif push_wmops( "mdct_core_whitening" ); @@ -612,10 +620,7 @@ void ivas_mdct_core_whitening_enc( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { - if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE ) - { - stereo_tcx_init_enc( sts[ch] ); - } + stereo_tcx_init_enc( sts[ch] ); set_s( tnsSize[ch], 0, 2 ); set_s( tnsBits[ch], 0, 2 ); @@ -655,10 +660,7 @@ void ivas_mdct_core_whitening_enc( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; - if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE ) - { - SetTCXModeInfo( st, st->hTranDet, &st->hTcxCfg->tcx_curr_overlap_mode ); - } + SetTCXModeInfo( st, st->hTranDet, &st->hTcxCfg->tcx_curr_overlap_mode ); } } @@ -672,12 +674,10 @@ void ivas_mdct_core_whitening_enc( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; - - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( ( hCPE->cpe_id * CPE_CHANNELS + ch ) >= nChannels ) { continue; } - SetCurrentPsychParams( st->core, 0, st->hTcxCfg ); /* tcx ltp analysis on the 12.8kHz weighted speech, saves preproc resampling to sr_core */ @@ -686,11 +686,18 @@ void ivas_mdct_core_whitening_enc( core_signal_analysis_high_bitrate( new_samples[ch] + L_INP_MEM, T_op[ch], NULL, NULL, st, mdst_spectrum[ch], tnsSize[ch], tnsBits[ch], param_core[ch], <pBits[ch], windowedSignal[ch], st->L_frame, st->hTcxEnc->L_frameTCX, hCPE->last_element_mode, 0 ); /* BWD in MDCT domain */ - if ( st->hTcxEnc->transform_type[0] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP ) + if ( st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP ) { - if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + nSubframes = ( st->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV; + + for ( n = 0; n < nSubframes; n++ ) { - bw_detect( st, NULL, st->hTcxEnc->spectrum[0], NULL ); + bw_detect( st, NULL, st->hTcxEnc->spectrum[n], NULL, mct_on ); + + if ( nSubframes == NB_DIV && n == 0 ) + { + st->last_input_bwidth = st->input_bwidth; + } } } @@ -803,7 +810,7 @@ void ivas_mdct_core_whitening_enc( { TCX_ENC_HANDLE hTcxEncCh = sts[ch]->hTcxEnc; - if ( ( hCPE->cpe_id * CPE_CHANNELS + ch ) >= nChannels || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( ( hCPE->cpe_id * CPE_CHANNELS + ch ) >= nChannels ) { hTcxEncCh->kernel_symmetry_past = hTcxEncCh->kernel_type[0] = 0; @@ -830,9 +837,10 @@ void ivas_mdct_core_whitening_enc( * Envelope Quantization and FDNS *---------------------------------------------------------------*/ + for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { - if ( ( hCPE->cpe_id * CPE_CHANNELS + ch ) >= nChannels || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( ( hCPE->cpe_id * CPE_CHANNELS + ch ) >= nChannels ) { continue; } @@ -877,7 +885,8 @@ void ivas_mdct_core_whitening_enc( } /* MCT: detect whether there are silent channels and set mct_chan_mode accordingly */ - if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE && mct_on ) + if ( + mct_on ) { chE_tot = sum_f( chE, NB_DIV ); @@ -894,7 +903,7 @@ void ivas_mdct_core_whitening_enc( } /* set low br mode, if possible. Can later be discarded, depending on the stereo mode used for SNS parameter decoding */ - if ( hCPE->element_brate == IVAS_48k && !( ( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 ) || sts[1]->mct_chan_mode == MCT_CHAN_MODE_LFE ) ) + if ( hCPE->element_brate == IVAS_48k && !( ( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 ) ) ) { sns_low_br_mode = !sts[0]->sp_aud_decision0; } @@ -903,6 +912,49 @@ void ivas_mdct_core_whitening_enc( sns_low_br_mode = 0; } +#ifdef SNS_MSVQ + if ( !mct_on && sts[0]->sr_core == 25600 && ( ( hCPE->element_brate == IVAS_48k || hCPE->element_brate == IVAS_64k ) ) ) + { + nbits_sns = quantize_sns( scf, scf_q, sts, sns_vq_indices, zero_side_flag, sns_stereo_mode ); + } + else + { + if ( sts[0]->hTcxEnc->tcxMode == TCX_20 && sts[1]->hTcxEnc->tcxMode == TCX_20 && + sts[0]->mct_chan_mode == MCT_CHAN_MODE_REGULAR && sts[1]->mct_chan_mode == MCT_CHAN_MODE_REGULAR ) + { + sns_avq_cod_stereo( scf[0][0], scf[1][0], scf_q[0][0], scf_q[1][0], param_lpc[0], param_lpc[1] ); + } + else + { +#ifdef DEBUG_MODE_MDCT + { + float ener_side = 0; + float ener_mid = 0; + dbgwrite( &ener_side, sizeof( float ), 1, 1, "./res/ener_side" ); + dbgwrite( &ener_mid, sizeof( float ), 1, 1, "./res/ener_mid" ); + } +#endif + for ( ch = 0; ch < CPE_CHANNELS; ch++ ) + { + param_lpc[ch][0] = ch; + if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + { + continue; + } + st = sts[ch]; + + if ( st->hTcxEnc->tcxMode == TCX_20 ) + { + sns_avq_cod( scf[ch][0], NULL, scf_q[ch][0], NULL, ¶m_lpc[ch][1], st->hTcxEnc->tcxMode, sns_low_br_mode ); + } + else + { + sns_avq_cod( scf[ch][1], scf[ch][0], scf_q[ch][1], scf_q[ch][0], ¶m_lpc[ch][1], st->hTcxEnc->tcxMode, sns_low_br_mode ); + } + } + } + } +#else // else of SNS_MSVQ if ( sts[0]->hTcxEnc->tcxMode == TCX_20 && sts[1]->hTcxEnc->tcxMode == TCX_20 && sts[0]->mct_chan_mode == MCT_CHAN_MODE_REGULAR && sts[1]->mct_chan_mode == MCT_CHAN_MODE_REGULAR ) { @@ -921,7 +973,7 @@ void ivas_mdct_core_whitening_enc( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { param_lpc[ch][0] = ch; - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -933,18 +985,15 @@ void ivas_mdct_core_whitening_enc( } else { -#ifdef SNS_LOW_BR_MODE sns_avq_cod( scf[ch][1], scf[ch][0], scf_q[ch][1], scf_q[ch][0], ¶m_lpc[ch][1], st->hTcxEnc->tcxMode, sns_low_br_mode ); -#else - sns_avq_cod( scf[ch][1], scf[ch][0], scf_q[ch][1], scf_q[ch][0], ¶m_lpc[ch][1], st->hTcxEnc->tcxMode, ( hCPE->element_brate == IVAS_48k && !hCPE->hCoreCoder[0]->sp_aud_decision0 ) ); -#endif } } } +#endif // SNS_AVQ4TCX20_MSVQ4TCX10 for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -965,6 +1014,7 @@ void ivas_mdct_core_whitening_enc( } } + /*--------------------------------------------------------------* * TNS *---------------------------------------------------------------*/ @@ -972,7 +1022,7 @@ void ivas_mdct_core_whitening_enc( /* first deinterleave once more */ for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -993,7 +1043,7 @@ void ivas_mdct_core_whitening_enc( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -1015,8 +1065,6 @@ void ivas_mdct_core_whitening_enc( } } } - - /*check whether LFE channel is active*/ for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { /*no need to write last channel bit in case of odd channels*/ @@ -1029,12 +1077,7 @@ void ivas_mdct_core_whitening_enc( if ( mct_on ) /* signal bits should be written only for MCT*/ { - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - assert( *LFE_off == 1 ); - push_next_indice( hBstr, *LFE_off, 1 ); - } - else if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { push_next_indice( hBstr, 1, 1 ); } @@ -1051,7 +1094,7 @@ void ivas_mdct_core_whitening_enc( { st = sts[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && ( *LFE_off ) ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { st->side_bits_frame_channel = 0; /*dummy initialization to prevent range coder crashing in case all channels are silent and bits are distributed to channel 0 */ @@ -1089,14 +1132,105 @@ void ivas_mdct_core_whitening_enc( /*--------------------------------------------------------------------------------* * SNS parameters *--------------------------------------------------------------------------------*/ +#ifdef SNS_MSVQ + if ( !mct_on && sts[0]->sr_core == 25600 && ( ( hCPE->element_brate == IVAS_48k || hCPE->element_brate == IVAS_64k ) ) ) + { + nbits_sns = 0; + idx = 0; + + if ( sts[0]->core == sts[1]->core ) + { + nSubframes = ( sts[0]->core == TCX_20_CORE ) ? 1 : NB_DIV; + + /* push all stereo mode bits first */ + for ( n = 0; n < nSubframes; ++n ) + { + push_next_indice( hBstr, sns_stereo_mode[n], 1 ); + nbits_sns++; + sts[0]->side_bits_frame_channel++; + } + + /* zero side flags only get transmitted if needed */ + for ( n = 0; n < nSubframes; ++n ) + { + if ( sns_stereo_mode[n] == SNS_STEREO_MODE_MS ) + { + push_next_indice( hBstr, zero_side_flag[n], 1 ); + nbits_sns++; + sts[0]->side_bits_frame_channel++; + } + } + } + + for ( ch = 0; ch < CPE_CHANNELS; ++ch ) + { + st = sts[ch]; + nbits_start_sns = hBstr->nb_bits_tot; + nSubframes = ( st->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV; + for ( n = 0; n < nSubframes; ++n ) + { + const int16_t is_side = ch == 1 && sns_stereo_mode[n] == SNS_STEREO_MODE_MS; + const int16_t *bits = ( nSubframes == 1 ) ? ivas_sns_cdbks_tcx20_bits : ivas_sns_cdbks_tcx10_bits; + int16_t nStages = ( ( nSubframes == 1 ) ? SNS_MSVQ_NSTAGES_TCX20 : SNS_MSVQ_NSTAGES_TCX10 ); + + if ( is_side ) + { + if ( zero_side_flag[n] ) + { + continue; + } + nStages = SNS_MSVQ_NSTAGES_SIDE; + bits = ( sts[ch]->core == TCX_20_CORE ) ? ivas_sns_cdbks_side_tcx20_bits : ivas_sns_cdbks_side_tcx10_bits; + } + for ( int16_t j = 0; j < nStages; ++j, ++idx ) + { + push_next_indice( hBstr, sns_vq_indices[idx], bits[j] ); + } + } + st->side_bits_frame_channel += hBstr->nb_bits_tot - nbits_start_sns; + } + } + else + { + /* write SNS parameter separately since at the decoder, both channels' cores need to be decoded before, so the joint SNS decoding can be done */ + skipped_first_channel = 0; + for ( ch = 0; ch < CPE_CHANNELS; ch++ ) + { + st = sts[ch]; + + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + { + skipped_first_channel = 1; + continue; + } + + nbits_start_sns = hBstr->nb_bits_tot; + + num_sns = ( st->core == TCX_20_CORE ) ? 1 : 2; + + if ( ch == 0 || skipped_first_channel ) + { + push_next_indice( hBstr, param_lpc[0][0] >> 1, 1 ); + + if ( st->element_brate == IVAS_48k && !( ( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 ) ) ) + { + /* write classifier decision to signal low br mode for SNS encoding, for all other configs, low_br mode is not possible */ + push_next_indice( hBstr, sns_low_br_mode, 1 ); + } + } + encode_lpc_avq( hBstr, num_sns, param_lpc[ch], st->core, st->element_mode ); + st->side_bits_frame_channel += hBstr->nb_bits_tot - nbits_start_sns; + } + } +#else // else of SNS_MSVQ /* write SNS parameter separately since at the decoder, both channels' cores need to be decoded before, so the joint SNS decoding can be done */ skipped_first_channel = 0; for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && ( *LFE_off ) ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { skipped_first_channel = 1; continue; @@ -1110,7 +1244,7 @@ void ivas_mdct_core_whitening_enc( { push_next_indice( hBstr, param_lpc[0][0] >> 1, 1 ); - if ( st->element_brate == IVAS_48k && !( ( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 ) || sts[1]->mct_chan_mode == MCT_CHAN_MODE_LFE ) ) + if ( st->element_brate == IVAS_48k && !( ( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 ) ) ) { /* write classifier decision to signal low br mode for SNS encoding, for all other configs, low_br mode is not possible */ push_next_indice( hBstr, sns_low_br_mode, 1 ); @@ -1121,11 +1255,13 @@ void ivas_mdct_core_whitening_enc( st->side_bits_frame_channel += hBstr->nb_bits_tot - nbits_start_sns; } +#endif // MSVQ_SNS + /*update pitch buffer*/ for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && ( *LFE_off ) ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -1152,7 +1288,6 @@ void ivas_mdct_core_whitening_enc( void ivas_mdct_quant_coder( CPE_ENC_HANDLE hCPE, /* i/o: Encoder CPE handle */ - const int16_t LFE_off, /* i : flag if LFE is inactive */ int16_t tnsBits[CPE_CHANNELS][NB_DIV], /* i : bits needed for TNS parameters */ int16_t tnsSize[CPE_CHANNELS][NB_DIV], /* i : size of TNS */ int16_t p_param[CPE_CHANNELS][NB_DIV], /* i : pointer to parameter array */ @@ -1198,7 +1333,7 @@ void ivas_mdct_quant_coder( st = sts[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { ignore_chan[ch] = 1; continue; @@ -1258,7 +1393,7 @@ void ivas_mdct_quant_coder( { st = sts[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { /*Enable appropriate upadte of tcx_curr_overlap_mode even for uncoded channel index 1*/ L_frameTCX[ch][0] = ( st->core == TCX_10_CORE ) ? st->hTcxEnc->L_frameTCX >> 1 : st->hTcxEnc->L_frameTCX; @@ -1285,7 +1420,7 @@ void ivas_mdct_quant_coder( * Generate Bitstream *---------------------------------------------------------------*/ - if ( ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } diff --git a/lib_enc/ivas_qmetadata_enc.c b/lib_enc/ivas_qmetadata_enc.c index ac4f83a65794d7bbcdc2104e7b858d5bc8319ff7..3a947584e9f869707194d55857b7d1d2d3de40a0 100644 --- a/lib_enc/ivas_qmetadata_enc.c +++ b/lib_enc/ivas_qmetadata_enc.c @@ -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 + , + int16_t is_hr +#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,11 +93,21 @@ 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 + , + int16_t is_hr +#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 + , + int16_t is_hr +#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 ); @@ -117,6 +132,40 @@ static int16_t write_2dir_info( BSTR_ENC_HANDLE hMetaData, uint8_t *twoDirBands, static void transform_azimuth_dir2( IVAS_QMETADATA_HANDLE hQMetaData, int16_t *dir2_bands ); 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, + 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, + int16_t bits_dir_hr, + BSTR_ENC_HANDLE hMetaData ); + +static int16_t encode_surround_coherence_hr( + IVAS_QMETADATA *hQMetaData, /* i : quantized metadata */ + BSTR_ENC_HANDLE hMetaData /* i/o: metadata bitstream handle */ +); + +static void ivas_qmetadata_reorder_2dir_bands_hr( + IVAS_QMETADATA_HANDLE hQMetaData ); + +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 */ + int16_t bits_coh ); + +#endif /*-----------------------------------------------------------------------* * ivas_qmetadata_enc_encode() @@ -185,6 +234,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; @@ -380,9 +430,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 +450,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*/ @@ -420,7 +481,12 @@ ivas_error ivas_qmetadata_enc_encode( 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 ) { @@ -466,7 +532,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 ) { @@ -565,7 +636,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; } @@ -653,6 +729,238 @@ ivas_error ivas_qmetadata_enc_encode( return error; } +#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 */ + int16_t bits_sph_idx, + 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; + + 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 ); + } + } + } + + return error; +} +#endif + /*-----------------------------------------------------------------------* * ivas_qmetadata_enc_sid_encode() @@ -1036,6 +1344,303 @@ int16_t quantize_direction2D( return idx_sph; } +#ifdef HR_METADATA +/*------------------------------------------------------------------------- + * ivas_qmetadata_quantize_diffuseness_nrg_ratios() + * + * Quantize diffuseness + *------------------------------------------------------------------------*/ + +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 bits_dir_hr ) +{ + 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 dirRatio1, dirRatio2, diffRatio, sumRatio, dfRatio, dfRatioQ, diffRatioQ, dirRatio1Q, dirRatio2Q; + 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. */ + 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_hr, HR_MASA_ER_LEVELS ); + diffRatioQ = diffuseness_reconstructions_hr[index_diff]; + + dfRatio_bits = ivas_get_df_ratio_bits( index_diff >> 1 ); + + dfRatioBits[dir2band] = dfRatio_bits; + + dfRatio_qsteps = ( 1 << dfRatio_bits ); + 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_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 + * 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_HR; + + 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; + 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 ); + + 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; + + 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, + 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() @@ -1145,6 +1750,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]; } } @@ -1799,7 +2405,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 + , + int16_t is_hr +#endif +) { uint16_t diff_idx_min; int16_t i, j; @@ -1845,7 +2456,18 @@ static int16_t ivas_qmetadata_entropy_encode_dir( 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 ( is_hr ) + { + 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 ) { @@ -1895,6 +2517,7 @@ static int16_t ivas_qmetadata_entropy_encode_dir( no_th = no_theta_masa[bits_direction_masa[diff_idx_min] - 3]; + for ( i = 0; i < no_th; i++ ) { theta_cb[i] = i * delta_theta_masa[bits_direction_masa[diff_idx_min] - 3]; @@ -4054,6 +4677,10 @@ 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 */ +#ifdef HR_METADATA + , + int16_t is_hr +#endif ) { int16_t i, j, k; @@ -4079,11 +4706,23 @@ 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 ( is_hr ) + { + 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 ) ); @@ -4433,6 +5072,210 @@ 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() * @@ -4449,14 +5292,42 @@ 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 + , + int16_t is_hr +#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 ( is_hr ) + { + 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 +5340,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; @@ -4537,6 +5408,107 @@ static void dct4_transform( return; } +#ifdef HR_METADATA +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 */ + 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() @@ -4551,7 +5523,12 @@ static int16_t ivas_qmetadata_quantize_coherence( 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 ) + int16_t *indice_coherence +#ifdef HR_METADATA + , + int16_t is_hr +#endif +) { int16_t j, k; float dct_coh[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES]; @@ -4565,7 +5542,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 +5557,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 + , + is_hr +#endif + ); return nbits; } @@ -4632,13 +5617,31 @@ 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 ( is_hr ) + { + 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 + , + is_hr +#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 ); @@ -4790,6 +5793,61 @@ static void ivas_qmetadata_reorder_2dir_bands( return; } +#ifdef HR_METADATA +static void ivas_qmetadata_reorder_2dir_bands_hr( + IVAS_QMETADATA_HANDLE hQMetaData ) +{ + int16_t nbands; + int16_t nsubframes; + int16_t band, sf; + + 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_t uint16_tmp = 0; + float flt_tmp = 0; + uint8_t uint8_tmp = 0; + 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[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 /*-------------------------------------------------------------------* * write_2dir_info() @@ -4808,6 +5866,7 @@ static int16_t write_2dir_info( 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 ) diff --git a/lib_enc/ivas_qspherical_enc.c b/lib_enc/ivas_qspherical_enc.c index 80a9d0064f2dcfb23dbeb91ed3719dd74e0a526c..3d2df98217deca34987173f49e7226e4ebe21427 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 + , + int16_t is_hr +#endif +) { int16_t i, j; int16_t idx; @@ -92,17 +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 ( is_hr ) { - 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 ) { q_direction->band_data[i].azimuth_index[j] = 0; diff --git a/lib_enc/ivas_sba_enc.c b/lib_enc/ivas_sba_enc.c index e878d7418372886865942dd0420090234c67367c..d9fb1fef8347bb3e63131e06481d48c927b1a050 100644 --- a/lib_enc/ivas_sba_enc.c +++ b/lib_enc/ivas_sba_enc.c @@ -119,24 +119,14 @@ ivas_error ivas_sba_enc_reconfigure( { DIRAC_ENC_HANDLE hDirAC = st_ivas->hDirAC; SPAR_ENC_HANDLE hSpar; - SBA_MODE sba_mode_old; -#ifdef SBA_HPF_TUNING_ENC int16_t analysis_order_old; -#endif -#ifdef SBA_BR_SWITCHING_CLEAN_UP int16_t spar_reconfig_flag; spar_reconfig_flag = 0; -#endif 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 ); - -#ifdef SBA_HPF_TUNING_ENC analysis_order_old = ivas_sba_get_analysis_order( hEncoderConfig->last_ivas_total_brate, hEncoderConfig->sba_order ); if ( analysis_order_old != st_ivas->sba_analysis_order ) @@ -204,48 +194,18 @@ ivas_error ivas_sba_enc_reconfigure( old_mem_hp20_in = NULL; } } -#endif + ivas_spar_config( ivas_total_brate, min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ), + &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->hSpar->core_nominal_brate, -1 ); - if ( st_ivas->sba_mode == SBA_MODE_SPAR ) + for ( n = 0; n < DIRAC_MAX_ANA_CHANS; n++ ) { - if ( st_ivas->hSpar == NULL ) - { -#ifdef SBA_BR_SWITCHING_CLEAN_UP - if ( ( error = ivas_spar_enc_open( st_ivas, spar_reconfig_flag ) ) != IVAS_ERR_OK ) -#else - if ( ( error = ivas_spar_enc_open( st_ivas ) ) != IVAS_ERR_OK ) -#endif - { - 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 ); - -#ifdef SBA_BR_SWITCHING_CLEAN_UP - 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; -#endif } - else - { -#ifdef SBA_BR_SWITCHING_CLEAN_UP - ivas_spar_enc_close( st_ivas->hSpar, hEncoderConfig->input_Fs, hEncoderConfig->nchan_inp, spar_reconfig_flag ); - -#else - ivas_spar_enc_close( st_ivas->hSpar, hEncoderConfig->input_Fs, hEncoderConfig->nchan_inp ); -#endif - st_ivas->hSpar = NULL; - } - + hDirAC->num_samples_synchro_delay = 0; hSpar = st_ivas->hSpar; if ( st_ivas->nchan_transport == 1 ) @@ -256,168 +216,29 @@ 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 ) { /* FB mixer handle */ - if ( st_ivas->sba_mode == SBA_MODE_SPAR ) - { - if ( hDirAC->hFbMixer != NULL ) - { -#ifndef SBA_BR_SWITCHING_CLEAN_UP - ivas_FB_mixer_close( &( hDirAC->hFbMixer ), hEncoderConfig->input_Fs ); -#else - ivas_FB_mixer_close( &( hDirAC->hFbMixer ), hEncoderConfig->input_Fs, 0 ); -#endif - hDirAC->hFbMixer = NULL; - } - - if ( sba_mode_old == SBA_MODE_SPAR ) - { -#ifndef SBA_BR_SWITCHING_CLEAN_UP - IVAS_FB_CFG *fb_cfg; - int16_t nchan_internal, sba_order_internal; - int16_t table_idx, active_w_mixing; - - sba_order_internal = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); - nchan_internal = ivas_sba_get_nchan_metadata( sba_order_internal ); - - /* Covar. State handle */ - ivas_spar_covar_enc_close( &hSpar->hCovEnc, hSpar->hFbMixer->fb_cfg->num_in_chans ); - - /* MD handle */ - ivas_spar_md_enc_close( &hSpar->hMdEnc ); - - if ( ( error = ivas_spar_md_enc_open( &( hSpar->hMdEnc ), hEncoderConfig, sba_order_internal ) ) != IVAS_ERR_OK ) - { - return error; - } - - /*Initialization*/ - hSpar->hMdEnc->table_idx = -1; - - /* FB mixer handle */ - ivas_FB_mixer_close( &hSpar->hFbMixer, hEncoderConfig->input_Fs ); - - table_idx = ivas_get_spar_table_idx( ivas_total_brate, sba_order_internal, SPAR_CONFIG_BW, NULL, NULL ); - active_w_mixing = ivas_spar_br_table_consts[table_idx].active_w; - if ( ( error = ivas_fb_set_cfg( &fb_cfg, SBA_FORMAT, SBA_MODE_SPAR, nchan_internal, st_ivas->nchan_transport, active_w_mixing, hEncoderConfig->input_Fs ) ) != IVAS_ERR_OK ) - { - return error; - } - fb_cfg->remix_order = remix_order_set[hSpar->hMdEnc->spar_md_cfg.remix_unmix_order]; - - if ( ( error = ivas_FB_mixer_open( &( hSpar->hFbMixer ), hEncoderConfig->input_Fs, fb_cfg ) ) != IVAS_ERR_OK ) - { - return error; - } - - /* Covar. State handle */ - if ( ( error = ivas_spar_covar_enc_open( &( hSpar->hCovEnc ), hSpar->hFbMixer->pFb, hEncoderConfig->input_Fs, nchan_internal ) ) != IVAS_ERR_OK ) - { - return error; - } -#else - 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; - } -#endif - } - } - else + if ( hDirAC->hFbMixer != NULL ) { - 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 */ -#ifdef SBA_BR_SWITCHING_CLEAN_UP - if ( ( error = ivas_FB_mixer_open( &( hDirAC->hFbMixer ), hEncoderConfig->input_Fs, fb_cfg, 0 ) ) != IVAS_ERR_OK ) -#else - if ( ( error = ivas_FB_mixer_open( &( hDirAC->hFbMixer ), hEncoderConfig->input_Fs, fb_cfg ) ) != IVAS_ERR_OK ) -#endif - { - return error; - } - } - - if ( hDirAC->num_samples_synchro_delay == 0 ) - { - hDirAC->num_samples_synchro_delay = NS2SA( hEncoderConfig->input_Fs, IVAS_FB_ENC_DELAY_NS ); - - for ( n = 0; n < DIRAC_MAX_ANA_CHANS; n++ ) - { - if ( ( hDirAC->sba_synchro_buffer[n] = (float *) malloc( hDirAC->num_samples_synchro_delay * sizeof( float ) ) ) == NULL ) - { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for hDirAC synchro buffer\n" ) ); - } - set_zero( hDirAC->sba_synchro_buffer[n], hDirAC->num_samples_synchro_delay ); - } - for ( ; n < DIRAC_MAX_ANA_CHANS; n++ ) - { - hDirAC->sba_synchro_buffer[n] = NULL; - } - } + ivas_FB_mixer_close( &( hDirAC->hFbMixer ), hEncoderConfig->input_Fs, 0 ); + hDirAC->hFbMixer = NULL; } -#ifndef SBA_BR_SWITCHING_CLEAN_UP - /* initialize delay for SPAR/DirAC delay synchronization */ - if ( ( st_ivas->sba_mode == SBA_MODE_DIRAC ) && ( ( sba_mode_old != st_ivas->sba_mode ) || ( nchan_transport_old != st_ivas->nchan_transport ) ) ) - { - 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; - } - } - } - else + if ( ( error = ivas_spar_enc_open( st_ivas, spar_reconfig_flag ) ) != IVAS_ERR_OK ) { - for ( n = 0; n < DIRAC_MAX_ANA_CHANS; n++ ) - { - if ( hDirAC->sba_synchro_buffer[n] != NULL ) - { - free( hDirAC->sba_synchro_buffer[n] ); - hDirAC->sba_synchro_buffer[n] = NULL; - } - } - hDirAC->num_samples_synchro_delay = 0; + return error; } - - -#endif } - + 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 ) - { - 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; - } - + 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 *-----------------------------------------------------------------*/ diff --git a/lib_enc/ivas_sce_enc.c b/lib_enc/ivas_sce_enc.c index 195fc01cf757e155ade5d714b45c947321b6377b..c8577a85bae41f124907bdd60809cca4d529b7d6 100644 --- a/lib_enc/ivas_sce_enc.c +++ b/lib_enc/ivas_sce_enc.c @@ -180,21 +180,12 @@ ivas_error ivas_sce_enc( * Front Pre-processing *----------------------------------------------------------------*/ -#ifdef LOW_RATE_TRANS_CORE_CODER error = pre_proc_front_ivas( hSCE, NULL, hSCE->element_brate, nb_bits_metadata, input_frame, 0, old_inp_12k8[0], old_inp_16k[0], &ener[0], &relE[0], A[0], Aw[0], epsP[0], lsp_new[0], lsp_mid[0], &vad_hover_flag[0], &attack_flag[0], realBuffer[0], imagBuffer[0], old_wsp[0], pitch_fr[0], voicing_fr[0], &loc_harm[0], &cor_map_sum[0], &vad_flag_dtx[0], enerBuffer[0], fft_buff[0], A[0], lsp_new[0], currFlatness[0], 0, fr_bands, Etot_LR, lf_E, localVAD_HE_SAD, NULL, flag_16k_smc, st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_flag : 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->force_front_vad : 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_dtx_flag : 0, st_ivas->hEncoderConfig->ivas_total_brate ); -#else - error = pre_proc_front_ivas( hSCE, NULL, hSCE->element_brate, nb_bits_metadata, input_frame, 0, old_inp_12k8[0], old_inp_16k[0], - &ener[0], &relE[0], A[0], Aw[0], epsP[0], lsp_new[0], lsp_mid[0], - &vad_hover_flag[0], &attack_flag[0], realBuffer[0], imagBuffer[0], old_wsp[0], pitch_fr[0], voicing_fr[0], &loc_harm[0], &cor_map_sum[0], &vad_flag_dtx[0], enerBuffer[0], - fft_buff[0], A[0], lsp_new[0], currFlatness[0], 0, fr_bands, Etot_LR, lf_E, localVAD_HE_SAD, NULL, flag_16k_smc, - st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_flag : 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->force_front_vad : 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_dtx_flag : 0, - st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->hEncoderConfig->ivas_format ); -#endif if ( error != IVAS_ERR_OK ) { return error; @@ -260,10 +251,8 @@ ivas_error ivas_sce_enc( hSCE->last_element_brate = hSCE->element_brate; -#ifdef LOW_RATE_TRANS_CORE_CODER /* Store previous attack detection flag */ st->hTranDet->transientDetector.prev_bIsAttackPresent = st->hTranDet->transientDetector.bIsAttackPresent; -#endif #ifdef DEBUG_MODE_INFO { @@ -343,11 +332,7 @@ ivas_error create_sce_enc( st->total_brate = hSCE->element_brate; /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */ st->mct_chan_mode = MCT_CHAN_MODE_REGULAR; -#ifdef PARAM_ISM_DTX_CNG 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 ) -#else - if ( ( error = init_encoder( st, 0, st_ivas->hEncoderConfig->var_SID_rate_flag, st_ivas->hEncoderConfig->interval_SID, 0 ) ) != IVAS_ERR_OK ) -#endif { return error; } diff --git a/lib_enc/ivas_sns_enc.c b/lib_enc/ivas_sns_enc.c index 9eeb4d87605cc97362ea2ffbb5bcc34f96512fd1..c4f20841f3b576a3bce569dcefceee33dd928bf5 100644 --- a/lib_enc/ivas_sns_enc.c +++ b/lib_enc/ivas_sns_enc.c @@ -38,6 +38,10 @@ #include "prot.h" #include "ivas_prot.h" #include "rom_com.h" +#ifdef SNS_MSVQ +#include "ivas_rom_com.h" +#include "ivas_cnst.h" +#endif #ifdef DEBUGGING #include "debug.h" #endif @@ -130,7 +134,7 @@ static int16_t sns_1st_cod( /*------------------------------------------------------------------- - * sns_1st_cod() + * sns_2st_cod() * * *-------------------------------------------------------------------*/ @@ -282,12 +286,12 @@ void sns_avq_cod( *-------------------------------------------------------------------*/ void sns_avq_cod_stereo( - const float *snsl, /* i : Input sns vector (left channel) */ - const float *snsr, /* i : Input sns vector (right channel) */ - float *snsl_q, /* o : Quantized sns vector (left channel) */ - float *snsr_q, /* o : Quantized sns vector (right channel) */ - int16_t *indexl, /* o : Quantization indices (left channel) */ - int16_t *indexr /* o : Quantization indices (right channel) */ + const float *snsl, /* i : Input sns vector (left channel) */ + const float *snsr, /* i : Input sns vector (right channel) */ + float *snsl_q, /* o : Quantized sns vector (left channel) */ + float *snsr_q, /* o : Quantized sns vector (right channel) */ + int16_t *indexl, /* o : Quantization indices (left channel) */ + int16_t *indexr /* o : Quantization indices (right channel) */ ) { int16_t i, flag_zero; @@ -377,3 +381,149 @@ void sns_avq_cod_stereo( return; } + +#ifdef SNS_MSVQ +int16_t quantize_sns( + float sns_in[CPE_CHANNELS][NB_DIV][M], + float snsQ_out[CPE_CHANNELS][NB_DIV][M], + Encoder_State **sts, + int16_t *indices, + int16_t *zero_side_flag, + int16_t *sns_stereo_mode ) +{ + int16_t nSubframes, k, ch, i; + int16_t nbits, idxIndices; + Encoder_State *st; + float weights[M]; + const float *means; + float sns_buffer[CPE_CHANNELS][NB_DIV][M]; + + nbits = 0; + idxIndices = 0; + set_f( weights, 1.0f, M ); + + /* stereo mode decision */ + sns_stereo_mode[0] = SNS_STEREO_MODE_LR; + sns_stereo_mode[1] = SNS_STEREO_MODE_LR; + zero_side_flag[0] = 0; + zero_side_flag[1] = 0; + if ( sts[0]->core == sts[1]->core ) + { + nSubframes = ( sts[0]->core == TCX_20_CORE ) ? 1 : NB_DIV; + + for ( k = 0; k < nSubframes; ++k ) + { + float *side; + float ener_side; + + side = &sns_buffer[1][k][0]; + v_sub( sns_in[0][k], sns_in[1][k], side, M ); + ener_side = dotp( side, side, M ); + + sns_stereo_mode[k] = ener_side < 12.f; + zero_side_flag[k] = ener_side < 1.f; + } + } + + /* prepare buffers depending on the chosen stereo mode */ + + /* remove means of L/R SNS parameters */ + for ( ch = 0; ch < CPE_CHANNELS; ++ch ) + { + st = sts[ch]; + nSubframes = ( st->core == TCX_20_CORE ) ? 1 : NB_DIV; + means = ( st->core == TCX_20_CORE ) ? ivas_sns_means_tcx20 : ivas_sns_means_tcx10; + for ( k = 0; k < nSubframes; ++k ) + { + v_sub( sns_in[ch][k], means, sns_buffer[ch][k], M ); + } + } + + if ( sns_stereo_mode[0] == SNS_STEREO_MODE_MS || sns_stereo_mode[1] == SNS_STEREO_MODE_MS ) + { + nSubframes = ( sts[0]->core == TCX_20_CORE ) ? 1 : NB_DIV; + for ( k = 0; k < nSubframes; ++k ) + { + if ( sns_stereo_mode[k] == SNS_STEREO_MODE_MS ) + { + convertToMS( M, sns_buffer[0][k], sns_buffer[1][k], 0.5f ); + } + } + } + + for ( ch = 0; ch < CPE_CHANNELS; ++ch ) + { + st = sts[ch]; + nSubframes = ( st->core == TCX_20_CORE ) ? 1 : NB_DIV; + + for ( k = 0; k < nSubframes; ++k ) + { + const int16_t is_side = ch == 1 && sns_stereo_mode[k] == SNS_STEREO_MODE_MS; + const float *const *cdbks = ( nSubframes == 1 ) ? ivas_sns_cdbks_tcx20 : ivas_sns_cdbks_tcx10; + const int16_t *levels = ( nSubframes == 1 ) ? ivas_sns_cdbks_tcx20_levels : ivas_sns_cdbks_tcx10_levels; + const int16_t *bits = ( nSubframes == 1 ) ? ivas_sns_cdbks_tcx20_bits : ivas_sns_cdbks_tcx10_bits; + int16_t nStages = ( ( nSubframes == 1 ) ? SNS_MSVQ_NSTAGES_TCX20 : SNS_MSVQ_NSTAGES_TCX10 ); + float *snsQ = snsQ_out[ch][k]; + const float *sns_ptr = sns_buffer[ch][k]; + + if ( is_side ) + { + const float *const *side_cdbks = ( st->core == TCX_20_CORE ) ? ivas_sns_cdbks_side_tcx20 : ivas_sns_cdbks_side_tcx10; + const int16_t *side_levels = ( st->core == TCX_20_CORE ) ? ivas_sns_cdbks_side_tcx20_levels : ivas_sns_cdbks_side_tcx10_levels; + + if ( zero_side_flag[k] ) + { + set_zero( snsQ, M ); + continue; + } + + nStages = SNS_MSVQ_NSTAGES_SIDE; + bits = ( st->core == TCX_20_CORE ) ? ivas_sns_cdbks_side_tcx20_bits : ivas_sns_cdbks_side_tcx10_bits; + means = ( st->core == TCX_20_CORE ) ? ivas_sns_means_side_tcx20 : ivas_sns_means_side_tcx10; + + v_sub( sns_ptr, means, snsQ, M ); + 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 ); + v_add( snsQ, means, snsQ, M ); + } + 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 ); + } + } + } + + /* add means back */ + for ( ch = 0; ch < CPE_CHANNELS; ++ch ) + { + st = sts[ch]; + nSubframes = ( st->core == TCX_20_CORE ) ? 1 : NB_DIV; + means = ( st->core == TCX_20_CORE ) ? ivas_sns_means_tcx20 : ivas_sns_means_tcx10; + for ( k = 0; k < nSubframes; ++k ) + { + v_add( snsQ_out[ch][k], means, snsQ_out[ch][k], M ); + } + } + + return nbits; +} +#endif // SNS_MSVQ diff --git a/lib_enc/ivas_spar_encoder.c b/lib_enc/ivas_spar_encoder.c index b156c524d27aecd99b375a67541ad869dcf0712d..0484e2fb92dcdec73b6630aeb0b933a494207af7 100644 --- a/lib_enc/ivas_spar_encoder.c +++ b/lib_enc/ivas_spar_encoder.c @@ -58,11 +58,8 @@ static ivas_error ivas_spar_enc_process( Encoder_Struct *st_ivas, const ENCODER_ *------------------------------------------------------------------------*/ ivas_error ivas_spar_enc_open( - Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */ -#ifdef SBA_BR_SWITCHING_CLEAN_UP - , + Encoder_Struct *st_ivas, /* i/o: IVAS encoder handle */ const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ -#endif ) { SPAR_ENC_HANDLE hSpar; @@ -75,20 +72,16 @@ ivas_error ivas_spar_enc_open( hEncoderConfig = st_ivas->hEncoderConfig; error = IVAS_ERR_OK; -#ifdef SBA_BR_SWITCHING_CLEAN_UP hSpar = st_ivas->hSpar; if ( !spar_reconfig_flag ) { -#endif /* SPAR encoder handle */ if ( ( hSpar = (SPAR_ENC_HANDLE) malloc( sizeof( SPAR_ENC_DATA ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR encoder" ); } -#ifdef SBA_BR_SWITCHING_CLEAN_UP } -#endif input_Fs = hEncoderConfig->input_Fs; sba_order_internal = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); @@ -113,34 +106,26 @@ ivas_error ivas_spar_enc_open( ivas_fb_set_cfg( &fb_cfg, SBA_FORMAT, SBA_MODE_SPAR, nchan_inp, nchan_transport, active_w_mixing, input_Fs ); fb_cfg->remix_order = remix_order_set[hSpar->hMdEnc->spar_md_cfg.remix_unmix_order]; -/* FB mixer handle */ -#ifdef SBA_BR_SWITCHING_CLEAN_UP + /* FB mixer handle */ if ( ( error = ivas_FB_mixer_open( &( hSpar->hFbMixer ), input_Fs, fb_cfg, spar_reconfig_flag ) ) != IVAS_ERR_OK ) -#else - if ( ( error = ivas_FB_mixer_open( &( hSpar->hFbMixer ), input_Fs, fb_cfg ) ) != IVAS_ERR_OK ) -#endif { return error; } /* 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; } -#ifdef SBA_BR_SWITCHING_CLEAN_UP if ( !spar_reconfig_flag ) { -#endif /* Transient Detector handle */ if ( ( error = ivas_transient_det_open( &( hSpar->hTranDet ), input_Fs ) ) != IVAS_ERR_OK ) { return error; } -#ifdef SBA_BR_SWITCHING_CLEAN_UP } -#endif /* initialization */ hSpar->hMdEnc->table_idx = -1; @@ -194,10 +179,8 @@ ivas_error ivas_spar_enc_open( * Allocate and initialize Front-VAD handle *-----------------------------------------------------------------*/ -#ifdef SBA_BR_SWITCHING_CLEAN_UP if ( !spar_reconfig_flag ) { -#endif hSpar->front_vad_flag = 0; hSpar->front_vad_dtx_flag = 0; hSpar->force_front_vad = 0; @@ -219,11 +202,7 @@ 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; -#ifdef PARAM_ISM_DTX_CNG if ( ( error = init_encoder( hSpar->hCoreCoderVAD, 0, hEncoderConfig->var_SID_rate_flag, hEncoderConfig->interval_SID, 1, st_ivas->ism_mode ) ) != IVAS_ERR_OK ) -#else - if ( ( error = init_encoder( hSpar->hCoreCoderVAD, 0, hEncoderConfig->var_SID_rate_flag, hEncoderConfig->interval_SID, 1 ) ) != IVAS_ERR_OK ) -#endif { return error; } @@ -233,9 +212,7 @@ ivas_error ivas_spar_enc_open( hSpar->hCoreCoderVAD = NULL; hSpar->hFrontVad = NULL; } -#ifdef SBA_BR_SWITCHING_CLEAN_UP } -#endif /*-----------------------------------------------------------------* * Final assignment @@ -254,82 +231,67 @@ ivas_error ivas_spar_enc_open( *------------------------------------------------------------------------*/ void ivas_spar_enc_close( - SPAR_ENC_HANDLE hSpar, /* i/o: SPAR encoder handle */ - const int32_t input_Fs, /* i : input sampling rate */ - const int16_t nchan_inp /* i : number of input channels */ -#ifdef SBA_BR_SWITCHING_CLEAN_UP - , + SPAR_ENC_HANDLE *hSpar, /* i/o: SPAR encoder handle */ + const int32_t input_Fs, /* i : input sampling rate */ + const int16_t nchan_inp, /* i : number of input channels */ const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ -#endif ) { int16_t num_chans; - if ( hSpar != NULL ) + if ( hSpar == NULL || *hSpar == NULL ) { -#ifdef SBA_BR_SWITCHING_CLEAN_UP - if ( !spar_reconfig_flag ) - { -#endif - /* core-coder-VAD handle */ - if ( hSpar->hCoreCoderVAD != NULL ) - { - destroy_core_enc( hSpar->hCoreCoderVAD ); - hSpar->hCoreCoderVAD = NULL; - } + return; + } - /* front-VAD handle */ - if ( hSpar->hFrontVad != NULL ) - { - front_vad_destroy( &hSpar->hFrontVad ); - hSpar->hFrontVad = NULL; - } -#ifdef SBA_BR_SWITCHING_CLEAN_UP + if ( !spar_reconfig_flag ) + { + /* core-coder-VAD handle */ + if ( ( *hSpar )->hCoreCoderVAD != NULL ) + { + destroy_core_enc( ( *hSpar )->hCoreCoderVAD ); + ( *hSpar )->hCoreCoderVAD = NULL; } -#endif - num_chans = hSpar->hFbMixer->fb_cfg->num_in_chans; - assert( num_chans <= nchan_inp ); + /* front-VAD handle */ + if ( ( *hSpar )->hFrontVad != NULL ) + { + front_vad_destroy( &( *hSpar )->hFrontVad ); + ( *hSpar )->hFrontVad = NULL; + } + } - /* MD handle */ - ivas_spar_md_enc_close( &hSpar->hMdEnc ); + num_chans = ( *hSpar )->hFbMixer->fb_cfg->num_in_chans; + assert( num_chans <= nchan_inp ); - /* Covar. State handle */ - ivas_spar_covar_enc_close( &hSpar->hCovEnc, num_chans ); + /* MD handle */ + ivas_spar_md_enc_close( &( *hSpar )->hMdEnc ); - /* FB mixer handle */ -#ifdef SBA_BR_SWITCHING_CLEAN_UP - ivas_FB_mixer_close( &hSpar->hFbMixer, input_Fs, spar_reconfig_flag ); -#else - ivas_FB_mixer_close( &hSpar->hFbMixer, input_Fs ); + /* Covar. State handle */ + ivas_spar_covar_enc_close( &( *hSpar )->hCovEnc, num_chans ); - /* Trans Det handle */ - ivas_transient_det_close( &hSpar->hTranDet ); -#endif + /* FB mixer handle */ + ivas_FB_mixer_close( &( *hSpar )->hFbMixer, input_Fs, spar_reconfig_flag ); - /* AGC */ - ivas_spar_agc_enc_close( &hSpar->hAgcEnc ); + /* AGC */ + ivas_spar_agc_enc_close( &( *hSpar )->hAgcEnc ); - /* PCA */ - if ( hSpar->hPCA != NULL ) - { - free( hSpar->hPCA ); - hSpar->hPCA = NULL; - } + /* PCA */ + if ( ( *hSpar )->hPCA != NULL ) + { + free( ( *hSpar )->hPCA ); + ( *hSpar )->hPCA = NULL; + } -#ifdef SBA_BR_SWITCHING_CLEAN_UP - if ( !spar_reconfig_flag ) - { - /* Trans Det handle */ - ivas_transient_det_close( &hSpar->hTranDet ); -#endif - free( hSpar ); - hSpar = NULL; -#ifdef SBA_BR_SWITCHING_CLEAN_UP - } -#endif + if ( !spar_reconfig_flag ) + { + /* Trans Det handle */ + ivas_transient_det_close( &( *hSpar )->hTranDet ); + free( ( *hSpar ) ); + ( *hSpar ) = NULL; } + return; } @@ -357,7 +319,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]; @@ -430,11 +392,7 @@ static ivas_error ivas_spar_enc_process( float pcm_tmp[IVAS_SPAR_MAX_CH][L_FRAME48k * 2]; float *p_pcm_tmp[IVAS_SPAR_MAX_CH]; int16_t i, j, b, i_ts, input_frame, dtx_vad; -#ifdef SMOOTH_WITH_TRANS_DET int16_t transient_det[2]; -#else - int16_t transient_det; -#endif 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]; @@ -467,7 +425,8 @@ static ivas_error ivas_spar_enc_process( sba_order = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); nchan_inp = ivas_sba_get_nchan_metadata( sba_order ); assert( nchan_inp <= hEncoderConfig->nchan_inp ); - + int16_t active_w_vlbr; + active_w_vlbr = ( hEncoderConfig->ivas_total_brate < IVAS_24k4 ) ? 1 : 0; for ( i = FOA_CHANNELS + 1; i < nchan_inp; i++ ) { mvr2r( data_f[HOA_keep_ind[i]], data_f[i], input_frame ); @@ -477,16 +436,15 @@ static ivas_error ivas_spar_enc_process( * Transient detector *-----------------------------------------------------------------------------------------*/ -#ifdef SMOOTH_WITH_TRANS_DET ivas_transient_det_process( hSpar->hTranDet, data_f[0], input_frame, transient_det ); if ( sba_order == 1 ) { transient_det[1] = transient_det[0]; } -#else - transient_det = ivas_transient_det_process( hSpar->hTranDet, data_f[0], input_frame ); -#endif - + if ( ivas_total_brate < IVAS_24k4 ) + { + 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 ); @@ -632,7 +590,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 ) { @@ -666,7 +624,8 @@ 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 ); } { @@ -708,14 +667,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 *-----------------------------------------------------------------------------------------*/ @@ -788,7 +813,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 diff --git a/lib_enc/ivas_spar_md_enc.c b/lib_enc/ivas_spar_md_enc.c index bcc6718e9a60c513ead6780ac75f79bba2781c52..cdfd6050ba872863a211f53c84c258bf1fcbc118 100644 --- a/lib_enc/ivas_spar_md_enc.c +++ b/lib_enc/ivas_spar_md_enc.c @@ -72,15 +72,15 @@ static void ivas_band_mixer( float *cov_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], static void ivas_get_band_differential_index( ivas_band_coeffs_ind_t *pBand_idx, const int16_t q_levels[2], const int16_t one_sided, const int16_t nB, const int16_t complex_cov, const int16_t dim, const ivas_coeffs_type_t coeff_type ); -static void ivas_get_huffman_coded_bs( ivas_spar_md_enc_state_t *hMdEnc, BSTR_ENC_HANDLE hMetaData, const int16_t nB, const int16_t qsi, const int16_t planarCP ); +static void ivas_get_huffman_coded_bs( ivas_spar_md_enc_state_t *hMdEnc, BSTR_ENC_HANDLE hMetaData, const int16_t nB, const int16_t qsi, const int16_t planarCP, const int16_t bands_bw ); -static void ivas_get_arith_coded_bs( ivas_spar_md_enc_state_t *hMdEnc, BSTR_ENC_HANDLE hMetaData, const int16_t *pDo_diff, const int16_t bands_bw, const int16_t nB, const int16_t qsi, const int16_t planarCP ); +static void ivas_get_arith_coded_bs( ivas_spar_md_enc_state_t *hMdEnc, BSTR_ENC_HANDLE hMetaData, const int16_t *pDo_diff, const int16_t bands_bw, const int16_t nB, const int16_t qsi, const int16_t planarCP, const int16_t strat, const int32_t ivas_total_brate ); 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 ); @@ -225,6 +225,11 @@ void ivas_spar_md_enc_close( int16_t num_channels, i, j; ivas_spar_md_enc_state_t *hMdEnc; + if ( hMdEnc_in == NULL || *hMdEnc_in == NULL ) + { + return; + } + hMdEnc = *hMdEnc_in; num_channels = hMdEnc->num_umx_ch; @@ -250,7 +255,6 @@ void ivas_spar_md_enc_close( { for ( i = 0; i < num_channels; i++ ) { - for ( j = 0; j < num_channels; j++ ) { free( hMdEnc->cov_real[i][j] ); @@ -264,7 +268,6 @@ void ivas_spar_md_enc_close( { for ( i = 0; i < num_channels; i++ ) { - for ( j = 0; j < num_channels; j++ ) { free( hMdEnc->cov_dtx_real[i][j] ); @@ -288,11 +291,8 @@ void ivas_spar_md_enc_close( free( hMdEnc->mixer_mat_local ); } - if ( hMdEnc != NULL ) - { - free( hMdEnc ); - hMdEnc = NULL; - } + free( *hMdEnc_in ); + *hMdEnc_in = NULL; return; } @@ -544,6 +544,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 */ ) { float pred_coeffs_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS]; @@ -568,7 +570,8 @@ ivas_error ivas_spar_md_enc_process( 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 ) { @@ -621,6 +624,13 @@ 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; @@ -639,7 +649,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 +663,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 +750,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 +802,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 ); } } @@ -903,6 +951,64 @@ ivas_error ivas_spar_md_enc_process( { 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,7 +1184,8 @@ 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; @@ -1170,55 +1277,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,11 +1363,14 @@ static void ivas_write_spar_md_bitstream( #endif if ( no_ec == 1 ) { - ivas_get_huffman_coded_bs( hMdEnc, hMetaData, nB, qsi, planarCP ); + ivas_get_huffman_coded_bs( hMdEnc, hMetaData, nB, qsi, planarCP, + bands_bw ); } else { - ivas_get_arith_coded_bs( hMdEnc, hMetaData, do_diff, bands_bw, nB, qsi, planarCP ); + ivas_get_arith_coded_bs( hMdEnc, hMetaData, do_diff, bands_bw, nB, qsi, planarCP, + strat, + ivas_total_brate ); } return; @@ -1251,7 +1388,8 @@ static void ivas_get_huffman_coded_bs( BSTR_ENC_HANDLE hMetaData, const int16_t nB, const int16_t qsi, - const int16_t planarCP ) + const int16_t planarCP, + const int16_t bands_bw ) { int16_t i, j; int16_t pred_coeff_dim, pred_offset; @@ -1259,8 +1397,9 @@ 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; @@ -1337,7 +1476,9 @@ static void ivas_get_arith_coded_bs( const int16_t bands_bw, const int16_t nB, const int16_t qsi, - const int16_t planarCP ) + const int16_t planarCP, + const int16_t strat, + const int32_t ivas_total_brate ) { int16_t i, j, any_diff; ivas_cell_dim_t pred_cell_dims[IVAS_MAX_NUM_BANDS]; @@ -1352,21 +1493,35 @@ static void ivas_get_arith_coded_bs( int16_t ndm, ndec; ndm = hMdEnc->spar_md_cfg.num_dmx_chans_per_band[bands_bw * i]; ndec = hMdEnc->spar_md_cfg.num_decorr_per_band[bands_bw * i]; - pred_cell_dims[i].dim1 = ndm + ndec - 1; - if ( hMdEnc->spar_hoa_md_flag ) + 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 ) { - 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; @@ -1540,15 +1695,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 +1713,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 e4509902548f2d07141b3da9debcecad759605a3..9dfafbbc04fba7a832c29c042af618d7703dc179 100644 --- a/lib_enc/ivas_stat_enc.h +++ b/lib_enc/ivas_stat_enc.h @@ -219,22 +219,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 */ @@ -550,7 +534,6 @@ typedef struct ivas_stereo_classifier_data_structure } STEREO_CLASSIF_DATA, *STEREO_CLASSIF_HANDLE; -#ifdef PARAM_ISM_DTX_CNG /*----------------------------------------------------------------------------------* * ISM DTX structure *----------------------------------------------------------------------------------*/ @@ -560,13 +543,12 @@ typedef struct int16_t dtx_flag; int16_t sce_id_dtx; - int16_t dtx_speech_buffer_enc[PARAM_ISM_HYS_BUF_SIZE]; + int16_t cnt_SID_ISM; float long_term_energy_stereo_dmx_enc[MAX_NUM_OBJECTS][PARAM_ISM_HYS_BUF_SIZE]; float coh[MAX_NUM_OBJECTS]; } ISM_DTX_DATA, *ISM_DTX_HANDLE; -#endif /*----------------------------------------------------------------------------------* * Front-VAD structure @@ -738,14 +720,33 @@ typedef struct ivas_param_mc_enc_data_structure * MASA encoder structures *----------------------------------------------------------------------------------*/ +#ifdef FIX_398_MASA_DIRECTION_ALIGNMENT +typedef struct ivas_masa_dir_align_struct +{ + float previous_azi_dir1[MASA_FREQUENCY_BANDS]; + float previous_ele_dir1[MASA_FREQUENCY_BANDS]; + + float previous_azi_dir2[MASA_FREQUENCY_BANDS]; + float previous_ele_dir2[MASA_FREQUENCY_BANDS]; + +} MASA_DIR_ALIGN_STATE, *MASA_DIR_ALIGN_HANDLE; +#endif + +/* structure storing MASA framing sync detection and compensation data */ +typedef struct ivas_masa_sync_struct +{ + MASA_METADATA_FRAME previous_metadata; + uint8_t prev_sim_stop; + uint8_t prev_offset; + MASA_FRAME_MODE frame_mode; + +} MASA_SYNC_STATE, *MASA_SYNC_HANDLE; + typedef struct ivas_masa_encoder_data_struct { float energy[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]; int16_t num_Cldfb_instances; HANDLE_CLDFB_FILTER_BANK cldfbAnaEnc[MAX_NUM_ENC_CLDFB_INSTANCES]; -#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]; @@ -757,6 +758,12 @@ typedef struct ivas_masa_encoder_data_struct float onset_detector_1; float onset_detector_2; + MASA_SYNC_STATE sync_state; + +#ifdef FIX_398_MASA_DIRECTION_ALIGNMENT + MASA_DIR_ALIGN_STATE dir_align_state; +#endif + } MASA_ENCODER_DATA; typedef struct ivas_masa_encoder_struct @@ -925,11 +932,8 @@ typedef struct mct_enc_data_structure float lastxCorrMatrix[MCT_MAX_CHANNELS][MCT_MAX_CHANNELS]; int16_t lowE_ch[MCT_MAX_CHANNELS]; - int16_t LFE_off; uint16_t mc_global_ild[MCT_MAX_CHANNELS]; int16_t nBitsMCT; /* number of bits spent on mct side info */ - int16_t num_lfe; - /* pointers to local buffers */ float *p_mdst_spectrum_long[MCT_MAX_BLOCKS][CPE_CHANNELS]; float *p_orig_spectrum_long[MCT_MAX_BLOCKS][CPE_CHANNELS]; @@ -1012,9 +1016,11 @@ typedef struct encoder_config_structure int16_t element_mode_init; /* element mode used at initialization */ int16_t stereo_dmx_evs; /* flag to indicate that stereo downmix for EVS encoder */ + int16_t nchan_ism; /* number of ISM channels */ int16_t sba_order; /* Ambisonic (SBA) order */ int16_t sba_planar; /* Ambisonic (SBA) planar flag */ MC_LS_SETUP mc_input_setup; /* multichannel input ls setup */ + int16_t ism_extended_metadata_flag; /* flag indicating extended metadata encoding, including radius and orientation (yaw, pitch) in ISM format */ int16_t Opt_AMR_WB; /* flag indicating AMR-WB IO mode */ @@ -1031,7 +1037,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 */ @@ -1071,9 +1077,7 @@ typedef struct /* multichannel modules */ ISM_METADATA_HANDLE hIsmMetaData[MAX_NUM_OBJECTS]; /* ISM metadata handles (storage for one frame of read ISM metadata) */ -#ifdef PARAM_ISM_DTX_CNG ISM_DTX_HANDLE hISMDTX; /* ISM DTX handle */ -#endif DIRAC_ENC_HANDLE hDirAC; /* DirAC data handle */ SPAR_ENC_HANDLE hSpar; /* SPAR encoder handle */ MASA_ENCODER_HANDLE hMasa; /* MASA encoder data and configuration */ diff --git a/lib_enc/ivas_stereo_cng_enc.c b/lib_enc/ivas_stereo_cng_enc.c index 784ec10807aa6a92c0eb8a6d64c0afde1f342805..2eb838bf5c5bbac673ae0308c93df86e4c972cf9 100644 --- a/lib_enc/ivas_stereo_cng_enc.c +++ b/lib_enc/ivas_stereo_cng_enc.c @@ -173,8 +173,12 @@ void stereo_dft_enc_sid_coh( int16_t alpha_level; int16_t n; +#ifdef FIX_418_SID_BITRATE + nr_of_sid_stereo_bits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; +#else /* TODO: still use old number of bits to keep bitexactness in output */ nr_of_sid_stereo_bits = ( 4400 /*IVAS_SID_5k2*/ - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; +#endif zeropad = 0; /* Encode coherence vector. Find best fixed predictor by minimizing prediction error on input vector. @@ -329,7 +333,9 @@ void stereo_dft_enc_sid_coh( ( *nb_bits )++; } +#ifndef FIX_418_SID_BITRATE push_next_indice( hBstr, zeropad, ( IVAS_SID_5k2 - 4400 ) / FRAMES_PER_SEC ); +#endif return; } diff --git a/lib_enc/ivas_stereo_dft_enc.c b/lib_enc/ivas_stereo_dft_enc.c index ab4844ab944067f4a519135e05b06574f6d460f5..43546261a41b954622c9bdaa07ef0bee191c2072 100644 --- a/lib_enc/ivas_stereo_dft_enc.c +++ b/lib_enc/ivas_stereo_dft_enc.c @@ -416,21 +416,6 @@ void stereo_dft_enc_reset( ) { int16_t i; -#ifdef ITD_WINNER_GAIN_MODIFY - hStereoDft->noise_coherence = 0.0f; - hStereoDft->local_vad = 0; - hStereoDft->mus_flag = 2; - set_zero( hStereoDft->spd_L_noise, STEREO_DFT_N_32k_ENC / 2 ); - set_zero( hStereoDft->spd_R_noise, STEREO_DFT_N_32k_ENC / 2 ); - set_zero( hStereoDft->spd_L_noise_min, STEREO_DFT_N_32k_ENC / 2 ); - set_zero( hStereoDft->spd_R_noise_min, STEREO_DFT_N_32k_ENC / 2 ); - set_zero( hStereoDft->spd_L_noise_max, STEREO_DFT_N_32k_ENC / 2 ); - set_zero( hStereoDft->spd_R_noise_max, STEREO_DFT_N_32k_ENC / 2 ); - set_zero( hStereoDft->winner_gain_L, STEREO_DFT_N_32k_ENC / 2 ); - set_zero( hStereoDft->winner_gain_R, STEREO_DFT_N_32k_ENC / 2 ); - set_f( hStereoDft->spd_L_smooth_new, 1.0f, STEREO_DFT_N_32k_ENC / 2 ); - set_f( hStereoDft->spd_R_smooth_new, 1.0f, STEREO_DFT_N_32k_ENC / 2 ); -#endif /*reset parameters*/ set_zero( hStereoDft->side_gain, STEREO_DFT_ENC_DFT_NB * STEREO_DFT_BAND_MAX ); set_s( hStereoDft->side_gain_index_EC, 15, STEREO_DFT_BAND_MAX ); diff --git a/lib_enc/ivas_stereo_dft_enc_itd.c b/lib_enc/ivas_stereo_dft_enc_itd.c index f52d67a47a328fe47fcdc6ccf4d2c167dc7564f4..d2c0bc7fe1ec78ae00051af7f280b97fe93c1d2a 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() * @@ -741,9 +612,6 @@ void stereo_dft_enc_compute_itd( int16_t itd, itd_td; float xcorr_itd[STEREO_DFT_N_32k_ENC]; float tmpf1, tmpf2, tmpf3; -#ifdef ITD_WINNER_GAIN_MODIFY - float frame_coherence, tmpf4; -#endif float thres, alpha; int16_t index; float xcorr_max, sum_nrg_L_lb, par_L[XCORR_LB_NUM_BANDS], par_L_avrg, sum_nrg_L_tmp; @@ -984,32 +852,6 @@ void stereo_dft_enc_compute_itd( xcorr[0] = sign( hItd->xcorr_smooth[0] ); xcorr[1] = sign( hItd->xcorr_smooth[1] ); -#ifdef ITD_WINNER_GAIN_MODIFY - if ( hStereoDft->mus_flag == 0 ) - { - stereo_dft_frame_coherence( hStereoDft, xcorr, Spd_L, Spd_R, &frame_coherence ); - if ( hStereoDft->local_vad == 0 ) - { - hStereoDft->noise_coherence = 0.9f * hStereoDft->noise_coherence + ( 1.0 - 0.9f ) * frame_coherence; - } - else - { - hStereoDft->noise_coherence = hStereoDft->noise_coherence; - } - stereo_dft_itd_winner_gain( hStereoDft, Spd_L, Spd_R ); - - if ( hStereoDft->noise_coherence > 0.25f ) - { - for ( i = 1; i < NFFT / 2; i++ ) - { - xcorr[2 * i] = ( hStereoDft->winner_gain_L[i] * hStereoDft->winner_gain_R[i] ) * xcorr[2 * i]; - xcorr[2 * i + 1] = ( hStereoDft->winner_gain_L[i] * hStereoDft->winner_gain_R[i] ) * xcorr[2 * i + 1]; - Spd_L[i] = hStereoDft->winner_gain_L[i] * Spd_L[i]; - Spd_R[i] = hStereoDft->winner_gain_R[i] * Spd_R[i]; - } - } - } -#endif if ( hCPE->element_mode == IVAS_CPE_DFT && ( hItd->td_itd[k_offset] - hItd->td_itd[k_offset - 1] ) ) { @@ -1032,23 +874,6 @@ void stereo_dft_enc_compute_itd( } tmpf3 = 2.f; -#ifdef ITD_WINNER_GAIN_MODIFY - if ( hStereoDft->mus_flag == 0 ) - { - alpha = -0.8f; - } - else - { - if ( flag_noisy_speech_snr ) - { - alpha = -0.8f; - } - else - { - alpha = -1.0f; - } - } -#else if ( flag_noisy_speech_snr ) { alpha = -0.8f; @@ -1057,7 +882,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 +964,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 +984,9 @@ void stereo_dft_enc_compute_itd( tmpf1 += EPSILON; tmpf2 = tmpf1; tmpf1 = powf( tmpf1, alpha ); -#ifdef ITD_WINNER_GAIN_MODIFY - if ( hStereoDft->mus_flag == 0 ) - { - tmpf4 = 1.0f; - /* Calculate smoothed spectral power density for the L/R channel */ - hStereoDft->spd_L_smooth_new[i] = ( 1.f - sfm_L ) * hStereoDft->spd_L_smooth_new[i] + sfm_L * Spd_L[i]; - hStereoDft->spd_R_smooth_new[i] = ( 1.f - sfm_L ) * hStereoDft->spd_R_smooth_new[i] + sfm_L * Spd_R[i]; - /* Calculate cross spectral power density using the smoothed spectral power density*/ - tmpf4 = (float) sqrt( hStereoDft->spd_L_smooth_new[i] ) * sqrt( hStereoDft->spd_R_smooth_new[i] ); - /* Calculate the value of weighted function for each frequency bin */ - tmpf4 += EPSILON; - if ( hStereoDft->noise_coherence > 0.25f ) - { - tmpf4 = tmpf1 * pow( tmpf2, 2.0f ) * pow( tmpf4, -2.0f ); - tmpf3 += tmpf2 * tmpf1; - tmpf3 -= tmpf2 * tmpf4; - } - else - { - tmpf4 = tmpf2 * pow( tmpf4, -2.0f ); - } - /* Calculate the value of weighted generlized cross-correlation function for each frequency bin */ - xcorr[2 * i] = hItd->xcorr_smooth[2 * i] * tmpf4; - xcorr[2 * i + 1] = hItd->xcorr_smooth[2 * i + 1] * tmpf4; - } - else - { - tmpf3 += tmpf2 * tmpf1; - xcorr[2 * i] = hItd->xcorr_smooth[2 * i] * tmpf1; - xcorr[2 * i + 1] = hItd->xcorr_smooth[2 * i + 1] * tmpf1; - } -#else tmpf3 += tmpf2 * tmpf1; xcorr[2 * i] = hItd->xcorr_smooth[2 * i] * tmpf1; xcorr[2 * i + 1] = hItd->xcorr_smooth[2 * i + 1] * tmpf1; -#endif } } } @@ -1242,70 +1000,16 @@ void stereo_dft_enc_compute_itd( tmpf1 += EPSILON; tmpf2 = tmpf1; tmpf1 = powf( tmpf1, alpha ); -#ifdef ITD_WINNER_GAIN_MODIFY - if ( hStereoDft->mus_flag == 0 ) - { - tmpf4 = 1.0f; - /* Calculate smoothed spectral power density for the L/R channel */ - hStereoDft->spd_L_smooth_new[i] = ( 1.f - sfm_L ) * hStereoDft->spd_L_smooth_new[i] + sfm_L * Spd_L[i]; - hStereoDft->spd_R_smooth_new[i] = ( 1.f - sfm_L ) * hStereoDft->spd_R_smooth_new[i] + sfm_L * Spd_R[i]; - /* Calculate cross spectral power density using the smoothed spectral power density*/ - tmpf4 = (float) sqrt( hStereoDft->spd_L_smooth_new[i] ) * sqrt( hStereoDft->spd_R_smooth_new[i] ); - /* Calculate the value of weighted function for each frequency bin */ - tmpf4 += EPSILON; - if ( hStereoDft->noise_coherence > 0.25f ) - { - tmpf4 = tmpf1 * pow( tmpf2, 2.0f ) * pow( tmpf4, -2.0f ); - tmpf3 += tmpf2 * tmpf1; - tmpf3 -= tmpf2 * tmpf4; - } - else - { - tmpf4 = tmpf2 * pow( tmpf4, -2.0f ); - } - /* Calculate the value of weighted generlized cross-correlation function for each frequency bin */ - xcorr[2 * i] = hItd->xcorr_smooth[2 * i] * tmpf4; - xcorr[2 * i + 1] = hItd->xcorr_smooth[2 * i + 1] * tmpf4; - } - else - { - tmpf3 += tmpf2 * tmpf1; - xcorr[2 * i] = hItd->xcorr_smooth[2 * i] * tmpf1; - xcorr[2 * i + 1] = hItd->xcorr_smooth[2 * i + 1] * tmpf1; - } -#else tmpf3 += tmpf2 * tmpf1; xcorr[2 * i] = hItd->xcorr_smooth[2 * i] * tmpf1; xcorr[2 * i + 1] = hItd->xcorr_smooth[2 * i + 1] * tmpf1; -#endif - } - } -#ifdef ITD_WINNER_GAIN_MODIFY - if ( hStereoDft->mus_flag == 0 ) - { - if ( hStereoDft->noise_coherence > 0.25f ) - { - tmpf1 = (float) ( NFFT / 2 + 1 ) / tmpf3; - for ( i = 0; i < NFFT; i++ ) - { - xcorr[i] *= tmpf1; - } - } - else - { - for ( i = NFFT / 2; i < NFFT; i++ ) - { - xcorr[i] = 0.0f; - } } } -#else tmpf1 = (float) ( NFFT / 2 + 1 ) / tmpf3; for ( i = 0; i < NFFT; i++ ) { xcorr[i] *= tmpf1; } -#endif /*calculate mean E ratio of main to background signal for cohSNR*/ if ( hCPE->element_mode == IVAS_CPE_DFT ) { diff --git a/lib_enc/ivas_stereo_dmx_evs.c b/lib_enc/ivas_stereo_dmx_evs.c index 052970fa70c14831fb4768897e0e59ac17383095..a5c0fe147f0055724024771e5133507e08ccab36 100644 --- a/lib_enc/ivas_stereo_dmx_evs.c +++ b/lib_enc/ivas_stereo_dmx_evs.c @@ -946,16 +946,22 @@ ivas_error stereo_dmx_evs_init_encoder( *-------------------------------------------------------------------*/ void stereo_dmx_evs_close_encoder( - STEREO_DMX_EVS_ENC_HANDLE hStereoDmxEVS /* i/o: Stereo downmix for EVS encoder handle */ + STEREO_DMX_EVS_ENC_HANDLE *hStereoDmxEVS /* i/o: Stereo downmix for EVS encoder handle */ ) { - if ( hStereoDmxEVS->hPOC != NULL ) + if ( hStereoDmxEVS == NULL || *hStereoDmxEVS == NULL ) { - free( hStereoDmxEVS->hPOC ); - hStereoDmxEVS->hPOC = NULL; + return; } - free( hStereoDmxEVS ); + if ( ( *hStereoDmxEVS )->hPOC != NULL ) + { + free( ( *hStereoDmxEVS )->hPOC ); + ( *hStereoDmxEVS )->hPOC = NULL; + } + + free( ( *hStereoDmxEVS ) ); + ( *hStereoDmxEVS ) = NULL; return; } diff --git a/lib_enc/ivas_stereo_mdct_core_enc.c b/lib_enc/ivas_stereo_mdct_core_enc.c index 9500da4fb9d21b5e7181d2349306a66fc5e46774..2e739cc90651f43dc4f4d7d9adb4e733425e15fd 100644 --- a/lib_enc/ivas_stereo_mdct_core_enc.c +++ b/lib_enc/ivas_stereo_mdct_core_enc.c @@ -235,7 +235,8 @@ void stereo_mdct_core_enc( *---------------------------------------------------------------*/ ivas_mdct_core_whitening_enc( hCPE, new_samples, old_wsp, pitch_buf, p_mdst_spectrum_long, - tnsBits, p_orig_spectrum_long, tnsSize, p_param, hBstr, NULL, 0, CPE_CHANNELS ); + tnsBits, p_orig_spectrum_long, tnsSize, p_param, hBstr, + 0, CPE_CHANNELS ); for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { @@ -449,7 +450,8 @@ void stereo_mdct_core_enc( } #endif - ivas_mdct_quant_coder( hCPE, 0, tnsBits, tnsSize, p_param, 0 ); + ivas_mdct_quant_coder( hCPE, + tnsBits, tnsSize, p_param, 0 ); pop_wmops(); diff --git a/lib_enc/ivas_stereo_switching_enc.c b/lib_enc/ivas_stereo_switching_enc.c index 1be9af224e8341d63fbfbfd1763d3d8820fd2519..fca3c7785eab9e833c538536f7f61fc9fb99ebf3 100644 --- a/lib_enc/ivas_stereo_switching_enc.c +++ b/lib_enc/ivas_stereo_switching_enc.c @@ -526,7 +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, st->mct_chan_mode ); + st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode ); /* allocate and initialize MDCT stereo structure */ if ( ( hCPE->hStereoMdct = (STEREO_MDCT_ENC_DATA_HANDLE) malloc( sizeof( STEREO_MDCT_ENC_DATA ) ) ) == NULL ) diff --git a/lib_enc/ivas_tcx_core_enc.c b/lib_enc/ivas_tcx_core_enc.c index 3971c6740edf18f5608ab7ec590f765dc0ed736e..e334f4d0298b6fc9d00f108b3531f59028e0bacf 100644 --- a/lib_enc/ivas_tcx_core_enc.c +++ b/lib_enc/ivas_tcx_core_enc.c @@ -99,10 +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, st->mct_chan_mode ); + st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_mode ); if ( st->element_mode != EVS_MONO ) { - st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode, st->mct_chan_mode ); + st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode ); } st->core_brate = st->total_brate; @@ -457,11 +457,7 @@ void stereo_tcx_core_enc( mvr2r( lsp_q, st->lsp_old, M ); } -#ifdef PARAM_ISM_DTX_CNG if ( st->Opt_DTX_ON && !st->tcxonly && st->hTdCngEnc != NULL ) -#else - if ( st->Opt_DTX_ON && !st->tcxonly ) -#endif { /* update CNG parameters in active frames */ if ( st->bwidth == NB && st->enableTcxLpc && st->core != ACELP_CORE ) diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c old mode 100755 new mode 100644 index 7ed8d4f2ec2f2d967147be2326ecb124e5fd1e09..45d4c856837432451c385ce5b194b79591cb519e --- a/lib_enc/lib_enc.c +++ b/lib_enc/lib_enc.c @@ -61,6 +61,7 @@ struct IVAS_ENC bool ismMetadataProvided[MAX_NUM_OBJECTS]; bool maxBandwidthUser; /* Was a specific max bandwith selected by the user? */ IVAS_ENC_BANDWIDTH newBandwidthApi; /* maximum encoded bandwidth, as set on API level */ + bool extMetadataApi; /* External metadata requested, to be checked against current bit rate */ }; /*---------------------------------------------------------------------* @@ -75,7 +76,7 @@ static int16_t getInputBufferSize( const Encoder_Struct *st_ivas ); static ivas_error doCommonConfigureChecks( IVAS_ENC_HANDLE hIvasEnc ); static ivas_error doCommonSetterChecks( IVAS_ENC_HANDLE hIvasEnc ); static ivas_error sanitizeBandwidth( const IVAS_ENC_HANDLE hIvasEnc ); -static ivas_error sanitizeBitrateISM( const ENCODER_CONFIG_HANDLE hEncoderConfig ); +static ivas_error sanitizeBitrateISM( const ENCODER_CONFIG_HANDLE hEncoderConfig, const IVAS_ENC_HANDLE hIvasEnc ); static void init_encoder_config( ENCODER_CONFIG_HANDLE hEncoderConfig ); static void resetIsmMetadataProvidedFlags( IVAS_ENC_HANDLE hIvasEnc ); static ivas_error bandwidthApiToInternal( const IVAS_ENC_BANDWIDTH maxBandwidth, int16_t *internalMaxBandwidth ); @@ -366,7 +367,8 @@ ivas_error IVAS_ENC_ConfigureForObjects( const bool max_bwidth_user, /* i : shows if bandwidth limitation was set by the user (true) or if default bandwidth was used (false) */ const IVAS_ENC_BANDWIDTH maxBandwidth, /* i : bandwidth limitation */ const IVAS_ENC_DTX_CONFIG dtxConfig, /* i : configuration of DTX, can by set to default by using IVAS_ENC_GetDefaultDtxConfig() */ - const uint16_t numObjects /* i : number of objects to be encoded */ + const uint16_t numObjects, /* i : number of objects to be encoded */ + const bool ism_extended_metadata /* i : Extended metadata used (true/false), where extended metadata includes radius and orientation */ ) { Encoder_Struct *st_ivas; @@ -386,7 +388,9 @@ ivas_error IVAS_ENC_ConfigureForObjects( st_ivas->hEncoderConfig->ivas_format = ISM_FORMAT; st_ivas->hEncoderConfig->element_mode_init = IVAS_SCE; st_ivas->hEncoderConfig->nchan_inp = numObjects; - + st_ivas->hEncoderConfig->nchan_ism = numObjects; + st_ivas->hEncoderConfig->ism_extended_metadata_flag = ism_extended_metadata; + hIvasEnc->extMetadataApi = ( ism_extended_metadata == 1 ); hIvasEnc->maxBandwidthUser = max_bwidth_user; error = configureEncoder( hIvasEnc, inputFs, bitrate, maxBandwidth, dtxConfig, IVAS_ENC_GetDefaultChannelAwareConfig() ); @@ -426,7 +430,8 @@ 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 ); + error = ivas_set_ism_metadata( hIvasEnc->st_ivas->hIsmMetaData[ismIndex], metadata.azimuth, metadata.elevation, metadata.radius, metadata.yaw, metadata.pitch ); + if ( error != IVAS_ERR_OK ) { return error; @@ -776,7 +781,7 @@ static ivas_error configureEncoder( } else if ( hEncoderConfig->ivas_format == ISM_FORMAT ) { - if ( ( error = sanitizeBitrateISM( hEncoderConfig ) ) != IVAS_ERR_OK ) + if ( ( error = sanitizeBitrateISM( hEncoderConfig, hIvasEnc ) ) != IVAS_ERR_OK ) { return error; } @@ -873,28 +878,17 @@ static ivas_error configureEncoder( return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "8kHz input sampling rate is not supported in IVAS." ); } -#ifdef PARAM_ISM_DTX_CNG - if ( hEncoderConfig->Opt_DTX_ON && hEncoderConfig->ivas_format != MONO_FORMAT && - ( ( 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 - ( 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 - ) ) -#else if ( hEncoderConfig->Opt_DTX_ON && hEncoderConfig->ivas_format != MONO_FORMAT && - ( ( hEncoderConfig->ivas_format == ISM_FORMAT && hEncoderConfig->nchan_inp > 1 ) || // ToDo: see Issue 113 - ( hEncoderConfig->ivas_format == MASA_FORMAT && hEncoderConfig->ivas_total_brate > IVAS_128k ) || // ToDo: remove the bitrate limitation + ( ( hEncoderConfig->ivas_format == MASA_FORMAT && hEncoderConfig->ivas_total_brate > IVAS_128k ) || // ToDo: remove the bitrate limitation ( hEncoderConfig->ivas_format == SBA_FORMAT && ivas_get_sba_num_TCs( hEncoderConfig->ivas_total_brate, 1 ) > 2 ) || // ToDo: support for 3+ TCs to be done hEncoderConfig->ivas_format == MC_FORMAT // ToDo: TBD ) ) -#endif { 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." ); } @@ -919,12 +913,6 @@ static ivas_error configureEncoder( return error; } -#ifdef PARAM_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 ) { @@ -969,11 +957,7 @@ ivas_error IVAS_ENC_GetDelay( return IVAS_ERR_UNEXPECTED_NULL_POINTER; } -#ifdef BINAURALIZATION_DELAY_REPORT *delay = NS2SA( hEncoderConfig->input_Fs, get_delay( ENC, hEncoderConfig->input_Fs, hEncoderConfig->ivas_format, NULL ) ); -#else - *delay = NS2SA( hEncoderConfig->input_Fs, get_delay( ENC, hEncoderConfig->input_Fs, hEncoderConfig->ivas_format, NULL, 0 ) ); -#endif *delay *= hEncoderConfig->nchan_inp; @@ -994,7 +978,6 @@ static int16_t getInputBufferSize( return (int16_t) ( st_ivas->hEncoderConfig->input_Fs * st_ivas->hEncoderConfig->nchan_inp / FRAMES_PER_SEC ); } -#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS /*---------------------------------------------------------------------* * IVAS_ENC_GetNumInChannels() * @@ -1019,7 +1002,6 @@ ivas_error IVAS_ENC_GetNumInChannels( return IVAS_ERR_OK; } -#endif /*---------------------------------------------------------------------* @@ -1538,11 +1520,11 @@ static ivas_error printConfigInfo_enc( { if ( hEncoderConfig->ivas_total_brate <= ACELP_32k && hEncoderConfig->nchan_inp > 2 ) { - fprintf( stdout, "IVAS format: Param-ISm (%i streams)\n", hEncoderConfig->nchan_inp ); + fprintf( stdout, "IVAS format: Param-ISM (%i streams)\n", hEncoderConfig->nchan_inp ); } else { - fprintf( stdout, "IVAS format: ISm (%i streams)\n", hEncoderConfig->nchan_inp ); + fprintf( stdout, "IVAS format: ISM (%i streams)\n", hEncoderConfig->nchan_inp ); } } else if ( hEncoderConfig->ivas_format == SBA_FORMAT ) @@ -1744,7 +1726,7 @@ static ivas_error setBitrate( if ( hEncoderConfig->ivas_format == ISM_FORMAT ) { - if ( ( error = sanitizeBitrateISM( hEncoderConfig ) ) != IVAS_ERR_OK ) + if ( ( error = sanitizeBitrateISM( hEncoderConfig, hIvasEnc ) ) != IVAS_ERR_OK ) { return error; } @@ -1983,9 +1965,9 @@ static ivas_error sanitizeBandwidth( *---------------------------------------------------------------------*/ static ivas_error sanitizeBitrateISM( - const ENCODER_CONFIG_HANDLE hEncoderConfig ) + const ENCODER_CONFIG_HANDLE hEncoderConfig, + const IVAS_ENC_HANDLE hIvasEnc ) { -#ifdef ISM_HIGHEST_BITRATE if ( hEncoderConfig->ivas_total_brate > IVAS_128k && hEncoderConfig->nchan_inp == 1 ) { return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too high bitrate for 1 ISM specified in IVAS: %d", hEncoderConfig->ivas_total_brate ); @@ -2000,12 +1982,6 @@ static ivas_error sanitizeBitrateISM( { return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too high bitrate for 3 ISM specified in IVAS: %d", hEncoderConfig->ivas_total_brate ); } -#else - if ( hEncoderConfig->ivas_total_brate > IVAS_256k ) - { - return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too high bitrate for ISm specified in IVAS: %d", hEncoderConfig->ivas_total_brate ); - } -#endif if ( hEncoderConfig->ivas_total_brate < IVAS_16k4 && hEncoderConfig->nchan_inp == 2 ) { @@ -2022,6 +1998,15 @@ 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 ); } + if ( hIvasEnc->extMetadataApi ) + { + hEncoderConfig->ism_extended_metadata_flag = ( hEncoderConfig->ivas_total_brate >= ISM_EXTENDED_METADATA_BRATE ); + } + else + { + hEncoderConfig->ism_extended_metadata_flag = 0; + } + return IVAS_ERR_OK; } @@ -2277,8 +2262,10 @@ static void init_encoder_config( hEncoderConfig->var_SID_rate_flag = 1; hEncoderConfig->mc_input_setup = MC_LS_SETUP_INVALID; hEncoderConfig->stereo_dmx_evs = 0; + hEncoderConfig->nchan_ism = 0; hEncoderConfig->sba_order = 0; hEncoderConfig->sba_planar = 0; + hEncoderConfig->ism_extended_metadata_flag = 0; #ifdef DEBUGGING hEncoderConfig->stereo_mode_cmdl = 0; hEncoderConfig->force = -1; diff --git a/lib_enc/lib_enc.h b/lib_enc/lib_enc.h index 74308226420f551ccae785ec374fd0c387fe772f..349c41ebef721a1b65be35235e7a17e63a1de4e4 100644 --- a/lib_enc/lib_enc.h +++ b/lib_enc/lib_enc.h @@ -180,7 +180,8 @@ ivas_error IVAS_ENC_ConfigureForObjects( const bool max_bwidth_user, /* i : shows if bandwidth limitation was set by the user (true) or if default bandwidth was used (false) */ const IVAS_ENC_BANDWIDTH maxBandwidth, /* i : bandwidth limitation */ const IVAS_ENC_DTX_CONFIG dtxConfig, /* i : configuration of DTX, can by set to default by using IVAS_ENC_GetDefaultDtxConfig() */ - const uint16_t numObjects /* i : number of objects to be encoded */ + const uint16_t numObjects, /* i : number of objects to be encoded */ + const bool ism_extended_metadata /* i : Extended metadata used (true/false), where extended metadata includes radius and orientation */ ); /*! r: error code */ @@ -298,13 +299,11 @@ ivas_error IVAS_ENC_GetDelay( int16_t *delay /* o : encoder delay */ ); -#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS /*! r: encoder error code */ ivas_error IVAS_ENC_GetNumInChannels( const IVAS_ENC_HANDLE hIvasEnc, /* i/o: IVAS encoder handle */ int16_t *numInChannels /* o : total number of samples expected in the input buffer for current encoder configuration */ ); -#endif /*! r: encoder error code */ ivas_error IVAS_ENC_GetInputBufferSize( 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..0f7a798a75a8971530b55965a1ae43a7cb1b5a64 100644 --- a/lib_enc/lsf_msvq_ma_enc.c +++ b/lib_enc/lsf_msvq_ma_enc.c @@ -48,25 +48,285 @@ #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 ); + + +#ifdef ERI_MSVQ_CLEANUP + +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; +} +#endif + + /*--------------------------------------------------------------------------* * msvq_enc() * * MSVQ encoder *--------------------------------------------------------------------------*/ - void msvq_enc( - const float *const *cb, /* i : Codebook (indexed cb[*stages][levels][p]) */ - const int16_t dims[], /* i : Dimension of each codebook stage (NULL: full dim.) */ - 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 +337,51 @@ 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; +#ifndef ERI_MSVQ_CLEANUP + /* buffers */ + float dct_target[FDCNG_VQ_DCT_MAXTRUNC]; + float u_mr[FDCNG_VQ_MAX_LEN]; + float u_mr_scaled[FDCNG_VQ_MAX_LEN]; + float mse_trunc_all_segms; + float mse_trunc_segm[FDCNG_VQ_DCT_NSEGM]; + float mse; + + const Word8 *cbpW8; + const Word16 *dct_col_shift_tab; + + float *st1_mse_pair; + int16_t *st1_idx_pair; + int16_t indices_st1_local[FDCNG_VQ_DCT_NSEGM * 2]; /* after stage#1 DCT search this is copied to the global indices[1][s*stages] structure */ + int16_t n_ana, p_mins[2], idx_min[2]; + DCTTYPE dcttype = DCT_T2_24_XX; + float tmp2; + + int16_t check_ind[FDCNG_VQ_DCT_NPOST]; + int16_t segm, j_full, maxC_pre; +#endif + 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 */ +#ifdef ERI_MSVQ_CLEANUP + 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 */ +#else + float res24, high_diff[FDCNG_VQ_MAX_LEN - FDCNG_VQ_MAX_LEN_WB]; + maxC_pre = ( FDCNG_VQ_DCT_NSEGM * 2 ); +#endif + 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 */ + +#ifndef ERI_MSVQ_CLEANUP + dcttype = DCT_T2_24_XX; +#endif + /*----------------------------------------------------------------* - * Allocate memory for previous (parent) and current nodes. + * Allocate memory for previous (parent) and current nodes. * Parent node is indexed [0], current node is indexed [1]. *----------------------------------------------------------------*/ @@ -159,84 +461,235 @@ void msvq_enc( { dist[1][j] = FLT_MAX; } - if ( !s ) /* means: m==1 */ + +#ifdef ERI_MSVQ_CLEANUP + 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 */ + indices[1][c * stages] = indices_st1_local[c]; + } + } +#else + if ( !s && applyDCT_flag != 0 ) /* means: m==1 */ + { /* stage 1 search in truncated dct domain without any weights */ - 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] ) + n_ana = FDCNG_VQ_MAX_LEN; /* VQ stage#1 core is always using stored DCT24 coeffs */ + /*remove mean/mid fdcng stage#1 vector, in original subband domain */ + v_sub( u, cdk1r_tr_midQ_truncQ, u_mr, n_ana ); + + v_multc( u_mr, fdcng_dct_invScaleF[1], u_mr_scaled, n_ana ); /*scale up target to upscaled W8x storage domain */ + /* 16.0-->scale up from Q0 to search domain in Q4, not really needed in BASOP , impl. by shifts */ + + assert( n_ana >= FDCNG_VQ_DCT_MAXTRUNC ); /* check for WB , SWB, FB operation */ + + dctT2_N_apply_matrix( (const float *) u_mr_scaled, dct_target, min( FDCNG_VQ_DCT_MAXTRUNC, n_ana ), n_ana, invTrfMatrix, FDCNG_VQ_DCT_MAXTRUNC, dcttype ); + + mse_trunc_all_segms = 0; + mse = 0; + + /* init search state ptr's at the top */ + for ( segm = 0; segm < FDCNG_VQ_DCT_NSEGM; segm++ ) + { + /* point to a new paired location */ + st1_mse_pair = &( dist[1][2 * segm] ); /* req. ptr init +=2 */ + st1_mse_pair[0] = FLT_MAX; /* req */ + st1_mse_pair[1] = FLT_MAX; /* req */ + st1_idx_pair = &( indices_st1_local[2 * segm] ); /* +=2 */ + p_max = 0; /* req. to point to 1 or 0 */ + + /* compute segment common trunction error in dct domain */ + mse_trunc_segm[segm] = mse_trunc_all_segms; + mse_trunc_segm[segm] += sum2_f( (const float *) ( &( dct_target[cdk1_ivas_cols_per_segment[segm]] ) ), cdk1_ivas_trunc_dct_cols_per_segment[segm] ); + + cbpW8 = cdk_37bits_ivas_stage1_W8Qx_dct_sections[segm]; /* Word8 column variable Qx storage*/ + + for ( j = 0; j < cdk1_ivas_entries_per_segment[segm]; j++ ) { - /* Replace worst */ - dist[1][p_max] = tmp; - indices[1][p_max * stages] = j; - parents[p_max] = 0; + /* unweighted segmented search DCT domain loop */ + j_full = j + cdk1_ivas_cum_entries_per_segment[segm]; /* or simply use j_full++ */ - p_max = 0; - for ( c2 = 1; c2 < maxC; c2++ ) + mse = mse_trunc_segm[segm]; /* move32() init mse with with common mse truncation part */ + + dct_col_shift_tab = stage1_dct_col_syn_shift[segm]; /* ptr init */ + + for ( c2 = 0; c2 < cdk1_ivas_cols_per_segment[segm]; c2++ ) { - if ( dist[1][c2] > dist[1][p_max] ) - { - p_max = 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*/ } - } /* if (tmp <= dist[1][p_max]) */ - } /* for (j=0; j also update mse */ + st1_mse_pair[p_max] = mse; /* move32(), single BASOP */ + } /* BASOP 3 ops */ + /* avoid WC costly list management by always updating p_max, as we have only a pair to maintain */ + p_max = 0; /* move16() */ + if ( ( st1_mse_pair[0] - st1_mse_pair[1] ) < 0 ) /* L_sub()*/ + { + p_max = 1; /* move16() */ + } /* BASOP 3 ops ,Note 2 ops possible in BASOP with L_sub and L_lshr */ + + /* Note: logical shift right not available in ANSI-C */ + /* p_max = (st1_mse_pair[0] - st1_mse_pair[1]) ">>>" 31; */ + /* in java logical shift right is available as >>> , in BASOP it is L_lshr */ + + /* Cost: weighted sum with cond moves ('if') => 8 in float , 7 in BASOP with L_lshr */ + } /* j in section */ + + } /* next segment */ + + for ( j = 0; j < maxC_pre; j++ ) + { + /* compute_full mse using stored DCT24 domain MSE's */ + /* calculate MSE from stage1 inner using existing inner DCT domain variables */ + dist[1][j] *= fdcng_dct_scaleF[2]; /* single multiplication to get the MSE scale to the correct input domain */ + } + + p_max = maximum( dist[1], maxC_pre, NULL ); /* establish current worst candidate for stage#2 among all maxC_pre candidates */ + + p_mins[0] = minimum( dist[1], maxC_pre, NULL ); /* find best entry among all maxC_pre */ + tmp = dist[1][p_mins[0]]; + dist[1][p_mins[0]] = FLT_MAX; /* exclude 1st */ + + p_mins[1] = minimum( dist[1], maxC_pre, NULL ); /* find 2nd best entry */ + tmp2 = dist[1][p_mins[1]]; + dist[1][p_mins[1]] = FLT_MAX; /* exclude 2nd*/ + + dist[1][p_mins[0]] = tmp; /* restore 1st */ + dist[1][p_mins[1]] = tmp2; /* restore 2nd */ + + idx_min[0] = indices_st1_local[p_mins[0]]; + idx_min[1] = indices_st1_local[p_mins[1]]; + + + /* use global exclusion list to never reselect the two (best) mse values sofar */ + st1_mse_ptr[idx_min[0]] = FLT_MAX; /* move32() */ + st1_mse_ptr[idx_min[1]] = FLT_MAX; /* move32() */ + + /* circular MSE-neigbour list in use to potentially replace some segment search candidates */ + /* using both 1st and 2nd best neighbours in fwd and rev directions */ + check_ind[0] = cdk1_ivas_segm_neighbour_fwd[idx_min[0]]; + check_ind[1] = cdk1_ivas_segm_neighbour_rev[idx_min[0]]; + + check_ind[2] = cdk1_ivas_segm_neighbour_fwd[idx_min[1]]; + check_ind[3] = cdk1_ivas_segm_neighbour_rev[idx_min[1]]; + + check_ind[4] = cdk1_ivas_segm_neighbour_fwd[check_ind[0]]; + check_ind[5] = cdk1_ivas_segm_neighbour_rev[check_ind[1]]; + + check_ind[6] = cdk1_ivas_segm_neighbour_fwd[check_ind[2]]; + check_ind[7] = cdk1_ivas_segm_neighbour_rev[check_ind[3]]; + + for ( i = 0; i < FDCNG_VQ_DCT_NPOST; i++ ) { - en = 0.0f; - /* w,Tmp */ - /* Compute weighted codebook element and its energy */ - for ( c2 = 0; c2 < n; c2++ ) + float check_mse = st1_mse_ptr[check_ind[i]] * fdcng_dct_scaleF[2]; + /* *= fdcng_dct_scaleF[2]; */ /* multiplication in use to get the float outer loop scale correct */ + + if ( check_mse < dist[1][p_max] ) { - Tmp[start + c2] = w[start + c2] * cbp[c2]; - en += cbp[c2] * Tmp[start + c2]; + /* new winner , replace */ + dist[1][p_max] = check_mse; + indices_st1_local[p_max] = check_ind[i]; + st1_mse_ptr[check_ind[i]] = FLT_MAX; /* BASOP: move32() */ + p_max = maximum( dist[1], maxC_pre, NULL ); /* establish a new current worst candidate among all maxC */ } - cbp += maxn; /* pointer is incremented */ + } + + for ( c = 0; c < maxC_pre; c++ ) + { + indices[1][c * stages] = indices_st1_local[c]; /* move established stage#1 indices to global MSVQ list structure */ + } + /* extract the selected stage one vectors in DCT domain , apply IDCT_N and scale up */ + /*always extract full length signal(24) to be able to update WB( N==21) candidate MSE values */ + for ( c = 0; c < maxC_pre; c++ ) + { + dec_FDCNG_MSVQ_stage1( indices_st1_local[c], FDCNG_VQ_MAX_LEN, invTrfMatrix, dcttype + 1, &( st1_syn_vec_ptr[c * FDCNG_VQ_MAX_LEN] ), NULL ); + } + + assert( maxC == maxC_pre ); + } +#endif + else + /* non-DCT Stage #1 code below */ + if ( !s ) /* means: m==1 */ + { + /* This loop is identical to the one below, except, that the inner + loop over c=0..m is hardcoded to c=0, since m=1. */ /* dist[0][0] */ - pTmp = &resid[0][0]; - /* Iterate over all parent nodes */ - for ( c = 0; c < m; c++ ) + for ( j = 0; j < levels[s]; j++ ) { - /* Tmp[0] */ + 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][c]; + tmp += dist[0][0]; if ( tmp < dist[1][p_max] ) { /* Replace worst */ dist[1][p_max] = tmp; - indices[1][p_max * stages + s] = j; - parents[p_max] = c; + indices[1][p_max * stages] = j; + parents[p_max] = 0; p_max = 0; for ( c2 = 1; c2 < maxC; c2++ ) @@ -247,9 +700,58 @@ void msvq_enc( } } } /* if (tmp <= dist[1][p_max]) */ - } /* for(c=0; c dist[1][p_max] ) + { + p_max = c2; + } + } + } /* if (tmp <= dist[1][p_max]) */ + } /* for(c=0; cinput, NULL, enerBuffer ); + bw_detect( st, st->input, NULL, enerBuffer, + 0 ); /*----------------------------------------------------------------* * Noise energy down-ward update and total noise energy estimation @@ -253,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 *----------------------------------------------------------------*/ @@ -616,7 +616,7 @@ void pre_proc( st->gamma = GAMMA16k; } - st->igf = getIgfPresent( EVS_MONO, st->total_brate, st->bwidth, st->rf_mode, MCT_CHAN_MODE_REGULAR ); /* TBV: needs checking */ + st->igf = getIgfPresent( EVS_MONO, st->total_brate, st->bwidth, st->rf_mode ); } st->coder_type = st->coder_type_raw; 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/rst_enc.c b/lib_enc/rst_enc.c index 2f19c41665aba07c87b803d0589eb8e2041e6090..3a2041875941a62f4e4b09796f49084332c77ad4 100644 --- a/lib_enc/rst_enc.c +++ b/lib_enc/rst_enc.c @@ -84,15 +84,11 @@ void CNG_reset_enc( set_f( voice_factors, 1.0, NB_SUBFR16k ); -#ifdef PARAM_ISM_DTX_CNG if ( st->hTdCngEnc != NULL ) { -#endif /* Reset active frame counter */ st->hTdCngEnc->act_cnt2 = 0; -#ifdef PARAM_ISM_DTX_CNG } -#endif /* deactivate bass post-filter */ st->bpf_off = 1; diff --git a/lib_enc/speech_music_classif.c b/lib_enc/speech_music_classif.c index cf8568e649db982127b0cd978a935d7f28b97b2f..80bd2d6d2a8cc8aeb9c7d334e13959d824c0736e 100644 --- a/lib_enc/speech_music_classif.c +++ b/lib_enc/speech_music_classif.c @@ -1828,6 +1828,9 @@ void ivas_smc_mode_selection( float ton; int16_t i; float S_p2a, S_max, S_ave; +#ifdef FIX_SP2A + float thr_sp2a; +#endif SP_MUS_CLAS_HANDLE hSpMusClas = st->hSpMusClas; @@ -1858,8 +1861,23 @@ void ivas_smc_mode_selection( S_ave = sum_f( st->hSpMusClas->tod_lt_Bin_E, TOD_NSPEC ) / TOD_NSPEC; S_p2a = S_max - S_ave; +#ifdef FIX_SP2A + if ( element_brate <= IVAS_16k4 ) + { + thr_sp2a = THR_P2A_HIGH; + } + else + { + thr_sp2a = THR_P2A; + } +#endif + /* initial 3-way selection of coding modes (ACELP/GSC/TCX) */ +#ifdef FIX_SP2A + if ( relE > -10.0f && ( S_p2a > thr_sp2a || ton > hSpMusClas->tod_thr_lt ) ) +#else if ( relE > -10.0f && ( S_p2a > THR_P2A || ton > hSpMusClas->tod_thr_lt ) ) +#endif { /* select TCX to encode extremely peaky signals or strongly tonal signals */ st->sp_aud_decision1 = 1; diff --git a/lib_enc/transient_detection.c b/lib_enc/transient_detection.c index 91106686c091fe908b9fd9955a479335c6a42963..1f8b36819f22bfa028814c617b723c4f0760a872 100644 --- a/lib_enc/transient_detection.c +++ b/lib_enc/transient_detection.c @@ -324,86 +324,74 @@ void SetTCXModeInfo( hTcxEnc->tcxMode = NO_TCX; } } - - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) + /* set the left window overlap */ + if ( st->last_core == ACELP_CORE || st->last_core == AMR_WB_CORE ) + { + st->hTcxCfg->tcx_last_overlap_mode = TRANSITION_OVERLAP; + } + else if ( ( hTcxEnc->tcxMode == TCX_10 ) && ( st->hTcxCfg->tcx_curr_overlap_mode == ALDO_WINDOW ) ) + { + st->hTcxCfg->tcx_last_overlap_mode = FULL_OVERLAP; + } + else { - hTcxEnc->tcxMode = TCX_20; - *tcxModeOverlap = FULL_OVERLAP; st->hTcxCfg->tcx_last_overlap_mode = st->hTcxCfg->tcx_curr_overlap_mode; } - - if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + /* determine the right window overlap */ + if ( hTcxEnc->tcxMode == TCX_10 ) { - /* set the left window overlap */ - if ( st->last_core == ACELP_CORE || st->last_core == AMR_WB_CORE ) + if ( hTranDet->transientDetector.attackIndex < 0 ) { - st->hTcxCfg->tcx_last_overlap_mode = TRANSITION_OVERLAP; - } - else if ( ( hTcxEnc->tcxMode == TCX_10 ) && ( st->hTcxCfg->tcx_curr_overlap_mode == ALDO_WINDOW ) ) - { - st->hTcxCfg->tcx_last_overlap_mode = FULL_OVERLAP; + *tcxModeOverlap = HALF_OVERLAP; } else { - st->hTcxCfg->tcx_last_overlap_mode = st->hTcxCfg->tcx_curr_overlap_mode; - } - - /* determine the right window overlap */ - if ( hTcxEnc->tcxMode == TCX_10 ) - { - if ( hTranDet->transientDetector.attackIndex < 0 ) - { - *tcxModeOverlap = HALF_OVERLAP; - } - else + *tcxModeOverlap = hTranDet->transientDetector.attackIndex % 4; + if ( *tcxModeOverlap == 1 ) { - *tcxModeOverlap = 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; } } } + 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 cc2d5fce36637a9b754806d76706c54bb838f73f..6b8c595f5e1ca9b36c3c728a48a6c8711b78772b 100644 --- a/lib_enc/updt_enc.c +++ b/lib_enc/updt_enc.c @@ -408,7 +408,7 @@ void updt_enc_common( st->gamma = GAMMA16k; } - st->igf = getIgfPresent( EVS_MONO, st->total_brate, st->bwidth, st->rf_mode, MCT_CHAN_MODE_REGULAR ); + st->igf = getIgfPresent( EVS_MONO, st->total_brate, st->bwidth, st->rf_mode ); } /* update FER clas */ diff --git a/lib_rend/ivas_crend.c b/lib_rend/ivas_crend.c index caf9a562d5082559e49be3623c7acb116229dca8..c05ae7c2626401afd599719743834488a63786fd 100644 --- a/lib_rend/ivas_crend.c +++ b/lib_rend/ivas_crend.c @@ -147,1225 +147,6 @@ static ivas_error ivas_hrtf_close( return IVAS_ERR_OK; } - -#ifndef FIX_197_CREND_INTERFACE -/*------------------------------------------------------------------------- - * ivas_crend_init_from_rom() - * - * Allocate and initialize crend renderer handle - *------------------------------------------------------------------------*/ - -ivas_error ivas_crend_init_from_rom( - Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ -) -{ - int16_t i, j, tmp; - int32_t output_Fs; - AUDIO_CONFIG intern_config; - HRTFS_HANDLE hHrtf; - -#ifdef FIX_197_CREND_INTERFACE - hHrtf = st_ivas->hCrendWrapper->hHrtfCrend; -#else - hHrtf = st_ivas->hHrtf; -#endif - - output_Fs = st_ivas->hDecoderConfig->output_Fs; - - intern_config = st_ivas->intern_config; - - if ( intern_config == AUDIO_CONFIG_BINAURAL || intern_config == AUDIO_CONFIG_BINAURAL_ROOM ) - { - return IVAS_ERR_INTERNAL_FATAL; - } - - if ( hHrtf == NULL ) - { - if ( ivas_hrtf_open( &hHrtf ) != IVAS_ERR_OK ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for HRTF handle" ); - } - } - - hHrtf->max_num_ir = audioCfg2channels( intern_config ); - - if ( hHrtf->max_num_ir <= 0 ) - { - return IVAS_ERR_INTERNAL_FATAL; - } - - /* Do all error checks up front so that the nested if later is easier */ - if ( st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV && st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV_ROOM ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Encountered unsupported renderer type" ); - } - - if ( intern_config != AUDIO_CONFIG_5_1 && intern_config != AUDIO_CONFIG_5_1_2 && intern_config != AUDIO_CONFIG_5_1_4 && - intern_config != AUDIO_CONFIG_7_1 && intern_config != AUDIO_CONFIG_7_1_4 && - intern_config != AUDIO_CONFIG_FOA && intern_config != AUDIO_CONFIG_HOA2 && intern_config != AUDIO_CONFIG_HOA3 ) - { - return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Encountered unsupported transport config in Crend" ); - } - - if ( ( ( st_ivas->hRenderConfig != NULL ) && !st_ivas->hRenderConfig->roomAcoustics.use_brir ) || ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV ) ) - { - if ( intern_config == AUDIO_CONFIG_5_1 || intern_config == AUDIO_CONFIG_5_1_2 || intern_config == AUDIO_CONFIG_5_1_4 || - intern_config == AUDIO_CONFIG_7_1 || intern_config == AUDIO_CONFIG_7_1_4 ) - { - hHrtf->max_num_ir -= 1; /* subtract LFE */ - hHrtf->gain_lfe = GAIN_LFE; - - if ( output_Fs == 48000 ) - { - hHrtf->latency_s = CRendBin_Combined_HRIR_latency_s; - - hHrtf->max_num_iterations = CRendBin_Combined_HRIR_max_num_iterations_48kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_Combined_HRIR_index_frequency_max_diffuse_48kHz; - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_HRIR_num_iterations_diffuse_48kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_48kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_HRIR_coeff_diffuse_re_48kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_HRIR_coeff_diffuse_im_48kHz[j]; - } - } - else if ( output_Fs == 32000 ) - { - hHrtf->latency_s = CRendBin_Combined_HRIR_latency_s; - - hHrtf->max_num_iterations = CRendBin_Combined_HRIR_max_num_iterations_32kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_Combined_HRIR_index_frequency_max_diffuse_32kHz; - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_HRIR_num_iterations_diffuse_32kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_32kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_HRIR_coeff_diffuse_re_32kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_HRIR_coeff_diffuse_im_32kHz[j]; - } - } - else if ( output_Fs == 16000 ) - { - hHrtf->latency_s = CRendBin_Combined_HRIR_latency_s; - - hHrtf->max_num_iterations = CRendBin_Combined_HRIR_max_num_iterations_16kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_Combined_HRIR_index_frequency_max_diffuse_16kHz; - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_HRIR_num_iterations_diffuse_16kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_16kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_HRIR_coeff_diffuse_re_16kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_HRIR_coeff_diffuse_im_16kHz[j]; - } - } - else - { - return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" ); - } - - for ( i = 0; i < hHrtf->max_num_ir; i++ ) - { - if ( intern_config == AUDIO_CONFIG_5_1 ) - { - tmp = channelIndex_CICP6[i]; - } - else if ( intern_config == AUDIO_CONFIG_7_1 ) - { - tmp = channelIndex_CICP12[i]; - } - else if ( intern_config == AUDIO_CONFIG_5_1_2 ) - { - tmp = channelIndex_CICP14[i]; - } - else if ( intern_config == AUDIO_CONFIG_5_1_4 ) - { - tmp = channelIndex_CICP16[i]; - } - else if ( intern_config == AUDIO_CONFIG_7_1_4 ) - { - tmp = channelIndex_CICP19[i]; - } - else - { - return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: Channel configuration not specified!\n\n" ); - } - - if ( output_Fs == 48000 ) - { - hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_HRIR_inv_diffuse_weight_48kHz[tmp]; - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - hHrtf->num_iterations[i][j] = CRendBin_Combined_HRIR_num_iterations_48kHz[tmp][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_HRIR_pIndex_frequency_max_48kHz[tmp][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_HRIR_coeff_re_48kHz[tmp][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_HRIR_coeff_im_48kHz[tmp][j]; - } - } - else if ( output_Fs == 32000 ) - { - hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_HRIR_inv_diffuse_weight_32kHz[tmp]; - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - hHrtf->num_iterations[i][j] = CRendBin_Combined_HRIR_num_iterations_32kHz[tmp][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_HRIR_pIndex_frequency_max_32kHz[tmp][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_HRIR_coeff_re_32kHz[tmp][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_HRIR_coeff_im_32kHz[tmp][j]; - } - } - else if ( output_Fs == 16000 ) - { - hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_HRIR_inv_diffuse_weight_16kHz[tmp]; - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - hHrtf->num_iterations[i][j] = CRendBin_Combined_HRIR_num_iterations_16kHz[tmp][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_HRIR_pIndex_frequency_max_16kHz[tmp][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_HRIR_coeff_re_16kHz[tmp][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_HRIR_coeff_im_16kHz[tmp][j]; - } - } - else - { - return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" ); - } - } - } - else if ( intern_config == AUDIO_CONFIG_FOA || intern_config == AUDIO_CONFIG_HOA2 || intern_config == AUDIO_CONFIG_HOA3 ) - { - if ( output_Fs == 48000 ) - { - hHrtf->latency_s = CRendBin_HOA3_HRIR_latency_s; - - 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 ( ( ( st_ivas->hRenderConfig != NULL ) && st_ivas->hRenderConfig->roomAcoustics.use_brir ) || ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) ) - { - if ( intern_config == AUDIO_CONFIG_5_1 || intern_config == AUDIO_CONFIG_5_1_2 || intern_config == AUDIO_CONFIG_5_1_4 || - intern_config == AUDIO_CONFIG_7_1 || intern_config == AUDIO_CONFIG_7_1_4 ) - { - hHrtf->max_num_ir -= 1; /* subtract LFE */ - hHrtf->gain_lfe = GAIN_LFE; - - if ( output_Fs == 48000 ) - { - hHrtf->latency_s = CRendBin_Combined_BRIR_latency_s; - - hHrtf->max_num_iterations = CRendBin_Combined_BRIR_max_num_iterations_48kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_Combined_BRIR_index_frequency_max_diffuse_48kHz; - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_BRIR_num_iterations_diffuse_48kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_48kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_BRIR_coeff_diffuse_re_48kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_BRIR_coeff_diffuse_im_48kHz[j]; - } - } - else if ( output_Fs == 32000 ) - { - hHrtf->latency_s = CRendBin_Combined_BRIR_latency_s; - - hHrtf->max_num_iterations = CRendBin_Combined_BRIR_max_num_iterations_32kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_Combined_BRIR_index_frequency_max_diffuse_32kHz; - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_BRIR_num_iterations_diffuse_32kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_32kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_BRIR_coeff_diffuse_re_32kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_BRIR_coeff_diffuse_im_32kHz[j]; - } - } - else if ( output_Fs == 16000 ) - { - hHrtf->latency_s = CRendBin_Combined_BRIR_latency_s; - - hHrtf->max_num_iterations = CRendBin_Combined_BRIR_max_num_iterations_16kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_Combined_BRIR_index_frequency_max_diffuse_16kHz; - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_BRIR_num_iterations_diffuse_16kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_16kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_BRIR_coeff_diffuse_re_16kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[j]; - } - } - else - { - return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" ); - } - - for ( i = 0; i < hHrtf->max_num_ir; i++ ) - { - if ( intern_config == AUDIO_CONFIG_5_1 ) - { - tmp = channelIndex_CICP6[i]; - } - else if ( intern_config == AUDIO_CONFIG_7_1 ) - { - tmp = channelIndex_CICP12[i]; - } - else if ( intern_config == AUDIO_CONFIG_5_1_2 ) - { - tmp = channelIndex_CICP14[i]; - } - else if ( intern_config == AUDIO_CONFIG_5_1_4 ) - { - tmp = channelIndex_CICP16[i]; - } - else if ( intern_config == AUDIO_CONFIG_7_1_4 ) - { - tmp = channelIndex_CICP19[i]; - } - else - { - return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: Channel configuration not specified!\n\n" ); - } - - if ( output_Fs == 48000 ) - { - hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_BRIR_inv_diffuse_weight_48kHz[tmp]; - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - hHrtf->num_iterations[i][j] = CRendBin_Combined_BRIR_num_iterations_48kHz[tmp][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_BRIR_pIndex_frequency_max_48kHz[tmp][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_BRIR_coeff_re_48kHz[tmp][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_BRIR_coeff_im_48kHz[tmp][j]; - } - } - else if ( output_Fs == 32000 ) - { - hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_BRIR_inv_diffuse_weight_32kHz[tmp]; - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - hHrtf->num_iterations[i][j] = CRendBin_Combined_BRIR_num_iterations_32kHz[tmp][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_BRIR_pIndex_frequency_max_32kHz[tmp][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_BRIR_coeff_re_32kHz[tmp][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_BRIR_coeff_im_32kHz[tmp][j]; - } - } - else if ( output_Fs == 16000 ) - { - hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_BRIR_inv_diffuse_weight_16kHz[tmp]; - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - hHrtf->num_iterations[i][j] = CRendBin_Combined_BRIR_num_iterations_16kHz[tmp][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_BRIR_pIndex_frequency_max_16kHz[tmp][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_BRIR_coeff_re_16kHz[tmp][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_BRIR_coeff_im_16kHz[tmp][j]; - } - } - else - { - return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" ); - } - } - } - else if ( intern_config == AUDIO_CONFIG_FOA || intern_config == AUDIO_CONFIG_HOA2 || intern_config == AUDIO_CONFIG_HOA3 ) - { - if ( output_Fs == 48000 ) - { - hHrtf->latency_s = CRendBin_HOA3_HRIR_latency_s; - - 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 - { - return IVAS_ERROR( IVAS_ERR_INTERNAL, "Unsupported intern_config type in Crend" ); - } - } - else - { - return IVAS_ERROR( IVAS_ERR_INTERNAL, "Unsupported renderer type in Crend" ); - } - -#ifdef FIX_197_CREND_INTERFACE - st_ivas->hCrendWrapper->hHrtfCrend = hHrtf; -#else - st_ivas->hHrtf = hHrtf; -#endif - - return IVAS_ERR_OK; -} -#endif - -#ifndef FIX_197_CREND_INTERFACE -/*------------------------------------------------------------------------- - * ivas_crend_init_from_hrtf_handle() - * - * Allocate and initialize Crend HRTF handle from external file - *------------------------------------------------------------------------*/ - -ivas_error ivas_crend_init_from_hrtf_handle( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - HRTFS_HANDLE hrtf ) -{ - int16_t i, j, as_lfe_filter; - const int16_t *hchannelIndex = NULL; - AUDIO_CONFIG transport_config; - - if ( st_ivas == NULL ) - { - return IVAS_ERR_INTERNAL; - } - - if ( hrtf == NULL ) - { - return IVAS_ERR_INVALID_HRTF; - } - - if ( st_ivas->hHrtf != NULL ) - { - ivas_hrtf_close( &st_ivas->hHrtf ); - } - - if ( ivas_hrtf_open( &( st_ivas->hHrtf ) ) != IVAS_ERR_OK ) - { - return IVAS_ERR_INTERNAL; - } - - if ( st_ivas->hHrtf != NULL ) - { - st_ivas->hHrtf->latency_s = hrtf->latency_s; - // st_ivas->hHrtf->max_num_ir->max_ir_len = hrtf->max_ir_len; - st_ivas->hHrtf->max_num_iterations = hrtf->max_num_iterations; - st_ivas->hHrtf->gain_lfe = hrtf->gain_lfe; - // st_ivas->hHrtf->crend_hr_gain_foa_to_bin = hrtf->crend_hr_gain_foa_to_bin; - st_ivas->hHrtf->max_num_ir = 0; - st_ivas->hIntSetup.nchan_out_woLFE = 0; - st_ivas->hIntSetup.num_lfe = 0; - st_ivas->hIntSetup.nchan_out_woLFE = 0; - - transport_config = st_ivas->intern_config == AUDIO_CONFIG_INVALID ? st_ivas->transport_config : st_ivas->intern_config; - - switch ( transport_config ) - { - case AUDIO_CONFIG_5_1: - st_ivas->hHrtf->max_num_ir = 5; - st_ivas->hHrtf->gain_lfe = GAIN_LFE; - st_ivas->hIntSetup.nchan_out_woLFE = st_ivas->hHrtf->max_num_ir; - st_ivas->hIntSetup.num_lfe = 1; - hchannelIndex = (const int16_t *) &channelIndex_CICP6; - break; - case AUDIO_CONFIG_7_1: - st_ivas->hHrtf->max_num_ir = 7; - st_ivas->hHrtf->gain_lfe = GAIN_LFE; - st_ivas->hIntSetup.nchan_out_woLFE = st_ivas->hHrtf->max_num_ir; - st_ivas->hIntSetup.num_lfe = 1; - hchannelIndex = (const int16_t *) &channelIndex_CICP12; - break; - case AUDIO_CONFIG_5_1_2: - st_ivas->hHrtf->max_num_ir = 7; - st_ivas->hHrtf->gain_lfe = GAIN_LFE; - st_ivas->hIntSetup.nchan_out_woLFE = st_ivas->hHrtf->max_num_ir; - st_ivas->hIntSetup.num_lfe = 1; - hchannelIndex = (const int16_t *) &channelIndex_CICP14; - break; - case AUDIO_CONFIG_5_1_4: - st_ivas->hHrtf->max_num_ir = 9; - st_ivas->hHrtf->gain_lfe = GAIN_LFE; - st_ivas->hIntSetup.nchan_out_woLFE = st_ivas->hHrtf->max_num_ir; - st_ivas->hIntSetup.num_lfe = 1; - hchannelIndex = (const int16_t *) &channelIndex_CICP16; - break; - case AUDIO_CONFIG_7_1_4: - st_ivas->hHrtf->max_num_ir = 11; - st_ivas->hHrtf->gain_lfe = GAIN_LFE; - st_ivas->hIntSetup.nchan_out_woLFE = st_ivas->hHrtf->max_num_ir; - st_ivas->hIntSetup.num_lfe = 1; - hchannelIndex = (const int16_t *) &channelIndex_CICP19; - break; - case AUDIO_CONFIG_FOA: - st_ivas->hIntSetup.ambisonics_order = 1; - st_ivas->hHrtf->max_num_ir = 4; - break; - case AUDIO_CONFIG_HOA2: - st_ivas->hIntSetup.ambisonics_order = 2; - st_ivas->hHrtf->max_num_ir = 9; - break; - case AUDIO_CONFIG_HOA3: - st_ivas->hIntSetup.ambisonics_order = 3; - st_ivas->hHrtf->max_num_ir = 16; - break; - default: - break; - } - - as_lfe_filter = 0; - if ( ( st_ivas->hHrtf->max_num_ir != hrtf->max_num_ir ) && ( st_ivas->hHrtf->max_num_ir + 1 == hrtf->max_num_ir ) ) - { - as_lfe_filter = 1; - hchannelIndex = NULL; - } - - if ( st_ivas->hHrtf->max_num_ir == 0 ) - { - return IVAS_ERR_INTERNAL; - } - - for ( i = 0; i < st_ivas->hHrtf->max_num_ir; i++ ) - { - int16_t tmp = i; - if ( hchannelIndex != NULL ) - { - tmp = hchannelIndex[i]; - } - if ( as_lfe_filter ) - { - if ( tmp > 2 ) - { - tmp++; - } - } - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - st_ivas->hHrtf->pOut_to_bin_re[i][j] = hrtf->pOut_to_bin_re[tmp][j]; - st_ivas->hHrtf->pOut_to_bin_im[i][j] = hrtf->pOut_to_bin_im[tmp][j]; - st_ivas->hHrtf->num_iterations[i][j] = hrtf->num_iterations[tmp][j]; - st_ivas->hHrtf->pIndex_frequency_max[i][j] = hrtf->pIndex_frequency_max[tmp][j]; - } - st_ivas->hHrtf->inv_diffuse_weight[i] = hrtf->inv_diffuse_weight[tmp]; - } - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - st_ivas->hHrtf->pOut_to_bin_diffuse_re[j] = hrtf->pOut_to_bin_diffuse_re[j]; - st_ivas->hHrtf->pOut_to_bin_diffuse_im[j] = hrtf->pOut_to_bin_diffuse_im[j]; - st_ivas->hHrtf->num_iterations_diffuse[j] = hrtf->num_iterations_diffuse[j]; - st_ivas->hHrtf->pIndex_frequency_max_diffuse[j] = hrtf->pIndex_frequency_max_diffuse[j]; - } - st_ivas->hHrtf->index_frequency_max_diffuse = hrtf->index_frequency_max_diffuse; - } - return IVAS_ERR_OK; -} - -/*------------------------------------------------------------------------- - * ivas_crend_init_from_setofhrtf() - * - * Allocate and initialize crend renderer handle - *------------------------------------------------------------------------*/ - -ivas_error ivas_crend_init_from_setofhrtf( - Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ -) -{ - ivas_error error; - AUDIO_CONFIG transport_config; - - transport_config = st_ivas->intern_config == AUDIO_CONFIG_INVALID ? st_ivas->transport_config : st_ivas->intern_config; - switch ( transport_config ) - { - case AUDIO_CONFIG_5_1: - case AUDIO_CONFIG_5_1_2: - case AUDIO_CONFIG_5_1_4: - case AUDIO_CONFIG_7_1: - case AUDIO_CONFIG_7_1_4: - if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) - { - if ( ( error = ivas_crend_init_from_hrtf_handle( st_ivas, st_ivas->hSetOfHRTF->hHRTF_brir_combined ) ) != IVAS_ERR_OK ) - { - return error; - } - } - else - { - if ( ( error = ivas_crend_init_from_hrtf_handle( st_ivas, st_ivas->hSetOfHRTF->hHRTF_hrir_combined ) ) != IVAS_ERR_OK ) - { - return error; - } - } - break; - case AUDIO_CONFIG_FOA: - case AUDIO_CONFIG_HOA2: - case AUDIO_CONFIG_HOA3: - if ( ( error = ivas_crend_init_from_hrtf_handle( st_ivas, st_ivas->hSetOfHRTF->hHRTF_hrir_hoa3 ) ) != IVAS_ERR_OK ) - { - return error; - } - break; - default: - return IVAS_ERR_INTERNAL; - } - - return IVAS_ERR_OK; -} - -#endif - -#ifndef FIX_197_CREND_INTERFACE -/*------------------------------------------------------------------------- - * ivas_crend_open() - * - * Allocate and initialize Crend renderer handle - *------------------------------------------------------------------------*/ - -ivas_error ivas_crend_open( - Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ -) -{ - int16_t i, subframe_length; - int16_t max_total_ir_len; - HRTFS_HANDLE hHrtf; - CREND_HANDLE hCrend; - ivas_error error; - - error = IVAS_ERR_OK; - subframe_length = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC ) / MAX_PARAM_SPATIAL_SUBFRAMES; - - if ( ( st_ivas->hHrtf == NULL ) && ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) ) - { - if ( st_ivas->hSetOfHRTF != NULL ) - { - if ( ( error = ivas_crend_init_from_setofhrtf( st_ivas ) ) != IVAS_ERR_OK ) - { - return error; - } - } - else - { - if ( ( error = ivas_crend_init_from_rom( st_ivas ) ) != IVAS_ERR_OK ) - { - return error; - } - } - } - - if ( ( hCrend = (CREND_HANDLE) malloc( sizeof( CREND_DATA ) ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for renderer handle" ); - } - - hCrend->lfe_delay_line = NULL; - - for ( i = 0; i < MAX_INTERN_CHANNELS; i++ ) - { - hCrend->freq_buffer_re[i] = NULL; - hCrend->freq_buffer_im[i] = NULL; - } - - for ( i = 0; i < BINAURAL_CHANNELS; i++ ) - { - hCrend->prev_out_buffer[i] = NULL; - } - - hCrend->freq_buffer_re_diffuse = NULL; - hCrend->freq_buffer_im_diffuse = NULL; - hCrend->hReverb = NULL; - hCrend->delay_line_rw_index = 0; - hCrend->diffuse_delay_line_rw_index = 0; - hCrend->hTrack = NULL; - hCrend->m_fYaw = 0; - hCrend->m_fPitch = 0; - hCrend->m_fRoll = 0; - - hHrtf = st_ivas->hHrtf; - - if ( ( hHrtf != NULL ) && ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) ) - { - max_total_ir_len = hHrtf->max_num_iterations * subframe_length; - - for ( i = 0; i < hHrtf->max_num_ir; i++ ) - { - if ( ( hCrend->freq_buffer_re[i] = (float *) malloc( sizeof( float ) * max_total_ir_len ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); - } - set_f( hCrend->freq_buffer_re[i], 0, max_total_ir_len ); - - if ( ( hCrend->freq_buffer_im[i] = (float *) malloc( sizeof( float ) * max_total_ir_len ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); - } - set_f( hCrend->freq_buffer_im[i], 0, max_total_ir_len ); - } - - for ( i = 0; i < BINAURAL_CHANNELS; i++ ) - { - if ( ( hCrend->prev_out_buffer[i] = (float *) malloc( sizeof( float ) * subframe_length ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); - } - set_f( hCrend->prev_out_buffer[i], 0, subframe_length ); - } - - max_total_ir_len = hHrtf->num_iterations_diffuse[0] * subframe_length; - - if ( max_total_ir_len > 0 ) - { - if ( ( hCrend->freq_buffer_re_diffuse = (float *) malloc( sizeof( float ) * max_total_ir_len ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); - } - set_f( hCrend->freq_buffer_re_diffuse, 0, max_total_ir_len ); - - if ( ( hCrend->freq_buffer_im_diffuse = (float *) malloc( sizeof( float ) * max_total_ir_len ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); - } - set_f( hCrend->freq_buffer_im_diffuse, 0, max_total_ir_len ); - } - else - { - hCrend->freq_buffer_re_diffuse = NULL; - hCrend->freq_buffer_im_diffuse = NULL; - } - - max_total_ir_len = (int16_t) ( hHrtf->latency_s * st_ivas->hDecoderConfig->output_Fs + 0.5f ) + subframe_length; - if ( max_total_ir_len > 0 ) - { - if ( ( hCrend->lfe_delay_line = (float *) malloc( sizeof( float ) * max_total_ir_len ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); - } - set_f( hCrend->lfe_delay_line, 0, max_total_ir_len ); - } - else - { - hCrend->lfe_delay_line = NULL; - } - - if ( st_ivas->hDecoderConfig->Opt_Headrotation ) - { - if ( ( hCrend->hTrack = (ivas_orient_trk_state_t *) malloc( sizeof( ivas_orient_trk_state_t ) ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Orientation tracking" ); - } - - ivas_orient_trk_Init( hCrend->hTrack ); - } - else - { - hCrend->hTrack = NULL; - } - - if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM && st_ivas->ivas_format == MC_FORMAT && st_ivas->hDecoderConfig->Opt_Headrotation ) - { - if ( ( error = efap_init_data( &( st_ivas->hEFAPdata ), st_ivas->hIntSetup.ls_azimuth, st_ivas->hIntSetup.ls_elevation, st_ivas->hIntSetup.nchan_out_woLFE, EFAP_MODE_EFAP ) ) != IVAS_ERR_OK ) - { - return error; - } - } - - if ( ( ( st_ivas->hRenderConfig != NULL ) && st_ivas->hRenderConfig->roomAcoustics.late_reverb_on ) ) - { - if ( ( error = ivas_reverb_open( &( hCrend->hReverb ), st_ivas->intern_config, hHrtf, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK ) - { - return error; - } - } - else - { - hCrend->hReverb = NULL; - } - - st_ivas->binaural_latency_ns = (int32_t) ( st_ivas->hHrtf->latency_s * 1000000000.f ); - } - - st_ivas->hCrend = hCrend; - - return error; -} -#endif - -#ifndef FIX_197_CREND_INTERFACE - -/*------------------------------------------------------------------------- - * ivas_crend_close() - * - * Deallocate Crend renderer handle - *------------------------------------------------------------------------*/ - -ivas_error ivas_crend_close( - Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ -) -{ - int16_t i; - - if ( st_ivas->hHrtf != NULL ) - { - ivas_hrtf_close( &st_ivas->hHrtf ); - } - - if ( st_ivas->hCrend != NULL ) - { - if ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD ) - { - for ( i = 0; i < MAX_INTERN_CHANNELS; i++ ) - { - if ( st_ivas->hCrend->freq_buffer_re[i] != NULL ) - { - free( st_ivas->hCrend->freq_buffer_re[i] ); - st_ivas->hCrend->freq_buffer_re[i] = NULL; - } - if ( st_ivas->hCrend->freq_buffer_im[i] != NULL ) - { - free( st_ivas->hCrend->freq_buffer_im[i] ); - st_ivas->hCrend->freq_buffer_im[i] = NULL; - } - } - - for ( i = 0; i < BINAURAL_CHANNELS; i++ ) - { - if ( st_ivas->hCrend->prev_out_buffer[i] != NULL ) - { - free( st_ivas->hCrend->prev_out_buffer[i] ); - st_ivas->hCrend->prev_out_buffer[i] = NULL; - } - } - - if ( st_ivas->hCrend->lfe_delay_line != NULL ) - { - free( st_ivas->hCrend->lfe_delay_line ); - st_ivas->hCrend->lfe_delay_line = NULL; - } - - if ( st_ivas->hCrend->freq_buffer_re_diffuse != NULL ) - { - free( st_ivas->hCrend->freq_buffer_re_diffuse ); - st_ivas->hCrend->freq_buffer_re_diffuse = NULL; - } - - if ( st_ivas->hCrend->freq_buffer_im_diffuse != NULL ) - { - free( st_ivas->hCrend->freq_buffer_im_diffuse ); - st_ivas->hCrend->freq_buffer_im_diffuse = NULL; - } - - if ( st_ivas->hCrend->hTrack != NULL ) - { - free( st_ivas->hCrend->hTrack ); - st_ivas->hCrend->hTrack = NULL; - } - } - - ivas_reverb_close( &st_ivas->hCrend->hReverb ); - - free( st_ivas->hCrend ); - st_ivas->hCrend = NULL; - } - - return IVAS_ERR_OK; -} -#endif - -#ifndef FIX_197_CREND_INTERFACE - -/*-----------------------------------------------------------------------------------------* - * Function ivas_crend_convolver() - * - * Convolver block - *-----------------------------------------------------------------------------------------*/ - -static ivas_error ivas_crend_convolver( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - float pcm_in[][L_FRAME48k], - float pcm_out[][L_FRAME48k], - const int16_t i_ts ) -{ - float *pIn; - float *pFreq_buf_re; - float *pFreq_buf_im; - float *pFreq_filt_re; - float *pFreq_filt_im; - int16_t i, j, k, m, nchan_out, subframe_length, nchan_intern, idx_in; - float pOut[L_FRAME48k * 2]; - float tmp_out_re[L_FRAME48k], tmp_out_im[L_FRAME48k]; - int16_t offset, offset_in, offset_diffuse; - int32_t output_Fs; - - nchan_intern = audioCfg2channels( st_ivas->intern_config ); - nchan_out = st_ivas->hDecoderConfig->nchan_out; - output_Fs = st_ivas->hDecoderConfig->output_Fs; - subframe_length = (int16_t) ( output_Fs / FRAMES_PER_SEC ) / MAX_PARAM_SPATIAL_SUBFRAMES; - - offset = st_ivas->hCrend->delay_line_rw_index * subframe_length; /* subframe_length * ( st_ivas->hHrtf->max_num_iterations - 1 ); */ - offset_diffuse = st_ivas->hCrend->diffuse_delay_line_rw_index * subframe_length; /* subframe_length *( st_ivas->hHrtf->num_iterations_diffuse[0] - 1 ); */ - - if ( st_ivas->hHrtf->num_iterations_diffuse[0] > 0 ) - { - set_zero( &st_ivas->hCrend->freq_buffer_re_diffuse[offset_diffuse], subframe_length ); - set_zero( &st_ivas->hCrend->freq_buffer_im_diffuse[offset_diffuse], subframe_length ); - } - - i = 0; - for ( idx_in = 0; idx_in < nchan_intern; idx_in++ ) - { - pIn = &pcm_in[idx_in][i_ts * subframe_length]; - if ( st_ivas->hIntSetup.index_lfe[0] != idx_in ) - { - if ( st_ivas->hHrtf->num_iterations_diffuse[0] > 0 ) - { - pFreq_buf_re = &st_ivas->hCrend->freq_buffer_re_diffuse[offset_diffuse]; - pFreq_buf_im = &st_ivas->hCrend->freq_buffer_im_diffuse[offset_diffuse]; - pFreq_filt_re = &st_ivas->hCrend->freq_buffer_re[i][offset]; - pFreq_filt_im = &st_ivas->hCrend->freq_buffer_im[i][offset]; - - for ( k = 0; k < st_ivas->hHrtf->index_frequency_max_diffuse; k++ ) - { - pFreq_buf_re[k] += pFreq_filt_re[k] * st_ivas->hHrtf->inv_diffuse_weight[i]; - pFreq_buf_im[k] += pFreq_filt_im[k] * st_ivas->hHrtf->inv_diffuse_weight[i]; - } - } - - pFreq_buf_re = &st_ivas->hCrend->freq_buffer_re[i][offset]; - pFreq_buf_im = &st_ivas->hCrend->freq_buffer_im[i][offset]; - - ivas_mdft( pIn, pFreq_buf_re, pFreq_buf_im, subframe_length, subframe_length ); - i++; - } - } - - for ( j = 0; j < nchan_out; j++ ) - { - set_zero( tmp_out_re, subframe_length ); - set_zero( tmp_out_im, subframe_length ); - - i = 0; - for ( idx_in = 0; idx_in < nchan_intern; idx_in++ ) - { - if ( idx_in != st_ivas->hIntSetup.index_lfe[0] ) - { - offset = 0; - for ( m = 0; m < st_ivas->hHrtf->num_iterations[i][j]; m++ ) - { - offset_in = ( st_ivas->hCrend->delay_line_rw_index + st_ivas->hHrtf->max_num_iterations - st_ivas->hHrtf->num_iterations[i][j] + m + 1 ); - offset_in = offset_in % ( st_ivas->hHrtf->max_num_iterations ); - offset_in = offset_in * subframe_length; - pFreq_buf_re = &st_ivas->hCrend->freq_buffer_re[i][offset_in]; - pFreq_buf_im = &st_ivas->hCrend->freq_buffer_im[i][offset_in]; - pFreq_filt_re = &st_ivas->hHrtf->pOut_to_bin_re[i][j][offset]; - pFreq_filt_im = &st_ivas->hHrtf->pOut_to_bin_im[i][j][offset]; - - for ( k = 0; k < st_ivas->hHrtf->pIndex_frequency_max[i][j][m]; k++ ) - { - tmp_out_re[k] += pFreq_buf_re[k] * pFreq_filt_re[k] - pFreq_buf_im[k] * pFreq_filt_im[k]; - tmp_out_im[k] += pFreq_buf_re[k] * pFreq_filt_im[k] + pFreq_buf_im[k] * pFreq_filt_re[k]; - } - offset = offset + k; - } - i++; - } - } - - offset = 0; - for ( m = 0; m < st_ivas->hHrtf->num_iterations_diffuse[j]; m++ ) - { - offset_diffuse = ( st_ivas->hCrend->diffuse_delay_line_rw_index + m + 1 ); - offset_diffuse = offset_diffuse % st_ivas->hHrtf->num_iterations_diffuse[0]; - offset_diffuse = offset_diffuse * subframe_length; - pFreq_buf_re = &st_ivas->hCrend->freq_buffer_re_diffuse[offset_diffuse]; - pFreq_buf_im = &st_ivas->hCrend->freq_buffer_im_diffuse[offset_diffuse]; - pFreq_filt_re = &st_ivas->hHrtf->pOut_to_bin_diffuse_re[j][offset]; - pFreq_filt_im = &st_ivas->hHrtf->pOut_to_bin_diffuse_im[j][offset]; - - for ( k = 0; k < st_ivas->hHrtf->pIndex_frequency_max_diffuse[j][m]; k++ ) - { - tmp_out_re[k] += pFreq_buf_re[k] * pFreq_filt_re[k] - pFreq_buf_im[k] * pFreq_filt_im[k]; - tmp_out_im[k] += pFreq_buf_re[k] * pFreq_filt_im[k] + pFreq_buf_im[k] * pFreq_filt_re[k]; - } - offset = offset + k; - } - - ivas_imdft( tmp_out_re, tmp_out_im, pOut, subframe_length ); - - pFreq_buf_re = &pcm_out[j][i_ts * subframe_length]; - for ( k = 0; k < subframe_length; k++ ) - { - pFreq_buf_re[k] = pOut[k] + st_ivas->hCrend->prev_out_buffer[j][k]; - st_ivas->hCrend->prev_out_buffer[j][k] = pOut[k + subframe_length]; - } - } - - st_ivas->hCrend->delay_line_rw_index++; - st_ivas->hCrend->delay_line_rw_index = st_ivas->hCrend->delay_line_rw_index % ( st_ivas->hHrtf->max_num_iterations ); - if ( st_ivas->hHrtf->num_iterations_diffuse[0] > 0 ) - { - st_ivas->hCrend->diffuse_delay_line_rw_index++; - st_ivas->hCrend->diffuse_delay_line_rw_index = st_ivas->hCrend->diffuse_delay_line_rw_index % ( st_ivas->hHrtf->num_iterations_diffuse[0] ); - } - - return IVAS_ERR_OK; -} -#endif - -#ifndef FIX_197_CREND_INTERFACE - -/*-----------------------------------------------------------------------------------------* - * Function ivas_crend_process() - * - * Process call for IVAS Crend renderer - *-----------------------------------------------------------------------------------------*/ - -ivas_error ivas_crend_process( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - float output[][L_FRAME48k] /* i/o: input/output audio channels */ -) -{ - int16_t i, nchan_out, output_frame; - int16_t subframe_len, subframe_idx; - float pcm_tmp[BINAURAL_CHANNELS][L_FRAME48k]; - AUDIO_CONFIG intern_config; - ivas_error error; - - push_wmops( "ivas_crend_process" ); - - intern_config = st_ivas->intern_config; - nchan_out = st_ivas->hDecoderConfig->nchan_out; - output_frame = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC ); - subframe_len = output_frame / MAX_PARAM_SPATIAL_SUBFRAMES; - - for ( subframe_idx = 0; subframe_idx < MAX_PARAM_SPATIAL_SUBFRAMES; subframe_idx++ ) - { - if ( st_ivas->hDecoderConfig->Opt_Headrotation && st_ivas->hHeadTrackData && st_ivas->hHeadTrackData->num_quaternions >= 0 ) - { - /* Orientation tracking */ - if ( st_ivas->hCrend->hTrack != NULL ) - { - if ( st_ivas->hDecoderConfig->orientation_tracking == IVAS_ORIENT_TRK_AVG ) - { - ivas_orient_trk_SetTrackingType( st_ivas->hCrend->hTrack, OTR_TRACKING_AVG_ORIENT ); - } - else - { - ivas_orient_trk_SetTrackingType( st_ivas->hCrend->hTrack, OTR_TRACKING_REF_ORIENT ); - } - - /* get current subframe quaternion and convert to euler angles */ - Quat2Euler( st_ivas->hHeadTrackData->Quaternions[subframe_idx], &( st_ivas->hCrend->m_fYaw ), &( st_ivas->hCrend->m_fPitch ), &( st_ivas->hCrend->m_fRoll ) ); - ivas_orient_trk_SetAbsoluteOrientation( st_ivas->hCrend->hTrack, st_ivas->hCrend->m_fYaw, st_ivas->hCrend->m_fPitch, st_ivas->hCrend->m_fRoll ); - ivas_orient_trk_Process( st_ivas->hCrend->hTrack ); - ivas_orient_trk_GetTrackedOrientation( st_ivas->hCrend->hTrack, &( st_ivas->hCrend->m_fYaw ), &( st_ivas->hCrend->m_fPitch ), &( st_ivas->hCrend->m_fRoll ) ); - } - - /* Rotation in SHD for: - MC with elevation (5_1_2 / 5_1_4 / 7_1_4) -> BINAURAL - SBA SPAR -> BINAURAL or BINAURAL_ROOM - */ - if ( intern_config == AUDIO_CONFIG_FOA || intern_config == AUDIO_CONFIG_HOA2 || intern_config == AUDIO_CONFIG_HOA3 ) - { - rotateFrame_shd( st_ivas->hHeadTrackData, output, subframe_len, st_ivas->hIntSetup, subframe_idx ); - } - /* Rotation in SD for MC -> BINAURAL_ROOM */ - else if ( st_ivas->ivas_format != ISM_FORMAT && st_ivas->hIntSetup.is_loudspeaker_setup ) - { - rotateFrame_sd( st_ivas->hHeadTrackData, output, subframe_len, st_ivas->hIntSetup, st_ivas->hEFAPdata, subframe_idx ); - } - } - - if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) - { - if ( ( intern_config == AUDIO_CONFIG_FOA ) || ( intern_config == AUDIO_CONFIG_HOA2 ) || ( intern_config == AUDIO_CONFIG_HOA3 ) || - ( intern_config == AUDIO_CONFIG_5_1 ) || ( intern_config == AUDIO_CONFIG_7_1 ) || - ( intern_config == AUDIO_CONFIG_5_1_2 ) || ( intern_config == AUDIO_CONFIG_5_1_4 ) || ( intern_config == AUDIO_CONFIG_7_1_4 ) ) - { - ivas_crend_convolver( st_ivas, output, pcm_tmp, subframe_idx ); - - if ( st_ivas->hCrend->hReverb != NULL ) - { - if ( ( error = ivas_reverb_process( st_ivas->hCrend->hReverb, intern_config, 1, output, pcm_tmp, subframe_idx ) ) != IVAS_ERR_OK ) - { - return error; - } - } - } - else - { - return IVAS_ERR_INVALID_INPUT_FORMAT; - } - } - else - { - return IVAS_ERR_INTERNAL_FATAL; - } - } - - /* move to output */ - for ( i = 0; i < nchan_out; i++ ) - { - mvr2r( pcm_tmp[i], output[i], output_frame ); - } - - pop_wmops(); - - return IVAS_ERR_OK; -} -#endif - - /*------------------------------------------------------------------------- * initCrend_from_rom() * @@ -1416,17 +197,10 @@ static ivas_error ivas_rend_initCrend( /* set BRIR flag */ use_brir = false; -#ifdef FIX_197_CREND_INTERFACE if ( ( ( hRendCfg != NULL ) && hRendCfg->roomAcoustics.use_brir ) || ( ( hRendCfg == NULL ) && ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) ) ) { use_brir = true; } -#else - if ( ( hRendCfg != NULL && hRendCfg->roomAcoustics.use_brir ) || outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) - { - use_brir = true; - } -#endif if ( ( error = getAudioConfigNumChannels( inConfig, &nchan_in ) ) != IVAS_ERR_OK ) @@ -1893,8 +667,6 @@ static ivas_error ivas_rend_initCrend( return IVAS_ERR_OK; } -#ifdef FIX_197_CREND_INTERFACE -#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC /*------------------------------------------------------------------------- * ivas_rend_initCrendWrapper() * @@ -1950,8 +722,6 @@ ivas_error ivas_rend_initCrendWrapper( return IVAS_ERR_OK; } -#endif -#endif /*------------------------------------------------------------------------- * ivas_rend_openCrend() * @@ -1959,17 +729,10 @@ ivas_error ivas_rend_initCrendWrapper( *------------------------------------------------------------------------*/ ivas_error ivas_rend_openCrend( -#ifdef FIX_197_CREND_INTERFACE CREND_WRAPPER_HANDLE *pCrend, -#else - CREND_WRAPPER *pCrend, -#endif const AUDIO_CONFIG inConfig, const AUDIO_CONFIG outConfig, RENDER_CONFIG_DATA *hRendCfg, -#ifdef FIX_197_CREND_INTERFACE - int16_t Opt_Headrotation, -#endif HRTFS_CREND_HANDLE hSetOfHRTF, const int32_t output_Fs ) { @@ -1981,35 +744,14 @@ ivas_error ivas_rend_openCrend( ivas_error error; error = IVAS_ERR_OK; -#ifdef FIX_197_CREND_INTERFACE -#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC if ( ( error = ivas_rend_initCrendWrapper( pCrend ) ) != IVAS_ERR_OK ) { return error; } hCrend = ( *pCrend )->hCrend; -#else - if ( pCrend == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend Wrapper\n" ); - } - - if ( *pCrend == NULL ) - { - if ( ( *pCrend = (CREND_WRAPPER_HANDLE) malloc( sizeof( CREND_WRAPPER ) ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend Wrapper\n" ); - } - ( *pCrend )->binaural_latency_ns = 0; - ( *pCrend )->hCrend = NULL; - ( *pCrend )->hHrtfCrend = NULL; - } -#endif -#endif subframe_length = (int16_t) ( output_Fs / FRAMES_PER_SEC ) / MAX_PARAM_SPATIAL_SUBFRAMES; -#ifdef FIX_197_CREND_INTERFACE if ( ( *pCrend )->hHrtfCrend == NULL ) { if ( ( error = ivas_rend_initCrend( *pCrend, inConfig, outConfig, hRendCfg, hSetOfHRTF, output_Fs ) ) != IVAS_ERR_OK ) @@ -2017,53 +759,8 @@ ivas_error ivas_rend_openCrend( return error; } } -#else - if ( pCrend->hHrtfCrend == NULL ) - { - if ( ( error = ivas_rend_initCrend( pCrend, inConfig, outConfig, hRendCfg, hSetOfHRTF, output_Fs ) ) != IVAS_ERR_OK ) - { - return error; - } - } -#endif - -#ifndef FIX_329_ENABLE_TD_RENDERER_REVERB_MC - - if ( ( hCrend = (CREND_HANDLE) malloc( sizeof( CREND_DATA ) ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for renderer handle" ); - } - - hCrend->lfe_delay_line = NULL; - - for ( i = 0; i < MAX_INTERN_CHANNELS; i++ ) - { - hCrend->freq_buffer_re[i] = NULL; - hCrend->freq_buffer_im[i] = NULL; - } - - for ( i = 0; i < BINAURAL_CHANNELS; i++ ) - { - hCrend->prev_out_buffer[i] = NULL; - } - - hCrend->freq_buffer_re_diffuse = NULL; - hCrend->freq_buffer_im_diffuse = NULL; - hCrend->hReverb = NULL; - hCrend->delay_line_rw_index = 0; - hCrend->diffuse_delay_line_rw_index = 0; - hCrend->hTrack = NULL; - hCrend->m_fYaw = 0; - hCrend->m_fPitch = 0; - hCrend->m_fRoll = 0; -#endif - -#ifdef FIX_197_CREND_INTERFACE hHrtf = ( *pCrend )->hHrtfCrend; -#else - hHrtf = pCrend->hHrtfCrend; -#endif if ( hHrtf != NULL ) { @@ -2128,35 +825,10 @@ ivas_error ivas_rend_openCrend( { hCrend->lfe_delay_line = NULL; } -#ifdef FIX_197_CREND_INTERFACE - if ( Opt_Headrotation ) -#else - if ( false ) /* TODO tmu : check renderer headrotation flag */ -#endif - { - if ( ( hCrend->hTrack = (ivas_orient_trk_state_t *) malloc( sizeof( ivas_orient_trk_state_t ) ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Orientation tracking" ); - } - - ivas_orient_trk_Init( hCrend->hTrack ); - } - else - { - hCrend->hTrack = NULL; - } if ( ( hRendCfg != NULL ) && ( hRendCfg->roomAcoustics.late_reverb_on ) ) { - if ( ( error = ivas_reverb_open( &( hCrend->hReverb ), - inConfig, -#ifdef FIX_197_CREND_INTERFACE - ( *pCrend )->hHrtfCrend, -#else - pCrend->hHrtfCrend, -#endif - hRendCfg, - output_Fs ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_reverb_open( &( hCrend->hReverb ), inConfig, ( *pCrend )->hHrtfCrend, hRendCfg, output_Fs ) ) != IVAS_ERR_OK ) { return error; } @@ -2166,45 +838,27 @@ ivas_error ivas_rend_openCrend( hCrend->hReverb = NULL; } -#ifdef FIX_197_CREND_INTERFACE ( *pCrend )->binaural_latency_ns = (int32_t) ( ( *pCrend )->hHrtfCrend->latency_s * 1000000000.f ); -#else - pCrend->binaural_latency_ns = (int32_t) ( pCrend->hHrtfCrend->latency_s * 1000000000.f ); -#endif } -#ifdef FIX_197_CREND_INTERFACE ( *pCrend )->hCrend = hCrend; -#else - pCrend->hCrend = hCrend; -#endif return IVAS_ERR_OK; } + /*------------------------------------------------------------------------- * ivas_crend_close() * * Deallocate Crend renderer handle *------------------------------------------------------------------------*/ -#ifdef FIX_197_CREND_INTERFACE void ivas_rend_closeCrend( CREND_WRAPPER_HANDLE *pCrend ) -#else -ivas_error ivas_rend_closeCrend( - CREND_WRAPPER *pCrend ) -#endif { int16_t i; -#ifdef FIX_197_CREND_INTERFACE - if ( pCrend == NULL ) - { - return; - } - - if ( *pCrend == NULL ) + if ( pCrend == NULL || *pCrend == NULL ) { return; } @@ -2270,72 +924,11 @@ ivas_error ivas_rend_closeCrend( free( *pCrend ); *pCrend = NULL; } - return; -#else - if ( pCrend->hHrtfCrend != NULL ) - { - ivas_hrtf_close( &pCrend->hHrtfCrend ); - } - - if ( pCrend->hCrend != NULL ) - { - - for ( i = 0; i < MAX_INTERN_CHANNELS; i++ ) - { - if ( pCrend->hCrend->freq_buffer_re[i] != NULL ) - { - free( pCrend->hCrend->freq_buffer_re[i] ); - pCrend->hCrend->freq_buffer_re[i] = NULL; - } - if ( pCrend->hCrend->freq_buffer_im[i] != NULL ) - { - free( pCrend->hCrend->freq_buffer_im[i] ); - pCrend->hCrend->freq_buffer_im[i] = NULL; - } - } - - for ( i = 0; i < BINAURAL_CHANNELS; i++ ) - { - if ( pCrend->hCrend->prev_out_buffer[i] != NULL ) - { - free( pCrend->hCrend->prev_out_buffer[i] ); - pCrend->hCrend->prev_out_buffer[i] = NULL; - } - } - - if ( pCrend->hCrend->lfe_delay_line != NULL ) - { - free( pCrend->hCrend->lfe_delay_line ); - pCrend->hCrend->lfe_delay_line = NULL; - } - - if ( pCrend->hCrend->freq_buffer_re_diffuse != NULL ) - { - free( pCrend->hCrend->freq_buffer_re_diffuse ); - pCrend->hCrend->freq_buffer_re_diffuse = NULL; - } - - if ( pCrend->hCrend->freq_buffer_im_diffuse != NULL ) - { - free( pCrend->hCrend->freq_buffer_im_diffuse ); - pCrend->hCrend->freq_buffer_im_diffuse = NULL; - } - - if ( pCrend->hCrend->hTrack != NULL ) - { - free( pCrend->hCrend->hTrack ); - pCrend->hCrend->hTrack = NULL; - } - ivas_reverb_close( &pCrend->hCrend->hReverb ); - - free( pCrend->hCrend ); - pCrend->hCrend = NULL; - } - return IVAS_ERR_OK; -#endif + return; } + /*-----------------------------------------------------------------------------------------* * Function ivas_crend_convolver() * @@ -2508,20 +1101,14 @@ ivas_error ivas_rend_crendProcess( const CREND_WRAPPER *pCrend, const AUDIO_CONFIG inConfig, const AUDIO_CONFIG outConfig, -#ifdef FIX_197_CREND_INTERFACE DECODER_CONFIG_HANDLE hDecoderConfig, HEAD_TRACK_DATA_HANDLE hHeadTrackData, IVAS_OUTPUT_SETUP_HANDLE hIntSetup, EFAP_HANDLE hEFAPdata, -#endif float output[][L_FRAME48k], /* i/o: input/output audio channels */ const int32_t output_Fs ) { -#ifdef FIX_197_CREND_INTERFACE int16_t i, subframe_idx, output_frame, subframe_len; -#else - int16_t i, subframe_idx, output_frame; -#endif int16_t nchan_out; float pcm_tmp[BINAURAL_CHANNELS][L_FRAME48k]; AUDIO_CONFIG in_config; @@ -2535,11 +1122,7 @@ ivas_error ivas_rend_crendProcess( inRendConfig = getRendAudioConfigFromIvasAudioConfig( inConfig ); outRendConfig = getRendAudioConfigFromIvasAudioConfig( outConfig ); -#ifdef FIX_197_CREND_INTERFACE in_config = getIvasAudioConfigFromRendAudioConfig( inRendConfig ); -#else - in_config = rendAudioConfigToIvasAudioConfig( inRendConfig ); -#endif inConfigType = getAudioConfigType( inRendConfig ); @@ -2549,37 +1132,12 @@ ivas_error ivas_rend_crendProcess( } output_frame = (int16_t) ( output_Fs / FRAMES_PER_SEC ); -#ifdef FIX_197_CREND_INTERFACE subframe_len = output_frame / MAX_PARAM_SPATIAL_SUBFRAMES; -#endif for ( subframe_idx = 0; subframe_idx < MAX_PARAM_SPATIAL_SUBFRAMES; subframe_idx++ ) { -#ifdef FIX_197_CREND_INTERFACE if ( hDecoderConfig && hDecoderConfig->Opt_Headrotation && hHeadTrackData && hHeadTrackData->num_quaternions >= 0 ) { /* Orientation tracking */ - if ( pCrend->hCrend->hTrack != NULL ) - { - if ( hDecoderConfig->orientation_tracking == IVAS_ORIENT_TRK_AVG ) - { - ivas_orient_trk_SetTrackingType( pCrend->hCrend->hTrack, OTR_TRACKING_AVG_ORIENT ); - } - else - { - ivas_orient_trk_SetTrackingType( pCrend->hCrend->hTrack, OTR_TRACKING_REF_ORIENT ); - } - - /* get current subframe quaternion and convert to euler angles */ - Quat2Euler( hHeadTrackData->Quaternions[subframe_idx], &( pCrend->hCrend->m_fYaw ), &( pCrend->hCrend->m_fPitch ), &( pCrend->hCrend->m_fRoll ) ); - ivas_orient_trk_SetAbsoluteOrientation( pCrend->hCrend->hTrack, pCrend->hCrend->m_fYaw, pCrend->hCrend->m_fPitch, pCrend->hCrend->m_fRoll ); - - if ( ( error = ivas_orient_trk_Process( pCrend->hCrend->hTrack ) ) != IVAS_ERR_OK ) - { - return error; - } - - ivas_orient_trk_GetTrackedOrientation( pCrend->hCrend->hTrack, &( pCrend->hCrend->m_fYaw ), &( pCrend->hCrend->m_fPitch ), &( pCrend->hCrend->m_fRoll ) ); - } /* Rotation in SHD for: MC with elevation (5_1_2 / 5_1_4 / 7_1_4) -> BINAURAL @@ -2595,7 +1153,6 @@ ivas_error ivas_rend_crendProcess( rotateFrame_sd( hHeadTrackData, output, subframe_len, *hIntSetup, hEFAPdata, subframe_idx ); } } -#endif if ( ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) || ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS ) ) { diff --git a/lib_rend/ivas_dirac_dec_binaural_functions.c b/lib_rend/ivas_dirac_dec_binaural_functions.c index 020dd27cfa1b47d827fcf82d00f7e45094865297..035036bad3c27cf7b11a05f7a65f53464a25ea57 100644 --- a/lib_rend/ivas_dirac_dec_binaural_functions.c +++ b/lib_rend/ivas_dirac_dec_binaural_functions.c @@ -40,6 +40,8 @@ #include "ivas_cnst.h" #include "ivas_rom_binauralRenderer.h" #include "ivas_rom_rend.h" +#include "ivas_rom_com.h" + #ifdef DEBUGGING #include "debug.h" #endif @@ -50,26 +52,55 @@ * Local constants *------------------------------------------------------------------------*/ -#define CLDFB_HALF_BIN_FREQUENCY_OFFSET 0.5f +#define CLDFB_HALF_BIN_FREQUENCY_OFFSET 0.5f +#ifdef FIX_417_TD_DECORR_BRATE_SW #define IVAS_TDET_DUCK_MULT_FAC_PARA_BIN ( 2.0f ) #define IVAS_TDET_DUCK_MULT_FAC_PARA_BIN_LOW_BR ( 3.0f ) +#endif + +/* powf(0.95f, 4.0f) for sub-frame smoothing instead of CLDFB slot */ +#define ADAPT_HTPROTO_IIR_FAC 0.81450625f + +#define ADAPT_HTPROTO_ILD_LIM_DB0 1.0f +#define ADAPT_HTPROTO_ILD_LIM_DB1 4.0f +#define ADAPT_HTPROTO_ROT_LIM_0 0.4f +#define ADAPT_HTPROTO_ROT_LIM_1 0.8f /*------------------------------------------------------------------------- * Local function prototypes *------------------------------------------------------------------------*/ +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS +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 ); + +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_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 ); +#else 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] ); 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 ); +#endif static void ivas_dirac_dec_binaural_determine_processing_matrices( Decoder_Struct *st_ivas, const int16_t max_band_decorr, float Rmat[3][3] ); +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS +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] ); + +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] ); +#else static void ivas_dirac_dec_binaural_process_output( Decoder_Struct *st_ivas, float output_f[][L_FRAME48k], float inRe[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], const int16_t max_band_decorr, const uint8_t numInputChannels, const uint8_t firstSlot, const uint8_t slotEnd ); +static void adaptTransportSignalsHeadtracked( HEAD_TRACK_DATA_HANDLE hHeadTrackData, float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float inRe[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], const uint8_t firstSlot, const uint8_t slotEnd, const uint8_t nBins, float Rmat[3][3] ); + static void ivas_dirac_dec_binaural_check_and_switch_transports_headtracked( HEAD_TRACK_DATA_HANDLE hHeadTrackData, float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float inRe[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], const uint8_t firstSlot, const uint8_t slotEnd, const uint8_t nBins, float Rmat[3][3] ); +#endif + 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 ); static void hrtfShGetHrtf( const int16_t bin, const int16_t aziDeg, const int16_t eleDeg, float *lRealp, float *lImagp, float *rRealp, float *rImagp ); @@ -80,6 +111,9 @@ static void matrixMul( float Are[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Ai static void matrixTransp2Mul( float Are[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Aim[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Bre[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Bim[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float outRe[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float outIm[BINAURAL_CHANNELS][BINAURAL_CHANNELS] ); +#ifndef FIX_417_TD_DECORR_BRATE_SW +static float configure_reqularization_factor( const IVAS_FORMAT ivas_format, const int32_t ivas_brate ); +#endif /*------------------------------------------------------------------------- * ivas_dirac_dec_init_binaural_data() @@ -139,23 +173,11 @@ ivas_error ivas_dirac_dec_init_binaural_data( set_zero( hBinaural->ChCrossImOutPrev, nBins ); hBinaural->renderStereoOutputInsteadOfBinaural = 0; -#ifdef FIX_107_5MS_SUBFRAME_RENDERING +#ifndef FIX_355_REFACTOR_PARAMBIN_TO_5MS hBinaural->useSubframeMode = 1; -#else - if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR ) /* Use subframe-mode with SPAR, since the metadata is not in sync on a frame level */ - { - hBinaural->useSubframeMode = 1; - } - else - { -#ifdef DEBUGGING - hBinaural->useSubframeMode = st_ivas->hDecoderConfig->forceSubframeBinauralization; -#else - hBinaural->useSubframeMode = 0; /* Default to 20 ms mode. */ -#endif - } #endif +#ifndef FIX_417_TD_DECORR_BRATE_SW hBinaural->useTdDecorr = 0; if ( st_ivas->ivas_format == SBA_FORMAT ) { @@ -178,6 +200,7 @@ ivas_error ivas_dirac_dec_init_binaural_data( hBinaural->useTdDecorr = 1; } } +#endif for ( bin = 0; bin < nBins; bin++ ) { @@ -204,6 +227,28 @@ ivas_error ivas_dirac_dec_init_binaural_data( mvr2r( hHrtfParambin->parametricEarlyPartEneCorrection, hBinaural->earlyPartEneCorrection, nBins ); /* reconfiguration needed when Reverb. parameters are changed -> close and open the handle again */ +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS + if ( hBinaural->hReverb != NULL && ( ( hBinaural->hReverb->numBins != nBins ) || + ( hBinaural->hReverb->blockSize != CLDFB_SLOTS_PER_SUBFRAME ) ) ) + { + ivas_binaural_reverb_close( &( hBinaural->hReverb ) ); + } + + if ( hBinaural->hReverb == NULL ) + { + if ( ( error = ivas_binaural_reverb_open( &hBinaural->hReverb, + nBins, + CLDFB_SLOTS_PER_SUBFRAME, 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 ( 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 ) ) ) @@ -243,6 +288,7 @@ ivas_error ivas_dirac_dec_init_binaural_data( } } } +#endif } else if ( renderer_type == RENDERER_STEREO_PARAMETRIC ) { @@ -255,6 +301,17 @@ ivas_error ivas_dirac_dec_init_binaural_data( assert( false ); } +#ifdef FIX_417_TD_DECORR_BRATE_SW + if ( hBinaural->hTdDecorr == NULL ) + { + hBinaural->useTdDecorr = 0; + } + + if ( ( error = ivas_td_decorr_reconfig_dec( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hDecoderConfig->output_Fs, &( hBinaural->hTdDecorr ), &( hBinaural->useTdDecorr ) ) ) != IVAS_ERR_OK ) + { + return error; + } +#else if ( hBinaural->useTdDecorr ) { if ( st_ivas->hDecoderConfig->ivas_total_brate >= IVAS_13k2 && st_ivas->ivas_format == SBA_FORMAT ) @@ -282,6 +339,9 @@ ivas_error ivas_dirac_dec_init_binaural_data( { ivas_td_decorr_dec_close( &( hBinaural->hTdDecorr ) ); } +#endif + + hBinaural->reqularizationFactor = configure_reqularization_factor( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate ); st_ivas->hDiracDecBin = hBinaural; @@ -299,7 +359,7 @@ void ivas_dirac_dec_close_binaural_data( DIRAC_DEC_BIN_HANDLE *hBinaural /* i/o: decoder DirAC binaural data handle */ ) { - if ( *hBinaural == NULL ) + if ( hBinaural == NULL || *hBinaural == NULL ) { return; } @@ -375,6 +435,10 @@ void ivas_dirac_dec_binaural( const int16_t nchan_transport /* i : number of transport channels */ ) { +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS + int16_t subframe; + +#endif if ( st_ivas->hDiracDecBin->useTdDecorr ) { float *decorr_signal[BINAURAL_CHANNELS]; @@ -390,6 +454,12 @@ void ivas_dirac_dec_binaural( ivas_td_decorr_process( st_ivas->hDiracDecBin->hTdDecorr, output_f, decorr_signal, output_frame ); } +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS + for ( subframe = 0; subframe < MAX_PARAM_SPATIAL_SUBFRAMES; subframe++ ) + { + ivas_dirac_dec_binaural_internal( st_ivas, output_f, nchan_transport, subframe ); + } +#else if ( st_ivas->hDiracDecBin->useSubframeMode ) { uint8_t subframe; @@ -402,6 +472,7 @@ void ivas_dirac_dec_binaural( { ivas_dirac_dec_binaural_internal( st_ivas, output_f, nchan_transport, 0u, (uint8_t) MAX_PARAM_SPATIAL_SUBFRAMES ); } +#endif return; } @@ -411,6 +482,188 @@ void ivas_dirac_dec_binaural( * Local functions *------------------------------------------------------------------------*/ +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS +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 ) +{ + DIRAC_DEC_HANDLE hDirAC; + 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]; + int16_t max_band_decorr; + DIFFUSE_DISTRIBUTION_DATA diffuseDistData; + int16_t nBins, offsetSamples; + + hDirAC = st_ivas->hDirAC; + nBins = hDirAC->num_freq_bands; + offsetSamples = subframe * CLDFB_SLOTS_PER_SUBFRAME * nBins; + + /* The input channel number at this processing function (not nchan_transport) */ + numInChannels = BINAURAL_CHANNELS; + if ( st_ivas->hOutSetup.separateChannelEnabled ) + { + numInChannels++; + } + + Rmat[0][0] = 1.0f; + Rmat[0][1] = 0.0f; + Rmat[0][2] = 0.0f; + + Rmat[1][0] = 0.0f; + Rmat[1][1] = 1.0f; + Rmat[1][2] = 0.0f; + + Rmat[2][0] = 0.0f; + Rmat[2][1] = 0.0f; + Rmat[2][2] = 1.0f; + + /* CLDFB Analysis of input */ + for ( slot = 0; slot < CLDFB_SLOTS_PER_SUBFRAME; slot++ ) + { + for ( ch = 0; ch < numInChannels; ch++ ) + { + if ( ch == 0 || nchan_transport == 2 ) + { + cldfbAnalysis_ts( &( output_f[ch][nBins * slot + offsetSamples] ), + 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 */ + { + /* At mono input duplicate the channel to dual-mono */ + mvr2r( Cldfb_RealBuffer_in[0][slot], Cldfb_RealBuffer_in[1][slot], nBins ); + mvr2r( Cldfb_ImagBuffer_in[0][slot], Cldfb_ImagBuffer_in[1][slot], nBins ); + } + else /* when nchan_transport == 1 and ch == 1 */ + { + /* CNA and HB FD-CNG*/ + 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; + slotInFrame = subframe * CLDFB_SLOTS_PER_SUBFRAME + slot; + + generate_masking_noise_dirac( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom, + st_ivas->cldfbAnaDec[1], + &( output_f[1][L_FRAME48k - L_FRAME16k] ), /*used as temporary static buffer for the whole frame*/ + Cldfb_RealBuffer_in[2][slot], Cldfb_ImagBuffer_in[2][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 ); + + generate_masking_noise_dirac( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom, + st_ivas->cldfbAnaDec[1], /*nothing will be analyzed, just get cnst*/ + NULL, + Cldfb_RealBuffer_in[1][slot], Cldfb_ImagBuffer_in[1][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 ); + + /* LB: Copy first channel + LB-CNG to first and second channels with same scaling (dual-mono)*/ + for ( b = 0; b < numCoreBands; b++ ) + { + Cldfb_RealBuffer_in[0][slot][b] = INV_SQRT2 * ( Cldfb_RealBuffer_in[0][slot][b] + Cldfb_RealBuffer_in[2][slot][b] ); + Cldfb_RealBuffer_in[1][slot][b] = Cldfb_RealBuffer_in[0][slot][b]; + Cldfb_ImagBuffer_in[0][slot][b] = INV_SQRT2 * ( Cldfb_ImagBuffer_in[0][slot][b] + Cldfb_ImagBuffer_in[2][slot][b] ); + Cldfb_ImagBuffer_in[1][slot][b] = Cldfb_ImagBuffer_in[0][slot][b]; + } + + /* HB: Copy first channel to second channel and add HB-CNGs with different scalings*/ + for ( ; b < nBins; b++ ) + { + Cldfb_RealBuffer_in[0][slot][b] *= INV_SQRT2; + Cldfb_RealBuffer_in[1][slot][b] = Cldfb_RealBuffer_in[0][slot][b] + 0.5f * Cldfb_RealBuffer_in[1][slot][b] + Cldfb_RealBuffer_in[0][slot][b]; + Cldfb_RealBuffer_in[0][slot][b] += 0.5f * Cldfb_RealBuffer_in[2][slot][b]; + + Cldfb_ImagBuffer_in[0][slot][b] *= INV_SQRT2; + Cldfb_ImagBuffer_in[1][slot][b] = Cldfb_ImagBuffer_in[0][slot][b] + 0.5f * Cldfb_ImagBuffer_in[1][slot][b]; + Cldfb_ImagBuffer_in[0][slot][b] += 0.5f * Cldfb_ImagBuffer_in[2][slot][b]; + } + } + else + { + /* At mono input duplicate the channel to dual-mono, and apply gain + correction to ensure same overall level as in stereo mode */ + v_multc( Cldfb_RealBuffer_in[0][slot], INV_SQRT_2, Cldfb_RealBuffer_in[0][slot], nBins ); + v_multc( Cldfb_ImagBuffer_in[0][slot], INV_SQRT_2, Cldfb_ImagBuffer_in[0][slot], nBins ); + + mvr2r( Cldfb_RealBuffer_in[0][slot], Cldfb_RealBuffer_in[1][slot], nBins ); + mvr2r( Cldfb_ImagBuffer_in[0][slot], Cldfb_ImagBuffer_in[1][slot], nBins ); + } + } + } + + if ( st_ivas->hDiracDecBin->useTdDecorr ) + { + for ( ch = BINAURAL_CHANNELS; ch < ( 2 * BINAURAL_CHANNELS ); ch++ ) + { + cldfbAnalysis_ts( &( output_f[ch][nBins * slot + offsetSamples] ), + 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 ) + { + v_multc( Cldfb_RealBuffer_in[ch][slot], INV_SQRT_2, Cldfb_RealBuffer_in[ch][slot], nBins ); + v_multc( Cldfb_ImagBuffer_in[ch][slot], INV_SQRT_2, Cldfb_ImagBuffer_in[ch][slot], nBins ); + } + } + } + } + + if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR ) + { + st_ivas->hDirAC->hDiffuseDist = &diffuseDistData; + + 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, subframe ); + } + + if ( st_ivas->hHeadTrackData && st_ivas->hHeadTrackData->num_quaternions >= 0 ) + { + QuatToRotMat( st_ivas->hHeadTrackData->Quaternions[subframe], Rmat ); + + if ( nchan_transport == 2 ) + { + 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_RealBuffer_in, Cldfb_ImagBuffer_in, nBins, Rmat ); + } + } + + 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 ) + { + max_band_decorr = 0; + } + else if ( st_ivas->hDiracDecBin->useTdDecorr ) + { + max_band_decorr = CLDFB_NO_CHANNELS_MAX; + } + else + { + max_band_decorr = st_ivas->hDirAC->h_freq_domain_decorr_ap_params->max_band_decorr; + } + + 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, subframe ); + + st_ivas->hDirAC->hDiffuseDist = NULL; + hDirAC->dirac_read_idx = ( hDirAC->dirac_read_idx + 1 ) % hDirAC->dirac_md_buffer_length; + + return; +} +#else static void ivas_dirac_dec_binaural_internal( Decoder_Struct *st_ivas, float output_f[][L_FRAME48k], @@ -562,6 +815,8 @@ static void ivas_dirac_dec_binaural_internal( if ( nchan_transport == 2 ) { + adaptTransportSignalsHeadtracked( st_ivas->hHeadTrackData, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, firstSlot, slotEnd, nBins, Rmat ); + ivas_dirac_dec_binaural_check_and_switch_transports_headtracked( st_ivas->hHeadTrackData, Cldfb_ImagBuffer_in, Cldfb_RealBuffer_in, firstSlot, slotEnd, nBins, Rmat ); } } @@ -589,8 +844,18 @@ static void ivas_dirac_dec_binaural_internal( return; } +#endif +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS +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] ) +#else static void ivas_dirac_dec_decorrelate_slot( DIRAC_DEC_HANDLE hDirAC, const int8_t slot, @@ -598,6 +863,7 @@ static void ivas_dirac_dec_decorrelate_slot( float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float decRe[][CLDFB_NO_CHANNELS_MAX], float decIm[][CLDFB_NO_CHANNELS_MAX] ) +#endif { int16_t offset, ch, bin; float onset_filter[BINAURAL_CHANNELS * CLDFB_NO_CHANNELS_MAX]; /* 2 ch, 60 bins */ @@ -643,6 +909,404 @@ static void ivas_dirac_dec_decorrelate_slot( } +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS +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 ) +{ + int16_t ch, slot, bin; + uint8_t separateCenterChannelRendering; + int16_t nBins, idx; + float frameMeanDiffusenessEneWeight[CLDFB_NO_CHANNELS_MAX]; + DIRAC_DEC_HANDLE hDirAC; + DIRAC_DEC_BIN_HANDLE h; + float IIReneLimiterFactor; + float qualityBasedSmFactor; + 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; + separateCenterChannelRendering = st_ivas->hOutSetup.separateChannelEnabled; + nBins = hDirAC->num_freq_bands; /* Actually bins */ + + set_zero( h->ChCrossRe, nBins ); + set_zero( h->ChCrossIm, nBins ); + set_zero( h->ChCrossReOut, nBins ); + set_zero( h->ChCrossImOut, nBins ); + for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) + { + set_zero( h->ChEne[ch], nBins ); + set_zero( h->ChEneOut[ch], nBins ); + } + set_zero( h->frameMeanDiffuseness, nBins ); + + set_zero( frameMeanDiffusenessEneWeight, CLDFB_NO_CHANNELS_MAX ); + + /* Determine EQ for low bit rates (13.2 and 16.4 kbps) */ + applyLowBitRateEQ = 0; + if ( ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MC_FORMAT ) && st_ivas->hDecoderConfig->ivas_total_brate < MASA_STEREO_MIN_BITRATE ) + { + applyLowBitRateEQ = 1; + if ( st_ivas->hDecoderConfig->ivas_total_brate == IVAS_16k4 ) + { + for ( bin = 0; bin < LOW_BIT_RATE_BINAURAL_EQ_BINS; bin++ ) + { + lowBitRateEQ[bin + LOW_BIT_RATE_BINAURAL_EQ_OFFSET] = lowBitRateBinauralEQ[bin] * 0.5f + 0.5f; + } + } + else + { + for ( bin = 0; bin < LOW_BIT_RATE_BINAURAL_EQ_BINS; bin++ ) + { + lowBitRateEQ[bin + LOW_BIT_RATE_BINAURAL_EQ_OFFSET] = lowBitRateBinauralEQ[bin]; + } + } + } + + /* Formulate input and target covariance matrices for this subframe */ + set_zero( subFrameTotalEne, CLDFB_NO_CHANNELS_MAX ); + dirac_read_idx = hDirAC->dirac_read_idx; + + /* Calculate input covariance matrix */ + for ( slot = 0; slot < hDirAC->subframe_nbslots; slot++ ) + { + for ( bin = 0; bin < nBins; bin++ ) + { + for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) + { + float instEne; + + 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]; + } + } + + /* 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++ ) + { + 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 ); + + for ( slot = 0; slot < hDirAC->subframe_nbslots; slot++ ) + { + for ( bin = 0; bin < nBins; 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; + + /* Determine direct part target covariance matrix (for 1 or 2 directions) */ + for ( dirIndex = 0; dirIndex < hDirAC->numSimultaneousDirections; dirIndex++ ) + { + int16_t aziDeg, eleDeg; + float lRealp, lImagp, rRealp, rImagp; + float lRealpTmp, lImagpTmp, rRealpTmp, rImagpTmp; + float hrtfEne[BINAURAL_CHANNELS], hrtfCrossRe, hrtfCrossIm, ratio; + + if ( dirIndex == 0 ) /* For first of the two simultaneous directions */ + { + 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]; + } + else /* For second of the two simultaneous directions */ + { + 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]; + } + diffuseness -= ratio; /* diffuseness = 1 - ratio1 - ratio2 */ + + if ( separateCenterChannelRendering ) + { + /* 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 ); + } + + getDirectPartGains( bin, aziDeg, eleDeg, &lRealp, &lImagp, &rRealp, &rImagp, h->renderStereoOutputInsteadOfBinaural, Rmat ); + + if ( h->renderStereoOutputInsteadOfBinaural ) + { + /* 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 ( 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 ) + { + /* 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; + } + + /* 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 ) + { + w1 = 1.0f - 2.0f * spreadCoh; + w2 = 2.0f * spreadCoh; + w3 = 0.0f; + } + 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]; + } + } + + /* 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 */ + } + + /* 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 ) + { + 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; + + 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 ) + { + 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; + } + } + + /* Store parameters for formulating average diffuseness over frame */ + h->frameMeanDiffuseness[bin] += diffEne; + frameMeanDiffusenessEneWeight[bin] += meanEnePerCh; + } + + /* Formulate average diffuseness over frame */ + for ( bin = 0; bin < nBins; bin++ ) + { + h->frameMeanDiffuseness[bin] /= fmaxf( 1e-12f, frameMeanDiffusenessEneWeight[bin] ); + } + + /* Determine encoding quality based additional smoothing factor */ + qualityBasedSmFactor = 1.0f; + if ( st_ivas->hMasa != NULL ) + { + qualityBasedSmFactor = st_ivas->hMasa->data.dir_decode_quality; + qualityBasedSmFactor *= qualityBasedSmFactor; + } + + /* 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 + ( 1.0f - qualityBasedSmFactor ); + } + else + { + IIReneLimiterFactor = 8.0f + ( 1.0f - qualityBasedSmFactor ); + } + for ( bin = 0; bin < nBins; bin++ ) + { + float eneRatio, IIReneLimiter; + + /* Temporally smooth cov mtx estimates for resulting mixing matrix stability. The design principle is that + * the energy history (IIR) must not be more than double of the current frame energy. This provides more + * robust performance at energy offsets when compared to typical IIR averaging. */ + eneRatio = ( h->ChEne[0][bin] + h->ChEne[1][bin] ) / fmaxf( 1e-12f, ( h->ChEnePrev[0][bin] + h->ChEnePrev[1][bin] ) ); + IIReneLimiter = fminf( 1.0f, eneRatio * IIReneLimiterFactor ); + + h->ChCrossRe[bin] *= qualityBasedSmFactor; + h->ChCrossIm[bin] *= qualityBasedSmFactor; + h->ChCrossReOut[bin] *= qualityBasedSmFactor; + h->ChCrossImOut[bin] *= qualityBasedSmFactor; + + for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) + { + h->ChEne[ch][bin] *= qualityBasedSmFactor; + h->ChEneOut[ch][bin] *= qualityBasedSmFactor; + } + + h->ChCrossRe[bin] += IIReneLimiter * h->ChCrossRePrev[bin]; + h->ChCrossIm[bin] += IIReneLimiter * h->ChCrossImPrev[bin]; + h->ChCrossReOut[bin] += IIReneLimiter * h->ChCrossReOutPrev[bin]; + h->ChCrossImOut[bin] += IIReneLimiter * h->ChCrossImOutPrev[bin]; + + for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) + { + h->ChEne[ch][bin] += IIReneLimiter * h->ChEnePrev[ch][bin]; + h->ChEneOut[ch][bin] += IIReneLimiter * h->ChEneOutPrev[ch][bin]; + } + + /* Store energy values and coefficients for next round */ + h->ChCrossRePrev[bin] = h->ChCrossRe[bin]; + h->ChCrossImPrev[bin] = h->ChCrossIm[bin]; + h->ChCrossReOutPrev[bin] = h->ChCrossReOut[bin]; + h->ChCrossImOutPrev[bin] = h->ChCrossImOut[bin]; + + for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) + { + h->ChEnePrev[ch][bin] = h->ChEne[ch][bin]; + h->ChEneOutPrev[ch][bin] = h->ChEneOut[ch][bin]; + } + } + + return; +} +#else 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], @@ -1050,6 +1714,7 @@ static void ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matric return; } +#endif static void ivas_dirac_dec_binaural_determine_processing_matrices( @@ -1057,7 +1722,11 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices( const int16_t max_band_decorr, float Rmat[3][3] ) { +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS + int16_t chA, chB, bin; +#else uint8_t chA, chB, bin; +#endif uint8_t separateCenterChannelRendering; int16_t nBins; DIRAC_DEC_BIN_HANDLE h; @@ -1083,7 +1752,7 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices( h->ChCrossRe[bin], h->ChCrossIm[bin], h->ChEneOut[0][bin], h->ChEneOut[1][bin], h->ChCrossReOut[bin], h->ChCrossImOut[bin], - prototypeMtx, Mre, Mim, 1.0f ); + prototypeMtx, Mre, Mim, h->reqularizationFactor ); /* Load estimated covariance matrix to the [2][2] matrix form */ CxRe[0][0] = h->ChEne[0][bin]; @@ -1220,6 +1889,117 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices( } +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS +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 ) +{ + 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_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; + + h = st_ivas->hDiracDecBin; + nBins = st_ivas->hDirAC->num_freq_bands; + offsetSamples = subframe * CLDFB_SLOTS_PER_SUBFRAME * nBins; + + if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) + { + /* Process second / room effect part of binaural output when needed */ + ivas_binaural_reverb_processSubframe( st_ivas->hDiracDecBin->hReverb, numInChannels, inRe, inIm, reverbRe, reverbIm ); + } + + interpVal = 0.0f; + for ( slot = 0; slot < CLDFB_SLOTS_PER_SUBFRAME; slot++ ) + { + interpVal += 1.0f / ( (float) CLDFB_SLOTS_PER_SUBFRAME ); + if ( !st_ivas->hDiracDecBin->useTdDecorr && max_band_decorr > 0 ) + { + ivas_dirac_dec_decorrelate_slot( st_ivas->hDirAC, slot, inRe, inIm, decSlotRe, decSlotIm ); + } + + for ( chA = 0; chA < BINAURAL_CHANNELS; chA++ ) + { + float *outSlotRePr, *outSlotImPr; /* Pointers needed for function call compatibility */ + + set_zero( outSlotRe, CLDFB_NO_CHANNELS_MAX ); + set_zero( outSlotIm, CLDFB_NO_CHANNELS_MAX ); + + /* Processing of the first / HRTF part of the binaural output. */ + for ( chB = 0; chB < numInChannels; chB++ ) + { + if ( st_ivas->hDiracDecBin->useTdDecorr ) + { + decSlotRePointer = inRe[chB + 2][slot]; + decSlotImPointer = inIm[chB + 2][slot]; + } + else + { + decSlotRePointer = decSlotRe[chB]; + decSlotImPointer = decSlotIm[chB]; + } + + for ( bin = 0; bin < nBins; bin++ ) + { + float gain; + + /* Mixing using the formulated processing matrix M */ + gain = ( 1.0f - interpVal ) * h->processMtxRePrev[chA][chB][bin] + + interpVal * h->processMtxRe[chA][chB][bin]; + outSlotRe[bin] += gain * inRe[chB][slot][bin]; + outSlotIm[bin] += gain * inIm[chB][slot][bin]; + + gain = ( 1.0f - interpVal ) * h->processMtxImPrev[chA][chB][bin] + + interpVal * h->processMtxIm[chA][chB][bin]; + outSlotRe[bin] -= gain * inIm[chB][slot][bin]; + outSlotIm[bin] += gain * inRe[chB][slot][bin]; + + /* Mixing decorrelated signals using the formulated residual processing matrix Mdec */ + if ( bin < max_band_decorr && chB < 2 ) + { + gain = ( 1.0f - interpVal ) * h->processMtxDecRePrev[chA][chB][bin] + + interpVal * h->processMtxDecRe[chA][chB][bin]; + outSlotRe[bin] += gain * decSlotRePointer[bin]; + outSlotIm[bin] += gain * decSlotImPointer[bin]; + + gain = ( 1.0f - interpVal ) * h->processMtxDecImPrev[chA][chB][bin] + + interpVal * h->processMtxDecIm[chA][chB][bin]; + outSlotRe[bin] -= gain * decSlotImPointer[bin]; + outSlotIm[bin] += gain * decSlotRePointer[bin]; + } + } + } + + if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) + { + /* Combine second (reverb) part with the first (HRTF) part to obtain binaural output signal with room effect */ + v_add( outSlotRe, reverbRe[chA][slot], outSlotRe, CLDFB_NO_CHANNELS_MAX ); + v_add( outSlotIm, reverbIm[chA][slot], outSlotIm, CLDFB_NO_CHANNELS_MAX ); + } + + outSlotRePr = &( outSlotRe[0] ); + outSlotImPr = &( outSlotIm[0] ); + + /* Inverse filter bank */ + cldfbSynthesis( &outSlotRePr, &outSlotImPr, &( output_f[chA][nBins * slot + offsetSamples] ), nBins, st_ivas->cldfbSynDec[chA] ); + } + } + + return; +} +#else static void ivas_dirac_dec_binaural_process_output( Decoder_Struct *st_ivas, float output_f[][L_FRAME48k], @@ -1330,8 +2110,262 @@ static void ivas_dirac_dec_binaural_process_output( return; } +#endif + + +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS +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] ) +{ + int16_t slot, ch, bin, louderCh; + float ILD, mono_factor_ILD, mono_factor_rotation, mono_factor, y_val, ene_proc, ene_target; + int16_t max_band; + 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. */ + y_val = 1.0f - fabsf( Rmat[1][1] ); + mono_factor_rotation = ( y_val - ADAPT_HTPROTO_ROT_LIM_0 ) / ( ADAPT_HTPROTO_ROT_LIM_1 - ADAPT_HTPROTO_ROT_LIM_0 ); + mono_factor_rotation = fmaxf( 0.0f, fminf( 1.0f, mono_factor_rotation ) ); + + /* Adapt transport signals in frequency bands */ + /* optimization grouping CLDFB bins into MASA bands (they are readily available in ROM and suitable for the task) AND group CLDFB slots into sub-frames */ + + max_band = 0; + while ( max_band < MASA_FREQUENCY_BANDS && MASA_band_grouping_24[max_band] < nBins ) + { + max_band++; + } + + for ( band_idx = 0; band_idx < max_band; band_idx++ ) + { + float ch_nrg[2]; /* storage for input signal channel energies */ + bin_lo = MASA_band_grouping_24[band_idx]; + bin_hi = min( MASA_band_grouping_24[band_idx + 1], (int16_t) nBins ); + for ( ch = 0; ch < 2; ch++ ) + { + ch_nrg[ch] = 0.0f; + for ( slot = 0; slot < CLDFB_SLOTS_PER_SUBFRAME; slot++ ) + { + for ( bin = bin_lo; bin < bin_hi; bin++ ) + { + ch_nrg[ch] += ( inRe[ch][slot][bin] * inRe[ch][slot][bin] ) + ( inIm[ch][slot][bin] * inIm[ch][slot][bin] ); + } + } + hHeadTrackData->chEneIIR[ch][band_idx] *= ADAPT_HTPROTO_IIR_FAC; + hHeadTrackData->chEneIIR[ch][band_idx] += ( 1.0f - ADAPT_HTPROTO_IIR_FAC ) * ch_nrg[ch]; + } + + /* Determine ILD */ + ILD = fabsf( 10.0f * log10f( fmaxf( 1e-12f, hHeadTrackData->chEneIIR[0][band_idx] ) / fmaxf( 1e-12f, hHeadTrackData->chEneIIR[1][band_idx] ) ) ); + if ( hHeadTrackData->chEneIIR[1][band_idx] > hHeadTrackData->chEneIIR[0][band_idx] ) + { + louderCh = 1; + } + else + { + louderCh = 0; + } + + /* Determine ILD-based mono factor */ + mono_factor_ILD = ( ILD - ADAPT_HTPROTO_ILD_LIM_DB0 ) / ( ADAPT_HTPROTO_ILD_LIM_DB1 - ADAPT_HTPROTO_ILD_LIM_DB0 ); + mono_factor_ILD = fmaxf( 0.0f, fminf( 1.0f, mono_factor_ILD ) ); + + /* Combine mono factors */ + mono_factor = mono_factor_ILD * mono_factor_rotation; + + /* Mix original audio and sum signal according to determined mono factor */ + for ( ch = 0; ch < 2; ch++ ) + { + if ( ch != louderCh ) + { + float band_nrg = 0.0f; + + for ( slot = 0; slot < CLDFB_SLOTS_PER_SUBFRAME; slot++ ) + { + for ( bin = bin_lo; bin < bin_hi; bin++ ) + { + /* mono sum signal with the computed weight + rest from the original channel */ + inRe[ch][slot][bin] = mono_factor * ( inRe[0][slot][bin] + inRe[1][slot][bin] ) + ( 1.0f - mono_factor ) * inRe[ch][slot][bin]; + inIm[ch][slot][bin] = mono_factor * ( inIm[0][slot][bin] + inIm[1][slot][bin] ) + ( 1.0f - mono_factor ) * inIm[ch][slot][bin]; + band_nrg += ( inRe[ch][slot][bin] * inRe[ch][slot][bin] ) + ( inIm[ch][slot][bin] * inIm[ch][slot][bin] ); + } + } + hHeadTrackData->procChEneIIR[ch][band_idx] *= ADAPT_HTPROTO_IIR_FAC; + hHeadTrackData->procChEneIIR[ch][band_idx] += ( 1.0f - ADAPT_HTPROTO_IIR_FAC ) * band_nrg; + } + else + { + /* processed signal is input. use the original channel, so no need to compute new signals or signal energy */ + hHeadTrackData->procChEneIIR[ch][band_idx] *= ADAPT_HTPROTO_IIR_FAC; + hHeadTrackData->procChEneIIR[ch][band_idx] += ( 1.0f - ADAPT_HTPROTO_IIR_FAC ) * ch_nrg[ch]; + } + } + + /* Equalize */ + ene_target = hHeadTrackData->chEneIIR[0][band_idx] + hHeadTrackData->chEneIIR[1][band_idx]; + ene_proc = hHeadTrackData->procChEneIIR[0][band_idx] + hHeadTrackData->procChEneIIR[1][band_idx]; + eqVal = fminf( 4.0f, sqrtf( ene_target / fmaxf( 1e-12f, ene_proc ) ) ); + + for ( slot = 0; slot < CLDFB_SLOTS_PER_SUBFRAME; slot++ ) + { + for ( ch = 0; ch < 2; ch++ ) + { + for ( bin = bin_lo; bin < bin_hi; bin++ ) + { + inRe[ch][slot][bin] *= eqVal; + inIm[ch][slot][bin] *= eqVal; + } + } + } + } + + return; +} +#else +static void adaptTransportSignalsHeadtracked( + HEAD_TRACK_DATA_HANDLE hHeadTrackData, + float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + float inRe[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + const uint8_t firstSlot, + const uint8_t slotEnd, + const uint8_t nBins, + float Rmat[3][3] ) +{ + int16_t slot, ch, bin, louderCh; + float ILD, mono_factor_ILD, mono_factor_rotation, mono_factor, y_val, ene_proc, ene_target; + uint8_t n_slots_per_sf, sf_idx, n_sf; + int16_t max_band; + + /* Determine head-orientation-based mono factor. + Rmat[1][1] entry informs how close the ears are aligned according to transport signals. */ + y_val = 1.0f - fabsf( Rmat[1][1] ); + mono_factor_rotation = ( y_val - ADAPT_HTPROTO_ROT_LIM_0 ) / ( ADAPT_HTPROTO_ROT_LIM_1 - ADAPT_HTPROTO_ROT_LIM_0 ); + mono_factor_rotation = fmaxf( 0.0f, fminf( 1.0f, mono_factor_rotation ) ); + + /* Adapt transport signals in frequency bands */ + /* optimization grouping CLDFB bins into MASA bands (they are readily available in ROM and suitable for the task) AND group CLDFB slots into sub-frames */ + n_slots_per_sf = CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES; + n_sf = ( slotEnd - firstSlot ) / n_slots_per_sf; + + max_band = 0; + while ( max_band < MASA_FREQUENCY_BANDS && MASA_band_grouping_24[max_band] < nBins ) + { + max_band++; + } + + for ( sf_idx = 0; sf_idx < n_sf; sf_idx++ ) + { + float eqVal; + uint8_t start_slot, stop_slot; + int16_t band_idx, bin_lo, bin_hi; + + start_slot = firstSlot + sf_idx * n_slots_per_sf; + stop_slot = start_slot + n_slots_per_sf; + + for ( band_idx = 0; band_idx < max_band; band_idx++ ) + { + float ch_nrg[2]; /* storage for input signal channel energies */ + bin_lo = MASA_band_grouping_24[band_idx]; + bin_hi = min( MASA_band_grouping_24[band_idx + 1], (int16_t) nBins ); + for ( ch = 0; ch < 2; ch++ ) + { + ch_nrg[ch] = 0.0f; + for ( slot = start_slot; slot < stop_slot; slot++ ) + { + for ( bin = bin_lo; bin < bin_hi; bin++ ) + { + ch_nrg[ch] += ( inRe[ch][slot][bin] * inRe[ch][slot][bin] ) + ( inIm[ch][slot][bin] * inIm[ch][slot][bin] ); + } + } + hHeadTrackData->chEneIIR[ch][band_idx] *= ADAPT_HTPROTO_IIR_FAC; + hHeadTrackData->chEneIIR[ch][band_idx] += ( 1.0f - ADAPT_HTPROTO_IIR_FAC ) * ch_nrg[ch]; + } + + /* Determine ILD */ + ILD = fabsf( 10.0f * log10f( fmaxf( 1e-12f, hHeadTrackData->chEneIIR[0][band_idx] ) / fmaxf( 1e-12f, hHeadTrackData->chEneIIR[1][band_idx] ) ) ); + if ( hHeadTrackData->chEneIIR[1][band_idx] > hHeadTrackData->chEneIIR[0][band_idx] ) + { + louderCh = 1; + } + else + { + louderCh = 0; + } + + /* Determine ILD-based mono factor */ + mono_factor_ILD = ( ILD - ADAPT_HTPROTO_ILD_LIM_DB0 ) / ( ADAPT_HTPROTO_ILD_LIM_DB1 - ADAPT_HTPROTO_ILD_LIM_DB0 ); + mono_factor_ILD = fmaxf( 0.0f, fminf( 1.0f, mono_factor_ILD ) ); + + /* Combine mono factors */ + mono_factor = mono_factor_ILD * mono_factor_rotation; + + /* Mix original audio and sum signal according to determined mono factor */ + for ( ch = 0; ch < 2; ch++ ) + { + if ( ch != louderCh ) + { + float band_nrg = 0.0f; + + for ( slot = start_slot; slot < stop_slot; slot++ ) + { + for ( bin = bin_lo; bin < bin_hi; bin++ ) + { + /* mono sum signal with the computed weight + rest from the original channel */ + inRe[ch][slot][bin] = mono_factor * ( inRe[0][slot][bin] + inRe[1][slot][bin] ) + ( 1.0f - mono_factor ) * inRe[ch][slot][bin]; + inIm[ch][slot][bin] = mono_factor * ( inIm[0][slot][bin] + inIm[1][slot][bin] ) + ( 1.0f - mono_factor ) * inIm[ch][slot][bin]; + band_nrg += ( inRe[ch][slot][bin] * inRe[ch][slot][bin] ) + ( inIm[ch][slot][bin] * inIm[ch][slot][bin] ); + } + } + hHeadTrackData->procChEneIIR[ch][band_idx] *= ADAPT_HTPROTO_IIR_FAC; + hHeadTrackData->procChEneIIR[ch][band_idx] += ( 1.0f - ADAPT_HTPROTO_IIR_FAC ) * band_nrg; + } + else + { + /* processed signal is input. use the original channel, so no need to compute new signals or signal energy */ + hHeadTrackData->procChEneIIR[ch][band_idx] *= ADAPT_HTPROTO_IIR_FAC; + hHeadTrackData->procChEneIIR[ch][band_idx] += ( 1.0f - ADAPT_HTPROTO_IIR_FAC ) * ch_nrg[ch]; + } + } + + /* Equalize */ + ene_target = hHeadTrackData->chEneIIR[0][band_idx] + hHeadTrackData->chEneIIR[1][band_idx]; + ene_proc = hHeadTrackData->procChEneIIR[0][band_idx] + hHeadTrackData->procChEneIIR[1][band_idx]; + eqVal = fminf( 4.0f, sqrtf( ene_target / fmaxf( 1e-12f, ene_proc ) ) ); + + for ( slot = start_slot; slot < stop_slot; slot++ ) + { + for ( ch = 0; ch < 2; ch++ ) + { + for ( bin = bin_lo; bin < bin_hi; bin++ ) + { + inRe[ch][slot][bin] *= eqVal; + inIm[ch][slot][bin] *= eqVal; + } + } + } + } + } + return; +} +#endif +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS +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] ) +{ + int16_t slot, bin, ch; +#else 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], @@ -1342,6 +2376,7 @@ static void ivas_dirac_dec_binaural_check_and_switch_transports_headtracked( float Rmat[3][3] ) { uint8_t slot, bin, ch; +#endif float tmpVal; /* When not currently in prototype signal left-right switching procedure, check if such switching is needed */ @@ -1361,7 +2396,11 @@ static void ivas_dirac_dec_binaural_check_and_switch_transports_headtracked( /* When currently in interpolation */ if ( hHeadTrackData->lrSwitchedNext != hHeadTrackData->lrSwitchedCurrent ) { +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS + for ( slot = 0; slot < CLDFB_SLOTS_PER_SUBFRAME; slot++ ) +#else for ( slot = firstSlot; slot < slotEnd; slot++ ) +#endif { float switchOrderFactor, origOrderFactor; @@ -1417,7 +2456,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 ) { +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS + for ( slot = 0; slot < CLDFB_SLOTS_PER_SUBFRAME; slot++ ) +#else for ( slot = firstSlot; slot < slotEnd; slot++ ) +#endif { for ( bin = 0; bin < nBins; bin++ ) { @@ -1869,3 +2912,85 @@ static void hrtfShGetHrtf( return; } + + +/*------------------------------------------------------------------------- + * configure_reqularization_factor() + * + * Configure regularization factor for the mixing matrix generation of the + * parametric binauralizer using IVAS codec format and current bitrate. + *------------------------------------------------------------------------*/ + +/*! r: Configured reqularization factor value */ +#ifndef FIX_417_TD_DECORR_BRATE_SW +static +#endif + float + configure_reqularization_factor( + const IVAS_FORMAT ivas_format, /* i : IVAS format */ + const int32_t ivas_total_brate /* i : IVAS total bitrate */ + ) +{ + float reqularizationFactor; + reqularizationFactor = 1.0f; /* Default value */ + + if ( ivas_format == MASA_FORMAT ) + { + if ( ivas_total_brate >= IVAS_256k ) + { + reqularizationFactor = 0.2f; + } + else if ( ivas_total_brate == IVAS_192k ) + { + reqularizationFactor = 0.3f; + } + else if ( ivas_total_brate == IVAS_160k ) + { + reqularizationFactor = 0.4f; + } + else if ( ivas_total_brate == IVAS_128k ) + { + reqularizationFactor = 0.5f; + } + else if ( ivas_total_brate == IVAS_96k ) + { + reqularizationFactor = 0.6f; + } + else if ( ivas_total_brate >= IVAS_64k ) + { + reqularizationFactor = 0.8f; + } + else + { + reqularizationFactor = 1.0f; + } + } + + if ( ivas_format == MC_FORMAT ) /* This is always McMASA for parametric binauralizer. */ + { + if ( ivas_total_brate >= IVAS_96k ) + { + reqularizationFactor = 0.3f; + } + else if ( ivas_total_brate >= IVAS_80k ) + { + reqularizationFactor = 0.5f; + } + else if ( ivas_total_brate >= IVAS_64k ) + { + reqularizationFactor = 0.7f; + } + else if ( ivas_total_brate >= IVAS_48k ) + { + reqularizationFactor = 0.8f; + } + else + { + reqularizationFactor = 1.0f; + } + } + + /* For SBA and parametric ISM, currently in default value of 1.0f. */ + + return reqularizationFactor; +} diff --git a/lib_rend/ivas_hrtf.c b/lib_rend/ivas_hrtf.c index b53c636932f3dd77bb56142ba4387adce85caba2..2b1f16d025cfb0c9166a5c5c80c6c5489e0ca305 100644 --- a/lib_rend/ivas_hrtf.c +++ b/lib_rend/ivas_hrtf.c @@ -116,7 +116,6 @@ void ivas_HRTF_CRend_binary_close( return; } - free( *hSetOfHRTF ); *hSetOfHRTF = NULL; @@ -202,38 +201,3 @@ void ivas_HRTF_parambin_binary_close( return; } - - -/*-----------------------------------------------------------------------* - * ivas_headTrack_open() - * - * Allocate and initialize Head-Tracking handle - *-----------------------------------------------------------------------*/ - -ivas_error ivas_headTrack_open( - HEAD_TRACK_DATA_HANDLE *hHeadTrackData /* o : head track handle */ -) -{ - int16_t i; - - /* Allocate Head-Tracking handle */ - if ( ( *hHeadTrackData = (HEAD_TRACK_DATA_HANDLE) malloc( sizeof( HEAD_TRACK_DATA ) ) ) == NULL ) - { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for head-tracking memory\n" ) ); - } - - /* Initialization */ - ( *hHeadTrackData )->num_quaternions = 0; - ( *hHeadTrackData )->lrSwitchInterpVal = 0.0f; - ( *hHeadTrackData )->lrSwitchedCurrent = 0; - ( *hHeadTrackData )->lrSwitchedNext = 0; - - /* Initialise Rmat_prev to I, Rmat will be computed later */ - for ( i = 0; i < 3; i++ ) - { - set_zero( ( *hHeadTrackData )->Rmat_prev[i], 3 ); - ( *hHeadTrackData )->Rmat_prev[i][i] = 1.0f; - } - - return IVAS_ERR_OK; -} diff --git a/lib_rend/ivas_objectRenderer.c b/lib_rend/ivas_objectRenderer.c index a8be0b5ba32adb4065b1d53ab5bc66c1458dde40..0618534448deec903f1f016e8d2f8030f84e028f 100644 --- a/lib_rend/ivas_objectRenderer.c +++ b/lib_rend/ivas_objectRenderer.c @@ -30,6 +30,7 @@ *******************************************************************************************************/ +#include "ivas_stat_rend.h" #include #include "options.h" #include "prot.h" @@ -47,6 +48,7 @@ *---------------------------------------------------------------------*/ 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() @@ -60,6 +62,7 @@ ivas_error ivas_td_binaural_open_unwrap( const int16_t nchan_transport, /* i : Number of channels */ const IVAS_FORMAT ivas_format, /* i : IVAS format (ISM/MC) */ const AUDIO_CONFIG transport_config, /* i : Transport configuration */ + const float *directivity, /* i : Directivity pattern (used for ISM) */ const IVAS_OUTPUT_SETUP hTransSetup, /* i : Loudspeaker layout */ BINAURAL_TD_OBJECT_RENDERER_HANDLE *hBinRendererTd, /* o : TD renderer handle */ int32_t *binaural_latency_ns /* i : Binauralization delay */ @@ -168,9 +171,7 @@ ivas_error ivas_td_binaural_open_unwrap( for ( nS = 0; nS < nchan_rend; nS++ ) { /* Set source positions according to loudspeaker layout */ - Pos[0] = cosf( ls_elevation[nS] * PI_OVER_180 ) * cosf( ls_azimuth[nS] * PI_OVER_180 ); - Pos[1] = cosf( ls_elevation[nS] * PI_OVER_180 ) * sinf( ls_azimuth[nS] * PI_OVER_180 ); - Pos[2] = sinf( ls_elevation[nS] * PI_OVER_180 ); + angles_to_vec( 1.0f, ls_azimuth[nS], ls_elevation[nS], Pos ); Dir[0] = 1.0f; Dir[1] = 0.0f; Dir[2] = 0.0f; @@ -186,6 +187,27 @@ ivas_error ivas_td_binaural_open_unwrap( TDREND_MIX_SRC_SetDirAtten( pBinRendTd, nS, DirAtten_p ); } } + if ( ivas_format == ISM_FORMAT ) + { + DirAtten_p = pBinRendTd->DirAtten_p; + if ( NULL == directivity ) + { + DirAtten_p->ConeInnerAngle = 360.0f; /* Front cone */ + DirAtten_p->ConeOuterAngle = 360.0f; /* Back cone */ + DirAtten_p->ConeOuterGain = 1.0f; /* Back attenuation */ + } + else + { + DirAtten_p->ConeInnerAngle = directivity[0]; + DirAtten_p->ConeOuterAngle = directivity[1]; + DirAtten_p->ConeOuterGain = directivity[2]; + } + + for ( nS = 0; nS < nchan_rend; nS++ ) + { + TDREND_MIX_SRC_SetDirAtten( pBinRendTd, nS, DirAtten_p ); + } + } *hBinRendererTd = pBinRendTd; *binaural_latency_ns = (int32_t) ( ( *hBinRendererTd )->HrFiltSet_p->latency_s * 1000000000.f ); @@ -227,28 +249,16 @@ void ivas_td_binaural_close( *---------------------------------------------------------------------*/ ivas_error ivas_td_binaural_renderer_unwrap( -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - REVERB_HANDLE hReverb, /* i : reverb handle */ -#else - RENDER_CONFIG_DATA *hRenderConfig, /* i : Renderer configuration */ - const int16_t ini_frame, /* i : Initialization frame counter */ -#ifdef FIX_197_CREND_INTERFACE - CREND_WRAPPER_HANDLE hCrendWrapper, /* i : Crend wrapper handle */ -#else - CREND_HANDLE hCrend, /* i : Crend handle */ -#endif -#endif - AUDIO_CONFIG transport_config, /* i : Transport configuration */ -#ifndef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - const int32_t output_Fs, /* i : Output sampling rate */ -#endif + const REVERB_HANDLE hReverb, /* i : Reverberator handle */ + const AUDIO_CONFIG transport_config, /* i : Transport configuration */ BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD binaural object renderer handle */ - const int16_t nchan_transport, /* i : Transport channels (ISms) */ + const int16_t num_src, /* i : number of sources to render */ const int16_t lfe_idx, /* i : LFE channel index */ - IVAS_FORMAT ivas_format, /* i : IVAS format */ + const IVAS_FORMAT ivas_format, /* i : IVAS format */ ISM_METADATA_HANDLE *hIsmMetaData, /* i : ISM metadata handle */ const int16_t Opt_Headrotation, /* i : Head rotation flag */ const IVAS_QUATERNION *Quaternions, /* i : Head tracking data per subframe */ + const IVAS_VECTOR3 *Pos, /* i : Listener position data per subframe */ float output[][L_FRAME48k], /* i/o: SCE channels / Binaural synthesis */ const int16_t output_frame /* i : output frame length */ ) @@ -259,68 +269,21 @@ ivas_error ivas_td_binaural_renderer_unwrap( ivas_error error; subframe_length = output_frame / MAX_PARAM_SPATIAL_SUBFRAMES; -#ifndef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - if ( hRenderConfig != NULL ) - { - - if ( hRenderConfig->roomAcoustics.late_reverb_on && ( ini_frame == 0 ) ) - { - ivas_reverb_open( -#ifdef FIX_197_CREND_INTERFACE - &hCrendWrapper->hCrend->hReverb, -#else - &hCrend->hReverb, -#endif - transport_config, - NULL, - hRenderConfig, - output_Fs ); - } - } -#endif /* Update object position(s) */ - TDREND_Update_object_positions( hBinRendererTd, nchan_transport, lfe_idx, ivas_format, hIsmMetaData, output ); + TDREND_Update_object_positions( hBinRendererTd, num_src, lfe_idx, ivas_format, hIsmMetaData, output ); for ( subframe_idx = 0; subframe_idx < MAX_PARAM_SPATIAL_SUBFRAMES; subframe_idx++ ) { /* Update the listener's location/orientation */ - TDREND_Update_listener_orientation( hBinRendererTd, Opt_Headrotation, ( Quaternions != NULL ) ? &Quaternions[subframe_idx] : NULL ); + TDREND_Update_listener_orientation( hBinRendererTd, Opt_Headrotation, ( Quaternions != NULL ) ? &Quaternions[subframe_idx] : NULL, ( Pos != NULL ) ? &Pos[subframe_idx] : NULL ); -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - if ( ( hReverb != NULL ) && ( hReverb->pConfig.roomAcoustics.late_reverb_on ) ) -#else - if ( ( hRenderConfig != NULL ) && ( hRenderConfig->roomAcoustics.late_reverb_on ) ) -#endif + if ( hReverb != NULL && hReverb->pConfig.roomAcoustics.late_reverb_on ) { - if ( ( error = ivas_reverb_process( -#ifdef FIX_197_CREND_INTERFACE -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - hReverb, -#else - hCrendWrapper->hCrend->hReverb, -#endif -#else - hCrend->hReverb, -#endif - transport_config, 0, output, reverb_signal, subframe_idx ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_reverb_process( hReverb, transport_config, 0, output, reverb_signal, subframe_idx ) ) != IVAS_ERR_OK ) { return error; } - -#ifndef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - ivas_reverb_process( -#ifdef FIX_197_CREND_INTERFACE - hCrendWrapper->hCrend->hReverb, -#else - hCrend->hReverb, -#endif - transport_config, - 0, - output, - reverb_signal, - subframe_idx ); -#endif } /* Render subframe */ @@ -331,24 +294,12 @@ ivas_error ivas_td_binaural_renderer_unwrap( } -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - if ( ( hReverb != NULL ) && ( hReverb->pConfig.roomAcoustics.late_reverb_on ) ) + if ( hReverb != NULL && hReverb->pConfig.roomAcoustics.late_reverb_on ) { /* add reverb to rendered signals */ v_add( reverb_signal[0], output[0], output[0], output_frame ); v_add( reverb_signal[1], output[1], output[1], output_frame ); } -#else - if ( hRenderConfig != NULL ) /* Renderer Configuration not enabled in TD standalone renderer */ - { - if ( hRenderConfig->roomAcoustics.late_reverb_on ) - { - /* add reverb to rendered signals */ - v_add( reverb_signal[0], output[0], output[0], output_frame ); - v_add( reverb_signal[1], output[1], output[1], output_frame ); - } - } -#endif return IVAS_ERR_OK; } @@ -362,7 +313,7 @@ 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 */ + 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 */ ) @@ -451,7 +402,7 @@ 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 numSources, /* i : Number of sources to render */ + const int16_t num_src, /* i : number of sources to render */ const int16_t lfe_idx, /* i : Input LFE index */ const IVAS_FORMAT in_format, /* i : Format of input sources */ const ISM_METADATA_HANDLE *hIsmMetaData, /* i : Input metadata for ISM objects */ @@ -468,7 +419,7 @@ void TDREND_Update_object_positions( /* For each source, write the frame data to the source object*/ c_indx = 0; - for ( nS = 0; nS < numSources; nS++ ) + for ( nS = 0; nS < num_src; nS++ ) { if ( !( in_format == MC_FORMAT && nS == lfe_idx ) ) /* Skip LFE for MC */ { @@ -482,13 +433,8 @@ void TDREND_Update_object_positions( /* Update the source positions */ /* Source position and direction */ - Pos[0] = cosf( hIsmMetaData[nS]->elevation * PI_OVER_180 ) * cosf( hIsmMetaData[nS]->azimuth * PI_OVER_180 ); - Pos[1] = cosf( hIsmMetaData[nS]->elevation * PI_OVER_180 ) * sinf( hIsmMetaData[nS]->azimuth * PI_OVER_180 ); - Pos[2] = sinf( hIsmMetaData[nS]->elevation * PI_OVER_180 ); - Dir[0] = 1.0f; - Dir[1] = 0.0f; - Dir[2] = 0.0f; - + angles_to_vec( hIsmMetaData[nS]->radius, hIsmMetaData[nS]->azimuth, hIsmMetaData[nS]->elevation, Pos ); + angles_to_vec( 1.0f, hIsmMetaData[nS]->yaw, hIsmMetaData[nS]->pitch, Dir ); /* Source directivity info */ DirAtten_p->ConeInnerAngle = 360.0f; DirAtten_p->ConeOuterAngle = 360.0f; @@ -515,19 +461,14 @@ void TDREND_Update_object_positions( void TDREND_Update_listener_orientation( BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD Renderer handle */ const int16_t headRotEnabled, /* i : Headrotation flag */ - const IVAS_QUATERNION *headPosition /* i : Head Position */ + const IVAS_QUATERNION *headPosition, /* i : Listener orientation */ + const IVAS_VECTOR3 *Pos /* i : Listener Position */ ) { - float Pos[3]; float FrontVec[3]; float UpVec[3]; float Rmat[3][3]; - - /* Update the listener's location/orientation */ - /* Listener at the origin */ - Pos[0] = 0.0f; - Pos[1] = 0.0f; - Pos[2] = 0.0f; + float Pos_p[3]; if ( headRotEnabled ) { @@ -541,6 +482,10 @@ void TDREND_Update_listener_orientation( UpVec[0] = Rmat[2][0]; UpVec[1] = Rmat[2][1]; UpVec[2] = Rmat[2][2]; + /* Input position */ + Pos_p[0] = ( *Pos ).x; + Pos_p[1] = ( *Pos ).y; + Pos_p[2] = ( *Pos ).z; } else { @@ -552,10 +497,14 @@ void TDREND_Update_listener_orientation( UpVec[0] = 0.0f; UpVec[1] = 0.0f; UpVec[2] = 1.0f; + /* Listener at the origin */ + Pos_p[0] = 0.0f; + Pos_p[1] = 0.0f; + Pos_p[2] = 0.0f; } /* Set the listener position and orientation:*/ - TDREND_MIX_LIST_SetPos( hBinRendererTd, Pos ); + TDREND_MIX_LIST_SetPos( hBinRendererTd, Pos_p ); TDREND_MIX_LIST_SetOrient( hBinRendererTd, FrontVec, UpVec ); return; @@ -571,6 +520,7 @@ void TDREND_Update_listener_orientation( ivas_error ivas_td_binaural_open_ext( TDREND_WRAPPER *pTDRend, IVAS_REND_AudioConfig inConfig, + RENDER_CONFIG_DATA *hRendCfg, /* i : Renderer configuration */ LSSETUP_CUSTOM_STRUCT *customLsInput, const int32_t outFs ) { @@ -579,6 +529,7 @@ ivas_error ivas_td_binaural_open_ext( IVAS_FORMAT ivas_format; IVAS_OUTPUT_SETUP hTransSetup; ivas_error error; + float *directivity = NULL; if ( inConfig != IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) { @@ -592,16 +543,17 @@ ivas_error ivas_td_binaural_open_ext( nchan_transport = customLsInput->num_spk; } -#ifdef FIX_197_CREND_INTERFACE transport_config = getIvasAudioConfigFromRendAudioConfig( inConfig ); -#else - transport_config = rendAudioConfigToIvasAudioConfig( inConfig ); -#endif ivas_format = ( getAudioConfigType( inConfig ) == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) ? MC_FORMAT : ISM_FORMAT; hTransSetup.ls_azimuth = customLsInput->ls_azimuth; hTransSetup.ls_elevation = customLsInput->ls_elevation; - return ivas_td_binaural_open_unwrap( &pTDRend->hHrtfTD, outFs, nchan_transport, ivas_format, transport_config, hTransSetup, &pTDRend->hBinRendererTd, &pTDRend->binaural_latency_ns ); + if ( NULL != hRendCfg ) + { + directivity = hRendCfg->directivity; + } + + return ivas_td_binaural_open_unwrap( &pTDRend->hHrtfTD, outFs, nchan_transport, ivas_format, transport_config, directivity, hTransSetup, &pTDRend->hBinRendererTd, &pTDRend->binaural_latency_ns ); } @@ -618,28 +570,19 @@ ivas_error ivas_td_binaural_renderer_ext( const LSSETUP_CUSTOM_STRUCT *customLsInput, /* i : Input custom loudspeaker layout */ const IVAS_REND_HeadRotData *headRotData, /* i : Input head positions */ const IVAS_REND_AudioObjectPosition *currentPos, /* i : Object position */ -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - const REVERB_HANDLE reverb, /* i : reverb handle */ -#endif - const int16_t output_frame, /* i : output frame length */ - float output[][L_FRAME48k] /* i/o: SCE channels / Binaural synthesis */ + const REVERB_HANDLE hReverb, /* i : Reverberator handle */ + const int16_t output_frame, /* i : output frame length */ + float output[][L_FRAME48k] /* i/o: SCE channels / Binaural synthesis */ ) { ISM_METADATA_FRAME hIsmMetaDataFrame; ISM_METADATA_HANDLE hIsmMetaData[1]; int16_t lfe_idx; int16_t num_src; -#ifndef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - /* TODO tmu : pass down renderer config struct */ - // float reverb_signal[BINAURAL_CHANNELS][L_FRAME48k]; -#endif IVAS_FORMAT ivas_format; IVAS_REND_AudioConfigType inConfigType; AUDIO_CONFIG transport_config; ivas_error error; -#ifndef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - int32_t output_Fs; -#endif push_wmops( "ivas_td_binaural_renderer_ext" ); @@ -650,9 +593,7 @@ ivas_error ivas_td_binaural_renderer_ext( if ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) { ivas_format = MC_FORMAT; -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND transport_config = getIvasAudioConfigFromRendAudioConfig( inConfig ); -#endif if ( inConfig != IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) { if ( ( error = getAudioConfigNumChannels( inConfig, &num_src ) ) != IVAS_ERR_OK ) @@ -670,38 +611,43 @@ ivas_error ivas_td_binaural_renderer_ext( { ivas_format = ISM_FORMAT; num_src = 1; -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND transport_config = AUDIO_CONFIG_ISM1; -#endif hIsmMetaData[0] = &hIsmMetaDataFrame; hIsmMetaData[0]->azimuth = currentPos->azimuth; hIsmMetaData[0]->elevation = currentPos->elevation; + hIsmMetaData[0]->yaw = currentPos->yaw; + hIsmMetaData[0]->pitch = currentPos->pitch; + hIsmMetaData[0]->radius = currentPos->radius; } -#ifndef FIX_330_ENABLE_TD_RENDERER_REVERB_REND -#ifdef FIX_197_CREND_INTERFACE - transport_config = getIvasAudioConfigFromRendAudioConfig( inConfig ); -#else - transport_config = rendAudioConfigToIvasAudioConfig( inConfig ); -#endif - output_Fs = output_frame * 50; -#endif -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - if ( ( error = ivas_td_binaural_renderer_unwrap( reverb, transport_config, pTDRend->hBinRendererTd, num_src, lfe_idx, ivas_format, hIsmMetaData, headRotData->headRotEnabled, - ( headRotData != NULL ) ? headRotData->headPositions : NULL, output, output_frame ) ) != IVAS_ERR_OK ) - { - return error; - } -#else - if ( ( error = error = ivas_td_binaural_renderer_unwrap( NULL, 1, NULL, transport_config, output_Fs, pTDRend->hBinRendererTd, num_src, lfe_idx, - ivas_format, hIsmMetaData, headRotData->headRotEnabled, ( headRotData != NULL ) ? headRotData->headPositions : NULL, - output, output_frame ) ) != IVAS_ERR_OK ) + 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 ) { return error; } -#endif pop_wmops(); return IVAS_ERR_OK; } + +/*---------------------------------------------------------------------* + * angles_to_vec() + * + * Convert azimuth and elevation angles to position/orientation vector + *---------------------------------------------------------------------*/ + +static void angles_to_vec( + const float radius, /* i : radius */ + const float azimuth, /* i : Azimuth angle */ + const float elevation, /* i : Elevation angle */ + float *vec /* o : Pos/Dir vector */ +) +{ + vec[0] = radius * cosf( elevation * PI_OVER_180 ) * cosf( azimuth * PI_OVER_180 ); + vec[1] = radius * cosf( elevation * PI_OVER_180 ) * sinf( azimuth * PI_OVER_180 ); + vec[2] = radius * sinf( elevation * PI_OVER_180 ); + + return; +} diff --git a/lib_rend/ivas_objectRenderer_hrFilt.c b/lib_rend/ivas_objectRenderer_hrFilt.c index 0220b481450f403294a5cc453e8931780e7f5f8e..97d0b68fb8e83c6fb28f6e35b001800be2f9f5ac 100644 --- a/lib_rend/ivas_objectRenderer_hrFilt.c +++ b/lib_rend/ivas_objectRenderer_hrFilt.c @@ -69,10 +69,22 @@ ivas_error TDREND_REND_RenderSourceHRFilt( { float LeftOutputFrame[L_SPATIAL_SUBFR_48k]; float RightOutputFrame[L_SPATIAL_SUBFR_48k]; +#ifndef FIX_379_GAININTP + float Gain; + + Gain = ( *Src_p->SrcRend_p->DirGain_p ) * ( *Src_p->SrcRend_p->DistGain_p ); +#endif TDREND_Apply_ITD( Src_p->InputFrame_p, LeftOutputFrame, RightOutputFrame, &Src_p->previtd, Src_p->itd, Src_p->mem_itd, subframe_length ); - TDREND_firfilt( LeftOutputFrame, Src_p->hrf_left_prev, hrf_left_delta, intp_count, Src_p->mem_hrf_left, subframe_length, Src_p->filterlength ); - TDREND_firfilt( RightOutputFrame, Src_p->hrf_right_prev, hrf_right_delta, intp_count, Src_p->mem_hrf_right, subframe_length, Src_p->filterlength ); +#ifdef FIX_379_GAININTP + TDREND_firfilt( LeftOutputFrame, Src_p->hrf_left_prev, hrf_left_delta, intp_count, Src_p->mem_hrf_left, subframe_length, Src_p->filterlength, Src_p->Gain, Src_p->prevGain ); + TDREND_firfilt( RightOutputFrame, Src_p->hrf_right_prev, hrf_right_delta, intp_count, Src_p->mem_hrf_right, subframe_length, Src_p->filterlength, Src_p->Gain, Src_p->prevGain ); + Src_p->prevGain = Src_p->Gain; +#else + TDREND_firfilt( LeftOutputFrame, Src_p->hrf_left_prev, hrf_left_delta, intp_count, Src_p->mem_hrf_left, subframe_length, Src_p->filterlength, Gain ); + TDREND_firfilt( RightOutputFrame, Src_p->hrf_right_prev, hrf_right_delta, intp_count, Src_p->mem_hrf_right, subframe_length, Src_p->filterlength, Gain ); +#endif + /* Copy to accumulative output frame */ v_add( LeftOutputFrame, output_buf[0], output_buf[0], subframe_length ); v_add( RightOutputFrame, output_buf[1], output_buf[1], subframe_length ); diff --git a/lib_rend/ivas_objectRenderer_sfx.c b/lib_rend/ivas_objectRenderer_sfx.c index 005025827b8cc0c49158fb6fd7a83b11c86facf8..af3231df613a8717b5e8ada8603bc5fa92f94848 100644 --- a/lib_rend/ivas_objectRenderer_sfx.c +++ b/lib_rend/ivas_objectRenderer_sfx.c @@ -182,6 +182,7 @@ static void sincResample( const float *p_sinc_forward; const float *p_sinc_backward; + /* Compute fractional time step */ t_step = (float) ( length_in ) / (float) ( length_out ); t_frac = 0; @@ -234,7 +235,13 @@ void TDREND_firfilt( const int16_t intp_count, /* i : interpolation count */ float *mem, /* i/o: filter memory */ const int16_t subframe_length, /* i : Length of signal */ - const int16_t filterlength /* i : Filter length */ + const int16_t filterlength, /* i : Filter length */ +#ifdef FIX_379_GAININTP + const float Gain, /* i : Gain */ + const float prevGain /* i : Previous gain */ +#else + const float Gain /* i : Gain */ +#endif ) { float buffer[SFX_SPAT_BIN_MAX_FILTER_LENGTH - 1 + L_SUBFRAME5MS_48k]; @@ -243,6 +250,13 @@ void TDREND_firfilt( float *p_filter; float tmp; int16_t i, j; +#ifdef FIX_379_GAININTP + float step, gain_tmp, gain_delta; + + gain_delta = ( Gain - prevGain ); + step = gain_delta / ( subframe_length ); + gain_tmp = prevGain; +#endif /* Handle memory */ p_signal = buffer + filterlength - 1; @@ -260,7 +274,13 @@ void TDREND_firfilt( { tmp += ( *p_filter++ ) * ( *p_tmp-- ); } - signal[i] = tmp; +#ifdef FIX_379_GAININTP + /* Apply linear gain interpolation in case of abrupt gain changes */ + gain_tmp = gain_tmp + step; + signal[i] = tmp * gain_tmp; +#else + signal[i] = tmp * Gain; +#endif if ( i < intp_count ) { diff --git a/lib_rend/ivas_objectRenderer_sources.c b/lib_rend/ivas_objectRenderer_sources.c index d52422881292a65957e4c2d0c9d99a38f0d6ea7b..91253748b2eb4ee2554f80c6d8f2782b72c31fe8 100644 --- a/lib_rend/ivas_objectRenderer_sources.c +++ b/lib_rend/ivas_objectRenderer_sources.c @@ -96,7 +96,7 @@ ivas_error TDREND_MIX_SRC_SetPos( /*-------------------------------------------------------------------* * TDREND_MIX_SRC_SetDir() * - * Set source direciton + * Set source direction --------------------------------------------------------------------*/ ivas_error TDREND_MIX_SRC_SetDir( @@ -266,6 +266,7 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams( TDREND_MIX_Listener_t *Listener_p; TDREND_HRFILT_FiltSet_t *HrFiltSet_p; float ListRelPos[3], ListRelDist; + float ListRelPosAbs[3]; /* Relative position, ignoring orientation of listener */ float Azim, Elev; float hrf_left[SFX_SPAT_BIN_MAX_FILTER_LENGTH]; float hrf_right[SFX_SPAT_BIN_MAX_FILTER_LENGTH]; @@ -287,14 +288,14 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams( break; case TDREND_POSTYPE_ABSOLUTE: /* Absolute position */ - TDREND_SPATIAL_VecMapToNewCoordSystem( SrcSpatial_p->Pos_p, Listener_p->Pos, Listener_p->Front, Listener_p->Up, Listener_p->Right, ListRelPos ); + TDREND_SPATIAL_VecMapToNewCoordSystem( SrcSpatial_p->Pos_p, Listener_p->Pos, Listener_p->Front, Listener_p->Up, Listener_p->Right, ListRelPos, ListRelPosAbs ); break; default: /* Illegal position type */ #ifdef DEBUGGING printf( "Warning! TDREND_SRC_REND_UpdateFiltersFromSpatialParams: Invalid position type. Assuming absolute position!\n" ); #endif /* Assume absolute position */ - TDREND_SPATIAL_VecMapToNewCoordSystem( SrcSpatial_p->Pos_p, Listener_p->Pos, Listener_p->Front, Listener_p->Up, Listener_p->Right, ListRelPos ); + TDREND_SPATIAL_VecMapToNewCoordSystem( SrcSpatial_p->Pos_p, Listener_p->Pos, Listener_p->Front, Listener_p->Up, Listener_p->Right, ListRelPos, ListRelPosAbs ); break; } @@ -320,7 +321,7 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams( *SrcRend_p->DirGain_p = 1.0f; if ( SrcSpatial_p->DirAttenEnabled ) { - *SrcRend_p->DirGain_p = TDREND_SRC_SPATIAL_GetDirGain( &SrcSpatial_p->DirAtten, SrcSpatial_p->Front_p, ListRelPos ); + *SrcRend_p->DirGain_p = TDREND_SRC_SPATIAL_GetDirGain( &SrcSpatial_p->DirAtten, SrcSpatial_p->Front_p, ListRelPosAbs ); } /* Distance gain */ @@ -459,7 +460,7 @@ static void TDREND_SRC_SPATIAL_Init( SrcSpatial_p->DistAttenEnabled = FALSE; SrcSpatial_p->DistAtten.DistAttenModel = TDREND_DIST_ATTEN_MODEL_INV_DIST_CLAMPED; SrcSpatial_p->DistAtten.RefDist = 1.0f; - SrcSpatial_p->DistAtten.MaxDist = 10.0f; + SrcSpatial_p->DistAtten.MaxDist = 15.75f; /* Maximum radius (2^ISM_RADIUS_NBITS-1)*0.25 */ SrcSpatial_p->DistAtten.RollOffFactor = 1.0f; return; @@ -686,7 +687,9 @@ void TDREND_SRC_Init( Src_p->hrf_right_prev[0] = 1; Src_p->azim_prev = 0.0f; Src_p->elev_prev = 0.0f; - +#ifdef FIX_379_GAININTP + Src_p->prevGain = 1.0f; +#endif return; } diff --git a/lib_rend/ivas_objectRenderer_vec.c b/lib_rend/ivas_objectRenderer_vec.c index c3a780c725fa66aa07fe592adfb06dba643098b8..061b790e1b46e9010d14a0b0162b528bbd3768fb 100644 --- a/lib_rend/ivas_objectRenderer_vec.c +++ b/lib_rend/ivas_objectRenderer_vec.c @@ -111,20 +111,16 @@ void TDREND_SPATIAL_VecMapToNewCoordSystem( const float *DirVec_p, /* i : Direction vector */ const float *UpVec_p, /* i : Up vector */ const float *RightVec_p, /* i : Right vector */ - float *MappedVec_p /* o : Transformed vector */ + float *MappedVec_p, /* o : Transformed vector */ + float *LisRelPosAbs /* o : Transformed vector ignoring orientation */ ) { - float RelVec[3]; - - /* Evaluate Vec relative to the new origin given by TranslVec */ - v_sub( Vec_p, TranslVec_p, RelVec, 3 ); - + v_sub( Vec_p, TranslVec_p, LisRelPosAbs, 3 ); /* Evalute the relative Vec in the coordinates of the Orientation vectors, */ /* which form an orthonormal basis */ - MappedVec_p[0] = dotp( RelVec, DirVec_p, 3 ); - MappedVec_p[1] = dotp( RelVec, RightVec_p, 3 ); - MappedVec_p[2] = dotp( RelVec, UpVec_p, 3 ); - + MappedVec_p[0] = dotp( LisRelPosAbs, DirVec_p, 3 ); + MappedVec_p[1] = dotp( LisRelPosAbs, RightVec_p, 3 ); + MappedVec_p[2] = dotp( LisRelPosAbs, UpVec_p, 3 ); return; } diff --git a/lib_rend/ivas_orient_trk.c b/lib_rend/ivas_orient_trk.c index 4eec8ecd562c8f4f8006972d629dc652d5d9bd41..63d863c4b635dcdfc832f9c0027d165a7c902238 100644 --- a/lib_rend/ivas_orient_trk.c +++ b/lib_rend/ivas_orient_trk.c @@ -30,6 +30,7 @@ *******************************************************************************************************/ +#include "common_api_types.h" #include #include "options.h" #include "ivas_prot.h" @@ -49,52 +50,328 @@ #define MAX_TRACKED_ANGLE_AVG_ORIENT PI_OVER_2 #define MAX_TRACKED_ANGLE_REF_ORIENT EVS_PI - -/* TODO relate to frame rate - assumed here 50Hz, i.e. 20ms frame length */ -#define OTR_UPDATE_RATE ( 50.0f ) /* rate of the Process() calls [Hz]; 1x per IVAS frame */ +#define OTR_UPDATE_RATE (float) FRAMES_PER_SEC /* rate of the Process() calls [Hz]; 1x per IVAS frame */ /*------------------------------------------------------------------------------------------* * Local functions *------------------------------------------------------------------------------------------*/ -static float ClipAngle( - const float angle, - const float min_angle, - const float max_angle ) +/*------------------------------------------------------------------------------------------* + * IdentityQuaternion() + * + * + *------------------------------------------------------------------------------------------*/ + +static IVAS_QUATERNION IdentityQuaternion( + void ) { - float result = angle; + IVAS_QUATERNION q; - /* wrap angle modulo 2*pi into range of [-pi, pi> radians */ - /* 'while' assumed to use comparison to 0 */ - while ( result > EVS_PI ) - { - result -= PI2; - } - /* 'while' assumed to use comparison to 0 */ - while ( result <= -EVS_PI ) + q.w = 1.0f; + q.x = q.y = q.z = 0.0f; + + return q; +} + + +/*------------------------------------------------------------------------------------------* + * QuaternionProduct() + * + * Quaternion product + *------------------------------------------------------------------------------------------*/ + +static void QuaternionProduct( + const IVAS_QUATERNION q1, + const IVAS_QUATERNION q2, + IVAS_QUATERNION *const r ) +{ + IVAS_QUATERNION tmp; + tmp.w = q1.w * q2.w - q1.x * q2.x - q1.y * q2.y - q1.z * q2.z; + tmp.x = q1.w * q2.x + q1.x * q2.w + q1.y * q2.z - q1.z * q2.y; + tmp.y = q1.w * q2.y - q1.x * q2.z + q1.y * q2.w + q1.z * q2.x; + tmp.z = q1.w * q2.z + q1.x * q2.y - q1.y * q2.x + q1.z * q2.w; + + *r = tmp; + + return; +} + +/*------------------------------------------------------------------------------------------* + * QuaternionDotProduct() + * + * Quaternion dot product + *------------------------------------------------------------------------------------------*/ + +static float QuaternionDotProduct( + const IVAS_QUATERNION q1, + const IVAS_QUATERNION q2 ) +{ + return q1.x * q2.x + q1.y * q2.y + q1.z * q2.z + q1.w * q2.w; +} + + +/*------------------------------------------------------------------------------------------* + * QuaternionDivision() + * + * Divides a quaternion by a scalar + *------------------------------------------------------------------------------------------*/ + +static void QuaternionDivision( + const IVAS_QUATERNION q, + const float d, + IVAS_QUATERNION *const r ) +{ + r->w = q.w / d; + r->x = q.x / d; + r->y = q.y / d; + r->z = q.z / d; + + return; +} + + +/*------------------------------------------------------------------------------------------* + * QuaternionNormalize() + * + * Normalizes a quaternion + *------------------------------------------------------------------------------------------*/ + +static void QuaternionNormalize( + const IVAS_QUATERNION q, + IVAS_QUATERNION *const r ) +{ + QuaternionDivision( q, sqrtf( QuaternionDotProduct( q, q ) ), r ); + + return; +} + + +/*------------------------------------------------------------------------------------------* + * QuaternionSlerp() + * + * Computes a spherical linear interpolation between two quaternions + *------------------------------------------------------------------------------------------*/ + +static void QuaternionSlerp( + const IVAS_QUATERNION q1, + const IVAS_QUATERNION q2, + const float t, + IVAS_QUATERNION *const r ) +{ + float angle, denom, s, s2; + + s = QuaternionDotProduct( q1, q2 ); + + if ( fabsf( s ) >= 1.0f ) { - result += PI2; + *r = q2; + return; } - /* Next, clip angle into range */ - /* 'if' assumed to use comparison to 0 */ - if ( result < min_angle ) + angle = acosf( s ); + denom = sinf( angle ); + + s = sinf( ( 1 - t ) * angle ); + s2 = sinf( t * angle ); + r->x = ( q1.x * s + q2.x * s2 ) / denom; + r->y = ( q1.y * s + q2.y * s2 ) / denom; + r->z = ( q1.z * s + q2.z * s2 ) / denom; + r->w = ( q1.w * s + q2.w * s2 ) / denom; + + QuaternionNormalize( *r, r ); + + return; +} + + +/*------------------------------------------------------------------------------------------* + * QuaternionConjugate() + * + * Computes a quaternion conjugate + *------------------------------------------------------------------------------------------*/ + +static void QuaternionConjugate( + const IVAS_QUATERNION q, + IVAS_QUATERNION *const r ) +{ + r->w = q.w; + r->x = -q.x; + r->y = -q.y; + r->z = -q.z; + + return; +} + + +/*------------------------------------------------------------------------------------------* + * QuaternionAngle() + * + * Computes an angle between two quaternions + *------------------------------------------------------------------------------------------*/ + +static float QuaternionAngle( + const IVAS_QUATERNION q1, + const IVAS_QUATERNION q2 ) +{ + IVAS_QUATERNION q12; + float angle; + + QuaternionConjugate( q1, &q12 ); + QuaternionProduct( q12, q2, &q12 ); + angle = 2.0f * atan2f( sqrtf( q12.x * q12.x + q12.y * q12.y + q12.z * q12.z ), q12.w ); + + return angle; +} + + +/*------------------------------------------------------------------------------------------* + * QuaternionInverse() + * + * Computes an inverse quaternion + *------------------------------------------------------------------------------------------*/ + +static void QuaternionInverse( + const IVAS_QUATERNION q, + IVAS_QUATERNION *const r ) +{ + float dot_product; + + dot_product = QuaternionDotProduct( q, q ); + QuaternionConjugate( q, r ); + QuaternionDivision( *r, dot_product, r ); + + return; +} + + +/*------------------------------------------------------------------------------------------* + * VectorSubtract() + * + * Computes the difference of two vectors + *------------------------------------------------------------------------------------------*/ + +static IVAS_VECTOR3 VectorSubtract( + const IVAS_VECTOR3 p1, + const IVAS_VECTOR3 p2 ) +{ + IVAS_VECTOR3 result; + + result.x = p1.x - p2.x; + result.y = p1.y - p2.y; + result.z = p1.z - p2.z; + + return result; +} + + +/*------------------------------------------------------------------------------------------* + * VectorCrossProduct() + * + * Computes the cross product of two vectors + *------------------------------------------------------------------------------------------*/ + +static IVAS_VECTOR3 VectorCrossProduct( + const IVAS_VECTOR3 p1, + const IVAS_VECTOR3 p2 ) +{ + IVAS_VECTOR3 result; + result.x = p1.y * p2.z - p1.z * p2.y; + result.y = p1.z * p2.x - p1.x * p2.z; + result.z = p1.x * p2.y - p1.y * p2.x; + + return result; +} + + +/*------------------------------------------------------------------------------------------* + * VectorDotProduct( + * + * Computes the dot product of two vectors + *------------------------------------------------------------------------------------------*/ + +static float VectorDotProduct( + const IVAS_VECTOR3 p1, + const IVAS_VECTOR3 p2 ) +{ + return p1.x * p2.x + p1.y * p2.y + p1.z * p2.z; +} + + +/*------------------------------------------------------------------------------------------* + * VectorLength() + * + * Computes the length of a vector + *------------------------------------------------------------------------------------------*/ + +static float VectorLength( + const IVAS_VECTOR3 p ) +{ + return sqrtf( p.x * p.x + p.y * p.y + p.z * p.z ); +} + + +/*------------------------------------------------------------------------------------------* + * VectorNormalize() + * + * Normalizes a vector + *------------------------------------------------------------------------------------------*/ + +static IVAS_VECTOR3 VectorNormalize( + const IVAS_VECTOR3 p ) +{ + IVAS_VECTOR3 result; + + const float length = VectorLength( p ); + + result.x = p.x / length; + result.y = p.y / length; + result.z = p.z / length; + + return result; +} + + +/*------------------------------------------------------------------------------------------* + * VectorRotationToQuaternion() + * + * Computes a quaternion representing the rotation from vector p1 to vector p2 + *------------------------------------------------------------------------------------------*/ + +static void VectorRotationToQuaternion( + const IVAS_VECTOR3 p1, + const IVAS_VECTOR3 p2, + IVAS_QUATERNION *const r ) +{ + float dot_product; + IVAS_VECTOR3 cross_product, p1_normalized, p2_normalized; + + p1_normalized = VectorNormalize( p1 ); + p2_normalized = VectorNormalize( p2 ); + cross_product = VectorCrossProduct( p1_normalized, p2_normalized ); + dot_product = VectorDotProduct( p1_normalized, p2_normalized ); + + if ( dot_product < -0.999999 ) { - result = min_angle; + /* happens when the p1 vector is parallel to p2, but direction is flipped */ + r->w = 0.0f; + r->x = 0.0f; + r->y = 0.0f; + r->z = 1.0f; } else { - /* 'if' assumed to use comparison to 0 */ - if ( result > max_angle ) - { - result = max_angle; - } + /* all regular cases */ + r->x = cross_product.x; + r->y = cross_product.y; + r->z = cross_product.z; + r->w = 1.0f + dot_product; } - return result; -} + QuaternionNormalize( *r, r ); + return; +} /*-------------------------------------------------------------------* * ivas_orient_trk_Init() @@ -102,11 +379,18 @@ static float ClipAngle( * *-------------------------------------------------------------------*/ -void ivas_orient_trk_Init( - ivas_orient_trk_state_t *pOTR ) +ivas_error ivas_orient_trk_Init( + ivas_orient_trk_state_t *pOTR ) /* i/o : orientation tracker handle */ { - /* Track relative to a reference orientation */ - pOTR->trackingType = OTR_TRACKING_REF_ORIENT; + IVAS_QUATERNION identity; + + if ( pOTR == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + identity.w = 1.0f; + identity.x = identity.y = identity.z = 0.0f; /* configuration parameters */ pOTR->centerAdaptationRate = 1.0f / 30.0f; @@ -116,25 +400,15 @@ void ivas_orient_trk_Init( /* initial adaptivity filter coefficient, will be auto-adapted */ pOTR->alpha = sinf( PI2 * pOTR->offCenterAdaptationRate / OTR_UPDATE_RATE ); /* start adaptation at off-center rate = fastest rate */ - pOTR->absYaw = 0.0f; - pOTR->absPitch = 0.0f; - pOTR->absRoll = 0.0f; + pOTR->trkRot = identity; + pOTR->absAvgRot = identity; + /* Use frontal and horiontal orientation as reference orientation, unless/until overridden */ + pOTR->refRot = identity; - pOTR->absAvgYaw = 0.0f; - pOTR->absAvgPitch = 0.0f; - pOTR->absAvgRoll = 0.0f; + /* set safe default tracking mode */ + pOTR->trackingType = OTR_TRACKING_NONE; - /* Use frontal and horiontal orientation as reference orientation, - unless/until overridden by ivas_orient_trk_SetAbsoluteOrientation() */ - pOTR->refYaw = 0.0f; - pOTR->refPitch = 0.0f; - pOTR->refRoll = 0.0f; - - pOTR->trkYaw = 0.0f; - pOTR->trkPitch = 0.0f; - pOTR->trkRoll = 0.0f; - - return; + return IVAS_ERR_OK; } @@ -144,173 +418,257 @@ void ivas_orient_trk_Init( * *-------------------------------------------------------------------*/ -void ivas_orient_trk_SetTrackingType( - ivas_orient_trk_state_t *pOTR, - const OTR_TRACKING_T trackingType ) +ivas_error ivas_orient_trk_SetTrackingType( + ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ + const OTR_TRACKING_T trackingType /* i/o: orientation tracking type */ +) { + if ( pOTR == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } pOTR->trackingType = trackingType; - return; + return IVAS_ERR_OK; } - /*-------------------------------------------------------------------* - * ivas_orient_trk_SetAbsoluteOrientation() + * ivas_orient_trk_SetReferenceRotation() * * *-------------------------------------------------------------------*/ -void ivas_orient_trk_SetAbsoluteOrientation( - ivas_orient_trk_state_t *pOTR, - const float yaw, - const float pitch, - const float roll ) +ivas_error ivas_orient_trk_SetReferenceRotation( + ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ + const IVAS_QUATERNION refRot /* i : reference rotation */ +) { - /* TODO implement condition checks */ - pOTR->absYaw = yaw; - pOTR->absPitch = pitch; - pOTR->absRoll = roll; + if ( pOTR == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } - return; + /* check for Euler angle signaling */ + if ( refRot.w == -3.0f ) + { + Euler2Quat( deg2rad( refRot.x ), deg2rad( refRot.y ), deg2rad( refRot.z ), &pOTR->refRot ); + } + else + { + pOTR->refRot = refRot; + } + + return IVAS_ERR_OK; } /*-------------------------------------------------------------------* - * ivas_orient_trk_Process() + * ivas_orient_trk_GetMainOrientation() * * *-------------------------------------------------------------------*/ -ivas_error ivas_orient_trk_Process( - ivas_orient_trk_state_t *pOTR ) +ivas_error ivas_orient_trk_GetMainOrientation( + ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ + IVAS_QUATERNION *pOrientation /* i/o: average/reference orientation */ +) { - float yaw; - float pitch; - float roll; + if ( pOTR == NULL || pOrientation == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + switch ( pOTR->trackingType ) + { + case OTR_TRACKING_NONE: + *pOrientation = IdentityQuaternion(); + break; + case OTR_TRACKING_REF_VEC: + case OTR_TRACKING_REF_VEC_LEV: + case OTR_TRACKING_REF_ORIENT: + *pOrientation = pOTR->refRot; + break; + case OTR_TRACKING_AVG_ORIENT: + *pOrientation = pOTR->absAvgRot; + break; + } - if ( pOTR->trackingType == OTR_TRACKING_AVG_ORIENT ) + return IVAS_ERR_OK; +} + + +/*-------------------------------------------------------------------* + * ivas_orient_trk_GetTrackedRotation() + * + * + *-------------------------------------------------------------------*/ + +ivas_error ivas_orient_trk_GetTrackedRotation( + ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ + IVAS_QUATERNION *pRotation /* i/o: processed rotation */ +) +{ + if ( pOTR == NULL || pRotation == NULL ) { - float normalizedOrientation; - float relativeOrientationRate; - float rateRange; - float cutoffFrequency; - float alpha = pOTR->alpha; - - /* Copy absolute orientation as input to compute further on */ - yaw = pOTR->absYaw; - pitch = pOTR->absPitch; - roll = pOTR->absRoll; - - /* Compute average (low-pass filtered) absolute orientation */ - pOTR->absAvgYaw = ( 1.0f - alpha ) * pOTR->absAvgYaw + alpha * yaw; - pOTR->absAvgPitch = ( 1.0f - alpha ) * pOTR->absAvgPitch + alpha * pitch; - pOTR->absAvgRoll = ( 1.0f - alpha ) * pOTR->absAvgRoll + alpha * roll; - - /* Compute relative orientation = (absolute orientation) - (average absolute orientation) */ - yaw -= pOTR->absAvgYaw; - pitch -= pOTR->absAvgPitch; - roll -= pOTR->absAvgRoll; - - /* Clip tracked relative orientation to avoid wrap around */ - yaw = ClipAngle( yaw, -MAX_TRACKED_ANGLE_AVG_ORIENT, MAX_TRACKED_ANGLE_AVG_ORIENT ); - pitch = ClipAngle( pitch, -MAX_TRACKED_ANGLE_AVG_ORIENT, MAX_TRACKED_ANGLE_AVG_ORIENT ); - roll = ClipAngle( roll, -MAX_TRACKED_ANGLE_AVG_ORIENT, MAX_TRACKED_ANGLE_AVG_ORIENT ); - - /* Store relative orientation result as output */ - pOTR->trkYaw = yaw; - pOTR->trkPitch = pitch; - pOTR->trkRoll = roll; - - /* Reconstruct the mean absolute orientation, compensating for non-linear computation of relative orientation: - take absolute orientation and subtract the *clipped* mean relative orientation */ - pOTR->absAvgYaw = pOTR->absYaw - yaw; - pOTR->absAvgPitch = pOTR->absPitch - pitch; - pOTR->absAvgRoll = pOTR->absRoll - roll; - - /* Adapt LPF constant based on orientation excursion relative to current mean: - - low cutoff (slow adaptation) for small excursions (around center) - - high cutoff (fast adaptation) for large excursions (off-center) - */ - - normalizedOrientation = yaw * yaw; - normalizedOrientation += pitch * pitch; - normalizedOrientation += roll * roll; - - relativeOrientationRate = sqrtf( normalizedOrientation ) / pOTR->adaptationAngle; - /* 'if' assumed to perform comparison to 0 */ - if ( relativeOrientationRate > 1.0f ) - { - relativeOrientationRate = 1.0f; - } - - /* Compute range of the adaptation rate between center = lower rate and off-center = higher rate */ - rateRange = pOTR->offCenterAdaptationRate - pOTR->centerAdaptationRate; - /* 'if' assumed to perform comparison to 0 */ - if ( rateRange < 0.0f ) - { - rateRange = 0.0f; - } - - /* Compute adaptivity cutoff frequency: interpolate between minimum (center) and maximum (off-center) values */ - cutoffFrequency = pOTR->centerAdaptationRate + ( relativeOrientationRate * rateRange ); - - /* Compute filter coefficient corresponding to desired cutoff frequency */ - pOTR->alpha = sinf( 2.0f * EVS_PI * cutoffFrequency / OTR_UPDATE_RATE ); + return IVAS_ERR_UNEXPECTED_NULL_POINTER; } - else + + *pRotation = pOTR->trkRot; + + return IVAS_ERR_OK; +} + + +/*-------------------------------------------------------------------* + * ivas_orient_trk_SetReferenceVector() + * + * + *-------------------------------------------------------------------*/ + +ivas_error ivas_orient_trk_SetReferenceVector( + ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ + const IVAS_VECTOR3 listenerPos, /* i : Listener position */ + const IVAS_VECTOR3 refPos /* i : Reference position */ +) +{ + IVAS_VECTOR3 acousticFrontVector, ivasForwardVector; + IVAS_VECTOR3 listenerPosLevel, refPosLevel; + float acousticFrontVectorLength; + + if ( pOTR == NULL ) { - /* 'if' assumed to perform comparison to 0 */ - if ( pOTR->trackingType == OTR_TRACKING_REF_ORIENT ) - { - /* Reset average orientation */ - pOTR->absAvgYaw = pOTR->absYaw; - pOTR->absAvgPitch = pOTR->absPitch; - pOTR->absAvgRoll = pOTR->absRoll; + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } - /* Reset adaptation filter - start adaptation at center rate */ - pOTR->alpha = sinf( 2.0f * EVS_PI * pOTR->centerAdaptationRate / OTR_UPDATE_RATE ); + switch ( pOTR->trackingType ) + { + case OTR_TRACKING_NONE: + case OTR_TRACKING_REF_ORIENT: + case OTR_TRACKING_AVG_ORIENT: + case OTR_TRACKING_REF_VEC: + acousticFrontVector = VectorSubtract( listenerPos, refPos ); + break; + case OTR_TRACKING_REF_VEC_LEV: + /* ignore the height difference between listener position and reference position */ + listenerPosLevel.z = refPosLevel.z = listenerPos.z; + listenerPosLevel.x = listenerPos.x; + listenerPosLevel.y = listenerPos.y; + refPosLevel.x = refPos.x; + refPosLevel.y = refPos.y; + acousticFrontVector = VectorSubtract( listenerPosLevel, refPosLevel ); + break; + default: + return IVAS_ERR_WRONG_PARAMS; + } - /* Copy absolute orientation as input to compute further on */ - yaw = pOTR->absYaw; - pitch = pOTR->absPitch; - roll = pOTR->absRoll; + acousticFrontVectorLength = VectorLength( acousticFrontVector ); - /* Compute relative orientation = (absolute orientation) - (reference orientation) */ - yaw -= pOTR->refYaw; - pitch -= pOTR->refPitch; - roll -= pOTR->refRoll; - - /* Clip computed relative orientation to avoid wrap around and store as output */ - pOTR->trkYaw = ClipAngle( yaw, -MAX_TRACKED_ANGLE_REF_ORIENT, MAX_TRACKED_ANGLE_REF_ORIENT ); - pOTR->trkPitch = ClipAngle( pitch, -MAX_TRACKED_ANGLE_REF_ORIENT, MAX_TRACKED_ANGLE_REF_ORIENT ); - pOTR->trkRoll = ClipAngle( roll, -MAX_TRACKED_ANGLE_REF_ORIENT, MAX_TRACKED_ANGLE_REF_ORIENT ); - } - - else - { - return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Non-supported orientation tracking adaptation type" ); - } + /* if the length is zero, the user has entered insensible listener and reference positions */ + if ( acousticFrontVectorLength < 0.0001f ) + { + return IVAS_ERR_WRONG_PARAMS; } + ivasForwardVector.x = -1.0f; + ivasForwardVector.y = 0.0f; + ivasForwardVector.z = 0.0f; + VectorRotationToQuaternion( ivasForwardVector, acousticFrontVector, &pOTR->refRot ); + return IVAS_ERR_OK; } /*-------------------------------------------------------------------* - * ivas_orient_trk_GetTrackedOrientation() + * ivas_orient_trk_Process() * * *-------------------------------------------------------------------*/ -void ivas_orient_trk_GetTrackedOrientation( - ivas_orient_trk_state_t *pOTR, - float *yaw, - float *pitch, - float *roll ) +ivas_error ivas_orient_trk_Process( + ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ + IVAS_QUATERNION absRot, /* i : absolute head rotation */ + float updateRate, /* i : rotation update rate [Hz] */ + IVAS_QUATERNION *pTrkRot /* o : tracked rotation */ +) { - *yaw = pOTR->trkYaw; - *pitch = pOTR->trkPitch; - *roll = pOTR->trkRoll; + float normalizedOrientation; + float relativeOrientationRate; + float rateRange; + float cutoffFrequency; + float alpha = pOTR->alpha; + float ang; + ivas_error result; + + if ( pOTR == NULL || pTrkRot == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } - return; + result = IVAS_ERR_OK; + + switch ( pOTR->trackingType ) + { + case OTR_TRACKING_NONE: + pOTR->trkRot = absRot; + break; + case OTR_TRACKING_REF_VEC: + case OTR_TRACKING_REF_VEC_LEV: + case OTR_TRACKING_REF_ORIENT: + /* Reset average orientation */ + pOTR->absAvgRot = absRot; + + /* Reset adaptation filter - start adaptation at center rate */ + pOTR->alpha = sinf( 2.0f * EVS_PI * pOTR->centerAdaptationRate / updateRate ); + + /* Compute relative orientation = (absolute orientation) - (reference orientation) */ + QuaternionInverse( pOTR->refRot, &pOTR->trkRot ); + QuaternionProduct( pOTR->trkRot, absRot, &pOTR->trkRot ); + break; + + case OTR_TRACKING_AVG_ORIENT: + /* Compute average (low-pass filtered) absolute orientation */ + QuaternionSlerp( pOTR->absAvgRot, absRot, alpha, &pOTR->absAvgRot ); + + /* Compute relative orientation = (absolute orientation) - (average absolute orientation) */ + QuaternionInverse( pOTR->absAvgRot, &pOTR->trkRot ); + QuaternionProduct( pOTR->trkRot, absRot, &pOTR->trkRot ); + + /* Adapt LPF constant based on orientation excursion relative to current mean: + - low cutoff (slow adaptation) for small excursions (around center) + - high cutoff (fast adaptation) for large excursions (off-center) + */ + ang = QuaternionAngle( absRot, pOTR->trkRot ); + normalizedOrientation = ang * ang; + + relativeOrientationRate = sqrtf( normalizedOrientation ) / pOTR->adaptationAngle; + /* 'if' assumed to perform comparison to 0 */ + if ( relativeOrientationRate > 1.0f ) + { + relativeOrientationRate = 1.0f; + } + + /* Compute range of the adaptation rate between center = lower rate and off-center = higher rate */ + rateRange = pOTR->offCenterAdaptationRate - pOTR->centerAdaptationRate; + /* 'if' assumed to perform comparison to 0 */ + if ( rateRange < 0.0f ) + { + rateRange = 0.0f; + } + + /* Compute adaptivity cutoff frequency: interpolate between minimum (center) and maximum (off-center) values */ + cutoffFrequency = pOTR->centerAdaptationRate + ( relativeOrientationRate * rateRange ); + + /* Compute filter coefficient corresponding to desired cutoff frequency */ + pOTR->alpha = sinf( 2.0f * EVS_PI * cutoffFrequency / updateRate ); + break; + default: + result = IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Non-supported orientation tracking adaptation type" ); + break; + } + + if ( result == IVAS_ERR_OK ) + { + *pTrkRot = pOTR->trkRot; + } + + return result; } diff --git a/lib_rend/ivas_prot_rend.h b/lib_rend/ivas_prot_rend.h index 9e92e45d57fc01d4353b60f703f93c14abdc0a00..efa211124382f4c05ce4b3e77df0724c1608625a 100644 --- a/lib_rend/ivas_prot_rend.h +++ b/lib_rend/ivas_prot_rend.h @@ -54,11 +54,7 @@ ivas_error getAudioConfigNumChannels( int16_t *numChannels ); -#ifdef FIX_197_CREND_INTERFACE AUDIO_CONFIG getIvasAudioConfigFromRendAudioConfig( -#else -AUDIO_CONFIG rendAudioConfigToIvasAudioConfig( -#endif IVAS_REND_AudioConfig rendConfig ); IVAS_REND_AudioConfig getRendAudioConfigFromIvasAudioConfig( @@ -140,6 +136,14 @@ void efap_determine_gains( * SBA rendering *----------------------------------------------------------------------------------*/ +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS +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 */ +); +#else 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 */ @@ -147,6 +151,7 @@ void ivas_sba_prototype_renderer( const int16_t firstSubframe, /* i : First subframe to map */ const int16_t nSubframes /* i : Number of subframes to map */ ); +#endif ivas_error ivas_sba_get_hoa_dec_matrix( const IVAS_OUTPUT_SETUP hOutSetup, /* i : target output setup */ @@ -216,28 +221,16 @@ void ivas_HRTF_CRend_binary_close( *----------------------------------------------------------------------------------*/ ivas_error ivas_td_binaural_renderer_unwrap( -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - REVERB_HANDLE hReverb, /* i : reverb handle */ -#else - RENDER_CONFIG_DATA *hRenderConfig, /* i : Renderer configuration */ - const int16_t ini_frame, /* i : Initialization frame counter */ -#ifdef FIX_197_CREND_INTERFACE - CREND_WRAPPER_HANDLE hCrendWrapper, /* i : Crend wrapper handle */ -#else - CREND_HANDLE hCrend, /* i : Crend handle */ -#endif -#endif - AUDIO_CONFIG transport_config, /* i : Transport configuration */ -#ifndef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - const int32_t output_Fs, /* i : Output sampling rate */ -#endif + const REVERB_HANDLE hReverb, /* i : Reverberator handle */ + const AUDIO_CONFIG transport_config, /* i : Transport configuration */ BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD binaural object renderer handle */ - const int16_t nchan_transport, /* i : Transport channels (ISms) */ + const int16_t num_src, /* i : number of sources to render */ const int16_t lfe_idx, /* i : LFE channel index */ - IVAS_FORMAT ivas_format, /* i : IVAS format */ + const IVAS_FORMAT ivas_format, /* i : IVAS format */ ISM_METADATA_HANDLE *hIsmMetaData, /* i : ISM metadata handle */ const int16_t Opt_Headrotation, /* i : Head rotation flag */ const IVAS_QUATERNION *Quaternions, /* i : Head tracking data per subframe */ + const IVAS_VECTOR3 *Pos, /* i : Listener position data per subframe */ float output[][L_FRAME48k], /* i/o: SCE channels / Binaural synthesis */ const int16_t output_frame /* i : output frame length */ ); @@ -248,9 +241,7 @@ ivas_error ivas_td_binaural_renderer_ext( const LSSETUP_CUSTOM_STRUCT *customLsInput, /* i : Input custom loudspeaker layout */ const IVAS_REND_HeadRotData *headRotData, /* i : Input head positions */ const IVAS_REND_AudioObjectPosition *currentPos, /* i : Object position */ -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - const REVERB_HANDLE reverb, /* i : reverb handle */ -#endif + const REVERB_HANDLE hReverb, /* i : Reverberator handle */ const int16_t output_frame, /* i : output frame length */ float output[][L_FRAME48k] /* i/o: SCE channels / Binaural synthesis */ ); @@ -261,6 +252,7 @@ ivas_error ivas_td_binaural_open_unwrap( const int16_t nchan_transport, /* i : Number of channels */ const IVAS_FORMAT ivas_format, /* i : IVAS format (ISM/MC) */ const AUDIO_CONFIG transport_config, /* i : Transport configuration */ + const float *directivity, /* i : Directivity pattern (used for ISM) */ const IVAS_OUTPUT_SETUP hTransSetup, /* i : Loudspeaker layout */ BINAURAL_TD_OBJECT_RENDERER_HANDLE *hBinRendererTd, /* o : TD renderer handle */ int32_t *binaural_latency_ns /* i : Binauralization delay */ @@ -269,6 +261,7 @@ ivas_error ivas_td_binaural_open_unwrap( ivas_error ivas_td_binaural_open_ext( TDREND_WRAPPER *pTDRend, const IVAS_REND_AudioConfig inConfig, + RENDER_CONFIG_DATA *hRendCfg, /* i : Renderer configuration */ LSSETUP_CUSTOM_STRUCT *customLsInput, const int32_t output_Fs ); @@ -280,7 +273,7 @@ void ivas_td_binaural_close( ivas_error TDREND_GetMix( BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ - float output[][L_FRAME48k], /* i/o: ISm object synth / rendered output in 0,1 */ + float output[][L_FRAME48k], /* i/o: ISM object synth / rendered output in 0,1 */ const int16_t subframe_length, /* i/o: subframe length */ const int16_t subframe_idx /* i : Subframe index to 5 ms subframe */ ); @@ -288,12 +281,13 @@ ivas_error TDREND_GetMix( void TDREND_Update_listener_orientation( BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD Renderer handle */ const int16_t headRotEnabled, /* i : Headrotation flag */ - const IVAS_QUATERNION *headPosition /* i : Head Position */ + const IVAS_QUATERNION *headPosition, /* i : Listener orientation */ + const IVAS_VECTOR3 *Pos /* i : Listener Position */ ); void TDREND_Update_object_positions( BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o : TD Renderer handle */ - const int16_t numSources, /* i : Number of sources to render */ + const int16_t num_src, /* i : number of sources to render */ const int16_t lfe_idx, /* i : Input LFE index */ const IVAS_FORMAT in_format, /* i : Format of input sources */ const ISM_METADATA_HANDLE *hIsmMetaData, /* i : Input metadata for ISM objects */ @@ -409,7 +403,8 @@ void TDREND_SPATIAL_VecMapToNewCoordSystem( const float *DirVec_p, /* i : Direction vector */ const float *UpVec_p, /* i : Up vector */ const float *RightVec_p, /* i : Right vector */ - float *MappedVec_p /* o : Transformed vector */ + float *MappedVec_p, /* o : Transformed vector */ + float *LisRelPosAbs /* o : Transformed vector ignoring orientation */ ); /*! r: Flag if the orientation has been updated */ @@ -475,7 +470,13 @@ void TDREND_firfilt( const int16_t intp_count, /* i : interpolation count */ float *mem, /* i/o: filter memory */ const int16_t subframe_length, /* i : Length of signal */ - const int16_t filterlength /* i : Filter length */ + const int16_t filterlength, /* i : Filter length */ +#ifdef FIX_379_GAININTP + const float Gain, /* i : Gain */ + const float prevGain /* i : Previous gain */ +#else + const float Gain /* i : Gain */ +#endif ); @@ -484,59 +485,32 @@ void TDREND_firfilt( *----------------------------------------------------------------------------------*/ ivas_error ivas_rend_openCrend( -#ifdef FIX_197_CREND_INTERFACE CREND_WRAPPER_HANDLE *pCrend, -#else - CREND_WRAPPER *pCrend, -#endif const AUDIO_CONFIG inConfig, const AUDIO_CONFIG outConfig, RENDER_CONFIG_DATA *hRendCfg, -#ifdef FIX_197_CREND_INTERFACE - int16_t Opt_Headrotation, -#endif HRTFS_CREND_HANDLE hSetOfHRTF, const int32_t output_Fs ); -#ifdef FIX_197_CREND_INTERFACE void ivas_rend_closeCrend( CREND_WRAPPER_HANDLE *pCrend ); -#else -ivas_error ivas_rend_closeCrend( - CREND_WRAPPER *pCrend ); -#endif -#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC ivas_error ivas_rend_initCrendWrapper( CREND_WRAPPER_HANDLE *pCrend ); -#endif ivas_error ivas_rend_crendProcess( const CREND_WRAPPER *pCrend, const AUDIO_CONFIG inConfig, const AUDIO_CONFIG outConfig, -#ifdef FIX_197_CREND_INTERFACE DECODER_CONFIG_HANDLE hDecoderConfig, HEAD_TRACK_DATA_HANDLE hHeadTrackData, IVAS_OUTPUT_SETUP_HANDLE hIntSetup, EFAP_HANDLE hEFAPdata, -#endif float output[][L_FRAME48k], /* i/o: input/output audio channels */ const int32_t output_Fs ); -#ifndef FIX_197_CREND_INTERFACE - -ivas_error ivas_crend_init_from_setofhrtf( - Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ -); - -ivas_error ivas_crend_init_from_hrtf_handle( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - HRTFS_HANDLE hrtf); - -#endif @@ -577,6 +551,16 @@ void ivas_binaural_reverb_close( REVERB_STRUCT_HANDLE *hReverb /* i/o: binaural reverb handle */ ); +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS +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 */ + 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 */ +); +#else 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 */ @@ -586,6 +570,7 @@ void ivas_binaural_reverb_processFrame( float outImag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o : output CLDFB data imag */ const uint8_t offsetSamplesIO /* i : number of offset samples */ ); +#endif ivas_error ivas_reverb_open( REVERB_HANDLE *hReverb, /* i/o: Reverberator handle */ @@ -600,12 +585,12 @@ void ivas_reverb_close( ); ivas_error ivas_reverb_process( - REVERB_HANDLE hReverb, /* i/o: reverb state */ + const REVERB_HANDLE hReverb, /* i : Reverberator handle */ const AUDIO_CONFIG input_audio_config, /* i : reverb. input audio configuration */ const int16_t mix_signals, /* i : add reverb to output signal */ float pcm_in[][L_FRAME48k], /* i : the PCM audio to apply reverb on */ float pcm_out[][L_FRAME48k], /* o : the PCM audio with reverb applied */ - const int16_t i_ts + const int16_t i_ts /* i : subframe index */ ); void ivas_rev_delay_line_init( @@ -790,13 +775,21 @@ ivas_error ivas_headTrack_open( HEAD_TRACK_DATA_HANDLE *hHeadTrackData /* o : head track handle */ ); -void Quat2Euler( - const IVAS_QUATERNION quat, /* i : quaternion describing the rotation */ - float *yaw, /* o : yaw */ - float *pitch, /* o : pitch */ - float *roll /* o : roll */ +void ivas_headTrack_close( + HEAD_TRACK_DATA_HANDLE *hHeadTrackData /* i/o: head track handle */ ); +void Euler2Quat( + const float yaw, /* i : yaw (x) */ + const float pitch, /* i : pitch (y) */ + const float roll, /* i : roll (z) */ + IVAS_QUATERNION *quat /* o : quaternion describing the rotation */ +); + +float deg2rad( float degrees ); + + + void QuatToRotMat( const IVAS_QUATERNION quat, /* i : quaternion describing the rotation */ float Rmat[3][3] /* o : real-space rotation matrix for this rotation */ @@ -874,32 +867,43 @@ ivas_error ivas_render_config_init_from_rom( * Orientation tracking *----------------------------------------------------------------------------------*/ -void ivas_orient_trk_Init( - ivas_orient_trk_state_t *pOTR +ivas_error ivas_orient_trk_Init( + ivas_orient_trk_state_t *pOTR /* i/o: orientation tracker handle */ ); -void ivas_orient_trk_SetTrackingType( - ivas_orient_trk_state_t *pOTR, - const OTR_TRACKING_T trackingType +ivas_error ivas_orient_trk_SetTrackingType( + ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ + const OTR_TRACKING_T trackingType /* i : orientation tracking type */ ); -void ivas_orient_trk_SetAbsoluteOrientation( - ivas_orient_trk_state_t *pOTR, - const float yaw, - const float pitch, - const float roll +ivas_error ivas_orient_trk_SetReferenceRotation( + ivas_orient_trk_state_t *pOTR, /* i/o: orientatoin trakcer handle */ + const IVAS_QUATERNION refRot /* i : reference rotation */ ); -ivas_error ivas_orient_trk_Process( - ivas_orient_trk_state_t *pOTR +ivas_error ivas_orient_trk_SetReferenceVector( + ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ + const IVAS_VECTOR3 listenerPos, /* i : Listener position */ + const IVAS_VECTOR3 refPos /* i : Reference position */ ); -void ivas_orient_trk_GetTrackedOrientation( - ivas_orient_trk_state_t *pOTR, - float *yaw, - float *pitch, - float *roll +ivas_error ivas_orient_trk_GetMainOrientation( + ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ + IVAS_QUATERNION *pOrientation /* i/o: average/reference orientation */ ); + +ivas_error ivas_orient_trk_GetTrackedRotation( + ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ + IVAS_QUATERNION *pRotation /* i/o: processed rotation */ +); + +ivas_error ivas_orient_trk_Process( + ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ + IVAS_QUATERNION absRot, /* i : absolute head rotation */ + float updateRate, /* i : rotation update rate [Hz] */ + IVAS_QUATERNION *pTrkRot /* o : tracked rotation */ +); + /* clang-format on */ #endif /* IVAS_PROT_REND_H */ diff --git a/lib_rend/ivas_render_config.c b/lib_rend/ivas_render_config.c index ccee4ffe724264ba1e4ef2150797b1bb634fe6b1..efd866ccec4139bb01801f6141e6b4451776bc51 100644 --- a/lib_rend/ivas_render_config.c +++ b/lib_rend/ivas_render_config.c @@ -103,6 +103,7 @@ ivas_error ivas_render_config_init_from_rom( const int16_t room_flag_on /* i : room effect on/off flag */ ) { + if ( hRenderConfig == NULL || *hRenderConfig == NULL ) { return IVAS_ERROR( IVAS_ERR_UNEXPECTED_NULL_POINTER, "Unexpected null pointer while attempting to fill renderer configuration from ROM" ); @@ -125,5 +126,9 @@ ivas_error ivas_render_config_init_from_rom( mvr2r( ivas_reverb_default_RT60, ( *hRenderConfig )->roomAcoustics.pAcoustic_rt60, IVAS_REVERB_DEFAULT_N_BANDS ); mvr2r( ivas_reverb_default_DSR, ( *hRenderConfig )->roomAcoustics.pAcoustic_dsr, IVAS_REVERB_DEFAULT_N_BANDS ); + ( *hRenderConfig )->directivity[0] = 360.0f; /* Front cone */ + ( *hRenderConfig )->directivity[1] = 360.0f; /* Back cone */ + ( *hRenderConfig )->directivity[2] = 1.0f; /* Back attenuation */ + return IVAS_ERR_OK; } diff --git a/lib_rend/ivas_reverb.c b/lib_rend/ivas_reverb.c index 3911c36601c9722ba7544cab608d4b3ef240fcc2..af2717cc11a01fbe8a5bb9e41e33ca1b7a4f5dc9 100644 --- a/lib_rend/ivas_reverb.c +++ b/lib_rend/ivas_reverb.c @@ -675,34 +675,34 @@ static ivas_error calc_jot_t60_coeffs( *-----------------------------------------------------------------------------------------*/ static ivas_error initialize_reverb_filters( - REVERB_HANDLE pState ) + REVERB_HANDLE hReverb ) { ivas_error error; error = IVAS_ERR_OK; /* init correlation and coloration filters */ - if ( ( error = ivas_reverb_t2f_f2t_init( &pState->fft_filter_ols, pState->fft_size, pState->fft_subblock_size ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_reverb_t2f_f2t_init( &hReverb->fft_filter_ols, hReverb->fft_size, hReverb->fft_subblock_size ) ) != IVAS_ERR_OK ) { return error; } - if ( ( error = ivas_reverb_fft_filter_init( &pState->fft_filter_correl_0, pState->fft_size ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_reverb_fft_filter_init( &hReverb->fft_filter_correl_0, hReverb->fft_size ) ) != IVAS_ERR_OK ) { return error; } - if ( ( error = ivas_reverb_fft_filter_init( &pState->fft_filter_correl_1, pState->fft_size ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_reverb_fft_filter_init( &hReverb->fft_filter_correl_1, hReverb->fft_size ) ) != IVAS_ERR_OK ) { return error; } - if ( ( error = ivas_reverb_fft_filter_init( &pState->fft_filter_color_0, pState->fft_size ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_reverb_fft_filter_init( &hReverb->fft_filter_color_0, hReverb->fft_size ) ) != IVAS_ERR_OK ) { return error; } - if ( ( error = ivas_reverb_fft_filter_init( &pState->fft_filter_color_1, pState->fft_size ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_reverb_fft_filter_init( &hReverb->fft_filter_color_1, hReverb->fft_size ) ) != IVAS_ERR_OK ) { return error; } @@ -718,13 +718,13 @@ static ivas_error initialize_reverb_filters( *-----------------------------------------------------------------------------------------*/ static ivas_error set_t60_filter( - REVERB_HANDLE pState, + REVERB_HANDLE hReverb, const uint16_t branch, const uint16_t nr_taps, const float coefA[], const float coefB[] ) { - if ( branch >= pState->nr_of_branches ) + if ( branch >= hReverb->nr_of_branches ) { return IVAS_ERR_INTERNAL; } @@ -734,7 +734,7 @@ static ivas_error set_t60_filter( return IVAS_ERR_INTERNAL; } - ivas_reverb_iir_filt_set( &( pState->t60[branch] ), nr_taps, coefA, coefB ); + ivas_reverb_iir_filt_set( &( hReverb->t60[branch] ), nr_taps, coefA, coefB ); return IVAS_ERR_OK; } @@ -747,16 +747,16 @@ static ivas_error set_t60_filter( *-----------------------------------------------------------------------------------------*/ static ivas_error set_feedback_delay( - REVERB_HANDLE pState, + REVERB_HANDLE hReverb, const uint16_t branch, const int16_t fb_delay ) { - if ( branch >= pState->nr_of_branches ) + if ( branch >= hReverb->nr_of_branches ) { return IVAS_ERR_INTERNAL; } - pState->delay_line[branch].Delay = fb_delay; + hReverb->delay_line[branch].Delay = fb_delay; return IVAS_ERR_OK; } @@ -769,19 +769,19 @@ static ivas_error set_feedback_delay( *-----------------------------------------------------------------------------------------*/ static ivas_error set_feedback_gain( - REVERB_HANDLE pState, + REVERB_HANDLE hReverb, const uint16_t branch, const float *pGain ) { uint16_t gain_idx; - if ( branch >= pState->nr_of_branches ) + if ( branch >= hReverb->nr_of_branches ) { return IVAS_ERR_INTERNAL; } - for ( gain_idx = 0; gain_idx < pState->nr_of_branches; gain_idx++ ) + for ( gain_idx = 0; gain_idx < hReverb->nr_of_branches; gain_idx++ ) { - pState->gain_matrix[branch][gain_idx] = pGain[gain_idx]; + hReverb->gain_matrix[branch][gain_idx] = pGain[gain_idx]; } return IVAS_ERR_OK; @@ -795,7 +795,7 @@ static ivas_error set_feedback_gain( *-----------------------------------------------------------------------------------------*/ static ivas_error set_correl_fft_filter( - REVERB_HANDLE pState, + REVERB_HANDLE hReverb, const uint16_t channel, rv_fftwf_type_complex *pSpectrum ) { @@ -806,11 +806,11 @@ static ivas_error set_correl_fft_filter( if ( channel == 0 ) { - ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, pState->fft_filter_correl_0.fft_spectrum, pState->fft_filter_correl_0.fft_size ); + ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, hReverb->fft_filter_correl_0.fft_spectrum, hReverb->fft_filter_correl_0.fft_size ); } else { - ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, pState->fft_filter_correl_1.fft_spectrum, pState->fft_filter_correl_1.fft_size ); + ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, hReverb->fft_filter_correl_1.fft_spectrum, hReverb->fft_filter_correl_1.fft_size ); } return IVAS_ERR_OK; @@ -824,7 +824,7 @@ static ivas_error set_correl_fft_filter( *-----------------------------------------------------------------------------------------*/ static ivas_error set_color_fft_filter( - REVERB_HANDLE pState, + REVERB_HANDLE hReverb, const uint16_t channel, rv_fftwf_type_complex *pSpectrum ) { @@ -835,11 +835,11 @@ static ivas_error set_color_fft_filter( if ( channel == 0 ) { - ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, pState->fft_filter_color_0.fft_spectrum, pState->fft_filter_color_0.fft_size ); + ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, hReverb->fft_filter_color_0.fft_spectrum, hReverb->fft_filter_color_0.fft_size ); } else { - ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, pState->fft_filter_color_1.fft_spectrum, pState->fft_filter_color_1.fft_size ); + ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, hReverb->fft_filter_color_1.fft_spectrum, hReverb->fft_filter_color_1.fft_size ); } return IVAS_ERR_OK; @@ -853,7 +853,7 @@ static ivas_error set_color_fft_filter( *-----------------------------------------------------------------------------------------*/ static ivas_error set_mixer_level( - REVERB_HANDLE pState, + REVERB_HANDLE hReverb, const uint16_t channel, const float level[] ) { @@ -863,9 +863,9 @@ static ivas_error set_mixer_level( return IVAS_ERR_INTERNAL; } - for ( branch_idx = 0; branch_idx < pState->nr_of_branches; branch_idx++ ) + for ( branch_idx = 0; branch_idx < hReverb->nr_of_branches; branch_idx++ ) { - pState->mixer[channel][branch_idx] = level[branch_idx]; + hReverb->mixer[channel][branch_idx] = level[branch_idx]; } return IVAS_ERR_OK; @@ -879,7 +879,7 @@ static ivas_error set_mixer_level( *-----------------------------------------------------------------------------------------*/ static void clear_buffers( - REVERB_HANDLE pState ) + REVERB_HANDLE hReverb ) { int16_t branch_idx; ivas_rev_iir_filter_t *iirFilter; @@ -887,15 +887,15 @@ static void clear_buffers( for ( branch_idx = 0; branch_idx < IVAS_REV_MAX_NR_BRANCHES; branch_idx++ ) { - delay_line = &( pState->delay_line[branch_idx] ); + delay_line = &( hReverb->delay_line[branch_idx] ); set_f( delay_line->pBuffer, 0, delay_line->MaxDelay ); delay_line->BufferPos = 0; - iirFilter = &( pState->t60[branch_idx] ); + iirFilter = &( hReverb->t60[branch_idx] ); set_f( iirFilter->pBuffer, 0, iirFilter->MaxTaps ); } - ivas_reverb_t2f_f2t_ClearHistory( &pState->fft_filter_ols ); + ivas_reverb_t2f_f2t_ClearHistory( &hReverb->fft_filter_ols ); return; } @@ -908,31 +908,31 @@ static void clear_buffers( *-----------------------------------------------------------------------------------------*/ static void set_fft_and_datablock_sizes( - REVERB_HANDLE pState, + REVERB_HANDLE hReverb, const int16_t subframe_len ) { - pState->full_block_size = subframe_len; + hReverb->full_block_size = subframe_len; if ( subframe_len == L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES ) { - pState->fft_size = IVAS_REVERB_FFT_SIZE_48K; - pState->num_fft_subblocks = IVAS_REVERB_FFT_N_SUBBLOCKS_48K; + hReverb->fft_size = IVAS_REVERB_FFT_SIZE_48K; + hReverb->num_fft_subblocks = IVAS_REVERB_FFT_N_SUBBLOCKS_48K; } else if ( subframe_len == L_FRAME32k / MAX_PARAM_SPATIAL_SUBFRAMES ) { - pState->fft_size = IVAS_REVERB_FFT_SIZE_32K; - pState->num_fft_subblocks = IVAS_REVERB_FFT_N_SUBBLOCKS_32K; + hReverb->fft_size = IVAS_REVERB_FFT_SIZE_32K; + hReverb->num_fft_subblocks = IVAS_REVERB_FFT_N_SUBBLOCKS_32K; } else if ( subframe_len == L_FRAME16k / MAX_PARAM_SPATIAL_SUBFRAMES ) { - pState->fft_size = IVAS_REVERB_FFT_SIZE_16K; - pState->num_fft_subblocks = IVAS_REVERB_FFT_N_SUBBLOCKS_16K; + hReverb->fft_size = IVAS_REVERB_FFT_SIZE_16K; + hReverb->num_fft_subblocks = IVAS_REVERB_FFT_N_SUBBLOCKS_16K; } else { assert( 0 ); /* unsupported block size */ } - pState->fft_subblock_size = subframe_len / pState->num_fft_subblocks; + hReverb->fft_subblock_size = subframe_len / hReverb->num_fft_subblocks; return; } @@ -1030,7 +1030,7 @@ static void set_reverb_acoustic_data( *-----------------------------------------------------------------------------------------*/ static ivas_error setup_FDN_branches( - REVERB_HANDLE pState, + REVERB_HANDLE hReverb, ivas_reverb_params_t *pParams ) { int16_t nr_coefs, branch_idx, channel_idx; @@ -1041,12 +1041,12 @@ static ivas_error setup_FDN_branches( /* initialize feedback branches */ for ( branch_idx = 0; branch_idx < IVAS_REV_MAX_NR_BRANCHES; branch_idx++ ) { - ivas_rev_delay_line_init( &( pState->delay_line[branch_idx] ), pState->loop_delay_buffer[branch_idx], init_loop_delay[branch_idx], pParams->pLoop_delays[branch_idx] ); - ivas_reverb_iir_filt_init( &( pState->t60[branch_idx] ), IVAS_REV_MAX_IIR_FILTER_LENGTH ); - pState->mixer[0][branch_idx] = 0.0f; - pState->mixer[1][branch_idx] = 0.0f; + ivas_rev_delay_line_init( &( hReverb->delay_line[branch_idx] ), hReverb->loop_delay_buffer[branch_idx], init_loop_delay[branch_idx], pParams->pLoop_delays[branch_idx] ); + ivas_reverb_iir_filt_init( &( hReverb->t60[branch_idx] ), IVAS_REV_MAX_IIR_FILTER_LENGTH ); + hReverb->mixer[0][branch_idx] = 0.0f; + hReverb->mixer[1][branch_idx] = 0.0f; } - clear_buffers( pState ); + clear_buffers( hReverb ); nr_coefs = pParams->t60_filter_order + 1; if ( IVAS_REV_MAX_IIR_FILTER_LENGTH < nr_coefs ) @@ -1060,17 +1060,17 @@ static ivas_error setup_FDN_branches( pCoef_a = &pParams->pT60_filter_coeff[2 * nr_coefs * branch_idx + nr_coefs]; pCoef_b = &pParams->pT60_filter_coeff[2 * nr_coefs * branch_idx]; - if ( ( error = set_t60_filter( pState, branch_idx, nr_coefs, pCoef_a, pCoef_b ) ) != IVAS_ERR_OK ) + if ( ( error = set_t60_filter( hReverb, branch_idx, nr_coefs, pCoef_a, pCoef_b ) ) != IVAS_ERR_OK ) { return error; } - if ( ( error = set_feedback_delay( pState, branch_idx, pParams->pLoop_delays[branch_idx] ) ) != IVAS_ERR_OK ) + if ( ( error = set_feedback_delay( hReverb, branch_idx, pParams->pLoop_delays[branch_idx] ) ) != IVAS_ERR_OK ) { return error; } - if ( ( error = set_feedback_gain( pState, branch_idx, &( pParams->pLoop_feedback_matrix[branch_idx * pParams->nr_loops] ) ) ) != IVAS_ERR_OK ) + if ( ( error = set_feedback_gain( hReverb, branch_idx, &( pParams->pLoop_feedback_matrix[branch_idx * pParams->nr_loops] ) ) ) != IVAS_ERR_OK ) { return error; } @@ -1079,7 +1079,7 @@ static ivas_error setup_FDN_branches( for ( channel_idx = 0; channel_idx < pParams->nr_outputs; channel_idx++ ) { - if ( ( error = set_mixer_level( pState, channel_idx, &( pParams->pLoop_extract_matrix[channel_idx * pParams->nr_loops] ) ) ) != IVAS_ERR_OK ) + if ( ( error = set_mixer_level( hReverb, channel_idx, &( pParams->pLoop_extract_matrix[channel_idx * pParams->nr_loops] ) ) ) != IVAS_ERR_OK ) { return error; } @@ -1175,7 +1175,6 @@ ivas_error ivas_reverb_open( /* set up reverb acoustic data on the basis of HRTF data and renderer config */ set_reverb_acoustic_data( ¶ms, input_audio_config, hHrtf, &hRenderConfig->roomAcoustics, subframe_len, nr_fc_input, nr_fc_fft_filter ); -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND /* set reverb acoustic configuration based on renderer config */ #ifdef DEBUGGING pState->pConfig.renderer_type_override = hRenderConfig->renderer_type_override; @@ -1184,7 +1183,6 @@ ivas_error ivas_reverb_open( pState->pConfig.roomAcoustics.use_brir = hRenderConfig->roomAcoustics.use_brir; pState->pConfig.roomAcoustics.late_reverb_on = hRenderConfig->roomAcoustics.late_reverb_on; pState->pConfig.roomAcoustics.nBands = hRenderConfig->roomAcoustics.nBands; -#endif /* set up input downmix */ pState->dmx_gain = calc_dmx_gain(); @@ -1312,27 +1310,27 @@ void ivas_reverb_close( *-----------------------------------------------------------------------------------------*/ static void post_fft_filter( - REVERB_HANDLE pState, + REVERB_HANDLE hReverb, float *p0, float *p1, float *pBuffer_0, float *pBuffer_1 ) { - if ( pState->do_corr_filter ) + if ( hReverb->do_corr_filter ) { - ivas_reverb_t2f_f2t_in( &pState->fft_filter_ols, p0, p1, pBuffer_0, pBuffer_1 ); - ivas_reverb_fft_filter_ComplexMul( &pState->fft_filter_correl_0, pBuffer_0 ); - ivas_reverb_fft_filter_ComplexMul( &pState->fft_filter_correl_1, pBuffer_1 ); - ivas_reverb_fft_filter_CrossMix( pBuffer_0, pBuffer_1, pState->fft_filter_correl_0.fft_size ); + ivas_reverb_t2f_f2t_in( &hReverb->fft_filter_ols, p0, p1, pBuffer_0, pBuffer_1 ); + ivas_reverb_fft_filter_ComplexMul( &hReverb->fft_filter_correl_0, pBuffer_0 ); + ivas_reverb_fft_filter_ComplexMul( &hReverb->fft_filter_correl_1, pBuffer_1 ); + ivas_reverb_fft_filter_CrossMix( pBuffer_0, pBuffer_1, hReverb->fft_filter_correl_0.fft_size ); } else { - ivas_reverb_t2f_f2t_in( &pState->fft_filter_ols, p0, p1, pBuffer_0, pBuffer_1 ); + ivas_reverb_t2f_f2t_in( &hReverb->fft_filter_ols, p0, p1, pBuffer_0, pBuffer_1 ); } - ivas_reverb_fft_filter_ComplexMul( &pState->fft_filter_color_0, pBuffer_0 ); - ivas_reverb_fft_filter_ComplexMul( &pState->fft_filter_color_1, pBuffer_1 ); - ivas_reverb_t2f_f2t_out( &pState->fft_filter_ols, pBuffer_0, pBuffer_1, p0, p1 ); + ivas_reverb_fft_filter_ComplexMul( &hReverb->fft_filter_color_0, pBuffer_0 ); + ivas_reverb_fft_filter_ComplexMul( &hReverb->fft_filter_color_1, pBuffer_1 ); + ivas_reverb_t2f_f2t_out( &hReverb->fft_filter_ols, pBuffer_0, pBuffer_1, p0, p1 ); return; } @@ -1345,14 +1343,14 @@ static void post_fft_filter( *-----------------------------------------------------------------------------------------*/ static void reverb_block( - REVERB_HANDLE pState, + REVERB_HANDLE hReverb, float *pInput, float *pOut0, float *pOut1 ) { - uint16_t nr_branches = pState->nr_of_branches; - uint16_t bsize = pState->full_block_size; + uint16_t nr_branches = hReverb->nr_of_branches; + uint16_t bsize = hReverb->full_block_size; uint16_t inner_bsize = INNER_BLK_SIZE; uint16_t i, j, k, ns, branch_idx, blk_idx, start_sample_idx; @@ -1384,12 +1382,12 @@ static void reverb_block( for ( i = 0; i < nr_branches; i++ ) { float *pOutput_i = &ppOutput[i][0]; - float mixer_0_i = pState->mixer[0][i]; - float mixer_1_i = pState->mixer[1][i]; + float mixer_0_i = hReverb->mixer[0][i]; + float mixer_1_i = hReverb->mixer[1][i]; /* output and feedback are same, get sample from delay line ... */ - ivas_rev_delay_line_get_sample_blk( &( pState->delay_line[i] ), inner_bsize, pTemp ); - ivas_reverb_iir_filt_2taps_feed_blk( &( pState->t60[i] ), inner_bsize, pTemp, ppOutput[i] ); + ivas_rev_delay_line_get_sample_blk( &( hReverb->delay_line[i] ), inner_bsize, pTemp ); + ivas_reverb_iir_filt_2taps_feed_blk( &( hReverb->t60[i] ), inner_bsize, pTemp, ppOutput[i] ); for ( ns = 0; ns < inner_bsize; ns++ ) { pO0[ns] += pOutput_i[ns] * mixer_0_i; /* mixer ch 0 */ @@ -1408,7 +1406,7 @@ static void reverb_block( for ( j = 0; j < nr_branches; j++ ) { - float gain_matrix_j_i = pState->gain_matrix[j][i]; + float gain_matrix_j_i = hReverb->gain_matrix[j][i]; float *pOutput = &ppOutput[j][0]; for ( ns = 0; ns < inner_bsize; ns++ ) { @@ -1416,15 +1414,15 @@ static void reverb_block( } } - ivas_rev_delay_line_feed_sample_blk( &( pState->delay_line[i] ), inner_bsize, pFeedback_input ); + ivas_rev_delay_line_feed_sample_blk( &( hReverb->delay_line[i] ), inner_bsize, pFeedback_input ); } } /* Applying FFT filter to each sub-frame */ - for ( blk_idx = 0; blk_idx < pState->num_fft_subblocks; blk_idx++ ) + for ( blk_idx = 0; blk_idx < hReverb->num_fft_subblocks; blk_idx++ ) { - start_sample_idx = blk_idx * pState->fft_subblock_size; - post_fft_filter( pState, pOut0 + start_sample_idx, pOut1 + start_sample_idx, pFFT_buf[0], pFFT_buf[1] ); + start_sample_idx = blk_idx * hReverb->fft_subblock_size; + post_fft_filter( hReverb, pOut0 + start_sample_idx, pOut1 + start_sample_idx, pFFT_buf[0], pFFT_buf[1] ); } return; @@ -1438,14 +1436,14 @@ static void reverb_block( *-----------------------------------------------------------------------------------------*/ static ivas_error downmix_input_block( - REVERB_HANDLE pState, + const REVERB_HANDLE hReverb, float pcm_in[][L_FRAME48k], const AUDIO_CONFIG input_audio_config, float *pPcm_out, const int16_t input_offset ) { int16_t i, s, nchan_transport; - float dmx_gain = pState->dmx_gain; + float dmx_gain = hReverb->dmx_gain; switch ( input_audio_config ) { @@ -1461,7 +1459,7 @@ static ivas_error downmix_input_block( case AUDIO_CONFIG_ISM4: { nchan_transport = audioCfg2channels( input_audio_config ); - for ( s = 0; s < pState->full_block_size; s++ ) + for ( s = 0; s < hReverb->full_block_size; s++ ) { float temp = pcm_in[0][input_offset + s]; for ( i = 1; i < nchan_transport; i++ ) @@ -1477,7 +1475,7 @@ static ivas_error downmix_input_block( case AUDIO_CONFIG_HOA2: case AUDIO_CONFIG_HOA3: { - for ( s = 0; s < pState->full_block_size; s++ ) + for ( s = 0; s < hReverb->full_block_size; s++ ) { pPcm_out[s] = dmx_gain * pcm_in[0][input_offset + s]; } @@ -1499,35 +1497,35 @@ static ivas_error downmix_input_block( *-----------------------------------------------------------------------------------------*/ static void predelay_block( - REVERB_HANDLE pState, + const REVERB_HANDLE hReverb, float *pInput, float *pOutput ) { uint16_t i, idx, n_samples, blk_size; - uint16_t max_blk_size = (uint16_t) pState->predelay_line.Delay; + uint16_t max_blk_size = (uint16_t) hReverb->predelay_line.Delay; if ( max_blk_size < 2 ) { if ( max_blk_size == 0 ) /* zero-length delay line: just copy the data from input to output */ { - for ( i = 0; i < pState->full_block_size; i++ ) + for ( i = 0; i < hReverb->full_block_size; i++ ) { pOutput[i] = pInput[i]; } } else /* 1-sample length delay line: feed the data sample-by-sample */ { - for ( i = 0; i < pState->full_block_size; i++ ) + for ( i = 0; i < hReverb->full_block_size; i++ ) { - pOutput[i] = ivas_rev_delay_line_get_sample( &( pState->predelay_line ) ); - ivas_rev_delay_line_feed_sample( &( pState->predelay_line ), pInput[i] ); + pOutput[i] = ivas_rev_delay_line_get_sample( &( hReverb->predelay_line ) ); + ivas_rev_delay_line_feed_sample( &( hReverb->predelay_line ), pInput[i] ); } } } else /* multiple-sample length delay line: use block processing */ { idx = 0; - n_samples = pState->full_block_size; + n_samples = hReverb->full_block_size; while ( n_samples > 0 ) { blk_size = n_samples; @@ -1535,8 +1533,8 @@ static void predelay_block( { blk_size = max_blk_size; } - ivas_rev_delay_line_get_sample_blk( &( pState->predelay_line ), blk_size, &pOutput[idx] ); - ivas_rev_delay_line_feed_sample_blk( &( pState->predelay_line ), blk_size, &pInput[idx] ); + ivas_rev_delay_line_get_sample_blk( &( hReverb->predelay_line ), blk_size, &pOutput[idx] ); + ivas_rev_delay_line_feed_sample_blk( &( hReverb->predelay_line ), blk_size, &pInput[idx] ); idx += blk_size; n_samples -= blk_size; } @@ -1553,7 +1551,7 @@ static void predelay_block( *-----------------------------------------------------------------------------------------*/ static void mix_output_block( - REVERB_HANDLE pState, + const REVERB_HANDLE hReverb, const float *pInL, const float *pInR, float *pOutL, @@ -1561,7 +1559,7 @@ static void mix_output_block( { uint16_t i; - for ( i = 0; i < pState->full_block_size; i++ ) + for ( i = 0; i < hReverb->full_block_size; i++ ) { pOutL[i] += pInL[i]; pOutR[i] += pInR[i]; @@ -1578,12 +1576,13 @@ static void mix_output_block( *-----------------------------------------------------------------------------------------*/ ivas_error ivas_reverb_process( - REVERB_HANDLE hReverb, /* i/o: reverb state */ + const REVERB_HANDLE hReverb, /* i : Reverberator handle */ const AUDIO_CONFIG input_audio_config, /* i : reverb. input audio configuration */ const int16_t mix_signals, /* i : add reverb to output signal */ float pcm_in[][L_FRAME48k], /* i : the PCM audio to apply reverb on */ float pcm_out[][L_FRAME48k], /* o : the PCM audio with reverb applied */ - const int16_t i_ts ) + const int16_t i_ts /* i : subframe index */ +) { float tmp0[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES], tmp1[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES], tmp2[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES]; ivas_error error; @@ -1617,6 +1616,16 @@ ivas_error ivas_reverb_process( * Compute the reverberation - room effect *------------------------------------------------------------------------*/ +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS +void ivas_binaural_reverb_processSubframe( + REVERB_STRUCT_HANDLE hReverb, /* i/o: binaural reverb handle */ + const int16_t numInChannels, /* i : num inputs to be processed */ + 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 */ +) +#else void ivas_binaural_reverb_processFrame( REVERB_STRUCT_HANDLE hReverb, /* i/o: binaural reverb handle */ const int16_t numInChannels, /* i : num inputs to be processed */ @@ -1626,6 +1635,7 @@ void ivas_binaural_reverb_processFrame( float outImag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o : output CLDFB data imag */ const uint8_t offsetSamplesIO /* i : number of offset samples */ ) +#endif { /* Declare the required variables */ int16_t idx, bin, ch, sample, invertSampleIndex, tapIdx, *phaseShiftTypePr; @@ -1651,8 +1661,10 @@ void ivas_binaural_reverb_processFrame( idx = hReverb->preDelayBufferIndex; for ( sample = 0; sample < hReverb->blockSize; sample++ ) { +#ifndef FIX_355_REFACTOR_PARAMBIN_TO_5MS uint16_t sampleWithOffset; sampleWithOffset = sample + offsetSamplesIO; +#endif invertSampleIndex = hReverb->blockSize - sample - 1; for ( bin = 0; bin < hReverb->numBins; bin++ ) { @@ -1666,6 +1678,23 @@ void ivas_binaural_reverb_processFrame( /* Add every second input channel as is to the pre-delay buffer, and every second input channel with * 90 degrees phase shift to reduce energy imbalances between coherent and incoherent sounds */ +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS + for ( ch = 0; ch < numInChannels; ch++ ) + { + if ( ch % 2 ) + { + 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][sample], hReverb->preDelayBufferReal[idx], hReverb->numBins ); + v_add( hReverb->preDelayBufferImag[idx], inReal[ch][sample], hReverb->preDelayBufferImag[idx], hReverb->numBins ); + } + } + idx = ( idx + 1 ) % hReverb->preDelayBufferLength; + } +#else for ( ch = 0; ch < numInChannels; ch++ ) { if ( ch % 2 ) @@ -1681,6 +1710,7 @@ void ivas_binaural_reverb_processFrame( } idx = ( idx + 1 ) % hReverb->preDelayBufferLength; } +#endif hReverb->preDelayBufferIndex = idx; /* 3) Perform the filtering/decorrelating, using complex and sparse FIR filtering */ @@ -1750,12 +1780,26 @@ void ivas_binaural_reverb_processFrame( { for ( sample = 0; sample < hReverb->blockSize; sample++ ) { +#ifndef FIX_355_REFACTOR_PARAMBIN_TO_5MS uint16_t sampleWithOffset; sampleWithOffset = sample + offsetSamplesIO; +#endif /* Audio was in the temporally inverted order for convolution, re-invert audio to output */ invertSampleIndex = hReverb->blockSize - sample - 1; +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS + for ( bin = 0; bin < hReverb->numBins; bin++ ) + { + 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][sample][bin] = 0.0f; + outImag[ch][sample][bin] = 0.0f; + } +#else for ( bin = 0; bin < hReverb->numBins; bin++ ) { outReal[ch][sampleWithOffset][bin] = hReverb->outputBufferReal[bin][ch][invertSampleIndex]; @@ -1766,6 +1810,7 @@ void ivas_binaural_reverb_processFrame( outReal[ch][sampleWithOffset][bin] = 0.0f; outImag[ch][sampleWithOffset][bin] = 0.0f; } +#endif } } @@ -1895,26 +1940,26 @@ ivas_error ivas_binaural_reverb_open( } } - if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) + + if ( ( roomAcoustics ) && ( roomAcoustics->override ) ) { - if ( !roomAcoustics->override ) + ivas_reverb_prepare_cldfb_params( roomAcoustics, hHrtfFastConv, output_config, roomAcoustics->use_brir, sampling_rate, t60, ene ); + ivas_binaural_reverb_setReverbTimes( hReverb, sampling_rate, t60, ene ); + ivas_binaural_reverb_setPreDelay( hReverb, (int16_t) roundf( 48000.0f * roomAcoustics->acousticPreDelay / CLDFB_NO_CHANNELS_MAX ) ); + } + else + { + if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) { ivas_binaural_reverb_setReverbTimes( hReverb, sampling_rate, hHrtfFastConv->fastconvReverberationTimes, hHrtfFastConv->fastconvReverberationEneCorrections ); ivas_binaural_reverb_setPreDelay( hReverb, 10 ); } else { - ivas_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 ) ); + ivas_binaural_reverb_setReverbTimes( hReverb, sampling_rate, hHrtfParambin->parametricReverberationTimes, hHrtfParambin->parametricReverberationEneCorrections ); + ivas_binaural_reverb_setPreDelay( hReverb, 10 ); } } - else - { - ivas_binaural_reverb_setReverbTimes( hReverb, sampling_rate, hHrtfParambin->parametricReverberationTimes, hHrtfParambin->parametricReverberationEneCorrections ); - ivas_binaural_reverb_setPreDelay( hReverb, 10 ); - } - return IVAS_ERR_OK; } diff --git a/lib_rend/ivas_rom_TdBinauralRenderer.c b/lib_rend/ivas_rom_TdBinauralRenderer.c index 70daa6dff9ab5eafe41320317533c40ec1ed1ae2..4b56fb4883d7fb0b26d230409dd250cb75406f85 100644 --- a/lib_rend/ivas_rom_TdBinauralRenderer.c +++ b/lib_rend/ivas_rom_TdBinauralRenderer.c @@ -41,6 +41,7 @@ #include "ivas_cnst.h" #include "wmc_auto.h" +#define WMC_TOOL_SKIP /*------------------------------------------------------------------------- * TD Binaural rendering related ROM tables @@ -12456,4 +12457,6 @@ const uint32_t orange53_rom_ITD_elevBsShape[28] = { 0x3ebda12f,0x3f12f685,0x3f2aaaab, }; +#undef WMC_TOOL_SKIP + /* clang-format on */ diff --git a/lib_rend/ivas_rom_binauralRenderer.c b/lib_rend/ivas_rom_binauralRenderer.c index 763777ad288c2be764a3863d8439000c7d55b439..9708bac83aec16af96f97ae080fba9933f23d4bb 100644 --- a/lib_rend/ivas_rom_binauralRenderer.c +++ b/lib_rend/ivas_rom_binauralRenderer.c @@ -41,6 +41,8 @@ /* clang-format off */ +#define WMC_TOOL_SKIP + /*------------------------------------------------------------------------- * Binaural rendering related ROM tables *------------------------------------------------------------------------*/ @@ -44077,4 +44079,6 @@ const float parametricEarlyPartEneCorrection[CLDFB_NO_CHANNELS_MAX] = 0.016350f, 0.042709f, 0.077337f, 0.066238f, 0.042046f, 0.020017f, 0.007896f, 0.002947f, 0.000932f, 0.000152f }; +#undef WMC_TOOL_SKIP + /* clang-format on */ diff --git a/lib_rend/ivas_rom_binaural_crend_head.c b/lib_rend/ivas_rom_binaural_crend_head.c index a57d7803783d776b3e8d3541622d72ec654092d5..56a9a9ef5352414618cbc049009c64d61d3d1af9 100644 --- a/lib_rend/ivas_rom_binaural_crend_head.c +++ b/lib_rend/ivas_rom_binaural_crend_head.c @@ -47,6 +47,7 @@ #include "cnst.h" #include "ivas_cnst.h" +#define WMC_TOOL_SKIP /********************** CRendBin_Combined_HRIR **********************/ #ifdef FIX_BINAURAL_DELAY_PRECISION @@ -6923,3 +6924,4 @@ const float CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS][252 0.050578f, 0.012222f, 0.020049f, -0.020057f, -0.032135f, -0.002553f, -0.037541f, -0.023567f, -0.008392f, -0.012215f, 0.001644f, -0.001142f, 0.000540f, 0.001404f, -0.027979f, -0.022362f, -0.012091f, -0.022963f, 0.009075f, 0.010977f, -0.007069f, -0.000183f, -0.022228f, -0.001348f, 0.006548f, -0.003034f} }; +#undef WMC_TOOL_SKIP diff --git a/lib_rend/ivas_rom_rend.c b/lib_rend/ivas_rom_rend.c index 0dfdaf0d28083baaaa060515c382631ff7eb49b9..dd8ca99d80ee6cb990fa7f65db3db9539cd837f5 100644 --- a/lib_rend/ivas_rom_rend.c +++ b/lib_rend/ivas_rom_rend.c @@ -104,7 +104,7 @@ const float diffuseFieldCoherenceDifferenceZ[BINAURAL_COHERENCE_DIFFERENCE_BINS] /*----------------------------------------------------------------------------------* - * TD ISm binaural renderer ROM tables + * TD ISM binaural renderer ROM tables *----------------------------------------------------------------------------------*/ const int16_t HRTF_MODEL_N_CPTS_VAR[HRTF_MODEL_N_SECTIONS] = diff --git a/lib_rend/ivas_rotation.c b/lib_rend/ivas_rotation.c index 2622d02308b0c9dd25bd7cd67b301f2b2b214626..4d9eeef3d5f228f8514d21fc80c52835a7d93cbe 100644 --- a/lib_rend/ivas_rotation.c +++ b/lib_rend/ivas_rotation.c @@ -30,6 +30,7 @@ *******************************************************************************************************/ +#include "ivas_cnst.h" #include #include #include "options.h" @@ -43,111 +44,169 @@ #include "wmc_auto.h" -/*---------------------------------------------------------------------------------- - * QuatToRotMat() +/*-----------------------------------------------------------------------* + * ivas_headTrack_open() * - * Quaternion handling: calculate rotation matrices in real-space and SHD - *---------------------------------------------------------------------------------*/ + * Allocate and initialize Head-Tracking handle + *-----------------------------------------------------------------------*/ -void QuatToRotMat( - const IVAS_QUATERNION quat, /* i : quaternion describing the rotation */ - float Rmat[3][3] /* o : real-space rotation matrix for this rotation */ +ivas_error ivas_headTrack_open( + HEAD_TRACK_DATA_HANDLE *hHeadTrackData /* o : head track handle */ ) { - float s1, s2, s3, c1, c2, c3; -#ifdef DEBUGGING - /* PrintQuat( quat ); */ -#endif + int16_t i; + ivas_error error; - /* For debugging purposes we can also calculate the rotation matrix from - * Euler angles instead of quaternions. In this case, all the w values must - * be set to -3.0 in the trajectory file to signal switching to Euler angles. - * The x,y, and z components of the quaternion are then interpreted as - * yaw-pitch-roll. - */ - if ( quat.w != -3.0 ) + /* Allocate Head-Tracking handle */ + if ( ( *hHeadTrackData = (HEAD_TRACK_DATA_HANDLE) malloc( sizeof( HEAD_TRACK_DATA ) ) ) == NULL ) { - Rmat[0][0] = quat.w * quat.w + quat.x * quat.x - quat.y * quat.y - quat.z * quat.z; - Rmat[0][1] = 2.0f * ( quat.x * quat.y - quat.w * quat.z ); - Rmat[0][2] = 2.0f * ( quat.x * quat.z + quat.w * quat.y ); + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for head-tracking memory\n" ) ); + } - Rmat[1][0] = 2.0f * ( quat.x * quat.y + quat.w * quat.z ); - Rmat[1][1] = quat.w * quat.w - quat.x * quat.x + quat.y * quat.y - quat.z * quat.z; - Rmat[1][2] = 2.0f * ( quat.y * quat.z - quat.w * quat.x ); + /* Initialization */ + ( *hHeadTrackData )->num_quaternions = 0; + ( *hHeadTrackData )->lrSwitchInterpVal = 0.0f; + ( *hHeadTrackData )->lrSwitchedCurrent = 0; + ( *hHeadTrackData )->lrSwitchedNext = 0; + if ( ( ( *hHeadTrackData )->OrientationTracker = (ivas_orient_trk_state_t *) malloc( sizeof( ivas_orient_trk_state_t ) ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Orientation tracking" ); + } - Rmat[2][0] = 2.0f * ( quat.x * quat.z - quat.w * quat.y ); - Rmat[2][1] = 2.0f * ( quat.y * quat.z + quat.w * quat.x ); - Rmat[2][2] = quat.w * quat.w - quat.x * quat.x - quat.y * quat.y + quat.z * quat.z; + if ( ( error = ivas_orient_trk_Init( ( *hHeadTrackData )->OrientationTracker ) ) != IVAS_ERR_OK ) + { + return error; } - else + + /* Initialise Rmat_prev to I, Rmat will be computed later */ + for ( i = 0; i < 3; i++ ) { - /* 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 - */ + set_zero( ( *hHeadTrackData )->Rmat_prev[i], 3 ); + ( *hHeadTrackData )->Rmat_prev[i][i] = 1.0f; + } - c1 = cosf( quat.z / _180_OVER_PI ); - c2 = cosf( quat.y / _180_OVER_PI ); - c3 = cosf( quat.x / _180_OVER_PI ); + 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 ); - s1 = sinf( quat.z / _180_OVER_PI ); - s2 = sinf( -quat.y / _180_OVER_PI ); - s3 = sinf( quat.x / _180_OVER_PI ); + return IVAS_ERR_OK; +} - Rmat[0][0] = c2 * c3; - Rmat[0][1] = -c2 * s3; - Rmat[0][2] = s2; - Rmat[1][0] = c1 * s3 + c3 * s1 * s2; - Rmat[1][1] = c1 * c3 - s1 * s2 * s3; - Rmat[1][2] = -c2 * s1; +/*-----------------------------------------------------------------------* + * ivas_headTrack_close() + * + * Deallocate Head-Tracking handle + *-----------------------------------------------------------------------*/ - Rmat[2][0] = s1 * s3 - c1 * c3 * s2; - Rmat[2][1] = c3 * s1 + c1 * s2 * s3; - Rmat[2][2] = c1 * c2; +void ivas_headTrack_close( + HEAD_TRACK_DATA_HANDLE *hHeadTrackData /* i/o: head track handle */ +) +{ + if ( hHeadTrackData == NULL || *hHeadTrackData == NULL ) + { + return; } + if ( ( *hHeadTrackData )->OrientationTracker != NULL ) + { + free( ( *hHeadTrackData )->OrientationTracker ); + ( *hHeadTrackData )->OrientationTracker = NULL; + } + + free( ( *hHeadTrackData ) ); + *hHeadTrackData = NULL; + + return; +} + + +/*---------------------------------------------------------------------------------- + * QuatToRotMat() + * + * Quaternion handling: calculate rotation matrices in real-space and SHD + *---------------------------------------------------------------------------------*/ + +void QuatToRotMat( + const IVAS_QUATERNION quat, /* i : quaternion describing the rotation */ + float Rmat[3][3] /* o : real-space rotation matrix for this rotation */ +) +{ + Rmat[0][0] = quat.w * quat.w + quat.x * quat.x - quat.y * quat.y - quat.z * quat.z; + Rmat[0][1] = 2.0f * ( quat.x * quat.y - quat.w * quat.z ); + Rmat[0][2] = 2.0f * ( quat.x * quat.z + quat.w * quat.y ); + + Rmat[1][0] = 2.0f * ( quat.x * quat.y + quat.w * quat.z ); + Rmat[1][1] = quat.w * quat.w - quat.x * quat.x + quat.y * quat.y - quat.z * quat.z; + Rmat[1][2] = 2.0f * ( quat.y * quat.z - quat.w * quat.x ); + + Rmat[2][0] = 2.0f * ( quat.x * quat.z - quat.w * quat.y ); + Rmat[2][1] = 2.0f * ( quat.y * quat.z + quat.w * quat.x ); + Rmat[2][2] = quat.w * quat.w - quat.x * quat.x - quat.y * quat.y + quat.z * quat.z; + return; } + /*------------------------------------------------------------------------- - * Quat2Euler() + * Euler2Quat() * - * Quaternion handling: calculate corresponding Euler angles + * Calculate corresponding Quaternion from Euler angles in radians *------------------------------------------------------------------------*/ -void Quat2Euler( - const IVAS_QUATERNION quat, /* i : quaternion describing the rotation */ - float *yaw, /* o : yaw */ - float *pitch, /* o : pitch */ - float *roll /* o : roll */ +void Euler2Quat( + const float yaw, /* i : yaw (x) */ + const float pitch, /* i : pitch (y) */ + const float roll, /* i : roll (z) */ + IVAS_QUATERNION *quat /* o : quaternion describing the rotation */ ) { - if ( quat.w != -3.0 ) + float cr = cosf( roll * 0.5f ); + float sr = sinf( roll * 0.5f ); + float cp = cosf( pitch * 0.5f ); +#ifdef EUALER2QUAT_FIX + float sp = sinf( pitch * 0.5f ); +#else + float sp = sinf( -pitch * 0.5f ); +#endif + float cy = cosf( yaw * 0.5f ); + float sy = sinf( yaw * 0.5f ); +#ifdef EUALER2QUAT_FIX + quat->w = cr * cp * cy + sr * sp * sy; + quat->x = sr * cp * cy - cr * sp * sy; + quat->y = sr * cp * sy + cr * sp * cy; + quat->z = cr * cp * sy - sr * sp * cy; +#else + quat->w = cr * cp * cy - sr * sp * sy; + quat->x = sr * cp * cy + cr * sp * sy; + quat->y = cr * sp * cy - sr * cp * sy; + quat->z = cr * cp * sy + sr * sp * cy; +#endif + + return; +} + +/*------------------------------------------------------------------------- + * deg2rad() + * + * Converts degrees to normalized radians + *------------------------------------------------------------------------*/ +float deg2rad( + float degrees ) +{ + while ( degrees >= 180.0f ) { - *yaw = atan2f( 2 * ( quat.w * quat.x + quat.y * quat.z ), 1 - 2 * ( quat.x * quat.x + quat.y * quat.y ) ); - *pitch = asinf( 2 * ( quat.w * quat.y - quat.z * quat.x ) ); - *roll = atan2f( 2 * ( quat.w * quat.z + quat.x * quat.y ), 1 - 2 * ( quat.y * quat.y + quat.z * quat.z ) ); + degrees = degrees - 360.0f; } - else + while ( degrees <= -180.0f ) { - /* Euler angles in R_X(roll)*R_Y(pitch)*R_Z(yaw) convention - * - * yaw: rotate scene counter-clockwise in the horizontal plane - * pitch: rotate scene in the median plane, increase elevation with positive values - * roll: rotate scene from the right ear to the top - */ - *yaw = quat.z; - *pitch = quat.y; - *roll = quat.x; + degrees = degrees + 360.0f; } - return; + return PI_OVER_180 * degrees; } - /*------------------------------------------------------------------------- * rotateAziEle() * diff --git a/lib_rend/ivas_sba_rendering.c b/lib_rend/ivas_sba_rendering.c index 8fd10d83ba3b261a3874eed9065197fbca20ab3a..f59df117b4ef938b3b2d8bac9481046f9c2c40ad 100644 --- a/lib_rend/ivas_sba_rendering.c +++ b/lib_rend/ivas_sba_rendering.c @@ -50,6 +50,14 @@ * Render prototype audio signals using SBA mixing matrices *-------------------------------------------------------------------*/ +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS +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 */ +) +#else 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 */ @@ -57,6 +65,7 @@ void ivas_sba_prototype_renderer( const int16_t firstSubframe, /* i : First subframe to map */ const int16_t nSubframes /* i : Number of subframes to map */ ) +#endif { float mixer_mat[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH][IVAS_MAX_NUM_BANDS]; SPAR_DEC_HANDLE hSpar; @@ -66,8 +75,12 @@ void ivas_sba_prototype_renderer( int16_t num_cldfb_bands, numch_in, numch_out; int16_t cldfb_band; int16_t out_ch, in_ch; +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS + int16_t firstInCh, inChEnd, firstOutCh, outChEnd; +#else int16_t firstSlot, slotEnd, firstInCh, inChEnd, firstOutCh, outChEnd; int16_t sf_idx; +#endif push_wmops( "ivas_sba_prototype_renderer" ); @@ -75,9 +88,10 @@ void ivas_sba_prototype_renderer( hDecoderConfig = st_ivas->hDecoderConfig; num_spar_bands = hSpar->hFbMixer->pFb->filterbank_num_bands; +#ifndef FIX_355_REFACTOR_PARAMBIN_TO_5MS firstSlot = firstSubframe * ( CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES ); slotEnd = ( firstSubframe + nSubframes ) * ( CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES ); - +#endif 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; @@ -98,6 +112,74 @@ void ivas_sba_prototype_renderer( } /* Apply mixing matrix */ +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS + for ( ts = 0; ts < CLDFB_SLOTS_PER_SUBFRAME; ts++ ) + { + /* determine SPAR parameters for this time slot */ + ivas_spar_get_parameters( hSpar, hDecoderConfig, ts + subframe * CLDFB_SLOTS_PER_SUBFRAME, 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 */ + 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]; + } + } + } +#else for ( ts = firstSlot; ts < slotEnd; ts++ ) { /* determine SPAR parameters for this time slot */ @@ -168,11 +250,16 @@ void ivas_sba_prototype_renderer( } } } +#endif /* Create prototypes */ if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) { +#ifdef FIX_355_REFACTOR_PARAMBIN_TO_5MS + for ( ts = 0; ts < CLDFB_SLOTS_PER_SUBFRAME; ts++ ) +#else for ( ts = firstSlot; ts < slotEnd; ts++ ) +#endif { if ( st_ivas->nchan_transport == 1 ) /* Dual mono */ { diff --git a/lib_rend/ivas_stat_rend.h b/lib_rend/ivas_stat_rend.h index 586a43c4f8af75aad98de0c9f472aeb39ec2ced4..a3308e23c21e39a73a6ef9554257a9fdf52f7af2 100644 --- a/lib_rend/ivas_stat_rend.h +++ b/lib_rend/ivas_stat_rend.h @@ -140,6 +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; + float reqularizationFactor; } DIRAC_DEC_BIN_DATA, *DIRAC_DEC_BIN_HANDLE; @@ -221,6 +222,23 @@ typedef struct EFAP } EFAP, *EFAP_HANDLE; +/*----------------------------------------------------------------------------------* + * Orientation tracking structure + *----------------------------------------------------------------------------------*/ + +typedef struct ivas_orient_trk_state_t +{ + OTR_TRACKING_T trackingType; + float centerAdaptationRate; + float offCenterAdaptationRate; + float adaptationAngle; + + float alpha; + IVAS_QUATERNION absAvgRot; /* average absolute orientation */ + IVAS_QUATERNION refRot; /* reference orientation */ + IVAS_QUATERNION trkRot; /* tracked rotation */ + +} ivas_orient_trk_state_t; /*----------------------------------------------------------------------------------* * Head rotation data structure @@ -230,7 +248,9 @@ typedef struct { int8_t headRotEnabled; IVAS_QUATERNION headPositions[RENDERER_HEAD_POSITIONS_PER_FRAME]; + IVAS_VECTOR3 Pos[RENDERER_HEAD_POSITIONS_PER_FRAME]; float crossfade[L_FRAME48k / RENDERER_HEAD_POSITIONS_PER_FRAME]; + ivas_orient_trk_state_t *hOrientationTracker; } IVAS_REND_HeadRotData; @@ -238,6 +258,7 @@ typedef struct ivas_binaural_head_track_struct { int16_t num_quaternions; IVAS_QUATERNION Quaternions[MAX_PARAM_SPATIAL_SUBFRAMES]; + IVAS_VECTOR3 Pos[MAX_PARAM_SPATIAL_SUBFRAMES]; float Rmat[3][3]; float Rmat_prev[3][3]; @@ -245,46 +266,19 @@ typedef struct ivas_binaural_head_track_struct uint8_t lrSwitchedCurrent; float lrSwitchInterpVal; + float chEneIIR[2][MASA_FREQUENCY_BANDS]; /* independent of the format. MASA bands are suitable for the task and readily available in ROM. */ + float procChEneIIR[2][MASA_FREQUENCY_BANDS]; + int16_t shd_rot_max_order; + ivas_orient_trk_state_t *OrientationTracker; } HEAD_TRACK_DATA, *HEAD_TRACK_DATA_HANDLE; - -/*----------------------------------------------------------------------------------* - * Orientation tracking structure - *----------------------------------------------------------------------------------*/ - -typedef struct ivas_orient_trk_state_t -{ - OTR_TRACKING_T trackingType; - float centerAdaptationRate; - float offCenterAdaptationRate; - float adaptationAngle; - - float alpha; - - float absYaw; /* absolute orientation */ - float absPitch; - float absRoll; - - float absAvgYaw; /* average absolute orientation */ - float absAvgPitch; - float absAvgRoll; - - float refYaw; /* reference orientation */ - float refPitch; - float refRoll; - - float trkYaw; /* tracked orientation */ - float trkPitch; - float trkRoll; - -} ivas_orient_trk_state_t; - - /*----------------------------------------------------------------------------------* * Reverberator structure *----------------------------------------------------------------------------------*/ +/* Reverberator structures */ + typedef struct ivas_roomAcoustics_t { @@ -306,6 +300,7 @@ typedef struct ivas_render_config_t ivas_renderTypeOverride renderer_type_override; #endif ivas_roomAcoustics_t roomAcoustics; + float directivity[3]; } RENDER_CONFIG_DATA, *RENDER_CONFIG_HANDLE; @@ -389,7 +384,7 @@ typedef struct ivas_reverb_state_t /*----------------------------------------------------------------------------------* - * TD ISm Object Renderer structure + * TD ISM Object Renderer structure *----------------------------------------------------------------------------------*/ typedef struct @@ -609,6 +604,9 @@ 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; +#ifdef FIX_379_GAININTP + float prevGain; +#endif } TDREND_SRC_t; /* Top level TD binaural renderer handle */ diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c index 7a1c4f4f30bf57f62e7dfab7f748e86299e8930d..7744a6582b1e019890f23f5c7417d340e7ed0876 100644 --- a/lib_rend/lib_rend.c +++ b/lib_rend/lib_rend.c @@ -115,14 +115,8 @@ typedef struct IVAS_REND_AudioObjectPosition currentPos; IVAS_REND_AudioObjectPosition previousPos; TDREND_WRAPPER tdRendWrapper; -#ifdef FIX_197_CREND_INTERFACE CREND_WRAPPER_HANDLE crendWrapper; -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - REVERB_HANDLE reverb; -#endif -#else - CREND_WRAPPER crendWrapper; -#endif + REVERB_HANDLE hReverb; rotation_matrix rot_mat_prev; } input_ism; @@ -147,14 +141,8 @@ typedef struct LSSETUP_CUSTOM_STRUCT customLsInput; EFAP_WRAPPER efapInWrapper; TDREND_WRAPPER tdRendWrapper; -#ifdef FIX_197_CREND_INTERFACE CREND_WRAPPER_HANDLE crendWrapper; -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - REVERB_HANDLE reverb; -#endif -#else - CREND_WRAPPER crendWrapper; -#endif + REVERB_HANDLE hReverb; rotation_gains rot_gains_prev; lfe_routing lfeRouting; } input_mc; @@ -163,11 +151,7 @@ typedef struct { input_base base; pan_matrix hoaDecMtx; -#ifdef FIX_197_CREND_INTERFACE CREND_WRAPPER_HANDLE crendWrapper; -#else - CREND_WRAPPER crendWrapper; -#endif rotation_gains rot_gains_prev; } input_sba; @@ -329,11 +313,7 @@ static int32_t limitRendererOutput( * *-------------------------------------------------------------------*/ -#ifdef FIX_197_CREND_INTERFACE AUDIO_CONFIG getIvasAudioConfigFromRendAudioConfig( -#else -AUDIO_CONFIG rendAudioConfigToIvasAudioConfig( -#endif IVAS_REND_AudioConfig rendConfig ) { switch ( rendConfig ) @@ -921,11 +901,12 @@ static ivas_error getEfapGains( return IVAS_ERR_OK; } -static void initHeadRotation( +static ivas_error initHeadRotation( IVAS_REND_HANDLE hIvasRend ) { int16_t i, crossfade_len; float tmp; + ivas_error error; /* Head rotation is enabled by default */ hIvasRend->headRotData.headRotEnabled = 1; @@ -944,6 +925,27 @@ static void initHeadRotation( hIvasRend->headRotData.headPositions[i] = quaternionInit(); } + if ( ( hIvasRend->headRotData.hOrientationTracker = (ivas_orient_trk_state_t *) malloc( sizeof( ivas_orient_trk_state_t ) ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Orientation tracking" ); + } + + if ( ( error = ivas_orient_trk_Init( hIvasRend->headRotData.hOrientationTracker ) ) != IVAS_ERR_OK ) + { + return error; + } + + return IVAS_ERR_OK; +} + +static void closeHeadRotation( + IVAS_REND_HANDLE hIvasRend ) +{ + if ( ( hIvasRend != NULL ) && ( hIvasRend->headRotData.hOrientationTracker != NULL ) ) + { + free( hIvasRend->headRotData.hOrientationTracker ); + } + return; } @@ -1005,6 +1007,9 @@ static IVAS_REND_AudioObjectPosition defaultObjectPosition( pos.azimuth = 0.0f; pos.elevation = 0.0f; + pos.radius = 1.0f; + pos.yaw = 0.0f; + pos.pitch = 0.0f; return pos; } @@ -1050,8 +1055,9 @@ static CREND_WRAPPER defaultCrendWrapper( return w; } -#ifdef FIX_372_LIB_REND_VALIDATE_IO -static bool isIoConfigPairSupported( IVAS_REND_AudioConfig inConfig, IVAS_REND_AudioConfig outConfig ) +static bool isIoConfigPairSupported( + IVAS_REND_AudioConfig inConfig, + IVAS_REND_AudioConfig outConfig ) { /* Rendering mono or stereo to binaural is not supported */ if ( ( inConfig == IVAS_REND_AUDIO_CONFIG_MONO || inConfig == IVAS_REND_AUDIO_CONFIG_STEREO ) && @@ -1063,7 +1069,6 @@ static bool isIoConfigPairSupported( IVAS_REND_AudioConfig inConfig, IVAS_REND_A /* If not returned so far, config pair is supported */ return true; } -#endif static ivas_error setRendInputActiveIsm( void *input, @@ -1080,71 +1085,50 @@ static ivas_error setRendInputActiveIsm( rendCtx = inputIsm->base.ctx; outConfig = *rendCtx.pOutConfig; -#ifdef FIX_372_LIB_REND_VALIDATE_IO if ( !isIoConfigPairSupported( inConfig, outConfig ) ) { return IVAS_ERR_IO_CONFIG_PAIR_NOT_SUPPORTED; } -#endif initRendInputBase( &inputIsm->base, inConfig, id, rendCtx ); inputIsm->currentPos = defaultObjectPosition(); inputIsm->previousPos = defaultObjectPosition(); -#ifdef FIX_197_CREND_INTERFACE inputIsm->crendWrapper = NULL; -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - inputIsm->reverb = NULL; -#endif -#else - inputIsm->crendWrapper = defaultCrendWrapper(); -#endif + inputIsm->hReverb = NULL; inputIsm->tdRendWrapper = defaultTdRendWrapper(); initRotMatrix( inputIsm->rot_mat_prev ); error = IVAS_ERR_OK; if ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL ) { - if ( ( error = ivas_td_binaural_open_ext( &inputIsm->tdRendWrapper, inConfig, NULL, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_td_binaural_open_ext( &inputIsm->tdRendWrapper, inConfig, hRendCfg, NULL, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK ) { return error; } } else if ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) { -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND if ( hRendCfg != NULL && hRendCfg->roomAcoustics.use_brir == 0 && hRendCfg->roomAcoustics.late_reverb_on ) { - if ( ( error = ivas_td_binaural_open_ext( &inputIsm->tdRendWrapper, inConfig, NULL, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_td_binaural_open_ext( &inputIsm->tdRendWrapper, inConfig, hRendCfg, NULL, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK ) { return error; } - if ( ( error = ivas_reverb_open( &( inputIsm->reverb ), getIvasAudioConfigFromRendAudioConfig( outConfig ), NULL, hRendCfg, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_reverb_open( &( inputIsm->hReverb ), getIvasAudioConfigFromRendAudioConfig( outConfig ), NULL, hRendCfg, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK ) { return error; } } else { -#endif - if ( ( error = ivas_rend_openCrend( &inputIsm->crendWrapper, AUDIO_CONFIG_7_1_4, -#ifdef FIX_197_CREND_INTERFACE - getIvasAudioConfigFromRendAudioConfig( outConfig ), -#else - rendAudioConfigToIvasAudioConfig( outConfig ), -#endif - hRendCfg, -#ifdef FIX_197_CREND_INTERFACE - 0, -#endif + if ( ( error = ivas_rend_openCrend( &inputIsm->crendWrapper, AUDIO_CONFIG_7_1_4, getIvasAudioConfigFromRendAudioConfig( outConfig ), hRendCfg, NULL, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK ) { return error; } -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND } -#endif } return IVAS_ERR_OK; @@ -1160,21 +1144,10 @@ static void clearInputIsm( initRendInputBase( &inputIsm->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx ); /* Free input's internal handles */ -#ifdef FIX_197_CREND_INTERFACE - if ( inputIsm->crendWrapper != NULL ) -#else - if ( inputIsm->crendWrapper.hCrend != NULL ) -#endif - { - ivas_rend_closeCrend( &inputIsm->crendWrapper ); - } -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - if ( inputIsm->reverb != NULL ) - { - ivas_reverb_close( &inputIsm->reverb ); - } -#endif + ivas_rend_closeCrend( &inputIsm->crendWrapper ); + + ivas_reverb_close( &inputIsm->hReverb ); if ( inputIsm->tdRendWrapper.hBinRendererTd != NULL ) { @@ -1232,6 +1205,8 @@ static void fillIdentityPanMatrix( { panMatrix[i][i] = 1.0f; } + + return; } static ivas_error initMcPanGainsWithIdentMatrix( @@ -1249,20 +1224,14 @@ static ivas_error initMcPanGainsWithConversionMapping( AUDIO_CONFIG ivasConfigIn, ivasConfigOut; int16_t i; -#ifdef FIX_197_CREND_INTERFACE ivasConfigIn = getIvasAudioConfigFromRendAudioConfig( inputMc->base.inConfig ); ivasConfigOut = getIvasAudioConfigFromRendAudioConfig( outConfig ); -#else - ivasConfigIn = rendAudioConfigToIvasAudioConfig( inputMc->base.inConfig ); - ivasConfigOut = rendAudioConfigToIvasAudioConfig( outConfig ); -#endif /* Find conversion mapping for current I/O config pair. * Stay with default panning matrix if conversion_matrix is NULL */ for ( i = 0; i < LS_SETUP_CONVERSION_NUM_MAPPINGS; ++i ) { - if ( ls_conversion_mapping[i].input_config == ivasConfigIn && - ls_conversion_mapping[i].output_config == ivasConfigOut ) + if ( ls_conversion_mapping[i].input_config == ivasConfigIn && ls_conversion_mapping[i].output_config == ivasConfigOut ) { /* Mapping found with valid matrix - copy */ if ( ls_conversion_mapping[i].conversion_matrix != NULL ) @@ -1818,21 +1787,9 @@ static ivas_error initMcBinauralRendering( inputMc->tdRendWrapper.hHrtfTD = NULL; } -#ifdef FIX_197_CREND_INTERFACE - if ( inputMc->crendWrapper != NULL ) -#else - if ( inputMc->crendWrapper.hCrend != NULL ) -#endif - { - ivas_rend_closeCrend( &inputMc->crendWrapper ); - } + ivas_rend_closeCrend( &inputMc->crendWrapper ); -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - if ( inputMc->reverb != NULL ) - { - ivas_reverb_close( &inputMc->reverb ); - } -#endif + ivas_reverb_close( &inputMc->hReverb ); if ( inputMc->efapInWrapper.hEfap != NULL ) { @@ -1859,34 +1816,22 @@ static ivas_error initMcBinauralRendering( // if ( initTDRend ) { - if ( ( error = ivas_td_binaural_open_ext( &inputMc->tdRendWrapper, inConfig, &inputMc->customLsInput, outSampleRate ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_td_binaural_open_ext( &inputMc->tdRendWrapper, inConfig, hRendCfg, &inputMc->customLsInput, outSampleRate ) ) != IVAS_ERR_OK ) { return error; } -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND if ( hRendCfg != NULL && hRendCfg->roomAcoustics.use_brir == 0 && hRendCfg->roomAcoustics.late_reverb_on ) { - if ( ( error = ivas_reverb_open( &( inputMc->reverb ), getIvasAudioConfigFromRendAudioConfig( outConfig ), NULL, hRendCfg, outSampleRate ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_reverb_open( &( inputMc->hReverb ), getIvasAudioConfigFromRendAudioConfig( outConfig ), NULL, hRendCfg, outSampleRate ) ) != IVAS_ERR_OK ) { return error; } } -#endif } { - if ( ( error = ivas_rend_openCrend( &inputMc->crendWrapper, -#ifdef FIX_197_CREND_INTERFACE - ( inConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) ? AUDIO_CONFIG_7_1_4 : getIvasAudioConfigFromRendAudioConfig( inConfig ), getIvasAudioConfigFromRendAudioConfig( outConfig ), -#else - ( inConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) ? AUDIO_CONFIG_7_1_4 : rendAudioConfigToIvasAudioConfig( inConfig ), - rendAudioConfigToIvasAudioConfig( outConfig ), -#endif - hRendCfg, -#ifdef FIX_197_CREND_INTERFACE - 0, -#endif + if ( ( error = ivas_rend_openCrend( &inputMc->crendWrapper, ( inConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) ? AUDIO_CONFIG_7_1_4 : getIvasAudioConfigFromRendAudioConfig( inConfig ), getIvasAudioConfigFromRendAudioConfig( outConfig ), hRendCfg, NULL, outSampleRate ) ) != IVAS_ERR_OK ) { return error; @@ -1911,7 +1856,7 @@ static lfe_routing defaultLfeRouting( const IVAS_REND_AudioConfig outConfig, const LSSETUP_CUSTOM_STRUCT customLsOut ) { - int32_t i; + int16_t i; lfe_routing routing; /* Set all output gains to zero, then route each input LFE consecutively to the next available output LFE. */ @@ -1978,25 +1923,17 @@ static ivas_error setRendInputActiveMc( rendCtx = inputMc->base.ctx; outConfig = *rendCtx.pOutConfig; -#ifdef FIX_372_LIB_REND_VALIDATE_IO if ( !isIoConfigPairSupported( inConfig, outConfig ) ) { return IVAS_ERR_IO_CONFIG_PAIR_NOT_SUPPORTED; } -#endif initRendInputBase( &inputMc->base, inConfig, id, rendCtx ); setZeroPanMatrix( inputMc->panGains ); inputMc->customLsInput = defaultCustomLs(); inputMc->tdRendWrapper = defaultTdRendWrapper(); -#ifdef FIX_197_CREND_INTERFACE inputMc->crendWrapper = NULL; -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - inputMc->reverb = NULL; -#endif -#else - inputMc->crendWrapper = defaultCrendWrapper(); -#endif + inputMc->hReverb = NULL; initRotGains( inputMc->rot_gains_prev ); inputMc->lfeRouting = defaultLfeRouting( inConfig, inputMc->customLsInput, outConfig, *inputMc->base.ctx.pCustomLsOut ); @@ -2031,21 +1968,9 @@ static void clearInputMc( efap_free_data( &inputMc->efapInWrapper.hEfap ); } -#ifdef FIX_197_CREND_INTERFACE - if ( inputMc->crendWrapper != NULL ) -#else - if ( inputMc->crendWrapper.hCrend != NULL ) -#endif - { - ivas_rend_closeCrend( &inputMc->crendWrapper ); - } + ivas_rend_closeCrend( &inputMc->crendWrapper ); -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - if ( inputMc->reverb != NULL ) - { - ivas_reverb_close( &inputMc->reverb ); - } -#endif + ivas_reverb_close( &inputMc->hReverb ); if ( inputMc->tdRendWrapper.hBinRendererTd != NULL ) { @@ -2083,11 +2008,7 @@ static ivas_error initSbaPanGainsForMcOut( case IVAS_REND_AUDIO_CONFIG_MONO: hOutSetup.ls_azimuth = ls_azimuth_CICP1; hOutSetup.ls_elevation = ls_elevation_CICP1; -#ifdef FIX_197_CREND_INTERFACE ivas_output_init( &hOutSetup, getIvasAudioConfigFromRendAudioConfig( outConfig ) ); -#else - ivas_output_init( &hOutSetup, rendAudioConfigToIvasAudioConfig( outConfig ) ); -#endif break; case IVAS_REND_AUDIO_CONFIG_STEREO: case IVAS_REND_AUDIO_CONFIG_5_1: @@ -2095,11 +2016,7 @@ static ivas_error initSbaPanGainsForMcOut( case IVAS_REND_AUDIO_CONFIG_5_1_2: case IVAS_REND_AUDIO_CONFIG_5_1_4: case IVAS_REND_AUDIO_CONFIG_7_1_4: -#ifdef FIX_197_CREND_INTERFACE ivas_output_init( &hOutSetup, getIvasAudioConfigFromRendAudioConfig( outConfig ) ); -#else - ivas_output_init( &hOutSetup, rendAudioConfigToIvasAudioConfig( outConfig ) ); -#endif break; case IVAS_REND_AUDIO_CONFIG_LS_CUSTOM: ivas_ls_custom_setup( &hOutSetup, outSetupCustom ); @@ -2180,17 +2097,9 @@ static ivas_error updateSbaPanGains( { case IVAS_REND_AUDIO_CONFIG_BINAURAL: error = ivas_rend_openCrend( &inputSba->crendWrapper, -#ifdef FIX_197_CREND_INTERFACE getIvasAudioConfigFromRendAudioConfig( inConfig ), getIvasAudioConfigFromRendAudioConfig( outConfig ), -#else - rendAudioConfigToIvasAudioConfig( inConfig ), - rendAudioConfigToIvasAudioConfig( outConfig ), -#endif hRendCfg, -#ifdef FIX_197_CREND_INTERFACE - 0, -#endif NULL, *rendCtx.pOutSampleRate ); break; @@ -2202,15 +2111,8 @@ static ivas_error updateSbaPanGains( error = ivas_rend_openCrend( &inputSba->crendWrapper, AUDIO_CONFIG_7_1_4, -#ifdef FIX_197_CREND_INTERFACE getIvasAudioConfigFromRendAudioConfig( outConfig ), -#else - rendAudioConfigToIvasAudioConfig( outConfig ), -#endif hRendCfg, -#ifdef FIX_197_CREND_INTERFACE - 0, -#endif NULL, *rendCtx.pOutSampleRate ); break; @@ -2245,20 +2147,14 @@ static ivas_error setRendInputActiveSba( rendCtx = inputSba->base.ctx; outConfig = *rendCtx.pOutConfig; -#ifdef FIX_372_LIB_REND_VALIDATE_IO if ( !isIoConfigPairSupported( inConfig, outConfig ) ) { return IVAS_ERR_IO_CONFIG_PAIR_NOT_SUPPORTED; } -#endif initRendInputBase( &inputSba->base, inConfig, id, rendCtx ); setZeroPanMatrix( inputSba->hoaDecMtx ); -#ifdef FIX_197_CREND_INTERFACE inputSba->crendWrapper = NULL; -#else - inputSba->crendWrapper = defaultCrendWrapper(); -#endif initRotGains( inputSba->rot_gains_prev ); if ( ( error = updateSbaPanGains( inputSba, outConfig, hRendCfg ) ) != IVAS_ERR_OK ) @@ -2279,14 +2175,7 @@ static void clearInputSba( initRendInputBase( &inputSba->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx ); /* Free input's internal handles */ -#ifdef FIX_197_CREND_INTERFACE - if ( inputSba->crendWrapper != NULL ) -#else - if ( inputSba->crendWrapper.hCrend != NULL ) -#endif - { - ivas_rend_closeCrend( &inputSba->crendWrapper ); - } + ivas_rend_closeCrend( &inputSba->crendWrapper ); return; } @@ -2303,11 +2192,7 @@ static ivas_error initMasaDummyDecForMcOut( DecoderDummy *decDummy; decDummy = inputMasa->decDummy; -#ifdef FIX_197_CREND_INTERFACE output_config = getIvasAudioConfigFromRendAudioConfig( outConfig ); -#else - output_config = rendAudioConfigToIvasAudioConfig( outConfig ); -#endif decDummy->hDecoderConfig->output_config = output_config; decDummy->hDecoderConfig->ivas_total_brate = IVAS_512k; /* Todo Nokia: This is preventing initialization of 2TC as 1TC, should be fixed properly in ivas_dirac_dec_config() */ @@ -2337,6 +2222,7 @@ static ivas_error initMasaDummyDecForMcOut( { return error; } + decDummy->hDirAC->dirac_bs_md_write_idx = 0; if ( decDummy->renderer_type == RENDERER_STEREO_PARAMETRIC ) { @@ -2344,9 +2230,6 @@ static ivas_error initMasaDummyDecForMcOut( { return error; } -#ifndef FIX_107_5MS_SUBFRAME_RENDERING - decDummy->hDiracDecBin->useSubframeMode = 0; /* Todo Nokia: This will disappear in later work but needs to be this now. */ -#endif } numCldfbAnalyses = decDummy->nchan_transport; @@ -2392,11 +2275,7 @@ static ivas_error initMasaDummyDecForSbaOut( decDummy = inputMasa->decDummy; -#ifdef FIX_197_CREND_INTERFACE output_config = getIvasAudioConfigFromRendAudioConfig( outConfig ); -#else - output_config = rendAudioConfigToIvasAudioConfig( outConfig ); -#endif decDummy->hDecoderConfig->output_config = output_config; decDummy->hDecoderConfig->ivas_total_brate = IVAS_512k; /* Todo Nokia: This is preventing initialization of 2TC as 1TC, should be fixed properly in ivas_dirac_dec_config() */ @@ -2420,6 +2299,7 @@ static ivas_error initMasaDummyDecForSbaOut( { return error; } + decDummy->hDirAC->dirac_bs_md_write_idx = 0; numCldfbAnalyses = decDummy->nchan_transport; numCldfbSyntheses = decDummy->hDecoderConfig->nchan_out; @@ -2463,11 +2343,7 @@ static ivas_error initMasaDummyDecForBinauralOut( decDummy = inputMasa->decDummy; -#ifdef FIX_197_CREND_INTERFACE output_config = getIvasAudioConfigFromRendAudioConfig( outConfig ); -#else - output_config = rendAudioConfigToIvasAudioConfig( outConfig ); -#endif decDummy->hDecoderConfig->output_config = output_config; output_config = decDummy->hDecoderConfig->output_config; @@ -2487,16 +2363,12 @@ static ivas_error initMasaDummyDecForBinauralOut( } decDummy->ivas_format = MASA_FORMAT; decDummy->transport_config = AUDIO_CONFIG_INVALID; -#ifndef REMOVE_FORCE_SUBFRAME_BIN -#ifdef DEBUGGING - decDummy->hDecoderConfig->forceSubframeBinauralization = 0; -#endif -#endif if ( ( error = ivas_dirac_dec_open( decDummy ) ) != IVAS_ERR_OK ) { return error; } + decDummy->hDirAC->dirac_bs_md_write_idx = 0; if ( ( error = ivas_dirac_dec_binaural_copy_hrtfs( &decDummy->hHrtfParambin ) ) != IVAS_ERR_OK ) { @@ -2508,9 +2380,6 @@ static ivas_error initMasaDummyDecForBinauralOut( return error; } -#ifndef FIX_107_5MS_SUBFRAME_RENDERING - decDummy->hDiracDecBin->useSubframeMode = 0; /* Todo Nokia: This will disappear in later work but needs to be this now. */ -#endif for ( i = 0; i < BINAURAL_CHANNELS; i++ ) { @@ -2576,17 +2445,12 @@ static DecoderDummy *initDecoderDummy( decDummy = malloc( sizeof( DecoderDummy ) ); decDummy->hDecoderConfig = malloc( sizeof( DECODER_CONFIG ) ); decDummy->hDecoderConfig->output_Fs = sampleRate; - decDummy->hDecoderConfig->nchan_out = (int16_t) numOutChannels; + decDummy->hDecoderConfig->nchan_out = numOutChannels; decDummy->hDecoderConfig->Opt_Headrotation = 0; decDummy->hBinRenderer = NULL; decDummy->hEFAPdata = NULL; -#ifdef FIX_197_CREND_INTERFACE decDummy->hCrendWrapper = NULL; -#else - decDummy->hHrtf = NULL; - decDummy->hCrend = NULL; -#endif decDummy->hHrtfTD = NULL; decDummy->hSpar = NULL; decDummy->hoa_dec_mtx = NULL; @@ -2594,11 +2458,7 @@ static DecoderDummy *initDecoderDummy( decDummy->hMasa = NULL; decDummy->hDiracDecBin = NULL; decDummy->hQMetaData = NULL; -#ifdef FIX_197_CREND_INTERFACE decDummy->hDecoderConfig->output_config = getIvasAudioConfigFromRendAudioConfig( outConfig ); -#else - decDummy->hDecoderConfig->output_config = rendAudioConfigToIvasAudioConfig( outConfig ); -#endif decDummy->nchan_transport = numTransChannels; if ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM || outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) @@ -2615,6 +2475,8 @@ static DecoderDummy *initDecoderDummy( decDummy->hHeadTrackData->lrSwitchInterpVal = 0.0f; decDummy->hHeadTrackData->lrSwitchedCurrent = 0; decDummy->hHeadTrackData->lrSwitchedNext = 0; + decDummy->hHeadTrackData->OrientationTracker = (ivas_orient_trk_state_t *) malloc( sizeof( ivas_orient_trk_state_t ) ); + ivas_orient_trk_Init( decDummy->hHeadTrackData->OrientationTracker ); } else { @@ -2654,12 +2516,10 @@ static ivas_error setRendInputActiveMasa( outConfig = *rendCtx.pOutConfig; (void) hRendCfg; /* Suppress warning */ -#ifdef FIX_372_LIB_REND_VALIDATE_IO if ( !isIoConfigPairSupported( inConfig, outConfig ) ) { return IVAS_ERR_IO_CONFIG_PAIR_NOT_SUPPORTED; } -#endif initRendInputBase( &inputMasa->base, inConfig, id, rendCtx ); @@ -2667,7 +2527,7 @@ static ivas_error setRendInputActiveMasa( { return error; } - inputMasa->decDummy = initDecoderDummy( *rendCtx.pOutSampleRate, (int16_t) numInChannels, outConfig, 0 ); + inputMasa->decDummy = initDecoderDummy( *rendCtx.pOutSampleRate, numInChannels, outConfig, 0 ); inputMasa->metadataHasBeenFed = false; if ( ( error = updateMasaDummyDec( inputMasa, outConfig ) ) != IVAS_ERR_OK ) @@ -2694,8 +2554,13 @@ static void freeDecoderDummy( { free( pDecDummy->hDecoderConfig ); } + if ( pDecDummy->hHeadTrackData != NULL ) { + if ( pDecDummy->hHeadTrackData->OrientationTracker != NULL ) + { + free( pDecDummy->hHeadTrackData->OrientationTracker ); + } free( pDecDummy->hHeadTrackData ); } ivas_render_config_close( &pDecDummy->hRenderConfig ); @@ -2706,7 +2571,6 @@ static void freeDecoderDummy( if ( pDecDummy->cldfbAnaDec[i] != NULL ) { deleteCldfb( &( pDecDummy->cldfbAnaDec[i] ) ); - pDecDummy->cldfbAnaDec[i] = NULL; } } @@ -2715,16 +2579,11 @@ static void freeDecoderDummy( if ( pDecDummy->cldfbSynDec[i] != NULL ) { deleteCldfb( &( pDecDummy->cldfbSynDec[i] ) ); - pDecDummy->cldfbSynDec[i] = NULL; } } /* DirAC handle */ - if ( pDecDummy->hDirAC != NULL ) - { - ivas_dirac_dec_close( pDecDummy->hDirAC ); - pDecDummy->hDirAC = NULL; - } + ivas_dirac_dec_close( &( pDecDummy->hDirAC ) ); /* Qmetadata handle */ ivas_qmetadata_close( &pDecDummy->hQMetaData ); @@ -2771,10 +2630,7 @@ ivas_error IVAS_REND_Open( ivas_error error; int16_t numOutChannels; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( phIvasRend == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -2819,7 +2675,10 @@ ivas_error IVAS_REND_Open( } /* Initialize headrotation data */ - initHeadRotation( hIvasRend ); + if ( ( error = initHeadRotation( hIvasRend ) ) != IVAS_ERR_OK ) + { + return error; + } /* Initialize EFAP */ if ( ( error = initEfap( &hIvasRend->efapOutWrapper, outConfig, &hIvasRend->customLsOut ) ) != IVAS_ERR_OK ) @@ -2831,14 +2690,8 @@ ivas_error IVAS_REND_Open( for ( i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i ) { initRendInputBase( &hIvasRend->inputsIsm[i].base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, getRendCtx( hIvasRend ) ); -#ifdef FIX_197_CREND_INTERFACE hIvasRend->inputsIsm[i].crendWrapper = NULL; -#else - hIvasRend->inputsIsm[i].crendWrapper.hCrend = NULL; -#endif -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - hIvasRend->inputsIsm[i].reverb = NULL; -#endif + hIvasRend->inputsIsm[i].hReverb = NULL; hIvasRend->inputsIsm[i].tdRendWrapper.hBinRendererTd = NULL; } @@ -2846,25 +2699,15 @@ ivas_error IVAS_REND_Open( { initRendInputBase( &hIvasRend->inputsMc[i].base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, getRendCtx( hIvasRend ) ); hIvasRend->inputsMc[i].efapInWrapper.hEfap = NULL; -#ifdef FIX_197_CREND_INTERFACE hIvasRend->inputsMc[i].crendWrapper = NULL; -#else - hIvasRend->inputsMc[i].crendWrapper.hCrend = NULL; -#endif -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - hIvasRend->inputsMc[i].reverb = NULL; -#endif + hIvasRend->inputsMc[i].hReverb = NULL; hIvasRend->inputsMc[i].tdRendWrapper.hBinRendererTd = NULL; } for ( i = 0; i < RENDERER_MAX_SBA_INPUTS; ++i ) { initRendInputBase( &hIvasRend->inputsSba[i].base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, getRendCtx( hIvasRend ) ); -#ifdef FIX_197_CREND_INTERFACE hIvasRend->inputsSba[i].crendWrapper = NULL; -#else - hIvasRend->inputsSba[i].crendWrapper.hCrend = NULL; -#endif } for ( i = 0; i < RENDERER_MAX_MASA_INPUTS; ++i ) @@ -2942,10 +2785,7 @@ ivas_error IVAS_REND_ConfigureCustomOutputLoudspeakerLayout( input_mc *inputMc; input_sba *inputSba; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -3027,10 +2867,7 @@ ivas_error IVAS_REND_NumOutChannels( { ivas_error error; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL || numOutChannels == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -3253,10 +3090,7 @@ ivas_error IVAS_REND_AddInput( ivas_error ( *activateInput )( void *, IVAS_REND_AudioConfig, IVAS_REND_InputId, RENDER_CONFIG_DATA * ); int32_t inputIndex; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL || inputId == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -3325,10 +3159,7 @@ ivas_error IVAS_REND_ConfigureCustomInputLoudspeakerLayout( input_mc *inputMc; ivas_error error; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -3394,10 +3225,7 @@ ivas_error IVAS_REND_SetInputGain( input_base *inputBase; ivas_error error; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -3431,10 +3259,7 @@ ivas_error IVAS_REND_SetInputLfeMtx( input_mc *pInputMc; ivas_error error; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -3485,10 +3310,7 @@ ivas_error IVAS_REND_SetInputLfePos( input_mc *pInputMc; ivas_error error; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -3534,10 +3356,7 @@ ivas_error IVAS_REND_RemoveInput( ivas_error error; input_base *inputBase; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -3585,10 +3404,7 @@ ivas_error IVAS_REND_GetInputNumChannels( ivas_error error; const input_base *pInput; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL || numChannels == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -3627,10 +3443,7 @@ ivas_error IVAS_REND_GetDelay( int32_t latency_ns; int32_t max_latency_ns; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL || nSamples == NULL || timeScale == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -3645,13 +3458,8 @@ ivas_error IVAS_REND_GetDelay( { if ( hIvasRend->inputsIsm[i].base.inConfig != IVAS_REND_AUDIO_CONFIG_UNKNOWN ) { -#ifdef FIX_197_CREND_INTERFACE latency_ns = max( ( hIvasRend->inputsIsm[i].crendWrapper != NULL ) ? hIvasRend->inputsIsm[i].crendWrapper->binaural_latency_ns : 0, hIvasRend->inputsIsm[i].tdRendWrapper.binaural_latency_ns ); -#else - latency_ns = max( hIvasRend->inputsIsm[i].crendWrapper.binaural_latency_ns, - hIvasRend->inputsIsm[i].tdRendWrapper.binaural_latency_ns ); -#endif max_latency_ns = max( max_latency_ns, latency_ns ); } } @@ -3660,13 +3468,8 @@ ivas_error IVAS_REND_GetDelay( { if ( hIvasRend->inputsMc[i].base.inConfig != IVAS_REND_AUDIO_CONFIG_UNKNOWN ) { -#ifdef FIX_197_CREND_INTERFACE latency_ns = max( ( hIvasRend->inputsMc[i].crendWrapper != NULL ) ? hIvasRend->inputsMc[i].crendWrapper->binaural_latency_ns : 0, hIvasRend->inputsMc[i].tdRendWrapper.binaural_latency_ns ); -#else - latency_ns = max( hIvasRend->inputsMc[i].crendWrapper.binaural_latency_ns, - hIvasRend->inputsMc[i].tdRendWrapper.binaural_latency_ns ); -#endif max_latency_ns = max( max_latency_ns, latency_ns ); } } @@ -3675,11 +3478,7 @@ ivas_error IVAS_REND_GetDelay( { if ( hIvasRend->inputsSba[i].base.inConfig != IVAS_REND_AUDIO_CONFIG_UNKNOWN ) { -#ifdef FIX_197_CREND_INTERFACE latency_ns = ( hIvasRend->inputsSba[i].crendWrapper != NULL ) ? hIvasRend->inputsSba[i].crendWrapper->binaural_latency_ns : 0; -#else - latency_ns = hIvasRend->inputsSba[i].crendWrapper.binaural_latency_ns; -#endif max_latency_ns = max( max_latency_ns, latency_ns ); } } @@ -3688,7 +3487,7 @@ ivas_error IVAS_REND_GetDelay( { if ( hIvasRend->inputsMasa[i].base.inConfig != IVAS_REND_AUDIO_CONFIG_UNKNOWN ) { - latency_ns = NS2SA( hIvasRend->sampleRateOut, (int32_t) ( (float) IVAS_FB_DEC_DELAY_NS + 0.5f ) ); + latency_ns = (int32_t) ( (float) IVAS_FB_DEC_DELAY_NS + 0.5f ); max_latency_ns = max( max_latency_ns, latency_ns ); } } @@ -3715,10 +3514,7 @@ ivas_error IVAS_REND_FeedInputAudio( input_base *inputBase; int16_t numInputChannels; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL || inputAudio.data == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -3782,10 +3578,7 @@ ivas_error IVAS_REND_FeedInputObjectMetadata( input_ism *inputIsm; ivas_error error; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -3826,10 +3619,7 @@ ivas_error IVAS_REND_FeedInputMasaMetadata( input_base *inputBase; input_masa *inputMasa; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -3861,11 +3651,14 @@ ivas_error IVAS_REND_FeedInputMasaMetadata( *-------------------------------------------------------------------*/ ivas_error IVAS_REND_InitConfig( - IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ - const bool rendererConfigEnabled /* i : flag indicating if a renderer configuration file was supplied */ + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_REND_AudioConfig outAudioConfig /* i : output audioConfig */ ) { ivas_error error; + bool rendererConfigEnabled; + + rendererConfigEnabled = ( getAudioConfigType( outAudioConfig ) == IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL ); if ( rendererConfigEnabled ) { @@ -3876,34 +3669,21 @@ ivas_error IVAS_REND_InitConfig( hIvasRend->rendererConfigEnabled = 0; } -#ifdef FIX_197_CREND_INTERFACE if ( rendererConfigEnabled ) { if ( ( error = ivas_render_config_open( &( hIvasRend->hRendererConfig ) ) ) != IVAS_ERR_OK ) { return error; } - - if ( ivas_render_config_init_from_rom( &hIvasRend->hRendererConfig, hIvasRend->rendererConfigEnabled ) != IVAS_ERR_OK ) + if ( ( error = ivas_render_config_init_from_rom( &hIvasRend->hRendererConfig, outAudioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) ) != IVAS_ERR_OK ) { - return IVAS_ERR_INTERNAL_FATAL; + return error; } } else { hIvasRend->hRendererConfig = NULL; } -#else - if ( ( error = ivas_render_config_open( &( hIvasRend->hRendererConfig ) ) ) != IVAS_ERR_OK ) - { - return error; - } - - if ( ivas_render_config_init_from_rom( &hIvasRend->hRendererConfig, hIvasRend->rendererConfigEnabled ) != IVAS_ERR_OK ) - { - return IVAS_ERR_INTERNAL_FATAL; - } -#endif return IVAS_ERR_OK; } @@ -3976,6 +3756,7 @@ int16_t IVAS_REND_FeedRenderConfig( } 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 ) @@ -4008,16 +3789,15 @@ 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 positions for next rendering call */ + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_QUATERNION headRot[RENDERER_HEAD_POSITIONS_PER_FRAME], /* i : head orientations for next rendering call */ + const IVAS_VECTOR3 Pos[RENDERER_HEAD_POSITIONS_PER_FRAME] /* i : listener positions for next rendering call */ ) { int16_t i; + IVAS_QUATERNION rotQuat; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -4026,7 +3806,7 @@ ivas_error IVAS_REND_SetHeadRotation( if ( getAudioConfigType( hIvasRend->outputConfig ) != IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL ) { /* Head rotation can be set only with binaural output */ - return IVAS_ERR_METADATA_NOT_EXPECTED; + return IVAS_ERR_INVALID_OUTPUT_FORMAT; } if ( headRot == NULL ) @@ -4038,7 +3818,18 @@ ivas_error IVAS_REND_SetHeadRotation( hIvasRend->headRotData.headRotEnabled = 1; for ( i = 0; i < RENDERER_HEAD_POSITIONS_PER_FRAME; ++i ) { - hIvasRend->headRotData.headPositions[i] = headRot[i]; + /* check for Euler angle signaling */ + if ( headRot[i].w == -3.0f ) + { + Euler2Quat( deg2rad( headRot[i].x ), deg2rad( headRot[i].y ), deg2rad( headRot[i].z ), &rotQuat ); + } + else + { + rotQuat = headRot[i]; + } + + ivas_orient_trk_Process( hIvasRend->headRotData.hOrientationTracker, rotQuat, FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES, &hIvasRend->headRotData.headPositions[i] ); + hIvasRend->headRotData.Pos[i] = Pos[i]; } } @@ -4046,6 +3837,158 @@ ivas_error IVAS_REND_SetHeadRotation( } +/*-------------------------------------------------------------------* + * IVAS_REND_SetOrientationTrackingMode() + * + * + *-------------------------------------------------------------------*/ + +ivas_error IVAS_REND_SetOrientationTrackingMode( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const uint8_t otrMode /* i : Orientation tracking mode */ +) +{ + OTR_TRACKING_T mode; + ivas_error error; + + if ( hIvasRend == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + switch ( otrMode ) + { + case IVAS_ORIENT_TRK_AVG: + mode = OTR_TRACKING_AVG_ORIENT; + break; + case IVAS_ORIENT_TRK_REF: + mode = OTR_TRACKING_REF_ORIENT; + break; + case IVAS_ORIENT_TRK_REF_VEC: + mode = OTR_TRACKING_REF_VEC; + break; + case IVAS_ORIENT_TRK_REF_VEC_LEV: + mode = OTR_TRACKING_REF_VEC_LEV; + break; + case IVAS_ORIENT_TRK_NONE: + default: + mode = OTR_TRACKING_NONE; + break; + } + + if ( ( error = ivas_orient_trk_SetTrackingType( hIvasRend->headRotData.hOrientationTracker, mode ) ) != IVAS_ERR_OK ) + { + return error; + } + + return IVAS_ERR_OK; +} + + +/*-------------------------------------------------------------------* + * IVAS_REND_SetReferenceRotation() + * + * + *-------------------------------------------------------------------*/ + +ivas_error IVAS_REND_SetReferenceRotation( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_QUATERNION refRot /* i : Reference rotation */ +) +{ + ivas_error error; + + /* Validate function arguments */ + if ( hIvasRend == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + if ( ( error = ivas_orient_trk_SetReferenceRotation( hIvasRend->headRotData.hOrientationTracker, refRot ) ) != IVAS_ERR_OK ) + { + return error; + } + + return IVAS_ERR_OK; +} + + +/*-------------------------------------------------------------------* + * IVAS_REND_GetMainOrientation() + * + * + *-------------------------------------------------------------------*/ + +ivas_error IVAS_REND_GetMainOrientation( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + IVAS_QUATERNION *pOrientation /* i/o: Quaternion pointer for main orientation */ +) +{ + ivas_error error; + + if ( hIvasRend == NULL || pOrientation == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + if ( ( error = ivas_orient_trk_GetMainOrientation( hIvasRend->headRotData.hOrientationTracker, pOrientation ) ) != IVAS_ERR_OK ) + { + return error; + } + + return IVAS_ERR_OK; +} + + +/*-------------------------------------------------------------------* + * IVAS_REND_GetTrackedRotation() + * + * + *-------------------------------------------------------------------*/ + +ivas_error IVAS_REND_GetTrackedRotation( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + IVAS_QUATERNION *pRotation /* i/o: Quaternion pointer processed rotation */ +) +{ + ivas_error error; + + if ( hIvasRend == NULL || pRotation == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + if ( ( error = ivas_orient_trk_GetTrackedRotation( hIvasRend->headRotData.hOrientationTracker, pRotation ) ) != IVAS_ERR_OK ) + { + return error; + } + + return IVAS_ERR_OK; +} + + +/*---------------------------------------------------------------------* + * IVAS_REND_SetReferenceVector( ) + * + * Sets a reference vector spanning from listenerPos to refPos. Only + * available in OTR_TRACKING_REF_VEC and OTR_TRACKING_REF_VEC_LEV modes. + *---------------------------------------------------------------------*/ + +ivas_error IVAS_REND_SetReferenceVector( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_VECTOR3 listenerPos, /* i : Listener position */ + const IVAS_VECTOR3 refPos /* i : Reference position */ +) +{ + if ( hIvasRend == NULL || hIvasRend->headRotData.hOrientationTracker == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + return ivas_orient_trk_SetReferenceVector( hIvasRend->headRotData.hOrientationTracker, listenerPos, refPos ); +} + + /*-------------------------------------------------------------------* * Local functions *-------------------------------------------------------------------*/ @@ -4182,7 +4125,7 @@ static ivas_error rotateFrameMc( /* initialize gains to passthrough */ for ( ch_in = 0; ch_in < nchan; ch_in++ ) { - set_zero( gains[ch_in], (int16_t) nchan ); + set_zero( gains[ch_in], nchan ); gains[ch_in][ch_in] = 1.f; } @@ -4321,7 +4264,6 @@ static ivas_error rotateFrameSba( ( 1 - headRotData->crossfade[i] ) * gains_prev[n][m] * ( *readPtr ); } } -#ifdef FIX_376_SBA_ROTATE /* write back the result */ for ( n = m1; n < m2; n++ ) { @@ -4330,18 +4272,7 @@ static ivas_error rotateFrameSba( } m1 = m2; m2 += 2 * ( l + 1 ) + 1; -#endif } -#ifndef FIX_376_SBA_ROTATE - /* write back the result */ - for ( n = m1; n < m2; n++ ) - { - writePtr = getSmplPtr( outAudio, n, subframe_idx * subframe_len + i ); - ( *writePtr ) = tmpRot[n - m1]; - } - m1 = m2; - m2 += 2 * ( l + 1 ) + 1; -#endif } /*unoptimized code for reference (full matrix multiplication)*/ @@ -4388,9 +4319,7 @@ static ivas_error renderIsmToBinaural( NULL, ismInput->base.ctx.pHeadRotData, &ismInput->currentPos, -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - ismInput->reverb, -#endif + ismInput->hReverb, outAudio.config.numSamplesPerChannel, tmpTDRendBuffer ) ) != IVAS_ERR_OK ) { @@ -4413,11 +4342,7 @@ static ivas_error renderIsmToBinauralRoom( int16_t subframe_idx, subframe_len; int16_t tmp; rotation_matrix Rmat; -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND float tmpRendBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k]; -#else - float tmpCrendBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k]; -#endif IVAS_QUATERNION quat; ivas_error error; pan_vector currentPanGains; @@ -4431,8 +4356,7 @@ static ivas_error renderIsmToBinauralRoom( headRotData = ismInput->base.ctx.pHeadRotData; rotatedPos = defaultObjectPosition(); -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - if ( ismInput->reverb != NULL && ismInput->reverb->pConfig.roomAcoustics.use_brir == 0 && ismInput->reverb->pConfig.roomAcoustics.late_reverb_on == 1 && headRotData->headRotEnabled ) + if ( ismInput->hReverb != NULL && ismInput->hReverb->pConfig.roomAcoustics.use_brir == 0 && ismInput->hReverb->pConfig.roomAcoustics.late_reverb_on == 1 && headRotData->headRotEnabled ) { copyBufferTo2dArray( ismInput->base.inputBuffer, tmpRendBuffer ); @@ -4442,21 +4366,16 @@ static ivas_error renderIsmToBinauralRoom( NULL, ismInput->base.ctx.pHeadRotData, &ismInput->currentPos, -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - ismInput->reverb, -#endif + ismInput->hReverb, outAudio.config.numSamplesPerChannel, tmpRendBuffer ) ) != IVAS_ERR_OK ) { return error; } -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND accumulate2dArrayToBuffer( tmpRendBuffer, &outAudio ); -#endif } else { -#endif if ( headRotData->headRotEnabled ) { @@ -4528,43 +4447,18 @@ static ivas_error renderIsmToBinauralRoom( renderBufferChannelLerp( ismInput->base.inputBuffer, 0, currentPanGains, previousPanGains, tmpMcBuffer ); -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND copyBufferTo2dArray( tmpMcBuffer, tmpRendBuffer ); -#else - copyBufferTo2dArray( tmpMcBuffer, tmpCrendBuffer ); -#endif - - if ( ( error = ivas_rend_crendProcess( -#ifdef FIX_197_CREND_INTERFACE - ismInput->crendWrapper, -#else - &ismInput->crendWrapper, -#endif - AUDIO_CONFIG_7_1_4, AUDIO_CONFIG_BINAURAL_ROOM, -#ifdef FIX_197_CREND_INTERFACE - NULL, NULL, NULL, NULL, -#endif -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - tmpRendBuffer, -#else - tmpCrendBuffer, -#endif - *ismInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK ) + 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 ) { return error; } -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND accumulate2dArrayToBuffer( tmpRendBuffer, &outAudio ); -#else - accumulate2dArrayToBuffer( tmpCrendBuffer, &outAudio ); -#endif free( tmpMcBuffer.data ); -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND } -#endif pop_wmops(); return IVAS_ERR_OK; @@ -4643,6 +4537,7 @@ static ivas_error renderIsmToSba( { return error; } + if ( ( error = getAmbisonicsOrder( outConfig, &ambiOrderOut ) ) != IVAS_ERR_OK ) { return error; @@ -4697,7 +4592,6 @@ static ivas_error renderInputIsm( /* Apply input gain to new audio */ v_multc( inAudio.data, ismInput->base.gain, inAudio.data, inAudio.config.numSamplesPerChannel * inAudio.config.numChannels ); - switch ( getAudioConfigType( outConfig ) ) { case IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED: @@ -4821,21 +4715,12 @@ static ivas_error renderMcToBinaural( headRotEnabled = mcInput->base.ctx.pHeadRotData->headRotEnabled; inConfig = mcInput->base.inConfig; - if ( ( inConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) || - ( headRotEnabled && ( inConfig == IVAS_REND_AUDIO_CONFIG_5_1 || inConfig == IVAS_REND_AUDIO_CONFIG_7_1 ) ) ) + if ( ( inConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) || ( headRotEnabled && ( inConfig == IVAS_REND_AUDIO_CONFIG_5_1 || inConfig == IVAS_REND_AUDIO_CONFIG_7_1 ) ) ) { copyBufferTo2dArray( mcInput->base.inputBuffer, tmpRendBuffer ); - if ( ( error = ivas_td_binaural_renderer_ext( &mcInput->tdRendWrapper, - mcInput->base.inConfig, - &mcInput->customLsInput, - mcInput->base.ctx.pHeadRotData, - NULL, -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - mcInput->reverb, -#endif - mcInput->base.inputBuffer.config.numSamplesPerChannel, - tmpRendBuffer ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_td_binaural_renderer_ext( &mcInput->tdRendWrapper, mcInput->base.inConfig, &mcInput->customLsInput, mcInput->base.ctx.pHeadRotData, NULL, + mcInput->hReverb, mcInput->base.inputBuffer.config.numSamplesPerChannel, tmpRendBuffer ) ) != IVAS_ERR_OK ) { return error; } @@ -4849,13 +4734,8 @@ static ivas_error renderMcToBinaural( tmpRotBuffer.data = malloc( tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels * sizeof( float ) ); set_zero( tmpRotBuffer.data, tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels ); - if ( ( error = rotateFrameMc( mcInput->base.inputBuffer, - mcInput->base.inConfig, - mcInput->customLsInput, - mcInput->base.ctx.pHeadRotData, - mcInput->rot_gains_prev, - mcInput->efapInWrapper.hEfap, - tmpRotBuffer ) ) != IVAS_ERR_OK ) + if ( ( error = rotateFrameMc( mcInput->base.inputBuffer, mcInput->base.inConfig, mcInput->customLsInput, mcInput->base.ctx.pHeadRotData, + mcInput->rot_gains_prev, mcInput->efapInWrapper.hEfap, tmpRotBuffer ) ) != IVAS_ERR_OK ) { return error; } @@ -4869,16 +4749,8 @@ static ivas_error renderMcToBinaural( } /* call CREND */ - if ( ( error = ivas_rend_crendProcess( -#ifdef FIX_197_CREND_INTERFACE - mcInput->crendWrapper, getIvasAudioConfigFromRendAudioConfig( mcInput->base.inConfig ), getIvasAudioConfigFromRendAudioConfig( outConfig ), - NULL, NULL, NULL, NULL, -#else - &mcInput->crendWrapper, - rendAudioConfigToIvasAudioConfig( mcInput->base.inConfig ), - rendAudioConfigToIvasAudioConfig( outConfig ), -#endif - tmpRendBuffer, *mcInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK ) + 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 ) { return error; } @@ -4902,105 +4774,59 @@ static ivas_error renderMcToBinauralRoom( const IVAS_REND_AudioConfig outConfig, IVAS_REND_AudioBuffer outAudio ) { -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND int8_t headRotEnabled; float tmpRendBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k]; IVAS_REND_AudioConfig inConfig; -#else - float tmpCrendBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k]; -#endif ivas_error error; IVAS_REND_AudioBuffer tmpRotBuffer; push_wmops( "renderMcToBinauralRoom" ); -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND headRotEnabled = mcInput->base.ctx.pHeadRotData->headRotEnabled; inConfig = mcInput->base.inConfig; - if ( ( mcInput->reverb != NULL && mcInput->reverb->pConfig.roomAcoustics.use_brir == 0 && mcInput->reverb->pConfig.roomAcoustics.late_reverb_on == 1 ) && ( ( inConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) || ( headRotEnabled && ( inConfig == IVAS_REND_AUDIO_CONFIG_5_1 || inConfig == IVAS_REND_AUDIO_CONFIG_7_1 ) ) ) ) + if ( ( mcInput->hReverb != NULL && mcInput->hReverb->pConfig.roomAcoustics.use_brir == 0 && mcInput->hReverb->pConfig.roomAcoustics.late_reverb_on == 1 ) && ( ( inConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) || ( headRotEnabled && ( inConfig == IVAS_REND_AUDIO_CONFIG_5_1 || inConfig == IVAS_REND_AUDIO_CONFIG_7_1 ) ) ) ) { copyBufferTo2dArray( mcInput->base.inputBuffer, tmpRendBuffer ); - if ( ( error = ivas_td_binaural_renderer_ext( &mcInput->tdRendWrapper, - mcInput->base.inConfig, - &mcInput->customLsInput, - mcInput->base.ctx.pHeadRotData, - NULL, - mcInput->reverb, - mcInput->base.inputBuffer.config.numSamplesPerChannel, - tmpRendBuffer ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_td_binaural_renderer_ext( &mcInput->tdRendWrapper, mcInput->base.inConfig, &mcInput->customLsInput, mcInput->base.ctx.pHeadRotData, + NULL, mcInput->hReverb, mcInput->base.inputBuffer.config.numSamplesPerChannel, tmpRendBuffer ) ) != IVAS_ERR_OK ) { return error; } } else { - /* apply rotation */ if ( headRotEnabled ) -#else - /* apply rotation */ - if ( mcInput->base.ctx.pHeadRotData->headRotEnabled ) -#endif { tmpRotBuffer = mcInput->base.inputBuffer; tmpRotBuffer.data = malloc( tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels * sizeof( float ) ); set_zero( tmpRotBuffer.data, tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels ); - if ( ( error = rotateFrameMc( mcInput->base.inputBuffer, - mcInput->base.inConfig, - mcInput->customLsInput, - mcInput->base.ctx.pHeadRotData, - mcInput->rot_gains_prev, - mcInput->efapInWrapper.hEfap, - tmpRotBuffer ) ) != IVAS_ERR_OK ) + if ( ( error = rotateFrameMc( mcInput->base.inputBuffer, mcInput->base.inConfig, mcInput->customLsInput, mcInput->base.ctx.pHeadRotData, + mcInput->rot_gains_prev, mcInput->efapInWrapper.hEfap, tmpRotBuffer ) ) != IVAS_ERR_OK ) { return error; } -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND copyBufferTo2dArray( tmpRotBuffer, tmpRendBuffer ); -#else - copyBufferTo2dArray( tmpRotBuffer, tmpCrendBuffer ); -#endif free( tmpRotBuffer.data ); } else { -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND copyBufferTo2dArray( mcInput->base.inputBuffer, tmpRendBuffer ); -#else - copyBufferTo2dArray( mcInput->base.inputBuffer, tmpCrendBuffer ); -#endif } /* call CREND */ - if ( ( error = ivas_rend_crendProcess( -#ifdef FIX_197_CREND_INTERFACE - mcInput->crendWrapper, getIvasAudioConfigFromRendAudioConfig( mcInput->base.inConfig ), getIvasAudioConfigFromRendAudioConfig( outConfig ), - NULL, NULL, NULL, NULL, -#else - &mcInput->crendWrapper, - rendAudioConfigToIvasAudioConfig( mcInput->base.inConfig ), - rendAudioConfigToIvasAudioConfig( outConfig ), -#endif -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND - tmpRendBuffer, -#else - tmpCrendBuffer, -#endif - *mcInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK ) + 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 ) { return error; } -#ifdef FIX_330_ENABLE_TD_RENDERER_REVERB_REND } - accumulate2dArrayToBuffer( tmpRendBuffer, &outAudio ); -#else - accumulate2dArrayToBuffer( tmpCrendBuffer, &outAudio ); -#endif + accumulate2dArrayToBuffer( tmpRendBuffer, &outAudio ); /* TODO tmu : needs delay compensation */ if ( ( error = renderLfeToBinaural( mcInput, outAudio ) ) != IVAS_ERR_OK ) @@ -5054,7 +4880,7 @@ static ivas_error renderMcCustomLsToBinauralRoom( return error; } - tmpMcBuffer.config.numChannels = (int16_t) tmp; + tmpMcBuffer.config.numChannels = tmp; tmpMcBuffer.data = malloc( tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels * sizeof( float ) ); set_zero( tmpMcBuffer.data, tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels ); @@ -5066,15 +4892,8 @@ static ivas_error renderMcCustomLsToBinauralRoom( copyBufferTo2dArray( tmpMcBuffer, tmpCrendBuffer ); /* call CREND */ - if ( ( error = ivas_rend_crendProcess( -#ifdef FIX_197_CREND_INTERFACE - mcInput->crendWrapper, AUDIO_CONFIG_7_1_4, getIvasAudioConfigFromRendAudioConfig( outConfig ), NULL, NULL, NULL, NULL, -#else - &mcInput->crendWrapper, - AUDIO_CONFIG_7_1_4, - rendAudioConfigToIvasAudioConfig( outConfig ), -#endif - tmpCrendBuffer, *mcInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK ) + 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 ) { return error; } @@ -5302,15 +5121,8 @@ static ivas_error renderSbaToBinaural( } /* call CREND */ - if ( ( error = ivas_rend_crendProcess( -#ifdef FIX_197_CREND_INTERFACE - sbaInput->crendWrapper, getIvasAudioConfigFromRendAudioConfig( sbaInput->base.inConfig ), getIvasAudioConfigFromRendAudioConfig( outConfig ), NULL, NULL, NULL, NULL, -#else - &sbaInput->crendWrapper, - rendAudioConfigToIvasAudioConfig( sbaInput->base.inConfig ), - rendAudioConfigToIvasAudioConfig( outConfig ), -#endif - tmpCrendBuffer, *sbaInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK ) + 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 ) { return error; } @@ -5365,7 +5177,7 @@ static ivas_error renderSbaToBinauralRoom( return error; } - tmpMcBuffer.config.numChannels = (int16_t) tmp; + tmpMcBuffer.config.numChannels = tmp; tmpMcBuffer.data = malloc( tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels * sizeof( float ) ); set_zero( tmpMcBuffer.data, tmpMcBuffer.config.numChannels * tmpMcBuffer.config.numSamplesPerChannel ); @@ -5378,16 +5190,8 @@ static ivas_error renderSbaToBinauralRoom( copyBufferTo2dArray( tmpMcBuffer, tmpCrendBuffer ); /* call CREND */ - if ( ( error = ivas_rend_crendProcess( -#ifdef FIX_197_CREND_INTERFACE - sbaInput->crendWrapper, AUDIO_CONFIG_7_1_4, getIvasAudioConfigFromRendAudioConfig( outConfig ), - NULL, NULL, NULL, NULL, -#else - &sbaInput->crendWrapper, - AUDIO_CONFIG_7_1_4, - rendAudioConfigToIvasAudioConfig( outConfig ), -#endif - tmpCrendBuffer, *sbaInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK ) + 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 ) { return error; } @@ -5488,34 +5292,39 @@ static void copyMasaMetadataToDiracRenderer( DIRAC_DEC_HANDLE hDirAC ) { int16_t band, sf, bin; + int16_t meta_write_index; hDirAC->numSimultaneousDirections = meta->descriptive_meta.numberOfDirections + 1; for ( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ ) { + meta_write_index = ( hDirAC->dirac_bs_md_write_idx + sf ) % hDirAC->dirac_md_buffer_length; + for ( band = 0; band < MASA_MAXIMUM_CODING_SUBBANDS; band++ ) { for ( bin = MASA_band_grouping_24[band]; bin < MASA_band_grouping_24[band + 1]; bin++ ) { - hDirAC->azimuth[sf][bin] = (int16_t) meta->directional_meta[0].azimuth[sf][band]; - hDirAC->elevation[sf][bin] = (int16_t) meta->directional_meta[0].elevation[sf][band]; - hDirAC->energy_ratio1[sf][bin] = meta->directional_meta[0].energy_ratio[sf][band]; - hDirAC->diffuseness_vector[sf][bin] = 1.0f - meta->directional_meta[0].energy_ratio[sf][band]; - hDirAC->spreadCoherence[sf][bin] = meta->directional_meta[0].spread_coherence[sf][band]; - hDirAC->surroundingCoherence[sf][bin] = meta->common_meta.surround_coherence[sf][band]; + hDirAC->azimuth[meta_write_index][bin] = (int16_t) meta->directional_meta[0].azimuth[sf][band]; + hDirAC->elevation[meta_write_index][bin] = (int16_t) meta->directional_meta[0].elevation[sf][band]; + hDirAC->energy_ratio1[meta_write_index][bin] = meta->directional_meta[0].energy_ratio[sf][band]; + hDirAC->diffuseness_vector[meta_write_index][bin] = 1.0f - meta->directional_meta[0].energy_ratio[sf][band]; + hDirAC->spreadCoherence[meta_write_index][bin] = meta->directional_meta[0].spread_coherence[sf][band]; + hDirAC->surroundingCoherence[meta_write_index][bin] = meta->common_meta.surround_coherence[sf][band]; if ( hDirAC->numSimultaneousDirections == 2 ) { - hDirAC->azimuth2[sf][bin] = (int16_t) meta->directional_meta[1].azimuth[sf][band]; - hDirAC->elevation2[sf][bin] = (int16_t) meta->directional_meta[1].elevation[sf][band]; - hDirAC->energy_ratio2[sf][bin] = meta->directional_meta[1].energy_ratio[sf][band]; - hDirAC->diffuseness_vector[sf][bin] -= meta->directional_meta[1].energy_ratio[sf][band]; - hDirAC->spreadCoherence2[sf][bin] = meta->directional_meta[1].spread_coherence[sf][band]; + hDirAC->azimuth2[meta_write_index][bin] = (int16_t) meta->directional_meta[1].azimuth[sf][band]; + hDirAC->elevation2[meta_write_index][bin] = (int16_t) meta->directional_meta[1].elevation[sf][band]; + hDirAC->energy_ratio2[meta_write_index][bin] = meta->directional_meta[1].energy_ratio[sf][band]; + hDirAC->diffuseness_vector[meta_write_index][bin] -= meta->directional_meta[1].energy_ratio[sf][band]; + hDirAC->spreadCoherence2[meta_write_index][bin] = meta->directional_meta[1].spread_coherence[sf][band]; } } } } + hDirAC->dirac_bs_md_write_idx = ( hDirAC->dirac_bs_md_write_idx + MAX_PARAM_SPATIAL_SUBFRAMES ) % hDirAC->dirac_md_buffer_length; + return; } @@ -5635,7 +5444,7 @@ static ivas_error renderActiveInputsMasa( IVAS_REND_HANDLE hIvasRend, IVAS_REND_AudioBuffer outAudio ) { - int32_t i; + int16_t i; input_masa *pCurrentInput; ivas_error error; @@ -5671,10 +5480,7 @@ ivas_error IVAS_REND_GetSamples( ivas_error error; int16_t numOutChannels; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL || outAudio.data == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -5752,10 +5558,7 @@ void IVAS_REND_Close( uint16_t i; IVAS_REND_HANDLE hIvasRend; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( phIvasRend == NULL || *phIvasRend == NULL ) { return; @@ -5790,6 +5593,8 @@ void IVAS_REND_Close( ivas_limiter_close( &hIvasRend->hLimiter ); + closeHeadRotation( hIvasRend ); + free( hIvasRend ); *phIvasRend = NULL; diff --git a/lib_rend/lib_rend.h b/lib_rend/lib_rend.h index 6db5fd91dc12c7a4cecb82d801a1f5c50ba6adb1..1e9d41fd38c1c49044b537b6d5826ab3f520acb3 100644 --- a/lib_rend/lib_rend.h +++ b/lib_rend/lib_rend.h @@ -228,8 +228,8 @@ ivas_error IVAS_REND_FeedInputMasaMetadata( ); ivas_error IVAS_REND_InitConfig( - IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ - const bool rendererConfigEnabled /* i : flag indicating if a renderer configuration file was supplied */ + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_REND_AudioConfig outAudioConfig /* i : output audioConfig */ ); int16_t IVAS_REND_GetRenderConfig( @@ -244,7 +244,34 @@ 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 positions for next rendering call */ + const IVAS_QUATERNION headRot[RENDERER_HEAD_POSITIONS_PER_FRAME], /* i : head orientations for next rendering call */ + const IVAS_VECTOR3 Pos[RENDERER_HEAD_POSITIONS_PER_FRAME] /* i : listener positions for next rendering call */ +); + +ivas_error IVAS_REND_SetOrientationTrackingMode( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const uint8_t otrMode /* i : Orientation tracking mode */ +); + +ivas_error IVAS_REND_SetReferenceRotation( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_QUATERNION refRot /* i : Reference rotation */ +); + +ivas_error IVAS_REND_GetMainOrientation( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + IVAS_QUATERNION *pOrientation /* i/o: Quaternion pointer for main orientation */ +); + +ivas_error IVAS_REND_GetTrackedRotation( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + IVAS_QUATERNION *pRotation /* i/o: Quaternion pointer for processed rotation */ +); + +ivas_error IVAS_REND_SetReferenceVector( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_VECTOR3 listenerPos, /* i : Listener position */ + const IVAS_VECTOR3 refPos /* i : Reference position */ ); ivas_error IVAS_REND_GetSamples( diff --git a/lib_util/audio_file_reader.c b/lib_util/audio_file_reader.c index c7feefd7b7d58ae04de932265d9d1e6c18104094..4f6bd0c34d13fd62439775d31933f9d67a4197f4 100644 --- a/lib_util/audio_file_reader.c +++ b/lib_util/audio_file_reader.c @@ -40,9 +40,7 @@ struct AudioFileReader { FILE *rawFile; WAVEFILEIN *wavFile; -#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS uint32_t samplingRate; -#endif int16_t numChannels; }; @@ -57,26 +55,12 @@ static int8_t AudioFileReader_open_raw( static int8_t AudioFileReader_open_wav( AudioFileReader *self, - const char *fileName -#ifndef FIX_94_VERIFY_WAV_NUM_CHANNELS - , - int32_t *sampleRate -#endif -) + const char *fileName ) { -#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS uint32_t samplesInFile; -#else - uint32_t sampleRate_, samplesInFile; -#endif int16_t bps; -#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS self->wavFile = OpenWav( fileName, &self->samplingRate, &self->numChannels, &samplesInFile, &bps ); -#else - self->wavFile = OpenWav( fileName, &sampleRate_, &self->numChannels, &samplesInFile, &bps ); - *sampleRate = sampleRate_; -#endif if ( !self->wavFile ) { @@ -92,10 +76,6 @@ static int8_t AudioFileReader_open_wav( ivas_error AudioFileReader_open( AudioFileReader **audioReader, /* o : AudioFileReader handle */ const char *fileName /* i : path to wav/raw pcm file */ -#ifndef FIX_94_VERIFY_WAV_NUM_CHANNELS - , - int32_t *sampleRate /* o : sample rate of wav file, unused with pcm */ -#endif ) { AudioFileReader *self; @@ -118,19 +98,12 @@ ivas_error AudioFileReader_open( return IVAS_ERR_FAILED_FILE_OPEN; } self = calloc( sizeof( AudioFileReader ), 1 ); -#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS self->samplingRate = 0; -#endif self->numChannels = 0; if ( fileNameLen > wavSuffixLen && strncmp( fileName + fileNameLen - wavSuffixLen, wavSuffix, wavSuffixLen ) == 0 ) { - retCode = AudioFileReader_open_wav( self, fileName -#ifndef FIX_94_VERIFY_WAV_NUM_CHANNELS - , - sampleRate -#endif - ); + retCode = AudioFileReader_open_wav( self, fileName ); } else { @@ -206,7 +179,6 @@ ivas_error AudioFileReader_read( return error; } -#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS ivas_error AudioFileReader_getSamplingRate( AudioFileReader *self, int32_t *samplingRate ) @@ -257,17 +229,3 @@ ivas_error AudioFileReader_getNumChannels( return IVAS_ERR_OK; } -#else -/*! r: number of channels of the opened file */ -int16_t AudioFileReader_getNumChannels( - AudioFileReader *self /* i/o: AudioFileReader handle */ -) -{ - if ( self != NULL ) - { - return self->numChannels; - } - - return 0; -} -#endif diff --git a/lib_util/audio_file_reader.h b/lib_util/audio_file_reader.h index a944c85dc1a44279efa3596c3219943c70ae78a6..0fd4da5ac76c25285d3b49d67166ce651a96eeb8 100644 --- a/lib_util/audio_file_reader.h +++ b/lib_util/audio_file_reader.h @@ -43,9 +43,6 @@ typedef struct AudioFileReader AudioFileReader; ivas_error AudioFileReader_open( AudioFileReader **audioReader, /* o : AudioFileReader handle */ const char *fileName /* i : path to wav/raw pcm file */ -#ifndef FIX_94_VERIFY_WAV_NUM_CHANNELS - ,int32_t *sampleRate /* o : sample rate of wav file, unused with pcm */ -#endif ); ivas_error AudioFileReader_read( @@ -55,7 +52,6 @@ ivas_error AudioFileReader_read( int16_t *numSamplesRead /* i : number of samples actualy read */ ); -#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS /*! r: ivas error - in particular, IVAS_ERR_SAMPLING_RATE_UNKNOWN if the opened file has no sampling rate metadata */ ivas_error AudioFileReader_getSamplingRate( AudioFileReader *self, /* i/o: AudioFileReader handle */ @@ -67,12 +63,6 @@ ivas_error AudioFileReader_getNumChannels( AudioFileReader *self, /* i/o: AudioFileReader handle */ int16_t * numChannels /* o : number fo channels in opened audio file */ ); -#else -/*! r: number of channels of the opened file */ -int16_t AudioFileReader_getNumChannels( - AudioFileReader *self /* i/o: AudioFileReader handle */ -); -#endif void AudioFileReader_close( AudioFileReader **selfPtr /* i/o: pointer to AudioFileReader handle */ diff --git a/lib_util/audio_file_writer.c b/lib_util/audio_file_writer.c index d6cbb1810ed4729e1f749e4ec505435f50cc0e3c..81084dbd95b686d52477327b948ada136225f42f 100644 --- a/lib_util/audio_file_writer.c +++ b/lib_util/audio_file_writer.c @@ -98,7 +98,7 @@ ivas_error AudioFileWriter_open( int8_t retCode; - if ( fileNameLen > wavSuffixLen && strncmp( fileName + fileNameLen - wavSuffixLen, wavSuffix, wavSuffixLen ) == 0 ) + if ( ( fileNameLen > wavSuffixLen ) && ( strncmp( fileName + fileNameLen - wavSuffixLen, wavSuffix, wavSuffixLen ) == 0 ) ) { retCode = AudioFileWriter_open_wav( self, fileName, sampleRate, numChannels ); } diff --git a/lib_util/head_rotation_file_reader.c b/lib_util/head_rotation_file_reader.c index 533c14a6515edce05db918749c2d79749812920b..0283c292334daec7e88a2ffa6f54eb790f455257 100644 --- a/lib_util/head_rotation_file_reader.c +++ b/lib_util/head_rotation_file_reader.c @@ -93,33 +93,41 @@ ivas_error HeadRotationFileReader_open( ivas_error HeadRotationFileReading( HeadRotFileReader *headRotReader, /* i/o: HeadRotFileReader handle */ - IVAS_QUATERNION *Quaternions, /* o : head-tracking data */ - const int32_t frame_dec /* i : decoded frame number */ + IVAS_QUATERNION *pQuaternion, /* o : head-tracking data */ + IVAS_VECTOR3 *pPos /* o : listener position */ ) { - uint16_t i; float w, x, y, z; + float posx, posy, posz; + int32_t read_values; - for ( i = 0; i < IVAS_MAX_PARAM_SPATIAL_SUBFRAMES; i++ ) + posx = 0.0f; + posy = 0.0f; + posz = 0.0f; + + read_values = fscanf( headRotReader->trajFile, "%f,%f,%f,%f,%f,%f,%f", &w, &x, &y, &z, &posx, &posy, &posz ); + if ( ( read_values != 4 ) && ( read_values != 7 ) ) /* Allow either orientation (4) or orientation+position (4+3) */ { - if ( 4 != fscanf( headRotReader->trajFile, "%f,%f,%f,%f", &w, &x, &y, &z ) ) + if ( feof( headRotReader->trajFile ) ) { - if ( feof( headRotReader->trajFile ) ) - { - rewind( headRotReader->trajFile ); - headRotReader->fileRewind = true; - return HeadRotationFileReading( headRotReader, Quaternions, frame_dec ); - } - return IVAS_ERR_FAILED_FILE_PARSE; + rewind( headRotReader->trajFile ); + headRotReader->fileRewind = true; + return HeadRotationFileReading( headRotReader, pQuaternion, pPos ); } + return IVAS_ERR_FAILED_FILE_PARSE; + } + ( headRotReader->frameCounter )++; - ( headRotReader->frameCounter )++; - - Quaternions[i].w = w; - Quaternions[i].x = x; - Quaternions[i].y = y; - Quaternions[i].z = z; + pQuaternion->w = w; + pQuaternion->x = x; + pQuaternion->y = y; + pQuaternion->z = z; + if ( pPos != NULL ) + { + pPos->x = posx; + pPos->y = posy; + pPos->z = posz; } return IVAS_ERR_OK; diff --git a/lib_util/head_rotation_file_reader.h b/lib_util/head_rotation_file_reader.h index e70281401af40b5f00e246f40989be91ecaa5d9d..52b97ae1c3db0417fb308b47b484bb0b11feea61 100644 --- a/lib_util/head_rotation_file_reader.h +++ b/lib_util/head_rotation_file_reader.h @@ -59,8 +59,8 @@ ivas_error HeadRotationFileReader_open( ivas_error HeadRotationFileReading( HeadRotFileReader *headRotReader, /* i/o: HeadRotFileReader handle */ - IVAS_QUATERNION *Quaternions, /* o : head-tracking data */ - const int32_t frame_dec /* i : decoded frame number */ + IVAS_QUATERNION *pQuaternion, /* o : head-tracking data */ + IVAS_VECTOR3 *pPos /* o : listener position */ ); /*-----------------------------------------------------------------------* diff --git a/lib_util/ism_file_reader.c b/lib_util/ism_file_reader.c index 77912f5c586251110a57d708b529499f483aecd9..fa449512e403dc3e49634206a26b2d15e894b96f 100644 --- a/lib_util/ism_file_reader.c +++ b/lib_util/ism_file_reader.c @@ -37,7 +37,8 @@ #define META_LINE_LENGTH 200 /* max number of characters at one line of metadata input/output file */ -#define NUM_ISM_METADATA_PER_LINE 5 /* Number of ISM metadata per line in a metadata file */ +#define NUM_ISM_METADATA_PER_LINE 7 /* Number of ISM metadata per line in a metadata file */ +#define NUM_MIN_ISM_METADATA 2 /* Minimum number of metadata parameters (azimuth and elevation) */ struct IsmFileReader @@ -54,7 +55,7 @@ struct IsmFileReader *---------------------------------------------------------------------*/ IsmFileReader *IsmFileReader_open( - const char *filePath /* i : path to ism metadata file */ + const char *filePath /* i : path to ISM metadata file */ ) { IsmFileReader *self; @@ -90,15 +91,22 @@ IsmFileReader *IsmFileReader_open( /*! r: error code */ ivas_error IsmFileReader_readNextFrame( IsmFileReader *self, /* i/o: IsmFileReader handle */ - IVAS_ISM_METADATA *ismMetadata /* o ISM : metadata read from the opened file */ + IVAS_ISM_METADATA *ismMetadata /* o : ISM metadata read from the opened file */ ) { char char_buff[META_LINE_LENGTH]; float meta_prm[NUM_ISM_METADATA_PER_LINE]; + const float meta_prm_default[NUM_ISM_METADATA_PER_LINE] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f }; char *char_ptr; int16_t i; FILE *file; + /* Set default metadata parameters */ + for ( i = 0; i < NUM_ISM_METADATA_PER_LINE; i++ ) + { + meta_prm[i] = meta_prm_default[i]; + } + if ( ismMetadata == NULL || self->file == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -127,24 +135,21 @@ ivas_error IsmFileReader_readNextFrame( meta_prm[i++] = (float) atof( char_ptr ); } - - if ( i != NUM_ISM_METADATA_PER_LINE ) + /* Verify the number of metadata values. */ + if ( i < NUM_MIN_ISM_METADATA || char_ptr != NULL ) { - /* Not enough values provided in one line */ + /* Invalid number of metadata parameters (2-7 supported) */ return IVAS_ERR_ISM_FILE_READER_INVALID_METADATA_FORMAT; } - if ( char_ptr != NULL ) - { - /* Too many values provided in one line */ - return IVAS_ERR_ISM_FILE_READER_INVALID_METADATA_FORMAT; - } ismMetadata->azimuth = meta_prm[0]; ismMetadata->elevation = meta_prm[1]; ismMetadata->radius = meta_prm[2]; ismMetadata->spread = meta_prm[3]; ismMetadata->gainFactor = meta_prm[4]; + ismMetadata->yaw = meta_prm[5]; + ismMetadata->pitch = meta_prm[6]; /* verify whether the read metadata values are in an expected range */ if ( ismMetadata->azimuth > 180 || ismMetadata->azimuth < -180 ) @@ -157,7 +162,7 @@ ivas_error IsmFileReader_readNextFrame( return IVAS_ERR_ISM_INVALID_METADATA_VALUE; } - if ( ismMetadata->radius < 0 ) // Ivas_fmToDo: to be reviewed + if ( ismMetadata->radius < 0 ) /* Negative radius not supported. Max quantized radius = (2^ISM_RADIUS_NBITS-1)*0.25 = 15.75 */ { return IVAS_ERR_ISM_INVALID_METADATA_VALUE; } @@ -171,6 +176,15 @@ ivas_error IsmFileReader_readNextFrame( { return IVAS_ERR_ISM_INVALID_METADATA_VALUE; } + if ( ismMetadata->yaw > 180 || ismMetadata->yaw < -180 ) + { + return IVAS_ERR_ISM_INVALID_METADATA_VALUE; + } + + if ( ismMetadata->pitch > 90 || ismMetadata->pitch < -90 ) + { + return IVAS_ERR_ISM_INVALID_METADATA_VALUE; + } return IVAS_ERR_OK; } diff --git a/lib_util/ism_file_writer.c b/lib_util/ism_file_writer.c index c4dffe38b03462337e460558d84449f53977aebc..b29386282b016342c147f0c60775a8b9eb314ba4 100644 --- a/lib_util/ism_file_writer.c +++ b/lib_util/ism_file_writer.c @@ -35,8 +35,7 @@ #include -#define META_LINE_LENGTH 200 /* max number of characters at one line of metadata input/output file */ -#define NUM_ISM_METADATA_PER_LINE 5 /* Number of ISM metadata per line in a metadata file */ +#define META_LINE_LENGTH 200 /* max number of characters at one line of metadata input/output file */ struct IsmFileWriter @@ -54,7 +53,7 @@ struct IsmFileWriter /*! r: error code */ ivas_error IsmFileWriter_open( const char *filePathWav, /* i : path to output file */ - const int16_t obj_num, /* i : ISm number */ + const int16_t obj_num, /* i : number of ISM channels */ IsmFileWriter **ismWriter /* o : IsmFileWriter handle */ ) { @@ -115,7 +114,10 @@ ivas_error IsmFileWriter_writeFrame( file = ismWriter->file; /* IVAS_fmToDo: work in progress; currently position_azimuth, position_elevation, position_radius, spread, gain_factor */ - snprintf( char_buff, sizeof( char_buff ), "%+07.2f,%+06.2f,%05.2f,%06.2f,%04.2f\n", ismMetadata.azimuth, ismMetadata.elevation, ismMetadata.radius, ismMetadata.spread, ismMetadata.gainFactor ); +#ifdef FIX_293_EXT_RENDERER_CLI + sprintf( char_buff, "%+07.2f,%+06.2f,%05.2f,%06.2f,%04.2f,%+07.2f,%+06.2f\n", ismMetadata.azimuth, ismMetadata.elevation, ismMetadata.radius, ismMetadata.spread, ismMetadata.gainFactor, ismMetadata.yaw, ismMetadata.pitch ); +#endif + snprintf( char_buff, sizeof( char_buff ), "%+07.2f,%+06.2f,%05.2f,%06.2f,%04.2f,%+07.2f,%+06.2f\n", ismMetadata.azimuth, ismMetadata.elevation, ismMetadata.radius, ismMetadata.spread, ismMetadata.gainFactor, ismMetadata.yaw, ismMetadata.pitch ); if ( file ) { diff --git a/lib_util/ism_file_writer.h b/lib_util/ism_file_writer.h index 24b4c58bd4d89d805212ece1250546ed925d8c27..d9f731e87e56b8f0b333d725d813047320d82a39 100644 --- a/lib_util/ism_file_writer.h +++ b/lib_util/ism_file_writer.h @@ -43,7 +43,7 @@ typedef struct IsmFileWriter IsmFileWriter; /*! r: error code */ ivas_error IsmFileWriter_open( const char *filePathWav, /* i : path to output file */ - const int16_t obj_num, /* i : ISm number */ + const int16_t obj_num, /* i : number of ISM channels */ IsmFileWriter **ismWriter /* o : IsmFileReader handle */ ); diff --git a/lib_util/ls_custom_file_reader.c b/lib_util/ls_custom_file_reader.c index f73022e8499fdbb22eb801221444a06aa8af41f6..9b39fab486bd99ab3259fc5dd6770351792e1e6e 100644 --- a/lib_util/ls_custom_file_reader.c +++ b/lib_util/ls_custom_file_reader.c @@ -52,7 +52,7 @@ struct LsCustomFileReader ivas_error CustomLsReader_open( const char *LsFilePath, /* i : LS custom layout file name */ - LsCustomFileReader **hLsCustomReader /* o : HeadRotFileReader handle */ + LsCustomFileReader **hLsCustomReader /* o : LsCustomFileReader handle */ ) { LsCustomFileReader *self; @@ -89,7 +89,7 @@ ivas_error CustomLsReader_open( *-----------------------------------------------------------------------*/ void CustomLsReader_close( - LsCustomFileReader **hLsCustomReader /* i/o: HeadRotFileReader handle */ + LsCustomFileReader **hLsCustomReader /* i/o: LsCustomFileReader handle */ ) { if ( hLsCustomReader == NULL || *hLsCustomReader == NULL ) @@ -228,7 +228,7 @@ static void CustomLoudspeakerLayout_print_info( *-------------------------------------------------------------------------*/ LS_CUSTOM_FILEREADER_ERROR CustomLsFileReading( - LsCustomFileReader *hLsCustomReader, /* i/o: HeadRotFileReader handle */ + LsCustomFileReader *hLsCustomReader, /* i/o: LsCustomFileReader handle */ IVAS_CUSTOM_LS_DATA *hLsCustomData /* o : Custom loudspeaker setup data */ ) { diff --git a/lib_util/ls_custom_file_reader.h b/lib_util/ls_custom_file_reader.h index 70c854aa9cff8b26f5947d0b70ce6a7eabee2431..df7fe6bde7a929cb7dff5ae4a4e17d34ab0b58eb 100644 --- a/lib_util/ls_custom_file_reader.h +++ b/lib_util/ls_custom_file_reader.h @@ -64,7 +64,7 @@ typedef enum _LS_CUSTOM_FILEREADER_ERROR ivas_error CustomLsReader_open( const char *LsFilePath, /* i : LS custom layout file name */ - LsCustomFileReader **hLsCustomReader /* o : HeadRotFileReader handle */ + LsCustomFileReader **hLsCustomReader /* o : LsCustomFileReader handle */ ); /*-----------------------------------------------------------------------* @@ -74,7 +74,7 @@ ivas_error CustomLsReader_open( *-----------------------------------------------------------------------*/ void CustomLsReader_close( - LsCustomFileReader **hLsCustomReader /* i/o: HeadRotFileReader handle */ + LsCustomFileReader **hLsCustomReader /* i/o: LsCustomFileReader handle */ ); /*-------------------------------------------------------------------------* @@ -84,7 +84,7 @@ void CustomLsReader_close( *-------------------------------------------------------------------------*/ LS_CUSTOM_FILEREADER_ERROR CustomLsFileReading( - LsCustomFileReader *hLsCustomReader, /* i/o: HeadRotFileReader handle */ + LsCustomFileReader *hLsCustomReader, /* i/o: LsCustomFileReader handle */ IVAS_CUSTOM_LS_DATA *hLsCustomData /* o : Custom loudspeaker setup data */ ); diff --git a/lib_util/masa_file_reader.c b/lib_util/masa_file_reader.c index 19f12182f3ab11246cbe74ff5ddf2eec45a0ca89..95da7818e703a19eb0c03ff85aba45d69c8d4b06 100644 --- a/lib_util/masa_file_reader.c +++ b/lib_util/masa_file_reader.c @@ -100,13 +100,16 @@ IVAS_MASA_METADATA_HANDLE MasaFileReader_getMetadataHandle( * * 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 */ - float *theta, /* o : Elevation */ - float *phi /* o : Azimuth */ -) +#ifndef HR_METADATA +static +#endif + 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; @@ -342,6 +345,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 */ 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/render_config_reader.c b/lib_util/render_config_reader.c index 9fe7f019ebb767c5dfe384ab94eaf142fb47fe4a..54f2d012ce7f06c567ba87d1e216e98680306845 100644 --- a/lib_util/render_config_reader.c +++ b/lib_util/render_config_reader.c @@ -522,6 +522,13 @@ ivas_error RenderConfigReader_read( errorHandler( pValue, ERROR_VALUE_INVALID ); } } + else if ( strcmp( item, "DIRECTIVITY" ) == 0 ) + { + if ( read_vector( pValue, 3, hRenderConfig->directivity ) ) + { + errorHandler( item, ERROR_VALUE_INVALID ); + } + } #ifdef DEBUGGING else { diff --git a/lib_util/vector3_pair_file_reader.c b/lib_util/vector3_pair_file_reader.c new file mode 100644 index 0000000000000000000000000000000000000000..9e03358b91c901e9c6f2875bb8f714cce00a86db --- /dev/null +++ b/lib_util/vector3_pair_file_reader.c @@ -0,0 +1,163 @@ +/****************************************************************************************************** + + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository. All Rights Reserved. + + This software is protected by copyright law and by international treaties. + The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository retain full ownership rights in their respective contributions in + the software. This notice grants no license of any kind, including but not limited to patent + license, nor is any license granted by implication, estoppel or otherwise. + + Contributors are required to enter into the IVAS codec Public Collaboration agreement before making + contributions. + + This software is provided "AS IS", without any express or implied warranties. The software is in the + development stage. It is intended exclusively for experts who have experience with such software and + solely for the purpose of inspection. All implied warranties of non-infringement, merchantability + and fitness for a particular purpose are hereby disclaimed and excluded. + + Any dispute, controversy or claim arising under or in relation to providing this software shall be + submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in + accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and + the United Nations Convention on Contracts on the International Sales of Goods. + +*******************************************************************************************************/ + +#include "vector3_pair_file_reader.h" +#include +#include +#include +#include +#include "prot.h" +#include "options.h" /* only included to get access to the feature-defines */ + + +struct Vector3PairFileReader +{ + FILE *trajFile; + char *file_path; +}; + +/*-----------------------------------------------------------------------* + * Vector3PairFileReader_open() + * + * Allocate and initialize reader + *-----------------------------------------------------------------------*/ + +ivas_error Vector3PairFileReader_open( + const char *trajFilePath, /* i : trajectory file name */ + Vector3PairFileReader **vector3PairReader /* o : Vector3PairFileReader handle */ +) +{ + Vector3PairFileReader *self; + FILE *trajFile; + + /* Open trajectory file */ + if ( strlen( trajFilePath ) < 1 ) + { + return IVAS_ERR_FAILED_FILE_OPEN; + } + + trajFile = fopen( trajFilePath, "r" ); + + if ( !trajFile ) + { + return IVAS_ERR_FAILED_FILE_OPEN; + } + + self = calloc( sizeof( Vector3PairFileReader ), 1 ); + self->trajFile = trajFile; + self->file_path = calloc( sizeof( char ), strlen( trajFilePath ) + 1 ); + strcpy( self->file_path, trajFilePath ); + + *vector3PairReader = self; + + return IVAS_ERR_OK; +} + + +/*-----------------------------------------------------------------------* + * Vector3PairFileReader_read() + * + * Read one line of values from the trajectory file + *-----------------------------------------------------------------------*/ + +ivas_error Vector3PairFileReader_read( + Vector3PairFileReader *vector3PairReader, /* i/o: Vector3PairFileReader handle */ + IVAS_VECTOR3 *pFirst, /* o : first x,y,z position in the line */ + IVAS_VECTOR3 *pSecond /* o : second x,y,z position in the line */ +) +{ + float x1, y1, z1, x2, y2, z2; + + if ( vector3PairReader == NULL || pFirst == NULL || pSecond == NULL ) + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + + if ( 6 != fscanf( vector3PairReader->trajFile, "%f,%f,%f,%f,%f,%f", &x1, &y1, &z1, &x2, &y2, &z2 ) ) + { + if ( feof( vector3PairReader->trajFile ) ) + { + rewind( vector3PairReader->trajFile ); + return Vector3PairFileReader_read( vector3PairReader, pFirst, pSecond ); + } + return IVAS_ERR_FAILED_FILE_PARSE; + } + + pFirst->x = x1; + pFirst->y = y1; + pFirst->z = z1; + pSecond->x = x2; + pSecond->y = y2; + pSecond->z = z2; + + return IVAS_ERR_OK; +} + +/*-----------------------------------------------------------------------* + * Vector3PairFileReader_close() + * + * Deallocates memory for the Head-Tracking reader + *-----------------------------------------------------------------------*/ + +void Vector3PairFileReader_close( + Vector3PairFileReader **reader /* i/o: Vector3PairFileReader handle */ +) +{ + if ( reader == NULL || *reader == NULL ) + { + return; + } + + fclose( ( *reader )->trajFile ); + free( ( *reader )->file_path ); + free( *reader ); + *reader = NULL; + + return; +} + + +/*-----------------------------------------------------------------------* + * Vector3PairFileReader_getFilePath() + * + * + *-----------------------------------------------------------------------*/ + +const char *Vector3PairFileReader_getFilePath( + Vector3PairFileReader *reader /* i/o: Vector3PairFileReader handle */ +) +{ + if ( reader == NULL ) + { + return NULL; + } + + return reader->file_path; +} diff --git a/lib_debug/segsnr.c b/lib_util/vector3_pair_file_reader.h similarity index 53% rename from lib_debug/segsnr.c rename to lib_util/vector3_pair_file_reader.h index 5e5cee48b0d6f629890140af827eea0571350c3e..4ab687848c25265bc08fc33a7f2d5e474516e25b 100644 --- a/lib_debug/segsnr.c +++ b/lib_util/vector3_pair_file_reader.h @@ -30,76 +30,58 @@ *******************************************************************************************************/ -#include -#ifdef DEBUGGING -#include "debug.h" -#endif -#include "wmc_auto.h" -#include -#include "options.h" -#include "prot.h" - -#define WMC_TOOL_SKIP - -#ifdef OUTPUT_SNR -/*_____________________________________________________________________ - | | - | FUNCTION NAME segsnr | - | Computes the segmential signal-to-noise ratio between the | - | signal x and its estimate xe of length n samples. The segment | - | length is nseg samples. | - | - | INPUT - | x[0:n-1] Signal of n samples. - | xe[0:n-1] Estimated signal of n samples. - | n Signal length. - | nseg Segment length, must be a submultiple of n. - | - | RETURN VALUE - | snr Segmential signal to noise ratio in dB. - |_____________________________________________________________________| -*/ - -float segsnr( float x[], float xe[], int16_t n, int16_t nseg ) -{ - float snr = 0.0f; - float signal, noise, error, fac; - int16_t i, j; - LOOP( 1 ); - for ( i = 0; i < n; i += nseg ) - { - signal = 1e-6f; - MOVE( 2 ); - noise = 1e-6f; - LOOP( 1 ); - for ( j = 0; j < nseg; j++ ) - { - signal += ( *x ) * ( *x ); - MAC( 1 ); - error = *x++ - *xe++; - ADD( 1 ); - noise += error * error; - MAC( 1 ); - } - snr += (float) log10( signal / noise ); - TRANS( 1 ); - DIV( 1 ); - ADD( 1 ); - } - fac = ( (float) ( 10 * nseg ) ) / (float) n; - DIV( 1 ); - MULT( 1 ); - snr = fac * snr; - MULT( 1 ); - ADD( 1 ); - BRANCH( 1 ); - if ( snr < -99.0f ) - { - snr = -99.0f; - MOVE( 1 ); - } - return ( snr ); -} -#endif - -#undef WMC_TOOL_SKIP +#ifndef IVAS_V3PAIR_FILE_READER_H +#define IVAS_V3PAIR_FILE_READER_H + +#include "common_api_types.h" +#include "ivas_error.h" +#include "options.h" /* only included to get access to the feature-defines */ + + +typedef struct Vector3PairFileReader Vector3PairFileReader; + +/*-----------------------------------------------------------------------* + * Vector3PairFileReader_open() + * + * Allocate and initialize Head-Tracking handle + *-----------------------------------------------------------------------*/ + +ivas_error Vector3PairFileReader_open( + const char *trajFilePath, /* i : trajectory file name */ + Vector3PairFileReader **vector3PairReader /* o : Vector3PairFileReader handle */ +); + +/*-----------------------------------------------------------------------* + * Vector3PairFileReader_read() + * + * Read one line of values from the trajectory file + *-----------------------------------------------------------------------*/ + +ivas_error Vector3PairFileReader_read( + Vector3PairFileReader *vector3PairReader, /* i/o: Vector3PairFileReader handle */ + IVAS_VECTOR3 *pFirst, /* o : first x,y,z position in the line */ + IVAS_VECTOR3 *pSecond /* o : second x,y,z position in the line */ +); + +/*-----------------------------------------------------------------------* + * Vector3PairFileReader_close() + * + * Deallocates memory for the handle + *-----------------------------------------------------------------------*/ + +void Vector3PairFileReader_close( + Vector3PairFileReader **vector3PairReader /* i/o: Vector3PairFileReader handle */ +); + +/*-----------------------------------------------------------------------* + * Vector3PairFileReader_getFilePath() + * + * + *-----------------------------------------------------------------------*/ + +const char *Vector3PairFileReader_getFilePath( + Vector3PairFileReader *vector3PairReader /* i/o: Vector3PairFileReader handle */ +); + + +#endif /* IVAS_V3PAIR_FILE_READER_H */ diff --git a/readme.txt b/readme.txt index eeaea0f84a668c66907d2758d7566e778d49c188..397de57438376dc40fddf2b0560bad76291488be 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 @@ -255,22 +256,27 @@ Options: Format files, the magic word in the mime file is used to determine which of the two supported formats is in use. default bitstream file format is G.192 --T File : Head rotation specified by external trajectory File -hrtf File : HRTF filter File used in ISm format and BINAURAL output configuration --FEC X : Insert frame erasures, X = 0-10 is the percentage - of erased frames, or X may be the name of binary file or - file with G192 headers indicating GOOD FRAME or BAD FRAME - containing FEC pattern (short values of 0 (good) or 1 (bad)) - default is OFF, if this option is not used --force R : Force specific binaural rendering mode, R = (TDREND, CLDFBREND), --otr tracking_type : head orientation tracking type: 'ref' or 'avg' (only for binaural rendering) +-T File : Head rotation specified by external trajectory File +-otr tracking_type : Head orientation tracking type: 'none', 'ref', 'avg', 'ref_vec' + or 'ref_vec_lev' (only for binaural rendering) +-rf File : Reference rotation specified by external trajectory file + works only in combination with '-otr ref' mode +-rvf File : Reference vector specified by external trajectory file + works only in combination with '-otr ref_vec' and 'ref_vec_lev' modes -render_config File : Renderer configuration option File --no_diegetic_pan : panning mono no dietic sound to stereo -1<= pan <=1, +-no_diegetic_pan : panning mono non-diegetic sound to stereo -1<= pan <=1, left or l or 1->left, right or r or -1->right, center or c or 0->middle -q : Quiet mode, no frame counter default is deactivated +The usage of the "IVAS_rend" program is as follows: +--------------------------------------------------- + +TBD + + MULTICHANNEL LOUDSPEAKER INPUT / OUTPUT CONFIGURATIONS ====================================================== The loudspeaker positions for each MC layouts are assumed to have the following azimuth and elevation @@ -353,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 @@ -369,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 @@ -378,7 +384,7 @@ 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 with the following meaning: | Parameter | format, value range | meaning @@ -387,12 +393,23 @@ with the following meaning: ----------------------------------------------------------------------------------- | elevation | float, [-90,90] | elevation; positive indicates up ----------------------------------------------------------------------------------- -| distance | float, tbd | distance; default: 1 +| radius | float, [0, 15.75] | radius (extended metadata) ----------------------------------------------------------------------------------- | 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 +----------------------------------------------------------------------------------- +| pitch | float, [-90,90] | pitch (extended metadata); positive indicates up +----------------------------------------------------------------------------------- + +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: @@ -403,6 +420,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: @@ -415,5 +435,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/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/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/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 a2adaa4ccf89ecb49200c245aa23c066ad78401e..ab08c4e5cd8039bab7406e191dfad601a99eb25d 100644 --- a/scripts/config/ivas_modes.json +++ b/scripts/config/ivas_modes.json @@ -1813,7 +1813,7 @@ "table_name": "ISM1@{table_bitrate} kbps {bandwidth}", "nummetadata": 1, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -1868,7 +1868,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 +1924,69 @@ "table_name": "ISM2@{table_bitrate} kbps {bandwidth}", "nummetadata": 2, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000 + ], + "swb": [ + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000 + ], + "fb": [ + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000 + ] + } + }, + "ISM2_b{bitrate}_dtx_{bandwidth}_cbr": { + "encmodeoption": [ + "-dtx", + "-ism", + "2" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "EXT": [] + }, + "in_config": "ISM2", + "table_name": "ISM2@{table_bitrate} kbps DTX {bandwidth}", + "nummetadata": 2, + "metadatafilenames": [ + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -1987,7 +2049,7 @@ "table_name": "ISM3@{table_bitrate} kbps {bandwidth}", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -2050,7 +2112,7 @@ "table_name": "ISM3@{table_bitrate} kbps DTX {bandwidth}", "nummetadata": 3, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -2058,14 +2120,41 @@ "bitrates": { "wb": [ 24400, - 32000 + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000 ], "swb": [ 24400, - 32000 + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000 ], "fb": [ - 32000 + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000 ] } } @@ -2087,7 +2176,7 @@ "table_name": "ISM4@{table_bitrate} kbps {bandwidth}", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -2153,7 +2242,7 @@ "table_name": "ISM4@{table_bitrate} kbps DTX {bandwidth}", "nummetadata": 4, "metadatafilenames": [ - "test_ISM_trajectory{mdi}.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -2161,18 +2250,468 @@ "bitrates": { "wb": [ 24400, - 32000 + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 ], "swb": [ 24400, - 32000 + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 ], "fb": [ - 32000 + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 ] } } }, + "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 223ac0352c236eac057b8ac0a6da86eadf3de341..91bca7eef212539b05ae367039d1072f8871248f 100644 --- a/scripts/config/self_test.prm +++ b/scripts/config/self_test.prm @@ -161,19 +161,19 @@ ../IVAS_dec STEREO 48 bit testv/stvST48c.wav_stereo_32000_48-48_bandwidth_sw.tst // stereo at 32 kbps, 48kHz in, 32kHz out, random FEC at 6% -../IVAS_cod -stereo -max_band FB 32000 48 testv/stvST48c.wav bit +../IVAS_cod -stereo 32000 48 testv/stvST48c.wav bit ../IVAS_dec -fec testv/FEC_6pct.bin STEREO 32 bit testv/stvST48c.wav_stereo_32000_48-32_FEC5.tst // stereo at 32 kbps, 48kHz in, 48kHz out, DTX on, random FEC at 5% -../IVAS_cod -stereo -dtx -max_band FB 32000 48 testv/stvST48n.wav bit +../IVAS_cod -stereo -dtx 32000 48 testv/stvST48n.wav bit ../IVAS_dec -fec 5 STEREO 48 bit testv/stvST48n.wav_stereo_32000_48-48_DTX_FEC5.tst // stereo at 32 kbps, 48kHz in, 48kHz out, DTX on, MONO out, random FEC at 5% -../IVAS_cod -stereo -dtx -max_band FB 32000 48 testv/stvST48n.wav bit +../IVAS_cod -stereo -dtx 32000 48 testv/stvST48n.wav bit ../IVAS_dec -fec 5 MONO 48 bit testv/stvST48n.wav_stereo_32000_48-48_DTX_MONO_FEC5.tst // stereo at 32 kbps, 48kHz in, 16kHz out, DTX on, MONO out, random FEC at 5% -../IVAS_cod -stereo -dtx -max_band FB 32000 48 testv/stvST48n.wav bit +../IVAS_cod -stereo -dtx 32000 48 testv/stvST48n.wav bit ../IVAS_dec -fec 5 MONO 16 bit testv/stvST48n.wav_stereo_32000_48-16_DTX_MONO_FEC5.tst // stereo at 48 kbps, 16kHz in, 16kHz out @@ -250,154 +250,182 @@ -// 1 ISm with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, MONO out +// 1 ISM with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, MONO out ../IVAS_cod -ism 1 testv/stvISM1.csv 13200 48 testv/stv1ISM48s.wav bit ../IVAS_dec MONO 48 bit testv/stv1ISM48s.wav_13200_48-48_MONO.tst -// 1 ISm with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL out, random FEC at 5% +// 1 ISM with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL out, random FEC at 5% ../IVAS_cod -dtx -ism 1 testv/stvISM1.csv 13200 48 testv/stv48n.wav bit ../IVAS_dec -fec 5 BINAURAL 48 bit testv/stv48n.wav_13200_48-48_DTX_FEC5_BINAURAL.tst -// 2 ISm with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, STEREO out +// 2 ISM with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, STEREO out ../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 16400 48 testv/stv2ISM48s.wav bit ../IVAS_dec STEREO 48 bit testv/stv2ISM48s.wav_16400_48-48_STEREO.tst -// 3 ISm with metadata at 24.4 kbps, 48 kHz in, 48 kHz out, 7_1 out +// 2 ISM with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, BINAURAL out +../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 16400 48 testv/stv2ISM48s.wav bit +../IVAS_dec BINAURAL 48 bit testv/stv2ISM48s.wav_16400_48-48_binaural.tst + +// 1 ISM with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out +../IVAS_cod -ism 1 testv/stvISM1.csv 16400 48 testv/stv1ISM48s.wav bit +../IVAS_dec BINAURAL_ROOM 48 bit testv/stv1ISM48s.wav_16400_48-48_binaural_room.tst + +// 3 ISM with metadata at 24.4 kbps, 48 kHz in, 48 kHz out, 7_1 out ../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 24400 48 testv/stv3ISM48s.wav bit ../IVAS_dec 7_1 48 bit testv/stv3ISM48s.wav_24400_48-48_7_1.tst -// 3 ISm with metadata at 24.4 kbps, 48 kHz in, 48 kHz out, MONO out, random FEC at 5% +// 3 ISM with metadata at 24.4 kbps, 48 kHz in, 48 kHz out, MONO out, random FEC at 5% ../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 24400 48 testv/stv3ISM48s.wav bit ../IVAS_dec -fec 5 MONO 48 bit testv/stv3ISM48s.wav_24400_48-48_MONO_FEC5.tst -// 1 ISm with metadata at 32 kbps, 32 kHz in, 32 kHz out, DTX on, MONO out +// 3 ISM with metadata at 24.4 kbps, 48 kHz in, 48 kHz out, BINAURAL out +../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 24400 48 testv/stv3ISM48s.wav bit +../IVAS_dec BINAURAL 48 bit testv/stv3ISM48s.wav_24400_48-48_binaural.tst + +// 1 ISM with metadata at 32 kbps, 32 kHz in, 32 kHz out, DTX on, MONO out ../IVAS_cod -dtx -ism 1 testv/stvISM1.csv 32000 32 testv/stv32n.wav bit ../IVAS_dec MONO 32 bit testv/stv32n.wav_32000_32-32_DTX_MONO.tst -// 4 ISm with metadata at 32 kbps, 48 kHz in, 48 kHz out, FOA out +// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, FOA out ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48s.wav bit ../IVAS_dec FOA 48 bit testv/stv4ISM48s.wav_32000_48-48_FOA.tst -// 4 ISm with metadata at 32 kbps, 48 kHz in, 48 kHz out, STEREO out +// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, STEREO out ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48s.wav bit ../IVAS_dec STEREO 48 bit testv/stv4ISM48s.wav_32000_48-48_STEREO.tst -// 3 ISm with metadata at 48 kbps, 48 kHz in, 48 kHz out, MONO out -../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 48000 48 testv/stv3ISM48s.wav bit -../IVAS_dec MONO 48 bit testv/stv43ISM48s_48000_48-48_MONO.tst - -// 2 ISm with metadata at 64 kbps, 48 kHz in, 32 kHz out, 5_1 out -../IVAS_cod -max_band FB -ism 2 testv/stvISM1.csv testv/stvISM2.csv 64000 48 testv/stv2ISM48s.wav bit -../IVAS_dec 5_1 32 bit testv/stv2ISM48s.wav_64000_48-32_5_1.tst +// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, BINAURAL out +../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48s.wav bit +../IVAS_dec BINAURAL 48 bit testv/stv4ISM48s.wav_32000_48-48_binaural.tst -// 4 ISm with metadata at 80 kbps, 48 kHz in, 48 kHz out, HOA2 out -../IVAS_cod -max_band FB -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 80000 48 testv/stv4ISM48s.wav bit -../IVAS_dec HOA2 48 bit testv/stv4ISM48s.wav_80000_48-48_HOA2.tst +// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL out +../IVAS_cod -dtx -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48n.wav bit +../IVAS_dec BINAURAL 48 bit testv/stv4ISM48n.wav_32000_48-48_DTX_BINAURAL.tst -// 4 ISm with metadata at 96 kbps, 48 kHz in, 48 kHz out, Custom LS setup out -../IVAS_cod -max_band FB -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 96000 48 testv/stv4ISM48s.wav bit -../IVAS_dec testv/ls_setup_16ch_8+4+4.txt 48 bit testv/stv4ISM48s.wav_96000_48-48_MC_custom_setup.tst +// 2 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, DTX on, HOA2 out +../IVAS_cod -dtx -ism 2 testv/stvISM1.csv testv/stvISM2.csv 32000 48 testv/stvST48c.wav bit +../IVAS_dec HOA2 48 bit testv/stv2ST48c.wav_32000_48-48_DTX_HOA2.tst -// 3 ISm with metadata at 128 kbps, 48 kHz in, 32 kHz out, HOA3 out, random FEC at 5% -../IVAS_cod -max_band FB -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 128000 48 testv/stv3ISM48s.wav bit -../IVAS_dec -fec 5 HOA3 32 bit testv/stv3ISM48s.wav_128000_48-32_HOA3_FEC5.tst +// 2 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, EXTERNAL out +../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 32000 48 testv/stv2ISM48s.wav bit +../IVAS_dec EXT 48 bit testv/stv2ISM48s.wav_32000_48-48_external.tst -// 4 ISm with metadata at 160 kbps, 48 kHz in, 48 kHz out, STEREO out -../IVAS_cod -max_band FB -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 160000 48 testv/stv4ISM48s.wav bit -../IVAS_dec STEREO 48 bit testv/stv4ISM48s.wav_160000_48-48_STEREO.tst +// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out, random FEC at 5% +../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48s.wav bit +../IVAS_dec -fec 5 BINAURAL_ROOM 48 bit testv/stv4ISM48s.wav_32000_48-48_binaural_room_FEC5.tst -// 2 ISm with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, BINAURAL out -../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 16400 48 testv/stv2ISM48s.wav bit -../IVAS_dec BINAURAL 48 bit testv/stv2ISM48s.wav_16400_48-48_binaural.tst +// 3 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, MONO out +../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 48000 48 testv/stv3ISM48s.wav bit +../IVAS_dec MONO 48 bit testv/stv43ISM48s_48000_48-48_MONO.tst -// 3 ISm with metadata at 24.4 kbps, 48 kHz in, 48 kHz out, BINAURAL out -../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 24400 48 testv/stv3ISM48s.wav bit -../IVAS_dec BINAURAL 48 bit testv/stv3ISM48s.wav_24400_48-48_binaural.tst +// 4 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL ROOM out, random FEC at 5% +../IVAS_cod -dtx -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 48000 48 testv/stv4ISM48n.wav bit +../IVAS_dec -fec 5 BINAURAL_ROOM 48 bit testv/stv4ISM48n.wav_48000_48-48_DTX_TD_binaural_room_FEC5.tst -// 2 ISm with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL out, random FEC at 5% +// 2 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL out, random FEC at 5% ../IVAS_cod -ism 2 testv/stvISM3.csv testv/stvISM4.csv 48000 48 testv/stv2ISM48s.wav bit ../IVAS_dec -fec 5 BINAURAL 48 bit testv/stv2ISM48s.wav_48000_48-48_binaural_FEC5.tst -// 4 ISm with metadata at 32 kbps, 48 kHz in, 48 kHz out, BINAURAL out -../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48s.wav bit -../IVAS_dec BINAURAL 48 bit testv/stv4ISM48s.wav_32000_48-48_binaural.tst - -// 1 ISm with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out -../IVAS_cod -ism 1 testv/stvISM1.csv 16400 48 testv/stv1ISM48s.wav bit -../IVAS_dec BINAURAL_ROOM 48 bit testv/stv1ISM48s.wav_16400_48-48_binaural_room.tst - -// 2 ISm with metadata at 32 kbps, 48 kHz in, 48 kHz out, EXTERNAL out -../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 32000 48 testv/stv2ISM48s.wav bit -../IVAS_dec EXT 48 bit testv/stv2ISM48s.wav_32000_48-48_external.tst +// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out, head rotation, random FEC at 5% +../IVAS_cod -ism 1 testv/stvISM1.csv 48000 48 testv/stv1ISM48s.wav bit +../IVAS_dec -fec 5 -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM 48 bit testv/stv1ISM48s.wav_64000_48-48_binaural_room_HR.tst -// 2 ISm with metadata at 64 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out +// 2 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out ../IVAS_cod -ism 2 testv/stvISM3.csv testv/stvISM4.csv 64000 48 testv/stv2ISM48s.wav bit ../IVAS_dec BINAURAL_ROOM 48 bit testv/stv2ISM48s.wav_64000_48-48_binaural_room.tst -// 4 ISm with metadata at 32 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out, random FEC at 5% -../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48s.wav bit -../IVAS_dec -fec 5 BINAURAL_ROOM 48 bit testv/stv4ISM48s.wav_32000_48-48_binaural_room_FEC5.tst +// 2 ISM with metadata at 64 kbps, 48 kHz in, 32 kHz out, 5_1 out +../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 64000 48 testv/stv2ISM48s.wav bit +../IVAS_dec 5_1 32 bit testv/stv2ISM48s.wav_64000_48-32_5_1.tst -// 4 ISm with metadata at 64 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out +// 4 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 64000 48 testv/stv4ISM48s.wav bit ../IVAS_dec BINAURAL_ROOM 48 bit testv/stv4ISM48s.wav_64000_48-48_binaural_room.tst -// 1 ISm with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out, head rotation, random FEC at 5% -../IVAS_cod -ism 1 testv/stvISM1.csv 48000 48 testv/stv1ISM48s.wav bit -../IVAS_dec -fec 5 -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM 48 bit testv/stv1ISM48s.wav_64000_48-48_binaural_room_HR.tst +// 2 ISM with metadata at 80 kbps, 48 kHz in, 48 kHz out, DTX on, stereo out +../IVAS_cod -dtx -ism 2 testv/stvISM1.csv testv/stvISM2.csv 80000 48 testv/stvST48c.wav bit +../IVAS_dec STEREO 48 bit testv/stv2ST48c.wav_80000_48-48_DTX_STEREO.tst -// 1 ISm with metadata at 96 kbps, 48 kHz in, 16 kHz out, TD BINAURAL out (Model from file) -../IVAS_cod -ism 1 testv/stvISM1.csv 96000 48 testv/stv1ISM48s.wav bit -../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit testv/stv2ISM48s.wav_96000_48-16_TD_binaural.tst +// 4 ISM with metadata at 80 kbps, 48 kHz in, 48 kHz out, HOA2 out +../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 80000 48 testv/stv4ISM48s.wav bit +../IVAS_dec HOA2 48 bit testv/stv4ISM48s.wav_80000_48-48_HOA2.tst -// 2 ISm with metadata at 160 kbps, 48 kHz in, 32 kHz out, TD BINAURAL out -../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 160000 48 testv/stv2ISM48s.wav bit -../IVAS_dec BINAURAL 32 bit testv/stv2ISM48s.wav_160000_48-32_TD_binaural.tst +// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, BINAURAL out (Model from file), head rotation, random FEC at 5% +../IVAS_cod -ism 1 testv/stvISM1.csv 80000 48 testv/stv1ISM48s.wav bit +../IVAS_dec -fec 5 -t testv/headrot_case00_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit testv/stv2ISM48s.wav_80000_48-16_binaural_file_TDHR_FEC5.tst -// 3 ISm with metadata at 192 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out (Model from file) -../IVAS_cod -ism 3 testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 192000 48 testv/stv3ISM48s.wav bit -../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL 48 bit testv/stv3ISM48s.wav_192000_48-48_TD_binaural.tst +// 4 ISM with metadata at 96 kbps, 48 kHz in, 48 kHz out, Custom LS setup out +../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 96000 48 testv/stv4ISM48s.wav bit +../IVAS_dec testv/ls_setup_16ch_8+4+4.txt 48 bit testv/stv4ISM48s.wav_96000_48-48_MC_custom_setup.tst -// 4 ISm with metadata at 256 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out -../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit -../IVAS_dec BINAURAL 48 bit testv/stv4ISM48s.wav_256000_48-48_TD_binaural.tst +// 1 ISM with metadata at 96 kbps, 48 kHz in, 16 kHz out, BINAURAL out (Model from file) +../IVAS_cod -ism 1 testv/stvISM1.csv 96000 48 testv/stv1ISM48s.wav bit +../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit testv/stv2ISM48s.wav_96000_48-16_binaural.tst -// 1 ISm with metadata at 80 kbps, 48 kHz in, 16 kHz out, TD BINAURAL out (Model from file), head rotation, random FEC at 5% -../IVAS_cod -ism 1 testv/stvISM1.csv 80000 48 testv/stv1ISM48s.wav bit -../IVAS_dec -fec 5 -t testv/headrot_case00_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit testv/stv2ISM48s.wav_80000_48-16_TDHR_FEC5.tst +// 3 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, HOA3 out, random FEC at 5% +../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 128000 48 testv/stv3ISM48s.wav bit +../IVAS_dec -fec 5 HOA3 32 bit testv/stv3ISM48s.wav_128000_48-32_HOA3_FEC5.tst -// 2 ISm with metadata at 128 kbps, 48 kHz in, 32 kHz out, TD BINAURAL out (Model from file), head rotation +// 2 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, BINAURAL out (Model from file), head rotation ../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 128000 48 testv/stv2ISM48s.wav bit -../IVAS_dec -t testv/headrot_case01_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin BINAURAL 32 bit testv/stv2ISM48s.wav_128000_48-32_TDHR.tst +../IVAS_dec -t testv/headrot_case01_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin BINAURAL 32 bit testv/stv2ISM48s.wav_128000_48-32_binaural_file_TDHR.tst + +// 4 ISM with metadata at 160 kbps, 48 kHz in, 48 kHz out, STEREO out +../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 160000 48 testv/stv4ISM48s.wav bit +../IVAS_dec STEREO 48 bit testv/stv4ISM48s.wav_160000_48-48_STEREO.tst + +// 2 ISM with metadata at 160 kbps, 48 kHz in, 32 kHz out, BINAURAL out +../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 160000 48 testv/stv2ISM48s.wav bit +../IVAS_dec BINAURAL 32 bit testv/stv2ISM48s.wav_160000_48-32_binaural.tst + +// 3 ISM with metadata at 192 kbps, 48 kHz in, 48 kHz out, BINAURAL out (Model from file) +../IVAS_cod -ism 3 testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 192000 48 testv/stv3ISM48s.wav bit +../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL 48 bit testv/stv3ISM48s.wav_192000_48-48_binaural)file.tst -// 3 ISm with metadata at 192 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out, head rotation, random FEC at 5% +// 3 ISM with metadata at 192 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation, random FEC at 5% ../IVAS_cod -ism 3 testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 192000 48 testv/stv3ISM48s.wav bit -../IVAS_dec -fec 5 -t testv/headrot_case02_3000_q.csv BINAURAL 48 bit testv/stv3ISM48s.wav_192000_48-48_TDHR_FEC5.tst +../IVAS_dec -fec 5 -t testv/headrot_case02_3000_q.csv BINAURAL 48 bit testv/stv3ISM48s.wav_192000_48-48_binaural_file_TDHR_FEC5.tst + +// 4 ISM with metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out +../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit +../IVAS_dec BINAURAL 48 bit testv/stv4ISM48s.wav_256000_48-48_binaural.tst -// 4 ISm with metadata at 256 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out, head rotation +// 4 ISM with metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit -../IVAS_dec -t testv/headrot_case03_3000_q.csv BINAURAL 48 bit testv/stv4ISM48s.wav_256000_48-48_TDHR.tst +../IVAS_dec -t testv/headrot_case03_3000_q.csv BINAURAL 48 bit testv/stv4ISM48s.wav_256000_48-48_binaural_file_TDHR.tst -// 3 ISm with metadata at 384 kbps, 48 kHz in, 32 kHz out, 7_1_4 out +// 3 ISM with metadata at 384 kbps, 48 kHz in, 32 kHz out, 7_1_4 out ../IVAS_cod -ism 3 testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 384000 48 testv/stv3ISM48s.wav bit ../IVAS_dec 7_1_4 32 bit testv/stv3ISM48s.wav_384000_48-32_7_1_4.tst -// 4 ISm with metadata at 512 kbps, 48 kHz in, 48 kHz out, 5_1 +// 4 ISM with metadata at 512 kbps, 48 kHz in, 48 kHz out, 5_1 ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 48 testv/stv4ISM48s.wav bit ../IVAS_dec 5_1 48 bit testv/stv4ISM48s.wav_512000_48-48_5_1.tst -// 1 ISm with metadata bitrate switching from 13.2 kbps to 128 kbps, 32 kHz in, 32 kHz out, mono out, DTX on +// 4 ISm with metadata at 256 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out, head rotation, Orientation tracking +../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit +../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL 48 bit testv/stv4ISM48s.pcm_256000_48-48_TDHR_OtrAvg.tst + +// 1 ISM with metadata bitrate switching from 13.2 kbps to 128 kbps, 32 kHz in, 32 kHz out, mono out, DTX on ../IVAS_cod -dtx -ism 1 testv/stvISM1.csv ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 32 testv/stv32c.wav bit ../IVAS_dec MONO 32 bit testv/stv32c.wav_brate_sw_32-32_mono_dtx.tst -// 4 ISm with metadata bitrate switching from 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out +// 4 ISM with metadata bitrate switching from 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv4ISM48s.wav bit -../IVAS_dec BINAURAL 48 bit testv/stv4ISM48s.wav_brate_sw_48-48_BINAURAL.tst +../IVAS_dec BINAURAL 48 bit testv/stv4ISM48s.wav_brate_sw_48-48_binaural.tst -// 4 ISm with metadata at 256 kbps, 48 kHz in, 48 kHz out, DTX on, TD BINAURAL out -../IVAS_cod -dtx -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48n.wav bit -../IVAS_dec BINAURAL 48 bit testv/stv4ISM48n.wav_256000_48-48_DTX_TD_binaural.tst +// 4 ISm with and without metadata bitrate switching from 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, DTX on, HOA3 out +../IVAS_cod -dtx -ism 4 testv/stvISM1.csv NULL NULL testv/stvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv4ISM48s.wav bit +../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 @@ -432,6 +460,10 @@ ../IVAS_cod -sba 3 24400 32 testv/stv3OA32c.wav bit ../IVAS_dec -t testv/headrot.csv BINAURAL 32 bit testv/stv3OA32c.wav_SBA_24400_32-32_Binaural_Headrot.tst +// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, Headrotation, Orientation tracking +../IVAS_cod -sba 3 24400 32 testv/stv3OA32c.wav bit +../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL 32 bit testv/stv3OA32c.pcm_SBA_24400_32-32_Binaural_Headrot_OtrAvg.tst + // SBA at 24.4 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, random FEC at 5% ../IVAS_cod -sba 3 -dtx 24400 32 testv/stv3OA32c.wav bit ../IVAS_dec -fec 5 BINAURAL 32 bit testv/stv3OA32c.wav_SBA_24400_32-32_DTX_Binaural_FEC5.tst @@ -476,6 +508,18 @@ ../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit ../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_BinauralRoom_Headrot.tst +// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, Headrotation, Orientation tracking +../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit +../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_ROOM 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_OtrAvg.tst + +// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, Headrotation, reference vector tracking +../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit +../IVAS_dec -t ../scripts/trajectories/full-circle-4s.csv -rvf ../scripts/trajectories/full-circle-4s-Vector3.csv -otr ref_vec BINAURAL_ROOM 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_OtrRefPos.tst + +// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, Headrotation, reference vector tracking in level mode +../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit +../IVAS_dec -t ../scripts/trajectories/full-circle-with-up-and-down-4s.csv -rvf ../scripts/trajectories/full-circle-with-up-and-down-4s-Vector3.csv -otr ref_vec_lev BINAURAL_ROOM 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_OtrRefPosLev.tst + // SBA at 48 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, random FEC at 5% ../IVAS_cod -sba 3 -dtx 48000 32 testv/stv3OA32c.wav bit ../IVAS_dec -fec 5 BINAURAL 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_DTX_Binaural_FEC5.tst @@ -493,7 +537,7 @@ ../IVAS_dec -fec 5 FOA 32 bit testv/stvFOA32c.wav_SBA_64000_32-32_DTX_FOA.tst // SBA at 64 kbps, 48kHz in, 48kHz out, 5_1_4 out -../IVAS_cod -max_band FB -sba 1 64000 48 testv/stvFOA48c.wav bit +../IVAS_cod -sba 1 64000 48 testv/stvFOA48c.wav bit ../IVAS_dec 5_1_4 48 bit testv/stvFOA48c.wav_SBA_64000_48-48_5_1_4.tst // SBA at 64 kbps, 48kHz in, 48kHz out, 7_1_4 out @@ -532,6 +576,10 @@ ../IVAS_cod -sba 3 128000 32 testv/stv3OA32c.wav bit ../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM 32 bit testv/stv3OA32c.wav_SBA_128000_32-32_Binaural_room_Headrot.tst +// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, Headrotation, Orientation tracking +../IVAS_cod -sba 3 128000 32 testv/stv3OA32c.wav bit +../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_ROOM 32 bit testv/stv3OA32c.pcm_SBA_128000_32-32_Binaural_room_Headrot_OtrAvg.tst + // SBA at 192 kbps, 48kHz in, 48kHz out, HOA2 out, random FEC at 5% ../IVAS_cod -sba 3 192000 48 testv/stv3OA48c.wav bit ../IVAS_dec -fec 5 HOA2 48 bit testv/stv3OA48c.wav_SBA_192000_48-48_HOA2_FEC5.tst @@ -666,6 +714,10 @@ ../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 32000 48 testv/stv1MASA2TC48c.wav bit ../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM 48 bit testv/stv1MASA2TC48c.wav_32000_48-48_BinauralRoom_Headrot.tst +// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, Headrotation, Orientation tracking +../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 32000 48 testv/stv1MASA2TC48c.wav bit +../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_ROOM 48 bit testv/stv_IVASMASA_1dir2TC.pcm_32000_48-48_BinauralRoom_Headrot_OtrAvg.tst + // MASA 1dir 2TC at 48 kbps, 48kHz in, 48kHz out, 7_1_4 out, random FEC at 5% ../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 48000 48 testv/stv1MASA2TC48c.wav bit ../IVAS_dec -fec 5 7_1_4 48 bit testv/stv1MASA2TC48c.wav_48000_48-48_7_1_4_FEC5.tst @@ -804,6 +856,10 @@ ../IVAS_cod -mc 5_1 256000 48 testv/stv51MC48c.wav bit ../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM 48 bit testv/stv51MC48c.wav_MC51_256000_48-48_BinauralRoom_Headrot.tst +// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, head rotation, Orientation tracking +../IVAS_cod -mc 5_1 256000 48 testv/stv51MC48c.wav bit +../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_ROOM 48 bit testv/stv51MC48c.pcm_MC51_256000_48-48_BinauralRoom_Headrot_OtrAvg.tst + // Multi-channel 5_1 at 384 kbps, 48kHz in, 48kHz out ../IVAS_cod -mc 5_1 384000 48 testv/stv51MC48c.wav bit ../IVAS_dec 5_1 48 bit testv/stv51MC48c.wav_MC51_384000_48-48_5_1.tst 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/__init__.py b/scripts/pyaudio3dtools/quaternions/__init__.py deleted file mode 100644 index 8f1f04c36906bb9a43d1c3226aca6eced4f63498..0000000000000000000000000000000000000000 --- a/scripts/pyaudio3dtools/quaternions/__init__.py +++ /dev/null @@ -1,44 +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. -""" - -""" -Quaternions -==== - -Provides - Handling of quaternions in the same conventions as in IVAS and the Matlab scripts - -Imports -------- -functions -""" -from . import functions 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..94e2646684d244e9eb75fa6a094537fea65e3e50 100644 --- a/scripts/pyivastest/IvasModeAnalyzer.py +++ b/scripts/pyivastest/IvasModeAnalyzer.py @@ -958,6 +958,7 @@ class IvasModeAnalyzer(IvasModeCollector): IvasModeAnalyzer.write_csv_file(filename, table) def all_instrumented_to_csv(self, basefilename, encdec=-1): + basefilename = os.path.abspath(basefilename) for value in INSTRUMENTED_RESULTS: table = self.get_instrumented_value(value, encdec=encdec) IvasModeAnalyzer.write_csv_file("".join([basefilename, "_", value]), table) diff --git a/scripts/pyivastest/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/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/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..0082c1282340113845a884c78f6b8140646057da 100644 --- a/scripts/testv/stvISM1.csv +++ b/scripts/testv/stvISM1.csv @@ -1,1500 +1,1500 @@ -0.00,0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 -9.60,0.00,1.00,0.00,1.00 -14.40,0.00,1.00,0.00,1.00 -19.20,0.00,1.00,0.00,1.00 -24.00,0.00,1.00,0.00,1.00 -28.80,0.00,1.00,0.00,1.00 -33.60,0.00,1.00,0.00,1.00 -38.40,0.00,1.00,0.00,1.00 -43.20,0.00,1.00,0.00,1.00 -48.00,0.00,1.00,0.00,1.00 -52.80,0.00,1.00,0.00,1.00 -57.60,0.00,1.00,0.00,1.00 -62.40,0.00,1.00,0.00,1.00 -67.20,0.00,1.00,0.00,1.00 -72.00,0.00,1.00,0.00,1.00 -76.80,0.00,1.00,0.00,1.00 -81.60,0.00,1.00,0.00,1.00 -86.40,0.00,1.00,0.00,1.00 -91.20,0.00,1.00,0.00,1.00 -96.00,0.00,1.00,0.00,1.00 -100.80,0.00,1.00,0.00,1.00 -105.60,0.00,1.00,0.00,1.00 -110.40,0.00,1.00,0.00,1.00 -115.20,0.00,1.00,0.00,1.00 -120.00,0.00,1.00,0.00,1.00 -124.80,0.00,1.00,0.00,1.00 -129.60,0.00,1.00,0.00,1.00 -134.40,0.00,1.00,0.00,1.00 -139.20,0.00,1.00,0.00,1.00 -144.00,0.00,1.00,0.00,1.00 -148.80,0.00,1.00,0.00,1.00 -153.60,0.00,1.00,0.00,1.00 -158.40,0.00,1.00,0.00,1.00 -163.20,0.00,1.00,0.00,1.00 -168.00,0.00,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,0.00,1.00,0.00,1.00 --168.00,0.00,1.00,0.00,1.00 --163.20,0.00,1.00,0.00,1.00 --158.40,0.00,1.00,0.00,1.00 --153.60,0.00,1.00,0.00,1.00 --148.80,0.00,1.00,0.00,1.00 --144.00,0.00,1.00,0.00,1.00 --139.20,0.00,1.00,0.00,1.00 --134.40,0.00,1.00,0.00,1.00 --129.60,0.00,1.00,0.00,1.00 --124.80,0.00,1.00,0.00,1.00 --120.00,0.00,1.00,0.00,1.00 --115.20,0.00,1.00,0.00,1.00 --110.40,0.00,1.00,0.00,1.00 --105.60,0.00,1.00,0.00,1.00 --100.80,0.00,1.00,0.00,1.00 --96.00,0.00,1.00,0.00,1.00 --91.20,0.00,1.00,0.00,1.00 --86.40,0.00,1.00,0.00,1.00 --81.60,0.00,1.00,0.00,1.00 --76.80,0.00,1.00,0.00,1.00 --72.00,0.00,1.00,0.00,1.00 --67.20,0.00,1.00,0.00,1.00 --62.40,0.00,1.00,0.00,1.00 --57.60,0.00,1.00,0.00,1.00 --52.80,0.00,1.00,0.00,1.00 --48.00,0.00,1.00,0.00,1.00 --43.20,0.00,1.00,0.00,1.00 --38.40,0.00,1.00,0.00,1.00 --33.60,0.00,1.00,0.00,1.00 --28.80,0.00,1.00,0.00,1.00 --24.00,0.00,1.00,0.00,1.00 --19.20,0.00,1.00,0.00,1.00 --14.40,0.00,1.00,0.00,1.00 --9.60,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -9.60,-0.00,1.00,0.00,1.00 -14.40,-0.00,1.00,0.00,1.00 -19.20,-0.00,1.00,0.00,1.00 -24.00,-0.00,1.00,0.00,1.00 -28.80,-0.00,1.00,0.00,1.00 -33.60,-4.80,1.00,0.00,1.00 -38.40,-4.80,1.00,0.00,1.00 -43.20,-4.80,1.00,0.00,1.00 -48.00,-4.80,1.00,0.00,1.00 -52.80,-4.80,1.00,0.00,1.00 -57.60,-4.80,1.00,0.00,1.00 -62.40,-4.80,1.00,0.00,1.00 -67.20,-4.80,1.00,0.00,1.00 -72.00,-4.80,1.00,0.00,1.00 -76.80,-4.80,1.00,0.00,1.00 -81.60,-4.80,1.00,0.00,1.00 -86.40,-4.80,1.00,0.00,1.00 -91.20,-4.80,1.00,0.00,1.00 -96.00,-4.80,1.00,0.00,1.00 -100.80,-4.80,1.00,0.00,1.00 -105.60,-4.80,1.00,0.00,1.00 -110.40,-4.80,1.00,0.00,1.00 -115.20,-4.80,1.00,0.00,1.00 -120.00,-4.80,1.00,0.00,1.00 -124.80,-4.80,1.00,0.00,1.00 -129.60,-4.80,1.00,0.00,1.00 -134.40,-4.80,1.00,0.00,1.00 -139.20,-4.80,1.00,0.00,1.00 -144.00,-4.80,1.00,0.00,1.00 -148.80,-4.80,1.00,0.00,1.00 -153.60,-0.00,1.00,0.00,1.00 -158.40,-0.00,1.00,0.00,1.00 -163.20,-0.00,1.00,0.00,1.00 -168.00,-0.00,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,0.00,1.00,0.00,1.00 --168.00,0.00,1.00,0.00,1.00 --163.20,0.00,1.00,0.00,1.00 --158.40,0.00,1.00,0.00,1.00 --153.60,0.00,1.00,0.00,1.00 --148.80,4.80,1.00,0.00,1.00 --144.00,4.80,1.00,0.00,1.00 --139.20,4.80,1.00,0.00,1.00 --134.40,4.80,1.00,0.00,1.00 --129.60,4.80,1.00,0.00,1.00 --124.80,4.80,1.00,0.00,1.00 --120.00,4.80,1.00,0.00,1.00 --115.20,4.80,1.00,0.00,1.00 --110.40,4.80,1.00,0.00,1.00 --105.60,4.80,1.00,0.00,1.00 --100.80,4.80,1.00,0.00,1.00 --96.00,4.80,1.00,0.00,1.00 --91.20,4.80,1.00,0.00,1.00 --86.40,4.80,1.00,0.00,1.00 --81.60,4.80,1.00,0.00,1.00 --76.80,4.80,1.00,0.00,1.00 --72.00,4.80,1.00,0.00,1.00 --67.20,4.80,1.00,0.00,1.00 --62.40,4.80,1.00,0.00,1.00 --57.60,4.80,1.00,0.00,1.00 --52.80,4.80,1.00,0.00,1.00 --48.00,4.80,1.00,0.00,1.00 --43.20,4.80,1.00,0.00,1.00 --38.40,4.80,1.00,0.00,1.00 --33.60,4.80,1.00,0.00,1.00 --28.80,0.00,1.00,0.00,1.00 --24.00,0.00,1.00,0.00,1.00 --19.20,0.00,1.00,0.00,1.00 --14.40,0.00,1.00,0.00,1.00 --9.60,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -9.60,-0.00,1.00,0.00,1.00 -14.40,-0.00,1.00,0.00,1.00 -19.20,-4.80,1.00,0.00,1.00 -24.00,-4.80,1.00,0.00,1.00 -28.80,-4.80,1.00,0.00,1.00 -33.60,-4.80,1.00,0.00,1.00 -38.40,-4.80,1.00,0.00,1.00 -43.20,-4.80,1.00,0.00,1.00 -48.00,-4.80,1.00,0.00,1.00 -52.80,-9.60,1.00,0.00,1.00 -57.60,-9.60,1.00,0.00,1.00 -62.40,-9.60,1.00,0.00,1.00 -67.20,-9.60,1.00,0.00,1.00 -72.00,-9.60,1.00,0.00,1.00 -76.80,-9.60,1.00,0.00,1.00 -81.60,-9.60,1.00,0.00,1.00 -86.40,-9.60,1.00,0.00,1.00 -91.20,-9.60,1.00,0.00,1.00 -96.00,-9.60,1.00,0.00,1.00 -100.80,-9.60,1.00,0.00,1.00 -105.60,-9.60,1.00,0.00,1.00 -110.40,-9.60,1.00,0.00,1.00 -115.20,-9.60,1.00,0.00,1.00 -120.00,-9.60,1.00,0.00,1.00 -124.80,-9.60,1.00,0.00,1.00 -129.60,-9.60,1.00,0.00,1.00 -134.40,-4.80,1.00,0.00,1.00 -139.20,-4.80,1.00,0.00,1.00 -144.00,-4.80,1.00,0.00,1.00 -148.80,-4.80,1.00,0.00,1.00 -153.60,-4.80,1.00,0.00,1.00 -158.40,-4.80,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 -168.00,-0.00,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,0.00,1.00,0.00,1.00 --168.00,0.00,1.00,0.00,1.00 --163.20,4.80,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 --153.60,4.80,1.00,0.00,1.00 --148.80,4.80,1.00,0.00,1.00 --144.00,4.80,1.00,0.00,1.00 --139.20,4.80,1.00,0.00,1.00 --134.40,4.80,1.00,0.00,1.00 --129.60,9.60,1.00,0.00,1.00 --124.80,9.60,1.00,0.00,1.00 --120.00,9.60,1.00,0.00,1.00 --115.20,9.60,1.00,0.00,1.00 --110.40,9.60,1.00,0.00,1.00 --105.60,9.60,1.00,0.00,1.00 --100.80,9.60,1.00,0.00,1.00 --96.00,9.60,1.00,0.00,1.00 --91.20,9.60,1.00,0.00,1.00 --86.40,9.60,1.00,0.00,1.00 --81.60,9.60,1.00,0.00,1.00 --76.80,9.60,1.00,0.00,1.00 --72.00,9.60,1.00,0.00,1.00 --67.20,9.60,1.00,0.00,1.00 --62.40,9.60,1.00,0.00,1.00 --57.60,9.60,1.00,0.00,1.00 --52.80,9.60,1.00,0.00,1.00 --48.00,4.80,1.00,0.00,1.00 --43.20,4.80,1.00,0.00,1.00 --38.40,4.80,1.00,0.00,1.00 --33.60,4.80,1.00,0.00,1.00 --28.80,4.80,1.00,0.00,1.00 --24.00,4.80,1.00,0.00,1.00 --19.20,4.80,1.00,0.00,1.00 --14.40,0.00,1.00,0.00,1.00 --9.60,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -9.60,-0.00,1.00,0.00,1.00 -14.40,-4.80,1.00,0.00,1.00 -19.20,-4.80,1.00,0.00,1.00 -24.00,-4.80,1.00,0.00,1.00 -28.80,-4.80,1.00,0.00,1.00 -33.60,-9.60,1.00,0.00,1.00 -38.40,-9.60,1.00,0.00,1.00 -43.20,-9.60,1.00,0.00,1.00 -48.00,-9.60,1.00,0.00,1.00 -52.80,-9.60,1.00,0.00,1.00 -57.60,-14.40,1.00,0.00,1.00 -62.40,-14.40,1.00,0.00,1.00 -67.20,-14.40,1.00,0.00,1.00 -72.00,-14.40,1.00,0.00,1.00 -76.80,-14.40,1.00,0.00,1.00 -81.60,-14.40,1.00,0.00,1.00 -86.40,-14.40,1.00,0.00,1.00 -91.20,-14.40,1.00,0.00,1.00 -96.00,-14.40,1.00,0.00,1.00 -100.80,-14.40,1.00,0.00,1.00 -105.60,-14.40,1.00,0.00,1.00 -110.40,-14.40,1.00,0.00,1.00 -115.20,-14.40,1.00,0.00,1.00 -120.00,-14.40,1.00,0.00,1.00 -124.80,-9.60,1.00,0.00,1.00 -129.60,-9.60,1.00,0.00,1.00 -134.40,-9.60,1.00,0.00,1.00 -139.20,-9.60,1.00,0.00,1.00 -144.00,-9.60,1.00,0.00,1.00 -148.80,-9.60,1.00,0.00,1.00 -153.60,-4.80,1.00,0.00,1.00 -158.40,-4.80,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 -168.00,-4.80,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,0.00,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 --163.20,4.80,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 --153.60,4.80,1.00,0.00,1.00 --148.80,9.60,1.00,0.00,1.00 --144.00,9.60,1.00,0.00,1.00 --139.20,9.60,1.00,0.00,1.00 --134.40,9.60,1.00,0.00,1.00 --129.60,9.60,1.00,0.00,1.00 --124.80,9.60,1.00,0.00,1.00 --120.00,14.40,1.00,0.00,1.00 --115.20,14.40,1.00,0.00,1.00 --110.40,14.40,1.00,0.00,1.00 --105.60,14.40,1.00,0.00,1.00 --100.80,14.40,1.00,0.00,1.00 --96.00,14.40,1.00,0.00,1.00 --91.20,14.40,1.00,0.00,1.00 --86.40,14.40,1.00,0.00,1.00 --81.60,14.40,1.00,0.00,1.00 --76.80,14.40,1.00,0.00,1.00 --72.00,14.40,1.00,0.00,1.00 --67.20,14.40,1.00,0.00,1.00 --62.40,14.40,1.00,0.00,1.00 --57.60,14.40,1.00,0.00,1.00 --52.80,9.60,1.00,0.00,1.00 --48.00,9.60,1.00,0.00,1.00 --43.20,9.60,1.00,0.00,1.00 --38.40,9.60,1.00,0.00,1.00 --33.60,9.60,1.00,0.00,1.00 --28.80,4.80,1.00,0.00,1.00 --24.00,4.80,1.00,0.00,1.00 --19.20,4.80,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 --9.60,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 -14.40,-4.80,1.00,0.00,1.00 -19.20,-4.80,1.00,0.00,1.00 -24.00,-9.60,1.00,0.00,1.00 -28.80,-9.60,1.00,0.00,1.00 -33.60,-9.60,1.00,0.00,1.00 -38.40,-9.60,1.00,0.00,1.00 -43.20,-14.40,1.00,0.00,1.00 -48.00,-14.40,1.00,0.00,1.00 -52.80,-14.40,1.00,0.00,1.00 -57.60,-14.40,1.00,0.00,1.00 -62.40,-19.20,1.00,0.00,1.00 -67.20,-19.20,1.00,0.00,1.00 -72.00,-19.20,1.00,0.00,1.00 -76.80,-19.20,1.00,0.00,1.00 -81.60,-19.20,1.00,0.00,1.00 -86.40,-19.20,1.00,0.00,1.00 -91.20,-19.20,1.00,0.00,1.00 -96.00,-19.20,1.00,0.00,1.00 -100.80,-19.20,1.00,0.00,1.00 -105.60,-19.20,1.00,0.00,1.00 -110.40,-19.20,1.00,0.00,1.00 -115.20,-19.20,1.00,0.00,1.00 -120.00,-14.40,1.00,0.00,1.00 -124.80,-14.40,1.00,0.00,1.00 -129.60,-14.40,1.00,0.00,1.00 -134.40,-14.40,1.00,0.00,1.00 -139.20,-14.40,1.00,0.00,1.00 -144.00,-9.60,1.00,0.00,1.00 -148.80,-9.60,1.00,0.00,1.00 -153.60,-9.60,1.00,0.00,1.00 -158.40,-4.80,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 -168.00,-4.80,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,0.00,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 --163.20,4.80,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 --153.60,9.60,1.00,0.00,1.00 --148.80,9.60,1.00,0.00,1.00 --144.00,9.60,1.00,0.00,1.00 --139.20,14.40,1.00,0.00,1.00 --134.40,14.40,1.00,0.00,1.00 --129.60,14.40,1.00,0.00,1.00 --124.80,14.40,1.00,0.00,1.00 --120.00,14.40,1.00,0.00,1.00 --115.20,19.20,1.00,0.00,1.00 --110.40,19.20,1.00,0.00,1.00 --105.60,19.20,1.00,0.00,1.00 --100.80,19.20,1.00,0.00,1.00 --96.00,19.20,1.00,0.00,1.00 --91.20,19.20,1.00,0.00,1.00 --86.40,19.20,1.00,0.00,1.00 --81.60,19.20,1.00,0.00,1.00 --76.80,19.20,1.00,0.00,1.00 --72.00,19.20,1.00,0.00,1.00 --67.20,19.20,1.00,0.00,1.00 --62.40,19.20,1.00,0.00,1.00 --57.60,14.40,1.00,0.00,1.00 --52.80,14.40,1.00,0.00,1.00 --48.00,14.40,1.00,0.00,1.00 --43.20,14.40,1.00,0.00,1.00 --38.40,9.60,1.00,0.00,1.00 --33.60,9.60,1.00,0.00,1.00 --28.80,9.60,1.00,0.00,1.00 --24.00,9.60,1.00,0.00,1.00 --19.20,4.80,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 -14.40,-4.80,1.00,0.00,1.00 -19.20,-9.60,1.00,0.00,1.00 -24.00,-9.60,1.00,0.00,1.00 -28.80,-9.60,1.00,0.00,1.00 -33.60,-14.40,1.00,0.00,1.00 -33.60,-14.40,1.00,0.00,1.00 -38.40,-14.40,1.00,0.00,1.00 -43.20,-19.20,1.00,0.00,1.00 -48.00,-19.20,1.00,0.00,1.00 -57.60,-19.20,1.00,0.00,1.00 -62.40,-19.20,1.00,0.00,1.00 -67.20,-24.00,1.00,0.00,1.00 -72.00,-24.00,1.00,0.00,1.00 -76.80,-24.00,1.00,0.00,1.00 -81.60,-24.00,1.00,0.00,1.00 -86.40,-24.00,1.00,0.00,1.00 -91.20,-24.00,1.00,0.00,1.00 -96.00,-24.00,1.00,0.00,1.00 -100.80,-24.00,1.00,0.00,1.00 -105.60,-24.00,1.00,0.00,1.00 -110.40,-24.00,1.00,0.00,1.00 -115.20,-19.20,1.00,0.00,1.00 -120.00,-19.20,1.00,0.00,1.00 -129.60,-19.20,1.00,0.00,1.00 -134.40,-19.20,1.00,0.00,1.00 -139.20,-19.20,1.00,0.00,1.00 -144.00,-14.40,1.00,0.00,1.00 -148.80,-14.40,1.00,0.00,1.00 -148.80,-14.40,1.00,0.00,1.00 -153.60,-9.60,1.00,0.00,1.00 -158.40,-9.60,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 -168.00,-4.80,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 --163.20,4.80,1.00,0.00,1.00 --158.40,9.60,1.00,0.00,1.00 --153.60,9.60,1.00,0.00,1.00 --148.80,14.40,1.00,0.00,1.00 --148.80,14.40,1.00,0.00,1.00 --144.00,14.40,1.00,0.00,1.00 --139.20,19.20,1.00,0.00,1.00 --134.40,19.20,1.00,0.00,1.00 --129.60,19.20,1.00,0.00,1.00 --120.00,19.20,1.00,0.00,1.00 --115.20,19.20,1.00,0.00,1.00 --110.40,24.00,1.00,0.00,1.00 --105.60,24.00,1.00,0.00,1.00 --100.80,24.00,1.00,0.00,1.00 --96.00,24.00,1.00,0.00,1.00 --91.20,24.00,1.00,0.00,1.00 --86.40,24.00,1.00,0.00,1.00 --81.60,24.00,1.00,0.00,1.00 --76.80,24.00,1.00,0.00,1.00 --72.00,24.00,1.00,0.00,1.00 --67.20,24.00,1.00,0.00,1.00 --62.40,19.20,1.00,0.00,1.00 --57.60,19.20,1.00,0.00,1.00 --48.00,19.20,1.00,0.00,1.00 --43.20,19.20,1.00,0.00,1.00 --38.40,14.40,1.00,0.00,1.00 --33.60,14.40,1.00,0.00,1.00 --33.60,14.40,1.00,0.00,1.00 --28.80,9.60,1.00,0.00,1.00 --24.00,9.60,1.00,0.00,1.00 --19.20,9.60,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 -14.40,-4.80,1.00,0.00,1.00 -19.20,-9.60,1.00,0.00,1.00 -19.20,-9.60,1.00,0.00,1.00 -24.00,-14.40,1.00,0.00,1.00 -28.80,-14.40,1.00,0.00,1.00 -33.60,-19.20,1.00,0.00,1.00 -38.40,-19.20,1.00,0.00,1.00 -43.20,-19.20,1.00,0.00,1.00 -48.00,-24.00,1.00,0.00,1.00 -52.80,-24.00,1.00,0.00,1.00 -57.60,-24.00,1.00,0.00,1.00 -62.40,-24.00,1.00,0.00,1.00 -72.00,-28.80,1.00,0.00,1.00 -76.80,-28.80,1.00,0.00,1.00 -81.60,-28.80,1.00,0.00,1.00 -86.40,-28.80,1.00,0.00,1.00 -91.20,-28.80,1.00,0.00,1.00 -96.00,-28.80,1.00,0.00,1.00 -100.80,-28.80,1.00,0.00,1.00 -105.60,-28.80,1.00,0.00,1.00 -115.20,-28.80,1.00,0.00,1.00 -120.00,-24.00,1.00,0.00,1.00 -124.80,-24.00,1.00,0.00,1.00 -129.60,-24.00,1.00,0.00,1.00 -134.40,-24.00,1.00,0.00,1.00 -139.20,-19.20,1.00,0.00,1.00 -144.00,-19.20,1.00,0.00,1.00 -148.80,-14.40,1.00,0.00,1.00 -153.60,-14.40,1.00,0.00,1.00 -158.40,-14.40,1.00,0.00,1.00 -163.20,-9.60,1.00,0.00,1.00 -163.20,-9.60,1.00,0.00,1.00 -168.00,-4.80,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 --163.20,9.60,1.00,0.00,1.00 --163.20,9.60,1.00,0.00,1.00 --158.40,14.40,1.00,0.00,1.00 --153.60,14.40,1.00,0.00,1.00 --148.80,14.40,1.00,0.00,1.00 --144.00,19.20,1.00,0.00,1.00 --139.20,19.20,1.00,0.00,1.00 --134.40,24.00,1.00,0.00,1.00 --129.60,24.00,1.00,0.00,1.00 --124.80,24.00,1.00,0.00,1.00 --120.00,24.00,1.00,0.00,1.00 --115.20,28.80,1.00,0.00,1.00 --105.60,28.80,1.00,0.00,1.00 --100.80,28.80,1.00,0.00,1.00 --96.00,28.80,1.00,0.00,1.00 --91.20,28.80,1.00,0.00,1.00 --86.40,28.80,1.00,0.00,1.00 --81.60,28.80,1.00,0.00,1.00 --76.80,28.80,1.00,0.00,1.00 --72.00,28.80,1.00,0.00,1.00 --62.40,24.00,1.00,0.00,1.00 --57.60,24.00,1.00,0.00,1.00 --52.80,24.00,1.00,0.00,1.00 --48.00,24.00,1.00,0.00,1.00 --43.20,19.20,1.00,0.00,1.00 --38.40,19.20,1.00,0.00,1.00 --33.60,19.20,1.00,0.00,1.00 --28.80,14.40,1.00,0.00,1.00 --24.00,14.40,1.00,0.00,1.00 --19.20,9.60,1.00,0.00,1.00 --19.20,9.60,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 -19.20,-14.40,1.00,0.00,1.00 -24.00,-14.40,1.00,0.00,1.00 -28.80,-19.20,1.00,0.00,1.00 -33.60,-19.20,1.00,0.00,1.00 -38.40,-24.00,1.00,0.00,1.00 -43.20,-24.00,1.00,0.00,1.00 -48.00,-24.00,1.00,0.00,1.00 -52.80,-28.80,1.00,0.00,1.00 -57.60,-28.80,1.00,0.00,1.00 -62.40,-28.80,1.00,0.00,1.00 -67.20,-33.60,1.00,0.00,1.00 -72.00,-33.60,1.00,0.00,1.00 -81.60,-33.60,1.00,0.00,1.00 -86.40,-33.60,1.00,0.00,1.00 -91.20,-33.60,1.00,0.00,1.00 -96.00,-33.60,1.00,0.00,1.00 -100.80,-33.60,1.00,0.00,1.00 -110.40,-33.60,1.00,0.00,1.00 -115.20,-33.60,1.00,0.00,1.00 -120.00,-28.80,1.00,0.00,1.00 -124.80,-28.80,1.00,0.00,1.00 -129.60,-28.80,1.00,0.00,1.00 -134.40,-24.00,1.00,0.00,1.00 -139.20,-24.00,1.00,0.00,1.00 -144.00,-19.20,1.00,0.00,1.00 -148.80,-19.20,1.00,0.00,1.00 -153.60,-14.40,1.00,0.00,1.00 -158.40,-14.40,1.00,0.00,1.00 -163.20,-9.60,1.00,0.00,1.00 -168.00,-9.60,1.00,0.00,1.00 -168.00,-4.80,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 --168.00,9.60,1.00,0.00,1.00 --163.20,9.60,1.00,0.00,1.00 --158.40,14.40,1.00,0.00,1.00 --153.60,14.40,1.00,0.00,1.00 --148.80,19.20,1.00,0.00,1.00 --144.00,19.20,1.00,0.00,1.00 --139.20,24.00,1.00,0.00,1.00 --134.40,24.00,1.00,0.00,1.00 --129.60,28.80,1.00,0.00,1.00 --124.80,28.80,1.00,0.00,1.00 --120.00,28.80,1.00,0.00,1.00 --115.20,33.60,1.00,0.00,1.00 --110.40,33.60,1.00,0.00,1.00 --100.80,33.60,1.00,0.00,1.00 --96.00,33.60,1.00,0.00,1.00 --91.20,33.60,1.00,0.00,1.00 --86.40,33.60,1.00,0.00,1.00 --81.60,33.60,1.00,0.00,1.00 --72.00,33.60,1.00,0.00,1.00 --67.20,33.60,1.00,0.00,1.00 --62.40,28.80,1.00,0.00,1.00 --57.60,28.80,1.00,0.00,1.00 --52.80,28.80,1.00,0.00,1.00 --48.00,24.00,1.00,0.00,1.00 --43.20,24.00,1.00,0.00,1.00 --38.40,24.00,1.00,0.00,1.00 --33.60,19.20,1.00,0.00,1.00 --28.80,19.20,1.00,0.00,1.00 --24.00,14.40,1.00,0.00,1.00 --19.20,14.40,1.00,0.00,1.00 --14.40,9.60,1.00,0.00,1.00 --14.40,9.60,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 -9.60,-9.60,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 -19.20,-14.40,1.00,0.00,1.00 -24.00,-19.20,1.00,0.00,1.00 -28.80,-19.20,1.00,0.00,1.00 -33.60,-24.00,1.00,0.00,1.00 -38.40,-24.00,1.00,0.00,1.00 -43.20,-28.80,1.00,0.00,1.00 -48.00,-28.80,1.00,0.00,1.00 -52.80,-33.60,1.00,0.00,1.00 -57.60,-33.60,1.00,0.00,1.00 -62.40,-33.60,1.00,0.00,1.00 -67.20,-38.40,1.00,0.00,1.00 -72.00,-38.40,1.00,0.00,1.00 -81.60,-38.40,1.00,0.00,1.00 -86.40,-38.40,1.00,0.00,1.00 -91.20,-38.40,1.00,0.00,1.00 -96.00,-38.40,1.00,0.00,1.00 -105.60,-38.40,1.00,0.00,1.00 -110.40,-38.40,1.00,0.00,1.00 -115.20,-33.60,1.00,0.00,1.00 -120.00,-33.60,1.00,0.00,1.00 -124.80,-33.60,1.00,0.00,1.00 -129.60,-28.80,1.00,0.00,1.00 -134.40,-28.80,1.00,0.00,1.00 -139.20,-24.00,1.00,0.00,1.00 -144.00,-24.00,1.00,0.00,1.00 -148.80,-19.20,1.00,0.00,1.00 -153.60,-19.20,1.00,0.00,1.00 -158.40,-14.40,1.00,0.00,1.00 -163.20,-14.40,1.00,0.00,1.00 -168.00,-9.60,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --168.00,9.60,1.00,0.00,1.00 --163.20,14.40,1.00,0.00,1.00 --158.40,14.40,1.00,0.00,1.00 --153.60,19.20,1.00,0.00,1.00 --148.80,19.20,1.00,0.00,1.00 --144.00,24.00,1.00,0.00,1.00 --139.20,24.00,1.00,0.00,1.00 --134.40,28.80,1.00,0.00,1.00 --129.60,28.80,1.00,0.00,1.00 --124.80,33.60,1.00,0.00,1.00 --120.00,33.60,1.00,0.00,1.00 --115.20,33.60,1.00,0.00,1.00 --110.40,38.40,1.00,0.00,1.00 --105.60,38.40,1.00,0.00,1.00 --96.00,38.40,1.00,0.00,1.00 --91.20,38.40,1.00,0.00,1.00 --86.40,38.40,1.00,0.00,1.00 --81.60,38.40,1.00,0.00,1.00 --72.00,38.40,1.00,0.00,1.00 --67.20,38.40,1.00,0.00,1.00 --62.40,33.60,1.00,0.00,1.00 --57.60,33.60,1.00,0.00,1.00 --52.80,33.60,1.00,0.00,1.00 --48.00,28.80,1.00,0.00,1.00 --43.20,28.80,1.00,0.00,1.00 --38.40,24.00,1.00,0.00,1.00 --33.60,24.00,1.00,0.00,1.00 --28.80,19.20,1.00,0.00,1.00 --24.00,19.20,1.00,0.00,1.00 --19.20,14.40,1.00,0.00,1.00 --14.40,9.60,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -9.60,-9.60,1.00,0.00,1.00 -14.40,-14.40,1.00,0.00,1.00 -19.20,-14.40,1.00,0.00,1.00 -24.00,-19.20,1.00,0.00,1.00 -24.00,-24.00,1.00,0.00,1.00 -28.80,-24.00,1.00,0.00,1.00 -33.60,-28.80,1.00,0.00,1.00 -38.40,-28.80,1.00,0.00,1.00 -43.20,-33.60,1.00,0.00,1.00 -48.00,-33.60,1.00,0.00,1.00 -52.80,-38.40,1.00,0.00,1.00 -62.40,-38.40,1.00,0.00,1.00 -67.20,-38.40,1.00,0.00,1.00 -72.00,-43.20,1.00,0.00,1.00 -76.80,-43.20,1.00,0.00,1.00 -86.40,-43.20,1.00,0.00,1.00 -91.20,-43.20,1.00,0.00,1.00 -96.00,-43.20,1.00,0.00,1.00 -105.60,-43.20,1.00,0.00,1.00 -110.40,-43.20,1.00,0.00,1.00 -115.20,-38.40,1.00,0.00,1.00 -124.80,-38.40,1.00,0.00,1.00 -129.60,-38.40,1.00,0.00,1.00 -134.40,-33.60,1.00,0.00,1.00 -139.20,-33.60,1.00,0.00,1.00 -144.00,-28.80,1.00,0.00,1.00 -148.80,-28.80,1.00,0.00,1.00 -153.60,-24.00,1.00,0.00,1.00 -158.40,-19.20,1.00,0.00,1.00 -158.40,-19.20,1.00,0.00,1.00 -163.20,-14.40,1.00,0.00,1.00 -168.00,-9.60,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --168.00,9.60,1.00,0.00,1.00 --163.20,14.40,1.00,0.00,1.00 --158.40,19.20,1.00,0.00,1.00 --158.40,19.20,1.00,0.00,1.00 --153.60,24.00,1.00,0.00,1.00 --148.80,28.80,1.00,0.00,1.00 --144.00,28.80,1.00,0.00,1.00 --139.20,33.60,1.00,0.00,1.00 --134.40,33.60,1.00,0.00,1.00 --129.60,38.40,1.00,0.00,1.00 --124.80,38.40,1.00,0.00,1.00 --115.20,38.40,1.00,0.00,1.00 --110.40,43.20,1.00,0.00,1.00 --105.60,43.20,1.00,0.00,1.00 --96.00,43.20,1.00,0.00,1.00 --91.20,43.20,1.00,0.00,1.00 --86.40,43.20,1.00,0.00,1.00 --76.80,43.20,1.00,0.00,1.00 --72.00,43.20,1.00,0.00,1.00 --67.20,38.40,1.00,0.00,1.00 --62.40,38.40,1.00,0.00,1.00 --52.80,38.40,1.00,0.00,1.00 --48.00,33.60,1.00,0.00,1.00 --43.20,33.60,1.00,0.00,1.00 --38.40,28.80,1.00,0.00,1.00 --33.60,28.80,1.00,0.00,1.00 --28.80,24.00,1.00,0.00,1.00 --24.00,24.00,1.00,0.00,1.00 --24.00,19.20,1.00,0.00,1.00 --19.20,14.40,1.00,0.00,1.00 --14.40,14.40,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -9.60,-9.60,1.00,0.00,1.00 -14.40,-14.40,1.00,0.00,1.00 -14.40,-19.20,1.00,0.00,1.00 -19.20,-19.20,1.00,0.00,1.00 -24.00,-24.00,1.00,0.00,1.00 -28.80,-28.80,1.00,0.00,1.00 -33.60,-28.80,1.00,0.00,1.00 -38.40,-33.60,1.00,0.00,1.00 -43.20,-38.40,1.00,0.00,1.00 -48.00,-38.40,1.00,0.00,1.00 -52.80,-43.20,1.00,0.00,1.00 -57.60,-43.20,1.00,0.00,1.00 -62.40,-43.20,1.00,0.00,1.00 -72.00,-48.00,1.00,0.00,1.00 -76.80,-48.00,1.00,0.00,1.00 -86.40,-48.00,1.00,0.00,1.00 -91.20,-48.00,1.00,0.00,1.00 -100.80,-48.00,1.00,0.00,1.00 -105.60,-48.00,1.00,0.00,1.00 -110.40,-48.00,1.00,0.00,1.00 -120.00,-43.20,1.00,0.00,1.00 -124.80,-43.20,1.00,0.00,1.00 -129.60,-38.40,1.00,0.00,1.00 -134.40,-38.40,1.00,0.00,1.00 -139.20,-33.60,1.00,0.00,1.00 -144.00,-33.60,1.00,0.00,1.00 -148.80,-28.80,1.00,0.00,1.00 -153.60,-24.00,1.00,0.00,1.00 -158.40,-24.00,1.00,0.00,1.00 -163.20,-19.20,1.00,0.00,1.00 -163.20,-14.40,1.00,0.00,1.00 -168.00,-14.40,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --168.00,14.40,1.00,0.00,1.00 --163.20,14.40,1.00,0.00,1.00 --163.20,19.20,1.00,0.00,1.00 --158.40,24.00,1.00,0.00,1.00 --153.60,24.00,1.00,0.00,1.00 --148.80,28.80,1.00,0.00,1.00 --144.00,33.60,1.00,0.00,1.00 --139.20,33.60,1.00,0.00,1.00 --134.40,38.40,1.00,0.00,1.00 --129.60,38.40,1.00,0.00,1.00 --124.80,43.20,1.00,0.00,1.00 --120.00,43.20,1.00,0.00,1.00 --110.40,48.00,1.00,0.00,1.00 --105.60,48.00,1.00,0.00,1.00 --100.80,48.00,1.00,0.00,1.00 --91.20,48.00,1.00,0.00,1.00 --86.40,48.00,1.00,0.00,1.00 --76.80,48.00,1.00,0.00,1.00 --72.00,48.00,1.00,0.00,1.00 --62.40,43.20,1.00,0.00,1.00 --57.60,43.20,1.00,0.00,1.00 --52.80,43.20,1.00,0.00,1.00 --48.00,38.40,1.00,0.00,1.00 --43.20,38.40,1.00,0.00,1.00 --38.40,33.60,1.00,0.00,1.00 --33.60,28.80,1.00,0.00,1.00 --28.80,28.80,1.00,0.00,1.00 --24.00,24.00,1.00,0.00,1.00 --19.20,19.20,1.00,0.00,1.00 --14.40,19.20,1.00,0.00,1.00 --14.40,14.40,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -4.80,-9.60,1.00,0.00,1.00 -9.60,-9.60,1.00,0.00,1.00 -9.60,-14.40,1.00,0.00,1.00 -14.40,-19.20,1.00,0.00,1.00 -19.20,-24.00,1.00,0.00,1.00 -24.00,-24.00,1.00,0.00,1.00 -24.00,-28.80,1.00,0.00,1.00 -28.80,-33.60,1.00,0.00,1.00 -33.60,-38.40,1.00,0.00,1.00 -38.40,-38.40,1.00,0.00,1.00 -43.20,-43.20,1.00,0.00,1.00 -48.00,-43.20,1.00,0.00,1.00 -52.80,-48.00,1.00,0.00,1.00 -62.40,-48.00,1.00,0.00,1.00 -67.20,-52.80,1.00,0.00,1.00 -76.80,-52.80,1.00,0.00,1.00 -86.40,-52.80,1.00,0.00,1.00 -91.20,-52.80,1.00,0.00,1.00 -100.80,-52.80,1.00,0.00,1.00 -105.60,-52.80,1.00,0.00,1.00 -115.20,-48.00,1.00,0.00,1.00 -120.00,-48.00,1.00,0.00,1.00 -129.60,-48.00,1.00,0.00,1.00 -134.40,-43.20,1.00,0.00,1.00 -139.20,-43.20,1.00,0.00,1.00 -144.00,-38.40,1.00,0.00,1.00 -148.80,-33.60,1.00,0.00,1.00 -153.60,-33.60,1.00,0.00,1.00 -158.40,-28.80,1.00,0.00,1.00 -158.40,-24.00,1.00,0.00,1.00 -163.20,-19.20,1.00,0.00,1.00 -168.00,-19.20,1.00,0.00,1.00 -168.00,-14.40,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --168.00,14.40,1.00,0.00,1.00 --168.00,19.20,1.00,0.00,1.00 --163.20,19.20,1.00,0.00,1.00 --158.40,24.00,1.00,0.00,1.00 --158.40,28.80,1.00,0.00,1.00 --153.60,33.60,1.00,0.00,1.00 --148.80,33.60,1.00,0.00,1.00 --144.00,38.40,1.00,0.00,1.00 --139.20,43.20,1.00,0.00,1.00 --134.40,43.20,1.00,0.00,1.00 --129.60,48.00,1.00,0.00,1.00 --120.00,48.00,1.00,0.00,1.00 --115.20,48.00,1.00,0.00,1.00 --105.60,52.80,1.00,0.00,1.00 --100.80,52.80,1.00,0.00,1.00 --91.20,52.80,1.00,0.00,1.00 --86.40,52.80,1.00,0.00,1.00 --76.80,52.80,1.00,0.00,1.00 --67.20,52.80,1.00,0.00,1.00 --62.40,48.00,1.00,0.00,1.00 --52.80,48.00,1.00,0.00,1.00 --48.00,43.20,1.00,0.00,1.00 --43.20,43.20,1.00,0.00,1.00 --38.40,38.40,1.00,0.00,1.00 --33.60,38.40,1.00,0.00,1.00 --28.80,33.60,1.00,0.00,1.00 --24.00,28.80,1.00,0.00,1.00 --24.00,24.00,1.00,0.00,1.00 --19.20,24.00,1.00,0.00,1.00 --14.40,19.20,1.00,0.00,1.00 --9.60,14.40,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 --4.80,9.60,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -4.80,-9.60,1.00,0.00,1.00 -9.60,-14.40,1.00,0.00,1.00 -9.60,-14.40,1.00,0.00,1.00 -14.40,-19.20,1.00,0.00,1.00 -14.40,-24.00,1.00,0.00,1.00 -19.20,-28.80,1.00,0.00,1.00 -24.00,-33.60,1.00,0.00,1.00 -28.80,-33.60,1.00,0.00,1.00 -28.80,-38.40,1.00,0.00,1.00 -33.60,-43.20,1.00,0.00,1.00 -38.40,-43.20,1.00,0.00,1.00 -48.00,-48.00,1.00,0.00,1.00 -52.80,-52.80,1.00,0.00,1.00 -57.60,-52.80,1.00,0.00,1.00 -67.20,-57.60,1.00,0.00,1.00 -76.80,-57.60,1.00,0.00,1.00 -81.60,-57.60,1.00,0.00,1.00 -91.20,-57.60,1.00,0.00,1.00 -100.80,-57.60,1.00,0.00,1.00 -110.40,-57.60,1.00,0.00,1.00 -115.20,-52.80,1.00,0.00,1.00 -124.80,-52.80,1.00,0.00,1.00 -129.60,-48.00,1.00,0.00,1.00 -139.20,-48.00,1.00,0.00,1.00 -144.00,-43.20,1.00,0.00,1.00 -148.80,-38.40,1.00,0.00,1.00 -153.60,-38.40,1.00,0.00,1.00 -153.60,-33.60,1.00,0.00,1.00 -158.40,-28.80,1.00,0.00,1.00 -163.20,-24.00,1.00,0.00,1.00 -163.20,-24.00,1.00,0.00,1.00 -168.00,-19.20,1.00,0.00,1.00 -172.80,-14.40,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --172.80,14.40,1.00,0.00,1.00 --168.00,19.20,1.00,0.00,1.00 --163.20,24.00,1.00,0.00,1.00 --163.20,24.00,1.00,0.00,1.00 --158.40,28.80,1.00,0.00,1.00 --153.60,33.60,1.00,0.00,1.00 --153.60,38.40,1.00,0.00,1.00 --148.80,38.40,1.00,0.00,1.00 --144.00,43.20,1.00,0.00,1.00 --139.20,48.00,1.00,0.00,1.00 --129.60,48.00,1.00,0.00,1.00 --124.80,52.80,1.00,0.00,1.00 --115.20,52.80,1.00,0.00,1.00 --110.40,57.60,1.00,0.00,1.00 --100.80,57.60,1.00,0.00,1.00 --91.20,57.60,1.00,0.00,1.00 --81.60,57.60,1.00,0.00,1.00 --76.80,57.60,1.00,0.00,1.00 --67.20,57.60,1.00,0.00,1.00 --57.60,52.80,1.00,0.00,1.00 --52.80,52.80,1.00,0.00,1.00 --48.00,48.00,1.00,0.00,1.00 --38.40,43.20,1.00,0.00,1.00 --33.60,43.20,1.00,0.00,1.00 --28.80,38.40,1.00,0.00,1.00 --28.80,33.60,1.00,0.00,1.00 --24.00,33.60,1.00,0.00,1.00 --19.20,28.80,1.00,0.00,1.00 --14.40,24.00,1.00,0.00,1.00 --14.40,19.20,1.00,0.00,1.00 --9.60,14.40,1.00,0.00,1.00 --9.60,14.40,1.00,0.00,1.00 --4.80,9.60,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -4.80,-9.60,1.00,0.00,1.00 -4.80,-14.40,1.00,0.00,1.00 -9.60,-19.20,1.00,0.00,1.00 -9.60,-19.20,1.00,0.00,1.00 -14.40,-24.00,1.00,0.00,1.00 -19.20,-28.80,1.00,0.00,1.00 -19.20,-33.60,1.00,0.00,1.00 -24.00,-38.40,1.00,0.00,1.00 -28.80,-43.20,1.00,0.00,1.00 -33.60,-43.20,1.00,0.00,1.00 -38.40,-48.00,1.00,0.00,1.00 -43.20,-52.80,1.00,0.00,1.00 -48.00,-52.80,1.00,0.00,1.00 -52.80,-57.60,1.00,0.00,1.00 -62.40,-57.60,1.00,0.00,1.00 -72.00,-62.40,1.00,0.00,1.00 -81.60,-62.40,1.00,0.00,1.00 -91.20,-62.40,1.00,0.00,1.00 -100.80,-62.40,1.00,0.00,1.00 -110.40,-62.40,1.00,0.00,1.00 -120.00,-57.60,1.00,0.00,1.00 -129.60,-57.60,1.00,0.00,1.00 -134.40,-52.80,1.00,0.00,1.00 -139.20,-48.00,1.00,0.00,1.00 -144.00,-48.00,1.00,0.00,1.00 -148.80,-43.20,1.00,0.00,1.00 -153.60,-38.40,1.00,0.00,1.00 -158.40,-33.60,1.00,0.00,1.00 -163.20,-33.60,1.00,0.00,1.00 -163.20,-28.80,1.00,0.00,1.00 -168.00,-24.00,1.00,0.00,1.00 -168.00,-19.20,1.00,0.00,1.00 -172.80,-14.40,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --172.80,14.40,1.00,0.00,1.00 --168.00,19.20,1.00,0.00,1.00 --168.00,24.00,1.00,0.00,1.00 --163.20,28.80,1.00,0.00,1.00 --163.20,33.60,1.00,0.00,1.00 --158.40,33.60,1.00,0.00,1.00 --153.60,38.40,1.00,0.00,1.00 --148.80,43.20,1.00,0.00,1.00 --144.00,48.00,1.00,0.00,1.00 --139.20,48.00,1.00,0.00,1.00 --134.40,52.80,1.00,0.00,1.00 --129.60,57.60,1.00,0.00,1.00 --120.00,57.60,1.00,0.00,1.00 --110.40,62.40,1.00,0.00,1.00 --100.80,62.40,1.00,0.00,1.00 --91.20,62.40,1.00,0.00,1.00 --81.60,62.40,1.00,0.00,1.00 --72.00,62.40,1.00,0.00,1.00 --62.40,57.60,1.00,0.00,1.00 --52.80,57.60,1.00,0.00,1.00 --48.00,52.80,1.00,0.00,1.00 --43.20,52.80,1.00,0.00,1.00 --38.40,48.00,1.00,0.00,1.00 --33.60,43.20,1.00,0.00,1.00 --28.80,43.20,1.00,0.00,1.00 --24.00,38.40,1.00,0.00,1.00 --19.20,33.60,1.00,0.00,1.00 --19.20,28.80,1.00,0.00,1.00 --14.40,24.00,1.00,0.00,1.00 --9.60,19.20,1.00,0.00,1.00 --9.60,19.20,1.00,0.00,1.00 --4.80,14.40,1.00,0.00,1.00 --4.80,9.60,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -4.80,-9.60,1.00,0.00,1.00 -4.80,-14.40,1.00,0.00,1.00 -9.60,-19.20,1.00,0.00,1.00 -9.60,-24.00,1.00,0.00,1.00 -14.40,-24.00,1.00,0.00,1.00 -14.40,-28.80,1.00,0.00,1.00 -19.20,-33.60,1.00,0.00,1.00 -19.20,-38.40,1.00,0.00,1.00 -24.00,-43.20,1.00,0.00,1.00 -28.80,-48.00,1.00,0.00,1.00 -33.60,-52.80,1.00,0.00,1.00 -38.40,-52.80,1.00,0.00,1.00 -43.20,-57.60,1.00,0.00,1.00 -48.00,-62.40,1.00,0.00,1.00 -57.60,-62.40,1.00,0.00,1.00 -67.20,-67.20,1.00,0.00,1.00 -81.60,-67.20,1.00,0.00,1.00 -91.20,-67.20,1.00,0.00,1.00 -105.60,-67.20,1.00,0.00,1.00 -115.20,-67.20,1.00,0.00,1.00 -124.80,-62.40,1.00,0.00,1.00 -134.40,-57.60,1.00,0.00,1.00 -139.20,-57.60,1.00,0.00,1.00 -144.00,-52.80,1.00,0.00,1.00 -148.80,-48.00,1.00,0.00,1.00 -153.60,-43.20,1.00,0.00,1.00 -158.40,-43.20,1.00,0.00,1.00 -163.20,-38.40,1.00,0.00,1.00 -163.20,-33.60,1.00,0.00,1.00 -168.00,-28.80,1.00,0.00,1.00 -168.00,-24.00,1.00,0.00,1.00 -172.80,-19.20,1.00,0.00,1.00 -172.80,-14.40,1.00,0.00,1.00 -177.60,-9.60,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,9.60,1.00,0.00,1.00 --172.80,14.40,1.00,0.00,1.00 --172.80,19.20,1.00,0.00,1.00 --168.00,24.00,1.00,0.00,1.00 --168.00,28.80,1.00,0.00,1.00 --163.20,33.60,1.00,0.00,1.00 --163.20,38.40,1.00,0.00,1.00 --158.40,43.20,1.00,0.00,1.00 --153.60,43.20,1.00,0.00,1.00 --148.80,48.00,1.00,0.00,1.00 --144.00,52.80,1.00,0.00,1.00 --139.20,57.60,1.00,0.00,1.00 --134.40,57.60,1.00,0.00,1.00 --124.80,62.40,1.00,0.00,1.00 --115.20,67.20,1.00,0.00,1.00 --105.60,67.20,1.00,0.00,1.00 --91.20,67.20,1.00,0.00,1.00 --81.60,67.20,1.00,0.00,1.00 --67.20,67.20,1.00,0.00,1.00 --57.60,62.40,1.00,0.00,1.00 --48.00,62.40,1.00,0.00,1.00 --43.20,57.60,1.00,0.00,1.00 --38.40,52.80,1.00,0.00,1.00 --33.60,52.80,1.00,0.00,1.00 --28.80,48.00,1.00,0.00,1.00 --24.00,43.20,1.00,0.00,1.00 --19.20,38.40,1.00,0.00,1.00 --19.20,33.60,1.00,0.00,1.00 --14.40,28.80,1.00,0.00,1.00 --14.40,24.00,1.00,0.00,1.00 --9.60,24.00,1.00,0.00,1.00 --9.60,19.20,1.00,0.00,1.00 --4.80,14.40,1.00,0.00,1.00 --4.80,9.60,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -4.80,-9.60,1.00,0.00,1.00 -4.80,-14.40,1.00,0.00,1.00 -4.80,-19.20,1.00,0.00,1.00 -9.60,-24.00,1.00,0.00,1.00 -9.60,-28.80,1.00,0.00,1.00 -9.60,-33.60,1.00,0.00,1.00 -14.40,-38.40,1.00,0.00,1.00 -14.40,-38.40,1.00,0.00,1.00 -19.20,-43.20,1.00,0.00,1.00 -24.00,-48.00,1.00,0.00,1.00 -24.00,-52.80,1.00,0.00,1.00 -28.80,-57.60,1.00,0.00,1.00 -38.40,-62.40,1.00,0.00,1.00 -43.20,-62.40,1.00,0.00,1.00 -52.80,-67.20,1.00,0.00,1.00 -62.40,-72.00,1.00,0.00,1.00 -76.80,-72.00,1.00,0.00,1.00 -96.00,-72.00,1.00,0.00,1.00 -110.40,-72.00,1.00,0.00,1.00 -120.00,-67.20,1.00,0.00,1.00 -134.40,-67.20,1.00,0.00,1.00 -139.20,-62.40,1.00,0.00,1.00 -148.80,-57.60,1.00,0.00,1.00 -153.60,-57.60,1.00,0.00,1.00 -158.40,-52.80,1.00,0.00,1.00 -158.40,-48.00,1.00,0.00,1.00 -163.20,-43.20,1.00,0.00,1.00 -163.20,-38.40,1.00,0.00,1.00 -168.00,-33.60,1.00,0.00,1.00 -168.00,-28.80,1.00,0.00,1.00 -172.80,-24.00,1.00,0.00,1.00 -172.80,-19.20,1.00,0.00,1.00 -172.80,-14.40,1.00,0.00,1.00 -177.60,-9.60,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,9.60,1.00,0.00,1.00 --172.80,14.40,1.00,0.00,1.00 --172.80,19.20,1.00,0.00,1.00 --172.80,24.00,1.00,0.00,1.00 --168.00,28.80,1.00,0.00,1.00 --168.00,33.60,1.00,0.00,1.00 --163.20,38.40,1.00,0.00,1.00 --163.20,43.20,1.00,0.00,1.00 --158.40,48.00,1.00,0.00,1.00 --158.40,52.80,1.00,0.00,1.00 --153.60,57.60,1.00,0.00,1.00 --148.80,57.60,1.00,0.00,1.00 --139.20,62.40,1.00,0.00,1.00 --134.40,67.20,1.00,0.00,1.00 --120.00,67.20,1.00,0.00,1.00 --110.40,72.00,1.00,0.00,1.00 --96.00,72.00,1.00,0.00,1.00 --76.80,72.00,1.00,0.00,1.00 --62.40,72.00,1.00,0.00,1.00 --52.80,67.20,1.00,0.00,1.00 --43.20,62.40,1.00,0.00,1.00 --38.40,62.40,1.00,0.00,1.00 --28.80,57.60,1.00,0.00,1.00 --24.00,52.80,1.00,0.00,1.00 --24.00,48.00,1.00,0.00,1.00 --19.20,43.20,1.00,0.00,1.00 --14.40,38.40,1.00,0.00,1.00 --14.40,38.40,1.00,0.00,1.00 --9.60,33.60,1.00,0.00,1.00 --9.60,28.80,1.00,0.00,1.00 --9.60,24.00,1.00,0.00,1.00 --4.80,19.20,1.00,0.00,1.00 --4.80,14.40,1.00,0.00,1.00 --4.80,9.60,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -0.00,-9.60,1.00,0.00,1.00 -4.80,-14.40,1.00,0.00,1.00 -4.80,-19.20,1.00,0.00,1.00 -4.80,-24.00,1.00,0.00,1.00 -4.80,-28.80,1.00,0.00,1.00 -9.60,-33.60,1.00,0.00,1.00 -9.60,-38.40,1.00,0.00,1.00 -14.40,-43.20,1.00,0.00,1.00 -14.40,-48.00,1.00,0.00,1.00 -14.40,-52.80,1.00,0.00,1.00 -19.20,-57.60,1.00,0.00,1.00 -24.00,-57.60,1.00,0.00,1.00 -28.80,-62.40,1.00,0.00,1.00 -33.60,-67.20,1.00,0.00,1.00 -43.20,-72.00,1.00,0.00,1.00 -57.60,-72.00,1.00,0.00,1.00 -76.80,-76.80,1.00,0.00,1.00 -96.00,-76.80,1.00,0.00,1.00 -115.20,-76.80,1.00,0.00,1.00 -129.60,-72.00,1.00,0.00,1.00 -139.20,-72.00,1.00,0.00,1.00 -148.80,-67.20,1.00,0.00,1.00 -153.60,-62.40,1.00,0.00,1.00 -158.40,-57.60,1.00,0.00,1.00 -163.20,-52.80,1.00,0.00,1.00 -163.20,-48.00,1.00,0.00,1.00 -168.00,-43.20,1.00,0.00,1.00 -168.00,-38.40,1.00,0.00,1.00 -172.80,-33.60,1.00,0.00,1.00 -172.80,-28.80,1.00,0.00,1.00 -172.80,-24.00,1.00,0.00,1.00 -172.80,-19.20,1.00,0.00,1.00 -177.60,-14.40,1.00,0.00,1.00 -177.60,-9.60,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,9.60,1.00,0.00,1.00 --177.60,14.40,1.00,0.00,1.00 --172.80,19.20,1.00,0.00,1.00 --172.80,24.00,1.00,0.00,1.00 --172.80,28.80,1.00,0.00,1.00 --172.80,33.60,1.00,0.00,1.00 --168.00,38.40,1.00,0.00,1.00 --168.00,43.20,1.00,0.00,1.00 --163.20,48.00,1.00,0.00,1.00 --163.20,52.80,1.00,0.00,1.00 --158.40,57.60,1.00,0.00,1.00 --153.60,62.40,1.00,0.00,1.00 --148.80,67.20,1.00,0.00,1.00 --139.20,72.00,1.00,0.00,1.00 --129.60,72.00,1.00,0.00,1.00 --115.20,76.80,1.00,0.00,1.00 --96.00,76.80,1.00,0.00,1.00 --76.80,76.80,1.00,0.00,1.00 --57.60,72.00,1.00,0.00,1.00 --43.20,72.00,1.00,0.00,1.00 --33.60,67.20,1.00,0.00,1.00 --28.80,62.40,1.00,0.00,1.00 --24.00,57.60,1.00,0.00,1.00 --19.20,57.60,1.00,0.00,1.00 --14.40,52.80,1.00,0.00,1.00 --14.40,48.00,1.00,0.00,1.00 --14.40,43.20,1.00,0.00,1.00 --9.60,38.40,1.00,0.00,1.00 --9.60,33.60,1.00,0.00,1.00 --4.80,28.80,1.00,0.00,1.00 --4.80,24.00,1.00,0.00,1.00 --4.80,19.20,1.00,0.00,1.00 --4.80,14.40,1.00,0.00,1.00 --0.00,9.60,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -0.00,-9.60,1.00,0.00,1.00 -0.00,-14.40,1.00,0.00,1.00 -4.80,-19.20,1.00,0.00,1.00 -4.80,-24.00,1.00,0.00,1.00 -4.80,-28.80,1.00,0.00,1.00 -4.80,-33.60,1.00,0.00,1.00 -4.80,-38.40,1.00,0.00,1.00 -9.60,-43.20,1.00,0.00,1.00 -9.60,-48.00,1.00,0.00,1.00 -9.60,-52.80,1.00,0.00,1.00 -14.40,-57.60,1.00,0.00,1.00 -14.40,-62.40,1.00,0.00,1.00 -19.20,-67.20,1.00,0.00,1.00 -24.00,-72.00,1.00,0.00,1.00 -33.60,-72.00,1.00,0.00,1.00 -43.20,-76.80,1.00,0.00,1.00 -67.20,-81.60,1.00,0.00,1.00 -96.00,-81.60,1.00,0.00,1.00 -124.80,-81.60,1.00,0.00,1.00 -144.00,-76.80,1.00,0.00,1.00 -153.60,-72.00,1.00,0.00,1.00 -158.40,-67.20,1.00,0.00,1.00 -163.20,-62.40,1.00,0.00,1.00 -168.00,-57.60,1.00,0.00,1.00 -168.00,-52.80,1.00,0.00,1.00 -168.00,-48.00,1.00,0.00,1.00 -172.80,-43.20,1.00,0.00,1.00 -172.80,-38.40,1.00,0.00,1.00 -172.80,-33.60,1.00,0.00,1.00 -172.80,-28.80,1.00,0.00,1.00 -177.60,-24.00,1.00,0.00,1.00 -177.60,-19.20,1.00,0.00,1.00 -177.60,-14.40,1.00,0.00,1.00 -177.60,-9.60,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,9.60,1.00,0.00,1.00 --177.60,14.40,1.00,0.00,1.00 --177.60,19.20,1.00,0.00,1.00 --177.60,24.00,1.00,0.00,1.00 --172.80,28.80,1.00,0.00,1.00 --172.80,33.60,1.00,0.00,1.00 --172.80,38.40,1.00,0.00,1.00 --172.80,43.20,1.00,0.00,1.00 --168.00,48.00,1.00,0.00,1.00 --168.00,52.80,1.00,0.00,1.00 --168.00,57.60,1.00,0.00,1.00 --163.20,62.40,1.00,0.00,1.00 --158.40,67.20,1.00,0.00,1.00 --153.60,72.00,1.00,0.00,1.00 --144.00,76.80,1.00,0.00,1.00 --124.80,81.60,1.00,0.00,1.00 --96.00,81.60,1.00,0.00,1.00 --67.20,81.60,1.00,0.00,1.00 --43.20,76.80,1.00,0.00,1.00 --33.60,72.00,1.00,0.00,1.00 --24.00,72.00,1.00,0.00,1.00 --19.20,67.20,1.00,0.00,1.00 --14.40,62.40,1.00,0.00,1.00 --14.40,57.60,1.00,0.00,1.00 --9.60,52.80,1.00,0.00,1.00 --9.60,48.00,1.00,0.00,1.00 --9.60,43.20,1.00,0.00,1.00 --4.80,38.40,1.00,0.00,1.00 --4.80,33.60,1.00,0.00,1.00 --4.80,28.80,1.00,0.00,1.00 --4.80,24.00,1.00,0.00,1.00 --4.80,19.20,1.00,0.00,1.00 --0.00,14.40,1.00,0.00,1.00 --0.00,9.60,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -0.00,-9.60,1.00,0.00,1.00 -0.00,-14.40,1.00,0.00,1.00 -0.00,-19.20,1.00,0.00,1.00 -0.00,-24.00,1.00,0.00,1.00 -0.00,-28.80,1.00,0.00,1.00 -0.00,-33.60,1.00,0.00,1.00 -4.80,-38.40,1.00,0.00,1.00 -4.80,-43.20,1.00,0.00,1.00 -4.80,-48.00,1.00,0.00,1.00 -4.80,-52.80,1.00,0.00,1.00 -4.80,-57.60,1.00,0.00,1.00 -4.80,-62.40,1.00,0.00,1.00 -9.60,-67.20,1.00,0.00,1.00 -9.60,-72.00,1.00,0.00,1.00 -14.40,-76.80,1.00,0.00,1.00 -24.00,-81.60,1.00,0.00,1.00 -43.20,-86.40,1.00,0.00,1.00 -110.40,-86.40,1.00,0.00,1.00 -148.80,-81.60,1.00,0.00,1.00 -163.20,-76.80,1.00,0.00,1.00 -168.00,-72.00,1.00,0.00,1.00 -172.80,-67.20,1.00,0.00,1.00 -172.80,-62.40,1.00,0.00,1.00 -172.80,-57.60,1.00,0.00,1.00 -172.80,-52.80,1.00,0.00,1.00 -177.60,-48.00,1.00,0.00,1.00 -177.60,-43.20,1.00,0.00,1.00 -177.60,-38.40,1.00,0.00,1.00 -177.60,-33.60,1.00,0.00,1.00 -177.60,-28.80,1.00,0.00,1.00 -177.60,-24.00,1.00,0.00,1.00 -177.60,-19.20,1.00,0.00,1.00 -177.60,-14.40,1.00,0.00,1.00 -177.60,-9.60,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,9.60,1.00,0.00,1.00 --177.60,14.40,1.00,0.00,1.00 --177.60,19.20,1.00,0.00,1.00 --177.60,24.00,1.00,0.00,1.00 --177.60,28.80,1.00,0.00,1.00 --177.60,33.60,1.00,0.00,1.00 --177.60,38.40,1.00,0.00,1.00 --177.60,43.20,1.00,0.00,1.00 --177.60,48.00,1.00,0.00,1.00 --172.80,52.80,1.00,0.00,1.00 --172.80,57.60,1.00,0.00,1.00 --172.80,62.40,1.00,0.00,1.00 --172.80,67.20,1.00,0.00,1.00 --168.00,72.00,1.00,0.00,1.00 --163.20,76.80,1.00,0.00,1.00 --148.80,81.60,1.00,0.00,1.00 --110.40,86.40,1.00,0.00,1.00 --43.20,86.40,1.00,0.00,1.00 --24.00,81.60,1.00,0.00,1.00 --14.40,76.80,1.00,0.00,1.00 --9.60,72.00,1.00,0.00,1.00 --9.60,67.20,1.00,0.00,1.00 --4.80,62.40,1.00,0.00,1.00 --4.80,57.60,1.00,0.00,1.00 --4.80,52.80,1.00,0.00,1.00 --4.80,48.00,1.00,0.00,1.00 --4.80,43.20,1.00,0.00,1.00 --4.80,38.40,1.00,0.00,1.00 --0.00,33.60,1.00,0.00,1.00 --0.00,28.80,1.00,0.00,1.00 --0.00,24.00,1.00,0.00,1.00 --0.00,19.20,1.00,0.00,1.00 --0.00,14.40,1.00,0.00,1.00 --0.00,9.60,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --0.00,-4.80,1.00,0.00,1.00 --0.00,-9.60,1.00,0.00,1.00 --0.00,-14.40,1.00,0.00,1.00 --0.00,-19.20,1.00,0.00,1.00 --0.00,-24.00,1.00,0.00,1.00 --0.00,-28.80,1.00,0.00,1.00 --0.00,-33.60,1.00,0.00,1.00 --0.00,-38.40,1.00,0.00,1.00 --0.00,-43.20,1.00,0.00,1.00 --0.00,-48.00,1.00,0.00,1.00 --0.00,-52.80,1.00,0.00,1.00 --0.00,-57.60,1.00,0.00,1.00 --0.00,-62.40,1.00,0.00,1.00 --4.80,-67.20,1.00,0.00,1.00 --4.80,-72.00,1.00,0.00,1.00 --4.80,-76.80,1.00,0.00,1.00 --9.60,-81.60,1.00,0.00,1.00 --19.20,-86.40,1.00,0.00,1.00 --134.40,-86.40,1.00,0.00,1.00 --168.00,-81.60,1.00,0.00,1.00 --172.80,-76.80,1.00,0.00,1.00 --177.60,-72.00,1.00,0.00,1.00 --177.60,-67.20,1.00,0.00,1.00 --177.60,-62.40,1.00,0.00,1.00 --177.60,-57.60,1.00,0.00,1.00 --177.60,-52.80,1.00,0.00,1.00 --177.60,-48.00,1.00,0.00,1.00 --177.60,-43.20,1.00,0.00,1.00 --177.60,-38.40,1.00,0.00,1.00 --177.60,-33.60,1.00,0.00,1.00 --177.60,-28.80,1.00,0.00,1.00 --177.60,-24.00,1.00,0.00,1.00 --177.60,-19.20,1.00,0.00,1.00 --177.60,-14.40,1.00,0.00,1.00 --177.60,-9.60,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 -177.60,4.80,1.00,0.00,1.00 -177.60,9.60,1.00,0.00,1.00 -177.60,14.40,1.00,0.00,1.00 -177.60,19.20,1.00,0.00,1.00 -177.60,24.00,1.00,0.00,1.00 -177.60,28.80,1.00,0.00,1.00 -177.60,33.60,1.00,0.00,1.00 -177.60,38.40,1.00,0.00,1.00 -177.60,43.20,1.00,0.00,1.00 -177.60,48.00,1.00,0.00,1.00 -177.60,52.80,1.00,0.00,1.00 -177.60,57.60,1.00,0.00,1.00 -177.60,62.40,1.00,0.00,1.00 -177.60,67.20,1.00,0.00,1.00 -177.60,72.00,1.00,0.00,1.00 -172.80,76.80,1.00,0.00,1.00 -168.00,81.60,1.00,0.00,1.00 -134.40,86.40,1.00,0.00,1.00 -19.20,86.40,1.00,0.00,1.00 -9.60,81.60,1.00,0.00,1.00 -4.80,76.80,1.00,0.00,1.00 -4.80,72.00,1.00,0.00,1.00 -4.80,67.20,1.00,0.00,1.00 -0.00,62.40,1.00,0.00,1.00 -0.00,57.60,1.00,0.00,1.00 -0.00,52.80,1.00,0.00,1.00 -0.00,48.00,1.00,0.00,1.00 -0.00,43.20,1.00,0.00,1.00 -0.00,38.40,1.00,0.00,1.00 -0.00,33.60,1.00,0.00,1.00 -0.00,28.80,1.00,0.00,1.00 -0.00,24.00,1.00,0.00,1.00 -0.00,19.20,1.00,0.00,1.00 -0.00,14.40,1.00,0.00,1.00 -0.00,9.60,1.00,0.00,1.00 -0.00,4.80,1.00,0.00,1.00 +0.00,0.00,0.00,0.00,1.00,0.00,0.00 +4.80,0.00,0.02,0.00,1.00,0.00,-4.80 +9.60,0.00,0.04,0.00,1.00,0.00,4.80 +14.40,0.00,0.06,0.00,1.00,0.00,-9.60 +19.20,0.00,0.09,0.00,1.00,0.00,14.40 +24.00,0.00,0.11,0.00,1.00,0.00,-14.40 +28.80,0.00,0.13,0.00,1.00,0.00,19.20 +33.60,0.00,0.15,0.00,1.00,0.00,-24.00 +38.40,0.00,0.17,0.00,1.00,0.00,24.00 +43.20,0.00,0.19,0.00,1.00,0.00,-28.80 +48.00,0.00,0.21,0.00,1.00,0.00,33.60 +52.80,0.00,0.23,0.00,1.00,0.00,-33.60 +57.60,0.00,0.26,0.00,1.00,0.00,38.40 +62.40,0.00,0.28,0.00,1.00,4.80,-38.40 +67.20,0.00,0.30,0.00,1.00,4.80,38.40 +72.00,0.00,0.32,0.00,1.00,4.80,-43.20 +76.80,0.00,0.34,0.00,1.00,9.60,43.20 +81.60,0.00,0.36,0.00,1.00,19.20,-43.20 +86.40,0.00,0.38,0.00,1.00,134.40,43.20 +91.20,0.00,0.41,0.00,1.00,168.00,-43.20 +96.00,0.00,0.43,0.00,1.00,172.80,43.20 +100.80,0.00,0.45,0.00,1.00,177.60,-43.20 +105.60,0.00,0.47,0.00,1.00,177.60,43.20 +110.40,0.00,0.49,0.00,1.00,177.60,-43.20 +115.20,0.00,0.51,0.00,1.00,177.60,38.40 +120.00,0.00,0.53,0.00,1.00,177.60,-38.40 +124.80,0.00,0.56,0.00,1.00,177.60,33.60 +129.60,0.00,0.58,0.00,1.00,177.60,-33.60 +134.40,0.00,0.60,0.00,1.00,177.60,28.80 +139.20,0.00,0.62,0.00,1.00,177.60,-28.80 +144.00,0.00,0.64,0.00,1.00,177.60,24.00 +148.80,0.00,0.66,0.00,1.00,177.60,-19.20 +153.60,0.00,0.68,0.00,1.00,177.60,19.20 +158.40,0.00,0.70,0.00,1.00,177.60,-14.40 +163.20,0.00,0.73,0.00,1.00,177.60,9.60 +168.00,0.00,0.75,0.00,1.00,177.60,-9.60 +172.80,0.00,0.77,0.00,1.00,177.60,4.80 +177.60,0.00,0.79,0.00,1.00,-177.60,-0.00 +-177.60,0.00,0.81,0.00,1.00,-177.60,-0.00 +-172.80,0.00,0.83,0.00,1.00,-177.60,4.80 +-168.00,0.00,0.85,0.00,1.00,-177.60,-9.60 +-163.20,0.00,0.88,0.00,1.00,-177.60,9.60 +-158.40,0.00,0.90,0.00,1.00,-177.60,-14.40 +-153.60,0.00,0.92,0.00,1.00,-177.60,19.20 +-148.80,0.00,0.94,0.00,1.00,-177.60,-19.20 +-144.00,0.00,0.96,0.00,1.00,-177.60,24.00 +-139.20,0.00,0.98,0.00,1.00,-177.60,-28.80 +-134.40,0.00,1.00,0.00,1.00,-177.60,28.80 +-129.60,0.00,1.03,0.00,1.00,-177.60,-33.60 +-124.80,0.00,1.05,0.00,1.00,-177.60,33.60 +-120.00,0.00,1.07,0.00,1.00,-177.60,-38.40 +-115.20,0.00,1.09,0.00,1.00,-177.60,38.40 +-110.40,0.00,1.11,0.00,1.00,-177.60,-43.20 +-105.60,0.00,1.13,0.00,1.00,-172.80,43.20 +-100.80,0.00,1.15,0.00,1.00,-168.00,-43.20 +-96.00,0.00,1.17,0.00,1.00,-134.40,43.20 +-91.20,0.00,1.20,0.00,1.00,-19.20,-43.20 +-86.40,0.00,1.22,0.00,1.00,-9.60,43.20 +-81.60,0.00,1.24,0.00,1.00,-4.80,-43.20 +-76.80,0.00,1.26,0.00,1.00,-4.80,43.20 +-72.00,0.00,1.28,0.00,1.00,-4.80,-43.20 +-67.20,0.00,1.30,0.00,1.00,-0.00,38.40 +-62.40,0.00,1.32,0.00,1.00,-0.00,-38.40 +-57.60,0.00,1.35,0.00,1.00,-0.00,38.40 +-52.80,0.00,1.37,0.00,1.00,-0.00,-33.60 +-48.00,0.00,1.39,0.00,1.00,-0.00,33.60 +-43.20,0.00,1.41,0.00,1.00,-0.00,-28.80 +-38.40,0.00,1.43,0.00,1.00,-0.00,24.00 +-33.60,0.00,1.45,0.00,1.00,-0.00,-24.00 +-28.80,0.00,1.47,0.00,1.00,-0.00,19.20 +-24.00,0.00,1.50,0.00,1.00,-0.00,-14.40 +-19.20,0.00,1.52,0.00,1.00,-0.00,14.40 +-14.40,0.00,1.54,0.00,1.00,-0.00,-9.60 +-9.60,0.00,1.56,0.00,1.00,-0.00,4.80 +-4.80,0.00,1.58,0.00,1.00,-0.00,-4.80 +0.00,0.00,1.60,0.00,1.00,-0.00,0.00 +4.80,-0.00,1.62,0.00,1.00,-0.00,-4.80 +9.60,-0.00,1.64,0.00,1.00,-0.00,4.80 +14.40,-0.00,1.67,0.00,1.00,-0.00,-9.60 +19.20,-0.00,1.69,0.00,1.00,-0.00,14.40 +24.00,-0.00,1.71,0.00,1.00,-0.00,-14.40 +28.80,-0.00,1.73,0.00,1.00,-0.00,19.20 +33.60,-4.80,1.75,0.00,1.00,-4.80,-19.20 +38.40,-4.80,1.77,0.00,1.00,-4.80,24.00 +43.20,-4.80,1.79,0.00,1.00,-4.80,-24.00 +48.00,-4.80,1.82,0.00,1.00,-4.80,28.80 +52.80,-4.80,1.84,0.00,1.00,-4.80,-28.80 +57.60,-4.80,1.86,0.00,1.00,-4.80,33.60 +62.40,-4.80,1.88,0.00,1.00,-9.60,-33.60 +67.20,-4.80,1.90,0.00,1.00,-9.60,38.40 +72.00,-4.80,1.92,0.00,1.00,-14.40,-38.40 +76.80,-4.80,1.94,0.00,1.00,-24.00,38.40 +81.60,-4.80,1.97,0.00,1.00,-43.20,-38.40 +86.40,-4.80,1.99,0.00,1.00,-110.40,38.40 +91.20,-4.80,2.01,0.00,1.00,-148.80,-38.40 +96.00,-4.80,2.03,0.00,1.00,-163.20,38.40 +100.80,-4.80,2.05,0.00,1.00,-168.00,-38.40 +105.60,-4.80,2.07,0.00,1.00,-172.80,38.40 +110.40,-4.80,2.09,0.00,1.00,-172.80,-38.40 +115.20,-4.80,2.11,0.00,1.00,-172.80,33.60 +120.00,-4.80,2.14,0.00,1.00,-172.80,-33.60 +124.80,-4.80,2.16,0.00,1.00,-177.60,33.60 +129.60,-4.80,2.18,0.00,1.00,-177.60,-28.80 +134.40,-4.80,2.20,0.00,1.00,-177.60,28.80 +139.20,-4.80,2.22,0.00,1.00,-177.60,-24.00 +144.00,-4.80,2.24,0.00,1.00,-177.60,24.00 +148.80,-4.80,2.26,0.00,1.00,-177.60,-19.20 +153.60,-0.00,2.29,0.00,1.00,-177.60,14.40 +158.40,-0.00,2.31,0.00,1.00,-177.60,-14.40 +163.20,-0.00,2.33,0.00,1.00,-177.60,9.60 +168.00,-0.00,2.35,0.00,1.00,-177.60,-9.60 +172.80,-0.00,2.37,0.00,1.00,-177.60,4.80 +177.60,-0.00,2.39,0.00,1.00,177.60,-0.00 +-177.60,0.00,2.41,0.00,1.00,177.60,-0.00 +-172.80,0.00,2.44,0.00,1.00,177.60,4.80 +-168.00,0.00,2.46,0.00,1.00,177.60,-9.60 +-163.20,0.00,2.48,0.00,1.00,177.60,9.60 +-158.40,0.00,2.50,0.00,1.00,177.60,-14.40 +-153.60,0.00,2.52,0.00,1.00,177.60,14.40 +-148.80,4.80,2.54,0.00,1.00,177.60,-19.20 +-144.00,4.80,2.56,0.00,1.00,177.60,24.00 +-139.20,4.80,2.58,0.00,1.00,177.60,-24.00 +-134.40,4.80,2.61,0.00,1.00,177.60,28.80 +-129.60,4.80,2.63,0.00,1.00,172.80,-28.80 +-124.80,4.80,2.65,0.00,1.00,172.80,33.60 +-120.00,4.80,2.67,0.00,1.00,172.80,-33.60 +-115.20,4.80,2.69,0.00,1.00,172.80,33.60 +-110.40,4.80,2.71,0.00,1.00,168.00,-38.40 +-105.60,4.80,2.73,0.00,1.00,163.20,38.40 +-100.80,4.80,2.76,0.00,1.00,148.80,-38.40 +-96.00,4.80,2.78,0.00,1.00,110.40,38.40 +-91.20,4.80,2.80,0.00,1.00,43.20,-38.40 +-86.40,4.80,2.82,0.00,1.00,24.00,38.40 +-81.60,4.80,2.84,0.00,1.00,14.40,-38.40 +-76.80,4.80,2.86,0.00,1.00,9.60,38.40 +-72.00,4.80,2.88,0.00,1.00,9.60,-38.40 +-67.20,4.80,2.91,0.00,1.00,4.80,38.40 +-62.40,4.80,2.93,0.00,1.00,4.80,-33.60 +-57.60,4.80,2.95,0.00,1.00,4.80,33.60 +-52.80,4.80,2.97,0.00,1.00,4.80,-28.80 +-48.00,4.80,2.99,0.00,1.00,4.80,28.80 +-43.20,4.80,3.01,0.00,1.00,4.80,-24.00 +-38.40,4.80,3.03,0.00,1.00,0.00,24.00 +-33.60,4.80,3.05,0.00,1.00,0.00,-19.20 +-28.80,0.00,3.08,0.00,1.00,0.00,19.20 +-24.00,0.00,3.10,0.00,1.00,0.00,-14.40 +-19.20,0.00,3.12,0.00,1.00,0.00,14.40 +-14.40,0.00,3.14,0.00,1.00,0.00,-9.60 +-9.60,0.00,3.16,0.00,1.00,0.00,4.80 +-4.80,0.00,3.18,0.00,1.00,0.00,-4.80 +0.00,0.00,3.20,0.00,1.00,-0.00,0.00 +4.80,-0.00,3.23,0.00,1.00,-0.00,-4.80 +9.60,-0.00,3.25,0.00,1.00,-0.00,4.80 +14.40,-0.00,3.27,0.00,1.00,-4.80,-9.60 +19.20,-4.80,3.29,0.00,1.00,-4.80,9.60 +24.00,-4.80,3.31,0.00,1.00,-4.80,-14.40 +28.80,-4.80,3.33,0.00,1.00,-4.80,14.40 +33.60,-4.80,3.35,0.00,1.00,-4.80,-19.20 +38.40,-4.80,3.38,0.00,1.00,-9.60,19.20 +43.20,-4.80,3.40,0.00,1.00,-9.60,-24.00 +48.00,-4.80,3.42,0.00,1.00,-9.60,24.00 +52.80,-9.60,3.44,0.00,1.00,-14.40,-28.80 +57.60,-9.60,3.46,0.00,1.00,-14.40,28.80 +62.40,-9.60,3.48,0.00,1.00,-19.20,-28.80 +67.20,-9.60,3.50,0.00,1.00,-24.00,33.60 +72.00,-9.60,3.52,0.00,1.00,-33.60,-33.60 +76.80,-9.60,3.55,0.00,1.00,-43.20,33.60 +81.60,-9.60,3.57,0.00,1.00,-67.20,-33.60 +86.40,-9.60,3.59,0.00,1.00,-96.00,33.60 +91.20,-9.60,3.61,0.00,1.00,-124.80,-33.60 +96.00,-9.60,3.63,0.00,1.00,-144.00,33.60 +100.80,-9.60,3.65,0.00,1.00,-153.60,-33.60 +105.60,-9.60,3.67,0.00,1.00,-158.40,33.60 +110.40,-9.60,3.70,0.00,1.00,-163.20,-33.60 +115.20,-9.60,3.72,0.00,1.00,-168.00,33.60 +120.00,-9.60,3.74,0.00,1.00,-168.00,-28.80 +124.80,-9.60,3.76,0.00,1.00,-168.00,28.80 +129.60,-9.60,3.78,0.00,1.00,-172.80,-28.80 +134.40,-4.80,3.80,0.00,1.00,-172.80,24.00 +139.20,-4.80,3.82,0.00,1.00,-172.80,-24.00 +144.00,-4.80,3.85,0.00,1.00,-172.80,19.20 +148.80,-4.80,3.87,0.00,1.00,-177.60,-19.20 +153.60,-4.80,3.89,0.00,1.00,-177.60,14.40 +158.40,-4.80,3.91,0.00,1.00,-177.60,-14.40 +163.20,-4.80,3.93,0.00,1.00,-177.60,9.60 +168.00,-0.00,3.95,0.00,1.00,-177.60,-4.80 +172.80,-0.00,3.97,0.00,1.00,-177.60,4.80 +177.60,-0.00,3.99,0.00,1.00,177.60,-0.00 +-177.60,0.00,4.02,0.00,1.00,177.60,-0.00 +-172.80,0.00,4.04,0.00,1.00,177.60,4.80 +-168.00,0.00,4.06,0.00,1.00,177.60,-4.80 +-163.20,4.80,4.08,0.00,1.00,177.60,9.60 +-158.40,4.80,4.10,0.00,1.00,177.60,-14.40 +-153.60,4.80,4.12,0.00,1.00,172.80,14.40 +-148.80,4.80,4.14,0.00,1.00,172.80,-19.20 +-144.00,4.80,4.17,0.00,1.00,172.80,19.20 +-139.20,4.80,4.19,0.00,1.00,172.80,-24.00 +-134.40,4.80,4.21,0.00,1.00,168.00,24.00 +-129.60,9.60,4.23,0.00,1.00,168.00,-28.80 +-124.80,9.60,4.25,0.00,1.00,168.00,28.80 +-120.00,9.60,4.27,0.00,1.00,163.20,-28.80 +-115.20,9.60,4.29,0.00,1.00,158.40,33.60 +-110.40,9.60,4.32,0.00,1.00,153.60,-33.60 +-105.60,9.60,4.34,0.00,1.00,144.00,33.60 +-100.80,9.60,4.36,0.00,1.00,124.80,-33.60 +-96.00,9.60,4.38,0.00,1.00,96.00,33.60 +-91.20,9.60,4.40,0.00,1.00,67.20,-33.60 +-86.40,9.60,4.42,0.00,1.00,43.20,33.60 +-81.60,9.60,4.44,0.00,1.00,33.60,-33.60 +-76.80,9.60,4.46,0.00,1.00,24.00,33.60 +-72.00,9.60,4.49,0.00,1.00,19.20,-33.60 +-67.20,9.60,4.51,0.00,1.00,14.40,33.60 +-62.40,9.60,4.53,0.00,1.00,14.40,-28.80 +-57.60,9.60,4.55,0.00,1.00,9.60,28.80 +-52.80,9.60,4.57,0.00,1.00,9.60,-28.80 +-48.00,4.80,4.59,0.00,1.00,9.60,24.00 +-43.20,4.80,4.61,0.00,1.00,4.80,-24.00 +-38.40,4.80,4.64,0.00,1.00,4.80,19.20 +-33.60,4.80,4.66,0.00,1.00,4.80,-19.20 +-28.80,4.80,4.68,0.00,1.00,4.80,14.40 +-24.00,4.80,4.70,0.00,1.00,4.80,-14.40 +-19.20,4.80,4.72,0.00,1.00,0.00,9.60 +-14.40,0.00,4.74,0.00,1.00,0.00,-9.60 +-9.60,0.00,4.76,0.00,1.00,0.00,4.80 +-4.80,0.00,4.79,0.00,1.00,0.00,-4.80 +0.00,0.00,4.81,0.00,1.00,-0.00,0.00 +4.80,-0.00,4.83,0.00,1.00,-0.00,-4.80 +9.60,-0.00,4.85,0.00,1.00,-4.80,4.80 +14.40,-4.80,4.87,0.00,1.00,-4.80,-9.60 +19.20,-4.80,4.89,0.00,1.00,-4.80,9.60 +24.00,-4.80,4.91,0.00,1.00,-4.80,-9.60 +28.80,-4.80,4.93,0.00,1.00,-9.60,14.40 +33.60,-9.60,4.96,0.00,1.00,-9.60,-14.40 +38.40,-9.60,4.98,0.00,1.00,-14.40,19.20 +43.20,-9.60,5.00,0.00,1.00,-14.40,-19.20 +48.00,-9.60,5.02,0.00,1.00,-14.40,24.00 +52.80,-9.60,5.04,0.00,1.00,-19.20,-24.00 +57.60,-14.40,5.06,0.00,1.00,-24.00,24.00 +62.40,-14.40,5.08,0.00,1.00,-28.80,-28.80 +67.20,-14.40,5.11,0.00,1.00,-33.60,28.80 +72.00,-14.40,5.13,0.00,1.00,-43.20,-28.80 +76.80,-14.40,5.15,0.00,1.00,-57.60,28.80 +81.60,-14.40,5.17,0.00,1.00,-76.80,-28.80 +86.40,-14.40,5.19,0.00,1.00,-96.00,28.80 +91.20,-14.40,5.21,0.00,1.00,-115.20,-28.80 +96.00,-14.40,5.23,0.00,1.00,-129.60,28.80 +100.80,-14.40,5.26,0.00,1.00,-139.20,-28.80 +105.60,-14.40,5.28,0.00,1.00,-148.80,28.80 +110.40,-14.40,5.30,0.00,1.00,-153.60,-28.80 +115.20,-14.40,5.32,0.00,1.00,-158.40,28.80 +120.00,-14.40,5.34,0.00,1.00,-163.20,-24.00 +124.80,-9.60,5.36,0.00,1.00,-163.20,24.00 +129.60,-9.60,5.38,0.00,1.00,-168.00,-24.00 +134.40,-9.60,5.40,0.00,1.00,-168.00,19.20 +139.20,-9.60,5.43,0.00,1.00,-172.80,-19.20 +144.00,-9.60,5.45,0.00,1.00,-172.80,19.20 +148.80,-9.60,5.47,0.00,1.00,-172.80,-14.40 +153.60,-4.80,5.49,0.00,1.00,-172.80,14.40 +158.40,-4.80,5.51,0.00,1.00,-177.60,-9.60 +163.20,-4.80,5.53,0.00,1.00,-177.60,9.60 +168.00,-4.80,5.55,0.00,1.00,-177.60,-4.80 +172.80,-0.00,5.58,0.00,1.00,-177.60,4.80 +177.60,-0.00,5.60,0.00,1.00,177.60,-0.00 +-177.60,0.00,5.62,0.00,1.00,177.60,-0.00 +-172.80,0.00,5.64,0.00,1.00,177.60,4.80 +-168.00,4.80,5.66,0.00,1.00,177.60,-4.80 +-163.20,4.80,5.68,0.00,1.00,172.80,9.60 +-158.40,4.80,5.70,0.00,1.00,172.80,-9.60 +-153.60,4.80,5.72,0.00,1.00,172.80,14.40 +-148.80,9.60,5.75,0.00,1.00,172.80,-14.40 +-144.00,9.60,5.77,0.00,1.00,168.00,19.20 +-139.20,9.60,5.79,0.00,1.00,168.00,-19.20 +-134.40,9.60,5.81,0.00,1.00,163.20,19.20 +-129.60,9.60,5.83,0.00,1.00,163.20,-24.00 +-124.80,9.60,5.85,0.00,1.00,158.40,24.00 +-120.00,14.40,5.87,0.00,1.00,153.60,-24.00 +-115.20,14.40,5.90,0.00,1.00,148.80,28.80 +-110.40,14.40,5.92,0.00,1.00,139.20,-28.80 +-105.60,14.40,5.94,0.00,1.00,129.60,28.80 +-100.80,14.40,5.96,0.00,1.00,115.20,-28.80 +-96.00,14.40,5.98,0.00,1.00,96.00,28.80 +-91.20,14.40,6.00,0.00,1.00,76.80,-28.80 +-86.40,14.40,6.02,0.00,1.00,57.60,28.80 +-81.60,14.40,6.05,0.00,1.00,43.20,-28.80 +-76.80,14.40,6.07,0.00,1.00,33.60,28.80 +-72.00,14.40,6.09,0.00,1.00,28.80,-28.80 +-67.20,14.40,6.11,0.00,1.00,24.00,28.80 +-62.40,14.40,6.13,0.00,1.00,19.20,-28.80 +-57.60,14.40,6.15,0.00,1.00,14.40,24.00 +-52.80,9.60,6.17,0.00,1.00,14.40,-24.00 +-48.00,9.60,6.19,0.00,1.00,14.40,24.00 +-43.20,9.60,6.22,0.00,1.00,9.60,-19.20 +-38.40,9.60,6.24,0.00,1.00,9.60,19.20 +-33.60,9.60,6.26,0.00,1.00,4.80,-14.40 +-28.80,4.80,6.28,0.00,1.00,4.80,14.40 +-24.00,4.80,6.30,0.00,1.00,4.80,-9.60 +-19.20,4.80,6.32,0.00,1.00,4.80,9.60 +-14.40,4.80,6.34,0.00,1.00,0.00,-9.60 +-9.60,0.00,6.37,0.00,1.00,0.00,4.80 +-4.80,0.00,6.39,0.00,1.00,0.00,-4.80 +0.00,0.00,6.41,0.00,1.00,-0.00,0.00 +4.80,-0.00,6.43,0.00,1.00,-4.80,-0.00 +9.60,-4.80,6.45,0.00,1.00,-4.80,4.80 +14.40,-4.80,6.47,0.00,1.00,-4.80,-4.80 +19.20,-4.80,6.49,0.00,1.00,-9.60,9.60 +24.00,-9.60,6.52,0.00,1.00,-9.60,-9.60 +28.80,-9.60,6.54,0.00,1.00,-9.60,14.40 +33.60,-9.60,6.56,0.00,1.00,-14.40,-14.40 +38.40,-9.60,6.58,0.00,1.00,-14.40,14.40 +43.20,-14.40,6.60,0.00,1.00,-19.20,-19.20 +48.00,-14.40,6.62,0.00,1.00,-24.00,19.20 +52.80,-14.40,6.64,0.00,1.00,-24.00,-19.20 +57.60,-14.40,6.66,0.00,1.00,-28.80,19.20 +62.40,-19.20,6.69,0.00,1.00,-38.40,-24.00 +67.20,-19.20,6.71,0.00,1.00,-43.20,24.00 +72.00,-19.20,6.73,0.00,1.00,-52.80,-24.00 +76.80,-19.20,6.75,0.00,1.00,-62.40,24.00 +81.60,-19.20,6.77,0.00,1.00,-76.80,-24.00 +86.40,-19.20,6.79,0.00,1.00,-96.00,24.00 +91.20,-19.20,6.81,0.00,1.00,-110.40,-24.00 +96.00,-19.20,6.84,0.00,1.00,-120.00,24.00 +100.80,-19.20,6.86,0.00,1.00,-134.40,-24.00 +105.60,-19.20,6.88,0.00,1.00,-139.20,24.00 +110.40,-19.20,6.90,0.00,1.00,-148.80,-24.00 +115.20,-19.20,6.92,0.00,1.00,-153.60,24.00 +120.00,-14.40,6.94,0.00,1.00,-158.40,-24.00 +124.80,-14.40,6.96,0.00,1.00,-158.40,19.20 +129.60,-14.40,6.99,0.00,1.00,-163.20,-19.20 +134.40,-14.40,7.01,0.00,1.00,-163.20,19.20 +139.20,-14.40,7.03,0.00,1.00,-168.00,-14.40 +144.00,-9.60,7.05,0.00,1.00,-168.00,14.40 +148.80,-9.60,7.07,0.00,1.00,-172.80,-14.40 +153.60,-9.60,7.09,0.00,1.00,-172.80,9.60 +158.40,-4.80,7.11,0.00,1.00,-172.80,-9.60 +163.20,-4.80,7.13,0.00,1.00,-177.60,9.60 +168.00,-4.80,7.16,0.00,1.00,-177.60,-4.80 +172.80,-0.00,7.18,0.00,1.00,-177.60,4.80 +177.60,-0.00,7.20,0.00,1.00,177.60,-0.00 +-177.60,0.00,7.22,0.00,1.00,177.60,-0.00 +-172.80,0.00,7.24,0.00,1.00,177.60,4.80 +-168.00,4.80,7.26,0.00,1.00,172.80,-4.80 +-163.20,4.80,7.28,0.00,1.00,172.80,9.60 +-158.40,4.80,7.31,0.00,1.00,172.80,-9.60 +-153.60,9.60,7.33,0.00,1.00,168.00,9.60 +-148.80,9.60,7.35,0.00,1.00,168.00,-14.40 +-144.00,9.60,7.37,0.00,1.00,163.20,14.40 +-139.20,14.40,7.39,0.00,1.00,163.20,-14.40 +-134.40,14.40,7.41,0.00,1.00,158.40,19.20 +-129.60,14.40,7.43,0.00,1.00,158.40,-19.20 +-124.80,14.40,7.46,0.00,1.00,153.60,19.20 +-120.00,14.40,7.48,0.00,1.00,148.80,-24.00 +-115.20,19.20,7.50,0.00,1.00,139.20,24.00 +-110.40,19.20,7.52,0.00,1.00,134.40,-24.00 +-105.60,19.20,7.54,0.00,1.00,120.00,24.00 +-100.80,19.20,7.56,0.00,1.00,110.40,-24.00 +-96.00,19.20,7.58,0.00,1.00,96.00,24.00 +-91.20,19.20,7.60,0.00,1.00,76.80,-24.00 +-86.40,19.20,7.63,0.00,1.00,62.40,24.00 +-81.60,19.20,7.65,0.00,1.00,52.80,-24.00 +-76.80,19.20,7.67,0.00,1.00,43.20,24.00 +-72.00,19.20,7.69,0.00,1.00,38.40,-24.00 +-67.20,19.20,7.71,0.00,1.00,28.80,24.00 +-62.40,19.20,7.73,0.00,1.00,24.00,-24.00 +-57.60,14.40,7.75,0.00,1.00,24.00,19.20 +-52.80,14.40,7.78,0.00,1.00,19.20,-19.20 +-48.00,14.40,7.80,0.00,1.00,14.40,19.20 +-43.20,14.40,7.82,0.00,1.00,14.40,-19.20 +-38.40,9.60,7.84,0.00,1.00,9.60,14.40 +-33.60,9.60,7.86,0.00,1.00,9.60,-14.40 +-28.80,9.60,7.88,0.00,1.00,9.60,14.40 +-24.00,9.60,7.90,0.00,1.00,4.80,-9.60 +-19.20,4.80,7.93,0.00,1.00,4.80,9.60 +-14.40,4.80,7.95,0.00,1.00,4.80,-4.80 +-9.60,4.80,7.97,0.00,1.00,0.00,4.80 +-4.80,0.00,7.99,0.00,1.00,0.00,-0.00 +0.00,0.00,8.01,0.00,1.00,-0.00,0.00 +4.80,-0.00,8.03,0.00,1.00,-4.80,-0.00 +9.60,-4.80,8.05,0.00,1.00,-4.80,4.80 +14.40,-4.80,8.07,0.00,1.00,-9.60,-4.80 +19.20,-9.60,8.10,0.00,1.00,-9.60,4.80 +24.00,-9.60,8.12,0.00,1.00,-14.40,-9.60 +28.80,-9.60,8.14,0.00,1.00,-14.40,9.60 +33.60,-14.40,8.16,0.00,1.00,-19.20,-9.60 +33.60,-14.40,8.18,0.00,1.00,-19.20,14.40 +38.40,-14.40,8.20,0.00,1.00,-24.00,-14.40 +43.20,-19.20,8.22,0.00,1.00,-28.80,14.40 +48.00,-19.20,8.25,0.00,1.00,-33.60,-14.40 +57.60,-19.20,8.27,0.00,1.00,-38.40,19.20 +62.40,-19.20,8.29,0.00,1.00,-43.20,-19.20 +67.20,-24.00,8.31,0.00,1.00,-48.00,19.20 +72.00,-24.00,8.33,0.00,1.00,-57.60,-19.20 +76.80,-24.00,8.35,0.00,1.00,-67.20,19.20 +81.60,-24.00,8.37,0.00,1.00,-81.60,-19.20 +86.40,-24.00,8.40,0.00,1.00,-91.20,19.20 +91.20,-24.00,8.42,0.00,1.00,-105.60,-19.20 +96.00,-24.00,8.44,0.00,1.00,-115.20,19.20 +100.80,-24.00,8.46,0.00,1.00,-124.80,-19.20 +105.60,-24.00,8.48,0.00,1.00,-134.40,19.20 +110.40,-24.00,8.50,0.00,1.00,-139.20,-19.20 +115.20,-19.20,8.52,0.00,1.00,-144.00,19.20 +120.00,-19.20,8.54,0.00,1.00,-148.80,-19.20 +129.60,-19.20,8.57,0.00,1.00,-153.60,19.20 +134.40,-19.20,8.59,0.00,1.00,-158.40,-14.40 +139.20,-19.20,8.61,0.00,1.00,-163.20,14.40 +144.00,-14.40,8.63,0.00,1.00,-163.20,-14.40 +148.80,-14.40,8.65,0.00,1.00,-168.00,14.40 +148.80,-14.40,8.67,0.00,1.00,-168.00,-9.60 +153.60,-9.60,8.69,0.00,1.00,-172.80,9.60 +158.40,-9.60,8.72,0.00,1.00,-172.80,-9.60 +163.20,-4.80,8.74,0.00,1.00,-177.60,4.80 +168.00,-4.80,8.76,0.00,1.00,-177.60,-4.80 +172.80,-4.80,8.78,0.00,1.00,-177.60,4.80 +177.60,-0.00,8.80,0.00,1.00,177.60,-0.00 +-177.60,0.00,8.82,0.00,1.00,177.60,-0.00 +-172.80,4.80,8.84,0.00,1.00,177.60,4.80 +-168.00,4.80,8.87,0.00,1.00,172.80,-4.80 +-163.20,4.80,8.89,0.00,1.00,172.80,4.80 +-158.40,9.60,8.91,0.00,1.00,168.00,-9.60 +-153.60,9.60,8.93,0.00,1.00,168.00,9.60 +-148.80,14.40,8.95,0.00,1.00,163.20,-9.60 +-148.80,14.40,8.97,0.00,1.00,163.20,14.40 +-144.00,14.40,8.99,0.00,1.00,158.40,-14.40 +-139.20,19.20,9.01,0.00,1.00,153.60,14.40 +-134.40,19.20,9.04,0.00,1.00,148.80,-14.40 +-129.60,19.20,9.06,0.00,1.00,144.00,19.20 +-120.00,19.20,9.08,0.00,1.00,139.20,-19.20 +-115.20,19.20,9.10,0.00,1.00,134.40,19.20 +-110.40,24.00,9.12,0.00,1.00,124.80,-19.20 +-105.60,24.00,9.14,0.00,1.00,115.20,19.20 +-100.80,24.00,9.16,0.00,1.00,105.60,-19.20 +-96.00,24.00,9.19,0.00,1.00,91.20,19.20 +-91.20,24.00,9.21,0.00,1.00,81.60,-19.20 +-86.40,24.00,9.23,0.00,1.00,67.20,19.20 +-81.60,24.00,9.25,0.00,1.00,57.60,-19.20 +-76.80,24.00,9.27,0.00,1.00,48.00,19.20 +-72.00,24.00,9.29,0.00,1.00,43.20,-19.20 +-67.20,24.00,9.31,0.00,1.00,38.40,19.20 +-62.40,19.20,9.34,0.00,1.00,33.60,-19.20 +-57.60,19.20,9.36,0.00,1.00,28.80,19.20 +-48.00,19.20,9.38,0.00,1.00,24.00,-14.40 +-43.20,19.20,9.40,0.00,1.00,19.20,14.40 +-38.40,14.40,9.42,0.00,1.00,19.20,-14.40 +-33.60,14.40,9.44,0.00,1.00,14.40,14.40 +-33.60,14.40,9.46,0.00,1.00,14.40,-9.60 +-28.80,9.60,9.48,0.00,1.00,9.60,9.60 +-24.00,9.60,9.51,0.00,1.00,9.60,-9.60 +-19.20,9.60,9.53,0.00,1.00,4.80,4.80 +-14.40,4.80,9.55,0.00,1.00,4.80,-4.80 +-9.60,4.80,9.57,0.00,1.00,0.00,4.80 +-4.80,0.00,9.59,0.00,1.00,0.00,-0.00 +0.00,0.00,9.61,0.00,1.00,-0.00,0.00 +4.80,-0.00,9.63,0.00,1.00,-4.80,-0.00 +9.60,-4.80,9.66,0.00,1.00,-4.80,4.80 +14.40,-4.80,9.68,0.00,1.00,-9.60,-4.80 +19.20,-9.60,9.70,0.00,1.00,-9.60,4.80 +19.20,-9.60,9.72,0.00,1.00,-14.40,-4.80 +24.00,-14.40,9.74,0.00,1.00,-19.20,9.60 +28.80,-14.40,9.76,0.00,1.00,-19.20,-9.60 +33.60,-19.20,9.78,0.00,1.00,-24.00,9.60 +38.40,-19.20,9.81,0.00,1.00,-28.80,-9.60 +43.20,-19.20,9.83,0.00,1.00,-33.60,9.60 +48.00,-24.00,9.85,0.00,1.00,-38.40,-14.40 +52.80,-24.00,9.87,0.00,1.00,-43.20,14.40 +57.60,-24.00,9.89,0.00,1.00,-48.00,-14.40 +62.40,-24.00,9.91,0.00,1.00,-52.80,14.40 +72.00,-28.80,9.93,0.00,1.00,-62.40,-14.40 +76.80,-28.80,9.95,0.00,1.00,-72.00,14.40 +81.60,-28.80,9.98,0.00,1.00,-81.60,-14.40 +86.40,-28.80,10.00,0.00,1.00,-91.20,14.40 +91.20,-28.80,10.02,0.00,1.00,-100.80,-14.40 +96.00,-28.80,10.04,0.00,1.00,-110.40,14.40 +100.80,-28.80,10.06,0.00,1.00,-120.00,-14.40 +105.60,-28.80,10.08,0.00,1.00,-129.60,14.40 +115.20,-28.80,10.10,0.00,1.00,-134.40,-14.40 +120.00,-24.00,10.13,0.00,1.00,-139.20,14.40 +124.80,-24.00,10.15,0.00,1.00,-144.00,-14.40 +129.60,-24.00,10.17,0.00,1.00,-148.80,14.40 +134.40,-24.00,10.19,0.00,1.00,-153.60,-14.40 +139.20,-19.20,10.21,0.00,1.00,-158.40,9.60 +144.00,-19.20,10.23,0.00,1.00,-163.20,-9.60 +148.80,-14.40,10.25,0.00,1.00,-163.20,9.60 +153.60,-14.40,10.28,0.00,1.00,-168.00,-9.60 +158.40,-14.40,10.30,0.00,1.00,-168.00,4.80 +163.20,-9.60,10.32,0.00,1.00,-172.80,-4.80 +163.20,-9.60,10.34,0.00,1.00,-172.80,4.80 +168.00,-4.80,10.36,0.00,1.00,-177.60,-4.80 +172.80,-4.80,10.38,0.00,1.00,-177.60,0.00 +177.60,-0.00,10.40,0.00,1.00,177.60,-0.00 +-177.60,0.00,10.42,0.00,1.00,177.60,-0.00 +-172.80,4.80,10.45,0.00,1.00,172.80,0.00 +-168.00,4.80,10.47,0.00,1.00,172.80,-4.80 +-163.20,9.60,10.49,0.00,1.00,168.00,4.80 +-163.20,9.60,10.51,0.00,1.00,168.00,-4.80 +-158.40,14.40,10.53,0.00,1.00,163.20,4.80 +-153.60,14.40,10.55,0.00,1.00,163.20,-9.60 +-148.80,14.40,10.57,0.00,1.00,158.40,9.60 +-144.00,19.20,10.60,0.00,1.00,153.60,-9.60 +-139.20,19.20,10.62,0.00,1.00,148.80,9.60 +-134.40,24.00,10.64,0.00,1.00,144.00,-14.40 +-129.60,24.00,10.66,0.00,1.00,139.20,14.40 +-124.80,24.00,10.68,0.00,1.00,134.40,-14.40 +-120.00,24.00,10.70,0.00,1.00,129.60,14.40 +-115.20,28.80,10.72,0.00,1.00,120.00,-14.40 +-105.60,28.80,10.74,0.00,1.00,110.40,14.40 +-100.80,28.80,10.77,0.00,1.00,100.80,-14.40 +-96.00,28.80,10.79,0.00,1.00,91.20,14.40 +-91.20,28.80,10.81,0.00,1.00,81.60,-14.40 +-86.40,28.80,10.83,0.00,1.00,72.00,14.40 +-81.60,28.80,10.85,0.00,1.00,62.40,-14.40 +-76.80,28.80,10.87,0.00,1.00,52.80,14.40 +-72.00,28.80,10.89,0.00,1.00,48.00,-14.40 +-62.40,24.00,10.92,0.00,1.00,43.20,14.40 +-57.60,24.00,10.94,0.00,1.00,38.40,-14.40 +-52.80,24.00,10.96,0.00,1.00,33.60,14.40 +-48.00,24.00,10.98,0.00,1.00,28.80,-14.40 +-43.20,19.20,11.00,0.00,1.00,24.00,9.60 +-38.40,19.20,11.02,0.00,1.00,19.20,-9.60 +-33.60,19.20,11.04,0.00,1.00,19.20,9.60 +-28.80,14.40,11.07,0.00,1.00,14.40,-9.60 +-24.00,14.40,11.09,0.00,1.00,9.60,9.60 +-19.20,9.60,11.11,0.00,1.00,9.60,-4.80 +-19.20,9.60,11.13,0.00,1.00,4.80,4.80 +-14.40,4.80,11.15,0.00,1.00,4.80,-4.80 +-9.60,4.80,11.17,0.00,1.00,0.00,4.80 +-4.80,0.00,11.19,0.00,1.00,0.00,-0.00 +0.00,0.00,11.21,0.00,1.00,-4.80,0.00 +4.80,-4.80,11.24,0.00,1.00,-4.80,-0.00 +9.60,-4.80,11.26,0.00,1.00,-9.60,0.00 +14.40,-9.60,11.28,0.00,1.00,-9.60,-4.80 +14.40,-9.60,11.30,0.00,1.00,-14.40,4.80 +19.20,-14.40,11.32,0.00,1.00,-14.40,-4.80 +24.00,-14.40,11.34,0.00,1.00,-19.20,4.80 +28.80,-19.20,11.36,0.00,1.00,-24.00,-4.80 +33.60,-19.20,11.39,0.00,1.00,-28.80,4.80 +38.40,-24.00,11.41,0.00,1.00,-28.80,-9.60 +43.20,-24.00,11.43,0.00,1.00,-33.60,9.60 +48.00,-24.00,11.45,0.00,1.00,-38.40,-9.60 +52.80,-28.80,11.47,0.00,1.00,-48.00,9.60 +57.60,-28.80,11.49,0.00,1.00,-52.80,-9.60 +62.40,-28.80,11.51,0.00,1.00,-57.60,9.60 +67.20,-33.60,11.54,0.00,1.00,-67.20,-9.60 +72.00,-33.60,11.56,0.00,1.00,-76.80,9.60 +81.60,-33.60,11.58,0.00,1.00,-81.60,-9.60 +86.40,-33.60,11.60,0.00,1.00,-91.20,9.60 +91.20,-33.60,11.62,0.00,1.00,-100.80,-9.60 +96.00,-33.60,11.64,0.00,1.00,-110.40,9.60 +100.80,-33.60,11.66,0.00,1.00,-115.20,-9.60 +110.40,-33.60,11.68,0.00,1.00,-124.80,9.60 +115.20,-33.60,11.71,0.00,1.00,-129.60,-9.60 +120.00,-28.80,11.73,0.00,1.00,-139.20,9.60 +124.80,-28.80,11.75,0.00,1.00,-144.00,-9.60 +129.60,-28.80,11.77,0.00,1.00,-148.80,9.60 +134.40,-24.00,11.79,0.00,1.00,-153.60,-9.60 +139.20,-24.00,11.81,0.00,1.00,-153.60,9.60 +144.00,-19.20,11.83,0.00,1.00,-158.40,-9.60 +148.80,-19.20,11.86,0.00,1.00,-163.20,4.80 +153.60,-14.40,11.88,0.00,1.00,-163.20,-4.80 +158.40,-14.40,11.90,0.00,1.00,-168.00,4.80 +163.20,-9.60,11.92,0.00,1.00,-172.80,-4.80 +168.00,-9.60,11.94,0.00,1.00,-172.80,4.80 +168.00,-4.80,11.96,0.00,1.00,-177.60,-0.00 +172.80,-4.80,11.98,0.00,1.00,-177.60,0.00 +177.60,-0.00,12.01,0.00,1.00,177.60,-0.00 +-177.60,0.00,12.03,0.00,1.00,177.60,-0.00 +-172.80,4.80,12.05,0.00,1.00,172.80,0.00 +-168.00,4.80,12.07,0.00,1.00,172.80,-0.00 +-168.00,9.60,12.09,0.00,1.00,168.00,4.80 +-163.20,9.60,12.11,0.00,1.00,163.20,-4.80 +-158.40,14.40,12.13,0.00,1.00,163.20,4.80 +-153.60,14.40,12.15,0.00,1.00,158.40,-4.80 +-148.80,19.20,12.18,0.00,1.00,153.60,4.80 +-144.00,19.20,12.20,0.00,1.00,153.60,-9.60 +-139.20,24.00,12.22,0.00,1.00,148.80,9.60 +-134.40,24.00,12.24,0.00,1.00,144.00,-9.60 +-129.60,28.80,12.26,0.00,1.00,139.20,9.60 +-124.80,28.80,12.28,0.00,1.00,129.60,-9.60 +-120.00,28.80,12.30,0.00,1.00,124.80,9.60 +-115.20,33.60,12.33,0.00,1.00,115.20,-9.60 +-110.40,33.60,12.35,0.00,1.00,110.40,9.60 +-100.80,33.60,12.37,0.00,1.00,100.80,-9.60 +-96.00,33.60,12.39,0.00,1.00,91.20,9.60 +-91.20,33.60,12.41,0.00,1.00,81.60,-9.60 +-86.40,33.60,12.43,0.00,1.00,76.80,9.60 +-81.60,33.60,12.45,0.00,1.00,67.20,-9.60 +-72.00,33.60,12.48,0.00,1.00,57.60,9.60 +-67.20,33.60,12.50,0.00,1.00,52.80,-9.60 +-62.40,28.80,12.52,0.00,1.00,48.00,9.60 +-57.60,28.80,12.54,0.00,1.00,38.40,-9.60 +-52.80,28.80,12.56,0.00,1.00,33.60,9.60 +-48.00,24.00,12.58,0.00,1.00,28.80,-9.60 +-43.20,24.00,12.60,0.00,1.00,28.80,9.60 +-38.40,24.00,12.62,0.00,1.00,24.00,-9.60 +-33.60,19.20,12.65,0.00,1.00,19.20,4.80 +-28.80,19.20,12.67,0.00,1.00,14.40,-4.80 +-24.00,14.40,12.69,0.00,1.00,14.40,4.80 +-19.20,14.40,12.71,0.00,1.00,9.60,-4.80 +-14.40,9.60,12.73,0.00,1.00,9.60,4.80 +-14.40,9.60,12.75,0.00,1.00,4.80,-4.80 +-9.60,4.80,12.77,0.00,1.00,4.80,0.00 +-4.80,4.80,12.80,0.00,1.00,0.00,-0.00 +0.00,0.00,12.82,0.00,1.00,-4.80,0.00 +4.80,-4.80,12.84,0.00,1.00,-4.80,-0.00 +9.60,-4.80,12.86,0.00,1.00,-9.60,0.00 +9.60,-9.60,12.88,0.00,1.00,-9.60,-0.00 +14.40,-9.60,12.90,0.00,1.00,-14.40,0.00 +19.20,-14.40,12.92,0.00,1.00,-19.20,-4.80 +24.00,-19.20,12.95,0.00,1.00,-24.00,4.80 +28.80,-19.20,12.97,0.00,1.00,-24.00,-4.80 +33.60,-24.00,12.99,0.00,1.00,-28.80,4.80 +38.40,-24.00,13.01,0.00,1.00,-33.60,-4.80 +43.20,-28.80,13.03,0.00,1.00,-38.40,4.80 +48.00,-28.80,13.05,0.00,1.00,-43.20,-4.80 +52.80,-33.60,13.07,0.00,1.00,-48.00,4.80 +57.60,-33.60,13.09,0.00,1.00,-52.80,-4.80 +62.40,-33.60,13.12,0.00,1.00,-62.40,4.80 +67.20,-38.40,13.14,0.00,1.00,-67.20,-4.80 +72.00,-38.40,13.16,0.00,1.00,-76.80,4.80 +81.60,-38.40,13.18,0.00,1.00,-86.40,-4.80 +86.40,-38.40,13.20,0.00,1.00,-91.20,4.80 +91.20,-38.40,13.22,0.00,1.00,-100.80,-4.80 +96.00,-38.40,13.24,0.00,1.00,-105.60,4.80 +105.60,-38.40,13.27,0.00,1.00,-115.20,-4.80 +110.40,-38.40,13.29,0.00,1.00,-120.00,4.80 +115.20,-33.60,13.31,0.00,1.00,-129.60,-4.80 +120.00,-33.60,13.33,0.00,1.00,-134.40,4.80 +124.80,-33.60,13.35,0.00,1.00,-139.20,-4.80 +129.60,-28.80,13.37,0.00,1.00,-144.00,4.80 +134.40,-28.80,13.39,0.00,1.00,-148.80,-4.80 +139.20,-24.00,13.42,0.00,1.00,-153.60,4.80 +144.00,-24.00,13.44,0.00,1.00,-158.40,-4.80 +148.80,-19.20,13.46,0.00,1.00,-158.40,4.80 +153.60,-19.20,13.48,0.00,1.00,-163.20,-4.80 +158.40,-14.40,13.50,0.00,1.00,-168.00,4.80 +163.20,-14.40,13.52,0.00,1.00,-168.00,-4.80 +168.00,-9.60,13.54,0.00,1.00,-172.80,0.00 +172.80,-9.60,13.56,0.00,1.00,-177.60,-0.00 +172.80,-4.80,13.59,0.00,1.00,-177.60,0.00 +177.60,-0.00,13.61,0.00,1.00,177.60,-0.00 +-177.60,0.00,13.63,0.00,1.00,177.60,-0.00 +-172.80,4.80,13.65,0.00,1.00,172.80,0.00 +-172.80,9.60,13.67,0.00,1.00,168.00,-0.00 +-168.00,9.60,13.69,0.00,1.00,168.00,0.00 +-163.20,14.40,13.71,0.00,1.00,163.20,-4.80 +-158.40,14.40,13.74,0.00,1.00,158.40,4.80 +-153.60,19.20,13.76,0.00,1.00,158.40,-4.80 +-148.80,19.20,13.78,0.00,1.00,153.60,4.80 +-144.00,24.00,13.80,0.00,1.00,148.80,-4.80 +-139.20,24.00,13.82,0.00,1.00,144.00,4.80 +-134.40,28.80,13.84,0.00,1.00,139.20,-4.80 +-129.60,28.80,13.86,0.00,1.00,134.40,4.80 +-124.80,33.60,13.89,0.00,1.00,129.60,-4.80 +-120.00,33.60,13.91,0.00,1.00,120.00,4.80 +-115.20,33.60,13.93,0.00,1.00,115.20,-4.80 +-110.40,38.40,13.95,0.00,1.00,105.60,4.80 +-105.60,38.40,13.97,0.00,1.00,100.80,-4.80 +-96.00,38.40,13.99,0.00,1.00,91.20,4.80 +-91.20,38.40,14.01,0.00,1.00,86.40,-4.80 +-86.40,38.40,14.03,0.00,1.00,76.80,4.80 +-81.60,38.40,14.06,0.00,1.00,67.20,-4.80 +-72.00,38.40,14.08,0.00,1.00,62.40,4.80 +-67.20,38.40,14.10,0.00,1.00,52.80,-4.80 +-62.40,33.60,14.12,0.00,1.00,48.00,4.80 +-57.60,33.60,14.14,0.00,1.00,43.20,-4.80 +-52.80,33.60,14.16,0.00,1.00,38.40,4.80 +-48.00,28.80,14.18,0.00,1.00,33.60,-4.80 +-43.20,28.80,14.21,0.00,1.00,28.80,4.80 +-38.40,24.00,14.23,0.00,1.00,24.00,-4.80 +-33.60,24.00,14.25,0.00,1.00,24.00,4.80 +-28.80,19.20,14.27,0.00,1.00,19.20,-4.80 +-24.00,19.20,14.29,0.00,1.00,14.40,4.80 +-19.20,14.40,14.31,0.00,1.00,9.60,-4.80 +-14.40,9.60,14.33,0.00,1.00,9.60,0.00 +-9.60,9.60,14.36,0.00,1.00,4.80,-0.00 +-9.60,4.80,14.38,0.00,1.00,4.80,0.00 +-4.80,4.80,14.40,0.00,1.00,0.00,-0.00 +0.00,0.00,14.42,0.00,1.00,-4.80,0.00 +4.80,-4.80,14.44,0.00,1.00,-4.80,-0.00 +4.80,-4.80,14.46,0.00,1.00,-9.60,0.00 +9.60,-9.60,14.48,0.00,1.00,-14.40,-0.00 +14.40,-14.40,14.50,0.00,1.00,-14.40,0.00 +19.20,-14.40,14.53,0.00,1.00,-19.20,-0.00 +24.00,-19.20,14.55,0.00,1.00,-24.00,0.00 +24.00,-24.00,14.57,0.00,1.00,-28.80,-0.00 +28.80,-24.00,14.59,0.00,1.00,-33.60,0.00 +33.60,-28.80,14.61,0.00,1.00,-38.40,-0.00 +38.40,-28.80,14.63,0.00,1.00,-43.20,0.00 +43.20,-33.60,14.65,0.00,1.00,-48.00,-0.00 +48.00,-33.60,14.68,0.00,1.00,-52.80,0.00 +52.80,-38.40,14.70,0.00,1.00,-57.60,-0.00 +62.40,-38.40,14.72,0.00,1.00,-62.40,0.00 +67.20,-38.40,14.74,0.00,1.00,-72.00,-0.00 +72.00,-43.20,14.76,0.00,1.00,-76.80,0.00 +76.80,-43.20,14.78,0.00,1.00,-86.40,-0.00 +86.40,-43.20,14.80,0.00,1.00,-91.20,0.00 +91.20,-43.20,14.83,0.00,1.00,-100.80,-0.00 +96.00,-43.20,14.85,0.00,1.00,-105.60,0.00 +105.60,-43.20,14.87,0.00,1.00,-110.40,-0.00 +110.40,-43.20,14.89,0.00,1.00,-120.00,0.00 +115.20,-38.40,14.91,0.00,1.00,-124.80,-0.00 +124.80,-38.40,14.93,0.00,1.00,-129.60,0.00 +129.60,-38.40,14.95,0.00,1.00,-134.40,-0.00 +134.40,-33.60,14.97,0.00,1.00,-139.20,0.00 +139.20,-33.60,15.00,0.00,1.00,-144.00,-0.00 +144.00,-28.80,15.02,0.00,1.00,-148.80,0.00 +148.80,-28.80,15.04,0.00,1.00,-153.60,-0.00 +153.60,-24.00,15.06,0.00,1.00,-158.40,0.00 +158.40,-19.20,15.08,0.00,1.00,-163.20,-0.00 +158.40,-19.20,15.10,0.00,1.00,-163.20,0.00 +163.20,-14.40,15.12,0.00,1.00,-168.00,-0.00 +168.00,-9.60,15.15,0.00,1.00,-172.80,0.00 +172.80,-9.60,15.17,0.00,1.00,-172.80,-0.00 +172.80,-4.80,15.19,0.00,1.00,-177.60,0.00 +177.60,-0.00,15.21,0.00,1.00,177.60,-0.00 +-177.60,0.00,15.23,0.00,1.00,172.80,-0.00 +-172.80,4.80,15.25,0.00,1.00,172.80,0.00 +-172.80,9.60,15.27,0.00,1.00,168.00,-0.00 +-168.00,9.60,15.30,0.00,1.00,163.20,0.00 +-163.20,14.40,15.32,0.00,1.00,163.20,-0.00 +-158.40,19.20,15.34,0.00,1.00,158.40,0.00 +-158.40,19.20,15.36,0.00,1.00,153.60,-0.00 +-153.60,24.00,15.38,0.00,1.00,148.80,0.00 +-148.80,28.80,15.40,0.00,1.00,144.00,-0.00 +-144.00,28.80,15.42,0.00,1.00,139.20,0.00 +-139.20,33.60,15.44,0.00,1.00,134.40,-0.00 +-134.40,33.60,15.47,0.00,1.00,129.60,0.00 +-129.60,38.40,15.49,0.00,1.00,124.80,-0.00 +-124.80,38.40,15.51,0.00,1.00,120.00,0.00 +-115.20,38.40,15.53,0.00,1.00,110.40,-0.00 +-110.40,43.20,15.55,0.00,1.00,105.60,0.00 +-105.60,43.20,15.57,0.00,1.00,100.80,-0.00 +-96.00,43.20,15.59,0.00,1.00,91.20,0.00 +-91.20,43.20,15.62,0.00,1.00,86.40,-0.00 +-86.40,43.20,15.64,0.00,1.00,76.80,0.00 +-76.80,43.20,15.66,0.00,1.00,72.00,-0.00 +-72.00,43.20,15.68,0.00,1.00,62.40,0.00 +-67.20,38.40,15.70,0.00,1.00,57.60,-0.00 +-62.40,38.40,15.72,0.00,1.00,52.80,0.00 +-52.80,38.40,15.74,0.00,1.00,48.00,-0.00 +-48.00,33.60,15.77,0.00,1.00,43.20,0.00 +-43.20,33.60,15.79,0.00,1.00,38.40,-0.00 +-38.40,28.80,15.81,0.00,1.00,33.60,0.00 +-33.60,28.80,15.83,0.00,1.00,28.80,-0.00 +-28.80,24.00,15.85,0.00,1.00,24.00,0.00 +-24.00,24.00,15.87,0.00,1.00,19.20,-0.00 +-24.00,19.20,15.89,0.00,1.00,14.40,0.00 +-19.20,14.40,15.91,0.00,1.00,14.40,-0.00 +-14.40,14.40,15.94,0.00,1.00,9.60,0.00 +-9.60,9.60,15.96,0.00,1.00,4.80,-0.00 +-4.80,4.80,15.98,0.00,1.00,4.80,0.00 +-4.80,4.80,16.00,0.00,1.00,0.00,-0.00 +0.00,0.00,16.00,0.00,1.00,-4.80,0.00 +4.80,-4.80,15.98,0.00,1.00,-4.80,0.00 +4.80,-4.80,15.96,0.00,1.00,-9.60,-0.00 +9.60,-9.60,15.94,0.00,1.00,-14.40,0.00 +14.40,-14.40,15.91,0.00,1.00,-19.20,-0.00 +14.40,-19.20,15.89,0.00,1.00,-24.00,0.00 +19.20,-19.20,15.87,0.00,1.00,-24.00,-0.00 +24.00,-24.00,15.85,0.00,1.00,-28.80,0.00 +28.80,-28.80,15.83,0.00,1.00,-33.60,-0.00 +33.60,-28.80,15.81,0.00,1.00,-38.40,0.00 +38.40,-33.60,15.79,0.00,1.00,-43.20,-0.00 +43.20,-38.40,15.77,0.00,1.00,-48.00,0.00 +48.00,-38.40,15.74,0.00,1.00,-52.80,-4.80 +52.80,-43.20,15.72,0.00,1.00,-62.40,4.80 +57.60,-43.20,15.70,0.00,1.00,-67.20,-4.80 +62.40,-43.20,15.68,0.00,1.00,-72.00,4.80 +72.00,-48.00,15.66,0.00,1.00,-76.80,-4.80 +76.80,-48.00,15.64,0.00,1.00,-86.40,4.80 +86.40,-48.00,15.62,0.00,1.00,-91.20,-4.80 +91.20,-48.00,15.59,0.00,1.00,-96.00,4.80 +100.80,-48.00,15.57,0.00,1.00,-105.60,-4.80 +105.60,-48.00,15.55,0.00,1.00,-110.40,4.80 +110.40,-48.00,15.53,0.00,1.00,-115.20,-4.80 +120.00,-43.20,15.51,0.00,1.00,-124.80,4.80 +124.80,-43.20,15.49,0.00,1.00,-129.60,-4.80 +129.60,-38.40,15.47,0.00,1.00,-134.40,4.80 +134.40,-38.40,15.44,0.00,1.00,-139.20,-4.80 +139.20,-33.60,15.42,0.00,1.00,-144.00,0.00 +144.00,-33.60,15.40,0.00,1.00,-148.80,-0.00 +148.80,-28.80,15.38,0.00,1.00,-153.60,0.00 +153.60,-24.00,15.36,0.00,1.00,-158.40,-0.00 +158.40,-24.00,15.34,0.00,1.00,-158.40,0.00 +163.20,-19.20,15.32,0.00,1.00,-163.20,-0.00 +163.20,-14.40,15.30,0.00,1.00,-168.00,0.00 +168.00,-14.40,15.27,0.00,1.00,-172.80,-0.00 +172.80,-9.60,15.25,0.00,1.00,-172.80,0.00 +172.80,-4.80,15.23,0.00,1.00,-177.60,-0.00 +177.60,-0.00,15.21,0.00,1.00,177.60,0.00 +-177.60,0.00,15.19,0.00,1.00,172.80,0.00 +-172.80,4.80,15.17,0.00,1.00,172.80,-0.00 +-172.80,9.60,15.15,0.00,1.00,168.00,0.00 +-168.00,14.40,15.12,0.00,1.00,163.20,-0.00 +-163.20,14.40,15.10,0.00,1.00,158.40,0.00 +-163.20,19.20,15.08,0.00,1.00,158.40,-0.00 +-158.40,24.00,15.06,0.00,1.00,153.60,0.00 +-153.60,24.00,15.04,0.00,1.00,148.80,-0.00 +-148.80,28.80,15.02,0.00,1.00,144.00,0.00 +-144.00,33.60,15.00,0.00,1.00,139.20,-0.00 +-139.20,33.60,14.97,0.00,1.00,134.40,0.00 +-134.40,38.40,14.95,0.00,1.00,129.60,-4.80 +-129.60,38.40,14.93,0.00,1.00,124.80,4.80 +-124.80,43.20,14.91,0.00,1.00,115.20,-4.80 +-120.00,43.20,14.89,0.00,1.00,110.40,4.80 +-110.40,48.00,14.87,0.00,1.00,105.60,-4.80 +-105.60,48.00,14.85,0.00,1.00,96.00,4.80 +-100.80,48.00,14.83,0.00,1.00,91.20,-4.80 +-91.20,48.00,14.80,0.00,1.00,86.40,4.80 +-86.40,48.00,14.78,0.00,1.00,76.80,-4.80 +-76.80,48.00,14.76,0.00,1.00,72.00,4.80 +-72.00,48.00,14.74,0.00,1.00,67.20,-4.80 +-62.40,43.20,14.72,0.00,1.00,62.40,4.80 +-57.60,43.20,14.70,0.00,1.00,52.80,-4.80 +-52.80,43.20,14.68,0.00,1.00,48.00,4.80 +-48.00,38.40,14.65,0.00,1.00,43.20,-4.80 +-43.20,38.40,14.63,0.00,1.00,38.40,0.00 +-38.40,33.60,14.61,0.00,1.00,33.60,-0.00 +-33.60,28.80,14.59,0.00,1.00,28.80,0.00 +-28.80,28.80,14.57,0.00,1.00,24.00,-0.00 +-24.00,24.00,14.55,0.00,1.00,24.00,0.00 +-19.20,19.20,14.53,0.00,1.00,19.20,-0.00 +-14.40,19.20,14.50,0.00,1.00,14.40,0.00 +-14.40,14.40,14.48,0.00,1.00,9.60,-0.00 +-9.60,9.60,14.46,0.00,1.00,4.80,0.00 +-4.80,4.80,14.44,0.00,1.00,4.80,-0.00 +-4.80,4.80,14.42,0.00,1.00,0.00,0.00 +0.00,0.00,14.40,0.00,1.00,-4.80,0.00 +4.80,-4.80,14.38,0.00,1.00,-9.60,0.00 +4.80,-9.60,14.36,0.00,1.00,-9.60,-0.00 +9.60,-9.60,14.33,0.00,1.00,-14.40,0.00 +9.60,-14.40,14.31,0.00,1.00,-19.20,-4.80 +14.40,-19.20,14.29,0.00,1.00,-24.00,4.80 +19.20,-24.00,14.27,0.00,1.00,-28.80,-4.80 +24.00,-24.00,14.25,0.00,1.00,-33.60,4.80 +24.00,-28.80,14.23,0.00,1.00,-38.40,-4.80 +28.80,-33.60,14.21,0.00,1.00,-43.20,4.80 +33.60,-38.40,14.18,0.00,1.00,-48.00,-4.80 +38.40,-38.40,14.16,0.00,1.00,-52.80,4.80 +43.20,-43.20,14.14,0.00,1.00,-57.60,-4.80 +48.00,-43.20,14.12,0.00,1.00,-62.40,4.80 +52.80,-48.00,14.10,0.00,1.00,-67.20,-4.80 +62.40,-48.00,14.08,0.00,1.00,-72.00,9.60 +67.20,-52.80,14.06,0.00,1.00,-81.60,-9.60 +76.80,-52.80,14.03,0.00,1.00,-86.40,9.60 +86.40,-52.80,14.01,0.00,1.00,-91.20,-9.60 +91.20,-52.80,13.99,0.00,1.00,-96.00,9.60 +100.80,-52.80,13.97,0.00,1.00,-105.60,-9.60 +105.60,-52.80,13.95,0.00,1.00,-110.40,9.60 +115.20,-48.00,13.93,0.00,1.00,-115.20,-9.60 +120.00,-48.00,13.91,0.00,1.00,-120.00,9.60 +129.60,-48.00,13.89,0.00,1.00,-124.80,-4.80 +134.40,-43.20,13.86,0.00,1.00,-129.60,4.80 +139.20,-43.20,13.84,0.00,1.00,-134.40,-4.80 +144.00,-38.40,13.82,0.00,1.00,-139.20,4.80 +148.80,-33.60,13.80,0.00,1.00,-144.00,-4.80 +153.60,-33.60,13.78,0.00,1.00,-148.80,4.80 +158.40,-28.80,13.76,0.00,1.00,-153.60,-4.80 +158.40,-24.00,13.74,0.00,1.00,-158.40,4.80 +163.20,-19.20,13.71,0.00,1.00,-163.20,-4.80 +168.00,-19.20,13.69,0.00,1.00,-168.00,4.80 +168.00,-14.40,13.67,0.00,1.00,-172.80,-0.00 +172.80,-9.60,13.65,0.00,1.00,-172.80,0.00 +177.60,-4.80,13.63,0.00,1.00,-177.60,-0.00 +177.60,-0.00,13.61,0.00,1.00,177.60,0.00 +-177.60,0.00,13.59,0.00,1.00,172.80,0.00 +-177.60,4.80,13.56,0.00,1.00,172.80,-0.00 +-172.80,9.60,13.54,0.00,1.00,168.00,0.00 +-168.00,14.40,13.52,0.00,1.00,163.20,-0.00 +-168.00,19.20,13.50,0.00,1.00,158.40,4.80 +-163.20,19.20,13.48,0.00,1.00,153.60,-4.80 +-158.40,24.00,13.46,0.00,1.00,148.80,4.80 +-158.40,28.80,13.44,0.00,1.00,144.00,-4.80 +-153.60,33.60,13.42,0.00,1.00,139.20,4.80 +-148.80,33.60,13.39,0.00,1.00,134.40,-4.80 +-144.00,38.40,13.37,0.00,1.00,129.60,4.80 +-139.20,43.20,13.35,0.00,1.00,124.80,-4.80 +-134.40,43.20,13.33,0.00,1.00,120.00,4.80 +-129.60,48.00,13.31,0.00,1.00,115.20,-4.80 +-120.00,48.00,13.29,0.00,1.00,110.40,9.60 +-115.20,48.00,13.27,0.00,1.00,105.60,-9.60 +-105.60,52.80,13.24,0.00,1.00,96.00,9.60 +-100.80,52.80,13.22,0.00,1.00,91.20,-9.60 +-91.20,52.80,13.20,0.00,1.00,86.40,9.60 +-86.40,52.80,13.18,0.00,1.00,81.60,-9.60 +-76.80,52.80,13.16,0.00,1.00,72.00,9.60 +-67.20,52.80,13.14,0.00,1.00,67.20,-9.60 +-62.40,48.00,13.12,0.00,1.00,62.40,9.60 +-52.80,48.00,13.09,0.00,1.00,57.60,-4.80 +-48.00,43.20,13.07,0.00,1.00,52.80,4.80 +-43.20,43.20,13.05,0.00,1.00,48.00,-4.80 +-38.40,38.40,13.03,0.00,1.00,43.20,4.80 +-33.60,38.40,13.01,0.00,1.00,38.40,-4.80 +-28.80,33.60,12.99,0.00,1.00,33.60,4.80 +-24.00,28.80,12.97,0.00,1.00,28.80,-4.80 +-24.00,24.00,12.95,0.00,1.00,24.00,4.80 +-19.20,24.00,12.92,0.00,1.00,19.20,-4.80 +-14.40,19.20,12.90,0.00,1.00,14.40,4.80 +-9.60,14.40,12.88,0.00,1.00,9.60,-4.80 +-9.60,9.60,12.86,0.00,1.00,9.60,0.00 +-4.80,9.60,12.84,0.00,1.00,4.80,-0.00 +-4.80,4.80,12.82,0.00,1.00,0.00,0.00 +0.00,0.00,12.80,0.00,1.00,-4.80,0.00 +4.80,-4.80,12.77,0.00,1.00,-9.60,0.00 +4.80,-9.60,12.75,0.00,1.00,-14.40,-0.00 +9.60,-14.40,12.73,0.00,1.00,-14.40,4.80 +9.60,-14.40,12.71,0.00,1.00,-19.20,-4.80 +14.40,-19.20,12.69,0.00,1.00,-24.00,4.80 +14.40,-24.00,12.67,0.00,1.00,-28.80,-4.80 +19.20,-28.80,12.65,0.00,1.00,-33.60,4.80 +24.00,-33.60,12.62,0.00,1.00,-38.40,-9.60 +28.80,-33.60,12.60,0.00,1.00,-43.20,9.60 +28.80,-38.40,12.58,0.00,1.00,-48.00,-9.60 +33.60,-43.20,12.56,0.00,1.00,-52.80,9.60 +38.40,-43.20,12.54,0.00,1.00,-57.60,-9.60 +48.00,-48.00,12.52,0.00,1.00,-62.40,9.60 +52.80,-52.80,12.50,0.00,1.00,-67.20,-9.60 +57.60,-52.80,12.48,0.00,1.00,-72.00,9.60 +67.20,-57.60,12.45,0.00,1.00,-81.60,-14.40 +76.80,-57.60,12.43,0.00,1.00,-86.40,14.40 +81.60,-57.60,12.41,0.00,1.00,-91.20,-14.40 +91.20,-57.60,12.39,0.00,1.00,-96.00,14.40 +100.80,-57.60,12.37,0.00,1.00,-100.80,-14.40 +110.40,-57.60,12.35,0.00,1.00,-110.40,14.40 +115.20,-52.80,12.33,0.00,1.00,-115.20,-14.40 +124.80,-52.80,12.30,0.00,1.00,-120.00,9.60 +129.60,-48.00,12.28,0.00,1.00,-124.80,-9.60 +139.20,-48.00,12.26,0.00,1.00,-129.60,9.60 +144.00,-43.20,12.24,0.00,1.00,-134.40,-9.60 +148.80,-38.40,12.22,0.00,1.00,-139.20,9.60 +153.60,-38.40,12.20,0.00,1.00,-144.00,-9.60 +153.60,-33.60,12.18,0.00,1.00,-148.80,9.60 +158.40,-28.80,12.15,0.00,1.00,-153.60,-9.60 +163.20,-24.00,12.13,0.00,1.00,-158.40,4.80 +163.20,-24.00,12.11,0.00,1.00,-163.20,-4.80 +168.00,-19.20,12.09,0.00,1.00,-168.00,4.80 +172.80,-14.40,12.07,0.00,1.00,-168.00,-4.80 +172.80,-9.60,12.05,0.00,1.00,-172.80,4.80 +177.60,-4.80,12.03,0.00,1.00,-177.60,-0.00 +177.60,-0.00,12.01,0.00,1.00,177.60,0.00 +-177.60,0.00,11.98,0.00,1.00,172.80,0.00 +-177.60,4.80,11.96,0.00,1.00,168.00,-0.00 +-172.80,9.60,11.94,0.00,1.00,168.00,4.80 +-172.80,14.40,11.92,0.00,1.00,163.20,-4.80 +-168.00,19.20,11.90,0.00,1.00,158.40,4.80 +-163.20,24.00,11.88,0.00,1.00,153.60,-4.80 +-163.20,24.00,11.86,0.00,1.00,148.80,4.80 +-158.40,28.80,11.83,0.00,1.00,144.00,-9.60 +-153.60,33.60,11.81,0.00,1.00,139.20,9.60 +-153.60,38.40,11.79,0.00,1.00,134.40,-9.60 +-148.80,38.40,11.77,0.00,1.00,129.60,9.60 +-144.00,43.20,11.75,0.00,1.00,124.80,-9.60 +-139.20,48.00,11.73,0.00,1.00,120.00,9.60 +-129.60,48.00,11.71,0.00,1.00,115.20,-9.60 +-124.80,52.80,11.68,0.00,1.00,110.40,9.60 +-115.20,52.80,11.66,0.00,1.00,100.80,-14.40 +-110.40,57.60,11.64,0.00,1.00,96.00,14.40 +-100.80,57.60,11.62,0.00,1.00,91.20,-14.40 +-91.20,57.60,11.60,0.00,1.00,86.40,14.40 +-81.60,57.60,11.58,0.00,1.00,81.60,-14.40 +-76.80,57.60,11.56,0.00,1.00,72.00,14.40 +-67.20,57.60,11.54,0.00,1.00,67.20,-14.40 +-57.60,52.80,11.51,0.00,1.00,62.40,9.60 +-52.80,52.80,11.49,0.00,1.00,57.60,-9.60 +-48.00,48.00,11.47,0.00,1.00,52.80,9.60 +-38.40,43.20,11.45,0.00,1.00,48.00,-9.60 +-33.60,43.20,11.43,0.00,1.00,43.20,9.60 +-28.80,38.40,11.41,0.00,1.00,38.40,-9.60 +-28.80,33.60,11.39,0.00,1.00,33.60,9.60 +-24.00,33.60,11.36,0.00,1.00,28.80,-9.60 +-19.20,28.80,11.34,0.00,1.00,24.00,4.80 +-14.40,24.00,11.32,0.00,1.00,19.20,-4.80 +-14.40,19.20,11.30,0.00,1.00,14.40,4.80 +-9.60,14.40,11.28,0.00,1.00,14.40,-4.80 +-9.60,14.40,11.26,0.00,1.00,9.60,4.80 +-4.80,9.60,11.24,0.00,1.00,4.80,-0.00 +-4.80,4.80,11.21,0.00,1.00,0.00,0.00 +0.00,0.00,11.19,0.00,1.00,-4.80,0.00 +0.00,-4.80,11.17,0.00,1.00,-9.60,0.00 +4.80,-9.60,11.15,0.00,1.00,-14.40,-4.80 +4.80,-14.40,11.13,0.00,1.00,-19.20,4.80 +9.60,-19.20,11.11,0.00,1.00,-19.20,-4.80 +9.60,-19.20,11.09,0.00,1.00,-24.00,4.80 +14.40,-24.00,11.07,0.00,1.00,-28.80,-9.60 +19.20,-28.80,11.04,0.00,1.00,-33.60,9.60 +19.20,-33.60,11.02,0.00,1.00,-38.40,-9.60 +24.00,-38.40,11.00,0.00,1.00,-43.20,9.60 +28.80,-43.20,10.98,0.00,1.00,-48.00,-14.40 +33.60,-43.20,10.96,0.00,1.00,-52.80,14.40 +38.40,-48.00,10.94,0.00,1.00,-57.60,-14.40 +43.20,-52.80,10.92,0.00,1.00,-62.40,14.40 +48.00,-52.80,10.89,0.00,1.00,-72.00,-14.40 +52.80,-57.60,10.87,0.00,1.00,-76.80,14.40 +62.40,-57.60,10.85,0.00,1.00,-81.60,-19.20 +72.00,-62.40,10.83,0.00,1.00,-86.40,19.20 +81.60,-62.40,10.81,0.00,1.00,-91.20,-19.20 +91.20,-62.40,10.79,0.00,1.00,-96.00,19.20 +100.80,-62.40,10.77,0.00,1.00,-100.80,-19.20 +110.40,-62.40,10.74,0.00,1.00,-105.60,19.20 +120.00,-57.60,10.72,0.00,1.00,-115.20,-14.40 +129.60,-57.60,10.70,0.00,1.00,-120.00,14.40 +134.40,-52.80,10.68,0.00,1.00,-124.80,-14.40 +139.20,-48.00,10.66,0.00,1.00,-129.60,14.40 +144.00,-48.00,10.64,0.00,1.00,-134.40,-14.40 +148.80,-43.20,10.62,0.00,1.00,-139.20,14.40 +153.60,-38.40,10.60,0.00,1.00,-144.00,-14.40 +158.40,-33.60,10.57,0.00,1.00,-148.80,9.60 +163.20,-33.60,10.55,0.00,1.00,-153.60,-9.60 +163.20,-28.80,10.53,0.00,1.00,-158.40,9.60 +168.00,-24.00,10.51,0.00,1.00,-163.20,-9.60 +168.00,-19.20,10.49,0.00,1.00,-163.20,4.80 +172.80,-14.40,10.47,0.00,1.00,-168.00,-4.80 +172.80,-9.60,10.45,0.00,1.00,-172.80,4.80 +177.60,-4.80,10.42,0.00,1.00,-177.60,-0.00 +177.60,-0.00,10.40,0.00,1.00,177.60,0.00 +-177.60,0.00,10.38,0.00,1.00,172.80,0.00 +-177.60,4.80,10.36,0.00,1.00,168.00,-0.00 +-172.80,9.60,10.34,0.00,1.00,163.20,4.80 +-172.80,14.40,10.32,0.00,1.00,163.20,-4.80 +-168.00,19.20,10.30,0.00,1.00,158.40,4.80 +-168.00,24.00,10.28,0.00,1.00,153.60,-9.60 +-163.20,28.80,10.25,0.00,1.00,148.80,9.60 +-163.20,33.60,10.23,0.00,1.00,144.00,-9.60 +-158.40,33.60,10.21,0.00,1.00,139.20,9.60 +-153.60,38.40,10.19,0.00,1.00,134.40,-14.40 +-148.80,43.20,10.17,0.00,1.00,129.60,14.40 +-144.00,48.00,10.15,0.00,1.00,124.80,-14.40 +-139.20,48.00,10.13,0.00,1.00,120.00,14.40 +-134.40,52.80,10.10,0.00,1.00,115.20,-14.40 +-129.60,57.60,10.08,0.00,1.00,105.60,14.40 +-120.00,57.60,10.06,0.00,1.00,100.80,-14.40 +-110.40,62.40,10.04,0.00,1.00,96.00,19.20 +-100.80,62.40,10.02,0.00,1.00,91.20,-19.20 +-91.20,62.40,10.00,0.00,1.00,86.40,19.20 +-81.60,62.40,9.98,0.00,1.00,81.60,-19.20 +-72.00,62.40,9.95,0.00,1.00,76.80,19.20 +-62.40,57.60,9.93,0.00,1.00,72.00,-19.20 +-52.80,57.60,9.91,0.00,1.00,62.40,14.40 +-48.00,52.80,9.89,0.00,1.00,57.60,-14.40 +-43.20,52.80,9.87,0.00,1.00,52.80,14.40 +-38.40,48.00,9.85,0.00,1.00,48.00,-14.40 +-33.60,43.20,9.83,0.00,1.00,43.20,14.40 +-28.80,43.20,9.81,0.00,1.00,38.40,-14.40 +-24.00,38.40,9.78,0.00,1.00,33.60,9.60 +-19.20,33.60,9.76,0.00,1.00,28.80,-9.60 +-19.20,28.80,9.74,0.00,1.00,24.00,9.60 +-14.40,24.00,9.72,0.00,1.00,19.20,-9.60 +-9.60,19.20,9.70,0.00,1.00,19.20,4.80 +-9.60,19.20,9.68,0.00,1.00,14.40,-4.80 +-4.80,14.40,9.66,0.00,1.00,9.60,4.80 +-4.80,9.60,9.63,0.00,1.00,4.80,-4.80 +-0.00,4.80,9.61,0.00,1.00,0.00,0.00 +0.00,0.00,9.59,0.00,1.00,-4.80,0.00 +0.00,-4.80,9.57,0.00,1.00,-9.60,0.00 +4.80,-9.60,9.55,0.00,1.00,-14.40,-4.80 +4.80,-14.40,9.53,0.00,1.00,-19.20,4.80 +9.60,-19.20,9.51,0.00,1.00,-24.00,-4.80 +9.60,-24.00,9.48,0.00,1.00,-28.80,9.60 +14.40,-24.00,9.46,0.00,1.00,-33.60,-9.60 +14.40,-28.80,9.44,0.00,1.00,-33.60,14.40 +19.20,-33.60,9.42,0.00,1.00,-38.40,-14.40 +19.20,-38.40,9.40,0.00,1.00,-43.20,14.40 +24.00,-43.20,9.38,0.00,1.00,-48.00,-14.40 +28.80,-48.00,9.36,0.00,1.00,-57.60,19.20 +33.60,-52.80,9.34,0.00,1.00,-62.40,-19.20 +38.40,-52.80,9.31,0.00,1.00,-67.20,19.20 +43.20,-57.60,9.29,0.00,1.00,-72.00,-19.20 +48.00,-62.40,9.27,0.00,1.00,-76.80,19.20 +57.60,-62.40,9.25,0.00,1.00,-81.60,-19.20 +67.20,-67.20,9.23,0.00,1.00,-86.40,24.00 +81.60,-67.20,9.21,0.00,1.00,-91.20,-24.00 +91.20,-67.20,9.19,0.00,1.00,-96.00,24.00 +105.60,-67.20,9.16,0.00,1.00,-100.80,-24.00 +115.20,-67.20,9.14,0.00,1.00,-105.60,24.00 +124.80,-62.40,9.12,0.00,1.00,-110.40,-19.20 +134.40,-57.60,9.10,0.00,1.00,-115.20,19.20 +139.20,-57.60,9.08,0.00,1.00,-120.00,-19.20 +144.00,-52.80,9.06,0.00,1.00,-129.60,19.20 +148.80,-48.00,9.04,0.00,1.00,-134.40,-19.20 +153.60,-43.20,9.01,0.00,1.00,-139.20,19.20 +158.40,-43.20,8.99,0.00,1.00,-144.00,-14.40 +163.20,-38.40,8.97,0.00,1.00,-148.80,14.40 +163.20,-33.60,8.95,0.00,1.00,-148.80,-14.40 +168.00,-28.80,8.93,0.00,1.00,-153.60,9.60 +168.00,-24.00,8.91,0.00,1.00,-158.40,-9.60 +172.80,-19.20,8.89,0.00,1.00,-163.20,9.60 +172.80,-14.40,8.87,0.00,1.00,-168.00,-4.80 +177.60,-9.60,8.84,0.00,1.00,-172.80,4.80 +177.60,-4.80,8.82,0.00,1.00,-177.60,-4.80 +177.60,-0.00,8.80,0.00,1.00,177.60,0.00 +-177.60,0.00,8.78,0.00,1.00,172.80,0.00 +-177.60,4.80,8.76,0.00,1.00,168.00,-4.80 +-177.60,9.60,8.74,0.00,1.00,163.20,4.80 +-172.80,14.40,8.72,0.00,1.00,158.40,-4.80 +-172.80,19.20,8.69,0.00,1.00,153.60,9.60 +-168.00,24.00,8.67,0.00,1.00,148.80,-9.60 +-168.00,28.80,8.65,0.00,1.00,148.80,9.60 +-163.20,33.60,8.63,0.00,1.00,144.00,-14.40 +-163.20,38.40,8.61,0.00,1.00,139.20,14.40 +-158.40,43.20,8.59,0.00,1.00,134.40,-14.40 +-153.60,43.20,8.57,0.00,1.00,129.60,19.20 +-148.80,48.00,8.54,0.00,1.00,120.00,-19.20 +-144.00,52.80,8.52,0.00,1.00,115.20,19.20 +-139.20,57.60,8.50,0.00,1.00,110.40,-19.20 +-134.40,57.60,8.48,0.00,1.00,105.60,19.20 +-124.80,62.40,8.46,0.00,1.00,100.80,-19.20 +-115.20,67.20,8.44,0.00,1.00,96.00,24.00 +-105.60,67.20,8.42,0.00,1.00,91.20,-24.00 +-91.20,67.20,8.40,0.00,1.00,86.40,24.00 +-81.60,67.20,8.37,0.00,1.00,81.60,-24.00 +-67.20,67.20,8.35,0.00,1.00,76.80,24.00 +-57.60,62.40,8.33,0.00,1.00,72.00,-19.20 +-48.00,62.40,8.31,0.00,1.00,67.20,19.20 +-43.20,57.60,8.29,0.00,1.00,62.40,-19.20 +-38.40,52.80,8.27,0.00,1.00,57.60,19.20 +-33.60,52.80,8.25,0.00,1.00,48.00,-19.20 +-28.80,48.00,8.22,0.00,1.00,43.20,19.20 +-24.00,43.20,8.20,0.00,1.00,38.40,-14.40 +-19.20,38.40,8.18,0.00,1.00,33.60,14.40 +-19.20,33.60,8.16,0.00,1.00,33.60,-14.40 +-14.40,28.80,8.14,0.00,1.00,28.80,14.40 +-14.40,24.00,8.12,0.00,1.00,24.00,-9.60 +-9.60,24.00,8.10,0.00,1.00,19.20,9.60 +-9.60,19.20,8.07,0.00,1.00,14.40,-4.80 +-4.80,14.40,8.05,0.00,1.00,9.60,4.80 +-4.80,9.60,8.03,0.00,1.00,4.80,-4.80 +-0.00,4.80,8.01,0.00,1.00,0.00,0.00 +0.00,0.00,7.99,0.00,1.00,-4.80,0.00 +0.00,-4.80,7.97,0.00,1.00,-9.60,0.00 +4.80,-9.60,7.95,0.00,1.00,-14.40,-4.80 +4.80,-14.40,7.93,0.00,1.00,-19.20,4.80 +4.80,-19.20,7.90,0.00,1.00,-24.00,-9.60 +9.60,-24.00,7.88,0.00,1.00,-28.80,9.60 +9.60,-28.80,7.86,0.00,1.00,-33.60,-14.40 +9.60,-33.60,7.84,0.00,1.00,-38.40,14.40 +14.40,-38.40,7.82,0.00,1.00,-43.20,-14.40 +14.40,-38.40,7.80,0.00,1.00,-48.00,19.20 +19.20,-43.20,7.78,0.00,1.00,-52.80,-19.20 +24.00,-48.00,7.75,0.00,1.00,-57.60,19.20 +24.00,-52.80,7.73,0.00,1.00,-62.40,-24.00 +28.80,-57.60,7.71,0.00,1.00,-67.20,24.00 +38.40,-62.40,7.69,0.00,1.00,-72.00,-24.00 +43.20,-62.40,7.67,0.00,1.00,-76.80,24.00 +52.80,-67.20,7.65,0.00,1.00,-81.60,-24.00 +62.40,-72.00,7.63,0.00,1.00,-86.40,28.80 +76.80,-72.00,7.60,0.00,1.00,-91.20,-28.80 +96.00,-72.00,7.58,0.00,1.00,-96.00,28.80 +110.40,-72.00,7.56,0.00,1.00,-100.80,-28.80 +120.00,-67.20,7.54,0.00,1.00,-105.60,28.80 +134.40,-67.20,7.52,0.00,1.00,-110.40,-24.00 +139.20,-62.40,7.50,0.00,1.00,-115.20,24.00 +148.80,-57.60,7.48,0.00,1.00,-120.00,-24.00 +153.60,-57.60,7.46,0.00,1.00,-124.80,24.00 +158.40,-52.80,7.43,0.00,1.00,-129.60,-24.00 +158.40,-48.00,7.41,0.00,1.00,-134.40,19.20 +163.20,-43.20,7.39,0.00,1.00,-139.20,-19.20 +163.20,-38.40,7.37,0.00,1.00,-144.00,19.20 +168.00,-33.60,7.35,0.00,1.00,-148.80,-14.40 +168.00,-28.80,7.33,0.00,1.00,-153.60,14.40 +172.80,-24.00,7.31,0.00,1.00,-158.40,-9.60 +172.80,-19.20,7.28,0.00,1.00,-163.20,9.60 +172.80,-14.40,7.26,0.00,1.00,-168.00,-9.60 +177.60,-9.60,7.24,0.00,1.00,-172.80,4.80 +177.60,-4.80,7.22,0.00,1.00,-177.60,-4.80 +177.60,-0.00,7.20,0.00,1.00,177.60,0.00 +-177.60,0.00,7.18,0.00,1.00,172.80,0.00 +-177.60,4.80,7.16,0.00,1.00,168.00,-4.80 +-177.60,9.60,7.13,0.00,1.00,163.20,4.80 +-172.80,14.40,7.11,0.00,1.00,158.40,-9.60 +-172.80,19.20,7.09,0.00,1.00,153.60,9.60 +-172.80,24.00,7.07,0.00,1.00,148.80,-9.60 +-168.00,28.80,7.05,0.00,1.00,144.00,14.40 +-168.00,33.60,7.03,0.00,1.00,139.20,-14.40 +-163.20,38.40,7.01,0.00,1.00,134.40,19.20 +-163.20,43.20,6.99,0.00,1.00,129.60,-19.20 +-158.40,48.00,6.96,0.00,1.00,124.80,19.20 +-158.40,52.80,6.94,0.00,1.00,120.00,-24.00 +-153.60,57.60,6.92,0.00,1.00,115.20,24.00 +-148.80,57.60,6.90,0.00,1.00,110.40,-24.00 +-139.20,62.40,6.88,0.00,1.00,105.60,24.00 +-134.40,67.20,6.86,0.00,1.00,100.80,-24.00 +-120.00,67.20,6.84,0.00,1.00,96.00,28.80 +-110.40,72.00,6.81,0.00,1.00,91.20,-28.80 +-96.00,72.00,6.79,0.00,1.00,86.40,28.80 +-76.80,72.00,6.77,0.00,1.00,81.60,-28.80 +-62.40,72.00,6.75,0.00,1.00,76.80,28.80 +-52.80,67.20,6.73,0.00,1.00,72.00,-24.00 +-43.20,62.40,6.71,0.00,1.00,67.20,24.00 +-38.40,62.40,6.69,0.00,1.00,62.40,-24.00 +-28.80,57.60,6.66,0.00,1.00,57.60,24.00 +-24.00,52.80,6.64,0.00,1.00,52.80,-24.00 +-24.00,48.00,6.62,0.00,1.00,48.00,19.20 +-19.20,43.20,6.60,0.00,1.00,43.20,-19.20 +-14.40,38.40,6.58,0.00,1.00,38.40,19.20 +-14.40,38.40,6.56,0.00,1.00,33.60,-14.40 +-9.60,33.60,6.54,0.00,1.00,28.80,14.40 +-9.60,28.80,6.52,0.00,1.00,24.00,-14.40 +-9.60,24.00,6.49,0.00,1.00,19.20,9.60 +-4.80,19.20,6.47,0.00,1.00,14.40,-9.60 +-4.80,14.40,6.45,0.00,1.00,9.60,4.80 +-4.80,9.60,6.43,0.00,1.00,4.80,-4.80 +-0.00,4.80,6.41,0.00,1.00,0.00,0.00 +0.00,0.00,6.39,0.00,1.00,-4.80,0.00 +0.00,-4.80,6.37,0.00,1.00,-9.60,4.80 +0.00,-9.60,6.34,0.00,1.00,-14.40,-4.80 +4.80,-14.40,6.32,0.00,1.00,-19.20,9.60 +4.80,-19.20,6.30,0.00,1.00,-24.00,-9.60 +4.80,-24.00,6.28,0.00,1.00,-28.80,14.40 +4.80,-28.80,6.26,0.00,1.00,-33.60,-14.40 +9.60,-33.60,6.24,0.00,1.00,-38.40,19.20 +9.60,-38.40,6.22,0.00,1.00,-43.20,-19.20 +14.40,-43.20,6.19,0.00,1.00,-48.00,19.20 +14.40,-48.00,6.17,0.00,1.00,-52.80,-24.00 +14.40,-52.80,6.15,0.00,1.00,-57.60,24.00 +19.20,-57.60,6.13,0.00,1.00,-62.40,-28.80 +24.00,-57.60,6.11,0.00,1.00,-67.20,28.80 +28.80,-62.40,6.09,0.00,1.00,-72.00,-28.80 +33.60,-67.20,6.07,0.00,1.00,-76.80,28.80 +43.20,-72.00,6.05,0.00,1.00,-81.60,-28.80 +57.60,-72.00,6.02,0.00,1.00,-86.40,33.60 +76.80,-76.80,6.00,0.00,1.00,-91.20,-33.60 +96.00,-76.80,5.98,0.00,1.00,-96.00,33.60 +115.20,-76.80,5.96,0.00,1.00,-100.80,-33.60 +129.60,-72.00,5.94,0.00,1.00,-105.60,28.80 +139.20,-72.00,5.92,0.00,1.00,-110.40,-28.80 +148.80,-67.20,5.90,0.00,1.00,-115.20,28.80 +153.60,-62.40,5.87,0.00,1.00,-120.00,-28.80 +158.40,-57.60,5.85,0.00,1.00,-124.80,28.80 +163.20,-52.80,5.83,0.00,1.00,-129.60,-24.00 +163.20,-48.00,5.81,0.00,1.00,-134.40,24.00 +168.00,-43.20,5.79,0.00,1.00,-139.20,-24.00 +168.00,-38.40,5.77,0.00,1.00,-144.00,19.20 +172.80,-33.60,5.75,0.00,1.00,-148.80,-19.20 +172.80,-28.80,5.72,0.00,1.00,-153.60,14.40 +172.80,-24.00,5.70,0.00,1.00,-158.40,-14.40 +172.80,-19.20,5.68,0.00,1.00,-163.20,9.60 +177.60,-14.40,5.66,0.00,1.00,-168.00,-9.60 +177.60,-9.60,5.64,0.00,1.00,-172.80,4.80 +177.60,-4.80,5.62,0.00,1.00,-177.60,-4.80 +177.60,-0.00,5.60,0.00,1.00,177.60,0.00 +-177.60,0.00,5.58,0.00,1.00,172.80,0.00 +-177.60,4.80,5.55,0.00,1.00,168.00,-4.80 +-177.60,9.60,5.53,0.00,1.00,163.20,4.80 +-177.60,14.40,5.51,0.00,1.00,158.40,-9.60 +-172.80,19.20,5.49,0.00,1.00,153.60,9.60 +-172.80,24.00,5.47,0.00,1.00,148.80,-14.40 +-172.80,28.80,5.45,0.00,1.00,144.00,14.40 +-172.80,33.60,5.43,0.00,1.00,139.20,-19.20 +-168.00,38.40,5.40,0.00,1.00,134.40,19.20 +-168.00,43.20,5.38,0.00,1.00,129.60,-24.00 +-163.20,48.00,5.36,0.00,1.00,124.80,24.00 +-163.20,52.80,5.34,0.00,1.00,120.00,-24.00 +-158.40,57.60,5.32,0.00,1.00,115.20,28.80 +-153.60,62.40,5.30,0.00,1.00,110.40,-28.80 +-148.80,67.20,5.28,0.00,1.00,105.60,28.80 +-139.20,72.00,5.26,0.00,1.00,100.80,-28.80 +-129.60,72.00,5.23,0.00,1.00,96.00,28.80 +-115.20,76.80,5.21,0.00,1.00,91.20,-33.60 +-96.00,76.80,5.19,0.00,1.00,86.40,33.60 +-76.80,76.80,5.17,0.00,1.00,81.60,-33.60 +-57.60,72.00,5.15,0.00,1.00,76.80,33.60 +-43.20,72.00,5.13,0.00,1.00,72.00,-28.80 +-33.60,67.20,5.11,0.00,1.00,67.20,28.80 +-28.80,62.40,5.08,0.00,1.00,62.40,-28.80 +-24.00,57.60,5.06,0.00,1.00,57.60,28.80 +-19.20,57.60,5.04,0.00,1.00,52.80,-28.80 +-14.40,52.80,5.02,0.00,1.00,48.00,24.00 +-14.40,48.00,5.00,0.00,1.00,43.20,-24.00 +-14.40,43.20,4.98,0.00,1.00,38.40,19.20 +-9.60,38.40,4.96,0.00,1.00,33.60,-19.20 +-9.60,33.60,4.93,0.00,1.00,28.80,19.20 +-4.80,28.80,4.91,0.00,1.00,24.00,-14.40 +-4.80,24.00,4.89,0.00,1.00,19.20,14.40 +-4.80,19.20,4.87,0.00,1.00,14.40,-9.60 +-4.80,14.40,4.85,0.00,1.00,9.60,9.60 +-0.00,9.60,4.83,0.00,1.00,4.80,-4.80 +-0.00,4.80,4.81,0.00,1.00,0.00,4.80 +0.00,0.00,4.79,0.00,1.00,-4.80,0.00 +0.00,-4.80,4.76,0.00,1.00,-9.60,4.80 +0.00,-9.60,4.74,0.00,1.00,-14.40,-4.80 +0.00,-14.40,4.72,0.00,1.00,-19.20,9.60 +4.80,-19.20,4.70,0.00,1.00,-24.00,-9.60 +4.80,-24.00,4.68,0.00,1.00,-28.80,14.40 +4.80,-28.80,4.66,0.00,1.00,-33.60,-14.40 +4.80,-33.60,4.64,0.00,1.00,-38.40,19.20 +4.80,-38.40,4.61,0.00,1.00,-43.20,-24.00 +9.60,-43.20,4.59,0.00,1.00,-48.00,24.00 +9.60,-48.00,4.57,0.00,1.00,-52.80,-24.00 +9.60,-52.80,4.55,0.00,1.00,-57.60,28.80 +14.40,-57.60,4.53,0.00,1.00,-62.40,-28.80 +14.40,-62.40,4.51,0.00,1.00,-67.20,33.60 +19.20,-67.20,4.49,0.00,1.00,-72.00,-33.60 +24.00,-72.00,4.46,0.00,1.00,-76.80,33.60 +33.60,-72.00,4.44,0.00,1.00,-81.60,-33.60 +43.20,-76.80,4.42,0.00,1.00,-86.40,38.40 +67.20,-81.60,4.40,0.00,1.00,-91.20,-38.40 +96.00,-81.60,4.38,0.00,1.00,-96.00,38.40 +124.80,-81.60,4.36,0.00,1.00,-100.80,-38.40 +144.00,-76.80,4.34,0.00,1.00,-105.60,33.60 +153.60,-72.00,4.32,0.00,1.00,-110.40,-33.60 +158.40,-67.20,4.29,0.00,1.00,-115.20,33.60 +163.20,-62.40,4.27,0.00,1.00,-120.00,-33.60 +168.00,-57.60,4.25,0.00,1.00,-124.80,28.80 +168.00,-52.80,4.23,0.00,1.00,-129.60,-28.80 +168.00,-48.00,4.21,0.00,1.00,-134.40,28.80 +172.80,-43.20,4.19,0.00,1.00,-139.20,-24.00 +172.80,-38.40,4.17,0.00,1.00,-144.00,24.00 +172.80,-33.60,4.14,0.00,1.00,-148.80,-19.20 +172.80,-28.80,4.12,0.00,1.00,-153.60,19.20 +177.60,-24.00,4.10,0.00,1.00,-158.40,-14.40 +177.60,-19.20,4.08,0.00,1.00,-163.20,14.40 +177.60,-14.40,4.06,0.00,1.00,-168.00,-9.60 +177.60,-9.60,4.04,0.00,1.00,-172.80,4.80 +177.60,-4.80,4.02,0.00,1.00,-177.60,-4.80 +177.60,-0.00,3.99,0.00,1.00,177.60,0.00 +-177.60,0.00,3.97,0.00,1.00,172.80,0.00 +-177.60,4.80,3.95,0.00,1.00,168.00,-4.80 +-177.60,9.60,3.93,0.00,1.00,163.20,4.80 +-177.60,14.40,3.91,0.00,1.00,158.40,-9.60 +-177.60,19.20,3.89,0.00,1.00,153.60,14.40 +-177.60,24.00,3.87,0.00,1.00,148.80,-14.40 +-172.80,28.80,3.85,0.00,1.00,144.00,19.20 +-172.80,33.60,3.82,0.00,1.00,139.20,-19.20 +-172.80,38.40,3.80,0.00,1.00,134.40,24.00 +-172.80,43.20,3.78,0.00,1.00,129.60,-24.00 +-168.00,48.00,3.76,0.00,1.00,124.80,28.80 +-168.00,52.80,3.74,0.00,1.00,120.00,-28.80 +-168.00,57.60,3.72,0.00,1.00,115.20,28.80 +-163.20,62.40,3.70,0.00,1.00,110.40,-33.60 +-158.40,67.20,3.67,0.00,1.00,105.60,33.60 +-153.60,72.00,3.65,0.00,1.00,100.80,-33.60 +-144.00,76.80,3.63,0.00,1.00,96.00,33.60 +-124.80,81.60,3.61,0.00,1.00,91.20,-38.40 +-96.00,81.60,3.59,0.00,1.00,86.40,38.40 +-67.20,81.60,3.57,0.00,1.00,81.60,-38.40 +-43.20,76.80,3.55,0.00,1.00,76.80,38.40 +-33.60,72.00,3.52,0.00,1.00,72.00,-33.60 +-24.00,72.00,3.50,0.00,1.00,67.20,33.60 +-19.20,67.20,3.48,0.00,1.00,62.40,-33.60 +-14.40,62.40,3.46,0.00,1.00,57.60,33.60 +-14.40,57.60,3.44,0.00,1.00,52.80,-28.80 +-9.60,52.80,3.42,0.00,1.00,48.00,28.80 +-9.60,48.00,3.40,0.00,1.00,43.20,-24.00 +-9.60,43.20,3.38,0.00,1.00,38.40,24.00 +-4.80,38.40,3.35,0.00,1.00,33.60,-24.00 +-4.80,33.60,3.33,0.00,1.00,28.80,19.20 +-4.80,28.80,3.31,0.00,1.00,24.00,-14.40 +-4.80,24.00,3.29,0.00,1.00,19.20,14.40 +-4.80,19.20,3.27,0.00,1.00,14.40,-9.60 +-0.00,14.40,3.25,0.00,1.00,9.60,9.60 +-0.00,9.60,3.23,0.00,1.00,4.80,-4.80 +-0.00,4.80,3.20,0.00,1.00,0.00,4.80 +0.00,0.00,3.18,0.00,1.00,-4.80,0.00 +0.00,-4.80,3.16,0.00,1.00,-9.60,4.80 +0.00,-9.60,3.14,0.00,1.00,-14.40,-4.80 +0.00,-14.40,3.12,0.00,1.00,-19.20,9.60 +0.00,-19.20,3.10,0.00,1.00,-24.00,-14.40 +0.00,-24.00,3.08,0.00,1.00,-28.80,14.40 +0.00,-28.80,3.05,0.00,1.00,-33.60,-19.20 +0.00,-33.60,3.03,0.00,1.00,-38.40,19.20 +4.80,-38.40,3.01,0.00,1.00,-43.20,-24.00 +4.80,-43.20,2.99,0.00,1.00,-48.00,28.80 +4.80,-48.00,2.97,0.00,1.00,-52.80,-28.80 +4.80,-52.80,2.95,0.00,1.00,-57.60,33.60 +4.80,-57.60,2.93,0.00,1.00,-62.40,-33.60 +4.80,-62.40,2.91,0.00,1.00,-67.20,33.60 +9.60,-67.20,2.88,0.00,1.00,-72.00,-38.40 +9.60,-72.00,2.86,0.00,1.00,-76.80,38.40 +14.40,-76.80,2.84,0.00,1.00,-81.60,-38.40 +24.00,-81.60,2.82,0.00,1.00,-86.40,43.20 +43.20,-86.40,2.80,0.00,1.00,-91.20,-43.20 +110.40,-86.40,2.78,0.00,1.00,-96.00,43.20 +148.80,-81.60,2.76,0.00,1.00,-100.80,-43.20 +163.20,-76.80,2.73,0.00,1.00,-105.60,38.40 +168.00,-72.00,2.71,0.00,1.00,-110.40,-38.40 +172.80,-67.20,2.69,0.00,1.00,-115.20,38.40 +172.80,-62.40,2.67,0.00,1.00,-120.00,-38.40 +172.80,-57.60,2.65,0.00,1.00,-124.80,33.60 +172.80,-52.80,2.63,0.00,1.00,-129.60,-33.60 +177.60,-48.00,2.61,0.00,1.00,-134.40,28.80 +177.60,-43.20,2.58,0.00,1.00,-139.20,-28.80 +177.60,-38.40,2.56,0.00,1.00,-144.00,24.00 +177.60,-33.60,2.54,0.00,1.00,-148.80,-24.00 +177.60,-28.80,2.52,0.00,1.00,-153.60,19.20 +177.60,-24.00,2.50,0.00,1.00,-158.40,-19.20 +177.60,-19.20,2.48,0.00,1.00,-163.20,14.40 +177.60,-14.40,2.46,0.00,1.00,-168.00,-9.60 +177.60,-9.60,2.44,0.00,1.00,-172.80,9.60 +177.60,-4.80,2.41,0.00,1.00,-177.60,-4.80 +177.60,-0.00,2.39,0.00,1.00,177.60,0.00 +-177.60,0.00,2.37,0.00,1.00,172.80,0.00 +-177.60,4.80,2.35,0.00,1.00,168.00,-4.80 +-177.60,9.60,2.33,0.00,1.00,163.20,9.60 +-177.60,14.40,2.31,0.00,1.00,158.40,-9.60 +-177.60,19.20,2.29,0.00,1.00,153.60,14.40 +-177.60,24.00,2.26,0.00,1.00,148.80,-19.20 +-177.60,28.80,2.24,0.00,1.00,144.00,19.20 +-177.60,33.60,2.22,0.00,1.00,139.20,-24.00 +-177.60,38.40,2.20,0.00,1.00,134.40,24.00 +-177.60,43.20,2.18,0.00,1.00,129.60,-28.80 +-177.60,48.00,2.16,0.00,1.00,124.80,28.80 +-172.80,52.80,2.14,0.00,1.00,120.00,-33.60 +-172.80,57.60,2.11,0.00,1.00,115.20,33.60 +-172.80,62.40,2.09,0.00,1.00,110.40,-38.40 +-172.80,67.20,2.07,0.00,1.00,105.60,38.40 +-168.00,72.00,2.05,0.00,1.00,100.80,-38.40 +-163.20,76.80,2.03,0.00,1.00,96.00,38.40 +-148.80,81.60,2.01,0.00,1.00,91.20,-43.20 +-110.40,86.40,1.99,0.00,1.00,86.40,43.20 +-43.20,86.40,1.97,0.00,1.00,81.60,-43.20 +-24.00,81.60,1.94,0.00,1.00,76.80,43.20 +-14.40,76.80,1.92,0.00,1.00,72.00,-38.40 +-9.60,72.00,1.90,0.00,1.00,67.20,38.40 +-9.60,67.20,1.88,0.00,1.00,62.40,-38.40 +-4.80,62.40,1.86,0.00,1.00,57.60,33.60 +-4.80,57.60,1.84,0.00,1.00,52.80,-33.60 +-4.80,52.80,1.82,0.00,1.00,48.00,33.60 +-4.80,48.00,1.79,0.00,1.00,43.20,-28.80 +-4.80,43.20,1.77,0.00,1.00,38.40,28.80 +-4.80,38.40,1.75,0.00,1.00,33.60,-24.00 +-0.00,33.60,1.73,0.00,1.00,28.80,19.20 +-0.00,28.80,1.71,0.00,1.00,24.00,-19.20 +-0.00,24.00,1.69,0.00,1.00,19.20,14.40 +-0.00,19.20,1.67,0.00,1.00,14.40,-14.40 +-0.00,14.40,1.64,0.00,1.00,9.60,9.60 +-0.00,9.60,1.62,0.00,1.00,4.80,-4.80 +-0.00,4.80,1.60,0.00,1.00,0.00,4.80 +-0.00,0.00,1.58,0.00,1.00,-4.80,0.00 +-0.00,-4.80,1.56,0.00,1.00,-9.60,4.80 +-0.00,-9.60,1.54,0.00,1.00,-14.40,-4.80 +-0.00,-14.40,1.52,0.00,1.00,-19.20,9.60 +-0.00,-19.20,1.50,0.00,1.00,-24.00,-14.40 +-0.00,-24.00,1.47,0.00,1.00,-28.80,19.20 +-0.00,-28.80,1.45,0.00,1.00,-33.60,-19.20 +-0.00,-33.60,1.43,0.00,1.00,-38.40,24.00 +-0.00,-38.40,1.41,0.00,1.00,-43.20,-28.80 +-0.00,-43.20,1.39,0.00,1.00,-48.00,28.80 +-0.00,-48.00,1.37,0.00,1.00,-52.80,-33.60 +-0.00,-52.80,1.35,0.00,1.00,-57.60,33.60 +-0.00,-57.60,1.32,0.00,1.00,-62.40,-38.40 +-0.00,-62.40,1.30,0.00,1.00,-67.20,38.40 +-4.80,-67.20,1.28,0.00,1.00,-72.00,-43.20 +-4.80,-72.00,1.26,0.00,1.00,-76.80,43.20 +-4.80,-76.80,1.24,0.00,1.00,-81.60,-43.20 +-9.60,-81.60,1.22,0.00,1.00,-86.40,43.20 +-19.20,-86.40,1.20,0.00,1.00,-91.20,-48.00 +-134.40,-86.40,1.17,0.00,1.00,-96.00,48.00 +-168.00,-81.60,1.15,0.00,1.00,-100.80,-48.00 +-172.80,-76.80,1.13,0.00,1.00,-105.60,43.20 +-177.60,-72.00,1.11,0.00,1.00,-110.40,-43.20 +-177.60,-67.20,1.09,0.00,1.00,-115.20,43.20 +-177.60,-62.40,1.07,0.00,1.00,-120.00,-38.40 +-177.60,-57.60,1.05,0.00,1.00,-124.80,38.40 +-177.60,-52.80,1.03,0.00,1.00,-129.60,-38.40 +-177.60,-48.00,1.00,0.00,1.00,-134.40,33.60 +-177.60,-43.20,0.98,0.00,1.00,-139.20,-28.80 +-177.60,-38.40,0.96,0.00,1.00,-144.00,28.80 +-177.60,-33.60,0.94,0.00,1.00,-148.80,-24.00 +-177.60,-28.80,0.92,0.00,1.00,-153.60,24.00 +-177.60,-24.00,0.90,0.00,1.00,-158.40,-19.20 +-177.60,-19.20,0.88,0.00,1.00,-163.20,14.40 +-177.60,-14.40,0.85,0.00,1.00,-168.00,-14.40 +-177.60,-9.60,0.83,0.00,1.00,-172.80,9.60 +-177.60,-4.80,0.81,0.00,1.00,-177.60,-4.80 +-177.60,-0.00,0.79,0.00,1.00,177.60,0.00 +177.60,0.00,0.77,0.00,1.00,172.80,0.00 +177.60,4.80,0.75,0.00,1.00,168.00,-4.80 +177.60,9.60,0.73,0.00,1.00,163.20,9.60 +177.60,14.40,0.70,0.00,1.00,158.40,-14.40 +177.60,19.20,0.68,0.00,1.00,153.60,14.40 +177.60,24.00,0.66,0.00,1.00,148.80,-19.20 +177.60,28.80,0.64,0.00,1.00,144.00,24.00 +177.60,33.60,0.62,0.00,1.00,139.20,-24.00 +177.60,38.40,0.60,0.00,1.00,134.40,28.80 +177.60,43.20,0.58,0.00,1.00,129.60,-28.80 +177.60,48.00,0.56,0.00,1.00,124.80,33.60 +177.60,52.80,0.53,0.00,1.00,120.00,-38.40 +177.60,57.60,0.51,0.00,1.00,115.20,38.40 +177.60,62.40,0.49,0.00,1.00,110.40,-38.40 +177.60,67.20,0.47,0.00,1.00,105.60,43.20 +177.60,72.00,0.45,0.00,1.00,100.80,-43.20 +172.80,76.80,0.43,0.00,1.00,96.00,43.20 +168.00,81.60,0.41,0.00,1.00,91.20,-48.00 +134.40,86.40,0.38,0.00,1.00,86.40,48.00 +19.20,86.40,0.36,0.00,1.00,81.60,-48.00 +9.60,81.60,0.34,0.00,1.00,76.80,43.20 +4.80,76.80,0.32,0.00,1.00,72.00,-43.20 +4.80,72.00,0.30,0.00,1.00,67.20,43.20 +4.80,67.20,0.28,0.00,1.00,62.40,-43.20 +0.00,62.40,0.26,0.00,1.00,57.60,38.40 +0.00,57.60,0.23,0.00,1.00,52.80,-38.40 +0.00,52.80,0.21,0.00,1.00,48.00,33.60 +0.00,48.00,0.19,0.00,1.00,43.20,-33.60 +0.00,43.20,0.17,0.00,1.00,38.40,28.80 +0.00,38.40,0.15,0.00,1.00,33.60,-28.80 +0.00,33.60,0.13,0.00,1.00,28.80,24.00 +0.00,28.80,0.11,0.00,1.00,24.00,-19.20 +0.00,24.00,0.09,0.00,1.00,19.20,19.20 +0.00,19.20,0.06,0.00,1.00,14.40,-14.40 +0.00,14.40,0.04,0.00,1.00,9.60,9.60 +0.00,9.60,0.02,0.00,1.00,4.80,-4.80 +0.00,4.80,0.00,0.00,1.00,0.00,4.80 diff --git a/scripts/testv/stvISM2.csv b/scripts/testv/stvISM2.csv index dcd3fee39c2a449df4d955626a7148aaecba3fab..35698d046f9653a7d051af70111c426ca461355d 100644 --- a/scripts/testv/stvISM2.csv +++ b/scripts/testv/stvISM2.csv @@ -1,1500 +1,1500 @@ -0.00,4.80,1.00,0.00,1.00 -0.00,9.60,1.00,0.00,1.00 -0.00,14.40,1.00,0.00,1.00 -0.00,19.20,1.00,0.00,1.00 -0.00,24.00,1.00,0.00,1.00 -0.00,28.80,1.00,0.00,1.00 -0.00,33.60,1.00,0.00,1.00 -0.00,38.40,1.00,0.00,1.00 -0.00,43.20,1.00,0.00,1.00 -0.00,48.00,1.00,0.00,1.00 -0.00,52.80,1.00,0.00,1.00 -0.00,57.60,1.00,0.00,1.00 -0.00,62.40,1.00,0.00,1.00 -4.80,67.20,1.00,0.00,1.00 -4.80,72.00,1.00,0.00,1.00 -4.80,76.80,1.00,0.00,1.00 -9.60,81.60,1.00,0.00,1.00 -19.20,86.40,1.00,0.00,1.00 -134.40,86.40,1.00,0.00,1.00 -168.00,81.60,1.00,0.00,1.00 -172.80,76.80,1.00,0.00,1.00 -177.60,72.00,1.00,0.00,1.00 -177.60,67.20,1.00,0.00,1.00 -177.60,62.40,1.00,0.00,1.00 -177.60,57.60,1.00,0.00,1.00 -177.60,52.80,1.00,0.00,1.00 -177.60,48.00,1.00,0.00,1.00 -177.60,43.20,1.00,0.00,1.00 -177.60,38.40,1.00,0.00,1.00 -177.60,33.60,1.00,0.00,1.00 -177.60,28.80,1.00,0.00,1.00 -177.60,24.00,1.00,0.00,1.00 -177.60,19.20,1.00,0.00,1.00 -177.60,14.40,1.00,0.00,1.00 -177.60,9.60,1.00,0.00,1.00 -177.60,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 --177.60,-9.60,1.00,0.00,1.00 --177.60,-14.40,1.00,0.00,1.00 --177.60,-19.20,1.00,0.00,1.00 --177.60,-24.00,1.00,0.00,1.00 --177.60,-28.80,1.00,0.00,1.00 --177.60,-33.60,1.00,0.00,1.00 --177.60,-38.40,1.00,0.00,1.00 --177.60,-43.20,1.00,0.00,1.00 --177.60,-48.00,1.00,0.00,1.00 --177.60,-52.80,1.00,0.00,1.00 --177.60,-57.60,1.00,0.00,1.00 --177.60,-62.40,1.00,0.00,1.00 --177.60,-67.20,1.00,0.00,1.00 --177.60,-72.00,1.00,0.00,1.00 --172.80,-76.80,1.00,0.00,1.00 --168.00,-81.60,1.00,0.00,1.00 --134.40,-86.40,1.00,0.00,1.00 --19.20,-86.40,1.00,0.00,1.00 --9.60,-81.60,1.00,0.00,1.00 --4.80,-76.80,1.00,0.00,1.00 --4.80,-72.00,1.00,0.00,1.00 --4.80,-67.20,1.00,0.00,1.00 --0.00,-62.40,1.00,0.00,1.00 --0.00,-57.60,1.00,0.00,1.00 --0.00,-52.80,1.00,0.00,1.00 --0.00,-48.00,1.00,0.00,1.00 --0.00,-43.20,1.00,0.00,1.00 --0.00,-38.40,1.00,0.00,1.00 --0.00,-33.60,1.00,0.00,1.00 --0.00,-28.80,1.00,0.00,1.00 --0.00,-24.00,1.00,0.00,1.00 --0.00,-19.20,1.00,0.00,1.00 --0.00,-14.40,1.00,0.00,1.00 --0.00,-9.60,1.00,0.00,1.00 --0.00,-4.80,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 --0.00,9.60,1.00,0.00,1.00 --0.00,14.40,1.00,0.00,1.00 --0.00,19.20,1.00,0.00,1.00 --0.00,24.00,1.00,0.00,1.00 --0.00,28.80,1.00,0.00,1.00 --0.00,33.60,1.00,0.00,1.00 --4.80,38.40,1.00,0.00,1.00 --4.80,43.20,1.00,0.00,1.00 --4.80,48.00,1.00,0.00,1.00 --4.80,52.80,1.00,0.00,1.00 --4.80,57.60,1.00,0.00,1.00 --4.80,62.40,1.00,0.00,1.00 --9.60,67.20,1.00,0.00,1.00 --9.60,72.00,1.00,0.00,1.00 --14.40,76.80,1.00,0.00,1.00 --24.00,81.60,1.00,0.00,1.00 --43.20,86.40,1.00,0.00,1.00 --110.40,86.40,1.00,0.00,1.00 --148.80,81.60,1.00,0.00,1.00 --163.20,76.80,1.00,0.00,1.00 --168.00,72.00,1.00,0.00,1.00 --172.80,67.20,1.00,0.00,1.00 --172.80,62.40,1.00,0.00,1.00 --172.80,57.60,1.00,0.00,1.00 --172.80,52.80,1.00,0.00,1.00 --177.60,48.00,1.00,0.00,1.00 --177.60,43.20,1.00,0.00,1.00 --177.60,38.40,1.00,0.00,1.00 --177.60,33.60,1.00,0.00,1.00 --177.60,28.80,1.00,0.00,1.00 --177.60,24.00,1.00,0.00,1.00 --177.60,19.20,1.00,0.00,1.00 --177.60,14.40,1.00,0.00,1.00 --177.60,9.60,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-9.60,1.00,0.00,1.00 -177.60,-14.40,1.00,0.00,1.00 -177.60,-19.20,1.00,0.00,1.00 -177.60,-24.00,1.00,0.00,1.00 -177.60,-28.80,1.00,0.00,1.00 -177.60,-33.60,1.00,0.00,1.00 -177.60,-38.40,1.00,0.00,1.00 -177.60,-43.20,1.00,0.00,1.00 -177.60,-48.00,1.00,0.00,1.00 -172.80,-52.80,1.00,0.00,1.00 -172.80,-57.60,1.00,0.00,1.00 -172.80,-62.40,1.00,0.00,1.00 -172.80,-67.20,1.00,0.00,1.00 -168.00,-72.00,1.00,0.00,1.00 -163.20,-76.80,1.00,0.00,1.00 -148.80,-81.60,1.00,0.00,1.00 -110.40,-86.40,1.00,0.00,1.00 -43.20,-86.40,1.00,0.00,1.00 -24.00,-81.60,1.00,0.00,1.00 -14.40,-76.80,1.00,0.00,1.00 -9.60,-72.00,1.00,0.00,1.00 -9.60,-67.20,1.00,0.00,1.00 -4.80,-62.40,1.00,0.00,1.00 -4.80,-57.60,1.00,0.00,1.00 -4.80,-52.80,1.00,0.00,1.00 -4.80,-48.00,1.00,0.00,1.00 -4.80,-43.20,1.00,0.00,1.00 -4.80,-38.40,1.00,0.00,1.00 -0.00,-33.60,1.00,0.00,1.00 -0.00,-28.80,1.00,0.00,1.00 -0.00,-24.00,1.00,0.00,1.00 -0.00,-19.20,1.00,0.00,1.00 -0.00,-14.40,1.00,0.00,1.00 -0.00,-9.60,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 --0.00,9.60,1.00,0.00,1.00 --0.00,14.40,1.00,0.00,1.00 --4.80,19.20,1.00,0.00,1.00 --4.80,24.00,1.00,0.00,1.00 --4.80,28.80,1.00,0.00,1.00 --4.80,33.60,1.00,0.00,1.00 --4.80,38.40,1.00,0.00,1.00 --9.60,43.20,1.00,0.00,1.00 --9.60,48.00,1.00,0.00,1.00 --9.60,52.80,1.00,0.00,1.00 --14.40,57.60,1.00,0.00,1.00 --14.40,62.40,1.00,0.00,1.00 --19.20,67.20,1.00,0.00,1.00 --24.00,72.00,1.00,0.00,1.00 --33.60,72.00,1.00,0.00,1.00 --43.20,76.80,1.00,0.00,1.00 --67.20,81.60,1.00,0.00,1.00 --96.00,81.60,1.00,0.00,1.00 --124.80,81.60,1.00,0.00,1.00 --144.00,76.80,1.00,0.00,1.00 --153.60,72.00,1.00,0.00,1.00 --158.40,67.20,1.00,0.00,1.00 --163.20,62.40,1.00,0.00,1.00 --168.00,57.60,1.00,0.00,1.00 --168.00,52.80,1.00,0.00,1.00 --168.00,48.00,1.00,0.00,1.00 --172.80,43.20,1.00,0.00,1.00 --172.80,38.40,1.00,0.00,1.00 --172.80,33.60,1.00,0.00,1.00 --172.80,28.80,1.00,0.00,1.00 --177.60,24.00,1.00,0.00,1.00 --177.60,19.20,1.00,0.00,1.00 --177.60,14.40,1.00,0.00,1.00 --177.60,9.60,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-9.60,1.00,0.00,1.00 -177.60,-14.40,1.00,0.00,1.00 -177.60,-19.20,1.00,0.00,1.00 -177.60,-24.00,1.00,0.00,1.00 -172.80,-28.80,1.00,0.00,1.00 -172.80,-33.60,1.00,0.00,1.00 -172.80,-38.40,1.00,0.00,1.00 -172.80,-43.20,1.00,0.00,1.00 -168.00,-48.00,1.00,0.00,1.00 -168.00,-52.80,1.00,0.00,1.00 -168.00,-57.60,1.00,0.00,1.00 -163.20,-62.40,1.00,0.00,1.00 -158.40,-67.20,1.00,0.00,1.00 -153.60,-72.00,1.00,0.00,1.00 -144.00,-76.80,1.00,0.00,1.00 -124.80,-81.60,1.00,0.00,1.00 -96.00,-81.60,1.00,0.00,1.00 -67.20,-81.60,1.00,0.00,1.00 -43.20,-76.80,1.00,0.00,1.00 -33.60,-72.00,1.00,0.00,1.00 -24.00,-72.00,1.00,0.00,1.00 -19.20,-67.20,1.00,0.00,1.00 -14.40,-62.40,1.00,0.00,1.00 -14.40,-57.60,1.00,0.00,1.00 -9.60,-52.80,1.00,0.00,1.00 -9.60,-48.00,1.00,0.00,1.00 -9.60,-43.20,1.00,0.00,1.00 -4.80,-38.40,1.00,0.00,1.00 -4.80,-33.60,1.00,0.00,1.00 -4.80,-28.80,1.00,0.00,1.00 -4.80,-24.00,1.00,0.00,1.00 -4.80,-19.20,1.00,0.00,1.00 -0.00,-14.40,1.00,0.00,1.00 -0.00,-9.60,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 --0.00,9.60,1.00,0.00,1.00 --4.80,14.40,1.00,0.00,1.00 --4.80,19.20,1.00,0.00,1.00 --4.80,24.00,1.00,0.00,1.00 --4.80,28.80,1.00,0.00,1.00 --9.60,33.60,1.00,0.00,1.00 --9.60,38.40,1.00,0.00,1.00 --14.40,43.20,1.00,0.00,1.00 --14.40,48.00,1.00,0.00,1.00 --14.40,52.80,1.00,0.00,1.00 --19.20,57.60,1.00,0.00,1.00 --24.00,57.60,1.00,0.00,1.00 --28.80,62.40,1.00,0.00,1.00 --33.60,67.20,1.00,0.00,1.00 --43.20,72.00,1.00,0.00,1.00 --57.60,72.00,1.00,0.00,1.00 --76.80,76.80,1.00,0.00,1.00 --96.00,76.80,1.00,0.00,1.00 --115.20,76.80,1.00,0.00,1.00 --129.60,72.00,1.00,0.00,1.00 --139.20,72.00,1.00,0.00,1.00 --148.80,67.20,1.00,0.00,1.00 --153.60,62.40,1.00,0.00,1.00 --158.40,57.60,1.00,0.00,1.00 --163.20,52.80,1.00,0.00,1.00 --163.20,48.00,1.00,0.00,1.00 --168.00,43.20,1.00,0.00,1.00 --168.00,38.40,1.00,0.00,1.00 --172.80,33.60,1.00,0.00,1.00 --172.80,28.80,1.00,0.00,1.00 --172.80,24.00,1.00,0.00,1.00 --172.80,19.20,1.00,0.00,1.00 --177.60,14.40,1.00,0.00,1.00 --177.60,9.60,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-9.60,1.00,0.00,1.00 -177.60,-14.40,1.00,0.00,1.00 -172.80,-19.20,1.00,0.00,1.00 -172.80,-24.00,1.00,0.00,1.00 -172.80,-28.80,1.00,0.00,1.00 -172.80,-33.60,1.00,0.00,1.00 -168.00,-38.40,1.00,0.00,1.00 -168.00,-43.20,1.00,0.00,1.00 -163.20,-48.00,1.00,0.00,1.00 -163.20,-52.80,1.00,0.00,1.00 -158.40,-57.60,1.00,0.00,1.00 -153.60,-62.40,1.00,0.00,1.00 -148.80,-67.20,1.00,0.00,1.00 -139.20,-72.00,1.00,0.00,1.00 -129.60,-72.00,1.00,0.00,1.00 -115.20,-76.80,1.00,0.00,1.00 -96.00,-76.80,1.00,0.00,1.00 -76.80,-76.80,1.00,0.00,1.00 -57.60,-72.00,1.00,0.00,1.00 -43.20,-72.00,1.00,0.00,1.00 -33.60,-67.20,1.00,0.00,1.00 -28.80,-62.40,1.00,0.00,1.00 -24.00,-57.60,1.00,0.00,1.00 -19.20,-57.60,1.00,0.00,1.00 -14.40,-52.80,1.00,0.00,1.00 -14.40,-48.00,1.00,0.00,1.00 -14.40,-43.20,1.00,0.00,1.00 -9.60,-38.40,1.00,0.00,1.00 -9.60,-33.60,1.00,0.00,1.00 -4.80,-28.80,1.00,0.00,1.00 -4.80,-24.00,1.00,0.00,1.00 -4.80,-19.20,1.00,0.00,1.00 -4.80,-14.40,1.00,0.00,1.00 -0.00,-9.60,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 --4.80,9.60,1.00,0.00,1.00 --4.80,14.40,1.00,0.00,1.00 --4.80,19.20,1.00,0.00,1.00 --9.60,24.00,1.00,0.00,1.00 --9.60,28.80,1.00,0.00,1.00 --9.60,33.60,1.00,0.00,1.00 --14.40,38.40,1.00,0.00,1.00 --14.40,38.40,1.00,0.00,1.00 --19.20,43.20,1.00,0.00,1.00 --24.00,48.00,1.00,0.00,1.00 --24.00,52.80,1.00,0.00,1.00 --28.80,57.60,1.00,0.00,1.00 --38.40,62.40,1.00,0.00,1.00 --43.20,62.40,1.00,0.00,1.00 --52.80,67.20,1.00,0.00,1.00 --62.40,72.00,1.00,0.00,1.00 --76.80,72.00,1.00,0.00,1.00 --96.00,72.00,1.00,0.00,1.00 --110.40,72.00,1.00,0.00,1.00 --120.00,67.20,1.00,0.00,1.00 --134.40,67.20,1.00,0.00,1.00 --139.20,62.40,1.00,0.00,1.00 --148.80,57.60,1.00,0.00,1.00 --153.60,57.60,1.00,0.00,1.00 --158.40,52.80,1.00,0.00,1.00 --158.40,48.00,1.00,0.00,1.00 --163.20,43.20,1.00,0.00,1.00 --163.20,38.40,1.00,0.00,1.00 --168.00,33.60,1.00,0.00,1.00 --168.00,28.80,1.00,0.00,1.00 --172.80,24.00,1.00,0.00,1.00 --172.80,19.20,1.00,0.00,1.00 --172.80,14.40,1.00,0.00,1.00 --177.60,9.60,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-9.60,1.00,0.00,1.00 -172.80,-14.40,1.00,0.00,1.00 -172.80,-19.20,1.00,0.00,1.00 -172.80,-24.00,1.00,0.00,1.00 -168.00,-28.80,1.00,0.00,1.00 -168.00,-33.60,1.00,0.00,1.00 -163.20,-38.40,1.00,0.00,1.00 -163.20,-43.20,1.00,0.00,1.00 -158.40,-48.00,1.00,0.00,1.00 -158.40,-52.80,1.00,0.00,1.00 -153.60,-57.60,1.00,0.00,1.00 -148.80,-57.60,1.00,0.00,1.00 -139.20,-62.40,1.00,0.00,1.00 -134.40,-67.20,1.00,0.00,1.00 -120.00,-67.20,1.00,0.00,1.00 -110.40,-72.00,1.00,0.00,1.00 -96.00,-72.00,1.00,0.00,1.00 -76.80,-72.00,1.00,0.00,1.00 -62.40,-72.00,1.00,0.00,1.00 -52.80,-67.20,1.00,0.00,1.00 -43.20,-62.40,1.00,0.00,1.00 -38.40,-62.40,1.00,0.00,1.00 -28.80,-57.60,1.00,0.00,1.00 -24.00,-52.80,1.00,0.00,1.00 -24.00,-48.00,1.00,0.00,1.00 -19.20,-43.20,1.00,0.00,1.00 -14.40,-38.40,1.00,0.00,1.00 -14.40,-38.40,1.00,0.00,1.00 -9.60,-33.60,1.00,0.00,1.00 -9.60,-28.80,1.00,0.00,1.00 -9.60,-24.00,1.00,0.00,1.00 -4.80,-19.20,1.00,0.00,1.00 -4.80,-14.40,1.00,0.00,1.00 -4.80,-9.60,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 --4.80,9.60,1.00,0.00,1.00 --4.80,14.40,1.00,0.00,1.00 --9.60,19.20,1.00,0.00,1.00 --9.60,24.00,1.00,0.00,1.00 --14.40,24.00,1.00,0.00,1.00 --14.40,28.80,1.00,0.00,1.00 --19.20,33.60,1.00,0.00,1.00 --19.20,38.40,1.00,0.00,1.00 --24.00,43.20,1.00,0.00,1.00 --28.80,48.00,1.00,0.00,1.00 --33.60,52.80,1.00,0.00,1.00 --38.40,52.80,1.00,0.00,1.00 --43.20,57.60,1.00,0.00,1.00 --48.00,62.40,1.00,0.00,1.00 --57.60,62.40,1.00,0.00,1.00 --67.20,67.20,1.00,0.00,1.00 --81.60,67.20,1.00,0.00,1.00 --91.20,67.20,1.00,0.00,1.00 --105.60,67.20,1.00,0.00,1.00 --115.20,67.20,1.00,0.00,1.00 --124.80,62.40,1.00,0.00,1.00 --134.40,57.60,1.00,0.00,1.00 --139.20,57.60,1.00,0.00,1.00 --144.00,52.80,1.00,0.00,1.00 --148.80,48.00,1.00,0.00,1.00 --153.60,43.20,1.00,0.00,1.00 --158.40,43.20,1.00,0.00,1.00 --163.20,38.40,1.00,0.00,1.00 --163.20,33.60,1.00,0.00,1.00 --168.00,28.80,1.00,0.00,1.00 --168.00,24.00,1.00,0.00,1.00 --172.80,19.20,1.00,0.00,1.00 --172.80,14.40,1.00,0.00,1.00 --177.60,9.60,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-9.60,1.00,0.00,1.00 -172.80,-14.40,1.00,0.00,1.00 -172.80,-19.20,1.00,0.00,1.00 -168.00,-24.00,1.00,0.00,1.00 -168.00,-28.80,1.00,0.00,1.00 -163.20,-33.60,1.00,0.00,1.00 -163.20,-38.40,1.00,0.00,1.00 -158.40,-43.20,1.00,0.00,1.00 -153.60,-43.20,1.00,0.00,1.00 -148.80,-48.00,1.00,0.00,1.00 -144.00,-52.80,1.00,0.00,1.00 -139.20,-57.60,1.00,0.00,1.00 -134.40,-57.60,1.00,0.00,1.00 -124.80,-62.40,1.00,0.00,1.00 -115.20,-67.20,1.00,0.00,1.00 -105.60,-67.20,1.00,0.00,1.00 -91.20,-67.20,1.00,0.00,1.00 -81.60,-67.20,1.00,0.00,1.00 -67.20,-67.20,1.00,0.00,1.00 -57.60,-62.40,1.00,0.00,1.00 -48.00,-62.40,1.00,0.00,1.00 -43.20,-57.60,1.00,0.00,1.00 -38.40,-52.80,1.00,0.00,1.00 -33.60,-52.80,1.00,0.00,1.00 -28.80,-48.00,1.00,0.00,1.00 -24.00,-43.20,1.00,0.00,1.00 -19.20,-38.40,1.00,0.00,1.00 -19.20,-33.60,1.00,0.00,1.00 -14.40,-28.80,1.00,0.00,1.00 -14.40,-24.00,1.00,0.00,1.00 -9.60,-24.00,1.00,0.00,1.00 -9.60,-19.20,1.00,0.00,1.00 -4.80,-14.40,1.00,0.00,1.00 -4.80,-9.60,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 --4.80,9.60,1.00,0.00,1.00 --4.80,14.40,1.00,0.00,1.00 --9.60,19.20,1.00,0.00,1.00 --9.60,19.20,1.00,0.00,1.00 --14.40,24.00,1.00,0.00,1.00 --19.20,28.80,1.00,0.00,1.00 --19.20,33.60,1.00,0.00,1.00 --24.00,38.40,1.00,0.00,1.00 --28.80,43.20,1.00,0.00,1.00 --33.60,43.20,1.00,0.00,1.00 --38.40,48.00,1.00,0.00,1.00 --43.20,52.80,1.00,0.00,1.00 --48.00,52.80,1.00,0.00,1.00 --52.80,57.60,1.00,0.00,1.00 --62.40,57.60,1.00,0.00,1.00 --72.00,62.40,1.00,0.00,1.00 --81.60,62.40,1.00,0.00,1.00 --91.20,62.40,1.00,0.00,1.00 --100.80,62.40,1.00,0.00,1.00 --110.40,62.40,1.00,0.00,1.00 --120.00,57.60,1.00,0.00,1.00 --129.60,57.60,1.00,0.00,1.00 --134.40,52.80,1.00,0.00,1.00 --139.20,48.00,1.00,0.00,1.00 --144.00,48.00,1.00,0.00,1.00 --148.80,43.20,1.00,0.00,1.00 --153.60,38.40,1.00,0.00,1.00 --158.40,33.60,1.00,0.00,1.00 --163.20,33.60,1.00,0.00,1.00 --163.20,28.80,1.00,0.00,1.00 --168.00,24.00,1.00,0.00,1.00 --168.00,19.20,1.00,0.00,1.00 --172.80,14.40,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -172.80,-14.40,1.00,0.00,1.00 -168.00,-19.20,1.00,0.00,1.00 -168.00,-24.00,1.00,0.00,1.00 -163.20,-28.80,1.00,0.00,1.00 -163.20,-33.60,1.00,0.00,1.00 -158.40,-33.60,1.00,0.00,1.00 -153.60,-38.40,1.00,0.00,1.00 -148.80,-43.20,1.00,0.00,1.00 -144.00,-48.00,1.00,0.00,1.00 -139.20,-48.00,1.00,0.00,1.00 -134.40,-52.80,1.00,0.00,1.00 -129.60,-57.60,1.00,0.00,1.00 -120.00,-57.60,1.00,0.00,1.00 -110.40,-62.40,1.00,0.00,1.00 -100.80,-62.40,1.00,0.00,1.00 -91.20,-62.40,1.00,0.00,1.00 -81.60,-62.40,1.00,0.00,1.00 -72.00,-62.40,1.00,0.00,1.00 -62.40,-57.60,1.00,0.00,1.00 -52.80,-57.60,1.00,0.00,1.00 -48.00,-52.80,1.00,0.00,1.00 -43.20,-52.80,1.00,0.00,1.00 -38.40,-48.00,1.00,0.00,1.00 -33.60,-43.20,1.00,0.00,1.00 -28.80,-43.20,1.00,0.00,1.00 -24.00,-38.40,1.00,0.00,1.00 -19.20,-33.60,1.00,0.00,1.00 -19.20,-28.80,1.00,0.00,1.00 -14.40,-24.00,1.00,0.00,1.00 -9.60,-19.20,1.00,0.00,1.00 -9.60,-19.20,1.00,0.00,1.00 -4.80,-14.40,1.00,0.00,1.00 -4.80,-9.60,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 --4.80,9.60,1.00,0.00,1.00 --9.60,14.40,1.00,0.00,1.00 --9.60,14.40,1.00,0.00,1.00 --14.40,19.20,1.00,0.00,1.00 --14.40,24.00,1.00,0.00,1.00 --19.20,28.80,1.00,0.00,1.00 --24.00,33.60,1.00,0.00,1.00 --28.80,33.60,1.00,0.00,1.00 --28.80,38.40,1.00,0.00,1.00 --33.60,43.20,1.00,0.00,1.00 --38.40,43.20,1.00,0.00,1.00 --48.00,48.00,1.00,0.00,1.00 --52.80,52.80,1.00,0.00,1.00 --57.60,52.80,1.00,0.00,1.00 --67.20,57.60,1.00,0.00,1.00 --76.80,57.60,1.00,0.00,1.00 --81.60,57.60,1.00,0.00,1.00 --91.20,57.60,1.00,0.00,1.00 --100.80,57.60,1.00,0.00,1.00 --110.40,57.60,1.00,0.00,1.00 --115.20,52.80,1.00,0.00,1.00 --124.80,52.80,1.00,0.00,1.00 --129.60,48.00,1.00,0.00,1.00 --139.20,48.00,1.00,0.00,1.00 --144.00,43.20,1.00,0.00,1.00 --148.80,38.40,1.00,0.00,1.00 --153.60,38.40,1.00,0.00,1.00 --153.60,33.60,1.00,0.00,1.00 --158.40,28.80,1.00,0.00,1.00 --163.20,24.00,1.00,0.00,1.00 --163.20,24.00,1.00,0.00,1.00 --168.00,19.20,1.00,0.00,1.00 --172.80,14.40,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -172.80,-14.40,1.00,0.00,1.00 -168.00,-19.20,1.00,0.00,1.00 -163.20,-24.00,1.00,0.00,1.00 -163.20,-24.00,1.00,0.00,1.00 -158.40,-28.80,1.00,0.00,1.00 -153.60,-33.60,1.00,0.00,1.00 -153.60,-38.40,1.00,0.00,1.00 -148.80,-38.40,1.00,0.00,1.00 -144.00,-43.20,1.00,0.00,1.00 -139.20,-48.00,1.00,0.00,1.00 -129.60,-48.00,1.00,0.00,1.00 -124.80,-52.80,1.00,0.00,1.00 -115.20,-52.80,1.00,0.00,1.00 -110.40,-57.60,1.00,0.00,1.00 -100.80,-57.60,1.00,0.00,1.00 -91.20,-57.60,1.00,0.00,1.00 -81.60,-57.60,1.00,0.00,1.00 -76.80,-57.60,1.00,0.00,1.00 -67.20,-57.60,1.00,0.00,1.00 -57.60,-52.80,1.00,0.00,1.00 -52.80,-52.80,1.00,0.00,1.00 -48.00,-48.00,1.00,0.00,1.00 -38.40,-43.20,1.00,0.00,1.00 -33.60,-43.20,1.00,0.00,1.00 -28.80,-38.40,1.00,0.00,1.00 -28.80,-33.60,1.00,0.00,1.00 -24.00,-33.60,1.00,0.00,1.00 -19.20,-28.80,1.00,0.00,1.00 -14.40,-24.00,1.00,0.00,1.00 -14.40,-19.20,1.00,0.00,1.00 -9.60,-14.40,1.00,0.00,1.00 -9.60,-14.40,1.00,0.00,1.00 -4.80,-9.60,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 --4.80,9.60,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 --9.60,14.40,1.00,0.00,1.00 --14.40,19.20,1.00,0.00,1.00 --19.20,24.00,1.00,0.00,1.00 --24.00,24.00,1.00,0.00,1.00 --24.00,28.80,1.00,0.00,1.00 --28.80,33.60,1.00,0.00,1.00 --33.60,38.40,1.00,0.00,1.00 --38.40,38.40,1.00,0.00,1.00 --43.20,43.20,1.00,0.00,1.00 --48.00,43.20,1.00,0.00,1.00 --52.80,48.00,1.00,0.00,1.00 --62.40,48.00,1.00,0.00,1.00 --67.20,52.80,1.00,0.00,1.00 --76.80,52.80,1.00,0.00,1.00 --86.40,52.80,1.00,0.00,1.00 --91.20,52.80,1.00,0.00,1.00 --100.80,52.80,1.00,0.00,1.00 --105.60,52.80,1.00,0.00,1.00 --115.20,48.00,1.00,0.00,1.00 --120.00,48.00,1.00,0.00,1.00 --129.60,48.00,1.00,0.00,1.00 --134.40,43.20,1.00,0.00,1.00 --139.20,43.20,1.00,0.00,1.00 --144.00,38.40,1.00,0.00,1.00 --148.80,33.60,1.00,0.00,1.00 --153.60,33.60,1.00,0.00,1.00 --158.40,28.80,1.00,0.00,1.00 --158.40,24.00,1.00,0.00,1.00 --163.20,19.20,1.00,0.00,1.00 --168.00,19.20,1.00,0.00,1.00 --168.00,14.40,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -168.00,-14.40,1.00,0.00,1.00 -168.00,-19.20,1.00,0.00,1.00 -163.20,-19.20,1.00,0.00,1.00 -158.40,-24.00,1.00,0.00,1.00 -158.40,-28.80,1.00,0.00,1.00 -153.60,-33.60,1.00,0.00,1.00 -148.80,-33.60,1.00,0.00,1.00 -144.00,-38.40,1.00,0.00,1.00 -139.20,-43.20,1.00,0.00,1.00 -134.40,-43.20,1.00,0.00,1.00 -129.60,-48.00,1.00,0.00,1.00 -120.00,-48.00,1.00,0.00,1.00 -115.20,-48.00,1.00,0.00,1.00 -105.60,-52.80,1.00,0.00,1.00 -100.80,-52.80,1.00,0.00,1.00 -91.20,-52.80,1.00,0.00,1.00 -86.40,-52.80,1.00,0.00,1.00 -76.80,-52.80,1.00,0.00,1.00 -67.20,-52.80,1.00,0.00,1.00 -62.40,-48.00,1.00,0.00,1.00 -52.80,-48.00,1.00,0.00,1.00 -48.00,-43.20,1.00,0.00,1.00 -43.20,-43.20,1.00,0.00,1.00 -38.40,-38.40,1.00,0.00,1.00 -33.60,-38.40,1.00,0.00,1.00 -28.80,-33.60,1.00,0.00,1.00 -24.00,-28.80,1.00,0.00,1.00 -24.00,-24.00,1.00,0.00,1.00 -19.20,-24.00,1.00,0.00,1.00 -14.40,-19.20,1.00,0.00,1.00 -9.60,-14.40,1.00,0.00,1.00 -9.60,-9.60,1.00,0.00,1.00 -4.80,-9.60,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 --14.40,14.40,1.00,0.00,1.00 --14.40,19.20,1.00,0.00,1.00 --19.20,19.20,1.00,0.00,1.00 --24.00,24.00,1.00,0.00,1.00 --28.80,28.80,1.00,0.00,1.00 --33.60,28.80,1.00,0.00,1.00 --38.40,33.60,1.00,0.00,1.00 --43.20,38.40,1.00,0.00,1.00 --48.00,38.40,1.00,0.00,1.00 --52.80,43.20,1.00,0.00,1.00 --57.60,43.20,1.00,0.00,1.00 --62.40,43.20,1.00,0.00,1.00 --72.00,48.00,1.00,0.00,1.00 --76.80,48.00,1.00,0.00,1.00 --86.40,48.00,1.00,0.00,1.00 --91.20,48.00,1.00,0.00,1.00 --100.80,48.00,1.00,0.00,1.00 --105.60,48.00,1.00,0.00,1.00 --110.40,48.00,1.00,0.00,1.00 --120.00,43.20,1.00,0.00,1.00 --124.80,43.20,1.00,0.00,1.00 --129.60,38.40,1.00,0.00,1.00 --134.40,38.40,1.00,0.00,1.00 --139.20,33.60,1.00,0.00,1.00 --144.00,33.60,1.00,0.00,1.00 --148.80,28.80,1.00,0.00,1.00 --153.60,24.00,1.00,0.00,1.00 --158.40,24.00,1.00,0.00,1.00 --163.20,19.20,1.00,0.00,1.00 --163.20,14.40,1.00,0.00,1.00 --168.00,14.40,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -168.00,-14.40,1.00,0.00,1.00 -163.20,-14.40,1.00,0.00,1.00 -163.20,-19.20,1.00,0.00,1.00 -158.40,-24.00,1.00,0.00,1.00 -153.60,-24.00,1.00,0.00,1.00 -148.80,-28.80,1.00,0.00,1.00 -144.00,-33.60,1.00,0.00,1.00 -139.20,-33.60,1.00,0.00,1.00 -134.40,-38.40,1.00,0.00,1.00 -129.60,-38.40,1.00,0.00,1.00 -124.80,-43.20,1.00,0.00,1.00 -120.00,-43.20,1.00,0.00,1.00 -110.40,-48.00,1.00,0.00,1.00 -105.60,-48.00,1.00,0.00,1.00 -100.80,-48.00,1.00,0.00,1.00 -91.20,-48.00,1.00,0.00,1.00 -86.40,-48.00,1.00,0.00,1.00 -76.80,-48.00,1.00,0.00,1.00 -72.00,-48.00,1.00,0.00,1.00 -62.40,-43.20,1.00,0.00,1.00 -57.60,-43.20,1.00,0.00,1.00 -52.80,-43.20,1.00,0.00,1.00 -48.00,-38.40,1.00,0.00,1.00 -43.20,-38.40,1.00,0.00,1.00 -38.40,-33.60,1.00,0.00,1.00 -33.60,-28.80,1.00,0.00,1.00 -28.80,-28.80,1.00,0.00,1.00 -24.00,-24.00,1.00,0.00,1.00 -19.20,-19.20,1.00,0.00,1.00 -14.40,-19.20,1.00,0.00,1.00 -14.40,-14.40,1.00,0.00,1.00 -9.60,-9.60,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 --14.40,14.40,1.00,0.00,1.00 --19.20,14.40,1.00,0.00,1.00 --24.00,19.20,1.00,0.00,1.00 --24.00,24.00,1.00,0.00,1.00 --28.80,24.00,1.00,0.00,1.00 --33.60,28.80,1.00,0.00,1.00 --38.40,28.80,1.00,0.00,1.00 --43.20,33.60,1.00,0.00,1.00 --48.00,33.60,1.00,0.00,1.00 --52.80,38.40,1.00,0.00,1.00 --62.40,38.40,1.00,0.00,1.00 --67.20,38.40,1.00,0.00,1.00 --72.00,43.20,1.00,0.00,1.00 --76.80,43.20,1.00,0.00,1.00 --86.40,43.20,1.00,0.00,1.00 --91.20,43.20,1.00,0.00,1.00 --96.00,43.20,1.00,0.00,1.00 --105.60,43.20,1.00,0.00,1.00 --110.40,43.20,1.00,0.00,1.00 --115.20,38.40,1.00,0.00,1.00 --124.80,38.40,1.00,0.00,1.00 --129.60,38.40,1.00,0.00,1.00 --134.40,33.60,1.00,0.00,1.00 --139.20,33.60,1.00,0.00,1.00 --144.00,28.80,1.00,0.00,1.00 --148.80,28.80,1.00,0.00,1.00 --153.60,24.00,1.00,0.00,1.00 --158.40,19.20,1.00,0.00,1.00 --158.40,19.20,1.00,0.00,1.00 --163.20,14.40,1.00,0.00,1.00 --168.00,9.60,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -168.00,-9.60,1.00,0.00,1.00 -163.20,-14.40,1.00,0.00,1.00 -158.40,-19.20,1.00,0.00,1.00 -158.40,-19.20,1.00,0.00,1.00 -153.60,-24.00,1.00,0.00,1.00 -148.80,-28.80,1.00,0.00,1.00 -144.00,-28.80,1.00,0.00,1.00 -139.20,-33.60,1.00,0.00,1.00 -134.40,-33.60,1.00,0.00,1.00 -129.60,-38.40,1.00,0.00,1.00 -124.80,-38.40,1.00,0.00,1.00 -115.20,-38.40,1.00,0.00,1.00 -110.40,-43.20,1.00,0.00,1.00 -105.60,-43.20,1.00,0.00,1.00 -96.00,-43.20,1.00,0.00,1.00 -91.20,-43.20,1.00,0.00,1.00 -86.40,-43.20,1.00,0.00,1.00 -76.80,-43.20,1.00,0.00,1.00 -72.00,-43.20,1.00,0.00,1.00 -67.20,-38.40,1.00,0.00,1.00 -62.40,-38.40,1.00,0.00,1.00 -52.80,-38.40,1.00,0.00,1.00 -48.00,-33.60,1.00,0.00,1.00 -43.20,-33.60,1.00,0.00,1.00 -38.40,-28.80,1.00,0.00,1.00 -33.60,-28.80,1.00,0.00,1.00 -28.80,-24.00,1.00,0.00,1.00 -24.00,-24.00,1.00,0.00,1.00 -24.00,-19.20,1.00,0.00,1.00 -19.20,-14.40,1.00,0.00,1.00 -14.40,-14.40,1.00,0.00,1.00 -9.60,-9.60,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 --14.40,9.60,1.00,0.00,1.00 --19.20,14.40,1.00,0.00,1.00 --24.00,19.20,1.00,0.00,1.00 --28.80,19.20,1.00,0.00,1.00 --33.60,24.00,1.00,0.00,1.00 --38.40,24.00,1.00,0.00,1.00 --43.20,28.80,1.00,0.00,1.00 --48.00,28.80,1.00,0.00,1.00 --52.80,33.60,1.00,0.00,1.00 --57.60,33.60,1.00,0.00,1.00 --62.40,33.60,1.00,0.00,1.00 --67.20,38.40,1.00,0.00,1.00 --72.00,38.40,1.00,0.00,1.00 --81.60,38.40,1.00,0.00,1.00 --86.40,38.40,1.00,0.00,1.00 --91.20,38.40,1.00,0.00,1.00 --96.00,38.40,1.00,0.00,1.00 --105.60,38.40,1.00,0.00,1.00 --110.40,38.40,1.00,0.00,1.00 --115.20,33.60,1.00,0.00,1.00 --120.00,33.60,1.00,0.00,1.00 --124.80,33.60,1.00,0.00,1.00 --129.60,28.80,1.00,0.00,1.00 --134.40,28.80,1.00,0.00,1.00 --139.20,24.00,1.00,0.00,1.00 --144.00,24.00,1.00,0.00,1.00 --148.80,19.20,1.00,0.00,1.00 --153.60,19.20,1.00,0.00,1.00 --158.40,14.40,1.00,0.00,1.00 --163.20,14.40,1.00,0.00,1.00 --168.00,9.60,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -168.00,-9.60,1.00,0.00,1.00 -163.20,-14.40,1.00,0.00,1.00 -158.40,-14.40,1.00,0.00,1.00 -153.60,-19.20,1.00,0.00,1.00 -148.80,-19.20,1.00,0.00,1.00 -144.00,-24.00,1.00,0.00,1.00 -139.20,-24.00,1.00,0.00,1.00 -134.40,-28.80,1.00,0.00,1.00 -129.60,-28.80,1.00,0.00,1.00 -124.80,-33.60,1.00,0.00,1.00 -120.00,-33.60,1.00,0.00,1.00 -115.20,-33.60,1.00,0.00,1.00 -110.40,-38.40,1.00,0.00,1.00 -105.60,-38.40,1.00,0.00,1.00 -96.00,-38.40,1.00,0.00,1.00 -91.20,-38.40,1.00,0.00,1.00 -86.40,-38.40,1.00,0.00,1.00 -81.60,-38.40,1.00,0.00,1.00 -72.00,-38.40,1.00,0.00,1.00 -67.20,-38.40,1.00,0.00,1.00 -62.40,-33.60,1.00,0.00,1.00 -57.60,-33.60,1.00,0.00,1.00 -52.80,-33.60,1.00,0.00,1.00 -48.00,-28.80,1.00,0.00,1.00 -43.20,-28.80,1.00,0.00,1.00 -38.40,-24.00,1.00,0.00,1.00 -33.60,-24.00,1.00,0.00,1.00 -28.80,-19.20,1.00,0.00,1.00 -24.00,-19.20,1.00,0.00,1.00 -19.20,-14.40,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 -9.60,-9.60,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 --14.40,9.60,1.00,0.00,1.00 --14.40,9.60,1.00,0.00,1.00 --19.20,14.40,1.00,0.00,1.00 --24.00,14.40,1.00,0.00,1.00 --28.80,19.20,1.00,0.00,1.00 --33.60,19.20,1.00,0.00,1.00 --38.40,24.00,1.00,0.00,1.00 --43.20,24.00,1.00,0.00,1.00 --48.00,24.00,1.00,0.00,1.00 --52.80,28.80,1.00,0.00,1.00 --57.60,28.80,1.00,0.00,1.00 --62.40,28.80,1.00,0.00,1.00 --67.20,33.60,1.00,0.00,1.00 --72.00,33.60,1.00,0.00,1.00 --81.60,33.60,1.00,0.00,1.00 --86.40,33.60,1.00,0.00,1.00 --91.20,33.60,1.00,0.00,1.00 --96.00,33.60,1.00,0.00,1.00 --100.80,33.60,1.00,0.00,1.00 --110.40,33.60,1.00,0.00,1.00 --115.20,33.60,1.00,0.00,1.00 --120.00,28.80,1.00,0.00,1.00 --124.80,28.80,1.00,0.00,1.00 --129.60,28.80,1.00,0.00,1.00 --134.40,24.00,1.00,0.00,1.00 --139.20,24.00,1.00,0.00,1.00 --144.00,19.20,1.00,0.00,1.00 --148.80,19.20,1.00,0.00,1.00 --153.60,14.40,1.00,0.00,1.00 --158.40,14.40,1.00,0.00,1.00 --163.20,9.60,1.00,0.00,1.00 --168.00,9.60,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -168.00,-4.80,1.00,0.00,1.00 -168.00,-9.60,1.00,0.00,1.00 -163.20,-9.60,1.00,0.00,1.00 -158.40,-14.40,1.00,0.00,1.00 -153.60,-14.40,1.00,0.00,1.00 -148.80,-19.20,1.00,0.00,1.00 -144.00,-19.20,1.00,0.00,1.00 -139.20,-24.00,1.00,0.00,1.00 -134.40,-24.00,1.00,0.00,1.00 -129.60,-28.80,1.00,0.00,1.00 -124.80,-28.80,1.00,0.00,1.00 -120.00,-28.80,1.00,0.00,1.00 -115.20,-33.60,1.00,0.00,1.00 -110.40,-33.60,1.00,0.00,1.00 -100.80,-33.60,1.00,0.00,1.00 -96.00,-33.60,1.00,0.00,1.00 -91.20,-33.60,1.00,0.00,1.00 -86.40,-33.60,1.00,0.00,1.00 -81.60,-33.60,1.00,0.00,1.00 -72.00,-33.60,1.00,0.00,1.00 -67.20,-33.60,1.00,0.00,1.00 -62.40,-28.80,1.00,0.00,1.00 -57.60,-28.80,1.00,0.00,1.00 -52.80,-28.80,1.00,0.00,1.00 -48.00,-24.00,1.00,0.00,1.00 -43.20,-24.00,1.00,0.00,1.00 -38.40,-24.00,1.00,0.00,1.00 -33.60,-19.20,1.00,0.00,1.00 -28.80,-19.20,1.00,0.00,1.00 -24.00,-14.40,1.00,0.00,1.00 -19.20,-14.40,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 --19.20,9.60,1.00,0.00,1.00 --19.20,9.60,1.00,0.00,1.00 --24.00,14.40,1.00,0.00,1.00 --28.80,14.40,1.00,0.00,1.00 --33.60,19.20,1.00,0.00,1.00 --38.40,19.20,1.00,0.00,1.00 --43.20,19.20,1.00,0.00,1.00 --48.00,24.00,1.00,0.00,1.00 --52.80,24.00,1.00,0.00,1.00 --57.60,24.00,1.00,0.00,1.00 --62.40,24.00,1.00,0.00,1.00 --72.00,28.80,1.00,0.00,1.00 --76.80,28.80,1.00,0.00,1.00 --81.60,28.80,1.00,0.00,1.00 --86.40,28.80,1.00,0.00,1.00 --91.20,28.80,1.00,0.00,1.00 --96.00,28.80,1.00,0.00,1.00 --100.80,28.80,1.00,0.00,1.00 --105.60,28.80,1.00,0.00,1.00 --115.20,28.80,1.00,0.00,1.00 --120.00,24.00,1.00,0.00,1.00 --124.80,24.00,1.00,0.00,1.00 --129.60,24.00,1.00,0.00,1.00 --134.40,24.00,1.00,0.00,1.00 --139.20,19.20,1.00,0.00,1.00 --144.00,19.20,1.00,0.00,1.00 --148.80,14.40,1.00,0.00,1.00 --153.60,14.40,1.00,0.00,1.00 --158.40,14.40,1.00,0.00,1.00 --163.20,9.60,1.00,0.00,1.00 --163.20,9.60,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -168.00,-4.80,1.00,0.00,1.00 -163.20,-9.60,1.00,0.00,1.00 -163.20,-9.60,1.00,0.00,1.00 -158.40,-14.40,1.00,0.00,1.00 -153.60,-14.40,1.00,0.00,1.00 -148.80,-14.40,1.00,0.00,1.00 -144.00,-19.20,1.00,0.00,1.00 -139.20,-19.20,1.00,0.00,1.00 -134.40,-24.00,1.00,0.00,1.00 -129.60,-24.00,1.00,0.00,1.00 -124.80,-24.00,1.00,0.00,1.00 -120.00,-24.00,1.00,0.00,1.00 -115.20,-28.80,1.00,0.00,1.00 -105.60,-28.80,1.00,0.00,1.00 -100.80,-28.80,1.00,0.00,1.00 -96.00,-28.80,1.00,0.00,1.00 -91.20,-28.80,1.00,0.00,1.00 -86.40,-28.80,1.00,0.00,1.00 -81.60,-28.80,1.00,0.00,1.00 -76.80,-28.80,1.00,0.00,1.00 -72.00,-28.80,1.00,0.00,1.00 -62.40,-24.00,1.00,0.00,1.00 -57.60,-24.00,1.00,0.00,1.00 -52.80,-24.00,1.00,0.00,1.00 -48.00,-24.00,1.00,0.00,1.00 -43.20,-19.20,1.00,0.00,1.00 -38.40,-19.20,1.00,0.00,1.00 -33.60,-19.20,1.00,0.00,1.00 -28.80,-14.40,1.00,0.00,1.00 -24.00,-14.40,1.00,0.00,1.00 -19.20,-9.60,1.00,0.00,1.00 -19.20,-9.60,1.00,0.00,1.00 -14.40,-4.80,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 --19.20,9.60,1.00,0.00,1.00 --24.00,9.60,1.00,0.00,1.00 --28.80,9.60,1.00,0.00,1.00 --33.60,14.40,1.00,0.00,1.00 --33.60,14.40,1.00,0.00,1.00 --38.40,14.40,1.00,0.00,1.00 --43.20,19.20,1.00,0.00,1.00 --48.00,19.20,1.00,0.00,1.00 --57.60,19.20,1.00,0.00,1.00 --62.40,19.20,1.00,0.00,1.00 --67.20,24.00,1.00,0.00,1.00 --72.00,24.00,1.00,0.00,1.00 --76.80,24.00,1.00,0.00,1.00 --81.60,24.00,1.00,0.00,1.00 --86.40,24.00,1.00,0.00,1.00 --91.20,24.00,1.00,0.00,1.00 --96.00,24.00,1.00,0.00,1.00 --100.80,24.00,1.00,0.00,1.00 --105.60,24.00,1.00,0.00,1.00 --110.40,24.00,1.00,0.00,1.00 --115.20,19.20,1.00,0.00,1.00 --120.00,19.20,1.00,0.00,1.00 --129.60,19.20,1.00,0.00,1.00 --134.40,19.20,1.00,0.00,1.00 --139.20,19.20,1.00,0.00,1.00 --144.00,14.40,1.00,0.00,1.00 --148.80,14.40,1.00,0.00,1.00 --148.80,14.40,1.00,0.00,1.00 --153.60,9.60,1.00,0.00,1.00 --158.40,9.60,1.00,0.00,1.00 --163.20,4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -168.00,-4.80,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 -158.40,-9.60,1.00,0.00,1.00 -153.60,-9.60,1.00,0.00,1.00 -148.80,-14.40,1.00,0.00,1.00 -148.80,-14.40,1.00,0.00,1.00 -144.00,-14.40,1.00,0.00,1.00 -139.20,-19.20,1.00,0.00,1.00 -134.40,-19.20,1.00,0.00,1.00 -129.60,-19.20,1.00,0.00,1.00 -120.00,-19.20,1.00,0.00,1.00 -115.20,-19.20,1.00,0.00,1.00 -110.40,-24.00,1.00,0.00,1.00 -105.60,-24.00,1.00,0.00,1.00 -100.80,-24.00,1.00,0.00,1.00 -96.00,-24.00,1.00,0.00,1.00 -91.20,-24.00,1.00,0.00,1.00 -86.40,-24.00,1.00,0.00,1.00 -81.60,-24.00,1.00,0.00,1.00 -76.80,-24.00,1.00,0.00,1.00 -72.00,-24.00,1.00,0.00,1.00 -67.20,-24.00,1.00,0.00,1.00 -62.40,-19.20,1.00,0.00,1.00 -57.60,-19.20,1.00,0.00,1.00 -48.00,-19.20,1.00,0.00,1.00 -43.20,-19.20,1.00,0.00,1.00 -38.40,-14.40,1.00,0.00,1.00 -33.60,-14.40,1.00,0.00,1.00 -33.60,-14.40,1.00,0.00,1.00 -28.80,-9.60,1.00,0.00,1.00 -24.00,-9.60,1.00,0.00,1.00 -19.20,-9.60,1.00,0.00,1.00 -14.40,-4.80,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 --19.20,4.80,1.00,0.00,1.00 --24.00,9.60,1.00,0.00,1.00 --28.80,9.60,1.00,0.00,1.00 --33.60,9.60,1.00,0.00,1.00 --38.40,9.60,1.00,0.00,1.00 --43.20,14.40,1.00,0.00,1.00 --48.00,14.40,1.00,0.00,1.00 --52.80,14.40,1.00,0.00,1.00 --57.60,14.40,1.00,0.00,1.00 --62.40,19.20,1.00,0.00,1.00 --67.20,19.20,1.00,0.00,1.00 --72.00,19.20,1.00,0.00,1.00 --76.80,19.20,1.00,0.00,1.00 --81.60,19.20,1.00,0.00,1.00 --86.40,19.20,1.00,0.00,1.00 --91.20,19.20,1.00,0.00,1.00 --96.00,19.20,1.00,0.00,1.00 --100.80,19.20,1.00,0.00,1.00 --105.60,19.20,1.00,0.00,1.00 --110.40,19.20,1.00,0.00,1.00 --115.20,19.20,1.00,0.00,1.00 --120.00,14.40,1.00,0.00,1.00 --124.80,14.40,1.00,0.00,1.00 --129.60,14.40,1.00,0.00,1.00 --134.40,14.40,1.00,0.00,1.00 --139.20,14.40,1.00,0.00,1.00 --144.00,9.60,1.00,0.00,1.00 --148.80,9.60,1.00,0.00,1.00 --153.60,9.60,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 --163.20,4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 --172.80,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 -168.00,-4.80,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 -158.40,-4.80,1.00,0.00,1.00 -153.60,-9.60,1.00,0.00,1.00 -148.80,-9.60,1.00,0.00,1.00 -144.00,-9.60,1.00,0.00,1.00 -139.20,-14.40,1.00,0.00,1.00 -134.40,-14.40,1.00,0.00,1.00 -129.60,-14.40,1.00,0.00,1.00 -124.80,-14.40,1.00,0.00,1.00 -120.00,-14.40,1.00,0.00,1.00 -115.20,-19.20,1.00,0.00,1.00 -110.40,-19.20,1.00,0.00,1.00 -105.60,-19.20,1.00,0.00,1.00 -100.80,-19.20,1.00,0.00,1.00 -96.00,-19.20,1.00,0.00,1.00 -91.20,-19.20,1.00,0.00,1.00 -86.40,-19.20,1.00,0.00,1.00 -81.60,-19.20,1.00,0.00,1.00 -76.80,-19.20,1.00,0.00,1.00 -72.00,-19.20,1.00,0.00,1.00 -67.20,-19.20,1.00,0.00,1.00 -62.40,-19.20,1.00,0.00,1.00 -57.60,-14.40,1.00,0.00,1.00 -52.80,-14.40,1.00,0.00,1.00 -48.00,-14.40,1.00,0.00,1.00 -43.20,-14.40,1.00,0.00,1.00 -38.40,-9.60,1.00,0.00,1.00 -33.60,-9.60,1.00,0.00,1.00 -28.80,-9.60,1.00,0.00,1.00 -24.00,-9.60,1.00,0.00,1.00 -19.20,-4.80,1.00,0.00,1.00 -14.40,-4.80,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 --9.60,0.00,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 --19.20,4.80,1.00,0.00,1.00 --24.00,4.80,1.00,0.00,1.00 --28.80,4.80,1.00,0.00,1.00 --33.60,9.60,1.00,0.00,1.00 --38.40,9.60,1.00,0.00,1.00 --43.20,9.60,1.00,0.00,1.00 --48.00,9.60,1.00,0.00,1.00 --52.80,9.60,1.00,0.00,1.00 --57.60,14.40,1.00,0.00,1.00 --62.40,14.40,1.00,0.00,1.00 --67.20,14.40,1.00,0.00,1.00 --72.00,14.40,1.00,0.00,1.00 --76.80,14.40,1.00,0.00,1.00 --81.60,14.40,1.00,0.00,1.00 --86.40,14.40,1.00,0.00,1.00 --91.20,14.40,1.00,0.00,1.00 --96.00,14.40,1.00,0.00,1.00 --100.80,14.40,1.00,0.00,1.00 --105.60,14.40,1.00,0.00,1.00 --110.40,14.40,1.00,0.00,1.00 --115.20,14.40,1.00,0.00,1.00 --120.00,14.40,1.00,0.00,1.00 --124.80,9.60,1.00,0.00,1.00 --129.60,9.60,1.00,0.00,1.00 --134.40,9.60,1.00,0.00,1.00 --139.20,9.60,1.00,0.00,1.00 --144.00,9.60,1.00,0.00,1.00 --148.80,9.60,1.00,0.00,1.00 --153.60,4.80,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 --163.20,4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 --172.80,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 -168.00,-4.80,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 -158.40,-4.80,1.00,0.00,1.00 -153.60,-4.80,1.00,0.00,1.00 -148.80,-9.60,1.00,0.00,1.00 -144.00,-9.60,1.00,0.00,1.00 -139.20,-9.60,1.00,0.00,1.00 -134.40,-9.60,1.00,0.00,1.00 -129.60,-9.60,1.00,0.00,1.00 -124.80,-9.60,1.00,0.00,1.00 -120.00,-14.40,1.00,0.00,1.00 -115.20,-14.40,1.00,0.00,1.00 -110.40,-14.40,1.00,0.00,1.00 -105.60,-14.40,1.00,0.00,1.00 -100.80,-14.40,1.00,0.00,1.00 -96.00,-14.40,1.00,0.00,1.00 -91.20,-14.40,1.00,0.00,1.00 -86.40,-14.40,1.00,0.00,1.00 -81.60,-14.40,1.00,0.00,1.00 -76.80,-14.40,1.00,0.00,1.00 -72.00,-14.40,1.00,0.00,1.00 -67.20,-14.40,1.00,0.00,1.00 -62.40,-14.40,1.00,0.00,1.00 -57.60,-14.40,1.00,0.00,1.00 -52.80,-9.60,1.00,0.00,1.00 -48.00,-9.60,1.00,0.00,1.00 -43.20,-9.60,1.00,0.00,1.00 -38.40,-9.60,1.00,0.00,1.00 -33.60,-9.60,1.00,0.00,1.00 -28.80,-4.80,1.00,0.00,1.00 -24.00,-4.80,1.00,0.00,1.00 -19.20,-4.80,1.00,0.00,1.00 -14.40,-4.80,1.00,0.00,1.00 -9.60,-0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 --9.60,0.00,1.00,0.00,1.00 --14.40,0.00,1.00,0.00,1.00 --19.20,4.80,1.00,0.00,1.00 --24.00,4.80,1.00,0.00,1.00 --28.80,4.80,1.00,0.00,1.00 --33.60,4.80,1.00,0.00,1.00 --38.40,4.80,1.00,0.00,1.00 --43.20,4.80,1.00,0.00,1.00 --48.00,4.80,1.00,0.00,1.00 --52.80,9.60,1.00,0.00,1.00 --57.60,9.60,1.00,0.00,1.00 --62.40,9.60,1.00,0.00,1.00 --67.20,9.60,1.00,0.00,1.00 --72.00,9.60,1.00,0.00,1.00 --76.80,9.60,1.00,0.00,1.00 --81.60,9.60,1.00,0.00,1.00 --86.40,9.60,1.00,0.00,1.00 --91.20,9.60,1.00,0.00,1.00 --96.00,9.60,1.00,0.00,1.00 --100.80,9.60,1.00,0.00,1.00 --105.60,9.60,1.00,0.00,1.00 --110.40,9.60,1.00,0.00,1.00 --115.20,9.60,1.00,0.00,1.00 --120.00,9.60,1.00,0.00,1.00 --124.80,9.60,1.00,0.00,1.00 --129.60,9.60,1.00,0.00,1.00 --134.40,4.80,1.00,0.00,1.00 --139.20,4.80,1.00,0.00,1.00 --144.00,4.80,1.00,0.00,1.00 --148.80,4.80,1.00,0.00,1.00 --153.60,4.80,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 --163.20,4.80,1.00,0.00,1.00 --168.00,0.00,1.00,0.00,1.00 --172.80,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 -168.00,-0.00,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 -158.40,-4.80,1.00,0.00,1.00 -153.60,-4.80,1.00,0.00,1.00 -148.80,-4.80,1.00,0.00,1.00 -144.00,-4.80,1.00,0.00,1.00 -139.20,-4.80,1.00,0.00,1.00 -134.40,-4.80,1.00,0.00,1.00 -129.60,-9.60,1.00,0.00,1.00 -124.80,-9.60,1.00,0.00,1.00 -120.00,-9.60,1.00,0.00,1.00 -115.20,-9.60,1.00,0.00,1.00 -110.40,-9.60,1.00,0.00,1.00 -105.60,-9.60,1.00,0.00,1.00 -100.80,-9.60,1.00,0.00,1.00 -96.00,-9.60,1.00,0.00,1.00 -91.20,-9.60,1.00,0.00,1.00 -86.40,-9.60,1.00,0.00,1.00 -81.60,-9.60,1.00,0.00,1.00 -76.80,-9.60,1.00,0.00,1.00 -72.00,-9.60,1.00,0.00,1.00 -67.20,-9.60,1.00,0.00,1.00 -62.40,-9.60,1.00,0.00,1.00 -57.60,-9.60,1.00,0.00,1.00 -52.80,-9.60,1.00,0.00,1.00 -48.00,-4.80,1.00,0.00,1.00 -43.20,-4.80,1.00,0.00,1.00 -38.40,-4.80,1.00,0.00,1.00 -33.60,-4.80,1.00,0.00,1.00 -28.80,-4.80,1.00,0.00,1.00 -24.00,-4.80,1.00,0.00,1.00 -19.20,-4.80,1.00,0.00,1.00 -14.40,-0.00,1.00,0.00,1.00 -9.60,-0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 --9.60,0.00,1.00,0.00,1.00 --14.40,0.00,1.00,0.00,1.00 --19.20,0.00,1.00,0.00,1.00 --24.00,0.00,1.00,0.00,1.00 --28.80,0.00,1.00,0.00,1.00 --33.60,4.80,1.00,0.00,1.00 --38.40,4.80,1.00,0.00,1.00 --43.20,4.80,1.00,0.00,1.00 --48.00,4.80,1.00,0.00,1.00 --52.80,4.80,1.00,0.00,1.00 --57.60,4.80,1.00,0.00,1.00 --62.40,4.80,1.00,0.00,1.00 --67.20,4.80,1.00,0.00,1.00 --72.00,4.80,1.00,0.00,1.00 --76.80,4.80,1.00,0.00,1.00 --81.60,4.80,1.00,0.00,1.00 --86.40,4.80,1.00,0.00,1.00 --91.20,4.80,1.00,0.00,1.00 --96.00,4.80,1.00,0.00,1.00 --100.80,4.80,1.00,0.00,1.00 --105.60,4.80,1.00,0.00,1.00 --110.40,4.80,1.00,0.00,1.00 --115.20,4.80,1.00,0.00,1.00 --120.00,4.80,1.00,0.00,1.00 --124.80,4.80,1.00,0.00,1.00 --129.60,4.80,1.00,0.00,1.00 --134.40,4.80,1.00,0.00,1.00 --139.20,4.80,1.00,0.00,1.00 --144.00,4.80,1.00,0.00,1.00 --148.80,4.80,1.00,0.00,1.00 --153.60,0.00,1.00,0.00,1.00 --158.40,0.00,1.00,0.00,1.00 --163.20,0.00,1.00,0.00,1.00 --168.00,0.00,1.00,0.00,1.00 --172.80,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 -168.00,-0.00,1.00,0.00,1.00 -163.20,-0.00,1.00,0.00,1.00 -158.40,-0.00,1.00,0.00,1.00 -153.60,-0.00,1.00,0.00,1.00 -148.80,-4.80,1.00,0.00,1.00 -144.00,-4.80,1.00,0.00,1.00 -139.20,-4.80,1.00,0.00,1.00 -134.40,-4.80,1.00,0.00,1.00 -129.60,-4.80,1.00,0.00,1.00 -124.80,-4.80,1.00,0.00,1.00 -120.00,-4.80,1.00,0.00,1.00 -115.20,-4.80,1.00,0.00,1.00 -110.40,-4.80,1.00,0.00,1.00 -105.60,-4.80,1.00,0.00,1.00 -100.80,-4.80,1.00,0.00,1.00 -96.00,-4.80,1.00,0.00,1.00 -91.20,-4.80,1.00,0.00,1.00 -86.40,-4.80,1.00,0.00,1.00 -81.60,-4.80,1.00,0.00,1.00 -76.80,-4.80,1.00,0.00,1.00 -72.00,-4.80,1.00,0.00,1.00 -67.20,-4.80,1.00,0.00,1.00 -62.40,-4.80,1.00,0.00,1.00 -57.60,-4.80,1.00,0.00,1.00 -52.80,-4.80,1.00,0.00,1.00 -48.00,-4.80,1.00,0.00,1.00 -43.20,-4.80,1.00,0.00,1.00 -38.40,-4.80,1.00,0.00,1.00 -33.60,-4.80,1.00,0.00,1.00 -28.80,-0.00,1.00,0.00,1.00 -24.00,-0.00,1.00,0.00,1.00 -19.20,-0.00,1.00,0.00,1.00 -14.40,-0.00,1.00,0.00,1.00 -9.60,-0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 --9.60,0.00,1.00,0.00,1.00 --14.40,0.00,1.00,0.00,1.00 --19.20,0.00,1.00,0.00,1.00 --24.00,0.00,1.00,0.00,1.00 --28.80,0.00,1.00,0.00,1.00 --33.60,0.00,1.00,0.00,1.00 --38.40,0.00,1.00,0.00,1.00 --43.20,0.00,1.00,0.00,1.00 --48.00,0.00,1.00,0.00,1.00 --52.80,0.00,1.00,0.00,1.00 --57.60,0.00,1.00,0.00,1.00 --62.40,0.00,1.00,0.00,1.00 --67.20,0.00,1.00,0.00,1.00 --72.00,0.00,1.00,0.00,1.00 --76.80,0.00,1.00,0.00,1.00 --81.60,0.00,1.00,0.00,1.00 --86.40,0.00,1.00,0.00,1.00 --91.20,0.00,1.00,0.00,1.00 --96.00,0.00,1.00,0.00,1.00 --100.80,0.00,1.00,0.00,1.00 --105.60,0.00,1.00,0.00,1.00 --110.40,0.00,1.00,0.00,1.00 --115.20,0.00,1.00,0.00,1.00 --120.00,0.00,1.00,0.00,1.00 --124.80,0.00,1.00,0.00,1.00 --129.60,0.00,1.00,0.00,1.00 --134.40,0.00,1.00,0.00,1.00 --139.20,0.00,1.00,0.00,1.00 --144.00,0.00,1.00,0.00,1.00 --148.80,0.00,1.00,0.00,1.00 --153.60,0.00,1.00,0.00,1.00 --158.40,0.00,1.00,0.00,1.00 --163.20,0.00,1.00,0.00,1.00 --168.00,0.00,1.00,0.00,1.00 --172.80,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 -168.00,0.00,1.00,0.00,1.00 -163.20,0.00,1.00,0.00,1.00 -158.40,0.00,1.00,0.00,1.00 -153.60,0.00,1.00,0.00,1.00 -148.80,0.00,1.00,0.00,1.00 -144.00,0.00,1.00,0.00,1.00 -139.20,0.00,1.00,0.00,1.00 -134.40,0.00,1.00,0.00,1.00 -129.60,0.00,1.00,0.00,1.00 -124.80,0.00,1.00,0.00,1.00 -120.00,0.00,1.00,0.00,1.00 -115.20,0.00,1.00,0.00,1.00 -110.40,0.00,1.00,0.00,1.00 -105.60,0.00,1.00,0.00,1.00 -100.80,0.00,1.00,0.00,1.00 -96.00,0.00,1.00,0.00,1.00 -91.20,0.00,1.00,0.00,1.00 -86.40,0.00,1.00,0.00,1.00 -81.60,0.00,1.00,0.00,1.00 -76.80,0.00,1.00,0.00,1.00 -72.00,0.00,1.00,0.00,1.00 -67.20,0.00,1.00,0.00,1.00 -62.40,0.00,1.00,0.00,1.00 -57.60,0.00,1.00,0.00,1.00 -52.80,0.00,1.00,0.00,1.00 -48.00,0.00,1.00,0.00,1.00 -43.20,0.00,1.00,0.00,1.00 -38.40,0.00,1.00,0.00,1.00 -33.60,0.00,1.00,0.00,1.00 -28.80,0.00,1.00,0.00,1.00 -24.00,0.00,1.00,0.00,1.00 -19.20,0.00,1.00,0.00,1.00 -14.40,0.00,1.00,0.00,1.00 -9.60,0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 +0.00,4.80,16.00,0.00,1.00,0.00,0.00 +0.00,9.60,15.98,0.00,1.00,-177.60,4.80 +0.00,14.40,15.96,0.00,1.00,4.80,9.60 +0.00,19.20,15.94,0.00,1.00,-168.00,14.40 +0.00,24.00,15.91,0.00,1.00,14.40,19.20 +0.00,28.80,15.89,0.00,1.00,-163.20,24.00 +0.00,33.60,15.87,0.00,1.00,19.20,28.80 +0.00,38.40,15.85,0.00,1.00,-153.60,33.60 +0.00,43.20,15.83,0.00,1.00,28.80,38.40 +0.00,48.00,15.81,0.00,1.00,-148.80,43.20 +0.00,52.80,15.79,0.00,1.00,38.40,48.00 +0.00,57.60,15.77,0.00,1.00,-139.20,52.80 +0.00,62.40,15.74,0.00,1.00,48.00,57.60 +4.80,67.20,15.72,0.00,1.00,-124.80,62.40 +4.80,72.00,15.70,0.00,1.00,57.60,67.20 +4.80,76.80,15.68,0.00,1.00,-115.20,72.00 +9.60,81.60,15.66,0.00,1.00,72.00,76.80 +19.20,86.40,15.64,0.00,1.00,-100.80,81.60 +134.40,86.40,15.62,0.00,1.00,86.40,86.40 +168.00,81.60,15.59,0.00,1.00,-86.40,89.20 +172.80,76.80,15.57,0.00,1.00,100.80,86.40 +177.60,72.00,15.55,0.00,1.00,-76.80,81.60 +177.60,67.20,15.53,0.00,1.00,110.40,76.80 +177.60,62.40,15.51,0.00,1.00,-62.40,72.00 +177.60,57.60,15.49,0.00,1.00,124.80,67.20 +177.60,52.80,15.47,0.00,1.00,-52.80,62.40 +177.60,48.00,15.44,0.00,1.00,134.40,57.60 +177.60,43.20,15.42,0.00,1.00,-38.40,52.80 +177.60,38.40,15.40,0.00,1.00,144.00,48.00 +177.60,33.60,15.38,0.00,1.00,-33.60,43.20 +177.60,28.80,15.36,0.00,1.00,153.60,38.40 +177.60,24.00,15.34,0.00,1.00,-24.00,33.60 +177.60,19.20,15.32,0.00,1.00,158.40,28.80 +177.60,14.40,15.30,0.00,1.00,-14.40,24.00 +177.60,9.60,15.27,0.00,1.00,168.00,19.20 +177.60,4.80,15.25,0.00,1.00,-9.60,14.40 +177.60,0.00,15.23,0.00,1.00,172.80,9.60 +-177.60,-0.00,15.21,0.00,1.00,-0.00,4.80 +-177.60,-4.80,15.19,0.00,1.00,-177.60,-0.00 +-177.60,-9.60,15.17,0.00,1.00,4.80,-4.80 +-177.60,-14.40,15.15,0.00,1.00,-172.80,-9.60 +-177.60,-19.20,15.12,0.00,1.00,14.40,-14.40 +-177.60,-24.00,15.10,0.00,1.00,-163.20,-19.20 +-177.60,-28.80,15.08,0.00,1.00,19.20,-24.00 +-177.60,-33.60,15.06,0.00,1.00,-158.40,-28.80 +-177.60,-38.40,15.04,0.00,1.00,28.80,-33.60 +-177.60,-43.20,15.02,0.00,1.00,-148.80,-38.40 +-177.60,-48.00,15.00,0.00,1.00,33.60,-48.00 +-177.60,-52.80,14.97,0.00,1.00,-139.20,-48.00 +-177.60,-57.60,14.95,0.00,1.00,43.20,-52.80 +-177.60,-62.40,14.93,0.00,1.00,-129.60,-57.60 +-177.60,-67.20,14.91,0.00,1.00,57.60,-62.40 +-177.60,-72.00,14.89,0.00,1.00,-120.00,-67.20 +-172.80,-76.80,14.87,0.00,1.00,67.20,-76.80 +-168.00,-81.60,14.85,0.00,1.00,-105.60,-76.80 +-134.40,-86.40,14.83,0.00,1.00,81.60,-86.40 +-19.20,-86.40,14.80,0.00,1.00,-91.20,-89.20 +-9.60,-81.60,14.78,0.00,1.00,96.00,-86.40 +-4.80,-76.80,14.76,0.00,1.00,-76.80,-81.60 +-4.80,-72.00,14.74,0.00,1.00,110.40,-76.80 +-4.80,-67.20,14.72,0.00,1.00,-67.20,-72.00 +-0.00,-62.40,14.70,0.00,1.00,120.00,-67.20 +-0.00,-57.60,14.68,0.00,1.00,-52.80,-62.40 +-0.00,-52.80,14.65,0.00,1.00,129.60,-57.60 +-0.00,-48.00,14.63,0.00,1.00,-43.20,-52.80 +-0.00,-43.20,14.61,0.00,1.00,144.00,-48.00 +-0.00,-38.40,14.59,0.00,1.00,-33.60,-43.20 +-0.00,-33.60,14.57,0.00,1.00,148.80,-38.40 +-0.00,-28.80,14.55,0.00,1.00,-24.00,-33.60 +-0.00,-24.00,14.53,0.00,1.00,158.40,-28.80 +-0.00,-19.20,14.50,0.00,1.00,-19.20,-24.00 +-0.00,-14.40,14.48,0.00,1.00,168.00,-19.20 +-0.00,-9.60,14.46,0.00,1.00,-9.60,-14.40 +-0.00,-4.80,14.44,0.00,1.00,172.80,-9.60 +-0.00,0.00,14.42,0.00,1.00,-4.80,-4.80 +-0.00,4.80,14.40,0.00,1.00,0.00,0.00 +-0.00,9.60,14.38,0.00,1.00,-177.60,4.80 +-0.00,14.40,14.36,0.00,1.00,9.60,9.60 +-0.00,19.20,14.33,0.00,1.00,-168.00,14.40 +-0.00,24.00,14.31,0.00,1.00,14.40,19.20 +-0.00,28.80,14.29,0.00,1.00,-163.20,24.00 +-0.00,33.60,14.27,0.00,1.00,24.00,28.80 +-4.80,38.40,14.25,0.00,1.00,-153.60,33.60 +-4.80,43.20,14.23,0.00,1.00,28.80,38.40 +-4.80,48.00,14.21,0.00,1.00,-144.00,43.20 +-4.80,52.80,14.18,0.00,1.00,38.40,48.00 +-4.80,57.60,14.16,0.00,1.00,-134.40,52.80 +-4.80,62.40,14.14,0.00,1.00,48.00,57.60 +-9.60,67.20,14.12,0.00,1.00,-124.80,62.40 +-9.60,72.00,14.10,0.00,1.00,62.40,67.20 +-14.40,76.80,14.08,0.00,1.00,-115.20,72.00 +-24.00,81.60,14.06,0.00,1.00,72.00,76.80 +-43.20,86.40,14.03,0.00,1.00,-100.80,81.60 +-110.40,86.40,14.01,0.00,1.00,86.40,86.40 +-148.80,81.60,13.99,0.00,1.00,-86.40,86.40 +-163.20,76.80,13.97,0.00,1.00,96.00,81.60 +-168.00,72.00,13.95,0.00,1.00,-76.80,76.80 +-172.80,67.20,13.93,0.00,1.00,110.40,72.00 +-172.80,62.40,13.91,0.00,1.00,-62.40,67.20 +-172.80,57.60,13.89,0.00,1.00,120.00,62.40 +-172.80,52.80,13.86,0.00,1.00,-52.80,57.60 +-177.60,48.00,13.84,0.00,1.00,134.40,52.80 +-177.60,43.20,13.82,0.00,1.00,-43.20,48.00 +-177.60,38.40,13.80,0.00,1.00,144.00,43.20 +-177.60,33.60,13.78,0.00,1.00,-33.60,38.40 +-177.60,28.80,13.76,0.00,1.00,148.80,33.60 +-177.60,24.00,13.74,0.00,1.00,-24.00,28.80 +-177.60,19.20,13.71,0.00,1.00,158.40,24.00 +-177.60,14.40,13.69,0.00,1.00,-19.20,19.20 +-177.60,9.60,13.67,0.00,1.00,168.00,14.40 +-177.60,4.80,13.65,0.00,1.00,-9.60,9.60 +-177.60,0.00,13.63,0.00,1.00,172.80,4.80 +177.60,-0.00,13.61,0.00,1.00,-0.00,0.00 +177.60,-4.80,13.59,0.00,1.00,-177.60,-0.00 +177.60,-9.60,13.56,0.00,1.00,4.80,-4.80 +177.60,-14.40,13.54,0.00,1.00,-172.80,-9.60 +177.60,-19.20,13.52,0.00,1.00,14.40,-14.40 +177.60,-24.00,13.50,0.00,1.00,-163.20,-19.20 +177.60,-28.80,13.48,0.00,1.00,19.20,-24.00 +177.60,-33.60,13.46,0.00,1.00,-153.60,-28.80 +177.60,-38.40,13.44,0.00,1.00,28.80,-33.60 +177.60,-43.20,13.42,0.00,1.00,-148.80,-38.40 +177.60,-48.00,13.39,0.00,1.00,38.40,-43.20 +172.80,-52.80,13.37,0.00,1.00,-139.20,-48.00 +172.80,-57.60,13.35,0.00,1.00,48.00,-52.80 +172.80,-62.40,13.33,0.00,1.00,-124.80,-57.60 +172.80,-67.20,13.31,0.00,1.00,57.60,-62.40 +168.00,-72.00,13.29,0.00,1.00,-115.20,-67.20 +163.20,-76.80,13.27,0.00,1.00,72.00,-72.00 +148.80,-81.60,13.24,0.00,1.00,-105.60,-76.80 +110.40,-86.40,13.22,0.00,1.00,81.60,-81.60 +43.20,-86.40,13.20,0.00,1.00,-91.20,-86.40 +24.00,-81.60,13.18,0.00,1.00,96.00,-86.40 +14.40,-76.80,13.16,0.00,1.00,-76.80,-81.60 +9.60,-72.00,13.14,0.00,1.00,105.60,-76.80 +9.60,-67.20,13.12,0.00,1.00,-67.20,-72.00 +4.80,-62.40,13.09,0.00,1.00,120.00,-67.20 +4.80,-57.60,13.07,0.00,1.00,-57.60,-62.40 +4.80,-52.80,13.05,0.00,1.00,129.60,-57.60 +4.80,-48.00,13.03,0.00,1.00,-43.20,-52.80 +4.80,-43.20,13.01,0.00,1.00,139.20,-48.00 +4.80,-38.40,12.99,0.00,1.00,-33.60,-43.20 +0.00,-33.60,12.97,0.00,1.00,148.80,-38.40 +0.00,-28.80,12.95,0.00,1.00,-28.80,-33.60 +0.00,-24.00,12.92,0.00,1.00,158.40,-28.80 +0.00,-19.20,12.90,0.00,1.00,-19.20,-24.00 +0.00,-14.40,12.88,0.00,1.00,163.20,-19.20 +0.00,-9.60,12.86,0.00,1.00,-9.60,-14.40 +0.00,-4.80,12.84,0.00,1.00,172.80,-9.60 +0.00,0.00,12.82,0.00,1.00,-4.80,-4.80 +-0.00,4.80,12.80,0.00,1.00,0.00,0.00 +-0.00,9.60,12.77,0.00,1.00,-177.60,4.80 +-0.00,14.40,12.75,0.00,1.00,9.60,9.60 +-4.80,19.20,12.73,0.00,1.00,-168.00,14.40 +-4.80,24.00,12.71,0.00,1.00,14.40,19.20 +-4.80,28.80,12.69,0.00,1.00,-158.40,24.00 +-4.80,33.60,12.67,0.00,1.00,24.00,28.80 +-4.80,38.40,12.65,0.00,1.00,-153.60,33.60 +-9.60,43.20,12.62,0.00,1.00,33.60,38.40 +-9.60,48.00,12.60,0.00,1.00,-144.00,43.20 +-9.60,52.80,12.58,0.00,1.00,43.20,48.00 +-14.40,57.60,12.56,0.00,1.00,-134.40,52.80 +-14.40,62.40,12.54,0.00,1.00,52.80,57.60 +-19.20,67.20,12.52,0.00,1.00,-124.80,62.40 +-24.00,72.00,12.50,0.00,1.00,62.40,67.20 +-33.60,72.00,12.48,0.00,1.00,-110.40,72.00 +-43.20,76.80,12.45,0.00,1.00,72.00,72.00 +-67.20,81.60,12.43,0.00,1.00,-100.80,76.80 +-96.00,81.60,12.41,0.00,1.00,86.40,81.60 +-124.80,81.60,12.39,0.00,1.00,-86.40,81.60 +-144.00,76.80,12.37,0.00,1.00,96.00,76.80 +-153.60,72.00,12.35,0.00,1.00,-76.80,76.80 +-158.40,67.20,12.33,0.00,1.00,110.40,72.00 +-163.20,62.40,12.30,0.00,1.00,-67.20,67.20 +-168.00,57.60,12.28,0.00,1.00,120.00,62.40 +-168.00,52.80,12.26,0.00,1.00,-52.80,57.60 +-168.00,48.00,12.24,0.00,1.00,129.60,52.80 +-172.80,43.20,12.22,0.00,1.00,-43.20,48.00 +-172.80,38.40,12.20,0.00,1.00,139.20,43.20 +-172.80,33.60,12.18,0.00,1.00,-33.60,38.40 +-172.80,28.80,12.15,0.00,1.00,148.80,33.60 +-177.60,24.00,12.13,0.00,1.00,-24.00,28.80 +-177.60,19.20,12.11,0.00,1.00,158.40,24.00 +-177.60,14.40,12.09,0.00,1.00,-19.20,19.20 +-177.60,9.60,12.07,0.00,1.00,168.00,14.40 +-177.60,4.80,12.05,0.00,1.00,-9.60,9.60 +-177.60,0.00,12.03,0.00,1.00,172.80,4.80 +177.60,-0.00,12.01,0.00,1.00,-0.00,0.00 +177.60,-4.80,11.98,0.00,1.00,-177.60,-0.00 +177.60,-9.60,11.96,0.00,1.00,4.80,-4.80 +177.60,-14.40,11.94,0.00,1.00,-168.00,-9.60 +177.60,-19.20,11.92,0.00,1.00,14.40,-14.40 +177.60,-24.00,11.90,0.00,1.00,-163.20,-19.20 +172.80,-28.80,11.88,0.00,1.00,24.00,-24.00 +172.80,-33.60,11.86,0.00,1.00,-153.60,-28.80 +172.80,-38.40,11.83,0.00,1.00,28.80,-33.60 +172.80,-43.20,11.81,0.00,1.00,-144.00,-38.40 +168.00,-48.00,11.79,0.00,1.00,38.40,-43.20 +168.00,-52.80,11.77,0.00,1.00,-134.40,-48.00 +168.00,-57.60,11.75,0.00,1.00,48.00,-52.80 +163.20,-62.40,11.73,0.00,1.00,-124.80,-57.60 +158.40,-67.20,11.71,0.00,1.00,62.40,-62.40 +153.60,-72.00,11.68,0.00,1.00,-115.20,-67.20 +144.00,-76.80,11.66,0.00,1.00,72.00,-72.00 +124.80,-81.60,11.64,0.00,1.00,-100.80,-76.80 +96.00,-81.60,11.62,0.00,1.00,81.60,-76.80 +67.20,-81.60,11.60,0.00,1.00,-91.20,-81.60 +43.20,-76.80,11.58,0.00,1.00,96.00,-81.60 +33.60,-72.00,11.56,0.00,1.00,-81.60,-76.80 +24.00,-72.00,11.54,0.00,1.00,105.60,-72.00 +19.20,-67.20,11.51,0.00,1.00,-67.20,-72.00 +14.40,-62.40,11.49,0.00,1.00,115.20,-67.20 +14.40,-57.60,11.47,0.00,1.00,-57.60,-62.40 +9.60,-52.80,11.45,0.00,1.00,129.60,-57.60 +9.60,-48.00,11.43,0.00,1.00,-48.00,-52.80 +9.60,-43.20,11.41,0.00,1.00,139.20,-48.00 +4.80,-38.40,11.39,0.00,1.00,-38.40,-43.20 +4.80,-33.60,11.36,0.00,1.00,148.80,-38.40 +4.80,-28.80,11.34,0.00,1.00,-28.80,-33.60 +4.80,-24.00,11.32,0.00,1.00,153.60,-28.80 +4.80,-19.20,11.30,0.00,1.00,-19.20,-24.00 +0.00,-14.40,11.28,0.00,1.00,163.20,-19.20 +0.00,-9.60,11.26,0.00,1.00,-9.60,-14.40 +0.00,-4.80,11.24,0.00,1.00,172.80,-9.60 +0.00,0.00,11.21,0.00,1.00,-4.80,-4.80 +-0.00,4.80,11.19,0.00,1.00,0.00,0.00 +-0.00,9.60,11.17,0.00,1.00,-177.60,4.80 +-4.80,14.40,11.15,0.00,1.00,9.60,9.60 +-4.80,19.20,11.13,0.00,1.00,-168.00,14.40 +-4.80,24.00,11.11,0.00,1.00,14.40,19.20 +-4.80,28.80,11.09,0.00,1.00,-158.40,24.00 +-9.60,33.60,11.07,0.00,1.00,24.00,28.80 +-9.60,38.40,11.04,0.00,1.00,-148.80,33.60 +-14.40,43.20,11.02,0.00,1.00,33.60,38.40 +-14.40,48.00,11.00,0.00,1.00,-139.20,43.20 +-14.40,52.80,10.98,0.00,1.00,43.20,48.00 +-19.20,57.60,10.96,0.00,1.00,-129.60,52.80 +-24.00,57.60,10.94,0.00,1.00,52.80,52.80 +-28.80,62.40,10.92,0.00,1.00,-120.00,57.60 +-33.60,67.20,10.89,0.00,1.00,62.40,62.40 +-43.20,72.00,10.87,0.00,1.00,-110.40,67.20 +-57.60,72.00,10.85,0.00,1.00,76.80,72.00 +-76.80,76.80,10.83,0.00,1.00,-100.80,72.00 +-96.00,76.80,10.81,0.00,1.00,86.40,76.80 +-115.20,76.80,10.79,0.00,1.00,-86.40,76.80 +-129.60,72.00,10.77,0.00,1.00,96.00,76.80 +-139.20,72.00,10.74,0.00,1.00,-76.80,72.00 +-148.80,67.20,10.72,0.00,1.00,105.60,67.20 +-153.60,62.40,10.70,0.00,1.00,-67.20,67.20 +-158.40,57.60,10.68,0.00,1.00,120.00,62.40 +-163.20,52.80,10.66,0.00,1.00,-57.60,57.60 +-163.20,48.00,10.64,0.00,1.00,129.60,52.80 +-168.00,43.20,10.62,0.00,1.00,-48.00,48.00 +-168.00,38.40,10.60,0.00,1.00,139.20,43.20 +-172.80,33.60,10.57,0.00,1.00,-38.40,38.40 +-172.80,28.80,10.55,0.00,1.00,148.80,33.60 +-172.80,24.00,10.53,0.00,1.00,-28.80,28.80 +-172.80,19.20,10.51,0.00,1.00,158.40,24.00 +-177.60,14.40,10.49,0.00,1.00,-19.20,19.20 +-177.60,9.60,10.47,0.00,1.00,163.20,14.40 +-177.60,4.80,10.45,0.00,1.00,-9.60,9.60 +-177.60,0.00,10.42,0.00,1.00,172.80,4.80 +177.60,-0.00,10.40,0.00,1.00,-0.00,0.00 +177.60,-4.80,10.38,0.00,1.00,-177.60,-0.00 +177.60,-9.60,10.36,0.00,1.00,4.80,-4.80 +177.60,-14.40,10.34,0.00,1.00,-168.00,-9.60 +172.80,-19.20,10.32,0.00,1.00,14.40,-14.40 +172.80,-24.00,10.30,0.00,1.00,-163.20,-19.20 +172.80,-28.80,10.28,0.00,1.00,24.00,-24.00 +172.80,-33.60,10.25,0.00,1.00,-153.60,-28.80 +168.00,-38.40,10.23,0.00,1.00,33.60,-33.60 +168.00,-43.20,10.21,0.00,1.00,-144.00,-38.40 +163.20,-48.00,10.19,0.00,1.00,43.20,-43.20 +163.20,-52.80,10.17,0.00,1.00,-134.40,-48.00 +158.40,-57.60,10.15,0.00,1.00,52.80,-52.80 +153.60,-62.40,10.13,0.00,1.00,-124.80,-57.60 +148.80,-67.20,10.10,0.00,1.00,62.40,-62.40 +139.20,-72.00,10.08,0.00,1.00,-115.20,-67.20 +129.60,-72.00,10.06,0.00,1.00,72.00,-67.20 +115.20,-76.80,10.04,0.00,1.00,-100.80,-72.00 +96.00,-76.80,10.02,0.00,1.00,81.60,-76.80 +76.80,-76.80,10.00,0.00,1.00,-91.20,-76.80 +57.60,-72.00,9.98,0.00,1.00,96.00,-76.80 +43.20,-72.00,9.95,0.00,1.00,-81.60,-72.00 +33.60,-67.20,9.93,0.00,1.00,105.60,-72.00 +28.80,-62.40,9.91,0.00,1.00,-67.20,-67.20 +24.00,-57.60,9.89,0.00,1.00,115.20,-62.40 +19.20,-57.60,9.87,0.00,1.00,-57.60,-57.60 +14.40,-52.80,9.85,0.00,1.00,124.80,-52.80 +14.40,-48.00,9.83,0.00,1.00,-48.00,-52.80 +14.40,-43.20,9.81,0.00,1.00,134.40,-48.00 +9.60,-38.40,9.78,0.00,1.00,-38.40,-43.20 +9.60,-33.60,9.76,0.00,1.00,144.00,-38.40 +4.80,-28.80,9.74,0.00,1.00,-28.80,-33.60 +4.80,-24.00,9.72,0.00,1.00,153.60,-28.80 +4.80,-19.20,9.70,0.00,1.00,-19.20,-24.00 +4.80,-14.40,9.68,0.00,1.00,163.20,-19.20 +0.00,-9.60,9.66,0.00,1.00,-14.40,-14.40 +0.00,-4.80,9.63,0.00,1.00,172.80,-9.60 +0.00,0.00,9.61,0.00,1.00,-4.80,-4.80 +-0.00,4.80,9.59,0.00,1.00,0.00,0.00 +-4.80,9.60,9.57,0.00,1.00,-177.60,4.80 +-4.80,14.40,9.55,0.00,1.00,9.60,9.60 +-4.80,19.20,9.53,0.00,1.00,-168.00,14.40 +-9.60,24.00,9.51,0.00,1.00,19.20,19.20 +-9.60,28.80,9.48,0.00,1.00,-158.40,24.00 +-9.60,33.60,9.46,0.00,1.00,24.00,28.80 +-14.40,38.40,9.44,0.00,1.00,-148.80,33.60 +-14.40,38.40,9.42,0.00,1.00,33.60,33.60 +-19.20,43.20,9.40,0.00,1.00,-139.20,38.40 +-24.00,48.00,9.38,0.00,1.00,43.20,43.20 +-24.00,52.80,9.36,0.00,1.00,-129.60,48.00 +-28.80,57.60,9.34,0.00,1.00,52.80,52.80 +-38.40,62.40,9.31,0.00,1.00,-120.00,57.60 +-43.20,62.40,9.29,0.00,1.00,67.20,62.40 +-52.80,67.20,9.27,0.00,1.00,-110.40,62.40 +-62.40,72.00,9.25,0.00,1.00,76.80,67.20 +-76.80,72.00,9.23,0.00,1.00,-100.80,67.20 +-96.00,72.00,9.21,0.00,1.00,86.40,72.00 +-110.40,72.00,9.19,0.00,1.00,-86.40,72.00 +-120.00,67.20,9.16,0.00,1.00,96.00,72.00 +-134.40,67.20,9.14,0.00,1.00,-76.80,67.20 +-139.20,62.40,9.12,0.00,1.00,105.60,67.20 +-148.80,57.60,9.10,0.00,1.00,-67.20,62.40 +-153.60,57.60,9.08,0.00,1.00,115.20,57.60 +-158.40,52.80,9.06,0.00,1.00,-57.60,52.80 +-158.40,48.00,9.04,0.00,1.00,129.60,52.80 +-163.20,43.20,9.01,0.00,1.00,-48.00,48.00 +-163.20,38.40,8.99,0.00,1.00,139.20,43.20 +-168.00,33.60,8.97,0.00,1.00,-38.40,38.40 +-168.00,28.80,8.95,0.00,1.00,148.80,33.60 +-172.80,24.00,8.93,0.00,1.00,-28.80,28.80 +-172.80,19.20,8.91,0.00,1.00,153.60,24.00 +-172.80,14.40,8.89,0.00,1.00,-19.20,19.20 +-177.60,9.60,8.87,0.00,1.00,163.20,14.40 +-177.60,4.80,8.84,0.00,1.00,-9.60,9.60 +-177.60,0.00,8.82,0.00,1.00,172.80,4.80 +177.60,-0.00,8.80,0.00,1.00,-0.00,0.00 +177.60,-4.80,8.78,0.00,1.00,-177.60,-0.00 +177.60,-9.60,8.76,0.00,1.00,4.80,-4.80 +172.80,-14.40,8.74,0.00,1.00,-168.00,-9.60 +172.80,-19.20,8.72,0.00,1.00,14.40,-14.40 +172.80,-24.00,8.69,0.00,1.00,-158.40,-19.20 +168.00,-28.80,8.67,0.00,1.00,24.00,-24.00 +168.00,-33.60,8.65,0.00,1.00,-153.60,-28.80 +163.20,-38.40,8.63,0.00,1.00,33.60,-33.60 +163.20,-43.20,8.61,0.00,1.00,-144.00,-38.40 +158.40,-48.00,8.59,0.00,1.00,43.20,-43.20 +158.40,-52.80,8.57,0.00,1.00,-134.40,-48.00 +153.60,-57.60,8.54,0.00,1.00,52.80,-52.80 +148.80,-57.60,8.52,0.00,1.00,-124.80,-52.80 +139.20,-62.40,8.50,0.00,1.00,62.40,-57.60 +134.40,-67.20,8.48,0.00,1.00,-110.40,-62.40 +120.00,-67.20,8.46,0.00,1.00,72.00,-67.20 +110.40,-72.00,8.44,0.00,1.00,-100.80,-67.20 +96.00,-72.00,8.42,0.00,1.00,81.60,-72.00 +76.80,-72.00,8.40,0.00,1.00,-91.20,-72.00 +62.40,-72.00,8.37,0.00,1.00,96.00,-72.00 +52.80,-67.20,8.35,0.00,1.00,-81.60,-67.20 +43.20,-62.40,8.33,0.00,1.00,105.60,-67.20 +38.40,-62.40,8.31,0.00,1.00,-72.00,-62.40 +28.80,-57.60,8.29,0.00,1.00,115.20,-62.40 +24.00,-52.80,8.27,0.00,1.00,-57.60,-57.60 +24.00,-48.00,8.25,0.00,1.00,124.80,-52.80 +19.20,-43.20,8.22,0.00,1.00,-48.00,-48.00 +14.40,-38.40,8.20,0.00,1.00,134.40,-43.20 +14.40,-38.40,8.18,0.00,1.00,-38.40,-38.40 +9.60,-33.60,8.16,0.00,1.00,144.00,-33.60 +9.60,-28.80,8.14,0.00,1.00,-28.80,-33.60 +9.60,-24.00,8.12,0.00,1.00,153.60,-28.80 +4.80,-19.20,8.10,0.00,1.00,-24.00,-24.00 +4.80,-14.40,8.07,0.00,1.00,163.20,-19.20 +4.80,-9.60,8.05,0.00,1.00,-14.40,-14.40 +0.00,-4.80,8.03,0.00,1.00,172.80,-9.60 +0.00,0.00,8.01,0.00,1.00,-4.80,-4.80 +-0.00,4.80,7.99,0.00,1.00,0.00,0.00 +-4.80,9.60,7.97,0.00,1.00,-177.60,4.80 +-4.80,14.40,7.95,0.00,1.00,9.60,9.60 +-9.60,19.20,7.93,0.00,1.00,-168.00,14.40 +-9.60,24.00,7.90,0.00,1.00,19.20,19.20 +-14.40,24.00,7.88,0.00,1.00,-158.40,24.00 +-14.40,28.80,7.86,0.00,1.00,28.80,24.00 +-19.20,33.60,7.84,0.00,1.00,-148.80,28.80 +-19.20,38.40,7.82,0.00,1.00,38.40,33.60 +-24.00,43.20,7.80,0.00,1.00,-139.20,38.40 +-28.80,48.00,7.78,0.00,1.00,48.00,43.20 +-33.60,52.80,7.75,0.00,1.00,-129.60,48.00 +-38.40,52.80,7.73,0.00,1.00,57.60,52.80 +-43.20,57.60,7.71,0.00,1.00,-120.00,52.80 +-48.00,62.40,7.69,0.00,1.00,67.20,57.60 +-57.60,62.40,7.67,0.00,1.00,-110.40,62.40 +-67.20,67.20,7.65,0.00,1.00,76.80,62.40 +-81.60,67.20,7.63,0.00,1.00,-100.80,62.40 +-91.20,67.20,7.60,0.00,1.00,86.40,67.20 +-105.60,67.20,7.58,0.00,1.00,-86.40,67.20 +-115.20,67.20,7.56,0.00,1.00,96.00,67.20 +-124.80,62.40,7.54,0.00,1.00,-76.80,62.40 +-134.40,57.60,7.52,0.00,1.00,105.60,62.40 +-139.20,57.60,7.50,0.00,1.00,-67.20,57.60 +-144.00,52.80,7.48,0.00,1.00,115.20,57.60 +-148.80,48.00,7.46,0.00,1.00,-57.60,52.80 +-153.60,43.20,7.43,0.00,1.00,124.80,48.00 +-158.40,43.20,7.41,0.00,1.00,-48.00,43.20 +-163.20,38.40,7.39,0.00,1.00,134.40,38.40 +-163.20,33.60,7.37,0.00,1.00,-38.40,38.40 +-168.00,28.80,7.35,0.00,1.00,144.00,33.60 +-168.00,24.00,7.33,0.00,1.00,-28.80,28.80 +-172.80,19.20,7.31,0.00,1.00,153.60,24.00 +-172.80,14.40,7.28,0.00,1.00,-19.20,19.20 +-177.60,9.60,7.26,0.00,1.00,163.20,14.40 +-177.60,4.80,7.24,0.00,1.00,-9.60,9.60 +-177.60,0.00,7.22,0.00,1.00,172.80,4.80 +177.60,-0.00,7.20,0.00,1.00,-0.00,0.00 +177.60,-4.80,7.18,0.00,1.00,-177.60,-0.00 +177.60,-9.60,7.16,0.00,1.00,4.80,-4.80 +172.80,-14.40,7.13,0.00,1.00,-168.00,-9.60 +172.80,-19.20,7.11,0.00,1.00,14.40,-14.40 +168.00,-24.00,7.09,0.00,1.00,-158.40,-19.20 +168.00,-28.80,7.07,0.00,1.00,24.00,-24.00 +163.20,-33.60,7.05,0.00,1.00,-148.80,-28.80 +163.20,-38.40,7.03,0.00,1.00,33.60,-33.60 +158.40,-43.20,7.01,0.00,1.00,-139.20,-38.40 +153.60,-43.20,6.99,0.00,1.00,43.20,-38.40 +148.80,-48.00,6.96,0.00,1.00,-129.60,-43.20 +144.00,-52.80,6.94,0.00,1.00,52.80,-48.00 +139.20,-57.60,6.92,0.00,1.00,-120.00,-52.80 +134.40,-57.60,6.90,0.00,1.00,62.40,-57.60 +124.80,-62.40,6.88,0.00,1.00,-110.40,-57.60 +115.20,-67.20,6.86,0.00,1.00,72.00,-62.40 +105.60,-67.20,6.84,0.00,1.00,-100.80,-62.40 +91.20,-67.20,6.81,0.00,1.00,81.60,-67.20 +81.60,-67.20,6.79,0.00,1.00,-91.20,-67.20 +67.20,-67.20,6.77,0.00,1.00,96.00,-67.20 +57.60,-62.40,6.75,0.00,1.00,-81.60,-62.40 +48.00,-62.40,6.73,0.00,1.00,105.60,-62.40 +43.20,-57.60,6.71,0.00,1.00,-72.00,-62.40 +38.40,-52.80,6.69,0.00,1.00,115.20,-57.60 +33.60,-52.80,6.66,0.00,1.00,-62.40,-52.80 +28.80,-48.00,6.64,0.00,1.00,124.80,-52.80 +24.00,-43.20,6.62,0.00,1.00,-52.80,-48.00 +19.20,-38.40,6.60,0.00,1.00,134.40,-43.20 +19.20,-33.60,6.58,0.00,1.00,-43.20,-38.40 +14.40,-28.80,6.56,0.00,1.00,144.00,-33.60 +14.40,-24.00,6.54,0.00,1.00,-33.60,-28.80 +9.60,-24.00,6.52,0.00,1.00,153.60,-24.00 +9.60,-19.20,6.49,0.00,1.00,-24.00,-24.00 +4.80,-14.40,6.47,0.00,1.00,163.20,-19.20 +4.80,-9.60,6.45,0.00,1.00,-14.40,-14.40 +0.00,-4.80,6.43,0.00,1.00,172.80,-9.60 +0.00,0.00,6.41,0.00,1.00,-4.80,-4.80 +-0.00,4.80,6.39,0.00,1.00,0.00,0.00 +-4.80,9.60,6.37,0.00,1.00,-177.60,4.80 +-4.80,14.40,6.34,0.00,1.00,9.60,9.60 +-9.60,19.20,6.32,0.00,1.00,-168.00,14.40 +-9.60,19.20,6.30,0.00,1.00,19.20,14.40 +-14.40,24.00,6.28,0.00,1.00,-158.40,19.20 +-19.20,28.80,6.26,0.00,1.00,28.80,24.00 +-19.20,33.60,6.24,0.00,1.00,-148.80,28.80 +-24.00,38.40,6.22,0.00,1.00,38.40,33.60 +-28.80,43.20,6.19,0.00,1.00,-139.20,38.40 +-33.60,43.20,6.17,0.00,1.00,48.00,38.40 +-38.40,48.00,6.15,0.00,1.00,-129.60,43.20 +-43.20,52.80,6.13,0.00,1.00,57.60,48.00 +-48.00,52.80,6.11,0.00,1.00,-120.00,52.80 +-52.80,57.60,6.09,0.00,1.00,67.20,52.80 +-62.40,57.60,6.07,0.00,1.00,-110.40,57.60 +-72.00,62.40,6.05,0.00,1.00,76.80,57.60 +-81.60,62.40,6.02,0.00,1.00,-100.80,62.40 +-91.20,62.40,6.00,0.00,1.00,86.40,62.40 +-100.80,62.40,5.98,0.00,1.00,-86.40,62.40 +-110.40,62.40,5.96,0.00,1.00,96.00,62.40 +-120.00,57.60,5.94,0.00,1.00,-76.80,57.60 +-129.60,57.60,5.92,0.00,1.00,105.60,57.60 +-134.40,52.80,5.90,0.00,1.00,-67.20,57.60 +-139.20,48.00,5.87,0.00,1.00,115.20,52.80 +-144.00,48.00,5.85,0.00,1.00,-57.60,48.00 +-148.80,43.20,5.83,0.00,1.00,124.80,48.00 +-153.60,38.40,5.81,0.00,1.00,-48.00,43.20 +-158.40,33.60,5.79,0.00,1.00,134.40,38.40 +-163.20,33.60,5.77,0.00,1.00,-38.40,33.60 +-163.20,28.80,5.75,0.00,1.00,144.00,28.80 +-168.00,24.00,5.72,0.00,1.00,-28.80,28.80 +-168.00,19.20,5.70,0.00,1.00,153.60,24.00 +-172.80,14.40,5.68,0.00,1.00,-19.20,19.20 +-172.80,9.60,5.66,0.00,1.00,163.20,14.40 +-177.60,4.80,5.64,0.00,1.00,-9.60,9.60 +-177.60,0.00,5.62,0.00,1.00,172.80,4.80 +177.60,-0.00,5.60,0.00,1.00,-0.00,0.00 +177.60,-4.80,5.58,0.00,1.00,-177.60,-0.00 +172.80,-9.60,5.55,0.00,1.00,4.80,-4.80 +172.80,-14.40,5.53,0.00,1.00,-168.00,-9.60 +168.00,-19.20,5.51,0.00,1.00,14.40,-14.40 +168.00,-24.00,5.49,0.00,1.00,-158.40,-19.20 +163.20,-28.80,5.47,0.00,1.00,24.00,-24.00 +163.20,-33.60,5.45,0.00,1.00,-148.80,-28.80 +158.40,-33.60,5.43,0.00,1.00,33.60,-28.80 +153.60,-38.40,5.40,0.00,1.00,-139.20,-33.60 +148.80,-43.20,5.38,0.00,1.00,43.20,-38.40 +144.00,-48.00,5.36,0.00,1.00,-129.60,-43.20 +139.20,-48.00,5.34,0.00,1.00,52.80,-48.00 +134.40,-52.80,5.32,0.00,1.00,-120.00,-48.00 +129.60,-57.60,5.30,0.00,1.00,62.40,-52.80 +120.00,-57.60,5.28,0.00,1.00,-110.40,-57.60 +110.40,-62.40,5.26,0.00,1.00,72.00,-57.60 +100.80,-62.40,5.23,0.00,1.00,-100.80,-57.60 +91.20,-62.40,5.21,0.00,1.00,81.60,-62.40 +81.60,-62.40,5.19,0.00,1.00,-91.20,-62.40 +72.00,-62.40,5.17,0.00,1.00,96.00,-62.40 +62.40,-57.60,5.15,0.00,1.00,-81.60,-62.40 +52.80,-57.60,5.13,0.00,1.00,105.60,-57.60 +48.00,-52.80,5.11,0.00,1.00,-72.00,-57.60 +43.20,-52.80,5.08,0.00,1.00,115.20,-52.80 +38.40,-48.00,5.06,0.00,1.00,-62.40,-52.80 +33.60,-43.20,5.04,0.00,1.00,124.80,-48.00 +28.80,-43.20,5.02,0.00,1.00,-52.80,-43.20 +24.00,-38.40,5.00,0.00,1.00,134.40,-38.40 +19.20,-33.60,4.98,0.00,1.00,-43.20,-38.40 +19.20,-28.80,4.96,0.00,1.00,144.00,-33.60 +14.40,-24.00,4.93,0.00,1.00,-33.60,-28.80 +9.60,-19.20,4.91,0.00,1.00,153.60,-24.00 +9.60,-19.20,4.89,0.00,1.00,-24.00,-19.20 +4.80,-14.40,4.87,0.00,1.00,163.20,-14.40 +4.80,-9.60,4.85,0.00,1.00,-14.40,-14.40 +0.00,-4.80,4.83,0.00,1.00,172.80,-9.60 +0.00,0.00,4.81,0.00,1.00,-4.80,-4.80 +-4.80,4.80,4.79,0.00,1.00,0.00,0.00 +-4.80,9.60,4.76,0.00,1.00,-177.60,4.80 +-9.60,14.40,4.74,0.00,1.00,9.60,9.60 +-9.60,14.40,4.72,0.00,1.00,-168.00,9.60 +-14.40,19.20,4.70,0.00,1.00,19.20,14.40 +-14.40,24.00,4.68,0.00,1.00,-158.40,19.20 +-19.20,28.80,4.66,0.00,1.00,28.80,24.00 +-24.00,33.60,4.64,0.00,1.00,-148.80,28.80 +-28.80,33.60,4.61,0.00,1.00,38.40,28.80 +-28.80,38.40,4.59,0.00,1.00,-139.20,33.60 +-33.60,43.20,4.57,0.00,1.00,48.00,38.40 +-38.40,43.20,4.55,0.00,1.00,-129.60,43.20 +-48.00,48.00,4.53,0.00,1.00,57.60,43.20 +-52.80,52.80,4.51,0.00,1.00,-120.00,48.00 +-57.60,52.80,4.49,0.00,1.00,67.20,48.00 +-67.20,57.60,4.46,0.00,1.00,-110.40,52.80 +-76.80,57.60,4.44,0.00,1.00,76.80,52.80 +-81.60,57.60,4.42,0.00,1.00,-100.80,57.60 +-91.20,57.60,4.40,0.00,1.00,86.40,57.60 +-100.80,57.60,4.38,0.00,1.00,-86.40,57.60 +-110.40,57.60,4.36,0.00,1.00,96.00,57.60 +-115.20,52.80,4.34,0.00,1.00,-76.80,52.80 +-124.80,52.80,4.32,0.00,1.00,105.60,52.80 +-129.60,48.00,4.29,0.00,1.00,-67.20,52.80 +-139.20,48.00,4.27,0.00,1.00,115.20,48.00 +-144.00,43.20,4.25,0.00,1.00,-57.60,48.00 +-148.80,38.40,4.23,0.00,1.00,124.80,43.20 +-153.60,38.40,4.21,0.00,1.00,-48.00,38.40 +-153.60,33.60,4.19,0.00,1.00,134.40,38.40 +-158.40,28.80,4.17,0.00,1.00,-38.40,33.60 +-163.20,24.00,4.14,0.00,1.00,144.00,28.80 +-163.20,24.00,4.12,0.00,1.00,-28.80,24.00 +-168.00,19.20,4.10,0.00,1.00,153.60,24.00 +-172.80,14.40,4.08,0.00,1.00,-19.20,19.20 +-172.80,9.60,4.06,0.00,1.00,163.20,14.40 +-177.60,4.80,4.04,0.00,1.00,-9.60,9.60 +-177.60,0.00,4.02,0.00,1.00,172.80,4.80 +177.60,-0.00,3.99,0.00,1.00,-0.00,0.00 +177.60,-4.80,3.97,0.00,1.00,-177.60,-0.00 +172.80,-9.60,3.95,0.00,1.00,4.80,-4.80 +172.80,-14.40,3.93,0.00,1.00,-168.00,-9.60 +168.00,-19.20,3.91,0.00,1.00,14.40,-14.40 +163.20,-24.00,3.89,0.00,1.00,-158.40,-19.20 +163.20,-24.00,3.87,0.00,1.00,24.00,-24.00 +158.40,-28.80,3.85,0.00,1.00,-148.80,-24.00 +153.60,-33.60,3.82,0.00,1.00,33.60,-28.80 +153.60,-38.40,3.80,0.00,1.00,-139.20,-33.60 +148.80,-38.40,3.78,0.00,1.00,43.20,-38.40 +144.00,-43.20,3.76,0.00,1.00,-129.60,-38.40 +139.20,-48.00,3.74,0.00,1.00,52.80,-43.20 +129.60,-48.00,3.72,0.00,1.00,-120.00,-48.00 +124.80,-52.80,3.70,0.00,1.00,62.40,-48.00 +115.20,-52.80,3.67,0.00,1.00,-110.40,-52.80 +110.40,-57.60,3.65,0.00,1.00,72.00,-52.80 +100.80,-57.60,3.63,0.00,1.00,-100.80,-52.80 +91.20,-57.60,3.61,0.00,1.00,81.60,-57.60 +81.60,-57.60,3.59,0.00,1.00,-91.20,-57.60 +76.80,-57.60,3.57,0.00,1.00,96.00,-57.60 +67.20,-57.60,3.55,0.00,1.00,-81.60,-57.60 +57.60,-52.80,3.52,0.00,1.00,105.60,-52.80 +52.80,-52.80,3.50,0.00,1.00,-72.00,-52.80 +48.00,-48.00,3.48,0.00,1.00,115.20,-48.00 +38.40,-43.20,3.46,0.00,1.00,-62.40,-48.00 +33.60,-43.20,3.44,0.00,1.00,124.80,-43.20 +28.80,-38.40,3.42,0.00,1.00,-52.80,-43.20 +28.80,-33.60,3.40,0.00,1.00,134.40,-38.40 +24.00,-33.60,3.38,0.00,1.00,-43.20,-33.60 +19.20,-28.80,3.35,0.00,1.00,144.00,-28.80 +14.40,-24.00,3.33,0.00,1.00,-33.60,-28.80 +14.40,-19.20,3.31,0.00,1.00,153.60,-24.00 +9.60,-14.40,3.29,0.00,1.00,-24.00,-19.20 +9.60,-14.40,3.27,0.00,1.00,163.20,-14.40 +4.80,-9.60,3.25,0.00,1.00,-14.40,-9.60 +4.80,-4.80,3.23,0.00,1.00,172.80,-9.60 +0.00,0.00,3.20,0.00,1.00,-4.80,-4.80 +-4.80,4.80,3.18,0.00,1.00,0.00,0.00 +-4.80,9.60,3.16,0.00,1.00,-177.60,4.80 +-9.60,9.60,3.14,0.00,1.00,9.60,9.60 +-9.60,14.40,3.12,0.00,1.00,-168.00,9.60 +-14.40,19.20,3.10,0.00,1.00,19.20,14.40 +-19.20,24.00,3.08,0.00,1.00,-158.40,19.20 +-24.00,24.00,3.05,0.00,1.00,28.80,24.00 +-24.00,28.80,3.03,0.00,1.00,-148.80,24.00 +-28.80,33.60,3.01,0.00,1.00,38.40,28.80 +-33.60,38.40,2.99,0.00,1.00,-139.20,33.60 +-38.40,38.40,2.97,0.00,1.00,48.00,33.60 +-43.20,43.20,2.95,0.00,1.00,-129.60,38.40 +-48.00,43.20,2.93,0.00,1.00,57.60,43.20 +-52.80,48.00,2.91,0.00,1.00,-120.00,43.20 +-62.40,48.00,2.88,0.00,1.00,67.20,48.00 +-67.20,52.80,2.86,0.00,1.00,-110.40,48.00 +-76.80,52.80,2.84,0.00,1.00,76.80,48.00 +-86.40,52.80,2.82,0.00,1.00,-100.80,52.80 +-91.20,52.80,2.80,0.00,1.00,86.40,52.80 +-100.80,52.80,2.78,0.00,1.00,-86.40,52.80 +-105.60,52.80,2.76,0.00,1.00,96.00,52.80 +-115.20,48.00,2.73,0.00,1.00,-76.80,48.00 +-120.00,48.00,2.71,0.00,1.00,105.60,48.00 +-129.60,48.00,2.69,0.00,1.00,-67.20,48.00 +-134.40,43.20,2.67,0.00,1.00,115.20,43.20 +-139.20,43.20,2.65,0.00,1.00,-57.60,43.20 +-144.00,38.40,2.63,0.00,1.00,124.80,38.40 +-148.80,33.60,2.61,0.00,1.00,-48.00,38.40 +-153.60,33.60,2.58,0.00,1.00,134.40,33.60 +-158.40,28.80,2.56,0.00,1.00,-38.40,28.80 +-158.40,24.00,2.54,0.00,1.00,144.00,28.80 +-163.20,19.20,2.52,0.00,1.00,-28.80,24.00 +-168.00,19.20,2.50,0.00,1.00,153.60,19.20 +-168.00,14.40,2.48,0.00,1.00,-19.20,14.40 +-172.80,9.60,2.46,0.00,1.00,163.20,14.40 +-177.60,4.80,2.44,0.00,1.00,-9.60,9.60 +-177.60,0.00,2.41,0.00,1.00,172.80,4.80 +177.60,-0.00,2.39,0.00,1.00,-0.00,0.00 +177.60,-4.80,2.37,0.00,1.00,-177.60,-0.00 +172.80,-9.60,2.35,0.00,1.00,4.80,-4.80 +168.00,-14.40,2.33,0.00,1.00,-168.00,-9.60 +168.00,-19.20,2.31,0.00,1.00,14.40,-14.40 +163.20,-19.20,2.29,0.00,1.00,-158.40,-14.40 +158.40,-24.00,2.26,0.00,1.00,24.00,-19.20 +158.40,-28.80,2.24,0.00,1.00,-148.80,-24.00 +153.60,-33.60,2.22,0.00,1.00,33.60,-28.80 +148.80,-33.60,2.20,0.00,1.00,-139.20,-28.80 +144.00,-38.40,2.18,0.00,1.00,43.20,-33.60 +139.20,-43.20,2.16,0.00,1.00,-129.60,-38.40 +134.40,-43.20,2.14,0.00,1.00,52.80,-38.40 +129.60,-48.00,2.11,0.00,1.00,-120.00,-43.20 +120.00,-48.00,2.09,0.00,1.00,62.40,-43.20 +115.20,-48.00,2.07,0.00,1.00,-110.40,-48.00 +105.60,-52.80,2.05,0.00,1.00,72.00,-48.00 +100.80,-52.80,2.03,0.00,1.00,-100.80,-48.00 +91.20,-52.80,2.01,0.00,1.00,81.60,-52.80 +86.40,-52.80,1.99,0.00,1.00,-91.20,-52.80 +76.80,-52.80,1.97,0.00,1.00,96.00,-52.80 +67.20,-52.80,1.94,0.00,1.00,-81.60,-52.80 +62.40,-48.00,1.92,0.00,1.00,105.60,-48.00 +52.80,-48.00,1.90,0.00,1.00,-72.00,-48.00 +48.00,-43.20,1.88,0.00,1.00,115.20,-48.00 +43.20,-43.20,1.86,0.00,1.00,-62.40,-43.20 +38.40,-38.40,1.84,0.00,1.00,124.80,-43.20 +33.60,-38.40,1.82,0.00,1.00,-52.80,-38.40 +28.80,-33.60,1.79,0.00,1.00,134.40,-33.60 +24.00,-28.80,1.77,0.00,1.00,-43.20,-33.60 +24.00,-24.00,1.75,0.00,1.00,144.00,-28.80 +19.20,-24.00,1.73,0.00,1.00,-33.60,-24.00 +14.40,-19.20,1.71,0.00,1.00,153.60,-24.00 +9.60,-14.40,1.69,0.00,1.00,-24.00,-19.20 +9.60,-9.60,1.67,0.00,1.00,163.20,-14.40 +4.80,-9.60,1.64,0.00,1.00,-14.40,-9.60 +4.80,-4.80,1.62,0.00,1.00,172.80,-9.60 +0.00,0.00,1.60,0.00,1.00,-4.80,-4.80 +-4.80,4.80,1.58,0.00,1.00,0.00,0.00 +-4.80,4.80,1.56,0.00,1.00,-177.60,4.80 +-9.60,9.60,1.54,0.00,1.00,9.60,4.80 +-14.40,14.40,1.52,0.00,1.00,-168.00,9.60 +-14.40,19.20,1.50,0.00,1.00,19.20,14.40 +-19.20,19.20,1.47,0.00,1.00,-158.40,19.20 +-24.00,24.00,1.45,0.00,1.00,28.80,19.20 +-28.80,28.80,1.43,0.00,1.00,-148.80,24.00 +-33.60,28.80,1.41,0.00,1.00,38.40,28.80 +-38.40,33.60,1.39,0.00,1.00,-139.20,28.80 +-43.20,38.40,1.37,0.00,1.00,48.00,33.60 +-48.00,38.40,1.35,0.00,1.00,-129.60,33.60 +-52.80,43.20,1.32,0.00,1.00,57.60,38.40 +-57.60,43.20,1.30,0.00,1.00,-120.00,38.40 +-62.40,43.20,1.28,0.00,1.00,67.20,43.20 +-72.00,48.00,1.26,0.00,1.00,-110.40,43.20 +-76.80,48.00,1.24,0.00,1.00,76.80,43.20 +-86.40,48.00,1.22,0.00,1.00,-100.80,48.00 +-91.20,48.00,1.20,0.00,1.00,86.40,48.00 +-100.80,48.00,1.17,0.00,1.00,-86.40,48.00 +-105.60,48.00,1.15,0.00,1.00,96.00,48.00 +-110.40,48.00,1.13,0.00,1.00,-76.80,48.00 +-120.00,43.20,1.11,0.00,1.00,105.60,43.20 +-124.80,43.20,1.09,0.00,1.00,-67.20,43.20 +-129.60,38.40,1.07,0.00,1.00,115.20,43.20 +-134.40,38.40,1.05,0.00,1.00,-57.60,38.40 +-139.20,33.60,1.03,0.00,1.00,124.80,38.40 +-144.00,33.60,1.00,0.00,1.00,-48.00,33.60 +-148.80,28.80,0.98,0.00,1.00,134.40,33.60 +-153.60,24.00,0.96,0.00,1.00,-38.40,28.80 +-158.40,24.00,0.94,0.00,1.00,144.00,24.00 +-163.20,19.20,0.92,0.00,1.00,-28.80,24.00 +-163.20,14.40,0.90,0.00,1.00,153.60,19.20 +-168.00,14.40,0.88,0.00,1.00,-19.20,14.40 +-172.80,9.60,0.85,0.00,1.00,163.20,14.40 +-172.80,4.80,0.83,0.00,1.00,-9.60,9.60 +-177.60,0.00,0.81,0.00,1.00,172.80,4.80 +177.60,-0.00,0.79,0.00,1.00,-0.00,0.00 +172.80,-4.80,0.77,0.00,1.00,-177.60,-0.00 +172.80,-9.60,0.75,0.00,1.00,4.80,-4.80 +168.00,-14.40,0.73,0.00,1.00,-168.00,-9.60 +163.20,-14.40,0.70,0.00,1.00,14.40,-14.40 +163.20,-19.20,0.68,0.00,1.00,-158.40,-14.40 +158.40,-24.00,0.66,0.00,1.00,24.00,-19.20 +153.60,-24.00,0.64,0.00,1.00,-148.80,-24.00 +148.80,-28.80,0.62,0.00,1.00,33.60,-24.00 +144.00,-33.60,0.60,0.00,1.00,-139.20,-28.80 +139.20,-33.60,0.58,0.00,1.00,43.20,-33.60 +134.40,-38.40,0.56,0.00,1.00,-129.60,-33.60 +129.60,-38.40,0.53,0.00,1.00,52.80,-38.40 +124.80,-43.20,0.51,0.00,1.00,-120.00,-38.40 +120.00,-43.20,0.49,0.00,1.00,62.40,-43.20 +110.40,-48.00,0.47,0.00,1.00,-110.40,-43.20 +105.60,-48.00,0.45,0.00,1.00,72.00,-43.20 +100.80,-48.00,0.43,0.00,1.00,-100.80,-48.00 +91.20,-48.00,0.41,0.00,1.00,81.60,-48.00 +86.40,-48.00,0.38,0.00,1.00,-91.20,-48.00 +76.80,-48.00,0.36,0.00,1.00,96.00,-48.00 +72.00,-48.00,0.34,0.00,1.00,-81.60,-48.00 +62.40,-43.20,0.32,0.00,1.00,105.60,-43.20 +57.60,-43.20,0.30,0.00,1.00,-72.00,-43.20 +52.80,-43.20,0.28,0.00,1.00,115.20,-43.20 +48.00,-38.40,0.26,0.00,1.00,-62.40,-38.40 +43.20,-38.40,0.23,0.00,1.00,124.80,-38.40 +38.40,-33.60,0.21,0.00,1.00,-52.80,-33.60 +33.60,-28.80,0.19,0.00,1.00,134.40,-33.60 +28.80,-28.80,0.17,0.00,1.00,-43.20,-28.80 +24.00,-24.00,0.15,0.00,1.00,144.00,-28.80 +19.20,-19.20,0.13,0.00,1.00,-33.60,-24.00 +14.40,-19.20,0.11,0.00,1.00,153.60,-19.20 +14.40,-14.40,0.09,0.00,1.00,-24.00,-19.20 +9.60,-9.60,0.06,0.00,1.00,163.20,-14.40 +4.80,-4.80,0.04,0.00,1.00,-14.40,-9.60 +4.80,-4.80,0.02,0.00,1.00,172.80,-4.80 +0.00,0.00,0.00,0.00,1.00,-4.80,-4.80 +-4.80,4.80,0.00,0.00,1.00,0.00,0.00 +-4.80,4.80,0.02,0.00,1.00,-177.60,4.80 +-9.60,9.60,0.04,0.00,1.00,9.60,4.80 +-14.40,14.40,0.06,0.00,1.00,-168.00,9.60 +-19.20,14.40,0.09,0.00,1.00,19.20,14.40 +-24.00,19.20,0.11,0.00,1.00,-158.40,14.40 +-24.00,24.00,0.13,0.00,1.00,28.80,19.20 +-28.80,24.00,0.15,0.00,1.00,-148.80,24.00 +-33.60,28.80,0.17,0.00,1.00,38.40,24.00 +-38.40,28.80,0.19,0.00,1.00,-139.20,28.80 +-43.20,33.60,0.21,0.00,1.00,48.00,28.80 +-48.00,33.60,0.23,0.00,1.00,-129.60,33.60 +-52.80,38.40,0.26,0.00,1.00,57.60,33.60 +-62.40,38.40,0.28,0.00,1.00,-120.00,38.40 +-67.20,38.40,0.30,0.00,1.00,67.20,38.40 +-72.00,43.20,0.32,0.00,1.00,-110.40,38.40 +-76.80,43.20,0.34,0.00,1.00,76.80,38.40 +-86.40,43.20,0.36,0.00,1.00,-100.80,43.20 +-91.20,43.20,0.38,0.00,1.00,86.40,43.20 +-96.00,43.20,0.41,0.00,1.00,-86.40,43.20 +-105.60,43.20,0.43,0.00,1.00,96.00,43.20 +-110.40,43.20,0.45,0.00,1.00,-76.80,43.20 +-115.20,38.40,0.47,0.00,1.00,105.60,38.40 +-124.80,38.40,0.49,0.00,1.00,-67.20,38.40 +-129.60,38.40,0.51,0.00,1.00,115.20,38.40 +-134.40,33.60,0.53,0.00,1.00,-57.60,33.60 +-139.20,33.60,0.56,0.00,1.00,124.80,33.60 +-144.00,28.80,0.58,0.00,1.00,-48.00,28.80 +-148.80,28.80,0.60,0.00,1.00,134.40,28.80 +-153.60,24.00,0.62,0.00,1.00,-38.40,24.00 +-158.40,19.20,0.64,0.00,1.00,144.00,24.00 +-158.40,19.20,0.66,0.00,1.00,-28.80,19.20 +-163.20,14.40,0.68,0.00,1.00,153.60,19.20 +-168.00,9.60,0.70,0.00,1.00,-19.20,14.40 +-172.80,9.60,0.73,0.00,1.00,163.20,9.60 +-172.80,4.80,0.75,0.00,1.00,-9.60,9.60 +-177.60,0.00,0.77,0.00,1.00,172.80,4.80 +177.60,-0.00,0.79,0.00,1.00,-0.00,0.00 +172.80,-4.80,0.81,0.00,1.00,-177.60,-0.00 +172.80,-9.60,0.83,0.00,1.00,4.80,-4.80 +168.00,-9.60,0.85,0.00,1.00,-168.00,-9.60 +163.20,-14.40,0.88,0.00,1.00,14.40,-9.60 +158.40,-19.20,0.90,0.00,1.00,-158.40,-14.40 +158.40,-19.20,0.92,0.00,1.00,24.00,-19.20 +153.60,-24.00,0.94,0.00,1.00,-148.80,-19.20 +148.80,-28.80,0.96,0.00,1.00,33.60,-24.00 +144.00,-28.80,0.98,0.00,1.00,-139.20,-24.00 +139.20,-33.60,1.00,0.00,1.00,43.20,-28.80 +134.40,-33.60,1.03,0.00,1.00,-129.60,-28.80 +129.60,-38.40,1.05,0.00,1.00,52.80,-33.60 +124.80,-38.40,1.07,0.00,1.00,-120.00,-33.60 +115.20,-38.40,1.09,0.00,1.00,62.40,-38.40 +110.40,-43.20,1.11,0.00,1.00,-110.40,-38.40 +105.60,-43.20,1.13,0.00,1.00,72.00,-38.40 +96.00,-43.20,1.15,0.00,1.00,-100.80,-43.20 +91.20,-43.20,1.17,0.00,1.00,81.60,-43.20 +86.40,-43.20,1.20,0.00,1.00,-91.20,-43.20 +76.80,-43.20,1.22,0.00,1.00,96.00,-43.20 +72.00,-43.20,1.24,0.00,1.00,-81.60,-43.20 +67.20,-38.40,1.26,0.00,1.00,105.60,-38.40 +62.40,-38.40,1.28,0.00,1.00,-72.00,-38.40 +52.80,-38.40,1.30,0.00,1.00,115.20,-38.40 +48.00,-33.60,1.32,0.00,1.00,-62.40,-38.40 +43.20,-33.60,1.35,0.00,1.00,124.80,-33.60 +38.40,-28.80,1.37,0.00,1.00,-52.80,-33.60 +33.60,-28.80,1.39,0.00,1.00,134.40,-28.80 +28.80,-24.00,1.41,0.00,1.00,-43.20,-28.80 +24.00,-24.00,1.43,0.00,1.00,144.00,-24.00 +24.00,-19.20,1.45,0.00,1.00,-33.60,-24.00 +19.20,-14.40,1.47,0.00,1.00,153.60,-19.20 +14.40,-14.40,1.50,0.00,1.00,-24.00,-14.40 +9.60,-9.60,1.52,0.00,1.00,163.20,-14.40 +4.80,-4.80,1.54,0.00,1.00,-14.40,-9.60 +4.80,-4.80,1.56,0.00,1.00,172.80,-4.80 +0.00,0.00,1.58,0.00,1.00,-4.80,-4.80 +-4.80,4.80,1.60,0.00,1.00,0.00,0.00 +-9.60,4.80,1.62,0.00,1.00,-177.60,4.80 +-9.60,9.60,1.64,0.00,1.00,9.60,4.80 +-14.40,9.60,1.67,0.00,1.00,-168.00,9.60 +-19.20,14.40,1.69,0.00,1.00,19.20,9.60 +-24.00,19.20,1.71,0.00,1.00,-158.40,14.40 +-28.80,19.20,1.73,0.00,1.00,28.80,19.20 +-33.60,24.00,1.75,0.00,1.00,-148.80,19.20 +-38.40,24.00,1.77,0.00,1.00,38.40,24.00 +-43.20,28.80,1.79,0.00,1.00,-139.20,24.00 +-48.00,28.80,1.82,0.00,1.00,48.00,28.80 +-52.80,33.60,1.84,0.00,1.00,-129.60,28.80 +-57.60,33.60,1.86,0.00,1.00,57.60,28.80 +-62.40,33.60,1.88,0.00,1.00,-120.00,33.60 +-67.20,38.40,1.90,0.00,1.00,67.20,33.60 +-72.00,38.40,1.92,0.00,1.00,-110.40,33.60 +-81.60,38.40,1.94,0.00,1.00,76.80,38.40 +-86.40,38.40,1.97,0.00,1.00,-100.80,38.40 +-91.20,38.40,1.99,0.00,1.00,86.40,38.40 +-96.00,38.40,2.01,0.00,1.00,-86.40,38.40 +-105.60,38.40,2.03,0.00,1.00,96.00,38.40 +-110.40,38.40,2.05,0.00,1.00,-76.80,38.40 +-115.20,33.60,2.07,0.00,1.00,105.60,33.60 +-120.00,33.60,2.09,0.00,1.00,-67.20,33.60 +-124.80,33.60,2.11,0.00,1.00,115.20,33.60 +-129.60,28.80,2.14,0.00,1.00,-57.60,33.60 +-134.40,28.80,2.16,0.00,1.00,124.80,28.80 +-139.20,24.00,2.18,0.00,1.00,-48.00,28.80 +-144.00,24.00,2.20,0.00,1.00,134.40,24.00 +-148.80,19.20,2.22,0.00,1.00,-38.40,24.00 +-153.60,19.20,2.24,0.00,1.00,144.00,19.20 +-158.40,14.40,2.26,0.00,1.00,-28.80,19.20 +-163.20,14.40,2.29,0.00,1.00,153.60,14.40 +-168.00,9.60,2.31,0.00,1.00,-19.20,14.40 +-172.80,9.60,2.33,0.00,1.00,163.20,9.60 +-172.80,4.80,2.35,0.00,1.00,-9.60,9.60 +-177.60,0.00,2.37,0.00,1.00,172.80,4.80 +177.60,-0.00,2.39,0.00,1.00,-0.00,0.00 +172.80,-4.80,2.41,0.00,1.00,-177.60,-0.00 +172.80,-9.60,2.44,0.00,1.00,4.80,-4.80 +168.00,-9.60,2.46,0.00,1.00,-168.00,-9.60 +163.20,-14.40,2.48,0.00,1.00,14.40,-9.60 +158.40,-14.40,2.50,0.00,1.00,-158.40,-14.40 +153.60,-19.20,2.52,0.00,1.00,24.00,-14.40 +148.80,-19.20,2.54,0.00,1.00,-148.80,-19.20 +144.00,-24.00,2.56,0.00,1.00,33.60,-19.20 +139.20,-24.00,2.58,0.00,1.00,-139.20,-24.00 +134.40,-28.80,2.61,0.00,1.00,43.20,-24.00 +129.60,-28.80,2.63,0.00,1.00,-129.60,-28.80 +124.80,-33.60,2.65,0.00,1.00,52.80,-28.80 +120.00,-33.60,2.67,0.00,1.00,-120.00,-33.60 +115.20,-33.60,2.69,0.00,1.00,62.40,-33.60 +110.40,-38.40,2.71,0.00,1.00,-110.40,-33.60 +105.60,-38.40,2.73,0.00,1.00,72.00,-33.60 +96.00,-38.40,2.76,0.00,1.00,-100.80,-38.40 +91.20,-38.40,2.78,0.00,1.00,81.60,-38.40 +86.40,-38.40,2.80,0.00,1.00,-91.20,-38.40 +81.60,-38.40,2.82,0.00,1.00,96.00,-38.40 +72.00,-38.40,2.84,0.00,1.00,-81.60,-38.40 +67.20,-38.40,2.86,0.00,1.00,105.60,-38.40 +62.40,-33.60,2.88,0.00,1.00,-72.00,-33.60 +57.60,-33.60,2.91,0.00,1.00,115.20,-33.60 +52.80,-33.60,2.93,0.00,1.00,-62.40,-33.60 +48.00,-28.80,2.95,0.00,1.00,124.80,-28.80 +43.20,-28.80,2.97,0.00,1.00,-52.80,-28.80 +38.40,-24.00,2.99,0.00,1.00,134.40,-28.80 +33.60,-24.00,3.01,0.00,1.00,-43.20,-24.00 +28.80,-19.20,3.03,0.00,1.00,144.00,-24.00 +24.00,-19.20,3.05,0.00,1.00,-33.60,-19.20 +19.20,-14.40,3.08,0.00,1.00,153.60,-19.20 +14.40,-9.60,3.10,0.00,1.00,-24.00,-14.40 +9.60,-9.60,3.12,0.00,1.00,163.20,-9.60 +9.60,-4.80,3.14,0.00,1.00,-14.40,-9.60 +4.80,-4.80,3.16,0.00,1.00,172.80,-4.80 +0.00,0.00,3.18,0.00,1.00,-4.80,-4.80 +-4.80,4.80,3.20,0.00,1.00,0.00,0.00 +-9.60,4.80,3.23,0.00,1.00,-177.60,4.80 +-14.40,9.60,3.25,0.00,1.00,9.60,4.80 +-14.40,9.60,3.27,0.00,1.00,-168.00,9.60 +-19.20,14.40,3.29,0.00,1.00,19.20,9.60 +-24.00,14.40,3.31,0.00,1.00,-158.40,14.40 +-28.80,19.20,3.33,0.00,1.00,28.80,14.40 +-33.60,19.20,3.35,0.00,1.00,-148.80,19.20 +-38.40,24.00,3.38,0.00,1.00,38.40,19.20 +-43.20,24.00,3.40,0.00,1.00,-139.20,19.20 +-48.00,24.00,3.42,0.00,1.00,48.00,24.00 +-52.80,28.80,3.44,0.00,1.00,-129.60,24.00 +-57.60,28.80,3.46,0.00,1.00,57.60,28.80 +-62.40,28.80,3.48,0.00,1.00,-120.00,28.80 +-67.20,33.60,3.50,0.00,1.00,67.20,28.80 +-72.00,33.60,3.52,0.00,1.00,-110.40,28.80 +-81.60,33.60,3.55,0.00,1.00,76.80,33.60 +-86.40,33.60,3.57,0.00,1.00,-100.80,33.60 +-91.20,33.60,3.59,0.00,1.00,86.40,33.60 +-96.00,33.60,3.61,0.00,1.00,-86.40,33.60 +-100.80,33.60,3.63,0.00,1.00,96.00,33.60 +-110.40,33.60,3.65,0.00,1.00,-76.80,33.60 +-115.20,33.60,3.67,0.00,1.00,105.60,28.80 +-120.00,28.80,3.70,0.00,1.00,-67.20,28.80 +-124.80,28.80,3.72,0.00,1.00,115.20,28.80 +-129.60,28.80,3.74,0.00,1.00,-57.60,28.80 +-134.40,24.00,3.76,0.00,1.00,124.80,24.00 +-139.20,24.00,3.78,0.00,1.00,-48.00,24.00 +-144.00,19.20,3.80,0.00,1.00,134.40,24.00 +-148.80,19.20,3.82,0.00,1.00,-38.40,19.20 +-153.60,14.40,3.85,0.00,1.00,144.00,19.20 +-158.40,14.40,3.87,0.00,1.00,-28.80,14.40 +-163.20,9.60,3.89,0.00,1.00,153.60,14.40 +-168.00,9.60,3.91,0.00,1.00,-19.20,9.60 +-168.00,4.80,3.93,0.00,1.00,163.20,9.60 +-172.80,4.80,3.95,0.00,1.00,-9.60,4.80 +-177.60,0.00,3.97,0.00,1.00,172.80,4.80 +177.60,-0.00,3.99,0.00,1.00,-0.00,0.00 +172.80,-4.80,4.02,0.00,1.00,-177.60,-0.00 +168.00,-4.80,4.04,0.00,1.00,4.80,-4.80 +168.00,-9.60,4.06,0.00,1.00,-168.00,-4.80 +163.20,-9.60,4.08,0.00,1.00,14.40,-9.60 +158.40,-14.40,4.10,0.00,1.00,-158.40,-9.60 +153.60,-14.40,4.12,0.00,1.00,24.00,-14.40 +148.80,-19.20,4.14,0.00,1.00,-148.80,-14.40 +144.00,-19.20,4.17,0.00,1.00,33.60,-19.20 +139.20,-24.00,4.19,0.00,1.00,-139.20,-19.20 +134.40,-24.00,4.21,0.00,1.00,43.20,-24.00 +129.60,-28.80,4.23,0.00,1.00,-129.60,-24.00 +124.80,-28.80,4.25,0.00,1.00,52.80,-24.00 +120.00,-28.80,4.27,0.00,1.00,-120.00,-28.80 +115.20,-33.60,4.29,0.00,1.00,62.40,-28.80 +110.40,-33.60,4.32,0.00,1.00,-110.40,-28.80 +100.80,-33.60,4.34,0.00,1.00,72.00,-28.80 +96.00,-33.60,4.36,0.00,1.00,-100.80,-33.60 +91.20,-33.60,4.38,0.00,1.00,81.60,-33.60 +86.40,-33.60,4.40,0.00,1.00,-91.20,-33.60 +81.60,-33.60,4.42,0.00,1.00,96.00,-33.60 +72.00,-33.60,4.44,0.00,1.00,-81.60,-33.60 +67.20,-33.60,4.46,0.00,1.00,105.60,-33.60 +62.40,-28.80,4.49,0.00,1.00,-72.00,-28.80 +57.60,-28.80,4.51,0.00,1.00,115.20,-28.80 +52.80,-28.80,4.53,0.00,1.00,-62.40,-28.80 +48.00,-24.00,4.55,0.00,1.00,124.80,-28.80 +43.20,-24.00,4.57,0.00,1.00,-52.80,-24.00 +38.40,-24.00,4.59,0.00,1.00,134.40,-24.00 +33.60,-19.20,4.61,0.00,1.00,-43.20,-19.20 +28.80,-19.20,4.64,0.00,1.00,144.00,-19.20 +24.00,-14.40,4.66,0.00,1.00,-33.60,-19.20 +19.20,-14.40,4.68,0.00,1.00,153.60,-14.40 +14.40,-9.60,4.70,0.00,1.00,-24.00,-14.40 +14.40,-9.60,4.72,0.00,1.00,163.20,-9.60 +9.60,-4.80,4.74,0.00,1.00,-14.40,-9.60 +4.80,-4.80,4.76,0.00,1.00,172.80,-4.80 +0.00,0.00,4.79,0.00,1.00,-4.80,-4.80 +-4.80,0.00,4.81,0.00,1.00,0.00,0.00 +-9.60,4.80,4.83,0.00,1.00,-177.60,0.00 +-14.40,4.80,4.85,0.00,1.00,9.60,4.80 +-19.20,9.60,4.87,0.00,1.00,-168.00,4.80 +-19.20,9.60,4.89,0.00,1.00,19.20,9.60 +-24.00,14.40,4.91,0.00,1.00,-158.40,9.60 +-28.80,14.40,4.93,0.00,1.00,28.80,14.40 +-33.60,19.20,4.96,0.00,1.00,-148.80,14.40 +-38.40,19.20,4.98,0.00,1.00,38.40,14.40 +-43.20,19.20,5.00,0.00,1.00,-139.20,19.20 +-48.00,24.00,5.02,0.00,1.00,48.00,19.20 +-52.80,24.00,5.04,0.00,1.00,-129.60,24.00 +-57.60,24.00,5.06,0.00,1.00,57.60,24.00 +-62.40,24.00,5.08,0.00,1.00,-120.00,24.00 +-72.00,28.80,5.11,0.00,1.00,67.20,24.00 +-76.80,28.80,5.13,0.00,1.00,-110.40,24.00 +-81.60,28.80,5.15,0.00,1.00,76.80,28.80 +-86.40,28.80,5.17,0.00,1.00,-100.80,28.80 +-91.20,28.80,5.19,0.00,1.00,86.40,28.80 +-96.00,28.80,5.21,0.00,1.00,-86.40,28.80 +-100.80,28.80,5.23,0.00,1.00,96.00,28.80 +-105.60,28.80,5.26,0.00,1.00,-76.80,28.80 +-115.20,28.80,5.28,0.00,1.00,105.60,28.80 +-120.00,24.00,5.30,0.00,1.00,-67.20,24.00 +-124.80,24.00,5.32,0.00,1.00,115.20,24.00 +-129.60,24.00,5.34,0.00,1.00,-57.60,24.00 +-134.40,24.00,5.36,0.00,1.00,124.80,24.00 +-139.20,19.20,5.38,0.00,1.00,-48.00,19.20 +-144.00,19.20,5.40,0.00,1.00,134.40,19.20 +-148.80,14.40,5.43,0.00,1.00,-38.40,19.20 +-153.60,14.40,5.45,0.00,1.00,144.00,14.40 +-158.40,14.40,5.47,0.00,1.00,-28.80,14.40 +-163.20,9.60,5.49,0.00,1.00,153.60,9.60 +-163.20,9.60,5.51,0.00,1.00,-19.20,9.60 +-168.00,4.80,5.53,0.00,1.00,163.20,9.60 +-172.80,4.80,5.55,0.00,1.00,-9.60,4.80 +-177.60,0.00,5.58,0.00,1.00,172.80,4.80 +177.60,-0.00,5.60,0.00,1.00,-0.00,0.00 +172.80,-4.80,5.62,0.00,1.00,-177.60,-0.00 +168.00,-4.80,5.64,0.00,1.00,4.80,-4.80 +163.20,-9.60,5.66,0.00,1.00,-168.00,-4.80 +163.20,-9.60,5.68,0.00,1.00,14.40,-9.60 +158.40,-14.40,5.70,0.00,1.00,-158.40,-9.60 +153.60,-14.40,5.72,0.00,1.00,24.00,-9.60 +148.80,-14.40,5.75,0.00,1.00,-148.80,-14.40 +144.00,-19.20,5.77,0.00,1.00,33.60,-14.40 +139.20,-19.20,5.79,0.00,1.00,-139.20,-19.20 +134.40,-24.00,5.81,0.00,1.00,43.20,-19.20 +129.60,-24.00,5.83,0.00,1.00,-129.60,-19.20 +124.80,-24.00,5.85,0.00,1.00,52.80,-24.00 +120.00,-24.00,5.87,0.00,1.00,-120.00,-24.00 +115.20,-28.80,5.90,0.00,1.00,62.40,-24.00 +105.60,-28.80,5.92,0.00,1.00,-110.40,-24.00 +100.80,-28.80,5.94,0.00,1.00,72.00,-28.80 +96.00,-28.80,5.96,0.00,1.00,-100.80,-28.80 +91.20,-28.80,5.98,0.00,1.00,81.60,-28.80 +86.40,-28.80,6.00,0.00,1.00,-91.20,-28.80 +81.60,-28.80,6.02,0.00,1.00,96.00,-28.80 +76.80,-28.80,6.05,0.00,1.00,-81.60,-28.80 +72.00,-28.80,6.07,0.00,1.00,105.60,-28.80 +62.40,-24.00,6.09,0.00,1.00,-72.00,-24.00 +57.60,-24.00,6.11,0.00,1.00,115.20,-24.00 +52.80,-24.00,6.13,0.00,1.00,-62.40,-24.00 +48.00,-24.00,6.15,0.00,1.00,124.80,-24.00 +43.20,-19.20,6.17,0.00,1.00,-52.80,-24.00 +38.40,-19.20,6.19,0.00,1.00,134.40,-19.20 +33.60,-19.20,6.22,0.00,1.00,-43.20,-19.20 +28.80,-14.40,6.24,0.00,1.00,144.00,-14.40 +24.00,-14.40,6.26,0.00,1.00,-33.60,-14.40 +19.20,-9.60,6.28,0.00,1.00,153.60,-14.40 +19.20,-9.60,6.30,0.00,1.00,-24.00,-9.60 +14.40,-4.80,6.32,0.00,1.00,163.20,-9.60 +9.60,-4.80,6.34,0.00,1.00,-14.40,-4.80 +4.80,-0.00,6.37,0.00,1.00,172.80,-4.80 +0.00,0.00,6.39,0.00,1.00,-4.80,-0.00 +-4.80,0.00,6.41,0.00,1.00,0.00,0.00 +-9.60,4.80,6.43,0.00,1.00,-177.60,0.00 +-14.40,4.80,6.45,0.00,1.00,9.60,4.80 +-19.20,9.60,6.47,0.00,1.00,-168.00,4.80 +-24.00,9.60,6.49,0.00,1.00,19.20,9.60 +-28.80,9.60,6.52,0.00,1.00,-158.40,9.60 +-33.60,14.40,6.54,0.00,1.00,28.80,9.60 +-33.60,14.40,6.56,0.00,1.00,-148.80,14.40 +-38.40,14.40,6.58,0.00,1.00,38.40,14.40 +-43.20,19.20,6.60,0.00,1.00,-139.20,14.40 +-48.00,19.20,6.62,0.00,1.00,48.00,14.40 +-57.60,19.20,6.64,0.00,1.00,-129.60,19.20 +-62.40,19.20,6.66,0.00,1.00,57.60,19.20 +-67.20,24.00,6.69,0.00,1.00,-120.00,19.20 +-72.00,24.00,6.71,0.00,1.00,67.20,19.20 +-76.80,24.00,6.73,0.00,1.00,-110.40,24.00 +-81.60,24.00,6.75,0.00,1.00,76.80,24.00 +-86.40,24.00,6.77,0.00,1.00,-100.80,24.00 +-91.20,24.00,6.79,0.00,1.00,86.40,24.00 +-96.00,24.00,6.81,0.00,1.00,-86.40,24.00 +-100.80,24.00,6.84,0.00,1.00,96.00,24.00 +-105.60,24.00,6.86,0.00,1.00,-76.80,24.00 +-110.40,24.00,6.88,0.00,1.00,105.60,24.00 +-115.20,19.20,6.90,0.00,1.00,-67.20,19.20 +-120.00,19.20,6.92,0.00,1.00,115.20,19.20 +-129.60,19.20,6.94,0.00,1.00,-57.60,19.20 +-134.40,19.20,6.96,0.00,1.00,124.80,19.20 +-139.20,19.20,6.99,0.00,1.00,-48.00,19.20 +-144.00,14.40,7.01,0.00,1.00,134.40,14.40 +-148.80,14.40,7.03,0.00,1.00,-38.40,14.40 +-148.80,14.40,7.05,0.00,1.00,144.00,14.40 +-153.60,9.60,7.07,0.00,1.00,-28.80,9.60 +-158.40,9.60,7.09,0.00,1.00,153.60,9.60 +-163.20,4.80,7.11,0.00,1.00,-19.20,9.60 +-168.00,4.80,7.13,0.00,1.00,163.20,4.80 +-172.80,4.80,7.16,0.00,1.00,-9.60,4.80 +-177.60,0.00,7.18,0.00,1.00,172.80,4.80 +177.60,-0.00,7.20,0.00,1.00,-0.00,0.00 +172.80,-4.80,7.22,0.00,1.00,-177.60,-0.00 +168.00,-4.80,7.24,0.00,1.00,4.80,-4.80 +163.20,-4.80,7.26,0.00,1.00,-168.00,-4.80 +158.40,-9.60,7.28,0.00,1.00,14.40,-4.80 +153.60,-9.60,7.31,0.00,1.00,-158.40,-9.60 +148.80,-14.40,7.33,0.00,1.00,24.00,-9.60 +148.80,-14.40,7.35,0.00,1.00,-148.80,-9.60 +144.00,-14.40,7.37,0.00,1.00,33.60,-14.40 +139.20,-19.20,7.39,0.00,1.00,-139.20,-14.40 +134.40,-19.20,7.41,0.00,1.00,43.20,-14.40 +129.60,-19.20,7.43,0.00,1.00,-129.60,-19.20 +120.00,-19.20,7.46,0.00,1.00,52.80,-19.20 +115.20,-19.20,7.48,0.00,1.00,-120.00,-19.20 +110.40,-24.00,7.50,0.00,1.00,62.40,-19.20 +105.60,-24.00,7.52,0.00,1.00,-110.40,-19.20 +100.80,-24.00,7.54,0.00,1.00,72.00,-24.00 +96.00,-24.00,7.56,0.00,1.00,-100.80,-24.00 +91.20,-24.00,7.58,0.00,1.00,81.60,-24.00 +86.40,-24.00,7.60,0.00,1.00,-91.20,-24.00 +81.60,-24.00,7.63,0.00,1.00,96.00,-24.00 +76.80,-24.00,7.65,0.00,1.00,-81.60,-24.00 +72.00,-24.00,7.67,0.00,1.00,105.60,-24.00 +67.20,-24.00,7.69,0.00,1.00,-72.00,-24.00 +62.40,-19.20,7.71,0.00,1.00,115.20,-19.20 +57.60,-19.20,7.73,0.00,1.00,-62.40,-19.20 +48.00,-19.20,7.75,0.00,1.00,124.80,-19.20 +43.20,-19.20,7.78,0.00,1.00,-52.80,-19.20 +38.40,-14.40,7.80,0.00,1.00,134.40,-14.40 +33.60,-14.40,7.82,0.00,1.00,-43.20,-14.40 +33.60,-14.40,7.84,0.00,1.00,144.00,-14.40 +28.80,-9.60,7.86,0.00,1.00,-33.60,-14.40 +24.00,-9.60,7.88,0.00,1.00,153.60,-9.60 +19.20,-9.60,7.90,0.00,1.00,-24.00,-9.60 +14.40,-4.80,7.93,0.00,1.00,163.20,-9.60 +9.60,-4.80,7.95,0.00,1.00,-14.40,-4.80 +4.80,-0.00,7.97,0.00,1.00,172.80,-4.80 +0.00,0.00,7.99,0.00,1.00,-4.80,-0.00 +-4.80,0.00,8.01,0.00,1.00,0.00,0.00 +-9.60,4.80,8.03,0.00,1.00,-177.60,0.00 +-14.40,4.80,8.05,0.00,1.00,9.60,4.80 +-19.20,4.80,8.07,0.00,1.00,-168.00,4.80 +-24.00,9.60,8.10,0.00,1.00,19.20,4.80 +-28.80,9.60,8.12,0.00,1.00,-158.40,9.60 +-33.60,9.60,8.14,0.00,1.00,24.00,9.60 +-38.40,9.60,8.16,0.00,1.00,-148.80,9.60 +-43.20,14.40,8.18,0.00,1.00,33.60,9.60 +-48.00,14.40,8.20,0.00,1.00,-139.20,14.40 +-52.80,14.40,8.22,0.00,1.00,43.20,14.40 +-57.60,14.40,8.25,0.00,1.00,-129.60,14.40 +-62.40,19.20,8.27,0.00,1.00,52.80,14.40 +-67.20,19.20,8.29,0.00,1.00,-120.00,14.40 +-72.00,19.20,8.31,0.00,1.00,62.40,14.40 +-76.80,19.20,8.33,0.00,1.00,-110.40,19.20 +-81.60,19.20,8.35,0.00,1.00,76.80,19.20 +-86.40,19.20,8.37,0.00,1.00,-100.80,19.20 +-91.20,19.20,8.40,0.00,1.00,86.40,19.20 +-96.00,19.20,8.42,0.00,1.00,-86.40,19.20 +-100.80,19.20,8.44,0.00,1.00,96.00,19.20 +-105.60,19.20,8.46,0.00,1.00,-76.80,19.20 +-110.40,19.20,8.48,0.00,1.00,105.60,19.20 +-115.20,19.20,8.50,0.00,1.00,-67.20,19.20 +-120.00,14.40,8.52,0.00,1.00,120.00,14.40 +-124.80,14.40,8.54,0.00,1.00,-57.60,14.40 +-129.60,14.40,8.57,0.00,1.00,129.60,14.40 +-134.40,14.40,8.59,0.00,1.00,-48.00,14.40 +-139.20,14.40,8.61,0.00,1.00,139.20,14.40 +-144.00,9.60,8.63,0.00,1.00,-38.40,9.60 +-148.80,9.60,8.65,0.00,1.00,148.80,9.60 +-153.60,9.60,8.67,0.00,1.00,-28.80,9.60 +-158.40,4.80,8.69,0.00,1.00,158.40,9.60 +-163.20,4.80,8.72,0.00,1.00,-19.20,4.80 +-168.00,4.80,8.74,0.00,1.00,163.20,4.80 +-172.80,0.00,8.76,0.00,1.00,-9.60,4.80 +-177.60,0.00,8.78,0.00,1.00,172.80,0.00 +177.60,-0.00,8.80,0.00,1.00,-0.00,0.00 +172.80,-0.00,8.82,0.00,1.00,-177.60,-0.00 +168.00,-4.80,8.84,0.00,1.00,4.80,-0.00 +163.20,-4.80,8.87,0.00,1.00,-168.00,-4.80 +158.40,-4.80,8.89,0.00,1.00,14.40,-4.80 +153.60,-9.60,8.91,0.00,1.00,-158.40,-4.80 +148.80,-9.60,8.93,0.00,1.00,24.00,-9.60 +144.00,-9.60,8.95,0.00,1.00,-153.60,-9.60 +139.20,-14.40,8.97,0.00,1.00,33.60,-9.60 +134.40,-14.40,8.99,0.00,1.00,-144.00,-9.60 +129.60,-14.40,9.01,0.00,1.00,43.20,-14.40 +124.80,-14.40,9.04,0.00,1.00,-134.40,-14.40 +120.00,-14.40,9.06,0.00,1.00,52.80,-14.40 +115.20,-19.20,9.08,0.00,1.00,-124.80,-14.40 +110.40,-19.20,9.10,0.00,1.00,62.40,-14.40 +105.60,-19.20,9.12,0.00,1.00,-110.40,-19.20 +100.80,-19.20,9.14,0.00,1.00,72.00,-19.20 +96.00,-19.20,9.16,0.00,1.00,-100.80,-19.20 +91.20,-19.20,9.19,0.00,1.00,81.60,-19.20 +86.40,-19.20,9.21,0.00,1.00,-91.20,-19.20 +81.60,-19.20,9.23,0.00,1.00,96.00,-19.20 +76.80,-19.20,9.25,0.00,1.00,-81.60,-19.20 +72.00,-19.20,9.27,0.00,1.00,105.60,-19.20 +67.20,-19.20,9.29,0.00,1.00,-72.00,-19.20 +62.40,-19.20,9.31,0.00,1.00,115.20,-14.40 +57.60,-14.40,9.34,0.00,1.00,-57.60,-14.40 +52.80,-14.40,9.36,0.00,1.00,124.80,-14.40 +48.00,-14.40,9.38,0.00,1.00,-48.00,-14.40 +43.20,-14.40,9.40,0.00,1.00,134.40,-14.40 +38.40,-9.60,9.42,0.00,1.00,-38.40,-14.40 +33.60,-9.60,9.44,0.00,1.00,144.00,-9.60 +28.80,-9.60,9.46,0.00,1.00,-28.80,-9.60 +24.00,-9.60,9.48,0.00,1.00,153.60,-9.60 +19.20,-4.80,9.51,0.00,1.00,-24.00,-9.60 +14.40,-4.80,9.53,0.00,1.00,163.20,-4.80 +9.60,-4.80,9.55,0.00,1.00,-14.40,-4.80 +4.80,-0.00,9.57,0.00,1.00,172.80,-4.80 +0.00,0.00,9.59,0.00,1.00,-4.80,-0.00 +-4.80,0.00,9.61,0.00,1.00,0.00,0.00 +-9.60,0.00,9.63,0.00,1.00,-177.60,0.00 +-14.40,4.80,9.66,0.00,1.00,9.60,0.00 +-19.20,4.80,9.68,0.00,1.00,-168.00,4.80 +-24.00,4.80,9.70,0.00,1.00,14.40,4.80 +-28.80,4.80,9.72,0.00,1.00,-158.40,4.80 +-33.60,9.60,9.74,0.00,1.00,24.00,4.80 +-38.40,9.60,9.76,0.00,1.00,-148.80,9.60 +-43.20,9.60,9.78,0.00,1.00,33.60,9.60 +-48.00,9.60,9.81,0.00,1.00,-139.20,9.60 +-52.80,9.60,9.83,0.00,1.00,43.20,9.60 +-57.60,14.40,9.85,0.00,1.00,-129.60,9.60 +-62.40,14.40,9.87,0.00,1.00,52.80,9.60 +-67.20,14.40,9.89,0.00,1.00,-120.00,9.60 +-72.00,14.40,9.91,0.00,1.00,62.40,14.40 +-76.80,14.40,9.93,0.00,1.00,-110.40,14.40 +-81.60,14.40,9.95,0.00,1.00,76.80,14.40 +-86.40,14.40,9.98,0.00,1.00,-100.80,14.40 +-91.20,14.40,10.00,0.00,1.00,86.40,14.40 +-96.00,14.40,10.02,0.00,1.00,-86.40,14.40 +-100.80,14.40,10.04,0.00,1.00,96.00,14.40 +-105.60,14.40,10.06,0.00,1.00,-76.80,14.40 +-110.40,14.40,10.08,0.00,1.00,110.40,14.40 +-115.20,14.40,10.10,0.00,1.00,-67.20,14.40 +-120.00,14.40,10.13,0.00,1.00,120.00,9.60 +-124.80,9.60,10.15,0.00,1.00,-57.60,9.60 +-129.60,9.60,10.17,0.00,1.00,129.60,9.60 +-134.40,9.60,10.19,0.00,1.00,-48.00,9.60 +-139.20,9.60,10.21,0.00,1.00,139.20,9.60 +-144.00,9.60,10.23,0.00,1.00,-38.40,9.60 +-148.80,9.60,10.25,0.00,1.00,148.80,9.60 +-153.60,4.80,10.28,0.00,1.00,-28.80,4.80 +-158.40,4.80,10.30,0.00,1.00,158.40,4.80 +-163.20,4.80,10.32,0.00,1.00,-19.20,4.80 +-168.00,4.80,10.34,0.00,1.00,168.00,4.80 +-172.80,0.00,10.36,0.00,1.00,-9.60,4.80 +-177.60,0.00,10.38,0.00,1.00,172.80,0.00 +177.60,-0.00,10.40,0.00,1.00,-0.00,0.00 +172.80,-0.00,10.42,0.00,1.00,-177.60,-0.00 +168.00,-4.80,10.45,0.00,1.00,4.80,-0.00 +163.20,-4.80,10.47,0.00,1.00,-168.00,-4.80 +158.40,-4.80,10.49,0.00,1.00,14.40,-4.80 +153.60,-4.80,10.51,0.00,1.00,-163.20,-4.80 +148.80,-9.60,10.53,0.00,1.00,24.00,-4.80 +144.00,-9.60,10.55,0.00,1.00,-153.60,-4.80 +139.20,-9.60,10.57,0.00,1.00,33.60,-9.60 +134.40,-9.60,10.60,0.00,1.00,-144.00,-9.60 +129.60,-9.60,10.62,0.00,1.00,43.20,-9.60 +124.80,-9.60,10.64,0.00,1.00,-134.40,-9.60 +120.00,-14.40,10.66,0.00,1.00,52.80,-9.60 +115.20,-14.40,10.68,0.00,1.00,-124.80,-9.60 +110.40,-14.40,10.70,0.00,1.00,62.40,-9.60 +105.60,-14.40,10.72,0.00,1.00,-115.20,-14.40 +100.80,-14.40,10.74,0.00,1.00,72.00,-14.40 +96.00,-14.40,10.77,0.00,1.00,-100.80,-14.40 +91.20,-14.40,10.79,0.00,1.00,81.60,-14.40 +86.40,-14.40,10.81,0.00,1.00,-91.20,-14.40 +81.60,-14.40,10.83,0.00,1.00,96.00,-14.40 +76.80,-14.40,10.85,0.00,1.00,-81.60,-14.40 +72.00,-14.40,10.87,0.00,1.00,105.60,-14.40 +67.20,-14.40,10.89,0.00,1.00,-67.20,-14.40 +62.40,-14.40,10.92,0.00,1.00,115.20,-14.40 +57.60,-14.40,10.94,0.00,1.00,-57.60,-9.60 +52.80,-9.60,10.96,0.00,1.00,124.80,-9.60 +48.00,-9.60,10.98,0.00,1.00,-48.00,-9.60 +43.20,-9.60,11.00,0.00,1.00,134.40,-9.60 +38.40,-9.60,11.02,0.00,1.00,-38.40,-9.60 +33.60,-9.60,11.04,0.00,1.00,144.00,-9.60 +28.80,-4.80,11.07,0.00,1.00,-28.80,-9.60 +24.00,-4.80,11.09,0.00,1.00,153.60,-4.80 +19.20,-4.80,11.11,0.00,1.00,-19.20,-4.80 +14.40,-4.80,11.13,0.00,1.00,163.20,-4.80 +9.60,-0.00,11.15,0.00,1.00,-14.40,-4.80 +4.80,-0.00,11.17,0.00,1.00,172.80,-0.00 +0.00,0.00,11.19,0.00,1.00,-4.80,-0.00 +-4.80,0.00,11.21,0.00,1.00,0.00,0.00 +-9.60,0.00,11.24,0.00,1.00,-177.60,0.00 +-14.40,0.00,11.26,0.00,1.00,9.60,0.00 +-19.20,4.80,11.28,0.00,1.00,-168.00,0.00 +-24.00,4.80,11.30,0.00,1.00,14.40,4.80 +-28.80,4.80,11.32,0.00,1.00,-158.40,4.80 +-33.60,4.80,11.34,0.00,1.00,24.00,4.80 +-38.40,4.80,11.36,0.00,1.00,-153.60,4.80 +-43.20,4.80,11.39,0.00,1.00,33.60,4.80 +-48.00,4.80,11.41,0.00,1.00,-144.00,4.80 +-52.80,9.60,11.43,0.00,1.00,43.20,4.80 +-57.60,9.60,11.45,0.00,1.00,-134.40,4.80 +-62.40,9.60,11.47,0.00,1.00,52.80,4.80 +-67.20,9.60,11.49,0.00,1.00,-124.80,9.60 +-72.00,9.60,11.51,0.00,1.00,62.40,9.60 +-76.80,9.60,11.54,0.00,1.00,-110.40,9.60 +-81.60,9.60,11.56,0.00,1.00,72.00,9.60 +-86.40,9.60,11.58,0.00,1.00,-100.80,9.60 +-91.20,9.60,11.60,0.00,1.00,86.40,9.60 +-96.00,9.60,11.62,0.00,1.00,-86.40,9.60 +-100.80,9.60,11.64,0.00,1.00,96.00,9.60 +-105.60,9.60,11.66,0.00,1.00,-76.80,9.60 +-110.40,9.60,11.68,0.00,1.00,110.40,9.60 +-115.20,9.60,11.71,0.00,1.00,-67.20,9.60 +-120.00,9.60,11.73,0.00,1.00,120.00,9.60 +-124.80,9.60,11.75,0.00,1.00,-52.80,9.60 +-129.60,9.60,11.77,0.00,1.00,129.60,4.80 +-134.40,4.80,11.79,0.00,1.00,-43.20,4.80 +-139.20,4.80,11.81,0.00,1.00,139.20,4.80 +-144.00,4.80,11.83,0.00,1.00,-33.60,4.80 +-148.80,4.80,11.86,0.00,1.00,148.80,4.80 +-153.60,4.80,11.88,0.00,1.00,-24.00,4.80 +-158.40,4.80,11.90,0.00,1.00,158.40,4.80 +-163.20,4.80,11.92,0.00,1.00,-19.20,4.80 +-168.00,0.00,11.94,0.00,1.00,168.00,4.80 +-172.80,0.00,11.96,0.00,1.00,-9.60,0.00 +-177.60,0.00,11.98,0.00,1.00,172.80,0.00 +177.60,-0.00,12.01,0.00,1.00,-0.00,0.00 +172.80,-0.00,12.03,0.00,1.00,-177.60,-0.00 +168.00,-0.00,12.05,0.00,1.00,4.80,-0.00 +163.20,-4.80,12.07,0.00,1.00,-168.00,-0.00 +158.40,-4.80,12.09,0.00,1.00,14.40,-4.80 +153.60,-4.80,12.11,0.00,1.00,-163.20,-4.80 +148.80,-4.80,12.13,0.00,1.00,24.00,-4.80 +144.00,-4.80,12.15,0.00,1.00,-153.60,-4.80 +139.20,-4.80,12.18,0.00,1.00,28.80,-4.80 +134.40,-4.80,12.20,0.00,1.00,-144.00,-4.80 +129.60,-9.60,12.22,0.00,1.00,38.40,-4.80 +124.80,-9.60,12.24,0.00,1.00,-134.40,-4.80 +120.00,-9.60,12.26,0.00,1.00,48.00,-4.80 +115.20,-9.60,12.28,0.00,1.00,-124.80,-9.60 +110.40,-9.60,12.30,0.00,1.00,57.60,-9.60 +105.60,-9.60,12.33,0.00,1.00,-115.20,-9.60 +100.80,-9.60,12.35,0.00,1.00,72.00,-9.60 +96.00,-9.60,12.37,0.00,1.00,-105.60,-9.60 +91.20,-9.60,12.39,0.00,1.00,81.60,-9.60 +86.40,-9.60,12.41,0.00,1.00,-91.20,-9.60 +81.60,-9.60,12.43,0.00,1.00,96.00,-9.60 +76.80,-9.60,12.45,0.00,1.00,-81.60,-9.60 +72.00,-9.60,12.48,0.00,1.00,105.60,-9.60 +67.20,-9.60,12.50,0.00,1.00,-67.20,-9.60 +62.40,-9.60,12.52,0.00,1.00,120.00,-9.60 +57.60,-9.60,12.54,0.00,1.00,-57.60,-9.60 +52.80,-9.60,12.56,0.00,1.00,129.60,-4.80 +48.00,-4.80,12.58,0.00,1.00,-48.00,-4.80 +43.20,-4.80,12.60,0.00,1.00,139.20,-4.80 +38.40,-4.80,12.62,0.00,1.00,-38.40,-4.80 +33.60,-4.80,12.65,0.00,1.00,148.80,-4.80 +28.80,-4.80,12.67,0.00,1.00,-28.80,-4.80 +24.00,-4.80,12.69,0.00,1.00,158.40,-4.80 +19.20,-4.80,12.71,0.00,1.00,-19.20,-4.80 +14.40,-0.00,12.73,0.00,1.00,163.20,-4.80 +9.60,-0.00,12.75,0.00,1.00,-9.60,-0.00 +4.80,-0.00,12.77,0.00,1.00,172.80,-0.00 +0.00,0.00,12.80,0.00,1.00,-4.80,-0.00 +-4.80,0.00,12.82,0.00,1.00,0.00,0.00 +-9.60,0.00,12.84,0.00,1.00,-177.60,0.00 +-14.40,0.00,12.86,0.00,1.00,9.60,0.00 +-19.20,0.00,12.88,0.00,1.00,-168.00,0.00 +-24.00,0.00,12.90,0.00,1.00,14.40,0.00 +-28.80,0.00,12.92,0.00,1.00,-163.20,0.00 +-33.60,4.80,12.95,0.00,1.00,24.00,0.00 +-38.40,4.80,12.97,0.00,1.00,-153.60,0.00 +-43.20,4.80,12.99,0.00,1.00,28.80,0.00 +-48.00,4.80,13.01,0.00,1.00,-144.00,4.80 +-52.80,4.80,13.03,0.00,1.00,38.40,4.80 +-57.60,4.80,13.05,0.00,1.00,-134.40,4.80 +-62.40,4.80,13.07,0.00,1.00,48.00,4.80 +-67.20,4.80,13.09,0.00,1.00,-124.80,4.80 +-72.00,4.80,13.12,0.00,1.00,62.40,4.80 +-76.80,4.80,13.14,0.00,1.00,-115.20,4.80 +-81.60,4.80,13.16,0.00,1.00,72.00,4.80 +-86.40,4.80,13.18,0.00,1.00,-100.80,4.80 +-91.20,4.80,13.20,0.00,1.00,86.40,4.80 +-96.00,4.80,13.22,0.00,1.00,-86.40,4.80 +-100.80,4.80,13.24,0.00,1.00,96.00,4.80 +-105.60,4.80,13.27,0.00,1.00,-76.80,4.80 +-110.40,4.80,13.29,0.00,1.00,110.40,4.80 +-115.20,4.80,13.31,0.00,1.00,-62.40,4.80 +-120.00,4.80,13.33,0.00,1.00,120.00,4.80 +-124.80,4.80,13.35,0.00,1.00,-52.80,4.80 +-129.60,4.80,13.37,0.00,1.00,134.40,4.80 +-134.40,4.80,13.39,0.00,1.00,-43.20,4.80 +-139.20,4.80,13.42,0.00,1.00,144.00,4.80 +-144.00,4.80,13.44,0.00,1.00,-33.60,0.00 +-148.80,4.80,13.46,0.00,1.00,153.60,0.00 +-153.60,0.00,13.48,0.00,1.00,-24.00,0.00 +-158.40,0.00,13.50,0.00,1.00,158.40,0.00 +-163.20,0.00,13.52,0.00,1.00,-14.40,0.00 +-168.00,0.00,13.54,0.00,1.00,168.00,0.00 +-172.80,0.00,13.56,0.00,1.00,-9.60,0.00 +-177.60,0.00,13.59,0.00,1.00,172.80,0.00 +177.60,-0.00,13.61,0.00,1.00,-0.00,0.00 +172.80,-0.00,13.63,0.00,1.00,-177.60,-0.00 +168.00,-0.00,13.65,0.00,1.00,4.80,-0.00 +163.20,-0.00,13.67,0.00,1.00,-172.80,-0.00 +158.40,-0.00,13.69,0.00,1.00,14.40,-0.00 +153.60,-0.00,13.71,0.00,1.00,-163.20,-0.00 +148.80,-4.80,13.74,0.00,1.00,19.20,-0.00 +144.00,-4.80,13.76,0.00,1.00,-153.60,-0.00 +139.20,-4.80,13.78,0.00,1.00,28.80,-0.00 +134.40,-4.80,13.80,0.00,1.00,-148.80,-0.00 +129.60,-4.80,13.82,0.00,1.00,38.40,-4.80 +124.80,-4.80,13.84,0.00,1.00,-139.20,-4.80 +120.00,-4.80,13.86,0.00,1.00,48.00,-4.80 +115.20,-4.80,13.89,0.00,1.00,-129.60,-4.80 +110.40,-4.80,13.91,0.00,1.00,57.60,-4.80 +105.60,-4.80,13.93,0.00,1.00,-115.20,-4.80 +100.80,-4.80,13.95,0.00,1.00,67.20,-4.80 +96.00,-4.80,13.97,0.00,1.00,-105.60,-4.80 +91.20,-4.80,13.99,0.00,1.00,81.60,-4.80 +86.40,-4.80,14.01,0.00,1.00,-91.20,-4.80 +81.60,-4.80,14.03,0.00,1.00,96.00,-4.80 +76.80,-4.80,14.06,0.00,1.00,-76.80,-4.80 +72.00,-4.80,14.08,0.00,1.00,105.60,-4.80 +67.20,-4.80,14.10,0.00,1.00,-67.20,-4.80 +62.40,-4.80,14.12,0.00,1.00,120.00,-4.80 +57.60,-4.80,14.14,0.00,1.00,-52.80,-4.80 +52.80,-4.80,14.16,0.00,1.00,129.60,-4.80 +48.00,-4.80,14.18,0.00,1.00,-43.20,-4.80 +43.20,-4.80,14.21,0.00,1.00,139.20,-4.80 +38.40,-4.80,14.23,0.00,1.00,-33.60,-4.80 +33.60,-4.80,14.25,0.00,1.00,148.80,-0.00 +28.80,-0.00,14.27,0.00,1.00,-28.80,-0.00 +24.00,-0.00,14.29,0.00,1.00,158.40,-0.00 +19.20,-0.00,14.31,0.00,1.00,-19.20,-0.00 +14.40,-0.00,14.33,0.00,1.00,163.20,-0.00 +9.60,-0.00,14.36,0.00,1.00,-9.60,-0.00 +4.80,-0.00,14.38,0.00,1.00,172.80,-0.00 +0.00,0.00,14.40,0.00,1.00,-4.80,-0.00 +-4.80,0.00,14.42,0.00,1.00,0.00,0.00 +-9.60,0.00,14.44,0.00,1.00,-177.60,-0.00 +-14.40,0.00,14.46,0.00,1.00,4.80,-0.00 +-19.20,0.00,14.48,0.00,1.00,-168.00,-0.00 +-24.00,0.00,14.50,0.00,1.00,14.40,-0.00 +-28.80,0.00,14.53,0.00,1.00,-163.20,-0.00 +-33.60,0.00,14.55,0.00,1.00,19.20,-0.00 +-38.40,0.00,14.57,0.00,1.00,-153.60,-0.00 +-43.20,0.00,14.59,0.00,1.00,28.80,-0.00 +-48.00,0.00,14.61,0.00,1.00,-148.80,-0.00 +-52.80,0.00,14.63,0.00,1.00,38.40,-0.00 +-57.60,0.00,14.65,0.00,1.00,-139.20,-0.00 +-62.40,0.00,14.68,0.00,1.00,48.00,-0.00 +-67.20,0.00,14.70,0.00,1.00,-124.80,-0.00 +-72.00,0.00,14.72,0.00,1.00,57.60,-0.00 +-76.80,0.00,14.74,0.00,1.00,-115.20,-0.00 +-81.60,0.00,14.76,0.00,1.00,72.00,-0.00 +-86.40,0.00,14.78,0.00,1.00,-100.80,-0.00 +-91.20,0.00,14.80,0.00,1.00,86.40,-0.00 +-96.00,0.00,14.83,0.00,1.00,-86.40,-0.00 +-100.80,0.00,14.85,0.00,1.00,100.80,-0.00 +-105.60,0.00,14.87,0.00,1.00,-76.80,-0.00 +-110.40,0.00,14.89,0.00,1.00,110.40,-0.00 +-115.20,0.00,14.91,0.00,1.00,-62.40,-0.00 +-120.00,0.00,14.93,0.00,1.00,124.80,-0.00 +-124.80,0.00,14.95,0.00,1.00,-48.00,-0.00 +-129.60,0.00,14.97,0.00,1.00,134.40,-0.00 +-134.40,0.00,15.00,0.00,1.00,-38.40,-0.00 +-139.20,0.00,15.02,0.00,1.00,144.00,-0.00 +-144.00,0.00,15.04,0.00,1.00,-28.80,-0.00 +-148.80,0.00,15.06,0.00,1.00,153.60,-0.00 +-153.60,0.00,15.08,0.00,1.00,-24.00,-0.00 +-158.40,0.00,15.10,0.00,1.00,163.20,-0.00 +-163.20,0.00,15.12,0.00,1.00,-14.40,-0.00 +-168.00,0.00,15.15,0.00,1.00,168.00,-0.00 +-172.80,0.00,15.17,0.00,1.00,-9.60,-0.00 +-177.60,0.00,15.19,0.00,1.00,172.80,-0.00 +177.60,0.00,15.21,0.00,1.00,-0.00,-0.00 +172.80,0.00,15.23,0.00,1.00,-177.60,0.00 +168.00,0.00,15.25,0.00,1.00,4.80,0.00 +163.20,0.00,15.27,0.00,1.00,-172.80,0.00 +158.40,0.00,15.30,0.00,1.00,9.60,0.00 +153.60,0.00,15.32,0.00,1.00,-163.20,0.00 +148.80,0.00,15.34,0.00,1.00,19.20,0.00 +144.00,0.00,15.36,0.00,1.00,-158.40,0.00 +139.20,0.00,15.38,0.00,1.00,28.80,0.00 +134.40,0.00,15.40,0.00,1.00,-148.80,0.00 +129.60,0.00,15.42,0.00,1.00,33.60,0.00 +124.80,0.00,15.44,0.00,1.00,-139.20,0.00 +120.00,0.00,15.47,0.00,1.00,43.20,0.00 +115.20,0.00,15.49,0.00,1.00,-129.60,0.00 +110.40,0.00,15.51,0.00,1.00,57.60,0.00 +105.60,0.00,15.53,0.00,1.00,-120.00,0.00 +100.80,0.00,15.55,0.00,1.00,67.20,0.00 +96.00,0.00,15.57,0.00,1.00,-105.60,0.00 +91.20,0.00,15.59,0.00,1.00,81.60,0.00 +86.40,0.00,15.62,0.00,1.00,-91.20,0.00 +81.60,0.00,15.64,0.00,1.00,96.00,0.00 +76.80,0.00,15.66,0.00,1.00,-76.80,0.00 +72.00,0.00,15.68,0.00,1.00,110.40,0.00 +67.20,0.00,15.70,0.00,1.00,-67.20,0.00 +62.40,0.00,15.72,0.00,1.00,120.00,0.00 +57.60,0.00,15.74,0.00,1.00,-52.80,0.00 +52.80,0.00,15.77,0.00,1.00,134.40,0.00 +48.00,0.00,15.79,0.00,1.00,-43.20,0.00 +43.20,0.00,15.81,0.00,1.00,144.00,0.00 +38.40,0.00,15.83,0.00,1.00,-33.60,0.00 +33.60,0.00,15.85,0.00,1.00,153.60,0.00 +28.80,0.00,15.87,0.00,1.00,-24.00,0.00 +24.00,0.00,15.89,0.00,1.00,158.40,0.00 +19.20,0.00,15.91,0.00,1.00,-19.20,0.00 +14.40,0.00,15.94,0.00,1.00,168.00,0.00 +9.60,0.00,15.96,0.00,1.00,-9.60,0.00 +4.80,0.00,15.98,0.00,1.00,172.80,0.00 +0.00,0.00,16.00,0.00,1.00,-4.80,0.00 diff --git a/scripts/testv/stvISM3.csv b/scripts/testv/stvISM3.csv index d2474d78fd398460c53b0715771184a40bbbd60c..ac37e672e3758c851a5d236e56e612697bcd5f1f 100644 --- a/scripts/testv/stvISM3.csv +++ b/scripts/testv/stvISM3.csv @@ -1,1500 +1,1500 @@ -0.00,0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 --168.00,-9.60,1.00,0.00,1.00 -14.40,14.40,1.00,0.00,1.00 --163.20,-14.40,1.00,0.00,1.00 -19.20,19.20,1.00,0.00,1.00 --153.60,-24.00,1.00,0.00,1.00 -28.80,24.00,1.00,0.00,1.00 --148.80,-28.80,1.00,0.00,1.00 -38.40,33.60,1.00,0.00,1.00 --139.20,-33.60,1.00,0.00,1.00 -48.00,38.40,1.00,0.00,1.00 --124.80,-38.40,1.00,0.00,1.00 -57.60,38.40,1.00,0.00,1.00 --115.20,-43.20,1.00,0.00,1.00 -72.00,43.20,1.00,0.00,1.00 --100.80,-43.20,1.00,0.00,1.00 -86.40,43.20,1.00,0.00,1.00 --86.40,-43.20,1.00,0.00,1.00 -100.80,43.20,1.00,0.00,1.00 --76.80,-43.20,1.00,0.00,1.00 -110.40,43.20,1.00,0.00,1.00 --62.40,-43.20,1.00,0.00,1.00 -124.80,38.40,1.00,0.00,1.00 --52.80,-38.40,1.00,0.00,1.00 -134.40,33.60,1.00,0.00,1.00 --38.40,-33.60,1.00,0.00,1.00 -144.00,28.80,1.00,0.00,1.00 --33.60,-28.80,1.00,0.00,1.00 -153.60,24.00,1.00,0.00,1.00 --24.00,-19.20,1.00,0.00,1.00 -158.40,19.20,1.00,0.00,1.00 --14.40,-14.40,1.00,0.00,1.00 -168.00,9.60,1.00,0.00,1.00 --9.60,-9.60,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --0.00,-0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 --172.80,-9.60,1.00,0.00,1.00 -14.40,9.60,1.00,0.00,1.00 --163.20,-14.40,1.00,0.00,1.00 -19.20,19.20,1.00,0.00,1.00 --158.40,-19.20,1.00,0.00,1.00 -28.80,24.00,1.00,0.00,1.00 --148.80,-28.80,1.00,0.00,1.00 -33.60,28.80,1.00,0.00,1.00 --139.20,-33.60,1.00,0.00,1.00 -43.20,33.60,1.00,0.00,1.00 --129.60,-38.40,1.00,0.00,1.00 -57.60,38.40,1.00,0.00,1.00 --120.00,-43.20,1.00,0.00,1.00 -67.20,43.20,1.00,0.00,1.00 --105.60,-43.20,1.00,0.00,1.00 -81.60,43.20,1.00,0.00,1.00 --91.20,-43.20,1.00,0.00,1.00 -96.00,43.20,1.00,0.00,1.00 --76.80,-43.20,1.00,0.00,1.00 -110.40,43.20,1.00,0.00,1.00 --67.20,-43.20,1.00,0.00,1.00 -120.00,38.40,1.00,0.00,1.00 --52.80,-38.40,1.00,0.00,1.00 -129.60,38.40,1.00,0.00,1.00 --43.20,-33.60,1.00,0.00,1.00 -144.00,33.60,1.00,0.00,1.00 --33.60,-28.80,1.00,0.00,1.00 -148.80,24.00,1.00,0.00,1.00 --24.00,-24.00,1.00,0.00,1.00 -158.40,19.20,1.00,0.00,1.00 --19.20,-14.40,1.00,0.00,1.00 -168.00,14.40,1.00,0.00,1.00 --9.60,-9.60,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 -9.60,4.80,1.00,0.00,1.00 --168.00,-9.60,1.00,0.00,1.00 -14.40,14.40,1.00,0.00,1.00 --163.20,-14.40,1.00,0.00,1.00 -24.00,19.20,1.00,0.00,1.00 --153.60,-19.20,1.00,0.00,1.00 -28.80,24.00,1.00,0.00,1.00 --144.00,-24.00,1.00,0.00,1.00 -38.40,28.80,1.00,0.00,1.00 --134.40,-28.80,1.00,0.00,1.00 -48.00,33.60,1.00,0.00,1.00 --124.80,-33.60,1.00,0.00,1.00 -62.40,38.40,1.00,0.00,1.00 --115.20,-38.40,1.00,0.00,1.00 -72.00,38.40,1.00,0.00,1.00 --100.80,-38.40,1.00,0.00,1.00 -86.40,38.40,1.00,0.00,1.00 --86.40,-38.40,1.00,0.00,1.00 -96.00,38.40,1.00,0.00,1.00 --76.80,-38.40,1.00,0.00,1.00 -110.40,38.40,1.00,0.00,1.00 --62.40,-38.40,1.00,0.00,1.00 -120.00,33.60,1.00,0.00,1.00 --52.80,-33.60,1.00,0.00,1.00 -134.40,33.60,1.00,0.00,1.00 --43.20,-28.80,1.00,0.00,1.00 -144.00,28.80,1.00,0.00,1.00 --33.60,-24.00,1.00,0.00,1.00 -148.80,24.00,1.00,0.00,1.00 --24.00,-19.20,1.00,0.00,1.00 -158.40,14.40,1.00,0.00,1.00 --19.20,-14.40,1.00,0.00,1.00 -168.00,9.60,1.00,0.00,1.00 --9.60,-9.60,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --0.00,-0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 --172.80,-9.60,1.00,0.00,1.00 -14.40,9.60,1.00,0.00,1.00 --163.20,-14.40,1.00,0.00,1.00 -19.20,14.40,1.00,0.00,1.00 --153.60,-19.20,1.00,0.00,1.00 -28.80,24.00,1.00,0.00,1.00 --148.80,-24.00,1.00,0.00,1.00 -38.40,28.80,1.00,0.00,1.00 --139.20,-28.80,1.00,0.00,1.00 -48.00,33.60,1.00,0.00,1.00 --124.80,-33.60,1.00,0.00,1.00 -57.60,33.60,1.00,0.00,1.00 --115.20,-38.40,1.00,0.00,1.00 -72.00,38.40,1.00,0.00,1.00 --105.60,-38.40,1.00,0.00,1.00 -81.60,38.40,1.00,0.00,1.00 --91.20,-38.40,1.00,0.00,1.00 -96.00,38.40,1.00,0.00,1.00 --76.80,-38.40,1.00,0.00,1.00 -105.60,38.40,1.00,0.00,1.00 --67.20,-38.40,1.00,0.00,1.00 -120.00,38.40,1.00,0.00,1.00 --57.60,-33.60,1.00,0.00,1.00 -129.60,33.60,1.00,0.00,1.00 --43.20,-28.80,1.00,0.00,1.00 -139.20,28.80,1.00,0.00,1.00 --33.60,-24.00,1.00,0.00,1.00 -148.80,24.00,1.00,0.00,1.00 --28.80,-19.20,1.00,0.00,1.00 -158.40,19.20,1.00,0.00,1.00 --19.20,-14.40,1.00,0.00,1.00 -163.20,14.40,1.00,0.00,1.00 --9.60,-9.60,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 -9.60,4.80,1.00,0.00,1.00 --168.00,-9.60,1.00,0.00,1.00 -14.40,9.60,1.00,0.00,1.00 --158.40,-14.40,1.00,0.00,1.00 -24.00,14.40,1.00,0.00,1.00 --153.60,-19.20,1.00,0.00,1.00 -33.60,19.20,1.00,0.00,1.00 --144.00,-24.00,1.00,0.00,1.00 -43.20,24.00,1.00,0.00,1.00 --134.40,-28.80,1.00,0.00,1.00 -52.80,28.80,1.00,0.00,1.00 --124.80,-28.80,1.00,0.00,1.00 -62.40,33.60,1.00,0.00,1.00 --110.40,-33.60,1.00,0.00,1.00 -72.00,33.60,1.00,0.00,1.00 --100.80,-33.60,1.00,0.00,1.00 -86.40,33.60,1.00,0.00,1.00 --86.40,-33.60,1.00,0.00,1.00 -96.00,33.60,1.00,0.00,1.00 --76.80,-33.60,1.00,0.00,1.00 -110.40,33.60,1.00,0.00,1.00 --67.20,-33.60,1.00,0.00,1.00 -120.00,33.60,1.00,0.00,1.00 --52.80,-28.80,1.00,0.00,1.00 -129.60,28.80,1.00,0.00,1.00 --43.20,-28.80,1.00,0.00,1.00 -139.20,24.00,1.00,0.00,1.00 --33.60,-24.00,1.00,0.00,1.00 -148.80,19.20,1.00,0.00,1.00 --24.00,-19.20,1.00,0.00,1.00 -158.40,14.40,1.00,0.00,1.00 --19.20,-14.40,1.00,0.00,1.00 -168.00,9.60,1.00,0.00,1.00 --9.60,-4.80,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --0.00,-0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 -14.40,9.60,1.00,0.00,1.00 --163.20,-14.40,1.00,0.00,1.00 -24.00,14.40,1.00,0.00,1.00 --153.60,-19.20,1.00,0.00,1.00 -28.80,19.20,1.00,0.00,1.00 --144.00,-24.00,1.00,0.00,1.00 -38.40,24.00,1.00,0.00,1.00 --134.40,-28.80,1.00,0.00,1.00 -48.00,28.80,1.00,0.00,1.00 --124.80,-28.80,1.00,0.00,1.00 -62.40,33.60,1.00,0.00,1.00 --115.20,-33.60,1.00,0.00,1.00 -72.00,33.60,1.00,0.00,1.00 --100.80,-33.60,1.00,0.00,1.00 -81.60,33.60,1.00,0.00,1.00 --91.20,-33.60,1.00,0.00,1.00 -96.00,33.60,1.00,0.00,1.00 --81.60,-33.60,1.00,0.00,1.00 -105.60,33.60,1.00,0.00,1.00 --67.20,-33.60,1.00,0.00,1.00 -115.20,33.60,1.00,0.00,1.00 --57.60,-28.80,1.00,0.00,1.00 -129.60,28.80,1.00,0.00,1.00 --48.00,-28.80,1.00,0.00,1.00 -139.20,24.00,1.00,0.00,1.00 --38.40,-24.00,1.00,0.00,1.00 -148.80,19.20,1.00,0.00,1.00 --28.80,-19.20,1.00,0.00,1.00 -153.60,14.40,1.00,0.00,1.00 --19.20,-14.40,1.00,0.00,1.00 -163.20,9.60,1.00,0.00,1.00 --9.60,-9.60,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 -9.60,4.80,1.00,0.00,1.00 --168.00,-9.60,1.00,0.00,1.00 -14.40,9.60,1.00,0.00,1.00 --158.40,-9.60,1.00,0.00,1.00 -24.00,14.40,1.00,0.00,1.00 --148.80,-14.40,1.00,0.00,1.00 -33.60,19.20,1.00,0.00,1.00 --139.20,-19.20,1.00,0.00,1.00 -43.20,24.00,1.00,0.00,1.00 --129.60,-24.00,1.00,0.00,1.00 -52.80,24.00,1.00,0.00,1.00 --120.00,-28.80,1.00,0.00,1.00 -62.40,28.80,1.00,0.00,1.00 --110.40,-28.80,1.00,0.00,1.00 -76.80,28.80,1.00,0.00,1.00 --100.80,-28.80,1.00,0.00,1.00 -86.40,28.80,1.00,0.00,1.00 --86.40,-28.80,1.00,0.00,1.00 -96.00,28.80,1.00,0.00,1.00 --76.80,-28.80,1.00,0.00,1.00 -105.60,28.80,1.00,0.00,1.00 --67.20,-28.80,1.00,0.00,1.00 -120.00,28.80,1.00,0.00,1.00 --57.60,-24.00,1.00,0.00,1.00 -129.60,24.00,1.00,0.00,1.00 --48.00,-24.00,1.00,0.00,1.00 -139.20,19.20,1.00,0.00,1.00 --38.40,-19.20,1.00,0.00,1.00 -148.80,19.20,1.00,0.00,1.00 --28.80,-14.40,1.00,0.00,1.00 -158.40,14.40,1.00,0.00,1.00 --19.20,-9.60,1.00,0.00,1.00 -163.20,9.60,1.00,0.00,1.00 --9.60,-4.80,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --0.00,-0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 -14.40,9.60,1.00,0.00,1.00 --163.20,-9.60,1.00,0.00,1.00 -24.00,14.40,1.00,0.00,1.00 --153.60,-14.40,1.00,0.00,1.00 -33.60,19.20,1.00,0.00,1.00 --144.00,-19.20,1.00,0.00,1.00 -43.20,19.20,1.00,0.00,1.00 --134.40,-24.00,1.00,0.00,1.00 -52.80,24.00,1.00,0.00,1.00 --124.80,-24.00,1.00,0.00,1.00 -62.40,28.80,1.00,0.00,1.00 --115.20,-28.80,1.00,0.00,1.00 -72.00,28.80,1.00,0.00,1.00 --100.80,-28.80,1.00,0.00,1.00 -81.60,28.80,1.00,0.00,1.00 --91.20,-28.80,1.00,0.00,1.00 -96.00,28.80,1.00,0.00,1.00 --81.60,-28.80,1.00,0.00,1.00 -105.60,28.80,1.00,0.00,1.00 --67.20,-28.80,1.00,0.00,1.00 -115.20,28.80,1.00,0.00,1.00 --57.60,-28.80,1.00,0.00,1.00 -124.80,24.00,1.00,0.00,1.00 --48.00,-24.00,1.00,0.00,1.00 -134.40,24.00,1.00,0.00,1.00 --38.40,-19.20,1.00,0.00,1.00 -144.00,19.20,1.00,0.00,1.00 --28.80,-14.40,1.00,0.00,1.00 -153.60,14.40,1.00,0.00,1.00 --19.20,-9.60,1.00,0.00,1.00 -163.20,9.60,1.00,0.00,1.00 --14.40,-9.60,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -9.60,4.80,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 -19.20,9.60,1.00,0.00,1.00 --158.40,-9.60,1.00,0.00,1.00 -24.00,14.40,1.00,0.00,1.00 --148.80,-14.40,1.00,0.00,1.00 -33.60,14.40,1.00,0.00,1.00 --139.20,-19.20,1.00,0.00,1.00 -43.20,19.20,1.00,0.00,1.00 --129.60,-19.20,1.00,0.00,1.00 -52.80,19.20,1.00,0.00,1.00 --120.00,-24.00,1.00,0.00,1.00 -67.20,24.00,1.00,0.00,1.00 --110.40,-24.00,1.00,0.00,1.00 -76.80,24.00,1.00,0.00,1.00 --100.80,-24.00,1.00,0.00,1.00 -86.40,24.00,1.00,0.00,1.00 --86.40,-24.00,1.00,0.00,1.00 -96.00,24.00,1.00,0.00,1.00 --76.80,-24.00,1.00,0.00,1.00 -105.60,24.00,1.00,0.00,1.00 --67.20,-24.00,1.00,0.00,1.00 -115.20,24.00,1.00,0.00,1.00 --57.60,-24.00,1.00,0.00,1.00 -129.60,19.20,1.00,0.00,1.00 --48.00,-19.20,1.00,0.00,1.00 -139.20,19.20,1.00,0.00,1.00 --38.40,-14.40,1.00,0.00,1.00 -148.80,14.40,1.00,0.00,1.00 --28.80,-14.40,1.00,0.00,1.00 -153.60,9.60,1.00,0.00,1.00 --19.20,-9.60,1.00,0.00,1.00 -163.20,9.60,1.00,0.00,1.00 --9.60,-4.80,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --0.00,-0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 -14.40,9.60,1.00,0.00,1.00 --158.40,-9.60,1.00,0.00,1.00 -24.00,9.60,1.00,0.00,1.00 --153.60,-14.40,1.00,0.00,1.00 -33.60,14.40,1.00,0.00,1.00 --144.00,-14.40,1.00,0.00,1.00 -43.20,19.20,1.00,0.00,1.00 --134.40,-19.20,1.00,0.00,1.00 -52.80,19.20,1.00,0.00,1.00 --124.80,-24.00,1.00,0.00,1.00 -62.40,24.00,1.00,0.00,1.00 --110.40,-24.00,1.00,0.00,1.00 -72.00,24.00,1.00,0.00,1.00 --100.80,-24.00,1.00,0.00,1.00 -81.60,24.00,1.00,0.00,1.00 --91.20,-24.00,1.00,0.00,1.00 -96.00,24.00,1.00,0.00,1.00 --81.60,-24.00,1.00,0.00,1.00 -105.60,24.00,1.00,0.00,1.00 --72.00,-24.00,1.00,0.00,1.00 -115.20,24.00,1.00,0.00,1.00 --57.60,-24.00,1.00,0.00,1.00 -124.80,19.20,1.00,0.00,1.00 --48.00,-19.20,1.00,0.00,1.00 -134.40,19.20,1.00,0.00,1.00 --38.40,-19.20,1.00,0.00,1.00 -144.00,14.40,1.00,0.00,1.00 --28.80,-14.40,1.00,0.00,1.00 -153.60,14.40,1.00,0.00,1.00 --24.00,-9.60,1.00,0.00,1.00 -163.20,9.60,1.00,0.00,1.00 --14.40,-4.80,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -9.60,4.80,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 -19.20,4.80,1.00,0.00,1.00 --158.40,-9.60,1.00,0.00,1.00 -28.80,9.60,1.00,0.00,1.00 --148.80,-9.60,1.00,0.00,1.00 -38.40,14.40,1.00,0.00,1.00 --139.20,-14.40,1.00,0.00,1.00 -48.00,14.40,1.00,0.00,1.00 --129.60,-14.40,1.00,0.00,1.00 -57.60,19.20,1.00,0.00,1.00 --120.00,-19.20,1.00,0.00,1.00 -67.20,19.20,1.00,0.00,1.00 --110.40,-19.20,1.00,0.00,1.00 -76.80,19.20,1.00,0.00,1.00 --100.80,-19.20,1.00,0.00,1.00 -86.40,19.20,1.00,0.00,1.00 --86.40,-19.20,1.00,0.00,1.00 -96.00,19.20,1.00,0.00,1.00 --76.80,-19.20,1.00,0.00,1.00 -105.60,19.20,1.00,0.00,1.00 --67.20,-19.20,1.00,0.00,1.00 -115.20,19.20,1.00,0.00,1.00 --57.60,-19.20,1.00,0.00,1.00 -124.80,19.20,1.00,0.00,1.00 --48.00,-14.40,1.00,0.00,1.00 -134.40,14.40,1.00,0.00,1.00 --38.40,-14.40,1.00,0.00,1.00 -144.00,14.40,1.00,0.00,1.00 --28.80,-9.60,1.00,0.00,1.00 -153.60,9.60,1.00,0.00,1.00 --19.20,-9.60,1.00,0.00,1.00 -163.20,4.80,1.00,0.00,1.00 --9.60,-4.80,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --0.00,-0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 -14.40,4.80,1.00,0.00,1.00 --158.40,-9.60,1.00,0.00,1.00 -24.00,9.60,1.00,0.00,1.00 --148.80,-9.60,1.00,0.00,1.00 -33.60,14.40,1.00,0.00,1.00 --139.20,-14.40,1.00,0.00,1.00 -43.20,14.40,1.00,0.00,1.00 --129.60,-14.40,1.00,0.00,1.00 -52.80,19.20,1.00,0.00,1.00 --120.00,-19.20,1.00,0.00,1.00 -62.40,19.20,1.00,0.00,1.00 --110.40,-19.20,1.00,0.00,1.00 -72.00,19.20,1.00,0.00,1.00 --100.80,-19.20,1.00,0.00,1.00 -81.60,19.20,1.00,0.00,1.00 --91.20,-19.20,1.00,0.00,1.00 -96.00,19.20,1.00,0.00,1.00 --81.60,-19.20,1.00,0.00,1.00 -105.60,19.20,1.00,0.00,1.00 --72.00,-19.20,1.00,0.00,1.00 -115.20,19.20,1.00,0.00,1.00 --62.40,-19.20,1.00,0.00,1.00 -124.80,19.20,1.00,0.00,1.00 --52.80,-14.40,1.00,0.00,1.00 -134.40,14.40,1.00,0.00,1.00 --43.20,-14.40,1.00,0.00,1.00 -144.00,14.40,1.00,0.00,1.00 --33.60,-9.60,1.00,0.00,1.00 -153.60,9.60,1.00,0.00,1.00 --24.00,-9.60,1.00,0.00,1.00 -163.20,4.80,1.00,0.00,1.00 --14.40,-4.80,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -9.60,4.80,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 -19.20,4.80,1.00,0.00,1.00 --158.40,-4.80,1.00,0.00,1.00 -28.80,9.60,1.00,0.00,1.00 --148.80,-9.60,1.00,0.00,1.00 -38.40,9.60,1.00,0.00,1.00 --139.20,-9.60,1.00,0.00,1.00 -48.00,9.60,1.00,0.00,1.00 --129.60,-14.40,1.00,0.00,1.00 -57.60,14.40,1.00,0.00,1.00 --120.00,-14.40,1.00,0.00,1.00 -67.20,14.40,1.00,0.00,1.00 --110.40,-14.40,1.00,0.00,1.00 -76.80,14.40,1.00,0.00,1.00 --100.80,-14.40,1.00,0.00,1.00 -86.40,14.40,1.00,0.00,1.00 --86.40,-14.40,1.00,0.00,1.00 -96.00,14.40,1.00,0.00,1.00 --76.80,-14.40,1.00,0.00,1.00 -105.60,14.40,1.00,0.00,1.00 --67.20,-14.40,1.00,0.00,1.00 -115.20,14.40,1.00,0.00,1.00 --57.60,-14.40,1.00,0.00,1.00 -124.80,14.40,1.00,0.00,1.00 --48.00,-14.40,1.00,0.00,1.00 -134.40,9.60,1.00,0.00,1.00 --38.40,-9.60,1.00,0.00,1.00 -144.00,9.60,1.00,0.00,1.00 --28.80,-9.60,1.00,0.00,1.00 -153.60,4.80,1.00,0.00,1.00 --19.20,-4.80,1.00,0.00,1.00 -163.20,4.80,1.00,0.00,1.00 --9.60,-4.80,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 --0.00,-0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 -14.40,4.80,1.00,0.00,1.00 --158.40,-4.80,1.00,0.00,1.00 -24.00,4.80,1.00,0.00,1.00 --148.80,-9.60,1.00,0.00,1.00 -33.60,9.60,1.00,0.00,1.00 --139.20,-9.60,1.00,0.00,1.00 -43.20,9.60,1.00,0.00,1.00 --129.60,-14.40,1.00,0.00,1.00 -52.80,14.40,1.00,0.00,1.00 --120.00,-14.40,1.00,0.00,1.00 -62.40,14.40,1.00,0.00,1.00 --110.40,-14.40,1.00,0.00,1.00 -72.00,14.40,1.00,0.00,1.00 --100.80,-14.40,1.00,0.00,1.00 -81.60,14.40,1.00,0.00,1.00 --91.20,-14.40,1.00,0.00,1.00 -96.00,14.40,1.00,0.00,1.00 --81.60,-14.40,1.00,0.00,1.00 -105.60,14.40,1.00,0.00,1.00 --72.00,-14.40,1.00,0.00,1.00 -115.20,14.40,1.00,0.00,1.00 --62.40,-14.40,1.00,0.00,1.00 -124.80,14.40,1.00,0.00,1.00 --52.80,-14.40,1.00,0.00,1.00 -134.40,9.60,1.00,0.00,1.00 --43.20,-9.60,1.00,0.00,1.00 -144.00,9.60,1.00,0.00,1.00 --33.60,-9.60,1.00,0.00,1.00 -153.60,9.60,1.00,0.00,1.00 --24.00,-4.80,1.00,0.00,1.00 -163.20,4.80,1.00,0.00,1.00 --14.40,-4.80,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -9.60,0.00,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 -19.20,4.80,1.00,0.00,1.00 --158.40,-4.80,1.00,0.00,1.00 -28.80,4.80,1.00,0.00,1.00 --148.80,-4.80,1.00,0.00,1.00 -38.40,4.80,1.00,0.00,1.00 --139.20,-9.60,1.00,0.00,1.00 -48.00,9.60,1.00,0.00,1.00 --129.60,-9.60,1.00,0.00,1.00 -57.60,9.60,1.00,0.00,1.00 --120.00,-9.60,1.00,0.00,1.00 -67.20,9.60,1.00,0.00,1.00 --110.40,-9.60,1.00,0.00,1.00 -76.80,9.60,1.00,0.00,1.00 --100.80,-9.60,1.00,0.00,1.00 -86.40,9.60,1.00,0.00,1.00 --86.40,-9.60,1.00,0.00,1.00 -96.00,9.60,1.00,0.00,1.00 --76.80,-9.60,1.00,0.00,1.00 -105.60,9.60,1.00,0.00,1.00 --67.20,-9.60,1.00,0.00,1.00 -115.20,9.60,1.00,0.00,1.00 --57.60,-9.60,1.00,0.00,1.00 -124.80,9.60,1.00,0.00,1.00 --48.00,-9.60,1.00,0.00,1.00 -134.40,9.60,1.00,0.00,1.00 --38.40,-9.60,1.00,0.00,1.00 -144.00,4.80,1.00,0.00,1.00 --28.80,-4.80,1.00,0.00,1.00 -153.60,4.80,1.00,0.00,1.00 --19.20,-4.80,1.00,0.00,1.00 -163.20,4.80,1.00,0.00,1.00 --9.60,-0.00,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 --0.00,-0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 --168.00,-0.00,1.00,0.00,1.00 -14.40,4.80,1.00,0.00,1.00 --158.40,-4.80,1.00,0.00,1.00 -24.00,4.80,1.00,0.00,1.00 --148.80,-4.80,1.00,0.00,1.00 -33.60,4.80,1.00,0.00,1.00 --139.20,-9.60,1.00,0.00,1.00 -43.20,9.60,1.00,0.00,1.00 --129.60,-9.60,1.00,0.00,1.00 -52.80,9.60,1.00,0.00,1.00 --120.00,-9.60,1.00,0.00,1.00 -62.40,9.60,1.00,0.00,1.00 --110.40,-9.60,1.00,0.00,1.00 -72.00,9.60,1.00,0.00,1.00 --100.80,-9.60,1.00,0.00,1.00 -81.60,9.60,1.00,0.00,1.00 --91.20,-9.60,1.00,0.00,1.00 -96.00,9.60,1.00,0.00,1.00 --81.60,-9.60,1.00,0.00,1.00 -105.60,9.60,1.00,0.00,1.00 --72.00,-9.60,1.00,0.00,1.00 -115.20,9.60,1.00,0.00,1.00 --62.40,-9.60,1.00,0.00,1.00 -124.80,9.60,1.00,0.00,1.00 --52.80,-9.60,1.00,0.00,1.00 -134.40,9.60,1.00,0.00,1.00 --43.20,-9.60,1.00,0.00,1.00 -144.00,4.80,1.00,0.00,1.00 --33.60,-4.80,1.00,0.00,1.00 -153.60,4.80,1.00,0.00,1.00 --24.00,-4.80,1.00,0.00,1.00 -163.20,4.80,1.00,0.00,1.00 --14.40,-4.80,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -9.60,0.00,1.00,0.00,1.00 --168.00,-0.00,1.00,0.00,1.00 -19.20,0.00,1.00,0.00,1.00 --158.40,-4.80,1.00,0.00,1.00 -28.80,4.80,1.00,0.00,1.00 --148.80,-4.80,1.00,0.00,1.00 -38.40,4.80,1.00,0.00,1.00 --139.20,-4.80,1.00,0.00,1.00 -48.00,4.80,1.00,0.00,1.00 --129.60,-4.80,1.00,0.00,1.00 -57.60,4.80,1.00,0.00,1.00 --120.00,-4.80,1.00,0.00,1.00 -67.20,4.80,1.00,0.00,1.00 --110.40,-4.80,1.00,0.00,1.00 -76.80,4.80,1.00,0.00,1.00 --100.80,-4.80,1.00,0.00,1.00 -86.40,4.80,1.00,0.00,1.00 --86.40,-4.80,1.00,0.00,1.00 -96.00,4.80,1.00,0.00,1.00 --76.80,-4.80,1.00,0.00,1.00 -105.60,4.80,1.00,0.00,1.00 --67.20,-4.80,1.00,0.00,1.00 -115.20,4.80,1.00,0.00,1.00 --57.60,-4.80,1.00,0.00,1.00 -124.80,4.80,1.00,0.00,1.00 --48.00,-4.80,1.00,0.00,1.00 -134.40,4.80,1.00,0.00,1.00 --38.40,-4.80,1.00,0.00,1.00 -144.00,4.80,1.00,0.00,1.00 --28.80,-4.80,1.00,0.00,1.00 -153.60,4.80,1.00,0.00,1.00 --19.20,-4.80,1.00,0.00,1.00 -163.20,0.00,1.00,0.00,1.00 --9.60,-0.00,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 --0.00,-0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 --168.00,-0.00,1.00,0.00,1.00 -14.40,0.00,1.00,0.00,1.00 --158.40,-4.80,1.00,0.00,1.00 -24.00,4.80,1.00,0.00,1.00 --148.80,-4.80,1.00,0.00,1.00 -33.60,4.80,1.00,0.00,1.00 --139.20,-4.80,1.00,0.00,1.00 -43.20,4.80,1.00,0.00,1.00 --129.60,-4.80,1.00,0.00,1.00 -52.80,4.80,1.00,0.00,1.00 --120.00,-4.80,1.00,0.00,1.00 -62.40,4.80,1.00,0.00,1.00 --110.40,-4.80,1.00,0.00,1.00 -72.00,4.80,1.00,0.00,1.00 --100.80,-4.80,1.00,0.00,1.00 -81.60,4.80,1.00,0.00,1.00 --91.20,-4.80,1.00,0.00,1.00 -96.00,4.80,1.00,0.00,1.00 --81.60,-4.80,1.00,0.00,1.00 -105.60,4.80,1.00,0.00,1.00 --72.00,-4.80,1.00,0.00,1.00 -115.20,4.80,1.00,0.00,1.00 --62.40,-4.80,1.00,0.00,1.00 -124.80,4.80,1.00,0.00,1.00 --52.80,-4.80,1.00,0.00,1.00 -134.40,4.80,1.00,0.00,1.00 --43.20,-4.80,1.00,0.00,1.00 -144.00,4.80,1.00,0.00,1.00 --33.60,-4.80,1.00,0.00,1.00 -153.60,4.80,1.00,0.00,1.00 --24.00,-4.80,1.00,0.00,1.00 -163.20,0.00,1.00,0.00,1.00 --14.40,-0.00,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -9.60,0.00,1.00,0.00,1.00 --168.00,-0.00,1.00,0.00,1.00 -19.20,0.00,1.00,0.00,1.00 --158.40,-0.00,1.00,0.00,1.00 -28.80,0.00,1.00,0.00,1.00 --148.80,-0.00,1.00,0.00,1.00 -38.40,0.00,1.00,0.00,1.00 --139.20,-0.00,1.00,0.00,1.00 -48.00,0.00,1.00,0.00,1.00 --129.60,-0.00,1.00,0.00,1.00 -57.60,0.00,1.00,0.00,1.00 --120.00,-0.00,1.00,0.00,1.00 -67.20,0.00,1.00,0.00,1.00 --110.40,-0.00,1.00,0.00,1.00 -76.80,0.00,1.00,0.00,1.00 --100.80,-0.00,1.00,0.00,1.00 -86.40,0.00,1.00,0.00,1.00 --86.40,-0.00,1.00,0.00,1.00 -96.00,0.00,1.00,0.00,1.00 --76.80,-0.00,1.00,0.00,1.00 -105.60,0.00,1.00,0.00,1.00 --67.20,-0.00,1.00,0.00,1.00 -115.20,0.00,1.00,0.00,1.00 --57.60,-0.00,1.00,0.00,1.00 -124.80,0.00,1.00,0.00,1.00 --48.00,-0.00,1.00,0.00,1.00 -134.40,0.00,1.00,0.00,1.00 --38.40,-0.00,1.00,0.00,1.00 -144.00,0.00,1.00,0.00,1.00 --28.80,-0.00,1.00,0.00,1.00 -153.60,0.00,1.00,0.00,1.00 --19.20,-0.00,1.00,0.00,1.00 -163.20,0.00,1.00,0.00,1.00 --9.60,-0.00,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 --0.00,-0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 --168.00,-0.00,1.00,0.00,1.00 -14.40,0.00,1.00,0.00,1.00 --158.40,-0.00,1.00,0.00,1.00 -24.00,0.00,1.00,0.00,1.00 --148.80,-0.00,1.00,0.00,1.00 -33.60,0.00,1.00,0.00,1.00 --139.20,-0.00,1.00,0.00,1.00 -43.20,0.00,1.00,0.00,1.00 --129.60,-0.00,1.00,0.00,1.00 -52.80,0.00,1.00,0.00,1.00 --120.00,-0.00,1.00,0.00,1.00 -62.40,0.00,1.00,0.00,1.00 --110.40,-0.00,1.00,0.00,1.00 -72.00,0.00,1.00,0.00,1.00 --100.80,-0.00,1.00,0.00,1.00 -81.60,0.00,1.00,0.00,1.00 --91.20,-0.00,1.00,0.00,1.00 -96.00,0.00,1.00,0.00,1.00 --81.60,-0.00,1.00,0.00,1.00 -105.60,0.00,1.00,0.00,1.00 --72.00,-0.00,1.00,0.00,1.00 -115.20,0.00,1.00,0.00,1.00 --62.40,-0.00,1.00,0.00,1.00 -124.80,0.00,1.00,0.00,1.00 --52.80,-0.00,1.00,0.00,1.00 -134.40,0.00,1.00,0.00,1.00 --43.20,-0.00,1.00,0.00,1.00 -144.00,0.00,1.00,0.00,1.00 --33.60,-0.00,1.00,0.00,1.00 -153.60,0.00,1.00,0.00,1.00 --24.00,-0.00,1.00,0.00,1.00 -163.20,0.00,1.00,0.00,1.00 --14.40,-0.00,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -9.60,-0.00,1.00,0.00,1.00 --168.00,0.00,1.00,0.00,1.00 -19.20,-0.00,1.00,0.00,1.00 --158.40,0.00,1.00,0.00,1.00 -28.80,-0.00,1.00,0.00,1.00 --148.80,0.00,1.00,0.00,1.00 -38.40,-0.00,1.00,0.00,1.00 --139.20,0.00,1.00,0.00,1.00 -48.00,-0.00,1.00,0.00,1.00 --129.60,0.00,1.00,0.00,1.00 -57.60,-4.80,1.00,0.00,1.00 --120.00,4.80,1.00,0.00,1.00 -67.20,-4.80,1.00,0.00,1.00 --110.40,4.80,1.00,0.00,1.00 -76.80,-4.80,1.00,0.00,1.00 --100.80,4.80,1.00,0.00,1.00 -86.40,-4.80,1.00,0.00,1.00 --86.40,4.80,1.00,0.00,1.00 -96.00,-4.80,1.00,0.00,1.00 --76.80,4.80,1.00,0.00,1.00 -105.60,-4.80,1.00,0.00,1.00 --67.20,4.80,1.00,0.00,1.00 -115.20,-4.80,1.00,0.00,1.00 --57.60,4.80,1.00,0.00,1.00 -124.80,-4.80,1.00,0.00,1.00 --48.00,0.00,1.00,0.00,1.00 -134.40,-0.00,1.00,0.00,1.00 --38.40,0.00,1.00,0.00,1.00 -144.00,-0.00,1.00,0.00,1.00 --28.80,0.00,1.00,0.00,1.00 -153.60,-0.00,1.00,0.00,1.00 --19.20,0.00,1.00,0.00,1.00 -163.20,-0.00,1.00,0.00,1.00 --9.60,0.00,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 --168.00,0.00,1.00,0.00,1.00 -14.40,-0.00,1.00,0.00,1.00 --158.40,0.00,1.00,0.00,1.00 -24.00,-0.00,1.00,0.00,1.00 --148.80,0.00,1.00,0.00,1.00 -33.60,-0.00,1.00,0.00,1.00 --139.20,0.00,1.00,0.00,1.00 -43.20,-0.00,1.00,0.00,1.00 --129.60,0.00,1.00,0.00,1.00 -52.80,-4.80,1.00,0.00,1.00 --120.00,4.80,1.00,0.00,1.00 -62.40,-4.80,1.00,0.00,1.00 --110.40,4.80,1.00,0.00,1.00 -72.00,-4.80,1.00,0.00,1.00 --100.80,4.80,1.00,0.00,1.00 -81.60,-4.80,1.00,0.00,1.00 --91.20,4.80,1.00,0.00,1.00 -96.00,-4.80,1.00,0.00,1.00 --81.60,4.80,1.00,0.00,1.00 -105.60,-4.80,1.00,0.00,1.00 --72.00,4.80,1.00,0.00,1.00 -115.20,-4.80,1.00,0.00,1.00 --62.40,4.80,1.00,0.00,1.00 -124.80,-4.80,1.00,0.00,1.00 --52.80,0.00,1.00,0.00,1.00 -134.40,-0.00,1.00,0.00,1.00 --43.20,0.00,1.00,0.00,1.00 -144.00,-0.00,1.00,0.00,1.00 --33.60,0.00,1.00,0.00,1.00 -153.60,-0.00,1.00,0.00,1.00 --24.00,0.00,1.00,0.00,1.00 -163.20,-0.00,1.00,0.00,1.00 --14.40,0.00,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -9.60,-0.00,1.00,0.00,1.00 --168.00,0.00,1.00,0.00,1.00 -19.20,-4.80,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 -28.80,-4.80,1.00,0.00,1.00 --148.80,4.80,1.00,0.00,1.00 -38.40,-4.80,1.00,0.00,1.00 --139.20,4.80,1.00,0.00,1.00 -48.00,-4.80,1.00,0.00,1.00 --129.60,4.80,1.00,0.00,1.00 -57.60,-4.80,1.00,0.00,1.00 --120.00,4.80,1.00,0.00,1.00 -67.20,-4.80,1.00,0.00,1.00 --110.40,9.60,1.00,0.00,1.00 -76.80,-9.60,1.00,0.00,1.00 --100.80,9.60,1.00,0.00,1.00 -86.40,-9.60,1.00,0.00,1.00 --86.40,9.60,1.00,0.00,1.00 -96.00,-9.60,1.00,0.00,1.00 --76.80,9.60,1.00,0.00,1.00 -105.60,-9.60,1.00,0.00,1.00 --67.20,9.60,1.00,0.00,1.00 -115.20,-4.80,1.00,0.00,1.00 --57.60,4.80,1.00,0.00,1.00 -124.80,-4.80,1.00,0.00,1.00 --48.00,4.80,1.00,0.00,1.00 -134.40,-4.80,1.00,0.00,1.00 --38.40,4.80,1.00,0.00,1.00 -144.00,-4.80,1.00,0.00,1.00 --28.80,4.80,1.00,0.00,1.00 -153.60,-4.80,1.00,0.00,1.00 --19.20,4.80,1.00,0.00,1.00 -163.20,-0.00,1.00,0.00,1.00 --9.60,0.00,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 --168.00,0.00,1.00,0.00,1.00 -14.40,-0.00,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 -24.00,-4.80,1.00,0.00,1.00 --148.80,4.80,1.00,0.00,1.00 -33.60,-4.80,1.00,0.00,1.00 --139.20,4.80,1.00,0.00,1.00 -43.20,-4.80,1.00,0.00,1.00 --129.60,4.80,1.00,0.00,1.00 -52.80,-4.80,1.00,0.00,1.00 --120.00,4.80,1.00,0.00,1.00 -62.40,-4.80,1.00,0.00,1.00 --110.40,9.60,1.00,0.00,1.00 -72.00,-9.60,1.00,0.00,1.00 --100.80,9.60,1.00,0.00,1.00 -81.60,-9.60,1.00,0.00,1.00 --91.20,9.60,1.00,0.00,1.00 -96.00,-9.60,1.00,0.00,1.00 --81.60,9.60,1.00,0.00,1.00 -105.60,-9.60,1.00,0.00,1.00 --72.00,9.60,1.00,0.00,1.00 -115.20,-4.80,1.00,0.00,1.00 --62.40,4.80,1.00,0.00,1.00 -124.80,-4.80,1.00,0.00,1.00 --52.80,4.80,1.00,0.00,1.00 -134.40,-4.80,1.00,0.00,1.00 --43.20,4.80,1.00,0.00,1.00 -144.00,-4.80,1.00,0.00,1.00 --33.60,4.80,1.00,0.00,1.00 -153.60,-4.80,1.00,0.00,1.00 --24.00,4.80,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 --14.40,0.00,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -9.60,-0.00,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 -19.20,-4.80,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 -28.80,-4.80,1.00,0.00,1.00 --148.80,4.80,1.00,0.00,1.00 -38.40,-9.60,1.00,0.00,1.00 --139.20,9.60,1.00,0.00,1.00 -48.00,-9.60,1.00,0.00,1.00 --129.60,9.60,1.00,0.00,1.00 -57.60,-9.60,1.00,0.00,1.00 --120.00,9.60,1.00,0.00,1.00 -67.20,-9.60,1.00,0.00,1.00 --110.40,9.60,1.00,0.00,1.00 -76.80,-14.40,1.00,0.00,1.00 --100.80,14.40,1.00,0.00,1.00 -86.40,-14.40,1.00,0.00,1.00 --86.40,14.40,1.00,0.00,1.00 -96.00,-14.40,1.00,0.00,1.00 --76.80,14.40,1.00,0.00,1.00 -105.60,-14.40,1.00,0.00,1.00 --67.20,9.60,1.00,0.00,1.00 -115.20,-9.60,1.00,0.00,1.00 --57.60,9.60,1.00,0.00,1.00 -124.80,-9.60,1.00,0.00,1.00 --48.00,9.60,1.00,0.00,1.00 -134.40,-9.60,1.00,0.00,1.00 --38.40,9.60,1.00,0.00,1.00 -144.00,-9.60,1.00,0.00,1.00 --28.80,4.80,1.00,0.00,1.00 -153.60,-4.80,1.00,0.00,1.00 --19.20,4.80,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 -14.40,-4.80,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 -24.00,-4.80,1.00,0.00,1.00 --148.80,4.80,1.00,0.00,1.00 -33.60,-9.60,1.00,0.00,1.00 --139.20,9.60,1.00,0.00,1.00 -43.20,-9.60,1.00,0.00,1.00 --129.60,9.60,1.00,0.00,1.00 -52.80,-9.60,1.00,0.00,1.00 --120.00,9.60,1.00,0.00,1.00 -62.40,-9.60,1.00,0.00,1.00 --110.40,9.60,1.00,0.00,1.00 -72.00,-14.40,1.00,0.00,1.00 --100.80,14.40,1.00,0.00,1.00 -81.60,-14.40,1.00,0.00,1.00 --91.20,14.40,1.00,0.00,1.00 -96.00,-14.40,1.00,0.00,1.00 --81.60,14.40,1.00,0.00,1.00 -105.60,-14.40,1.00,0.00,1.00 --72.00,9.60,1.00,0.00,1.00 -115.20,-9.60,1.00,0.00,1.00 --62.40,9.60,1.00,0.00,1.00 -124.80,-9.60,1.00,0.00,1.00 --52.80,9.60,1.00,0.00,1.00 -134.40,-9.60,1.00,0.00,1.00 --43.20,9.60,1.00,0.00,1.00 -144.00,-9.60,1.00,0.00,1.00 --33.60,4.80,1.00,0.00,1.00 -153.60,-4.80,1.00,0.00,1.00 --24.00,4.80,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 -19.20,-4.80,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 -28.80,-9.60,1.00,0.00,1.00 --148.80,9.60,1.00,0.00,1.00 -38.40,-9.60,1.00,0.00,1.00 --139.20,9.60,1.00,0.00,1.00 -48.00,-14.40,1.00,0.00,1.00 --129.60,14.40,1.00,0.00,1.00 -57.60,-14.40,1.00,0.00,1.00 --120.00,14.40,1.00,0.00,1.00 -67.20,-14.40,1.00,0.00,1.00 --110.40,14.40,1.00,0.00,1.00 -76.80,-19.20,1.00,0.00,1.00 --100.80,19.20,1.00,0.00,1.00 -86.40,-19.20,1.00,0.00,1.00 --86.40,19.20,1.00,0.00,1.00 -96.00,-19.20,1.00,0.00,1.00 --76.80,19.20,1.00,0.00,1.00 -105.60,-14.40,1.00,0.00,1.00 --67.20,14.40,1.00,0.00,1.00 -115.20,-14.40,1.00,0.00,1.00 --57.60,14.40,1.00,0.00,1.00 -124.80,-14.40,1.00,0.00,1.00 --48.00,14.40,1.00,0.00,1.00 -134.40,-14.40,1.00,0.00,1.00 --38.40,9.60,1.00,0.00,1.00 -144.00,-9.60,1.00,0.00,1.00 --28.80,9.60,1.00,0.00,1.00 -153.60,-9.60,1.00,0.00,1.00 --19.20,4.80,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 -14.40,-4.80,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 -24.00,-9.60,1.00,0.00,1.00 --148.80,9.60,1.00,0.00,1.00 -33.60,-9.60,1.00,0.00,1.00 --139.20,9.60,1.00,0.00,1.00 -43.20,-14.40,1.00,0.00,1.00 --129.60,14.40,1.00,0.00,1.00 -52.80,-14.40,1.00,0.00,1.00 --120.00,14.40,1.00,0.00,1.00 -62.40,-14.40,1.00,0.00,1.00 --110.40,14.40,1.00,0.00,1.00 -72.00,-14.40,1.00,0.00,1.00 --100.80,19.20,1.00,0.00,1.00 -81.60,-19.20,1.00,0.00,1.00 --91.20,19.20,1.00,0.00,1.00 -96.00,-19.20,1.00,0.00,1.00 --81.60,19.20,1.00,0.00,1.00 -105.60,-19.20,1.00,0.00,1.00 --72.00,14.40,1.00,0.00,1.00 -115.20,-14.40,1.00,0.00,1.00 --62.40,14.40,1.00,0.00,1.00 -124.80,-14.40,1.00,0.00,1.00 --52.80,14.40,1.00,0.00,1.00 -134.40,-14.40,1.00,0.00,1.00 --43.20,9.60,1.00,0.00,1.00 -144.00,-9.60,1.00,0.00,1.00 --33.60,9.60,1.00,0.00,1.00 -153.60,-9.60,1.00,0.00,1.00 --24.00,4.80,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 -19.20,-4.80,1.00,0.00,1.00 --158.40,9.60,1.00,0.00,1.00 -28.80,-9.60,1.00,0.00,1.00 --148.80,14.40,1.00,0.00,1.00 -38.40,-14.40,1.00,0.00,1.00 --139.20,14.40,1.00,0.00,1.00 -48.00,-14.40,1.00,0.00,1.00 --129.60,19.20,1.00,0.00,1.00 -57.60,-19.20,1.00,0.00,1.00 --120.00,19.20,1.00,0.00,1.00 -67.20,-19.20,1.00,0.00,1.00 --110.40,19.20,1.00,0.00,1.00 -76.80,-19.20,1.00,0.00,1.00 --100.80,24.00,1.00,0.00,1.00 -86.40,-24.00,1.00,0.00,1.00 --86.40,24.00,1.00,0.00,1.00 -96.00,-24.00,1.00,0.00,1.00 --76.80,24.00,1.00,0.00,1.00 -105.60,-19.20,1.00,0.00,1.00 --67.20,19.20,1.00,0.00,1.00 -115.20,-19.20,1.00,0.00,1.00 --57.60,19.20,1.00,0.00,1.00 -124.80,-19.20,1.00,0.00,1.00 --48.00,19.20,1.00,0.00,1.00 -134.40,-14.40,1.00,0.00,1.00 --38.40,14.40,1.00,0.00,1.00 -144.00,-14.40,1.00,0.00,1.00 --28.80,9.60,1.00,0.00,1.00 -153.60,-9.60,1.00,0.00,1.00 --19.20,9.60,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 -14.40,-4.80,1.00,0.00,1.00 --158.40,9.60,1.00,0.00,1.00 -24.00,-9.60,1.00,0.00,1.00 --148.80,9.60,1.00,0.00,1.00 -33.60,-14.40,1.00,0.00,1.00 --139.20,14.40,1.00,0.00,1.00 -43.20,-14.40,1.00,0.00,1.00 --129.60,19.20,1.00,0.00,1.00 -52.80,-19.20,1.00,0.00,1.00 --120.00,19.20,1.00,0.00,1.00 -62.40,-19.20,1.00,0.00,1.00 --110.40,19.20,1.00,0.00,1.00 -72.00,-19.20,1.00,0.00,1.00 --100.80,24.00,1.00,0.00,1.00 -81.60,-24.00,1.00,0.00,1.00 --91.20,24.00,1.00,0.00,1.00 -96.00,-24.00,1.00,0.00,1.00 --81.60,24.00,1.00,0.00,1.00 -105.60,-19.20,1.00,0.00,1.00 --72.00,19.20,1.00,0.00,1.00 -115.20,-19.20,1.00,0.00,1.00 --62.40,19.20,1.00,0.00,1.00 -124.80,-19.20,1.00,0.00,1.00 --52.80,19.20,1.00,0.00,1.00 -134.40,-14.40,1.00,0.00,1.00 --43.20,14.40,1.00,0.00,1.00 -144.00,-14.40,1.00,0.00,1.00 --33.60,14.40,1.00,0.00,1.00 -153.60,-9.60,1.00,0.00,1.00 --24.00,9.60,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 -19.20,-9.60,1.00,0.00,1.00 --158.40,9.60,1.00,0.00,1.00 -24.00,-14.40,1.00,0.00,1.00 --148.80,14.40,1.00,0.00,1.00 -33.60,-14.40,1.00,0.00,1.00 --139.20,19.20,1.00,0.00,1.00 -43.20,-19.20,1.00,0.00,1.00 --129.60,19.20,1.00,0.00,1.00 -52.80,-24.00,1.00,0.00,1.00 --120.00,24.00,1.00,0.00,1.00 -62.40,-24.00,1.00,0.00,1.00 --110.40,24.00,1.00,0.00,1.00 -76.80,-24.00,1.00,0.00,1.00 --100.80,28.80,1.00,0.00,1.00 -86.40,-28.80,1.00,0.00,1.00 --86.40,28.80,1.00,0.00,1.00 -96.00,-28.80,1.00,0.00,1.00 --76.80,28.80,1.00,0.00,1.00 -105.60,-24.00,1.00,0.00,1.00 --67.20,24.00,1.00,0.00,1.00 -120.00,-24.00,1.00,0.00,1.00 --57.60,24.00,1.00,0.00,1.00 -129.60,-24.00,1.00,0.00,1.00 --48.00,19.20,1.00,0.00,1.00 -139.20,-19.20,1.00,0.00,1.00 --38.40,19.20,1.00,0.00,1.00 -148.80,-14.40,1.00,0.00,1.00 --28.80,14.40,1.00,0.00,1.00 -158.40,-9.60,1.00,0.00,1.00 --19.20,9.60,1.00,0.00,1.00 -163.20,-9.60,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 --158.40,9.60,1.00,0.00,1.00 -24.00,-9.60,1.00,0.00,1.00 --153.60,14.40,1.00,0.00,1.00 -33.60,-14.40,1.00,0.00,1.00 --144.00,19.20,1.00,0.00,1.00 -43.20,-19.20,1.00,0.00,1.00 --134.40,19.20,1.00,0.00,1.00 -52.80,-24.00,1.00,0.00,1.00 --124.80,24.00,1.00,0.00,1.00 -62.40,-24.00,1.00,0.00,1.00 --110.40,24.00,1.00,0.00,1.00 -72.00,-24.00,1.00,0.00,1.00 --100.80,28.80,1.00,0.00,1.00 -81.60,-28.80,1.00,0.00,1.00 --91.20,28.80,1.00,0.00,1.00 -96.00,-28.80,1.00,0.00,1.00 --81.60,28.80,1.00,0.00,1.00 -105.60,-24.00,1.00,0.00,1.00 --72.00,24.00,1.00,0.00,1.00 -115.20,-24.00,1.00,0.00,1.00 --57.60,24.00,1.00,0.00,1.00 -124.80,-24.00,1.00,0.00,1.00 --48.00,19.20,1.00,0.00,1.00 -134.40,-19.20,1.00,0.00,1.00 --38.40,19.20,1.00,0.00,1.00 -144.00,-14.40,1.00,0.00,1.00 --28.80,14.40,1.00,0.00,1.00 -153.60,-14.40,1.00,0.00,1.00 --24.00,9.60,1.00,0.00,1.00 -163.20,-9.60,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 --168.00,9.60,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 --158.40,14.40,1.00,0.00,1.00 -24.00,-14.40,1.00,0.00,1.00 --148.80,19.20,1.00,0.00,1.00 -33.60,-19.20,1.00,0.00,1.00 --139.20,19.20,1.00,0.00,1.00 -43.20,-24.00,1.00,0.00,1.00 --129.60,24.00,1.00,0.00,1.00 -52.80,-28.80,1.00,0.00,1.00 --120.00,28.80,1.00,0.00,1.00 -62.40,-28.80,1.00,0.00,1.00 --110.40,28.80,1.00,0.00,1.00 -76.80,-28.80,1.00,0.00,1.00 --100.80,33.60,1.00,0.00,1.00 -86.40,-33.60,1.00,0.00,1.00 --86.40,33.60,1.00,0.00,1.00 -96.00,-33.60,1.00,0.00,1.00 --76.80,28.80,1.00,0.00,1.00 -110.40,-28.80,1.00,0.00,1.00 --67.20,28.80,1.00,0.00,1.00 -120.00,-28.80,1.00,0.00,1.00 --57.60,28.80,1.00,0.00,1.00 -129.60,-24.00,1.00,0.00,1.00 --48.00,24.00,1.00,0.00,1.00 -139.20,-24.00,1.00,0.00,1.00 --38.40,19.20,1.00,0.00,1.00 -148.80,-19.20,1.00,0.00,1.00 --28.80,14.40,1.00,0.00,1.00 -158.40,-14.40,1.00,0.00,1.00 --19.20,9.60,1.00,0.00,1.00 -168.00,-9.60,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 --163.20,9.60,1.00,0.00,1.00 -24.00,-14.40,1.00,0.00,1.00 --153.60,14.40,1.00,0.00,1.00 -33.60,-19.20,1.00,0.00,1.00 --144.00,19.20,1.00,0.00,1.00 -43.20,-24.00,1.00,0.00,1.00 --134.40,24.00,1.00,0.00,1.00 -52.80,-24.00,1.00,0.00,1.00 --124.80,28.80,1.00,0.00,1.00 -62.40,-28.80,1.00,0.00,1.00 --115.20,28.80,1.00,0.00,1.00 -72.00,-28.80,1.00,0.00,1.00 --100.80,28.80,1.00,0.00,1.00 -81.60,-33.60,1.00,0.00,1.00 --91.20,33.60,1.00,0.00,1.00 -96.00,-33.60,1.00,0.00,1.00 --81.60,33.60,1.00,0.00,1.00 -105.60,-28.80,1.00,0.00,1.00 --67.20,28.80,1.00,0.00,1.00 -115.20,-28.80,1.00,0.00,1.00 --57.60,28.80,1.00,0.00,1.00 -124.80,-28.80,1.00,0.00,1.00 --48.00,24.00,1.00,0.00,1.00 -134.40,-24.00,1.00,0.00,1.00 --38.40,19.20,1.00,0.00,1.00 -144.00,-19.20,1.00,0.00,1.00 --28.80,19.20,1.00,0.00,1.00 -153.60,-14.40,1.00,0.00,1.00 --19.20,14.40,1.00,0.00,1.00 -163.20,-9.60,1.00,0.00,1.00 --14.40,9.60,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 --168.00,9.60,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 --158.40,14.40,1.00,0.00,1.00 -24.00,-14.40,1.00,0.00,1.00 --153.60,19.20,1.00,0.00,1.00 -33.60,-24.00,1.00,0.00,1.00 --144.00,24.00,1.00,0.00,1.00 -43.20,-24.00,1.00,0.00,1.00 --134.40,28.80,1.00,0.00,1.00 -52.80,-28.80,1.00,0.00,1.00 --124.80,33.60,1.00,0.00,1.00 -62.40,-33.60,1.00,0.00,1.00 --110.40,33.60,1.00,0.00,1.00 -72.00,-33.60,1.00,0.00,1.00 --100.80,38.40,1.00,0.00,1.00 -86.40,-38.40,1.00,0.00,1.00 --86.40,38.40,1.00,0.00,1.00 -96.00,-38.40,1.00,0.00,1.00 --76.80,33.60,1.00,0.00,1.00 -110.40,-33.60,1.00,0.00,1.00 --67.20,33.60,1.00,0.00,1.00 -120.00,-33.60,1.00,0.00,1.00 --52.80,28.80,1.00,0.00,1.00 -129.60,-28.80,1.00,0.00,1.00 --43.20,28.80,1.00,0.00,1.00 -139.20,-24.00,1.00,0.00,1.00 --33.60,24.00,1.00,0.00,1.00 -148.80,-19.20,1.00,0.00,1.00 --24.00,19.20,1.00,0.00,1.00 -158.40,-14.40,1.00,0.00,1.00 --19.20,14.40,1.00,0.00,1.00 -168.00,-9.60,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 --163.20,14.40,1.00,0.00,1.00 -24.00,-14.40,1.00,0.00,1.00 --153.60,19.20,1.00,0.00,1.00 -28.80,-19.20,1.00,0.00,1.00 --144.00,24.00,1.00,0.00,1.00 -38.40,-24.00,1.00,0.00,1.00 --134.40,28.80,1.00,0.00,1.00 -48.00,-28.80,1.00,0.00,1.00 --124.80,28.80,1.00,0.00,1.00 -57.60,-33.60,1.00,0.00,1.00 --115.20,33.60,1.00,0.00,1.00 -72.00,-33.60,1.00,0.00,1.00 --105.60,33.60,1.00,0.00,1.00 -81.60,-38.40,1.00,0.00,1.00 --91.20,38.40,1.00,0.00,1.00 -96.00,-38.40,1.00,0.00,1.00 --81.60,38.40,1.00,0.00,1.00 -105.60,-33.60,1.00,0.00,1.00 --67.20,33.60,1.00,0.00,1.00 -120.00,-33.60,1.00,0.00,1.00 --57.60,33.60,1.00,0.00,1.00 -129.60,-28.80,1.00,0.00,1.00 --48.00,28.80,1.00,0.00,1.00 -139.20,-24.00,1.00,0.00,1.00 --38.40,24.00,1.00,0.00,1.00 -148.80,-24.00,1.00,0.00,1.00 --28.80,19.20,1.00,0.00,1.00 -158.40,-14.40,1.00,0.00,1.00 --19.20,14.40,1.00,0.00,1.00 -163.20,-9.60,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 --168.00,9.60,1.00,0.00,1.00 -14.40,-14.40,1.00,0.00,1.00 --163.20,14.40,1.00,0.00,1.00 -24.00,-19.20,1.00,0.00,1.00 --153.60,19.20,1.00,0.00,1.00 -28.80,-24.00,1.00,0.00,1.00 --144.00,28.80,1.00,0.00,1.00 -38.40,-28.80,1.00,0.00,1.00 --134.40,33.60,1.00,0.00,1.00 -48.00,-33.60,1.00,0.00,1.00 --124.80,33.60,1.00,0.00,1.00 -62.40,-38.40,1.00,0.00,1.00 --115.20,38.40,1.00,0.00,1.00 -72.00,-38.40,1.00,0.00,1.00 --100.80,43.20,1.00,0.00,1.00 -86.40,-43.20,1.00,0.00,1.00 --86.40,43.20,1.00,0.00,1.00 -96.00,-43.20,1.00,0.00,1.00 --76.80,38.40,1.00,0.00,1.00 -110.40,-38.40,1.00,0.00,1.00 --62.40,38.40,1.00,0.00,1.00 -120.00,-38.40,1.00,0.00,1.00 --52.80,33.60,1.00,0.00,1.00 -134.40,-33.60,1.00,0.00,1.00 --43.20,28.80,1.00,0.00,1.00 -144.00,-28.80,1.00,0.00,1.00 --33.60,24.00,1.00,0.00,1.00 -153.60,-24.00,1.00,0.00,1.00 --24.00,19.20,1.00,0.00,1.00 -158.40,-19.20,1.00,0.00,1.00 --14.40,14.40,1.00,0.00,1.00 -168.00,-9.60,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 --163.20,14.40,1.00,0.00,1.00 -19.20,-19.20,1.00,0.00,1.00 --153.60,19.20,1.00,0.00,1.00 -28.80,-24.00,1.00,0.00,1.00 --148.80,24.00,1.00,0.00,1.00 -38.40,-28.80,1.00,0.00,1.00 --139.20,28.80,1.00,0.00,1.00 -48.00,-33.60,1.00,0.00,1.00 --129.60,33.60,1.00,0.00,1.00 -57.60,-38.40,1.00,0.00,1.00 --115.20,38.40,1.00,0.00,1.00 -67.20,-38.40,1.00,0.00,1.00 --105.60,38.40,1.00,0.00,1.00 -81.60,-43.20,1.00,0.00,1.00 --91.20,43.20,1.00,0.00,1.00 -96.00,-43.20,1.00,0.00,1.00 --76.80,43.20,1.00,0.00,1.00 -105.60,-38.40,1.00,0.00,1.00 --67.20,38.40,1.00,0.00,1.00 -120.00,-38.40,1.00,0.00,1.00 --52.80,33.60,1.00,0.00,1.00 -129.60,-33.60,1.00,0.00,1.00 --43.20,33.60,1.00,0.00,1.00 -139.20,-28.80,1.00,0.00,1.00 --33.60,28.80,1.00,0.00,1.00 -148.80,-24.00,1.00,0.00,1.00 --28.80,19.20,1.00,0.00,1.00 -158.40,-19.20,1.00,0.00,1.00 --19.20,14.40,1.00,0.00,1.00 -163.20,-14.40,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 --168.00,9.60,1.00,0.00,1.00 -14.40,-14.40,1.00,0.00,1.00 --163.20,19.20,1.00,0.00,1.00 -19.20,-19.20,1.00,0.00,1.00 --153.60,24.00,1.00,0.00,1.00 -28.80,-28.80,1.00,0.00,1.00 --148.80,28.80,1.00,0.00,1.00 -38.40,-33.60,1.00,0.00,1.00 --139.20,33.60,1.00,0.00,1.00 -48.00,-38.40,1.00,0.00,1.00 --124.80,38.40,1.00,0.00,1.00 -57.60,-43.20,1.00,0.00,1.00 --115.20,43.20,1.00,0.00,1.00 -72.00,-43.20,1.00,0.00,1.00 --100.80,43.20,1.00,0.00,1.00 -86.40,-48.00,1.00,0.00,1.00 --86.40,48.00,1.00,0.00,1.00 -100.80,-48.00,1.00,0.00,1.00 --76.80,43.20,1.00,0.00,1.00 -110.40,-43.20,1.00,0.00,1.00 --62.40,43.20,1.00,0.00,1.00 -124.80,-38.40,1.00,0.00,1.00 --48.00,38.40,1.00,0.00,1.00 -134.40,-38.40,1.00,0.00,1.00 --38.40,33.60,1.00,0.00,1.00 -144.00,-28.80,1.00,0.00,1.00 --28.80,28.80,1.00,0.00,1.00 -153.60,-24.00,1.00,0.00,1.00 --24.00,24.00,1.00,0.00,1.00 -163.20,-19.20,1.00,0.00,1.00 --14.40,14.40,1.00,0.00,1.00 -168.00,-14.40,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 -9.60,-14.40,1.00,0.00,1.00 --163.20,14.40,1.00,0.00,1.00 -19.20,-19.20,1.00,0.00,1.00 --158.40,24.00,1.00,0.00,1.00 -28.80,-24.00,1.00,0.00,1.00 --148.80,28.80,1.00,0.00,1.00 -33.60,-28.80,1.00,0.00,1.00 --139.20,33.60,1.00,0.00,1.00 -43.20,-38.40,1.00,0.00,1.00 --129.60,38.40,1.00,0.00,1.00 -57.60,-38.40,1.00,0.00,1.00 --120.00,43.20,1.00,0.00,1.00 -67.20,-43.20,1.00,0.00,1.00 --105.60,43.20,1.00,0.00,1.00 -81.60,-48.00,1.00,0.00,1.00 --91.20,48.00,1.00,0.00,1.00 -96.00,-48.00,1.00,0.00,1.00 --76.80,43.20,1.00,0.00,1.00 -110.40,-43.20,1.00,0.00,1.00 --67.20,43.20,1.00,0.00,1.00 -120.00,-43.20,1.00,0.00,1.00 --52.80,38.40,1.00,0.00,1.00 -134.40,-38.40,1.00,0.00,1.00 --43.20,33.60,1.00,0.00,1.00 -144.00,-33.60,1.00,0.00,1.00 --33.60,28.80,1.00,0.00,1.00 -153.60,-28.80,1.00,0.00,1.00 --24.00,24.00,1.00,0.00,1.00 -158.40,-19.20,1.00,0.00,1.00 --19.20,19.20,1.00,0.00,1.00 -168.00,-14.40,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 +0.00,0.00,0.00,0.00,1.00,-0.00,0.00 +-177.60,-4.80,16.00,0.00,1.00,-0.00,0.00 +4.80,4.80,0.02,0.00,1.00,-0.00,0.00 +-168.00,-9.60,15.98,0.00,1.00,-0.00,0.00 +14.40,14.40,0.04,0.00,1.00,-0.00,0.00 +-163.20,-14.40,15.96,0.00,1.00,-0.00,0.00 +19.20,19.20,0.06,0.00,1.00,-0.00,0.00 +-153.60,-24.00,15.94,0.00,1.00,-0.00,0.00 +28.80,24.00,0.09,0.00,1.00,-0.00,0.00 +-148.80,-28.80,15.91,0.00,1.00,-0.00,0.00 +38.40,33.60,0.11,0.00,1.00,-0.00,0.00 +-139.20,-33.60,15.89,0.00,1.00,-0.00,0.00 +48.00,38.40,0.13,0.00,1.00,-0.00,0.00 +-124.80,-38.40,15.87,0.00,1.00,-0.00,0.00 +57.60,38.40,0.15,0.00,1.00,-0.00,0.00 +-115.20,-43.20,15.85,0.00,1.00,-0.00,0.00 +72.00,43.20,0.17,0.00,1.00,-0.00,0.00 +-100.80,-43.20,15.83,0.00,1.00,-0.00,0.00 +86.40,43.20,0.19,0.00,1.00,-0.00,0.00 +-86.40,-43.20,15.81,0.00,1.00,-177.60,0.00 +100.80,43.20,0.21,0.00,1.00,-177.60,0.00 +-76.80,-43.20,15.79,0.00,1.00,-177.60,0.00 +110.40,43.20,0.23,0.00,1.00,-177.60,0.00 +-62.40,-43.20,15.77,0.00,1.00,-177.60,0.00 +124.80,38.40,0.26,0.00,1.00,-177.60,0.00 +-52.80,-38.40,15.74,0.00,1.00,177.60,0.00 +134.40,33.60,0.28,0.00,1.00,177.60,0.00 +-38.40,-33.60,15.72,0.00,1.00,177.60,0.00 +144.00,28.80,0.30,0.00,1.00,177.60,0.00 +-33.60,-28.80,15.70,0.00,1.00,177.60,0.00 +153.60,24.00,0.32,0.00,1.00,177.60,0.00 +-24.00,-19.20,15.68,0.00,1.00,177.60,0.00 +158.40,19.20,0.34,0.00,1.00,177.60,0.00 +-14.40,-14.40,15.66,0.00,1.00,177.60,0.00 +168.00,9.60,0.36,0.00,1.00,177.60,0.00 +-9.60,-9.60,15.64,0.00,1.00,177.60,0.00 +172.80,4.80,0.38,0.00,1.00,177.60,0.00 +-0.00,-0.00,15.62,0.00,1.00,177.60,0.00 +-177.60,-0.00,0.41,0.00,1.00,-177.60,0.00 +4.80,4.80,15.59,0.00,1.00,-177.60,0.00 +-172.80,-9.60,0.43,0.00,1.00,-177.60,0.00 +14.40,9.60,15.57,0.00,1.00,-177.60,0.00 +-163.20,-14.40,0.45,0.00,1.00,-177.60,0.00 +19.20,19.20,15.55,0.00,1.00,-177.60,0.00 +-158.40,-19.20,0.47,0.00,1.00,-177.60,0.00 +28.80,24.00,15.53,0.00,1.00,-177.60,0.00 +-148.80,-28.80,0.49,0.00,1.00,-177.60,0.00 +33.60,28.80,15.51,0.00,1.00,-177.60,0.00 +-139.20,-33.60,0.51,0.00,1.00,-177.60,0.00 +43.20,33.60,15.49,0.00,1.00,-177.60,0.00 +-129.60,-38.40,0.53,0.00,1.00,-177.60,0.00 +57.60,38.40,15.47,0.00,1.00,177.60,0.00 +-120.00,-43.20,0.56,0.00,1.00,177.60,0.00 +67.20,43.20,15.44,0.00,1.00,177.60,0.00 +-105.60,-43.20,0.58,0.00,1.00,177.60,0.00 +81.60,43.20,15.42,0.00,1.00,177.60,0.00 +-91.20,-43.20,0.60,0.00,1.00,177.60,0.00 +96.00,43.20,15.40,0.00,1.00,0.00,0.00 +-76.80,-43.20,0.62,0.00,1.00,0.00,0.00 +110.40,43.20,15.38,0.00,1.00,0.00,0.00 +-67.20,-43.20,0.64,0.00,1.00,0.00,0.00 +120.00,38.40,15.36,0.00,1.00,0.00,0.00 +-52.80,-38.40,0.66,0.00,1.00,0.00,0.00 +129.60,38.40,15.34,0.00,1.00,0.00,0.00 +-43.20,-33.60,0.68,0.00,1.00,0.00,0.00 +144.00,33.60,15.32,0.00,1.00,0.00,0.00 +-33.60,-28.80,0.70,0.00,1.00,0.00,0.00 +148.80,24.00,15.30,0.00,1.00,0.00,0.00 +-24.00,-24.00,0.73,0.00,1.00,0.00,0.00 +158.40,19.20,15.27,0.00,1.00,0.00,0.00 +-19.20,-14.40,0.75,0.00,1.00,0.00,0.00 +168.00,14.40,15.25,0.00,1.00,0.00,0.00 +-9.60,-9.60,0.77,0.00,1.00,0.00,0.00 +172.80,4.80,15.23,0.00,1.00,0.00,0.00 +-4.80,-4.80,0.79,0.00,1.00,0.00,0.00 +0.00,0.00,15.21,0.00,1.00,0.00,0.00 +-177.60,-4.80,0.81,0.00,1.00,0.00,-0.00 +9.60,4.80,15.19,0.00,1.00,0.00,-0.00 +-168.00,-9.60,0.83,0.00,1.00,0.00,-0.00 +14.40,14.40,15.17,0.00,1.00,0.00,-0.00 +-163.20,-14.40,0.85,0.00,1.00,0.00,-0.00 +24.00,19.20,15.15,0.00,1.00,4.80,-0.00 +-153.60,-19.20,0.88,0.00,1.00,4.80,-4.80 +28.80,24.00,15.12,0.00,1.00,4.80,-4.80 +-144.00,-24.00,0.90,0.00,1.00,4.80,-4.80 +38.40,28.80,15.10,0.00,1.00,4.80,-4.80 +-134.40,-28.80,0.92,0.00,1.00,4.80,-4.80 +48.00,33.60,15.08,0.00,1.00,9.60,-4.80 +-124.80,-33.60,0.94,0.00,1.00,9.60,-4.80 +62.40,38.40,15.06,0.00,1.00,9.60,-4.80 +-115.20,-38.40,0.96,0.00,1.00,14.40,-4.80 +72.00,38.40,15.04,0.00,1.00,19.20,-4.80 +-100.80,-38.40,0.98,0.00,1.00,28.80,-4.80 +86.40,38.40,15.02,0.00,1.00,52.80,-4.80 +-86.40,-38.40,1.00,0.00,1.00,105.60,-4.80 +96.00,38.40,15.00,0.00,1.00,139.20,-4.80 +-76.80,-38.40,1.03,0.00,1.00,158.40,-4.80 +110.40,38.40,14.97,0.00,1.00,163.20,-4.80 +-62.40,-38.40,1.05,0.00,1.00,168.00,-4.80 +120.00,33.60,14.95,0.00,1.00,168.00,-4.80 +-52.80,-33.60,1.07,0.00,1.00,172.80,-4.80 +134.40,33.60,14.93,0.00,1.00,172.80,-4.80 +-43.20,-28.80,1.09,0.00,1.00,172.80,-4.80 +144.00,28.80,14.91,0.00,1.00,172.80,-4.80 +-33.60,-24.00,1.11,0.00,1.00,177.60,-4.80 +148.80,24.00,14.89,0.00,1.00,177.60,-4.80 +-24.00,-19.20,1.13,0.00,1.00,177.60,-4.80 +158.40,14.40,14.87,0.00,1.00,177.60,-0.00 +-19.20,-14.40,1.15,0.00,1.00,177.60,-0.00 +168.00,9.60,14.85,0.00,1.00,177.60,-0.00 +-9.60,-9.60,1.17,0.00,1.00,177.60,-0.00 +172.80,4.80,14.83,0.00,1.00,177.60,-0.00 +-0.00,-0.00,1.20,0.00,1.00,177.60,-0.00 +-177.60,-0.00,14.80,0.00,1.00,-177.60,0.00 +4.80,4.80,1.22,0.00,1.00,-177.60,0.00 +-172.80,-9.60,14.78,0.00,1.00,-177.60,0.00 +14.40,9.60,1.24,0.00,1.00,-177.60,0.00 +-163.20,-14.40,14.76,0.00,1.00,-177.60,0.00 +19.20,14.40,1.26,0.00,1.00,-177.60,0.00 +-153.60,-19.20,14.74,0.00,1.00,-177.60,4.80 +28.80,24.00,1.28,0.00,1.00,-177.60,4.80 +-148.80,-24.00,14.72,0.00,1.00,-177.60,4.80 +38.40,28.80,1.30,0.00,1.00,-172.80,4.80 +-139.20,-28.80,14.70,0.00,1.00,-172.80,4.80 +48.00,33.60,1.32,0.00,1.00,-172.80,4.80 +-124.80,-33.60,14.68,0.00,1.00,-172.80,4.80 +57.60,33.60,1.35,0.00,1.00,-168.00,4.80 +-115.20,-38.40,14.65,0.00,1.00,-168.00,4.80 +72.00,38.40,1.37,0.00,1.00,-163.20,4.80 +-105.60,-38.40,14.63,0.00,1.00,-158.40,4.80 +81.60,38.40,1.39,0.00,1.00,-139.20,4.80 +-91.20,-38.40,14.61,0.00,1.00,-105.60,4.80 +96.00,38.40,1.41,0.00,1.00,-52.80,4.80 +-76.80,-38.40,14.59,0.00,1.00,-28.80,4.80 +105.60,38.40,1.43,0.00,1.00,-19.20,4.80 +-67.20,-38.40,14.57,0.00,1.00,-14.40,4.80 +120.00,38.40,1.45,0.00,1.00,-9.60,4.80 +-57.60,-33.60,14.55,0.00,1.00,-9.60,4.80 +129.60,33.60,1.47,0.00,1.00,-9.60,4.80 +-43.20,-28.80,14.53,0.00,1.00,-4.80,4.80 +139.20,28.80,1.50,0.00,1.00,-4.80,4.80 +-33.60,-24.00,14.50,0.00,1.00,-4.80,4.80 +148.80,24.00,1.52,0.00,1.00,-4.80,4.80 +-28.80,-19.20,14.48,0.00,1.00,-4.80,4.80 +158.40,19.20,1.54,0.00,1.00,-4.80,0.00 +-19.20,-14.40,14.46,0.00,1.00,-0.00,0.00 +163.20,14.40,1.56,0.00,1.00,-0.00,0.00 +-9.60,-9.60,14.44,0.00,1.00,-0.00,0.00 +172.80,4.80,1.58,0.00,1.00,-0.00,0.00 +-4.80,-4.80,14.42,0.00,1.00,-0.00,0.00 +0.00,0.00,1.60,0.00,1.00,0.00,0.00 +-177.60,-4.80,14.40,0.00,1.00,0.00,-0.00 +9.60,4.80,1.62,0.00,1.00,0.00,-0.00 +-168.00,-9.60,14.38,0.00,1.00,4.80,-0.00 +14.40,9.60,1.64,0.00,1.00,4.80,-4.80 +-158.40,-14.40,14.36,0.00,1.00,4.80,-4.80 +24.00,14.40,1.67,0.00,1.00,4.80,-4.80 +-153.60,-19.20,14.33,0.00,1.00,4.80,-4.80 +33.60,19.20,1.69,0.00,1.00,9.60,-4.80 +-144.00,-24.00,14.31,0.00,1.00,9.60,-4.80 +43.20,24.00,1.71,0.00,1.00,9.60,-4.80 +-134.40,-28.80,14.29,0.00,1.00,14.40,-9.60 +52.80,28.80,1.73,0.00,1.00,14.40,-9.60 +-124.80,-28.80,14.27,0.00,1.00,19.20,-9.60 +62.40,33.60,1.75,0.00,1.00,24.00,-9.60 +-110.40,-33.60,14.25,0.00,1.00,28.80,-9.60 +72.00,33.60,1.77,0.00,1.00,33.60,-9.60 +-100.80,-33.60,14.23,0.00,1.00,48.00,-9.60 +86.40,33.60,1.79,0.00,1.00,67.20,-9.60 +-86.40,-33.60,14.21,0.00,1.00,96.00,-9.60 +96.00,33.60,1.82,0.00,1.00,120.00,-9.60 +-76.80,-33.60,14.18,0.00,1.00,139.20,-9.60 +110.40,33.60,1.84,0.00,1.00,148.80,-9.60 +-67.20,-33.60,14.16,0.00,1.00,153.60,-9.60 +120.00,33.60,1.86,0.00,1.00,158.40,-9.60 +-52.80,-28.80,14.14,0.00,1.00,163.20,-9.60 +129.60,28.80,1.88,0.00,1.00,168.00,-9.60 +-43.20,-28.80,14.12,0.00,1.00,168.00,-9.60 +139.20,24.00,1.90,0.00,1.00,168.00,-4.80 +-33.60,-24.00,14.10,0.00,1.00,172.80,-4.80 +148.80,19.20,1.92,0.00,1.00,172.80,-4.80 +-24.00,-19.20,14.08,0.00,1.00,172.80,-4.80 +158.40,14.40,1.94,0.00,1.00,177.60,-4.80 +-19.20,-14.40,14.06,0.00,1.00,177.60,-4.80 +168.00,9.60,1.97,0.00,1.00,177.60,-4.80 +-9.60,-4.80,14.03,0.00,1.00,177.60,-0.00 +172.80,4.80,1.99,0.00,1.00,177.60,-0.00 +-0.00,-0.00,14.01,0.00,1.00,177.60,-0.00 +-177.60,-0.00,2.01,0.00,1.00,-177.60,0.00 +4.80,4.80,13.99,0.00,1.00,-177.60,0.00 +-168.00,-4.80,2.03,0.00,1.00,-177.60,0.00 +14.40,9.60,13.97,0.00,1.00,-177.60,4.80 +-163.20,-14.40,2.05,0.00,1.00,-177.60,4.80 +24.00,14.40,13.95,0.00,1.00,-177.60,4.80 +-153.60,-19.20,2.07,0.00,1.00,-172.80,4.80 +28.80,19.20,13.93,0.00,1.00,-172.80,4.80 +-144.00,-24.00,2.09,0.00,1.00,-172.80,4.80 +38.40,24.00,13.91,0.00,1.00,-168.00,4.80 +-134.40,-28.80,2.11,0.00,1.00,-168.00,9.60 +48.00,28.80,13.89,0.00,1.00,-168.00,9.60 +-124.80,-28.80,2.14,0.00,1.00,-163.20,9.60 +62.40,33.60,13.86,0.00,1.00,-158.40,9.60 +-115.20,-33.60,2.16,0.00,1.00,-153.60,9.60 +72.00,33.60,13.84,0.00,1.00,-148.80,9.60 +-100.80,-33.60,2.18,0.00,1.00,-139.20,9.60 +81.60,33.60,13.82,0.00,1.00,-120.00,9.60 +-91.20,-33.60,2.20,0.00,1.00,-96.00,9.60 +96.00,33.60,13.80,0.00,1.00,-67.20,9.60 +-81.60,-33.60,2.22,0.00,1.00,-48.00,9.60 +105.60,33.60,13.78,0.00,1.00,-33.60,9.60 +-67.20,-33.60,2.24,0.00,1.00,-28.80,9.60 +115.20,33.60,13.76,0.00,1.00,-24.00,9.60 +-57.60,-28.80,2.26,0.00,1.00,-19.20,9.60 +129.60,28.80,13.74,0.00,1.00,-14.40,9.60 +-48.00,-28.80,2.29,0.00,1.00,-14.40,9.60 +139.20,24.00,13.71,0.00,1.00,-9.60,4.80 +-38.40,-24.00,2.31,0.00,1.00,-9.60,4.80 +148.80,19.20,13.69,0.00,1.00,-9.60,4.80 +-28.80,-19.20,2.33,0.00,1.00,-4.80,4.80 +153.60,14.40,13.67,0.00,1.00,-4.80,4.80 +-19.20,-14.40,2.35,0.00,1.00,-4.80,4.80 +163.20,9.60,13.65,0.00,1.00,-4.80,4.80 +-9.60,-9.60,2.37,0.00,1.00,-4.80,0.00 +172.80,4.80,13.63,0.00,1.00,-0.00,0.00 +-4.80,-4.80,2.39,0.00,1.00,-0.00,0.00 +0.00,0.00,13.61,0.00,1.00,0.00,0.00 +-177.60,-4.80,2.41,0.00,1.00,0.00,-0.00 +9.60,4.80,13.59,0.00,1.00,4.80,-0.00 +-168.00,-9.60,2.44,0.00,1.00,4.80,-4.80 +14.40,9.60,13.56,0.00,1.00,4.80,-4.80 +-158.40,-9.60,2.46,0.00,1.00,4.80,-4.80 +24.00,14.40,13.54,0.00,1.00,9.60,-4.80 +-148.80,-14.40,2.48,0.00,1.00,9.60,-9.60 +33.60,19.20,13.52,0.00,1.00,9.60,-9.60 +-139.20,-19.20,2.50,0.00,1.00,14.40,-9.60 +43.20,24.00,13.50,0.00,1.00,14.40,-9.60 +-129.60,-24.00,2.52,0.00,1.00,19.20,-9.60 +52.80,24.00,13.48,0.00,1.00,19.20,-14.40 +-120.00,-28.80,2.54,0.00,1.00,24.00,-14.40 +62.40,28.80,13.46,0.00,1.00,28.80,-14.40 +-110.40,-28.80,2.56,0.00,1.00,38.40,-14.40 +76.80,28.80,13.44,0.00,1.00,48.00,-14.40 +-100.80,-28.80,2.58,0.00,1.00,57.60,-14.40 +86.40,28.80,13.42,0.00,1.00,76.80,-14.40 +-86.40,-28.80,2.61,0.00,1.00,96.00,-14.40 +96.00,28.80,13.39,0.00,1.00,115.20,-14.40 +-76.80,-28.80,2.63,0.00,1.00,129.60,-14.40 +105.60,28.80,13.37,0.00,1.00,139.20,-14.40 +-67.20,-28.80,2.65,0.00,1.00,144.00,-14.40 +120.00,28.80,13.35,0.00,1.00,153.60,-14.40 +-57.60,-24.00,2.67,0.00,1.00,158.40,-14.40 +129.60,24.00,13.33,0.00,1.00,158.40,-9.60 +-48.00,-24.00,2.69,0.00,1.00,163.20,-9.60 +139.20,19.20,13.31,0.00,1.00,168.00,-9.60 +-38.40,-19.20,2.71,0.00,1.00,168.00,-9.60 +148.80,19.20,13.29,0.00,1.00,168.00,-9.60 +-28.80,-14.40,2.73,0.00,1.00,172.80,-9.60 +158.40,14.40,13.27,0.00,1.00,172.80,-4.80 +-19.20,-9.60,2.76,0.00,1.00,172.80,-4.80 +163.20,9.60,13.24,0.00,1.00,177.60,-4.80 +-9.60,-4.80,2.78,0.00,1.00,177.60,-4.80 +172.80,4.80,13.22,0.00,1.00,177.60,-0.00 +-0.00,-0.00,2.80,0.00,1.00,177.60,-0.00 +-177.60,-0.00,13.20,0.00,1.00,-177.60,0.00 +4.80,4.80,2.82,0.00,1.00,-177.60,0.00 +-168.00,-4.80,13.18,0.00,1.00,-177.60,4.80 +14.40,9.60,2.84,0.00,1.00,-177.60,4.80 +-163.20,-9.60,13.16,0.00,1.00,-172.80,4.80 +24.00,14.40,2.86,0.00,1.00,-172.80,4.80 +-153.60,-14.40,13.14,0.00,1.00,-172.80,9.60 +33.60,19.20,2.88,0.00,1.00,-168.00,9.60 +-144.00,-19.20,13.12,0.00,1.00,-168.00,9.60 +43.20,19.20,2.91,0.00,1.00,-168.00,9.60 +-134.40,-24.00,13.09,0.00,1.00,-163.20,9.60 +52.80,24.00,2.93,0.00,1.00,-158.40,9.60 +-124.80,-24.00,13.07,0.00,1.00,-158.40,14.40 +62.40,28.80,2.95,0.00,1.00,-153.60,14.40 +-115.20,-28.80,13.05,0.00,1.00,-144.00,14.40 +72.00,28.80,2.97,0.00,1.00,-139.20,14.40 +-100.80,-28.80,13.03,0.00,1.00,-129.60,14.40 +81.60,28.80,2.99,0.00,1.00,-115.20,14.40 +-91.20,-28.80,13.01,0.00,1.00,-96.00,14.40 +96.00,28.80,3.01,0.00,1.00,-76.80,14.40 +-81.60,-28.80,12.99,0.00,1.00,-57.60,14.40 +105.60,28.80,3.03,0.00,1.00,-48.00,14.40 +-67.20,-28.80,12.97,0.00,1.00,-38.40,14.40 +115.20,28.80,3.05,0.00,1.00,-28.80,14.40 +-57.60,-28.80,12.95,0.00,1.00,-24.00,14.40 +124.80,24.00,3.08,0.00,1.00,-19.20,14.40 +-48.00,-24.00,12.92,0.00,1.00,-19.20,9.60 +134.40,24.00,3.10,0.00,1.00,-14.40,9.60 +-38.40,-19.20,12.90,0.00,1.00,-14.40,9.60 +144.00,19.20,3.12,0.00,1.00,-9.60,9.60 +-28.80,-14.40,12.88,0.00,1.00,-9.60,9.60 +153.60,14.40,3.14,0.00,1.00,-9.60,4.80 +-19.20,-9.60,12.86,0.00,1.00,-4.80,4.80 +163.20,9.60,3.16,0.00,1.00,-4.80,4.80 +-14.40,-9.60,12.84,0.00,1.00,-4.80,4.80 +172.80,4.80,3.18,0.00,1.00,-4.80,0.00 +-4.80,-4.80,12.82,0.00,1.00,-0.00,0.00 +0.00,0.00,3.20,0.00,1.00,0.00,0.00 +-177.60,-0.00,12.80,0.00,1.00,0.00,-0.00 +9.60,4.80,3.23,0.00,1.00,4.80,-4.80 +-168.00,-4.80,12.77,0.00,1.00,4.80,-4.80 +19.20,9.60,3.25,0.00,1.00,4.80,-4.80 +-158.40,-9.60,12.75,0.00,1.00,9.60,-9.60 +24.00,14.40,3.27,0.00,1.00,9.60,-9.60 +-148.80,-14.40,12.73,0.00,1.00,14.40,-9.60 +33.60,14.40,3.29,0.00,1.00,14.40,-9.60 +-139.20,-19.20,12.71,0.00,1.00,19.20,-14.40 +43.20,19.20,3.31,0.00,1.00,19.20,-14.40 +-129.60,-19.20,12.69,0.00,1.00,24.00,-14.40 +52.80,19.20,3.33,0.00,1.00,28.80,-14.40 +-120.00,-24.00,12.67,0.00,1.00,33.60,-19.20 +67.20,24.00,3.35,0.00,1.00,38.40,-19.20 +-110.40,-24.00,12.65,0.00,1.00,43.20,-19.20 +76.80,24.00,3.38,0.00,1.00,52.80,-19.20 +-100.80,-24.00,12.62,0.00,1.00,67.20,-19.20 +86.40,24.00,3.40,0.00,1.00,76.80,-19.20 +-86.40,-24.00,12.60,0.00,1.00,96.00,-19.20 +96.00,24.00,3.42,0.00,1.00,105.60,-19.20 +-76.80,-24.00,12.58,0.00,1.00,120.00,-19.20 +105.60,24.00,3.44,0.00,1.00,129.60,-19.20 +-67.20,-24.00,12.56,0.00,1.00,139.20,-19.20 +115.20,24.00,3.46,0.00,1.00,144.00,-19.20 +-57.60,-24.00,12.54,0.00,1.00,148.80,-14.40 +129.60,19.20,3.48,0.00,1.00,153.60,-14.40 +-48.00,-19.20,12.52,0.00,1.00,158.40,-14.40 +139.20,19.20,3.50,0.00,1.00,163.20,-14.40 +-38.40,-14.40,12.50,0.00,1.00,163.20,-14.40 +148.80,14.40,3.52,0.00,1.00,168.00,-9.60 +-28.80,-14.40,12.48,0.00,1.00,168.00,-9.60 +153.60,9.60,3.55,0.00,1.00,172.80,-9.60 +-19.20,-9.60,12.45,0.00,1.00,172.80,-4.80 +163.20,9.60,3.57,0.00,1.00,172.80,-4.80 +-9.60,-4.80,12.43,0.00,1.00,177.60,-4.80 +172.80,4.80,3.59,0.00,1.00,177.60,-0.00 +-0.00,-0.00,12.41,0.00,1.00,177.60,-0.00 +-177.60,-0.00,3.61,0.00,1.00,-177.60,0.00 +4.80,4.80,12.39,0.00,1.00,-177.60,0.00 +-168.00,-4.80,3.63,0.00,1.00,-177.60,4.80 +14.40,9.60,12.37,0.00,1.00,-172.80,4.80 +-158.40,-9.60,3.65,0.00,1.00,-172.80,4.80 +24.00,9.60,12.35,0.00,1.00,-172.80,9.60 +-153.60,-14.40,3.67,0.00,1.00,-168.00,9.60 +33.60,14.40,12.33,0.00,1.00,-168.00,9.60 +-144.00,-14.40,3.70,0.00,1.00,-163.20,14.40 +43.20,19.20,12.30,0.00,1.00,-163.20,14.40 +-134.40,-19.20,3.72,0.00,1.00,-158.40,14.40 +52.80,19.20,12.28,0.00,1.00,-153.60,14.40 +-124.80,-24.00,3.74,0.00,1.00,-148.80,14.40 +62.40,24.00,12.26,0.00,1.00,-144.00,19.20 +-110.40,-24.00,3.76,0.00,1.00,-139.20,19.20 +72.00,24.00,12.24,0.00,1.00,-129.60,19.20 +-100.80,-24.00,3.78,0.00,1.00,-120.00,19.20 +81.60,24.00,12.22,0.00,1.00,-105.60,19.20 +-91.20,-24.00,3.80,0.00,1.00,-96.00,19.20 +96.00,24.00,12.20,0.00,1.00,-76.80,19.20 +-81.60,-24.00,3.82,0.00,1.00,-67.20,19.20 +105.60,24.00,12.18,0.00,1.00,-52.80,19.20 +-72.00,-24.00,3.85,0.00,1.00,-43.20,19.20 +115.20,24.00,12.15,0.00,1.00,-38.40,19.20 +-57.60,-24.00,3.87,0.00,1.00,-33.60,19.20 +124.80,19.20,12.13,0.00,1.00,-28.80,14.40 +-48.00,-19.20,3.89,0.00,1.00,-24.00,14.40 +134.40,19.20,12.11,0.00,1.00,-19.20,14.40 +-38.40,-19.20,3.91,0.00,1.00,-19.20,14.40 +144.00,14.40,12.09,0.00,1.00,-14.40,9.60 +-28.80,-14.40,3.93,0.00,1.00,-14.40,9.60 +153.60,14.40,12.07,0.00,1.00,-9.60,9.60 +-24.00,-9.60,3.95,0.00,1.00,-9.60,9.60 +163.20,9.60,12.05,0.00,1.00,-4.80,4.80 +-14.40,-4.80,3.97,0.00,1.00,-4.80,4.80 +172.80,4.80,12.03,0.00,1.00,-4.80,4.80 +-4.80,-0.00,3.99,0.00,1.00,-0.00,0.00 +0.00,0.00,12.01,0.00,1.00,0.00,0.00 +-177.60,-0.00,4.02,0.00,1.00,0.00,-0.00 +9.60,4.80,11.98,0.00,1.00,4.80,-4.80 +-168.00,-4.80,4.04,0.00,1.00,4.80,-4.80 +19.20,4.80,11.96,0.00,1.00,9.60,-9.60 +-158.40,-9.60,4.06,0.00,1.00,9.60,-9.60 +28.80,9.60,11.94,0.00,1.00,14.40,-9.60 +-148.80,-9.60,4.08,0.00,1.00,14.40,-14.40 +38.40,14.40,11.92,0.00,1.00,19.20,-14.40 +-139.20,-14.40,4.10,0.00,1.00,19.20,-14.40 +48.00,14.40,11.90,0.00,1.00,24.00,-19.20 +-129.60,-14.40,4.12,0.00,1.00,28.80,-19.20 +57.60,19.20,11.88,0.00,1.00,33.60,-19.20 +-120.00,-19.20,4.14,0.00,1.00,38.40,-19.20 +67.20,19.20,11.86,0.00,1.00,43.20,-24.00 +-110.40,-19.20,4.17,0.00,1.00,52.80,-24.00 +76.80,19.20,11.83,0.00,1.00,62.40,-24.00 +-100.80,-19.20,4.19,0.00,1.00,72.00,-24.00 +86.40,19.20,11.81,0.00,1.00,81.60,-24.00 +-86.40,-19.20,4.21,0.00,1.00,91.20,-24.00 +96.00,19.20,11.79,0.00,1.00,105.60,-24.00 +-76.80,-19.20,4.23,0.00,1.00,115.20,-24.00 +105.60,19.20,11.77,0.00,1.00,124.80,-24.00 +-67.20,-19.20,4.25,0.00,1.00,134.40,-24.00 +115.20,19.20,11.75,0.00,1.00,139.20,-19.20 +-57.60,-19.20,4.27,0.00,1.00,144.00,-19.20 +124.80,19.20,11.73,0.00,1.00,148.80,-19.20 +-48.00,-14.40,4.29,0.00,1.00,153.60,-19.20 +134.40,14.40,11.71,0.00,1.00,158.40,-19.20 +-38.40,-14.40,4.32,0.00,1.00,158.40,-14.40 +144.00,14.40,11.68,0.00,1.00,163.20,-14.40 +-28.80,-9.60,4.34,0.00,1.00,168.00,-14.40 +153.60,9.60,11.66,0.00,1.00,168.00,-9.60 +-19.20,-9.60,4.36,0.00,1.00,172.80,-9.60 +163.20,4.80,11.64,0.00,1.00,172.80,-4.80 +-9.60,-4.80,4.38,0.00,1.00,172.80,-4.80 +172.80,4.80,11.62,0.00,1.00,177.60,-4.80 +-0.00,-0.00,4.40,0.00,1.00,177.60,-0.00 +-177.60,-0.00,11.60,0.00,1.00,-177.60,0.00 +4.80,4.80,4.42,0.00,1.00,-177.60,4.80 +-168.00,-4.80,11.58,0.00,1.00,-172.80,4.80 +14.40,4.80,4.44,0.00,1.00,-172.80,4.80 +-158.40,-9.60,11.56,0.00,1.00,-172.80,9.60 +24.00,9.60,4.46,0.00,1.00,-168.00,9.60 +-148.80,-9.60,11.54,0.00,1.00,-168.00,14.40 +33.60,14.40,4.49,0.00,1.00,-163.20,14.40 +-139.20,-14.40,11.51,0.00,1.00,-158.40,14.40 +43.20,14.40,4.51,0.00,1.00,-158.40,19.20 +-129.60,-14.40,11.49,0.00,1.00,-153.60,19.20 +52.80,19.20,4.53,0.00,1.00,-148.80,19.20 +-120.00,-19.20,11.47,0.00,1.00,-144.00,19.20 +62.40,19.20,4.55,0.00,1.00,-139.20,19.20 +-110.40,-19.20,11.45,0.00,1.00,-134.40,24.00 +72.00,19.20,4.57,0.00,1.00,-124.80,24.00 +-100.80,-19.20,11.43,0.00,1.00,-115.20,24.00 +81.60,19.20,4.59,0.00,1.00,-105.60,24.00 +-91.20,-19.20,11.41,0.00,1.00,-91.20,24.00 +96.00,19.20,4.61,0.00,1.00,-81.60,24.00 +-81.60,-19.20,11.39,0.00,1.00,-72.00,24.00 +105.60,19.20,4.64,0.00,1.00,-62.40,24.00 +-72.00,-19.20,11.36,0.00,1.00,-52.80,24.00 +115.20,19.20,4.66,0.00,1.00,-43.20,24.00 +-62.40,-19.20,11.34,0.00,1.00,-38.40,19.20 +124.80,19.20,4.68,0.00,1.00,-33.60,19.20 +-52.80,-14.40,11.32,0.00,1.00,-28.80,19.20 +134.40,14.40,4.70,0.00,1.00,-24.00,19.20 +-43.20,-14.40,11.30,0.00,1.00,-19.20,14.40 +144.00,14.40,4.72,0.00,1.00,-19.20,14.40 +-33.60,-9.60,11.28,0.00,1.00,-14.40,14.40 +153.60,9.60,4.74,0.00,1.00,-14.40,9.60 +-24.00,-9.60,11.26,0.00,1.00,-9.60,9.60 +163.20,4.80,4.76,0.00,1.00,-9.60,9.60 +-14.40,-4.80,11.24,0.00,1.00,-4.80,4.80 +172.80,4.80,4.79,0.00,1.00,-4.80,4.80 +-4.80,-0.00,11.21,0.00,1.00,-0.00,0.00 +0.00,0.00,4.81,0.00,1.00,0.00,0.00 +-177.60,-0.00,11.19,0.00,1.00,0.00,-0.00 +9.60,4.80,4.83,0.00,1.00,4.80,-4.80 +-168.00,-4.80,11.17,0.00,1.00,4.80,-4.80 +19.20,4.80,4.85,0.00,1.00,9.60,-9.60 +-158.40,-4.80,11.15,0.00,1.00,14.40,-9.60 +28.80,9.60,4.87,0.00,1.00,14.40,-14.40 +-148.80,-9.60,11.13,0.00,1.00,19.20,-14.40 +38.40,9.60,4.89,0.00,1.00,19.20,-19.20 +-139.20,-9.60,11.11,0.00,1.00,24.00,-19.20 +48.00,9.60,4.91,0.00,1.00,28.80,-19.20 +-129.60,-14.40,11.09,0.00,1.00,33.60,-24.00 +57.60,14.40,4.93,0.00,1.00,38.40,-24.00 +-120.00,-14.40,11.07,0.00,1.00,43.20,-24.00 +67.20,14.40,4.96,0.00,1.00,48.00,-24.00 +-110.40,-14.40,11.04,0.00,1.00,57.60,-28.80 +76.80,14.40,4.98,0.00,1.00,62.40,-28.80 +-100.80,-14.40,11.02,0.00,1.00,72.00,-28.80 +86.40,14.40,5.00,0.00,1.00,81.60,-28.80 +-86.40,-14.40,11.00,0.00,1.00,91.20,-28.80 +96.00,14.40,5.02,0.00,1.00,100.80,-28.80 +-76.80,-14.40,10.98,0.00,1.00,110.40,-28.80 +105.60,14.40,5.04,0.00,1.00,120.00,-28.80 +-67.20,-14.40,10.96,0.00,1.00,129.60,-28.80 +115.20,14.40,5.06,0.00,1.00,134.40,-24.00 +-57.60,-14.40,10.94,0.00,1.00,139.20,-24.00 +124.80,14.40,5.08,0.00,1.00,144.00,-24.00 +-48.00,-14.40,10.92,0.00,1.00,148.80,-24.00 +134.40,9.60,5.11,0.00,1.00,153.60,-19.20 +-38.40,-9.60,10.89,0.00,1.00,158.40,-19.20 +144.00,9.60,5.13,0.00,1.00,158.40,-14.40 +-28.80,-9.60,10.87,0.00,1.00,163.20,-14.40 +153.60,4.80,5.15,0.00,1.00,168.00,-14.40 +-19.20,-4.80,10.85,0.00,1.00,168.00,-9.60 +163.20,4.80,5.17,0.00,1.00,172.80,-9.60 +-9.60,-4.80,10.83,0.00,1.00,172.80,-4.80 +172.80,0.00,5.19,0.00,1.00,177.60,-4.80 +-0.00,-0.00,10.81,0.00,1.00,177.60,-0.00 +-177.60,-0.00,5.21,0.00,1.00,-177.60,0.00 +4.80,0.00,10.79,0.00,1.00,-177.60,4.80 +-168.00,-4.80,5.23,0.00,1.00,-172.80,4.80 +14.40,4.80,10.77,0.00,1.00,-172.80,9.60 +-158.40,-4.80,5.26,0.00,1.00,-168.00,9.60 +24.00,4.80,10.74,0.00,1.00,-168.00,14.40 +-148.80,-9.60,5.28,0.00,1.00,-163.20,14.40 +33.60,9.60,10.72,0.00,1.00,-158.40,14.40 +-139.20,-9.60,5.30,0.00,1.00,-158.40,19.20 +43.20,9.60,10.70,0.00,1.00,-153.60,19.20 +-129.60,-14.40,5.32,0.00,1.00,-148.80,24.00 +52.80,14.40,10.68,0.00,1.00,-144.00,24.00 +-120.00,-14.40,5.34,0.00,1.00,-139.20,24.00 +62.40,14.40,10.66,0.00,1.00,-134.40,24.00 +-110.40,-14.40,5.36,0.00,1.00,-129.60,28.80 +72.00,14.40,10.64,0.00,1.00,-120.00,28.80 +-100.80,-14.40,5.38,0.00,1.00,-110.40,28.80 +81.60,14.40,10.62,0.00,1.00,-100.80,28.80 +-91.20,-14.40,5.40,0.00,1.00,-91.20,28.80 +96.00,14.40,10.60,0.00,1.00,-81.60,28.80 +-81.60,-14.40,5.43,0.00,1.00,-72.00,28.80 +105.60,14.40,10.57,0.00,1.00,-62.40,28.80 +-72.00,-14.40,5.45,0.00,1.00,-57.60,28.80 +115.20,14.40,10.55,0.00,1.00,-48.00,24.00 +-62.40,-14.40,5.47,0.00,1.00,-43.20,24.00 +124.80,14.40,10.53,0.00,1.00,-38.40,24.00 +-52.80,-14.40,5.49,0.00,1.00,-33.60,24.00 +134.40,9.60,10.51,0.00,1.00,-28.80,19.20 +-43.20,-9.60,5.51,0.00,1.00,-24.00,19.20 +144.00,9.60,10.49,0.00,1.00,-19.20,19.20 +-33.60,-9.60,5.53,0.00,1.00,-19.20,14.40 +153.60,9.60,10.47,0.00,1.00,-14.40,14.40 +-24.00,-4.80,5.55,0.00,1.00,-14.40,9.60 +163.20,4.80,10.45,0.00,1.00,-9.60,9.60 +-14.40,-4.80,5.58,0.00,1.00,-4.80,4.80 +172.80,4.80,10.42,0.00,1.00,-4.80,4.80 +-4.80,-0.00,5.60,0.00,1.00,-0.00,0.00 +0.00,0.00,10.40,0.00,1.00,0.00,0.00 +-177.60,-0.00,5.62,0.00,1.00,4.80,-4.80 +9.60,0.00,10.38,0.00,1.00,4.80,-4.80 +-168.00,-4.80,5.64,0.00,1.00,9.60,-9.60 +19.20,4.80,10.36,0.00,1.00,9.60,-9.60 +-158.40,-4.80,5.66,0.00,1.00,14.40,-14.40 +28.80,4.80,10.34,0.00,1.00,19.20,-14.40 +-148.80,-4.80,5.68,0.00,1.00,19.20,-19.20 +38.40,4.80,10.32,0.00,1.00,24.00,-19.20 +-139.20,-9.60,5.70,0.00,1.00,28.80,-24.00 +48.00,9.60,10.30,0.00,1.00,33.60,-24.00 +-129.60,-9.60,5.72,0.00,1.00,38.40,-24.00 +57.60,9.60,10.28,0.00,1.00,43.20,-28.80 +-120.00,-9.60,5.75,0.00,1.00,48.00,-28.80 +67.20,9.60,10.25,0.00,1.00,52.80,-28.80 +-110.40,-9.60,5.77,0.00,1.00,57.60,-33.60 +76.80,9.60,10.23,0.00,1.00,67.20,-33.60 +-100.80,-9.60,5.79,0.00,1.00,76.80,-33.60 +86.40,9.60,10.21,0.00,1.00,81.60,-33.60 +-86.40,-9.60,5.81,0.00,1.00,91.20,-33.60 +96.00,9.60,10.19,0.00,1.00,100.80,-33.60 +-76.80,-9.60,5.83,0.00,1.00,110.40,-33.60 +105.60,9.60,10.17,0.00,1.00,115.20,-33.60 +-67.20,-9.60,5.85,0.00,1.00,124.80,-33.60 +115.20,9.60,10.15,0.00,1.00,129.60,-28.80 +-57.60,-9.60,5.87,0.00,1.00,134.40,-28.80 +124.80,9.60,10.13,0.00,1.00,139.20,-28.80 +-48.00,-9.60,5.90,0.00,1.00,144.00,-24.00 +134.40,9.60,10.10,0.00,1.00,148.80,-24.00 +-38.40,-9.60,5.92,0.00,1.00,153.60,-19.20 +144.00,4.80,10.08,0.00,1.00,158.40,-19.20 +-28.80,-4.80,5.94,0.00,1.00,163.20,-14.40 +153.60,4.80,10.06,0.00,1.00,163.20,-14.40 +-19.20,-4.80,5.96,0.00,1.00,168.00,-9.60 +163.20,4.80,10.04,0.00,1.00,172.80,-9.60 +-9.60,-0.00,5.98,0.00,1.00,172.80,-4.80 +172.80,0.00,10.02,0.00,1.00,177.60,-4.80 +-0.00,-0.00,6.00,0.00,1.00,177.60,-0.00 +-177.60,-0.00,10.00,0.00,1.00,-177.60,0.00 +4.80,0.00,6.02,0.00,1.00,-177.60,4.80 +-168.00,-0.00,9.98,0.00,1.00,-172.80,4.80 +14.40,4.80,6.05,0.00,1.00,-172.80,9.60 +-158.40,-4.80,9.95,0.00,1.00,-168.00,9.60 +24.00,4.80,6.07,0.00,1.00,-163.20,14.40 +-148.80,-4.80,9.93,0.00,1.00,-163.20,14.40 +33.60,4.80,6.09,0.00,1.00,-158.40,19.20 +-139.20,-9.60,9.91,0.00,1.00,-153.60,19.20 +43.20,9.60,6.11,0.00,1.00,-148.80,24.00 +-129.60,-9.60,9.89,0.00,1.00,-144.00,24.00 +52.80,9.60,6.13,0.00,1.00,-139.20,28.80 +-120.00,-9.60,9.87,0.00,1.00,-134.40,28.80 +62.40,9.60,6.15,0.00,1.00,-129.60,28.80 +-110.40,-9.60,9.85,0.00,1.00,-124.80,33.60 +72.00,9.60,6.17,0.00,1.00,-115.20,33.60 +-100.80,-9.60,9.83,0.00,1.00,-110.40,33.60 +81.60,9.60,6.19,0.00,1.00,-100.80,33.60 +-91.20,-9.60,9.81,0.00,1.00,-91.20,33.60 +96.00,9.60,6.22,0.00,1.00,-81.60,33.60 +-81.60,-9.60,9.78,0.00,1.00,-76.80,33.60 +105.60,9.60,6.24,0.00,1.00,-67.20,33.60 +-72.00,-9.60,9.76,0.00,1.00,-57.60,33.60 +115.20,9.60,6.26,0.00,1.00,-52.80,28.80 +-62.40,-9.60,9.74,0.00,1.00,-48.00,28.80 +124.80,9.60,6.28,0.00,1.00,-43.20,28.80 +-52.80,-9.60,9.72,0.00,1.00,-38.40,24.00 +134.40,9.60,6.30,0.00,1.00,-33.60,24.00 +-43.20,-9.60,9.70,0.00,1.00,-28.80,24.00 +144.00,4.80,6.32,0.00,1.00,-24.00,19.20 +-33.60,-4.80,9.68,0.00,1.00,-19.20,19.20 +153.60,4.80,6.34,0.00,1.00,-19.20,14.40 +-24.00,-4.80,9.66,0.00,1.00,-14.40,14.40 +163.20,4.80,6.37,0.00,1.00,-9.60,9.60 +-14.40,-4.80,9.63,0.00,1.00,-9.60,9.60 +172.80,0.00,6.39,0.00,1.00,-4.80,4.80 +-4.80,-0.00,9.61,0.00,1.00,-4.80,4.80 +0.00,0.00,6.41,0.00,1.00,0.00,0.00 +-177.60,-0.00,9.59,0.00,1.00,4.80,-4.80 +9.60,0.00,6.43,0.00,1.00,4.80,-4.80 +-168.00,-0.00,9.57,0.00,1.00,9.60,-9.60 +19.20,0.00,6.45,0.00,1.00,14.40,-9.60 +-158.40,-4.80,9.55,0.00,1.00,14.40,-14.40 +28.80,4.80,6.47,0.00,1.00,19.20,-19.20 +-148.80,-4.80,9.53,0.00,1.00,24.00,-19.20 +38.40,4.80,6.49,0.00,1.00,24.00,-24.00 +-139.20,-4.80,9.51,0.00,1.00,28.80,-24.00 +48.00,4.80,6.52,0.00,1.00,33.60,-28.80 +-129.60,-4.80,9.48,0.00,1.00,38.40,-28.80 +57.60,4.80,6.54,0.00,1.00,43.20,-33.60 +-120.00,-4.80,9.46,0.00,1.00,48.00,-33.60 +67.20,4.80,6.56,0.00,1.00,57.60,-33.60 +-110.40,-4.80,9.44,0.00,1.00,62.40,-38.40 +76.80,4.80,6.58,0.00,1.00,67.20,-38.40 +-100.80,-4.80,9.42,0.00,1.00,76.80,-38.40 +86.40,4.80,6.60,0.00,1.00,86.40,-38.40 +-86.40,-4.80,9.40,0.00,1.00,91.20,-38.40 +96.00,4.80,6.62,0.00,1.00,100.80,-38.40 +-76.80,-4.80,9.38,0.00,1.00,105.60,-38.40 +105.60,4.80,6.64,0.00,1.00,115.20,-38.40 +-67.20,-4.80,9.36,0.00,1.00,120.00,-33.60 +115.20,4.80,6.66,0.00,1.00,124.80,-33.60 +-57.60,-4.80,9.34,0.00,1.00,134.40,-33.60 +124.80,4.80,6.69,0.00,1.00,139.20,-28.80 +-48.00,-4.80,9.31,0.00,1.00,144.00,-28.80 +134.40,4.80,6.71,0.00,1.00,148.80,-24.00 +-38.40,-4.80,9.29,0.00,1.00,153.60,-24.00 +144.00,4.80,6.73,0.00,1.00,153.60,-19.20 +-28.80,-4.80,9.27,0.00,1.00,158.40,-19.20 +153.60,4.80,6.75,0.00,1.00,163.20,-14.40 +-19.20,-4.80,9.25,0.00,1.00,168.00,-14.40 +163.20,0.00,6.77,0.00,1.00,168.00,-9.60 +-9.60,-0.00,9.23,0.00,1.00,172.80,-9.60 +172.80,0.00,6.79,0.00,1.00,177.60,-4.80 +-0.00,-0.00,9.21,0.00,1.00,177.60,-0.00 +-177.60,-0.00,6.81,0.00,1.00,-177.60,0.00 +4.80,0.00,9.19,0.00,1.00,-177.60,4.80 +-168.00,-0.00,6.84,0.00,1.00,-172.80,9.60 +14.40,0.00,9.16,0.00,1.00,-168.00,9.60 +-158.40,-4.80,6.86,0.00,1.00,-168.00,14.40 +24.00,4.80,9.14,0.00,1.00,-163.20,14.40 +-148.80,-4.80,6.88,0.00,1.00,-158.40,19.20 +33.60,4.80,9.12,0.00,1.00,-153.60,19.20 +-139.20,-4.80,6.90,0.00,1.00,-153.60,24.00 +43.20,4.80,9.10,0.00,1.00,-148.80,24.00 +-129.60,-4.80,6.92,0.00,1.00,-144.00,28.80 +52.80,4.80,9.08,0.00,1.00,-139.20,28.80 +-120.00,-4.80,6.94,0.00,1.00,-134.40,33.60 +62.40,4.80,9.06,0.00,1.00,-124.80,33.60 +-110.40,-4.80,6.96,0.00,1.00,-120.00,33.60 +72.00,4.80,9.04,0.00,1.00,-115.20,38.40 +-100.80,-4.80,6.99,0.00,1.00,-105.60,38.40 +81.60,4.80,9.01,0.00,1.00,-100.80,38.40 +-91.20,-4.80,7.01,0.00,1.00,-91.20,38.40 +96.00,4.80,8.99,0.00,1.00,-86.40,38.40 +-81.60,-4.80,7.03,0.00,1.00,-76.80,38.40 +105.60,4.80,8.97,0.00,1.00,-67.20,38.40 +-72.00,-4.80,7.05,0.00,1.00,-62.40,38.40 +115.20,4.80,8.95,0.00,1.00,-57.60,33.60 +-62.40,-4.80,7.07,0.00,1.00,-48.00,33.60 +124.80,4.80,8.93,0.00,1.00,-43.20,33.60 +-52.80,-4.80,7.09,0.00,1.00,-38.40,28.80 +134.40,4.80,8.91,0.00,1.00,-33.60,28.80 +-43.20,-4.80,7.11,0.00,1.00,-28.80,24.00 +144.00,4.80,8.89,0.00,1.00,-24.00,24.00 +-33.60,-4.80,7.13,0.00,1.00,-24.00,19.20 +153.60,4.80,8.87,0.00,1.00,-19.20,19.20 +-24.00,-4.80,7.16,0.00,1.00,-14.40,14.40 +163.20,0.00,8.84,0.00,1.00,-14.40,9.60 +-14.40,-0.00,7.18,0.00,1.00,-9.60,9.60 +172.80,0.00,8.82,0.00,1.00,-4.80,4.80 +-4.80,-0.00,7.20,0.00,1.00,-4.80,4.80 +0.00,0.00,8.80,0.00,1.00,0.00,0.00 +-177.60,-0.00,7.22,0.00,1.00,4.80,-4.80 +9.60,0.00,8.78,0.00,1.00,4.80,-4.80 +-168.00,-0.00,7.24,0.00,1.00,9.60,-9.60 +19.20,0.00,8.76,0.00,1.00,14.40,-14.40 +-158.40,-0.00,7.26,0.00,1.00,19.20,-14.40 +28.80,0.00,8.74,0.00,1.00,19.20,-19.20 +-148.80,-0.00,7.28,0.00,1.00,24.00,-24.00 +38.40,0.00,8.72,0.00,1.00,28.80,-24.00 +-139.20,-0.00,7.31,0.00,1.00,33.60,-28.80 +48.00,0.00,8.69,0.00,1.00,38.40,-28.80 +-129.60,-0.00,7.33,0.00,1.00,43.20,-33.60 +57.60,0.00,8.67,0.00,1.00,48.00,-33.60 +-120.00,-0.00,7.35,0.00,1.00,52.80,-38.40 +67.20,0.00,8.65,0.00,1.00,57.60,-38.40 +-110.40,-0.00,7.37,0.00,1.00,62.40,-38.40 +76.80,0.00,8.63,0.00,1.00,72.00,-43.20 +-100.80,-0.00,7.39,0.00,1.00,76.80,-43.20 +86.40,0.00,8.61,0.00,1.00,86.40,-43.20 +-86.40,-0.00,7.41,0.00,1.00,91.20,-43.20 +96.00,0.00,8.59,0.00,1.00,100.80,-43.20 +-76.80,-0.00,7.43,0.00,1.00,105.60,-43.20 +105.60,0.00,8.57,0.00,1.00,110.40,-43.20 +-67.20,-0.00,7.46,0.00,1.00,120.00,-38.40 +115.20,0.00,8.54,0.00,1.00,124.80,-38.40 +-57.60,-0.00,7.48,0.00,1.00,129.60,-38.40 +124.80,0.00,8.52,0.00,1.00,134.40,-33.60 +-48.00,-0.00,7.50,0.00,1.00,139.20,-33.60 +134.40,0.00,8.50,0.00,1.00,144.00,-28.80 +-38.40,-0.00,7.52,0.00,1.00,148.80,-28.80 +144.00,0.00,8.48,0.00,1.00,153.60,-24.00 +-28.80,-0.00,7.54,0.00,1.00,158.40,-19.20 +153.60,0.00,8.46,0.00,1.00,163.20,-19.20 +-19.20,-0.00,7.56,0.00,1.00,163.20,-14.40 +163.20,0.00,8.44,0.00,1.00,168.00,-9.60 +-9.60,-0.00,7.58,0.00,1.00,172.80,-9.60 +172.80,0.00,8.42,0.00,1.00,172.80,-4.80 +-0.00,-0.00,7.60,0.00,1.00,177.60,-0.00 +-177.60,-0.00,8.40,0.00,1.00,-177.60,0.00 +4.80,0.00,7.63,0.00,1.00,-172.80,4.80 +-168.00,-0.00,8.37,0.00,1.00,-172.80,9.60 +14.40,0.00,7.65,0.00,1.00,-168.00,9.60 +-158.40,-0.00,8.35,0.00,1.00,-163.20,14.40 +24.00,0.00,7.67,0.00,1.00,-163.20,19.20 +-148.80,-0.00,8.33,0.00,1.00,-158.40,19.20 +33.60,0.00,7.69,0.00,1.00,-153.60,24.00 +-139.20,-0.00,8.31,0.00,1.00,-148.80,28.80 +43.20,0.00,7.71,0.00,1.00,-144.00,28.80 +-129.60,-0.00,8.29,0.00,1.00,-139.20,33.60 +52.80,0.00,7.73,0.00,1.00,-134.40,33.60 +-120.00,-0.00,8.27,0.00,1.00,-129.60,38.40 +62.40,0.00,7.75,0.00,1.00,-124.80,38.40 +-110.40,-0.00,8.25,0.00,1.00,-120.00,38.40 +72.00,0.00,7.78,0.00,1.00,-110.40,43.20 +-100.80,-0.00,8.22,0.00,1.00,-105.60,43.20 +81.60,0.00,7.80,0.00,1.00,-100.80,43.20 +-91.20,-0.00,8.20,0.00,1.00,-91.20,43.20 +96.00,0.00,7.82,0.00,1.00,-86.40,43.20 +-81.60,-0.00,8.18,0.00,1.00,-76.80,43.20 +105.60,0.00,7.84,0.00,1.00,-72.00,43.20 +-72.00,-0.00,8.16,0.00,1.00,-62.40,38.40 +115.20,0.00,7.86,0.00,1.00,-57.60,38.40 +-62.40,-0.00,8.14,0.00,1.00,-52.80,38.40 +124.80,0.00,7.88,0.00,1.00,-48.00,33.60 +-52.80,-0.00,8.12,0.00,1.00,-43.20,33.60 +134.40,0.00,7.90,0.00,1.00,-38.40,28.80 +-43.20,-0.00,8.10,0.00,1.00,-33.60,28.80 +144.00,0.00,7.93,0.00,1.00,-28.80,24.00 +-33.60,-0.00,8.07,0.00,1.00,-24.00,24.00 +153.60,0.00,7.95,0.00,1.00,-19.20,19.20 +-24.00,-0.00,8.05,0.00,1.00,-19.20,14.40 +163.20,0.00,7.97,0.00,1.00,-14.40,14.40 +-14.40,-0.00,8.03,0.00,1.00,-9.60,9.60 +172.80,0.00,7.99,0.00,1.00,-4.80,4.80 +-4.80,-0.00,8.01,0.00,1.00,-4.80,4.80 +0.00,0.00,8.01,0.00,1.00,0.00,0.00 +-177.60,0.00,7.99,0.00,1.00,4.80,-4.80 +9.60,-0.00,8.03,0.00,1.00,4.80,-4.80 +-168.00,0.00,7.97,0.00,1.00,9.60,-9.60 +19.20,-0.00,8.05,0.00,1.00,14.40,-14.40 +-158.40,0.00,7.95,0.00,1.00,19.20,-19.20 +28.80,-0.00,8.07,0.00,1.00,24.00,-19.20 +-148.80,0.00,7.93,0.00,1.00,24.00,-24.00 +38.40,-0.00,8.10,0.00,1.00,28.80,-28.80 +-139.20,0.00,7.90,0.00,1.00,33.60,-28.80 +48.00,-0.00,8.12,0.00,1.00,38.40,-33.60 +-129.60,0.00,7.88,0.00,1.00,43.20,-38.40 +57.60,-4.80,8.14,0.00,1.00,48.00,-38.40 +-120.00,4.80,7.86,0.00,1.00,52.80,-43.20 +67.20,-4.80,8.16,0.00,1.00,62.40,-43.20 +-110.40,4.80,7.84,0.00,1.00,67.20,-43.20 +76.80,-4.80,8.18,0.00,1.00,72.00,-48.00 +-100.80,4.80,7.82,0.00,1.00,76.80,-48.00 +86.40,-4.80,8.20,0.00,1.00,86.40,-48.00 +-86.40,4.80,7.80,0.00,1.00,91.20,-48.00 +96.00,-4.80,8.22,0.00,1.00,96.00,-48.00 +-76.80,4.80,7.78,0.00,1.00,105.60,-48.00 +105.60,-4.80,8.25,0.00,1.00,110.40,-48.00 +-67.20,4.80,7.75,0.00,1.00,115.20,-43.20 +115.20,-4.80,8.27,0.00,1.00,120.00,-43.20 +-57.60,4.80,7.73,0.00,1.00,129.60,-38.40 +124.80,-4.80,8.29,0.00,1.00,134.40,-38.40 +-48.00,0.00,7.71,0.00,1.00,139.20,-33.60 +134.40,-0.00,8.31,0.00,1.00,144.00,-33.60 +-38.40,0.00,7.69,0.00,1.00,148.80,-28.80 +144.00,-0.00,8.33,0.00,1.00,153.60,-24.00 +-28.80,0.00,7.67,0.00,1.00,153.60,-24.00 +153.60,-0.00,8.35,0.00,1.00,158.40,-19.20 +-19.20,0.00,7.65,0.00,1.00,163.20,-14.40 +163.20,-0.00,8.37,0.00,1.00,168.00,-14.40 +-9.60,0.00,7.63,0.00,1.00,172.80,-9.60 +172.80,-0.00,8.40,0.00,1.00,172.80,-4.80 +-0.00,0.00,7.60,0.00,1.00,177.60,-0.00 +-177.60,0.00,8.42,0.00,1.00,-177.60,0.00 +4.80,-0.00,7.58,0.00,1.00,-172.80,4.80 +-168.00,0.00,8.44,0.00,1.00,-172.80,9.60 +14.40,-0.00,7.56,0.00,1.00,-168.00,14.40 +-158.40,0.00,8.46,0.00,1.00,-163.20,14.40 +24.00,-0.00,7.54,0.00,1.00,-158.40,19.20 +-148.80,0.00,8.48,0.00,1.00,-153.60,24.00 +33.60,-0.00,7.52,0.00,1.00,-153.60,24.00 +-139.20,0.00,8.50,0.00,1.00,-148.80,28.80 +43.20,-0.00,7.50,0.00,1.00,-144.00,33.60 +-129.60,0.00,8.52,0.00,1.00,-139.20,33.60 +52.80,-4.80,7.48,0.00,1.00,-134.40,38.40 +-120.00,4.80,8.54,0.00,1.00,-129.60,38.40 +62.40,-4.80,7.46,0.00,1.00,-120.00,43.20 +-110.40,4.80,8.57,0.00,1.00,-115.20,43.20 +72.00,-4.80,7.43,0.00,1.00,-110.40,48.00 +-100.80,4.80,8.59,0.00,1.00,-105.60,48.00 +81.60,-4.80,7.41,0.00,1.00,-96.00,48.00 +-91.20,4.80,8.61,0.00,1.00,-91.20,48.00 +96.00,-4.80,7.39,0.00,1.00,-86.40,48.00 +-81.60,4.80,8.63,0.00,1.00,-76.80,48.00 +105.60,-4.80,7.37,0.00,1.00,-72.00,48.00 +-72.00,4.80,8.65,0.00,1.00,-67.20,43.20 +115.20,-4.80,7.35,0.00,1.00,-62.40,43.20 +-62.40,4.80,8.67,0.00,1.00,-52.80,43.20 +124.80,-4.80,7.33,0.00,1.00,-48.00,38.40 +-52.80,0.00,8.69,0.00,1.00,-43.20,38.40 +134.40,-0.00,7.31,0.00,1.00,-38.40,33.60 +-43.20,0.00,8.72,0.00,1.00,-33.60,28.80 +144.00,-0.00,7.28,0.00,1.00,-28.80,28.80 +-33.60,0.00,8.74,0.00,1.00,-24.00,24.00 +153.60,-0.00,7.26,0.00,1.00,-24.00,19.20 +-24.00,0.00,8.76,0.00,1.00,-19.20,19.20 +163.20,-0.00,7.24,0.00,1.00,-14.40,14.40 +-14.40,0.00,8.78,0.00,1.00,-9.60,9.60 +172.80,-0.00,7.22,0.00,1.00,-4.80,4.80 +-4.80,0.00,8.80,0.00,1.00,-4.80,4.80 +0.00,0.00,7.20,0.00,1.00,0.00,0.00 +-177.60,0.00,8.82,0.00,1.00,4.80,-4.80 +9.60,-0.00,7.18,0.00,1.00,9.60,-9.60 +-168.00,0.00,8.84,0.00,1.00,9.60,-9.60 +19.20,-4.80,7.16,0.00,1.00,14.40,-14.40 +-158.40,4.80,8.87,0.00,1.00,19.20,-19.20 +28.80,-4.80,7.13,0.00,1.00,24.00,-24.00 +-148.80,4.80,8.89,0.00,1.00,28.80,-24.00 +38.40,-4.80,7.11,0.00,1.00,33.60,-28.80 +-139.20,4.80,8.91,0.00,1.00,38.40,-33.60 +48.00,-4.80,7.09,0.00,1.00,43.20,-38.40 +-129.60,4.80,8.93,0.00,1.00,48.00,-38.40 +57.60,-4.80,7.07,0.00,1.00,52.80,-43.20 +-120.00,4.80,8.95,0.00,1.00,57.60,-43.20 +67.20,-4.80,7.05,0.00,1.00,62.40,-48.00 +-110.40,9.60,8.97,0.00,1.00,67.20,-48.00 +76.80,-9.60,7.03,0.00,1.00,72.00,-52.80 +-100.80,9.60,8.99,0.00,1.00,81.60,-52.80 +86.40,-9.60,7.01,0.00,1.00,86.40,-52.80 +-86.40,9.60,9.01,0.00,1.00,91.20,-52.80 +96.00,-9.60,6.99,0.00,1.00,96.00,-52.80 +-76.80,9.60,9.04,0.00,1.00,105.60,-52.80 +105.60,-9.60,6.96,0.00,1.00,110.40,-48.00 +-67.20,9.60,9.06,0.00,1.00,115.20,-48.00 +115.20,-4.80,6.94,0.00,1.00,120.00,-48.00 +-57.60,4.80,9.08,0.00,1.00,124.80,-43.20 +124.80,-4.80,6.92,0.00,1.00,129.60,-43.20 +-48.00,4.80,9.10,0.00,1.00,134.40,-38.40 +134.40,-4.80,6.90,0.00,1.00,139.20,-33.60 +-38.40,4.80,9.12,0.00,1.00,144.00,-33.60 +144.00,-4.80,6.88,0.00,1.00,148.80,-28.80 +-28.80,4.80,9.14,0.00,1.00,153.60,-24.00 +153.60,-4.80,6.86,0.00,1.00,158.40,-19.20 +-19.20,4.80,9.16,0.00,1.00,163.20,-19.20 +163.20,-0.00,6.84,0.00,1.00,168.00,-14.40 +-9.60,0.00,9.19,0.00,1.00,168.00,-9.60 +172.80,-0.00,6.81,0.00,1.00,172.80,-4.80 +-0.00,0.00,9.21,0.00,1.00,177.60,-0.00 +-177.60,0.00,6.79,0.00,1.00,-177.60,0.00 +4.80,-0.00,9.23,0.00,1.00,-172.80,4.80 +-168.00,0.00,6.77,0.00,1.00,-168.00,9.60 +14.40,-0.00,9.25,0.00,1.00,-168.00,14.40 +-158.40,4.80,6.75,0.00,1.00,-163.20,19.20 +24.00,-4.80,9.27,0.00,1.00,-158.40,19.20 +-148.80,4.80,6.73,0.00,1.00,-153.60,24.00 +33.60,-4.80,9.29,0.00,1.00,-148.80,28.80 +-139.20,4.80,6.71,0.00,1.00,-144.00,33.60 +43.20,-4.80,9.31,0.00,1.00,-139.20,33.60 +-129.60,4.80,6.69,0.00,1.00,-134.40,38.40 +52.80,-4.80,9.34,0.00,1.00,-129.60,43.20 +-120.00,4.80,6.66,0.00,1.00,-124.80,43.20 +62.40,-4.80,9.36,0.00,1.00,-120.00,48.00 +-110.40,9.60,6.64,0.00,1.00,-115.20,48.00 +72.00,-9.60,9.38,0.00,1.00,-110.40,48.00 +-100.80,9.60,6.62,0.00,1.00,-105.60,52.80 +81.60,-9.60,9.40,0.00,1.00,-96.00,52.80 +-91.20,9.60,6.60,0.00,1.00,-91.20,52.80 +96.00,-9.60,9.42,0.00,1.00,-86.40,52.80 +-81.60,9.60,6.58,0.00,1.00,-81.60,52.80 +105.60,-9.60,9.44,0.00,1.00,-72.00,52.80 +-72.00,9.60,6.56,0.00,1.00,-67.20,48.00 +115.20,-4.80,9.46,0.00,1.00,-62.40,48.00 +-62.40,4.80,6.54,0.00,1.00,-57.60,43.20 +124.80,-4.80,9.48,0.00,1.00,-52.80,43.20 +-52.80,4.80,6.52,0.00,1.00,-48.00,38.40 +134.40,-4.80,9.51,0.00,1.00,-43.20,38.40 +-43.20,4.80,6.49,0.00,1.00,-38.40,33.60 +144.00,-4.80,9.53,0.00,1.00,-33.60,28.80 +-33.60,4.80,6.47,0.00,1.00,-28.80,24.00 +153.60,-4.80,9.55,0.00,1.00,-24.00,24.00 +-24.00,4.80,6.45,0.00,1.00,-19.20,19.20 +163.20,-4.80,9.57,0.00,1.00,-14.40,14.40 +-14.40,0.00,6.43,0.00,1.00,-9.60,9.60 +172.80,-0.00,9.59,0.00,1.00,-9.60,9.60 +-4.80,0.00,6.41,0.00,1.00,-4.80,4.80 +0.00,0.00,9.61,0.00,1.00,0.00,0.00 +-177.60,0.00,6.39,0.00,1.00,4.80,-4.80 +9.60,-0.00,9.63,0.00,1.00,9.60,-9.60 +-168.00,4.80,6.37,0.00,1.00,14.40,-14.40 +19.20,-4.80,9.66,0.00,1.00,14.40,-14.40 +-158.40,4.80,6.34,0.00,1.00,19.20,-19.20 +28.80,-4.80,9.68,0.00,1.00,24.00,-24.00 +-148.80,4.80,6.32,0.00,1.00,28.80,-28.80 +38.40,-9.60,9.70,0.00,1.00,33.60,-33.60 +-139.20,9.60,6.30,0.00,1.00,38.40,-33.60 +48.00,-9.60,9.72,0.00,1.00,43.20,-38.40 +-129.60,9.60,6.28,0.00,1.00,48.00,-43.20 +57.60,-9.60,9.74,0.00,1.00,52.80,-43.20 +-120.00,9.60,6.26,0.00,1.00,57.60,-48.00 +67.20,-9.60,9.76,0.00,1.00,62.40,-52.80 +-110.40,9.60,6.24,0.00,1.00,67.20,-52.80 +76.80,-14.40,9.78,0.00,1.00,76.80,-57.60 +-100.80,14.40,6.22,0.00,1.00,81.60,-57.60 +86.40,-14.40,9.81,0.00,1.00,86.40,-57.60 +-86.40,14.40,6.19,0.00,1.00,91.20,-57.60 +96.00,-14.40,9.83,0.00,1.00,96.00,-57.60 +-76.80,14.40,6.17,0.00,1.00,100.80,-57.60 +105.60,-14.40,9.85,0.00,1.00,110.40,-52.80 +-67.20,9.60,6.15,0.00,1.00,115.20,-52.80 +115.20,-9.60,9.87,0.00,1.00,120.00,-48.00 +-57.60,9.60,6.13,0.00,1.00,124.80,-48.00 +124.80,-9.60,9.89,0.00,1.00,129.60,-43.20 +-48.00,9.60,6.11,0.00,1.00,134.40,-38.40 +134.40,-9.60,9.91,0.00,1.00,139.20,-38.40 +-38.40,9.60,6.09,0.00,1.00,144.00,-33.60 +144.00,-9.60,9.93,0.00,1.00,148.80,-28.80 +-28.80,4.80,6.07,0.00,1.00,153.60,-24.00 +153.60,-4.80,9.95,0.00,1.00,158.40,-24.00 +-19.20,4.80,6.05,0.00,1.00,163.20,-19.20 +163.20,-4.80,9.98,0.00,1.00,168.00,-14.40 +-9.60,4.80,6.02,0.00,1.00,168.00,-9.60 +172.80,-0.00,10.00,0.00,1.00,172.80,-4.80 +-0.00,0.00,6.00,0.00,1.00,177.60,-0.00 +-177.60,0.00,10.02,0.00,1.00,-177.60,0.00 +4.80,-0.00,5.98,0.00,1.00,-172.80,4.80 +-168.00,4.80,10.04,0.00,1.00,-168.00,9.60 +14.40,-4.80,5.96,0.00,1.00,-168.00,14.40 +-158.40,4.80,10.06,0.00,1.00,-163.20,19.20 +24.00,-4.80,5.94,0.00,1.00,-158.40,24.00 +-148.80,4.80,10.08,0.00,1.00,-153.60,24.00 +33.60,-9.60,5.92,0.00,1.00,-148.80,28.80 +-139.20,9.60,10.10,0.00,1.00,-144.00,33.60 +43.20,-9.60,5.90,0.00,1.00,-139.20,38.40 +-129.60,9.60,10.13,0.00,1.00,-134.40,38.40 +52.80,-9.60,5.87,0.00,1.00,-129.60,43.20 +-120.00,9.60,10.15,0.00,1.00,-124.80,48.00 +62.40,-9.60,5.85,0.00,1.00,-120.00,48.00 +-110.40,9.60,10.17,0.00,1.00,-115.20,52.80 +72.00,-14.40,5.83,0.00,1.00,-110.40,52.80 +-100.80,14.40,10.19,0.00,1.00,-100.80,57.60 +81.60,-14.40,5.81,0.00,1.00,-96.00,57.60 +-91.20,14.40,10.21,0.00,1.00,-91.20,57.60 +96.00,-14.40,5.79,0.00,1.00,-86.40,57.60 +-81.60,14.40,10.23,0.00,1.00,-81.60,57.60 +105.60,-14.40,5.77,0.00,1.00,-76.80,57.60 +-72.00,9.60,10.25,0.00,1.00,-67.20,52.80 +115.20,-9.60,5.75,0.00,1.00,-62.40,52.80 +-62.40,9.60,10.28,0.00,1.00,-57.60,48.00 +124.80,-9.60,5.72,0.00,1.00,-52.80,43.20 +-52.80,9.60,10.30,0.00,1.00,-48.00,43.20 +134.40,-9.60,5.70,0.00,1.00,-43.20,38.40 +-43.20,9.60,10.32,0.00,1.00,-38.40,33.60 +144.00,-9.60,5.68,0.00,1.00,-33.60,33.60 +-33.60,4.80,10.34,0.00,1.00,-28.80,28.80 +153.60,-4.80,5.66,0.00,1.00,-24.00,24.00 +-24.00,4.80,10.36,0.00,1.00,-19.20,19.20 +163.20,-4.80,5.64,0.00,1.00,-14.40,14.40 +-14.40,4.80,10.38,0.00,1.00,-14.40,14.40 +172.80,-0.00,5.62,0.00,1.00,-9.60,9.60 +-4.80,0.00,10.40,0.00,1.00,-4.80,4.80 +0.00,0.00,5.60,0.00,1.00,0.00,0.00 +-177.60,0.00,10.42,0.00,1.00,4.80,-4.80 +9.60,-4.80,5.58,0.00,1.00,9.60,-9.60 +-168.00,4.80,10.45,0.00,1.00,14.40,-14.40 +19.20,-4.80,5.55,0.00,1.00,19.20,-19.20 +-158.40,4.80,10.47,0.00,1.00,19.20,-19.20 +28.80,-9.60,5.53,0.00,1.00,24.00,-24.00 +-148.80,9.60,10.49,0.00,1.00,28.80,-28.80 +38.40,-9.60,5.51,0.00,1.00,33.60,-33.60 +-139.20,9.60,10.51,0.00,1.00,38.40,-38.40 +48.00,-14.40,5.49,0.00,1.00,43.20,-43.20 +-129.60,14.40,10.53,0.00,1.00,48.00,-43.20 +57.60,-14.40,5.47,0.00,1.00,52.80,-48.00 +-120.00,14.40,10.55,0.00,1.00,57.60,-52.80 +67.20,-14.40,5.45,0.00,1.00,62.40,-52.80 +-110.40,14.40,10.57,0.00,1.00,72.00,-57.60 +76.80,-19.20,5.43,0.00,1.00,76.80,-57.60 +-100.80,19.20,10.60,0.00,1.00,81.60,-62.40 +86.40,-19.20,5.40,0.00,1.00,86.40,-62.40 +-86.40,19.20,10.62,0.00,1.00,91.20,-62.40 +96.00,-19.20,5.38,0.00,1.00,96.00,-62.40 +-76.80,19.20,10.64,0.00,1.00,100.80,-62.40 +105.60,-14.40,5.36,0.00,1.00,105.60,-57.60 +-67.20,14.40,10.66,0.00,1.00,110.40,-57.60 +115.20,-14.40,5.34,0.00,1.00,120.00,-52.80 +-57.60,14.40,10.68,0.00,1.00,124.80,-48.00 +124.80,-14.40,5.32,0.00,1.00,129.60,-48.00 +-48.00,14.40,10.70,0.00,1.00,134.40,-43.20 +134.40,-14.40,5.30,0.00,1.00,139.20,-38.40 +-38.40,9.60,10.72,0.00,1.00,144.00,-33.60 +144.00,-9.60,5.28,0.00,1.00,148.80,-33.60 +-28.80,9.60,10.74,0.00,1.00,153.60,-28.80 +153.60,-9.60,5.26,0.00,1.00,158.40,-24.00 +-19.20,4.80,10.77,0.00,1.00,158.40,-19.20 +163.20,-4.80,5.23,0.00,1.00,163.20,-14.40 +-9.60,4.80,10.79,0.00,1.00,168.00,-9.60 +172.80,-0.00,5.21,0.00,1.00,172.80,-4.80 +-0.00,0.00,10.81,0.00,1.00,177.60,-0.00 +-177.60,0.00,5.19,0.00,1.00,-177.60,0.00 +4.80,-0.00,10.83,0.00,1.00,-172.80,4.80 +-168.00,4.80,5.17,0.00,1.00,-168.00,9.60 +14.40,-4.80,10.85,0.00,1.00,-163.20,14.40 +-158.40,4.80,5.15,0.00,1.00,-158.40,19.20 +24.00,-9.60,10.87,0.00,1.00,-158.40,24.00 +-148.80,9.60,5.13,0.00,1.00,-153.60,28.80 +33.60,-9.60,10.89,0.00,1.00,-148.80,33.60 +-139.20,9.60,5.11,0.00,1.00,-144.00,33.60 +43.20,-14.40,10.92,0.00,1.00,-139.20,38.40 +-129.60,14.40,5.08,0.00,1.00,-134.40,43.20 +52.80,-14.40,10.94,0.00,1.00,-129.60,48.00 +-120.00,14.40,5.06,0.00,1.00,-124.80,48.00 +62.40,-14.40,10.96,0.00,1.00,-120.00,52.80 +-110.40,14.40,5.04,0.00,1.00,-110.40,57.60 +72.00,-14.40,10.98,0.00,1.00,-105.60,57.60 +-100.80,19.20,5.02,0.00,1.00,-100.80,62.40 +81.60,-19.20,11.00,0.00,1.00,-96.00,62.40 +-91.20,19.20,5.00,0.00,1.00,-91.20,62.40 +96.00,-19.20,11.02,0.00,1.00,-86.40,62.40 +-81.60,19.20,4.98,0.00,1.00,-81.60,62.40 +105.60,-19.20,11.04,0.00,1.00,-76.80,57.60 +-72.00,14.40,4.96,0.00,1.00,-72.00,57.60 +115.20,-14.40,11.07,0.00,1.00,-62.40,52.80 +-62.40,14.40,4.93,0.00,1.00,-57.60,52.80 +124.80,-14.40,11.09,0.00,1.00,-52.80,48.00 +-52.80,14.40,4.91,0.00,1.00,-48.00,43.20 +134.40,-14.40,11.11,0.00,1.00,-43.20,43.20 +-43.20,9.60,4.89,0.00,1.00,-38.40,38.40 +144.00,-9.60,11.13,0.00,1.00,-33.60,33.60 +-33.60,9.60,4.87,0.00,1.00,-28.80,28.80 +153.60,-9.60,11.15,0.00,1.00,-24.00,24.00 +-24.00,4.80,4.85,0.00,1.00,-19.20,19.20 +163.20,-4.80,11.17,0.00,1.00,-19.20,19.20 +-14.40,4.80,4.83,0.00,1.00,-14.40,14.40 +172.80,-4.80,11.19,0.00,1.00,-9.60,9.60 +-4.80,0.00,4.81,0.00,1.00,-4.80,4.80 +0.00,0.00,11.21,0.00,1.00,0.00,0.00 +-177.60,0.00,4.79,0.00,1.00,4.80,-4.80 +9.60,-4.80,11.24,0.00,1.00,9.60,-9.60 +-168.00,4.80,4.76,0.00,1.00,14.40,-14.40 +19.20,-4.80,11.26,0.00,1.00,19.20,-19.20 +-158.40,9.60,4.74,0.00,1.00,24.00,-24.00 +28.80,-9.60,11.28,0.00,1.00,28.80,-24.00 +-148.80,14.40,4.72,0.00,1.00,33.60,-28.80 +38.40,-14.40,11.30,0.00,1.00,38.40,-33.60 +-139.20,14.40,4.70,0.00,1.00,43.20,-38.40 +48.00,-14.40,11.32,0.00,1.00,48.00,-43.20 +-129.60,19.20,4.68,0.00,1.00,52.80,-48.00 +57.60,-19.20,11.34,0.00,1.00,57.60,-52.80 +-120.00,19.20,4.66,0.00,1.00,62.40,-52.80 +67.20,-19.20,11.36,0.00,1.00,67.20,-57.60 +-110.40,19.20,4.64,0.00,1.00,72.00,-62.40 +76.80,-19.20,11.39,0.00,1.00,76.80,-62.40 +-100.80,24.00,4.61,0.00,1.00,81.60,-67.20 +86.40,-24.00,11.41,0.00,1.00,86.40,-67.20 +-86.40,24.00,4.59,0.00,1.00,91.20,-67.20 +96.00,-24.00,11.43,0.00,1.00,96.00,-67.20 +-76.80,24.00,4.57,0.00,1.00,100.80,-67.20 +105.60,-19.20,11.45,0.00,1.00,105.60,-62.40 +-67.20,19.20,4.55,0.00,1.00,110.40,-57.60 +115.20,-19.20,11.47,0.00,1.00,115.20,-57.60 +-57.60,19.20,4.53,0.00,1.00,120.00,-52.80 +124.80,-19.20,11.49,0.00,1.00,124.80,-48.00 +-48.00,19.20,4.51,0.00,1.00,129.60,-43.20 +134.40,-14.40,11.51,0.00,1.00,134.40,-43.20 +-38.40,14.40,4.49,0.00,1.00,139.20,-38.40 +144.00,-14.40,11.54,0.00,1.00,144.00,-33.60 +-28.80,9.60,4.46,0.00,1.00,148.80,-28.80 +153.60,-9.60,11.56,0.00,1.00,153.60,-24.00 +-19.20,9.60,4.44,0.00,1.00,158.40,-19.20 +163.20,-4.80,11.58,0.00,1.00,163.20,-14.40 +-9.60,4.80,4.42,0.00,1.00,168.00,-9.60 +172.80,-4.80,11.60,0.00,1.00,172.80,-4.80 +-0.00,0.00,4.40,0.00,1.00,177.60,-0.00 +-177.60,0.00,11.62,0.00,1.00,-177.60,0.00 +4.80,-4.80,4.38,0.00,1.00,-172.80,4.80 +-168.00,4.80,11.64,0.00,1.00,-168.00,9.60 +14.40,-4.80,4.36,0.00,1.00,-163.20,14.40 +-158.40,9.60,11.66,0.00,1.00,-158.40,19.20 +24.00,-9.60,4.34,0.00,1.00,-153.60,24.00 +-148.80,9.60,11.68,0.00,1.00,-148.80,28.80 +33.60,-14.40,4.32,0.00,1.00,-144.00,33.60 +-139.20,14.40,11.71,0.00,1.00,-139.20,38.40 +43.20,-14.40,4.29,0.00,1.00,-134.40,43.20 +-129.60,19.20,11.73,0.00,1.00,-129.60,43.20 +52.80,-19.20,4.27,0.00,1.00,-124.80,48.00 +-120.00,19.20,11.75,0.00,1.00,-120.00,52.80 +62.40,-19.20,4.25,0.00,1.00,-115.20,57.60 +-110.40,19.20,11.77,0.00,1.00,-110.40,57.60 +72.00,-19.20,4.23,0.00,1.00,-105.60,62.40 +-100.80,24.00,11.79,0.00,1.00,-100.80,67.20 +81.60,-24.00,4.21,0.00,1.00,-96.00,67.20 +-91.20,24.00,11.81,0.00,1.00,-91.20,67.20 +96.00,-24.00,4.19,0.00,1.00,-86.40,67.20 +-81.60,24.00,11.83,0.00,1.00,-81.60,67.20 +105.60,-19.20,4.17,0.00,1.00,-76.80,62.40 +-72.00,19.20,11.86,0.00,1.00,-72.00,62.40 +115.20,-19.20,4.14,0.00,1.00,-67.20,57.60 +-62.40,19.20,11.88,0.00,1.00,-62.40,52.80 +124.80,-19.20,4.12,0.00,1.00,-57.60,52.80 +-52.80,19.20,11.90,0.00,1.00,-52.80,48.00 +134.40,-14.40,4.10,0.00,1.00,-48.00,43.20 +-43.20,14.40,11.92,0.00,1.00,-43.20,38.40 +144.00,-14.40,4.08,0.00,1.00,-38.40,33.60 +-33.60,14.40,11.94,0.00,1.00,-33.60,28.80 +153.60,-9.60,4.06,0.00,1.00,-28.80,24.00 +-24.00,9.60,11.96,0.00,1.00,-24.00,24.00 +163.20,-4.80,4.04,0.00,1.00,-19.20,19.20 +-14.40,4.80,11.98,0.00,1.00,-14.40,14.40 +172.80,-4.80,4.02,0.00,1.00,-9.60,9.60 +-4.80,0.00,12.01,0.00,1.00,-4.80,4.80 +0.00,0.00,3.99,0.00,1.00,0.00,0.00 +-177.60,0.00,12.03,0.00,1.00,4.80,-4.80 +9.60,-4.80,3.97,0.00,1.00,9.60,-9.60 +-168.00,4.80,12.05,0.00,1.00,14.40,-14.40 +19.20,-9.60,3.95,0.00,1.00,19.20,-19.20 +-158.40,9.60,12.07,0.00,1.00,24.00,-24.00 +24.00,-14.40,3.93,0.00,1.00,28.80,-28.80 +-148.80,14.40,12.09,0.00,1.00,33.60,-33.60 +33.60,-14.40,3.91,0.00,1.00,38.40,-38.40 +-139.20,19.20,12.11,0.00,1.00,43.20,-38.40 +43.20,-19.20,3.89,0.00,1.00,48.00,-43.20 +-129.60,19.20,12.13,0.00,1.00,52.80,-48.00 +52.80,-24.00,3.87,0.00,1.00,57.60,-52.80 +-120.00,24.00,12.15,0.00,1.00,62.40,-57.60 +62.40,-24.00,3.85,0.00,1.00,67.20,-62.40 +-110.40,24.00,12.18,0.00,1.00,72.00,-62.40 +76.80,-24.00,3.82,0.00,1.00,76.80,-67.20 +-100.80,28.80,12.20,0.00,1.00,81.60,-72.00 +86.40,-28.80,3.80,0.00,1.00,86.40,-72.00 +-86.40,28.80,12.22,0.00,1.00,91.20,-72.00 +96.00,-28.80,3.78,0.00,1.00,96.00,-72.00 +-76.80,28.80,12.24,0.00,1.00,100.80,-67.20 +105.60,-24.00,3.76,0.00,1.00,105.60,-67.20 +-67.20,24.00,12.26,0.00,1.00,110.40,-62.40 +120.00,-24.00,3.74,0.00,1.00,115.20,-57.60 +-57.60,24.00,12.28,0.00,1.00,120.00,-57.60 +129.60,-24.00,3.72,0.00,1.00,124.80,-52.80 +-48.00,19.20,12.30,0.00,1.00,129.60,-48.00 +139.20,-19.20,3.70,0.00,1.00,134.40,-43.20 +-38.40,19.20,12.33,0.00,1.00,139.20,-38.40 +148.80,-14.40,3.67,0.00,1.00,144.00,-33.60 +-28.80,14.40,12.35,0.00,1.00,148.80,-28.80 +158.40,-9.60,3.65,0.00,1.00,153.60,-24.00 +-19.20,9.60,12.37,0.00,1.00,158.40,-19.20 +163.20,-9.60,3.63,0.00,1.00,163.20,-14.40 +-9.60,4.80,12.39,0.00,1.00,168.00,-9.60 +172.80,-4.80,3.61,0.00,1.00,172.80,-4.80 +-0.00,0.00,12.41,0.00,1.00,177.60,-0.00 +-177.60,0.00,3.59,0.00,1.00,-177.60,0.00 +4.80,-4.80,12.43,0.00,1.00,-172.80,4.80 +-168.00,4.80,3.57,0.00,1.00,-168.00,9.60 +14.40,-9.60,12.45,0.00,1.00,-163.20,14.40 +-158.40,9.60,3.55,0.00,1.00,-158.40,19.20 +24.00,-9.60,12.48,0.00,1.00,-153.60,24.00 +-153.60,14.40,3.52,0.00,1.00,-148.80,28.80 +33.60,-14.40,12.50,0.00,1.00,-144.00,33.60 +-144.00,19.20,3.50,0.00,1.00,-139.20,38.40 +43.20,-19.20,12.52,0.00,1.00,-134.40,43.20 +-134.40,19.20,3.48,0.00,1.00,-129.60,48.00 +52.80,-24.00,12.54,0.00,1.00,-124.80,52.80 +-124.80,24.00,3.46,0.00,1.00,-120.00,57.60 +62.40,-24.00,12.56,0.00,1.00,-115.20,57.60 +-110.40,24.00,3.44,0.00,1.00,-110.40,62.40 +72.00,-24.00,12.58,0.00,1.00,-105.60,67.20 +-100.80,28.80,3.42,0.00,1.00,-100.80,67.20 +81.60,-28.80,12.60,0.00,1.00,-96.00,72.00 +-91.20,28.80,3.40,0.00,1.00,-91.20,72.00 +96.00,-28.80,12.62,0.00,1.00,-86.40,72.00 +-81.60,28.80,3.38,0.00,1.00,-81.60,72.00 +105.60,-24.00,12.65,0.00,1.00,-76.80,67.20 +-72.00,24.00,3.35,0.00,1.00,-72.00,62.40 +115.20,-24.00,12.67,0.00,1.00,-67.20,62.40 +-57.60,24.00,3.33,0.00,1.00,-62.40,57.60 +124.80,-24.00,12.69,0.00,1.00,-57.60,52.80 +-48.00,19.20,3.31,0.00,1.00,-52.80,48.00 +134.40,-19.20,12.71,0.00,1.00,-48.00,43.20 +-38.40,19.20,3.29,0.00,1.00,-43.20,38.40 +144.00,-14.40,12.73,0.00,1.00,-38.40,38.40 +-28.80,14.40,3.27,0.00,1.00,-33.60,33.60 +153.60,-14.40,12.75,0.00,1.00,-28.80,28.80 +-24.00,9.60,3.25,0.00,1.00,-24.00,24.00 +163.20,-9.60,12.77,0.00,1.00,-19.20,19.20 +-14.40,4.80,3.23,0.00,1.00,-14.40,14.40 +172.80,-4.80,12.80,0.00,1.00,-9.60,9.60 +-4.80,0.00,3.20,0.00,1.00,-4.80,4.80 +0.00,0.00,12.82,0.00,1.00,0.00,0.00 +-177.60,4.80,3.18,0.00,1.00,4.80,-4.80 +9.60,-4.80,12.84,0.00,1.00,9.60,-9.60 +-168.00,9.60,3.16,0.00,1.00,14.40,-14.40 +14.40,-9.60,12.86,0.00,1.00,19.20,-19.20 +-158.40,14.40,3.14,0.00,1.00,24.00,-24.00 +24.00,-14.40,12.88,0.00,1.00,28.80,-28.80 +-148.80,19.20,3.12,0.00,1.00,33.60,-33.60 +33.60,-19.20,12.90,0.00,1.00,38.40,-38.40 +-139.20,19.20,3.10,0.00,1.00,43.20,-43.20 +43.20,-24.00,12.92,0.00,1.00,48.00,-48.00 +-129.60,24.00,3.08,0.00,1.00,52.80,-52.80 +52.80,-28.80,12.95,0.00,1.00,57.60,-57.60 +-120.00,28.80,3.05,0.00,1.00,62.40,-57.60 +62.40,-28.80,12.97,0.00,1.00,67.20,-62.40 +-110.40,28.80,3.03,0.00,1.00,72.00,-67.20 +76.80,-28.80,12.99,0.00,1.00,76.80,-72.00 +-100.80,33.60,3.01,0.00,1.00,81.60,-72.00 +86.40,-33.60,13.01,0.00,1.00,86.40,-76.80 +-86.40,33.60,2.99,0.00,1.00,91.20,-76.80 +96.00,-33.60,13.03,0.00,1.00,96.00,-76.80 +-76.80,28.80,2.97,0.00,1.00,100.80,-72.00 +110.40,-28.80,13.05,0.00,1.00,105.60,-72.00 +-67.20,28.80,2.95,0.00,1.00,110.40,-67.20 +120.00,-28.80,13.07,0.00,1.00,115.20,-62.40 +-57.60,28.80,2.93,0.00,1.00,120.00,-57.60 +129.60,-24.00,13.09,0.00,1.00,124.80,-52.80 +-48.00,24.00,2.91,0.00,1.00,129.60,-48.00 +139.20,-24.00,13.12,0.00,1.00,134.40,-43.20 +-38.40,19.20,2.88,0.00,1.00,139.20,-38.40 +148.80,-19.20,13.14,0.00,1.00,144.00,-33.60 +-28.80,14.40,2.86,0.00,1.00,148.80,-28.80 +158.40,-14.40,13.16,0.00,1.00,153.60,-24.00 +-19.20,9.60,2.84,0.00,1.00,158.40,-19.20 +168.00,-9.60,13.18,0.00,1.00,163.20,-14.40 +-9.60,4.80,2.82,0.00,1.00,168.00,-9.60 +172.80,-4.80,13.20,0.00,1.00,172.80,-4.80 +-0.00,0.00,2.80,0.00,1.00,177.60,-0.00 +-177.60,0.00,13.22,0.00,1.00,-177.60,0.00 +4.80,-4.80,2.78,0.00,1.00,-172.80,4.80 +-168.00,4.80,13.24,0.00,1.00,-168.00,9.60 +14.40,-9.60,2.76,0.00,1.00,-163.20,14.40 +-163.20,9.60,13.27,0.00,1.00,-158.40,19.20 +24.00,-14.40,2.73,0.00,1.00,-153.60,24.00 +-153.60,14.40,13.29,0.00,1.00,-148.80,28.80 +33.60,-19.20,2.71,0.00,1.00,-144.00,33.60 +-144.00,19.20,13.31,0.00,1.00,-139.20,38.40 +43.20,-24.00,2.69,0.00,1.00,-134.40,43.20 +-134.40,24.00,13.33,0.00,1.00,-129.60,48.00 +52.80,-24.00,2.67,0.00,1.00,-124.80,52.80 +-124.80,28.80,13.35,0.00,1.00,-120.00,57.60 +62.40,-28.80,2.65,0.00,1.00,-115.20,62.40 +-115.20,28.80,13.37,0.00,1.00,-110.40,67.20 +72.00,-28.80,2.63,0.00,1.00,-105.60,72.00 +-100.80,28.80,13.39,0.00,1.00,-100.80,72.00 +81.60,-33.60,2.61,0.00,1.00,-96.00,76.80 +-91.20,33.60,13.42,0.00,1.00,-91.20,76.80 +96.00,-33.60,2.58,0.00,1.00,-86.40,76.80 +-81.60,33.60,13.44,0.00,1.00,-81.60,72.00 +105.60,-28.80,2.56,0.00,1.00,-76.80,72.00 +-67.20,28.80,13.46,0.00,1.00,-72.00,67.20 +115.20,-28.80,2.54,0.00,1.00,-67.20,62.40 +-57.60,28.80,13.48,0.00,1.00,-62.40,57.60 +124.80,-28.80,2.52,0.00,1.00,-57.60,57.60 +-48.00,24.00,13.50,0.00,1.00,-52.80,52.80 +134.40,-24.00,2.50,0.00,1.00,-48.00,48.00 +-38.40,19.20,13.52,0.00,1.00,-43.20,43.20 +144.00,-19.20,2.48,0.00,1.00,-38.40,38.40 +-28.80,19.20,13.54,0.00,1.00,-33.60,33.60 +153.60,-14.40,2.46,0.00,1.00,-28.80,28.80 +-19.20,14.40,13.56,0.00,1.00,-24.00,24.00 +163.20,-9.60,2.44,0.00,1.00,-19.20,19.20 +-14.40,9.60,13.59,0.00,1.00,-14.40,14.40 +172.80,-4.80,2.41,0.00,1.00,-9.60,9.60 +-4.80,4.80,13.61,0.00,1.00,-4.80,4.80 +0.00,0.00,2.39,0.00,1.00,0.00,0.00 +-177.60,4.80,13.63,0.00,1.00,4.80,-4.80 +9.60,-4.80,2.37,0.00,1.00,9.60,-9.60 +-168.00,9.60,13.65,0.00,1.00,14.40,-14.40 +14.40,-9.60,2.35,0.00,1.00,19.20,-19.20 +-158.40,14.40,13.67,0.00,1.00,24.00,-24.00 +24.00,-14.40,2.33,0.00,1.00,28.80,-28.80 +-153.60,19.20,13.69,0.00,1.00,33.60,-33.60 +33.60,-24.00,2.31,0.00,1.00,38.40,-38.40 +-144.00,24.00,13.71,0.00,1.00,43.20,-43.20 +43.20,-24.00,2.29,0.00,1.00,48.00,-48.00 +-134.40,28.80,13.74,0.00,1.00,52.80,-52.80 +52.80,-28.80,2.26,0.00,1.00,57.60,-57.60 +-124.80,33.60,13.76,0.00,1.00,62.40,-62.40 +62.40,-33.60,2.24,0.00,1.00,67.20,-67.20 +-110.40,33.60,13.78,0.00,1.00,72.00,-72.00 +72.00,-33.60,2.22,0.00,1.00,76.80,-72.00 +-100.80,38.40,13.80,0.00,1.00,81.60,-76.80 +86.40,-38.40,2.20,0.00,1.00,86.40,-81.60 +-86.40,38.40,13.82,0.00,1.00,91.20,-81.60 +96.00,-38.40,2.18,0.00,1.00,96.00,-81.60 +-76.80,33.60,13.84,0.00,1.00,100.80,-76.80 +110.40,-33.60,2.16,0.00,1.00,105.60,-72.00 +-67.20,33.60,13.86,0.00,1.00,110.40,-67.20 +120.00,-33.60,2.14,0.00,1.00,115.20,-62.40 +-52.80,28.80,13.89,0.00,1.00,120.00,-57.60 +129.60,-28.80,2.11,0.00,1.00,124.80,-52.80 +-43.20,28.80,13.91,0.00,1.00,129.60,-48.00 +139.20,-24.00,2.09,0.00,1.00,134.40,-43.20 +-33.60,24.00,13.93,0.00,1.00,139.20,-38.40 +148.80,-19.20,2.07,0.00,1.00,144.00,-33.60 +-24.00,19.20,13.95,0.00,1.00,148.80,-28.80 +158.40,-14.40,2.05,0.00,1.00,153.60,-24.00 +-19.20,14.40,13.97,0.00,1.00,158.40,-19.20 +168.00,-9.60,2.03,0.00,1.00,163.20,-14.40 +-9.60,4.80,13.99,0.00,1.00,168.00,-9.60 +172.80,-4.80,2.01,0.00,1.00,172.80,-4.80 +-0.00,0.00,14.01,0.00,1.00,177.60,-0.00 +-177.60,0.00,1.99,0.00,1.00,-177.60,0.00 +4.80,-4.80,14.03,0.00,1.00,-172.80,4.80 +-168.00,4.80,1.97,0.00,1.00,-168.00,9.60 +14.40,-9.60,14.06,0.00,1.00,-163.20,14.40 +-163.20,14.40,1.94,0.00,1.00,-158.40,19.20 +24.00,-14.40,14.08,0.00,1.00,-153.60,24.00 +-153.60,19.20,1.92,0.00,1.00,-148.80,28.80 +28.80,-19.20,14.10,0.00,1.00,-144.00,33.60 +-144.00,24.00,1.90,0.00,1.00,-139.20,38.40 +38.40,-24.00,14.12,0.00,1.00,-134.40,43.20 +-134.40,28.80,1.88,0.00,1.00,-129.60,48.00 +48.00,-28.80,14.14,0.00,1.00,-124.80,52.80 +-124.80,28.80,1.86,0.00,1.00,-120.00,57.60 +57.60,-33.60,14.16,0.00,1.00,-115.20,62.40 +-115.20,33.60,1.84,0.00,1.00,-110.40,67.20 +72.00,-33.60,14.18,0.00,1.00,-105.60,72.00 +-105.60,33.60,1.82,0.00,1.00,-100.80,76.80 +81.60,-38.40,14.21,0.00,1.00,-96.00,81.60 +-91.20,38.40,1.79,0.00,1.00,-91.20,81.60 +96.00,-38.40,14.23,0.00,1.00,-86.40,81.60 +-81.60,38.40,1.77,0.00,1.00,-81.60,76.80 +105.60,-33.60,14.25,0.00,1.00,-76.80,72.00 +-67.20,33.60,1.75,0.00,1.00,-72.00,72.00 +120.00,-33.60,14.27,0.00,1.00,-67.20,67.20 +-57.60,33.60,1.73,0.00,1.00,-62.40,62.40 +129.60,-28.80,14.29,0.00,1.00,-57.60,57.60 +-48.00,28.80,1.71,0.00,1.00,-52.80,52.80 +139.20,-24.00,14.31,0.00,1.00,-48.00,48.00 +-38.40,24.00,1.69,0.00,1.00,-43.20,43.20 +148.80,-24.00,14.33,0.00,1.00,-38.40,38.40 +-28.80,19.20,1.67,0.00,1.00,-33.60,33.60 +158.40,-14.40,14.36,0.00,1.00,-28.80,28.80 +-19.20,14.40,1.64,0.00,1.00,-24.00,24.00 +163.20,-9.60,14.38,0.00,1.00,-19.20,19.20 +-9.60,9.60,1.62,0.00,1.00,-14.40,14.40 +172.80,-4.80,14.40,0.00,1.00,-9.60,9.60 +-4.80,4.80,1.60,0.00,1.00,-4.80,4.80 +0.00,0.00,14.42,0.00,1.00,0.00,0.00 +-177.60,4.80,1.58,0.00,1.00,4.80,-4.80 +9.60,-4.80,14.44,0.00,1.00,9.60,-9.60 +-168.00,9.60,1.56,0.00,1.00,14.40,-14.40 +14.40,-14.40,14.46,0.00,1.00,19.20,-19.20 +-163.20,14.40,1.54,0.00,1.00,24.00,-24.00 +24.00,-19.20,14.48,0.00,1.00,28.80,-28.80 +-153.60,19.20,1.52,0.00,1.00,33.60,-33.60 +28.80,-24.00,14.50,0.00,1.00,38.40,-38.40 +-144.00,28.80,1.50,0.00,1.00,43.20,-43.20 +38.40,-28.80,14.53,0.00,1.00,48.00,-48.00 +-134.40,33.60,1.47,0.00,1.00,52.80,-52.80 +48.00,-33.60,14.55,0.00,1.00,57.60,-57.60 +-124.80,33.60,1.45,0.00,1.00,62.40,-62.40 +62.40,-38.40,14.57,0.00,1.00,67.20,-67.20 +-115.20,38.40,1.43,0.00,1.00,72.00,-72.00 +72.00,-38.40,14.59,0.00,1.00,76.80,-76.80 +-100.80,43.20,1.41,0.00,1.00,81.60,-81.60 +86.40,-43.20,14.61,0.00,1.00,86.40,-86.40 +-86.40,43.20,1.39,0.00,1.00,91.20,-86.40 +96.00,-43.20,14.63,0.00,1.00,96.00,-81.60 +-76.80,38.40,1.37,0.00,1.00,100.80,-76.80 +110.40,-38.40,14.65,0.00,1.00,105.60,-72.00 +-62.40,38.40,1.35,0.00,1.00,110.40,-67.20 +120.00,-38.40,14.68,0.00,1.00,115.20,-62.40 +-52.80,33.60,1.32,0.00,1.00,120.00,-57.60 +134.40,-33.60,14.70,0.00,1.00,124.80,-52.80 +-43.20,28.80,1.30,0.00,1.00,129.60,-48.00 +144.00,-28.80,14.72,0.00,1.00,134.40,-43.20 +-33.60,24.00,1.28,0.00,1.00,139.20,-38.40 +153.60,-24.00,14.74,0.00,1.00,144.00,-33.60 +-24.00,19.20,1.26,0.00,1.00,148.80,-28.80 +158.40,-19.20,14.76,0.00,1.00,153.60,-24.00 +-14.40,14.40,1.24,0.00,1.00,158.40,-19.20 +168.00,-9.60,14.78,0.00,1.00,163.20,-14.40 +-9.60,9.60,1.22,0.00,1.00,168.00,-9.60 +172.80,-4.80,14.80,0.00,1.00,172.80,-4.80 +-0.00,0.00,1.20,0.00,1.00,177.60,-0.00 +-177.60,0.00,14.83,0.00,1.00,-177.60,0.00 +4.80,-4.80,1.17,0.00,1.00,-172.80,4.80 +-172.80,9.60,14.85,0.00,1.00,-168.00,9.60 +14.40,-9.60,1.15,0.00,1.00,-163.20,14.40 +-163.20,14.40,14.87,0.00,1.00,-158.40,19.20 +19.20,-19.20,1.13,0.00,1.00,-153.60,24.00 +-153.60,19.20,14.89,0.00,1.00,-148.80,28.80 +28.80,-24.00,1.11,0.00,1.00,-144.00,33.60 +-148.80,24.00,14.91,0.00,1.00,-139.20,38.40 +38.40,-28.80,1.09,0.00,1.00,-134.40,43.20 +-139.20,28.80,14.93,0.00,1.00,-129.60,48.00 +48.00,-33.60,1.07,0.00,1.00,-124.80,52.80 +-129.60,33.60,14.95,0.00,1.00,-120.00,57.60 +57.60,-38.40,1.05,0.00,1.00,-115.20,62.40 +-115.20,38.40,14.97,0.00,1.00,-110.40,67.20 +67.20,-38.40,1.03,0.00,1.00,-105.60,72.00 +-105.60,38.40,15.00,0.00,1.00,-100.80,76.80 +81.60,-43.20,1.00,0.00,1.00,-96.00,81.60 +-91.20,43.20,15.02,0.00,1.00,-91.20,86.40 +96.00,-43.20,0.98,0.00,1.00,-86.40,86.40 +-76.80,43.20,15.04,0.00,1.00,-81.60,81.60 +105.60,-38.40,0.96,0.00,1.00,-76.80,76.80 +-67.20,38.40,15.06,0.00,1.00,-72.00,72.00 +120.00,-38.40,0.94,0.00,1.00,-67.20,67.20 +-52.80,33.60,15.08,0.00,1.00,-62.40,62.40 +129.60,-33.60,0.92,0.00,1.00,-57.60,57.60 +-43.20,33.60,15.10,0.00,1.00,-52.80,52.80 +139.20,-28.80,0.90,0.00,1.00,-48.00,48.00 +-33.60,28.80,15.12,0.00,1.00,-43.20,43.20 +148.80,-24.00,0.88,0.00,1.00,-38.40,38.40 +-28.80,19.20,15.15,0.00,1.00,-33.60,33.60 +158.40,-19.20,0.85,0.00,1.00,-28.80,28.80 +-19.20,14.40,15.17,0.00,1.00,-24.00,24.00 +163.20,-14.40,0.83,0.00,1.00,-19.20,19.20 +-9.60,9.60,15.19,0.00,1.00,-14.40,14.40 +172.80,-4.80,0.81,0.00,1.00,-9.60,9.60 +-4.80,4.80,15.21,0.00,1.00,-4.80,4.80 +0.00,0.00,0.79,0.00,1.00,0.00,0.00 +-177.60,4.80,15.23,0.00,1.00,4.80,-4.80 +4.80,-4.80,0.77,0.00,1.00,9.60,-9.60 +-168.00,9.60,15.25,0.00,1.00,14.40,-14.40 +14.40,-14.40,0.75,0.00,1.00,19.20,-19.20 +-163.20,19.20,15.27,0.00,1.00,24.00,-24.00 +19.20,-19.20,0.73,0.00,1.00,28.80,-28.80 +-153.60,24.00,15.30,0.00,1.00,33.60,-33.60 +28.80,-28.80,0.70,0.00,1.00,38.40,-38.40 +-148.80,28.80,15.32,0.00,1.00,43.20,-43.20 +38.40,-33.60,0.68,0.00,1.00,48.00,-48.00 +-139.20,33.60,15.34,0.00,1.00,52.80,-52.80 +48.00,-38.40,0.66,0.00,1.00,57.60,-57.60 +-124.80,38.40,15.36,0.00,1.00,62.40,-62.40 +57.60,-43.20,0.64,0.00,1.00,67.20,-67.20 +-115.20,43.20,15.38,0.00,1.00,72.00,-72.00 +72.00,-43.20,0.62,0.00,1.00,76.80,-76.80 +-100.80,43.20,15.40,0.00,1.00,81.60,-81.60 +86.40,-48.00,0.60,0.00,1.00,86.40,-86.40 +-86.40,48.00,15.42,0.00,1.00,91.20,-86.40 +100.80,-48.00,0.58,0.00,1.00,96.00,-81.60 +-76.80,43.20,15.44,0.00,1.00,100.80,-76.80 +110.40,-43.20,0.56,0.00,1.00,105.60,-72.00 +-62.40,43.20,15.47,0.00,1.00,110.40,-67.20 +124.80,-38.40,0.53,0.00,1.00,115.20,-62.40 +-48.00,38.40,15.49,0.00,1.00,120.00,-57.60 +134.40,-38.40,0.51,0.00,1.00,124.80,-52.80 +-38.40,33.60,15.51,0.00,1.00,129.60,-48.00 +144.00,-28.80,0.49,0.00,1.00,134.40,-43.20 +-28.80,28.80,15.53,0.00,1.00,139.20,-38.40 +153.60,-24.00,0.47,0.00,1.00,144.00,-33.60 +-24.00,24.00,15.55,0.00,1.00,148.80,-28.80 +163.20,-19.20,0.45,0.00,1.00,153.60,-24.00 +-14.40,14.40,15.57,0.00,1.00,158.40,-19.20 +168.00,-14.40,0.43,0.00,1.00,163.20,-14.40 +-9.60,9.60,15.59,0.00,1.00,168.00,-9.60 +172.80,-4.80,0.41,0.00,1.00,172.80,-4.80 +-0.00,0.00,15.62,0.00,1.00,177.60,-0.00 +-177.60,0.00,0.38,0.00,1.00,-177.60,0.00 +4.80,-4.80,15.64,0.00,1.00,-172.80,4.80 +-172.80,9.60,0.36,0.00,1.00,-168.00,9.60 +9.60,-14.40,15.66,0.00,1.00,-163.20,14.40 +-163.20,14.40,0.34,0.00,1.00,-158.40,19.20 +19.20,-19.20,15.68,0.00,1.00,-153.60,24.00 +-158.40,24.00,0.32,0.00,1.00,-148.80,28.80 +28.80,-24.00,15.70,0.00,1.00,-144.00,33.60 +-148.80,28.80,0.30,0.00,1.00,-139.20,38.40 +33.60,-28.80,15.72,0.00,1.00,-134.40,43.20 +-139.20,33.60,0.28,0.00,1.00,-129.60,48.00 +43.20,-38.40,15.74,0.00,1.00,-124.80,52.80 +-129.60,38.40,0.26,0.00,1.00,-120.00,57.60 +57.60,-38.40,15.77,0.00,1.00,-115.20,62.40 +-120.00,43.20,0.23,0.00,1.00,-110.40,67.20 +67.20,-43.20,15.79,0.00,1.00,-105.60,72.00 +-105.60,43.20,0.21,0.00,1.00,-100.80,76.80 +81.60,-48.00,15.81,0.00,1.00,-96.00,81.60 +-91.20,48.00,0.19,0.00,1.00,-91.20,86.40 +96.00,-48.00,15.83,0.00,1.00,-86.40,86.40 +-76.80,43.20,0.17,0.00,1.00,-81.60,81.60 +110.40,-43.20,15.85,0.00,1.00,-76.80,76.80 +-67.20,43.20,0.15,0.00,1.00,-72.00,72.00 +120.00,-43.20,15.87,0.00,1.00,-67.20,67.20 +-52.80,38.40,0.13,0.00,1.00,-62.40,62.40 +134.40,-38.40,15.89,0.00,1.00,-57.60,57.60 +-43.20,33.60,0.11,0.00,1.00,-52.80,52.80 +144.00,-33.60,15.91,0.00,1.00,-48.00,48.00 +-33.60,28.80,0.09,0.00,1.00,-43.20,43.20 +153.60,-28.80,15.94,0.00,1.00,-38.40,38.40 +-24.00,24.00,0.06,0.00,1.00,-33.60,33.60 +158.40,-19.20,15.96,0.00,1.00,-28.80,28.80 +-19.20,19.20,0.04,0.00,1.00,-24.00,24.00 +168.00,-14.40,15.98,0.00,1.00,-19.20,19.20 +-9.60,9.60,0.02,0.00,1.00,-14.40,14.40 +172.80,-4.80,16.00,0.00,1.00,-9.60,9.60 +-4.80,4.80,0.00,0.00,1.00,-4.80,4.80 diff --git a/scripts/testv/stvISM4.csv b/scripts/testv/stvISM4.csv index 6318155a25063eee0dbf035a8ad94ca5ddac9c21..326176319a11d780fbf4dab842869b792887c8a5 100644 --- a/scripts/testv/stvISM4.csv +++ b/scripts/testv/stvISM4.csv @@ -1,1500 +1,1500 @@ --0.00,0.00,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 --0.00,9.60,1.00,0.00,1.00 --0.00,14.40,1.00,0.00,1.00 --0.00,19.20,1.00,0.00,1.00 --0.00,24.00,1.00,0.00,1.00 --0.00,28.80,1.00,0.00,1.00 --0.00,33.60,1.00,0.00,1.00 --0.00,38.40,1.00,0.00,1.00 --0.00,43.20,1.00,0.00,1.00 --0.00,48.00,1.00,0.00,1.00 --0.00,52.80,1.00,0.00,1.00 --0.00,57.60,1.00,0.00,1.00 --0.00,62.40,1.00,0.00,1.00 --0.00,67.20,1.00,0.00,1.00 --0.00,72.00,1.00,0.00,1.00 --0.00,76.80,1.00,0.00,1.00 --0.00,81.60,1.00,0.00,1.00 --0.00,86.40,1.00,0.00,1.00 --177.60,89.20,1.00,0.00,1.00 --177.60,86.40,1.00,0.00,1.00 --177.60,81.60,1.00,0.00,1.00 --177.60,76.80,1.00,0.00,1.00 --177.60,72.00,1.00,0.00,1.00 --177.60,67.20,1.00,0.00,1.00 -177.60,62.40,1.00,0.00,1.00 -177.60,57.60,1.00,0.00,1.00 -177.60,52.80,1.00,0.00,1.00 -177.60,48.00,1.00,0.00,1.00 -177.60,43.20,1.00,0.00,1.00 -177.60,38.40,1.00,0.00,1.00 -177.60,33.60,1.00,0.00,1.00 -177.60,28.80,1.00,0.00,1.00 -177.60,24.00,1.00,0.00,1.00 -177.60,19.20,1.00,0.00,1.00 -177.60,14.40,1.00,0.00,1.00 -177.60,9.60,1.00,0.00,1.00 -177.60,4.80,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 --177.60,-9.60,1.00,0.00,1.00 --177.60,-14.40,1.00,0.00,1.00 --177.60,-19.20,1.00,0.00,1.00 --177.60,-24.00,1.00,0.00,1.00 --177.60,-28.80,1.00,0.00,1.00 --177.60,-33.60,1.00,0.00,1.00 --177.60,-38.40,1.00,0.00,1.00 --177.60,-48.00,1.00,0.00,1.00 --177.60,-48.00,1.00,0.00,1.00 --177.60,-52.80,1.00,0.00,1.00 --177.60,-57.60,1.00,0.00,1.00 -177.60,-62.40,1.00,0.00,1.00 -177.60,-67.20,1.00,0.00,1.00 -177.60,-76.80,1.00,0.00,1.00 -177.60,-76.80,1.00,0.00,1.00 -177.60,-86.40,1.00,0.00,1.00 -177.60,-89.20,1.00,0.00,1.00 -0.00,-86.40,1.00,0.00,1.00 -0.00,-81.60,1.00,0.00,1.00 -0.00,-76.80,1.00,0.00,1.00 -0.00,-72.00,1.00,0.00,1.00 -0.00,-67.20,1.00,0.00,1.00 -0.00,-62.40,1.00,0.00,1.00 -0.00,-57.60,1.00,0.00,1.00 -0.00,-52.80,1.00,0.00,1.00 -0.00,-48.00,1.00,0.00,1.00 -0.00,-43.20,1.00,0.00,1.00 -0.00,-38.40,1.00,0.00,1.00 -0.00,-33.60,1.00,0.00,1.00 -0.00,-28.80,1.00,0.00,1.00 -0.00,-24.00,1.00,0.00,1.00 -0.00,-19.20,1.00,0.00,1.00 -0.00,-14.40,1.00,0.00,1.00 -0.00,-9.60,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,4.80,1.00,0.00,1.00 -0.00,9.60,1.00,0.00,1.00 -0.00,14.40,1.00,0.00,1.00 -0.00,19.20,1.00,0.00,1.00 -0.00,24.00,1.00,0.00,1.00 -4.80,28.80,1.00,0.00,1.00 -4.80,33.60,1.00,0.00,1.00 -4.80,38.40,1.00,0.00,1.00 -4.80,43.20,1.00,0.00,1.00 -4.80,48.00,1.00,0.00,1.00 -4.80,52.80,1.00,0.00,1.00 -9.60,57.60,1.00,0.00,1.00 -9.60,62.40,1.00,0.00,1.00 -9.60,67.20,1.00,0.00,1.00 -14.40,72.00,1.00,0.00,1.00 -19.20,76.80,1.00,0.00,1.00 -28.80,81.60,1.00,0.00,1.00 -52.80,86.40,1.00,0.00,1.00 -105.60,86.40,1.00,0.00,1.00 -139.20,81.60,1.00,0.00,1.00 -158.40,76.80,1.00,0.00,1.00 -163.20,72.00,1.00,0.00,1.00 -168.00,67.20,1.00,0.00,1.00 -168.00,62.40,1.00,0.00,1.00 -172.80,57.60,1.00,0.00,1.00 -172.80,52.80,1.00,0.00,1.00 -172.80,48.00,1.00,0.00,1.00 -172.80,43.20,1.00,0.00,1.00 -177.60,38.40,1.00,0.00,1.00 -177.60,33.60,1.00,0.00,1.00 -177.60,28.80,1.00,0.00,1.00 -177.60,24.00,1.00,0.00,1.00 -177.60,19.20,1.00,0.00,1.00 -177.60,14.40,1.00,0.00,1.00 -177.60,9.60,1.00,0.00,1.00 -177.60,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 --177.60,-9.60,1.00,0.00,1.00 --177.60,-14.40,1.00,0.00,1.00 --177.60,-19.20,1.00,0.00,1.00 --177.60,-24.00,1.00,0.00,1.00 --177.60,-28.80,1.00,0.00,1.00 --177.60,-33.60,1.00,0.00,1.00 --177.60,-38.40,1.00,0.00,1.00 --172.80,-43.20,1.00,0.00,1.00 --172.80,-48.00,1.00,0.00,1.00 --172.80,-52.80,1.00,0.00,1.00 --172.80,-57.60,1.00,0.00,1.00 --168.00,-62.40,1.00,0.00,1.00 --168.00,-67.20,1.00,0.00,1.00 --163.20,-72.00,1.00,0.00,1.00 --158.40,-76.80,1.00,0.00,1.00 --139.20,-81.60,1.00,0.00,1.00 --105.60,-86.40,1.00,0.00,1.00 --52.80,-86.40,1.00,0.00,1.00 --28.80,-81.60,1.00,0.00,1.00 --19.20,-76.80,1.00,0.00,1.00 --14.40,-72.00,1.00,0.00,1.00 --9.60,-67.20,1.00,0.00,1.00 --9.60,-62.40,1.00,0.00,1.00 --9.60,-57.60,1.00,0.00,1.00 --4.80,-52.80,1.00,0.00,1.00 --4.80,-48.00,1.00,0.00,1.00 --4.80,-43.20,1.00,0.00,1.00 --4.80,-38.40,1.00,0.00,1.00 --4.80,-33.60,1.00,0.00,1.00 --4.80,-28.80,1.00,0.00,1.00 --0.00,-24.00,1.00,0.00,1.00 --0.00,-19.20,1.00,0.00,1.00 --0.00,-14.40,1.00,0.00,1.00 --0.00,-9.60,1.00,0.00,1.00 --0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,4.80,1.00,0.00,1.00 -0.00,9.60,1.00,0.00,1.00 -4.80,14.40,1.00,0.00,1.00 -4.80,19.20,1.00,0.00,1.00 -4.80,24.00,1.00,0.00,1.00 -4.80,28.80,1.00,0.00,1.00 -4.80,33.60,1.00,0.00,1.00 -9.60,38.40,1.00,0.00,1.00 -9.60,43.20,1.00,0.00,1.00 -9.60,48.00,1.00,0.00,1.00 -14.40,52.80,1.00,0.00,1.00 -14.40,57.60,1.00,0.00,1.00 -19.20,62.40,1.00,0.00,1.00 -24.00,67.20,1.00,0.00,1.00 -28.80,72.00,1.00,0.00,1.00 -33.60,72.00,1.00,0.00,1.00 -48.00,76.80,1.00,0.00,1.00 -67.20,81.60,1.00,0.00,1.00 -96.00,81.60,1.00,0.00,1.00 -120.00,76.80,1.00,0.00,1.00 -139.20,76.80,1.00,0.00,1.00 -148.80,72.00,1.00,0.00,1.00 -153.60,67.20,1.00,0.00,1.00 -158.40,62.40,1.00,0.00,1.00 -163.20,57.60,1.00,0.00,1.00 -168.00,52.80,1.00,0.00,1.00 -168.00,48.00,1.00,0.00,1.00 -168.00,43.20,1.00,0.00,1.00 -172.80,38.40,1.00,0.00,1.00 -172.80,33.60,1.00,0.00,1.00 -172.80,28.80,1.00,0.00,1.00 -177.60,24.00,1.00,0.00,1.00 -177.60,19.20,1.00,0.00,1.00 -177.60,14.40,1.00,0.00,1.00 -177.60,9.60,1.00,0.00,1.00 -177.60,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 --177.60,-9.60,1.00,0.00,1.00 --177.60,-14.40,1.00,0.00,1.00 --177.60,-19.20,1.00,0.00,1.00 --177.60,-24.00,1.00,0.00,1.00 --172.80,-28.80,1.00,0.00,1.00 --172.80,-33.60,1.00,0.00,1.00 --172.80,-38.40,1.00,0.00,1.00 --168.00,-43.20,1.00,0.00,1.00 --168.00,-48.00,1.00,0.00,1.00 --168.00,-52.80,1.00,0.00,1.00 --163.20,-57.60,1.00,0.00,1.00 --158.40,-62.40,1.00,0.00,1.00 --153.60,-67.20,1.00,0.00,1.00 --148.80,-72.00,1.00,0.00,1.00 --139.20,-76.80,1.00,0.00,1.00 --120.00,-76.80,1.00,0.00,1.00 --96.00,-81.60,1.00,0.00,1.00 --67.20,-81.60,1.00,0.00,1.00 --48.00,-76.80,1.00,0.00,1.00 --33.60,-72.00,1.00,0.00,1.00 --28.80,-72.00,1.00,0.00,1.00 --24.00,-67.20,1.00,0.00,1.00 --19.20,-62.40,1.00,0.00,1.00 --14.40,-57.60,1.00,0.00,1.00 --14.40,-52.80,1.00,0.00,1.00 --9.60,-48.00,1.00,0.00,1.00 --9.60,-43.20,1.00,0.00,1.00 --9.60,-38.40,1.00,0.00,1.00 --4.80,-33.60,1.00,0.00,1.00 --4.80,-28.80,1.00,0.00,1.00 --4.80,-24.00,1.00,0.00,1.00 --4.80,-19.20,1.00,0.00,1.00 --4.80,-14.40,1.00,0.00,1.00 --0.00,-9.60,1.00,0.00,1.00 --0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,4.80,1.00,0.00,1.00 -4.80,9.60,1.00,0.00,1.00 -4.80,14.40,1.00,0.00,1.00 -4.80,19.20,1.00,0.00,1.00 -4.80,24.00,1.00,0.00,1.00 -9.60,28.80,1.00,0.00,1.00 -9.60,33.60,1.00,0.00,1.00 -9.60,38.40,1.00,0.00,1.00 -14.40,43.20,1.00,0.00,1.00 -14.40,48.00,1.00,0.00,1.00 -19.20,52.80,1.00,0.00,1.00 -19.20,52.80,1.00,0.00,1.00 -24.00,57.60,1.00,0.00,1.00 -28.80,62.40,1.00,0.00,1.00 -38.40,67.20,1.00,0.00,1.00 -48.00,72.00,1.00,0.00,1.00 -57.60,72.00,1.00,0.00,1.00 -76.80,76.80,1.00,0.00,1.00 -96.00,76.80,1.00,0.00,1.00 -115.20,76.80,1.00,0.00,1.00 -129.60,72.00,1.00,0.00,1.00 -139.20,67.20,1.00,0.00,1.00 -144.00,67.20,1.00,0.00,1.00 -153.60,62.40,1.00,0.00,1.00 -158.40,57.60,1.00,0.00,1.00 -158.40,52.80,1.00,0.00,1.00 -163.20,48.00,1.00,0.00,1.00 -168.00,43.20,1.00,0.00,1.00 -168.00,38.40,1.00,0.00,1.00 -168.00,33.60,1.00,0.00,1.00 -172.80,28.80,1.00,0.00,1.00 -172.80,24.00,1.00,0.00,1.00 -172.80,19.20,1.00,0.00,1.00 -177.60,14.40,1.00,0.00,1.00 -177.60,9.60,1.00,0.00,1.00 -177.60,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 --177.60,-9.60,1.00,0.00,1.00 --177.60,-14.40,1.00,0.00,1.00 --172.80,-19.20,1.00,0.00,1.00 --172.80,-24.00,1.00,0.00,1.00 --172.80,-28.80,1.00,0.00,1.00 --168.00,-33.60,1.00,0.00,1.00 --168.00,-38.40,1.00,0.00,1.00 --168.00,-43.20,1.00,0.00,1.00 --163.20,-48.00,1.00,0.00,1.00 --158.40,-52.80,1.00,0.00,1.00 --158.40,-57.60,1.00,0.00,1.00 --153.60,-62.40,1.00,0.00,1.00 --144.00,-67.20,1.00,0.00,1.00 --139.20,-67.20,1.00,0.00,1.00 --129.60,-72.00,1.00,0.00,1.00 --115.20,-76.80,1.00,0.00,1.00 --96.00,-76.80,1.00,0.00,1.00 --76.80,-76.80,1.00,0.00,1.00 --57.60,-72.00,1.00,0.00,1.00 --48.00,-72.00,1.00,0.00,1.00 --38.40,-67.20,1.00,0.00,1.00 --28.80,-62.40,1.00,0.00,1.00 --24.00,-57.60,1.00,0.00,1.00 --19.20,-52.80,1.00,0.00,1.00 --19.20,-52.80,1.00,0.00,1.00 --14.40,-48.00,1.00,0.00,1.00 --14.40,-43.20,1.00,0.00,1.00 --9.60,-38.40,1.00,0.00,1.00 --9.60,-33.60,1.00,0.00,1.00 --9.60,-28.80,1.00,0.00,1.00 --4.80,-24.00,1.00,0.00,1.00 --4.80,-19.20,1.00,0.00,1.00 --4.80,-14.40,1.00,0.00,1.00 --4.80,-9.60,1.00,0.00,1.00 --0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,4.80,1.00,0.00,1.00 -4.80,9.60,1.00,0.00,1.00 -4.80,14.40,1.00,0.00,1.00 -4.80,19.20,1.00,0.00,1.00 -9.60,24.00,1.00,0.00,1.00 -9.60,28.80,1.00,0.00,1.00 -14.40,33.60,1.00,0.00,1.00 -14.40,33.60,1.00,0.00,1.00 -19.20,38.40,1.00,0.00,1.00 -19.20,43.20,1.00,0.00,1.00 -24.00,48.00,1.00,0.00,1.00 -28.80,52.80,1.00,0.00,1.00 -33.60,57.60,1.00,0.00,1.00 -38.40,62.40,1.00,0.00,1.00 -43.20,62.40,1.00,0.00,1.00 -52.80,67.20,1.00,0.00,1.00 -67.20,67.20,1.00,0.00,1.00 -76.80,72.00,1.00,0.00,1.00 -96.00,72.00,1.00,0.00,1.00 -105.60,72.00,1.00,0.00,1.00 -120.00,67.20,1.00,0.00,1.00 -129.60,67.20,1.00,0.00,1.00 -139.20,62.40,1.00,0.00,1.00 -144.00,57.60,1.00,0.00,1.00 -148.80,52.80,1.00,0.00,1.00 -153.60,52.80,1.00,0.00,1.00 -158.40,48.00,1.00,0.00,1.00 -163.20,43.20,1.00,0.00,1.00 -163.20,38.40,1.00,0.00,1.00 -168.00,33.60,1.00,0.00,1.00 -168.00,28.80,1.00,0.00,1.00 -172.80,24.00,1.00,0.00,1.00 -172.80,19.20,1.00,0.00,1.00 -172.80,14.40,1.00,0.00,1.00 -177.60,9.60,1.00,0.00,1.00 -177.60,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 --177.60,-9.60,1.00,0.00,1.00 --172.80,-14.40,1.00,0.00,1.00 --172.80,-19.20,1.00,0.00,1.00 --172.80,-24.00,1.00,0.00,1.00 --168.00,-28.80,1.00,0.00,1.00 --168.00,-33.60,1.00,0.00,1.00 --163.20,-38.40,1.00,0.00,1.00 --163.20,-43.20,1.00,0.00,1.00 --158.40,-48.00,1.00,0.00,1.00 --153.60,-52.80,1.00,0.00,1.00 --148.80,-52.80,1.00,0.00,1.00 --144.00,-57.60,1.00,0.00,1.00 --139.20,-62.40,1.00,0.00,1.00 --129.60,-67.20,1.00,0.00,1.00 --120.00,-67.20,1.00,0.00,1.00 --105.60,-72.00,1.00,0.00,1.00 --96.00,-72.00,1.00,0.00,1.00 --76.80,-72.00,1.00,0.00,1.00 --67.20,-67.20,1.00,0.00,1.00 --52.80,-67.20,1.00,0.00,1.00 --43.20,-62.40,1.00,0.00,1.00 --38.40,-62.40,1.00,0.00,1.00 --33.60,-57.60,1.00,0.00,1.00 --28.80,-52.80,1.00,0.00,1.00 --24.00,-48.00,1.00,0.00,1.00 --19.20,-43.20,1.00,0.00,1.00 --19.20,-38.40,1.00,0.00,1.00 --14.40,-33.60,1.00,0.00,1.00 --14.40,-33.60,1.00,0.00,1.00 --9.60,-28.80,1.00,0.00,1.00 --9.60,-24.00,1.00,0.00,1.00 --4.80,-19.20,1.00,0.00,1.00 --4.80,-14.40,1.00,0.00,1.00 --4.80,-9.60,1.00,0.00,1.00 --0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,4.80,1.00,0.00,1.00 -4.80,9.60,1.00,0.00,1.00 -4.80,14.40,1.00,0.00,1.00 -9.60,19.20,1.00,0.00,1.00 -9.60,24.00,1.00,0.00,1.00 -14.40,24.00,1.00,0.00,1.00 -14.40,28.80,1.00,0.00,1.00 -19.20,33.60,1.00,0.00,1.00 -19.20,38.40,1.00,0.00,1.00 -24.00,43.20,1.00,0.00,1.00 -28.80,48.00,1.00,0.00,1.00 -33.60,52.80,1.00,0.00,1.00 -38.40,52.80,1.00,0.00,1.00 -43.20,57.60,1.00,0.00,1.00 -52.80,62.40,1.00,0.00,1.00 -62.40,62.40,1.00,0.00,1.00 -72.00,62.40,1.00,0.00,1.00 -81.60,67.20,1.00,0.00,1.00 -91.20,67.20,1.00,0.00,1.00 -105.60,67.20,1.00,0.00,1.00 -115.20,62.40,1.00,0.00,1.00 -124.80,62.40,1.00,0.00,1.00 -134.40,57.60,1.00,0.00,1.00 -139.20,57.60,1.00,0.00,1.00 -144.00,52.80,1.00,0.00,1.00 -148.80,48.00,1.00,0.00,1.00 -153.60,43.20,1.00,0.00,1.00 -158.40,38.40,1.00,0.00,1.00 -158.40,38.40,1.00,0.00,1.00 -163.20,33.60,1.00,0.00,1.00 -168.00,28.80,1.00,0.00,1.00 -168.00,24.00,1.00,0.00,1.00 -172.80,19.20,1.00,0.00,1.00 -172.80,14.40,1.00,0.00,1.00 -172.80,9.60,1.00,0.00,1.00 -177.60,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 --172.80,-9.60,1.00,0.00,1.00 --172.80,-14.40,1.00,0.00,1.00 --172.80,-19.20,1.00,0.00,1.00 --168.00,-24.00,1.00,0.00,1.00 --168.00,-28.80,1.00,0.00,1.00 --163.20,-33.60,1.00,0.00,1.00 --158.40,-38.40,1.00,0.00,1.00 --158.40,-38.40,1.00,0.00,1.00 --153.60,-43.20,1.00,0.00,1.00 --148.80,-48.00,1.00,0.00,1.00 --144.00,-52.80,1.00,0.00,1.00 --139.20,-57.60,1.00,0.00,1.00 --134.40,-57.60,1.00,0.00,1.00 --124.80,-62.40,1.00,0.00,1.00 --115.20,-62.40,1.00,0.00,1.00 --105.60,-67.20,1.00,0.00,1.00 --91.20,-67.20,1.00,0.00,1.00 --81.60,-67.20,1.00,0.00,1.00 --72.00,-62.40,1.00,0.00,1.00 --62.40,-62.40,1.00,0.00,1.00 --52.80,-62.40,1.00,0.00,1.00 --43.20,-57.60,1.00,0.00,1.00 --38.40,-52.80,1.00,0.00,1.00 --33.60,-52.80,1.00,0.00,1.00 --28.80,-48.00,1.00,0.00,1.00 --24.00,-43.20,1.00,0.00,1.00 --19.20,-38.40,1.00,0.00,1.00 --19.20,-33.60,1.00,0.00,1.00 --14.40,-28.80,1.00,0.00,1.00 --14.40,-24.00,1.00,0.00,1.00 --9.60,-24.00,1.00,0.00,1.00 --9.60,-19.20,1.00,0.00,1.00 --4.80,-14.40,1.00,0.00,1.00 --4.80,-9.60,1.00,0.00,1.00 --0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,4.80,1.00,0.00,1.00 -4.80,9.60,1.00,0.00,1.00 -4.80,14.40,1.00,0.00,1.00 -9.60,14.40,1.00,0.00,1.00 -14.40,19.20,1.00,0.00,1.00 -14.40,24.00,1.00,0.00,1.00 -19.20,28.80,1.00,0.00,1.00 -19.20,33.60,1.00,0.00,1.00 -24.00,38.40,1.00,0.00,1.00 -28.80,38.40,1.00,0.00,1.00 -33.60,43.20,1.00,0.00,1.00 -38.40,48.00,1.00,0.00,1.00 -43.20,52.80,1.00,0.00,1.00 -48.00,52.80,1.00,0.00,1.00 -57.60,57.60,1.00,0.00,1.00 -62.40,57.60,1.00,0.00,1.00 -72.00,62.40,1.00,0.00,1.00 -81.60,62.40,1.00,0.00,1.00 -91.20,62.40,1.00,0.00,1.00 -100.80,62.40,1.00,0.00,1.00 -110.40,57.60,1.00,0.00,1.00 -120.00,57.60,1.00,0.00,1.00 -129.60,57.60,1.00,0.00,1.00 -134.40,52.80,1.00,0.00,1.00 -139.20,48.00,1.00,0.00,1.00 -144.00,48.00,1.00,0.00,1.00 -148.80,43.20,1.00,0.00,1.00 -153.60,38.40,1.00,0.00,1.00 -158.40,33.60,1.00,0.00,1.00 -158.40,28.80,1.00,0.00,1.00 -163.20,28.80,1.00,0.00,1.00 -168.00,24.00,1.00,0.00,1.00 -168.00,19.20,1.00,0.00,1.00 -172.80,14.40,1.00,0.00,1.00 -172.80,9.60,1.00,0.00,1.00 -177.60,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 --172.80,-9.60,1.00,0.00,1.00 --172.80,-14.40,1.00,0.00,1.00 --168.00,-19.20,1.00,0.00,1.00 --168.00,-24.00,1.00,0.00,1.00 --163.20,-28.80,1.00,0.00,1.00 --158.40,-28.80,1.00,0.00,1.00 --158.40,-33.60,1.00,0.00,1.00 --153.60,-38.40,1.00,0.00,1.00 --148.80,-43.20,1.00,0.00,1.00 --144.00,-48.00,1.00,0.00,1.00 --139.20,-48.00,1.00,0.00,1.00 --134.40,-52.80,1.00,0.00,1.00 --129.60,-57.60,1.00,0.00,1.00 --120.00,-57.60,1.00,0.00,1.00 --110.40,-57.60,1.00,0.00,1.00 --100.80,-62.40,1.00,0.00,1.00 --91.20,-62.40,1.00,0.00,1.00 --81.60,-62.40,1.00,0.00,1.00 --72.00,-62.40,1.00,0.00,1.00 --62.40,-57.60,1.00,0.00,1.00 --57.60,-57.60,1.00,0.00,1.00 --48.00,-52.80,1.00,0.00,1.00 --43.20,-52.80,1.00,0.00,1.00 --38.40,-48.00,1.00,0.00,1.00 --33.60,-43.20,1.00,0.00,1.00 --28.80,-38.40,1.00,0.00,1.00 --24.00,-38.40,1.00,0.00,1.00 --19.20,-33.60,1.00,0.00,1.00 --19.20,-28.80,1.00,0.00,1.00 --14.40,-24.00,1.00,0.00,1.00 --14.40,-19.20,1.00,0.00,1.00 --9.60,-14.40,1.00,0.00,1.00 --4.80,-14.40,1.00,0.00,1.00 --4.80,-9.60,1.00,0.00,1.00 --0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 -4.80,9.60,1.00,0.00,1.00 -9.60,9.60,1.00,0.00,1.00 -9.60,14.40,1.00,0.00,1.00 -14.40,19.20,1.00,0.00,1.00 -19.20,24.00,1.00,0.00,1.00 -19.20,28.80,1.00,0.00,1.00 -24.00,28.80,1.00,0.00,1.00 -28.80,33.60,1.00,0.00,1.00 -33.60,38.40,1.00,0.00,1.00 -38.40,43.20,1.00,0.00,1.00 -43.20,43.20,1.00,0.00,1.00 -48.00,48.00,1.00,0.00,1.00 -52.80,48.00,1.00,0.00,1.00 -57.60,52.80,1.00,0.00,1.00 -67.20,52.80,1.00,0.00,1.00 -76.80,57.60,1.00,0.00,1.00 -81.60,57.60,1.00,0.00,1.00 -91.20,57.60,1.00,0.00,1.00 -100.80,57.60,1.00,0.00,1.00 -110.40,52.80,1.00,0.00,1.00 -115.20,52.80,1.00,0.00,1.00 -124.80,52.80,1.00,0.00,1.00 -129.60,48.00,1.00,0.00,1.00 -134.40,48.00,1.00,0.00,1.00 -139.20,43.20,1.00,0.00,1.00 -144.00,38.40,1.00,0.00,1.00 -148.80,38.40,1.00,0.00,1.00 -153.60,33.60,1.00,0.00,1.00 -158.40,28.80,1.00,0.00,1.00 -163.20,24.00,1.00,0.00,1.00 -163.20,24.00,1.00,0.00,1.00 -168.00,19.20,1.00,0.00,1.00 -172.80,14.40,1.00,0.00,1.00 -172.80,9.60,1.00,0.00,1.00 -177.60,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 --172.80,-9.60,1.00,0.00,1.00 --172.80,-14.40,1.00,0.00,1.00 --168.00,-19.20,1.00,0.00,1.00 --163.20,-24.00,1.00,0.00,1.00 --163.20,-24.00,1.00,0.00,1.00 --158.40,-28.80,1.00,0.00,1.00 --153.60,-33.60,1.00,0.00,1.00 --148.80,-38.40,1.00,0.00,1.00 --144.00,-38.40,1.00,0.00,1.00 --139.20,-43.20,1.00,0.00,1.00 --134.40,-48.00,1.00,0.00,1.00 --129.60,-48.00,1.00,0.00,1.00 --124.80,-52.80,1.00,0.00,1.00 --115.20,-52.80,1.00,0.00,1.00 --110.40,-52.80,1.00,0.00,1.00 --100.80,-57.60,1.00,0.00,1.00 --91.20,-57.60,1.00,0.00,1.00 --81.60,-57.60,1.00,0.00,1.00 --76.80,-57.60,1.00,0.00,1.00 --67.20,-52.80,1.00,0.00,1.00 --57.60,-52.80,1.00,0.00,1.00 --52.80,-48.00,1.00,0.00,1.00 --48.00,-48.00,1.00,0.00,1.00 --43.20,-43.20,1.00,0.00,1.00 --38.40,-43.20,1.00,0.00,1.00 --33.60,-38.40,1.00,0.00,1.00 --28.80,-33.60,1.00,0.00,1.00 --24.00,-28.80,1.00,0.00,1.00 --19.20,-28.80,1.00,0.00,1.00 --19.20,-24.00,1.00,0.00,1.00 --14.40,-19.20,1.00,0.00,1.00 --9.60,-14.40,1.00,0.00,1.00 --9.60,-9.60,1.00,0.00,1.00 --4.80,-9.60,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 -4.80,9.60,1.00,0.00,1.00 -9.60,9.60,1.00,0.00,1.00 -14.40,14.40,1.00,0.00,1.00 -14.40,19.20,1.00,0.00,1.00 -19.20,24.00,1.00,0.00,1.00 -24.00,24.00,1.00,0.00,1.00 -24.00,28.80,1.00,0.00,1.00 -28.80,33.60,1.00,0.00,1.00 -33.60,33.60,1.00,0.00,1.00 -38.40,38.40,1.00,0.00,1.00 -43.20,43.20,1.00,0.00,1.00 -48.00,43.20,1.00,0.00,1.00 -57.60,48.00,1.00,0.00,1.00 -62.40,48.00,1.00,0.00,1.00 -67.20,48.00,1.00,0.00,1.00 -76.80,52.80,1.00,0.00,1.00 -86.40,52.80,1.00,0.00,1.00 -91.20,52.80,1.00,0.00,1.00 -100.80,52.80,1.00,0.00,1.00 -105.60,48.00,1.00,0.00,1.00 -115.20,48.00,1.00,0.00,1.00 -120.00,48.00,1.00,0.00,1.00 -124.80,43.20,1.00,0.00,1.00 -134.40,43.20,1.00,0.00,1.00 -139.20,38.40,1.00,0.00,1.00 -144.00,38.40,1.00,0.00,1.00 -148.80,33.60,1.00,0.00,1.00 -153.60,28.80,1.00,0.00,1.00 -153.60,28.80,1.00,0.00,1.00 -158.40,24.00,1.00,0.00,1.00 -163.20,19.20,1.00,0.00,1.00 -168.00,14.40,1.00,0.00,1.00 -168.00,14.40,1.00,0.00,1.00 -172.80,9.60,1.00,0.00,1.00 -177.60,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 --172.80,-9.60,1.00,0.00,1.00 --168.00,-14.40,1.00,0.00,1.00 --168.00,-14.40,1.00,0.00,1.00 --163.20,-19.20,1.00,0.00,1.00 --158.40,-24.00,1.00,0.00,1.00 --153.60,-28.80,1.00,0.00,1.00 --153.60,-28.80,1.00,0.00,1.00 --148.80,-33.60,1.00,0.00,1.00 --144.00,-38.40,1.00,0.00,1.00 --139.20,-38.40,1.00,0.00,1.00 --134.40,-43.20,1.00,0.00,1.00 --124.80,-43.20,1.00,0.00,1.00 --120.00,-48.00,1.00,0.00,1.00 --115.20,-48.00,1.00,0.00,1.00 --105.60,-48.00,1.00,0.00,1.00 --100.80,-52.80,1.00,0.00,1.00 --91.20,-52.80,1.00,0.00,1.00 --86.40,-52.80,1.00,0.00,1.00 --76.80,-52.80,1.00,0.00,1.00 --67.20,-48.00,1.00,0.00,1.00 --62.40,-48.00,1.00,0.00,1.00 --57.60,-48.00,1.00,0.00,1.00 --48.00,-43.20,1.00,0.00,1.00 --43.20,-43.20,1.00,0.00,1.00 --38.40,-38.40,1.00,0.00,1.00 --33.60,-33.60,1.00,0.00,1.00 --28.80,-33.60,1.00,0.00,1.00 --24.00,-28.80,1.00,0.00,1.00 --24.00,-24.00,1.00,0.00,1.00 --19.20,-24.00,1.00,0.00,1.00 --14.40,-19.20,1.00,0.00,1.00 --14.40,-14.40,1.00,0.00,1.00 --9.60,-9.60,1.00,0.00,1.00 --4.80,-9.60,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 -9.60,9.60,1.00,0.00,1.00 -14.40,14.40,1.00,0.00,1.00 -19.20,19.20,1.00,0.00,1.00 -19.20,19.20,1.00,0.00,1.00 -24.00,24.00,1.00,0.00,1.00 -28.80,28.80,1.00,0.00,1.00 -33.60,28.80,1.00,0.00,1.00 -38.40,33.60,1.00,0.00,1.00 -43.20,33.60,1.00,0.00,1.00 -48.00,38.40,1.00,0.00,1.00 -52.80,38.40,1.00,0.00,1.00 -57.60,43.20,1.00,0.00,1.00 -62.40,43.20,1.00,0.00,1.00 -72.00,43.20,1.00,0.00,1.00 -76.80,48.00,1.00,0.00,1.00 -86.40,48.00,1.00,0.00,1.00 -91.20,48.00,1.00,0.00,1.00 -100.80,48.00,1.00,0.00,1.00 -105.60,48.00,1.00,0.00,1.00 -110.40,43.20,1.00,0.00,1.00 -120.00,43.20,1.00,0.00,1.00 -124.80,43.20,1.00,0.00,1.00 -129.60,38.40,1.00,0.00,1.00 -134.40,38.40,1.00,0.00,1.00 -139.20,33.60,1.00,0.00,1.00 -144.00,33.60,1.00,0.00,1.00 -148.80,28.80,1.00,0.00,1.00 -153.60,24.00,1.00,0.00,1.00 -158.40,24.00,1.00,0.00,1.00 -163.20,19.20,1.00,0.00,1.00 -163.20,14.40,1.00,0.00,1.00 -168.00,14.40,1.00,0.00,1.00 -172.80,9.60,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --172.80,-4.80,1.00,0.00,1.00 --172.80,-9.60,1.00,0.00,1.00 --168.00,-14.40,1.00,0.00,1.00 --163.20,-14.40,1.00,0.00,1.00 --163.20,-19.20,1.00,0.00,1.00 --158.40,-24.00,1.00,0.00,1.00 --153.60,-24.00,1.00,0.00,1.00 --148.80,-28.80,1.00,0.00,1.00 --144.00,-33.60,1.00,0.00,1.00 --139.20,-33.60,1.00,0.00,1.00 --134.40,-38.40,1.00,0.00,1.00 --129.60,-38.40,1.00,0.00,1.00 --124.80,-43.20,1.00,0.00,1.00 --120.00,-43.20,1.00,0.00,1.00 --110.40,-43.20,1.00,0.00,1.00 --105.60,-48.00,1.00,0.00,1.00 --100.80,-48.00,1.00,0.00,1.00 --91.20,-48.00,1.00,0.00,1.00 --86.40,-48.00,1.00,0.00,1.00 --76.80,-48.00,1.00,0.00,1.00 --72.00,-43.20,1.00,0.00,1.00 --62.40,-43.20,1.00,0.00,1.00 --57.60,-43.20,1.00,0.00,1.00 --52.80,-38.40,1.00,0.00,1.00 --48.00,-38.40,1.00,0.00,1.00 --43.20,-33.60,1.00,0.00,1.00 --38.40,-33.60,1.00,0.00,1.00 --33.60,-28.80,1.00,0.00,1.00 --28.80,-28.80,1.00,0.00,1.00 --24.00,-24.00,1.00,0.00,1.00 --19.20,-19.20,1.00,0.00,1.00 --19.20,-19.20,1.00,0.00,1.00 --14.40,-14.40,1.00,0.00,1.00 --9.60,-9.60,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 -9.60,9.60,1.00,0.00,1.00 -14.40,14.40,1.00,0.00,1.00 -19.20,14.40,1.00,0.00,1.00 -24.00,19.20,1.00,0.00,1.00 -24.00,24.00,1.00,0.00,1.00 -28.80,24.00,1.00,0.00,1.00 -33.60,28.80,1.00,0.00,1.00 -38.40,28.80,1.00,0.00,1.00 -43.20,33.60,1.00,0.00,1.00 -48.00,33.60,1.00,0.00,1.00 -52.80,38.40,1.00,0.00,1.00 -62.40,38.40,1.00,0.00,1.00 -67.20,38.40,1.00,0.00,1.00 -72.00,38.40,1.00,0.00,1.00 -76.80,43.20,1.00,0.00,1.00 -86.40,43.20,1.00,0.00,1.00 -91.20,43.20,1.00,0.00,1.00 -96.00,43.20,1.00,0.00,1.00 -105.60,43.20,1.00,0.00,1.00 -110.40,38.40,1.00,0.00,1.00 -115.20,38.40,1.00,0.00,1.00 -120.00,38.40,1.00,0.00,1.00 -129.60,33.60,1.00,0.00,1.00 -134.40,33.60,1.00,0.00,1.00 -139.20,28.80,1.00,0.00,1.00 -144.00,28.80,1.00,0.00,1.00 -148.80,24.00,1.00,0.00,1.00 -153.60,24.00,1.00,0.00,1.00 -153.60,19.20,1.00,0.00,1.00 -158.40,19.20,1.00,0.00,1.00 -163.20,14.40,1.00,0.00,1.00 -168.00,9.60,1.00,0.00,1.00 -172.80,9.60,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --172.80,-4.80,1.00,0.00,1.00 --172.80,-9.60,1.00,0.00,1.00 --168.00,-9.60,1.00,0.00,1.00 --163.20,-14.40,1.00,0.00,1.00 --158.40,-19.20,1.00,0.00,1.00 --153.60,-19.20,1.00,0.00,1.00 --153.60,-24.00,1.00,0.00,1.00 --148.80,-24.00,1.00,0.00,1.00 --144.00,-28.80,1.00,0.00,1.00 --139.20,-28.80,1.00,0.00,1.00 --134.40,-33.60,1.00,0.00,1.00 --129.60,-33.60,1.00,0.00,1.00 --120.00,-38.40,1.00,0.00,1.00 --115.20,-38.40,1.00,0.00,1.00 --110.40,-38.40,1.00,0.00,1.00 --105.60,-43.20,1.00,0.00,1.00 --96.00,-43.20,1.00,0.00,1.00 --91.20,-43.20,1.00,0.00,1.00 --86.40,-43.20,1.00,0.00,1.00 --76.80,-43.20,1.00,0.00,1.00 --72.00,-38.40,1.00,0.00,1.00 --67.20,-38.40,1.00,0.00,1.00 --62.40,-38.40,1.00,0.00,1.00 --52.80,-38.40,1.00,0.00,1.00 --48.00,-33.60,1.00,0.00,1.00 --43.20,-33.60,1.00,0.00,1.00 --38.40,-28.80,1.00,0.00,1.00 --33.60,-28.80,1.00,0.00,1.00 --28.80,-24.00,1.00,0.00,1.00 --24.00,-24.00,1.00,0.00,1.00 --24.00,-19.20,1.00,0.00,1.00 --19.20,-14.40,1.00,0.00,1.00 --14.40,-14.40,1.00,0.00,1.00 --9.60,-9.60,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 -9.60,4.80,1.00,0.00,1.00 -9.60,9.60,1.00,0.00,1.00 -14.40,9.60,1.00,0.00,1.00 -19.20,14.40,1.00,0.00,1.00 -24.00,19.20,1.00,0.00,1.00 -28.80,19.20,1.00,0.00,1.00 -33.60,24.00,1.00,0.00,1.00 -38.40,24.00,1.00,0.00,1.00 -43.20,28.80,1.00,0.00,1.00 -48.00,28.80,1.00,0.00,1.00 -52.80,28.80,1.00,0.00,1.00 -57.60,33.60,1.00,0.00,1.00 -62.40,33.60,1.00,0.00,1.00 -67.20,33.60,1.00,0.00,1.00 -72.00,38.40,1.00,0.00,1.00 -81.60,38.40,1.00,0.00,1.00 -86.40,38.40,1.00,0.00,1.00 -91.20,38.40,1.00,0.00,1.00 -96.00,38.40,1.00,0.00,1.00 -105.60,38.40,1.00,0.00,1.00 -110.40,33.60,1.00,0.00,1.00 -115.20,33.60,1.00,0.00,1.00 -120.00,33.60,1.00,0.00,1.00 -124.80,33.60,1.00,0.00,1.00 -129.60,28.80,1.00,0.00,1.00 -134.40,28.80,1.00,0.00,1.00 -139.20,24.00,1.00,0.00,1.00 -144.00,24.00,1.00,0.00,1.00 -148.80,19.20,1.00,0.00,1.00 -153.60,19.20,1.00,0.00,1.00 -158.40,14.40,1.00,0.00,1.00 -163.20,14.40,1.00,0.00,1.00 -168.00,9.60,1.00,0.00,1.00 -168.00,9.60,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --172.80,-4.80,1.00,0.00,1.00 --168.00,-9.60,1.00,0.00,1.00 --168.00,-9.60,1.00,0.00,1.00 --163.20,-14.40,1.00,0.00,1.00 --158.40,-14.40,1.00,0.00,1.00 --153.60,-19.20,1.00,0.00,1.00 --148.80,-19.20,1.00,0.00,1.00 --144.00,-24.00,1.00,0.00,1.00 --139.20,-24.00,1.00,0.00,1.00 --134.40,-28.80,1.00,0.00,1.00 --129.60,-28.80,1.00,0.00,1.00 --124.80,-33.60,1.00,0.00,1.00 --120.00,-33.60,1.00,0.00,1.00 --115.20,-33.60,1.00,0.00,1.00 --110.40,-33.60,1.00,0.00,1.00 --105.60,-38.40,1.00,0.00,1.00 --96.00,-38.40,1.00,0.00,1.00 --91.20,-38.40,1.00,0.00,1.00 --86.40,-38.40,1.00,0.00,1.00 --81.60,-38.40,1.00,0.00,1.00 --72.00,-38.40,1.00,0.00,1.00 --67.20,-33.60,1.00,0.00,1.00 --62.40,-33.60,1.00,0.00,1.00 --57.60,-33.60,1.00,0.00,1.00 --52.80,-28.80,1.00,0.00,1.00 --48.00,-28.80,1.00,0.00,1.00 --43.20,-28.80,1.00,0.00,1.00 --38.40,-24.00,1.00,0.00,1.00 --33.60,-24.00,1.00,0.00,1.00 --28.80,-19.20,1.00,0.00,1.00 --24.00,-19.20,1.00,0.00,1.00 --19.20,-14.40,1.00,0.00,1.00 --14.40,-9.60,1.00,0.00,1.00 --9.60,-9.60,1.00,0.00,1.00 --9.60,-4.80,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 -9.60,4.80,1.00,0.00,1.00 -14.40,9.60,1.00,0.00,1.00 -14.40,9.60,1.00,0.00,1.00 -19.20,14.40,1.00,0.00,1.00 -24.00,14.40,1.00,0.00,1.00 -28.80,19.20,1.00,0.00,1.00 -33.60,19.20,1.00,0.00,1.00 -38.40,19.20,1.00,0.00,1.00 -43.20,24.00,1.00,0.00,1.00 -48.00,24.00,1.00,0.00,1.00 -52.80,28.80,1.00,0.00,1.00 -57.60,28.80,1.00,0.00,1.00 -62.40,28.80,1.00,0.00,1.00 -67.20,28.80,1.00,0.00,1.00 -76.80,33.60,1.00,0.00,1.00 -81.60,33.60,1.00,0.00,1.00 -86.40,33.60,1.00,0.00,1.00 -91.20,33.60,1.00,0.00,1.00 -96.00,33.60,1.00,0.00,1.00 -100.80,33.60,1.00,0.00,1.00 -110.40,28.80,1.00,0.00,1.00 -115.20,28.80,1.00,0.00,1.00 -120.00,28.80,1.00,0.00,1.00 -124.80,28.80,1.00,0.00,1.00 -129.60,24.00,1.00,0.00,1.00 -134.40,24.00,1.00,0.00,1.00 -139.20,24.00,1.00,0.00,1.00 -144.00,19.20,1.00,0.00,1.00 -148.80,19.20,1.00,0.00,1.00 -153.60,14.40,1.00,0.00,1.00 -158.40,14.40,1.00,0.00,1.00 -163.20,9.60,1.00,0.00,1.00 -168.00,9.60,1.00,0.00,1.00 -168.00,4.80,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --172.80,-4.80,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 --168.00,-9.60,1.00,0.00,1.00 --163.20,-9.60,1.00,0.00,1.00 --158.40,-14.40,1.00,0.00,1.00 --153.60,-14.40,1.00,0.00,1.00 --148.80,-19.20,1.00,0.00,1.00 --144.00,-19.20,1.00,0.00,1.00 --139.20,-24.00,1.00,0.00,1.00 --134.40,-24.00,1.00,0.00,1.00 --129.60,-24.00,1.00,0.00,1.00 --124.80,-28.80,1.00,0.00,1.00 --120.00,-28.80,1.00,0.00,1.00 --115.20,-28.80,1.00,0.00,1.00 --110.40,-28.80,1.00,0.00,1.00 --100.80,-33.60,1.00,0.00,1.00 --96.00,-33.60,1.00,0.00,1.00 --91.20,-33.60,1.00,0.00,1.00 --86.40,-33.60,1.00,0.00,1.00 --81.60,-33.60,1.00,0.00,1.00 --76.80,-33.60,1.00,0.00,1.00 --67.20,-28.80,1.00,0.00,1.00 --62.40,-28.80,1.00,0.00,1.00 --57.60,-28.80,1.00,0.00,1.00 --52.80,-28.80,1.00,0.00,1.00 --48.00,-24.00,1.00,0.00,1.00 --43.20,-24.00,1.00,0.00,1.00 --38.40,-19.20,1.00,0.00,1.00 --33.60,-19.20,1.00,0.00,1.00 --28.80,-19.20,1.00,0.00,1.00 --24.00,-14.40,1.00,0.00,1.00 --19.20,-14.40,1.00,0.00,1.00 --14.40,-9.60,1.00,0.00,1.00 --14.40,-9.60,1.00,0.00,1.00 --9.60,-4.80,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 -9.60,4.80,1.00,0.00,1.00 -14.40,4.80,1.00,0.00,1.00 -19.20,9.60,1.00,0.00,1.00 -19.20,9.60,1.00,0.00,1.00 -24.00,14.40,1.00,0.00,1.00 -28.80,14.40,1.00,0.00,1.00 -33.60,14.40,1.00,0.00,1.00 -38.40,19.20,1.00,0.00,1.00 -43.20,19.20,1.00,0.00,1.00 -48.00,24.00,1.00,0.00,1.00 -52.80,24.00,1.00,0.00,1.00 -57.60,24.00,1.00,0.00,1.00 -62.40,24.00,1.00,0.00,1.00 -72.00,24.00,1.00,0.00,1.00 -76.80,28.80,1.00,0.00,1.00 -81.60,28.80,1.00,0.00,1.00 -86.40,28.80,1.00,0.00,1.00 -91.20,28.80,1.00,0.00,1.00 -96.00,28.80,1.00,0.00,1.00 -100.80,28.80,1.00,0.00,1.00 -105.60,28.80,1.00,0.00,1.00 -110.40,24.00,1.00,0.00,1.00 -120.00,24.00,1.00,0.00,1.00 -124.80,24.00,1.00,0.00,1.00 -129.60,24.00,1.00,0.00,1.00 -134.40,19.20,1.00,0.00,1.00 -139.20,19.20,1.00,0.00,1.00 -144.00,19.20,1.00,0.00,1.00 -148.80,14.40,1.00,0.00,1.00 -153.60,14.40,1.00,0.00,1.00 -158.40,9.60,1.00,0.00,1.00 -158.40,9.60,1.00,0.00,1.00 -163.20,9.60,1.00,0.00,1.00 -168.00,4.80,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --172.80,-4.80,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 --163.20,-9.60,1.00,0.00,1.00 --158.40,-9.60,1.00,0.00,1.00 --158.40,-9.60,1.00,0.00,1.00 --153.60,-14.40,1.00,0.00,1.00 --148.80,-14.40,1.00,0.00,1.00 --144.00,-19.20,1.00,0.00,1.00 --139.20,-19.20,1.00,0.00,1.00 --134.40,-19.20,1.00,0.00,1.00 --129.60,-24.00,1.00,0.00,1.00 --124.80,-24.00,1.00,0.00,1.00 --120.00,-24.00,1.00,0.00,1.00 --110.40,-24.00,1.00,0.00,1.00 --105.60,-28.80,1.00,0.00,1.00 --100.80,-28.80,1.00,0.00,1.00 --96.00,-28.80,1.00,0.00,1.00 --91.20,-28.80,1.00,0.00,1.00 --86.40,-28.80,1.00,0.00,1.00 --81.60,-28.80,1.00,0.00,1.00 --76.80,-28.80,1.00,0.00,1.00 --72.00,-24.00,1.00,0.00,1.00 --62.40,-24.00,1.00,0.00,1.00 --57.60,-24.00,1.00,0.00,1.00 --52.80,-24.00,1.00,0.00,1.00 --48.00,-24.00,1.00,0.00,1.00 --43.20,-19.20,1.00,0.00,1.00 --38.40,-19.20,1.00,0.00,1.00 --33.60,-14.40,1.00,0.00,1.00 --28.80,-14.40,1.00,0.00,1.00 --24.00,-14.40,1.00,0.00,1.00 --19.20,-9.60,1.00,0.00,1.00 --19.20,-9.60,1.00,0.00,1.00 --14.40,-4.80,1.00,0.00,1.00 --9.60,-4.80,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 -9.60,4.80,1.00,0.00,1.00 -14.40,4.80,1.00,0.00,1.00 -19.20,9.60,1.00,0.00,1.00 -24.00,9.60,1.00,0.00,1.00 -28.80,9.60,1.00,0.00,1.00 -33.60,14.40,1.00,0.00,1.00 -38.40,14.40,1.00,0.00,1.00 -43.20,14.40,1.00,0.00,1.00 -48.00,14.40,1.00,0.00,1.00 -52.80,19.20,1.00,0.00,1.00 -57.60,19.20,1.00,0.00,1.00 -62.40,19.20,1.00,0.00,1.00 -67.20,19.20,1.00,0.00,1.00 -72.00,24.00,1.00,0.00,1.00 -76.80,24.00,1.00,0.00,1.00 -81.60,24.00,1.00,0.00,1.00 -86.40,24.00,1.00,0.00,1.00 -91.20,24.00,1.00,0.00,1.00 -96.00,24.00,1.00,0.00,1.00 -100.80,24.00,1.00,0.00,1.00 -105.60,24.00,1.00,0.00,1.00 -110.40,19.20,1.00,0.00,1.00 -115.20,19.20,1.00,0.00,1.00 -120.00,19.20,1.00,0.00,1.00 -124.80,19.20,1.00,0.00,1.00 -129.60,19.20,1.00,0.00,1.00 -134.40,14.40,1.00,0.00,1.00 -139.20,14.40,1.00,0.00,1.00 -144.00,14.40,1.00,0.00,1.00 -148.80,9.60,1.00,0.00,1.00 -153.60,9.60,1.00,0.00,1.00 -158.40,9.60,1.00,0.00,1.00 -163.20,4.80,1.00,0.00,1.00 -168.00,4.80,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --172.80,-4.80,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 --163.20,-4.80,1.00,0.00,1.00 --158.40,-9.60,1.00,0.00,1.00 --153.60,-9.60,1.00,0.00,1.00 --148.80,-9.60,1.00,0.00,1.00 --144.00,-14.40,1.00,0.00,1.00 --139.20,-14.40,1.00,0.00,1.00 --134.40,-14.40,1.00,0.00,1.00 --129.60,-19.20,1.00,0.00,1.00 --124.80,-19.20,1.00,0.00,1.00 --120.00,-19.20,1.00,0.00,1.00 --115.20,-19.20,1.00,0.00,1.00 --110.40,-19.20,1.00,0.00,1.00 --105.60,-24.00,1.00,0.00,1.00 --100.80,-24.00,1.00,0.00,1.00 --96.00,-24.00,1.00,0.00,1.00 --91.20,-24.00,1.00,0.00,1.00 --86.40,-24.00,1.00,0.00,1.00 --81.60,-24.00,1.00,0.00,1.00 --76.80,-24.00,1.00,0.00,1.00 --72.00,-24.00,1.00,0.00,1.00 --67.20,-19.20,1.00,0.00,1.00 --62.40,-19.20,1.00,0.00,1.00 --57.60,-19.20,1.00,0.00,1.00 --52.80,-19.20,1.00,0.00,1.00 --48.00,-14.40,1.00,0.00,1.00 --43.20,-14.40,1.00,0.00,1.00 --38.40,-14.40,1.00,0.00,1.00 --33.60,-14.40,1.00,0.00,1.00 --28.80,-9.60,1.00,0.00,1.00 --24.00,-9.60,1.00,0.00,1.00 --19.20,-9.60,1.00,0.00,1.00 --14.40,-4.80,1.00,0.00,1.00 --9.60,-4.80,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 -9.60,4.80,1.00,0.00,1.00 -14.40,4.80,1.00,0.00,1.00 -19.20,4.80,1.00,0.00,1.00 -24.00,9.60,1.00,0.00,1.00 -28.80,9.60,1.00,0.00,1.00 -33.60,9.60,1.00,0.00,1.00 -38.40,9.60,1.00,0.00,1.00 -43.20,14.40,1.00,0.00,1.00 -48.00,14.40,1.00,0.00,1.00 -52.80,14.40,1.00,0.00,1.00 -57.60,14.40,1.00,0.00,1.00 -62.40,14.40,1.00,0.00,1.00 -67.20,14.40,1.00,0.00,1.00 -72.00,19.20,1.00,0.00,1.00 -76.80,19.20,1.00,0.00,1.00 -81.60,19.20,1.00,0.00,1.00 -86.40,19.20,1.00,0.00,1.00 -91.20,19.20,1.00,0.00,1.00 -96.00,19.20,1.00,0.00,1.00 -100.80,19.20,1.00,0.00,1.00 -105.60,19.20,1.00,0.00,1.00 -110.40,19.20,1.00,0.00,1.00 -115.20,14.40,1.00,0.00,1.00 -120.00,14.40,1.00,0.00,1.00 -124.80,14.40,1.00,0.00,1.00 -129.60,14.40,1.00,0.00,1.00 -134.40,14.40,1.00,0.00,1.00 -139.20,9.60,1.00,0.00,1.00 -144.00,9.60,1.00,0.00,1.00 -148.80,9.60,1.00,0.00,1.00 -153.60,9.60,1.00,0.00,1.00 -158.40,4.80,1.00,0.00,1.00 -163.20,4.80,1.00,0.00,1.00 -168.00,4.80,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --172.80,-0.00,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 --163.20,-4.80,1.00,0.00,1.00 --158.40,-4.80,1.00,0.00,1.00 --153.60,-9.60,1.00,0.00,1.00 --148.80,-9.60,1.00,0.00,1.00 --144.00,-9.60,1.00,0.00,1.00 --139.20,-9.60,1.00,0.00,1.00 --134.40,-14.40,1.00,0.00,1.00 --129.60,-14.40,1.00,0.00,1.00 --124.80,-14.40,1.00,0.00,1.00 --120.00,-14.40,1.00,0.00,1.00 --115.20,-14.40,1.00,0.00,1.00 --110.40,-19.20,1.00,0.00,1.00 --105.60,-19.20,1.00,0.00,1.00 --100.80,-19.20,1.00,0.00,1.00 --96.00,-19.20,1.00,0.00,1.00 --91.20,-19.20,1.00,0.00,1.00 --86.40,-19.20,1.00,0.00,1.00 --81.60,-19.20,1.00,0.00,1.00 --76.80,-19.20,1.00,0.00,1.00 --72.00,-19.20,1.00,0.00,1.00 --67.20,-14.40,1.00,0.00,1.00 --62.40,-14.40,1.00,0.00,1.00 --57.60,-14.40,1.00,0.00,1.00 --52.80,-14.40,1.00,0.00,1.00 --48.00,-14.40,1.00,0.00,1.00 --43.20,-14.40,1.00,0.00,1.00 --38.40,-9.60,1.00,0.00,1.00 --33.60,-9.60,1.00,0.00,1.00 --28.80,-9.60,1.00,0.00,1.00 --24.00,-9.60,1.00,0.00,1.00 --19.20,-4.80,1.00,0.00,1.00 --14.40,-4.80,1.00,0.00,1.00 --9.60,-4.80,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 -9.60,0.00,1.00,0.00,1.00 -14.40,4.80,1.00,0.00,1.00 -19.20,4.80,1.00,0.00,1.00 -24.00,4.80,1.00,0.00,1.00 -28.80,4.80,1.00,0.00,1.00 -33.60,9.60,1.00,0.00,1.00 -38.40,9.60,1.00,0.00,1.00 -43.20,9.60,1.00,0.00,1.00 -48.00,9.60,1.00,0.00,1.00 -52.80,9.60,1.00,0.00,1.00 -57.60,9.60,1.00,0.00,1.00 -62.40,9.60,1.00,0.00,1.00 -67.20,14.40,1.00,0.00,1.00 -72.00,14.40,1.00,0.00,1.00 -76.80,14.40,1.00,0.00,1.00 -81.60,14.40,1.00,0.00,1.00 -86.40,14.40,1.00,0.00,1.00 -91.20,14.40,1.00,0.00,1.00 -96.00,14.40,1.00,0.00,1.00 -100.80,14.40,1.00,0.00,1.00 -105.60,14.40,1.00,0.00,1.00 -110.40,14.40,1.00,0.00,1.00 -115.20,9.60,1.00,0.00,1.00 -120.00,9.60,1.00,0.00,1.00 -124.80,9.60,1.00,0.00,1.00 -129.60,9.60,1.00,0.00,1.00 -134.40,9.60,1.00,0.00,1.00 -139.20,9.60,1.00,0.00,1.00 -144.00,9.60,1.00,0.00,1.00 -148.80,4.80,1.00,0.00,1.00 -153.60,4.80,1.00,0.00,1.00 -158.40,4.80,1.00,0.00,1.00 -163.20,4.80,1.00,0.00,1.00 -168.00,4.80,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --172.80,-0.00,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 --163.20,-4.80,1.00,0.00,1.00 --158.40,-4.80,1.00,0.00,1.00 --153.60,-4.80,1.00,0.00,1.00 --148.80,-4.80,1.00,0.00,1.00 --144.00,-9.60,1.00,0.00,1.00 --139.20,-9.60,1.00,0.00,1.00 --134.40,-9.60,1.00,0.00,1.00 --129.60,-9.60,1.00,0.00,1.00 --124.80,-9.60,1.00,0.00,1.00 --120.00,-9.60,1.00,0.00,1.00 --115.20,-9.60,1.00,0.00,1.00 --110.40,-14.40,1.00,0.00,1.00 --105.60,-14.40,1.00,0.00,1.00 --100.80,-14.40,1.00,0.00,1.00 --96.00,-14.40,1.00,0.00,1.00 --91.20,-14.40,1.00,0.00,1.00 --86.40,-14.40,1.00,0.00,1.00 --81.60,-14.40,1.00,0.00,1.00 --76.80,-14.40,1.00,0.00,1.00 --72.00,-14.40,1.00,0.00,1.00 --67.20,-14.40,1.00,0.00,1.00 --62.40,-9.60,1.00,0.00,1.00 --57.60,-9.60,1.00,0.00,1.00 --52.80,-9.60,1.00,0.00,1.00 --48.00,-9.60,1.00,0.00,1.00 --43.20,-9.60,1.00,0.00,1.00 --38.40,-9.60,1.00,0.00,1.00 --33.60,-9.60,1.00,0.00,1.00 --28.80,-4.80,1.00,0.00,1.00 --24.00,-4.80,1.00,0.00,1.00 --19.20,-4.80,1.00,0.00,1.00 --14.40,-4.80,1.00,0.00,1.00 --9.60,-0.00,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 -9.60,0.00,1.00,0.00,1.00 -14.40,0.00,1.00,0.00,1.00 -19.20,4.80,1.00,0.00,1.00 -24.00,4.80,1.00,0.00,1.00 -28.80,4.80,1.00,0.00,1.00 -33.60,4.80,1.00,0.00,1.00 -38.40,4.80,1.00,0.00,1.00 -43.20,4.80,1.00,0.00,1.00 -48.00,4.80,1.00,0.00,1.00 -52.80,4.80,1.00,0.00,1.00 -57.60,4.80,1.00,0.00,1.00 -62.40,9.60,1.00,0.00,1.00 -67.20,9.60,1.00,0.00,1.00 -72.00,9.60,1.00,0.00,1.00 -76.80,9.60,1.00,0.00,1.00 -81.60,9.60,1.00,0.00,1.00 -86.40,9.60,1.00,0.00,1.00 -91.20,9.60,1.00,0.00,1.00 -96.00,9.60,1.00,0.00,1.00 -100.80,9.60,1.00,0.00,1.00 -105.60,9.60,1.00,0.00,1.00 -110.40,9.60,1.00,0.00,1.00 -115.20,9.60,1.00,0.00,1.00 -120.00,9.60,1.00,0.00,1.00 -124.80,4.80,1.00,0.00,1.00 -129.60,4.80,1.00,0.00,1.00 -134.40,4.80,1.00,0.00,1.00 -139.20,4.80,1.00,0.00,1.00 -144.00,4.80,1.00,0.00,1.00 -148.80,4.80,1.00,0.00,1.00 -153.60,4.80,1.00,0.00,1.00 -158.40,4.80,1.00,0.00,1.00 -163.20,4.80,1.00,0.00,1.00 -168.00,0.00,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --172.80,-0.00,1.00,0.00,1.00 --168.00,-0.00,1.00,0.00,1.00 --163.20,-4.80,1.00,0.00,1.00 --158.40,-4.80,1.00,0.00,1.00 --153.60,-4.80,1.00,0.00,1.00 --148.80,-4.80,1.00,0.00,1.00 --144.00,-4.80,1.00,0.00,1.00 --139.20,-4.80,1.00,0.00,1.00 --134.40,-4.80,1.00,0.00,1.00 --129.60,-4.80,1.00,0.00,1.00 --124.80,-4.80,1.00,0.00,1.00 --120.00,-9.60,1.00,0.00,1.00 --115.20,-9.60,1.00,0.00,1.00 --110.40,-9.60,1.00,0.00,1.00 --105.60,-9.60,1.00,0.00,1.00 --100.80,-9.60,1.00,0.00,1.00 --96.00,-9.60,1.00,0.00,1.00 --91.20,-9.60,1.00,0.00,1.00 --86.40,-9.60,1.00,0.00,1.00 --81.60,-9.60,1.00,0.00,1.00 --76.80,-9.60,1.00,0.00,1.00 --72.00,-9.60,1.00,0.00,1.00 --67.20,-9.60,1.00,0.00,1.00 --62.40,-9.60,1.00,0.00,1.00 --57.60,-4.80,1.00,0.00,1.00 --52.80,-4.80,1.00,0.00,1.00 --48.00,-4.80,1.00,0.00,1.00 --43.20,-4.80,1.00,0.00,1.00 --38.40,-4.80,1.00,0.00,1.00 --33.60,-4.80,1.00,0.00,1.00 --28.80,-4.80,1.00,0.00,1.00 --24.00,-4.80,1.00,0.00,1.00 --19.20,-4.80,1.00,0.00,1.00 --14.40,-0.00,1.00,0.00,1.00 --9.60,-0.00,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 -9.60,0.00,1.00,0.00,1.00 -14.40,0.00,1.00,0.00,1.00 -19.20,0.00,1.00,0.00,1.00 -24.00,0.00,1.00,0.00,1.00 -28.80,0.00,1.00,0.00,1.00 -33.60,0.00,1.00,0.00,1.00 -38.40,0.00,1.00,0.00,1.00 -43.20,4.80,1.00,0.00,1.00 -48.00,4.80,1.00,0.00,1.00 -52.80,4.80,1.00,0.00,1.00 -57.60,4.80,1.00,0.00,1.00 -62.40,4.80,1.00,0.00,1.00 -67.20,4.80,1.00,0.00,1.00 -72.00,4.80,1.00,0.00,1.00 -76.80,4.80,1.00,0.00,1.00 -81.60,4.80,1.00,0.00,1.00 -86.40,4.80,1.00,0.00,1.00 -91.20,4.80,1.00,0.00,1.00 -96.00,4.80,1.00,0.00,1.00 -100.80,4.80,1.00,0.00,1.00 -105.60,4.80,1.00,0.00,1.00 -110.40,4.80,1.00,0.00,1.00 -115.20,4.80,1.00,0.00,1.00 -120.00,4.80,1.00,0.00,1.00 -124.80,4.80,1.00,0.00,1.00 -129.60,4.80,1.00,0.00,1.00 -134.40,4.80,1.00,0.00,1.00 -139.20,0.00,1.00,0.00,1.00 -144.00,0.00,1.00,0.00,1.00 -148.80,0.00,1.00,0.00,1.00 -153.60,0.00,1.00,0.00,1.00 -158.40,0.00,1.00,0.00,1.00 -163.20,0.00,1.00,0.00,1.00 -168.00,0.00,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --172.80,-0.00,1.00,0.00,1.00 --168.00,-0.00,1.00,0.00,1.00 --163.20,-0.00,1.00,0.00,1.00 --158.40,-0.00,1.00,0.00,1.00 --153.60,-0.00,1.00,0.00,1.00 --148.80,-0.00,1.00,0.00,1.00 --144.00,-0.00,1.00,0.00,1.00 --139.20,-0.00,1.00,0.00,1.00 --134.40,-4.80,1.00,0.00,1.00 --129.60,-4.80,1.00,0.00,1.00 --124.80,-4.80,1.00,0.00,1.00 --120.00,-4.80,1.00,0.00,1.00 --115.20,-4.80,1.00,0.00,1.00 --110.40,-4.80,1.00,0.00,1.00 --105.60,-4.80,1.00,0.00,1.00 --100.80,-4.80,1.00,0.00,1.00 --96.00,-4.80,1.00,0.00,1.00 --91.20,-4.80,1.00,0.00,1.00 --86.40,-4.80,1.00,0.00,1.00 --81.60,-4.80,1.00,0.00,1.00 --76.80,-4.80,1.00,0.00,1.00 --72.00,-4.80,1.00,0.00,1.00 --67.20,-4.80,1.00,0.00,1.00 --62.40,-4.80,1.00,0.00,1.00 --57.60,-4.80,1.00,0.00,1.00 --52.80,-4.80,1.00,0.00,1.00 --48.00,-4.80,1.00,0.00,1.00 --43.20,-4.80,1.00,0.00,1.00 --38.40,-0.00,1.00,0.00,1.00 --33.60,-0.00,1.00,0.00,1.00 --28.80,-0.00,1.00,0.00,1.00 --24.00,-0.00,1.00,0.00,1.00 --19.20,-0.00,1.00,0.00,1.00 --14.40,-0.00,1.00,0.00,1.00 --9.60,-0.00,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -9.60,-0.00,1.00,0.00,1.00 -14.40,-0.00,1.00,0.00,1.00 -19.20,-0.00,1.00,0.00,1.00 -24.00,-0.00,1.00,0.00,1.00 -28.80,-0.00,1.00,0.00,1.00 -33.60,-0.00,1.00,0.00,1.00 -38.40,-0.00,1.00,0.00,1.00 -43.20,-0.00,1.00,0.00,1.00 -48.00,-0.00,1.00,0.00,1.00 -52.80,-0.00,1.00,0.00,1.00 -57.60,-0.00,1.00,0.00,1.00 -62.40,-0.00,1.00,0.00,1.00 -67.20,-0.00,1.00,0.00,1.00 -72.00,-0.00,1.00,0.00,1.00 -76.80,-0.00,1.00,0.00,1.00 -81.60,-0.00,1.00,0.00,1.00 -86.40,-0.00,1.00,0.00,1.00 -91.20,-0.00,1.00,0.00,1.00 -96.00,-0.00,1.00,0.00,1.00 -100.80,-0.00,1.00,0.00,1.00 -105.60,-0.00,1.00,0.00,1.00 -110.40,-0.00,1.00,0.00,1.00 -115.20,-0.00,1.00,0.00,1.00 -120.00,-0.00,1.00,0.00,1.00 -124.80,-0.00,1.00,0.00,1.00 -129.60,-0.00,1.00,0.00,1.00 -134.40,-0.00,1.00,0.00,1.00 -139.20,-0.00,1.00,0.00,1.00 -144.00,-0.00,1.00,0.00,1.00 -148.80,-0.00,1.00,0.00,1.00 -153.60,-0.00,1.00,0.00,1.00 -158.40,-0.00,1.00,0.00,1.00 -163.20,-0.00,1.00,0.00,1.00 -168.00,-0.00,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,0.00,1.00,0.00,1.00 --168.00,0.00,1.00,0.00,1.00 --163.20,0.00,1.00,0.00,1.00 --158.40,0.00,1.00,0.00,1.00 --153.60,0.00,1.00,0.00,1.00 --148.80,0.00,1.00,0.00,1.00 --144.00,0.00,1.00,0.00,1.00 --139.20,0.00,1.00,0.00,1.00 --134.40,0.00,1.00,0.00,1.00 --129.60,0.00,1.00,0.00,1.00 --124.80,0.00,1.00,0.00,1.00 --120.00,0.00,1.00,0.00,1.00 --115.20,0.00,1.00,0.00,1.00 --110.40,0.00,1.00,0.00,1.00 --105.60,0.00,1.00,0.00,1.00 --100.80,0.00,1.00,0.00,1.00 --96.00,0.00,1.00,0.00,1.00 --91.20,0.00,1.00,0.00,1.00 --86.40,0.00,1.00,0.00,1.00 --81.60,0.00,1.00,0.00,1.00 --76.80,0.00,1.00,0.00,1.00 --72.00,0.00,1.00,0.00,1.00 --67.20,0.00,1.00,0.00,1.00 --62.40,0.00,1.00,0.00,1.00 --57.60,0.00,1.00,0.00,1.00 --52.80,0.00,1.00,0.00,1.00 --48.00,0.00,1.00,0.00,1.00 --43.20,0.00,1.00,0.00,1.00 --38.40,0.00,1.00,0.00,1.00 --33.60,0.00,1.00,0.00,1.00 --28.80,0.00,1.00,0.00,1.00 --24.00,0.00,1.00,0.00,1.00 --19.20,0.00,1.00,0.00,1.00 --14.40,0.00,1.00,0.00,1.00 --9.60,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 +-0.00,0.00,0.00,0.00,1.00,0.00,4.80 +-0.00,4.80,0.06,0.00,1.00,4.80,9.60 +-0.00,9.60,0.13,0.00,1.00,9.60,14.40 +-0.00,14.40,0.19,0.00,1.00,14.40,19.20 +-0.00,19.20,0.26,0.00,1.00,19.20,24.00 +-0.00,24.00,0.32,0.00,1.00,24.00,28.80 +-0.00,28.80,0.39,0.00,1.00,28.80,33.60 +-0.00,33.60,0.45,0.00,1.00,33.60,38.40 +-0.00,38.40,0.51,0.00,1.00,38.40,43.20 +-0.00,43.20,0.58,0.00,1.00,43.20,48.00 +-0.00,48.00,0.64,0.00,1.00,48.00,52.80 +-0.00,52.80,0.71,0.00,1.00,52.80,57.60 +-0.00,57.60,0.77,0.00,1.00,57.60,62.40 +-0.00,62.40,0.84,0.00,1.00,62.40,67.20 +-0.00,67.20,0.90,0.00,1.00,67.20,72.00 +-0.00,72.00,0.96,0.00,1.00,72.00,76.80 +-0.00,76.80,1.03,0.00,1.00,76.80,81.60 +-0.00,81.60,1.09,0.00,1.00,81.60,86.40 +-0.00,86.40,1.16,0.00,1.00,86.40,86.40 +-177.60,89.20,1.22,0.00,1.00,91.20,81.60 +-177.60,86.40,1.29,0.00,1.00,96.00,76.80 +-177.60,81.60,1.35,0.00,1.00,100.80,72.00 +-177.60,76.80,1.41,0.00,1.00,105.60,67.20 +-177.60,72.00,1.48,0.00,1.00,110.40,62.40 +-177.60,67.20,1.54,0.00,1.00,115.20,57.60 +177.60,62.40,1.61,0.00,1.00,120.00,52.80 +177.60,57.60,1.67,0.00,1.00,124.80,48.00 +177.60,52.80,1.73,0.00,1.00,129.60,43.20 +177.60,48.00,1.80,0.00,1.00,134.40,38.40 +177.60,43.20,1.86,0.00,1.00,139.20,33.60 +177.60,38.40,1.93,0.00,1.00,144.00,28.80 +177.60,33.60,1.99,0.00,1.00,148.80,24.00 +177.60,28.80,2.06,0.00,1.00,153.60,19.20 +177.60,24.00,2.12,0.00,1.00,158.40,14.40 +177.60,19.20,2.18,0.00,1.00,163.20,9.60 +177.60,14.40,2.25,0.00,1.00,168.00,4.80 +177.60,9.60,2.31,0.00,1.00,172.80,0.00 +177.60,4.80,2.38,0.00,1.00,177.60,-0.00 +-177.60,-0.00,2.44,0.00,1.00,-177.60,-4.80 +-177.60,-4.80,2.51,0.00,1.00,-172.80,-9.60 +-177.60,-9.60,2.57,0.00,1.00,-168.00,-14.40 +-177.60,-14.40,2.63,0.00,1.00,-163.20,-19.20 +-177.60,-19.20,2.70,0.00,1.00,-158.40,-24.00 +-177.60,-24.00,2.76,0.00,1.00,-153.60,-28.80 +-177.60,-28.80,2.83,0.00,1.00,-148.80,-33.60 +-177.60,-33.60,2.89,0.00,1.00,-144.00,-38.40 +-177.60,-38.40,2.96,0.00,1.00,-139.20,-43.20 +-177.60,-48.00,3.02,0.00,1.00,-134.40,-48.00 +-177.60,-48.00,3.08,0.00,1.00,-129.60,-52.80 +-177.60,-52.80,3.15,0.00,1.00,-124.80,-57.60 +-177.60,-57.60,3.21,0.00,1.00,-120.00,-62.40 +177.60,-62.40,3.28,0.00,1.00,-115.20,-67.20 +177.60,-67.20,3.34,0.00,1.00,-110.40,-72.00 +177.60,-76.80,3.41,0.00,1.00,-105.60,-76.80 +177.60,-76.80,3.47,0.00,1.00,-100.80,-81.60 +177.60,-86.40,3.53,0.00,1.00,-96.00,-86.40 +177.60,-89.20,3.60,0.00,1.00,-91.20,-86.40 +0.00,-86.40,3.66,0.00,1.00,-86.40,-81.60 +0.00,-81.60,3.73,0.00,1.00,-81.60,-76.80 +0.00,-76.80,3.79,0.00,1.00,-76.80,-72.00 +0.00,-72.00,3.86,0.00,1.00,-72.00,-67.20 +0.00,-67.20,3.92,0.00,1.00,-67.20,-62.40 +0.00,-62.40,3.98,0.00,1.00,-62.40,-57.60 +0.00,-57.60,4.05,0.00,1.00,-57.60,-52.80 +0.00,-52.80,4.11,0.00,1.00,-52.80,-48.00 +0.00,-48.00,4.18,0.00,1.00,-48.00,-43.20 +0.00,-43.20,4.24,0.00,1.00,-43.20,-38.40 +0.00,-38.40,4.31,0.00,1.00,-38.40,-33.60 +0.00,-33.60,4.37,0.00,1.00,-33.60,-28.80 +0.00,-28.80,4.43,0.00,1.00,-28.80,-24.00 +0.00,-24.00,4.50,0.00,1.00,-24.00,-19.20 +0.00,-19.20,4.56,0.00,1.00,-19.20,-14.40 +0.00,-14.40,4.63,0.00,1.00,-14.40,-9.60 +0.00,-9.60,4.69,0.00,1.00,-9.60,-4.80 +0.00,-4.80,4.76,0.00,1.00,-4.80,0.00 +0.00,0.00,4.82,0.00,1.00,0.00,4.80 +0.00,4.80,4.88,0.00,1.00,4.80,9.60 +0.00,9.60,4.95,0.00,1.00,9.60,14.40 +0.00,14.40,5.01,0.00,1.00,14.40,19.20 +0.00,19.20,5.08,0.00,1.00,19.20,24.00 +0.00,24.00,5.14,0.00,1.00,24.00,28.80 +4.80,28.80,5.20,0.00,1.00,28.80,33.60 +4.80,33.60,5.27,0.00,1.00,33.60,38.40 +4.80,38.40,5.33,0.00,1.00,38.40,43.20 +4.80,43.20,5.40,0.00,1.00,43.20,48.00 +4.80,48.00,5.46,0.00,1.00,48.00,52.80 +4.80,52.80,5.53,0.00,1.00,52.80,57.60 +9.60,57.60,5.59,0.00,1.00,57.60,62.40 +9.60,62.40,5.65,0.00,1.00,62.40,67.20 +9.60,67.20,5.72,0.00,1.00,67.20,72.00 +14.40,72.00,5.78,0.00,1.00,72.00,76.80 +19.20,76.80,5.85,0.00,1.00,76.80,81.60 +28.80,81.60,5.91,0.00,1.00,81.60,86.40 +52.80,86.40,5.98,0.00,1.00,86.40,86.40 +105.60,86.40,6.04,0.00,1.00,91.20,81.60 +139.20,81.60,6.10,0.00,1.00,96.00,76.80 +158.40,76.80,6.17,0.00,1.00,100.80,72.00 +163.20,72.00,6.23,0.00,1.00,105.60,67.20 +168.00,67.20,6.30,0.00,1.00,110.40,62.40 +168.00,62.40,6.36,0.00,1.00,115.20,57.60 +172.80,57.60,6.43,0.00,1.00,120.00,52.80 +172.80,52.80,6.49,0.00,1.00,124.80,48.00 +172.80,48.00,6.55,0.00,1.00,129.60,43.20 +172.80,43.20,6.62,0.00,1.00,134.40,38.40 +177.60,38.40,6.68,0.00,1.00,139.20,33.60 +177.60,33.60,6.75,0.00,1.00,144.00,28.80 +177.60,28.80,6.81,0.00,1.00,148.80,24.00 +177.60,24.00,6.88,0.00,1.00,153.60,19.20 +177.60,19.20,6.94,0.00,1.00,158.40,14.40 +177.60,14.40,7.00,0.00,1.00,163.20,9.60 +177.60,9.60,7.07,0.00,1.00,168.00,4.80 +177.60,4.80,7.13,0.00,1.00,172.80,0.00 +177.60,0.00,7.20,0.00,1.00,177.60,-0.00 +-177.60,-0.00,7.26,0.00,1.00,-177.60,-4.80 +-177.60,-4.80,7.33,0.00,1.00,-172.80,-9.60 +-177.60,-9.60,7.39,0.00,1.00,-168.00,-14.40 +-177.60,-14.40,7.45,0.00,1.00,-163.20,-19.20 +-177.60,-19.20,7.52,0.00,1.00,-158.40,-24.00 +-177.60,-24.00,7.58,0.00,1.00,-153.60,-28.80 +-177.60,-28.80,7.65,0.00,1.00,-148.80,-33.60 +-177.60,-33.60,7.71,0.00,1.00,-144.00,-38.40 +-177.60,-38.40,7.78,0.00,1.00,-139.20,-43.20 +-172.80,-43.20,7.84,0.00,1.00,-134.40,-48.00 +-172.80,-48.00,7.90,0.00,1.00,-129.60,-52.80 +-172.80,-52.80,7.97,0.00,1.00,-124.80,-57.60 +-172.80,-57.60,8.03,0.00,1.00,-120.00,-62.40 +-168.00,-62.40,8.10,0.00,1.00,-115.20,-67.20 +-168.00,-67.20,8.16,0.00,1.00,-110.40,-72.00 +-163.20,-72.00,8.22,0.00,1.00,-105.60,-76.80 +-158.40,-76.80,8.29,0.00,1.00,-100.80,-81.60 +-139.20,-81.60,8.35,0.00,1.00,-96.00,-86.40 +-105.60,-86.40,8.42,0.00,1.00,-91.20,-86.40 +-52.80,-86.40,8.48,0.00,1.00,-86.40,-81.60 +-28.80,-81.60,8.55,0.00,1.00,-81.60,-76.80 +-19.20,-76.80,8.61,0.00,1.00,-76.80,-72.00 +-14.40,-72.00,8.67,0.00,1.00,-72.00,-67.20 +-9.60,-67.20,8.74,0.00,1.00,-67.20,-62.40 +-9.60,-62.40,8.80,0.00,1.00,-62.40,-57.60 +-9.60,-57.60,8.87,0.00,1.00,-57.60,-52.80 +-4.80,-52.80,8.93,0.00,1.00,-52.80,-48.00 +-4.80,-48.00,9.00,0.00,1.00,-48.00,-43.20 +-4.80,-43.20,9.06,0.00,1.00,-43.20,-38.40 +-4.80,-38.40,9.12,0.00,1.00,-38.40,-33.60 +-4.80,-33.60,9.19,0.00,1.00,-33.60,-28.80 +-4.80,-28.80,9.25,0.00,1.00,-28.80,-24.00 +-0.00,-24.00,9.32,0.00,1.00,-24.00,-19.20 +-0.00,-19.20,9.38,0.00,1.00,-19.20,-14.40 +-0.00,-14.40,9.45,0.00,1.00,-14.40,-9.60 +-0.00,-9.60,9.51,0.00,1.00,-9.60,-4.80 +-0.00,-4.80,9.57,0.00,1.00,-4.80,0.00 +0.00,0.00,9.64,0.00,1.00,0.00,4.80 +0.00,4.80,9.70,0.00,1.00,4.80,9.60 +0.00,9.60,9.77,0.00,1.00,9.60,14.40 +4.80,14.40,9.83,0.00,1.00,14.40,19.20 +4.80,19.20,9.90,0.00,1.00,19.20,24.00 +4.80,24.00,9.96,0.00,1.00,24.00,28.80 +4.80,28.80,10.02,0.00,1.00,28.80,33.60 +4.80,33.60,10.09,0.00,1.00,33.60,38.40 +9.60,38.40,10.15,0.00,1.00,38.40,43.20 +9.60,43.20,10.22,0.00,1.00,43.20,48.00 +9.60,48.00,10.28,0.00,1.00,48.00,52.80 +14.40,52.80,10.35,0.00,1.00,52.80,57.60 +14.40,57.60,10.41,0.00,1.00,57.60,62.40 +19.20,62.40,10.47,0.00,1.00,62.40,67.20 +24.00,67.20,10.54,0.00,1.00,67.20,72.00 +28.80,72.00,10.60,0.00,1.00,72.00,72.00 +33.60,72.00,10.67,0.00,1.00,76.80,76.80 +48.00,76.80,10.73,0.00,1.00,81.60,81.60 +67.20,81.60,10.80,0.00,1.00,86.40,81.60 +96.00,81.60,10.86,0.00,1.00,91.20,81.60 +120.00,76.80,10.92,0.00,1.00,96.00,76.80 +139.20,76.80,10.99,0.00,1.00,100.80,72.00 +148.80,72.00,11.05,0.00,1.00,105.60,67.20 +153.60,67.20,11.12,0.00,1.00,110.40,62.40 +158.40,62.40,11.18,0.00,1.00,115.20,57.60 +163.20,57.60,11.24,0.00,1.00,120.00,52.80 +168.00,52.80,11.31,0.00,1.00,124.80,48.00 +168.00,48.00,11.37,0.00,1.00,129.60,43.20 +168.00,43.20,11.44,0.00,1.00,134.40,38.40 +172.80,38.40,11.50,0.00,1.00,139.20,33.60 +172.80,33.60,11.57,0.00,1.00,144.00,28.80 +172.80,28.80,11.63,0.00,1.00,148.80,24.00 +177.60,24.00,11.69,0.00,1.00,153.60,19.20 +177.60,19.20,11.76,0.00,1.00,158.40,14.40 +177.60,14.40,11.82,0.00,1.00,163.20,9.60 +177.60,9.60,11.89,0.00,1.00,168.00,4.80 +177.60,4.80,11.95,0.00,1.00,172.80,0.00 +177.60,0.00,12.02,0.00,1.00,177.60,-0.00 +-177.60,-0.00,12.08,0.00,1.00,-177.60,-4.80 +-177.60,-4.80,12.14,0.00,1.00,-172.80,-9.60 +-177.60,-9.60,12.21,0.00,1.00,-168.00,-14.40 +-177.60,-14.40,12.27,0.00,1.00,-163.20,-19.20 +-177.60,-19.20,12.34,0.00,1.00,-158.40,-24.00 +-177.60,-24.00,12.40,0.00,1.00,-153.60,-28.80 +-172.80,-28.80,12.47,0.00,1.00,-148.80,-33.60 +-172.80,-33.60,12.53,0.00,1.00,-144.00,-38.40 +-172.80,-38.40,12.59,0.00,1.00,-139.20,-43.20 +-168.00,-43.20,12.66,0.00,1.00,-134.40,-48.00 +-168.00,-48.00,12.72,0.00,1.00,-129.60,-52.80 +-168.00,-52.80,12.79,0.00,1.00,-124.80,-57.60 +-163.20,-57.60,12.85,0.00,1.00,-120.00,-62.40 +-158.40,-62.40,12.92,0.00,1.00,-115.20,-67.20 +-153.60,-67.20,12.98,0.00,1.00,-110.40,-72.00 +-148.80,-72.00,13.04,0.00,1.00,-105.60,-76.80 +-139.20,-76.80,13.11,0.00,1.00,-100.80,-81.60 +-120.00,-76.80,13.17,0.00,1.00,-96.00,-81.60 +-96.00,-81.60,13.24,0.00,1.00,-91.20,-81.60 +-67.20,-81.60,13.30,0.00,1.00,-86.40,-76.80 +-48.00,-76.80,13.37,0.00,1.00,-81.60,-72.00 +-33.60,-72.00,13.43,0.00,1.00,-76.80,-72.00 +-28.80,-72.00,13.49,0.00,1.00,-72.00,-67.20 +-24.00,-67.20,13.56,0.00,1.00,-67.20,-62.40 +-19.20,-62.40,13.62,0.00,1.00,-62.40,-57.60 +-14.40,-57.60,13.69,0.00,1.00,-57.60,-52.80 +-14.40,-52.80,13.75,0.00,1.00,-52.80,-48.00 +-9.60,-48.00,13.82,0.00,1.00,-48.00,-43.20 +-9.60,-43.20,13.88,0.00,1.00,-43.20,-38.40 +-9.60,-38.40,13.94,0.00,1.00,-38.40,-33.60 +-4.80,-33.60,14.01,0.00,1.00,-33.60,-28.80 +-4.80,-28.80,14.07,0.00,1.00,-28.80,-24.00 +-4.80,-24.00,14.14,0.00,1.00,-24.00,-19.20 +-4.80,-19.20,14.20,0.00,1.00,-19.20,-14.40 +-4.80,-14.40,14.27,0.00,1.00,-14.40,-9.60 +-0.00,-9.60,14.33,0.00,1.00,-9.60,-4.80 +-0.00,-4.80,14.39,0.00,1.00,-4.80,0.00 +0.00,0.00,14.46,0.00,1.00,0.00,4.80 +0.00,4.80,14.52,0.00,1.00,4.80,9.60 +4.80,9.60,14.59,0.00,1.00,9.60,14.40 +4.80,14.40,14.65,0.00,1.00,14.40,19.20 +4.80,19.20,14.71,0.00,1.00,19.20,24.00 +4.80,24.00,14.78,0.00,1.00,24.00,28.80 +9.60,28.80,14.84,0.00,1.00,28.80,33.60 +9.60,33.60,14.91,0.00,1.00,33.60,38.40 +9.60,38.40,14.97,0.00,1.00,38.40,43.20 +14.40,43.20,15.04,0.00,1.00,43.20,48.00 +14.40,48.00,15.10,0.00,1.00,48.00,52.80 +19.20,52.80,15.16,0.00,1.00,52.80,57.60 +19.20,52.80,15.23,0.00,1.00,57.60,57.60 +24.00,57.60,15.29,0.00,1.00,62.40,62.40 +28.80,62.40,15.36,0.00,1.00,67.20,67.20 +38.40,67.20,15.42,0.00,1.00,72.00,72.00 +48.00,72.00,15.49,0.00,1.00,76.80,72.00 +57.60,72.00,15.55,0.00,1.00,81.60,76.80 +76.80,76.80,15.61,0.00,1.00,86.40,76.80 +96.00,76.80,15.68,0.00,1.00,91.20,76.80 +115.20,76.80,15.74,0.00,1.00,96.00,72.00 +129.60,72.00,15.81,0.00,1.00,100.80,72.00 +139.20,67.20,15.87,0.00,1.00,105.60,67.20 +144.00,67.20,15.94,0.00,1.00,110.40,62.40 +153.60,62.40,16.00,0.00,1.00,115.20,57.60 +158.40,57.60,16.00,0.00,1.00,120.00,52.80 +158.40,52.80,15.94,0.00,1.00,124.80,48.00 +163.20,48.00,15.87,0.00,1.00,129.60,43.20 +168.00,43.20,15.81,0.00,1.00,134.40,38.40 +168.00,38.40,15.74,0.00,1.00,139.20,33.60 +168.00,33.60,15.68,0.00,1.00,144.00,28.80 +172.80,28.80,15.61,0.00,1.00,148.80,24.00 +172.80,24.00,15.55,0.00,1.00,153.60,19.20 +172.80,19.20,15.49,0.00,1.00,158.40,14.40 +177.60,14.40,15.42,0.00,1.00,163.20,9.60 +177.60,9.60,15.36,0.00,1.00,168.00,4.80 +177.60,4.80,15.29,0.00,1.00,172.80,0.00 +177.60,0.00,15.23,0.00,1.00,177.60,-0.00 +-177.60,-0.00,15.16,0.00,1.00,-177.60,-4.80 +-177.60,-4.80,15.10,0.00,1.00,-172.80,-9.60 +-177.60,-9.60,15.04,0.00,1.00,-168.00,-14.40 +-177.60,-14.40,14.97,0.00,1.00,-163.20,-19.20 +-172.80,-19.20,14.91,0.00,1.00,-158.40,-24.00 +-172.80,-24.00,14.84,0.00,1.00,-153.60,-28.80 +-172.80,-28.80,14.78,0.00,1.00,-148.80,-33.60 +-168.00,-33.60,14.71,0.00,1.00,-144.00,-38.40 +-168.00,-38.40,14.65,0.00,1.00,-139.20,-43.20 +-168.00,-43.20,14.59,0.00,1.00,-134.40,-48.00 +-163.20,-48.00,14.52,0.00,1.00,-129.60,-52.80 +-158.40,-52.80,14.46,0.00,1.00,-124.80,-57.60 +-158.40,-57.60,14.39,0.00,1.00,-120.00,-62.40 +-153.60,-62.40,14.33,0.00,1.00,-115.20,-67.20 +-144.00,-67.20,14.27,0.00,1.00,-110.40,-72.00 +-139.20,-67.20,14.20,0.00,1.00,-105.60,-72.00 +-129.60,-72.00,14.14,0.00,1.00,-100.80,-76.80 +-115.20,-76.80,14.07,0.00,1.00,-96.00,-76.80 +-96.00,-76.80,14.01,0.00,1.00,-91.20,-76.80 +-76.80,-76.80,13.94,0.00,1.00,-86.40,-72.00 +-57.60,-72.00,13.88,0.00,1.00,-81.60,-72.00 +-48.00,-72.00,13.82,0.00,1.00,-76.80,-67.20 +-38.40,-67.20,13.75,0.00,1.00,-72.00,-62.40 +-28.80,-62.40,13.69,0.00,1.00,-67.20,-57.60 +-24.00,-57.60,13.62,0.00,1.00,-62.40,-57.60 +-19.20,-52.80,13.56,0.00,1.00,-57.60,-52.80 +-19.20,-52.80,13.49,0.00,1.00,-52.80,-48.00 +-14.40,-48.00,13.43,0.00,1.00,-48.00,-43.20 +-14.40,-43.20,13.37,0.00,1.00,-43.20,-38.40 +-9.60,-38.40,13.30,0.00,1.00,-38.40,-33.60 +-9.60,-33.60,13.24,0.00,1.00,-33.60,-28.80 +-9.60,-28.80,13.17,0.00,1.00,-28.80,-24.00 +-4.80,-24.00,13.11,0.00,1.00,-24.00,-19.20 +-4.80,-19.20,13.04,0.00,1.00,-19.20,-14.40 +-4.80,-14.40,12.98,0.00,1.00,-14.40,-9.60 +-4.80,-9.60,12.92,0.00,1.00,-9.60,-4.80 +-0.00,-4.80,12.85,0.00,1.00,-4.80,0.00 +0.00,0.00,12.79,0.00,1.00,0.00,4.80 +0.00,4.80,12.72,0.00,1.00,4.80,9.60 +4.80,9.60,12.66,0.00,1.00,9.60,14.40 +4.80,14.40,12.59,0.00,1.00,14.40,19.20 +4.80,19.20,12.53,0.00,1.00,19.20,24.00 +9.60,24.00,12.47,0.00,1.00,24.00,28.80 +9.60,28.80,12.40,0.00,1.00,28.80,33.60 +14.40,33.60,12.34,0.00,1.00,33.60,38.40 +14.40,33.60,12.27,0.00,1.00,38.40,38.40 +19.20,38.40,12.21,0.00,1.00,43.20,43.20 +19.20,43.20,12.14,0.00,1.00,48.00,48.00 +24.00,48.00,12.08,0.00,1.00,52.80,52.80 +28.80,52.80,12.02,0.00,1.00,57.60,57.60 +33.60,57.60,11.95,0.00,1.00,62.40,62.40 +38.40,62.40,11.89,0.00,1.00,67.20,62.40 +43.20,62.40,11.82,0.00,1.00,72.00,67.20 +52.80,67.20,11.76,0.00,1.00,76.80,72.00 +67.20,67.20,11.69,0.00,1.00,81.60,72.00 +76.80,72.00,11.63,0.00,1.00,86.40,72.00 +96.00,72.00,11.57,0.00,1.00,91.20,72.00 +105.60,72.00,11.50,0.00,1.00,96.00,67.20 +120.00,67.20,11.44,0.00,1.00,100.80,67.20 +129.60,67.20,11.37,0.00,1.00,105.60,62.40 +139.20,62.40,11.31,0.00,1.00,110.40,57.60 +144.00,57.60,11.24,0.00,1.00,115.20,57.60 +148.80,52.80,11.18,0.00,1.00,120.00,52.80 +153.60,52.80,11.12,0.00,1.00,124.80,48.00 +158.40,48.00,11.05,0.00,1.00,129.60,43.20 +163.20,43.20,10.99,0.00,1.00,134.40,38.40 +163.20,38.40,10.92,0.00,1.00,139.20,33.60 +168.00,33.60,10.86,0.00,1.00,144.00,28.80 +168.00,28.80,10.80,0.00,1.00,148.80,24.00 +172.80,24.00,10.73,0.00,1.00,153.60,19.20 +172.80,19.20,10.67,0.00,1.00,158.40,14.40 +172.80,14.40,10.60,0.00,1.00,163.20,9.60 +177.60,9.60,10.54,0.00,1.00,168.00,4.80 +177.60,4.80,10.47,0.00,1.00,172.80,0.00 +177.60,0.00,10.41,0.00,1.00,177.60,-0.00 +-177.60,-0.00,10.35,0.00,1.00,-177.60,-4.80 +-177.60,-4.80,10.28,0.00,1.00,-172.80,-9.60 +-177.60,-9.60,10.22,0.00,1.00,-168.00,-14.40 +-172.80,-14.40,10.15,0.00,1.00,-163.20,-19.20 +-172.80,-19.20,10.09,0.00,1.00,-158.40,-24.00 +-172.80,-24.00,10.02,0.00,1.00,-153.60,-28.80 +-168.00,-28.80,9.96,0.00,1.00,-148.80,-33.60 +-168.00,-33.60,9.90,0.00,1.00,-144.00,-38.40 +-163.20,-38.40,9.83,0.00,1.00,-139.20,-43.20 +-163.20,-43.20,9.77,0.00,1.00,-134.40,-48.00 +-158.40,-48.00,9.70,0.00,1.00,-129.60,-52.80 +-153.60,-52.80,9.64,0.00,1.00,-124.80,-57.60 +-148.80,-52.80,9.57,0.00,1.00,-120.00,-57.60 +-144.00,-57.60,9.51,0.00,1.00,-115.20,-62.40 +-139.20,-62.40,9.45,0.00,1.00,-110.40,-67.20 +-129.60,-67.20,9.38,0.00,1.00,-105.60,-67.20 +-120.00,-67.20,9.32,0.00,1.00,-100.80,-72.00 +-105.60,-72.00,9.25,0.00,1.00,-96.00,-72.00 +-96.00,-72.00,9.19,0.00,1.00,-91.20,-72.00 +-76.80,-72.00,9.12,0.00,1.00,-86.40,-72.00 +-67.20,-67.20,9.06,0.00,1.00,-81.60,-67.20 +-52.80,-67.20,9.00,0.00,1.00,-76.80,-62.40 +-43.20,-62.40,8.93,0.00,1.00,-72.00,-62.40 +-38.40,-62.40,8.87,0.00,1.00,-67.20,-57.60 +-33.60,-57.60,8.80,0.00,1.00,-62.40,-52.80 +-28.80,-52.80,8.74,0.00,1.00,-57.60,-48.00 +-24.00,-48.00,8.67,0.00,1.00,-52.80,-43.20 +-19.20,-43.20,8.61,0.00,1.00,-48.00,-38.40 +-19.20,-38.40,8.55,0.00,1.00,-43.20,-38.40 +-14.40,-33.60,8.48,0.00,1.00,-38.40,-33.60 +-14.40,-33.60,8.42,0.00,1.00,-33.60,-28.80 +-9.60,-28.80,8.35,0.00,1.00,-28.80,-24.00 +-9.60,-24.00,8.29,0.00,1.00,-24.00,-19.20 +-4.80,-19.20,8.22,0.00,1.00,-19.20,-14.40 +-4.80,-14.40,8.16,0.00,1.00,-14.40,-9.60 +-4.80,-9.60,8.10,0.00,1.00,-9.60,-4.80 +-0.00,-4.80,8.03,0.00,1.00,-4.80,0.00 +0.00,0.00,7.97,0.00,1.00,0.00,4.80 +0.00,4.80,7.90,0.00,1.00,4.80,9.60 +4.80,9.60,7.84,0.00,1.00,9.60,14.40 +4.80,14.40,7.78,0.00,1.00,14.40,19.20 +9.60,19.20,7.71,0.00,1.00,19.20,24.00 +9.60,24.00,7.65,0.00,1.00,24.00,24.00 +14.40,24.00,7.58,0.00,1.00,28.80,28.80 +14.40,28.80,7.52,0.00,1.00,33.60,33.60 +19.20,33.60,7.45,0.00,1.00,33.60,38.40 +19.20,38.40,7.39,0.00,1.00,38.40,43.20 +24.00,43.20,7.33,0.00,1.00,43.20,48.00 +28.80,48.00,7.26,0.00,1.00,48.00,52.80 +33.60,52.80,7.20,0.00,1.00,57.60,52.80 +38.40,52.80,7.13,0.00,1.00,62.40,57.60 +43.20,57.60,7.07,0.00,1.00,67.20,62.40 +52.80,62.40,7.00,0.00,1.00,72.00,62.40 +62.40,62.40,6.94,0.00,1.00,76.80,67.20 +72.00,62.40,6.88,0.00,1.00,81.60,67.20 +81.60,67.20,6.81,0.00,1.00,86.40,67.20 +91.20,67.20,6.75,0.00,1.00,91.20,67.20 +105.60,67.20,6.68,0.00,1.00,96.00,67.20 +115.20,62.40,6.62,0.00,1.00,100.80,62.40 +124.80,62.40,6.55,0.00,1.00,105.60,57.60 +134.40,57.60,6.49,0.00,1.00,110.40,57.60 +139.20,57.60,6.43,0.00,1.00,115.20,52.80 +144.00,52.80,6.36,0.00,1.00,120.00,48.00 +148.80,48.00,6.30,0.00,1.00,129.60,43.20 +153.60,43.20,6.23,0.00,1.00,134.40,43.20 +158.40,38.40,6.17,0.00,1.00,139.20,38.40 +158.40,38.40,6.10,0.00,1.00,144.00,33.60 +163.20,33.60,6.04,0.00,1.00,148.80,28.80 +168.00,28.80,5.98,0.00,1.00,148.80,24.00 +168.00,24.00,5.91,0.00,1.00,153.60,19.20 +172.80,19.20,5.85,0.00,1.00,158.40,14.40 +172.80,14.40,5.78,0.00,1.00,163.20,9.60 +172.80,9.60,5.72,0.00,1.00,168.00,4.80 +177.60,4.80,5.65,0.00,1.00,172.80,0.00 +177.60,0.00,5.59,0.00,1.00,177.60,-0.00 +-177.60,-0.00,5.53,0.00,1.00,-177.60,-4.80 +-177.60,-4.80,5.46,0.00,1.00,-172.80,-9.60 +-172.80,-9.60,5.40,0.00,1.00,-168.00,-14.40 +-172.80,-14.40,5.33,0.00,1.00,-163.20,-19.20 +-172.80,-19.20,5.27,0.00,1.00,-158.40,-24.00 +-168.00,-24.00,5.20,0.00,1.00,-153.60,-28.80 +-168.00,-28.80,5.14,0.00,1.00,-148.80,-33.60 +-163.20,-33.60,5.08,0.00,1.00,-148.80,-38.40 +-158.40,-38.40,5.01,0.00,1.00,-144.00,-43.20 +-158.40,-38.40,4.95,0.00,1.00,-139.20,-43.20 +-153.60,-43.20,4.88,0.00,1.00,-134.40,-48.00 +-148.80,-48.00,4.82,0.00,1.00,-129.60,-52.80 +-144.00,-52.80,4.76,0.00,1.00,-120.00,-57.60 +-139.20,-57.60,4.69,0.00,1.00,-115.20,-57.60 +-134.40,-57.60,4.63,0.00,1.00,-110.40,-62.40 +-124.80,-62.40,4.56,0.00,1.00,-105.60,-67.20 +-115.20,-62.40,4.50,0.00,1.00,-100.80,-67.20 +-105.60,-67.20,4.43,0.00,1.00,-96.00,-67.20 +-91.20,-67.20,4.37,0.00,1.00,-91.20,-67.20 +-81.60,-67.20,4.31,0.00,1.00,-86.40,-67.20 +-72.00,-62.40,4.24,0.00,1.00,-81.60,-62.40 +-62.40,-62.40,4.18,0.00,1.00,-76.80,-62.40 +-52.80,-62.40,4.11,0.00,1.00,-72.00,-57.60 +-43.20,-57.60,4.05,0.00,1.00,-67.20,-52.80 +-38.40,-52.80,3.98,0.00,1.00,-62.40,-52.80 +-33.60,-52.80,3.92,0.00,1.00,-57.60,-48.00 +-28.80,-48.00,3.86,0.00,1.00,-48.00,-43.20 +-24.00,-43.20,3.79,0.00,1.00,-43.20,-38.40 +-19.20,-38.40,3.73,0.00,1.00,-38.40,-33.60 +-19.20,-33.60,3.66,0.00,1.00,-33.60,-28.80 +-14.40,-28.80,3.60,0.00,1.00,-33.60,-24.00 +-14.40,-24.00,3.53,0.00,1.00,-28.80,-24.00 +-9.60,-24.00,3.47,0.00,1.00,-24.00,-19.20 +-9.60,-19.20,3.41,0.00,1.00,-19.20,-14.40 +-4.80,-14.40,3.34,0.00,1.00,-14.40,-9.60 +-4.80,-9.60,3.28,0.00,1.00,-9.60,-4.80 +-0.00,-4.80,3.21,0.00,1.00,-4.80,0.00 +0.00,0.00,3.15,0.00,1.00,0.00,4.80 +0.00,4.80,3.08,0.00,1.00,4.80,9.60 +4.80,9.60,3.02,0.00,1.00,9.60,14.40 +4.80,14.40,2.96,0.00,1.00,14.40,19.20 +9.60,14.40,2.89,0.00,1.00,19.20,19.20 +14.40,19.20,2.83,0.00,1.00,19.20,24.00 +14.40,24.00,2.76,0.00,1.00,24.00,28.80 +19.20,28.80,2.70,0.00,1.00,28.80,33.60 +19.20,33.60,2.63,0.00,1.00,33.60,38.40 +24.00,38.40,2.57,0.00,1.00,38.40,43.20 +28.80,38.40,2.51,0.00,1.00,43.20,43.20 +33.60,43.20,2.44,0.00,1.00,48.00,48.00 +38.40,48.00,2.38,0.00,1.00,52.80,52.80 +43.20,52.80,2.31,0.00,1.00,57.60,52.80 +48.00,52.80,2.25,0.00,1.00,62.40,57.60 +57.60,57.60,2.18,0.00,1.00,72.00,57.60 +62.40,57.60,2.12,0.00,1.00,76.80,62.40 +72.00,62.40,2.06,0.00,1.00,81.60,62.40 +81.60,62.40,1.99,0.00,1.00,86.40,62.40 +91.20,62.40,1.93,0.00,1.00,91.20,62.40 +100.80,62.40,1.86,0.00,1.00,96.00,62.40 +110.40,57.60,1.80,0.00,1.00,100.80,57.60 +120.00,57.60,1.73,0.00,1.00,105.60,57.60 +129.60,57.60,1.67,0.00,1.00,115.20,52.80 +134.40,52.80,1.61,0.00,1.00,120.00,48.00 +139.20,48.00,1.54,0.00,1.00,124.80,48.00 +144.00,48.00,1.48,0.00,1.00,129.60,43.20 +148.80,43.20,1.41,0.00,1.00,134.40,38.40 +153.60,38.40,1.35,0.00,1.00,139.20,33.60 +158.40,33.60,1.29,0.00,1.00,144.00,33.60 +158.40,28.80,1.22,0.00,1.00,148.80,28.80 +163.20,28.80,1.16,0.00,1.00,153.60,24.00 +168.00,24.00,1.09,0.00,1.00,158.40,19.20 +168.00,19.20,1.03,0.00,1.00,163.20,14.40 +172.80,14.40,0.96,0.00,1.00,163.20,9.60 +172.80,9.60,0.90,0.00,1.00,168.00,4.80 +177.60,4.80,0.84,0.00,1.00,172.80,0.00 +177.60,0.00,0.77,0.00,1.00,177.60,-0.00 +-177.60,-0.00,0.71,0.00,1.00,-177.60,-4.80 +-177.60,-4.80,0.64,0.00,1.00,-172.80,-9.60 +-172.80,-9.60,0.58,0.00,1.00,-168.00,-14.40 +-172.80,-14.40,0.51,0.00,1.00,-163.20,-19.20 +-168.00,-19.20,0.45,0.00,1.00,-163.20,-24.00 +-168.00,-24.00,0.39,0.00,1.00,-158.40,-28.80 +-163.20,-28.80,0.32,0.00,1.00,-153.60,-33.60 +-158.40,-28.80,0.26,0.00,1.00,-148.80,-33.60 +-158.40,-33.60,0.19,0.00,1.00,-144.00,-38.40 +-153.60,-38.40,0.13,0.00,1.00,-139.20,-43.20 +-148.80,-43.20,0.06,0.00,1.00,-134.40,-48.00 +-144.00,-48.00,0.00,0.00,1.00,-129.60,-48.00 +-139.20,-48.00,0.00,0.00,1.00,-124.80,-52.80 +-134.40,-52.80,0.16,0.00,1.00,-120.00,-57.60 +-129.60,-57.60,0.32,0.00,1.00,-115.20,-57.60 +-120.00,-57.60,0.48,0.00,1.00,-105.60,-62.40 +-110.40,-57.60,0.65,0.00,1.00,-100.80,-62.40 +-100.80,-62.40,0.81,0.00,1.00,-96.00,-62.40 +-91.20,-62.40,0.97,0.00,1.00,-91.20,-62.40 +-81.60,-62.40,1.13,0.00,1.00,-86.40,-62.40 +-72.00,-62.40,1.29,0.00,1.00,-81.60,-57.60 +-62.40,-57.60,1.45,0.00,1.00,-76.80,-57.60 +-57.60,-57.60,1.62,0.00,1.00,-72.00,-52.80 +-48.00,-52.80,1.78,0.00,1.00,-62.40,-52.80 +-43.20,-52.80,1.94,0.00,1.00,-57.60,-48.00 +-38.40,-48.00,2.10,0.00,1.00,-52.80,-43.20 +-33.60,-43.20,2.26,0.00,1.00,-48.00,-43.20 +-28.80,-38.40,2.42,0.00,1.00,-43.20,-38.40 +-24.00,-38.40,2.59,0.00,1.00,-38.40,-33.60 +-19.20,-33.60,2.75,0.00,1.00,-33.60,-28.80 +-19.20,-28.80,2.91,0.00,1.00,-28.80,-24.00 +-14.40,-24.00,3.07,0.00,1.00,-24.00,-19.20 +-14.40,-19.20,3.23,0.00,1.00,-19.20,-19.20 +-9.60,-14.40,3.39,0.00,1.00,-19.20,-14.40 +-4.80,-14.40,3.56,0.00,1.00,-14.40,-9.60 +-4.80,-9.60,3.72,0.00,1.00,-9.60,-4.80 +-0.00,-4.80,3.88,0.00,1.00,-4.80,0.00 +0.00,0.00,4.04,0.00,1.00,0.00,4.80 +4.80,4.80,4.20,0.00,1.00,4.80,9.60 +4.80,9.60,4.36,0.00,1.00,9.60,14.40 +9.60,9.60,4.53,0.00,1.00,14.40,14.40 +9.60,14.40,4.69,0.00,1.00,14.40,19.20 +14.40,19.20,4.85,0.00,1.00,19.20,24.00 +19.20,24.00,5.01,0.00,1.00,24.00,28.80 +19.20,28.80,5.17,0.00,1.00,28.80,33.60 +24.00,28.80,5.33,0.00,1.00,33.60,33.60 +28.80,33.60,5.49,0.00,1.00,38.40,38.40 +33.60,38.40,5.66,0.00,1.00,43.20,43.20 +38.40,43.20,5.82,0.00,1.00,48.00,43.20 +43.20,43.20,5.98,0.00,1.00,52.80,48.00 +48.00,48.00,6.14,0.00,1.00,57.60,52.80 +52.80,48.00,6.30,0.00,1.00,62.40,52.80 +57.60,52.80,6.46,0.00,1.00,67.20,57.60 +67.20,52.80,6.63,0.00,1.00,72.00,57.60 +76.80,57.60,6.79,0.00,1.00,81.60,57.60 +81.60,57.60,6.95,0.00,1.00,86.40,57.60 +91.20,57.60,7.11,0.00,1.00,91.20,57.60 +100.80,57.60,7.27,0.00,1.00,96.00,57.60 +110.40,52.80,7.43,0.00,1.00,100.80,52.80 +115.20,52.80,7.60,0.00,1.00,110.40,52.80 +124.80,52.80,7.76,0.00,1.00,115.20,48.00 +129.60,48.00,7.92,0.00,1.00,120.00,48.00 +134.40,48.00,8.08,0.00,1.00,124.80,43.20 +139.20,43.20,8.24,0.00,1.00,129.60,38.40 +144.00,38.40,8.40,0.00,1.00,134.40,38.40 +148.80,38.40,8.57,0.00,1.00,139.20,33.60 +153.60,33.60,8.73,0.00,1.00,144.00,28.80 +158.40,28.80,8.89,0.00,1.00,148.80,24.00 +163.20,24.00,9.05,0.00,1.00,153.60,24.00 +163.20,24.00,9.21,0.00,1.00,158.40,19.20 +168.00,19.20,9.37,0.00,1.00,163.20,14.40 +172.80,14.40,9.54,0.00,1.00,168.00,9.60 +172.80,9.60,9.70,0.00,1.00,168.00,4.80 +177.60,4.80,9.86,0.00,1.00,172.80,0.00 +177.60,0.00,10.02,0.00,1.00,177.60,-0.00 +-177.60,-0.00,10.18,0.00,1.00,-177.60,-4.80 +-177.60,-4.80,10.34,0.00,1.00,-172.80,-9.60 +-172.80,-9.60,10.51,0.00,1.00,-168.00,-14.40 +-172.80,-14.40,10.67,0.00,1.00,-168.00,-19.20 +-168.00,-19.20,10.83,0.00,1.00,-163.20,-24.00 +-163.20,-24.00,10.99,0.00,1.00,-158.40,-24.00 +-163.20,-24.00,11.15,0.00,1.00,-153.60,-28.80 +-158.40,-28.80,11.31,0.00,1.00,-148.80,-33.60 +-153.60,-33.60,11.47,0.00,1.00,-144.00,-38.40 +-148.80,-38.40,11.64,0.00,1.00,-139.20,-38.40 +-144.00,-38.40,11.80,0.00,1.00,-134.40,-43.20 +-139.20,-43.20,11.96,0.00,1.00,-129.60,-48.00 +-134.40,-48.00,12.12,0.00,1.00,-124.80,-48.00 +-129.60,-48.00,12.28,0.00,1.00,-120.00,-52.80 +-124.80,-52.80,12.44,0.00,1.00,-115.20,-52.80 +-115.20,-52.80,12.61,0.00,1.00,-110.40,-57.60 +-110.40,-52.80,12.77,0.00,1.00,-100.80,-57.60 +-100.80,-57.60,12.93,0.00,1.00,-96.00,-57.60 +-91.20,-57.60,13.09,0.00,1.00,-91.20,-57.60 +-81.60,-57.60,13.25,0.00,1.00,-86.40,-57.60 +-76.80,-57.60,13.41,0.00,1.00,-81.60,-57.60 +-67.20,-52.80,13.58,0.00,1.00,-72.00,-52.80 +-57.60,-52.80,13.74,0.00,1.00,-67.20,-52.80 +-52.80,-48.00,13.90,0.00,1.00,-62.40,-48.00 +-48.00,-48.00,14.06,0.00,1.00,-57.60,-43.20 +-43.20,-43.20,14.22,0.00,1.00,-52.80,-43.20 +-38.40,-43.20,14.38,0.00,1.00,-48.00,-38.40 +-33.60,-38.40,14.55,0.00,1.00,-43.20,-33.60 +-28.80,-33.60,14.71,0.00,1.00,-38.40,-33.60 +-24.00,-28.80,14.87,0.00,1.00,-33.60,-28.80 +-19.20,-28.80,15.03,0.00,1.00,-28.80,-24.00 +-19.20,-24.00,15.19,0.00,1.00,-24.00,-19.20 +-14.40,-19.20,15.35,0.00,1.00,-19.20,-14.40 +-9.60,-14.40,15.52,0.00,1.00,-14.40,-14.40 +-9.60,-9.60,15.68,0.00,1.00,-14.40,-9.60 +-4.80,-9.60,15.84,0.00,1.00,-9.60,-4.80 +-4.80,-4.80,16.00,0.00,1.00,-4.80,0.00 +0.00,0.00,16.00,0.00,1.00,0.00,4.80 +4.80,4.80,15.84,0.00,1.00,4.80,9.60 +4.80,9.60,15.68,0.00,1.00,9.60,9.60 +9.60,9.60,15.52,0.00,1.00,9.60,14.40 +14.40,14.40,15.35,0.00,1.00,14.40,19.20 +14.40,19.20,15.19,0.00,1.00,19.20,24.00 +19.20,24.00,15.03,0.00,1.00,24.00,24.00 +24.00,24.00,14.87,0.00,1.00,28.80,28.80 +24.00,28.80,14.71,0.00,1.00,33.60,33.60 +28.80,33.60,14.55,0.00,1.00,38.40,38.40 +33.60,33.60,14.38,0.00,1.00,43.20,38.40 +38.40,38.40,14.22,0.00,1.00,48.00,43.20 +43.20,43.20,14.06,0.00,1.00,52.80,43.20 +48.00,43.20,13.90,0.00,1.00,57.60,48.00 +57.60,48.00,13.74,0.00,1.00,62.40,48.00 +62.40,48.00,13.58,0.00,1.00,67.20,52.80 +67.20,48.00,13.41,0.00,1.00,72.00,52.80 +76.80,52.80,13.25,0.00,1.00,81.60,52.80 +86.40,52.80,13.09,0.00,1.00,86.40,52.80 +91.20,52.80,12.93,0.00,1.00,91.20,52.80 +100.80,52.80,12.77,0.00,1.00,96.00,52.80 +105.60,48.00,12.61,0.00,1.00,105.60,48.00 +115.20,48.00,12.44,0.00,1.00,110.40,48.00 +120.00,48.00,12.28,0.00,1.00,115.20,48.00 +124.80,43.20,12.12,0.00,1.00,120.00,43.20 +134.40,43.20,11.96,0.00,1.00,124.80,43.20 +139.20,38.40,11.80,0.00,1.00,129.60,38.40 +144.00,38.40,11.64,0.00,1.00,134.40,33.60 +148.80,33.60,11.47,0.00,1.00,139.20,33.60 +153.60,28.80,11.31,0.00,1.00,144.00,28.80 +153.60,28.80,11.15,0.00,1.00,148.80,24.00 +158.40,24.00,10.99,0.00,1.00,153.60,19.20 +163.20,19.20,10.83,0.00,1.00,158.40,19.20 +168.00,14.40,10.67,0.00,1.00,163.20,14.40 +168.00,14.40,10.51,0.00,1.00,168.00,9.60 +172.80,9.60,10.34,0.00,1.00,172.80,4.80 +177.60,4.80,10.18,0.00,1.00,172.80,0.00 +177.60,0.00,10.02,0.00,1.00,177.60,-0.00 +-177.60,-0.00,9.86,0.00,1.00,-177.60,-4.80 +-177.60,-4.80,9.70,0.00,1.00,-172.80,-9.60 +-172.80,-9.60,9.54,0.00,1.00,-172.80,-14.40 +-168.00,-14.40,9.37,0.00,1.00,-168.00,-19.20 +-168.00,-14.40,9.21,0.00,1.00,-163.20,-19.20 +-163.20,-19.20,9.05,0.00,1.00,-158.40,-24.00 +-158.40,-24.00,8.89,0.00,1.00,-153.60,-28.80 +-153.60,-28.80,8.73,0.00,1.00,-148.80,-33.60 +-153.60,-28.80,8.57,0.00,1.00,-144.00,-33.60 +-148.80,-33.60,8.40,0.00,1.00,-139.20,-38.40 +-144.00,-38.40,8.24,0.00,1.00,-134.40,-43.20 +-139.20,-38.40,8.08,0.00,1.00,-129.60,-43.20 +-134.40,-43.20,7.92,0.00,1.00,-124.80,-48.00 +-124.80,-43.20,7.76,0.00,1.00,-120.00,-48.00 +-120.00,-48.00,7.60,0.00,1.00,-115.20,-48.00 +-115.20,-48.00,7.43,0.00,1.00,-110.40,-52.80 +-105.60,-48.00,7.27,0.00,1.00,-105.60,-52.80 +-100.80,-52.80,7.11,0.00,1.00,-96.00,-52.80 +-91.20,-52.80,6.95,0.00,1.00,-91.20,-52.80 +-86.40,-52.80,6.79,0.00,1.00,-86.40,-52.80 +-76.80,-52.80,6.63,0.00,1.00,-81.60,-52.80 +-67.20,-48.00,6.46,0.00,1.00,-72.00,-48.00 +-62.40,-48.00,6.30,0.00,1.00,-67.20,-48.00 +-57.60,-48.00,6.14,0.00,1.00,-62.40,-43.20 +-48.00,-43.20,5.98,0.00,1.00,-57.60,-43.20 +-43.20,-43.20,5.82,0.00,1.00,-52.80,-38.40 +-38.40,-38.40,5.66,0.00,1.00,-48.00,-38.40 +-33.60,-33.60,5.49,0.00,1.00,-43.20,-33.60 +-28.80,-33.60,5.33,0.00,1.00,-38.40,-28.80 +-24.00,-28.80,5.17,0.00,1.00,-33.60,-24.00 +-24.00,-24.00,5.01,0.00,1.00,-28.80,-24.00 +-19.20,-24.00,4.85,0.00,1.00,-24.00,-19.20 +-14.40,-19.20,4.69,0.00,1.00,-19.20,-14.40 +-14.40,-14.40,4.53,0.00,1.00,-14.40,-9.60 +-9.60,-9.60,4.36,0.00,1.00,-9.60,-9.60 +-4.80,-9.60,4.20,0.00,1.00,-9.60,-4.80 +-4.80,-4.80,4.04,0.00,1.00,-4.80,0.00 +0.00,0.00,3.88,0.00,1.00,0.00,4.80 +4.80,4.80,3.72,0.00,1.00,4.80,4.80 +4.80,4.80,3.56,0.00,1.00,4.80,9.60 +9.60,9.60,3.39,0.00,1.00,9.60,14.40 +14.40,14.40,3.23,0.00,1.00,14.40,19.20 +19.20,19.20,3.07,0.00,1.00,19.20,19.20 +19.20,19.20,2.91,0.00,1.00,24.00,24.00 +24.00,24.00,2.75,0.00,1.00,24.00,28.80 +28.80,28.80,2.59,0.00,1.00,28.80,28.80 +33.60,28.80,2.42,0.00,1.00,33.60,33.60 +38.40,33.60,2.26,0.00,1.00,38.40,38.40 +43.20,33.60,2.10,0.00,1.00,43.20,38.40 +48.00,38.40,1.94,0.00,1.00,48.00,43.20 +52.80,38.40,1.78,0.00,1.00,52.80,43.20 +57.60,43.20,1.62,0.00,1.00,62.40,43.20 +62.40,43.20,1.45,0.00,1.00,67.20,48.00 +72.00,43.20,1.29,0.00,1.00,72.00,48.00 +76.80,48.00,1.13,0.00,1.00,76.80,48.00 +86.40,48.00,0.97,0.00,1.00,86.40,48.00 +91.20,48.00,0.81,0.00,1.00,91.20,48.00 +100.80,48.00,0.65,0.00,1.00,96.00,48.00 +105.60,48.00,0.48,0.00,1.00,105.60,48.00 +110.40,43.20,0.32,0.00,1.00,110.40,43.20 +120.00,43.20,0.16,0.00,1.00,115.20,43.20 +124.80,43.20,0.00,0.00,1.00,124.80,38.40 +129.60,38.40,0.00,0.00,1.00,129.60,38.40 +134.40,38.40,0.04,0.00,1.00,134.40,33.60 +139.20,33.60,0.08,0.00,1.00,139.20,33.60 +144.00,33.60,0.12,0.00,1.00,144.00,28.80 +148.80,28.80,0.16,0.00,1.00,148.80,24.00 +153.60,24.00,0.20,0.00,1.00,153.60,24.00 +158.40,24.00,0.24,0.00,1.00,158.40,19.20 +163.20,19.20,0.28,0.00,1.00,158.40,14.40 +163.20,14.40,0.32,0.00,1.00,163.20,14.40 +168.00,14.40,0.36,0.00,1.00,168.00,9.60 +172.80,9.60,0.40,0.00,1.00,172.80,4.80 +172.80,4.80,0.44,0.00,1.00,172.80,0.00 +177.60,0.00,0.48,0.00,1.00,177.60,-0.00 +-177.60,-0.00,0.52,0.00,1.00,-177.60,-4.80 +-172.80,-4.80,0.56,0.00,1.00,-172.80,-9.60 +-172.80,-9.60,0.60,0.00,1.00,-172.80,-14.40 +-168.00,-14.40,0.64,0.00,1.00,-168.00,-14.40 +-163.20,-14.40,0.68,0.00,1.00,-163.20,-19.20 +-163.20,-19.20,0.72,0.00,1.00,-158.40,-24.00 +-158.40,-24.00,0.76,0.00,1.00,-158.40,-24.00 +-153.60,-24.00,0.80,0.00,1.00,-153.60,-28.80 +-148.80,-28.80,0.84,0.00,1.00,-148.80,-33.60 +-144.00,-33.60,0.88,0.00,1.00,-144.00,-33.60 +-139.20,-33.60,0.92,0.00,1.00,-139.20,-38.40 +-134.40,-38.40,0.96,0.00,1.00,-134.40,-38.40 +-129.60,-38.40,1.00,0.00,1.00,-129.60,-43.20 +-124.80,-43.20,1.04,0.00,1.00,-124.80,-43.20 +-120.00,-43.20,1.08,0.00,1.00,-115.20,-48.00 +-110.40,-43.20,1.12,0.00,1.00,-110.40,-48.00 +-105.60,-48.00,1.16,0.00,1.00,-105.60,-48.00 +-100.80,-48.00,1.20,0.00,1.00,-96.00,-48.00 +-91.20,-48.00,1.24,0.00,1.00,-91.20,-48.00 +-86.40,-48.00,1.28,0.00,1.00,-86.40,-48.00 +-76.80,-48.00,1.32,0.00,1.00,-76.80,-48.00 +-72.00,-43.20,1.36,0.00,1.00,-72.00,-43.20 +-62.40,-43.20,1.40,0.00,1.00,-67.20,-43.20 +-57.60,-43.20,1.44,0.00,1.00,-62.40,-43.20 +-52.80,-38.40,1.48,0.00,1.00,-52.80,-38.40 +-48.00,-38.40,1.52,0.00,1.00,-48.00,-38.40 +-43.20,-33.60,1.56,0.00,1.00,-43.20,-33.60 +-38.40,-33.60,1.60,0.00,1.00,-38.40,-28.80 +-33.60,-28.80,1.64,0.00,1.00,-33.60,-28.80 +-28.80,-28.80,1.68,0.00,1.00,-28.80,-24.00 +-24.00,-24.00,1.72,0.00,1.00,-24.00,-19.20 +-19.20,-19.20,1.76,0.00,1.00,-24.00,-19.20 +-19.20,-19.20,1.80,0.00,1.00,-19.20,-14.40 +-14.40,-14.40,1.84,0.00,1.00,-14.40,-9.60 +-9.60,-9.60,1.88,0.00,1.00,-9.60,-4.80 +-4.80,-4.80,1.92,0.00,1.00,-4.80,-4.80 +-4.80,-4.80,1.96,0.00,1.00,-4.80,0.00 +0.00,0.00,2.01,0.00,1.00,0.00,4.80 +4.80,4.80,2.05,0.00,1.00,4.80,4.80 +4.80,4.80,2.09,0.00,1.00,4.80,9.60 +9.60,9.60,2.13,0.00,1.00,9.60,14.40 +14.40,14.40,2.17,0.00,1.00,14.40,14.40 +19.20,14.40,2.21,0.00,1.00,14.40,19.20 +24.00,19.20,2.25,0.00,1.00,19.20,24.00 +24.00,24.00,2.29,0.00,1.00,24.00,24.00 +28.80,24.00,2.33,0.00,1.00,28.80,28.80 +33.60,28.80,2.37,0.00,1.00,33.60,28.80 +38.40,28.80,2.41,0.00,1.00,38.40,33.60 +43.20,33.60,2.45,0.00,1.00,43.20,33.60 +48.00,33.60,2.49,0.00,1.00,48.00,38.40 +52.80,38.40,2.53,0.00,1.00,52.80,38.40 +62.40,38.40,2.57,0.00,1.00,57.60,38.40 +67.20,38.40,2.61,0.00,1.00,62.40,43.20 +72.00,38.40,2.65,0.00,1.00,72.00,43.20 +76.80,43.20,2.69,0.00,1.00,76.80,43.20 +86.40,43.20,2.73,0.00,1.00,86.40,43.20 +91.20,43.20,2.77,0.00,1.00,91.20,43.20 +96.00,43.20,2.81,0.00,1.00,100.80,43.20 +105.60,43.20,2.85,0.00,1.00,105.60,43.20 +110.40,38.40,2.89,0.00,1.00,110.40,38.40 +115.20,38.40,2.93,0.00,1.00,120.00,38.40 +120.00,38.40,2.97,0.00,1.00,124.80,38.40 +129.60,33.60,3.01,0.00,1.00,129.60,33.60 +134.40,33.60,3.05,0.00,1.00,134.40,33.60 +139.20,28.80,3.09,0.00,1.00,139.20,28.80 +144.00,28.80,3.13,0.00,1.00,144.00,28.80 +148.80,24.00,3.17,0.00,1.00,148.80,24.00 +153.60,24.00,3.21,0.00,1.00,153.60,19.20 +153.60,19.20,3.25,0.00,1.00,158.40,19.20 +158.40,19.20,3.29,0.00,1.00,163.20,14.40 +163.20,14.40,3.33,0.00,1.00,163.20,9.60 +168.00,9.60,3.37,0.00,1.00,168.00,9.60 +172.80,9.60,3.41,0.00,1.00,172.80,4.80 +172.80,4.80,3.45,0.00,1.00,172.80,0.00 +177.60,0.00,3.49,0.00,1.00,177.60,-0.00 +-177.60,-0.00,3.53,0.00,1.00,-177.60,-4.80 +-172.80,-4.80,3.57,0.00,1.00,-172.80,-9.60 +-172.80,-9.60,3.61,0.00,1.00,-172.80,-9.60 +-168.00,-9.60,3.65,0.00,1.00,-168.00,-14.40 +-163.20,-14.40,3.69,0.00,1.00,-163.20,-19.20 +-158.40,-19.20,3.73,0.00,1.00,-163.20,-19.20 +-153.60,-19.20,3.77,0.00,1.00,-158.40,-24.00 +-153.60,-24.00,3.81,0.00,1.00,-153.60,-28.80 +-148.80,-24.00,3.85,0.00,1.00,-148.80,-28.80 +-144.00,-28.80,3.89,0.00,1.00,-144.00,-33.60 +-139.20,-28.80,3.93,0.00,1.00,-139.20,-33.60 +-134.40,-33.60,3.97,0.00,1.00,-134.40,-38.40 +-129.60,-33.60,4.01,0.00,1.00,-129.60,-38.40 +-120.00,-38.40,4.05,0.00,1.00,-124.80,-38.40 +-115.20,-38.40,4.09,0.00,1.00,-120.00,-43.20 +-110.40,-38.40,4.13,0.00,1.00,-110.40,-43.20 +-105.60,-43.20,4.17,0.00,1.00,-105.60,-43.20 +-96.00,-43.20,4.21,0.00,1.00,-100.80,-43.20 +-91.20,-43.20,4.25,0.00,1.00,-91.20,-43.20 +-86.40,-43.20,4.29,0.00,1.00,-86.40,-43.20 +-76.80,-43.20,4.33,0.00,1.00,-76.80,-43.20 +-72.00,-38.40,4.37,0.00,1.00,-72.00,-38.40 +-67.20,-38.40,4.41,0.00,1.00,-62.40,-38.40 +-62.40,-38.40,4.45,0.00,1.00,-57.60,-38.40 +-52.80,-38.40,4.49,0.00,1.00,-52.80,-33.60 +-48.00,-33.60,4.53,0.00,1.00,-48.00,-33.60 +-43.20,-33.60,4.57,0.00,1.00,-43.20,-28.80 +-38.40,-28.80,4.61,0.00,1.00,-38.40,-28.80 +-33.60,-28.80,4.65,0.00,1.00,-33.60,-24.00 +-28.80,-24.00,4.69,0.00,1.00,-28.80,-24.00 +-24.00,-24.00,4.73,0.00,1.00,-24.00,-19.20 +-24.00,-19.20,4.77,0.00,1.00,-19.20,-14.40 +-19.20,-14.40,4.81,0.00,1.00,-14.40,-14.40 +-14.40,-14.40,4.85,0.00,1.00,-14.40,-9.60 +-9.60,-9.60,4.89,0.00,1.00,-9.60,-4.80 +-4.80,-4.80,4.93,0.00,1.00,-4.80,-4.80 +-4.80,-4.80,4.97,0.00,1.00,-4.80,0.00 +0.00,0.00,5.01,0.00,1.00,0.00,4.80 +4.80,4.80,5.05,0.00,1.00,4.80,4.80 +9.60,4.80,5.09,0.00,1.00,4.80,9.60 +9.60,9.60,5.13,0.00,1.00,9.60,9.60 +14.40,9.60,5.17,0.00,1.00,9.60,14.40 +19.20,14.40,5.21,0.00,1.00,14.40,19.20 +24.00,19.20,5.25,0.00,1.00,19.20,19.20 +28.80,19.20,5.29,0.00,1.00,24.00,24.00 +33.60,24.00,5.33,0.00,1.00,24.00,24.00 +38.40,24.00,5.37,0.00,1.00,28.80,28.80 +43.20,28.80,5.41,0.00,1.00,33.60,28.80 +48.00,28.80,5.45,0.00,1.00,38.40,33.60 +52.80,28.80,5.49,0.00,1.00,43.20,33.60 +57.60,33.60,5.53,0.00,1.00,48.00,33.60 +62.40,33.60,5.57,0.00,1.00,52.80,38.40 +67.20,33.60,5.61,0.00,1.00,62.40,38.40 +72.00,38.40,5.65,0.00,1.00,67.20,38.40 +81.60,38.40,5.69,0.00,1.00,76.80,38.40 +86.40,38.40,5.73,0.00,1.00,86.40,38.40 +91.20,38.40,5.77,0.00,1.00,91.20,38.40 +96.00,38.40,5.81,0.00,1.00,100.80,38.40 +105.60,38.40,5.85,0.00,1.00,105.60,38.40 +110.40,33.60,5.89,0.00,1.00,115.20,33.60 +115.20,33.60,5.93,0.00,1.00,120.00,33.60 +120.00,33.60,5.97,0.00,1.00,129.60,33.60 +124.80,33.60,6.02,0.00,1.00,134.40,28.80 +129.60,28.80,6.06,0.00,1.00,139.20,28.80 +134.40,28.80,6.10,0.00,1.00,144.00,24.00 +139.20,24.00,6.14,0.00,1.00,148.80,24.00 +144.00,24.00,6.18,0.00,1.00,153.60,19.20 +148.80,19.20,6.22,0.00,1.00,158.40,19.20 +153.60,19.20,6.26,0.00,1.00,158.40,14.40 +158.40,14.40,6.30,0.00,1.00,163.20,14.40 +163.20,14.40,6.34,0.00,1.00,168.00,9.60 +168.00,9.60,6.38,0.00,1.00,168.00,9.60 +168.00,9.60,6.42,0.00,1.00,172.80,4.80 +172.80,4.80,6.46,0.00,1.00,177.60,0.00 +177.60,0.00,6.50,0.00,1.00,177.60,-0.00 +-177.60,-0.00,6.54,0.00,1.00,-177.60,-4.80 +-172.80,-4.80,6.58,0.00,1.00,-177.60,-9.60 +-168.00,-9.60,6.62,0.00,1.00,-172.80,-9.60 +-168.00,-9.60,6.66,0.00,1.00,-168.00,-14.40 +-163.20,-14.40,6.70,0.00,1.00,-168.00,-14.40 +-158.40,-14.40,6.74,0.00,1.00,-163.20,-19.20 +-153.60,-19.20,6.78,0.00,1.00,-158.40,-19.20 +-148.80,-19.20,6.82,0.00,1.00,-158.40,-24.00 +-144.00,-24.00,6.86,0.00,1.00,-153.60,-24.00 +-139.20,-24.00,6.90,0.00,1.00,-148.80,-28.80 +-134.40,-28.80,6.94,0.00,1.00,-144.00,-28.80 +-129.60,-28.80,6.98,0.00,1.00,-139.20,-33.60 +-124.80,-33.60,7.02,0.00,1.00,-134.40,-33.60 +-120.00,-33.60,7.06,0.00,1.00,-129.60,-33.60 +-115.20,-33.60,7.10,0.00,1.00,-120.00,-38.40 +-110.40,-33.60,7.14,0.00,1.00,-115.20,-38.40 +-105.60,-38.40,7.18,0.00,1.00,-105.60,-38.40 +-96.00,-38.40,7.22,0.00,1.00,-100.80,-38.40 +-91.20,-38.40,7.26,0.00,1.00,-91.20,-38.40 +-86.40,-38.40,7.30,0.00,1.00,-86.40,-38.40 +-81.60,-38.40,7.34,0.00,1.00,-76.80,-38.40 +-72.00,-38.40,7.38,0.00,1.00,-67.20,-38.40 +-67.20,-33.60,7.42,0.00,1.00,-62.40,-33.60 +-62.40,-33.60,7.46,0.00,1.00,-52.80,-33.60 +-57.60,-33.60,7.50,0.00,1.00,-48.00,-33.60 +-52.80,-28.80,7.54,0.00,1.00,-43.20,-28.80 +-48.00,-28.80,7.58,0.00,1.00,-38.40,-28.80 +-43.20,-28.80,7.62,0.00,1.00,-33.60,-24.00 +-38.40,-24.00,7.66,0.00,1.00,-28.80,-24.00 +-33.60,-24.00,7.70,0.00,1.00,-24.00,-19.20 +-28.80,-19.20,7.74,0.00,1.00,-24.00,-19.20 +-24.00,-19.20,7.78,0.00,1.00,-19.20,-14.40 +-19.20,-14.40,7.82,0.00,1.00,-14.40,-9.60 +-14.40,-9.60,7.86,0.00,1.00,-9.60,-9.60 +-9.60,-9.60,7.90,0.00,1.00,-9.60,-4.80 +-9.60,-4.80,7.94,0.00,1.00,-4.80,-4.80 +-4.80,-4.80,7.98,0.00,1.00,-4.80,0.00 +0.00,0.00,8.02,0.00,1.00,0.00,4.80 +4.80,4.80,8.06,0.00,1.00,4.80,4.80 +9.60,4.80,8.10,0.00,1.00,4.80,9.60 +14.40,9.60,8.14,0.00,1.00,9.60,9.60 +14.40,9.60,8.18,0.00,1.00,9.60,14.40 +19.20,14.40,8.22,0.00,1.00,14.40,14.40 +24.00,14.40,8.26,0.00,1.00,14.40,19.20 +28.80,19.20,8.30,0.00,1.00,19.20,19.20 +33.60,19.20,8.34,0.00,1.00,24.00,24.00 +38.40,19.20,8.38,0.00,1.00,28.80,24.00 +43.20,24.00,8.42,0.00,1.00,28.80,24.00 +48.00,24.00,8.46,0.00,1.00,33.60,28.80 +52.80,28.80,8.50,0.00,1.00,38.40,28.80 +57.60,28.80,8.54,0.00,1.00,48.00,28.80 +62.40,28.80,8.58,0.00,1.00,52.80,33.60 +67.20,28.80,8.62,0.00,1.00,57.60,33.60 +76.80,33.60,8.66,0.00,1.00,67.20,33.60 +81.60,33.60,8.70,0.00,1.00,76.80,33.60 +86.40,33.60,8.74,0.00,1.00,81.60,33.60 +91.20,33.60,8.78,0.00,1.00,91.20,33.60 +96.00,33.60,8.82,0.00,1.00,100.80,33.60 +100.80,33.60,8.86,0.00,1.00,110.40,33.60 +110.40,28.80,8.90,0.00,1.00,115.20,33.60 +115.20,28.80,8.94,0.00,1.00,124.80,28.80 +120.00,28.80,8.98,0.00,1.00,129.60,28.80 +124.80,28.80,9.02,0.00,1.00,139.20,28.80 +129.60,24.00,9.06,0.00,1.00,144.00,24.00 +134.40,24.00,9.10,0.00,1.00,148.80,24.00 +139.20,24.00,9.14,0.00,1.00,153.60,19.20 +144.00,19.20,9.18,0.00,1.00,153.60,19.20 +148.80,19.20,9.22,0.00,1.00,158.40,14.40 +153.60,14.40,9.26,0.00,1.00,163.20,14.40 +158.40,14.40,9.30,0.00,1.00,163.20,9.60 +163.20,9.60,9.34,0.00,1.00,168.00,9.60 +168.00,9.60,9.38,0.00,1.00,172.80,4.80 +168.00,4.80,9.42,0.00,1.00,172.80,4.80 +172.80,4.80,9.46,0.00,1.00,177.60,0.00 +177.60,0.00,9.50,0.00,1.00,177.60,-0.00 +-177.60,-0.00,9.54,0.00,1.00,-177.60,-4.80 +-172.80,-4.80,9.58,0.00,1.00,-177.60,-4.80 +-168.00,-4.80,9.62,0.00,1.00,-172.80,-9.60 +-168.00,-9.60,9.66,0.00,1.00,-172.80,-9.60 +-163.20,-9.60,9.70,0.00,1.00,-168.00,-14.40 +-158.40,-14.40,9.74,0.00,1.00,-163.20,-14.40 +-153.60,-14.40,9.78,0.00,1.00,-163.20,-19.20 +-148.80,-19.20,9.82,0.00,1.00,-158.40,-19.20 +-144.00,-19.20,9.86,0.00,1.00,-153.60,-24.00 +-139.20,-24.00,9.90,0.00,1.00,-153.60,-24.00 +-134.40,-24.00,9.94,0.00,1.00,-148.80,-28.80 +-129.60,-24.00,9.98,0.00,1.00,-144.00,-28.80 +-124.80,-28.80,10.03,0.00,1.00,-139.20,-28.80 +-120.00,-28.80,10.07,0.00,1.00,-129.60,-33.60 +-115.20,-28.80,10.11,0.00,1.00,-124.80,-33.60 +-110.40,-28.80,10.15,0.00,1.00,-115.20,-33.60 +-100.80,-33.60,10.19,0.00,1.00,-110.40,-33.60 +-96.00,-33.60,10.23,0.00,1.00,-100.80,-33.60 +-91.20,-33.60,10.27,0.00,1.00,-91.20,-33.60 +-86.40,-33.60,10.31,0.00,1.00,-81.60,-33.60 +-81.60,-33.60,10.35,0.00,1.00,-76.80,-33.60 +-76.80,-33.60,10.39,0.00,1.00,-67.20,-33.60 +-67.20,-28.80,10.43,0.00,1.00,-57.60,-28.80 +-62.40,-28.80,10.47,0.00,1.00,-52.80,-28.80 +-57.60,-28.80,10.51,0.00,1.00,-48.00,-28.80 +-52.80,-28.80,10.55,0.00,1.00,-38.40,-24.00 +-48.00,-24.00,10.59,0.00,1.00,-33.60,-24.00 +-43.20,-24.00,10.63,0.00,1.00,-28.80,-24.00 +-38.40,-19.20,10.67,0.00,1.00,-28.80,-19.20 +-33.60,-19.20,10.71,0.00,1.00,-24.00,-19.20 +-28.80,-19.20,10.75,0.00,1.00,-19.20,-14.40 +-24.00,-14.40,10.79,0.00,1.00,-14.40,-14.40 +-19.20,-14.40,10.83,0.00,1.00,-14.40,-9.60 +-14.40,-9.60,10.87,0.00,1.00,-9.60,-9.60 +-14.40,-9.60,10.91,0.00,1.00,-9.60,-4.80 +-9.60,-4.80,10.95,0.00,1.00,-4.80,-4.80 +-4.80,-4.80,10.99,0.00,1.00,-4.80,0.00 +0.00,0.00,11.03,0.00,1.00,0.00,0.00 +4.80,0.00,11.07,0.00,1.00,0.00,4.80 +9.60,4.80,11.11,0.00,1.00,4.80,4.80 +14.40,4.80,11.15,0.00,1.00,4.80,9.60 +19.20,9.60,11.19,0.00,1.00,9.60,9.60 +19.20,9.60,11.23,0.00,1.00,9.60,14.40 +24.00,14.40,11.27,0.00,1.00,14.40,14.40 +28.80,14.40,11.31,0.00,1.00,19.20,19.20 +33.60,14.40,11.35,0.00,1.00,19.20,19.20 +38.40,19.20,11.39,0.00,1.00,24.00,19.20 +43.20,19.20,11.43,0.00,1.00,28.80,24.00 +48.00,24.00,11.47,0.00,1.00,33.60,24.00 +52.80,24.00,11.51,0.00,1.00,38.40,24.00 +57.60,24.00,11.55,0.00,1.00,43.20,24.00 +62.40,24.00,11.59,0.00,1.00,48.00,28.80 +72.00,24.00,11.63,0.00,1.00,52.80,28.80 +76.80,28.80,11.67,0.00,1.00,62.40,28.80 +81.60,28.80,11.71,0.00,1.00,72.00,28.80 +86.40,28.80,11.75,0.00,1.00,81.60,28.80 +91.20,28.80,11.79,0.00,1.00,91.20,28.80 +96.00,28.80,11.83,0.00,1.00,100.80,28.80 +100.80,28.80,11.87,0.00,1.00,110.40,28.80 +105.60,28.80,11.91,0.00,1.00,120.00,28.80 +110.40,24.00,11.95,0.00,1.00,129.60,24.00 +120.00,24.00,11.99,0.00,1.00,134.40,24.00 +124.80,24.00,12.03,0.00,1.00,139.20,24.00 +129.60,24.00,12.07,0.00,1.00,144.00,24.00 +134.40,19.20,12.11,0.00,1.00,148.80,19.20 +139.20,19.20,12.15,0.00,1.00,153.60,19.20 +144.00,19.20,12.19,0.00,1.00,158.40,14.40 +148.80,14.40,12.23,0.00,1.00,163.20,14.40 +153.60,14.40,12.27,0.00,1.00,163.20,14.40 +158.40,9.60,12.31,0.00,1.00,168.00,9.60 +158.40,9.60,12.35,0.00,1.00,168.00,9.60 +163.20,9.60,12.39,0.00,1.00,172.80,4.80 +168.00,4.80,12.43,0.00,1.00,172.80,4.80 +172.80,4.80,12.47,0.00,1.00,177.60,0.00 +177.60,0.00,12.51,0.00,1.00,177.60,-0.00 +-177.60,-0.00,12.55,0.00,1.00,-177.60,-4.80 +-172.80,-4.80,12.59,0.00,1.00,-177.60,-4.80 +-168.00,-4.80,12.63,0.00,1.00,-172.80,-9.60 +-163.20,-9.60,12.67,0.00,1.00,-172.80,-9.60 +-158.40,-9.60,12.71,0.00,1.00,-168.00,-14.40 +-158.40,-9.60,12.75,0.00,1.00,-168.00,-14.40 +-153.60,-14.40,12.79,0.00,1.00,-163.20,-14.40 +-148.80,-14.40,12.83,0.00,1.00,-163.20,-19.20 +-144.00,-19.20,12.87,0.00,1.00,-158.40,-19.20 +-139.20,-19.20,12.91,0.00,1.00,-153.60,-24.00 +-134.40,-19.20,12.95,0.00,1.00,-148.80,-24.00 +-129.60,-24.00,12.99,0.00,1.00,-144.00,-24.00 +-124.80,-24.00,13.03,0.00,1.00,-139.20,-24.00 +-120.00,-24.00,13.07,0.00,1.00,-134.40,-28.80 +-110.40,-24.00,13.11,0.00,1.00,-129.60,-28.80 +-105.60,-28.80,13.15,0.00,1.00,-120.00,-28.80 +-100.80,-28.80,13.19,0.00,1.00,-110.40,-28.80 +-96.00,-28.80,13.23,0.00,1.00,-100.80,-28.80 +-91.20,-28.80,13.27,0.00,1.00,-91.20,-28.80 +-86.40,-28.80,13.31,0.00,1.00,-81.60,-28.80 +-81.60,-28.80,13.35,0.00,1.00,-72.00,-28.80 +-76.80,-28.80,13.39,0.00,1.00,-62.40,-28.80 +-72.00,-24.00,13.43,0.00,1.00,-52.80,-24.00 +-62.40,-24.00,13.47,0.00,1.00,-48.00,-24.00 +-57.60,-24.00,13.51,0.00,1.00,-43.20,-24.00 +-52.80,-24.00,13.55,0.00,1.00,-38.40,-24.00 +-48.00,-24.00,13.59,0.00,1.00,-33.60,-19.20 +-43.20,-19.20,13.63,0.00,1.00,-28.80,-19.20 +-38.40,-19.20,13.67,0.00,1.00,-24.00,-19.20 +-33.60,-14.40,13.71,0.00,1.00,-19.20,-14.40 +-28.80,-14.40,13.75,0.00,1.00,-19.20,-14.40 +-24.00,-14.40,13.79,0.00,1.00,-14.40,-9.60 +-19.20,-9.60,13.83,0.00,1.00,-9.60,-9.60 +-19.20,-9.60,13.87,0.00,1.00,-9.60,-4.80 +-14.40,-4.80,13.91,0.00,1.00,-4.80,-4.80 +-9.60,-4.80,13.95,0.00,1.00,-4.80,-0.00 +-4.80,-0.00,13.99,0.00,1.00,-0.00,0.00 +0.00,0.00,14.04,0.00,1.00,0.00,0.00 +4.80,0.00,14.08,0.00,1.00,0.00,4.80 +9.60,4.80,14.12,0.00,1.00,4.80,4.80 +14.40,4.80,14.16,0.00,1.00,4.80,9.60 +19.20,9.60,14.20,0.00,1.00,9.60,9.60 +24.00,9.60,14.24,0.00,1.00,9.60,9.60 +28.80,9.60,14.28,0.00,1.00,14.40,14.40 +33.60,14.40,14.32,0.00,1.00,14.40,14.40 +38.40,14.40,14.36,0.00,1.00,19.20,14.40 +43.20,14.40,14.40,0.00,1.00,19.20,19.20 +48.00,14.40,14.44,0.00,1.00,24.00,19.20 +52.80,19.20,14.48,0.00,1.00,28.80,19.20 +57.60,19.20,14.52,0.00,1.00,33.60,19.20 +62.40,19.20,14.56,0.00,1.00,38.40,24.00 +67.20,19.20,14.60,0.00,1.00,43.20,24.00 +72.00,24.00,14.64,0.00,1.00,48.00,24.00 +76.80,24.00,14.68,0.00,1.00,57.60,24.00 +81.60,24.00,14.72,0.00,1.00,67.20,24.00 +86.40,24.00,14.76,0.00,1.00,81.60,24.00 +91.20,24.00,14.80,0.00,1.00,91.20,24.00 +96.00,24.00,14.84,0.00,1.00,105.60,24.00 +100.80,24.00,14.88,0.00,1.00,115.20,24.00 +105.60,24.00,14.92,0.00,1.00,124.80,24.00 +110.40,19.20,14.96,0.00,1.00,134.40,19.20 +115.20,19.20,15.00,0.00,1.00,139.20,19.20 +120.00,19.20,15.04,0.00,1.00,144.00,19.20 +124.80,19.20,15.08,0.00,1.00,148.80,19.20 +129.60,19.20,15.12,0.00,1.00,153.60,19.20 +134.40,14.40,15.16,0.00,1.00,158.40,14.40 +139.20,14.40,15.20,0.00,1.00,163.20,14.40 +144.00,14.40,15.24,0.00,1.00,163.20,14.40 +148.80,9.60,15.28,0.00,1.00,168.00,9.60 +153.60,9.60,15.32,0.00,1.00,168.00,9.60 +158.40,9.60,15.36,0.00,1.00,172.80,4.80 +163.20,4.80,15.40,0.00,1.00,172.80,4.80 +168.00,4.80,15.44,0.00,1.00,177.60,4.80 +172.80,4.80,15.48,0.00,1.00,177.60,0.00 +177.60,0.00,15.52,0.00,1.00,177.60,-0.00 +-177.60,-0.00,15.56,0.00,1.00,-177.60,-4.80 +-172.80,-4.80,15.60,0.00,1.00,-177.60,-4.80 +-168.00,-4.80,15.64,0.00,1.00,-177.60,-4.80 +-163.20,-4.80,15.68,0.00,1.00,-172.80,-9.60 +-158.40,-9.60,15.72,0.00,1.00,-172.80,-9.60 +-153.60,-9.60,15.76,0.00,1.00,-168.00,-14.40 +-148.80,-9.60,15.80,0.00,1.00,-168.00,-14.40 +-144.00,-14.40,15.84,0.00,1.00,-163.20,-14.40 +-139.20,-14.40,15.88,0.00,1.00,-163.20,-19.20 +-134.40,-14.40,15.92,0.00,1.00,-158.40,-19.20 +-129.60,-19.20,15.96,0.00,1.00,-153.60,-19.20 +-124.80,-19.20,16.00,0.00,1.00,-148.80,-19.20 +-120.00,-19.20,16.00,0.00,1.00,-144.00,-19.20 +-115.20,-19.20,15.96,0.00,1.00,-139.20,-24.00 +-110.40,-19.20,15.92,0.00,1.00,-134.40,-24.00 +-105.60,-24.00,15.88,0.00,1.00,-124.80,-24.00 +-100.80,-24.00,15.84,0.00,1.00,-115.20,-24.00 +-96.00,-24.00,15.80,0.00,1.00,-105.60,-24.00 +-91.20,-24.00,15.76,0.00,1.00,-91.20,-24.00 +-86.40,-24.00,15.72,0.00,1.00,-81.60,-24.00 +-81.60,-24.00,15.68,0.00,1.00,-67.20,-24.00 +-76.80,-24.00,15.64,0.00,1.00,-57.60,-24.00 +-72.00,-24.00,15.60,0.00,1.00,-48.00,-24.00 +-67.20,-19.20,15.56,0.00,1.00,-43.20,-19.20 +-62.40,-19.20,15.52,0.00,1.00,-38.40,-19.20 +-57.60,-19.20,15.48,0.00,1.00,-33.60,-19.20 +-52.80,-19.20,15.44,0.00,1.00,-28.80,-19.20 +-48.00,-14.40,15.40,0.00,1.00,-24.00,-14.40 +-43.20,-14.40,15.36,0.00,1.00,-19.20,-14.40 +-38.40,-14.40,15.32,0.00,1.00,-19.20,-14.40 +-33.60,-14.40,15.28,0.00,1.00,-14.40,-9.60 +-28.80,-9.60,15.24,0.00,1.00,-14.40,-9.60 +-24.00,-9.60,15.20,0.00,1.00,-9.60,-9.60 +-19.20,-9.60,15.16,0.00,1.00,-9.60,-4.80 +-14.40,-4.80,15.12,0.00,1.00,-4.80,-4.80 +-9.60,-4.80,15.08,0.00,1.00,-4.80,-0.00 +-4.80,-0.00,15.04,0.00,1.00,-0.00,0.00 +0.00,0.00,15.00,0.00,1.00,0.00,0.00 +4.80,0.00,14.96,0.00,1.00,0.00,4.80 +9.60,4.80,14.92,0.00,1.00,4.80,4.80 +14.40,4.80,14.88,0.00,1.00,4.80,4.80 +19.20,4.80,14.84,0.00,1.00,4.80,9.60 +24.00,9.60,14.80,0.00,1.00,9.60,9.60 +28.80,9.60,14.76,0.00,1.00,9.60,9.60 +33.60,9.60,14.72,0.00,1.00,9.60,9.60 +38.40,9.60,14.68,0.00,1.00,14.40,14.40 +43.20,14.40,14.64,0.00,1.00,14.40,14.40 +48.00,14.40,14.60,0.00,1.00,19.20,14.40 +52.80,14.40,14.56,0.00,1.00,24.00,14.40 +57.60,14.40,14.52,0.00,1.00,24.00,19.20 +62.40,14.40,14.48,0.00,1.00,28.80,19.20 +67.20,14.40,14.44,0.00,1.00,38.40,19.20 +72.00,19.20,14.40,0.00,1.00,43.20,19.20 +76.80,19.20,14.36,0.00,1.00,52.80,19.20 +81.60,19.20,14.32,0.00,1.00,62.40,19.20 +86.40,19.20,14.28,0.00,1.00,76.80,19.20 +91.20,19.20,14.24,0.00,1.00,96.00,19.20 +96.00,19.20,14.20,0.00,1.00,110.40,19.20 +100.80,19.20,14.16,0.00,1.00,120.00,19.20 +105.60,19.20,14.12,0.00,1.00,134.40,19.20 +110.40,19.20,14.08,0.00,1.00,139.20,19.20 +115.20,14.40,14.04,0.00,1.00,148.80,14.40 +120.00,14.40,13.99,0.00,1.00,153.60,14.40 +124.80,14.40,13.95,0.00,1.00,158.40,14.40 +129.60,14.40,13.91,0.00,1.00,158.40,14.40 +134.40,14.40,13.87,0.00,1.00,163.20,14.40 +139.20,9.60,13.83,0.00,1.00,163.20,9.60 +144.00,9.60,13.79,0.00,1.00,168.00,9.60 +148.80,9.60,13.75,0.00,1.00,168.00,9.60 +153.60,9.60,13.71,0.00,1.00,172.80,4.80 +158.40,4.80,13.67,0.00,1.00,172.80,4.80 +163.20,4.80,13.63,0.00,1.00,172.80,4.80 +168.00,4.80,13.59,0.00,1.00,177.60,0.00 +172.80,0.00,13.55,0.00,1.00,177.60,0.00 +177.60,0.00,13.51,0.00,1.00,177.60,-0.00 +-177.60,-0.00,13.47,0.00,1.00,-177.60,-0.00 +-172.80,-0.00,13.43,0.00,1.00,-177.60,-4.80 +-168.00,-4.80,13.39,0.00,1.00,-177.60,-4.80 +-163.20,-4.80,13.35,0.00,1.00,-172.80,-4.80 +-158.40,-4.80,13.31,0.00,1.00,-172.80,-9.60 +-153.60,-9.60,13.27,0.00,1.00,-172.80,-9.60 +-148.80,-9.60,13.23,0.00,1.00,-168.00,-9.60 +-144.00,-9.60,13.19,0.00,1.00,-168.00,-14.40 +-139.20,-9.60,13.15,0.00,1.00,-163.20,-14.40 +-134.40,-14.40,13.11,0.00,1.00,-163.20,-14.40 +-129.60,-14.40,13.07,0.00,1.00,-158.40,-14.40 +-124.80,-14.40,13.03,0.00,1.00,-158.40,-14.40 +-120.00,-14.40,12.99,0.00,1.00,-153.60,-19.20 +-115.20,-14.40,12.95,0.00,1.00,-148.80,-19.20 +-110.40,-19.20,12.91,0.00,1.00,-139.20,-19.20 +-105.60,-19.20,12.87,0.00,1.00,-134.40,-19.20 +-100.80,-19.20,12.83,0.00,1.00,-120.00,-19.20 +-96.00,-19.20,12.79,0.00,1.00,-110.40,-19.20 +-91.20,-19.20,12.75,0.00,1.00,-96.00,-19.20 +-86.40,-19.20,12.71,0.00,1.00,-76.80,-19.20 +-81.60,-19.20,12.67,0.00,1.00,-62.40,-19.20 +-76.80,-19.20,12.63,0.00,1.00,-52.80,-19.20 +-72.00,-19.20,12.59,0.00,1.00,-43.20,-19.20 +-67.20,-14.40,12.55,0.00,1.00,-38.40,-19.20 +-62.40,-14.40,12.51,0.00,1.00,-28.80,-14.40 +-57.60,-14.40,12.47,0.00,1.00,-24.00,-14.40 +-52.80,-14.40,12.43,0.00,1.00,-24.00,-14.40 +-48.00,-14.40,12.39,0.00,1.00,-19.20,-14.40 +-43.20,-14.40,12.35,0.00,1.00,-14.40,-9.60 +-38.40,-9.60,12.31,0.00,1.00,-14.40,-9.60 +-33.60,-9.60,12.27,0.00,1.00,-9.60,-9.60 +-28.80,-9.60,12.23,0.00,1.00,-9.60,-9.60 +-24.00,-9.60,12.19,0.00,1.00,-9.60,-4.80 +-19.20,-4.80,12.15,0.00,1.00,-4.80,-4.80 +-14.40,-4.80,12.11,0.00,1.00,-4.80,-4.80 +-9.60,-4.80,12.07,0.00,1.00,-4.80,-0.00 +-4.80,-0.00,12.03,0.00,1.00,-0.00,0.00 +0.00,0.00,11.99,0.00,1.00,0.00,0.00 +4.80,0.00,11.95,0.00,1.00,0.00,0.00 +9.60,0.00,11.91,0.00,1.00,0.00,4.80 +14.40,4.80,11.87,0.00,1.00,4.80,4.80 +19.20,4.80,11.83,0.00,1.00,4.80,4.80 +24.00,4.80,11.79,0.00,1.00,4.80,4.80 +28.80,4.80,11.75,0.00,1.00,4.80,9.60 +33.60,9.60,11.71,0.00,1.00,9.60,9.60 +38.40,9.60,11.67,0.00,1.00,9.60,9.60 +43.20,9.60,11.63,0.00,1.00,14.40,9.60 +48.00,9.60,11.59,0.00,1.00,14.40,9.60 +52.80,9.60,11.55,0.00,1.00,14.40,14.40 +57.60,9.60,11.51,0.00,1.00,19.20,14.40 +62.40,9.60,11.47,0.00,1.00,24.00,14.40 +67.20,14.40,11.43,0.00,1.00,28.80,14.40 +72.00,14.40,11.39,0.00,1.00,33.60,14.40 +76.80,14.40,11.35,0.00,1.00,43.20,14.40 +81.60,14.40,11.31,0.00,1.00,57.60,14.40 +86.40,14.40,11.27,0.00,1.00,76.80,14.40 +91.20,14.40,11.23,0.00,1.00,96.00,14.40 +96.00,14.40,11.19,0.00,1.00,115.20,14.40 +100.80,14.40,11.15,0.00,1.00,129.60,14.40 +105.60,14.40,11.11,0.00,1.00,139.20,14.40 +110.40,14.40,11.07,0.00,1.00,148.80,14.40 +115.20,9.60,11.03,0.00,1.00,153.60,14.40 +120.00,9.60,10.99,0.00,1.00,158.40,9.60 +124.80,9.60,10.95,0.00,1.00,163.20,9.60 +129.60,9.60,10.91,0.00,1.00,163.20,9.60 +134.40,9.60,10.87,0.00,1.00,168.00,9.60 +139.20,9.60,10.83,0.00,1.00,168.00,9.60 +144.00,9.60,10.79,0.00,1.00,172.80,9.60 +148.80,4.80,10.75,0.00,1.00,172.80,4.80 +153.60,4.80,10.71,0.00,1.00,172.80,4.80 +158.40,4.80,10.67,0.00,1.00,172.80,4.80 +163.20,4.80,10.63,0.00,1.00,177.60,4.80 +168.00,4.80,10.59,0.00,1.00,177.60,0.00 +172.80,0.00,10.55,0.00,1.00,177.60,0.00 +177.60,0.00,10.51,0.00,1.00,177.60,-0.00 +-177.60,-0.00,10.47,0.00,1.00,-177.60,-0.00 +-172.80,-0.00,10.43,0.00,1.00,-177.60,-4.80 +-168.00,-4.80,10.39,0.00,1.00,-177.60,-4.80 +-163.20,-4.80,10.35,0.00,1.00,-177.60,-4.80 +-158.40,-4.80,10.31,0.00,1.00,-172.80,-4.80 +-153.60,-4.80,10.27,0.00,1.00,-172.80,-9.60 +-148.80,-4.80,10.23,0.00,1.00,-172.80,-9.60 +-144.00,-9.60,10.19,0.00,1.00,-172.80,-9.60 +-139.20,-9.60,10.15,0.00,1.00,-168.00,-9.60 +-134.40,-9.60,10.11,0.00,1.00,-168.00,-9.60 +-129.60,-9.60,10.07,0.00,1.00,-163.20,-9.60 +-124.80,-9.60,10.03,0.00,1.00,-163.20,-14.40 +-120.00,-9.60,9.98,0.00,1.00,-158.40,-14.40 +-115.20,-9.60,9.94,0.00,1.00,-153.60,-14.40 +-110.40,-14.40,9.90,0.00,1.00,-148.80,-14.40 +-105.60,-14.40,9.86,0.00,1.00,-139.20,-14.40 +-100.80,-14.40,9.82,0.00,1.00,-129.60,-14.40 +-96.00,-14.40,9.78,0.00,1.00,-115.20,-14.40 +-91.20,-14.40,9.74,0.00,1.00,-96.00,-14.40 +-86.40,-14.40,9.70,0.00,1.00,-76.80,-14.40 +-81.60,-14.40,9.66,0.00,1.00,-57.60,-14.40 +-76.80,-14.40,9.62,0.00,1.00,-43.20,-14.40 +-72.00,-14.40,9.58,0.00,1.00,-33.60,-14.40 +-67.20,-14.40,9.54,0.00,1.00,-28.80,-14.40 +-62.40,-9.60,9.50,0.00,1.00,-24.00,-14.40 +-57.60,-9.60,9.46,0.00,1.00,-19.20,-9.60 +-52.80,-9.60,9.42,0.00,1.00,-14.40,-9.60 +-48.00,-9.60,9.38,0.00,1.00,-14.40,-9.60 +-43.20,-9.60,9.34,0.00,1.00,-14.40,-9.60 +-38.40,-9.60,9.30,0.00,1.00,-9.60,-9.60 +-33.60,-9.60,9.26,0.00,1.00,-9.60,-4.80 +-28.80,-4.80,9.22,0.00,1.00,-4.80,-4.80 +-24.00,-4.80,9.18,0.00,1.00,-4.80,-4.80 +-19.20,-4.80,9.14,0.00,1.00,-4.80,-4.80 +-14.40,-4.80,9.10,0.00,1.00,-4.80,-0.00 +-9.60,-0.00,9.06,0.00,1.00,-0.00,-0.00 +-4.80,-0.00,9.02,0.00,1.00,-0.00,0.00 +0.00,0.00,8.98,0.00,1.00,0.00,0.00 +4.80,0.00,8.94,0.00,1.00,0.00,0.00 +9.60,0.00,8.90,0.00,1.00,0.00,0.00 +14.40,0.00,8.86,0.00,1.00,0.00,4.80 +19.20,4.80,8.82,0.00,1.00,4.80,4.80 +24.00,4.80,8.78,0.00,1.00,4.80,4.80 +28.80,4.80,8.74,0.00,1.00,4.80,4.80 +33.60,4.80,8.70,0.00,1.00,4.80,4.80 +38.40,4.80,8.66,0.00,1.00,4.80,4.80 +43.20,4.80,8.62,0.00,1.00,9.60,4.80 +48.00,4.80,8.58,0.00,1.00,9.60,9.60 +52.80,4.80,8.54,0.00,1.00,9.60,9.60 +57.60,4.80,8.50,0.00,1.00,14.40,9.60 +62.40,9.60,8.46,0.00,1.00,14.40,9.60 +67.20,9.60,8.42,0.00,1.00,19.20,9.60 +72.00,9.60,8.38,0.00,1.00,24.00,9.60 +76.80,9.60,8.34,0.00,1.00,33.60,9.60 +81.60,9.60,8.30,0.00,1.00,43.20,9.60 +86.40,9.60,8.26,0.00,1.00,67.20,9.60 +91.20,9.60,8.22,0.00,1.00,96.00,9.60 +96.00,9.60,8.18,0.00,1.00,124.80,9.60 +100.80,9.60,8.14,0.00,1.00,144.00,9.60 +105.60,9.60,8.10,0.00,1.00,153.60,9.60 +110.40,9.60,8.06,0.00,1.00,158.40,9.60 +115.20,9.60,8.02,0.00,1.00,163.20,9.60 +120.00,9.60,7.98,0.00,1.00,168.00,9.60 +124.80,4.80,7.94,0.00,1.00,168.00,9.60 +129.60,4.80,7.90,0.00,1.00,168.00,4.80 +134.40,4.80,7.86,0.00,1.00,172.80,4.80 +139.20,4.80,7.82,0.00,1.00,172.80,4.80 +144.00,4.80,7.78,0.00,1.00,172.80,4.80 +148.80,4.80,7.74,0.00,1.00,172.80,4.80 +153.60,4.80,7.70,0.00,1.00,177.60,4.80 +158.40,4.80,7.66,0.00,1.00,177.60,4.80 +163.20,4.80,7.62,0.00,1.00,177.60,0.00 +168.00,0.00,7.58,0.00,1.00,177.60,0.00 +172.80,0.00,7.54,0.00,1.00,177.60,0.00 +177.60,0.00,7.50,0.00,1.00,177.60,-0.00 +-177.60,-0.00,7.46,0.00,1.00,-177.60,-0.00 +-172.80,-0.00,7.42,0.00,1.00,-177.60,-0.00 +-168.00,-0.00,7.38,0.00,1.00,-177.60,-4.80 +-163.20,-4.80,7.34,0.00,1.00,-177.60,-4.80 +-158.40,-4.80,7.30,0.00,1.00,-177.60,-4.80 +-153.60,-4.80,7.26,0.00,1.00,-177.60,-4.80 +-148.80,-4.80,7.22,0.00,1.00,-172.80,-4.80 +-144.00,-4.80,7.18,0.00,1.00,-172.80,-4.80 +-139.20,-4.80,7.14,0.00,1.00,-172.80,-4.80 +-134.40,-4.80,7.10,0.00,1.00,-172.80,-9.60 +-129.60,-4.80,7.06,0.00,1.00,-168.00,-9.60 +-124.80,-4.80,7.02,0.00,1.00,-168.00,-9.60 +-120.00,-9.60,6.98,0.00,1.00,-168.00,-9.60 +-115.20,-9.60,6.94,0.00,1.00,-163.20,-9.60 +-110.40,-9.60,6.90,0.00,1.00,-158.40,-9.60 +-105.60,-9.60,6.86,0.00,1.00,-153.60,-9.60 +-100.80,-9.60,6.82,0.00,1.00,-144.00,-9.60 +-96.00,-9.60,6.78,0.00,1.00,-124.80,-9.60 +-91.20,-9.60,6.74,0.00,1.00,-96.00,-9.60 +-86.40,-9.60,6.70,0.00,1.00,-67.20,-9.60 +-81.60,-9.60,6.66,0.00,1.00,-43.20,-9.60 +-76.80,-9.60,6.62,0.00,1.00,-33.60,-9.60 +-72.00,-9.60,6.58,0.00,1.00,-24.00,-9.60 +-67.20,-9.60,6.54,0.00,1.00,-19.20,-9.60 +-62.40,-9.60,6.50,0.00,1.00,-14.40,-9.60 +-57.60,-4.80,6.46,0.00,1.00,-14.40,-9.60 +-52.80,-4.80,6.42,0.00,1.00,-9.60,-4.80 +-48.00,-4.80,6.38,0.00,1.00,-9.60,-4.80 +-43.20,-4.80,6.34,0.00,1.00,-9.60,-4.80 +-38.40,-4.80,6.30,0.00,1.00,-4.80,-4.80 +-33.60,-4.80,6.26,0.00,1.00,-4.80,-4.80 +-28.80,-4.80,6.22,0.00,1.00,-4.80,-4.80 +-24.00,-4.80,6.18,0.00,1.00,-4.80,-4.80 +-19.20,-4.80,6.14,0.00,1.00,-4.80,-0.00 +-14.40,-0.00,6.10,0.00,1.00,-0.00,-0.00 +-9.60,-0.00,6.06,0.00,1.00,-0.00,-0.00 +-4.80,-0.00,6.02,0.00,1.00,-0.00,0.00 +0.00,0.00,5.97,0.00,1.00,0.00,0.00 +4.80,0.00,5.93,0.00,1.00,0.00,0.00 +9.60,0.00,5.89,0.00,1.00,0.00,0.00 +14.40,0.00,5.85,0.00,1.00,0.00,0.00 +19.20,0.00,5.81,0.00,1.00,0.00,0.00 +24.00,0.00,5.77,0.00,1.00,0.00,0.00 +28.80,0.00,5.73,0.00,1.00,0.00,4.80 +33.60,0.00,5.69,0.00,1.00,0.00,4.80 +38.40,0.00,5.65,0.00,1.00,4.80,4.80 +43.20,4.80,5.61,0.00,1.00,4.80,4.80 +48.00,4.80,5.57,0.00,1.00,4.80,4.80 +52.80,4.80,5.53,0.00,1.00,4.80,4.80 +57.60,4.80,5.49,0.00,1.00,4.80,4.80 +62.40,4.80,5.45,0.00,1.00,4.80,4.80 +67.20,4.80,5.41,0.00,1.00,9.60,4.80 +72.00,4.80,5.37,0.00,1.00,9.60,4.80 +76.80,4.80,5.33,0.00,1.00,14.40,4.80 +81.60,4.80,5.29,0.00,1.00,24.00,4.80 +86.40,4.80,5.25,0.00,1.00,43.20,4.80 +91.20,4.80,5.21,0.00,1.00,110.40,4.80 +96.00,4.80,5.17,0.00,1.00,148.80,4.80 +100.80,4.80,5.13,0.00,1.00,163.20,4.80 +105.60,4.80,5.09,0.00,1.00,168.00,4.80 +110.40,4.80,5.05,0.00,1.00,172.80,4.80 +115.20,4.80,5.01,0.00,1.00,172.80,4.80 +120.00,4.80,4.97,0.00,1.00,172.80,4.80 +124.80,4.80,4.93,0.00,1.00,172.80,4.80 +129.60,4.80,4.89,0.00,1.00,177.60,4.80 +134.40,4.80,4.85,0.00,1.00,177.60,4.80 +139.20,0.00,4.81,0.00,1.00,177.60,4.80 +144.00,0.00,4.77,0.00,1.00,177.60,4.80 +148.80,0.00,4.73,0.00,1.00,177.60,0.00 +153.60,0.00,4.69,0.00,1.00,177.60,0.00 +158.40,0.00,4.65,0.00,1.00,177.60,0.00 +163.20,0.00,4.61,0.00,1.00,177.60,0.00 +168.00,0.00,4.57,0.00,1.00,177.60,0.00 +172.80,0.00,4.53,0.00,1.00,177.60,0.00 +177.60,0.00,4.49,0.00,1.00,177.60,-0.00 +-177.60,-0.00,4.45,0.00,1.00,-177.60,-0.00 +-172.80,-0.00,4.41,0.00,1.00,-177.60,-0.00 +-168.00,-0.00,4.37,0.00,1.00,-177.60,-0.00 +-163.20,-0.00,4.33,0.00,1.00,-177.60,-0.00 +-158.40,-0.00,4.29,0.00,1.00,-177.60,-0.00 +-153.60,-0.00,4.25,0.00,1.00,-177.60,-4.80 +-148.80,-0.00,4.21,0.00,1.00,-177.60,-4.80 +-144.00,-0.00,4.17,0.00,1.00,-177.60,-4.80 +-139.20,-0.00,4.13,0.00,1.00,-177.60,-4.80 +-134.40,-4.80,4.09,0.00,1.00,-177.60,-4.80 +-129.60,-4.80,4.05,0.00,1.00,-177.60,-4.80 +-124.80,-4.80,4.01,0.00,1.00,-172.80,-4.80 +-120.00,-4.80,3.97,0.00,1.00,-172.80,-4.80 +-115.20,-4.80,3.93,0.00,1.00,-172.80,-4.80 +-110.40,-4.80,3.89,0.00,1.00,-172.80,-4.80 +-105.60,-4.80,3.85,0.00,1.00,-168.00,-4.80 +-100.80,-4.80,3.81,0.00,1.00,-163.20,-4.80 +-96.00,-4.80,3.77,0.00,1.00,-148.80,-4.80 +-91.20,-4.80,3.73,0.00,1.00,-110.40,-4.80 +-86.40,-4.80,3.69,0.00,1.00,-43.20,-4.80 +-81.60,-4.80,3.65,0.00,1.00,-24.00,-4.80 +-76.80,-4.80,3.61,0.00,1.00,-14.40,-4.80 +-72.00,-4.80,3.57,0.00,1.00,-9.60,-4.80 +-67.20,-4.80,3.53,0.00,1.00,-9.60,-4.80 +-62.40,-4.80,3.49,0.00,1.00,-4.80,-4.80 +-57.60,-4.80,3.45,0.00,1.00,-4.80,-4.80 +-52.80,-4.80,3.41,0.00,1.00,-4.80,-4.80 +-48.00,-4.80,3.37,0.00,1.00,-4.80,-4.80 +-43.20,-4.80,3.33,0.00,1.00,-4.80,-4.80 +-38.40,-0.00,3.29,0.00,1.00,-4.80,-4.80 +-33.60,-0.00,3.25,0.00,1.00,-0.00,-0.00 +-28.80,-0.00,3.21,0.00,1.00,-0.00,-0.00 +-24.00,-0.00,3.17,0.00,1.00,-0.00,-0.00 +-19.20,-0.00,3.13,0.00,1.00,-0.00,-0.00 +-14.40,-0.00,3.09,0.00,1.00,-0.00,-0.00 +-9.60,-0.00,3.05,0.00,1.00,-0.00,-0.00 +-4.80,-0.00,3.01,0.00,1.00,-0.00,0.00 +0.00,0.00,2.97,0.00,1.00,-0.00,0.00 +4.80,-0.00,2.93,0.00,1.00,-0.00,0.00 +9.60,-0.00,2.89,0.00,1.00,-0.00,0.00 +14.40,-0.00,2.85,0.00,1.00,-0.00,0.00 +19.20,-0.00,2.81,0.00,1.00,-0.00,0.00 +24.00,-0.00,2.77,0.00,1.00,-0.00,0.00 +28.80,-0.00,2.73,0.00,1.00,-0.00,0.00 +33.60,-0.00,2.69,0.00,1.00,-0.00,0.00 +38.40,-0.00,2.65,0.00,1.00,-0.00,0.00 +43.20,-0.00,2.61,0.00,1.00,-0.00,0.00 +48.00,-0.00,2.57,0.00,1.00,-0.00,0.00 +52.80,-0.00,2.53,0.00,1.00,-0.00,0.00 +57.60,-0.00,2.49,0.00,1.00,-0.00,0.00 +62.40,-0.00,2.45,0.00,1.00,-0.00,0.00 +67.20,-0.00,2.41,0.00,1.00,-4.80,0.00 +72.00,-0.00,2.37,0.00,1.00,-4.80,0.00 +76.80,-0.00,2.33,0.00,1.00,-4.80,0.00 +81.60,-0.00,2.29,0.00,1.00,-9.60,0.00 +86.40,-0.00,2.25,0.00,1.00,-19.20,0.00 +91.20,-0.00,2.21,0.00,1.00,-134.40,0.00 +96.00,-0.00,2.17,0.00,1.00,-168.00,0.00 +100.80,-0.00,2.13,0.00,1.00,-172.80,0.00 +105.60,-0.00,2.09,0.00,1.00,-177.60,0.00 +110.40,-0.00,2.05,0.00,1.00,-177.60,0.00 +115.20,-0.00,2.01,0.00,1.00,-177.60,0.00 +120.00,-0.00,1.96,0.00,1.00,-177.60,0.00 +124.80,-0.00,1.92,0.00,1.00,-177.60,0.00 +129.60,-0.00,1.88,0.00,1.00,-177.60,0.00 +134.40,-0.00,1.84,0.00,1.00,-177.60,0.00 +139.20,-0.00,1.80,0.00,1.00,-177.60,0.00 +144.00,-0.00,1.76,0.00,1.00,-177.60,0.00 +148.80,-0.00,1.72,0.00,1.00,-177.60,0.00 +153.60,-0.00,1.68,0.00,1.00,-177.60,0.00 +158.40,-0.00,1.64,0.00,1.00,-177.60,0.00 +163.20,-0.00,1.60,0.00,1.00,-177.60,0.00 +168.00,-0.00,1.56,0.00,1.00,-177.60,0.00 +172.80,-0.00,1.52,0.00,1.00,-177.60,0.00 +177.60,-0.00,1.48,0.00,1.00,-177.60,0.00 +-177.60,0.00,1.44,0.00,1.00,177.60,0.00 +-172.80,0.00,1.40,0.00,1.00,177.60,0.00 +-168.00,0.00,1.36,0.00,1.00,177.60,0.00 +-163.20,0.00,1.32,0.00,1.00,177.60,0.00 +-158.40,0.00,1.28,0.00,1.00,177.60,0.00 +-153.60,0.00,1.24,0.00,1.00,177.60,0.00 +-148.80,0.00,1.20,0.00,1.00,177.60,0.00 +-144.00,0.00,1.16,0.00,1.00,177.60,0.00 +-139.20,0.00,1.12,0.00,1.00,177.60,0.00 +-134.40,0.00,1.08,0.00,1.00,177.60,0.00 +-129.60,0.00,1.04,0.00,1.00,177.60,0.00 +-124.80,0.00,1.00,0.00,1.00,177.60,0.00 +-120.00,0.00,0.96,0.00,1.00,177.60,0.00 +-115.20,0.00,0.92,0.00,1.00,177.60,0.00 +-110.40,0.00,0.88,0.00,1.00,177.60,0.00 +-105.60,0.00,0.84,0.00,1.00,177.60,0.00 +-100.80,0.00,0.80,0.00,1.00,172.80,0.00 +-96.00,0.00,0.76,0.00,1.00,168.00,0.00 +-91.20,0.00,0.72,0.00,1.00,134.40,0.00 +-86.40,0.00,0.68,0.00,1.00,19.20,0.00 +-81.60,0.00,0.64,0.00,1.00,9.60,0.00 +-76.80,0.00,0.60,0.00,1.00,4.80,0.00 +-72.00,0.00,0.56,0.00,1.00,4.80,0.00 +-67.20,0.00,0.52,0.00,1.00,4.80,0.00 +-62.40,0.00,0.48,0.00,1.00,0.00,0.00 +-57.60,0.00,0.44,0.00,1.00,0.00,0.00 +-52.80,0.00,0.40,0.00,1.00,0.00,0.00 +-48.00,0.00,0.36,0.00,1.00,0.00,0.00 +-43.20,0.00,0.32,0.00,1.00,0.00,0.00 +-38.40,0.00,0.28,0.00,1.00,0.00,0.00 +-33.60,0.00,0.24,0.00,1.00,0.00,0.00 +-28.80,0.00,0.20,0.00,1.00,0.00,0.00 +-24.00,0.00,0.16,0.00,1.00,0.00,0.00 +-19.20,0.00,0.12,0.00,1.00,0.00,0.00 +-14.40,0.00,0.08,0.00,1.00,0.00,0.00 +-9.60,0.00,0.04,0.00,1.00,0.00,0.00 +-4.80,0.00,0.00,0.00,1.00,0.00,0.00 diff --git a/scripts/trajectories/azi+2-ele+2-every-100-frames-Euler.csv b/scripts/trajectories/azi_plus_2-ele_plus_2-every-100-frames-Euler.csv similarity index 100% rename from scripts/trajectories/azi+2-ele+2-every-100-frames-Euler.csv rename to scripts/trajectories/azi_plus_2-ele_plus_2-every-100-frames-Euler.csv diff --git a/scripts/trajectories/azi+2-ele+2-every-100-frames.csv b/scripts/trajectories/azi_plus_2-ele_plus_2-every-100-frames.csv similarity index 100% rename from scripts/trajectories/azi+2-ele+2-every-100-frames.csv rename to scripts/trajectories/azi_plus_2-ele_plus_2-every-100-frames.csv diff --git a/scripts/trajectories/azi_plus_2-ele_plus_2-every-25-rows.csv b/scripts/trajectories/azi_plus_2-ele_plus_2-every-25-rows.csv new file mode 100644 index 0000000000000000000000000000000000000000..4d8eb8d47b98963cf759f1a0a3f52b592f82ce86 --- /dev/null +++ b/scripts/trajectories/azi_plus_2-ele_plus_2-every-25-rows.csv @@ -0,0 +1,3000 @@ + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.653281, -0.270598, 0.270598, 0.653281 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.634602, -0.292582, 0.282543, 0.657150 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.615562, -0.314856, 0.293608, 0.660109 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.596200, -0.337381, 0.303779, 0.662147 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.576556, -0.360116, 0.313044, 0.663252 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.556670, -0.383022, 0.321394, 0.663414 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.536584, -0.406058, 0.328819, 0.662626 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.516337, -0.429181, 0.335313, 0.660881 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.495972, -0.452352, 0.340872, 0.658176 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.475528, -0.475528, 0.345492, 0.654508 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.455049, -0.498668, 0.349171, 0.649877 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.434575, -0.521730, 0.351911, 0.644283 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.414147, -0.544673, 0.353715, 0.637730 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.393807, -0.567455, 0.354585, 0.630223 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.373595, -0.590035, 0.354529, 0.621767 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.353553, -0.612372, 0.353553, 0.612372 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.333721, -0.634427, 0.351668, 0.602048 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.314138, -0.656158, 0.348885, 0.590807 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.294843, -0.677527, 0.345217, 0.578662 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.275876, -0.698494, 0.340678, 0.565629 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.257274, -0.719022, 0.335286, 0.551725 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.239074, -0.739074, 0.329057, 0.536969 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.221313, -0.758612, 0.322012, 0.521380 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.204025, -0.777602, 0.314172, 0.504981 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.187247, -0.796008, 0.305559, 0.487794 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.171010, -0.813798, 0.296198, 0.469846 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.155348, -0.830938, 0.286115, 0.451162 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.140291, -0.847398, 0.275336, 0.431771 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.125869, -0.863147, 0.263890, 0.411700 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.112112, -0.878156, 0.251807, 0.390980 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.099046, -0.892399, 0.239118, 0.369644 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.086697, -0.905849, 0.225854, 0.347723 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.075090, -0.918482, 0.212048, 0.325251 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.064248, -0.930274, 0.197736, 0.302264 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.054193, -0.941204, 0.182951, 0.278797 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.044943, -0.951251, 0.167731, 0.254887 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.036519, -0.960398, 0.152112, 0.230571 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.028936, -0.968628, 0.136132, 0.205888 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.022209, -0.975926, 0.119829, 0.180877 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.016352, -0.982278, 0.103242, 0.155578 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.011376, -0.987672, 0.086410, 0.130030 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.007292, -0.992099, 0.069374, 0.104274 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.004106, -0.995551, 0.052175, 0.078352 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.001826, -0.998021, 0.034852, 0.052304 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000457, -0.999505, 0.017446, 0.026173 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000000, -1.000000, 0.000000, 0.000000 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.000457, -0.999505, -0.017446, -0.026173 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.001826, -0.998021, -0.034852, -0.052304 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.004106, -0.995551, -0.052175, -0.078352 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.007292, -0.992099, -0.069374, -0.104274 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.011376, -0.987672, -0.086410, -0.130030 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.016352, -0.982278, -0.103242, -0.155578 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.022209, -0.975926, -0.119829, -0.180877 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.028936, -0.968628, -0.136132, -0.205888 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.036519, -0.960398, -0.152112, -0.230571 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.044943, -0.951251, -0.167731, -0.254887 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.054193, -0.941204, -0.182951, -0.278797 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.064248, -0.930274, -0.197736, -0.302264 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.075090, -0.918482, -0.212048, -0.325251 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.086697, -0.905849, -0.225854, -0.347723 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.099046, -0.892399, -0.239118, -0.369644 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.112112, -0.878156, -0.251807, -0.390980 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.125869, -0.863147, -0.263890, -0.411700 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.140291, -0.847398, -0.275336, -0.431771 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.155348, -0.830938, -0.286115, -0.451162 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.171010, -0.813798, -0.296198, -0.469846 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.187247, -0.796008, -0.305559, -0.487794 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.204025, -0.777602, -0.314172, -0.504981 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.221313, -0.758612, -0.322012, -0.521380 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.239074, -0.739074, -0.329057, -0.536969 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.257274, -0.719022, -0.335286, -0.551725 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.275876, -0.698494, -0.340678, -0.565629 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.294843, -0.677527, -0.345217, -0.578662 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.314138, -0.656158, -0.348885, -0.590807 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.333721, -0.634427, -0.351668, -0.602048 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.353553, -0.612372, -0.353553, -0.612372 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.373595, -0.590035, -0.354529, -0.621767 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.393807, -0.567455, -0.354585, -0.630223 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.414147, -0.544673, -0.353715, -0.637730 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.434575, -0.521730, -0.351911, -0.644283 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.455049, -0.498668, -0.349171, -0.649877 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.475528, -0.475528, -0.345492, -0.654508 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.495972, -0.452352, -0.340872, -0.658176 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.516337, -0.429181, -0.335313, -0.660881 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.536584, -0.406058, -0.328819, -0.662626 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.556670, -0.383022, -0.321394, -0.663414 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.576556, -0.360116, -0.313044, -0.663252 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.596200, -0.337381, -0.303779, -0.662147 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.615562, -0.314856, -0.293608, -0.660109 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.634602, -0.292582, -0.282543, -0.657150 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.653281, -0.270598, -0.270598, -0.653281 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.671562, -0.248943, -0.257788, -0.648519 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.689404, -0.227656, -0.244131, -0.642880 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.706773, -0.206773, -0.229644, -0.636381 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.723630, -0.186331, -0.214349, -0.629042 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.739942, -0.166366, -0.198267, -0.620885 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.755673, -0.146912, -0.181421, -0.611932 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.770791, -0.128003, -0.163837, -0.602208 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.785262, -0.109672, -0.145540, -0.591738 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.799057, -0.091950, -0.126558, -0.580549 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.812144, -0.074867, -0.106921, -0.568669 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.824496, -0.058452, -0.086658, -0.556130 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.836085, -0.042732, -0.065801, -0.542960 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.846886, -0.027734, -0.044383, -0.529193 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.856874, -0.013482, -0.022438, -0.514862 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.866025, -0.000000, -0.000000, -0.500000 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.874320, 0.012691, 0.022895, -0.484643 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.881738, 0.024570, 0.046210, -0.468828 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.888260, 0.035620, 0.069908, -0.452591 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.893870, 0.045822, 0.093950, -0.435970 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.898554, 0.055163, 0.118297, -0.419003 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.902298, 0.063628, 0.142910, -0.401729 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.905091, 0.071205, 0.167749, -0.384188 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.906923, 0.077885, 0.192772, -0.366421 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907786, 0.083659, 0.217940, -0.348466 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.907673, 0.088521, 0.243210, -0.330366 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.906582, 0.092466, 0.268542, -0.312161 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.904508, 0.095492, 0.293893, -0.293893 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.901453, 0.097596, 0.319221, -0.275602 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 + 0.897415, 0.098780, 0.344485, -0.257330 diff --git a/scripts/trajectories/const000-Vector3.csv b/scripts/trajectories/const000-Vector3.csv new file mode 100644 index 0000000000000000000000000000000000000000..f47ae12e5defebf51cff611c9887c231cfdb2327 --- /dev/null +++ b/scripts/trajectories/const000-Vector3.csv @@ -0,0 +1,4 @@ +0.0, 0.0, 0.0, 1.0, 0.0, 0.0 +0.0, 0.0, 0.0, 1.0, 0.0, 0.0 +0.0, 0.0, 0.0, 1.0, 0.0, 0.0 +0.0, 0.0, 0.0, 1.0, 0.0, 0.0 diff --git a/scripts/trajectories/full-circle-4s-Vector3.csv b/scripts/trajectories/full-circle-4s-Vector3.csv new file mode 100644 index 0000000000000000000000000000000000000000..38a350523957054744f92fb08c628981a12e0f9a --- /dev/null +++ b/scripts/trajectories/full-circle-4s-Vector3.csv @@ -0,0 +1,200 @@ +0.0000,0.0000,0.0000,0.9995,-0.0314,0.0000 +0.0000,0.0000,0.0000,0.9980,-0.0628,0.0000 +0.0000,0.0000,0.0000,0.9956,-0.0941,0.0000 +0.0000,0.0000,0.0000,0.9921,-0.1253,0.0000 +0.0000,0.0000,0.0000,0.9877,-0.1564,0.0000 +0.0000,0.0000,0.0000,0.9823,-0.1874,0.0000 +0.0000,0.0000,0.0000,0.9759,-0.2181,0.0000 +0.0000,0.0000,0.0000,0.9686,-0.2487,0.0000 +0.0000,0.0000,0.0000,0.9603,-0.2790,0.0000 +0.0000,0.0000,0.0000,0.9511,-0.3090,0.0000 +0.0000,0.0000,0.0000,0.9409,-0.3387,0.0000 +0.0000,0.0000,0.0000,0.9298,-0.3681,0.0000 +0.0000,0.0000,0.0000,0.9178,-0.3971,0.0000 +0.0000,0.0000,0.0000,0.9048,-0.4258,0.0000 +0.0000,0.0000,0.0000,0.8910,-0.4540,0.0000 +0.0000,0.0000,0.0000,0.8763,-0.4818,0.0000 +0.0000,0.0000,0.0000,0.8607,-0.5090,0.0000 +0.0000,0.0000,0.0000,0.8443,-0.5358,0.0000 +0.0000,0.0000,0.0000,0.8271,-0.5621,0.0000 +0.0000,0.0000,0.0000,0.8090,-0.5878,0.0000 +0.0000,0.0000,0.0000,0.7902,-0.6129,0.0000 +0.0000,0.0000,0.0000,0.7705,-0.6374,0.0000 +0.0000,0.0000,0.0000,0.7501,-0.6613,0.0000 +0.0000,0.0000,0.0000,0.7290,-0.6845,0.0000 +0.0000,0.0000,0.0000,0.7071,-0.7071,0.0000 +0.0000,0.0000,0.0000,0.6845,-0.7290,0.0000 +0.0000,0.0000,0.0000,0.6613,-0.7501,0.0000 +0.0000,0.0000,0.0000,0.6374,-0.7705,0.0000 +0.0000,0.0000,0.0000,0.6129,-0.7902,0.0000 +0.0000,0.0000,0.0000,0.5878,-0.8090,0.0000 +0.0000,0.0000,0.0000,0.5621,-0.8271,0.0000 +0.0000,0.0000,0.0000,0.5358,-0.8443,0.0000 +0.0000,0.0000,0.0000,0.5090,-0.8607,0.0000 +0.0000,0.0000,0.0000,0.4818,-0.8763,0.0000 +0.0000,0.0000,0.0000,0.4540,-0.8910,0.0000 +0.0000,0.0000,0.0000,0.4258,-0.9048,0.0000 +0.0000,0.0000,0.0000,0.3971,-0.9178,0.0000 +0.0000,0.0000,0.0000,0.3681,-0.9298,0.0000 +0.0000,0.0000,0.0000,0.3387,-0.9409,0.0000 +0.0000,0.0000,0.0000,0.3090,-0.9511,0.0000 +0.0000,0.0000,0.0000,0.2790,-0.9603,0.0000 +0.0000,0.0000,0.0000,0.2487,-0.9686,0.0000 +0.0000,0.0000,0.0000,0.2181,-0.9759,0.0000 +0.0000,0.0000,0.0000,0.1874,-0.9823,0.0000 +0.0000,0.0000,0.0000,0.1564,-0.9877,0.0000 +0.0000,0.0000,0.0000,0.1253,-0.9921,0.0000 +0.0000,0.0000,0.0000,0.0941,-0.9956,0.0000 +0.0000,0.0000,0.0000,0.0628,-0.9980,0.0000 +0.0000,0.0000,0.0000,0.0314,-0.9995,0.0000 +0.0000,0.0000,0.0000,-0.0000,-1.0000,0.0000 +0.0000,0.0000,0.0000,-0.0314,-0.9995,0.0000 +0.0000,0.0000,0.0000,-0.0628,-0.9980,0.0000 +0.0000,0.0000,0.0000,-0.0941,-0.9956,0.0000 +0.0000,0.0000,0.0000,-0.1253,-0.9921,0.0000 +0.0000,0.0000,0.0000,-0.1564,-0.9877,0.0000 +0.0000,0.0000,0.0000,-0.1874,-0.9823,0.0000 +0.0000,0.0000,0.0000,-0.2181,-0.9759,0.0000 +0.0000,0.0000,0.0000,-0.2487,-0.9686,0.0000 +0.0000,0.0000,0.0000,-0.2790,-0.9603,0.0000 +0.0000,0.0000,0.0000,-0.3090,-0.9511,0.0000 +0.0000,0.0000,0.0000,-0.3387,-0.9409,0.0000 +0.0000,0.0000,0.0000,-0.3681,-0.9298,0.0000 +0.0000,0.0000,0.0000,-0.3971,-0.9178,0.0000 +0.0000,0.0000,0.0000,-0.4258,-0.9048,0.0000 +0.0000,0.0000,0.0000,-0.4540,-0.8910,0.0000 +0.0000,0.0000,0.0000,-0.4818,-0.8763,0.0000 +0.0000,0.0000,0.0000,-0.5090,-0.8607,0.0000 +0.0000,0.0000,0.0000,-0.5358,-0.8443,0.0000 +0.0000,0.0000,0.0000,-0.5621,-0.8271,0.0000 +0.0000,0.0000,0.0000,-0.5878,-0.8090,0.0000 +0.0000,0.0000,0.0000,-0.6129,-0.7902,0.0000 +0.0000,0.0000,0.0000,-0.6374,-0.7705,0.0000 +0.0000,0.0000,0.0000,-0.6613,-0.7501,0.0000 +0.0000,0.0000,0.0000,-0.6845,-0.7290,0.0000 +0.0000,0.0000,0.0000,-0.7071,-0.7071,0.0000 +0.0000,0.0000,0.0000,-0.7290,-0.6845,0.0000 +0.0000,0.0000,0.0000,-0.7501,-0.6613,0.0000 +0.0000,0.0000,0.0000,-0.7705,-0.6374,0.0000 +0.0000,0.0000,0.0000,-0.7902,-0.6129,0.0000 +0.0000,0.0000,0.0000,-0.8090,-0.5878,0.0000 +0.0000,0.0000,0.0000,-0.8271,-0.5621,0.0000 +0.0000,0.0000,0.0000,-0.8443,-0.5358,0.0000 +0.0000,0.0000,0.0000,-0.8607,-0.5090,0.0000 +0.0000,0.0000,0.0000,-0.8763,-0.4818,0.0000 +0.0000,0.0000,0.0000,-0.8910,-0.4540,0.0000 +0.0000,0.0000,0.0000,-0.9048,-0.4258,0.0000 +0.0000,0.0000,0.0000,-0.9178,-0.3971,0.0000 +0.0000,0.0000,0.0000,-0.9298,-0.3681,0.0000 +0.0000,0.0000,0.0000,-0.9409,-0.3387,0.0000 +0.0000,0.0000,0.0000,-0.9511,-0.3090,0.0000 +0.0000,0.0000,0.0000,-0.9603,-0.2790,0.0000 +0.0000,0.0000,0.0000,-0.9686,-0.2487,0.0000 +0.0000,0.0000,0.0000,-0.9759,-0.2181,0.0000 +0.0000,0.0000,0.0000,-0.9823,-0.1874,0.0000 +0.0000,0.0000,0.0000,-0.9877,-0.1564,0.0000 +0.0000,0.0000,0.0000,-0.9921,-0.1253,0.0000 +0.0000,0.0000,0.0000,-0.9956,-0.0941,0.0000 +0.0000,0.0000,0.0000,-0.9980,-0.0628,0.0000 +0.0000,0.0000,0.0000,-0.9995,-0.0314,0.0000 +0.0000,0.0000,0.0000,-1.0000,0.0000,0.0000 +0.0000,0.0000,0.0000,-0.9995,0.0314,0.0000 +0.0000,0.0000,0.0000,-0.9980,0.0628,0.0000 +0.0000,0.0000,0.0000,-0.9956,0.0941,0.0000 +0.0000,0.0000,0.0000,-0.9921,0.1253,0.0000 +0.0000,0.0000,0.0000,-0.9877,0.1564,0.0000 +0.0000,0.0000,0.0000,-0.9823,0.1874,0.0000 +0.0000,0.0000,0.0000,-0.9759,0.2181,0.0000 +0.0000,0.0000,0.0000,-0.9686,0.2487,0.0000 +0.0000,0.0000,0.0000,-0.9603,0.2790,0.0000 +0.0000,0.0000,0.0000,-0.9511,0.3090,0.0000 +0.0000,0.0000,0.0000,-0.9409,0.3387,0.0000 +0.0000,0.0000,0.0000,-0.9298,0.3681,0.0000 +0.0000,0.0000,0.0000,-0.9178,0.3971,0.0000 +0.0000,0.0000,0.0000,-0.9048,0.4258,0.0000 +0.0000,0.0000,0.0000,-0.8910,0.4540,0.0000 +0.0000,0.0000,0.0000,-0.8763,0.4818,0.0000 +0.0000,0.0000,0.0000,-0.8607,0.5090,0.0000 +0.0000,0.0000,0.0000,-0.8443,0.5358,0.0000 +0.0000,0.0000,0.0000,-0.8271,0.5621,0.0000 +0.0000,0.0000,0.0000,-0.8090,0.5878,0.0000 +0.0000,0.0000,0.0000,-0.7902,0.6129,0.0000 +0.0000,0.0000,0.0000,-0.7705,0.6374,0.0000 +0.0000,0.0000,0.0000,-0.7501,0.6613,0.0000 +0.0000,0.0000,0.0000,-0.7290,0.6845,0.0000 +0.0000,0.0000,0.0000,-0.7071,0.7071,0.0000 +0.0000,0.0000,0.0000,-0.6845,0.7290,0.0000 +0.0000,0.0000,0.0000,-0.6613,0.7501,0.0000 +0.0000,0.0000,0.0000,-0.6374,0.7705,0.0000 +0.0000,0.0000,0.0000,-0.6129,0.7902,0.0000 +0.0000,0.0000,0.0000,-0.5878,0.8090,0.0000 +0.0000,0.0000,0.0000,-0.5621,0.8271,0.0000 +0.0000,0.0000,0.0000,-0.5358,0.8443,0.0000 +0.0000,0.0000,0.0000,-0.5090,0.8607,0.0000 +0.0000,0.0000,0.0000,-0.4818,0.8763,0.0000 +0.0000,0.0000,0.0000,-0.4540,0.8910,0.0000 +0.0000,0.0000,0.0000,-0.4258,0.9048,0.0000 +0.0000,0.0000,0.0000,-0.3971,0.9178,0.0000 +0.0000,0.0000,0.0000,-0.3681,0.9298,0.0000 +0.0000,0.0000,0.0000,-0.3387,0.9409,0.0000 +0.0000,0.0000,0.0000,-0.3090,0.9511,0.0000 +0.0000,0.0000,0.0000,-0.2790,0.9603,0.0000 +0.0000,0.0000,0.0000,-0.2487,0.9686,0.0000 +0.0000,0.0000,0.0000,-0.2181,0.9759,0.0000 +0.0000,0.0000,0.0000,-0.1874,0.9823,0.0000 +0.0000,0.0000,0.0000,-0.1564,0.9877,0.0000 +0.0000,0.0000,0.0000,-0.1253,0.9921,0.0000 +0.0000,0.0000,0.0000,-0.0941,0.9956,0.0000 +0.0000,0.0000,0.0000,-0.0628,0.9980,0.0000 +0.0000,0.0000,0.0000,-0.0314,0.9995,0.0000 +0.0000,0.0000,0.0000,0.0000,1.0000,0.0000 +0.0000,0.0000,0.0000,0.0314,0.9995,0.0000 +0.0000,0.0000,0.0000,0.0628,0.9980,0.0000 +0.0000,0.0000,0.0000,0.0941,0.9956,0.0000 +0.0000,0.0000,0.0000,0.1253,0.9921,0.0000 +0.0000,0.0000,0.0000,0.1564,0.9877,0.0000 +0.0000,0.0000,0.0000,0.1874,0.9823,0.0000 +0.0000,0.0000,0.0000,0.2181,0.9759,0.0000 +0.0000,0.0000,0.0000,0.2487,0.9686,0.0000 +0.0000,0.0000,0.0000,0.2790,0.9603,0.0000 +0.0000,0.0000,0.0000,0.3090,0.9511,0.0000 +0.0000,0.0000,0.0000,0.3387,0.9409,0.0000 +0.0000,0.0000,0.0000,0.3681,0.9298,0.0000 +0.0000,0.0000,0.0000,0.3971,0.9178,0.0000 +0.0000,0.0000,0.0000,0.4258,0.9048,0.0000 +0.0000,0.0000,0.0000,0.4540,0.8910,0.0000 +0.0000,0.0000,0.0000,0.4818,0.8763,0.0000 +0.0000,0.0000,0.0000,0.5090,0.8607,0.0000 +0.0000,0.0000,0.0000,0.5358,0.8443,0.0000 +0.0000,0.0000,0.0000,0.5621,0.8271,0.0000 +0.0000,0.0000,0.0000,0.5878,0.8090,0.0000 +0.0000,0.0000,0.0000,0.6129,0.7902,0.0000 +0.0000,0.0000,0.0000,0.6374,0.7705,0.0000 +0.0000,0.0000,0.0000,0.6613,0.7501,0.0000 +0.0000,0.0000,0.0000,0.6845,0.7290,0.0000 +0.0000,0.0000,0.0000,0.7071,0.7071,0.0000 +0.0000,0.0000,0.0000,0.7290,0.6845,0.0000 +0.0000,0.0000,0.0000,0.7501,0.6613,0.0000 +0.0000,0.0000,0.0000,0.7705,0.6374,0.0000 +0.0000,0.0000,0.0000,0.7902,0.6129,0.0000 +0.0000,0.0000,0.0000,0.8090,0.5878,0.0000 +0.0000,0.0000,0.0000,0.8271,0.5621,0.0000 +0.0000,0.0000,0.0000,0.8443,0.5358,0.0000 +0.0000,0.0000,0.0000,0.8607,0.5090,0.0000 +0.0000,0.0000,0.0000,0.8763,0.4818,0.0000 +0.0000,0.0000,0.0000,0.8910,0.4540,0.0000 +0.0000,0.0000,0.0000,0.9048,0.4258,0.0000 +0.0000,0.0000,0.0000,0.9178,0.3971,0.0000 +0.0000,0.0000,0.0000,0.9298,0.3681,0.0000 +0.0000,0.0000,0.0000,0.9409,0.3387,0.0000 +0.0000,0.0000,0.0000,0.9511,0.3090,0.0000 +0.0000,0.0000,0.0000,0.9603,0.2790,0.0000 +0.0000,0.0000,0.0000,0.9686,0.2487,0.0000 +0.0000,0.0000,0.0000,0.9759,0.2181,0.0000 +0.0000,0.0000,0.0000,0.9823,0.1874,0.0000 +0.0000,0.0000,0.0000,0.9877,0.1564,0.0000 +0.0000,0.0000,0.0000,0.9921,0.1253,0.0000 +0.0000,0.0000,0.0000,0.9956,0.0941,0.0000 +0.0000,0.0000,0.0000,0.9980,0.0628,0.0000 +0.0000,0.0000,0.0000,0.9995,0.0314,0.0000 +0.0000,0.0000,0.0000,1.0000,-0.0000,0.0000 diff --git a/scripts/trajectories/full-circle-4s-ccw-Vector3.csv b/scripts/trajectories/full-circle-4s-ccw-Vector3.csv new file mode 100644 index 0000000000000000000000000000000000000000..37b2904ea4199014bf5647fa0196bf3975b13d55 --- /dev/null +++ b/scripts/trajectories/full-circle-4s-ccw-Vector3.csv @@ -0,0 +1,200 @@ +0.0000,0.0000,0.0000,0.9995,0.0314,0.0000 +0.0000,0.0000,0.0000,0.9980,0.0628,0.0000 +0.0000,0.0000,0.0000,0.9956,0.0941,0.0000 +0.0000,0.0000,0.0000,0.9921,0.1253,0.0000 +0.0000,0.0000,0.0000,0.9877,0.1564,0.0000 +0.0000,0.0000,0.0000,0.9823,0.1874,0.0000 +0.0000,0.0000,0.0000,0.9759,0.2181,0.0000 +0.0000,0.0000,0.0000,0.9686,0.2487,0.0000 +0.0000,0.0000,0.0000,0.9603,0.2790,0.0000 +0.0000,0.0000,0.0000,0.9511,0.3090,0.0000 +0.0000,0.0000,0.0000,0.9409,0.3387,0.0000 +0.0000,0.0000,0.0000,0.9298,0.3681,0.0000 +0.0000,0.0000,0.0000,0.9178,0.3971,0.0000 +0.0000,0.0000,0.0000,0.9048,0.4258,0.0000 +0.0000,0.0000,0.0000,0.8910,0.4540,0.0000 +0.0000,0.0000,0.0000,0.8763,0.4818,0.0000 +0.0000,0.0000,0.0000,0.8607,0.5090,0.0000 +0.0000,0.0000,0.0000,0.8443,0.5358,0.0000 +0.0000,0.0000,0.0000,0.8271,0.5621,0.0000 +0.0000,0.0000,0.0000,0.8090,0.5878,0.0000 +0.0000,0.0000,0.0000,0.7902,0.6129,0.0000 +0.0000,0.0000,0.0000,0.7705,0.6374,0.0000 +0.0000,0.0000,0.0000,0.7501,0.6613,0.0000 +0.0000,0.0000,0.0000,0.7290,0.6845,0.0000 +0.0000,0.0000,0.0000,0.7071,0.7071,0.0000 +0.0000,0.0000,0.0000,0.6845,0.7290,0.0000 +0.0000,0.0000,0.0000,0.6613,0.7501,0.0000 +0.0000,0.0000,0.0000,0.6374,0.7705,0.0000 +0.0000,0.0000,0.0000,0.6129,0.7902,0.0000 +0.0000,0.0000,0.0000,0.5878,0.8090,0.0000 +0.0000,0.0000,0.0000,0.5621,0.8271,0.0000 +0.0000,0.0000,0.0000,0.5358,0.8443,0.0000 +0.0000,0.0000,0.0000,0.5090,0.8607,0.0000 +0.0000,0.0000,0.0000,0.4818,0.8763,0.0000 +0.0000,0.0000,0.0000,0.4540,0.8910,0.0000 +0.0000,0.0000,0.0000,0.4258,0.9048,0.0000 +0.0000,0.0000,0.0000,0.3971,0.9178,0.0000 +0.0000,0.0000,0.0000,0.3681,0.9298,0.0000 +0.0000,0.0000,0.0000,0.3387,0.9409,0.0000 +0.0000,0.0000,0.0000,0.3090,0.9511,0.0000 +0.0000,0.0000,0.0000,0.2790,0.9603,0.0000 +0.0000,0.0000,0.0000,0.2487,0.9686,0.0000 +0.0000,0.0000,0.0000,0.2181,0.9759,0.0000 +0.0000,0.0000,0.0000,0.1874,0.9823,0.0000 +0.0000,0.0000,0.0000,0.1564,0.9877,0.0000 +0.0000,0.0000,0.0000,0.1253,0.9921,0.0000 +0.0000,0.0000,0.0000,0.0941,0.9956,0.0000 +0.0000,0.0000,0.0000,0.0628,0.9980,0.0000 +0.0000,0.0000,0.0000,0.0314,0.9995,0.0000 +0.0000,0.0000,0.0000,-0.0000,1.0000,0.0000 +0.0000,0.0000,0.0000,-0.0314,0.9995,0.0000 +0.0000,0.0000,0.0000,-0.0628,0.9980,0.0000 +0.0000,0.0000,0.0000,-0.0941,0.9956,0.0000 +0.0000,0.0000,0.0000,-0.1253,0.9921,0.0000 +0.0000,0.0000,0.0000,-0.1564,0.9877,0.0000 +0.0000,0.0000,0.0000,-0.1874,0.9823,0.0000 +0.0000,0.0000,0.0000,-0.2181,0.9759,0.0000 +0.0000,0.0000,0.0000,-0.2487,0.9686,0.0000 +0.0000,0.0000,0.0000,-0.2790,0.9603,0.0000 +0.0000,0.0000,0.0000,-0.3090,0.9511,0.0000 +0.0000,0.0000,0.0000,-0.3387,0.9409,0.0000 +0.0000,0.0000,0.0000,-0.3681,0.9298,0.0000 +0.0000,0.0000,0.0000,-0.3971,0.9178,0.0000 +0.0000,0.0000,0.0000,-0.4258,0.9048,0.0000 +0.0000,0.0000,0.0000,-0.4540,0.8910,0.0000 +0.0000,0.0000,0.0000,-0.4818,0.8763,0.0000 +0.0000,0.0000,0.0000,-0.5090,0.8607,0.0000 +0.0000,0.0000,0.0000,-0.5358,0.8443,0.0000 +0.0000,0.0000,0.0000,-0.5621,0.8271,0.0000 +0.0000,0.0000,0.0000,-0.5878,0.8090,0.0000 +0.0000,0.0000,0.0000,-0.6129,0.7902,0.0000 +0.0000,0.0000,0.0000,-0.6374,0.7705,0.0000 +0.0000,0.0000,0.0000,-0.6613,0.7501,0.0000 +0.0000,0.0000,0.0000,-0.6845,0.7290,0.0000 +0.0000,0.0000,0.0000,-0.7071,0.7071,0.0000 +0.0000,0.0000,0.0000,-0.7290,0.6845,0.0000 +0.0000,0.0000,0.0000,-0.7501,0.6613,0.0000 +0.0000,0.0000,0.0000,-0.7705,0.6374,0.0000 +0.0000,0.0000,0.0000,-0.7902,0.6129,0.0000 +0.0000,0.0000,0.0000,-0.8090,0.5878,0.0000 +0.0000,0.0000,0.0000,-0.8271,0.5621,0.0000 +0.0000,0.0000,0.0000,-0.8443,0.5358,0.0000 +0.0000,0.0000,0.0000,-0.8607,0.5090,0.0000 +0.0000,0.0000,0.0000,-0.8763,0.4818,0.0000 +0.0000,0.0000,0.0000,-0.8910,0.4540,0.0000 +0.0000,0.0000,0.0000,-0.9048,0.4258,0.0000 +0.0000,0.0000,0.0000,-0.9178,0.3971,0.0000 +0.0000,0.0000,0.0000,-0.9298,0.3681,0.0000 +0.0000,0.0000,0.0000,-0.9409,0.3387,0.0000 +0.0000,0.0000,0.0000,-0.9511,0.3090,0.0000 +0.0000,0.0000,0.0000,-0.9603,0.2790,0.0000 +0.0000,0.0000,0.0000,-0.9686,0.2487,0.0000 +0.0000,0.0000,0.0000,-0.9759,0.2181,0.0000 +0.0000,0.0000,0.0000,-0.9823,0.1874,0.0000 +0.0000,0.0000,0.0000,-0.9877,0.1564,0.0000 +0.0000,0.0000,0.0000,-0.9921,0.1253,0.0000 +0.0000,0.0000,0.0000,-0.9956,0.0941,0.0000 +0.0000,0.0000,0.0000,-0.9980,0.0628,0.0000 +0.0000,0.0000,0.0000,-0.9995,0.0314,0.0000 +0.0000,0.0000,0.0000,-1.0000,-0.0000,0.0000 +0.0000,0.0000,0.0000,-0.9995,-0.0314,0.0000 +0.0000,0.0000,0.0000,-0.9980,-0.0628,0.0000 +0.0000,0.0000,0.0000,-0.9956,-0.0941,0.0000 +0.0000,0.0000,0.0000,-0.9921,-0.1253,0.0000 +0.0000,0.0000,0.0000,-0.9877,-0.1564,0.0000 +0.0000,0.0000,0.0000,-0.9823,-0.1874,0.0000 +0.0000,0.0000,0.0000,-0.9759,-0.2181,0.0000 +0.0000,0.0000,0.0000,-0.9686,-0.2487,0.0000 +0.0000,0.0000,0.0000,-0.9603,-0.2790,0.0000 +0.0000,0.0000,0.0000,-0.9511,-0.3090,0.0000 +0.0000,0.0000,0.0000,-0.9409,-0.3387,0.0000 +0.0000,0.0000,0.0000,-0.9298,-0.3681,0.0000 +0.0000,0.0000,0.0000,-0.9178,-0.3971,0.0000 +0.0000,0.0000,0.0000,-0.9048,-0.4258,0.0000 +0.0000,0.0000,0.0000,-0.8910,-0.4540,0.0000 +0.0000,0.0000,0.0000,-0.8763,-0.4818,0.0000 +0.0000,0.0000,0.0000,-0.8607,-0.5090,0.0000 +0.0000,0.0000,0.0000,-0.8443,-0.5358,0.0000 +0.0000,0.0000,0.0000,-0.8271,-0.5621,0.0000 +0.0000,0.0000,0.0000,-0.8090,-0.5878,0.0000 +0.0000,0.0000,0.0000,-0.7902,-0.6129,0.0000 +0.0000,0.0000,0.0000,-0.7705,-0.6374,0.0000 +0.0000,0.0000,0.0000,-0.7501,-0.6613,0.0000 +0.0000,0.0000,0.0000,-0.7290,-0.6845,0.0000 +0.0000,0.0000,0.0000,-0.7071,-0.7071,0.0000 +0.0000,0.0000,0.0000,-0.6845,-0.7290,0.0000 +0.0000,0.0000,0.0000,-0.6613,-0.7501,0.0000 +0.0000,0.0000,0.0000,-0.6374,-0.7705,0.0000 +0.0000,0.0000,0.0000,-0.6129,-0.7902,0.0000 +0.0000,0.0000,0.0000,-0.5878,-0.8090,0.0000 +0.0000,0.0000,0.0000,-0.5621,-0.8271,0.0000 +0.0000,0.0000,0.0000,-0.5358,-0.8443,0.0000 +0.0000,0.0000,0.0000,-0.5090,-0.8607,0.0000 +0.0000,0.0000,0.0000,-0.4818,-0.8763,0.0000 +0.0000,0.0000,0.0000,-0.4540,-0.8910,0.0000 +0.0000,0.0000,0.0000,-0.4258,-0.9048,0.0000 +0.0000,0.0000,0.0000,-0.3971,-0.9178,0.0000 +0.0000,0.0000,0.0000,-0.3681,-0.9298,0.0000 +0.0000,0.0000,0.0000,-0.3387,-0.9409,0.0000 +0.0000,0.0000,0.0000,-0.3090,-0.9511,0.0000 +0.0000,0.0000,0.0000,-0.2790,-0.9603,0.0000 +0.0000,0.0000,0.0000,-0.2487,-0.9686,0.0000 +0.0000,0.0000,0.0000,-0.2181,-0.9759,0.0000 +0.0000,0.0000,0.0000,-0.1874,-0.9823,0.0000 +0.0000,0.0000,0.0000,-0.1564,-0.9877,0.0000 +0.0000,0.0000,0.0000,-0.1253,-0.9921,0.0000 +0.0000,0.0000,0.0000,-0.0941,-0.9956,0.0000 +0.0000,0.0000,0.0000,-0.0628,-0.9980,0.0000 +0.0000,0.0000,0.0000,-0.0314,-0.9995,0.0000 +0.0000,0.0000,0.0000,0.0000,-1.0000,0.0000 +0.0000,0.0000,0.0000,0.0314,-0.9995,0.0000 +0.0000,0.0000,0.0000,0.0628,-0.9980,0.0000 +0.0000,0.0000,0.0000,0.0941,-0.9956,0.0000 +0.0000,0.0000,0.0000,0.1253,-0.9921,0.0000 +0.0000,0.0000,0.0000,0.1564,-0.9877,0.0000 +0.0000,0.0000,0.0000,0.1874,-0.9823,0.0000 +0.0000,0.0000,0.0000,0.2181,-0.9759,0.0000 +0.0000,0.0000,0.0000,0.2487,-0.9686,0.0000 +0.0000,0.0000,0.0000,0.2790,-0.9603,0.0000 +0.0000,0.0000,0.0000,0.3090,-0.9511,0.0000 +0.0000,0.0000,0.0000,0.3387,-0.9409,0.0000 +0.0000,0.0000,0.0000,0.3681,-0.9298,0.0000 +0.0000,0.0000,0.0000,0.3971,-0.9178,0.0000 +0.0000,0.0000,0.0000,0.4258,-0.9048,0.0000 +0.0000,0.0000,0.0000,0.4540,-0.8910,0.0000 +0.0000,0.0000,0.0000,0.4818,-0.8763,0.0000 +0.0000,0.0000,0.0000,0.5090,-0.8607,0.0000 +0.0000,0.0000,0.0000,0.5358,-0.8443,0.0000 +0.0000,0.0000,0.0000,0.5621,-0.8271,0.0000 +0.0000,0.0000,0.0000,0.5878,-0.8090,0.0000 +0.0000,0.0000,0.0000,0.6129,-0.7902,0.0000 +0.0000,0.0000,0.0000,0.6374,-0.7705,0.0000 +0.0000,0.0000,0.0000,0.6613,-0.7501,0.0000 +0.0000,0.0000,0.0000,0.6845,-0.7290,0.0000 +0.0000,0.0000,0.0000,0.7071,-0.7071,0.0000 +0.0000,0.0000,0.0000,0.7290,-0.6845,0.0000 +0.0000,0.0000,0.0000,0.7501,-0.6613,0.0000 +0.0000,0.0000,0.0000,0.7705,-0.6374,0.0000 +0.0000,0.0000,0.0000,0.7902,-0.6129,0.0000 +0.0000,0.0000,0.0000,0.8090,-0.5878,0.0000 +0.0000,0.0000,0.0000,0.8271,-0.5621,0.0000 +0.0000,0.0000,0.0000,0.8443,-0.5358,0.0000 +0.0000,0.0000,0.0000,0.8607,-0.5090,0.0000 +0.0000,0.0000,0.0000,0.8763,-0.4818,0.0000 +0.0000,0.0000,0.0000,0.8910,-0.4540,0.0000 +0.0000,0.0000,0.0000,0.9048,-0.4258,0.0000 +0.0000,0.0000,0.0000,0.9178,-0.3971,0.0000 +0.0000,0.0000,0.0000,0.9298,-0.3681,0.0000 +0.0000,0.0000,0.0000,0.9409,-0.3387,0.0000 +0.0000,0.0000,0.0000,0.9511,-0.3090,0.0000 +0.0000,0.0000,0.0000,0.9603,-0.2790,0.0000 +0.0000,0.0000,0.0000,0.9686,-0.2487,0.0000 +0.0000,0.0000,0.0000,0.9759,-0.2181,0.0000 +0.0000,0.0000,0.0000,0.9823,-0.1874,0.0000 +0.0000,0.0000,0.0000,0.9877,-0.1564,0.0000 +0.0000,0.0000,0.0000,0.9921,-0.1253,0.0000 +0.0000,0.0000,0.0000,0.9956,-0.0941,0.0000 +0.0000,0.0000,0.0000,0.9980,-0.0628,0.0000 +0.0000,0.0000,0.0000,0.9995,-0.0314,0.0000 +0.0000,0.0000,0.0000,1.0000,0.0000,0.0000 diff --git a/scripts/trajectories/full-circle-4s-ccw.csv b/scripts/trajectories/full-circle-4s-ccw.csv new file mode 100644 index 0000000000000000000000000000000000000000..13eeae28e126750542c3fc6583d05e4a30575f42 --- /dev/null +++ b/scripts/trajectories/full-circle-4s-ccw.csv @@ -0,0 +1,800 @@ +0.9999,0.0000,0.0000,0.0157 +0.9999,0.0000,0.0000,0.0157 +0.9999,0.0000,0.0000,0.0157 +0.9999,0.0000,0.0000,0.0157 +0.9995,0.0000,0.0000,0.0314 +0.9995,0.0000,0.0000,0.0314 +0.9995,0.0000,0.0000,0.0314 +0.9995,0.0000,0.0000,0.0314 +0.9989,0.0000,0.0000,0.0471 +0.9989,0.0000,0.0000,0.0471 +0.9989,0.0000,0.0000,0.0471 +0.9989,0.0000,0.0000,0.0471 +0.9980,0.0000,0.0000,0.0628 +0.9980,0.0000,0.0000,0.0628 +0.9980,0.0000,0.0000,0.0628 +0.9980,0.0000,0.0000,0.0628 +0.9969,0.0000,0.0000,0.0785 +0.9969,0.0000,0.0000,0.0785 +0.9969,0.0000,0.0000,0.0785 +0.9969,0.0000,0.0000,0.0785 +0.9956,0.0000,0.0000,0.0941 +0.9956,0.0000,0.0000,0.0941 +0.9956,0.0000,0.0000,0.0941 +0.9956,0.0000,0.0000,0.0941 +0.9940,0.0000,0.0000,0.1097 +0.9940,0.0000,0.0000,0.1097 +0.9940,0.0000,0.0000,0.1097 +0.9940,0.0000,0.0000,0.1097 +0.9921,0.0000,0.0000,0.1253 +0.9921,0.0000,0.0000,0.1253 +0.9921,0.0000,0.0000,0.1253 +0.9921,0.0000,0.0000,0.1253 +0.9900,0.0000,0.0000,0.1409 +0.9900,0.0000,0.0000,0.1409 +0.9900,0.0000,0.0000,0.1409 +0.9900,0.0000,0.0000,0.1409 +0.9877,0.0000,0.0000,0.1564 +0.9877,0.0000,0.0000,0.1564 +0.9877,0.0000,0.0000,0.1564 +0.9877,0.0000,0.0000,0.1564 +0.9851,0.0000,0.0000,0.1719 +0.9851,0.0000,0.0000,0.1719 +0.9851,0.0000,0.0000,0.1719 +0.9851,0.0000,0.0000,0.1719 +0.9823,0.0000,0.0000,0.1874 +0.9823,0.0000,0.0000,0.1874 +0.9823,0.0000,0.0000,0.1874 +0.9823,0.0000,0.0000,0.1874 +0.9792,0.0000,0.0000,0.2028 +0.9792,0.0000,0.0000,0.2028 +0.9792,0.0000,0.0000,0.2028 +0.9792,0.0000,0.0000,0.2028 +0.9759,0.0000,0.0000,0.2181 +0.9759,0.0000,0.0000,0.2181 +0.9759,0.0000,0.0000,0.2181 +0.9759,0.0000,0.0000,0.2181 +0.9724,0.0000,0.0000,0.2334 +0.9724,0.0000,0.0000,0.2334 +0.9724,0.0000,0.0000,0.2334 +0.9724,0.0000,0.0000,0.2334 +0.9686,0.0000,0.0000,0.2487 +0.9686,0.0000,0.0000,0.2487 +0.9686,0.0000,0.0000,0.2487 +0.9686,0.0000,0.0000,0.2487 +0.9646,0.0000,0.0000,0.2639 +0.9646,0.0000,0.0000,0.2639 +0.9646,0.0000,0.0000,0.2639 +0.9646,0.0000,0.0000,0.2639 +0.9603,0.0000,0.0000,0.2790 +0.9603,0.0000,0.0000,0.2790 +0.9603,0.0000,0.0000,0.2790 +0.9603,0.0000,0.0000,0.2790 +0.9558,0.0000,0.0000,0.2940 +0.9558,0.0000,0.0000,0.2940 +0.9558,0.0000,0.0000,0.2940 +0.9558,0.0000,0.0000,0.2940 +0.9511,0.0000,0.0000,0.3090 +0.9511,0.0000,0.0000,0.3090 +0.9511,0.0000,0.0000,0.3090 +0.9511,0.0000,0.0000,0.3090 +0.9461,0.0000,0.0000,0.3239 +0.9461,0.0000,0.0000,0.3239 +0.9461,0.0000,0.0000,0.3239 +0.9461,0.0000,0.0000,0.3239 +0.9409,0.0000,0.0000,0.3387 +0.9409,0.0000,0.0000,0.3387 +0.9409,0.0000,0.0000,0.3387 +0.9409,0.0000,0.0000,0.3387 +0.9354,0.0000,0.0000,0.3535 +0.9354,0.0000,0.0000,0.3535 +0.9354,0.0000,0.0000,0.3535 +0.9354,0.0000,0.0000,0.3535 +0.9298,0.0000,0.0000,0.3681 +0.9298,0.0000,0.0000,0.3681 +0.9298,0.0000,0.0000,0.3681 +0.9298,0.0000,0.0000,0.3681 +0.9239,0.0000,0.0000,0.3827 +0.9239,0.0000,0.0000,0.3827 +0.9239,0.0000,0.0000,0.3827 +0.9239,0.0000,0.0000,0.3827 +0.9178,0.0000,0.0000,0.3971 +0.9178,0.0000,0.0000,0.3971 +0.9178,0.0000,0.0000,0.3971 +0.9178,0.0000,0.0000,0.3971 +0.9114,0.0000,0.0000,0.4115 +0.9114,0.0000,0.0000,0.4115 +0.9114,0.0000,0.0000,0.4115 +0.9114,0.0000,0.0000,0.4115 +0.9048,0.0000,0.0000,0.4258 +0.9048,0.0000,0.0000,0.4258 +0.9048,0.0000,0.0000,0.4258 +0.9048,0.0000,0.0000,0.4258 +0.8980,0.0000,0.0000,0.4399 +0.8980,0.0000,0.0000,0.4399 +0.8980,0.0000,0.0000,0.4399 +0.8980,0.0000,0.0000,0.4399 +0.8910,0.0000,0.0000,0.4540 +0.8910,0.0000,0.0000,0.4540 +0.8910,0.0000,0.0000,0.4540 +0.8910,0.0000,0.0000,0.4540 +0.8838,0.0000,0.0000,0.4679 +0.8838,0.0000,0.0000,0.4679 +0.8838,0.0000,0.0000,0.4679 +0.8838,0.0000,0.0000,0.4679 +0.8763,0.0000,0.0000,0.4818 +0.8763,0.0000,0.0000,0.4818 +0.8763,0.0000,0.0000,0.4818 +0.8763,0.0000,0.0000,0.4818 +0.8686,0.0000,0.0000,0.4955 +0.8686,0.0000,0.0000,0.4955 +0.8686,0.0000,0.0000,0.4955 +0.8686,0.0000,0.0000,0.4955 +0.8607,0.0000,0.0000,0.5090 +0.8607,0.0000,0.0000,0.5090 +0.8607,0.0000,0.0000,0.5090 +0.8607,0.0000,0.0000,0.5090 +0.8526,0.0000,0.0000,0.5225 +0.8526,0.0000,0.0000,0.5225 +0.8526,0.0000,0.0000,0.5225 +0.8526,0.0000,0.0000,0.5225 +0.8443,0.0000,0.0000,0.5358 +0.8443,0.0000,0.0000,0.5358 +0.8443,0.0000,0.0000,0.5358 +0.8443,0.0000,0.0000,0.5358 +0.8358,0.0000,0.0000,0.5490 +0.8358,0.0000,0.0000,0.5490 +0.8358,0.0000,0.0000,0.5490 +0.8358,0.0000,0.0000,0.5490 +0.8271,0.0000,0.0000,0.5621 +0.8271,0.0000,0.0000,0.5621 +0.8271,0.0000,0.0000,0.5621 +0.8271,0.0000,0.0000,0.5621 +0.8181,0.0000,0.0000,0.5750 +0.8181,0.0000,0.0000,0.5750 +0.8181,0.0000,0.0000,0.5750 +0.8181,0.0000,0.0000,0.5750 +0.8090,0.0000,0.0000,0.5878 +0.8090,0.0000,0.0000,0.5878 +0.8090,0.0000,0.0000,0.5878 +0.8090,0.0000,0.0000,0.5878 +0.7997,0.0000,0.0000,0.6004 +0.7997,0.0000,0.0000,0.6004 +0.7997,0.0000,0.0000,0.6004 +0.7997,0.0000,0.0000,0.6004 +0.7902,0.0000,0.0000,0.6129 +0.7902,0.0000,0.0000,0.6129 +0.7902,0.0000,0.0000,0.6129 +0.7902,0.0000,0.0000,0.6129 +0.7804,0.0000,0.0000,0.6252 +0.7804,0.0000,0.0000,0.6252 +0.7804,0.0000,0.0000,0.6252 +0.7804,0.0000,0.0000,0.6252 +0.7705,0.0000,0.0000,0.6374 +0.7705,0.0000,0.0000,0.6374 +0.7705,0.0000,0.0000,0.6374 +0.7705,0.0000,0.0000,0.6374 +0.7604,0.0000,0.0000,0.6494 +0.7604,0.0000,0.0000,0.6494 +0.7604,0.0000,0.0000,0.6494 +0.7604,0.0000,0.0000,0.6494 +0.7501,0.0000,0.0000,0.6613 +0.7501,0.0000,0.0000,0.6613 +0.7501,0.0000,0.0000,0.6613 +0.7501,0.0000,0.0000,0.6613 +0.7396,0.0000,0.0000,0.6730 +0.7396,0.0000,0.0000,0.6730 +0.7396,0.0000,0.0000,0.6730 +0.7396,0.0000,0.0000,0.6730 +0.7290,0.0000,0.0000,0.6845 +0.7290,0.0000,0.0000,0.6845 +0.7290,0.0000,0.0000,0.6845 +0.7290,0.0000,0.0000,0.6845 +0.7181,0.0000,0.0000,0.6959 +0.7181,0.0000,0.0000,0.6959 +0.7181,0.0000,0.0000,0.6959 +0.7181,0.0000,0.0000,0.6959 +0.7071,0.0000,0.0000,0.7071 +0.7071,0.0000,0.0000,0.7071 +0.7071,0.0000,0.0000,0.7071 +0.7071,0.0000,0.0000,0.7071 +0.6959,0.0000,0.0000,0.7181 +0.6959,0.0000,0.0000,0.7181 +0.6959,0.0000,0.0000,0.7181 +0.6959,0.0000,0.0000,0.7181 +0.6845,0.0000,0.0000,0.7290 +0.6845,0.0000,0.0000,0.7290 +0.6845,0.0000,0.0000,0.7290 +0.6845,0.0000,0.0000,0.7290 +0.6730,0.0000,0.0000,0.7396 +0.6730,0.0000,0.0000,0.7396 +0.6730,0.0000,0.0000,0.7396 +0.6730,0.0000,0.0000,0.7396 +0.6613,0.0000,0.0000,0.7501 +0.6613,0.0000,0.0000,0.7501 +0.6613,0.0000,0.0000,0.7501 +0.6613,0.0000,0.0000,0.7501 +0.6494,0.0000,0.0000,0.7604 +0.6494,0.0000,0.0000,0.7604 +0.6494,0.0000,0.0000,0.7604 +0.6494,0.0000,0.0000,0.7604 +0.6374,0.0000,0.0000,0.7705 +0.6374,0.0000,0.0000,0.7705 +0.6374,0.0000,0.0000,0.7705 +0.6374,0.0000,0.0000,0.7705 +0.6252,0.0000,0.0000,0.7804 +0.6252,0.0000,0.0000,0.7804 +0.6252,0.0000,0.0000,0.7804 +0.6252,0.0000,0.0000,0.7804 +0.6129,0.0000,0.0000,0.7902 +0.6129,0.0000,0.0000,0.7902 +0.6129,0.0000,0.0000,0.7902 +0.6129,0.0000,0.0000,0.7902 +0.6004,0.0000,0.0000,0.7997 +0.6004,0.0000,0.0000,0.7997 +0.6004,0.0000,0.0000,0.7997 +0.6004,0.0000,0.0000,0.7997 +0.5878,0.0000,0.0000,0.8090 +0.5878,0.0000,0.0000,0.8090 +0.5878,0.0000,0.0000,0.8090 +0.5878,0.0000,0.0000,0.8090 +0.5750,0.0000,0.0000,0.8181 +0.5750,0.0000,0.0000,0.8181 +0.5750,0.0000,0.0000,0.8181 +0.5750,0.0000,0.0000,0.8181 +0.5621,0.0000,0.0000,0.8271 +0.5621,0.0000,0.0000,0.8271 +0.5621,0.0000,0.0000,0.8271 +0.5621,0.0000,0.0000,0.8271 +0.5490,0.0000,0.0000,0.8358 +0.5490,0.0000,0.0000,0.8358 +0.5490,0.0000,0.0000,0.8358 +0.5490,0.0000,0.0000,0.8358 +0.5358,0.0000,0.0000,0.8443 +0.5358,0.0000,0.0000,0.8443 +0.5358,0.0000,0.0000,0.8443 +0.5358,0.0000,0.0000,0.8443 +0.5225,0.0000,0.0000,0.8526 +0.5225,0.0000,0.0000,0.8526 +0.5225,0.0000,0.0000,0.8526 +0.5225,0.0000,0.0000,0.8526 +0.5090,0.0000,0.0000,0.8607 +0.5090,0.0000,0.0000,0.8607 +0.5090,0.0000,0.0000,0.8607 +0.5090,0.0000,0.0000,0.8607 +0.4955,0.0000,0.0000,0.8686 +0.4955,0.0000,0.0000,0.8686 +0.4955,0.0000,0.0000,0.8686 +0.4955,0.0000,0.0000,0.8686 +0.4818,0.0000,0.0000,0.8763 +0.4818,0.0000,0.0000,0.8763 +0.4818,0.0000,0.0000,0.8763 +0.4818,0.0000,0.0000,0.8763 +0.4679,0.0000,0.0000,0.8838 +0.4679,0.0000,0.0000,0.8838 +0.4679,0.0000,0.0000,0.8838 +0.4679,0.0000,0.0000,0.8838 +0.4540,0.0000,0.0000,0.8910 +0.4540,0.0000,0.0000,0.8910 +0.4540,0.0000,0.0000,0.8910 +0.4540,0.0000,0.0000,0.8910 +0.4399,0.0000,0.0000,0.8980 +0.4399,0.0000,0.0000,0.8980 +0.4399,0.0000,0.0000,0.8980 +0.4399,0.0000,0.0000,0.8980 +0.4258,0.0000,0.0000,0.9048 +0.4258,0.0000,0.0000,0.9048 +0.4258,0.0000,0.0000,0.9048 +0.4258,0.0000,0.0000,0.9048 +0.4115,0.0000,0.0000,0.9114 +0.4115,0.0000,0.0000,0.9114 +0.4115,0.0000,0.0000,0.9114 +0.4115,0.0000,0.0000,0.9114 +0.3971,0.0000,0.0000,0.9178 +0.3971,0.0000,0.0000,0.9178 +0.3971,0.0000,0.0000,0.9178 +0.3971,0.0000,0.0000,0.9178 +0.3827,0.0000,0.0000,0.9239 +0.3827,0.0000,0.0000,0.9239 +0.3827,0.0000,0.0000,0.9239 +0.3827,0.0000,0.0000,0.9239 +0.3681,0.0000,0.0000,0.9298 +0.3681,0.0000,0.0000,0.9298 +0.3681,0.0000,0.0000,0.9298 +0.3681,0.0000,0.0000,0.9298 +0.3535,0.0000,0.0000,0.9354 +0.3535,0.0000,0.0000,0.9354 +0.3535,0.0000,0.0000,0.9354 +0.3535,0.0000,0.0000,0.9354 +0.3387,0.0000,0.0000,0.9409 +0.3387,0.0000,0.0000,0.9409 +0.3387,0.0000,0.0000,0.9409 +0.3387,0.0000,0.0000,0.9409 +0.3239,0.0000,0.0000,0.9461 +0.3239,0.0000,0.0000,0.9461 +0.3239,0.0000,0.0000,0.9461 +0.3239,0.0000,0.0000,0.9461 +0.3090,0.0000,0.0000,0.9511 +0.3090,0.0000,0.0000,0.9511 +0.3090,0.0000,0.0000,0.9511 +0.3090,0.0000,0.0000,0.9511 +0.2940,0.0000,0.0000,0.9558 +0.2940,0.0000,0.0000,0.9558 +0.2940,0.0000,0.0000,0.9558 +0.2940,0.0000,0.0000,0.9558 +0.2790,0.0000,0.0000,0.9603 +0.2790,0.0000,0.0000,0.9603 +0.2790,0.0000,0.0000,0.9603 +0.2790,0.0000,0.0000,0.9603 +0.2639,0.0000,0.0000,0.9646 +0.2639,0.0000,0.0000,0.9646 +0.2639,0.0000,0.0000,0.9646 +0.2639,0.0000,0.0000,0.9646 +0.2487,0.0000,0.0000,0.9686 +0.2487,0.0000,0.0000,0.9686 +0.2487,0.0000,0.0000,0.9686 +0.2487,0.0000,0.0000,0.9686 +0.2334,0.0000,0.0000,0.9724 +0.2334,0.0000,0.0000,0.9724 +0.2334,0.0000,0.0000,0.9724 +0.2334,0.0000,0.0000,0.9724 +0.2181,0.0000,0.0000,0.9759 +0.2181,0.0000,0.0000,0.9759 +0.2181,0.0000,0.0000,0.9759 +0.2181,0.0000,0.0000,0.9759 +0.2028,0.0000,0.0000,0.9792 +0.2028,0.0000,0.0000,0.9792 +0.2028,0.0000,0.0000,0.9792 +0.2028,0.0000,0.0000,0.9792 +0.1874,0.0000,0.0000,0.9823 +0.1874,0.0000,0.0000,0.9823 +0.1874,0.0000,0.0000,0.9823 +0.1874,0.0000,0.0000,0.9823 +0.1719,0.0000,0.0000,0.9851 +0.1719,0.0000,0.0000,0.9851 +0.1719,0.0000,0.0000,0.9851 +0.1719,0.0000,0.0000,0.9851 +0.1564,0.0000,0.0000,0.9877 +0.1564,0.0000,0.0000,0.9877 +0.1564,0.0000,0.0000,0.9877 +0.1564,0.0000,0.0000,0.9877 +0.1409,0.0000,0.0000,0.9900 +0.1409,0.0000,0.0000,0.9900 +0.1409,0.0000,0.0000,0.9900 +0.1409,0.0000,0.0000,0.9900 +0.1253,0.0000,0.0000,0.9921 +0.1253,0.0000,0.0000,0.9921 +0.1253,0.0000,0.0000,0.9921 +0.1253,0.0000,0.0000,0.9921 +0.1097,0.0000,0.0000,0.9940 +0.1097,0.0000,0.0000,0.9940 +0.1097,0.0000,0.0000,0.9940 +0.1097,0.0000,0.0000,0.9940 +0.0941,0.0000,0.0000,0.9956 +0.0941,0.0000,0.0000,0.9956 +0.0941,0.0000,0.0000,0.9956 +0.0941,0.0000,0.0000,0.9956 +0.0785,0.0000,0.0000,0.9969 +0.0785,0.0000,0.0000,0.9969 +0.0785,0.0000,0.0000,0.9969 +0.0785,0.0000,0.0000,0.9969 +0.0628,0.0000,0.0000,0.9980 +0.0628,0.0000,0.0000,0.9980 +0.0628,0.0000,0.0000,0.9980 +0.0628,0.0000,0.0000,0.9980 +0.0471,0.0000,0.0000,0.9989 +0.0471,0.0000,0.0000,0.9989 +0.0471,0.0000,0.0000,0.9989 +0.0471,0.0000,0.0000,0.9989 +0.0314,0.0000,0.0000,0.9995 +0.0314,0.0000,0.0000,0.9995 +0.0314,0.0000,0.0000,0.9995 +0.0314,0.0000,0.0000,0.9995 +0.0157,0.0000,0.0000,0.9999 +0.0157,0.0000,0.0000,0.9999 +0.0157,0.0000,0.0000,0.9999 +0.0157,0.0000,0.0000,0.9999 +-0.0000,0.0000,0.0000,1.0000 +-0.0000,0.0000,0.0000,1.0000 +-0.0000,0.0000,0.0000,1.0000 +-0.0000,0.0000,0.0000,1.0000 +-0.0157,0.0000,0.0000,0.9999 +-0.0157,0.0000,0.0000,0.9999 +-0.0157,0.0000,0.0000,0.9999 +-0.0157,0.0000,0.0000,0.9999 +-0.0314,0.0000,0.0000,0.9995 +-0.0314,0.0000,0.0000,0.9995 +-0.0314,0.0000,0.0000,0.9995 +-0.0314,0.0000,0.0000,0.9995 +-0.0471,0.0000,0.0000,0.9989 +-0.0471,0.0000,0.0000,0.9989 +-0.0471,0.0000,0.0000,0.9989 +-0.0471,0.0000,0.0000,0.9989 +-0.0628,0.0000,0.0000,0.9980 +-0.0628,0.0000,0.0000,0.9980 +-0.0628,0.0000,0.0000,0.9980 +-0.0628,0.0000,0.0000,0.9980 +-0.0785,0.0000,0.0000,0.9969 +-0.0785,0.0000,0.0000,0.9969 +-0.0785,0.0000,0.0000,0.9969 +-0.0785,0.0000,0.0000,0.9969 +-0.0941,0.0000,0.0000,0.9956 +-0.0941,0.0000,0.0000,0.9956 +-0.0941,0.0000,0.0000,0.9956 +-0.0941,0.0000,0.0000,0.9956 +-0.1097,0.0000,0.0000,0.9940 +-0.1097,0.0000,0.0000,0.9940 +-0.1097,0.0000,0.0000,0.9940 +-0.1097,0.0000,0.0000,0.9940 +-0.1253,0.0000,0.0000,0.9921 +-0.1253,0.0000,0.0000,0.9921 +-0.1253,0.0000,0.0000,0.9921 +-0.1253,0.0000,0.0000,0.9921 +-0.1409,0.0000,0.0000,0.9900 +-0.1409,0.0000,0.0000,0.9900 +-0.1409,0.0000,0.0000,0.9900 +-0.1409,0.0000,0.0000,0.9900 +-0.1564,0.0000,0.0000,0.9877 +-0.1564,0.0000,0.0000,0.9877 +-0.1564,0.0000,0.0000,0.9877 +-0.1564,0.0000,0.0000,0.9877 +-0.1719,0.0000,0.0000,0.9851 +-0.1719,0.0000,0.0000,0.9851 +-0.1719,0.0000,0.0000,0.9851 +-0.1719,0.0000,0.0000,0.9851 +-0.1874,0.0000,0.0000,0.9823 +-0.1874,0.0000,0.0000,0.9823 +-0.1874,0.0000,0.0000,0.9823 +-0.1874,0.0000,0.0000,0.9823 +-0.2028,0.0000,0.0000,0.9792 +-0.2028,0.0000,0.0000,0.9792 +-0.2028,0.0000,0.0000,0.9792 +-0.2028,0.0000,0.0000,0.9792 +-0.2181,0.0000,0.0000,0.9759 +-0.2181,0.0000,0.0000,0.9759 +-0.2181,0.0000,0.0000,0.9759 +-0.2181,0.0000,0.0000,0.9759 +-0.2334,0.0000,0.0000,0.9724 +-0.2334,0.0000,0.0000,0.9724 +-0.2334,0.0000,0.0000,0.9724 +-0.2334,0.0000,0.0000,0.9724 +-0.2487,0.0000,0.0000,0.9686 +-0.2487,0.0000,0.0000,0.9686 +-0.2487,0.0000,0.0000,0.9686 +-0.2487,0.0000,0.0000,0.9686 +-0.2639,0.0000,0.0000,0.9646 +-0.2639,0.0000,0.0000,0.9646 +-0.2639,0.0000,0.0000,0.9646 +-0.2639,0.0000,0.0000,0.9646 +-0.2790,0.0000,0.0000,0.9603 +-0.2790,0.0000,0.0000,0.9603 +-0.2790,0.0000,0.0000,0.9603 +-0.2790,0.0000,0.0000,0.9603 +-0.2940,0.0000,0.0000,0.9558 +-0.2940,0.0000,0.0000,0.9558 +-0.2940,0.0000,0.0000,0.9558 +-0.2940,0.0000,0.0000,0.9558 +-0.3090,0.0000,0.0000,0.9511 +-0.3090,0.0000,0.0000,0.9511 +-0.3090,0.0000,0.0000,0.9511 +-0.3090,0.0000,0.0000,0.9511 +-0.3239,0.0000,0.0000,0.9461 +-0.3239,0.0000,0.0000,0.9461 +-0.3239,0.0000,0.0000,0.9461 +-0.3239,0.0000,0.0000,0.9461 +-0.3387,0.0000,0.0000,0.9409 +-0.3387,0.0000,0.0000,0.9409 +-0.3387,0.0000,0.0000,0.9409 +-0.3387,0.0000,0.0000,0.9409 +-0.3535,0.0000,0.0000,0.9354 +-0.3535,0.0000,0.0000,0.9354 +-0.3535,0.0000,0.0000,0.9354 +-0.3535,0.0000,0.0000,0.9354 +-0.3681,0.0000,0.0000,0.9298 +-0.3681,0.0000,0.0000,0.9298 +-0.3681,0.0000,0.0000,0.9298 +-0.3681,0.0000,0.0000,0.9298 +-0.3827,0.0000,0.0000,0.9239 +-0.3827,0.0000,0.0000,0.9239 +-0.3827,0.0000,0.0000,0.9239 +-0.3827,0.0000,0.0000,0.9239 +-0.3971,0.0000,0.0000,0.9178 +-0.3971,0.0000,0.0000,0.9178 +-0.3971,0.0000,0.0000,0.9178 +-0.3971,0.0000,0.0000,0.9178 +-0.4115,0.0000,0.0000,0.9114 +-0.4115,0.0000,0.0000,0.9114 +-0.4115,0.0000,0.0000,0.9114 +-0.4115,0.0000,0.0000,0.9114 +-0.4258,0.0000,0.0000,0.9048 +-0.4258,0.0000,0.0000,0.9048 +-0.4258,0.0000,0.0000,0.9048 +-0.4258,0.0000,0.0000,0.9048 +-0.4399,0.0000,0.0000,0.8980 +-0.4399,0.0000,0.0000,0.8980 +-0.4399,0.0000,0.0000,0.8980 +-0.4399,0.0000,0.0000,0.8980 +-0.4540,0.0000,0.0000,0.8910 +-0.4540,0.0000,0.0000,0.8910 +-0.4540,0.0000,0.0000,0.8910 +-0.4540,0.0000,0.0000,0.8910 +-0.4679,0.0000,0.0000,0.8838 +-0.4679,0.0000,0.0000,0.8838 +-0.4679,0.0000,0.0000,0.8838 +-0.4679,0.0000,0.0000,0.8838 +-0.4818,0.0000,0.0000,0.8763 +-0.4818,0.0000,0.0000,0.8763 +-0.4818,0.0000,0.0000,0.8763 +-0.4818,0.0000,0.0000,0.8763 +-0.4955,0.0000,0.0000,0.8686 +-0.4955,0.0000,0.0000,0.8686 +-0.4955,0.0000,0.0000,0.8686 +-0.4955,0.0000,0.0000,0.8686 +-0.5090,0.0000,0.0000,0.8607 +-0.5090,0.0000,0.0000,0.8607 +-0.5090,0.0000,0.0000,0.8607 +-0.5090,0.0000,0.0000,0.8607 +-0.5225,0.0000,0.0000,0.8526 +-0.5225,0.0000,0.0000,0.8526 +-0.5225,0.0000,0.0000,0.8526 +-0.5225,0.0000,0.0000,0.8526 +-0.5358,0.0000,0.0000,0.8443 +-0.5358,0.0000,0.0000,0.8443 +-0.5358,0.0000,0.0000,0.8443 +-0.5358,0.0000,0.0000,0.8443 +-0.5490,0.0000,0.0000,0.8358 +-0.5490,0.0000,0.0000,0.8358 +-0.5490,0.0000,0.0000,0.8358 +-0.5490,0.0000,0.0000,0.8358 +-0.5621,0.0000,0.0000,0.8271 +-0.5621,0.0000,0.0000,0.8271 +-0.5621,0.0000,0.0000,0.8271 +-0.5621,0.0000,0.0000,0.8271 +-0.5750,0.0000,0.0000,0.8181 +-0.5750,0.0000,0.0000,0.8181 +-0.5750,0.0000,0.0000,0.8181 +-0.5750,0.0000,0.0000,0.8181 +-0.5878,0.0000,0.0000,0.8090 +-0.5878,0.0000,0.0000,0.8090 +-0.5878,0.0000,0.0000,0.8090 +-0.5878,0.0000,0.0000,0.8090 +-0.6004,0.0000,0.0000,0.7997 +-0.6004,0.0000,0.0000,0.7997 +-0.6004,0.0000,0.0000,0.7997 +-0.6004,0.0000,0.0000,0.7997 +-0.6129,0.0000,0.0000,0.7902 +-0.6129,0.0000,0.0000,0.7902 +-0.6129,0.0000,0.0000,0.7902 +-0.6129,0.0000,0.0000,0.7902 +-0.6252,0.0000,0.0000,0.7804 +-0.6252,0.0000,0.0000,0.7804 +-0.6252,0.0000,0.0000,0.7804 +-0.6252,0.0000,0.0000,0.7804 +-0.6374,0.0000,0.0000,0.7705 +-0.6374,0.0000,0.0000,0.7705 +-0.6374,0.0000,0.0000,0.7705 +-0.6374,0.0000,0.0000,0.7705 +-0.6494,0.0000,0.0000,0.7604 +-0.6494,0.0000,0.0000,0.7604 +-0.6494,0.0000,0.0000,0.7604 +-0.6494,0.0000,0.0000,0.7604 +-0.6613,0.0000,0.0000,0.7501 +-0.6613,0.0000,0.0000,0.7501 +-0.6613,0.0000,0.0000,0.7501 +-0.6613,0.0000,0.0000,0.7501 +-0.6730,0.0000,0.0000,0.7396 +-0.6730,0.0000,0.0000,0.7396 +-0.6730,0.0000,0.0000,0.7396 +-0.6730,0.0000,0.0000,0.7396 +-0.6845,0.0000,0.0000,0.7290 +-0.6845,0.0000,0.0000,0.7290 +-0.6845,0.0000,0.0000,0.7290 +-0.6845,0.0000,0.0000,0.7290 +-0.6959,0.0000,0.0000,0.7181 +-0.6959,0.0000,0.0000,0.7181 +-0.6959,0.0000,0.0000,0.7181 +-0.6959,0.0000,0.0000,0.7181 +-0.7071,0.0000,0.0000,0.7071 +-0.7071,0.0000,0.0000,0.7071 +-0.7071,0.0000,0.0000,0.7071 +-0.7071,0.0000,0.0000,0.7071 +-0.7181,0.0000,0.0000,0.6959 +-0.7181,0.0000,0.0000,0.6959 +-0.7181,0.0000,0.0000,0.6959 +-0.7181,0.0000,0.0000,0.6959 +-0.7290,0.0000,0.0000,0.6845 +-0.7290,0.0000,0.0000,0.6845 +-0.7290,0.0000,0.0000,0.6845 +-0.7290,0.0000,0.0000,0.6845 +-0.7396,0.0000,0.0000,0.6730 +-0.7396,0.0000,0.0000,0.6730 +-0.7396,0.0000,0.0000,0.6730 +-0.7396,0.0000,0.0000,0.6730 +-0.7501,0.0000,0.0000,0.6613 +-0.7501,0.0000,0.0000,0.6613 +-0.7501,0.0000,0.0000,0.6613 +-0.7501,0.0000,0.0000,0.6613 +-0.7604,0.0000,0.0000,0.6494 +-0.7604,0.0000,0.0000,0.6494 +-0.7604,0.0000,0.0000,0.6494 +-0.7604,0.0000,0.0000,0.6494 +-0.7705,0.0000,0.0000,0.6374 +-0.7705,0.0000,0.0000,0.6374 +-0.7705,0.0000,0.0000,0.6374 +-0.7705,0.0000,0.0000,0.6374 +-0.7804,0.0000,0.0000,0.6252 +-0.7804,0.0000,0.0000,0.6252 +-0.7804,0.0000,0.0000,0.6252 +-0.7804,0.0000,0.0000,0.6252 +-0.7902,0.0000,0.0000,0.6129 +-0.7902,0.0000,0.0000,0.6129 +-0.7902,0.0000,0.0000,0.6129 +-0.7902,0.0000,0.0000,0.6129 +-0.7997,0.0000,0.0000,0.6004 +-0.7997,0.0000,0.0000,0.6004 +-0.7997,0.0000,0.0000,0.6004 +-0.7997,0.0000,0.0000,0.6004 +-0.8090,0.0000,0.0000,0.5878 +-0.8090,0.0000,0.0000,0.5878 +-0.8090,0.0000,0.0000,0.5878 +-0.8090,0.0000,0.0000,0.5878 +-0.8182,0.0000,0.0000,0.5750 +-0.8182,0.0000,0.0000,0.5750 +-0.8182,0.0000,0.0000,0.5750 +-0.8182,0.0000,0.0000,0.5750 +-0.8271,0.0000,0.0000,0.5621 +-0.8271,0.0000,0.0000,0.5621 +-0.8271,0.0000,0.0000,0.5621 +-0.8271,0.0000,0.0000,0.5621 +-0.8358,0.0000,0.0000,0.5490 +-0.8358,0.0000,0.0000,0.5490 +-0.8358,0.0000,0.0000,0.5490 +-0.8358,0.0000,0.0000,0.5490 +-0.8443,0.0000,0.0000,0.5358 +-0.8443,0.0000,0.0000,0.5358 +-0.8443,0.0000,0.0000,0.5358 +-0.8443,0.0000,0.0000,0.5358 +-0.8526,0.0000,0.0000,0.5225 +-0.8526,0.0000,0.0000,0.5225 +-0.8526,0.0000,0.0000,0.5225 +-0.8526,0.0000,0.0000,0.5225 +-0.8607,0.0000,0.0000,0.5090 +-0.8607,0.0000,0.0000,0.5090 +-0.8607,0.0000,0.0000,0.5090 +-0.8607,0.0000,0.0000,0.5090 +-0.8686,0.0000,0.0000,0.4955 +-0.8686,0.0000,0.0000,0.4955 +-0.8686,0.0000,0.0000,0.4955 +-0.8686,0.0000,0.0000,0.4955 +-0.8763,0.0000,0.0000,0.4818 +-0.8763,0.0000,0.0000,0.4818 +-0.8763,0.0000,0.0000,0.4818 +-0.8763,0.0000,0.0000,0.4818 +-0.8838,0.0000,0.0000,0.4679 +-0.8838,0.0000,0.0000,0.4679 +-0.8838,0.0000,0.0000,0.4679 +-0.8838,0.0000,0.0000,0.4679 +-0.8910,0.0000,0.0000,0.4540 +-0.8910,0.0000,0.0000,0.4540 +-0.8910,0.0000,0.0000,0.4540 +-0.8910,0.0000,0.0000,0.4540 +-0.8980,0.0000,0.0000,0.4399 +-0.8980,0.0000,0.0000,0.4399 +-0.8980,0.0000,0.0000,0.4399 +-0.8980,0.0000,0.0000,0.4399 +-0.9048,0.0000,0.0000,0.4258 +-0.9048,0.0000,0.0000,0.4258 +-0.9048,0.0000,0.0000,0.4258 +-0.9048,0.0000,0.0000,0.4258 +-0.9114,0.0000,0.0000,0.4115 +-0.9114,0.0000,0.0000,0.4115 +-0.9114,0.0000,0.0000,0.4115 +-0.9114,0.0000,0.0000,0.4115 +-0.9178,0.0000,0.0000,0.3971 +-0.9178,0.0000,0.0000,0.3971 +-0.9178,0.0000,0.0000,0.3971 +-0.9178,0.0000,0.0000,0.3971 +-0.9239,0.0000,0.0000,0.3827 +-0.9239,0.0000,0.0000,0.3827 +-0.9239,0.0000,0.0000,0.3827 +-0.9239,0.0000,0.0000,0.3827 +-0.9298,0.0000,0.0000,0.3681 +-0.9298,0.0000,0.0000,0.3681 +-0.9298,0.0000,0.0000,0.3681 +-0.9298,0.0000,0.0000,0.3681 +-0.9354,0.0000,0.0000,0.3535 +-0.9354,0.0000,0.0000,0.3535 +-0.9354,0.0000,0.0000,0.3535 +-0.9354,0.0000,0.0000,0.3535 +-0.9409,0.0000,0.0000,0.3387 +-0.9409,0.0000,0.0000,0.3387 +-0.9409,0.0000,0.0000,0.3387 +-0.9409,0.0000,0.0000,0.3387 +-0.9461,0.0000,0.0000,0.3239 +-0.9461,0.0000,0.0000,0.3239 +-0.9461,0.0000,0.0000,0.3239 +-0.9461,0.0000,0.0000,0.3239 +-0.9511,0.0000,0.0000,0.3090 +-0.9511,0.0000,0.0000,0.3090 +-0.9511,0.0000,0.0000,0.3090 +-0.9511,0.0000,0.0000,0.3090 +-0.9558,0.0000,0.0000,0.2940 +-0.9558,0.0000,0.0000,0.2940 +-0.9558,0.0000,0.0000,0.2940 +-0.9558,0.0000,0.0000,0.2940 +-0.9603,0.0000,0.0000,0.2790 +-0.9603,0.0000,0.0000,0.2790 +-0.9603,0.0000,0.0000,0.2790 +-0.9603,0.0000,0.0000,0.2790 +-0.9646,0.0000,0.0000,0.2639 +-0.9646,0.0000,0.0000,0.2639 +-0.9646,0.0000,0.0000,0.2639 +-0.9646,0.0000,0.0000,0.2639 +-0.9686,0.0000,0.0000,0.2487 +-0.9686,0.0000,0.0000,0.2487 +-0.9686,0.0000,0.0000,0.2487 +-0.9686,0.0000,0.0000,0.2487 +-0.9724,0.0000,0.0000,0.2334 +-0.9724,0.0000,0.0000,0.2334 +-0.9724,0.0000,0.0000,0.2334 +-0.9724,0.0000,0.0000,0.2334 +-0.9759,0.0000,0.0000,0.2181 +-0.9759,0.0000,0.0000,0.2181 +-0.9759,0.0000,0.0000,0.2181 +-0.9759,0.0000,0.0000,0.2181 +-0.9792,0.0000,0.0000,0.2028 +-0.9792,0.0000,0.0000,0.2028 +-0.9792,0.0000,0.0000,0.2028 +-0.9792,0.0000,0.0000,0.2028 +-0.9823,0.0000,0.0000,0.1874 +-0.9823,0.0000,0.0000,0.1874 +-0.9823,0.0000,0.0000,0.1874 +-0.9823,0.0000,0.0000,0.1874 +-0.9851,0.0000,0.0000,0.1719 +-0.9851,0.0000,0.0000,0.1719 +-0.9851,0.0000,0.0000,0.1719 +-0.9851,0.0000,0.0000,0.1719 +-0.9877,0.0000,0.0000,0.1564 +-0.9877,0.0000,0.0000,0.1564 +-0.9877,0.0000,0.0000,0.1564 +-0.9877,0.0000,0.0000,0.1564 +-0.9900,0.0000,0.0000,0.1409 +-0.9900,0.0000,0.0000,0.1409 +-0.9900,0.0000,0.0000,0.1409 +-0.9900,0.0000,0.0000,0.1409 +-0.9921,0.0000,0.0000,0.1253 +-0.9921,0.0000,0.0000,0.1253 +-0.9921,0.0000,0.0000,0.1253 +-0.9921,0.0000,0.0000,0.1253 +-0.9940,0.0000,0.0000,0.1097 +-0.9940,0.0000,0.0000,0.1097 +-0.9940,0.0000,0.0000,0.1097 +-0.9940,0.0000,0.0000,0.1097 +-0.9956,0.0000,0.0000,0.0941 +-0.9956,0.0000,0.0000,0.0941 +-0.9956,0.0000,0.0000,0.0941 +-0.9956,0.0000,0.0000,0.0941 +-0.9969,0.0000,0.0000,0.0785 +-0.9969,0.0000,0.0000,0.0785 +-0.9969,0.0000,0.0000,0.0785 +-0.9969,0.0000,0.0000,0.0785 +-0.9980,0.0000,0.0000,0.0628 +-0.9980,0.0000,0.0000,0.0628 +-0.9980,0.0000,0.0000,0.0628 +-0.9980,0.0000,0.0000,0.0628 +-0.9989,0.0000,0.0000,0.0471 +-0.9989,0.0000,0.0000,0.0471 +-0.9989,0.0000,0.0000,0.0471 +-0.9989,0.0000,0.0000,0.0471 +-0.9995,0.0000,0.0000,0.0314 +-0.9995,0.0000,0.0000,0.0314 +-0.9995,0.0000,0.0000,0.0314 +-0.9995,0.0000,0.0000,0.0314 +-0.9999,0.0000,0.0000,0.0157 +-0.9999,0.0000,0.0000,0.0157 +-0.9999,0.0000,0.0000,0.0157 +-0.9999,0.0000,0.0000,0.0157 +1.0000,0.0000,0.0000,0.0000 +1.0000,0.0000,0.0000,0.0000 +1.0000,0.0000,0.0000,0.0000 +1.0000,0.0000,0.0000,0.0000 diff --git a/scripts/trajectories/full-circle-4s.csv b/scripts/trajectories/full-circle-4s.csv new file mode 100644 index 0000000000000000000000000000000000000000..4174a531b7e4b7ed785105d18fcfe2d5d195c035 --- /dev/null +++ b/scripts/trajectories/full-circle-4s.csv @@ -0,0 +1,800 @@ +0.9999,0.0000,0.0000,-0.0157 +0.9999,0.0000,0.0000,-0.0157 +0.9999,0.0000,0.0000,-0.0157 +0.9999,0.0000,0.0000,-0.0157 +0.9995,0.0000,0.0000,-0.0314 +0.9995,0.0000,0.0000,-0.0314 +0.9995,0.0000,0.0000,-0.0314 +0.9995,0.0000,0.0000,-0.0314 +0.9989,0.0000,0.0000,-0.0471 +0.9989,0.0000,0.0000,-0.0471 +0.9989,0.0000,0.0000,-0.0471 +0.9989,0.0000,0.0000,-0.0471 +0.9980,0.0000,0.0000,-0.0628 +0.9980,0.0000,0.0000,-0.0628 +0.9980,0.0000,0.0000,-0.0628 +0.9980,0.0000,0.0000,-0.0628 +0.9969,0.0000,0.0000,-0.0785 +0.9969,0.0000,0.0000,-0.0785 +0.9969,0.0000,0.0000,-0.0785 +0.9969,0.0000,0.0000,-0.0785 +0.9956,0.0000,0.0000,-0.0941 +0.9956,0.0000,0.0000,-0.0941 +0.9956,0.0000,0.0000,-0.0941 +0.9956,0.0000,0.0000,-0.0941 +0.9940,0.0000,0.0000,-0.1097 +0.9940,0.0000,0.0000,-0.1097 +0.9940,0.0000,0.0000,-0.1097 +0.9940,0.0000,0.0000,-0.1097 +0.9921,0.0000,0.0000,-0.1253 +0.9921,0.0000,0.0000,-0.1253 +0.9921,0.0000,0.0000,-0.1253 +0.9921,0.0000,0.0000,-0.1253 +0.9900,0.0000,0.0000,-0.1409 +0.9900,0.0000,0.0000,-0.1409 +0.9900,0.0000,0.0000,-0.1409 +0.9900,0.0000,0.0000,-0.1409 +0.9877,0.0000,0.0000,-0.1564 +0.9877,0.0000,0.0000,-0.1564 +0.9877,0.0000,0.0000,-0.1564 +0.9877,0.0000,0.0000,-0.1564 +0.9851,0.0000,0.0000,-0.1719 +0.9851,0.0000,0.0000,-0.1719 +0.9851,0.0000,0.0000,-0.1719 +0.9851,0.0000,0.0000,-0.1719 +0.9823,0.0000,0.0000,-0.1874 +0.9823,0.0000,0.0000,-0.1874 +0.9823,0.0000,0.0000,-0.1874 +0.9823,0.0000,0.0000,-0.1874 +0.9792,0.0000,0.0000,-0.2028 +0.9792,0.0000,0.0000,-0.2028 +0.9792,0.0000,0.0000,-0.2028 +0.9792,0.0000,0.0000,-0.2028 +0.9759,0.0000,0.0000,-0.2181 +0.9759,0.0000,0.0000,-0.2181 +0.9759,0.0000,0.0000,-0.2181 +0.9759,0.0000,0.0000,-0.2181 +0.9724,0.0000,0.0000,-0.2334 +0.9724,0.0000,0.0000,-0.2334 +0.9724,0.0000,0.0000,-0.2334 +0.9724,0.0000,0.0000,-0.2334 +0.9686,0.0000,0.0000,-0.2487 +0.9686,0.0000,0.0000,-0.2487 +0.9686,0.0000,0.0000,-0.2487 +0.9686,0.0000,0.0000,-0.2487 +0.9646,0.0000,0.0000,-0.2639 +0.9646,0.0000,0.0000,-0.2639 +0.9646,0.0000,0.0000,-0.2639 +0.9646,0.0000,0.0000,-0.2639 +0.9603,0.0000,0.0000,-0.2790 +0.9603,0.0000,0.0000,-0.2790 +0.9603,0.0000,0.0000,-0.2790 +0.9603,0.0000,0.0000,-0.2790 +0.9558,0.0000,0.0000,-0.2940 +0.9558,0.0000,0.0000,-0.2940 +0.9558,0.0000,0.0000,-0.2940 +0.9558,0.0000,0.0000,-0.2940 +0.9511,0.0000,0.0000,-0.3090 +0.9511,0.0000,0.0000,-0.3090 +0.9511,0.0000,0.0000,-0.3090 +0.9511,0.0000,0.0000,-0.3090 +0.9461,0.0000,0.0000,-0.3239 +0.9461,0.0000,0.0000,-0.3239 +0.9461,0.0000,0.0000,-0.3239 +0.9461,0.0000,0.0000,-0.3239 +0.9409,0.0000,0.0000,-0.3387 +0.9409,0.0000,0.0000,-0.3387 +0.9409,0.0000,0.0000,-0.3387 +0.9409,0.0000,0.0000,-0.3387 +0.9354,0.0000,0.0000,-0.3535 +0.9354,0.0000,0.0000,-0.3535 +0.9354,0.0000,0.0000,-0.3535 +0.9354,0.0000,0.0000,-0.3535 +0.9298,0.0000,0.0000,-0.3681 +0.9298,0.0000,0.0000,-0.3681 +0.9298,0.0000,0.0000,-0.3681 +0.9298,0.0000,0.0000,-0.3681 +0.9239,0.0000,0.0000,-0.3827 +0.9239,0.0000,0.0000,-0.3827 +0.9239,0.0000,0.0000,-0.3827 +0.9239,0.0000,0.0000,-0.3827 +0.9178,0.0000,0.0000,-0.3971 +0.9178,0.0000,0.0000,-0.3971 +0.9178,0.0000,0.0000,-0.3971 +0.9178,0.0000,0.0000,-0.3971 +0.9114,0.0000,0.0000,-0.4115 +0.9114,0.0000,0.0000,-0.4115 +0.9114,0.0000,0.0000,-0.4115 +0.9114,0.0000,0.0000,-0.4115 +0.9048,0.0000,0.0000,-0.4258 +0.9048,0.0000,0.0000,-0.4258 +0.9048,0.0000,0.0000,-0.4258 +0.9048,0.0000,0.0000,-0.4258 +0.8980,0.0000,0.0000,-0.4399 +0.8980,0.0000,0.0000,-0.4399 +0.8980,0.0000,0.0000,-0.4399 +0.8980,0.0000,0.0000,-0.4399 +0.8910,0.0000,0.0000,-0.4540 +0.8910,0.0000,0.0000,-0.4540 +0.8910,0.0000,0.0000,-0.4540 +0.8910,0.0000,0.0000,-0.4540 +0.8838,0.0000,0.0000,-0.4679 +0.8838,0.0000,0.0000,-0.4679 +0.8838,0.0000,0.0000,-0.4679 +0.8838,0.0000,0.0000,-0.4679 +0.8763,0.0000,0.0000,-0.4818 +0.8763,0.0000,0.0000,-0.4818 +0.8763,0.0000,0.0000,-0.4818 +0.8763,0.0000,0.0000,-0.4818 +0.8686,0.0000,0.0000,-0.4955 +0.8686,0.0000,0.0000,-0.4955 +0.8686,0.0000,0.0000,-0.4955 +0.8686,0.0000,0.0000,-0.4955 +0.8607,0.0000,0.0000,-0.5090 +0.8607,0.0000,0.0000,-0.5090 +0.8607,0.0000,0.0000,-0.5090 +0.8607,0.0000,0.0000,-0.5090 +0.8526,0.0000,0.0000,-0.5225 +0.8526,0.0000,0.0000,-0.5225 +0.8526,0.0000,0.0000,-0.5225 +0.8526,0.0000,0.0000,-0.5225 +0.8443,0.0000,0.0000,-0.5358 +0.8443,0.0000,0.0000,-0.5358 +0.8443,0.0000,0.0000,-0.5358 +0.8443,0.0000,0.0000,-0.5358 +0.8358,0.0000,0.0000,-0.5490 +0.8358,0.0000,0.0000,-0.5490 +0.8358,0.0000,0.0000,-0.5490 +0.8358,0.0000,0.0000,-0.5490 +0.8271,0.0000,0.0000,-0.5621 +0.8271,0.0000,0.0000,-0.5621 +0.8271,0.0000,0.0000,-0.5621 +0.8271,0.0000,0.0000,-0.5621 +0.8181,0.0000,0.0000,-0.5750 +0.8181,0.0000,0.0000,-0.5750 +0.8181,0.0000,0.0000,-0.5750 +0.8181,0.0000,0.0000,-0.5750 +0.8090,0.0000,0.0000,-0.5878 +0.8090,0.0000,0.0000,-0.5878 +0.8090,0.0000,0.0000,-0.5878 +0.8090,0.0000,0.0000,-0.5878 +0.7997,0.0000,0.0000,-0.6004 +0.7997,0.0000,0.0000,-0.6004 +0.7997,0.0000,0.0000,-0.6004 +0.7997,0.0000,0.0000,-0.6004 +0.7902,0.0000,0.0000,-0.6129 +0.7902,0.0000,0.0000,-0.6129 +0.7902,0.0000,0.0000,-0.6129 +0.7902,0.0000,0.0000,-0.6129 +0.7804,0.0000,0.0000,-0.6252 +0.7804,0.0000,0.0000,-0.6252 +0.7804,0.0000,0.0000,-0.6252 +0.7804,0.0000,0.0000,-0.6252 +0.7705,0.0000,0.0000,-0.6374 +0.7705,0.0000,0.0000,-0.6374 +0.7705,0.0000,0.0000,-0.6374 +0.7705,0.0000,0.0000,-0.6374 +0.7604,0.0000,0.0000,-0.6494 +0.7604,0.0000,0.0000,-0.6494 +0.7604,0.0000,0.0000,-0.6494 +0.7604,0.0000,0.0000,-0.6494 +0.7501,0.0000,0.0000,-0.6613 +0.7501,0.0000,0.0000,-0.6613 +0.7501,0.0000,0.0000,-0.6613 +0.7501,0.0000,0.0000,-0.6613 +0.7396,0.0000,0.0000,-0.6730 +0.7396,0.0000,0.0000,-0.6730 +0.7396,0.0000,0.0000,-0.6730 +0.7396,0.0000,0.0000,-0.6730 +0.7290,0.0000,0.0000,-0.6845 +0.7290,0.0000,0.0000,-0.6845 +0.7290,0.0000,0.0000,-0.6845 +0.7290,0.0000,0.0000,-0.6845 +0.7181,0.0000,0.0000,-0.6959 +0.7181,0.0000,0.0000,-0.6959 +0.7181,0.0000,0.0000,-0.6959 +0.7181,0.0000,0.0000,-0.6959 +0.7071,0.0000,0.0000,-0.7071 +0.7071,0.0000,0.0000,-0.7071 +0.7071,0.0000,0.0000,-0.7071 +0.7071,0.0000,0.0000,-0.7071 +0.6959,0.0000,0.0000,-0.7181 +0.6959,0.0000,0.0000,-0.7181 +0.6959,0.0000,0.0000,-0.7181 +0.6959,0.0000,0.0000,-0.7181 +0.6845,0.0000,0.0000,-0.7290 +0.6845,0.0000,0.0000,-0.7290 +0.6845,0.0000,0.0000,-0.7290 +0.6845,0.0000,0.0000,-0.7290 +0.6730,0.0000,0.0000,-0.7396 +0.6730,0.0000,0.0000,-0.7396 +0.6730,0.0000,0.0000,-0.7396 +0.6730,0.0000,0.0000,-0.7396 +0.6613,0.0000,0.0000,-0.7501 +0.6613,0.0000,0.0000,-0.7501 +0.6613,0.0000,0.0000,-0.7501 +0.6613,0.0000,0.0000,-0.7501 +0.6494,0.0000,0.0000,-0.7604 +0.6494,0.0000,0.0000,-0.7604 +0.6494,0.0000,0.0000,-0.7604 +0.6494,0.0000,0.0000,-0.7604 +0.6374,0.0000,0.0000,-0.7705 +0.6374,0.0000,0.0000,-0.7705 +0.6374,0.0000,0.0000,-0.7705 +0.6374,0.0000,0.0000,-0.7705 +0.6252,0.0000,0.0000,-0.7804 +0.6252,0.0000,0.0000,-0.7804 +0.6252,0.0000,0.0000,-0.7804 +0.6252,0.0000,0.0000,-0.7804 +0.6129,0.0000,0.0000,-0.7902 +0.6129,0.0000,0.0000,-0.7902 +0.6129,0.0000,0.0000,-0.7902 +0.6129,0.0000,0.0000,-0.7902 +0.6004,0.0000,0.0000,-0.7997 +0.6004,0.0000,0.0000,-0.7997 +0.6004,0.0000,0.0000,-0.7997 +0.6004,0.0000,0.0000,-0.7997 +0.5878,0.0000,0.0000,-0.8090 +0.5878,0.0000,0.0000,-0.8090 +0.5878,0.0000,0.0000,-0.8090 +0.5878,0.0000,0.0000,-0.8090 +0.5750,0.0000,0.0000,-0.8181 +0.5750,0.0000,0.0000,-0.8181 +0.5750,0.0000,0.0000,-0.8181 +0.5750,0.0000,0.0000,-0.8181 +0.5621,0.0000,0.0000,-0.8271 +0.5621,0.0000,0.0000,-0.8271 +0.5621,0.0000,0.0000,-0.8271 +0.5621,0.0000,0.0000,-0.8271 +0.5490,0.0000,0.0000,-0.8358 +0.5490,0.0000,0.0000,-0.8358 +0.5490,0.0000,0.0000,-0.8358 +0.5490,0.0000,0.0000,-0.8358 +0.5358,0.0000,0.0000,-0.8443 +0.5358,0.0000,0.0000,-0.8443 +0.5358,0.0000,0.0000,-0.8443 +0.5358,0.0000,0.0000,-0.8443 +0.5225,0.0000,0.0000,-0.8526 +0.5225,0.0000,0.0000,-0.8526 +0.5225,0.0000,0.0000,-0.8526 +0.5225,0.0000,0.0000,-0.8526 +0.5090,0.0000,0.0000,-0.8607 +0.5090,0.0000,0.0000,-0.8607 +0.5090,0.0000,0.0000,-0.8607 +0.5090,0.0000,0.0000,-0.8607 +0.4955,0.0000,0.0000,-0.8686 +0.4955,0.0000,0.0000,-0.8686 +0.4955,0.0000,0.0000,-0.8686 +0.4955,0.0000,0.0000,-0.8686 +0.4818,0.0000,0.0000,-0.8763 +0.4818,0.0000,0.0000,-0.8763 +0.4818,0.0000,0.0000,-0.8763 +0.4818,0.0000,0.0000,-0.8763 +0.4679,0.0000,0.0000,-0.8838 +0.4679,0.0000,0.0000,-0.8838 +0.4679,0.0000,0.0000,-0.8838 +0.4679,0.0000,0.0000,-0.8838 +0.4540,0.0000,0.0000,-0.8910 +0.4540,0.0000,0.0000,-0.8910 +0.4540,0.0000,0.0000,-0.8910 +0.4540,0.0000,0.0000,-0.8910 +0.4399,0.0000,0.0000,-0.8980 +0.4399,0.0000,0.0000,-0.8980 +0.4399,0.0000,0.0000,-0.8980 +0.4399,0.0000,0.0000,-0.8980 +0.4258,0.0000,0.0000,-0.9048 +0.4258,0.0000,0.0000,-0.9048 +0.4258,0.0000,0.0000,-0.9048 +0.4258,0.0000,0.0000,-0.9048 +0.4115,0.0000,0.0000,-0.9114 +0.4115,0.0000,0.0000,-0.9114 +0.4115,0.0000,0.0000,-0.9114 +0.4115,0.0000,0.0000,-0.9114 +0.3971,0.0000,0.0000,-0.9178 +0.3971,0.0000,0.0000,-0.9178 +0.3971,0.0000,0.0000,-0.9178 +0.3971,0.0000,0.0000,-0.9178 +0.3827,0.0000,0.0000,-0.9239 +0.3827,0.0000,0.0000,-0.9239 +0.3827,0.0000,0.0000,-0.9239 +0.3827,0.0000,0.0000,-0.9239 +0.3681,0.0000,0.0000,-0.9298 +0.3681,0.0000,0.0000,-0.9298 +0.3681,0.0000,0.0000,-0.9298 +0.3681,0.0000,0.0000,-0.9298 +0.3535,0.0000,0.0000,-0.9354 +0.3535,0.0000,0.0000,-0.9354 +0.3535,0.0000,0.0000,-0.9354 +0.3535,0.0000,0.0000,-0.9354 +0.3387,0.0000,0.0000,-0.9409 +0.3387,0.0000,0.0000,-0.9409 +0.3387,0.0000,0.0000,-0.9409 +0.3387,0.0000,0.0000,-0.9409 +0.3239,0.0000,0.0000,-0.9461 +0.3239,0.0000,0.0000,-0.9461 +0.3239,0.0000,0.0000,-0.9461 +0.3239,0.0000,0.0000,-0.9461 +0.3090,0.0000,0.0000,-0.9511 +0.3090,0.0000,0.0000,-0.9511 +0.3090,0.0000,0.0000,-0.9511 +0.3090,0.0000,0.0000,-0.9511 +0.2940,0.0000,0.0000,-0.9558 +0.2940,0.0000,0.0000,-0.9558 +0.2940,0.0000,0.0000,-0.9558 +0.2940,0.0000,0.0000,-0.9558 +0.2790,0.0000,0.0000,-0.9603 +0.2790,0.0000,0.0000,-0.9603 +0.2790,0.0000,0.0000,-0.9603 +0.2790,0.0000,0.0000,-0.9603 +0.2639,0.0000,0.0000,-0.9646 +0.2639,0.0000,0.0000,-0.9646 +0.2639,0.0000,0.0000,-0.9646 +0.2639,0.0000,0.0000,-0.9646 +0.2487,0.0000,0.0000,-0.9686 +0.2487,0.0000,0.0000,-0.9686 +0.2487,0.0000,0.0000,-0.9686 +0.2487,0.0000,0.0000,-0.9686 +0.2334,0.0000,0.0000,-0.9724 +0.2334,0.0000,0.0000,-0.9724 +0.2334,0.0000,0.0000,-0.9724 +0.2334,0.0000,0.0000,-0.9724 +0.2181,0.0000,0.0000,-0.9759 +0.2181,0.0000,0.0000,-0.9759 +0.2181,0.0000,0.0000,-0.9759 +0.2181,0.0000,0.0000,-0.9759 +0.2028,0.0000,0.0000,-0.9792 +0.2028,0.0000,0.0000,-0.9792 +0.2028,0.0000,0.0000,-0.9792 +0.2028,0.0000,0.0000,-0.9792 +0.1874,0.0000,0.0000,-0.9823 +0.1874,0.0000,0.0000,-0.9823 +0.1874,0.0000,0.0000,-0.9823 +0.1874,0.0000,0.0000,-0.9823 +0.1719,0.0000,0.0000,-0.9851 +0.1719,0.0000,0.0000,-0.9851 +0.1719,0.0000,0.0000,-0.9851 +0.1719,0.0000,0.0000,-0.9851 +0.1564,0.0000,0.0000,-0.9877 +0.1564,0.0000,0.0000,-0.9877 +0.1564,0.0000,0.0000,-0.9877 +0.1564,0.0000,0.0000,-0.9877 +0.1409,0.0000,0.0000,-0.9900 +0.1409,0.0000,0.0000,-0.9900 +0.1409,0.0000,0.0000,-0.9900 +0.1409,0.0000,0.0000,-0.9900 +0.1253,0.0000,0.0000,-0.9921 +0.1253,0.0000,0.0000,-0.9921 +0.1253,0.0000,0.0000,-0.9921 +0.1253,0.0000,0.0000,-0.9921 +0.1097,0.0000,0.0000,-0.9940 +0.1097,0.0000,0.0000,-0.9940 +0.1097,0.0000,0.0000,-0.9940 +0.1097,0.0000,0.0000,-0.9940 +0.0941,0.0000,0.0000,-0.9956 +0.0941,0.0000,0.0000,-0.9956 +0.0941,0.0000,0.0000,-0.9956 +0.0941,0.0000,0.0000,-0.9956 +0.0785,0.0000,0.0000,-0.9969 +0.0785,0.0000,0.0000,-0.9969 +0.0785,0.0000,0.0000,-0.9969 +0.0785,0.0000,0.0000,-0.9969 +0.0628,0.0000,0.0000,-0.9980 +0.0628,0.0000,0.0000,-0.9980 +0.0628,0.0000,0.0000,-0.9980 +0.0628,0.0000,0.0000,-0.9980 +0.0471,0.0000,0.0000,-0.9989 +0.0471,0.0000,0.0000,-0.9989 +0.0471,0.0000,0.0000,-0.9989 +0.0471,0.0000,0.0000,-0.9989 +0.0314,0.0000,0.0000,-0.9995 +0.0314,0.0000,0.0000,-0.9995 +0.0314,0.0000,0.0000,-0.9995 +0.0314,0.0000,0.0000,-0.9995 +0.0157,0.0000,0.0000,-0.9999 +0.0157,0.0000,0.0000,-0.9999 +0.0157,0.0000,0.0000,-0.9999 +0.0157,0.0000,0.0000,-0.9999 +-0.0000,0.0000,0.0000,-1.0000 +-0.0000,0.0000,0.0000,-1.0000 +-0.0000,0.0000,0.0000,-1.0000 +-0.0000,0.0000,0.0000,-1.0000 +-0.0157,0.0000,0.0000,-0.9999 +-0.0157,0.0000,0.0000,-0.9999 +-0.0157,0.0000,0.0000,-0.9999 +-0.0157,0.0000,0.0000,-0.9999 +-0.0314,0.0000,0.0000,-0.9995 +-0.0314,0.0000,0.0000,-0.9995 +-0.0314,0.0000,0.0000,-0.9995 +-0.0314,0.0000,0.0000,-0.9995 +-0.0471,0.0000,0.0000,-0.9989 +-0.0471,0.0000,0.0000,-0.9989 +-0.0471,0.0000,0.0000,-0.9989 +-0.0471,0.0000,0.0000,-0.9989 +-0.0628,0.0000,0.0000,-0.9980 +-0.0628,0.0000,0.0000,-0.9980 +-0.0628,0.0000,0.0000,-0.9980 +-0.0628,0.0000,0.0000,-0.9980 +-0.0785,0.0000,0.0000,-0.9969 +-0.0785,0.0000,0.0000,-0.9969 +-0.0785,0.0000,0.0000,-0.9969 +-0.0785,0.0000,0.0000,-0.9969 +-0.0941,0.0000,0.0000,-0.9956 +-0.0941,0.0000,0.0000,-0.9956 +-0.0941,0.0000,0.0000,-0.9956 +-0.0941,0.0000,0.0000,-0.9956 +-0.1097,0.0000,0.0000,-0.9940 +-0.1097,0.0000,0.0000,-0.9940 +-0.1097,0.0000,0.0000,-0.9940 +-0.1097,0.0000,0.0000,-0.9940 +-0.1253,0.0000,0.0000,-0.9921 +-0.1253,0.0000,0.0000,-0.9921 +-0.1253,0.0000,0.0000,-0.9921 +-0.1253,0.0000,0.0000,-0.9921 +-0.1409,0.0000,0.0000,-0.9900 +-0.1409,0.0000,0.0000,-0.9900 +-0.1409,0.0000,0.0000,-0.9900 +-0.1409,0.0000,0.0000,-0.9900 +-0.1564,0.0000,0.0000,-0.9877 +-0.1564,0.0000,0.0000,-0.9877 +-0.1564,0.0000,0.0000,-0.9877 +-0.1564,0.0000,0.0000,-0.9877 +-0.1719,0.0000,0.0000,-0.9851 +-0.1719,0.0000,0.0000,-0.9851 +-0.1719,0.0000,0.0000,-0.9851 +-0.1719,0.0000,0.0000,-0.9851 +-0.1874,0.0000,0.0000,-0.9823 +-0.1874,0.0000,0.0000,-0.9823 +-0.1874,0.0000,0.0000,-0.9823 +-0.1874,0.0000,0.0000,-0.9823 +-0.2028,0.0000,0.0000,-0.9792 +-0.2028,0.0000,0.0000,-0.9792 +-0.2028,0.0000,0.0000,-0.9792 +-0.2028,0.0000,0.0000,-0.9792 +-0.2181,0.0000,0.0000,-0.9759 +-0.2181,0.0000,0.0000,-0.9759 +-0.2181,0.0000,0.0000,-0.9759 +-0.2181,0.0000,0.0000,-0.9759 +-0.2334,0.0000,0.0000,-0.9724 +-0.2334,0.0000,0.0000,-0.9724 +-0.2334,0.0000,0.0000,-0.9724 +-0.2334,0.0000,0.0000,-0.9724 +-0.2487,0.0000,0.0000,-0.9686 +-0.2487,0.0000,0.0000,-0.9686 +-0.2487,0.0000,0.0000,-0.9686 +-0.2487,0.0000,0.0000,-0.9686 +-0.2639,0.0000,0.0000,-0.9646 +-0.2639,0.0000,0.0000,-0.9646 +-0.2639,0.0000,0.0000,-0.9646 +-0.2639,0.0000,0.0000,-0.9646 +-0.2790,0.0000,0.0000,-0.9603 +-0.2790,0.0000,0.0000,-0.9603 +-0.2790,0.0000,0.0000,-0.9603 +-0.2790,0.0000,0.0000,-0.9603 +-0.2940,0.0000,0.0000,-0.9558 +-0.2940,0.0000,0.0000,-0.9558 +-0.2940,0.0000,0.0000,-0.9558 +-0.2940,0.0000,0.0000,-0.9558 +-0.3090,0.0000,0.0000,-0.9511 +-0.3090,0.0000,0.0000,-0.9511 +-0.3090,0.0000,0.0000,-0.9511 +-0.3090,0.0000,0.0000,-0.9511 +-0.3239,0.0000,0.0000,-0.9461 +-0.3239,0.0000,0.0000,-0.9461 +-0.3239,0.0000,0.0000,-0.9461 +-0.3239,0.0000,0.0000,-0.9461 +-0.3387,0.0000,0.0000,-0.9409 +-0.3387,0.0000,0.0000,-0.9409 +-0.3387,0.0000,0.0000,-0.9409 +-0.3387,0.0000,0.0000,-0.9409 +-0.3535,0.0000,0.0000,-0.9354 +-0.3535,0.0000,0.0000,-0.9354 +-0.3535,0.0000,0.0000,-0.9354 +-0.3535,0.0000,0.0000,-0.9354 +-0.3681,0.0000,0.0000,-0.9298 +-0.3681,0.0000,0.0000,-0.9298 +-0.3681,0.0000,0.0000,-0.9298 +-0.3681,0.0000,0.0000,-0.9298 +-0.3827,0.0000,0.0000,-0.9239 +-0.3827,0.0000,0.0000,-0.9239 +-0.3827,0.0000,0.0000,-0.9239 +-0.3827,0.0000,0.0000,-0.9239 +-0.3971,0.0000,0.0000,-0.9178 +-0.3971,0.0000,0.0000,-0.9178 +-0.3971,0.0000,0.0000,-0.9178 +-0.3971,0.0000,0.0000,-0.9178 +-0.4115,0.0000,0.0000,-0.9114 +-0.4115,0.0000,0.0000,-0.9114 +-0.4115,0.0000,0.0000,-0.9114 +-0.4115,0.0000,0.0000,-0.9114 +-0.4258,0.0000,0.0000,-0.9048 +-0.4258,0.0000,0.0000,-0.9048 +-0.4258,0.0000,0.0000,-0.9048 +-0.4258,0.0000,0.0000,-0.9048 +-0.4399,0.0000,0.0000,-0.8980 +-0.4399,0.0000,0.0000,-0.8980 +-0.4399,0.0000,0.0000,-0.8980 +-0.4399,0.0000,0.0000,-0.8980 +-0.4540,0.0000,0.0000,-0.8910 +-0.4540,0.0000,0.0000,-0.8910 +-0.4540,0.0000,0.0000,-0.8910 +-0.4540,0.0000,0.0000,-0.8910 +-0.4679,0.0000,0.0000,-0.8838 +-0.4679,0.0000,0.0000,-0.8838 +-0.4679,0.0000,0.0000,-0.8838 +-0.4679,0.0000,0.0000,-0.8838 +-0.4818,0.0000,0.0000,-0.8763 +-0.4818,0.0000,0.0000,-0.8763 +-0.4818,0.0000,0.0000,-0.8763 +-0.4818,0.0000,0.0000,-0.8763 +-0.4955,0.0000,0.0000,-0.8686 +-0.4955,0.0000,0.0000,-0.8686 +-0.4955,0.0000,0.0000,-0.8686 +-0.4955,0.0000,0.0000,-0.8686 +-0.5090,0.0000,0.0000,-0.8607 +-0.5090,0.0000,0.0000,-0.8607 +-0.5090,0.0000,0.0000,-0.8607 +-0.5090,0.0000,0.0000,-0.8607 +-0.5225,0.0000,0.0000,-0.8526 +-0.5225,0.0000,0.0000,-0.8526 +-0.5225,0.0000,0.0000,-0.8526 +-0.5225,0.0000,0.0000,-0.8526 +-0.5358,0.0000,0.0000,-0.8443 +-0.5358,0.0000,0.0000,-0.8443 +-0.5358,0.0000,0.0000,-0.8443 +-0.5358,0.0000,0.0000,-0.8443 +-0.5490,0.0000,0.0000,-0.8358 +-0.5490,0.0000,0.0000,-0.8358 +-0.5490,0.0000,0.0000,-0.8358 +-0.5490,0.0000,0.0000,-0.8358 +-0.5621,0.0000,0.0000,-0.8271 +-0.5621,0.0000,0.0000,-0.8271 +-0.5621,0.0000,0.0000,-0.8271 +-0.5621,0.0000,0.0000,-0.8271 +-0.5750,0.0000,0.0000,-0.8181 +-0.5750,0.0000,0.0000,-0.8181 +-0.5750,0.0000,0.0000,-0.8181 +-0.5750,0.0000,0.0000,-0.8181 +-0.5878,0.0000,0.0000,-0.8090 +-0.5878,0.0000,0.0000,-0.8090 +-0.5878,0.0000,0.0000,-0.8090 +-0.5878,0.0000,0.0000,-0.8090 +-0.6004,0.0000,0.0000,-0.7997 +-0.6004,0.0000,0.0000,-0.7997 +-0.6004,0.0000,0.0000,-0.7997 +-0.6004,0.0000,0.0000,-0.7997 +-0.6129,0.0000,0.0000,-0.7902 +-0.6129,0.0000,0.0000,-0.7902 +-0.6129,0.0000,0.0000,-0.7902 +-0.6129,0.0000,0.0000,-0.7902 +-0.6252,0.0000,0.0000,-0.7804 +-0.6252,0.0000,0.0000,-0.7804 +-0.6252,0.0000,0.0000,-0.7804 +-0.6252,0.0000,0.0000,-0.7804 +-0.6374,0.0000,0.0000,-0.7705 +-0.6374,0.0000,0.0000,-0.7705 +-0.6374,0.0000,0.0000,-0.7705 +-0.6374,0.0000,0.0000,-0.7705 +-0.6494,0.0000,0.0000,-0.7604 +-0.6494,0.0000,0.0000,-0.7604 +-0.6494,0.0000,0.0000,-0.7604 +-0.6494,0.0000,0.0000,-0.7604 +-0.6613,0.0000,0.0000,-0.7501 +-0.6613,0.0000,0.0000,-0.7501 +-0.6613,0.0000,0.0000,-0.7501 +-0.6613,0.0000,0.0000,-0.7501 +-0.6730,0.0000,0.0000,-0.7396 +-0.6730,0.0000,0.0000,-0.7396 +-0.6730,0.0000,0.0000,-0.7396 +-0.6730,0.0000,0.0000,-0.7396 +-0.6845,0.0000,0.0000,-0.7290 +-0.6845,0.0000,0.0000,-0.7290 +-0.6845,0.0000,0.0000,-0.7290 +-0.6845,0.0000,0.0000,-0.7290 +-0.6959,0.0000,0.0000,-0.7181 +-0.6959,0.0000,0.0000,-0.7181 +-0.6959,0.0000,0.0000,-0.7181 +-0.6959,0.0000,0.0000,-0.7181 +-0.7071,0.0000,0.0000,-0.7071 +-0.7071,0.0000,0.0000,-0.7071 +-0.7071,0.0000,0.0000,-0.7071 +-0.7071,0.0000,0.0000,-0.7071 +-0.7181,0.0000,0.0000,-0.6959 +-0.7181,0.0000,0.0000,-0.6959 +-0.7181,0.0000,0.0000,-0.6959 +-0.7181,0.0000,0.0000,-0.6959 +-0.7290,0.0000,0.0000,-0.6845 +-0.7290,0.0000,0.0000,-0.6845 +-0.7290,0.0000,0.0000,-0.6845 +-0.7290,0.0000,0.0000,-0.6845 +-0.7396,0.0000,0.0000,-0.6730 +-0.7396,0.0000,0.0000,-0.6730 +-0.7396,0.0000,0.0000,-0.6730 +-0.7396,0.0000,0.0000,-0.6730 +-0.7501,0.0000,0.0000,-0.6613 +-0.7501,0.0000,0.0000,-0.6613 +-0.7501,0.0000,0.0000,-0.6613 +-0.7501,0.0000,0.0000,-0.6613 +-0.7604,0.0000,0.0000,-0.6494 +-0.7604,0.0000,0.0000,-0.6494 +-0.7604,0.0000,0.0000,-0.6494 +-0.7604,0.0000,0.0000,-0.6494 +-0.7705,0.0000,0.0000,-0.6374 +-0.7705,0.0000,0.0000,-0.6374 +-0.7705,0.0000,0.0000,-0.6374 +-0.7705,0.0000,0.0000,-0.6374 +-0.7804,0.0000,0.0000,-0.6252 +-0.7804,0.0000,0.0000,-0.6252 +-0.7804,0.0000,0.0000,-0.6252 +-0.7804,0.0000,0.0000,-0.6252 +-0.7902,0.0000,0.0000,-0.6129 +-0.7902,0.0000,0.0000,-0.6129 +-0.7902,0.0000,0.0000,-0.6129 +-0.7902,0.0000,0.0000,-0.6129 +-0.7997,0.0000,0.0000,-0.6004 +-0.7997,0.0000,0.0000,-0.6004 +-0.7997,0.0000,0.0000,-0.6004 +-0.7997,0.0000,0.0000,-0.6004 +-0.8090,0.0000,0.0000,-0.5878 +-0.8090,0.0000,0.0000,-0.5878 +-0.8090,0.0000,0.0000,-0.5878 +-0.8090,0.0000,0.0000,-0.5878 +-0.8182,0.0000,0.0000,-0.5750 +-0.8182,0.0000,0.0000,-0.5750 +-0.8182,0.0000,0.0000,-0.5750 +-0.8182,0.0000,0.0000,-0.5750 +-0.8271,0.0000,0.0000,-0.5621 +-0.8271,0.0000,0.0000,-0.5621 +-0.8271,0.0000,0.0000,-0.5621 +-0.8271,0.0000,0.0000,-0.5621 +-0.8358,0.0000,0.0000,-0.5490 +-0.8358,0.0000,0.0000,-0.5490 +-0.8358,0.0000,0.0000,-0.5490 +-0.8358,0.0000,0.0000,-0.5490 +-0.8443,0.0000,0.0000,-0.5358 +-0.8443,0.0000,0.0000,-0.5358 +-0.8443,0.0000,0.0000,-0.5358 +-0.8443,0.0000,0.0000,-0.5358 +-0.8526,0.0000,0.0000,-0.5225 +-0.8526,0.0000,0.0000,-0.5225 +-0.8526,0.0000,0.0000,-0.5225 +-0.8526,0.0000,0.0000,-0.5225 +-0.8607,0.0000,0.0000,-0.5090 +-0.8607,0.0000,0.0000,-0.5090 +-0.8607,0.0000,0.0000,-0.5090 +-0.8607,0.0000,0.0000,-0.5090 +-0.8686,0.0000,0.0000,-0.4955 +-0.8686,0.0000,0.0000,-0.4955 +-0.8686,0.0000,0.0000,-0.4955 +-0.8686,0.0000,0.0000,-0.4955 +-0.8763,0.0000,0.0000,-0.4818 +-0.8763,0.0000,0.0000,-0.4818 +-0.8763,0.0000,0.0000,-0.4818 +-0.8763,0.0000,0.0000,-0.4818 +-0.8838,0.0000,0.0000,-0.4679 +-0.8838,0.0000,0.0000,-0.4679 +-0.8838,0.0000,0.0000,-0.4679 +-0.8838,0.0000,0.0000,-0.4679 +-0.8910,0.0000,0.0000,-0.4540 +-0.8910,0.0000,0.0000,-0.4540 +-0.8910,0.0000,0.0000,-0.4540 +-0.8910,0.0000,0.0000,-0.4540 +-0.8980,0.0000,0.0000,-0.4399 +-0.8980,0.0000,0.0000,-0.4399 +-0.8980,0.0000,0.0000,-0.4399 +-0.8980,0.0000,0.0000,-0.4399 +-0.9048,0.0000,0.0000,-0.4258 +-0.9048,0.0000,0.0000,-0.4258 +-0.9048,0.0000,0.0000,-0.4258 +-0.9048,0.0000,0.0000,-0.4258 +-0.9114,0.0000,0.0000,-0.4115 +-0.9114,0.0000,0.0000,-0.4115 +-0.9114,0.0000,0.0000,-0.4115 +-0.9114,0.0000,0.0000,-0.4115 +-0.9178,0.0000,0.0000,-0.3971 +-0.9178,0.0000,0.0000,-0.3971 +-0.9178,0.0000,0.0000,-0.3971 +-0.9178,0.0000,0.0000,-0.3971 +-0.9239,0.0000,0.0000,-0.3827 +-0.9239,0.0000,0.0000,-0.3827 +-0.9239,0.0000,0.0000,-0.3827 +-0.9239,0.0000,0.0000,-0.3827 +-0.9298,0.0000,0.0000,-0.3681 +-0.9298,0.0000,0.0000,-0.3681 +-0.9298,0.0000,0.0000,-0.3681 +-0.9298,0.0000,0.0000,-0.3681 +-0.9354,0.0000,0.0000,-0.3535 +-0.9354,0.0000,0.0000,-0.3535 +-0.9354,0.0000,0.0000,-0.3535 +-0.9354,0.0000,0.0000,-0.3535 +-0.9409,0.0000,0.0000,-0.3387 +-0.9409,0.0000,0.0000,-0.3387 +-0.9409,0.0000,0.0000,-0.3387 +-0.9409,0.0000,0.0000,-0.3387 +-0.9461,0.0000,0.0000,-0.3239 +-0.9461,0.0000,0.0000,-0.3239 +-0.9461,0.0000,0.0000,-0.3239 +-0.9461,0.0000,0.0000,-0.3239 +-0.9511,0.0000,0.0000,-0.3090 +-0.9511,0.0000,0.0000,-0.3090 +-0.9511,0.0000,0.0000,-0.3090 +-0.9511,0.0000,0.0000,-0.3090 +-0.9558,0.0000,0.0000,-0.2940 +-0.9558,0.0000,0.0000,-0.2940 +-0.9558,0.0000,0.0000,-0.2940 +-0.9558,0.0000,0.0000,-0.2940 +-0.9603,0.0000,0.0000,-0.2790 +-0.9603,0.0000,0.0000,-0.2790 +-0.9603,0.0000,0.0000,-0.2790 +-0.9603,0.0000,0.0000,-0.2790 +-0.9646,0.0000,0.0000,-0.2639 +-0.9646,0.0000,0.0000,-0.2639 +-0.9646,0.0000,0.0000,-0.2639 +-0.9646,0.0000,0.0000,-0.2639 +-0.9686,0.0000,0.0000,-0.2487 +-0.9686,0.0000,0.0000,-0.2487 +-0.9686,0.0000,0.0000,-0.2487 +-0.9686,0.0000,0.0000,-0.2487 +-0.9724,0.0000,0.0000,-0.2334 +-0.9724,0.0000,0.0000,-0.2334 +-0.9724,0.0000,0.0000,-0.2334 +-0.9724,0.0000,0.0000,-0.2334 +-0.9759,0.0000,0.0000,-0.2181 +-0.9759,0.0000,0.0000,-0.2181 +-0.9759,0.0000,0.0000,-0.2181 +-0.9759,0.0000,0.0000,-0.2181 +-0.9792,0.0000,0.0000,-0.2028 +-0.9792,0.0000,0.0000,-0.2028 +-0.9792,0.0000,0.0000,-0.2028 +-0.9792,0.0000,0.0000,-0.2028 +-0.9823,0.0000,0.0000,-0.1874 +-0.9823,0.0000,0.0000,-0.1874 +-0.9823,0.0000,0.0000,-0.1874 +-0.9823,0.0000,0.0000,-0.1874 +-0.9851,0.0000,0.0000,-0.1719 +-0.9851,0.0000,0.0000,-0.1719 +-0.9851,0.0000,0.0000,-0.1719 +-0.9851,0.0000,0.0000,-0.1719 +-0.9877,0.0000,0.0000,-0.1564 +-0.9877,0.0000,0.0000,-0.1564 +-0.9877,0.0000,0.0000,-0.1564 +-0.9877,0.0000,0.0000,-0.1564 +-0.9900,0.0000,0.0000,-0.1409 +-0.9900,0.0000,0.0000,-0.1409 +-0.9900,0.0000,0.0000,-0.1409 +-0.9900,0.0000,0.0000,-0.1409 +-0.9921,0.0000,0.0000,-0.1253 +-0.9921,0.0000,0.0000,-0.1253 +-0.9921,0.0000,0.0000,-0.1253 +-0.9921,0.0000,0.0000,-0.1253 +-0.9940,0.0000,0.0000,-0.1097 +-0.9940,0.0000,0.0000,-0.1097 +-0.9940,0.0000,0.0000,-0.1097 +-0.9940,0.0000,0.0000,-0.1097 +-0.9956,0.0000,0.0000,-0.0941 +-0.9956,0.0000,0.0000,-0.0941 +-0.9956,0.0000,0.0000,-0.0941 +-0.9956,0.0000,0.0000,-0.0941 +-0.9969,0.0000,0.0000,-0.0785 +-0.9969,0.0000,0.0000,-0.0785 +-0.9969,0.0000,0.0000,-0.0785 +-0.9969,0.0000,0.0000,-0.0785 +-0.9980,0.0000,0.0000,-0.0628 +-0.9980,0.0000,0.0000,-0.0628 +-0.9980,0.0000,0.0000,-0.0628 +-0.9980,0.0000,0.0000,-0.0628 +-0.9989,0.0000,0.0000,-0.0471 +-0.9989,0.0000,0.0000,-0.0471 +-0.9989,0.0000,0.0000,-0.0471 +-0.9989,0.0000,0.0000,-0.0471 +-0.9995,0.0000,0.0000,-0.0314 +-0.9995,0.0000,0.0000,-0.0314 +-0.9995,0.0000,0.0000,-0.0314 +-0.9995,0.0000,0.0000,-0.0314 +-0.9999,0.0000,0.0000,-0.0157 +-0.9999,0.0000,0.0000,-0.0157 +-0.9999,0.0000,0.0000,-0.0157 +-0.9999,0.0000,0.0000,-0.0157 +1.0000,0.0000,0.0000,-0.0000 +1.0000,0.0000,0.0000,-0.0000 +1.0000,0.0000,0.0000,-0.0000 +1.0000,0.0000,0.0000,-0.0000 diff --git a/scripts/trajectories/full-circle-with-up-and-down-4s-Vector3.csv b/scripts/trajectories/full-circle-with-up-and-down-4s-Vector3.csv new file mode 100644 index 0000000000000000000000000000000000000000..8fe2d2fe05d8e71170104a79cf3d50315ea722c8 --- /dev/null +++ b/scripts/trajectories/full-circle-with-up-and-down-4s-Vector3.csv @@ -0,0 +1,200 @@ +0.0000,0.0000,0.0000,0.7012,-0.0220,-0.7126 +0.0000,0.0000,0.0000,0.7057,-0.0444,-0.7071 +0.0000,0.0000,0.0000,0.7095,-0.0671,-0.7015 +0.0000,0.0000,0.0000,0.7125,-0.0900,-0.6959 +0.0000,0.0000,0.0000,0.7147,-0.1132,-0.6903 +0.0000,0.0000,0.0000,0.7161,-0.1366,-0.6845 +0.0000,0.0000,0.0000,0.7166,-0.1602,-0.6788 +0.0000,0.0000,0.0000,0.7164,-0.1839,-0.6730 +0.0000,0.0000,0.0000,0.7153,-0.2078,-0.6672 +0.0000,0.0000,0.0000,0.7134,-0.2318,-0.6613 +0.0000,0.0000,0.0000,0.7106,-0.2558,-0.6554 +0.0000,0.0000,0.0000,0.7070,-0.2799,-0.6494 +0.0000,0.0000,0.0000,0.7025,-0.3040,-0.6435 +0.0000,0.0000,0.0000,0.6972,-0.3281,-0.6374 +0.0000,0.0000,0.0000,0.6910,-0.3521,-0.6314 +0.0000,0.0000,0.0000,0.6839,-0.3760,-0.6252 +0.0000,0.0000,0.0000,0.6760,-0.3998,-0.6191 +0.0000,0.0000,0.0000,0.6671,-0.4234,-0.6129 +0.0000,0.0000,0.0000,0.6575,-0.4468,-0.6067 +0.0000,0.0000,0.0000,0.6470,-0.4700,-0.6004 +0.0000,0.0000,0.0000,0.6356,-0.4930,-0.5941 +0.0000,0.0000,0.0000,0.6234,-0.5157,-0.5878 +0.0000,0.0000,0.0000,0.6103,-0.5380,-0.5814 +0.0000,0.0000,0.0000,0.5964,-0.5601,-0.5750 +0.0000,0.0000,0.0000,0.5817,-0.5817,-0.5686 +0.0000,0.0000,0.0000,0.5662,-0.6029,-0.5621 +0.0000,0.0000,0.0000,0.5499,-0.6237,-0.5556 +0.0000,0.0000,0.0000,0.5328,-0.6440,-0.5490 +0.0000,0.0000,0.0000,0.5149,-0.6638,-0.5424 +0.0000,0.0000,0.0000,0.4963,-0.6831,-0.5358 +0.0000,0.0000,0.0000,0.4769,-0.7018,-0.5292 +0.0000,0.0000,0.0000,0.4569,-0.7199,-0.5225 +0.0000,0.0000,0.0000,0.4361,-0.7374,-0.5158 +0.0000,0.0000,0.0000,0.4147,-0.7543,-0.5090 +0.0000,0.0000,0.0000,0.3926,-0.7705,-0.5023 +0.0000,0.0000,0.0000,0.3698,-0.7860,-0.4955 +0.0000,0.0000,0.0000,0.3465,-0.8007,-0.4886 +0.0000,0.0000,0.0000,0.3226,-0.8148,-0.4818 +0.0000,0.0000,0.0000,0.2981,-0.8280,-0.4749 +0.0000,0.0000,0.0000,0.2731,-0.8405,-0.4679 +0.0000,0.0000,0.0000,0.2476,-0.8522,-0.4610 +0.0000,0.0000,0.0000,0.2216,-0.8630,-0.4540 +0.0000,0.0000,0.0000,0.1951,-0.8730,-0.4470 +0.0000,0.0000,0.0000,0.1683,-0.8821,-0.4399 +0.0000,0.0000,0.0000,0.1410,-0.8904,-0.4329 +0.0000,0.0000,0.0000,0.1134,-0.8977,-0.4258 +0.0000,0.0000,0.0000,0.0855,-0.9041,-0.4187 +0.0000,0.0000,0.0000,0.0572,-0.9096,-0.4115 +0.0000,0.0000,0.0000,0.0287,-0.9142,-0.4043 +0.0000,0.0000,0.0000,-0.0000,-0.9178,-0.3971 +0.0000,0.0000,0.0000,-0.0289,-0.9204,-0.3899 +0.0000,0.0000,0.0000,-0.0580,-0.9221,-0.3827 +0.0000,0.0000,0.0000,-0.0872,-0.9227,-0.3754 +0.0000,0.0000,0.0000,-0.1165,-0.9224,-0.3681 +0.0000,0.0000,0.0000,-0.1459,-0.9212,-0.3608 +0.0000,0.0000,0.0000,-0.1753,-0.9189,-0.3535 +0.0000,0.0000,0.0000,-0.2047,-0.9156,-0.3461 +0.0000,0.0000,0.0000,-0.2340,-0.9113,-0.3387 +0.0000,0.0000,0.0000,-0.2632,-0.9060,-0.3313 +0.0000,0.0000,0.0000,-0.2924,-0.8998,-0.3239 +0.0000,0.0000,0.0000,-0.3213,-0.8925,-0.3165 +0.0000,0.0000,0.0000,-0.3501,-0.8843,-0.3090 +0.0000,0.0000,0.0000,-0.3787,-0.8750,-0.3015 +0.0000,0.0000,0.0000,-0.4070,-0.8648,-0.2940 +0.0000,0.0000,0.0000,-0.4350,-0.8536,-0.2865 +0.0000,0.0000,0.0000,-0.4626,-0.8415,-0.2790 +0.0000,0.0000,0.0000,-0.4899,-0.8284,-0.2714 +0.0000,0.0000,0.0000,-0.5168,-0.8144,-0.2639 +0.0000,0.0000,0.0000,-0.5433,-0.7995,-0.2563 +0.0000,0.0000,0.0000,-0.5693,-0.7836,-0.2487 +0.0000,0.0000,0.0000,-0.5948,-0.7669,-0.2411 +0.0000,0.0000,0.0000,-0.6198,-0.7492,-0.2334 +0.0000,0.0000,0.0000,-0.6442,-0.7307,-0.2258 +0.0000,0.0000,0.0000,-0.6681,-0.7114,-0.2181 +0.0000,0.0000,0.0000,-0.6913,-0.6913,-0.2105 +0.0000,0.0000,0.0000,-0.7138,-0.6703,-0.2028 +0.0000,0.0000,0.0000,-0.7357,-0.6486,-0.1951 +0.0000,0.0000,0.0000,-0.7569,-0.6261,-0.1874 +0.0000,0.0000,0.0000,-0.7773,-0.6029,-0.1797 +0.0000,0.0000,0.0000,-0.7970,-0.5790,-0.1719 +0.0000,0.0000,0.0000,-0.8159,-0.5545,-0.1642 +0.0000,0.0000,0.0000,-0.8339,-0.5292,-0.1564 +0.0000,0.0000,0.0000,-0.8512,-0.5034,-0.1487 +0.0000,0.0000,0.0000,-0.8676,-0.4769,-0.1409 +0.0000,0.0000,0.0000,-0.8831,-0.4499,-0.1331 +0.0000,0.0000,0.0000,-0.8977,-0.4224,-0.1253 +0.0000,0.0000,0.0000,-0.9114,-0.3944,-0.1175 +0.0000,0.0000,0.0000,-0.9242,-0.3659,-0.1097 +0.0000,0.0000,0.0000,-0.9360,-0.3370,-0.1019 +0.0000,0.0000,0.0000,-0.9468,-0.3076,-0.0941 +0.0000,0.0000,0.0000,-0.9567,-0.2779,-0.0863 +0.0000,0.0000,0.0000,-0.9656,-0.2479,-0.0785 +0.0000,0.0000,0.0000,-0.9735,-0.2176,-0.0706 +0.0000,0.0000,0.0000,-0.9803,-0.1870,-0.0628 +0.0000,0.0000,0.0000,-0.9862,-0.1562,-0.0549 +0.0000,0.0000,0.0000,-0.9910,-0.1252,-0.0471 +0.0000,0.0000,0.0000,-0.9948,-0.0940,-0.0393 +0.0000,0.0000,0.0000,-0.9975,-0.0628,-0.0314 +0.0000,0.0000,0.0000,-0.9992,-0.0314,-0.0236 +0.0000,0.0000,0.0000,-0.9999,0.0000,-0.0157 +0.0000,0.0000,0.0000,-0.9995,0.0314,-0.0079 +0.0000,0.0000,0.0000,-0.9980,0.0628,0.0000 +0.0000,0.0000,0.0000,-0.9955,0.0941,0.0079 +0.0000,0.0000,0.0000,-0.9920,0.1253,0.0157 +0.0000,0.0000,0.0000,-0.9874,0.1564,0.0236 +0.0000,0.0000,0.0000,-0.9818,0.1873,0.0314 +0.0000,0.0000,0.0000,-0.9752,0.2180,0.0393 +0.0000,0.0000,0.0000,-0.9675,0.2484,0.0471 +0.0000,0.0000,0.0000,-0.9588,0.2786,0.0550 +0.0000,0.0000,0.0000,-0.9492,0.3084,0.0628 +0.0000,0.0000,0.0000,-0.9385,0.3379,0.0706 +0.0000,0.0000,0.0000,-0.9269,0.3670,0.0785 +0.0000,0.0000,0.0000,-0.9143,0.3957,0.0863 +0.0000,0.0000,0.0000,-0.9008,0.4239,0.0941 +0.0000,0.0000,0.0000,-0.8864,0.4516,0.1019 +0.0000,0.0000,0.0000,-0.8710,0.4788,0.1097 +0.0000,0.0000,0.0000,-0.8548,0.5055,0.1175 +0.0000,0.0000,0.0000,-0.8377,0.5316,0.1253 +0.0000,0.0000,0.0000,-0.8197,0.5571,0.1331 +0.0000,0.0000,0.0000,-0.8009,0.5819,0.1409 +0.0000,0.0000,0.0000,-0.7814,0.6061,0.1487 +0.0000,0.0000,0.0000,-0.7610,0.6296,0.1564 +0.0000,0.0000,0.0000,-0.7399,0.6523,0.1642 +0.0000,0.0000,0.0000,-0.7181,0.6744,0.1719 +0.0000,0.0000,0.0000,-0.6956,0.6956,0.1797 +0.0000,0.0000,0.0000,-0.6724,0.7161,0.1874 +0.0000,0.0000,0.0000,-0.6486,0.7357,0.1951 +0.0000,0.0000,0.0000,-0.6242,0.7545,0.2028 +0.0000,0.0000,0.0000,-0.5992,0.7725,0.2105 +0.0000,0.0000,0.0000,-0.5736,0.7895,0.2181 +0.0000,0.0000,0.0000,-0.5476,0.8057,0.2258 +0.0000,0.0000,0.0000,-0.5210,0.8210,0.2334 +0.0000,0.0000,0.0000,-0.4940,0.8354,0.2411 +0.0000,0.0000,0.0000,-0.4666,0.8488,0.2487 +0.0000,0.0000,0.0000,-0.4388,0.8612,0.2563 +0.0000,0.0000,0.0000,-0.4107,0.8728,0.2639 +0.0000,0.0000,0.0000,-0.3822,0.8833,0.2714 +0.0000,0.0000,0.0000,-0.3535,0.8929,0.2790 +0.0000,0.0000,0.0000,-0.3245,0.9014,0.2865 +0.0000,0.0000,0.0000,-0.2954,0.9090,0.2940 +0.0000,0.0000,0.0000,-0.2660,0.9156,0.3015 +0.0000,0.0000,0.0000,-0.2365,0.9212,0.3090 +0.0000,0.0000,0.0000,-0.2069,0.9258,0.3165 +0.0000,0.0000,0.0000,-0.1773,0.9293,0.3239 +0.0000,0.0000,0.0000,-0.1476,0.9319,0.3313 +0.0000,0.0000,0.0000,-0.1179,0.9335,0.3387 +0.0000,0.0000,0.0000,-0.0883,0.9340,0.3461 +0.0000,0.0000,0.0000,-0.0587,0.9336,0.3535 +0.0000,0.0000,0.0000,-0.0293,0.9322,0.3608 +0.0000,0.0000,0.0000,0.0000,0.9298,0.3681 +0.0000,0.0000,0.0000,0.0291,0.9264,0.3754 +0.0000,0.0000,0.0000,0.0580,0.9221,0.3827 +0.0000,0.0000,0.0000,0.0867,0.9168,0.3899 +0.0000,0.0000,0.0000,0.1150,0.9105,0.3971 +0.0000,0.0000,0.0000,0.1431,0.9033,0.4043 +0.0000,0.0000,0.0000,0.1708,0.8953,0.4115 +0.0000,0.0000,0.0000,0.1981,0.8863,0.4187 +0.0000,0.0000,0.0000,0.2250,0.8764,0.4258 +0.0000,0.0000,0.0000,0.2515,0.8657,0.4329 +0.0000,0.0000,0.0000,0.2775,0.8541,0.4399 +0.0000,0.0000,0.0000,0.3030,0.8417,0.4470 +0.0000,0.0000,0.0000,0.3280,0.8284,0.4540 +0.0000,0.0000,0.0000,0.3524,0.8144,0.4610 +0.0000,0.0000,0.0000,0.3763,0.7997,0.4679 +0.0000,0.0000,0.0000,0.3995,0.7841,0.4749 +0.0000,0.0000,0.0000,0.4222,0.7679,0.4818 +0.0000,0.0000,0.0000,0.4441,0.7510,0.4886 +0.0000,0.0000,0.0000,0.4654,0.7334,0.4955 +0.0000,0.0000,0.0000,0.4860,0.7152,0.5023 +0.0000,0.0000,0.0000,0.5059,0.6964,0.5090 +0.0000,0.0000,0.0000,0.5251,0.6769,0.5158 +0.0000,0.0000,0.0000,0.5435,0.6570,0.5225 +0.0000,0.0000,0.0000,0.5611,0.6365,0.5292 +0.0000,0.0000,0.0000,0.5780,0.6155,0.5358 +0.0000,0.0000,0.0000,0.5940,0.5940,0.5424 +0.0000,0.0000,0.0000,0.6093,0.5721,0.5490 +0.0000,0.0000,0.0000,0.6237,0.5499,0.5556 +0.0000,0.0000,0.0000,0.6373,0.5272,0.5621 +0.0000,0.0000,0.0000,0.6500,0.5042,0.5686 +0.0000,0.0000,0.0000,0.6619,0.4809,0.5750 +0.0000,0.0000,0.0000,0.6729,0.4573,0.5814 +0.0000,0.0000,0.0000,0.6831,0.4335,0.5878 +0.0000,0.0000,0.0000,0.6924,0.4095,0.5941 +0.0000,0.0000,0.0000,0.7008,0.3852,0.6004 +0.0000,0.0000,0.0000,0.7083,0.3609,0.6067 +0.0000,0.0000,0.0000,0.7150,0.3364,0.6129 +0.0000,0.0000,0.0000,0.7207,0.3119,0.6191 +0.0000,0.0000,0.0000,0.7256,0.2873,0.6252 +0.0000,0.0000,0.0000,0.7296,0.2627,0.6314 +0.0000,0.0000,0.0000,0.7328,0.2381,0.6374 +0.0000,0.0000,0.0000,0.7351,0.2136,0.6435 +0.0000,0.0000,0.0000,0.7365,0.1891,0.6494 +0.0000,0.0000,0.0000,0.7371,0.1648,0.6554 +0.0000,0.0000,0.0000,0.7368,0.1406,0.6613 +0.0000,0.0000,0.0000,0.7357,0.1165,0.6672 +0.0000,0.0000,0.0000,0.7338,0.0927,0.6730 +0.0000,0.0000,0.0000,0.7311,0.0691,0.6788 +0.0000,0.0000,0.0000,0.7275,0.0458,0.6845 +0.0000,0.0000,0.0000,0.7232,0.0227,0.6903 +0.0000,0.0000,0.0000,0.7181,-0.0000,0.6959 diff --git a/scripts/trajectories/full-circle-with-up-and-down-4s-ccw-Vector3.csv b/scripts/trajectories/full-circle-with-up-and-down-4s-ccw-Vector3.csv new file mode 100644 index 0000000000000000000000000000000000000000..63108890206963dbde169465283d8eb28796fc68 --- /dev/null +++ b/scripts/trajectories/full-circle-with-up-and-down-4s-ccw-Vector3.csv @@ -0,0 +1,200 @@ +0.0000,0.0000,0.0000,0.7012,0.0220,0.7126 +0.0000,0.0000,0.0000,0.7057,0.0444,0.7071 +0.0000,0.0000,0.0000,0.7095,0.0671,0.7015 +0.0000,0.0000,0.0000,0.7125,0.0900,0.6959 +0.0000,0.0000,0.0000,0.7147,0.1132,0.6903 +0.0000,0.0000,0.0000,0.7161,0.1366,0.6845 +0.0000,0.0000,0.0000,0.7166,0.1602,0.6788 +0.0000,0.0000,0.0000,0.7164,0.1839,0.6730 +0.0000,0.0000,0.0000,0.7153,0.2078,0.6672 +0.0000,0.0000,0.0000,0.7134,0.2318,0.6613 +0.0000,0.0000,0.0000,0.7106,0.2558,0.6554 +0.0000,0.0000,0.0000,0.7070,0.2799,0.6494 +0.0000,0.0000,0.0000,0.7025,0.3040,0.6435 +0.0000,0.0000,0.0000,0.6972,0.3281,0.6374 +0.0000,0.0000,0.0000,0.6910,0.3521,0.6314 +0.0000,0.0000,0.0000,0.6839,0.3760,0.6252 +0.0000,0.0000,0.0000,0.6760,0.3998,0.6191 +0.0000,0.0000,0.0000,0.6671,0.4234,0.6129 +0.0000,0.0000,0.0000,0.6575,0.4468,0.6067 +0.0000,0.0000,0.0000,0.6470,0.4700,0.6004 +0.0000,0.0000,0.0000,0.6356,0.4930,0.5941 +0.0000,0.0000,0.0000,0.6234,0.5157,0.5878 +0.0000,0.0000,0.0000,0.6103,0.5380,0.5814 +0.0000,0.0000,0.0000,0.5964,0.5601,0.5750 +0.0000,0.0000,0.0000,0.5817,0.5817,0.5686 +0.0000,0.0000,0.0000,0.5662,0.6029,0.5621 +0.0000,0.0000,0.0000,0.5499,0.6237,0.5556 +0.0000,0.0000,0.0000,0.5328,0.6440,0.5490 +0.0000,0.0000,0.0000,0.5149,0.6638,0.5424 +0.0000,0.0000,0.0000,0.4963,0.6831,0.5358 +0.0000,0.0000,0.0000,0.4769,0.7018,0.5292 +0.0000,0.0000,0.0000,0.4569,0.7199,0.5225 +0.0000,0.0000,0.0000,0.4361,0.7374,0.5158 +0.0000,0.0000,0.0000,0.4147,0.7543,0.5090 +0.0000,0.0000,0.0000,0.3926,0.7705,0.5023 +0.0000,0.0000,0.0000,0.3698,0.7860,0.4955 +0.0000,0.0000,0.0000,0.3465,0.8007,0.4886 +0.0000,0.0000,0.0000,0.3226,0.8148,0.4818 +0.0000,0.0000,0.0000,0.2981,0.8280,0.4749 +0.0000,0.0000,0.0000,0.2731,0.8405,0.4679 +0.0000,0.0000,0.0000,0.2476,0.8522,0.4610 +0.0000,0.0000,0.0000,0.2216,0.8630,0.4540 +0.0000,0.0000,0.0000,0.1951,0.8730,0.4470 +0.0000,0.0000,0.0000,0.1683,0.8821,0.4399 +0.0000,0.0000,0.0000,0.1410,0.8904,0.4329 +0.0000,0.0000,0.0000,0.1134,0.8977,0.4258 +0.0000,0.0000,0.0000,0.0855,0.9041,0.4187 +0.0000,0.0000,0.0000,0.0572,0.9096,0.4115 +0.0000,0.0000,0.0000,0.0287,0.9142,0.4043 +0.0000,0.0000,0.0000,-0.0000,0.9178,0.3971 +0.0000,0.0000,0.0000,-0.0289,0.9204,0.3899 +0.0000,0.0000,0.0000,-0.0580,0.9221,0.3827 +0.0000,0.0000,0.0000,-0.0872,0.9227,0.3754 +0.0000,0.0000,0.0000,-0.1165,0.9224,0.3681 +0.0000,0.0000,0.0000,-0.1459,0.9212,0.3608 +0.0000,0.0000,0.0000,-0.1753,0.9189,0.3535 +0.0000,0.0000,0.0000,-0.2047,0.9156,0.3461 +0.0000,0.0000,0.0000,-0.2340,0.9113,0.3387 +0.0000,0.0000,0.0000,-0.2632,0.9060,0.3313 +0.0000,0.0000,0.0000,-0.2924,0.8998,0.3239 +0.0000,0.0000,0.0000,-0.3213,0.8925,0.3165 +0.0000,0.0000,0.0000,-0.3501,0.8843,0.3090 +0.0000,0.0000,0.0000,-0.3787,0.8750,0.3015 +0.0000,0.0000,0.0000,-0.4070,0.8648,0.2940 +0.0000,0.0000,0.0000,-0.4350,0.8536,0.2865 +0.0000,0.0000,0.0000,-0.4626,0.8415,0.2790 +0.0000,0.0000,0.0000,-0.4899,0.8284,0.2714 +0.0000,0.0000,0.0000,-0.5168,0.8144,0.2639 +0.0000,0.0000,0.0000,-0.5433,0.7995,0.2563 +0.0000,0.0000,0.0000,-0.5693,0.7836,0.2487 +0.0000,0.0000,0.0000,-0.5948,0.7669,0.2411 +0.0000,0.0000,0.0000,-0.6198,0.7492,0.2334 +0.0000,0.0000,0.0000,-0.6442,0.7307,0.2258 +0.0000,0.0000,0.0000,-0.6681,0.7114,0.2181 +0.0000,0.0000,0.0000,-0.6913,0.6913,0.2105 +0.0000,0.0000,0.0000,-0.7138,0.6703,0.2028 +0.0000,0.0000,0.0000,-0.7357,0.6486,0.1951 +0.0000,0.0000,0.0000,-0.7569,0.6261,0.1874 +0.0000,0.0000,0.0000,-0.7773,0.6029,0.1797 +0.0000,0.0000,0.0000,-0.7970,0.5790,0.1719 +0.0000,0.0000,0.0000,-0.8159,0.5545,0.1642 +0.0000,0.0000,0.0000,-0.8339,0.5292,0.1564 +0.0000,0.0000,0.0000,-0.8512,0.5034,0.1487 +0.0000,0.0000,0.0000,-0.8676,0.4769,0.1409 +0.0000,0.0000,0.0000,-0.8831,0.4499,0.1331 +0.0000,0.0000,0.0000,-0.8977,0.4224,0.1253 +0.0000,0.0000,0.0000,-0.9114,0.3944,0.1175 +0.0000,0.0000,0.0000,-0.9242,0.3659,0.1097 +0.0000,0.0000,0.0000,-0.9360,0.3370,0.1019 +0.0000,0.0000,0.0000,-0.9468,0.3076,0.0941 +0.0000,0.0000,0.0000,-0.9567,0.2779,0.0863 +0.0000,0.0000,0.0000,-0.9656,0.2479,0.0785 +0.0000,0.0000,0.0000,-0.9735,0.2176,0.0706 +0.0000,0.0000,0.0000,-0.9803,0.1870,0.0628 +0.0000,0.0000,0.0000,-0.9862,0.1562,0.0549 +0.0000,0.0000,0.0000,-0.9910,0.1252,0.0471 +0.0000,0.0000,0.0000,-0.9948,0.0940,0.0393 +0.0000,0.0000,0.0000,-0.9975,0.0628,0.0314 +0.0000,0.0000,0.0000,-0.9992,0.0314,0.0236 +0.0000,0.0000,0.0000,-0.9999,-0.0000,0.0157 +0.0000,0.0000,0.0000,-0.9995,-0.0314,0.0079 +0.0000,0.0000,0.0000,-0.9980,-0.0628,-0.0000 +0.0000,0.0000,0.0000,-0.9955,-0.0941,-0.0079 +0.0000,0.0000,0.0000,-0.9920,-0.1253,-0.0157 +0.0000,0.0000,0.0000,-0.9874,-0.1564,-0.0236 +0.0000,0.0000,0.0000,-0.9818,-0.1873,-0.0314 +0.0000,0.0000,0.0000,-0.9752,-0.2180,-0.0393 +0.0000,0.0000,0.0000,-0.9675,-0.2484,-0.0471 +0.0000,0.0000,0.0000,-0.9588,-0.2786,-0.0550 +0.0000,0.0000,0.0000,-0.9492,-0.3084,-0.0628 +0.0000,0.0000,0.0000,-0.9385,-0.3379,-0.0706 +0.0000,0.0000,0.0000,-0.9269,-0.3670,-0.0785 +0.0000,0.0000,0.0000,-0.9143,-0.3957,-0.0863 +0.0000,0.0000,0.0000,-0.9008,-0.4239,-0.0941 +0.0000,0.0000,0.0000,-0.8864,-0.4516,-0.1019 +0.0000,0.0000,0.0000,-0.8710,-0.4788,-0.1097 +0.0000,0.0000,0.0000,-0.8548,-0.5055,-0.1175 +0.0000,0.0000,0.0000,-0.8377,-0.5316,-0.1253 +0.0000,0.0000,0.0000,-0.8197,-0.5571,-0.1331 +0.0000,0.0000,0.0000,-0.8009,-0.5819,-0.1409 +0.0000,0.0000,0.0000,-0.7814,-0.6061,-0.1487 +0.0000,0.0000,0.0000,-0.7610,-0.6296,-0.1564 +0.0000,0.0000,0.0000,-0.7399,-0.6523,-0.1642 +0.0000,0.0000,0.0000,-0.7181,-0.6744,-0.1719 +0.0000,0.0000,0.0000,-0.6956,-0.6956,-0.1797 +0.0000,0.0000,0.0000,-0.6724,-0.7161,-0.1874 +0.0000,0.0000,0.0000,-0.6486,-0.7357,-0.1951 +0.0000,0.0000,0.0000,-0.6242,-0.7545,-0.2028 +0.0000,0.0000,0.0000,-0.5992,-0.7725,-0.2105 +0.0000,0.0000,0.0000,-0.5736,-0.7895,-0.2181 +0.0000,0.0000,0.0000,-0.5476,-0.8057,-0.2258 +0.0000,0.0000,0.0000,-0.5210,-0.8210,-0.2334 +0.0000,0.0000,0.0000,-0.4940,-0.8354,-0.2411 +0.0000,0.0000,0.0000,-0.4666,-0.8488,-0.2487 +0.0000,0.0000,0.0000,-0.4388,-0.8612,-0.2563 +0.0000,0.0000,0.0000,-0.4107,-0.8728,-0.2639 +0.0000,0.0000,0.0000,-0.3822,-0.8833,-0.2714 +0.0000,0.0000,0.0000,-0.3535,-0.8929,-0.2790 +0.0000,0.0000,0.0000,-0.3245,-0.9014,-0.2865 +0.0000,0.0000,0.0000,-0.2954,-0.9090,-0.2940 +0.0000,0.0000,0.0000,-0.2660,-0.9156,-0.3015 +0.0000,0.0000,0.0000,-0.2365,-0.9212,-0.3090 +0.0000,0.0000,0.0000,-0.2069,-0.9258,-0.3165 +0.0000,0.0000,0.0000,-0.1773,-0.9293,-0.3239 +0.0000,0.0000,0.0000,-0.1476,-0.9319,-0.3313 +0.0000,0.0000,0.0000,-0.1179,-0.9335,-0.3387 +0.0000,0.0000,0.0000,-0.0883,-0.9340,-0.3461 +0.0000,0.0000,0.0000,-0.0587,-0.9336,-0.3535 +0.0000,0.0000,0.0000,-0.0293,-0.9322,-0.3608 +0.0000,0.0000,0.0000,0.0000,-0.9298,-0.3681 +0.0000,0.0000,0.0000,0.0291,-0.9264,-0.3754 +0.0000,0.0000,0.0000,0.0580,-0.9221,-0.3827 +0.0000,0.0000,0.0000,0.0867,-0.9168,-0.3899 +0.0000,0.0000,0.0000,0.1150,-0.9105,-0.3971 +0.0000,0.0000,0.0000,0.1431,-0.9033,-0.4043 +0.0000,0.0000,0.0000,0.1708,-0.8953,-0.4115 +0.0000,0.0000,0.0000,0.1981,-0.8863,-0.4187 +0.0000,0.0000,0.0000,0.2250,-0.8764,-0.4258 +0.0000,0.0000,0.0000,0.2515,-0.8657,-0.4329 +0.0000,0.0000,0.0000,0.2775,-0.8541,-0.4399 +0.0000,0.0000,0.0000,0.3030,-0.8417,-0.4470 +0.0000,0.0000,0.0000,0.3280,-0.8284,-0.4540 +0.0000,0.0000,0.0000,0.3524,-0.8144,-0.4610 +0.0000,0.0000,0.0000,0.3763,-0.7997,-0.4679 +0.0000,0.0000,0.0000,0.3995,-0.7841,-0.4749 +0.0000,0.0000,0.0000,0.4222,-0.7679,-0.4818 +0.0000,0.0000,0.0000,0.4441,-0.7510,-0.4886 +0.0000,0.0000,0.0000,0.4654,-0.7334,-0.4955 +0.0000,0.0000,0.0000,0.4860,-0.7152,-0.5023 +0.0000,0.0000,0.0000,0.5059,-0.6964,-0.5090 +0.0000,0.0000,0.0000,0.5251,-0.6769,-0.5158 +0.0000,0.0000,0.0000,0.5435,-0.6570,-0.5225 +0.0000,0.0000,0.0000,0.5611,-0.6365,-0.5292 +0.0000,0.0000,0.0000,0.5780,-0.6155,-0.5358 +0.0000,0.0000,0.0000,0.5940,-0.5940,-0.5424 +0.0000,0.0000,0.0000,0.6093,-0.5721,-0.5490 +0.0000,0.0000,0.0000,0.6237,-0.5499,-0.5556 +0.0000,0.0000,0.0000,0.6373,-0.5272,-0.5621 +0.0000,0.0000,0.0000,0.6500,-0.5042,-0.5686 +0.0000,0.0000,0.0000,0.6619,-0.4809,-0.5750 +0.0000,0.0000,0.0000,0.6729,-0.4573,-0.5814 +0.0000,0.0000,0.0000,0.6831,-0.4335,-0.5878 +0.0000,0.0000,0.0000,0.6924,-0.4095,-0.5941 +0.0000,0.0000,0.0000,0.7008,-0.3852,-0.6004 +0.0000,0.0000,0.0000,0.7083,-0.3609,-0.6067 +0.0000,0.0000,0.0000,0.7150,-0.3364,-0.6129 +0.0000,0.0000,0.0000,0.7207,-0.3119,-0.6191 +0.0000,0.0000,0.0000,0.7256,-0.2873,-0.6252 +0.0000,0.0000,0.0000,0.7296,-0.2627,-0.6314 +0.0000,0.0000,0.0000,0.7328,-0.2381,-0.6374 +0.0000,0.0000,0.0000,0.7351,-0.2136,-0.6435 +0.0000,0.0000,0.0000,0.7365,-0.1891,-0.6494 +0.0000,0.0000,0.0000,0.7371,-0.1648,-0.6554 +0.0000,0.0000,0.0000,0.7368,-0.1406,-0.6613 +0.0000,0.0000,0.0000,0.7357,-0.1165,-0.6672 +0.0000,0.0000,0.0000,0.7338,-0.0927,-0.6730 +0.0000,0.0000,0.0000,0.7311,-0.0691,-0.6788 +0.0000,0.0000,0.0000,0.7275,-0.0458,-0.6845 +0.0000,0.0000,0.0000,0.7232,-0.0227,-0.6903 +0.0000,0.0000,0.0000,0.7181,0.0000,-0.6959 diff --git a/scripts/trajectories/full-circle-with-up-and-down-4s-ccw.csv b/scripts/trajectories/full-circle-with-up-and-down-4s-ccw.csv new file mode 100644 index 0000000000000000000000000000000000000000..1e4a316720c584ee96394a65340d0e6726332552 --- /dev/null +++ b/scripts/trajectories/full-circle-with-up-and-down-4s-ccw.csv @@ -0,0 +1,800 @@ +0.9223,-0.0000,-0.3863,0.0119 +0.9223,-0.0000,-0.3863,0.0119 +0.9223,-0.0000,-0.3863,0.0119 +0.9223,-0.0000,-0.3863,0.0119 +0.9235,-0.0000,-0.3828,0.0240 +0.9235,-0.0000,-0.3828,0.0240 +0.9235,-0.0000,-0.3828,0.0240 +0.9235,-0.0000,-0.3828,0.0240 +0.9245,-0.0000,-0.3794,0.0363 +0.9245,-0.0000,-0.3794,0.0363 +0.9245,-0.0000,-0.3794,0.0363 +0.9245,-0.0000,-0.3794,0.0363 +0.9253,-0.0000,-0.3760,0.0486 +0.9253,-0.0000,-0.3760,0.0486 +0.9253,-0.0000,-0.3760,0.0486 +0.9253,-0.0000,-0.3760,0.0486 +0.9259,-0.0000,-0.3727,0.0611 +0.9259,-0.0000,-0.3727,0.0611 +0.9259,-0.0000,-0.3727,0.0611 +0.9259,-0.0000,-0.3727,0.0611 +0.9263,-0.0000,-0.3695,0.0737 +0.9263,-0.0000,-0.3695,0.0737 +0.9263,-0.0000,-0.3695,0.0737 +0.9263,-0.0000,-0.3695,0.0737 +0.9265,-0.0000,-0.3663,0.0865 +0.9265,-0.0000,-0.3663,0.0865 +0.9265,-0.0000,-0.3663,0.0865 +0.9265,-0.0000,-0.3663,0.0865 +0.9264,-0.0000,-0.3632,0.0993 +0.9264,-0.0000,-0.3632,0.0993 +0.9264,-0.0000,-0.3632,0.0993 +0.9264,-0.0000,-0.3632,0.0993 +0.9261,-0.0000,-0.3602,0.1122 +0.9261,-0.0000,-0.3602,0.1122 +0.9261,-0.0000,-0.3602,0.1122 +0.9261,-0.0000,-0.3602,0.1122 +0.9256,-0.0000,-0.3572,0.1252 +0.9256,-0.0000,-0.3572,0.1252 +0.9256,-0.0000,-0.3572,0.1252 +0.9256,-0.0000,-0.3572,0.1252 +0.9248,-0.0000,-0.3543,0.1383 +0.9248,-0.0000,-0.3543,0.1383 +0.9248,-0.0000,-0.3543,0.1383 +0.9248,-0.0000,-0.3543,0.1383 +0.9239,-0.0000,-0.3515,0.1515 +0.9239,-0.0000,-0.3515,0.1515 +0.9239,-0.0000,-0.3515,0.1515 +0.9239,-0.0000,-0.3515,0.1515 +0.9226,-0.0000,-0.3487,0.1648 +0.9226,-0.0000,-0.3487,0.1648 +0.9226,-0.0000,-0.3487,0.1648 +0.9226,-0.0000,-0.3487,0.1648 +0.9212,-0.0000,-0.3460,0.1781 +0.9212,-0.0000,-0.3460,0.1781 +0.9212,-0.0000,-0.3460,0.1781 +0.9212,-0.0000,-0.3460,0.1781 +0.9195,-0.0000,-0.3433,0.1914 +0.9195,-0.0000,-0.3433,0.1914 +0.9195,-0.0000,-0.3433,0.1914 +0.9195,-0.0000,-0.3433,0.1914 +0.9176,-0.0000,-0.3407,0.2049 +0.9176,-0.0000,-0.3407,0.2049 +0.9176,-0.0000,-0.3407,0.2049 +0.9176,-0.0000,-0.3407,0.2049 +0.9154,-0.0000,-0.3382,0.2183 +0.9154,-0.0000,-0.3382,0.2183 +0.9154,-0.0000,-0.3382,0.2183 +0.9154,-0.0000,-0.3382,0.2183 +0.9130,-0.0000,-0.3357,0.2319 +0.9130,-0.0000,-0.3357,0.2319 +0.9130,-0.0000,-0.3357,0.2319 +0.9130,-0.0000,-0.3357,0.2319 +0.9104,-0.0000,-0.3332,0.2454 +0.9104,-0.0000,-0.3332,0.2454 +0.9104,-0.0000,-0.3332,0.2454 +0.9104,-0.0000,-0.3332,0.2454 +0.9075,-0.0000,-0.3308,0.2590 +0.9075,-0.0000,-0.3308,0.2590 +0.9075,-0.0000,-0.3308,0.2590 +0.9075,-0.0000,-0.3308,0.2590 +0.9043,-0.0000,-0.3285,0.2726 +0.9043,-0.0000,-0.3285,0.2726 +0.9043,-0.0000,-0.3285,0.2726 +0.9043,-0.0000,-0.3285,0.2726 +0.9009,-0.0000,-0.3262,0.2862 +0.9009,-0.0000,-0.3262,0.2862 +0.9009,-0.0000,-0.3262,0.2862 +0.9009,-0.0000,-0.3262,0.2862 +0.8973,-0.0000,-0.3240,0.2998 +0.8973,-0.0000,-0.3240,0.2998 +0.8973,-0.0000,-0.3240,0.2998 +0.8973,-0.0000,-0.3240,0.2998 +0.8934,-0.0000,-0.3218,0.3134 +0.8934,-0.0000,-0.3218,0.3134 +0.8934,-0.0000,-0.3218,0.3134 +0.8934,-0.0000,-0.3218,0.3134 +0.8893,-0.0000,-0.3197,0.3271 +0.8893,-0.0000,-0.3197,0.3271 +0.8893,-0.0000,-0.3197,0.3271 +0.8893,-0.0000,-0.3197,0.3271 +0.8849,-0.0000,-0.3176,0.3407 +0.8849,-0.0000,-0.3176,0.3407 +0.8849,-0.0000,-0.3176,0.3407 +0.8849,-0.0000,-0.3176,0.3407 +0.8803,-0.0000,-0.3156,0.3543 +0.8803,-0.0000,-0.3156,0.3543 +0.8803,-0.0000,-0.3156,0.3543 +0.8803,-0.0000,-0.3156,0.3543 +0.8754,-0.0000,-0.3136,0.3678 +0.8754,-0.0000,-0.3136,0.3678 +0.8754,-0.0000,-0.3136,0.3678 +0.8754,-0.0000,-0.3136,0.3678 +0.8703,-0.0000,-0.3116,0.3814 +0.8703,-0.0000,-0.3116,0.3814 +0.8703,-0.0000,-0.3116,0.3814 +0.8703,-0.0000,-0.3116,0.3814 +0.8650,-0.0000,-0.3097,0.3949 +0.8650,-0.0000,-0.3097,0.3949 +0.8650,-0.0000,-0.3097,0.3949 +0.8650,-0.0000,-0.3097,0.3949 +0.8593,-0.0000,-0.3079,0.4083 +0.8593,-0.0000,-0.3079,0.4083 +0.8593,-0.0000,-0.3079,0.4083 +0.8593,-0.0000,-0.3079,0.4083 +0.8535,-0.0000,-0.3061,0.4217 +0.8535,-0.0000,-0.3061,0.4217 +0.8535,-0.0000,-0.3061,0.4217 +0.8535,-0.0000,-0.3061,0.4217 +0.8474,-0.0000,-0.3043,0.4351 +0.8474,-0.0000,-0.3043,0.4351 +0.8474,-0.0000,-0.3043,0.4351 +0.8474,-0.0000,-0.3043,0.4351 +0.8410,-0.0000,-0.3026,0.4484 +0.8410,-0.0000,-0.3026,0.4484 +0.8410,-0.0000,-0.3026,0.4484 +0.8410,-0.0000,-0.3026,0.4484 +0.8344,-0.0000,-0.3010,0.4617 +0.8344,-0.0000,-0.3010,0.4617 +0.8344,-0.0000,-0.3010,0.4617 +0.8344,-0.0000,-0.3010,0.4617 +0.8276,-0.0000,-0.2993,0.4748 +0.8276,-0.0000,-0.2993,0.4748 +0.8276,-0.0000,-0.2993,0.4748 +0.8276,-0.0000,-0.2993,0.4748 +0.8205,-0.0000,-0.2978,0.4879 +0.8205,-0.0000,-0.2978,0.4879 +0.8205,-0.0000,-0.2978,0.4879 +0.8205,-0.0000,-0.2978,0.4879 +0.8132,-0.0000,-0.2962,0.5010 +0.8132,-0.0000,-0.2962,0.5010 +0.8132,-0.0000,-0.2962,0.5010 +0.8132,-0.0000,-0.2962,0.5010 +0.8056,-0.0000,-0.2947,0.5139 +0.8056,-0.0000,-0.2947,0.5139 +0.8056,-0.0000,-0.2947,0.5139 +0.8056,-0.0000,-0.2947,0.5139 +0.7978,-0.0000,-0.2932,0.5267 +0.7978,-0.0000,-0.2932,0.5267 +0.7978,-0.0000,-0.2932,0.5267 +0.7978,-0.0000,-0.2932,0.5267 +0.7898,-0.0000,-0.2918,0.5395 +0.7898,-0.0000,-0.2918,0.5395 +0.7898,-0.0000,-0.2918,0.5395 +0.7898,-0.0000,-0.2918,0.5395 +0.7815,-0.0000,-0.2904,0.5521 +0.7815,-0.0000,-0.2904,0.5521 +0.7815,-0.0000,-0.2904,0.5521 +0.7815,-0.0000,-0.2904,0.5521 +0.7730,-0.0000,-0.2891,0.5647 +0.7730,-0.0000,-0.2891,0.5647 +0.7730,-0.0000,-0.2891,0.5647 +0.7730,-0.0000,-0.2891,0.5647 +0.7643,-0.0000,-0.2878,0.5771 +0.7643,-0.0000,-0.2878,0.5771 +0.7643,-0.0000,-0.2878,0.5771 +0.7643,-0.0000,-0.2878,0.5771 +0.7553,-0.0000,-0.2865,0.5894 +0.7553,-0.0000,-0.2865,0.5894 +0.7553,-0.0000,-0.2865,0.5894 +0.7553,-0.0000,-0.2865,0.5894 +0.7461,-0.0000,-0.2853,0.6016 +0.7461,-0.0000,-0.2853,0.6016 +0.7461,-0.0000,-0.2853,0.6016 +0.7461,-0.0000,-0.2853,0.6016 +0.7367,-0.0000,-0.2841,0.6136 +0.7367,-0.0000,-0.2841,0.6136 +0.7367,-0.0000,-0.2841,0.6136 +0.7367,-0.0000,-0.2841,0.6136 +0.7271,-0.0000,-0.2830,0.6255 +0.7271,-0.0000,-0.2830,0.6255 +0.7271,-0.0000,-0.2830,0.6255 +0.7271,-0.0000,-0.2830,0.6255 +0.7172,-0.0000,-0.2819,0.6373 +0.7172,-0.0000,-0.2819,0.6373 +0.7172,-0.0000,-0.2819,0.6373 +0.7172,-0.0000,-0.2819,0.6373 +0.7071,-0.0000,-0.2808,0.6490 +0.7071,-0.0000,-0.2808,0.6490 +0.7071,-0.0000,-0.2808,0.6490 +0.7071,-0.0000,-0.2808,0.6490 +0.6968,-0.0000,-0.2798,0.6604 +0.6968,-0.0000,-0.2798,0.6604 +0.6968,-0.0000,-0.2798,0.6604 +0.6968,-0.0000,-0.2798,0.6604 +0.6863,-0.0000,-0.2788,0.6718 +0.6863,-0.0000,-0.2788,0.6718 +0.6863,-0.0000,-0.2788,0.6718 +0.6863,-0.0000,-0.2788,0.6718 +0.6756,-0.0000,-0.2779,0.6829 +0.6756,-0.0000,-0.2779,0.6829 +0.6756,-0.0000,-0.2779,0.6829 +0.6756,-0.0000,-0.2779,0.6829 +0.6646,-0.0000,-0.2769,0.6940 +0.6646,-0.0000,-0.2769,0.6940 +0.6646,-0.0000,-0.2769,0.6940 +0.6646,-0.0000,-0.2769,0.6940 +0.6535,-0.0000,-0.2761,0.7048 +0.6535,-0.0000,-0.2761,0.7048 +0.6535,-0.0000,-0.2761,0.7048 +0.6535,-0.0000,-0.2761,0.7048 +0.6422,-0.0000,-0.2752,0.7155 +0.6422,-0.0000,-0.2752,0.7155 +0.6422,-0.0000,-0.2752,0.7155 +0.6422,-0.0000,-0.2752,0.7155 +0.6306,-0.0000,-0.2744,0.7260 +0.6306,-0.0000,-0.2744,0.7260 +0.6306,-0.0000,-0.2744,0.7260 +0.6306,-0.0000,-0.2744,0.7260 +0.6189,-0.0000,-0.2737,0.7363 +0.6189,-0.0000,-0.2737,0.7363 +0.6189,-0.0000,-0.2737,0.7363 +0.6189,-0.0000,-0.2737,0.7363 +0.6069,-0.0000,-0.2730,0.7464 +0.6069,-0.0000,-0.2730,0.7464 +0.6069,-0.0000,-0.2730,0.7464 +0.6069,-0.0000,-0.2730,0.7464 +0.5948,-0.0000,-0.2723,0.7563 +0.5948,-0.0000,-0.2723,0.7563 +0.5948,-0.0000,-0.2723,0.7563 +0.5948,-0.0000,-0.2723,0.7563 +0.5825,-0.0000,-0.2716,0.7661 +0.5825,-0.0000,-0.2716,0.7661 +0.5825,-0.0000,-0.2716,0.7661 +0.5825,-0.0000,-0.2716,0.7661 +0.5700,-0.0000,-0.2710,0.7756 +0.5700,-0.0000,-0.2710,0.7756 +0.5700,-0.0000,-0.2710,0.7756 +0.5700,-0.0000,-0.2710,0.7756 +0.5574,-0.0000,-0.2705,0.7850 +0.5574,-0.0000,-0.2705,0.7850 +0.5574,-0.0000,-0.2705,0.7850 +0.5574,-0.0000,-0.2705,0.7850 +0.5445,-0.0000,-0.2700,0.7941 +0.5445,-0.0000,-0.2700,0.7941 +0.5445,-0.0000,-0.2700,0.7941 +0.5445,-0.0000,-0.2700,0.7941 +0.5315,-0.0000,-0.2695,0.8030 +0.5315,-0.0000,-0.2695,0.8030 +0.5315,-0.0000,-0.2695,0.8030 +0.5315,-0.0000,-0.2695,0.8030 +0.5184,-0.0000,-0.2691,0.8117 +0.5184,-0.0000,-0.2691,0.8117 +0.5184,-0.0000,-0.2691,0.8117 +0.5184,-0.0000,-0.2691,0.8117 +0.5050,-0.0000,-0.2687,0.8202 +0.5050,-0.0000,-0.2687,0.8202 +0.5050,-0.0000,-0.2687,0.8202 +0.5050,-0.0000,-0.2687,0.8202 +0.4915,-0.0000,-0.2684,0.8285 +0.4915,-0.0000,-0.2684,0.8285 +0.4915,-0.0000,-0.2684,0.8285 +0.4915,-0.0000,-0.2684,0.8285 +0.4779,-0.0000,-0.2682,0.8365 +0.4779,-0.0000,-0.2682,0.8365 +0.4779,-0.0000,-0.2682,0.8365 +0.4779,-0.0000,-0.2682,0.8365 +0.4640,-0.0000,-0.2680,0.8443 +0.4640,-0.0000,-0.2680,0.8443 +0.4640,-0.0000,-0.2680,0.8443 +0.4640,-0.0000,-0.2680,0.8443 +0.4501,-0.0000,-0.2678,0.8519 +0.4501,-0.0000,-0.2678,0.8519 +0.4501,-0.0000,-0.2678,0.8519 +0.4501,-0.0000,-0.2678,0.8519 +0.4360,-0.0000,-0.2677,0.8592 +0.4360,-0.0000,-0.2677,0.8592 +0.4360,-0.0000,-0.2677,0.8592 +0.4360,-0.0000,-0.2677,0.8592 +0.4218,-0.0000,-0.2677,0.8663 +0.4218,-0.0000,-0.2677,0.8663 +0.4218,-0.0000,-0.2677,0.8663 +0.4218,-0.0000,-0.2677,0.8663 +0.4074,-0.0000,-0.2677,0.8731 +0.4074,-0.0000,-0.2677,0.8731 +0.4074,-0.0000,-0.2677,0.8731 +0.4074,-0.0000,-0.2677,0.8731 +0.3929,-0.0000,-0.2678,0.8797 +0.3929,-0.0000,-0.2678,0.8797 +0.3929,-0.0000,-0.2678,0.8797 +0.3929,-0.0000,-0.2678,0.8797 +0.3783,-0.0000,-0.2680,0.8860 +0.3783,-0.0000,-0.2680,0.8860 +0.3783,-0.0000,-0.2680,0.8860 +0.3783,-0.0000,-0.2680,0.8860 +0.3635,-0.0000,-0.2683,0.8921 +0.3635,-0.0000,-0.2683,0.8921 +0.3635,-0.0000,-0.2683,0.8921 +0.3635,-0.0000,-0.2683,0.8921 +0.3487,-0.0000,-0.2687,0.8979 +0.3487,-0.0000,-0.2687,0.8979 +0.3487,-0.0000,-0.2687,0.8979 +0.3487,-0.0000,-0.2687,0.8979 +0.3337,-0.0000,-0.2692,0.9034 +0.3337,-0.0000,-0.2692,0.9034 +0.3337,-0.0000,-0.2692,0.9034 +0.3337,-0.0000,-0.2692,0.9034 +0.3186,-0.0000,-0.2698,0.9087 +0.3186,-0.0000,-0.2698,0.9087 +0.3186,-0.0000,-0.2698,0.9087 +0.3186,-0.0000,-0.2698,0.9087 +0.3034,-0.0000,-0.2705,0.9136 +0.3034,-0.0000,-0.2705,0.9136 +0.3034,-0.0000,-0.2705,0.9136 +0.3034,-0.0000,-0.2705,0.9136 +0.2882,-0.0000,-0.2714,0.9183 +0.2882,-0.0000,-0.2714,0.9183 +0.2882,-0.0000,-0.2714,0.9183 +0.2882,-0.0000,-0.2714,0.9183 +0.2728,-0.0000,-0.2725,0.9227 +0.2728,-0.0000,-0.2725,0.9227 +0.2728,-0.0000,-0.2725,0.9227 +0.2728,-0.0000,-0.2725,0.9227 +0.2573,-0.0000,-0.2738,0.9267 +0.2573,-0.0000,-0.2738,0.9267 +0.2573,-0.0000,-0.2738,0.9267 +0.2573,-0.0000,-0.2738,0.9267 +0.2418,-0.0000,-0.2753,0.9305 +0.2418,-0.0000,-0.2753,0.9305 +0.2418,-0.0000,-0.2753,0.9305 +0.2418,-0.0000,-0.2753,0.9305 +0.2262,-0.0000,-0.2771,0.9339 +0.2262,-0.0000,-0.2771,0.9339 +0.2262,-0.0000,-0.2771,0.9339 +0.2262,-0.0000,-0.2771,0.9339 +0.2105,-0.0000,-0.2792,0.9369 +0.2105,-0.0000,-0.2792,0.9369 +0.2105,-0.0000,-0.2792,0.9369 +0.2105,-0.0000,-0.2792,0.9369 +0.1947,-0.0000,-0.2818,0.9395 +0.1947,-0.0000,-0.2818,0.9395 +0.1947,-0.0000,-0.2818,0.9395 +0.1947,-0.0000,-0.2818,0.9395 +0.1789,-0.0000,-0.2848,0.9417 +0.1789,-0.0000,-0.2848,0.9417 +0.1789,-0.0000,-0.2848,0.9417 +0.1789,-0.0000,-0.2848,0.9417 +0.1630,-0.0000,-0.2886,0.9435 +0.1630,-0.0000,-0.2886,0.9435 +0.1630,-0.0000,-0.2886,0.9435 +0.1630,-0.0000,-0.2886,0.9435 +0.1471,-0.0000,-0.2933,0.9446 +0.1471,-0.0000,-0.2933,0.9446 +0.1471,-0.0000,-0.2933,0.9446 +0.1471,-0.0000,-0.2933,0.9446 +0.1312,-0.0000,-0.2991,0.9452 +0.1312,-0.0000,-0.2991,0.9452 +0.1312,-0.0000,-0.2991,0.9452 +0.1312,-0.0000,-0.2991,0.9452 +0.1152,-0.0000,-0.3067,0.9448 +0.1152,-0.0000,-0.3067,0.9448 +0.1152,-0.0000,-0.3067,0.9448 +0.1152,-0.0000,-0.3067,0.9448 +0.0991,-0.0000,-0.3167,0.9433 +0.0991,-0.0000,-0.3167,0.9433 +0.0991,-0.0000,-0.3167,0.9433 +0.0991,-0.0000,-0.3167,0.9433 +0.0831,-0.0000,-0.3307,0.9401 +0.0831,-0.0000,-0.3307,0.9401 +0.0831,-0.0000,-0.3307,0.9401 +0.0831,-0.0000,-0.3307,0.9401 +0.0670,-0.0000,-0.3514,0.9338 +0.0670,-0.0000,-0.3514,0.9338 +0.0670,-0.0000,-0.3514,0.9338 +0.0670,-0.0000,-0.3514,0.9338 +0.0510,-0.0000,-0.3848,0.9216 +0.0510,-0.0000,-0.3848,0.9216 +0.0510,-0.0000,-0.3848,0.9216 +0.0510,-0.0000,-0.3848,0.9216 +0.0351,-0.0000,-0.4473,0.8937 +0.0351,-0.0000,-0.4473,0.8937 +0.0351,-0.0000,-0.4473,0.8937 +0.0351,-0.0000,-0.4473,0.8937 +0.0196,-0.0000,-0.6000,0.7997 +0.0196,-0.0000,-0.6000,0.7997 +0.0196,-0.0000,-0.6000,0.7997 +0.0196,-0.0000,-0.6000,0.7997 +0.0079,-0.0000,-1.0000,-0.0001 +0.0079,-0.0000,-1.0000,-0.0001 +0.0079,-0.0000,-1.0000,-0.0001 +0.0079,-0.0000,-1.0000,-0.0001 +0.0162,-0.0000,-0.2425,-0.9700 +0.0162,-0.0000,-0.2425,-0.9700 +0.0162,-0.0000,-0.2425,-0.9700 +0.0162,-0.0000,-0.2425,-0.9700 +0.0314,-0.0000,0.0000,-0.9995 +0.0314,-0.0000,0.0000,-0.9995 +0.0314,-0.0000,0.0000,-0.9995 +0.0314,-0.0000,0.0000,-0.9995 +0.0473,-0.0000,0.0831,-0.9954 +0.0473,-0.0000,0.0831,-0.9954 +0.0473,-0.0000,0.0831,-0.9954 +0.0473,-0.0000,0.0831,-0.9954 +0.0633,-0.0000,0.1241,-0.9902 +0.0633,-0.0000,0.1241,-0.9902 +0.0633,-0.0000,0.1241,-0.9902 +0.0633,-0.0000,0.1241,-0.9902 +0.0793,-0.0000,0.1485,-0.9857 +0.0793,-0.0000,0.1485,-0.9857 +0.0793,-0.0000,0.1485,-0.9857 +0.0793,-0.0000,0.1485,-0.9857 +0.0954,-0.0000,0.1646,-0.9817 +0.0954,-0.0000,0.1646,-0.9817 +0.0954,-0.0000,0.1646,-0.9817 +0.0954,-0.0000,0.1646,-0.9817 +0.1114,-0.0000,0.1762,-0.9780 +0.1114,-0.0000,0.1762,-0.9780 +0.1114,-0.0000,0.1762,-0.9780 +0.1114,-0.0000,0.1762,-0.9780 +0.1275,-0.0000,0.1848,-0.9745 +0.1275,-0.0000,0.1848,-0.9745 +0.1275,-0.0000,0.1848,-0.9745 +0.1275,-0.0000,0.1848,-0.9745 +0.1435,-0.0000,0.1915,-0.9709 +0.1435,-0.0000,0.1915,-0.9709 +0.1435,-0.0000,0.1915,-0.9709 +0.1435,-0.0000,0.1915,-0.9709 +0.1594,-0.0000,0.1970,-0.9674 +0.1594,-0.0000,0.1970,-0.9674 +0.1594,-0.0000,0.1970,-0.9674 +0.1594,-0.0000,0.1970,-0.9674 +0.1753,-0.0000,0.2014,-0.9637 +0.1753,-0.0000,0.2014,-0.9637 +0.1753,-0.0000,0.2014,-0.9637 +0.1753,-0.0000,0.2014,-0.9637 +0.1912,-0.0000,0.2052,-0.9599 +0.1912,-0.0000,0.2052,-0.9599 +0.1912,-0.0000,0.2052,-0.9599 +0.1912,-0.0000,0.2052,-0.9599 +0.2070,-0.0000,0.2085,-0.9559 +0.2070,-0.0000,0.2085,-0.9559 +0.2070,-0.0000,0.2085,-0.9559 +0.2070,-0.0000,0.2085,-0.9559 +0.2227,-0.0000,0.2113,-0.9517 +0.2227,-0.0000,0.2113,-0.9517 +0.2227,-0.0000,0.2113,-0.9517 +0.2227,-0.0000,0.2113,-0.9517 +0.2384,-0.0000,0.2138,-0.9473 +0.2384,-0.0000,0.2138,-0.9473 +0.2384,-0.0000,0.2138,-0.9473 +0.2384,-0.0000,0.2138,-0.9473 +0.2540,-0.0000,0.2161,-0.9428 +0.2540,-0.0000,0.2161,-0.9428 +0.2540,-0.0000,0.2161,-0.9428 +0.2540,-0.0000,0.2161,-0.9428 +0.2695,-0.0000,0.2181,-0.9380 +0.2695,-0.0000,0.2181,-0.9380 +0.2695,-0.0000,0.2181,-0.9380 +0.2695,-0.0000,0.2181,-0.9380 +0.2849,-0.0000,0.2200,-0.9330 +0.2849,-0.0000,0.2200,-0.9330 +0.2849,-0.0000,0.2200,-0.9330 +0.2849,-0.0000,0.2200,-0.9330 +0.3002,-0.0000,0.2217,-0.9277 +0.3002,-0.0000,0.2217,-0.9277 +0.3002,-0.0000,0.2217,-0.9277 +0.3002,-0.0000,0.2217,-0.9277 +0.3155,-0.0000,0.2233,-0.9223 +0.3155,-0.0000,0.2233,-0.9223 +0.3155,-0.0000,0.2233,-0.9223 +0.3155,-0.0000,0.2233,-0.9223 +0.3306,-0.0000,0.2248,-0.9166 +0.3306,-0.0000,0.2248,-0.9166 +0.3306,-0.0000,0.2248,-0.9166 +0.3306,-0.0000,0.2248,-0.9166 +0.3457,-0.0000,0.2263,-0.9107 +0.3457,-0.0000,0.2263,-0.9107 +0.3457,-0.0000,0.2263,-0.9107 +0.3457,-0.0000,0.2263,-0.9107 +0.3606,-0.0000,0.2277,-0.9045 +0.3606,-0.0000,0.2277,-0.9045 +0.3606,-0.0000,0.2277,-0.9045 +0.3606,-0.0000,0.2277,-0.9045 +0.3754,-0.0000,0.2290,-0.8981 +0.3754,-0.0000,0.2290,-0.8981 +0.3754,-0.0000,0.2290,-0.8981 +0.3754,-0.0000,0.2290,-0.8981 +0.3901,-0.0000,0.2303,-0.8915 +0.3901,-0.0000,0.2303,-0.8915 +0.3901,-0.0000,0.2303,-0.8915 +0.3901,-0.0000,0.2303,-0.8915 +0.4047,-0.0000,0.2315,-0.8847 +0.4047,-0.0000,0.2315,-0.8847 +0.4047,-0.0000,0.2315,-0.8847 +0.4047,-0.0000,0.2315,-0.8847 +0.4192,-0.0000,0.2327,-0.8776 +0.4192,-0.0000,0.2327,-0.8776 +0.4192,-0.0000,0.2327,-0.8776 +0.4192,-0.0000,0.2327,-0.8776 +0.4335,-0.0000,0.2339,-0.8703 +0.4335,-0.0000,0.2339,-0.8703 +0.4335,-0.0000,0.2339,-0.8703 +0.4335,-0.0000,0.2339,-0.8703 +0.4477,-0.0000,0.2351,-0.8627 +0.4477,-0.0000,0.2351,-0.8627 +0.4477,-0.0000,0.2351,-0.8627 +0.4477,-0.0000,0.2351,-0.8627 +0.4617,-0.0000,0.2362,-0.8550 +0.4617,-0.0000,0.2362,-0.8550 +0.4617,-0.0000,0.2362,-0.8550 +0.4617,-0.0000,0.2362,-0.8550 +0.4756,-0.0000,0.2374,-0.8470 +0.4756,-0.0000,0.2374,-0.8470 +0.4756,-0.0000,0.2374,-0.8470 +0.4756,-0.0000,0.2374,-0.8470 +0.4894,-0.0000,0.2385,-0.8388 +0.4894,-0.0000,0.2385,-0.8388 +0.4894,-0.0000,0.2385,-0.8388 +0.4894,-0.0000,0.2385,-0.8388 +0.5030,-0.0000,0.2396,-0.8304 +0.5030,-0.0000,0.2396,-0.8304 +0.5030,-0.0000,0.2396,-0.8304 +0.5030,-0.0000,0.2396,-0.8304 +0.5164,-0.0000,0.2408,-0.8218 +0.5164,-0.0000,0.2408,-0.8218 +0.5164,-0.0000,0.2408,-0.8218 +0.5164,-0.0000,0.2408,-0.8218 +0.5297,-0.0000,0.2419,-0.8130 +0.5297,-0.0000,0.2419,-0.8130 +0.5297,-0.0000,0.2419,-0.8130 +0.5297,-0.0000,0.2419,-0.8130 +0.5428,-0.0000,0.2431,-0.8039 +0.5428,-0.0000,0.2431,-0.8039 +0.5428,-0.0000,0.2431,-0.8039 +0.5428,-0.0000,0.2431,-0.8039 +0.5558,-0.0000,0.2442,-0.7947 +0.5558,-0.0000,0.2442,-0.7947 +0.5558,-0.0000,0.2442,-0.7947 +0.5558,-0.0000,0.2442,-0.7947 +0.5685,-0.0000,0.2454,-0.7852 +0.5685,-0.0000,0.2454,-0.7852 +0.5685,-0.0000,0.2454,-0.7852 +0.5685,-0.0000,0.2454,-0.7852 +0.5811,-0.0000,0.2465,-0.7756 +0.5811,-0.0000,0.2465,-0.7756 +0.5811,-0.0000,0.2465,-0.7756 +0.5811,-0.0000,0.2465,-0.7756 +0.5936,-0.0000,0.2477,-0.7657 +0.5936,-0.0000,0.2477,-0.7657 +0.5936,-0.0000,0.2477,-0.7657 +0.5936,-0.0000,0.2477,-0.7657 +0.6058,-0.0000,0.2489,-0.7557 +0.6058,-0.0000,0.2489,-0.7557 +0.6058,-0.0000,0.2489,-0.7557 +0.6058,-0.0000,0.2489,-0.7557 +0.6179,-0.0000,0.2501,-0.7455 +0.6179,-0.0000,0.2501,-0.7455 +0.6179,-0.0000,0.2501,-0.7455 +0.6179,-0.0000,0.2501,-0.7455 +0.6297,-0.0000,0.2513,-0.7351 +0.6297,-0.0000,0.2513,-0.7351 +0.6297,-0.0000,0.2513,-0.7351 +0.6297,-0.0000,0.2513,-0.7351 +0.6414,-0.0000,0.2525,-0.7245 +0.6414,-0.0000,0.2525,-0.7245 +0.6414,-0.0000,0.2525,-0.7245 +0.6414,-0.0000,0.2525,-0.7245 +0.6528,-0.0000,0.2538,-0.7137 +0.6528,-0.0000,0.2538,-0.7137 +0.6528,-0.0000,0.2538,-0.7137 +0.6528,-0.0000,0.2538,-0.7137 +0.6641,-0.0000,0.2550,-0.7028 +0.6641,-0.0000,0.2550,-0.7028 +0.6641,-0.0000,0.2550,-0.7028 +0.6641,-0.0000,0.2550,-0.7028 +0.6752,-0.0000,0.2563,-0.6917 +0.6752,-0.0000,0.2563,-0.6917 +0.6752,-0.0000,0.2563,-0.6917 +0.6752,-0.0000,0.2563,-0.6917 +0.6860,-0.0000,0.2576,-0.6804 +0.6860,-0.0000,0.2576,-0.6804 +0.6860,-0.0000,0.2576,-0.6804 +0.6860,-0.0000,0.2576,-0.6804 +0.6967,-0.0000,0.2590,-0.6690 +0.6967,-0.0000,0.2590,-0.6690 +0.6967,-0.0000,0.2590,-0.6690 +0.6967,-0.0000,0.2590,-0.6690 +0.7071,-0.0000,0.2603,-0.6575 +0.7071,-0.0000,0.2603,-0.6575 +0.7071,-0.0000,0.2603,-0.6575 +0.7071,-0.0000,0.2603,-0.6575 +0.7173,-0.0000,0.2617,-0.6457 +0.7173,-0.0000,0.2617,-0.6457 +0.7173,-0.0000,0.2617,-0.6457 +0.7173,-0.0000,0.2617,-0.6457 +0.7273,-0.0000,0.2631,-0.6339 +0.7273,-0.0000,0.2631,-0.6339 +0.7273,-0.0000,0.2631,-0.6339 +0.7273,-0.0000,0.2631,-0.6339 +0.7371,-0.0000,0.2645,-0.6219 +0.7371,-0.0000,0.2645,-0.6219 +0.7371,-0.0000,0.2645,-0.6219 +0.7371,-0.0000,0.2645,-0.6219 +0.7467,-0.0000,0.2659,-0.6097 +0.7467,-0.0000,0.2659,-0.6097 +0.7467,-0.0000,0.2659,-0.6097 +0.7467,-0.0000,0.2659,-0.6097 +0.7560,-0.0000,0.2674,-0.5974 +0.7560,-0.0000,0.2674,-0.5974 +0.7560,-0.0000,0.2674,-0.5974 +0.7560,-0.0000,0.2674,-0.5974 +0.7651,-0.0000,0.2689,-0.5851 +0.7651,-0.0000,0.2689,-0.5851 +0.7651,-0.0000,0.2689,-0.5851 +0.7651,-0.0000,0.2689,-0.5851 +0.7740,-0.0000,0.2705,-0.5725 +0.7740,-0.0000,0.2705,-0.5725 +0.7740,-0.0000,0.2705,-0.5725 +0.7740,-0.0000,0.2705,-0.5725 +0.7826,-0.0000,0.2720,-0.5599 +0.7826,-0.0000,0.2720,-0.5599 +0.7826,-0.0000,0.2720,-0.5599 +0.7826,-0.0000,0.2720,-0.5599 +0.7910,-0.0000,0.2736,-0.5472 +0.7910,-0.0000,0.2736,-0.5472 +0.7910,-0.0000,0.2736,-0.5472 +0.7910,-0.0000,0.2736,-0.5472 +0.7992,-0.0000,0.2752,-0.5343 +0.7992,-0.0000,0.2752,-0.5343 +0.7992,-0.0000,0.2752,-0.5343 +0.7992,-0.0000,0.2752,-0.5343 +0.8072,-0.0000,0.2769,-0.5214 +0.8072,-0.0000,0.2769,-0.5214 +0.8072,-0.0000,0.2769,-0.5214 +0.8072,-0.0000,0.2769,-0.5214 +0.8149,-0.0000,0.2786,-0.5083 +0.8149,-0.0000,0.2786,-0.5083 +0.8149,-0.0000,0.2786,-0.5083 +0.8149,-0.0000,0.2786,-0.5083 +0.8223,-0.0000,0.2803,-0.4952 +0.8223,-0.0000,0.2803,-0.4952 +0.8223,-0.0000,0.2803,-0.4952 +0.8223,-0.0000,0.2803,-0.4952 +0.8295,-0.0000,0.2820,-0.4820 +0.8295,-0.0000,0.2820,-0.4820 +0.8295,-0.0000,0.2820,-0.4820 +0.8295,-0.0000,0.2820,-0.4820 +0.8365,-0.0000,0.2838,-0.4687 +0.8365,-0.0000,0.2838,-0.4687 +0.8365,-0.0000,0.2838,-0.4687 +0.8365,-0.0000,0.2838,-0.4687 +0.8433,-0.0000,0.2857,-0.4553 +0.8433,-0.0000,0.2857,-0.4553 +0.8433,-0.0000,0.2857,-0.4553 +0.8433,-0.0000,0.2857,-0.4553 +0.8497,-0.0000,0.2875,-0.4419 +0.8497,-0.0000,0.2875,-0.4419 +0.8497,-0.0000,0.2875,-0.4419 +0.8497,-0.0000,0.2875,-0.4419 +0.8560,-0.0000,0.2894,-0.4284 +0.8560,-0.0000,0.2894,-0.4284 +0.8560,-0.0000,0.2894,-0.4284 +0.8560,-0.0000,0.2894,-0.4284 +0.8620,-0.0000,0.2913,-0.4148 +0.8620,-0.0000,0.2913,-0.4148 +0.8620,-0.0000,0.2913,-0.4148 +0.8620,-0.0000,0.2913,-0.4148 +0.8677,-0.0000,0.2933,-0.4012 +0.8677,-0.0000,0.2933,-0.4012 +0.8677,-0.0000,0.2933,-0.4012 +0.8677,-0.0000,0.2933,-0.4012 +0.8732,-0.0000,0.2953,-0.3876 +0.8732,-0.0000,0.2953,-0.3876 +0.8732,-0.0000,0.2953,-0.3876 +0.8732,-0.0000,0.2953,-0.3876 +0.8785,-0.0000,0.2974,-0.3739 +0.8785,-0.0000,0.2974,-0.3739 +0.8785,-0.0000,0.2974,-0.3739 +0.8785,-0.0000,0.2974,-0.3739 +0.8835,-0.0000,0.2995,-0.3602 +0.8835,-0.0000,0.2995,-0.3602 +0.8835,-0.0000,0.2995,-0.3602 +0.8835,-0.0000,0.2995,-0.3602 +0.8883,-0.0000,0.3016,-0.3465 +0.8883,-0.0000,0.3016,-0.3465 +0.8883,-0.0000,0.3016,-0.3465 +0.8883,-0.0000,0.3016,-0.3465 +0.8928,-0.0000,0.3038,-0.3327 +0.8928,-0.0000,0.3038,-0.3327 +0.8928,-0.0000,0.3038,-0.3327 +0.8928,-0.0000,0.3038,-0.3327 +0.8970,-0.0000,0.3060,-0.3189 +0.8970,-0.0000,0.3060,-0.3189 +0.8970,-0.0000,0.3060,-0.3189 +0.8970,-0.0000,0.3060,-0.3189 +0.9010,-0.0000,0.3083,-0.3051 +0.9010,-0.0000,0.3083,-0.3051 +0.9010,-0.0000,0.3083,-0.3051 +0.9010,-0.0000,0.3083,-0.3051 +0.9048,-0.0000,0.3106,-0.2913 +0.9048,-0.0000,0.3106,-0.2913 +0.9048,-0.0000,0.3106,-0.2913 +0.9048,-0.0000,0.3106,-0.2913 +0.9083,-0.0000,0.3130,-0.2776 +0.9083,-0.0000,0.3130,-0.2776 +0.9083,-0.0000,0.3130,-0.2776 +0.9083,-0.0000,0.3130,-0.2776 +0.9116,-0.0000,0.3154,-0.2638 +0.9116,-0.0000,0.3154,-0.2638 +0.9116,-0.0000,0.3154,-0.2638 +0.9116,-0.0000,0.3154,-0.2638 +0.9146,-0.0000,0.3179,-0.2500 +0.9146,-0.0000,0.3179,-0.2500 +0.9146,-0.0000,0.3179,-0.2500 +0.9146,-0.0000,0.3179,-0.2500 +0.9174,-0.0000,0.3204,-0.2363 +0.9174,-0.0000,0.3204,-0.2363 +0.9174,-0.0000,0.3204,-0.2363 +0.9174,-0.0000,0.3204,-0.2363 +0.9199,-0.0000,0.3229,-0.2226 +0.9199,-0.0000,0.3229,-0.2226 +0.9199,-0.0000,0.3229,-0.2226 +0.9199,-0.0000,0.3229,-0.2226 +0.9222,-0.0000,0.3256,-0.2089 +0.9222,-0.0000,0.3256,-0.2089 +0.9222,-0.0000,0.3256,-0.2089 +0.9222,-0.0000,0.3256,-0.2089 +0.9242,-0.0000,0.3282,-0.1952 +0.9242,-0.0000,0.3282,-0.1952 +0.9242,-0.0000,0.3282,-0.1952 +0.9242,-0.0000,0.3282,-0.1952 +0.9260,-0.0000,0.3309,-0.1817 +0.9260,-0.0000,0.3309,-0.1817 +0.9260,-0.0000,0.3309,-0.1817 +0.9260,-0.0000,0.3309,-0.1817 +0.9276,-0.0000,0.3337,-0.1681 +0.9276,-0.0000,0.3337,-0.1681 +0.9276,-0.0000,0.3337,-0.1681 +0.9276,-0.0000,0.3337,-0.1681 +0.9289,-0.0000,0.3366,-0.1546 +0.9289,-0.0000,0.3366,-0.1546 +0.9289,-0.0000,0.3366,-0.1546 +0.9289,-0.0000,0.3366,-0.1546 +0.9300,-0.0000,0.3395,-0.1412 +0.9300,-0.0000,0.3395,-0.1412 +0.9300,-0.0000,0.3395,-0.1412 +0.9300,-0.0000,0.3395,-0.1412 +0.9308,-0.0000,0.3424,-0.1279 +0.9308,-0.0000,0.3424,-0.1279 +0.9308,-0.0000,0.3424,-0.1279 +0.9308,-0.0000,0.3424,-0.1279 +0.9314,-0.0000,0.3454,-0.1146 +0.9314,-0.0000,0.3454,-0.1146 +0.9314,-0.0000,0.3454,-0.1146 +0.9314,-0.0000,0.3454,-0.1146 +0.9318,-0.0000,0.3485,-0.1015 +0.9318,-0.0000,0.3485,-0.1015 +0.9318,-0.0000,0.3485,-0.1015 +0.9318,-0.0000,0.3485,-0.1015 +0.9320,-0.0000,0.3516,-0.0884 +0.9320,-0.0000,0.3516,-0.0884 +0.9320,-0.0000,0.3516,-0.0884 +0.9320,-0.0000,0.3516,-0.0884 +0.9319,-0.0000,0.3548,-0.0754 +0.9319,-0.0000,0.3548,-0.0754 +0.9319,-0.0000,0.3548,-0.0754 +0.9319,-0.0000,0.3548,-0.0754 +0.9316,-0.0000,0.3581,-0.0625 +0.9316,-0.0000,0.3581,-0.0625 +0.9316,-0.0000,0.3581,-0.0625 +0.9316,-0.0000,0.3581,-0.0625 +0.9311,-0.0000,0.3614,-0.0498 +0.9311,-0.0000,0.3614,-0.0498 +0.9311,-0.0000,0.3614,-0.0498 +0.9311,-0.0000,0.3614,-0.0498 +0.9303,-0.0000,0.3648,-0.0371 +0.9303,-0.0000,0.3648,-0.0371 +0.9303,-0.0000,0.3648,-0.0371 +0.9303,-0.0000,0.3648,-0.0371 +0.9294,-0.0000,0.3683,-0.0246 +0.9294,-0.0000,0.3683,-0.0246 +0.9294,-0.0000,0.3683,-0.0246 +0.9294,-0.0000,0.3683,-0.0246 +0.9282,-0.0000,0.3718,-0.0122 +0.9282,-0.0000,0.3718,-0.0122 +0.9282,-0.0000,0.3718,-0.0122 +0.9282,-0.0000,0.3718,-0.0122 +0.9269,0.0000,0.3754,0.0000 +0.9269,0.0000,0.3754,0.0000 +0.9269,0.0000,0.3754,0.0000 +0.9269,0.0000,0.3754,0.0000 diff --git a/scripts/trajectories/full-circle-with-up-and-down-4s-fixed-pos-offset-Vector3.csv b/scripts/trajectories/full-circle-with-up-and-down-4s-fixed-pos-offset-Vector3.csv new file mode 100644 index 0000000000000000000000000000000000000000..c858131d945425a27860315c123758a1544ad922 --- /dev/null +++ b/scripts/trajectories/full-circle-with-up-and-down-4s-fixed-pos-offset-Vector3.csv @@ -0,0 +1,200 @@ +10.0000,10.0000,10.0000,10.7012,9.9780,9.2874 +10.0000,10.0000,10.0000,10.7057,9.9556,9.2929 +10.0000,10.0000,10.0000,10.7095,9.9329,9.2985 +10.0000,10.0000,10.0000,10.7125,9.9100,9.3041 +10.0000,10.0000,10.0000,10.7147,9.8868,9.3097 +10.0000,10.0000,10.0000,10.7161,9.8634,9.3155 +10.0000,10.0000,10.0000,10.7166,9.8398,9.3212 +10.0000,10.0000,10.0000,10.7164,9.8161,9.3270 +10.0000,10.0000,10.0000,10.7153,9.7922,9.3328 +10.0000,10.0000,10.0000,10.7134,9.7682,9.3387 +10.0000,10.0000,10.0000,10.7106,9.7442,9.3446 +10.0000,10.0000,10.0000,10.7070,9.7201,9.3506 +10.0000,10.0000,10.0000,10.7025,9.6960,9.3565 +10.0000,10.0000,10.0000,10.6972,9.6719,9.3626 +10.0000,10.0000,10.0000,10.6910,9.6479,9.3686 +10.0000,10.0000,10.0000,10.6839,9.6240,9.3748 +10.0000,10.0000,10.0000,10.6760,9.6002,9.3809 +10.0000,10.0000,10.0000,10.6671,9.5766,9.3871 +10.0000,10.0000,10.0000,10.6575,9.5532,9.3933 +10.0000,10.0000,10.0000,10.6470,9.5300,9.3996 +10.0000,10.0000,10.0000,10.6356,9.5070,9.4059 +10.0000,10.0000,10.0000,10.6234,9.4843,9.4122 +10.0000,10.0000,10.0000,10.6103,9.4620,9.4186 +10.0000,10.0000,10.0000,10.5964,9.4399,9.4250 +10.0000,10.0000,10.0000,10.5817,9.4183,9.4314 +10.0000,10.0000,10.0000,10.5662,9.3971,9.4379 +10.0000,10.0000,10.0000,10.5499,9.3763,9.4444 +10.0000,10.0000,10.0000,10.5328,9.3560,9.4510 +10.0000,10.0000,10.0000,10.5149,9.3362,9.4576 +10.0000,10.0000,10.0000,10.4963,9.3169,9.4642 +10.0000,10.0000,10.0000,10.4769,9.2982,9.4708 +10.0000,10.0000,10.0000,10.4569,9.2801,9.4775 +10.0000,10.0000,10.0000,10.4361,9.2626,9.4842 +10.0000,10.0000,10.0000,10.4147,9.2457,9.4910 +10.0000,10.0000,10.0000,10.3926,9.2295,9.4977 +10.0000,10.0000,10.0000,10.3698,9.2140,9.5045 +10.0000,10.0000,10.0000,10.3465,9.1993,9.5114 +10.0000,10.0000,10.0000,10.3226,9.1852,9.5182 +10.0000,10.0000,10.0000,10.2981,9.1720,9.5251 +10.0000,10.0000,10.0000,10.2731,9.1595,9.5321 +10.0000,10.0000,10.0000,10.2476,9.1478,9.5390 +10.0000,10.0000,10.0000,10.2216,9.1370,9.5460 +10.0000,10.0000,10.0000,10.1951,9.1270,9.5530 +10.0000,10.0000,10.0000,10.1683,9.1179,9.5601 +10.0000,10.0000,10.0000,10.1410,9.1096,9.5671 +10.0000,10.0000,10.0000,10.1134,9.1023,9.5742 +10.0000,10.0000,10.0000,10.0855,9.0959,9.5813 +10.0000,10.0000,10.0000,10.0572,9.0904,9.5885 +10.0000,10.0000,10.0000,10.0287,9.0858,9.5957 +10.0000,10.0000,10.0000,10.0000,9.0822,9.6029 +10.0000,10.0000,10.0000,9.9711,9.0796,9.6101 +10.0000,10.0000,10.0000,9.9420,9.0779,9.6173 +10.0000,10.0000,10.0000,9.9128,9.0773,9.6246 +10.0000,10.0000,10.0000,9.8835,9.0776,9.6319 +10.0000,10.0000,10.0000,9.8541,9.0788,9.6392 +10.0000,10.0000,10.0000,9.8247,9.0811,9.6465 +10.0000,10.0000,10.0000,9.7953,9.0844,9.6539 +10.0000,10.0000,10.0000,9.7660,9.0887,9.6613 +10.0000,10.0000,10.0000,9.7368,9.0940,9.6687 +10.0000,10.0000,10.0000,9.7076,9.1002,9.6761 +10.0000,10.0000,10.0000,9.6787,9.1075,9.6835 +10.0000,10.0000,10.0000,9.6499,9.1157,9.6910 +10.0000,10.0000,10.0000,9.6213,9.1250,9.6985 +10.0000,10.0000,10.0000,9.5930,9.1352,9.7060 +10.0000,10.0000,10.0000,9.5650,9.1464,9.7135 +10.0000,10.0000,10.0000,9.5374,9.1585,9.7210 +10.0000,10.0000,10.0000,9.5101,9.1716,9.7286 +10.0000,10.0000,10.0000,9.4832,9.1856,9.7361 +10.0000,10.0000,10.0000,9.4567,9.2005,9.7437 +10.0000,10.0000,10.0000,9.4307,9.2164,9.7513 +10.0000,10.0000,10.0000,9.4052,9.2331,9.7589 +10.0000,10.0000,10.0000,9.3802,9.2508,9.7666 +10.0000,10.0000,10.0000,9.3558,9.2693,9.7742 +10.0000,10.0000,10.0000,9.3319,9.2886,9.7819 +10.0000,10.0000,10.0000,9.3087,9.3087,9.7895 +10.0000,10.0000,10.0000,9.2862,9.3297,9.7972 +10.0000,10.0000,10.0000,9.2643,9.3514,9.8049 +10.0000,10.0000,10.0000,9.2431,9.3739,9.8126 +10.0000,10.0000,10.0000,9.2227,9.3971,9.8203 +10.0000,10.0000,10.0000,9.2030,9.4210,9.8281 +10.0000,10.0000,10.0000,9.1841,9.4455,9.8358 +10.0000,10.0000,10.0000,9.1661,9.4708,9.8436 +10.0000,10.0000,10.0000,9.1488,9.4966,9.8513 +10.0000,10.0000,10.0000,9.1324,9.5231,9.8591 +10.0000,10.0000,10.0000,9.1169,9.5501,9.8669 +10.0000,10.0000,10.0000,9.1023,9.5776,9.8747 +10.0000,10.0000,10.0000,9.0886,9.6056,9.8825 +10.0000,10.0000,10.0000,9.0758,9.6341,9.8903 +10.0000,10.0000,10.0000,9.0640,9.6630,9.8981 +10.0000,10.0000,10.0000,9.0532,9.6924,9.9059 +10.0000,10.0000,10.0000,9.0433,9.7221,9.9137 +10.0000,10.0000,10.0000,9.0344,9.7521,9.9215 +10.0000,10.0000,10.0000,9.0265,9.7824,9.9294 +10.0000,10.0000,10.0000,9.0197,9.8130,9.9372 +10.0000,10.0000,10.0000,9.0138,9.8438,9.9451 +10.0000,10.0000,10.0000,9.0090,9.8748,9.9529 +10.0000,10.0000,10.0000,9.0052,9.9060,9.9607 +10.0000,10.0000,10.0000,9.0025,9.9372,9.9686 +10.0000,10.0000,10.0000,9.0008,9.9686,9.9764 +10.0000,10.0000,10.0000,9.0001,10.0000,9.9843 +10.0000,10.0000,10.0000,9.0005,10.0314,9.9921 +10.0000,10.0000,10.0000,9.0020,10.0628,10.0000 +10.0000,10.0000,10.0000,9.0045,10.0941,10.0079 +10.0000,10.0000,10.0000,9.0080,10.1253,10.0157 +10.0000,10.0000,10.0000,9.0126,10.1564,10.0236 +10.0000,10.0000,10.0000,9.0182,10.1873,10.0314 +10.0000,10.0000,10.0000,9.0248,10.2180,10.0393 +10.0000,10.0000,10.0000,9.0325,10.2484,10.0471 +10.0000,10.0000,10.0000,9.0412,10.2786,10.0550 +10.0000,10.0000,10.0000,9.0508,10.3084,10.0628 +10.0000,10.0000,10.0000,9.0615,10.3379,10.0706 +10.0000,10.0000,10.0000,9.0731,10.3670,10.0785 +10.0000,10.0000,10.0000,9.0857,10.3957,10.0863 +10.0000,10.0000,10.0000,9.0992,10.4239,10.0941 +10.0000,10.0000,10.0000,9.1136,10.4516,10.1019 +10.0000,10.0000,10.0000,9.1290,10.4788,10.1097 +10.0000,10.0000,10.0000,9.1452,10.5055,10.1175 +10.0000,10.0000,10.0000,9.1623,10.5316,10.1253 +10.0000,10.0000,10.0000,9.1803,10.5571,10.1331 +10.0000,10.0000,10.0000,9.1991,10.5819,10.1409 +10.0000,10.0000,10.0000,9.2186,10.6061,10.1487 +10.0000,10.0000,10.0000,9.2390,10.6296,10.1564 +10.0000,10.0000,10.0000,9.2601,10.6523,10.1642 +10.0000,10.0000,10.0000,9.2819,10.6744,10.1719 +10.0000,10.0000,10.0000,9.3044,10.6956,10.1797 +10.0000,10.0000,10.0000,9.3276,10.7161,10.1874 +10.0000,10.0000,10.0000,9.3514,10.7357,10.1951 +10.0000,10.0000,10.0000,9.3758,10.7545,10.2028 +10.0000,10.0000,10.0000,9.4008,10.7725,10.2105 +10.0000,10.0000,10.0000,9.4264,10.7895,10.2181 +10.0000,10.0000,10.0000,9.4524,10.8057,10.2258 +10.0000,10.0000,10.0000,9.4790,10.8210,10.2334 +10.0000,10.0000,10.0000,9.5060,10.8354,10.2411 +10.0000,10.0000,10.0000,9.5334,10.8488,10.2487 +10.0000,10.0000,10.0000,9.5612,10.8612,10.2563 +10.0000,10.0000,10.0000,9.5893,10.8728,10.2639 +10.0000,10.0000,10.0000,9.6178,10.8833,10.2714 +10.0000,10.0000,10.0000,9.6465,10.8929,10.2790 +10.0000,10.0000,10.0000,9.6755,10.9014,10.2865 +10.0000,10.0000,10.0000,9.7046,10.9090,10.2940 +10.0000,10.0000,10.0000,9.7340,10.9156,10.3015 +10.0000,10.0000,10.0000,9.7635,10.9212,10.3090 +10.0000,10.0000,10.0000,9.7931,10.9258,10.3165 +10.0000,10.0000,10.0000,9.8227,10.9293,10.3239 +10.0000,10.0000,10.0000,9.8524,10.9319,10.3313 +10.0000,10.0000,10.0000,9.8821,10.9335,10.3387 +10.0000,10.0000,10.0000,9.9117,10.9340,10.3461 +10.0000,10.0000,10.0000,9.9413,10.9336,10.3535 +10.0000,10.0000,10.0000,9.9707,10.9322,10.3608 +10.0000,10.0000,10.0000,10.0000,10.9298,10.3681 +10.0000,10.0000,10.0000,10.0291,10.9264,10.3754 +10.0000,10.0000,10.0000,10.0580,10.9221,10.3827 +10.0000,10.0000,10.0000,10.0867,10.9168,10.3899 +10.0000,10.0000,10.0000,10.1150,10.9105,10.3971 +10.0000,10.0000,10.0000,10.1431,10.9033,10.4043 +10.0000,10.0000,10.0000,10.1708,10.8953,10.4115 +10.0000,10.0000,10.0000,10.1981,10.8863,10.4187 +10.0000,10.0000,10.0000,10.2250,10.8764,10.4258 +10.0000,10.0000,10.0000,10.2515,10.8657,10.4329 +10.0000,10.0000,10.0000,10.2775,10.8541,10.4399 +10.0000,10.0000,10.0000,10.3030,10.8417,10.4470 +10.0000,10.0000,10.0000,10.3280,10.8284,10.4540 +10.0000,10.0000,10.0000,10.3524,10.8144,10.4610 +10.0000,10.0000,10.0000,10.3763,10.7997,10.4679 +10.0000,10.0000,10.0000,10.3995,10.7841,10.4749 +10.0000,10.0000,10.0000,10.4222,10.7679,10.4818 +10.0000,10.0000,10.0000,10.4441,10.7510,10.4886 +10.0000,10.0000,10.0000,10.4654,10.7334,10.4955 +10.0000,10.0000,10.0000,10.4860,10.7152,10.5023 +10.0000,10.0000,10.0000,10.5059,10.6964,10.5090 +10.0000,10.0000,10.0000,10.5251,10.6769,10.5158 +10.0000,10.0000,10.0000,10.5435,10.6570,10.5225 +10.0000,10.0000,10.0000,10.5611,10.6365,10.5292 +10.0000,10.0000,10.0000,10.5780,10.6155,10.5358 +10.0000,10.0000,10.0000,10.5940,10.5940,10.5424 +10.0000,10.0000,10.0000,10.6093,10.5721,10.5490 +10.0000,10.0000,10.0000,10.6237,10.5499,10.5556 +10.0000,10.0000,10.0000,10.6373,10.5272,10.5621 +10.0000,10.0000,10.0000,10.6500,10.5042,10.5686 +10.0000,10.0000,10.0000,10.6619,10.4809,10.5750 +10.0000,10.0000,10.0000,10.6729,10.4573,10.5814 +10.0000,10.0000,10.0000,10.6831,10.4335,10.5878 +10.0000,10.0000,10.0000,10.6924,10.4095,10.5941 +10.0000,10.0000,10.0000,10.7008,10.3852,10.6004 +10.0000,10.0000,10.0000,10.7083,10.3609,10.6067 +10.0000,10.0000,10.0000,10.7150,10.3364,10.6129 +10.0000,10.0000,10.0000,10.7207,10.3119,10.6191 +10.0000,10.0000,10.0000,10.7256,10.2873,10.6252 +10.0000,10.0000,10.0000,10.7296,10.2627,10.6314 +10.0000,10.0000,10.0000,10.7328,10.2381,10.6374 +10.0000,10.0000,10.0000,10.7351,10.2136,10.6435 +10.0000,10.0000,10.0000,10.7365,10.1891,10.6494 +10.0000,10.0000,10.0000,10.7371,10.1648,10.6554 +10.0000,10.0000,10.0000,10.7368,10.1406,10.6613 +10.0000,10.0000,10.0000,10.7357,10.1165,10.6672 +10.0000,10.0000,10.0000,10.7338,10.0927,10.6730 +10.0000,10.0000,10.0000,10.7311,10.0691,10.6788 +10.0000,10.0000,10.0000,10.7275,10.0458,10.6845 +10.0000,10.0000,10.0000,10.7232,10.0227,10.6903 +10.0000,10.0000,10.0000,10.7181,10.0000,10.6959 diff --git a/scripts/trajectories/full-circle-with-up-and-down-4s.csv b/scripts/trajectories/full-circle-with-up-and-down-4s.csv new file mode 100644 index 0000000000000000000000000000000000000000..31692f46736eacc50237c02ec4a532cee6c67927 --- /dev/null +++ b/scripts/trajectories/full-circle-with-up-and-down-4s.csv @@ -0,0 +1,800 @@ +0.9223,-0.0000,0.3863,-0.0119 +0.9223,-0.0000,0.3863,-0.0119 +0.9223,-0.0000,0.3863,-0.0119 +0.9223,-0.0000,0.3863,-0.0119 +0.9235,-0.0000,0.3828,-0.0240 +0.9235,-0.0000,0.3828,-0.0240 +0.9235,-0.0000,0.3828,-0.0240 +0.9235,-0.0000,0.3828,-0.0240 +0.9245,-0.0000,0.3794,-0.0363 +0.9245,-0.0000,0.3794,-0.0363 +0.9245,-0.0000,0.3794,-0.0363 +0.9245,-0.0000,0.3794,-0.0363 +0.9253,-0.0000,0.3760,-0.0486 +0.9253,-0.0000,0.3760,-0.0486 +0.9253,-0.0000,0.3760,-0.0486 +0.9253,-0.0000,0.3760,-0.0486 +0.9259,-0.0000,0.3727,-0.0611 +0.9259,-0.0000,0.3727,-0.0611 +0.9259,-0.0000,0.3727,-0.0611 +0.9259,-0.0000,0.3727,-0.0611 +0.9263,-0.0000,0.3695,-0.0737 +0.9263,-0.0000,0.3695,-0.0737 +0.9263,-0.0000,0.3695,-0.0737 +0.9263,-0.0000,0.3695,-0.0737 +0.9265,-0.0000,0.3663,-0.0865 +0.9265,-0.0000,0.3663,-0.0865 +0.9265,-0.0000,0.3663,-0.0865 +0.9265,-0.0000,0.3663,-0.0865 +0.9264,-0.0000,0.3632,-0.0993 +0.9264,-0.0000,0.3632,-0.0993 +0.9264,-0.0000,0.3632,-0.0993 +0.9264,-0.0000,0.3632,-0.0993 +0.9261,-0.0000,0.3602,-0.1122 +0.9261,-0.0000,0.3602,-0.1122 +0.9261,-0.0000,0.3602,-0.1122 +0.9261,-0.0000,0.3602,-0.1122 +0.9256,-0.0000,0.3572,-0.1252 +0.9256,-0.0000,0.3572,-0.1252 +0.9256,-0.0000,0.3572,-0.1252 +0.9256,-0.0000,0.3572,-0.1252 +0.9248,-0.0000,0.3543,-0.1383 +0.9248,-0.0000,0.3543,-0.1383 +0.9248,-0.0000,0.3543,-0.1383 +0.9248,-0.0000,0.3543,-0.1383 +0.9239,-0.0000,0.3515,-0.1515 +0.9239,-0.0000,0.3515,-0.1515 +0.9239,-0.0000,0.3515,-0.1515 +0.9239,-0.0000,0.3515,-0.1515 +0.9226,-0.0000,0.3487,-0.1648 +0.9226,-0.0000,0.3487,-0.1648 +0.9226,-0.0000,0.3487,-0.1648 +0.9226,-0.0000,0.3487,-0.1648 +0.9212,-0.0000,0.3460,-0.1781 +0.9212,-0.0000,0.3460,-0.1781 +0.9212,-0.0000,0.3460,-0.1781 +0.9212,-0.0000,0.3460,-0.1781 +0.9195,-0.0000,0.3433,-0.1914 +0.9195,-0.0000,0.3433,-0.1914 +0.9195,-0.0000,0.3433,-0.1914 +0.9195,-0.0000,0.3433,-0.1914 +0.9176,-0.0000,0.3407,-0.2049 +0.9176,-0.0000,0.3407,-0.2049 +0.9176,-0.0000,0.3407,-0.2049 +0.9176,-0.0000,0.3407,-0.2049 +0.9154,-0.0000,0.3382,-0.2183 +0.9154,-0.0000,0.3382,-0.2183 +0.9154,-0.0000,0.3382,-0.2183 +0.9154,-0.0000,0.3382,-0.2183 +0.9130,-0.0000,0.3357,-0.2319 +0.9130,-0.0000,0.3357,-0.2319 +0.9130,-0.0000,0.3357,-0.2319 +0.9130,-0.0000,0.3357,-0.2319 +0.9104,-0.0000,0.3332,-0.2454 +0.9104,-0.0000,0.3332,-0.2454 +0.9104,-0.0000,0.3332,-0.2454 +0.9104,-0.0000,0.3332,-0.2454 +0.9075,-0.0000,0.3308,-0.2590 +0.9075,-0.0000,0.3308,-0.2590 +0.9075,-0.0000,0.3308,-0.2590 +0.9075,-0.0000,0.3308,-0.2590 +0.9043,-0.0000,0.3285,-0.2726 +0.9043,-0.0000,0.3285,-0.2726 +0.9043,-0.0000,0.3285,-0.2726 +0.9043,-0.0000,0.3285,-0.2726 +0.9009,-0.0000,0.3262,-0.2862 +0.9009,-0.0000,0.3262,-0.2862 +0.9009,-0.0000,0.3262,-0.2862 +0.9009,-0.0000,0.3262,-0.2862 +0.8973,-0.0000,0.3240,-0.2998 +0.8973,-0.0000,0.3240,-0.2998 +0.8973,-0.0000,0.3240,-0.2998 +0.8973,-0.0000,0.3240,-0.2998 +0.8934,-0.0000,0.3218,-0.3134 +0.8934,-0.0000,0.3218,-0.3134 +0.8934,-0.0000,0.3218,-0.3134 +0.8934,-0.0000,0.3218,-0.3134 +0.8893,-0.0000,0.3197,-0.3271 +0.8893,-0.0000,0.3197,-0.3271 +0.8893,-0.0000,0.3197,-0.3271 +0.8893,-0.0000,0.3197,-0.3271 +0.8849,-0.0000,0.3176,-0.3407 +0.8849,-0.0000,0.3176,-0.3407 +0.8849,-0.0000,0.3176,-0.3407 +0.8849,-0.0000,0.3176,-0.3407 +0.8803,-0.0000,0.3156,-0.3543 +0.8803,-0.0000,0.3156,-0.3543 +0.8803,-0.0000,0.3156,-0.3543 +0.8803,-0.0000,0.3156,-0.3543 +0.8754,-0.0000,0.3136,-0.3678 +0.8754,-0.0000,0.3136,-0.3678 +0.8754,-0.0000,0.3136,-0.3678 +0.8754,-0.0000,0.3136,-0.3678 +0.8703,-0.0000,0.3116,-0.3814 +0.8703,-0.0000,0.3116,-0.3814 +0.8703,-0.0000,0.3116,-0.3814 +0.8703,-0.0000,0.3116,-0.3814 +0.8650,-0.0000,0.3097,-0.3949 +0.8650,-0.0000,0.3097,-0.3949 +0.8650,-0.0000,0.3097,-0.3949 +0.8650,-0.0000,0.3097,-0.3949 +0.8593,-0.0000,0.3079,-0.4083 +0.8593,-0.0000,0.3079,-0.4083 +0.8593,-0.0000,0.3079,-0.4083 +0.8593,-0.0000,0.3079,-0.4083 +0.8535,-0.0000,0.3061,-0.4217 +0.8535,-0.0000,0.3061,-0.4217 +0.8535,-0.0000,0.3061,-0.4217 +0.8535,-0.0000,0.3061,-0.4217 +0.8474,-0.0000,0.3043,-0.4351 +0.8474,-0.0000,0.3043,-0.4351 +0.8474,-0.0000,0.3043,-0.4351 +0.8474,-0.0000,0.3043,-0.4351 +0.8410,-0.0000,0.3026,-0.4484 +0.8410,-0.0000,0.3026,-0.4484 +0.8410,-0.0000,0.3026,-0.4484 +0.8410,-0.0000,0.3026,-0.4484 +0.8344,-0.0000,0.3010,-0.4617 +0.8344,-0.0000,0.3010,-0.4617 +0.8344,-0.0000,0.3010,-0.4617 +0.8344,-0.0000,0.3010,-0.4617 +0.8276,-0.0000,0.2993,-0.4748 +0.8276,-0.0000,0.2993,-0.4748 +0.8276,-0.0000,0.2993,-0.4748 +0.8276,-0.0000,0.2993,-0.4748 +0.8205,-0.0000,0.2978,-0.4879 +0.8205,-0.0000,0.2978,-0.4879 +0.8205,-0.0000,0.2978,-0.4879 +0.8205,-0.0000,0.2978,-0.4879 +0.8132,-0.0000,0.2962,-0.5010 +0.8132,-0.0000,0.2962,-0.5010 +0.8132,-0.0000,0.2962,-0.5010 +0.8132,-0.0000,0.2962,-0.5010 +0.8056,-0.0000,0.2947,-0.5139 +0.8056,-0.0000,0.2947,-0.5139 +0.8056,-0.0000,0.2947,-0.5139 +0.8056,-0.0000,0.2947,-0.5139 +0.7978,-0.0000,0.2932,-0.5267 +0.7978,-0.0000,0.2932,-0.5267 +0.7978,-0.0000,0.2932,-0.5267 +0.7978,-0.0000,0.2932,-0.5267 +0.7898,-0.0000,0.2918,-0.5395 +0.7898,-0.0000,0.2918,-0.5395 +0.7898,-0.0000,0.2918,-0.5395 +0.7898,-0.0000,0.2918,-0.5395 +0.7815,-0.0000,0.2904,-0.5521 +0.7815,-0.0000,0.2904,-0.5521 +0.7815,-0.0000,0.2904,-0.5521 +0.7815,-0.0000,0.2904,-0.5521 +0.7730,-0.0000,0.2891,-0.5647 +0.7730,-0.0000,0.2891,-0.5647 +0.7730,-0.0000,0.2891,-0.5647 +0.7730,-0.0000,0.2891,-0.5647 +0.7643,-0.0000,0.2878,-0.5771 +0.7643,-0.0000,0.2878,-0.5771 +0.7643,-0.0000,0.2878,-0.5771 +0.7643,-0.0000,0.2878,-0.5771 +0.7553,-0.0000,0.2865,-0.5894 +0.7553,-0.0000,0.2865,-0.5894 +0.7553,-0.0000,0.2865,-0.5894 +0.7553,-0.0000,0.2865,-0.5894 +0.7461,-0.0000,0.2853,-0.6016 +0.7461,-0.0000,0.2853,-0.6016 +0.7461,-0.0000,0.2853,-0.6016 +0.7461,-0.0000,0.2853,-0.6016 +0.7367,-0.0000,0.2841,-0.6136 +0.7367,-0.0000,0.2841,-0.6136 +0.7367,-0.0000,0.2841,-0.6136 +0.7367,-0.0000,0.2841,-0.6136 +0.7271,-0.0000,0.2830,-0.6255 +0.7271,-0.0000,0.2830,-0.6255 +0.7271,-0.0000,0.2830,-0.6255 +0.7271,-0.0000,0.2830,-0.6255 +0.7172,-0.0000,0.2819,-0.6373 +0.7172,-0.0000,0.2819,-0.6373 +0.7172,-0.0000,0.2819,-0.6373 +0.7172,-0.0000,0.2819,-0.6373 +0.7071,-0.0000,0.2808,-0.6490 +0.7071,-0.0000,0.2808,-0.6490 +0.7071,-0.0000,0.2808,-0.6490 +0.7071,-0.0000,0.2808,-0.6490 +0.6968,-0.0000,0.2798,-0.6604 +0.6968,-0.0000,0.2798,-0.6604 +0.6968,-0.0000,0.2798,-0.6604 +0.6968,-0.0000,0.2798,-0.6604 +0.6863,-0.0000,0.2788,-0.6718 +0.6863,-0.0000,0.2788,-0.6718 +0.6863,-0.0000,0.2788,-0.6718 +0.6863,-0.0000,0.2788,-0.6718 +0.6756,-0.0000,0.2779,-0.6829 +0.6756,-0.0000,0.2779,-0.6829 +0.6756,-0.0000,0.2779,-0.6829 +0.6756,-0.0000,0.2779,-0.6829 +0.6646,-0.0000,0.2769,-0.6940 +0.6646,-0.0000,0.2769,-0.6940 +0.6646,-0.0000,0.2769,-0.6940 +0.6646,-0.0000,0.2769,-0.6940 +0.6535,-0.0000,0.2761,-0.7048 +0.6535,-0.0000,0.2761,-0.7048 +0.6535,-0.0000,0.2761,-0.7048 +0.6535,-0.0000,0.2761,-0.7048 +0.6422,-0.0000,0.2752,-0.7155 +0.6422,-0.0000,0.2752,-0.7155 +0.6422,-0.0000,0.2752,-0.7155 +0.6422,-0.0000,0.2752,-0.7155 +0.6306,-0.0000,0.2744,-0.7260 +0.6306,-0.0000,0.2744,-0.7260 +0.6306,-0.0000,0.2744,-0.7260 +0.6306,-0.0000,0.2744,-0.7260 +0.6189,-0.0000,0.2737,-0.7363 +0.6189,-0.0000,0.2737,-0.7363 +0.6189,-0.0000,0.2737,-0.7363 +0.6189,-0.0000,0.2737,-0.7363 +0.6069,-0.0000,0.2730,-0.7464 +0.6069,-0.0000,0.2730,-0.7464 +0.6069,-0.0000,0.2730,-0.7464 +0.6069,-0.0000,0.2730,-0.7464 +0.5948,-0.0000,0.2723,-0.7563 +0.5948,-0.0000,0.2723,-0.7563 +0.5948,-0.0000,0.2723,-0.7563 +0.5948,-0.0000,0.2723,-0.7563 +0.5825,-0.0000,0.2716,-0.7661 +0.5825,-0.0000,0.2716,-0.7661 +0.5825,-0.0000,0.2716,-0.7661 +0.5825,-0.0000,0.2716,-0.7661 +0.5700,-0.0000,0.2710,-0.7756 +0.5700,-0.0000,0.2710,-0.7756 +0.5700,-0.0000,0.2710,-0.7756 +0.5700,-0.0000,0.2710,-0.7756 +0.5574,-0.0000,0.2705,-0.7850 +0.5574,-0.0000,0.2705,-0.7850 +0.5574,-0.0000,0.2705,-0.7850 +0.5574,-0.0000,0.2705,-0.7850 +0.5445,-0.0000,0.2700,-0.7941 +0.5445,-0.0000,0.2700,-0.7941 +0.5445,-0.0000,0.2700,-0.7941 +0.5445,-0.0000,0.2700,-0.7941 +0.5315,-0.0000,0.2695,-0.8030 +0.5315,-0.0000,0.2695,-0.8030 +0.5315,-0.0000,0.2695,-0.8030 +0.5315,-0.0000,0.2695,-0.8030 +0.5184,-0.0000,0.2691,-0.8117 +0.5184,-0.0000,0.2691,-0.8117 +0.5184,-0.0000,0.2691,-0.8117 +0.5184,-0.0000,0.2691,-0.8117 +0.5050,-0.0000,0.2687,-0.8202 +0.5050,-0.0000,0.2687,-0.8202 +0.5050,-0.0000,0.2687,-0.8202 +0.5050,-0.0000,0.2687,-0.8202 +0.4915,-0.0000,0.2684,-0.8285 +0.4915,-0.0000,0.2684,-0.8285 +0.4915,-0.0000,0.2684,-0.8285 +0.4915,-0.0000,0.2684,-0.8285 +0.4779,-0.0000,0.2682,-0.8365 +0.4779,-0.0000,0.2682,-0.8365 +0.4779,-0.0000,0.2682,-0.8365 +0.4779,-0.0000,0.2682,-0.8365 +0.4640,-0.0000,0.2680,-0.8443 +0.4640,-0.0000,0.2680,-0.8443 +0.4640,-0.0000,0.2680,-0.8443 +0.4640,-0.0000,0.2680,-0.8443 +0.4501,-0.0000,0.2678,-0.8519 +0.4501,-0.0000,0.2678,-0.8519 +0.4501,-0.0000,0.2678,-0.8519 +0.4501,-0.0000,0.2678,-0.8519 +0.4360,-0.0000,0.2677,-0.8592 +0.4360,-0.0000,0.2677,-0.8592 +0.4360,-0.0000,0.2677,-0.8592 +0.4360,-0.0000,0.2677,-0.8592 +0.4218,-0.0000,0.2677,-0.8663 +0.4218,-0.0000,0.2677,-0.8663 +0.4218,-0.0000,0.2677,-0.8663 +0.4218,-0.0000,0.2677,-0.8663 +0.4074,-0.0000,0.2677,-0.8731 +0.4074,-0.0000,0.2677,-0.8731 +0.4074,-0.0000,0.2677,-0.8731 +0.4074,-0.0000,0.2677,-0.8731 +0.3929,-0.0000,0.2678,-0.8797 +0.3929,-0.0000,0.2678,-0.8797 +0.3929,-0.0000,0.2678,-0.8797 +0.3929,-0.0000,0.2678,-0.8797 +0.3783,-0.0000,0.2680,-0.8860 +0.3783,-0.0000,0.2680,-0.8860 +0.3783,-0.0000,0.2680,-0.8860 +0.3783,-0.0000,0.2680,-0.8860 +0.3635,-0.0000,0.2683,-0.8921 +0.3635,-0.0000,0.2683,-0.8921 +0.3635,-0.0000,0.2683,-0.8921 +0.3635,-0.0000,0.2683,-0.8921 +0.3487,-0.0000,0.2687,-0.8979 +0.3487,-0.0000,0.2687,-0.8979 +0.3487,-0.0000,0.2687,-0.8979 +0.3487,-0.0000,0.2687,-0.8979 +0.3337,-0.0000,0.2692,-0.9034 +0.3337,-0.0000,0.2692,-0.9034 +0.3337,-0.0000,0.2692,-0.9034 +0.3337,-0.0000,0.2692,-0.9034 +0.3186,-0.0000,0.2698,-0.9087 +0.3186,-0.0000,0.2698,-0.9087 +0.3186,-0.0000,0.2698,-0.9087 +0.3186,-0.0000,0.2698,-0.9087 +0.3034,-0.0000,0.2705,-0.9136 +0.3034,-0.0000,0.2705,-0.9136 +0.3034,-0.0000,0.2705,-0.9136 +0.3034,-0.0000,0.2705,-0.9136 +0.2882,-0.0000,0.2714,-0.9183 +0.2882,-0.0000,0.2714,-0.9183 +0.2882,-0.0000,0.2714,-0.9183 +0.2882,-0.0000,0.2714,-0.9183 +0.2728,-0.0000,0.2725,-0.9227 +0.2728,-0.0000,0.2725,-0.9227 +0.2728,-0.0000,0.2725,-0.9227 +0.2728,-0.0000,0.2725,-0.9227 +0.2573,-0.0000,0.2738,-0.9267 +0.2573,-0.0000,0.2738,-0.9267 +0.2573,-0.0000,0.2738,-0.9267 +0.2573,-0.0000,0.2738,-0.9267 +0.2418,-0.0000,0.2753,-0.9305 +0.2418,-0.0000,0.2753,-0.9305 +0.2418,-0.0000,0.2753,-0.9305 +0.2418,-0.0000,0.2753,-0.9305 +0.2262,-0.0000,0.2771,-0.9339 +0.2262,-0.0000,0.2771,-0.9339 +0.2262,-0.0000,0.2771,-0.9339 +0.2262,-0.0000,0.2771,-0.9339 +0.2105,-0.0000,0.2792,-0.9369 +0.2105,-0.0000,0.2792,-0.9369 +0.2105,-0.0000,0.2792,-0.9369 +0.2105,-0.0000,0.2792,-0.9369 +0.1947,-0.0000,0.2818,-0.9395 +0.1947,-0.0000,0.2818,-0.9395 +0.1947,-0.0000,0.2818,-0.9395 +0.1947,-0.0000,0.2818,-0.9395 +0.1789,-0.0000,0.2848,-0.9417 +0.1789,-0.0000,0.2848,-0.9417 +0.1789,-0.0000,0.2848,-0.9417 +0.1789,-0.0000,0.2848,-0.9417 +0.1630,-0.0000,0.2886,-0.9435 +0.1630,-0.0000,0.2886,-0.9435 +0.1630,-0.0000,0.2886,-0.9435 +0.1630,-0.0000,0.2886,-0.9435 +0.1471,-0.0000,0.2933,-0.9446 +0.1471,-0.0000,0.2933,-0.9446 +0.1471,-0.0000,0.2933,-0.9446 +0.1471,-0.0000,0.2933,-0.9446 +0.1312,-0.0000,0.2991,-0.9452 +0.1312,-0.0000,0.2991,-0.9452 +0.1312,-0.0000,0.2991,-0.9452 +0.1312,-0.0000,0.2991,-0.9452 +0.1152,-0.0000,0.3067,-0.9448 +0.1152,-0.0000,0.3067,-0.9448 +0.1152,-0.0000,0.3067,-0.9448 +0.1152,-0.0000,0.3067,-0.9448 +0.0991,-0.0000,0.3167,-0.9433 +0.0991,-0.0000,0.3167,-0.9433 +0.0991,-0.0000,0.3167,-0.9433 +0.0991,-0.0000,0.3167,-0.9433 +0.0831,-0.0000,0.3307,-0.9401 +0.0831,-0.0000,0.3307,-0.9401 +0.0831,-0.0000,0.3307,-0.9401 +0.0831,-0.0000,0.3307,-0.9401 +0.0670,-0.0000,0.3514,-0.9338 +0.0670,-0.0000,0.3514,-0.9338 +0.0670,-0.0000,0.3514,-0.9338 +0.0670,-0.0000,0.3514,-0.9338 +0.0510,-0.0000,0.3848,-0.9216 +0.0510,-0.0000,0.3848,-0.9216 +0.0510,-0.0000,0.3848,-0.9216 +0.0510,-0.0000,0.3848,-0.9216 +0.0351,-0.0000,0.4473,-0.8937 +0.0351,-0.0000,0.4473,-0.8937 +0.0351,-0.0000,0.4473,-0.8937 +0.0351,-0.0000,0.4473,-0.8937 +0.0196,-0.0000,0.6000,-0.7997 +0.0196,-0.0000,0.6000,-0.7997 +0.0196,-0.0000,0.6000,-0.7997 +0.0196,-0.0000,0.6000,-0.7997 +0.0079,0.0000,1.0000,0.0001 +0.0079,0.0000,1.0000,0.0001 +0.0079,0.0000,1.0000,0.0001 +0.0079,0.0000,1.0000,0.0001 +0.0162,0.0000,0.2425,0.9700 +0.0162,0.0000,0.2425,0.9700 +0.0162,0.0000,0.2425,0.9700 +0.0162,0.0000,0.2425,0.9700 +0.0314,-0.0000,-0.0000,0.9995 +0.0314,-0.0000,-0.0000,0.9995 +0.0314,-0.0000,-0.0000,0.9995 +0.0314,-0.0000,-0.0000,0.9995 +0.0473,-0.0000,-0.0831,0.9954 +0.0473,-0.0000,-0.0831,0.9954 +0.0473,-0.0000,-0.0831,0.9954 +0.0473,-0.0000,-0.0831,0.9954 +0.0633,-0.0000,-0.1241,0.9902 +0.0633,-0.0000,-0.1241,0.9902 +0.0633,-0.0000,-0.1241,0.9902 +0.0633,-0.0000,-0.1241,0.9902 +0.0793,-0.0000,-0.1485,0.9857 +0.0793,-0.0000,-0.1485,0.9857 +0.0793,-0.0000,-0.1485,0.9857 +0.0793,-0.0000,-0.1485,0.9857 +0.0954,-0.0000,-0.1646,0.9817 +0.0954,-0.0000,-0.1646,0.9817 +0.0954,-0.0000,-0.1646,0.9817 +0.0954,-0.0000,-0.1646,0.9817 +0.1114,-0.0000,-0.1762,0.9780 +0.1114,-0.0000,-0.1762,0.9780 +0.1114,-0.0000,-0.1762,0.9780 +0.1114,-0.0000,-0.1762,0.9780 +0.1275,-0.0000,-0.1848,0.9745 +0.1275,-0.0000,-0.1848,0.9745 +0.1275,-0.0000,-0.1848,0.9745 +0.1275,-0.0000,-0.1848,0.9745 +0.1435,-0.0000,-0.1915,0.9709 +0.1435,-0.0000,-0.1915,0.9709 +0.1435,-0.0000,-0.1915,0.9709 +0.1435,-0.0000,-0.1915,0.9709 +0.1594,-0.0000,-0.1970,0.9674 +0.1594,-0.0000,-0.1970,0.9674 +0.1594,-0.0000,-0.1970,0.9674 +0.1594,-0.0000,-0.1970,0.9674 +0.1753,-0.0000,-0.2014,0.9637 +0.1753,-0.0000,-0.2014,0.9637 +0.1753,-0.0000,-0.2014,0.9637 +0.1753,-0.0000,-0.2014,0.9637 +0.1912,-0.0000,-0.2052,0.9599 +0.1912,-0.0000,-0.2052,0.9599 +0.1912,-0.0000,-0.2052,0.9599 +0.1912,-0.0000,-0.2052,0.9599 +0.2070,-0.0000,-0.2085,0.9559 +0.2070,-0.0000,-0.2085,0.9559 +0.2070,-0.0000,-0.2085,0.9559 +0.2070,-0.0000,-0.2085,0.9559 +0.2227,-0.0000,-0.2113,0.9517 +0.2227,-0.0000,-0.2113,0.9517 +0.2227,-0.0000,-0.2113,0.9517 +0.2227,-0.0000,-0.2113,0.9517 +0.2384,-0.0000,-0.2138,0.9473 +0.2384,-0.0000,-0.2138,0.9473 +0.2384,-0.0000,-0.2138,0.9473 +0.2384,-0.0000,-0.2138,0.9473 +0.2540,-0.0000,-0.2161,0.9428 +0.2540,-0.0000,-0.2161,0.9428 +0.2540,-0.0000,-0.2161,0.9428 +0.2540,-0.0000,-0.2161,0.9428 +0.2695,-0.0000,-0.2181,0.9380 +0.2695,-0.0000,-0.2181,0.9380 +0.2695,-0.0000,-0.2181,0.9380 +0.2695,-0.0000,-0.2181,0.9380 +0.2849,-0.0000,-0.2200,0.9330 +0.2849,-0.0000,-0.2200,0.9330 +0.2849,-0.0000,-0.2200,0.9330 +0.2849,-0.0000,-0.2200,0.9330 +0.3002,-0.0000,-0.2217,0.9277 +0.3002,-0.0000,-0.2217,0.9277 +0.3002,-0.0000,-0.2217,0.9277 +0.3002,-0.0000,-0.2217,0.9277 +0.3155,-0.0000,-0.2233,0.9223 +0.3155,-0.0000,-0.2233,0.9223 +0.3155,-0.0000,-0.2233,0.9223 +0.3155,-0.0000,-0.2233,0.9223 +0.3306,-0.0000,-0.2248,0.9166 +0.3306,-0.0000,-0.2248,0.9166 +0.3306,-0.0000,-0.2248,0.9166 +0.3306,-0.0000,-0.2248,0.9166 +0.3457,-0.0000,-0.2263,0.9107 +0.3457,-0.0000,-0.2263,0.9107 +0.3457,-0.0000,-0.2263,0.9107 +0.3457,-0.0000,-0.2263,0.9107 +0.3606,-0.0000,-0.2277,0.9045 +0.3606,-0.0000,-0.2277,0.9045 +0.3606,-0.0000,-0.2277,0.9045 +0.3606,-0.0000,-0.2277,0.9045 +0.3754,-0.0000,-0.2290,0.8981 +0.3754,-0.0000,-0.2290,0.8981 +0.3754,-0.0000,-0.2290,0.8981 +0.3754,-0.0000,-0.2290,0.8981 +0.3901,-0.0000,-0.2303,0.8915 +0.3901,-0.0000,-0.2303,0.8915 +0.3901,-0.0000,-0.2303,0.8915 +0.3901,-0.0000,-0.2303,0.8915 +0.4047,-0.0000,-0.2315,0.8847 +0.4047,-0.0000,-0.2315,0.8847 +0.4047,-0.0000,-0.2315,0.8847 +0.4047,-0.0000,-0.2315,0.8847 +0.4192,-0.0000,-0.2327,0.8776 +0.4192,-0.0000,-0.2327,0.8776 +0.4192,-0.0000,-0.2327,0.8776 +0.4192,-0.0000,-0.2327,0.8776 +0.4335,-0.0000,-0.2339,0.8703 +0.4335,-0.0000,-0.2339,0.8703 +0.4335,-0.0000,-0.2339,0.8703 +0.4335,-0.0000,-0.2339,0.8703 +0.4477,-0.0000,-0.2351,0.8627 +0.4477,-0.0000,-0.2351,0.8627 +0.4477,-0.0000,-0.2351,0.8627 +0.4477,-0.0000,-0.2351,0.8627 +0.4617,-0.0000,-0.2362,0.8550 +0.4617,-0.0000,-0.2362,0.8550 +0.4617,-0.0000,-0.2362,0.8550 +0.4617,-0.0000,-0.2362,0.8550 +0.4756,-0.0000,-0.2374,0.8470 +0.4756,-0.0000,-0.2374,0.8470 +0.4756,-0.0000,-0.2374,0.8470 +0.4756,-0.0000,-0.2374,0.8470 +0.4894,-0.0000,-0.2385,0.8388 +0.4894,-0.0000,-0.2385,0.8388 +0.4894,-0.0000,-0.2385,0.8388 +0.4894,-0.0000,-0.2385,0.8388 +0.5030,-0.0000,-0.2396,0.8304 +0.5030,-0.0000,-0.2396,0.8304 +0.5030,-0.0000,-0.2396,0.8304 +0.5030,-0.0000,-0.2396,0.8304 +0.5164,-0.0000,-0.2408,0.8218 +0.5164,-0.0000,-0.2408,0.8218 +0.5164,-0.0000,-0.2408,0.8218 +0.5164,-0.0000,-0.2408,0.8218 +0.5297,-0.0000,-0.2419,0.8130 +0.5297,-0.0000,-0.2419,0.8130 +0.5297,-0.0000,-0.2419,0.8130 +0.5297,-0.0000,-0.2419,0.8130 +0.5428,-0.0000,-0.2431,0.8039 +0.5428,-0.0000,-0.2431,0.8039 +0.5428,-0.0000,-0.2431,0.8039 +0.5428,-0.0000,-0.2431,0.8039 +0.5558,-0.0000,-0.2442,0.7947 +0.5558,-0.0000,-0.2442,0.7947 +0.5558,-0.0000,-0.2442,0.7947 +0.5558,-0.0000,-0.2442,0.7947 +0.5685,-0.0000,-0.2454,0.7852 +0.5685,-0.0000,-0.2454,0.7852 +0.5685,-0.0000,-0.2454,0.7852 +0.5685,-0.0000,-0.2454,0.7852 +0.5811,-0.0000,-0.2465,0.7756 +0.5811,-0.0000,-0.2465,0.7756 +0.5811,-0.0000,-0.2465,0.7756 +0.5811,-0.0000,-0.2465,0.7756 +0.5936,-0.0000,-0.2477,0.7657 +0.5936,-0.0000,-0.2477,0.7657 +0.5936,-0.0000,-0.2477,0.7657 +0.5936,-0.0000,-0.2477,0.7657 +0.6058,-0.0000,-0.2489,0.7557 +0.6058,-0.0000,-0.2489,0.7557 +0.6058,-0.0000,-0.2489,0.7557 +0.6058,-0.0000,-0.2489,0.7557 +0.6179,-0.0000,-0.2501,0.7455 +0.6179,-0.0000,-0.2501,0.7455 +0.6179,-0.0000,-0.2501,0.7455 +0.6179,-0.0000,-0.2501,0.7455 +0.6297,-0.0000,-0.2513,0.7351 +0.6297,-0.0000,-0.2513,0.7351 +0.6297,-0.0000,-0.2513,0.7351 +0.6297,-0.0000,-0.2513,0.7351 +0.6414,-0.0000,-0.2525,0.7245 +0.6414,-0.0000,-0.2525,0.7245 +0.6414,-0.0000,-0.2525,0.7245 +0.6414,-0.0000,-0.2525,0.7245 +0.6528,-0.0000,-0.2538,0.7137 +0.6528,-0.0000,-0.2538,0.7137 +0.6528,-0.0000,-0.2538,0.7137 +0.6528,-0.0000,-0.2538,0.7137 +0.6641,-0.0000,-0.2550,0.7028 +0.6641,-0.0000,-0.2550,0.7028 +0.6641,-0.0000,-0.2550,0.7028 +0.6641,-0.0000,-0.2550,0.7028 +0.6752,-0.0000,-0.2563,0.6917 +0.6752,-0.0000,-0.2563,0.6917 +0.6752,-0.0000,-0.2563,0.6917 +0.6752,-0.0000,-0.2563,0.6917 +0.6860,-0.0000,-0.2576,0.6804 +0.6860,-0.0000,-0.2576,0.6804 +0.6860,-0.0000,-0.2576,0.6804 +0.6860,-0.0000,-0.2576,0.6804 +0.6967,-0.0000,-0.2590,0.6690 +0.6967,-0.0000,-0.2590,0.6690 +0.6967,-0.0000,-0.2590,0.6690 +0.6967,-0.0000,-0.2590,0.6690 +0.7071,-0.0000,-0.2603,0.6575 +0.7071,-0.0000,-0.2603,0.6575 +0.7071,-0.0000,-0.2603,0.6575 +0.7071,-0.0000,-0.2603,0.6575 +0.7173,-0.0000,-0.2617,0.6457 +0.7173,-0.0000,-0.2617,0.6457 +0.7173,-0.0000,-0.2617,0.6457 +0.7173,-0.0000,-0.2617,0.6457 +0.7273,-0.0000,-0.2631,0.6339 +0.7273,-0.0000,-0.2631,0.6339 +0.7273,-0.0000,-0.2631,0.6339 +0.7273,-0.0000,-0.2631,0.6339 +0.7371,-0.0000,-0.2645,0.6219 +0.7371,-0.0000,-0.2645,0.6219 +0.7371,-0.0000,-0.2645,0.6219 +0.7371,-0.0000,-0.2645,0.6219 +0.7467,-0.0000,-0.2659,0.6097 +0.7467,-0.0000,-0.2659,0.6097 +0.7467,-0.0000,-0.2659,0.6097 +0.7467,-0.0000,-0.2659,0.6097 +0.7560,-0.0000,-0.2674,0.5974 +0.7560,-0.0000,-0.2674,0.5974 +0.7560,-0.0000,-0.2674,0.5974 +0.7560,-0.0000,-0.2674,0.5974 +0.7651,-0.0000,-0.2689,0.5851 +0.7651,-0.0000,-0.2689,0.5851 +0.7651,-0.0000,-0.2689,0.5851 +0.7651,-0.0000,-0.2689,0.5851 +0.7740,-0.0000,-0.2705,0.5725 +0.7740,-0.0000,-0.2705,0.5725 +0.7740,-0.0000,-0.2705,0.5725 +0.7740,-0.0000,-0.2705,0.5725 +0.7826,-0.0000,-0.2720,0.5599 +0.7826,-0.0000,-0.2720,0.5599 +0.7826,-0.0000,-0.2720,0.5599 +0.7826,-0.0000,-0.2720,0.5599 +0.7910,-0.0000,-0.2736,0.5472 +0.7910,-0.0000,-0.2736,0.5472 +0.7910,-0.0000,-0.2736,0.5472 +0.7910,-0.0000,-0.2736,0.5472 +0.7992,-0.0000,-0.2752,0.5343 +0.7992,-0.0000,-0.2752,0.5343 +0.7992,-0.0000,-0.2752,0.5343 +0.7992,-0.0000,-0.2752,0.5343 +0.8072,-0.0000,-0.2769,0.5214 +0.8072,-0.0000,-0.2769,0.5214 +0.8072,-0.0000,-0.2769,0.5214 +0.8072,-0.0000,-0.2769,0.5214 +0.8149,-0.0000,-0.2786,0.5083 +0.8149,-0.0000,-0.2786,0.5083 +0.8149,-0.0000,-0.2786,0.5083 +0.8149,-0.0000,-0.2786,0.5083 +0.8223,-0.0000,-0.2803,0.4952 +0.8223,-0.0000,-0.2803,0.4952 +0.8223,-0.0000,-0.2803,0.4952 +0.8223,-0.0000,-0.2803,0.4952 +0.8295,-0.0000,-0.2820,0.4820 +0.8295,-0.0000,-0.2820,0.4820 +0.8295,-0.0000,-0.2820,0.4820 +0.8295,-0.0000,-0.2820,0.4820 +0.8365,-0.0000,-0.2838,0.4687 +0.8365,-0.0000,-0.2838,0.4687 +0.8365,-0.0000,-0.2838,0.4687 +0.8365,-0.0000,-0.2838,0.4687 +0.8433,-0.0000,-0.2857,0.4553 +0.8433,-0.0000,-0.2857,0.4553 +0.8433,-0.0000,-0.2857,0.4553 +0.8433,-0.0000,-0.2857,0.4553 +0.8497,-0.0000,-0.2875,0.4419 +0.8497,-0.0000,-0.2875,0.4419 +0.8497,-0.0000,-0.2875,0.4419 +0.8497,-0.0000,-0.2875,0.4419 +0.8560,-0.0000,-0.2894,0.4284 +0.8560,-0.0000,-0.2894,0.4284 +0.8560,-0.0000,-0.2894,0.4284 +0.8560,-0.0000,-0.2894,0.4284 +0.8620,-0.0000,-0.2913,0.4148 +0.8620,-0.0000,-0.2913,0.4148 +0.8620,-0.0000,-0.2913,0.4148 +0.8620,-0.0000,-0.2913,0.4148 +0.8677,-0.0000,-0.2933,0.4012 +0.8677,-0.0000,-0.2933,0.4012 +0.8677,-0.0000,-0.2933,0.4012 +0.8677,-0.0000,-0.2933,0.4012 +0.8732,-0.0000,-0.2953,0.3876 +0.8732,-0.0000,-0.2953,0.3876 +0.8732,-0.0000,-0.2953,0.3876 +0.8732,-0.0000,-0.2953,0.3876 +0.8785,-0.0000,-0.2974,0.3739 +0.8785,-0.0000,-0.2974,0.3739 +0.8785,-0.0000,-0.2974,0.3739 +0.8785,-0.0000,-0.2974,0.3739 +0.8835,-0.0000,-0.2995,0.3602 +0.8835,-0.0000,-0.2995,0.3602 +0.8835,-0.0000,-0.2995,0.3602 +0.8835,-0.0000,-0.2995,0.3602 +0.8883,-0.0000,-0.3016,0.3465 +0.8883,-0.0000,-0.3016,0.3465 +0.8883,-0.0000,-0.3016,0.3465 +0.8883,-0.0000,-0.3016,0.3465 +0.8928,-0.0000,-0.3038,0.3327 +0.8928,-0.0000,-0.3038,0.3327 +0.8928,-0.0000,-0.3038,0.3327 +0.8928,-0.0000,-0.3038,0.3327 +0.8970,-0.0000,-0.3060,0.3189 +0.8970,-0.0000,-0.3060,0.3189 +0.8970,-0.0000,-0.3060,0.3189 +0.8970,-0.0000,-0.3060,0.3189 +0.9010,-0.0000,-0.3083,0.3051 +0.9010,-0.0000,-0.3083,0.3051 +0.9010,-0.0000,-0.3083,0.3051 +0.9010,-0.0000,-0.3083,0.3051 +0.9048,-0.0000,-0.3106,0.2913 +0.9048,-0.0000,-0.3106,0.2913 +0.9048,-0.0000,-0.3106,0.2913 +0.9048,-0.0000,-0.3106,0.2913 +0.9083,-0.0000,-0.3130,0.2776 +0.9083,-0.0000,-0.3130,0.2776 +0.9083,-0.0000,-0.3130,0.2776 +0.9083,-0.0000,-0.3130,0.2776 +0.9116,-0.0000,-0.3154,0.2638 +0.9116,-0.0000,-0.3154,0.2638 +0.9116,-0.0000,-0.3154,0.2638 +0.9116,-0.0000,-0.3154,0.2638 +0.9146,-0.0000,-0.3179,0.2500 +0.9146,-0.0000,-0.3179,0.2500 +0.9146,-0.0000,-0.3179,0.2500 +0.9146,-0.0000,-0.3179,0.2500 +0.9174,-0.0000,-0.3204,0.2363 +0.9174,-0.0000,-0.3204,0.2363 +0.9174,-0.0000,-0.3204,0.2363 +0.9174,-0.0000,-0.3204,0.2363 +0.9199,-0.0000,-0.3229,0.2226 +0.9199,-0.0000,-0.3229,0.2226 +0.9199,-0.0000,-0.3229,0.2226 +0.9199,-0.0000,-0.3229,0.2226 +0.9222,-0.0000,-0.3256,0.2089 +0.9222,-0.0000,-0.3256,0.2089 +0.9222,-0.0000,-0.3256,0.2089 +0.9222,-0.0000,-0.3256,0.2089 +0.9242,-0.0000,-0.3282,0.1952 +0.9242,-0.0000,-0.3282,0.1952 +0.9242,-0.0000,-0.3282,0.1952 +0.9242,-0.0000,-0.3282,0.1952 +0.9260,-0.0000,-0.3309,0.1817 +0.9260,-0.0000,-0.3309,0.1817 +0.9260,-0.0000,-0.3309,0.1817 +0.9260,-0.0000,-0.3309,0.1817 +0.9276,-0.0000,-0.3337,0.1681 +0.9276,-0.0000,-0.3337,0.1681 +0.9276,-0.0000,-0.3337,0.1681 +0.9276,-0.0000,-0.3337,0.1681 +0.9289,-0.0000,-0.3366,0.1546 +0.9289,-0.0000,-0.3366,0.1546 +0.9289,-0.0000,-0.3366,0.1546 +0.9289,-0.0000,-0.3366,0.1546 +0.9300,-0.0000,-0.3395,0.1412 +0.9300,-0.0000,-0.3395,0.1412 +0.9300,-0.0000,-0.3395,0.1412 +0.9300,-0.0000,-0.3395,0.1412 +0.9308,-0.0000,-0.3424,0.1279 +0.9308,-0.0000,-0.3424,0.1279 +0.9308,-0.0000,-0.3424,0.1279 +0.9308,-0.0000,-0.3424,0.1279 +0.9314,-0.0000,-0.3454,0.1146 +0.9314,-0.0000,-0.3454,0.1146 +0.9314,-0.0000,-0.3454,0.1146 +0.9314,-0.0000,-0.3454,0.1146 +0.9318,-0.0000,-0.3485,0.1015 +0.9318,-0.0000,-0.3485,0.1015 +0.9318,-0.0000,-0.3485,0.1015 +0.9318,-0.0000,-0.3485,0.1015 +0.9320,-0.0000,-0.3516,0.0884 +0.9320,-0.0000,-0.3516,0.0884 +0.9320,-0.0000,-0.3516,0.0884 +0.9320,-0.0000,-0.3516,0.0884 +0.9319,-0.0000,-0.3548,0.0754 +0.9319,-0.0000,-0.3548,0.0754 +0.9319,-0.0000,-0.3548,0.0754 +0.9319,-0.0000,-0.3548,0.0754 +0.9316,-0.0000,-0.3581,0.0625 +0.9316,-0.0000,-0.3581,0.0625 +0.9316,-0.0000,-0.3581,0.0625 +0.9316,-0.0000,-0.3581,0.0625 +0.9311,-0.0000,-0.3614,0.0498 +0.9311,-0.0000,-0.3614,0.0498 +0.9311,-0.0000,-0.3614,0.0498 +0.9311,-0.0000,-0.3614,0.0498 +0.9303,-0.0000,-0.3648,0.0371 +0.9303,-0.0000,-0.3648,0.0371 +0.9303,-0.0000,-0.3648,0.0371 +0.9303,-0.0000,-0.3648,0.0371 +0.9294,-0.0000,-0.3683,0.0246 +0.9294,-0.0000,-0.3683,0.0246 +0.9294,-0.0000,-0.3683,0.0246 +0.9294,-0.0000,-0.3683,0.0246 +0.9282,-0.0000,-0.3718,0.0122 +0.9282,-0.0000,-0.3718,0.0122 +0.9282,-0.0000,-0.3718,0.0122 +0.9282,-0.0000,-0.3718,0.0122 +0.9269,-0.0000,-0.3754,-0.0000 +0.9269,-0.0000,-0.3754,-0.0000 +0.9269,-0.0000,-0.3754,-0.0000 +0.9269,-0.0000,-0.3754,-0.0000 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 3625a9307e9a947dc478b0eab8b2c661456e6973..c66f5e677c82a398ae3975fb808cbc2e1733c984 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. @@ -193,6 +193,10 @@ HR_TRAJECTORIES_TO_TEST = [ "rotate_yaw_pitch_roll1", ] +CONFIG_FILES_TO_TEST = [ + "just_reverb" +] + """ Per-testcase xfail SNR thresholds (dB) """ pass_snr = dict() # not relevant for tests anymore, should be deprecated soon _pass_snr = { diff --git a/tests/renderer/test_renderer.py b/tests/renderer/test_renderer.py index 866d2eee2c91eb9f231705d4117f5fe5a532dda6..d88d7a4a4299660e8891b395a75d3095332ac6d3 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. @@ -26,12 +26,10 @@ the United Nations Convention on Contracts on the International Sales of Goods. """ - import pytest from .utils import * - """ Ambisonics """ @@ -58,6 +56,174 @@ def test_ambisonics_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file): ) +# Test compares rendering with render config file containing just reverb defaults against rendering without config file. +# These should be binary equivalent. +@pytest.mark.parametrize("config_file", CONFIG_FILES_TO_TEST) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) +@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_ISM) +def test_ambisonics_binaural_headrotation_defaultrenderconfig(test_info, in_fmt, out_fmt, config_file): + compare_renderer_args( + test_info, + in_fmt, + out_fmt, + ref_kwargs={ + "name_extension": "defaultrenderconfig" + }, + cut_kwargs={ + "config_file": TESTV_DIR.joinpath(f"{config_file}.cfg") + } + ) + +# Test compares rendering with just a trajectory file against rendering with a trajectory file + a zero ref rotation. +# These should be binary equivalent. +@pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) +@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI) +def test_ambisonics_binaural_headrotation_refrotzero(test_info, in_fmt, out_fmt, trj_file): + compare_renderer_args( + test_info, + in_fmt, + out_fmt, + ref_kwargs={ + "name_extension": "refrotzero", + "trj_file": HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv") + }, + cut_kwargs={ + "trj_file": HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"), + "refrot_file": HR_TRAJECTORY_DIR.joinpath("const000.csv") + } + ) + + +# Second test compares rendering with no head rotation against rendering with equal ref and head rotation. +# These should also be binary equivalent. +# Note that reference rotation is supplied per 4 subframes; head rotation per subframe. +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) +@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI) +def test_ambisonics_binaural_headrotation_refrotequal(test_info, in_fmt, out_fmt): + compare_renderer_args( + test_info, + in_fmt, + out_fmt, + ref_kwargs={ + "name_extension": "refrotequal", + }, + cut_kwargs={ + "trj_file": HR_TRAJECTORY_DIR.joinpath("azi_plus_2-ele_plus_2-every-100-frames.csv"), + "refrot_file": HR_TRAJECTORY_DIR.joinpath("azi_plus_2-ele_plus_2-every-25-rows.csv") + } + ) + +# This test compares rendering with: +# ref: head rotation trajectory file (OTR=NONE) +# cut: identical head rotation trajectory file as ref but in addition a constant +# reference vector in the looking direction of the coordinate system (OTR=REF_VEC) +@pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) +@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI) +def test_ambisonics_binaural_headrotation_refveczero(test_info, in_fmt, out_fmt, trj_file): + compare_renderer_args( + test_info, + in_fmt, + out_fmt, + ref_kwargs={ + "name_extension": "refveczero", + "trj_file": HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv") + }, + cut_kwargs={ + "trj_file": HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"), + "refvec_file": HR_TRAJECTORY_DIR.joinpath("const000-Vector3.csv") + } + ) + +# This test compares rendering with: +# ref: no head rotation (OTR=NONE) +# cut: rendering with head rotation and a ref vector which moves in the +# looking-direction of the head rotation and therefore compensates it (OTR=REF_VEC) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) +@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI) +def test_ambisonics_binaural_headrotation_refvecequal(test_info, in_fmt, out_fmt): + compare_renderer_args( + test_info, + in_fmt, + out_fmt, + ref_kwargs={ + "name_extension": "refvecequal", + }, + cut_kwargs={ + "trj_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s.csv"), + "refvec_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s-Vector3.csv") + } + ) + +# This test compares rendering with: +# ref: a head rotation trajectory with elevation (OTR=NONE) +# cut: a static head rotation and a reference position trajectory which moves +# in a way that produces the same acoustic output as the ref head rot trajectory (OTR=REF_VEC) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) +@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI) +def test_ambisonics_binaural_headrotation_refvec_rotating(test_info, in_fmt, out_fmt): + compare_renderer_args( + test_info, + in_fmt, + out_fmt, + ref_kwargs={ + "name_extension": "refvec_rotating", + "trj_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s.csv"), + }, + cut_kwargs={ + "trj_file": HR_TRAJECTORY_DIR.joinpath("const000.csv"), + "refvec_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s-ccw-Vector3.csv") + } + ) + +# This test compares rendering with: +# ref: a head rotation trajectory with elevation (OTR=NONE) +# cut: a static head rotation and a reference position trajectory which moves +# in a way that produces the same acoustic output as the ref head rot trajectory (OTR=REF_VEC) +# which also contains a fixed position offset between listener and reference position (which +# gets compensated in the REF_VEV OTR modes) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) +@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI) +def test_ambisonics_binaural_headrotation_refvec_rotating_fixed_pos_offset(test_info, in_fmt, out_fmt): + compare_renderer_args( + test_info, + in_fmt, + out_fmt, + ref_kwargs={ + "name_extension": "refvec_rotating", + "trj_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s-ccw.csv"), + }, + cut_kwargs={ + "trj_file": HR_TRAJECTORY_DIR.joinpath("const000.csv"), + "refvec_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s-fixed-pos-offset-Vector3.csv") + } + ) + +# This test compares rendering with: +# ref: a reference position trajectory with elevation and REF_VEC_LEV OTR mode (OTR=REF_VEC_LEV) +# cut: a reference position trajectory without the elevation and REF_VEC OTR mode (OTR=REF_VEC) +# Since the only difference between REF_VEC_LEV and REF_VEC is that *LEV ignores +# the height difference in positions, the output must be binary equivalent. +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) +@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI) +def test_ambisonics_binaural_headrotation_refveclev_vs_refvec(test_info, in_fmt, out_fmt): + compare_renderer_args( + test_info, + in_fmt, + out_fmt, + ref_kwargs={ + "name_extension": "refveclevel", + "trj_file": HR_TRAJECTORY_DIR.joinpath("const000.csv"), + "refveclev_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s-Vector3.csv"), + }, + cut_kwargs={ + "trj_file": HR_TRAJECTORY_DIR.joinpath("const000.csv"), + "refvec_file": HR_TRAJECTORY_DIR.joinpath("full-circle-4s-Vector3.csv") + } + ) + + """ Multichannel """ @@ -96,6 +262,30 @@ def test_multichannel_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"), ) +# This test compares rendering with: +# ref: a head rotation trajectory with elevation (OTR=NONE) +# cut: a static head rotation and a reference position trajectory which moves +# in a way that produces the same acoustic output as the ref head rot trajectory (OTR=REF_VEC) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) +@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MC) +def test_multichannel_binaural_headrotation_refvec_rotating(test_info, in_fmt, out_fmt): + if in_fmt in ["MONO", "STEREO"]: + pytest.skip("MONO or STEREO to Binaural rendering unsupported") + + compare_renderer_args( + test_info, + in_fmt, + out_fmt, + ref_kwargs={ + "name_extension": "refvec_rotating", + "trj_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s.csv"), + }, + cut_kwargs={ + "trj_file": HR_TRAJECTORY_DIR.joinpath("const000.csv"), + "refvec_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s-ccw-Vector3.csv") + } + ) + """ ISM """ @@ -144,6 +334,33 @@ def test_ism_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file): in_meta_files=in_meta_files, ) +# This test compares rendering with: +# ref: a head rotation trajectory with elevation (OTR=NONE) +# cut: a static head rotation and a reference position trajectory which moves +# in a way that produces the same acoustic output as the ref head rot trajectory (OTR=REF_VEC) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) +@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_ISM) +def test_ism_binaural_headrotation_refvec_rotating(test_info, in_fmt, out_fmt): + try: + in_meta_files = FORMAT_TO_METADATA_FILES[in_fmt] + except: + in_meta_files = None + + compare_renderer_args( + test_info, + in_fmt, + out_fmt, + ref_kwargs={ + "name_extension": "refvec_rotating", + "trj_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s.csv"), + "in_meta_files": in_meta_files + }, + cut_kwargs={ + "trj_file": HR_TRAJECTORY_DIR.joinpath("const000.csv"), + "refvec_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s-ccw-Vector3.csv"), + "in_meta_files": in_meta_files + } + ) """ MASA """ diff --git a/tests/renderer/test_renderer_be_comparison.py b/tests/renderer/test_renderer_be_comparison.py index 815d7fd640b2d53dd5fffcc5f3402e3a8c552a52..d3c0be22c6f906308624bca2c9d321430d2e9479 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. diff --git a/tests/renderer/utils.py b/tests/renderer/utils.py index 143c33b066eaa5961ad3421ffe0793bea94720d6..bbc059bbd6aeab67f7729560873548e6b7aaf4ba 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. @@ -31,12 +31,11 @@ import subprocess as sp import sys from pathlib import Path from tempfile import TemporaryDirectory -from typing import Optional, Tuple +from typing import Optional, Tuple, Dict import numpy as np import pytest - from .compare_audio import compare_audio_arrays from .constants import * @@ -106,6 +105,11 @@ def run_renderer( metadata_input: Optional[str] = None, in_meta_files: Optional[list] = None, trj_file: Optional[str] = None, + name_extension: Optional[str] = None, + refrot_file: Optional[str] = None, + refvec_file: Optional[str] = None, + refveclev_file: Optional[str] = None, + config_file: Optional[str] = None, output_path_base: str = OUTPUT_PATH_CUT, binary_suffix: str = "", is_comparetest: Optional[bool] = False, @@ -116,6 +120,28 @@ def run_renderer( else: trj_name = "" + if refrot_file is not None: + refrot_name = f"_{refrot_file.stem}" + else: + refrot_name = "" + + if refvec_file is not None: + refvec_name = f"_{refvec_file.stem}" + else: + refvec_name = "" + + if refveclev_file is not None: + refveclev_name = f"_{refveclev_file.stem}" + else: + refveclev_name = "" + + if config_file is not None: + config_name = f"_{config_file.stem}" + else: + config_name = "" + + + if not isinstance(out_fmt, str): out_name = f"{out_fmt.stem}" else: @@ -136,7 +162,7 @@ def run_renderer( in_file = FORMAT_TO_FILE[in_fmt] in_name = in_fmt - out_file = str(output_path_base.joinpath(f"{in_name}_to_{out_name}{trj_name}.wav")) + out_file = str(output_path_base.joinpath(f"{in_name}_to_{out_name}{trj_name}{refrot_name}{refvec_name}{refveclev_name}{config_name}{name_extension}.wav")) cmd = RENDERER_CMD[:] cmd[2] = str(in_file) @@ -152,60 +178,25 @@ def run_renderer( if trj_file is not None: cmd.extend(["-tf", str(trj_file)]) - run_cmd(cmd) - - return pyaudio3dtools.audiofile.readfile(out_file) - - -def run_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 refrot_file is not None: + cmd.extend(["-rf", str(refrot_file)]) + cmd.extend(["-otr", "ref"]) - if is_comparetest: - FORMAT_TO_FILE = FORMAT_TO_FILE_COMPARETEST - else: - FORMAT_TO_FILE = FORMAT_TO_FILE_SMOKETEST + if refvec_file is not None: + cmd.extend(["-rvf", str(refvec_file)]) + cmd.extend(["-otr", "ref_vec"]) - 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 + if refveclev_file is not None: + cmd.extend(["-rvf", str(refveclev_file)]) + cmd.extend(["-otr", "ref_vec_lev"]) - out_file = str(OUTPUT_PATH_REF.joinpath(f"{in_name}_to_{out_name}{trj_name}.wav")) + if config_file is not None: + cmd.extend(["-rc", str(config_file)]) - 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, - ) + run_cmd(cmd) 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, @@ -222,3 +213,8 @@ def compare_renderer_vs_pyscripts(test_info, in_fmt, out_fmt, **kwargs): ref, ref_fs = run_pyscripts(in_fmt, out_fmt, **kwargs) cut, cut_fs = run_renderer(in_fmt, out_fmt, **kwargs) check_BE(test_info, ref, ref_fs, cut, cut_fs) + +def compare_renderer_args(test_info, in_fmt, out_fmt, ref_kwargs: Dict, cut_kwargs: Dict): + ref, ref_fs = run_renderer(in_fmt, out_fmt, **ref_kwargs) + cut, cut_fs = run_renderer(in_fmt, out_fmt, **cut_kwargs) + check_BE(test_info, ref, ref_fs, cut, cut_fs) \ No newline at end of file