[meta-arago] [matrix-gui-v2-apps] [PATCH] tidl_demo*: remove timeout to exit a demo

Senicic, Djordje

2018-09-28 16:45:08 UTC

ACK

-----Original Message-----
From: Gou, Hongmei
Sent: Friday, September 28, 2018 12:19 PM
To: meta-***@arago-project.org
Cc: Gou, Hongmei
Subject: [meta-arago] [matrix-gui-v2-apps] [PATCH] tidl_demo*: remove timeout to exit a demo

* tidl_classification has already mechanism to exit a demo
(by right-clicking the main window)

* Avoid the side problem of not returning to the demo HTML page
in time after right-clicking the main window before the timeout

Signed-off-by: Hongmei Gou <***@ti.com>
---
tidl_apps/tidl_demo_livecam/runTidlLiveCam.sh | 4 +---
tidl_apps/tidl_demo_livecam_lg2/runTidlLiveCam_lg2.sh | 4 +---
tidl_apps/tidl_demo_pnexamples/runTidlPnExamples.sh | 5 +----
tidl_apps/tidl_demo_staticimg/runTidlStaticImg.sh | 3 +--
tidl_apps/tidl_demo_staticimg_dsponly/runTidlStaticImg_dsponly.sh | 3 +--
tidl_apps/tidl_demo_staticimg_lg2/runTidlStaticImg_lg2.sh | 4 +---
6 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/tidl_apps/tidl_demo_livecam/runTidlLiveCam.sh b/tidl_apps/tidl_demo_livecam/runTidlLiveCam.sh
index 6b80d0e..e225519 100644
--- a/tidl_apps/tidl_demo_livecam/runTidlLiveCam.sh
+++ b/tidl_apps/tidl_demo_livecam/runTidlLiveCam.sh
@@ -1,5 +1,3 @@
cd /usr/share/ti/tidl/examples/classification

-./tidl_classification -g 1 -d 2 -e 0 -l ./imagenet.txt -s ./classlist.txt -i 1 -c ./stream_config_j11_v2.txt & pid=$!
-
-{ sleep 3600; kill $pid; }
+./tidl_classification -g 1 -d 2 -e 0 -l ./imagenet.txt -s ./classlist.txt -i 1 -c ./stream_config_j11_v2.txt
diff --git a/tidl_apps/tidl_demo_livecam_lg2/runTidlLiveCam_lg2.sh b/tidl_apps/tidl_demo_livecam_lg2/runTidlLiveCam_lg2.sh
index 9219f60..9dfd098 100644
--- a/tidl_apps/tidl_demo_livecam_lg2/runTidlLiveCam_lg2.sh
+++ b/tidl_apps/tidl_demo_livecam_lg2/runTidlLiveCam_lg2.sh
@@ -1,5 +1,3 @@
cd /usr/share/ti/tidl/examples/classification

-./tidl_classification -g 2 -d 1 -e 2 -l ./imagenet.txt -s ./classlist.txt -i 1 -c ./stream_config_j11_v2.txt & pid=$!
-
-{ sleep 3600; kill $pid; }
+./tidl_classification -g 2 -d 1 -e 2 -l ./imagenet.txt -s ./classlist.txt -i 1 -c ./stream_config_j11_v2.txt
diff --git a/tidl_apps/tidl_demo_pnexamples/runTidlPnExamples.sh b/tidl_apps/tidl_demo_pnexamples/runTidlPnExamples.sh
index 37e5ec3..7171f53 100644
--- a/tidl_apps/tidl_demo_pnexamples/runTidlPnExamples.sh
+++ b/tidl_apps/tidl_demo_pnexamples/runTidlPnExamples.sh
@@ -1,6 +1,3 @@
cd /usr/share/ti/tidl/examples/classification

-./tidl_classification -g 2 -d 1 -e 1 -l ./imagenet.txt -s ./classlist.txt -i ./clips/test2.mp4 -c ./stream_config_j11_v2.txt & pid=$!
-
-{ sleep 3600; kill $pid; }
-
+./tidl_classification -g 2 -d 1 -e 1 -l ./imagenet.txt -s ./classlist.txt -i ./clips/test2.mp4 -c ./stream_config_j11_v2.txt
diff --git a/tidl_apps/tidl_demo_staticimg/runTidlStaticImg.sh b/tidl_apps/tidl_demo_staticimg/runTidlStaticImg.sh
index 8d9d5d4..7d017d4 100644
--- a/tidl_apps/tidl_demo_staticimg/runTidlStaticImg.sh
+++ b/tidl_apps/tidl_demo_staticimg/runTidlStaticImg.sh
@@ -1,4 +1,3 @@
cd /usr/share/ti/tidl/examples/classification

-./tidl_classification -g 1 -d 2 -e 2 -l ./imagenet.txt -s ./classlist.txt -i ./clips/test10.mp4 -c ./stream_config_j11_v2.txt & pid=$!
-{ sleep 3600; kill $pid; }
+./tidl_classification -g 1 -d 2 -e 2 -l ./imagenet.txt -s ./classlist.txt -i ./clips/test10.mp4 -c ./stream_config_j11_v2.txt
diff --git a/tidl_apps/tidl_demo_staticimg_dsponly/runTidlStaticImg_dsponly.sh b/tidl_apps/tidl_demo_staticimg_dsponly/runTidlStaticImg_dsponly.sh
index b32fe56..64e3c68 100644
--- a/tidl_apps/tidl_demo_staticimg_dsponly/runTidlStaticImg_dsponly.sh
+++ b/tidl_apps/tidl_demo_staticimg_dsponly/runTidlStaticImg_dsponly.sh
@@ -1,4 +1,3 @@
cd /usr/share/ti/tidl/examples/classification

-./tidl_classification -g 1 -d 2 -e 0 -l ./imagenet.txt -s ./classlist.txt -i ./clips/test10.mp4 -c ./stream_config_j11_v2.txt & pid=$!
-{ sleep 3600; kill $pid; }
+./tidl_classification -g 1 -d 2 -e 0 -l ./imagenet.txt -s ./classlist.txt -i ./clips/test10.mp4 -c ./stream_config_j11_v2.txt
diff --git a/tidl_apps/tidl_demo_staticimg_lg2/runTidlStaticImg_lg2.sh b/tidl_apps/tidl_demo_staticimg_lg2/runTidlStaticImg_lg2.sh
index 83fdab9..4824722 100755
--- a/tidl_apps/tidl_demo_staticimg_lg2/runTidlStaticImg_lg2.sh
+++ b/tidl_apps/tidl_demo_staticimg_lg2/runTidlStaticImg_lg2.sh
@@ -1,5 +1,3 @@
cd /usr/share/ti/tidl/examples/classification

-./tidl_classification -g 2 -d 1 -e 2 -l ./imagenet.txt -s ./classlist.txt -i ./clips/test10.mp4 -c ./stream_config_j11_v2.txt & pid=$!
-
-{ sleep 3600; kill $pid; }
+./tidl_classification -g 2 -d 1 -e 2 -l ./imagenet.txt -s ./classlist.txt -i ./clips/test10.mp4 -c ./stream_config_j11_v2.txt

--
1.9.1