From b73029149580370e62dd6c14a270aea902f85cf2 Mon Sep 17 00:00:00 2001 From: zhangmeng <775834166@qq.com> Date: 星期三, 18 九月 2019 09:52:30 +0800 Subject: [PATCH] fix rec bug --- csrc/wrapper.hpp | 87 ++++++++++++++++++++----------------------- 1 files changed, 41 insertions(+), 46 deletions(-) diff --git a/csrc/wrapper.hpp b/csrc/wrapper.hpp index d398ed4..044b4ba 100644 --- a/csrc/wrapper.hpp +++ b/csrc/wrapper.hpp @@ -12,7 +12,6 @@ #include <thread> #include <atomic> #include <mutex> -#include <unordered_map> #include <memory> #include "common/callback.hpp" @@ -31,53 +30,49 @@ class rec; class Wrapper{ - public: - Wrapper(); - ~Wrapper (); + public: + Wrapper(); + ~Wrapper (); + private: + std::unique_ptr<ffwrapper::FormatIn> init_reader(const char* input); - private: - std::unique_ptr<ffwrapper::FormatIn> init_reader(const char* input); - void init_stream(); - void init_decoder(ffwrapper::FormatIn *in); - void init_rec(ffwrapper::FormatIn *in); - - public: - int RunStream(const char* input); - private: - void run_stream_thread(); + void init_worker(ffwrapper::FormatIn *in); + void run_worker(std::shared_ptr<ffwrapper::CodedData> data, int64_t &id); + void deinit_worker(); + public: + int RunStream(const char* input); + private: + void run_stream_thread(); + 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 &recID, int &index, std::string &path); + void ScalePicture(const int w, const int h, const int flags); + void GB28181(); + void CPUDec(); + public: //decoder + void BuildDecoder(); + void GetPicDecoder(unsigned char **data, int *w, int *h, int64_t *id); + public: // push stream + void GetPacket(unsigned char **pktData, int *size, int *key); + private: + // stream 鍙傛暟 + std::string input_url_; + int scale_w_, scale_h_, scale_f_; - 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 &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, int64_t *id); - void GetPacket(unsigned char **pktData, int *size, int *key); - - 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_; - - // 涓氬姟绫� - // 鎺ㄦ祦绫� - stream* stream_; - // 瑙g爜绫� - decoder* decoder_; - // 褰曞儚绫� - rec* rec_; - + int gb_, cpu_; + // decoder 鍙傛暟 + std::unique_ptr<std::thread> thread_; + std::atomic_bool stop_stream_; + // 涓氬姟绫� + // 鎺ㄦ祦绫� + stream* stream_; + // 瑙g爜绫� + decoder* decoder_; + // 褰曞儚绫�,涓�鐩村瓨鍦� + rec* rec_; + // 褰曞儚璇锋眰缂撳瓨,绛夊緟runstream鍚庢坊鍔� + std::function<void(ffwrapper::FormatIn*)> fn_rec_lazy_; }; uint8_t *DecodeJPEG(const char *file, int *w, int *h); -- Gitblit v1.8.0