From c60d61c48c7a1e7b693d4c3f6427e3b616d1f471 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 21 十月 2019 12:29:33 +0800
Subject: [PATCH] update ffmpeg
---
csrc/wrapper.cpp | 134 +++++++++++++++++++++++++++++++++++---------
1 files changed, 106 insertions(+), 28 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index a630271..9d0c679 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>
@@ -38,11 +39,8 @@
namespace cffmpeg_wrap{
using namespace buz;
- Wrapper::Wrapper(const bool logit, const char *logfile)
+ Wrapper::Wrapper()
:input_url_("")
- ,scale_w_(0)
- ,scale_h_(0)
- ,scale_f_(SWS_POINT)
,audio_(false)
,gb_(0)
,cpu_(0)
@@ -52,11 +50,26 @@
,stream_(nullptr)
,decoder_(nullptr)
,rec_(new rec)
+ ,logit_(false)
{
makeTheWorld();
- if (logit){
- logif::CreateLogger(logfile, true);
- }
+ }
+
+ Wrapper::Wrapper(const char *logfile)
+ :input_url_("")
+ ,audio_(false)
+ ,gb_(0)
+ ,cpu_(0)
+ ,run_dec_(false)
+ ,thread_(nullptr)
+ ,stop_stream_(false)
+ ,stream_(nullptr)
+ ,decoder_(nullptr)
+ ,rec_(new rec)
+ ,logit_(true)
+ {
+ makeTheWorld();
+ logif::CreateLogger(logfile, true);
}
@@ -74,7 +87,8 @@
{
logIt("WRAPPER EXCEPTION: ", e.what());
}
- logif::DestroyLogger();
+ if (logit_)
+ logif::DestroyLogger();
}
std::unique_ptr<ffwrapper::FormatIn> Wrapper::init_reader(const char* input){
@@ -132,10 +146,10 @@
void Wrapper::init_worker(ffwrapper::FormatIn *in){
if (rec_->Loaded() && stream_ && decoder_) return;
- stream_ = new stream(in, 3 * 25);
+ stream_ = new stream(in, 3 * in->getFPS());
// stream_->AudioSwitch(audio_);
- decoder_ = new decoder(in, scale_w_, scale_h_, scale_f_);
+ decoder_ = new decoder(in);
rec_->Load(in);
if(fn_rec_lazy_) {
@@ -144,14 +158,17 @@
}
}
- void Wrapper::run_worker(ffwrapper::FormatIn *in, std::shared_ptr<ffwrapper::CodedData> data, int64_t &id){
+ int Wrapper::run_worker(ffwrapper::FormatIn *in, std::shared_ptr<ffwrapper::CodedData> data, int64_t &id){
if (gb_){
AVPacket &pkt = data->getAVPacket();
pkt.pts = pkt.dts = AV_NOPTS_VALUE;
}
+ int flag = 0;
if (stream_) stream_->SetPacket(data, id);
- if (decoder_ && run_dec_) decoder_->SetFrame(data, id);
+ if (decoder_ && run_dec_) flag = decoder_->SetFrame(data, id);
if (rec_->Loaded()) rec_->SetPacket(data, id);
+
+ return flag;
}
void Wrapper::deinit_worker(){
@@ -170,14 +187,16 @@
sleep(2);
continue;
}
-
+
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 = gb_ ? 0 : -1;
+
+ bool exist = access(input_url_.c_str(), 0) == 0 ? true : false;
while(!stop_stream_.load()){
auto data(std::make_shared<CodedData>());
@@ -185,18 +204,23 @@
logIt("read packet error, id: %lld", id);
break;
}
-
if (in->notVideoAudio(&data->getAVPacket())){
continue;
}
-
+
if (!gb_ && id < 0){
id++;
continue;
}
-
- run_worker(in.get(), data, id);
- usleep(wTime);
+
+ // decode error
+ if (run_worker(in.get(), data, id) == -1){
+ break;
+ }
+
+ if (exist){
+ usleep(wTime);
+ }
id++;
}
@@ -205,16 +229,20 @@
}
}
- 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::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, a);
+ 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, a);};
+ [=]{rec_->NewRec(rid.c_str(), dir.c_str(), fid, mindur, maxdur, a);};
}
}
@@ -234,9 +262,9 @@
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);
}
}
@@ -310,8 +338,7 @@
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);
+ pic = bridge_->convert2Data(frm);
break;
}
}
@@ -373,14 +400,14 @@
PicEncoder *e = (PicEncoder*)hdl;
auto ctx = e->enc->getCodecContext();
+ AVPixelFormat pix_fmt = AV_PIX_FMT_BGR24;
if (e->bridge == NULL){
- AVPixelFormat pix_fmt = AV_PIX_FMT_BGR24;
e->bridge = new cvbridge(
w, h, AV_PIX_FMT_BGR24,
e->w, e->h, ctx->pix_fmt, e->flag);
}
- AVFrame *frame = e->bridge->getAVFrame(in, w, h);
+ AVFrame *frame = cvbridge::fillFrame(in, w, h, pix_fmt);
AVPacket *pkt = av_packet_alloc();
auto flag = e->enc->encode(pkt, frame);
@@ -408,5 +435,56 @@
return flag;
}
+///////////////////////////////////////////////////////////
+ typedef struct _conv
+ {
+ int srcW;
+ int srcH;
+ int srcF;
+ int dstW;
+ int dstH;
+ cvbridge *b;
+ }Conv;
+
+ void *CreateConvertor(const int srcW, const int srcH, const int srcFormat,
+ const int dstW, const int dstH, const int dstFormat, const int flag){
+
+ auto bridge = new cvbridge(
+ srcW, srcH, srcFormat,
+ dstW, dstH, dstFormat, flag);
+ if (!bridge) return NULL;
+
+ Conv *c = (Conv*)malloc(sizeof(Conv));
+ c->b = bridge;
+ c->dstW = dstW;
+ c->dstH = dstH;
+ c->srcW = srcW;
+ c->srcH = srcH;
+ c->srcF = srcFormat;
+
+ return c;
+ }
+
+ uint8_t *Convert(void *h, uint8_t *src){
+ Conv *c = (Conv*)h;
+
+ auto b = c->b;
+
+ AVFrame *tmp_frm = cvbridge::fillFrame(src, c->srcW, c->srcH, c->srcF);
+ if (!tmp_frm) return NULL;
+
+ unsigned char *picData = b->convert2Data(tmp_frm);
+
+ av_frame_free(&tmp_frm);
+
+ return picData;
+ }
+
+ void DestoryConvertor(void *h){
+ Conv *c = (Conv*)h;
+ delete c->b;
+ free(c);
+ }
+
}
--
Gitblit v1.8.0