From a8b447be656145c9ba2a2d8319a10ae8f726de1f Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 09 十月 2020 18:20:46 +0800
Subject: [PATCH] h264 mp4
---
csrc/wrapper.hpp | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/csrc/wrapper.hpp b/csrc/wrapper.hpp
index 43e3f61..e2d9a8b 100644
--- a/csrc/wrapper.hpp
+++ b/csrc/wrapper.hpp
@@ -43,28 +43,33 @@
public: //recorder
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);
+ int 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);
+ void SetRecMinCacheTime(const int mind, const int maxd);
int GetFPS(){return fps_;}
public: //decoder
void OpenDecoder();
- void GetPicDecoder(unsigned char **data, int *w, int *h, int *format, int *length, int64_t *id);
+ int GetPicDecoder(unsigned char **data, int *w, int *h, int *format, int *length, int64_t *id);
public: // push stream
void CloseStream();
- void GetPacket(unsigned char **pktData, int *size, int *key);
+ int GetPacket(unsigned char **pktData, int *size, int *key);
public: // recorder
void OpenRecorder();
+
+ public:
+ // set device id
+ int SetDevID(const int devid){ devid_ = devid; return 0;}
+
private:
// stream 鍙傛暟
std::string input_url_;
bool audio_;
- int gb_, cpu_;
+ int gb_, cpu_, devid_;
bool run_dec_;
bool run_stream_;
bool run_rec_;
@@ -82,6 +87,9 @@
std::function<void()> fn_rec_lazy_;
bool logit_;
int fps_;
+ // 涓哄吋瀹规枃浠惰В鐮佸仛鐨勮ˉ涓�
+ bool file_finished_;
+ int min_duration_;
};
void *CreateEncoder(const int w, const int h, const int fps, const int br,
--
Gitblit v1.8.0