From 080acae08ec8cfe413c3e6e45bcf7f9222dfa02d Mon Sep 17 00:00:00 2001 From: zhangmeng <775834166@qq.com> Date: 星期四, 24 十月 2019 16:50:28 +0800 Subject: [PATCH] update --- csrc/ffmpeg/format/FormatIn.cpp | 142 ++++++++++++++++++----------------------------- 1 files changed, 54 insertions(+), 88 deletions(-) diff --git a/csrc/ffmpeg/format/FormatIn.cpp b/csrc/ffmpeg/format/FormatIn.cpp index 3f87d59..420c9ac 100644 --- a/csrc/ffmpeg/format/FormatIn.cpp +++ b/csrc/ffmpeg/format/FormatIn.cpp @@ -17,8 +17,6 @@ #include "../configure/conf.hpp" #include "../property/VideoProp.hpp" -#include "../data/CodedData.hpp" -#include "../data/FrameData.hpp" #include "../../common/gpu/info.h" @@ -42,20 +40,23 @@ { if(io_ctx_){ if(read_io_buff_){ - // av_free(read_io_buff_); read_io_buff_ = NULL; } avio_context_free(&io_ctx_); io_ctx_ = NULL; } if(ctx_){ - avformat_close_input(&ctx_); - avformat_free_context(ctx_); + if (!ctx_->oformat){ + avformat_free_context(ctx_); + }else{ + avformat_close_input(&ctx_); + } ctx_ = NULL; if(dec_ctx_){ avcodec_close(dec_ctx_); dec_ctx_ = NULL; } + } if (handle_gb28181){ delete handle_gb28181; @@ -66,26 +67,25 @@ int FormatIn::openWithCustomIO(void *opaque, read_packet fn, AVDictionary **options/*=NULL*/){ ctx_ = avformat_alloc_context(); if(!ctx_){ - logIt("open with custom io create format error"); + logIt("open with custom io create format error\n"); return -1; } read_io_buff_ = (uint8_t*)av_malloc(read_io_buff_size_); if(!read_io_buff_){ - logIt("open with custom io alloc read io buff error"); + logIt("open with custom io alloc read io buff error\n"); return -1; } io_ctx_ = avio_alloc_context(read_io_buff_, read_io_buff_size_, 0, opaque, fn, NULL, NULL);//opaque if(!io_ctx_){ - logIt("open with custom io create custom avio error"); + logIt("open with custom io create custom avio error\n"); return -1; } ctx_->pb = io_ctx_; - auto err = av_probe_input_buffer(ctx_->pb, &ctx_->iformat, NULL, NULL, 0, read_io_buff_size_); + auto err = av_probe_input_buffer(ctx_->pb, &ctx_->iformat, NULL, NULL, 0, 0); if(err != 0){ - logIt("open with custom io prob input buffer error:%d", err); - logIt("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; } @@ -100,14 +100,18 @@ delete handle_gb28181; } handle_gb28181 = new GB28181API; - handle_gb28181->addCamera(fn); + if(handle_gb28181->addCamera(fn) == -1){ + logIt("do addCamera Error\n"); + return -1; + } int ret = openWithCustomIO(handle_gb28181, handle_gb28181->readData, options); if(ret < 0){ logIt("do openWithCustomIO failed:%d",ret); - } + }else{ + ret = avformat_open_input(&ctx_, "", NULL, options); + } - ret = avformat_open_input(&ctx_, "", NULL, options); // if(ret < 0){ // logIt("open %s failed:%s",filename, // getAVErrorDesc(ret).c_str()); @@ -138,11 +142,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; @@ -151,33 +157,30 @@ 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("video stream time base %d : %d", 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; - logIt("audio stream time base %d : %d", ctx_->streams[i]->time_base.num, ctx_->streams[i]->time_base.den); + 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); } } + return true; } - bool FormatIn::openCodec(const int type, AVDictionary **options){ - int stream_index = -1; - switch(type){ - case AVMEDIA_TYPE_VIDEO: - stream_index = vs_idx_; - break; - default: - break; - } - if(stream_index < 0){ - logIt("open input %s codec need correct stream",ctx_->filename); + const bool FormatIn::IsHEVC()const{ + return ctx_->streams[vs_idx_]->codecpar->codec_id == AV_CODEC_ID_HEVC; + } - return false; - } + bool FormatIn::openCodec(AVDictionary **options){ + if (vs_idx_ == -1) return false; - AVStream *s = ctx_->streams[stream_index]; + AVStream *s = ctx_->streams[vs_idx_]; AVCodecParameters *codecpar = s->codecpar; AVCodec *dec = NULL; @@ -206,7 +209,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); @@ -267,9 +269,9 @@ return ctx_->streams[vs_idx_]; } - if (type == ctx_->streams[vs_idx_]->codecpar->codec_type) + if (vs_idx_ > -1 && type == ctx_->streams[vs_idx_]->codecpar->codec_type) return ctx_->streams[vs_idx_]; - if (type == ctx_->streams[as_idx_]->codecpar->codec_type) + if (as_idx_ > -1 && type == ctx_->streams[as_idx_]->codecpar->codec_type) return ctx_->streams[as_idx_]; return NULL; @@ -279,43 +281,37 @@ return dec_ctx_; } - bool FormatIn::isVideoPkt(AVPacket &pkt){ - if (pkt.stream_index == vs_idx_){ + bool FormatIn::isVideoPkt(AVPacket *pkt){ + if (pkt->stream_index == vs_idx_){ return true; } return false; } - bool FormatIn::isAudioPkt(AVPacket &pkt){ - if (pkt.stream_index == as_idx_){ + bool FormatIn::isAudioPkt(AVPacket *pkt){ + if (pkt->stream_index == as_idx_){ return true; } return false; } - bool FormatIn::readPacket(AVPacket &pkt_out){ + bool FormatIn::notVideoAudio(AVPacket *pkt){ + return !isVideoPkt(pkt) && !isAudioPkt(pkt); + } + + int FormatIn::readPacket(AVPacket *pkt_out){ - const int ret = av_read_frame(ctx_, &pkt_out); - if(ret < 0){ - return false; - } + auto flag = av_read_frame(ctx_, pkt_out); - return true; - + return flag; } - bool FormatIn::readPacket(std::shared_ptr<CodedData> &data){ - - AVPacket &pkt(data->getAVPacket()); - return readPacket(pkt); - } - - int FormatIn::decode(AVFrame* &frame, AVPacket &pkt){ + int FormatIn::decode(AVFrame* frame, AVPacket *pkt){ AVStream *in = getStream(); - av_packet_rescale_ts(&pkt, in->time_base, in->codec->time_base); - int ret = avcodec_send_packet(dec_ctx_, &pkt); + av_packet_rescale_ts(pkt, in->time_base, in->codec->time_base); + int ret = avcodec_send_packet(dec_ctx_, pkt); if(ret < 0){ logIt("avcodec_send_packet error : %s", getAVErrorDesc(ret).c_str()); return -1; @@ -328,39 +324,9 @@ logIt("decode frame failed : %s", getAVErrorDesc(ret).c_str()); return -1; }else{ - return 1; + return 0; } } - return 0; + return -2; } - - int FormatIn::decode(std::shared_ptr<FrameData> &frame_data, - std::shared_ptr<CodedData> &data){ - - AVFrame *frame = frame_data->getAVFrame(); - AVPacket &pkt(data->getAVPacket()); - - return decode(frame, pkt); - } - - int FormatIn::readFrame(AVFrame* &frame){ - - auto data(std::make_shared<CodedData>()); - if(!readPacket(data)){ - return -1; - } - - AVPacket &pkt(data->getAVPacket()); - - return decode(frame, pkt); - } - - int FormatIn::readFrame(std::shared_ptr<FrameData> &frame_data){ - - AVFrame *frame(frame_data->getAVFrame()); - - return readFrame(frame); - } - - } -- Gitblit v1.8.0