From b8c69e1f08f748dd19da3637f23bf680ad14b0ec Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 29 十一月 2019 13:30:38 +0800
Subject: [PATCH] update
---
csrc/wrapper.cpp | 172 +++++++++++++--------------------------------------------
1 files changed, 39 insertions(+), 133 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index 9d0c679..d1cbfbf 100644
--- a/csrc/wrapper.cpp
+++ b/csrc/wrapper.cpp
@@ -24,6 +24,7 @@
#include "worker/stream.hpp"
#include "worker/decoder.hpp"
#include "worker/rec.hpp"
+#include "common.hpp"
using namespace logif;
using namespace ffwrapper;
@@ -51,6 +52,7 @@
,decoder_(nullptr)
,rec_(new rec)
,logit_(false)
+ ,fps_(25)
{
makeTheWorld();
}
@@ -158,15 +160,15 @@
}
}
- int 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 &pkt = data->getAVPacket();
- pkt.pts = pkt.dts = AV_NOPTS_VALUE;
+ AVPacket &p = pkt.data->getAVPacket();
+ p.pts = p.dts = AV_NOPTS_VALUE;
}
int flag = 0;
- if (stream_) stream_->SetPacket(data, id);
- if (decoder_ && run_dec_) flag = decoder_->SetFrame(data, id);
- if (rec_->Loaded()) rec_->SetPacket(data, id);
+ if (stream_) stream_->SetPacket(pkt);
+ if (decoder_ && run_dec_) flag = decoder_->SetFrame(pkt);
+ if (rec_->Loaded()) rec_->SetPacket(pkt);
return flag;
}
@@ -188,6 +190,8 @@
continue;
}
+ fps_ = in->getFPS();
+
int wTime = 1000000.0 / in->getFPS() ;
wTime >>= 1;
logIt("WAIT TIME PER FRAME: %d", wTime);
@@ -195,8 +199,10 @@
init_worker(in.get());
int64_t id = gb_ ? 0 : -1;
-
- bool exist = access(input_url_.c_str(), 0) == 0 ? true : false;
+ 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>());
@@ -204,28 +210,38 @@
logIt("read packet error, id: %lld", id);
break;
}
+ // 闈為煶瑙嗛
if (in->notVideoAudio(&data->getAVPacket())){
continue;
}
-
+ // 闈炲浗鏍囪烦杩囩涓�甯�,娴嬭瘯绗竴甯ф湁闂
if (!gb_ && id < 0){
- id++;
+ id++; v_id++; a_id++;
continue;
}
-
+ CPacket pkt{data, v_id, a_id, id};
// decode error
- if (run_worker(in.get(), data, id) == -1){
+ if (run_worker(in.get(), pkt) == -1){
break;
}
+ if (in->isVideoPkt(&data->getAVPacket())){
+ v_id++;
+ }else{
+ a_id++;
+ }
+
+ id++;
+
+ //鏈湴鏂囦欢澶揩sleep涓�涓�
if (exist){
usleep(wTime);
}
- id++;
}
deinit_worker();
+ if (exist) break;
}
}
@@ -236,7 +252,7 @@
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, fid, mindur, maxdur, a);
}else{
@@ -283,69 +299,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 = bridge_->convert2Data(frm);
- break;
- }
- }
- }
-
- return pic;
- }
/////// for encoder
typedef struct _PicEncoder{
FormatOut *enc;
@@ -354,11 +307,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;
@@ -367,6 +322,7 @@
e->fps = fps;
e->br = br;
e->gi = gi;
+ e->pix_fmt = pix_fmt;
e->flag = scale_flag;
e->bridge = NULL;
@@ -400,14 +356,16 @@
PicEncoder *e = (PicEncoder*)hdl;
auto ctx = e->enc->getCodecContext();
- AVPixelFormat pix_fmt = AV_PIX_FMT_BGR24;
if (e->bridge == NULL){
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 = cvbridge::fillFrame(in, w, h, pix_fmt);
+ 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);
@@ -434,57 +392,5 @@
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