Applied suggestions

luxonis · Nov 7, 2023 · 3d85f9f · 3d85f9f
1 parent 437cc34
commit 3d85f9f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/include/depthai/pipeline/node/VideoEncoder.hpp b/include/depthai/pipeline/node/VideoEncoder.hpp
@@ -25,12 +25,12 @@ class VideoEncoder : public NodeCRTP<Node, VideoEncoder, VideoEncoderProperties>
     Input input{*this, "in", Input::Type::SReceiver, true, 4, true, {{DatatypeEnum::ImgFrame, true}}};
 
     /**
-     * Outputs ImgFrame message that carries BITSTREAM encoded (MJPEG, H264 or H265) frame data.
+     * Outputs ImgFrame message that carries BITSTREAM encoded (MJPEG, H264 or H265) frame data. Mutually exclusive with out.
      */
     Output bitstream{*this, "bitstream", Output::Type::MSender, {{DatatypeEnum::ImgFrame, false}}};
 
     /**
-     * Outputs EncodedFrame message that carries encoded (MJPEG, H264 or H265) frame data.
+     * Outputs EncodedFrame message that carries encoded (MJPEG, H264 or H265) frame data. Mutually exclusive with bitstream.
      */
     Output out{*this, "out", Output::Type::MSender, {{DatatypeEnum::EncodedFrame, false}}};
 

diff --git a/src/pipeline/datatype/EncodedFrame.cpp b/src/pipeline/datatype/EncodedFrame.cpp
@@ -41,35 +41,35 @@ bool EncodedFrame::getLossless() const {
 }
 EncodedFrame::FrameType EncodedFrame::getFrameType() const {
     if(frame.type == FrameType::Unknown) {
-        SliceType frameType;
+        utility::SliceType frameType;
         switch(frame.profile) {
             case RawEncodedFrame::Profile::JPEG:
-                frameType = SliceType::I;
+                frameType = utility::SliceType::I;
                 break;
             case RawEncodedFrame::Profile::AVC:
-                frameType = getTypesH264(frame.data, true)[0];
+                frameType = utility::getTypesH264(frame.data, true)[0];
                 break;
             case RawEncodedFrame::Profile::HEVC:
-                frameType = getTypesH265(frame.data, true)[0];
+                frameType = utility::getTypesH265(frame.data, true)[0];
                 break;
         }
         switch(frameType) {
-            case SliceType::P:
+            case utility::SliceType::P:
                 frame.type = FrameType::P;
                 break;
-            case SliceType::B:
+            case utility::SliceType::B:
                 frame.type = FrameType::B;
                 break;
-            case SliceType::I:
+            case utility::SliceType::I:
                 frame.type = FrameType::I;
                 break;
-            case SliceType::SP:
+            case utility::SliceType::SP:
                 frame.type = FrameType::P;
                 break;
-            case SliceType::SI:
+            case utility::SliceType::SI:
                 frame.type = FrameType::I;
                 break;
-            case SliceType::Unknown:
+            case utility::SliceType::Unknown:
                 frame.type = FrameType::Unknown;
                 break;
         }

diff --git a/src/utility/H26xParsers.cpp b/src/utility/H26xParsers.cpp
@@ -4,6 +4,7 @@
 #include <tuple>
 
 namespace dai {
+namespace utility {
 
 template <typename T>
 struct H26xParser {
@@ -287,4 +288,5 @@ std::vector<SliceType> getTypesH265(buf& bs, bool breakOnFirst) {
     return H265Parser::getTypes(bs, breakOnFirst);
 }
 
+}  // namespace utility
 }  // namespace dai
diff --git a/src/utility/H26xParsers.hpp b/src/utility/H26xParsers.hpp
@@ -4,11 +4,13 @@
 #include <vector>
 
 namespace dai {
+namespace utility {
 
 enum class Profile { H264, H265 };
 enum class SliceType { P, B, I, SP, SI, Unknown };
 
 std::vector<SliceType> getTypesH264(const std::vector<std::uint8_t>& bs, bool breakOnFirst = false);
 std::vector<SliceType> getTypesH265(const std::vector<std::uint8_t>& bs, bool breakOnFirst = false);
 
+}  // namespace utility
 }  // namespace dai