diff --git a/CMakeLists.txt b/CMakeLists.txt index 4290066..341ae19 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,6 +56,7 @@ include_directories(/opt/nvidia/deepstream/deepstream-7.1/sources/includes) include_directories(/usr/include/gstreamer-1.0) include_directories(/usr/include/nlohmann) include_directories(/usr/local/cuda/include) +include_directories(/opt/nvidia/deepstream/deepstream-7.1/service-maker/includes/) link_directories(/opt/nvidia/deepstream/deepstream/lib/) link_directories(/opt/nvidia/deepstream/deepstream/lib/gst-plugins) link_directories(/usr/local/cuda/lib64/) @@ -73,7 +74,7 @@ include_directories(${PROJECT_SOURCE_DIR}/nv_ds_logger_manager.hpp) include_directories(${PROJECT_SOURCE_DIR}/sink_manager.hpp) include_directories(${PROJECT_SOURCE_DIR}/message_handling.hpp) include_directories(${PROJECT_SOURCE_DIR}/rtsp_streaming_manager.hpp) -include_directories(${PROJECT_SOURCE_DIR}/metrics_manager.hpp) +# include_directories(${PROJECT_SOURCE_DIR}/metrics_manager.hpp) include_directories(${PROJECT_SOURCE_DIR}/config_manager.hpp) include_directories(${PROJECT_SOURCE_DIR}/nv_infer_server_manager.hpp) include_directories(${PROJECT_SOURCE_DIR}/nv_tracker_manager.hpp) @@ -86,7 +87,9 @@ set(SOURCES src/main.cpp src/camera_manager.cpp src/pipeline_manager.cpp src/st src/source_bin.cpp src/gstds_example_manager.cpp src/tiler_manager.cpp src/nv_video_convert_manager.cpp src/nv_osd_manager.cpp src/queue_manager.cpp src/nv_ds_logger_manager.cpp src/sink_manager.cpp src/message_handling.cpp - src/rtsp_streaming_manager.cpp src/metrics_manager.cpp src/config_manager.cpp + src/rtsp_streaming_manager.cpp + # src/metrics_manager.cpp + src/config_manager.cpp src/nv_infer_server_manager.cpp src/nv_tracker_manager.cpp src/face_candid_trace.cpp src/face_nv_infer_server_manager.cpp src/face_nv_infer_server_manager.cpp) @@ -141,4 +144,5 @@ target_link_libraries(${PROJECT_NAME} cudart cuda) target_link_libraries(${PROJECT_NAME} nvdsgst_infer nvds_meta nvds_inferutils nvdsgst_meta nvds_utils nvdsgst_helper prometheus-cpp-core prometheus-cpp-pull # prometheus-cpp-exposer nvdsgst_metnvdsa - microhttpd) \ No newline at end of file + microhttpd + nvdsgst_nvmultiurisrcbin) \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index c13d119..af1e078 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6,7 +6,7 @@ #include #include "camera_manager.hpp" -#include "metrics_manager.hpp" +// #include "metrics_manager.hpp" #include "pipeline_manager.hpp" namespace fs = std::filesystem; @@ -59,16 +59,17 @@ int main(int argc, char *argv[]) { return 1; } - const auto &config = ConfigManager::get_instance().get_config(); - std::string host = config["prometheus"]["host"]; - int port = config["prometheus"]["port"]; - std::string prometheus_address = host + ":" + std::to_string(port); - // MetricsManager* metric_manager = new MetricsManager(); - std::shared_ptr metric_manager = - std::make_shared(prometheus_address); - metric_manager->setup_prometheus(); // Calls the metrics_loop method + // const auto &config = ConfigManager::get_instance().get_config(); + // std::string host = config["prometheus"]["host"]; + // int port = config["prometheus"]["port"]; + // std::string prometheus_address = host + ":" + std::to_string(port); + // // MetricsManager* metric_manager = new MetricsManager(); + // std::shared_ptr metric_manager = + // std::make_shared(prometheus_address); + // metric_manager->setup_prometheus(); // Calls the metrics_loop method - std::thread metrics_thread(&MetricsManager::metrics_loop, metric_manager); + // std::thread metrics_thread(&MetricsManager::metrics_loop, + // metric_manager); // std::thread metrics_thread(metric_manager->metrics_loop); //, // metric_manager->my_gauge @@ -98,7 +99,7 @@ int main(int argc, char *argv[]) { pipeline_manager->create_pipeline_elements(num_sources, url_camera); // On shutdown: - metric_manager->running = false; - metrics_thread.join(); // optional: wait on thread before exiting + // metric_manager->running = false; + // metrics_thread.join(); // optional: wait on thread before exiting return 0; } \ No newline at end of file