TexasInstruments-Sandbox
diff --git a/‎apps_cpp/app_config_checker/src/app_config_checker_main.cpp‎
Lines changed: 3 additions & 1 deletion b/‎apps_cpp/app_config_checker/src/app_config_checker_main.cpp‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎apps_cpp/app_edgeai/src/app_edgeai_main.cpp‎
Lines changed: 1 addition & 1 deletion b/‎apps_cpp/app_edgeai/src/app_edgeai_main.cpp‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎apps_cpp/cmake/common.cmake‎
Lines changed: 13 additions & 10 deletions b/‎apps_cpp/cmake/common.cmake‎
Lines changed: 13 additions & 10 deletions
diff --git a/‎apps_cpp/cmake/cross_compile_aarch64.cmake‎
Lines changed: 1 addition & 1 deletion b/‎apps_cpp/cmake/cross_compile_aarch64.cmake‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎apps_cpp/common/CMakeLists.txt‎
Lines changed: 1 addition & 0 deletions b/‎apps_cpp/common/CMakeLists.txt‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎apps_cpp/common/include/edgeai_demo.h‎
Lines changed: 8 additions & 0 deletions b/‎apps_cpp/common/include/edgeai_demo.h‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎apps_cpp/common/include/edgeai_demo_config.h‎
Lines changed: 38 additions & 4 deletions b/‎apps_cpp/common/include/edgeai_demo_config.h‎
Lines changed: 38 additions & 4 deletions
diff --git a/‎apps_cpp/common/include/post_process_image_keypoint_detect.h‎
Lines changed: 100 additions & 0 deletions b/‎apps_cpp/common/include/post_process_image_keypoint_detect.h‎
Lines changed: 100 additions & 0 deletions
diff --git a/‎apps_cpp/common/src/edgeai_demo.cpp‎
Lines changed: 12 additions & 1 deletion b/‎apps_cpp/common/src/edgeai_demo.cpp‎
Lines changed: 12 additions & 1 deletion
@@ -167,7 +167,9 @@ int32_t Demo::setupFlows()
 
         /* Update the output set. */
         auto const &outputIds = flow->m_outputIds;
-        outputSet.insert(outputIds.begin(), outputIds.end());
+        auto const begin = outputIds.begin();
+        auto const end = outputIds.end();
+        outputSet.insert(begin, end);
     }
 
     /* Collect the sink pipeline. */
 
@@ -54,7 +54,7 @@ static void sigHandler(int32_t sig)
     }
 }
 
-int32_t main(int argc, char * argv[])
+int main(int argc, char * argv[])
 {
     CmdlineArgs cmdArgs;
 
 
@@ -28,9 +28,12 @@ message(STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE} PROJECT_NAME = ${PROJECT_
 SET(CMAKE_FIND_LIBRARY_PREFIXES "" "lib")
 SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ".lib" ".so")
 
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib/${CMAKE_BUILD_TYPE})
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
+if(NOT CMAKE_OUTPUT_DIR)
+    set(CMAKE_OUTPUT_DIR ${CMAKE_SOURCE_DIR})
+endif()
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_OUTPUT_DIR}/lib/${CMAKE_BUILD_TYPE})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_OUTPUT_DIR}/lib/${CMAKE_BUILD_TYPE})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_OUTPUT_DIR}/bin/${CMAKE_BUILD_TYPE})
 
 if (NOT DEFINED ENV{SOC})
     message(FATAL_ERROR "SOC not defined.")
@@ -58,11 +61,11 @@ elseif ("${TARGET_SOC_LOWER}" STREQUAL "am62a")
     set(TARGET_CPU          A53)
     set(TARGET_OS           LINUX)
     set(TARGET_SOC          AM62A)
-elseif ("${TARGET_SOC_LOWER}" STREQUAL "am62")
+elseif ("${TARGET_SOC_LOWER}" STREQUAL "am62x")
     set(TARGET_PLATFORM     SITARA)
     set(TARGET_CPU          A53)
     set(TARGET_OS           LINUX)
