From 48c8a8ce082ebdb992cb52cdd766298e8ca19011 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 25 五月 2021 11:04:56 +0800
Subject: [PATCH] bug fixed gb28181 capture picture
---
csrc/wrapper.cpp | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index 4964629..4b6bd93 100644
--- a/csrc/wrapper.cpp
+++ b/csrc/wrapper.cpp
@@ -45,6 +45,7 @@
,audio_(false)
,gb_(0)
,cpu_(0)
+ ,devid_(-1)
,run_dec_(false)
,run_stream_(true)
,run_rec_(false)
@@ -66,6 +67,7 @@
,audio_(false)
,gb_(0)
,cpu_(0)
+ ,devid_(-1)
,run_dec_(false)
,run_stream_(true)
,run_rec_(false)
@@ -108,8 +110,9 @@
prop.url_ = input;
prop.rtsp_tcp_ = true;
prop.gpu_acc_ = !cpu_;
+ prop.gpu_index_ = devid_;
- std::unique_ptr<FormatIn> in(new FormatIn(prop.gpuAccl()));
+ std::unique_ptr<FormatIn> in(new FormatIn(prop, prop.gpuAccl()));
int flag = -1;
if (gb_){
flag = in->openGb28181(input, NULL);
@@ -450,7 +453,7 @@
return flag;
}
- int GetGb28181Pic(const char *rtspUrl, char *retData, int *retDataLen){
+ int GetGb28181Pic(const char *rtspUrl, char *retData, int *retDataLen, const int tt){
int ret = 0;
std::string fn = rtspUrl;
@@ -461,7 +464,7 @@
return -1;
}
- int retLen = handle_gb28181->capturePic(handle_gb28181, retData, retDataLen);
+ int retLen = handle_gb28181->capturePic(handle_gb28181, retData, retDataLen, tt);
if(retLen == 0){
logIt("do capturePic failed:%d");
ret = -1;
--
Gitblit v1.8.0