From 4eb29b8ec8777f68c26dfe2a4397cce92110fcfd Mon Sep 17 00:00:00 2001
From: chenshijun <chenshijun@aiotlink.com>
Date: 星期三, 08 九月 2021 17:58:20 +0800
Subject: [PATCH] ok

---
 demo.cpp |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/demo.cpp b/demo.cpp
index fc1ad8d..29242d6 100644
--- a/demo.cpp
+++ b/demo.cpp
@@ -32,7 +32,7 @@
     TImage *img = new TImage();
     TImage *img2 = new TImage();
     int i = 0;
-    cap = VideoCapture("/data/disk2/01_Scheaven/data/cam_53.avi");
+    cap = VideoCapture("../1.mp4");
 
     while(1){        /* code */
         cap >> frame;
@@ -45,9 +45,14 @@
             sr = get_result(handle, img, 0);
             TResult * t_result = (TResult*) sr;
             cout << "t_result->count==" << t_result->count  << endl;
-            for (int i=0; i<t_result->count; i++){
+            for (int i=0; i<t_result->count; i++)
+            {
                 cout << "confidence:" << t_result->targets[i].confidence << endl;
+<<<<<<< HEAD
                 //draw_SDK_result(frame, t_result->targets[i]);
+=======
+                // draw_SDK_result(frame, t_result->targets[i]);
+>>>>>>> e47cdf6abec38e5249f5258bc7b98824b67eb79f
             }
         }else{
             cout << "------------over--" << endl;

--
Gitblit v1.8.0