From 7fe46306ac577db11ba8a8bbf20653861fcb1a1a Mon Sep 17 00:00:00 2001 From: zhangmeng <775834166@qq.com> Date: 星期二, 22 十月 2019 15:31:29 +0800 Subject: [PATCH] rec bug fix --- csrc/worker/rec.hpp | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/csrc/worker/rec.hpp b/csrc/worker/rec.hpp index e79e332..fc6ba0d 100644 --- a/csrc/worker/rec.hpp +++ b/csrc/worker/rec.hpp @@ -9,6 +9,7 @@ #include "../buz/recorder.hpp" struct AVPacket; +class CPacket; namespace ffwrapper { @@ -45,10 +46,13 @@ std::mutex mtx_pkt_; private: + // 鏌ユ壘缂撳瓨涓殑褰曞埗甯� + void findRecFramesIndex(const int64_t &fired_id, const int duration, int &start, int &end); + // 褰曞儚瀹炰緥鐨勫洖璋冨嚱鏁�,褰曞儚瀹屾垚鍚庤缃綍鍍忔枃浠惰矾寰�,id鍜屽抚id void setRecInfo(std::string &id, int &index, std::string &path); // 缂撳瓨瑙嗛鍖� - void cachePacket(std::shared_ptr<ffwrapper::CodedData> data, int64_t &id); + void cachePacket(const CPacket &pkt); // 涓㈠純缂撳瓨 int shrinkCache(); // 鍒涘缓褰曞儚瀹炰緥寮�濮嬪綍鍍� @@ -63,7 +67,7 @@ void Unload(); const bool Loaded() const; // 缂撳瓨褰曞儚鐨勮棰戝寘,绛夊緟瑙﹀彂褰曞儚,鎴栫洿鎺ユ斁鍒板綍鍍忕紦瀛� - void SetPacket(std::shared_ptr<ffwrapper::CodedData> data, int64_t &id); + void SetPacket(const CPacket &pkt); // 瑙﹀彂褰曞儚 void FireRecSignal(const char* sid,const int64_t &id); // 鑾峰彇褰曞儚鏂囦欢璺緞鍜屽抚id -- Gitblit v1.8.0