From 6f27f088e5d9e828bdce65ab85984d2084bab222 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 06 三月 2019 11:52:47 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2
---
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 3a39a22..87b89d5 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