From 54ea1c13885725584a6a50d520f67e8a75f85b6f Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 19 八月 2019 11:33:13 +0800
Subject: [PATCH] fix rec
---
csrc/wrapper.hpp | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/csrc/wrapper.hpp b/csrc/wrapper.hpp
index b11c9ca..66f2aca 100644
--- a/csrc/wrapper.hpp
+++ b/csrc/wrapper.hpp
@@ -44,11 +44,14 @@
struct avpacket;
}
- typedef std::function<std::shared_ptr<buz::Recorder>(ffwrapper::FormatIn*)> FN_REC;
+ // 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;
+ std::string rid;
+ std::string dir;
+ int min;
+ int max;
+ std::unique_ptr<buz::Recorder> rec;
}FnRec;
class Wrapper{
@@ -60,7 +63,7 @@
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);
+ std::unique_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, int64_t &id);
--
Gitblit v1.8.0