From 1f005df2f3ff78458f332f9bf1cf2e78b6a8e8e4 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 26 九月 2019 14:43:52 +0800
Subject: [PATCH] bug fix audio codec
---
csrc/wrapper.hpp | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/csrc/wrapper.hpp b/csrc/wrapper.hpp
index c6fc3ea..9fce37d 100644
--- a/csrc/wrapper.hpp
+++ b/csrc/wrapper.hpp
@@ -27,7 +27,7 @@
class Wrapper{
public:
- Wrapper();
+ explicit Wrapper(const bool logit, const char *logfile);
~Wrapper ();
private:
std::unique_ptr<ffwrapper::FormatIn> init_reader(const char* input);
@@ -62,6 +62,7 @@
int scale_w_, scale_h_, scale_f_;
bool audio_;
int gb_, cpu_;
+ bool run_dec_;
// decoder 鍙傛暟
std::unique_ptr<std::thread> thread_;
std::atomic_bool stop_stream_;
@@ -73,10 +74,10 @@
// 褰曞儚绫�,涓�鐩村瓨鍦�
rec* rec_;
// 褰曞儚璇锋眰缂撳瓨,绛夊緟runstream鍚庢坊鍔�
- std::function<void(ffwrapper::FormatIn*)> fn_rec_lazy_;
+ std::function<void()> fn_rec_lazy_;
};
- uint8_t *DecodeJPEG(const char *file, int *w, int *h);
+ 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);
--
Gitblit v1.8.0