From 2ba74e5da86ef3eb8c5a098f3216c8cbf110480e Mon Sep 17 00:00:00 2001 From: zhangmeng <775834166@qq.com> Date: 星期二, 22 十月 2019 15:49:25 +0800 Subject: [PATCH] remove log --- csrc/wrapper.hpp | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/csrc/wrapper.hpp b/csrc/wrapper.hpp index ca528f9..5677ad0 100644 --- a/csrc/wrapper.hpp +++ b/csrc/wrapper.hpp @@ -11,7 +11,7 @@ #include <memory> #include "common/callback.hpp" - +class CPacket; namespace ffwrapper{ class FormatIn; @@ -34,20 +34,22 @@ std::unique_ptr<ffwrapper::FormatIn> init_reader(const char* input); void init_worker(ffwrapper::FormatIn *in); - int run_worker(ffwrapper::FormatIn *in, std::shared_ptr<ffwrapper::CodedData> data, int64_t &id); + int run_worker(ffwrapper::FormatIn *in, const CPacket &pkt); 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, const bool audio); + void BuildRecorder(const char* id, const char *dir, const int64_t &fid, const int mind, const int maxd, const bool audio); int FireRecorder(const char* sid,const int64_t &id); void GetInfoRecorder(std::string &recID, int &index, std::string &path); - + + public: void GB28181(){gb_ = 1;} void CPUDec(){cpu_ = 1;} void AudioSwitch(const bool a); + void SetRecMinCacheTime(const int mind); public: //decoder void BuildDecoder(); void GetPicDecoder(unsigned char **data, int *w, int *h, int *format, int *length, int64_t *id); @@ -84,8 +86,6 @@ const int dstW, const int dstH, const int dstFormat, const int flag); uint8_t *Convert(void *h, uint8_t *src); void DestoryConvertor(void *h); - - uint8_t* ConvertYUV2BGR(uint8_t *src, const int w, const int h, const int dst_w, const int dst_h, int *length); } #endif \ No newline at end of file -- Gitblit v1.8.0