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 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/csrc/wrapper.hpp b/csrc/wrapper.hpp index 3e68b46..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,7 +34,7 @@ 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); @@ -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); -- Gitblit v1.8.0