From 470d4180e2b86eee41c9c14910e4131d16edb8b7 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 25 五月 2021 17:02:54 +0800
Subject: [PATCH] bug fixed gb28181 capture
---
csrc/wrapper.cpp | 94 +++++++++++++++++++++++++++++++----------------
1 files changed, 62 insertions(+), 32 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index 7ad32f1..e743dcb 100644
--- a/csrc/wrapper.cpp
+++ b/csrc/wrapper.cpp
@@ -1,6 +1,7 @@
#include "wrapper.hpp"
#include <thread>
+#include <atomic>
#include <unistd.h>
#include <sys/time.h>
@@ -45,6 +46,7 @@
,audio_(false)
,gb_(0)
,cpu_(0)
+ ,devid_(-1)
,run_dec_(false)
,run_stream_(true)
,run_rec_(false)
@@ -56,7 +58,7 @@
,logit_(false)
,fps_(25)
,file_finished_(false)
- ,min_duration_(60)
+ ,min_duration_(0)
{
makeTheWorld();
}
@@ -66,6 +68,7 @@
,audio_(false)
,gb_(0)
,cpu_(0)
+ ,devid_(-1)
,run_dec_(false)
,run_stream_(true)
,run_rec_(false)
@@ -77,7 +80,7 @@
,logit_(true)
,fps_(25)
,file_finished_(false)
- ,min_duration_(60)
+ ,min_duration_(0)
{
makeTheWorld();
logif::CreateLogger(logfile, true);
@@ -108,8 +111,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);
@@ -193,7 +197,8 @@
void Wrapper::run_stream_thread(){
- int64_t rebootime = -1;
+ int64_t file_rebootime = 0;
+ int64_t file_frame = 0;
while(!stop_stream_.load()){
auto in = init_reader(input_url_.c_str());
@@ -203,8 +208,6 @@
sleep(2);
continue;
}
-
- rebootime++;
fps_ = in->getFPS();
@@ -223,9 +226,9 @@
bool exist = access(input_url_.c_str(), 0) == 0;
if (exist){
- wTime <<= 1;
+ wTime += wTime/2;
+ file_rebootime++;
}
- int64_t file_frame = 0;
logIt("WAIT TIME PER FRAME: %d", wTime);
@@ -260,24 +263,29 @@
id++;
//鏈湴鏂囦欢澶揩sleep涓�涓�
- if (exist){
- usleep(wTime);
+ if (exist && in->isVideoPkt(&data->getAVPacket())){
// 璁板綍瑙ｇ爜鐨勬枃浠舵湁澶氬皯甯�
file_frame++;
+ usleep(wTime);
}
}
deinit_worker();
if (exist) {
- if (file_frame == 0 && rebootime > 3){
- file_finished_ = true;
- break;
- }
- if (file_frame < min_duration_ * fps_){
+ // 涓夋涓�甯ч兘娌¤В鍑烘潵锛岄��鍑�
+ if (file_frame == 0 && file_rebootime < 3){
+ logIt("libcffmpeg.so-> run %lld time, current frames %lld", file_rebootime, file_frame);
continue;
}
- logIt("libcffmpeg.so-> local file %s run %lld time, all frames %lld", input_url_.c_str(), rebootime, file_frame);
+ // 鏈�灏忛渶瑕佽В鍑哄灏戝抚
+ if (file_frame < min_duration_ * fps_){
+ logIt("libcffmpeg.so-> run %lld time, current frames %lld, mind %d, fps: %d",
+ file_rebootime, file_frame, min_duration_, fps_);
+ continue;
+ }
+ logIt("libcffmpeg.so-> local file %s run %lld time, all frames %lld, mind %d, fps: %d",
+ input_url_.c_str(), file_rebootime, file_frame, min_duration_, fps_);
file_finished_ = true;
break;
}
@@ -446,25 +454,47 @@
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;
+ std::atomic_bool add_camera{false};
- auto handle_gb28181 = new GB28181API;
- if(handle_gb28181->addCamera(fn) == -1){
- delete(handle_gb28181);
- logIt("do addCamera Error\n");
- return -1;
+ std::thread t([&]{
+ auto handle_gb28181 = new GB28181API;
+ std::string ru(rtspUrl);
+ if(handle_gb28181->addCamera(ru) == -1){
+ delete(handle_gb28181);
+ logIt("do addCamera Error\n");
+ ret = -2;
+ return;
+ }
+ add_camera.store(true);
+ std::this_thread::sleep_for(std::chrono::seconds(1));
+ int retLen = handle_gb28181->capturePic(handle_gb28181, retData, retDataLen, tt);
+ if(retLen == 0){
+ logIt("do capturePic failed:%d");
+ ret = -1;
+ }
+
+ handle_gb28181->deleteCamera();
+ delete handle_gb28181;
+ });
+
+ std::this_thread::sleep_for(std::chrono::seconds(1));
+
+ int ttt = tt;
+ if (ttt < 6) ttt = 6;
+
+ int i = -1;
+ while (true) {
+ std::this_thread::sleep_for(std::chrono::seconds(1));
+ if (add_camera.load()) {
+ t.join();
+ return ret;
+ }
+ if (i++ > ttt) break;
}
-
- int retLen = handle_gb28181->capturePic(handle_gb28181, retData, retDataLen);
- if(retLen == 0){
- logIt("do capturePic failed:%d");
- ret = -1;
- }
-
- handle_gb28181->deleteCamera();
- return ret;
+ t.detach();
+ return -1;
}
}
--
Gitblit v1.8.0