diff --git a/Samples/YOLOV5MultiInput/scripts/sample_run.sh b/Samples/YOLOV5MultiInput/scripts/sample_run.sh index cdb180680d14565f749c0dc2fae4da96fce230bb..23b800ea7b1aa5750f17dd6cbb40e18480a892cf 100644 --- a/Samples/YOLOV5MultiInput/scripts/sample_run.sh +++ b/Samples/YOLOV5MultiInput/scripts/sample_run.sh @@ -3,7 +3,6 @@ ScriptPath="$( cd "$(dirname "$BASH_SOURCE")" ; pwd -P )" function main() { - echo $1 if [ "$1" != "imshow" ] && [ "$1" != "stdout" ]; then echo "[ERROR] please choose output display mode: [bash sample_run imshow] [bash sample_run stdout]" return diff --git a/Samples/YOLOV5MultiInput/src/main.cpp b/Samples/YOLOV5MultiInput/src/main.cpp index b5492149900e9dd214a2baf8f303207de04155ee..a85e23d9241b478b35bb725b4a04d487bc21e3b6 100644 --- a/Samples/YOLOV5MultiInput/src/main.cpp +++ b/Samples/YOLOV5MultiInput/src/main.cpp @@ -149,9 +149,9 @@ void GetResult(std::vector& inferOutputs, continue; } p1.x = detectData[totalBox * TOPLEFTX + i] * widthScale; - p1.y = detectData[totalBox * TOPLEFTY + i] * heightScale; + p1.y = detectData[totalBox * TOPLEFTY + i] * widthScale; p2.x = detectData[totalBox * BOTTOMRIGHTX + i] * widthScale; - p2.y = detectData[totalBox * BOTTOMRIGHTY + i] * heightScale; + p2.y = detectData[totalBox * BOTTOMRIGHTY + i] * widthScale; uint32_t objIndex = (uint32_t)detectData[totalBox * LABEL + i]; string text = yolov3Label[objIndex] + std::to_string(score) + "\%"; textPrint = textPrint + text + " "; @@ -192,7 +192,7 @@ void* GetInput(void* arg) { if (ret) { if (cnt % frameRate == 0) { ImageData dst; - imageProcess.Resize(frame, dst, modelSize); + imageProcess.Resize(frame, dst, modelSize, RESIZE_PROPORTIONAL_UPPER_LEFT); MsgData msgData; msgData.data = dst.data; msgData.size = dst.size; diff --git a/Samples/YOLOV5USBCamera/data/.keep b/Samples/YOLOV5USBCamera/data/.keep deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/Samples/YOLOV5USBCamera/src/main.cpp b/Samples/YOLOV5USBCamera/src/main.cpp index fe46de0bf939265217981008e2c689536dc28331..9d5d9c7424a07a396d0da58fa6d55f09dff2b658 100644 --- a/Samples/YOLOV5USBCamera/src/main.cpp +++ b/Samples/YOLOV5USBCamera/src/main.cpp @@ -93,9 +93,9 @@ void GetResult(std::vector& inferOutputs, float finalConfidence = classConfidence * classBuff[index]; BoundBox box; box.x = classBuff[i * totalNumber] * srcWidth / modelWidth; - box.y = classBuff[i * totalNumber + yIndex] * srcHeight / modelHeight; + box.y = classBuff[i * totalNumber + yIndex] * srcWidth / modelWidth; box.width = classBuff[i * totalNumber + widthIndex] * srcWidth/modelWidth; - box.height = classBuff[i * totalNumber + heightIndex] * srcHeight / modelHeight; + box.height = classBuff[i * totalNumber + heightIndex] * srcWidth / modelWidth; box.score = finalConfidence; box.classIndex = maxIndex; box.index = i; @@ -190,7 +190,7 @@ void* GetInput(void* arg) { ret = cap.Read(frame); if (ret) { ImageData dst; - imageProcess.Resize(frame, dst, modelSize); + imageProcess.Resize(frame, dst, modelSize, RESIZE_PROPORTIONAL_UPPER_LEFT); MsgData msgData; msgData.data = dst.data; msgData.size = dst.size;