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/FormatIn.cpp | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/csrc/ffmpeg/format/FormatIn.cpp b/csrc/ffmpeg/format/FormatIn.cpp
index c5eb651..bee3ae7 100644
--- a/csrc/ffmpeg/format/FormatIn.cpp
+++ b/csrc/ffmpeg/format/FormatIn.cpp
@@ -143,11 +143,13 @@
return false;
}
- logIt("there are %d stream", ctx_->nb_streams);
+ // logIt("there are %d stream", ctx_->nb_streams);
for (int i = 0; i < ctx_->nb_streams; ++i)
{
auto type = ctx_->streams[i]->codecpar->codec_type;
+ logIt("there are %d stream, stream %d, type %d", ctx_->nb_streams, i, type);
+
if (type == AVMEDIA_TYPE_VIDEO){
vs_idx_ = i;
@@ -157,10 +159,15 @@
}else if(in->r_frame_rate.num >=1 && in->r_frame_rate.den >= 1){
fps_ = av_q2d(in->r_frame_rate);
}
- logIt("in stream fps %f, time_base: %d : %d", fps_, in->time_base.num, in->time_base.den);
+ logIt("in stream video fps %f, time_base: %d : %d", fps_, in->time_base.num, in->time_base.den);
}
if (type == AVMEDIA_TYPE_AUDIO){
- as_idx_ = i;
+ auto in = ctx_->streams[i];
+ logIt("in stream audio %d time_base: %d : %d", in->codecpar->codec_id, in->time_base.num, in->time_base.den);
+ if (in->codecpar->codec_id == AV_CODEC_ID_AAC)
+ as_idx_ = i;
+ else
+ logIt("record not support audio codec: %d", in->codecpar->codec_id);
}
}
@@ -199,7 +206,6 @@
continue;
}else{
av_dict_set(&avdic, "gpu", std::to_string(idle_gpu).c_str(), 0);
- // av_dict_set(&avdic, "gpu", std::to_string(2).c_str(), 0);
}
}else{
dec = avcodec_find_decoder(codecpar->codec_id);
@@ -268,6 +274,19 @@
return NULL;
}
+ std::vector<AVStream*> FormatIn::allStreams(){
+ std::vector<AVStream*> vec;
+ auto v = getStream(AVMEDIA_TYPE_VIDEO);
+ if (v){
+ vec.push_back(v);
+ }
+ auto a = getStream(AVMEDIA_TYPE_AUDIO);
+ if (a){
+ vec.push_back(a);
+ }
+ return vec;
+ }
+
AVCodecContext *FormatIn::getCodecContext(int type){
return dec_ctx_;
}
@@ -286,6 +305,10 @@
return false;
}
+ bool FormatIn::notVideoAudio(AVPacket *pkt){
+ return !isVideoPkt(pkt) && !isAudioPkt(pkt);
+ }
+
int FormatIn::readPacket(AVPacket *pkt_out){
return av_read_frame(ctx_, pkt_out);
--
Gitblit v1.8.0