From 762251329bca80422a8e65d0cdb36e86e84883cf Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 27 九月 2019 11:11:45 +0800
Subject: [PATCH] bug fix
---
csrc/ffmpeg/format/FormatOut.cpp | 99 ++++++++++++++++++++++++++-----------------------
1 files changed, 52 insertions(+), 47 deletions(-)
diff --git a/csrc/ffmpeg/format/FormatOut.cpp b/csrc/ffmpeg/format/FormatOut.cpp
index 3dabfc8..a0cad4a 100644
--- a/csrc/ffmpeg/format/FormatOut.cpp
+++ b/csrc/ffmpeg/format/FormatOut.cpp
@@ -31,6 +31,8 @@
,record_(false)
,fps_(0.0f)
,format_name_("mp4")
+ ,in_v_stream_(NULL)
+ ,in_a_stream_(NULL)
{}
FormatOut::~FormatOut()
@@ -275,61 +277,63 @@
return true;
}
- bool FormatOut::copyCodecFromIn(std::vector<AVStream*> in){
-
- for (int i = 0; i < in.size(); i++){
-
- AVStream *in_stream = in[i];
-
- AVStream *out_stream = avformat_new_stream(ctx_, in_stream->codec->codec);
- if(!out_stream)
- {
- logIt("Failed allocating output stream.\n");
- return false;
- }
-
- //灏嗚緭鍑烘祦鐨勭紪鐮佷俊鎭鍒跺埌杈撳叆娴�
- auto ret = avcodec_copy_context(out_stream->codec, in_stream->codec);
- if(ret<0)
- {
- logIt("Failed to copy context from input to output stream codec context\n");
- return false;
- }
-
- if (in_stream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO){
- v_idx_ = i;
- logIt("copy video from instream");
-
- out_stream->codecpar->codec_tag = out_stream->codec->codec_tag = 0;
-
- if(ctx_->oformat->flags & AVFMT_GLOBALHEADER)
- out_stream->codec->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- }
- if (in_stream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO){
- logIt("copy audio from instream");
- a_idx_ = i;
-
- out_stream->codecpar->codec_tag = out_stream->codec->codec_tag = 0;
-
- if(ctx_->oformat->flags & AVFMT_GLOBALHEADER)
- out_stream->codec->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-
- }
+ bool FormatOut::addStream(AVStream *s){
+ AVStream *in_stream = s;
+
+ AVStream *out_stream = avformat_new_stream(ctx_, in_stream->codec->codec);
+ if(!out_stream)
+ {
+ logIt("Failed allocating output stream.\n");
+ return false;
}
-
- in_streams_ = in;
-
+ //灏嗚緭鍑烘祦鐨勭紪鐮佷俊鎭鍒跺埌杈撳叆娴�
+ auto ret = avcodec_copy_context(out_stream->codec, in_stream->codec);
+ if(ret<0)
+ {
+ logIt("Failed to copy context from input to output stream codec context\n");
+ return false;
+ }
+ out_stream->codecpar->codec_tag = out_stream->codec->codec_tag = 0;
+
+ if(ctx_->oformat->flags & AVFMT_GLOBALHEADER)
+ out_stream->codec->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+
return true;
}
- bool FormatOut::JustWriter(std::vector<AVStream*> in, const char *filename){
+ bool FormatOut::copyCodecFromIn(AVStream *v, AVStream *a){
+ if (v){
+ v_idx_ = 0;
+ in_v_stream_ = v;
+
+ if (!addStream(v)){
+ logIt("format out add video stream error");
+ return false;
+ }else{
+ logIt("copy video from instream");
+ }
+ }
+ if (a){
+ a_idx_ = 1;
+ in_a_stream_ = a;
+ if (!addStream(a)){
+ logIt("format out add audio stream error");
+ return false;
+ }else{
+ logIt("copy audio from instream");
+ }
+ }
+ return true;
+ }
+
+ bool FormatOut::JustWriter(AVStream *v, AVStream *a, const char *filename){
if(ctx_){
clear();
}
bool flag = open(NULL, format_name_.c_str());
- flag = copyCodecFromIn(in) && flag;
+ flag = copyCodecFromIn(v, a) && flag;
if(!flag){
logIt("FormatOut JustWriter error from in");
return false;
@@ -396,7 +400,7 @@
return;
}
- if (pkt->pts == AV_NOPTS_VALUE && pkt->pts == AV_NOPTS_VALUE){
+ if (!in_a_stream_){
int64_t time_stamp = frame_cnt;
pkt->pos = -1;
@@ -417,7 +421,8 @@
AVStream *in_stream,*out_stream;
int out_idx = -1;
- for (auto i : in_streams_){
+ std::vector<AVStream*> in_streams{in_v_stream_, in_a_stream_};
+ for (auto i : in_streams){
if (i->index == pkt->stream_index){
if (i->codecpar->codec_type == AVMEDIA_TYPE_VIDEO){
out_idx = v_idx_;
--
Gitblit v1.8.0