From d0b8204e3939e1e2d841a90ea254bc4b91309ab5 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期日, 19 一月 2020 13:32:13 +0800
Subject: [PATCH] update ffmepg gpu balance
---
csrc/wrapper.cpp | 238 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 136 insertions(+), 102 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index 9af3085..3e34b2c 100644
--- a/csrc/wrapper.cpp
+++ b/csrc/wrapper.cpp
@@ -2,6 +2,7 @@
#include <thread>
#include <unistd.h>
+#include <sys/time.h>
extern "C"{
#include <libavformat/avformat.h>
@@ -23,6 +24,7 @@
#include "worker/stream.hpp"
#include "worker/decoder.hpp"
#include "worker/rec.hpp"
+#include "common.hpp"
using namespace logif;
using namespace ffwrapper;
@@ -40,20 +42,40 @@
Wrapper::Wrapper()
:input_url_("")
- ,scale_w_(0)
- ,scale_h_(0)
- ,scale_f_(SWS_POINT)
,audio_(false)
,gb_(0)
,cpu_(0)
,run_dec_(false)
+ ,run_stream_(true)
+ ,run_rec_(false)
,thread_(nullptr)
,stop_stream_(false)
,stream_(nullptr)
,decoder_(nullptr)
,rec_(new rec)
+ ,logit_(false)
+ ,fps_(25)
{
makeTheWorld();
+ }
+
+ Wrapper::Wrapper(const char *logfile)
+ :input_url_("")
+ ,audio_(false)
+ ,gb_(0)
+ ,cpu_(0)
+ ,run_dec_(false)
+ ,run_stream_(true)
+ ,run_rec_(false)
+ ,thread_(nullptr)
+ ,stop_stream_(false)
+ ,stream_(nullptr)
+ ,decoder_(nullptr)
+ ,rec_(new rec)
+ ,logit_(true)
+ {
+ makeTheWorld();
+ logif::CreateLogger(logfile, true);
}
@@ -71,6 +93,8 @@
{
logIt("WRAPPER EXCEPTION: ", e.what());
}
+ if (logit_)
+ logif::DestroyLogger();
}
std::unique_ptr<ffwrapper::FormatIn> Wrapper::init_reader(const char* input){
@@ -81,16 +105,19 @@
prop.gpu_acc_ = !cpu_;
std::unique_ptr<FormatIn> in(new FormatIn(prop.gpuAccl()));
- AVDictionary *avdic = prop.optsFormat();
int flag = -1;
if (gb_){
flag = in->openGb28181(input, NULL);
}else{
- flag = in->open(input, &avdic);
+ AVDictionary *avdic = prop.optsFormat();
+ if(avdic){
+ flag = in->open(input, &avdic);
+ av_dict_free(&avdic);
+ }else{
+ flag = in->open(input, NULL);
+ }
}
- if(avdic){
- av_dict_free(&avdic);
- }
+
if(flag == 0){
if(!in->findStreamInfo(NULL)){
logIt("can't find video stream\n");
@@ -120,18 +147,18 @@
void Wrapper::AudioSwitch(const bool a){
audio_ = a;
- if (stream_){
- stream_->AudioSwitch(a);
- }
+ // if (stream_){
+ // stream_->AudioSwitch(a);
+ // }
}
void Wrapper::init_worker(ffwrapper::FormatIn *in){
if (rec_->Loaded() && stream_ && decoder_) return;
- stream_ = new stream(in, 3 * 25);
- stream_->AudioSwitch(audio_);
-
- decoder_ = new decoder(in, scale_w_, scale_h_, scale_f_);
+ stream_ = new stream(in, 3 * in->getFPS());
+ // stream_->AudioSwitch(audio_);
+
+ decoder_ = new decoder(in);
rec_->Load(in);
if(fn_rec_lazy_) {
@@ -140,11 +167,17 @@
}
}
- void Wrapper::run_worker(ffwrapper::FormatIn *in, std::shared_ptr<ffwrapper::CodedData> data, int64_t &id){
+ int Wrapper::run_worker(ffwrapper::FormatIn *in, const CPacket &pkt){
+ if (gb_){
+ AVPacket &p = pkt.data->getAVPacket();
+ p.pts = p.dts = AV_NOPTS_VALUE;
+ }
+ int flag = 0;
+ if (run_stream_ && stream_) stream_->SetPacket(pkt);
+ if (run_dec_ && decoder_) flag = decoder_->SetFrame(pkt);
+ if (run_rec_ && rec_->Loaded()) rec_->SetPacket(pkt);
- if (stream_) stream_->SetPacket(data, id);
- if (decoder_ && run_dec_) decoder_->SetFrame(data, id);
- if (rec_->Loaded()) rec_->SetPacket(data, id);
+ return flag;
}
void Wrapper::deinit_worker(){
@@ -160,49 +193,85 @@
if (!in) {
logIt("ERROR: init_reader! url: %s\n", input_url_.c_str());
- usleep(200000);
+ sleep(2);
continue;
}
+
+ fps_ = in->getFPS();
int wTime = 1000000.0 / in->getFPS() ;
wTime >>= 1;
- logIt("INPUT FPS: %d", wTime);
+ logIt("WAIT TIME PER FRAME: %d", wTime);
init_worker(in.get());
- int64_t id = -1;
+ int64_t id = gb_ ? 0 : -1;
+ int64_t v_id = id;
+ int64_t a_id = id;
+
+ bool exist = access(input_url_.c_str(), 0) == 0;
+
while(!stop_stream_.load()){
auto data(std::make_shared<CodedData>());
if (in->readPacket(&data->getAVPacket()) != 0){
logIt("read packet error, id: %lld", id);
break;
}
- if (id < 0){
- id++;
+ // 闈為煶瑙嗛
+ if (in->notVideoAudio(&data->getAVPacket())){
continue;
}
-
- run_worker(in.get(), data, id);
- usleep(wTime);
+ // 闈炲浗鏍囪烦杩囩涓�甯�,娴嬭瘯绗竴甯ф湁闂
+ if (!gb_ && id < 0){
+ id++; v_id++; a_id++;
+ continue;
+ }
+ CPacket pkt{data, v_id, a_id, id};
+ // decode error
+ if (run_worker(in.get(), pkt) == -1){
+ break;
+ }
+
+ if (in->isVideoPkt(&data->getAVPacket())){
+ v_id++;
+ }else{
+ a_id++;
+ }
id++;
+
+ //鏈湴鏂囦欢澶揩sleep涓�涓�
+ if (exist){
+ usleep(wTime);
+ }
+
}
deinit_worker();
+ if (exist) break;
}
}
- void Wrapper::BuildRecorder(const char* id, const char *output, const int mindur, const int maxdur, const bool audio){
+ void Wrapper::SetRecMinCacheTime(const int mind){
+ rec_->SetRecMinCacheTime(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;
if (rec_->Loaded()){
- rec_->NewRec(id, output, mindur, maxdur, audio);
+ rec_->NewRec(id, output, fid, mindur, maxdur, a);
}else{
std::string rid(id), dir(output);
fn_rec_lazy_ =
- [=]{rec_->NewRec(rid.c_str(), dir.c_str(), mindur, maxdur, audio);};
+ [=]{rec_->NewRec(rid.c_str(), dir.c_str(), fid, mindur, maxdur, a);};
}
}
-
int Wrapper::FireRecorder(const char* sid,const int64_t &id){
if (rec_->Loaded()){
rec_->FireRecSignal(sid, id);
@@ -215,16 +284,20 @@
}
}
////////decoder
- void Wrapper::BuildDecoder(){
+ void Wrapper::OpenDecoder(){
run_dec_ = true;
}
- void Wrapper::GetPicDecoder(unsigned char **data, int *w, int *h, int64_t *id){
+ void Wrapper::GetPicDecoder(unsigned char **data, int *w, int *h, int *format, int *length, int64_t *id){
if (decoder_){
- decoder_->GetFrame(data, w, h, id);
+ decoder_->GetFrame(data, w, h, format, length, id);
}
}
+ void Wrapper::CloseStream(){
+ run_stream_ = false;
+ }
+
void Wrapper::GetPacket(unsigned char **pktData, int *size, int *key){
if (stream_){
stream_->GetPacket(pktData, size, key);
@@ -240,70 +313,6 @@
// return val: -1 open error; -2, find stream error; -3, converter create
namespace cffmpeg_wrap{ // start test functions
- uint8_t* Decode(const char *file, const int gb, int *w, int *h){
- VideoProp prop;
- prop.url_ = file;
- prop.gpu_acc_ = false;
-
- std::unique_ptr<FormatIn> in(new FormatIn(prop.gpuAccl()));
- int flag = -1;
- if (gb){
- flag = in->openGb28181(file, NULL);
- }else{
- flag = in->open(file, NULL);
- }
-
- std::unique_ptr<cvbridge> bridge_(nullptr);
-
- if(flag == 0){
- if(!in->findStreamInfo(NULL)){
- logIt("yolo can't find video stream\n");
- *w = *h = -2;
- return NULL;
- }
- auto flag = in->openCodec(NULL);
- if(flag){
- auto dec_ctx = in->getCodecContext();
-
- AVPixelFormat pix_fmt = AV_PIX_FMT_BGR24;
- bridge_.reset(new cvbridge(
- dec_ctx->width, dec_ctx->height, dec_ctx->pix_fmt,
- dec_ctx->width, dec_ctx->height, pix_fmt, SWS_BICUBIC));
-
- }else{
- logIt("FormatIn openCodec Failed!");
- *w = *h = -3;
- return NULL;
- }
- }else{
- logIt("open %s error", file);
- *w = *h = -1;
- return NULL;
- }
-
- uint8_t *pic = NULL;
- *w = *h = 0;
-
- int tryTime = 0;
- while (tryTime++ < 100){
-
- auto data(std::make_shared<CodedData>());
- if (in->readPacket(&data->getAVPacket()) == 0){
-
- auto frame(std::make_shared<FrameData>());
- AVFrame *frm = frame->getAVFrame();
- if(in->decode(frm, &data->getAVPacket()) == 0){
- *w = frm->width;
- *h = frm->height;
- pic = (unsigned char*)malloc(frm->width * frm->height * 3);
- bridge_->copyPicture(pic, frm);
- break;
- }
- }
- }
-
- return pic;
- }
/////// for encoder
typedef struct _PicEncoder{
FormatOut *enc;
@@ -312,11 +321,13 @@
int fps;
int br;
int gi;
+ int pix_fmt;
int flag;
cvbridge *bridge;
} PicEncoder;
- void *CreateEncoder(const int w, const int h, const int fps, const int br, const int scale_flag, const int gi){
+ void *CreateEncoder(const int w, const int h, const int fps, const int br,
+ const int pix_fmt, const int scale_flag, const int gi){
PicEncoder *e = (PicEncoder*)malloc(sizeof(PicEncoder));
e->enc = NULL;
@@ -325,6 +336,7 @@
e->fps = fps;
e->br = br;
e->gi = gi;
+ e->pix_fmt = pix_fmt;
e->flag = scale_flag;
e->bridge = NULL;
@@ -359,13 +371,15 @@
auto ctx = e->enc->getCodecContext();
if (e->bridge == NULL){
- AVPixelFormat pix_fmt = AV_PIX_FMT_BGR24;
e->bridge = new cvbridge(
- w, h, AV_PIX_FMT_BGR24,
+ w, h, e->pix_fmt,
e->w, e->h, ctx->pix_fmt, e->flag);
}
- AVFrame *frame = e->bridge->getAVFrame(in, w, h);
+ AVFrame *bgr_frame = cvbridge::fillFrame(in, w, h, e->pix_fmt);
+ AVFrame *frame = e->bridge->convert2Frame(bgr_frame);
+ av_frame_free(&bgr_frame);
+
AVPacket *pkt = av_packet_alloc();
auto flag = e->enc->encode(pkt, frame);
@@ -393,5 +407,25 @@
return flag;
}
+ int GetGb28181Pic(const char *rtspUrl, char *retData, int *retDataLen){
+ int ret = 0;
+ std::string fn = rtspUrl;
+
+ auto handle_gb28181 = new GB28181API;
+ if(handle_gb28181->addCamera(fn) == -1){
+ delete(handle_gb28181);
+ logIt("do addCamera Error\n");
+ return -1;
+ }
+
+ int retLen = handle_gb28181->capturePic(handle_gb28181, retData, retDataLen);
+ if(retLen == 0){
+ logIt("do capturePic failed:%d");
+ ret = -1;
+ }
+
+ handle_gb28181->deleteCamera();
+ return ret;
+ }
}
--
Gitblit v1.8.0