[FFmpeg-cvslog] avformat/flvenc: fix EOS tag
Zhao Zhili
git at videolan.org
Sat Feb 18 19:31:58 EET 2023
ffmpeg | branch: master | Zhao Zhili <zhilizhao at tencent.com> | Tue Feb 7 05:25:45 2023 +0800| [59a9727c241aa50f18e713dbabbdd5cf3d379411] | committer: Zhao Zhili
avformat/flvenc: fix EOS tag
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.
Reviewed-by: Steven Liu <lq at chinaffmpeg.org>
Signed-off-by: Zhao Zhili <zhilizhao at tencent.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=59a9727c241aa50f18e713dbabbdd5cf3d379411
---
libavformat/flvenc.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index 81d9b6100d..64ea554dad 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);
}
}
More information about the ffmpeg-cvslog
mailing list