-    set(TARGET_SOC          AM62)
+    set(TARGET_SOC          AM62X)
 else()
     message(FATAL_ERROR "SOC ${TARGET_SOC_LOWER} is not supported.")
 endif()
@@ -78,7 +81,6 @@ add_definitions(
 
 set(TENSORFLOW_INSTALL_DIR ${TARGET_FS}/usr/include/tensorflow)
 set(ONNXRT_INSTALL_DIR ${TARGET_FS}/usr/include/onnxruntime)
-set(DLPACK_INSTALL_DIR ${TARGET_FS}/usr/include/dlpack)
 set(TFLITE_INSTALL_DIR ${TARGET_FS}/usr/lib/tflite_2.8)
 
 if(USE_DLR_RT)
@@ -98,7 +100,7 @@ link_directories(${TARGET_FS}/usr/lib/aarch64-linux-gnu
                  )
 
 if(USE_DLR_RT)
-link_directories(${TARGET_FS}/usr/lib/python3.8/site-packages/dlr)
+link_directories(${TARGET_FS}/usr/lib/python3.10/site-packages/dlr)
 endif()
 
 if(USE_TENSORFLOW_RT)
@@ -125,15 +127,16 @@ include_directories(${PROJECT_SOURCE_DIR}
                     SYSTEM ${TARGET_FS}/usr/local/include
                     SYSTEM ${TARGET_FS}/usr/include/gstreamer-1.0
                     SYSTEM ${TARGET_FS}/usr/include/glib-2.0
+                    SYSTEM ${TARGET_FS}/usr/lib/glib-2.0/include
                     SYSTEM ${TARGET_FS}/usr/lib/aarch64-linux-gnu/glib-2.0/include
                     SYSTEM ${TARGET_FS}/usr/include/opencv4/
                     SYSTEM ${TARGET_FS}/usr/include/processor_sdk/vision_apps
+                    SYSTEM ${TARGET_FS}/usr/include/processor_sdk/app_utils
                     SYSTEM ${TARGET_FS}/usr/include/edgeai_dl_inferer
-                    SYSTEM ${DLPACK_INSTALL_DIR}/include
                     )
 
 if(USE_DLR_RT)
-include_directories(${TARGET_FS}/usr/lib/python3.8/site-packages/dlr/include/)
+include_directories(${TARGET_FS}/usr/lib/python3.10/site-packages/dlr/include/)
 endif()
 
 if(USE_TENSORFLOW_RT)
@@ -170,7 +173,7 @@ set(SYSTEM_LINK_LIBS
     dl
     )
 
-if(NOT ${TARGET_SOC} STREQUAL "AM62")
+if(NOT ${TARGET_SOC} STREQUAL "AM62X")
 set(SYSTEM_LINK_LIBS ${SYSTEM_LINK_LIBS} tivision_apps)
 endif()
 
 
@@ -48,5 +48,5 @@ set(CMAKE_CXX_COMPILER_WORKS 1)
 # https://cmake.org/cmake/help/latest/variable/CMAKE_TRY_COMPILE_PLATFORM_VARIABLES.html
 list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES CROSS_COMPILER_PATH TARGET_FS TOOLCHAIN_PREFIX)
 
