From 1f005df2f3ff78458f332f9bf1cf2e78b6a8e8e4 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 26 九月 2019 14:43:52 +0800
Subject: [PATCH] bug fix audio codec
---
csrc/ffmpeg/format/FormatOut.cpp | 57 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 17 deletions(-)
diff --git a/csrc/ffmpeg/format/FormatOut.cpp b/csrc/ffmpeg/format/FormatOut.cpp
index 135590b..3dabfc8 100644
--- a/csrc/ffmpeg/format/FormatOut.cpp
+++ b/csrc/ffmpeg/format/FormatOut.cpp
@@ -275,11 +275,12 @@
return true;
}
- bool FormatOut::copyCodecFromIn(AVFormatContext* in){
+ bool FormatOut::copyCodecFromIn(std::vector<AVStream*> in){
- for(int i = 0; i < in->nb_streams; i++)
- { //鏍规嵁杈撳叆娴佸垱寤鸿緭鍑烘祦
- AVStream *in_stream = in->streams[i];
+ 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)
{
@@ -297,23 +298,31 @@
if (in_stream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO){
v_idx_ = i;
- }else{
- a_idx_ = i;
- }
+ logIt("copy video from instream");
- out_stream->codecpar->codec_tag = out_stream->codec->codec_tag = 0;
+ 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(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;
+ }
}
- in_ctx_ = in;
+ in_streams_ = in;
return true;
}
- bool FormatOut::JustWriter(AVFormatContext *in, const char *filename){
+ bool FormatOut::JustWriter(std::vector<AVStream*> in, const char *filename){
if(ctx_){
clear();
}
@@ -335,7 +344,6 @@
av_dict_set(&avdic,option_key,option_value,0);
flag = writeHeader(&avdic);
av_dict_free(&avdic);
-
}
return flag;
@@ -408,11 +416,26 @@
}
AVStream *in_stream,*out_stream;
+ int out_idx = -1;
+ for (auto i : in_streams_){
+ if (i->index == pkt->stream_index){
+ if (i->codecpar->codec_type == AVMEDIA_TYPE_VIDEO){
+ out_idx = v_idx_;
+ in_stream = i;
+ break;
+ }else if (i->codecpar->codec_type == AVMEDIA_TYPE_AUDIO){
+ in_stream = i;
+ out_idx = a_idx_;
+ break;
+ }
+ }
+ }
+ if (out_idx == -1) return;
+
+ out_stream = ctx_->streams[out_idx];
+ pkt->stream_index = out_idx;
- in_stream = in_ctx_->streams[pkt->stream_index];
- out_stream = ctx_->streams[pkt->stream_index];
-
- // logIt("BEFORE in stream timebase %d:%d, out timebase %d:%d, \
+ // logIt("BEFORE in stream timebase %d:%d, out timebase %d:%d,
// pts: %lld, dts: %lld, duration: %lld",
// in_stream->time_base.num, in_stream->time_base.den,
// out_stream->time_base.num, out_stream->time_base.den,
--
Gitblit v1.8.0