From 177293afbc1635e87d82070abeb687974326f41a Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 25 五月 2021 15:46:50 +0800
Subject: [PATCH] add retval
---
csrc/thirdparty/gb28181/include/PsToEs.hpp | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/csrc/thirdparty/gb28181/include/PsToEs.hpp b/csrc/thirdparty/gb28181/include/PsToEs.hpp
index 3073a45..c12e1e3 100644
--- a/csrc/thirdparty/gb28181/include/PsToEs.hpp
+++ b/csrc/thirdparty/gb28181/include/PsToEs.hpp
@@ -43,7 +43,7 @@
pthread_mutex_lock(&mtx);
if (q.empty()) {
gettimeofday(&now, NULL);
- t.tv_sec = now.tv_sec + 5;
+ t.tv_sec = now.tv_sec + 3;
t.tv_nsec = now.tv_usec * 1000;
// pthread_cond_wait(&cond, &mtx);
pthread_cond_timedwait(&cond, &mtx, &t);
@@ -177,13 +177,17 @@
return bufsize;
}
- static int capturePic(void *opaque, char *buf, int *bufsize) {
+ static int capturePic(void *opaque, char *buf, int *bufsize, const int tt) {
GB28181API *_this = (GB28181API *) opaque;
int len = 0;
*bufsize = 0;
+ int ttt = 0;
do {
+ if (ttt > tt) return 0;
+ ttt++;
+
//浠庣紦瀛樹腑鑾峰彇buffinfo
if (_this->m_rtpQueue.count_queue() == 0) {
// printf(" count_queue == 0 \n");
@@ -246,7 +250,7 @@
}
long addCamera(string &rtsp){
- static int count = 0;
+ int count = 0;
while (handle == -1 && count <= 3) {
count ++;
handle = RTSPSTREAM_Open(rtsp.c_str(), streamCallBack, (long) this);
--
Gitblit v1.8.0