From f29f269d999fc4bb8a9bfa85629f08b89971a2ef Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 03 十二月 2019 16:00:49 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/valib/goffmpeg
---
csrc/wrapper.hpp | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/csrc/wrapper.hpp b/csrc/wrapper.hpp
index 4d51708..662f87d 100644
--- a/csrc/wrapper.hpp
+++ b/csrc/wrapper.hpp
@@ -53,16 +53,21 @@
int GetFPS(){return fps_;}
public: //decoder
- void BuildDecoder();
+ void OpenDecoder();
void 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);
+ public: // recorder
+ void OpenRecorder();
private:
// stream 鍙傛暟
std::string input_url_;
bool audio_;
int gb_, cpu_;
bool run_dec_;
+ bool run_stream_;
+ bool run_rec_;
// decoder 鍙傛暟
std::unique_ptr<std::thread> thread_;
std::atomic_bool stop_stream_;
@@ -84,12 +89,6 @@
void *CreateEncoder(const int w, const int h, const int fps, const int br, const int scale_flag, const int gi);
void DestroyEncoder(void *h);
int Encode(void *hdl, uint8_t *in, const int w, const int h, uint8_t **out, int *size, int *key);
-
- void *CreateConvertor(const int srcW, const int srcH, const int srcFormat,
- const int dstW, const int dstH, const int dstFormat, const int flag);
- uint8_t *Convert(void *h, uint8_t *src);
- void DestoryConvertor(void *h);
-
int GetGb28181Pic(const char *filename, char *retData, int *retDataLen);
}
--
Gitblit v1.8.0