From c5a01eed95f1837e93fee27bce4da78c79f4ed10 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 12 十一月 2019 17:41:43 +0800
Subject: [PATCH] update
---
csrc/wrapper.hpp | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/csrc/wrapper.hpp b/csrc/wrapper.hpp
index 3b4aa7b..73da823 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>
@@ -15,12 +11,12 @@
#include <memory>
#include "common/callback.hpp"
+class CPacket;
namespace ffwrapper{
class FormatIn;
-
- class VideoProp;
class CodedData;
+ class VideoProp;
}
namespace cffmpeg_wrap{
@@ -32,40 +28,41 @@
class Wrapper{
public:
Wrapper();
+ explicit Wrapper(const char *logfile);
~Wrapper ();
private:
std::unique_ptr<ffwrapper::FormatIn> init_reader(const char* input);
void init_worker(ffwrapper::FormatIn *in);
- void run_worker(ffwrapper::FormatIn *in, std::shared_ptr<ffwrapper::CodedData> data, int64_t &id);
+ int run_worker(ffwrapper::FormatIn *in, const CPacket &pkt);
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, const bool audio);
+ void BuildRecorder(const char* id, const char *dir, const int64_t &fid, 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){
- scale_w_ = w;
- scale_h_ = h;
- scale_f_ = flags;
- }
+
+ public:
void GB28181(){gb_ = 1;}
void CPUDec(){cpu_ = 1;}
void AudioSwitch(const bool a);
+ void SetRecMinCacheTime(const int mind);
+
+ int GetFPS(){return fps_;}
public: //decoder
void BuildDecoder();
- void GetPicDecoder(unsigned char **data, int *w, int *h, int64_t *id);
+ void GetPicDecoder(unsigned char **data, int *w, int *h, int *format, int *length, int64_t *id);
public: // push stream
void GetPacket(unsigned char **pktData, int *size, int *key);
private:
// stream 鍙傛暟
std::string input_url_;
- 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,14 +74,21 @@
// 褰曞儚绫�,涓�鐩村瓨鍦�
rec* rec_;
// 褰曞儚璇锋眰缂撳瓨,绛夊緟runstream鍚庢坊鍔�
- std::function<void(ffwrapper::FormatIn*)> fn_rec_lazy_;
+ std::function<void()> fn_rec_lazy_;
+ bool logit_;
+ int fps_;
};
- 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);
+ void *CreateConvertor(const int srcW, const int srcH, const int srcFormat,
+ const int dstW, const int dstH, const int dstFormat, const int flag);
+ uint8_t *Convert(void *h, uint8_t *src);
+ void DestoryConvertor(void *h);
}
#endif
\ No newline at end of file
--
Gitblit v1.8.0