From 1d2e7ce97e33c74a949d443a226df531fbf5c7dd Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 25 九月 2019 14:04:09 +0800
Subject: [PATCH] bug fix
---
csrc/wrapper.cpp | 196 ++++++++++++++++++++++++++++++-------------------
1 files changed, 120 insertions(+), 76 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index 9fc2e25..9af3085 100644
--- a/csrc/wrapper.cpp
+++ b/csrc/wrapper.cpp
@@ -13,20 +13,27 @@
#include "ffmpeg/configure/conf.hpp"
#include "ffmpeg/format/FormatIn.hpp"
#include "ffmpeg/format/FormatOut.hpp"
-#include "ffmpeg/property/VideoProp.hpp"
#include "ffmpeg/data/CodedData.hpp"
-#include "ffmpeg/data/FrameData.hpp"
+#include "ffmpeg/property/VideoProp.hpp"
#include "ffmpeg/log/log.hpp"
#include "ffmpeg/bridge/cvbridge.hpp"
#include "buz/recorder.hpp"
-#include "stream.hpp"
-#include "decoder.hpp"
-#include "rec.hpp"
+#include "worker/stream.hpp"
+#include "worker/decoder.hpp"
+#include "worker/rec.hpp"
using namespace logif;
using namespace ffwrapper;
+
+#define DELETE_POINTER(p) \
+do \
+{ \
+if(NULL != p) \
+delete p; \
+p = NULL; \
+}while(0)
namespace cffmpeg_wrap{
using namespace buz;
@@ -36,14 +43,15 @@
,scale_w_(0)
,scale_h_(0)
,scale_f_(SWS_POINT)
+ ,audio_(false)
,gb_(0)
,cpu_(0)
- ,use_decoder_(false)
+ ,run_dec_(false)
,thread_(nullptr)
,stop_stream_(false)
,stream_(nullptr)
,decoder_(nullptr)
- ,rec_(nullptr)
+ ,rec_(new rec)
{
makeTheWorld();
}
@@ -57,25 +65,12 @@
stop_stream_.store(true);
thread_->join();
}
+ DELETE_POINTER(rec_);
}
catch(const std::exception& e)
{
logIt("WRAPPER EXCEPTION: ", e.what());
}
- }
-
- void Wrapper::ScalePicture(const int w, const int h, const int flags){
- scale_w_ = w;
- scale_f_ = flags;
- scale_h_ = h;
- }
-
- void Wrapper::UseGB28181(){
- gb_ = 1;
- }
-
- void Wrapper::UseCPU(){
- cpu_ = 1;
}
std::unique_ptr<ffwrapper::FormatIn> Wrapper::init_reader(const char* input){
@@ -98,7 +93,7 @@
}
if(flag == 0){
if(!in->findStreamInfo(NULL)){
- logIt("yolo can't find video stream\n");
+ logIt("can't find video stream\n");
return nullptr;
}
@@ -123,19 +118,39 @@
return 0;
}
- void Wrapper::init_stream(){
- if (stream_) delete stream_;
- stream_ = new stream;
+ void Wrapper::AudioSwitch(const bool a){
+ audio_ = a;
+ if (stream_){
+ stream_->AudioSwitch(a);
+ }
}
- void Wrapper::init_decoder(ffwrapper::FormatIn *in){
- if (decoder_) delete decoder_;
- decoder_ = new decoder(in, scale_w_, scale_h_,scale_f_);
+ 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_);
+
+ rec_->Load(in);
+ if(fn_rec_lazy_) {
+ fn_rec_lazy_();
+ fn_rec_lazy_ = nullptr;
+ }
+ }
+
+ void Wrapper::run_worker(ffwrapper::FormatIn *in, std::shared_ptr<ffwrapper::CodedData> data, int64_t &id){
+
+ if (stream_) stream_->SetPacket(data, id);
+ if (decoder_ && run_dec_) decoder_->SetFrame(data, id);
+ if (rec_->Loaded()) rec_->SetPacket(data, id);
}
- void Wrapper::init_rec(ffwrapper::FormatIn *in){
- if (rec_) delete rec_;
- rec_ = new rec(in);
+ void Wrapper::deinit_worker(){
+ DELETE_POINTER(stream_);
+ DELETE_POINTER(decoder_);
+ rec_->Unload();
}
void Wrapper::run_stream_thread(){
@@ -148,37 +163,48 @@
usleep(200000);
continue;
}
- init_stream();
- if (use_decoder_){
- init_decoder(in.get());
- }
- init_rec(in.get());
+
+ int wTime = 1000000.0 / in->getFPS() ;
+ wTime >>= 1;
+ logIt("INPUT FPS: %d", wTime);
- int64_t id = 0;
+ init_worker(in.get());
+
+ int64_t id = -1;
while(!stop_stream_.load()){
auto data(std::make_shared<CodedData>());
- if(!in->readPacket(data)){
- logIt("read packet error");
+ if (in->readPacket(&data->getAVPacket()) != 0){
+ logIt("read packet error, id: %lld", id);
break;
- }
- if (stream_) stream_->SetPacket(data);
- if (use_decoder_ && decoder_) decoder_->SetFrame(data, id);
- if (rec_) rec_->SetPacket(data, id);
+ }
+ if (id < 0){
+ id++;
+ continue;
+ }
+
+ run_worker(in.get(), data, id);
+ usleep(wTime);
id++;
}
+
+ deinit_worker();
}
}
- void Wrapper::BuildRecorder(const char* id, const char *output, const int mindur, const int maxdur){
+ void Wrapper::BuildRecorder(const char* id, const char *output, const int mindur, const int maxdur, const bool audio){
- if (rec_){
- rec_->NewRec(id, output, mindur, maxdur);
+ if (rec_->Loaded()){
+ rec_->NewRec(id, output, mindur, maxdur, audio);
+ }else{
+ std::string rid(id), dir(output);
+ fn_rec_lazy_ =
+ [=]{rec_->NewRec(rid.c_str(), dir.c_str(), mindur, maxdur, audio);};
}
}
int Wrapper::FireRecorder(const char* sid,const int64_t &id){
- if (rec_){
+ if (rec_->Loaded()){
rec_->FireRecSignal(sid, id);
}
}
@@ -190,7 +216,7 @@
}
////////decoder
void Wrapper::BuildDecoder(){
- use_decoder_ = true;
+ run_dec_ = true;
}
void Wrapper::GetPicDecoder(unsigned char **data, int *w, int *h, int64_t *id){
@@ -198,7 +224,7 @@
decoder_->GetFrame(data, w, h, id);
}
}
-
+
void Wrapper::GetPacket(unsigned char **pktData, int *size, int *key){
if (stream_){
stream_->GetPacket(pktData, size, key);
@@ -208,24 +234,34 @@
} // end class wrapper
///////////////////////////////////////////////////////////
///single decode or encoder
- ////// decoder
+////// decoder
+
+#include "ffmpeg/data/FrameData.hpp"
+
+// return val: -1 open error; -2, find stream error; -3, converter create
namespace cffmpeg_wrap{ // start test functions
- uint8_t* DecodeJPEG(const char *file, int *w, int *h){
+ 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 = in->open(file, NULL);
-
+ 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(AVMEDIA_TYPE_VIDEO, NULL);
+ auto flag = in->openCodec(NULL);
if(flag){
auto dec_ctx = in->getCodecContext();
@@ -236,29 +272,37 @@
}else{
logIt("FormatIn openCodec Failed!");
+ *w = *h = -3;
return NULL;
}
}else{
logIt("open %s error", file);
+ *w = *h = -1;
return NULL;
}
- auto data(std::make_shared<CodedData>());
- if(!in->readPacket(data)){
- logIt("read packet error");
- 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;
+ }
+ }
}
- auto frame(std::make_shared<FrameData>());
- auto ret = in->decode(frame, data);
- if(ret == 1){
- AVFrame *frm = frame->getAVFrame();
- *w = frm->width;
- *h = frm->height;
- unsigned char *data = (unsigned char*)malloc(frm->width * frm->height * 3);
- bridge_->copyPicture(data, frm);
- return data;
- }
- return NULL;
+
+ return pic;
}
/////// for encoder
typedef struct _PicEncoder{
@@ -322,28 +366,28 @@
}
AVFrame *frame = e->bridge->getAVFrame(in, w, h);
- auto data(std::make_shared<CodedData>());
+ AVPacket *pkt = av_packet_alloc();
- const int flag = e->enc->encode(data, frame);
- if(flag > 0){
- auto pkt = data->getAVPacket();
+ auto flag = e->enc->encode(pkt, frame);
+ if(flag == 0){
int extradata_size = ctx->extradata_size;
uint8_t *extra = ctx->extradata;
- *key = pkt.flags & AV_PKT_FLAG_KEY;
+ *key = pkt->flags & AV_PKT_FLAG_KEY;
if(!(*key)){
extradata_size = 0;
}
- *size = pkt.size + extradata_size;
+ *size = pkt->size + extradata_size;
*out = (unsigned char *)malloc(*size);
memcpy(*out, extra, extradata_size);
- memcpy(*out + extradata_size, pkt.data, pkt.size);
+ memcpy(*out + extradata_size, pkt->data, pkt->size);
}else{
logIt("encode error or need more packet\n");
}
+ av_packet_free(&pkt);
av_frame_free(&frame);
return flag;
--
Gitblit v1.8.0