From 1d2e7ce97e33c74a949d443a226df531fbf5c7dd Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 25 九月 2019 14:04:09 +0800
Subject: [PATCH] bug fix
---
csrc/wrapper.hpp | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/csrc/wrapper.hpp b/csrc/wrapper.hpp
index 3b4aa7b..ed9a9ee 100644
--- a/csrc/wrapper.hpp
+++ b/csrc/wrapper.hpp
@@ -1,10 +1,6 @@
#ifndef _cffmpeg_wrapper_hpp_
#define _cffmpeg_wrapper_hpp_
-extern "C"{
-#include <libavcodec/avcodec.h>
-}
-
#include <stdint.h>
#include <string>
@@ -16,11 +12,11 @@
#include "common/callback.hpp"
+
namespace ffwrapper{
class FormatIn;
-
- class VideoProp;
class CodedData;
+ class VideoProp;
}
namespace cffmpeg_wrap{
@@ -66,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_;
@@ -77,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