From ab3d17cd44625a762fc10f0f1fd8f2c46b980aff Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 26 四月 2022 11:42:19 +0800
Subject: [PATCH] capture use cpu and add arm version
---
csrc/wrapper.cpp | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index e743dcb..eec65a7 100644
--- a/csrc/wrapper.cpp
+++ b/csrc/wrapper.cpp
@@ -110,14 +110,16 @@
VideoProp prop;
prop.url_ = input;
prop.rtsp_tcp_ = true;
- prop.gpu_acc_ = !cpu_;
+ prop.gpu_acc_ = false;
prop.gpu_index_ = devid_;
std::unique_ptr<FormatIn> in(new FormatIn(prop, prop.gpuAccl()));
int flag = -1;
+#ifdef GB28181
if (gb_){
flag = in->openGb28181(input, NULL);
}else{
+#endif
AVDictionary *avdic = prop.optsFormat();
if(avdic){
flag = in->open(input, &avdic);
@@ -125,7 +127,9 @@
}else{
flag = in->open(input, NULL);
}
+#ifdef GB28181
}
+#endif
if(flag == 0){
if(!in->findStreamInfo(NULL)){
@@ -454,6 +458,7 @@
return flag;
}
+#ifdef GB28181
int GetGb28181Pic(const char *rtspUrl, char *retData, int *retDataLen, const int tt){
int ret = 0;
std::atomic_bool add_camera{false};
@@ -496,5 +501,6 @@
t.detach();
return -1;
}
+#endif
}
--
Gitblit v1.8.0