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 | 141 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 123 insertions(+), 18 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index 19357c5..eec65a7 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,8 +46,10 @@
,audio_(false)
,gb_(0)
,cpu_(0)
+ ,devid_(-1)
,run_dec_(false)
,run_stream_(true)
+ ,run_rec_(false)
,thread_(nullptr)
,stop_stream_(false)
,stream_(nullptr)
@@ -54,6 +57,8 @@
,rec_(new rec)
,logit_(false)
,fps_(25)
+ ,file_finished_(false)
+ ,min_duration_(0)
{
makeTheWorld();
}
@@ -63,14 +68,19 @@
,audio_(false)
,gb_(0)
,cpu_(0)
+ ,devid_(-1)
,run_dec_(false)
,run_stream_(true)
+ ,run_rec_(false)
,thread_(nullptr)
,stop_stream_(false)
,stream_(nullptr)
,decoder_(nullptr)
,rec_(new rec)
,logit_(true)
+ ,fps_(25)
+ ,file_finished_(false)
+ ,min_duration_(0)
{
makeTheWorld();
logif::CreateLogger(logfile, true);
@@ -100,19 +110,27 @@
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.gpuAccl()));
- AVDictionary *avdic = prop.optsFormat();
+ std::unique_ptr<FormatIn> in(new FormatIn(prop, prop.gpuAccl()));
int flag = -1;
+#ifdef GB28181
if (gb_){
flag = in->openGb28181(input, NULL);
}else{
- flag = in->open(input, &avdic);
+#endif
+ AVDictionary *avdic = prop.optsFormat();
+ if(avdic){
+ flag = in->open(input, &avdic);
+ av_dict_free(&avdic);
+ }else{
+ flag = in->open(input, NULL);
+ }
+#ifdef GB28181
}
- if(avdic){
- av_dict_free(&avdic);
- }
+#endif
+
if(flag == 0){
if(!in->findStreamInfo(NULL)){
logIt("can't find video stream\n");
@@ -170,7 +188,7 @@
int flag = 0;
if (run_stream_ && stream_) stream_->SetPacket(pkt);
if (run_dec_ && decoder_) flag = decoder_->SetFrame(pkt);
- if (rec_->Loaded()) rec_->SetPacket(pkt);
+ if (run_rec_ && rec_->Loaded()) rec_->SetPacket(pkt);
return flag;
}
@@ -183,6 +201,9 @@
void Wrapper::run_stream_thread(){
+ int64_t file_rebootime = 0;
+ int64_t file_frame = 0;
+
while(!stop_stream_.load()){
auto in = init_reader(input_url_.c_str());
@@ -194,9 +215,12 @@
fps_ = in->getFPS();
- int wTime = 1000000.0 / in->getFPS() ;
+ if (fps_ < 1 || fps_ > 200){
+ fps_ = 25;
+ }
+
+ int wTime = 1000000.0 / fps_ ;
wTime >>= 1;
- logIt("WAIT TIME PER FRAME: %d", wTime);
init_worker(in.get());
@@ -205,6 +229,12 @@
int64_t a_id = id;
bool exist = access(input_url_.c_str(), 0) == 0;
+ if (exist){
+ wTime += wTime/2;
+ file_rebootime++;
+ }
+
+ logIt("WAIT TIME PER FRAME: %d", wTime);
while(!stop_stream_.load()){
auto data(std::make_shared<CodedData>());
@@ -216,6 +246,7 @@
if (in->notVideoAudio(&data->getAVPacket())){
continue;
}
+
// 闈炲浗鏍囪烦杩囩涓�甯�,娴嬭瘯绗竴甯ф湁闂
if (!gb_ && id < 0){
id++; v_id++; a_id++;
@@ -236,21 +267,43 @@
id++;
//鏈湴鏂囦欢澶揩sleep涓�涓�
- if (exist){
+ if (exist && in->isVideoPkt(&data->getAVPacket())){
+ // 璁板綍瑙ｇ爜鐨勬枃浠舵湁澶氬皯甯�
+ file_frame++;
usleep(wTime);
}
}
deinit_worker();
- if (exist) break;
+ if (exist) {
+ // 涓夋涓�甯ч兘娌¤В鍑烘潵锛岄��鍑�
+ if (file_frame == 0 && file_rebootime < 3){
+ logIt("libcffmpeg.so-> run %lld time, current frames %lld", file_rebootime, file_frame);
+ continue;
+ }
+ // 鏈�灏忛渶瑕佽В鍑哄灏戝抚
+ 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;
+ }
}
}
- void Wrapper::SetRecMinCacheTime(const int mind){
- rec_->SetRecMinCacheTime(mind);
+ void Wrapper::SetRecMinCacheTime(const int mind, const int maxd){
+ min_duration_ = mind;
}
+ void Wrapper::OpenRecorder(){
+ run_rec_ = true;
+ }
+
void Wrapper::BuildRecorder(const char* id, const char *output, const int64_t &fid, const int mindur, const int maxdur, const bool audio){
bool a = audio;
if (gb_) a = false;
@@ -267,32 +320,39 @@
if (rec_->Loaded()){
rec_->FireRecSignal(sid, id);
}
+ return 0;
}
- void Wrapper::GetInfoRecorder(std::string &recID, int &index, std::string &path){
+ int Wrapper::GetInfoRecorder(std::string &recID, int &index, std::string &path){
if (rec_){
rec_->GetRecInfo(recID, index, path);
}
+ return 0;
}
////////decoder
- void Wrapper::BuildDecoder(){
+ void Wrapper::OpenDecoder(){
run_dec_ = true;
}
- void Wrapper::GetPicDecoder(unsigned char **data, int *w, int *h, int *format, int *length, int64_t *id){
+ int Wrapper::GetPicDecoder(unsigned char **data, int *w, int *h, int *format, int *length, int64_t *id){
+ if (file_finished_){
+ return -1;
+ }
if (decoder_){
decoder_->GetFrame(data, w, h, format, length, id);
}
+ return 0;
}
void Wrapper::CloseStream(){
run_stream_ = false;
}
- void Wrapper::GetPacket(unsigned char **pktData, int *size, int *key){
+ int Wrapper::GetPacket(unsigned char **pktData, int *size, int *key){
if (stream_){
stream_->GetPacket(pktData, size, key);
}
+ return 0;
}
} // end class wrapper
@@ -397,5 +457,50 @@
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};
+
+ 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;
+ }
+ t.detach();
+ return -1;
+ }
+#endif
}
--
Gitblit v1.8.0