From 803388b511d31b9e25f6829298bb12e06323474c Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 17 七月 2019 13:37:47 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.1.14:29418/valib/goffmpeg
---
csrc/wrapper.hpp | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/csrc/wrapper.hpp b/csrc/wrapper.hpp
index f242ee7..1145044 100644
--- a/csrc/wrapper.hpp
+++ b/csrc/wrapper.hpp
@@ -15,7 +15,8 @@
namespace ffwrapper{
class FormatIn;
-
+ class FormatOut;
+
class VideoProp;
class CodedData;
class FrameData;
@@ -26,6 +27,7 @@
enum WORKER{
WORKER_RECORDER = 0,
WORKER_DECODER,
+ WORKER_ENCODER,
};
namespace cffmpeg_wrap{
@@ -76,6 +78,11 @@
void GetPicDecoder(unsigned char **data, int *w, int *h);
//active api
void ActiveDecoder(FUNC_DEC fn);
+
+ public:
+ void BuildEncoder(const char *file, const int w, const int h, const int fps, const int br, const int gi);
+ int init_encoder(ffwrapper::FormatIn *in, const char *file, const int w, const int h, const int fps, const int br, const int gi);
+
private:
std::string input_url_;
@@ -105,7 +112,15 @@
//////////////////test frame to bgr24
public:
uint8_t *decodeJPEG(const char *file, int *w, int *h);
+
+ private:
+ ffwrapper::FormatOut *encoder_;
};
+
+ 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);
+
}
#endif
\ No newline at end of file
--
Gitblit v1.8.0