From e6725cb3cf4ced3a6985d4d3db4d5cf1336a30d8 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 19 七月 2019 16:53:35 +0800
Subject: [PATCH] merge so
---
csrc/wrapper.hpp | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/csrc/wrapper.hpp b/csrc/wrapper.hpp
index a7c5ec8..c1b56e0 100644
--- a/csrc/wrapper.hpp
+++ b/csrc/wrapper.hpp
@@ -51,6 +51,7 @@
private:
std::unique_ptr<ffwrapper::FormatIn> init_reader(const char* input);
+ ffwrapper::FormatIn* init_reader_gb28181(const char* input);
void init_worker(ffwrapper::FormatIn *in);
int init_recorder(ffwrapper::FormatIn *in, std::string dir, const int mind, const int maxd);
void run_worker(ffwrapper::FormatIn *in, buz::avpacket &pkt);
@@ -72,6 +73,8 @@
FUNC_REC func);
void ScalePicture(const int w, const int h, const int flags);
+ void UseGB28181();
+ void UseCPU();
public: //decoder
void BuildDecoder();
void GetPicDecoder(unsigned char **data, int *w, int *h);
@@ -108,6 +111,7 @@
FUNC_DEC func_dec_;
int scale_w_, scale_h_, scale_f_;
+ int gb_, cpu_;
//////////////////test frame to bgr24
public:
uint8_t *decodeJPEG(const char *file, int *w, int *h);
--
Gitblit v1.8.0