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/buz/recorder.hpp | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/csrc/buz/recorder.hpp b/csrc/buz/recorder.hpp
index 9c88bbb..9cb557a 100644
--- a/csrc/buz/recorder.hpp
+++ b/csrc/buz/recorder.hpp
@@ -32,8 +32,8 @@
public:
int Run(const char* output, const int mind, const int maxd, const bool audio);
- int PushPacket(const CPacket &pkt);
- int PushPackets(std::list<CPacket> &lst);
+ int PushPacket(std::list<CPacket> &lst);
+ int StartWritePacket(std::list<CPacket> &lst, const int64_t &id, const int start, const int end);
int FireRecorder(const int64_t &id);
void SetCallback(FUNC_REC_INFO cb){
@@ -63,33 +63,33 @@
ffwrapper::FormatIn *in_;
ffwrapper::FormatOut *out_;
- int maxduration;
- int minduration;
- int end_frame;
- int cur_frame;
- int cur_frame_a;
-
- std::list<CPacket> list_pkt_;
-
+ std::list<CPacket> list_pkt_;
std::atomic_bool stop_recorder_;
std::mutex mutex_pkt_;
std::condition_variable cv_;
-
- std::unique_ptr<std::thread> thrd_;
-
std::string dir_;
std::string id_;
-
int64_t id_frame_;
int id_frame_in_file_;
+
std::string file_path_;
FUNC_REC_INFO func_rec_info_;
-
- bool error_occured_;
-
+ FILE *fp_;
bool audio_;
- FILE *fp_;
+ std::unique_ptr<std::thread> thrd_;
+
+
+ int end_frame_;
+ int v_cur_frame_;
+ int a_cur_frame_;
+
+ int64_t last_rec_id_;
+
+ int maxduration;
+ int minduration;
+
+ bool error_occured_;
};
}
}
--
Gitblit v1.8.0