From 1d2e7ce97e33c74a949d443a226df531fbf5c7dd Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 25 九月 2019 14:04:09 +0800
Subject: [PATCH] bug fix
---
csrc/ffmpeg/format/FormatOut.hpp | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/csrc/ffmpeg/format/FormatOut.hpp b/csrc/ffmpeg/format/FormatOut.hpp
index 35575d7..fc6fa1b 100644
--- a/csrc/ffmpeg/format/FormatOut.hpp
+++ b/csrc/ffmpeg/format/FormatOut.hpp
@@ -4,6 +4,7 @@
#include <stdlib.h>
#include <memory>
#include <string>
+#include <vector>
struct AVFormatContext;
struct AVStream;
@@ -14,8 +15,6 @@
namespace ffwrapper{
class VideoProp;
- class CodedData;
- class FrameData;
class FormatOut
{
@@ -26,34 +25,31 @@
FormatOut(VideoProp &prop,
const char *filename, char *format_name = NULL);
- FormatOut(AVStream *in, const char *format_name);
+ FormatOut(const double fps, const char *format_name);
void clear();
public:
bool open(const char *filename, const char *format_name);
bool openCodec(VideoProp &prop);
- int encode(AVPacket &pkt, AVFrame *frame);
- int encode(std::shared_ptr<CodedData> &data,
- std::shared_ptr<FrameData> &frame_data);
- int encode(std::shared_ptr<CodedData> &data,AVFrame *frame);
+ int encode(AVPacket *pkt, AVFrame *frame);
public:
- bool copyCodecFromIn(AVStream *in);
+ bool copyCodecFromIn(AVFormatContext* in);
bool openResource(const char *filename, const int flags);
bool closeResource();
- bool JustWriter(AVStream *in, const char *filename);
+ bool JustWriter(AVFormatContext* in, 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);
+ bool writeFrame(AVPacket *pkt, const int64_t &frame_cnt, bool interleaved = true);
+ void adjustPTS(AVPacket *pkt, const int64_t &frame_cnt);
bool endWriter();
bool writeHeader(AVDictionary **options = NULL);
- bool writeFrame2(AVPacket &pkt, bool interleaved);
+ bool writeFrame2(AVPacket *pkt, bool interleaved);
bool writeTrailer();
public:
- AVStream *getStream(){return v_s_;}
+ AVStream *getStream();
const AVCodecContext *getCodecContext() const;
const double getFPS()const{return fps_;}
@@ -65,7 +61,8 @@
void configEncoder(VideoProp &prop);
private:
AVFormatContext *ctx_;
- AVStream *v_s_;
+ int v_idx_;
+ int a_idx_;
AVCodecContext *enc_ctx_;
int64_t sync_opts_;
@@ -75,6 +72,8 @@
double fps_;
std::string format_name_;
+ // rec
+ AVFormatContext *in_ctx_;
};
}
#endif
\ No newline at end of file
--
Gitblit v1.8.0