From be9c1d1f659b0ff31f656424c478e83a4f7c53b5 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 20 九月 2019 11:44:19 +0800
Subject: [PATCH] update ffmpeg
---
csrc/wrapper.hpp | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/csrc/wrapper.hpp b/csrc/wrapper.hpp
index 044b4ba..3b4aa7b 100644
--- a/csrc/wrapper.hpp
+++ b/csrc/wrapper.hpp
@@ -37,19 +37,24 @@
std::unique_ptr<ffwrapper::FormatIn> init_reader(const char* input);
void init_worker(ffwrapper::FormatIn *in);
- void run_worker(std::shared_ptr<ffwrapper::CodedData> data, int64_t &id);
+ void run_worker(ffwrapper::FormatIn *in, std::shared_ptr<ffwrapper::CodedData> data, int64_t &id);
void deinit_worker();
public:
int RunStream(const char* input);
private:
void run_stream_thread();
public: //recorder
- void BuildRecorder(const char* id,const char *dir, const int mind, const int maxd);
+ 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);
- void GB28181();
- void CPUDec();
+ 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);
@@ -59,7 +64,7 @@
// stream 鍙傛暟
std::string input_url_;
int scale_w_, scale_h_, scale_f_;
-
+ bool audio_;
int gb_, cpu_;
// decoder 鍙傛暟
std::unique_ptr<std::thread> thread_;
--
Gitblit v1.8.0