소스 검색

update namespace

leon 2 달 전
부모
커밋
528215be77

+ 23 - 23
src/main.cpp

@@ -8,19 +8,19 @@
 
 void test_depth()
 {
-    std::shared_ptr<Node::StreamNode> src_node0   = std::make_shared<Node::StreamNode>("src0", "rtsp://admin:lww123456@172.16.22.16:554/Streaming/Channels/201", 0, Node::DecodeType::GPU);
+    std::shared_ptr<GNode::StreamNode> src_node0   = std::make_shared<GNode::StreamNode>("src0", "rtsp://admin:lww123456@172.16.22.16:554/Streaming/Channels/201", 0, Node::DecodeType::GPU);
     src_node0->set_skip_frame(10);
 
     std::shared_ptr<Infer> depth_model = load("model/depth.engine", ModelType::DEPTH_ANYTHING, {}, 0, 0.25, 0.45);
-    std::shared_ptr<Node::InferNode> infer_node   = std::make_shared<Node::InferNode>("depth");
+    std::shared_ptr<GNode::InferNode> infer_node   = std::make_shared<GNode::InferNode>("depth");
     infer_node->set_model_instance(depth_model, ModelType::DEPTH_ANYTHING);
 
-    std::shared_ptr<Node::DrawNode> draw_node     = std::make_shared<Node::DrawNode>("draw");
-    std::shared_ptr<Node::HttpPushNode> push_node = std::make_shared<Node::HttpPushNode>("push", "172.16.20.168", 8080, "/push");
+    std::shared_ptr<GNode::DrawNode> draw_node     = std::make_shared<GNode::DrawNode>("draw");
+    std::shared_ptr<GNode::HttpPushNode> push_node = std::make_shared<GNode::HttpPushNode>("push", "172.16.20.168", 8080, "/push");
     
-    Node::LinkNode(src_node0, infer_node);
-    Node::LinkNode(infer_node, draw_node);
-    Node::LinkNode(draw_node, push_node);
+    GNode::LinkNode(src_node0, infer_node);
+    GNode::LinkNode(infer_node, draw_node);
+    GNode::LinkNode(draw_node, push_node);
     push_node->start();
     draw_node->start();
     infer_node->start();
@@ -31,22 +31,22 @@ void test_depth()
 void test_yolo()
 {
     std::vector<std::string> names = { "person", "clothes", "vest" };
-    std::shared_ptr<Node::StreamNode> src_node0   = std::make_shared<Node::StreamNode>("src0", "rtsp://admin:lww123456@172.16.22.16:554/Streaming/Channels/201", 0, Node::DecodeType::GPU);
+    std::shared_ptr<GNode::StreamNode> src_node0   = std::make_shared<GNode::StreamNode>("src0", "rtsp://admin:lww123456@172.16.22.16:554/Streaming/Channels/201", 0, Node::DecodeType::GPU);
     src_node0->set_skip_frame(10);
 
     std::shared_ptr<Infer> yolo_model = load("model/yolo11s.engine", ModelType::YOLO11, names, 0, 0.25, 0.45);
-    std::shared_ptr<Node::InferNode> infer_node   = std::make_shared<Node::InferNode>("yolo11");
+    std::shared_ptr<GNode::InferNode> infer_node   = std::make_shared<GNode::InferNode>("yolo11");
     infer_node->set_model_instance(yolo_model, ModelType::YOLO11);
 
-    std::shared_ptr<Node::TrackNode> track_node     = std::make_shared<Node::TrackNode>("tracker", 30, 30);
+    std::shared_ptr<GNode::TrackNode> track_node     = std::make_shared<GNode::TrackNode>("tracker", 30, 30);
 
-    std::shared_ptr<Node::DrawNode> draw_node     = std::make_shared<Node::DrawNode>("draw");
-    std::shared_ptr<Node::HttpPushNode> push_node = std::make_shared<Node::HttpPushNode>("push", "172.16.20.168", 8080, "/push");
+    std::shared_ptr<GNode::DrawNode> draw_node     = std::make_shared<GNode::DrawNode>("draw");
+    std::shared_ptr<GNode::HttpPushNode> push_node = std::make_shared<GNode::HttpPushNode>("push", "172.16.20.168", 8080, "/push");
     
-    Node::LinkNode(src_node0, infer_node);
-    Node::LinkNode(infer_node, track_node);
-    Node::LinkNode(track_node, draw_node);
-    Node::LinkNode(draw_node, push_node);
+    GNode::LinkNode(src_node0, infer_node);
+    GNode::LinkNode(infer_node, track_node);
+    GNode::LinkNode(track_node, draw_node);
+    GNode::LinkNode(draw_node, push_node);
     push_node->start();
     draw_node->start();
     track_node->start();
@@ -59,25 +59,25 @@ void test_multi()
 {
     std::vector<std::string> names = { "person", "clothes", "vest" };
 
-    std::shared_ptr<Node::StreamNode> src_node0   = std::make_shared<Node::StreamNode>("src0", "rtsp://admin:lww123456@172.16.22.16:554/Streaming/Channels/101", 0, Node::DecodeType::GPU);
+    std::shared_ptr<GNode::StreamNode> src_node0   = std::make_shared<GNode::StreamNode>("src0", "rtsp://admin:lww123456@172.16.22.16:554/Streaming/Channels/101", 0, GNode::DecodeType::GPU);
     src_node0->set_skip_frame(10);
 
-    std::shared_ptr<Node::StreamNode> src_node1   = std::make_shared<Node::StreamNode>("src1", "rtsp://admin:lww123456@172.16.22.16:554/Streaming/Channels/201", 0, Node::DecodeType::GPU);
+    std::shared_ptr<GNode::StreamNode> src_node1   = std::make_shared<GNode::StreamNode>("src1", "rtsp://admin:lww123456@172.16.22.16:554/Streaming/Channels/201", 0, GNode::DecodeType::GPU);
     src_node1->set_skip_frame(10);
 
-    std::shared_ptr<Node::StreamNode> src_node2   = std::make_shared<Node::StreamNode>("src2", "rtsp://admin:lww123456@172.16.22.16:554/Streaming/Channels/301", 0, Node::DecodeType::GPU);
+    std::shared_ptr<GNode::StreamNode> src_node2   = std::make_shared<GNode::StreamNode>("src2", "rtsp://admin:lww123456@172.16.22.16:554/Streaming/Channels/301", 0, GNode::DecodeType::GPU);
     src_node2->set_skip_frame(10);
 
     std::shared_ptr<Infer> yolo_model = load("model/yolo11s.engine", ModelType::YOLO11, names, 0, 0.25, 0.45);
-    std::shared_ptr<Node::InferNode> infer_node1   = std::make_shared<Node::InferNode>("yolo11");
+    std::shared_ptr<GNode::InferNode> infer_node1   = std::make_shared<GNode::InferNode>("yolo11");
     infer_node1->set_model_instance(yolo_model, ModelType::YOLO11);
 
     std::shared_ptr<Infer> depth_model = load("model/depth.engine", ModelType::DEPTH_ANYTHING, {}, 0, 0.25, 0.45);
-    std::shared_ptr<Node::InferNode> infer_node2   = std::make_shared<Node::InferNode>("depth");
+    std::shared_ptr<GNode::InferNode> infer_node2   = std::make_shared<GNode::InferNode>("depth");
     infer_node2->set_model_instance(depth_model, ModelType::DEPTH_ANYTHING);
 
-    std::shared_ptr<Node::DrawNode> draw_node     = std::make_shared<Node::DrawNode>("draw");
-    std::shared_ptr<Node::HttpPushNode> push_node = std::make_shared<Node::HttpPushNode>("push", "172.16.20.168", 8080, "/push");
+    std::shared_ptr<GNode::DrawNode> draw_node     = std::make_shared<GNode::DrawNode>("draw");
+    std::shared_ptr<GNode::HttpPushNode> push_node = std::make_shared<GNode::HttpPushNode>("push", "172.16.20.168", 8080, "/push");
 
     Node::LinkNode(src_node0, infer_node1);
     Node::LinkNode(src_node1, infer_node1);

+ 1 - 1
src/nodes/analyze/analyzeNode.cpp

@@ -2,7 +2,7 @@
 #include "nodes/analyze/analyzeNode.hpp"
 
 
-namespace Node
+namespace StreamNode
 {
 
 

+ 1 - 1
src/nodes/analyze/analyzeNode.hpp

@@ -4,7 +4,7 @@
 #include "nodes/base/base.hpp"
 #include <opencv2/opencv.hpp>
 
-namespace Node
+namespace StreamNode
 {
 
 class AnalyzeNode : public BaseNode

+ 2 - 2
src/nodes/base/base.cpp

@@ -1,7 +1,7 @@
 #include "common/meta.hpp"
 #include "nodes/base/base.hpp"
 
-namespace Node
+namespace GNode
 {
 
 BaseNode::BaseNode(const std::string& name, NODE_TYPE type)
@@ -12,7 +12,7 @@ BaseNode::BaseNode(const std::string& name, NODE_TYPE type)
 
 BaseNode::~BaseNode()
 {
-    
+
 }
 
 void BaseNode::start()

+ 1 - 1
src/nodes/base/base.hpp

@@ -13,7 +13,7 @@
 #include <memory>
 #include <atomic>
 
-namespace Node
+namespace GNode
 {
 
 enum NODE_TYPE {

+ 1 - 1
src/nodes/draw/drawNode.cpp

@@ -6,7 +6,7 @@
 #include <chrono>
 
 
-namespace Node
+namespace GNode
 {
 
 static std::tuple<int, int, int> getFontSize(const std::string& text)

+ 1 - 1
src/nodes/draw/drawNode.hpp

@@ -3,7 +3,7 @@
 #include "nodes/base/base.hpp"
 #include <opencv2/opencv.hpp>
 
-namespace Node
+namespace GNode
 {
 
 class DrawNode : public BaseNode

+ 1 - 1
src/nodes/httpPush/httpPush.cpp

@@ -2,7 +2,7 @@
 #include "nodes/base/base.hpp"
 #include "nodes/httpPush/httpPush.hpp"
 
-namespace Node
+namespace GNode
 {
 
 static cv::Mat get_color_depth(cv::Mat inverse_depth)

+ 3 - 1
src/nodes/httpPush/httpPush.hpp

@@ -3,7 +3,9 @@
 #include "nodes/base/base.hpp"
 #include <opencv2/opencv.hpp>
 #include "common/threadPool.hpp"
-namespace Node
+
+
+namespace GNode
 {
 
 class HttpPushNode : public BaseNode

+ 2 - 2
src/nodes/infer/inferNode.cpp

@@ -5,7 +5,7 @@
 #include <random>
 #include <algorithm>
 
-namespace Node
+namespace GNode
 {
 
 
@@ -83,4 +83,4 @@ void InferNode::work()
     }
 };
 
-}   // namespace Node
+}   // namespace StreamNode

+ 1 - 1
src/nodes/infer/inferNode.hpp

@@ -5,7 +5,7 @@
 #include <opencv2/opencv.hpp>
 #include "infer/infer.hpp"
 
-namespace Node
+namespace GNode
 {
 
 class InferNode : public BaseNode

+ 1 - 1
src/nodes/stream/streamNode.cpp

@@ -1,7 +1,7 @@
 #include "nodes/base/base.hpp"
 #include "nodes/stream/streamNode.hpp"
 
-namespace Node
+namespace GNode
 {
 
 void StreamNode::work()

+ 1 - 1
src/nodes/stream/streamNode.hpp

@@ -6,7 +6,7 @@
 
 #include "stream/stream.hpp"
 
-namespace Node
+namespace GNode
 {
 
 enum class DecodeType

+ 1 - 1
src/nodes/track/trackNode.cpp

@@ -1,6 +1,6 @@
 #include "nodes/track/trackNode.hpp"
 
-namespace Node
+namespace GNode
 {
 
 

+ 2 - 2
src/nodes/track/trackNode.hpp

@@ -8,7 +8,7 @@
 #include "BYTETracker.h"
 #include "infer/infer.hpp"
 
-namespace Node
+namespace GNode
 {
 
 class TrackNode : public BaseNode
@@ -28,4 +28,4 @@ private:
 
 }
 
-#endif
+#endif  // TRACKNODE_HPP__