To move away from naming it by only one of the supported algorithms.
Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
---
libavformat/Makefile | 4 +-
libavformat/hashenc.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++
libavformat/md5enc.c | 171 --------------------------------------------------
3 files changed, 173 insertions(+), 173 deletions(-)
create mode 100644 libavformat/hashenc.c
delete mode 100644 libavformat/md5enc.c
diff --git a/libavformat/Makefile b/libavformat/Makefile
index dc931d9..05c0fe8 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -173,7 +173,7 @@ OBJS-$(CONFIG_LIVE_FLV_DEMUXER) += flvdec.o
OBJS-$(CONFIG_FLV_MUXER) += flvenc.o avc.o
OBJS-$(CONFIG_FOURXM_DEMUXER) += 4xm.o
OBJS-$(CONFIG_FRAMECRC_MUXER) += framecrcenc.o framehash.o
-OBJS-$(CONFIG_FRAMEMD5_MUXER) += md5enc.o framehash.o
+OBJS-$(CONFIG_FRAMEMD5_MUXER) += hashenc.o framehash.o
OBJS-$(CONFIG_FRM_DEMUXER) += frmdec.o
OBJS-$(CONFIG_FSB_DEMUXER) += fsb.o
OBJS-$(CONFIG_GIF_MUXER) += gif.o
@@ -256,7 +256,7 @@ OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o
matroska.o \
avc.o hevc.o \
flacenc_header.o avlanguage.o
vorbiscomment.o wv.o \
webmdashenc.o webm_chunk.o
-OBJS-$(CONFIG_MD5_MUXER) += md5enc.o
+OBJS-$(CONFIG_MD5_MUXER) += hashenc.o
OBJS-$(CONFIG_MGSTS_DEMUXER) += mgsts.o
OBJS-$(CONFIG_MICRODVD_DEMUXER) += microdvddec.o subtitles.o
OBJS-$(CONFIG_MICRODVD_MUXER) += microdvdenc.o
diff --git a/libavformat/hashenc.c b/libavformat/hashenc.c
new file mode 100644
index 0000000..8433be4
--- /dev/null
+++ b/libavformat/hashenc.c
@@ -0,0 +1,171 @@
+/*
+ * MD5 encoder (for codec/format testing)
+ * Copyright (c) 2009 Reimar Döffinger, based on crcenc (c) 2002 Fabrice
Bellard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/avassert.h"
+#include "libavutil/avstring.h"
+#include "libavutil/hash.h"
+#include "libavutil/opt.h"
+#include "avformat.h"
+#include "internal.h"
+
+struct MD5Context {
+ const AVClass *avclass;
+ struct AVHashContext *hash;
+ char *hash_name;
+ int format_version;
+};
+
+static void md5_finish(struct AVFormatContext *s, char *buf)
+{
+ struct MD5Context *c = s->priv_data;
+ uint8_t md5[AV_HASH_MAX_SIZE];
+ int i, offset = strlen(buf);
+ int len = av_hash_get_size(c->hash);
+ av_assert0(len > 0 && len <= sizeof(md5));
+ av_hash_final(c->hash, md5);
+ for (i = 0; i < len; 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);
+}
+
+#define OFFSET(x) offsetof(struct MD5Context, x)
+#define ENC AV_OPT_FLAG_ENCODING_PARAM
+static const AVOption hash_options[] = {
+ { "hash", "set hash to use", OFFSET(hash_name), AV_OPT_TYPE_STRING, {.str
= "md5"}, 0, 0, ENC },
+ { "format_version", "file format version", OFFSET(format_version),
AV_OPT_TYPE_INT, {.i64 = 1}, 1, 1, ENC },
+ { NULL },
+};
+
+static const AVClass md5enc_class = {
+ .class_name = "hash encoder class",
+ .item_name = av_default_item_name,
+ .option = hash_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+#if CONFIG_MD5_MUXER
+static int write_header(struct AVFormatContext *s)
+{
+ struct MD5Context *c = s->priv_data;
+ int res = av_hash_alloc(&c->hash, c->hash_name);
+ if (res < 0)
+ return res;
+ av_hash_init(c->hash);
+ return 0;
+}
+
+static int write_packet(struct AVFormatContext *s, AVPacket *pkt)
+{
+ struct MD5Context *c = s->priv_data;
+ av_hash_update(c->hash, pkt->data, pkt->size);
+ return 0;
+}
+
+static int write_trailer(struct AVFormatContext *s)
+{
+ struct MD5Context *c = s->priv_data;
+ char buf[256];
+ av_strlcpy(buf, av_hash_get_name(c->hash), sizeof(buf) - 200);
+ av_strlcat(buf, "=", sizeof(buf) - 200);
+
+ md5_finish(s, buf);
+
+ av_hash_freep(&c->hash);
+ return 0;
+}
+
+AVOutputFormat ff_md5_muxer = {
+ .name = "md5",
+ .long_name = NULL_IF_CONFIG_SMALL("MD5 testing"),
+ .priv_data_size = sizeof(struct MD5Context),
+ .audio_codec = AV_CODEC_ID_PCM_S16LE,
+ .video_codec = AV_CODEC_ID_RAWVIDEO,
+ .write_header = write_header,
+ .write_packet = write_packet,
+ .write_trailer = write_trailer,
+ .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT |
+ AVFMT_TS_NEGATIVE,
+ .priv_class = &md5enc_class,
+};
+#endif
+
+#if CONFIG_FRAMEMD5_MUXER
+static int framemd5_write_header(struct AVFormatContext *s)
+{
+ struct MD5Context *c = s->priv_data;
+ int res = av_hash_alloc(&c->hash, c->hash_name);
+ if (res < 0)
+ return res;
+ avio_printf(s->pb, "#format: frame checksums\n");
+ avio_printf(s->pb, "#version: %d\n", c->format_version);
+ avio_printf(s->pb, "#hash: %s\n", av_hash_get_name(c->hash));
+ ff_framehash_write_header(s);
+ avio_printf(s->pb, "#stream#, dts, pts, duration, size,
hash\n");
+ return 0;
+}
+
+static int framemd5_write_packet(struct AVFormatContext *s, AVPacket *pkt)
+{
+ struct MD5Context *c = s->priv_data;
+ char buf[256];
+ av_hash_init(c->hash);
+ av_hash_update(c->hash, pkt->data, pkt->size);
+
+ snprintf(buf, sizeof(buf) - 64, "%d, %10"PRId64", %10"PRId64", %8"PRId64",
%8d, ",
+ pkt->stream_index, pkt->dts, pkt->pts, pkt->duration, pkt->size);
+ md5_finish(s, buf);
+ return 0;
+}
+
+static int framemd5_write_trailer(struct AVFormatContext *s)
+{
+ struct MD5Context *c = s->priv_data;
+ av_hash_freep(&c->hash);
+ return 0;
+}
+
+static const AVClass framemd5_class = {
+ .class_name = "frame hash encoder class",
+ .item_name = av_default_item_name,
+ .option = hash_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+AVOutputFormat ff_framemd5_muxer = {
+ .name = "framemd5",
+ .long_name = NULL_IF_CONFIG_SMALL("Per-frame MD5 testing"),
+ .priv_data_size = sizeof(struct MD5Context),
+ .audio_codec = AV_CODEC_ID_PCM_S16LE,
+ .video_codec = AV_CODEC_ID_RAWVIDEO,
+ .write_header = framemd5_write_header,
+ .write_packet = framemd5_write_packet,
+ .write_trailer = framemd5_write_trailer,
+ .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT |
+ AVFMT_TS_NEGATIVE,
+ .priv_class = &framemd5_class,
+};
+#endif
diff --git a/libavformat/md5enc.c b/libavformat/md5enc.c
deleted file mode 100644
index 8433be4..0000000
--- a/libavformat/md5enc.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * MD5 encoder (for codec/format testing)
- * Copyright (c) 2009 Reimar Döffinger, based on crcenc (c) 2002 Fabrice
Bellard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "libavutil/avassert.h"
-#include "libavutil/avstring.h"
-#include "libavutil/hash.h"
-#include "libavutil/opt.h"
-#include "avformat.h"
-#include "internal.h"
-
-struct MD5Context {
- const AVClass *avclass;
- struct AVHashContext *hash;
- char *hash_name;
- int format_version;
-};
-
-static void md5_finish(struct AVFormatContext *s, char *buf)
-{
- struct MD5Context *c = s->priv_data;
- uint8_t md5[AV_HASH_MAX_SIZE];
- int i, offset = strlen(buf);
- int len = av_hash_get_size(c->hash);
- av_assert0(len > 0 && len <= sizeof(md5));
- av_hash_final(c->hash, md5);
- for (i = 0; i < len; 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);
-}
-
-#define OFFSET(x) offsetof(struct MD5Context, x)
-#define ENC AV_OPT_FLAG_ENCODING_PARAM
-static const AVOption hash_options[] = {
- { "hash", "set hash to use", OFFSET(hash_name), AV_OPT_TYPE_STRING, {.str
= "md5"}, 0, 0, ENC },
- { "format_version", "file format version", OFFSET(format_version),
AV_OPT_TYPE_INT, {.i64 = 1}, 1, 1, ENC },
- { NULL },
-};
-
-static const AVClass md5enc_class = {
- .class_name = "hash encoder class",
- .item_name = av_default_item_name,
- .option = hash_options,
- .version = LIBAVUTIL_VERSION_INT,
-};
-
-#if CONFIG_MD5_MUXER
-static int write_header(struct AVFormatContext *s)
-{
- struct MD5Context *c = s->priv_data;
- int res = av_hash_alloc(&c->hash, c->hash_name);
- if (res < 0)
- return res;
- av_hash_init(c->hash);
- return 0;
-}
-
-static int write_packet(struct AVFormatContext *s, AVPacket *pkt)
-{
- struct MD5Context *c = s->priv_data;
- av_hash_update(c->hash, pkt->data, pkt->size);
- return 0;
-}
-
-static int write_trailer(struct AVFormatContext *s)
-{
- struct MD5Context *c = s->priv_data;
- char buf[256];
- av_strlcpy(buf, av_hash_get_name(c->hash), sizeof(buf) - 200);
- av_strlcat(buf, "=", sizeof(buf) - 200);
-
- md5_finish(s, buf);
-
- av_hash_freep(&c->hash);
- return 0;
-}
-
-AVOutputFormat ff_md5_muxer = {
- .name = "md5",
- .long_name = NULL_IF_CONFIG_SMALL("MD5 testing"),
- .priv_data_size = sizeof(struct MD5Context),
- .audio_codec = AV_CODEC_ID_PCM_S16LE,
- .video_codec = AV_CODEC_ID_RAWVIDEO,
- .write_header = write_header,
- .write_packet = write_packet,
- .write_trailer = write_trailer,
- .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT |
- AVFMT_TS_NEGATIVE,
- .priv_class = &md5enc_class,
-};
-#endif
-
-#if CONFIG_FRAMEMD5_MUXER
-static int framemd5_write_header(struct AVFormatContext *s)
-{
- struct MD5Context *c = s->priv_data;
- int res = av_hash_alloc(&c->hash, c->hash_name);
- if (res < 0)
- return res;
- avio_printf(s->pb, "#format: frame checksums\n");
- avio_printf(s->pb, "#version: %d\n", c->format_version);
- avio_printf(s->pb, "#hash: %s\n", av_hash_get_name(c->hash));
- ff_framehash_write_header(s);
- avio_printf(s->pb, "#stream#, dts, pts, duration, size,
hash\n");
- return 0;
-}
-
-static int framemd5_write_packet(struct AVFormatContext *s, AVPacket *pkt)
-{
- struct MD5Context *c = s->priv_data;
- char buf[256];
- av_hash_init(c->hash);
- av_hash_update(c->hash, pkt->data, pkt->size);
-
- snprintf(buf, sizeof(buf) - 64, "%d, %10"PRId64", %10"PRId64", %8"PRId64",
%8d, ",
- pkt->stream_index, pkt->dts, pkt->pts, pkt->duration, pkt->size);
- md5_finish(s, buf);
- return 0;
-}
-
-static int framemd5_write_trailer(struct AVFormatContext *s)
-{
- struct MD5Context *c = s->priv_data;
- av_hash_freep(&c->hash);
- return 0;
-}
-
-static const AVClass framemd5_class = {
- .class_name = "frame hash encoder class",
- .item_name = av_default_item_name,
- .option = hash_options,
- .version = LIBAVUTIL_VERSION_INT,
-};
-
-AVOutputFormat ff_framemd5_muxer = {
- .name = "framemd5",
- .long_name = NULL_IF_CONFIG_SMALL("Per-frame MD5 testing"),
- .priv_data_size = sizeof(struct MD5Context),
- .audio_codec = AV_CODEC_ID_PCM_S16LE,
- .video_codec = AV_CODEC_ID_RAWVIDEO,
- .write_header = framemd5_write_header,
- .write_packet = framemd5_write_packet,
- .write_trailer = framemd5_write_trailer,
- .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT |
- AVFMT_TS_NEGATIVE,
- .priv_class = &framemd5_class,
-};
-#endif
--
2.5.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
