From a8b447be656145c9ba2a2d8319a10ae8f726de1f Mon Sep 17 00:00:00 2001 From: zhangmeng <775834166@qq.com> Date: 星期五, 09 十月 2020 18:20:46 +0800 Subject: [PATCH] h264 mp4 --- csrc/ffmpeg/format/FormatIn.cpp | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/csrc/ffmpeg/format/FormatIn.cpp b/csrc/ffmpeg/format/FormatIn.cpp index 17f4d2c..e69a1bc 100644 --- a/csrc/ffmpeg/format/FormatIn.cpp +++ b/csrc/ffmpeg/format/FormatIn.cpp @@ -13,6 +13,7 @@ #include <libavutil/avassert.h> #include <libavutil/imgutils.h> #include <libswscale/swscale.h> +#include <libavutil/intreadwrite.h> } #include "../log/log.hpp" @@ -37,6 +38,8 @@ ,read_io_buff_size_(32768) ,handle_gb28181(NULL) ,fps_(25.0) + ,bsf_h264(NULL) + ,bsf_hevc(NULL) {} FormatIn::FormatIn(const VideoProp &prop, bool hw/*=true*/) @@ -51,6 +54,8 @@ ,read_io_buff_size_(32768) ,handle_gb28181(NULL) ,fps_(25.0) + ,bsf_h264(NULL) + ,bsf_hevc(NULL) { prop_ = new VideoProp; *prop_ = prop; @@ -82,6 +87,8 @@ io_ctx_ = NULL; } + if (bsf_h264) av_bsf_free(&bsf_h264); + if (bsf_hevc) av_bsf_free(&bsf_hevc); } //////////////////////////////////////////////////////////////////////// @@ -182,6 +189,19 @@ fps_ = av_q2d(in->avg_frame_rate); } logIt("in stream video fps %f, time_base: %d : %d, size: %dx%d", fps_, in->time_base.num, in->time_base.den, in->codecpar->width, in->codecpar->height); + + if (IsHEVC()){ + + }else if (isAVC1()) { + const AVBitStreamFilter *f = av_bsf_get_by_name("h264_mp4toannexb"); + if (f){ + if (av_bsf_alloc(f, &bsf_h264) >= 0){ + if (avcodec_parameters_copy(bsf_h264->par_in, in->codecpar) >= 0){ + if (av_bsf_init(bsf_h264) < 0) bsf_h264 = NULL; + } + } + } + } } if (type == AVMEDIA_TYPE_AUDIO){ auto in = ctx_->streams[i]; @@ -357,7 +377,40 @@ int FormatIn::readPacket(AVPacket *pkt_out){ auto flag = av_read_frame(ctx_, pkt_out); + if (flag < 0) return flag; + + AVBSFContext *bsf = NULL; + + if (IsHEVC()){ + if (pkt_out->size >= 5 && + AV_RB32(pkt_out->data) != 0x0000001 && + AV_RB24(pkt_out->data) != 0x000001 && + !bsf_hevc){ + + const AVBitStreamFilter *f = av_bsf_get_by_name("hevc_mp4toannexb"); + if (f){ + if (av_bsf_alloc(f, &bsf_hevc) >= 0){ + if (avcodec_parameters_copy(bsf_hevc->par_in, ctx_->streams[vs_idx_]->codecpar) >= 0){ + if (av_bsf_init(bsf_hevc) < 0) bsf_hevc = NULL; + } + } + } + } + + bsf = bsf_hevc; + + }else { + bsf = bsf_h264; + } + if (bsf){ + if (av_bsf_send_packet(bsf, pkt_out) < 0){ + logIt("bsf_%s send packet failed", IsHEVC() ? "hevc" : "h264"); + return -1; + } + return av_bsf_receive_packet(bsf, pkt_out); + } + return flag; } -- Gitblit v1.8.0