[FFmpeg-devel] [PATCH] Add AVC EOS tag to H264-encoded FLV files

[Thierry Foucu]

Hi,

The tag enables the Flash player to render all video frames to the end of
the file when the video codec is H264.

Index: libavformat/flvenc.c
===================================================================
--- libavformat/flvenc.c    (revision 24704)
+++ libavformat/flvenc.c    (working copy)
@@ -144,6 +144,18 @@
     put_buffer(pb, str, len);
 }

+static void put_avc_eos_tag(ByteIOContext *pb, unsigned ts) {
+    put_byte(pb, FLV_TAG_TYPE_VIDEO);
+    put_be24(pb, 5);  /* Tag Data Size */
+    put_be24(pb, ts);  /* lower 24 bits of timestamp in ms*/
+    put_byte(pb, (ts >> 24) & 0x7F);  /* MSB of ts in ms*/
+    put_be24(pb, 0);  /* StreamId = 0 */
+    put_byte(pb, 23);  /* ub[4] FrameType = 1, ub[4] CodecId = 7 */
+    put_byte(pb, 2);  /* AVC end of sequence */
+    put_be24(pb, 0);  /* Always 0 for AVC EOS. */
+    put_be32(pb, 16);  /* Size of FLV tag */
+}
+
 static void put_amf_double(ByteIOContext *pb, double d)
 {
     put_byte(pb, AMF_DATA_TYPE_NUMBER);
@@ -309,7 +321,16 @@

     ByteIOContext *pb = s->pb;
     FLVContext *flv = s->priv_data;
+    int i;

+    /* Add EOS tag */
+    for (i = 0; i < s->nb_streams; i++) {
+        AVCodecContext *enc = s->streams[i]->codec;
+        if (enc->codec_type == CODEC_TYPE_VIDEO && enc->codec_id ==
CODEC_ID_H264) {
+            put_avc_eos_tag(pb, flv->duration);
+        }
+    }
+
     file_size = url_ftell(pb);

     /* update informations */
-------------- next part --------------
Index: libavformat/flvenc.c
===================================================================
--- libavformat/flvenc.c	(revision 24704)
+++ libavformat/flvenc.c	(working copy)
@@ -144,6 +144,18 @@
     put_buffer(pb, str, len);
 }
 
+static void put_avc_eos_tag(ByteIOContext *pb, unsigned ts) {
+    put_byte(pb, FLV_TAG_TYPE_VIDEO);
+    put_be24(pb, 5);  /* Tag Data Size */
+    put_be24(pb, ts);  /* lower 24 bits of timestamp in ms*/
+    put_byte(pb, (ts >> 24) & 0x7F);  /* MSB of ts in ms*/
+    put_be24(pb, 0);  /* StreamId = 0 */
+    put_byte(pb, 23);  /* ub[4] FrameType = 1, ub[4] CodecId = 7 */
+    put_byte(pb, 2);  /* AVC end of sequence */
+    put_be24(pb, 0);  /* Always 0 for AVC EOS. */
+    put_be32(pb, 16);  /* Size of FLV tag */
+}
+
 static void put_amf_double(ByteIOContext *pb, double d)
 {
     put_byte(pb, AMF_DATA_TYPE_NUMBER);
@@ -309,7 +321,16 @@
 
     ByteIOContext *pb = s->pb;
     FLVContext *flv = s->priv_data;
+    int i;
 
+    /* Add EOS tag */
+    for (i = 0; i < s->nb_streams; i++) {
+        AVCodecContext *enc = s->streams[i]->codec;
+        if (enc->codec_type == CODEC_TYPE_VIDEO && enc->codec_id == CODEC_ID_H264) {
+            put_avc_eos_tag(pb, flv->duration);
+        }
+    }
+
     file_size = url_ftell(pb);
 
     /* update informations */