From c24b03d43977b75db84e03bfcdbe3a7b1ae2c1ea Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期四, 07 三月 2019 11:30:00 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/VideoAnalysFromHC/main.cpp | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/main.cpp b/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
index c037d6b..5103ad8 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
+++ b/QiaoJiaSystem/VideoAnalysFromHC/main.cpp
@@ -77,7 +77,18 @@
DBG("hava GB28181");
#endif
- appPref.setLongData("gpu.index", 0);
+ if (argc < 4) {
+ assert("t_value.size()");
+ }
+
+ int arg1 = atoi(argv[1]);
+
+ int gindx = abs(arg1) % 2;
+ int GB28181_Enable = arg1 < 0 ? gindx : -1;
+ DBG(gindx);
+ appPref.setIntData("GB28181_Enable", GB28181_Enable);
+
+ appPref.setLongData("gpu.index", gindx);
appPref.setIntData("show.image", 0);
//todo
--
Gitblit v1.8.0