From 2e1a71f9cd9d60c6ac1f09537d9649f96f1df811 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 16 九月 2019 13:37:56 +0800
Subject: [PATCH] add log
---
csrc/wrapper.hpp | 90 +++++++++++----------------------------------
1 files changed, 22 insertions(+), 68 deletions(-)
diff --git a/csrc/wrapper.hpp b/csrc/wrapper.hpp
index 8c866fd..d398ed4 100644
--- a/csrc/wrapper.hpp
+++ b/csrc/wrapper.hpp
@@ -19,35 +19,16 @@
namespace ffwrapper{
class FormatIn;
- class FormatOut;
class VideoProp;
class CodedData;
- class FrameData;
-
- class cvbridge;
}
namespace cffmpeg_wrap{
-
- typedef struct _pic_bgr24{
- unsigned char *data;
- int w;
- int h;
- }pic_bgr24;
-
- namespace buz{
- class Recorder;
- struct avpacket;
- }
-
- typedef std::function<std::shared_ptr<buz::Recorder>(ffwrapper::FormatIn*)> FN_REC;
-
- typedef struct _fn_rec{
- FN_REC fn_init;
- std::shared_ptr<buz::Recorder> rec;
- }FnRec;
+ class stream;
+ class decoder;
+ class rec;
class Wrapper{
public:
@@ -56,14 +37,10 @@
private:
std::unique_ptr<ffwrapper::FormatIn> init_reader(const char* input);
- // ffwrapper::FormatIn* init_reader_gb28181(const char* input);
- void run_worker(ffwrapper::FormatIn *in, buz::avpacket &pkt);
- std::shared_ptr<buz::Recorder> init_recorder(ffwrapper::FormatIn *in, std::string id,std::string dir, const int mind, const int maxd);
-
- void cache_rec_info(std::string &id, int &index, std::string &path);
- void cache_pic(std::shared_ptr<ffwrapper::FrameData> &frame);
-
- void cacheAVPacket(const AVPacket &pkt);
+ void init_stream();
+ void init_decoder(ffwrapper::FormatIn *in);
+ void init_rec(ffwrapper::FormatIn *in);
+
public:
int RunStream(const char* input);
private:
@@ -72,61 +49,38 @@
public: //recorder
void BuildRecorder(const char* id,const char *dir, const int mind, const int maxd);
int FireRecorder(const char* sid,const int64_t &id);
- void GetInfoRecorder(std::string &sid, int &index, std::string &path);
-
- // active api
- void ActiveRecorder(const char *dir, const int mind, const int maxd,
- FUNC_REC func);
+ void GetInfoRecorder(std::string &recID, int &index, std::string &path);
void ScalePicture(const int w, const int h, const int flags);
void UseGB28181();
void UseCPU();
public: //decoder
void BuildDecoder();
- void GetPicDecoder(unsigned char **data, int *w, int *h);
+ void GetPicDecoder(unsigned char **data, int *w, int *h, int64_t *id);
void GetPacket(unsigned char **pktData, int *size, int *key);
- //active api
- void ActiveDecoder(FUNC_DEC fn);
private:
-
+ // stream 鍙傛暟
std::string input_url_;
+ int scale_w_, scale_h_, scale_f_;
+ int gb_, cpu_;
+ bool use_decoder_;
+ // decoder 鍙傛暟
std::unique_ptr<std::thread> thread_;
std::atomic_bool stop_stream_;
- ffwrapper::cvbridge *bridge_;
-
- bool use_decoder_;
- std::unordered_map<std::string, FnRec> map_rec_;
-
- //passive api
- struct record_file_info{
- std::string id;
- int file_frame_index;
- std::string file_path;
- };
- std::list<struct record_file_info> list_rec_;
- std::mutex mutex_rec_;
-
- std::list<pic_bgr24> list_pic_;
- std::mutex mutex_pic_;
-
- std::list<AVPacket> list_avpkt_;
- std::mutex mutex_avpkt_;
-
- // active api
- FUNC_REC func_rec_;
- FUNC_DEC func_dec_;
-
- int scale_w_, scale_h_, scale_f_;
- int gb_, cpu_;
- //////////////////test frame to bgr24
- public:
- uint8_t *decodeJPEG(const char *file, int *w, int *h);
+ // 涓氬姟绫�
+ // 鎺ㄦ祦绫�
+ stream* stream_;
+ // 瑙ｇ爜绫�
+ decoder* decoder_;
+ // 褰曞儚绫�
+ rec* rec_;
};
+ uint8_t *DecodeJPEG(const char *file, int *w, int *h);
void *CreateEncoder(const int w, const int h, const int fps, const int br, const int scale_flag, const int gi);
void DestroyEncoder(void *h);
int Encode(void *hdl, uint8_t *in, const int w, const int h, uint8_t **out, int *size, int *key);
--
Gitblit v1.8.0