From 68a19a73681301c6712e10d55bc64324716dbd24 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 09 十月 2019 15:38:47 +0800
Subject: [PATCH] split scale
---
csrc/wrapper.hpp | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/csrc/wrapper.hpp b/csrc/wrapper.hpp
index af976e5..13d5f7d 100644
--- a/csrc/wrapper.hpp
+++ b/csrc/wrapper.hpp
@@ -44,23 +44,18 @@
void BuildRecorder(const char* id,const char *dir, 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);
- void ScalePicture(const int w, const int h, const int flags){
- scale_w_ = w;
- scale_h_ = h;
- scale_f_ = flags;
- }
+
void GB28181(){gb_ = 1;}
void CPUDec(){cpu_ = 1;}
void AudioSwitch(const bool a);
public: //decoder
void BuildDecoder();
- void GetPicDecoder(unsigned char **data, int *w, int *h, int64_t *id);
+ void GetPicDecoder(unsigned char **data, int *w, int *h, int *format, int *length, int64_t *id);
public: // push stream
void GetPacket(unsigned char **pktData, int *size, int *key);
private:
// stream 鍙傛暟
std::string input_url_;
- int scale_w_, scale_h_, scale_f_;
bool audio_;
int gb_, cpu_;
bool run_dec_;
@@ -80,10 +75,17 @@
};
uint8_t* Decode(const char *file, const int gb, int *w, int *h);
+
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 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