Merge branch 'develop' into 'main'

R22.09.01

See merge request Openncc/opennccframe!4

debian/changelog

@@ -1,3 +1,8 @@
+opennccframe (22.09.01) unstable; urgency=medium
+
+  * R22.09.01 (Closes: #nnnn)  <nnnn is the bug number of your ITP>
+
+ -- Zed <[email protected]>  Wed, 7 Sept 2022 14:37:11 +0800
 opennccframe (22.02.01) unstable; urgency=medium
 
   * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>

debian/rules

@@ -42,7 +42,7 @@ ifeq ($(wildcard nnstmp),)
 	git clone https://github.com/nnstreamer/nnstreamer nnstmp
 endif
 	cd nnstmp;\
-	git checkout 1356c2a43cd25fb94 && git reset --hard
+	git checkout 47bcd119 && git reset --hard
 # config the nnstreamer  
 	cd ${NCCFRAME_SOURCE_ROOT_PATH};\
 	cp 0001-Filter-Decoder-Add-option-for-ncc-and-fix-bug-of-box.patch ${NNSTREAMER_SOURCE_ROOT_PATH}

install.sh

@@ -2,9 +2,9 @@
 
 # auto: means automatic detect the $libdir
 if [ -z $1 ];then
-    echo "Please input cmd as (sudo ./install [<platform>]). "
-    echo "[<platform>]: [ubuntu][rk3568][raspi4][auto]"
-    exit
+    platform="auto"
+else
+    platform=$1
 fi
 
 if [ -z $2 ];then
@@ -15,7 +15,7 @@ else
     destdir=$2
 fi
 
-multiarch=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+#multiarch=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 project_path=$(cd `dirname $0`;pwd)
 install_pkg_path=$destdir/usr/lib/pkgconfig
 install_path=$destdir/usr/lib/openncc
@@ -45,26 +45,32 @@ if [ ! -d "$rule_path" ];then
     mkdir -p $rule_path
 fi
 
-if [ $1 = "ubuntu"  ] || [ $1 = "rk3568" ] || [ $1 = "raspi4" ];then 
-    echo "Starting to install OpenNCC Native libs for $1"
-    cd $resource_path/$1/
+if [ $platform = "ubuntu" ] || [ $platform = "rk3568" ] || [ $platform = "raspi4" ];then 
+    echo "Starting to install OpenNCC Native libs for $platform"
+    cd $resource_path/$platform/
     ./install.sh $install_path
-elif [ $1 = "auto"  ];then
-    if [[ `uname -a` =~ "x86_64" ]]; then
+elif [ $platform = "auto"  ]; then
+    if [[ `uname -m` =~ "x86_64" ]]; then
 	install_arch=ubuntu
-    elif [[ `uname -a` =~ "ARM-V8" ]]; then
+    elif [[ `uname -m` =~ "aarch64" ]]; then
 	install_arch=rk3568
-    elif [[ `uname -a` =~ "ARMv7l" ]]; then
+    elif [[ `uname -m` =~ "armv7l" ]]; then
 	install_arch=raspi4
     else
 	install_arch=unknown
     	echo "Unknown platform!"
+        echo "Please input cmd as (sudo ./install [<platform>]). "
+        echo "[<platform>]: [ubuntu][rk3568][raspi4]"
+        exit
     fi
     echo "Detected ARCH: $install_arch "
     cd $resource_path/$install_arch/
     ./install.sh $install_path
 else
     echo "Unknown platform!"
+    echo "Please input cmd as (sudo ./install [<platform>]). "
+    echo "[<platform>]: [ubuntu][rk3568][raspi4][auto]"
+    exit
 fi
 
 cp $firmware_path/* $install_path

model_zoo/ncc/openvino_2021.4/age-gender-recognition-retail-0013/config/input_BGR.json

@@ -1,5 +1,5 @@
 {
-        "blob":           "face-detection-adas-0001",
+        "blob":           "age-gender-recognition-retail-0013",
         "Function": " the input image is in bgr_planar_u8 format, and converts it into BGR_PLANAR_FP16 format. The tensor output is fp32 format",
 
         "nccVideoConvert": {
@@ -24,7 +24,6 @@
             "extInputs2": [0],
             "extInputs3": [0],
             "outputTensor": [1,1,200,7],  
-            "outputTensor2": [0],  
             "outputType": "CV_FP16",   
             "linkOut"     :  "nccTensorConvert"     
         },
@@ -34,7 +33,7 @@
             "linkIn"     :  "nccInference",
             "inputTensor": [1,1,200,7],  
             "inputType": "CV_FP16",  
-            "outputTensor1": [1,1,200,7],   
+            "outputTensor": [1,1,200,7],   
             "outputType": "CV_FP32",   
             "linkOut"     :  "output"   
         }

model_zoo/ncc/openvino_2021.4/age-gender-recognition-retail-0013/config/input_camera.json

@@ -1,5 +1,5 @@
 {
-        "blob":           "face-detection-adas-0001",
+        "blob":           "age-gender-recognition-retail-0013",
         "Function": " the input image is in YUV420 format, supports image clipping and scaling, and converts it into BGR_PLANAR_FP16 format. The tensor output is fp32 format",
 
         "nccVideoConvert": {
@@ -23,8 +23,7 @@
             "extInputs1": [0],  
             "extInputs2": [0],
             "extInputs3": [0],
-            "outputTensor1": [1,1,200,7],  
-            "outputTensor2": [0],  
+            "outputTensor": [1,1,200,7],   
             "outputType": "CV_FP16",   
             "linkOut"     :  "nccTensorConvert"     
         },
@@ -34,7 +33,7 @@
             "linkIn"     :  "nccInference",
             "inputTensor": [1,1,200,7],  
             "inputType": "CV_FP16",  
-            "outputTensor1": [1,1,200,7],   
+            "outputTensor": [1,1,200,7],   
             "outputType": "CV_FP32",   
             "linkOut"     :  "output"   
         }

model_zoo/ncc/openvino_2021.4/face-detection-adas-0001/config/input_BGR.json

@@ -23,8 +23,7 @@
             "extInputs1": [0],  
             "extInputs2": [0],
             "extInputs3": [0],
-            "outputTensor": [1,1,200,7],  
-            "outputTensor2": [0],  
+            "outputTensor": [1,1,200,7],    
             "outputType": "CV_FP16",   
             "linkOut"     :  "nccTensorConvert"     
         },
@@ -34,7 +33,7 @@
             "linkIn"     :  "nccInference",
             "inputTensor": [1,1,200,7],  
             "inputType": "CV_FP16",  
-            "outputTensor1": [1,1,200,7],   
+            "outputTensor": [1,1,200,7],   
             "outputType": "CV_FP32",   
             "linkOut"     :  "output"   
         }

model_zoo/ncc/openvino_2021.4/face-detection-adas-0001/config/input_camera.json

@@ -23,8 +23,7 @@
             "extInputs1": [0],  
             "extInputs2": [0],
             "extInputs3": [0],
-            "outputTensor1": [1,1,200,7],  
-            "outputTensor2": [0],  
+            "outputTensor": [1,1,200,7],    
             "outputType": "CV_FP16",   
             "linkOut"     :  "nccTensorConvert"     
         },
@@ -34,7 +33,7 @@
             "linkIn"     :  "nccInference",
             "inputTensor": [1,1,200,7],  
             "inputType": "CV_FP16",  
-            "outputTensor1": [1,1,200,7],   
+            "outputTensor": [1,1,200,7],   
             "outputType": "CV_FP32",   
             "linkOut"     :  "output"   
         }