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/buz/recorder.hpp | 46 ++++++++++++++++++++++++++++++++--------------
1 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/csrc/buz/recorder.hpp b/csrc/buz/recorder.hpp
index 70c32fe..9c88bbb 100644
--- a/csrc/buz/recorder.hpp
+++ b/csrc/buz/recorder.hpp
@@ -13,19 +13,17 @@
#include "../common/callback.hpp"
+#include "../common.hpp"
+
+struct AVPacket;
+
namespace ffwrapper{
class FormatIn;
class FormatOut;
-
- class CodedData;
}
namespace cffmpeg_wrap{
namespace buz{
- struct avpacket{
- std::shared_ptr<ffwrapper::CodedData> data;
- int64_t id;
- };
class Recorder{
public:
@@ -33,22 +31,34 @@
~Recorder();
public:
- int Run(const char* output, const int mind, const int maxd);
- int CachePacket(const avpacket &pkt);
+ 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 FireRecorder(const int64_t &id);
void SetCallback(FUNC_REC_INFO cb){
func_rec_info_ = cb;
}
+
+ const bool ErrorOcurred(){return error_occured_;}
+ const std::string& RecID()const{return id_;}
private:
void run_thread();
- int init_writer();
- void start_writer();
- int write_correctly(const avpacket &pkt);
+ int init_writer(const bool audio);
+ int write_correctly(const CPacket &pkt);
void end_writer();
void maybe_dump_gop();
+
+ int init_write_h264(const bool audio);
+ int write_h264(const CPacket &pkt);
+ int end_write_h264();
+
+ int init_write_hevc(const bool audio);
+ int write_hevc(const CPacket &pkt);
+ int end_write_hevc();
+ int mux_hevc(FILE *fp, const char *outfile);
private:
ffwrapper::FormatIn *in_;
ffwrapper::FormatOut *out_;
@@ -57,21 +67,29 @@
int minduration;
int end_frame;
int cur_frame;
+ int cur_frame_a;
- std::list<avpacket> list_pkt_;
+ std::list<CPacket> list_pkt_;
- std::unique_ptr<std::thread> thread_;
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 file_frame_index_;
+ int id_frame_in_file_;
std::string file_path_;
FUNC_REC_INFO func_rec_info_;
+
+ bool error_occured_;
+
+ bool audio_;
+
+ FILE *fp_;
};
}
}
--
Gitblit v1.8.0