From 4587f8d5507300782e329f9527f35f905f3bb697 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 29 十月 2019 14:13:25 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/valib/goffmpeg
---
csrc/wrapper.hpp | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/csrc/wrapper.hpp b/csrc/wrapper.hpp
index 4ae1a4f..73da823 100644
--- a/csrc/wrapper.hpp
+++ b/csrc/wrapper.hpp
@@ -11,7 +11,7 @@
#include <memory>
#include "common/callback.hpp"
-
+class CPacket;
namespace ffwrapper{
class FormatIn;
@@ -34,14 +34,14 @@
std::unique_ptr<ffwrapper::FormatIn> init_reader(const char* input);
void init_worker(ffwrapper::FormatIn *in);
- int 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);
@@ -50,6 +50,8 @@
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, int *format, int *length, int64_t *id);
@@ -74,6 +76,7 @@
// 褰曞儚璇锋眰缂撳瓨,绛夊緟runstream鍚庢坊鍔�
std::function<void()> fn_rec_lazy_;
bool logit_;
+ int fps_;
};
uint8_t* Decode(const char *file, const int gb, int *w, int *h);
@@ -86,8 +89,6 @@
const int dstW, const int dstH, const int dstFormat, const int flag);
uint8_t *Convert(void *h, uint8_t *src);
void DestoryConvertor(void *h);
-
- uint8_t* ConvertYUV2BGR(uint8_t *src, const int w, const int h, const int dst_w, const int dst_h, int *length);
}
#endif
\ No newline at end of file
--
Gitblit v1.8.0