From d64868c215e35088bfeda67aeb04db0800bf2844 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 09 十月 2020 16:33:43 +0800
Subject: [PATCH] h264 mp4
---
csrc/ffmpeg/format/FormatOut.hpp | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/csrc/ffmpeg/format/FormatOut.hpp b/csrc/ffmpeg/format/FormatOut.hpp
index 238d22f..62b5d02 100644
--- a/csrc/ffmpeg/format/FormatOut.hpp
+++ b/csrc/ffmpeg/format/FormatOut.hpp
@@ -4,7 +4,6 @@
#include <stdlib.h>
#include <memory>
#include <string>
-#include <vector>
struct AVFormatContext;
struct AVStream;
@@ -12,6 +11,7 @@
struct AVFrame;
struct AVPacket;
struct AVDictionary;
+struct AVBSFContext;
namespace ffwrapper{
class VideoProp;
@@ -35,11 +35,12 @@
int encode(AVPacket *pkt, AVFrame *frame);
public:
- bool copyCodecFromIn(std::vector<AVStream*> in);
+ bool addStream(AVStream *s);
+ bool copyCodecFromIn(AVStream *v, AVStream *a);
bool openResource(const char *filename, const int flags);
bool closeResource();
- bool JustWriter(std::vector<AVStream*> in, const char *filename);
+ bool JustWriter(AVStream *v, AVStream *a, const char *filename);
bool EncodeWriter(const char *filename);
bool writeFrame(AVPacket *pkt, const int64_t &frame_cnt, bool interleaved = true);
void adjustPTS(AVPacket *pkt, const int64_t &frame_cnt);
@@ -72,8 +73,10 @@
double fps_;
std::string format_name_;
+ AVBSFContext *bsf_h264, *bsf_hevc;
// rec
- std::vector<AVStream*> in_streams_;
+ AVStream *in_v_stream_;
+ AVStream *in_a_stream_;
};
}
#endif
\ No newline at end of file
--
Gitblit v1.8.0