diff --git a/.vscode/launch.json b/.vscode/launch.json index 10cb357..3218e56 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -23,10 +23,10 @@ } ] },{ - "name": "test", + "name": "test_face", "type": "cppdbg", "request": "launch", - "program": "${workspaceFolder}/bin/test", + "program": "${workspaceFolder}/bin/test_face", "args": ["/opt/cmhu/data/Street.uvf","0", "0", "0"], "stopAtEntry": false, "cwd": "${workspaceFolder}/bin", diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/async.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/async.h old mode 100755 new mode 100644 index 6406822..6406822 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/async.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/async.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/async_logger-inl.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/async_logger-inl.h old mode 100755 new mode 100644 index 6fac8fc..6fac8fc --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/async_logger-inl.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/async_logger-inl.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/async_logger.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/async_logger.h old mode 100755 new mode 100644 index 91a93fc..91a93fc --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/async_logger.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/async_logger.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/argv.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/argv.h old mode 100755 new mode 100644 index 36d9f1c..36d9f1c --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/argv.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/argv.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/env.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/env.h old mode 100755 new mode 100644 index 1f39ebb..1f39ebb --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/env.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/env.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/helpers-inl.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/helpers-inl.h old mode 100755 new mode 100644 index 675a13a..675a13a --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/helpers-inl.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/helpers-inl.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/helpers.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/helpers.h old mode 100755 new mode 100644 index ab7584e..ab7584e --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/helpers.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/helpers.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/common-inl.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/common-inl.h old mode 100755 new mode 100644 index 97cbbdd..97cbbdd --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/common-inl.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/common-inl.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/common.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/common.h old mode 100755 new mode 100644 index ed0ab46..ed0ab46 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/common.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/common.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/backtracer-inl.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/backtracer-inl.h old mode 100755 new mode 100644 index 2621c8f..2621c8f --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/backtracer-inl.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/backtracer-inl.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/backtracer.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/backtracer.h old mode 100755 new mode 100644 index b336ee7..b336ee7 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/backtracer.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/backtracer.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/circular_q.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/circular_q.h old mode 100755 new mode 100644 index 1f2712e..1f2712e --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/circular_q.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/circular_q.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/console_globals.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/console_globals.h old mode 100755 new mode 100644 index 665201d..665201d --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/console_globals.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/console_globals.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/file_helper-inl.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/file_helper-inl.h old mode 100755 new mode 100644 index ac7021a..ac7021a --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/file_helper-inl.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/file_helper-inl.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/file_helper.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/file_helper.h old mode 100755 new mode 100644 index cfccaed..cfccaed --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/file_helper.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/file_helper.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/fmt_helper.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/fmt_helper.h old mode 100755 new mode 100644 index 01b2aa4..01b2aa4 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/fmt_helper.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/fmt_helper.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/log_msg-inl.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/log_msg-inl.h old mode 100755 new mode 100644 index c6e8a7e..c6e8a7e --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/log_msg-inl.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/log_msg-inl.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/log_msg.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/log_msg.h old mode 100755 new mode 100644 index fed51ab..fed51ab --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/log_msg.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/log_msg.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/log_msg_buffer-inl.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/log_msg_buffer-inl.h old mode 100755 new mode 100644 index 84d83dc..84d83dc --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/log_msg_buffer-inl.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/log_msg_buffer-inl.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/log_msg_buffer.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/log_msg_buffer.h old mode 100755 new mode 100644 index 8105506..8105506 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/log_msg_buffer.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/log_msg_buffer.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/mpmc_blocking_q.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/mpmc_blocking_q.h old mode 100755 new mode 100644 index 5c3cca7..5c3cca7 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/mpmc_blocking_q.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/mpmc_blocking_q.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/null_mutex.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/null_mutex.h old mode 100755 new mode 100644 index 83533d4..83533d4 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/null_mutex.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/null_mutex.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/os-inl.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/os-inl.h old mode 100755 new mode 100644 index 4602782..4602782 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/os-inl.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/os-inl.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/os.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/os.h old mode 100755 new mode 100644 index 2b2ffa1..2b2ffa1 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/os.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/os.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/periodic_worker-inl.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/periodic_worker-inl.h old mode 100755 new mode 100644 index d4abbda..d4abbda --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/periodic_worker-inl.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/periodic_worker-inl.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/periodic_worker.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/periodic_worker.h old mode 100755 new mode 100644 index a300218..a300218 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/periodic_worker.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/periodic_worker.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/registry-inl.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/registry-inl.h old mode 100755 new mode 100644 index c55b5ee..c55b5ee --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/registry-inl.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/registry-inl.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/registry.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/registry.h old mode 100755 new mode 100644 index 97473ea..97473ea --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/registry.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/registry.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/synchronous_factory.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/synchronous_factory.h old mode 100755 new mode 100644 index e1e4226..e1e4226 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/synchronous_factory.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/synchronous_factory.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/tcp_client-windows.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/tcp_client-windows.h old mode 100755 new mode 100644 index 95c0d22..95c0d22 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/tcp_client-windows.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/tcp_client-windows.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/tcp_client.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/tcp_client.h old mode 100755 new mode 100644 index 706d759..706d759 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/tcp_client.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/tcp_client.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/thread_pool-inl.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/thread_pool-inl.h old mode 100755 new mode 100644 index deee376..deee376 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/thread_pool-inl.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/thread_pool-inl.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/thread_pool.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/thread_pool.h old mode 100755 new mode 100644 index 86187e4..86187e4 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/thread_pool.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/thread_pool.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/windows_include.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/windows_include.h old mode 100755 new mode 100644 index a92390b..a92390b --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/details/windows_include.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/details/windows_include.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bin_to_hex.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bin_to_hex.h old mode 100755 new mode 100644 index 0b6c3e9..0b6c3e9 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bin_to_hex.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bin_to_hex.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/args.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/args.h old mode 100755 new mode 100644 index 562e8ab..562e8ab --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/args.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/args.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/chrono.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/chrono.h old mode 100755 new mode 100644 index c024fd7..c024fd7 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/chrono.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/chrono.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/color.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/color.h old mode 100755 new mode 100644 index 3d5490e..3d5490e --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/color.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/color.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/compile.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/compile.h old mode 100755 new mode 100644 index 00000c9..00000c9 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/compile.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/compile.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/core.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/core.h old mode 100755 new mode 100644 index d058398..d058398 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/core.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/core.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/format-inl.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/format-inl.h old mode 100755 new mode 100644 index 94a36d1..94a36d1 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/format-inl.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/format-inl.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/format.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/format.h old mode 100755 new mode 100644 index 5398a23..5398a23 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/format.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/format.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/locale.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/locale.h old mode 100755 new mode 100644 index 7571b52..7571b52 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/locale.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/locale.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/os.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/os.h old mode 100755 new mode 100644 index f6c0f32..f6c0f32 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/os.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/os.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/ostream.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/ostream.h old mode 100755 new mode 100644 index d66248a..d66248a --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/ostream.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/ostream.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/printf.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/printf.h old mode 100755 new mode 100644 index 3a3cd15..3a3cd15 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/printf.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/printf.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/ranges.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/ranges.h old mode 100755 new mode 100644 index f0390df..f0390df --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/ranges.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/ranges.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/xchar.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/xchar.h old mode 100755 new mode 100644 index a0dd032..a0dd032 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/xchar.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/bundled/xchar.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/chrono.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/chrono.h old mode 100755 new mode 100644 index a0544bc..a0544bc --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/chrono.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/chrono.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/compile.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/compile.h old mode 100755 new mode 100644 index 6f34593..6f34593 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/compile.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/compile.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/fmt.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/fmt.h old mode 100755 new mode 100644 index 7aaeed8..7aaeed8 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/fmt.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/fmt.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/ostr.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/ostr.h old mode 100755 new mode 100644 index 9d8efe3..9d8efe3 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/ostr.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/ostr.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/xchar.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/xchar.h old mode 100755 new mode 100644 index 616d8f5..616d8f5 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/xchar.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/fmt/xchar.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/formatter.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/formatter.h old mode 100755 new mode 100644 index 5086fb2..5086fb2 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/formatter.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/formatter.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/fwd.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/fwd.h old mode 100755 new mode 100644 index cc05ddd..cc05ddd --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/fwd.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/fwd.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/logger-inl.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/logger-inl.h old mode 100755 new mode 100644 index fd84165..fd84165 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/logger-inl.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/logger-inl.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/logger.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/logger.h old mode 100755 new mode 100644 index ff3bef5..ff3bef5 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/logger.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/logger.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/pattern_formatter-inl.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/pattern_formatter-inl.h old mode 100755 new mode 100644 index ec72703..ec72703 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/pattern_formatter-inl.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/pattern_formatter-inl.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/pattern_formatter.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/pattern_formatter.h old mode 100755 new mode 100644 index e9ccfaa..e9ccfaa --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/pattern_formatter.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/pattern_formatter.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/android_sink.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/android_sink.h old mode 100755 new mode 100644 index 42935a7..42935a7 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/android_sink.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/android_sink.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/ansicolor_sink-inl.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/ansicolor_sink-inl.h old mode 100755 new mode 100644 index d8db423..d8db423 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/ansicolor_sink-inl.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/ansicolor_sink-inl.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/ansicolor_sink.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/ansicolor_sink.h old mode 100755 new mode 100644 index 39d966b..39d966b --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/ansicolor_sink.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/ansicolor_sink.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/base_sink-inl.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/base_sink-inl.h old mode 100755 new mode 100644 index 421fdf9..421fdf9 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/base_sink-inl.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/base_sink-inl.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/base_sink.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/base_sink.h old mode 100755 new mode 100644 index a0624e9..a0624e9 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/base_sink.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/base_sink.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/basic_file_sink-inl.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/basic_file_sink-inl.h old mode 100755 new mode 100644 index e903dd9..e903dd9 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/basic_file_sink-inl.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/basic_file_sink-inl.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/basic_file_sink.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/basic_file_sink.h old mode 100755 new mode 100644 index 047bc8c..047bc8c --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/basic_file_sink.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/basic_file_sink.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/daily_file_sink.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/daily_file_sink.h old mode 100755 new mode 100644 index d6a09f6..d6a09f6 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/daily_file_sink.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/daily_file_sink.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/dist_sink.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/dist_sink.h old mode 100755 new mode 100644 index 8fccb4e..8fccb4e --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/dist_sink.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/dist_sink.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/dup_filter_sink.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/dup_filter_sink.h old mode 100755 new mode 100644 index 282163a..282163a --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/dup_filter_sink.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/dup_filter_sink.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/hourly_file_sink.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/hourly_file_sink.h old mode 100755 new mode 100644 index e75ab4d..e75ab4d --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/hourly_file_sink.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/hourly_file_sink.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/mongo_sink.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/mongo_sink.h old mode 100755 new mode 100644 index 10573cf..10573cf --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/mongo_sink.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/mongo_sink.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/msvc_sink.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/msvc_sink.h old mode 100755 new mode 100644 index 2ac4a96..2ac4a96 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/msvc_sink.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/msvc_sink.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/null_sink.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/null_sink.h old mode 100755 new mode 100644 index eb83280..eb83280 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/null_sink.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/null_sink.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/ostream_sink.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/ostream_sink.h old mode 100755 new mode 100644 index 95c1e96..95c1e96 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/ostream_sink.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/ostream_sink.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/qt_sinks.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/qt_sinks.h old mode 100755 new mode 100644 index 25b2aae..25b2aae --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/qt_sinks.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/qt_sinks.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/ringbuffer_sink.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/ringbuffer_sink.h old mode 100755 new mode 100644 index 1ee3f69..1ee3f69 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/ringbuffer_sink.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/ringbuffer_sink.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/rotating_file_sink-inl.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/rotating_file_sink-inl.h old mode 100755 new mode 100644 index f31f531..f31f531 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/rotating_file_sink-inl.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/rotating_file_sink-inl.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/rotating_file_sink.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/rotating_file_sink.h old mode 100755 new mode 100644 index 842527e..842527e --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/rotating_file_sink.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/rotating_file_sink.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/sink-inl.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/sink-inl.h old mode 100755 new mode 100644 index df07add..df07add --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/sink-inl.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/sink-inl.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/sink.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/sink.h old mode 100755 new mode 100644 index 0a28ccc..0a28ccc --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/sink.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/sink.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/stdout_color_sinks-inl.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/stdout_color_sinks-inl.h old mode 100755 new mode 100644 index 066df18..066df18 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/stdout_color_sinks-inl.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/stdout_color_sinks-inl.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/stdout_color_sinks.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/stdout_color_sinks.h old mode 100755 new mode 100644 index 420b13a..420b13a --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/stdout_color_sinks.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/stdout_color_sinks.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/stdout_sinks-inl.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/stdout_sinks-inl.h old mode 100755 new mode 100644 index c14066b..c14066b --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/stdout_sinks-inl.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/stdout_sinks-inl.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/stdout_sinks.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/stdout_sinks.h old mode 100755 new mode 100644 index 6fdc0de..6fdc0de --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/stdout_sinks.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/stdout_sinks.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/syslog_sink.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/syslog_sink.h old mode 100755 new mode 100644 index 7c38fcb..7c38fcb --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/syslog_sink.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/syslog_sink.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/systemd_sink.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/systemd_sink.h old mode 100755 new mode 100644 index e3d513a..e3d513a --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/systemd_sink.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/systemd_sink.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/tcp_sink.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/tcp_sink.h old mode 100755 new mode 100644 index e0efb31..e0efb31 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/tcp_sink.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/tcp_sink.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/win_eventlog_sink.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/win_eventlog_sink.h old mode 100755 new mode 100644 index 5e70599..5e70599 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/win_eventlog_sink.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/win_eventlog_sink.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/wincolor_sink-inl.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/wincolor_sink-inl.h old mode 100755 new mode 100644 index be3d80a..be3d80a --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/wincolor_sink-inl.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/wincolor_sink-inl.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/wincolor_sink.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/wincolor_sink.h old mode 100755 new mode 100644 index 9b030fc..9b030fc --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/wincolor_sink.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/sinks/wincolor_sink.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/spdlog-inl.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/spdlog-inl.h old mode 100755 new mode 100644 index 2b875fa..2b875fa --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/spdlog-inl.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/spdlog-inl.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/spdlog.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/spdlog.h old mode 100755 new mode 100644 index 812896d..812896d --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/spdlog.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/spdlog.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/stopwatch.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/stopwatch.h old mode 100755 new mode 100644 index bb976b1..bb976b1 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/stopwatch.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/stopwatch.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/tweakme.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/tweakme.h old mode 100755 new mode 100644 index 24361f3..24361f3 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/tweakme.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/tweakme.h diff --git a/3rdparty/spdlog-1.9.2/release/include/spdlog/version.h b/3rdparty/spdlog-1.9.2/release/include/spdlog/version.h old mode 100755 new mode 100644 index b4ca456..b4ca456 --- a/3rdparty/spdlog-1.9.2/release/include/spdlog/version.h +++ b/3rdparty/spdlog-1.9.2/release/include/spdlog/version.h diff --git a/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfig.cmake b/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfig.cmake old mode 100755 new mode 100644 index 5da782c..5da782c --- a/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfig.cmake +++ b/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfig.cmake diff --git a/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfigTargets-release.cmake b/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfigTargets-release.cmake old mode 100755 new mode 100644 index caf8056..caf8056 --- a/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfigTargets-release.cmake +++ b/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfigTargets-release.cmake diff --git a/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfigTargets.cmake b/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfigTargets.cmake old mode 100755 new mode 100644 index 029fb07..029fb07 --- a/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfigTargets.cmake +++ b/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfigTargets.cmake diff --git a/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfigVersion.cmake b/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfigVersion.cmake old mode 100755 new mode 100644 index d374d5e..d374d5e --- a/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfigVersion.cmake +++ b/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfigVersion.cmake diff --git a/3rdparty/spdlog-1.9.2/release/lib/pkgconfig/spdlog.pc b/3rdparty/spdlog-1.9.2/release/lib/pkgconfig/spdlog.pc old mode 100755 new mode 100644 index 73445ab..30f9aed --- a/3rdparty/spdlog-1.9.2/release/lib/pkgconfig/spdlog.pc +++ b/3rdparty/spdlog-1.9.2/release/lib/pkgconfig/spdlog.pc @@ -1,4 +1,4 @@ -prefix=/opt/cmhu/vpt_ascend/3rdparty/spdlog-1.9.2/release +prefix=/opt/cmhu/vpt_ascend_arm/3rdparty/spdlog-1.9.2/release exec_prefix=${prefix} includedir=${prefix}/include libdir=${exec_prefix}/lib diff --git a/bin/libvpt_ascend.so b/bin/libvpt_ascend.so deleted file mode 100755 index a1847c5..0000000 --- a/bin/libvpt_ascend.so +++ /dev/null diff --git a/bin/vpt_proj b/bin/vpt_proj deleted file mode 100755 index 72dff6a..0000000 --- a/bin/vpt_proj +++ /dev/null diff --git a/src/Makefile b/src/Makefile index 6c81f47..7764b39 100755 --- a/src/Makefile +++ b/src/Makefile @@ -1,7 +1,7 @@ XX = g++ -PROJECT_ROOT= /opt/shzhao/vpt_ascend +PROJECT_ROOT= /opt/cmhu/vpt_ascend_arm DEPEND_DIR = $(PROJECT_ROOT)/bin SRC_ROOT = $(PROJECT_ROOT)/src diff --git a/src/ai_platform/MultiSourceProcess.cpp b/src/ai_platform/MultiSourceProcess.cpp index ec4eb0b..2febdf7 100755 --- a/src/ai_platform/MultiSourceProcess.cpp +++ b/src/ai_platform/MultiSourceProcess.cpp @@ -241,7 +241,6 @@ int CMultiSourceProcess::InitAlgorthim(tsl_aiplatform_param vptParam){ } , this); - m_timing_snapshot_thread = new std::thread( [](void* arg) { @@ -1853,4 +1852,4 @@ bool CMultiSourceProcess::CheckTime() { { return false; } -} \ No newline at end of file +} diff --git a/src/decoder/Makefile b/src/decoder/Makefile index ac300c3..c4487de 100755 --- a/src/decoder/Makefile +++ b/src/decoder/Makefile @@ -91,4 +91,4 @@ $(TARGET):$(OBJS) $(XX) $(CXXFLAGS) -c $< clean: - rm -f *.o $(TARGET) \ No newline at end of file + rm -f *.o $(TARGET) diff --git a/src/demo/Makefile b/src/demo/Makefile index d0fa6b7..3d88ac7 100755 --- a/src/demo/Makefile +++ b/src/demo/Makefile @@ -1,7 +1,7 @@ XX = g++ -PROJECT_ROOT= /opt/shzhao/vpt_ascend +PROJECT_ROOT= /opt/cmhu/vpt_ascend_arm DEPEND_DIR = $(PROJECT_ROOT)/bin SRC_ROOT = $(PROJECT_ROOT)/src @@ -15,7 +15,7 @@ JSON_ROOT = $(THIRDPARTY_ROOT)/jsoncpp-1.9.5/release FFMPEG_ROOT = $(THIRDPARTY_ROOT)/ffmpeg-4.4.4/release RABBITMQ_CLIENT_ROOT = $(THIRDPARTY_ROOT)/rabbitmq-c-0.11.0/release -DEFS = -DENABLE_DVPP_INTERFACE -DPOST_USE_RABBITMQ +DEFS = -DENABLE_DVPP_INTERFACE -DPOST_USE_RABBITMQ -DUSE_VILLAGE include_dir=-I/usr/local/Ascend/ascend-toolkit/6.3.RC1/aarch64-linux/include \ -I $(SPDLOG_ROOT)/include \ diff --git a/src/demo/demo.cpp b/src/demo/demo.cpp index 05fd5f4..10e1e0d 100755 --- a/src/demo/demo.cpp +++ b/src/demo/demo.cpp @@ -635,7 +635,9 @@ static long long get_cur_time(){ return tpMicro.time_since_epoch().count(); } -string createTask(void *handle, std::vector algor_vec, int gi){ +static int nTaskId = 0; + +string createTask(void *handle, std::vector algor_vec, int gi, bool bFlag = true){ task_param tparam; switch(gi){ @@ -643,17 +645,18 @@ string createTask(void *handle, std::vector algor_vec, int gi) tparam.ipc_url = "rtsp://admin:ad123456@192.168.60.165:554/cam/realmonitor?channel=1&subtype=0"; break; case 1: - tparam.ipc_url = "/opt/share/data/bayue.mp4"; + tparam.ipc_url = "rtsp://122.97.218.170:8604/openUrl/V5nXRHa?params=eyJwcm90b2NhbCI6InJ0c3AiLCJjbGllbnRUeXBlIjoib3Blbl9hcGkiLCJleHByaWVUaW1lIjotMSwicHJvdG9jb2wiOiJydHNwIiwiZXhwaXJlVGltZSI6MzAwLCJlbmFibGVNR0MiOnRydWUsImV4cGFuZCI6InN0YW5kYXJkPXJ0c3Amc3RyZWFtZm9ybT1ydHAiLCJhIjoiMTBjZjM4N2JjY2Y5NDg3YzhjNWYzNjE2M2ViMWUyNTJ8MXwwfDEiLCJ0IjoxfQ=="; break; case 2: - tparam.ipc_url = "/opt/share/data/Street.uvf"; + tparam.ipc_url = "rtsp://admin:ad123456@192.168.10.166:554/cam/realmonitor?channel=1&subtype=0"; break; case 3: tparam.ipc_url = "rtsp://122.97.218.170:8604/openUrl/LBBYTra?params=eyJwcm90b2NhbCI6InJ0c3AiLCJjbGllbnRUeXBlIjoib3Blbl9hcGkiLCJleHByaWVUaW1lIjotMSwicHJvdG9jb2wiOiJydHNwIiwiZXhwaXJlVGltZSI6MzAwLCJlbmFibGVNR0MiOnRydWUsImV4cGFuZCI6InN0YW5kYXJkPXJ0c3Amc3RyZWFtZm9ybT1ydHAiLCJhIjoiOTgzYjRjMmUxMThlNGU1OTlkYThmMTI3NTkyMGViODV8MXwwfDEiLCJ0IjoxfQ=="; // tparam.ipc_url = "rtsp://122.97.218.170:8604/openUrl/V5nXRHa?params=eyJwcm90b2NhbCI6InJ0c3AiLCJjbGllbnRUeXBlIjoib3Blbl9hcGkiLCJleHByaWVUaW1lIjotMSwicHJvdG9jb2wiOiJydHNwIiwiZXhwaXJlVGltZSI6MzAwLCJlbmFibGVNR0MiOnRydWUsImV4cGFuZCI6InN0YW5kYXJkPXJ0c3Amc3RyZWFtZm9ybT1ydHAiLCJhIjoiMTBjZjM4N2JjY2Y5NDg3YzhjNWYzNjE2M2ViMWUyNTJ8MXwwfDEiLCJ0IjoxfQ=="; + //tparam.ipc_url = "/opt/share/data/bayue.mp4"; break; case 4: - tparam.ipc_url = "rtsp://admin:ad123456@192.168.60.165:554/cam/realmonitor?channel=1&subtype=0"; + tparam.ipc_url = "/opt/share/data/Street.uvf"; break; case 5: tparam.ipc_url = "/opt/share/data/公安局老桥头_CVR15F89410_1465819864_1B.mp4"; @@ -661,6 +664,46 @@ string createTask(void *handle, std::vector algor_vec, int gi) case 6: tparam.ipc_url = "/opt/share/data/不带头盔2.mp4"; break; + case 7: + tparam.ipc_url = "/opt/share/data/caishenkezhan.mp4"; + break; + case 8: + tparam.ipc_url = "/opt/share/data/1-00000001d9.mp4"; + break; + case 9: + tparam.ipc_url = "/opt/share/data/1-00000002d55_h265.mp4"; + break; + case 10: + tparam.ipc_url = "/opt/share/data/1-00000002d55.mp4"; + break; + case 11: + tparam.ipc_url = "/opt/share/data/1.mp4"; + break; + case 12: + tparam.ipc_url = "/opt/share/data/20041609451310232511_20211128090026~1.mp4"; + break; + case 13: + tparam.ipc_url = "/opt/share/data/720.avi"; + break; + case 14: + tparam.ipc_url = "/opt/share/data/callphone.mp4"; + break; + case 15: + tparam.ipc_url = "/opt/share/data/crk2.mp4"; + break; + case 16: + tparam.ipc_url = "/opt/share/data/crk3.mp4"; + break; + case 17: + tparam.ipc_url = "/opt/share/data/diedao.mp4"; + break; + case 18: + tparam.ipc_url = "rtsp://122.97.218.170:8604/openUrl/LBBYTra?params=eyJwcm90b2NhbCI6InJ0c3AiLCJjbGllbnRUeXBlIjoib3Blbl9hcGkiLCJleHByaWVUaW1lIjotMSwicHJvdG9jb2wiOiJydHNwIiwiZXhwaXJlVGltZSI6MzAwLCJlbmFibGVNR0MiOnRydWUsImV4cGFuZCI6InN0YW5kYXJkPXJ0c3Amc3RyZWFtZm9ybT1ydHAiLCJhIjoiOTgzYjRjMmUxMThlNGU1OTlkYThmMTI3NTkyMGViODV8MXwwfDEiLCJ0IjoxfQ=="; + break; + case 19: + // 公安内网 + tparam.ipc_url = "http://192.168.51.200:8554/320202202308231001001002"; + break; default: tparam.ipc_url = "/opt/share/data/Street.uvf"; break; @@ -669,9 +712,15 @@ string createTask(void *handle, std::vector algor_vec, int gi) tparam.algor_counts = algor_vec.size(); tparam.dec_type = 2; - std::string task_id_str = "test_task_id_" + std::to_string(gi); + if (bFlag){ + nTaskId = gi; + } + + std::string task_id_str = "test_task_id_" + std::to_string(nTaskId); tparam.task_id = task_id_str.c_str(); + nTaskId++; + tparam.algor_config_params = new algor_config_param[tparam.algor_counts]; for (size_t idx = 0; idx < algor_vec.size(); ++idx) @@ -732,24 +781,54 @@ void test_gpu(int gpuID){ #endif // #ifdef POST_USE_RABBITMQ std::vector algor_vec = {algorithm_type_t::FACE_SNAPSHOT, algorithm_type_t::HUMAN_SNAPSHOT,algorithm_type_t::ROAD_WORK_DET, algorithm_type_t::PEDESTRIAN_RETROGRADE, algorithm_type_t::VEHICLE_RETROGRADE, - algorithm_type_t::PEDESTRIAN_TRESPASS, algorithm_type_t::VEHICLE_TRESPASS, algorithm_type_t::VEHICLE_SNAPSHOT, algorithm_type_t::NONMOTOR_VEHICLE_SNAPSHOT, algorithm_type_t::VIDEO_TIMING_SNAPSHOT, algorithm_type_t::VIDEO_SNAPSHOT}; + algorithm_type_t::PEDESTRIAN_TRESPASS, algorithm_type_t::VEHICLE_TRESPASS, algorithm_type_t::VEHICLE_SNAPSHOT, algorithm_type_t::NONMOTOR_VEHICLE_SNAPSHOT, algorithm_type_t::VIDEO_TIMING_SNAPSHOT + , algorithm_type_t::VIDEO_SNAPSHOT, algorithm_type_t::NONMOTOR_VEHICLE_NOHELMET, algorithm_type_t::NONMOTOR_VEHICLE_OVERMAN, algorithm_type_t::TRICYCLE_MANNED, algorithm_type_t::TRUCK_MANNED}; std::vector algor_vec2 = {algorithm_type_t::NONMOTOR_VEHICLE_NOHELMET, algorithm_type_t::NONMOTOR_VEHICLE_OVERMAN, algorithm_type_t::TRICYCLE_MANNED, algorithm_type_t::TRUCK_MANNED}; + // std::vector algor_vec2 = {algorithm_type_t::TRICYCLE_MANNED, algorithm_type_t::TRUCK_MANNED}; std::vector algor_vec3 = {algorithm_type_t::FACE_SNAPSHOT}; +/* int repeat_num = 1000; while(repeat_num--) { printf("============================:%d\n",repeat_num); string task_id = createTask(handle, algor_vec, 3 + gpuID * 10); string task_id1 = createTask(handle, algor_vec2, 5); string task_id2 = createTask(handle, algor_vec2, 6); +*/ + + // string task_id = createTask(handle, algor_vec, 3 + gpuID * 10); + // string task_id1 = createTask(handle, algor_vec2, 5); + createTask(handle, algor_vec, 18, false); + createTask(handle, algor_vec, 18, false); + createTask(handle, algor_vec, 18, false); + createTask(handle, algor_vec, 18, false); + createTask(handle, algor_vec, 18, false); + // createTask(handle, algor_vec, 3); + // createTask(handle, algor_vec, 4); + // createTask(handle, algor_vec, 5); + // createTask(handle, algor_vec, 6); + // createTask(handle, algor_vec, 7); + // createTask(handle, algor_vec, 8); + // createTask(handle, algor_vec, 9); + // createTask(handle, algor_vec, 10); + // createTask(handle, algor_vec, 11); + // createTask(handle, algor_vec, 12); + // createTask(handle, algor_vec, 13); + // createTask(handle, algor_vec, 14); + // createTask(handle, algor_vec, 15); + // createTask(handle, algor_vec, 16); + // createTask(handle, algor_vec, 17); + // createTask(handle, algor_vec, 18); + // createTask(handle, algor_vec, 19); +/* // test_snapshot(handle); sleep(60); //60s finish_task(handle, (char*)task_id2.data(), 0); finish_task(handle, (char*)task_id1.data(), 0); - } + }*/ while (getchar() != 'q'); // finish_task(handle, (char*)task_id.data(), 0); @@ -762,16 +841,16 @@ void test_gpu(int gpuID){ int main(int argc, char *argv[]) { printf("new test\n"); - if (argc < 4) { - fprintf(stderr, "./xxx 0 2 10 1 ## [start_ai_id, end_ai_id) repeat_num gpu_id\n"); - return -1; - } + // if (argc < 4) { + // fprintf(stderr, "./xxx 0 2 10 1 ## [start_ai_id, end_ai_id) repeat_num gpu_id\n"); + // return -1; + // } - //! load params. - int start_id = atoi(argv[1]); - int end_id = atoi(argv[2]); - int repeat_num = atoi(argv[3]); - int gpuID = atoi(argv[4]); + // //! load params. + // int start_id = atoi(argv[1]); + // int end_id = atoi(argv[2]); + // int repeat_num = atoi(argv[3]); + // int gpuID = atoi(argv[4]); test_gpu(0); // test_gpu(1); @@ -783,4 +862,4 @@ int main(int argc, char *argv[]) { printf("Done.\n"); return 0; -} \ No newline at end of file +}