Merge remote-tracking branch 'qatar/master'
[ffmpeg.git] / libavformat / md5enc.c
index 600b95d..4ea7924 100644 (file)
 
 #include "libavutil/md5.h"
 #include "avformat.h"
+#include "internal.h"
 
 #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;
+
+    avio_write(s->pb, buf, strlen(buf));
+    avio_flush(s->pb);
+}
+
+#if CONFIG_MD5_MUXER
 static int write_header(struct AVFormatContext *s)
 {
     if (PRIVSIZE < av_md5_size) {
@@ -42,32 +60,50 @@ 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;
+    md5_finish(s, buf);
+    return 0;
+}
+
+AVOutputFormat ff_md5_muxer = {
+    .name              = "md5",
+    .long_name         = NULL_IF_CONFIG_SMALL("MD5 testing format"),
+    .priv_data_size    = PRIVSIZE,
+    .audio_codec       = CODEC_ID_PCM_S16LE,
+    .video_codec       = CODEC_ID_RAWVIDEO,
+    .write_header      = write_header,
+    .write_packet      = write_packet,
+    .write_trailer     = write_trailer,
+    .flags             = AVFMT_NOTIMESTAMPS,
+};
+#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;
     }
-    buf[offset] = '\n';
-    buf[offset+1] = 0;
+    av_md5_init(s->priv_data);
+    av_md5_update(s->priv_data, pkt->data, pkt->size);
 
-    put_buffer(s->pb, buf, strlen(buf));
-    put_flush_packet(s->pb);
+    snprintf(buf, sizeof(buf) - 64, "%d, %10"PRId64", %10"PRId64", %8d, %8d, ",
+             pkt->stream_index, pkt->dts, pkt->pts, pkt->duration, pkt->size);
+    md5_finish(s, buf);
     return 0;
 }
 
-AVOutputFormat md5_muxer = {
-    "md5",
-    NULL_IF_CONFIG_SMALL("MD5 testing format"),
-    NULL,
-    "",
-    PRIVSIZE,
-    CODEC_ID_PCM_S16LE,
-    CODEC_ID_RAWVIDEO,
-    write_header,
-    write_packet,
-    write_trailer,
+AVOutputFormat ff_framemd5_muxer = {
+    .name              = "framemd5",
+    .long_name         = NULL_IF_CONFIG_SMALL("Per-frame MD5 testing format"),
+    .priv_data_size    = PRIVSIZE,
+    .audio_codec       = CODEC_ID_PCM_S16LE,
+    .video_codec       = CODEC_ID_RAWVIDEO,
+    .write_header      = ff_framehash_write_header,
+    .write_packet      = framemd5_write_packet,
+    .flags             = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT,
 };
+#endif