From 602b3b2a792d65e49dba07920b100b5feb39d36f Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 16 九月 2019 13:43:40 +0800
Subject: [PATCH] remove log
---
csrc/wrapper.cpp | 329 ++++++++++++++----------------------------------------
1 files changed, 85 insertions(+), 244 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index d67cb8d..9fc2e25 100644
--- a/csrc/wrapper.cpp
+++ b/csrc/wrapper.cpp
@@ -21,8 +21,11 @@
#include "buz/recorder.hpp"
-using namespace logif;
+#include "stream.hpp"
+#include "decoder.hpp"
+#include "rec.hpp"
+using namespace logif;
using namespace ffwrapper;
namespace cffmpeg_wrap{
@@ -30,15 +33,17 @@
Wrapper::Wrapper()
:input_url_("")
- ,thread_(nullptr)
- ,stop_stream_(false)
- ,bridge_(NULL)
,scale_w_(0)
,scale_h_(0)
,scale_f_(SWS_POINT)
,gb_(0)
,cpu_(0)
,use_decoder_(false)
+ ,thread_(nullptr)
+ ,stop_stream_(false)
+ ,stream_(nullptr)
+ ,decoder_(nullptr)
+ ,rec_(nullptr)
{
makeTheWorld();
}
@@ -46,14 +51,17 @@
Wrapper::~Wrapper()
{
- if(thread_){
- stop_stream_.store(true);
- thread_->join();
+ try
+ {
+ if(thread_){
+ stop_stream_.store(true);
+ thread_->join();
+ }
}
- if(bridge_){
- delete bridge_; bridge_ = NULL;
+ catch(const std::exception& e)
+ {
+ logIt("WRAPPER EXCEPTION: ", e.what());
}
-
}
void Wrapper::ScalePicture(const int w, const int h, const int flags){
@@ -100,45 +108,6 @@
return nullptr;
}
-
- void Wrapper::run_stream_thread(){
-
- while(!stop_stream_.load()){
- auto in = init_reader(input_url_.c_str());
-
- if (!in) {
- logIt("ERROR: init_reader! url: %s\n", input_url_.c_str());
- usleep(200000);
- continue;
- }
-
- int64_t id = 0;
- avpacket pkt;
- while(!stop_stream_.load()){
- auto data(std::make_shared<CodedData>());
- if(!in->readPacket(data)){
- logIt("read packet error");
- pkt.id = -1; data = nullptr; id = 0;
- }else{
- pkt.id = id++;
- }
- pkt.data = data;
- if(data != nullptr) {
- cacheAVPacket(data->getAVPacket());
- }
-
- run_worker(in.get(), pkt);
- if(!data){
- break;
- }
- //test
- // if(recorder_)
- // if(id % 250 == 0)
- // recorder_->FireRecorder(id);
- }
- }
- }
-
int Wrapper::RunStream(const char* input){
if(thread_){
logIt("wrapper run stream already run");
@@ -154,220 +123,94 @@
return 0;
}
- //////////////recorder
- std::shared_ptr<Recorder> Wrapper::init_recorder(FormatIn *in, std::string id,std::string dir, const int mind, const int maxd){
- if(!in){
- logIt("Init wrapper first");
- return nullptr;
- }
-
- auto rec = std::make_shared<Recorder>(in, id);
-
- rec->SetCallback([&](std::string &id, int &index, std::string &path){
- cache_rec_info(id, index, path);
- });
-
- int trycnt = 0;
- while(trycnt < 100){
- const int ret = rec->Run(dir.c_str(), mind, maxd);
- if(ret == 0) break;
- usleep(200000);
- }
- if (trycnt < 100){
- return rec;
- }
- return nullptr;
+ void Wrapper::init_stream(){
+ if (stream_) delete stream_;
+ stream_ = new stream;
}
-
- void Wrapper::BuildRecorder(const char* id, const char *output, const int mindur, const int maxdur){
- std::string rid(id);
- std::string dir(output);
- auto fn = [=](FormatIn *in){
- return init_recorder(in, rid, dir, mindur, maxdur);
- };
- std::shared_ptr<Recorder> rec(nullptr);
+
+ void Wrapper::init_decoder(ffwrapper::FormatIn *in){
+ if (decoder_) delete decoder_;
+ decoder_ = new decoder(in, scale_w_, scale_h_,scale_f_);
+ }
+
+ void Wrapper::init_rec(ffwrapper::FormatIn *in){
+ if (rec_) delete rec_;
+ rec_ = new rec(in);
+ }
+
+ void Wrapper::run_stream_thread(){
- FnRec r = FnRec{fn, rec};
- map_rec_[rid] = r;
+ while(!stop_stream_.load()){
+ auto in = init_reader(input_url_.c_str());
+
+ if (!in) {
+ logIt("ERROR: init_reader! url: %s\n", input_url_.c_str());
+ usleep(200000);
+ continue;
+ }
+ init_stream();
+ if (use_decoder_){
+ init_decoder(in.get());
+ }
+ init_rec(in.get());
+
+ int64_t id = 0;
+ while(!stop_stream_.load()){
+ auto data(std::make_shared<CodedData>());
+ if(!in->readPacket(data)){
+ logIt("read packet error");
+ break;
+ }
+ if (stream_) stream_->SetPacket(data);
+ if (use_decoder_ && decoder_) decoder_->SetFrame(data, id);
+ if (rec_) rec_->SetPacket(data, id);
+
+ id++;
+ }
+ }
+ }
+
+ void Wrapper::BuildRecorder(const char* id, const char *output, const int mindur, const int maxdur){
+
+ if (rec_){
+ rec_->NewRec(id, output, mindur, maxdur);
+ }
}
int Wrapper::FireRecorder(const char* sid,const int64_t &id){
- auto iter = map_rec_.find(sid);
- if (iter != map_rec_.end()){
- if(iter->second.rec){
- iter->second.rec->FireRecorder(id);
- }
+ if (rec_){
+ rec_->FireRecSignal(sid, id);
}
}
- void Wrapper::run_worker(ffwrapper::FormatIn *in, avpacket &pkt){
- if(!pkt.data) return;
- if (use_decoder_) {
- if(in->getCodecContext() == NULL){
-
- bool flag = true;
- flag = in->openCodec(AVMEDIA_TYPE_VIDEO, NULL);
- auto dec_ctx = in->getCodecContext();
- if(bridge_)delete bridge_;
-
- scale_w_ = scale_w_ == 0 || scale_w_ > dec_ctx->width ? dec_ctx->width : scale_w_;
- scale_h_ = scale_h_ == 0 || scale_h_ > dec_ctx->height ? dec_ctx->height : scale_h_;
-
- AVPixelFormat pix_fmt = AV_PIX_FMT_BGR24;
- bridge_ = new cvbridge(
- dec_ctx->width, dec_ctx->height, dec_ctx->pix_fmt,
- scale_w_, scale_h_, pix_fmt, scale_f_);
-
- if (!flag){
- logIt("FormatIn openCodec Failed!");
- }
- }
-
- auto frame(std::make_shared<FrameData>());
- auto ret = in->decode(frame, pkt.data);
- if(ret == 1){
- //鍚愬嚭鏁版嵁
- cache_pic(frame);
- }
+ void Wrapper::GetInfoRecorder(std::string &recID, int &index, std::string &path){
+ if (rec_){
+ rec_->GetRecInfo(recID, index, path);
}
-
- for(auto &i : map_rec_){
- if (!i.second.rec){
- i.second.rec = i.second.fn_init(in);
- }
- if (i.second.rec){
- i.second.rec->CachePacket(pkt);
- }
- }
- }
-
- void Wrapper::cache_rec_info(std::string &id, int &index, std::string &path){
- if(func_rec_){ //active api
- func_rec_(path, index);
- }else{ // passive api
- std::lock_guard<std::mutex> l(mutex_rec_);
- while(list_rec_.size() > 100){
- for(int i = 0; i < 25; i++){
- list_rec_.pop_front();
- }
- }
- struct record_file_info info;
- info.file_frame_index = index;
- info.file_path = path;
- list_rec_.emplace_back(info);
- list_rec_map_[path] = id;
- logIt("list rec files count : %d", list_rec_.size());
- map_rec_.erase(id);
- }
- }
-
- void Wrapper::GetInfoRecorder(int &index, std::string &path){
- std::lock_guard<std::mutex> l(mutex_rec_);
- if(list_rec_.empty()){
- index = -1;
- path = "";
- return;
- }
- auto info = list_rec_.front();
- index = info.file_frame_index;
- path = info.file_path;
- list_rec_.pop_front();
- // logIt("go get info index: %d, file: %s\n", index, path.c_str());
- }
-
- std::string Wrapper::GetRecorderID(const std::string &path){
- auto iter = list_rec_map_.find(path);
- if (iter != list_rec_map_.end()){
- return iter->second;
- }
- return "";
}
////////decoder
void Wrapper::BuildDecoder(){
use_decoder_ = true;
}
- void Wrapper::cache_pic(std::shared_ptr<ffwrapper::FrameData> &frame){
-
- pic_bgr24 pic;
- if(bridge_){
- AVFrame *frm = frame->getAVFrame();
- pic.w = scale_w_;
- pic.h = scale_h_;
-
- unsigned char *data = (unsigned char*)malloc(pic.w * pic.h * 3);
- bridge_->copyPicture(data, frm);
- pic.data = data;
+ void Wrapper::GetPicDecoder(unsigned char **data, int *w, int *h, int64_t *id){
+ if (decoder_){
+ decoder_->GetFrame(data, w, h, id);
}
- if(func_dec_){
- func_dec_(pic.data, pic.w, pic.h);
- }else{
- std::lock_guard<std::mutex> l(mutex_pic_);
- while(list_pic_.size() > 10){
- for(int i = 0; i < 5; i++){
- auto t = list_pic_.front();
- free(t.data);
- list_pic_.pop_front();
- }
- }
- list_pic_.emplace_back(pic);
- }
-
- }
-
- void Wrapper::GetPicDecoder(unsigned char **data, int *w, int *h){
- std::lock_guard<std::mutex> l(mutex_pic_);
- if(list_pic_.empty()){
- *data = NULL;
- *w = 0;
- *h = 0;
- return;
- }
- auto p = list_pic_.front();
- *data = p.data; *w = p.w; *h = p.h;
- list_pic_.pop_front();
}
void Wrapper::GetPacket(unsigned char **pktData, int *size, int *key){
- std::lock_guard<std::mutex> l(mutex_avpkt_);
- if(list_avpkt_.empty()){
- return;
+ if (stream_){
+ stream_->GetPacket(pktData, size, key);
}
- auto pkt = list_avpkt_.front();
- *key = pkt.flags & AV_PKT_FLAG_KEY;
- *size = pkt.size;
- *pktData = (unsigned char *)malloc(*size);
- memcpy(*pktData, pkt.data, pkt.size);
-
- list_avpkt_.pop_front();
- }
- void Wrapper::cacheAVPacket(const AVPacket &pkt){
- std::lock_guard<std::mutex> l(mutex_pic_);
- while(list_avpkt_.size() > 10){
-// printf("cacheAVPacket drop packets!!!!!!!!!!\n");
- for(int i = 0; i < 5; i++){
- list_avpkt_.pop_front();
- }
- }
- list_avpkt_.emplace_back(pkt);
}
-
- ///// active api
- void Wrapper::ActiveRecorder(const char *dir, const int mind, const int maxd,
- FUNC_REC func){
-
- BuildRecorder("", dir, mind, maxd);
- func_rec_ = func;
- }
-
- void Wrapper::ActiveDecoder(FUNC_DEC fn){
- BuildDecoder();
- func_dec_ = fn;
- }
-
- ////// test
- uint8_t *Wrapper::decodeJPEG(const char *file, int *w, int *h){
+} // end class wrapper
+///////////////////////////////////////////////////////////
+///single decode or encoder
+ ////// decoder
+namespace cffmpeg_wrap{ // start test functions
+ uint8_t* DecodeJPEG(const char *file, int *w, int *h){
VideoProp prop;
prop.url_ = file;
prop.gpu_acc_ = false;
@@ -396,7 +239,7 @@
return NULL;
}
}else{
- logIt("open %s error", input_url_.c_str());
+ logIt("open %s error", file);
return NULL;
}
@@ -417,8 +260,6 @@
}
return NULL;
}
-
-
/////// for encoder
typedef struct _PicEncoder{
FormatOut *enc;
--
Gitblit v1.8.0