Add -f framemd5 muxer similar to framecrc.

Originally committed as revision 23289 to svn://svn.ffmpeg.org/ffmpeg/trunk

3 files changed, 51 insertions, 12 deletions

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 70acbe7c39..cffcd6ad5c 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -78,6 +78,7 @@ OBJS-$(CONFIG_FLV_DEMUXER)               += flvdec.o
 OBJS-$(CONFIG_FLV_MUXER)                 += flvenc.o avc.o
 OBJS-$(CONFIG_FOURXM_DEMUXER)            += 4xm.o
 OBJS-$(CONFIG_FRAMECRC_MUXER)            += framecrcenc.o
+OBJS-$(CONFIG_FRAMEMD5_MUXER)            += md5enc.o
 OBJS-$(CONFIG_GIF_MUXER)                 += gif.o
 OBJS-$(CONFIG_GSM_DEMUXER)               += raw.o id3v2.o
 OBJS-$(CONFIG_GXF_DEMUXER)               += gxf.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 852cb58313..c4db132cec 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -89,6 +89,7 @@ void av_register_all(void)
     REGISTER_MUXDEMUX (FLV, flv);
     REGISTER_DEMUXER  (FOURXM, fourxm);
     REGISTER_MUXER    (FRAMECRC, framecrc);
+    REGISTER_MUXER    (FRAMEMD5, framemd5);
     REGISTER_MUXER    (GIF, gif);
     REGISTER_DEMUXER  (GSM, gsm);
     REGISTER_MUXDEMUX (GXF, gxf);
diff --git a/libavformat/md5enc.c b/libavformat/md5enc.c
index 600b95d6dc..f9ab3d0933 100644
--- a/libavformat/md5enc.c
+++ b/libavformat/md5enc.c
@@ -24,6 +24,23 @@
 
 #define PRIVSIZE 512
 
+static void md5_finish(struct AVFormatContext *s, char *buf)
+{
+    uint8_t md5[16];
+    int i, offset = strlen(buf);
+    av_md5_final(s->priv_data, md5);
+    for (i = 0; i < sizeof(md5); i++) {
+        snprintf(buf + offset, 3, "%02"PRIx8, md5[i]);
+        offset += 2;
+    }
+    buf[offset] = '\n';
+    buf[offset+1] = 0;
+
+    put_buffer(s->pb, buf, strlen(buf));
+    put_flush_packet(s->pb);
+}
+
+#if CONFIG_MD5_MUXER
 static int write_header(struct AVFormatContext *s)
 {
     if (PRIVSIZE < av_md5_size) {
@@ -42,20 +59,9 @@ static int write_packet(struct AVFormatContext *s, AVPacket *pkt)
 
 static int write_trailer(struct AVFormatContext *s)
 {
-    uint8_t md5[16];
     char buf[64] = "MD5=";
-    int i, offset = strlen(buf);
 
-    av_md5_final(s->priv_data, md5);
-    for (i = 0; i < sizeof(md5); i++) {
-        snprintf(buf + offset, 3, "%02"PRIx8, md5[i]);
-        offset += 2;
-    }
-    buf[offset] = '\n';
-    buf[offset+1] = 0;
-
-    put_buffer(s->pb, buf, strlen(buf));
-    put_flush_packet(s->pb);
+    md5_finish(s, buf);
     return 0;
 }
 
@@ -71,3 +77,34 @@ AVOutputFormat md5_muxer = {
     write_packet,
     write_trailer,
 };
+#endif
+
+#if CONFIG_FRAMEMD5_MUXER
+static int framemd5_write_packet(struct AVFormatContext *s, AVPacket *pkt)
+{
+    char buf[256];
+    if (PRIVSIZE < av_md5_size) {
+        av_log(s, AV_LOG_ERROR, "Insuffient size for md5 context\n");
+        return -1;
+    }
+    av_md5_init(s->priv_data);
+    av_md5_update(s->priv_data, pkt->data, pkt->size);
+
+    snprintf(buf, sizeof(buf) - 64, "%d, %"PRId64", %d, ", pkt->stream_index, pkt->dts, pkt->size);
+    md5_finish(s, buf);
+    return 0;
+}
+
+AVOutputFormat framemd5_muxer = {
+    "framemd5",
+    NULL_IF_CONFIG_SMALL("Per-frame MD5 testing format"),
+    NULL,
+    "",
+    PRIVSIZE,
+    CODEC_ID_PCM_S16LE,
+    CODEC_ID_RAWVIDEO,
+    NULL,
+    framemd5_write_packet,
+    NULL,
+};
+#endif