From 529a90df418bd92d206dfeabfb2e1d01b454ad32 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 09 十月 2020 17:30:03 +0800
Subject: [PATCH] h264 mp4
---
csrc/ffmpeg/format/FormatOut.cpp | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 8 deletions(-)
diff --git a/csrc/ffmpeg/format/FormatOut.cpp b/csrc/ffmpeg/format/FormatOut.cpp
index 60efd59..d686d8e 100644
--- a/csrc/ffmpeg/format/FormatOut.cpp
+++ b/csrc/ffmpeg/format/FormatOut.cpp
@@ -33,11 +33,16 @@
,format_name_("mp4")
,in_v_stream_(NULL)
,in_a_stream_(NULL)
+ ,bsf_h264(NULL)
+ ,bsf_hevc(NULL)
{}
FormatOut::~FormatOut()
{
clear();
+
+ if (bsf_h264) av_bsf_free(&bsf_h264);
+ if (bsf_hevc) av_bsf_free(&bsf_hevc);
}
void FormatOut::clear(){
@@ -349,7 +354,23 @@
flag = writeHeader(&avdic);
av_dict_free(&avdic);
}
-
+
+ if (v){
+ if (v->codecpar->codec_id == AV_CODEC_ID_H264){
+ char p[100] = {0};
+ char *sub = av_fourcc_make_string(p, v->codecpar->codec_tag);
+ if (strcmp(sub, "avc1") == 0){
+ 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, v->codecpar) >= 0){
+ if (av_bsf_init(bsf_h264) < 0) bsf_h264 = NULL;
+ }
+ }
+ }
+ }
+ }
+ }
return flag;
}
@@ -399,7 +420,7 @@
int out_idx = -1;
std::vector<AVStream*> in_streams{in_v_stream_, in_a_stream_};
for (auto i : in_streams){
- if (i->index == pkt->stream_index){
+ if (i && (i->index == pkt->stream_index)){
if (i->codecpar->codec_type == AVMEDIA_TYPE_VIDEO){
out_idx = v_idx_;
in_stream = i;
@@ -446,7 +467,7 @@
bool interleaved/* = true*/){
adjustPTS(pkt, frame_cnt);
- auto ret = writeFrame2(pkt, interleaved);
+ auto ret = writeFrameInternal(pkt, interleaved);
if (!ret){
logIt("write to file failed, pkt.pts: %lld, dts: %lld, frame count: %d",
pkt->pts, pkt->dts, frame_cnt);
@@ -454,16 +475,15 @@
return ret;
}
- bool FormatOut::writeFrame2(AVPacket *pkt, bool interleaved){
-
+ static bool write_frame(AVFormatContext *ctx, AVPacket *pkt, bool interleaved){
int ret = 0;
if(interleaved){
- ret = av_interleaved_write_frame(ctx_, pkt);
+ ret = av_interleaved_write_frame(ctx, pkt);
}else{
// returns 1 if flushed and there is no more data to flush
- ret = av_write_frame(ctx_, pkt);
+ ret = av_write_frame(ctx, pkt);
}
-
+
if(ret < -22 || ret == 0){
return true;
}
@@ -471,6 +491,25 @@
return false;
}
+ bool FormatOut::writeFrameInternal(AVPacket *pkt, bool interleaved){
+
+ // h264_mp4toanatax
+ if (bsf_h264){
+ if (av_bsf_send_packet(bsf_h264, pkt) < 0){
+ logIt("bsf_h264 send packet failed");
+ return true;
+ }
+ int ret;
+ while((ret = av_bsf_receive_packet(bsf_h264, pkt)) == 0){
+ if (!write_frame(ctx_, pkt, interleaved)) return false;
+ }
+
+ if (ret == AVERROR(EAGAIN)) return true;
+ }
+
+ return write_frame(ctx_, pkt, interleaved);
+ }
+
bool FormatOut::writeTrailer(){
const int ret = av_write_trailer(ctx_);
if(ret != 0)
--
Gitblit v1.8.0