From d42f702ea93b3d34a300ad2f1f72db4d7bb9cc80 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 22 七月 2019 09:58:55 +0800
Subject: [PATCH] update
---
csrc/wrapper.hpp | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/csrc/wrapper.hpp b/csrc/wrapper.hpp
index 1145044..c8d928b 100644
--- a/csrc/wrapper.hpp
+++ b/csrc/wrapper.hpp
@@ -51,7 +51,7 @@
private:
std::unique_ptr<ffwrapper::FormatIn> init_reader(const char* input);
- ffwrapper::FormatIn* init_reader_gb28181(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);
@@ -73,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);
@@ -109,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