Message ID | tencent_96D31C1C444BBA6633D0BC66D5A7F1AA9906@qq.com |
---|---|
State | Accepted |
Commit | 59a9727c241aa50f18e713dbabbdd5cf3d379411 |
Headers | show |
Series | [FFmpeg-devel] avformat/flvenc: fix EOS tag | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
> 2023年2月7日 05:25,Zhao Zhili <quinkblack@foxmail.com> 写道: > > From: Zhao Zhili <zhilizhao@tencent.com> > > FLV spec only has AVC end of sequence tag, and the EOS tag has a > CodecID as other video data packet. MPEG4 doesn't conformance to > the spec, but it's there for a decade. So only 'fix' the EOS tag > rather than remove it completely. > > Signed-off-by: Zhao Zhili <zhilizhao@tencent.com> > --- > libavformat/flvenc.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c > index 128ae8ebc0..8830c03044 100644 > --- a/libavformat/flvenc.c > +++ b/libavformat/flvenc.c > @@ -235,13 +235,16 @@ static void put_timestamp(AVIOContext *pb, int64_t ts) { > avio_w8(pb, (ts >> 24) & 0x7F); > } > > -static void put_avc_eos_tag(AVIOContext *pb, unsigned ts) > +static void put_eos_tag(AVIOContext *pb, unsigned ts, enum AVCodecID codec_id) > { > + uint32_t tag = ff_codec_get_tag(flv_video_codec_ids, codec_id); > + /* ub[4] FrameType = 1, ub[4] CodecId */ > + tag |= 1 << 4; > avio_w8(pb, FLV_TAG_TYPE_VIDEO); > avio_wb24(pb, 5); /* Tag Data Size */ > put_timestamp(pb, ts); > avio_wb24(pb, 0); /* StreamId = 0 */ > - avio_w8(pb, 23); /* ub[4] FrameType = 1, ub[4] CodecId = 7 */ > + avio_w8(pb, tag); > avio_w8(pb, 2); /* AVC end of sequence */ > avio_wb24(pb, 0); /* Always 0 for AVC EOS. */ > avio_wb32(pb, 16); /* Size of FLV tag */ > @@ -783,7 +786,7 @@ end: > FLVStreamContext *sc = s->streams[i]->priv_data; > if (par->codec_type == AVMEDIA_TYPE_VIDEO && > (par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_MPEG4)) > - put_avc_eos_tag(pb, sc->last_ts); > + put_eos_tag(pb, sc->last_ts, par->codec_id); > } > } > > -- > 2.25.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > LGTM Thanks Steven Liu
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 128ae8ebc0..8830c03044 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -235,13 +235,16 @@ static void put_timestamp(AVIOContext *pb, int64_t ts) { avio_w8(pb, (ts >> 24) & 0x7F); } -static void put_avc_eos_tag(AVIOContext *pb, unsigned ts) +static void put_eos_tag(AVIOContext *pb, unsigned ts, enum AVCodecID codec_id) { + uint32_t tag = ff_codec_get_tag(flv_video_codec_ids, codec_id); + /* ub[4] FrameType = 1, ub[4] CodecId */ + tag |= 1 << 4; avio_w8(pb, FLV_TAG_TYPE_VIDEO); avio_wb24(pb, 5); /* Tag Data Size */ put_timestamp(pb, ts); avio_wb24(pb, 0); /* StreamId = 0 */ - avio_w8(pb, 23); /* ub[4] FrameType = 1, ub[4] CodecId = 7 */ + avio_w8(pb, tag); avio_w8(pb, 2); /* AVC end of sequence */ avio_wb24(pb, 0); /* Always 0 for AVC EOS. */ avio_wb32(pb, 16); /* Size of FLV tag */ @@ -783,7 +786,7 @@ end: FLVStreamContext *sc = s->streams[i]->priv_data; if (par->codec_type == AVMEDIA_TYPE_VIDEO && (par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_MPEG4)) - put_avc_eos_tag(pb, sc->last_ts); + put_eos_tag(pb, sc->last_ts, par->codec_id); } }