From 461c08142aa92e8ee121c451fd93d04490caff75 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 26 七月 2019 15:45:24 +0800
Subject: [PATCH] remove redundant code
---
csrc/wrapper.hpp | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/csrc/wrapper.hpp b/csrc/wrapper.hpp
index 8c866fd..943936f 100644
--- a/csrc/wrapper.hpp
+++ b/csrc/wrapper.hpp
@@ -72,11 +72,8 @@
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(int &index, std::string &path);
+ std::string GetRecorderID(const std::string &path);
void ScalePicture(const int w, const int h, const int flags);
void UseGB28181();
@@ -86,7 +83,6 @@
void GetPicDecoder(unsigned char **data, int *w, int *h);
void GetPacket(unsigned char **pktData, int *size, int *key);
//active api
- void ActiveDecoder(FUNC_DEC fn);
private:
@@ -102,11 +98,12 @@
//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::unordered_map<std::string, std::string> list_rec_map_;
+
std::mutex mutex_rec_;
std::list<pic_bgr24> list_pic_;
@@ -114,10 +111,6 @@
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_;
--
Gitblit v1.8.0