From cd3fe8cc1ae9028acb4f630ed16c12f4fb327f3c Mon Sep 17 00:00:00 2001 From: zhangmeng <775834166@qq.com> Date: 星期四, 10 十月 2019 17:35:12 +0800 Subject: [PATCH] add interface out --- csrc/ffmpeg/format/FormatIn.cpp | 33 +++++++++++++-------------------- 1 files changed, 13 insertions(+), 20 deletions(-) diff --git a/csrc/ffmpeg/format/FormatIn.cpp b/csrc/ffmpeg/format/FormatIn.cpp index bee3ae7..9f743f8 100644 --- a/csrc/ffmpeg/format/FormatIn.cpp +++ b/csrc/ffmpeg/format/FormatIn.cpp @@ -57,6 +57,7 @@ avcodec_close(dec_ctx_); dec_ctx_ = NULL; } + } if (handle_gb28181){ delete handle_gb28181; @@ -85,8 +86,7 @@ auto err = av_probe_input_buffer(ctx_->pb, &ctx_->iformat, NULL, NULL, 0, read_io_buff_size_); if(err != 0){ - logIt("open with custom io prob input buffer error:%d\n", err); - logIt("custom io failed:%s", getAVErrorDesc(err).c_str()); + logIt("open with custom io prob input buffer error:%d err: %s\n", err, getAVErrorDesc(err).c_str()); return -1; } @@ -154,11 +154,11 @@ vs_idx_ = i; auto in = ctx_->streams[i]; - if(in->avg_frame_rate.num >=1 && in->avg_frame_rate.den >= 1){ - fps_ = av_q2d(in->avg_frame_rate); - }else if(in->r_frame_rate.num >=1 && in->r_frame_rate.den >= 1){ + if(in->r_frame_rate.num >=1 && in->r_frame_rate.den >= 1){ fps_ = av_q2d(in->r_frame_rate); - } + }else if(in->avg_frame_rate.num >=1 && in->avg_frame_rate.den >= 1){ + fps_ = av_q2d(in->avg_frame_rate); + } logIt("in stream video fps %f, time_base: %d : %d", fps_, in->time_base.num, in->time_base.den); } if (type == AVMEDIA_TYPE_AUDIO){ @@ -172,6 +172,10 @@ } return true; + } + + const bool FormatIn::IsHEVC()const{ + return ctx_->streams[vs_idx_]->codecpar->codec_id == AV_CODEC_ID_HEVC; } bool FormatIn::openCodec(AVDictionary **options){ @@ -274,19 +278,6 @@ 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_; } @@ -311,7 +302,9 @@ int FormatIn::readPacket(AVPacket *pkt_out){ - return av_read_frame(ctx_, pkt_out); + auto flag = av_read_frame(ctx_, pkt_out); + + return flag; } int FormatIn::decode(AVFrame* frame, AVPacket *pkt){ -- Gitblit v1.8.0