From c60d61c48c7a1e7b693d4c3f6427e3b616d1f471 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 21 十月 2019 12:29:33 +0800
Subject: [PATCH] update ffmpeg
---
csrc/worker/rec.hpp | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/csrc/worker/rec.hpp b/csrc/worker/rec.hpp
index 5ac00a9..e79e332 100644
--- a/csrc/worker/rec.hpp
+++ b/csrc/worker/rec.hpp
@@ -2,12 +2,13 @@
#define _cffmpeg_rec_hpp_
#include <string>
-#include <memory>
#include <unordered_map>
#include <list>
#include <mutex>
#include "../buz/recorder.hpp"
+
+struct AVPacket;
namespace ffwrapper
{
@@ -22,9 +23,7 @@
{
private:
ffwrapper::FormatIn *recRef_;
- int maxduration_;
- int minduration_;
-
+ int min_cache_len_;
// 褰曞儚鐨勫疄渚�,瀵瑰簲浠诲姟
std::unordered_map<std::string, std::unique_ptr<buz::Recorder> > map_rec_;
// 澶氱嚎绋嬫坊鍔犱换鍔″疄渚�,鍦ㄨ娴佺嚎绋嬩娇鐢ㄥ綍鍍�,浣嗘槸娣诲姞鍦ㄥ彟涓�涓嚎绋�
@@ -41,7 +40,7 @@
std::mutex mtx_recInfo_;
// 缂撳瓨鐨勮棰戝抚,绛夊緟firerecsignal瑙﹀彂寮�濮嬪綍鍍�
- std::list<buz::CPacket> list_pkt_;
+ std::list<CPacket> list_pkt_;
// 澶氱嚎绋�,鐢熶骇鑰呯嚎绋媟eader push pkt,娑堣垂鑰�,褰曞儚绾跨▼pop
std::mutex mtx_pkt_;
@@ -53,11 +52,11 @@
// 涓㈠純缂撳瓨
int shrinkCache();
// 鍒涘缓褰曞儚瀹炰緥寮�濮嬪綍鍍�
- std::unique_ptr<buz::Recorder> startRec(std::string id, std::string dir, const int mind, const int maxd, const bool audio);
+ std::unique_ptr<buz::Recorder> startRec(std::string id, std::string dir, const int64_t &frameID, const int mind, const int maxd, const bool audio);
// 娓呴櫎缂撳瓨,鏂嚎閲嶈繛鏃堕渶瑕�
void clear();
public:
- void NewRec(const char* id, const char *output, const int mindur, const int maxdur, const bool audio);
+ void NewRec(const char* id, const char *output, const int64_t &frameID, const int mindur, const int maxdur, const bool audio);
// 鍑嗗濂藉綍鍍�
void Load(ffwrapper::FormatIn *in);
@@ -70,6 +69,8 @@
// 鑾峰彇褰曞儚鏂囦欢璺緞鍜屽抚id
void GetRecInfo(std::string &recID, int &index, std::string &path);
+ // 璁剧疆褰曞埗鏃堕暱浣滀负缂撳瓨
+ void SetRecMinCacheTime(const int min);
public:
rec();
~rec();
--
Gitblit v1.8.0