-link_directories(${TARGET_FS}/usr/local/lib/python3.8/dist-packages/dlr
+link_directories(${TARGET_FS}/usr/local/lib/python3.10/dist-packages/dlr
                  )
@@ -10,6 +10,7 @@ set(EDGEAI_COMMON_SRCS
     src/post_process_image_classify.cpp
     src/post_process_image_object_detect.cpp
     src/post_process_image_segmentation.cpp
+    src/post_process_image_keypoint_detect.cpp
     src/edgeai_inference_pipe.cpp
     src/edgeai_demo.cpp
     src/edgeai_cmd_line_parse.cpp
 
@@ -93,6 +93,14 @@ namespace ti::edgeai::common
             ~EdgeAIDemo();
 
         private:
+            /**
+             * Copy Constructor.
+             *
+             * Copy Constructor is not required and allowed and hence prevent
+             * the compiler from generating a default Copy Constructor.
+             */
+            EdgeAIDemo(const EdgeAIDemo& ) = delete;
+
             /**
              * Assignment operator.
              *
 
@@ -272,7 +272,7 @@ namespace ti::edgeai::common
             string                              m_pattern{"ball"};
 
             /** v4l subdev id of sensor. */
-            int32_t                             m_subdev_id{2};
+            string                              m_subdev_id{"/dev/v4l-subdev2"};
 
             /** Frame rate. */
             string                              m_framerate{};
@@ -447,10 +447,10 @@ namespace ti::edgeai::common
              */
             int32_t                         m_port{8081};
 
-            /** Payloader for remote sink.
+            /** Encoding type for remote sink.
              * This field is ignored for sinks other than remote
              */
-            string                          m_payloader{"rtph264pay"};
+            string                          m_encoding{"h264"};
 
             /** gop size for encoder.
              */
@@ -462,7 +462,7 @@ namespace ti::edgeai::common
 
             /** Use tiperfoverlay.
              */
-            bool                            m_overlayPerformance{false};
+            string                          m_overlayPerfType{""};
 
             /** Output buffer. */
             GstWrapperBuffer                m_outBuff;
@@ -565,6 +565,23 @@ namespace ti::edgeai::common
              */
             void dumpInfo(const char *prefix="") const;
 
+        private:
+            /**
+             * Copy Constructor.
+             *
+             * Copy Constructor is not required and allowed and hence prevent
+             * the compiler from generating a default Copy Constructor.
+             */
+            ModelInfo(const ModelInfo& ) = delete;
+
+            /**
+             * Assignment operator.
+             *
+             * Assignment is not required and allowed and hence prevent
+             * the compiler from generating a default assignment operator.
+             */
+            ModelInfo & operator=(const ModelInfo& rhs) = delete;
+
         public:
             /** Inference context. */
             DLInferer              *m_infererObj{nullptr};
@@ -636,6 +653,23 @@ namespace ti::edgeai::common
              */
             void dumpInfo(const char *prefix="") const;
 
+        private:
+            /**
+             * Copy Constructor.
+             *
+             * Copy Constructor is not required and allowed and hence prevent
+             * the compiler from generating a default Copy Constructor.
+             */
+            SubFlowInfo(const SubFlowInfo& ) = delete;
+
+            /**
+             * Assignment operator.
+             *
+             * Assignment is not required and allowed and hence prevent
+             * the compiler from generating a default assignment operator.
+             */
+            SubFlowInfo & operator=(const SubFlowInfo& rhs) = delete;
+
         public:
             /** Pre-processing context. */
             PreprocessImage            *m_preProcObj{nullptr};
 
@@ -0,0 +1,100 @@
+/*
+ *  Copyright (C) 2023 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _POST_PROCESS_IMAGE_KEYPOINT_DETECT_H_
+#define _POST_PROCESS_IMAGE_KEYPOINT_DETECT_H_
+
+/* Module headers. */
+#include <common/include/post_process_image.h>
+
+/**
+ * \defgroup group_edgeai_cpp_apps_keypoint_detect Keypoint Detect post-processing
+ *
+ * \brief Class implementing the image based keypoint detect post-processing
+ *        logic.
+ *
+ * \ingroup group_edgeai_cpp_apps_post_proc
+ */
+
+namespace ti::edgeai::common
+{
+    /** Post-processing for image based keypoint detect.
+     *
+     * \ingroup group_edgeai_cpp_apps_keypoint_detect
+     */
+    class PostprocessImageKeypointDetect : public PostprocessImage
+    {
+        public:
+            /** Constructor.
+             *
+             * @param config Configuration information not present in YAML
+             * @param debugConfig Debug Configuration for passing to post process class
+             */
+            PostprocessImageKeypointDetect(const PostprocessImageConfig  &config,
+                                           const DebugDumpConfig         &debugConfig);
+
+            /** Function operator
+             *
+             * This is the heart of the class. The application uses this
+             * interface to execute the functionality provided by this class.
+             *
+             * @param frameData Input data frame on which results are overlaid
+             * @param results Detect output results from the inference
+             */
+            void *operator()(void              *frameData,
+                             VecDlTensorPtr    &results);
+
+            /** Destructor. */
+            ~PostprocessImageKeypointDetect();
+
+        private:
+            /** Multiplicative factor to be applied to X co-ordinates. */
+            float                   m_scaleX{1.0f};
+
+            /** Multiplicative factor to be applied to Y co-ordinates. */
+            float                   m_scaleY{1.0f};
+
+        private:
+            /**
+             * Assignment operator.
+             *
+             * Assignment is not required and allowed and hence prevent
+             * the compiler from generating a default assignment operator.
+             */
+            PostprocessImageKeypointDetect &
+                operator=(const PostprocessImageKeypointDetect& rhs) = delete;
+    };
+
+} // namespace ti::edgeai::common
+
+#endif /* _POST_PROCESS_IMAGE_KEYPOINT_DETECT_H_ */
+
@@ -86,6 +86,14 @@ class EdgeAIDemoImpl
         /** Setup the data flows. */
         int32_t setupFlows();
 
+        /**
+         * Copy Constructor.
+         *
+         * Copy Constructor is not required and allowed and hence prevent
+         * the compiler from generating a default Copy Constructor.
+         */
+        EdgeAIDemoImpl(const EdgeAIDemoImpl& ) = delete;
+
         /**
          * Assignment operator.
          *
@@ -168,7 +176,10 @@ int32_t EdgeAIDemoImpl::setupFlows()
 
         /* Update the output set. */
         auto const &outputIds = flow->m_outputIds;
-        outputSet.insert(outputIds.begin(), outputIds.end());
+
+        auto const begin = outputIds.begin();
+        auto const end = outputIds.end();
+        outputSet.insert(begin, end);
     }
 
     /* Collect the sink commands by scanning all the outputs. */
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,9 @@ int32_t Demo::setupFlows()`
`167`	`167`
`168`	`168`	`/* Update the output set. */`
`169`	`169`	`auto const &outputIds = flow->m_outputIds;`
`170`		`- outputSet.insert(outputIds.begin(), outputIds.end());`
	`170`	`+ auto const begin = outputIds.begin();`
	`171`	`+ auto const end = outputIds.end();`
	`172`	`+ outputSet.insert(begin, end);`
`171`	`173`	`}`
`172`	`174`
`173`	`175`	`/* Collect the sink pipeline. */`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ static void sigHandler(int32_t sig)`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`57`		`-int32_t main(int argc, char * argv[])`
	`57`	`+int main(int argc, char * argv[])`
`58`	`58`	`{`
`59`	`59`	`CmdlineArgs cmdArgs;`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -48,5 +48,5 @@ set(CMAKE_CXX_COMPILER_WORKS 1)`
`48`	`48`	`# https://cmake.org/cmake/help/latest/variable/CMAKE_TRY_COMPILE_PLATFORM_VARIABLES.html`
`49`	`49`	`list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES CROSS_COMPILER_PATH TARGET_FS TOOLCHAIN_PREFIX)`
`50`	`50`
`51`		`-link_directories(${TARGET_FS}/usr/local/lib/python3.8/dist-packages/dlr`
	`51`	`+link_directories(${TARGET_FS}/usr/local/lib/python3.10/dist-packages/dlr`
`52`	`52`	`)`