#define FORMAT_VERSION_OPT \
{ "format_version", "file format version", OFFSET(format_version), AV_OPT_TYPE_INT, {.i64 = 2}, 1, 2, ENC }
-#if CONFIG_HASH_MUXER
-static const AVOption hash_options[] = {
+#if CONFIG_HASH_MUXER || CONFIG_STREAMHASH_MUXER
+static const AVOption hash_streamhash_options[] = {
HASH_OPT("sha256"),
{ NULL },
};
};
#endif
-#if CONFIG_STREAMHASH_MUXER
-static const AVOption streamhash_options[] = {
- HASH_OPT("sha256"),
- { NULL },
-};
-#endif
-
#if CONFIG_MD5_MUXER
static const AVOption md5_options[] = {
HASH_OPT("md5"),
av_hash_final_hex(c->hashes[i], buf + strlen(buf), sizeof(buf) - strlen(buf));
av_strlcatf(buf, sizeof(buf), "\n");
avio_write(s->pb, buf, strlen(buf));
- avio_flush(s->pb);
}
return 0;
}
+#endif
static void hash_free(struct AVFormatContext *s)
{
}
av_freep(&c->hashes);
}
-#endif
#if CONFIG_HASH_MUXER
static const AVClass hashenc_class = {
.class_name = "hash muxer",
.item_name = av_default_item_name,
- .option = hash_options,
+ .option = hash_streamhash_options,
.version = LIBAVUTIL_VERSION_INT,
};
-AVOutputFormat ff_hash_muxer = {
+const AVOutputFormat ff_hash_muxer = {
.name = "hash",
.long_name = NULL_IF_CONFIG_SMALL("Hash testing"),
.priv_data_size = sizeof(struct HashContext),
.version = LIBAVUTIL_VERSION_INT,
};
-AVOutputFormat ff_md5_muxer = {
+const AVOutputFormat ff_md5_muxer = {
.name = "md5",
.long_name = NULL_IF_CONFIG_SMALL("MD5 testing"),
.priv_data_size = sizeof(struct HashContext),
static const AVClass streamhashenc_class = {
.class_name = "stream hash muxer",
.item_name = av_default_item_name,
- .option = streamhash_options,
+ .option = hash_streamhash_options,
.version = LIBAVUTIL_VERSION_INT,
};
-AVOutputFormat ff_streamhash_muxer = {
+const AVOutputFormat ff_streamhash_muxer = {
.name = "streamhash",
.long_name = NULL_IF_CONFIG_SMALL("Per-stream hash testing"),
.priv_data_size = sizeof(struct HashContext),
avio_write(s->pb, buf, strlen(buf));
if (c->format_version > 1 && pkt->side_data_elems) {
- int i, j;
+ int i;
avio_printf(s->pb, ", S=%d", pkt->side_data_elems);
for (i = 0; i < pkt->side_data_elems; i++) {
av_hash_init(c->hashes[0]);
if (HAVE_BIGENDIAN && pkt->side_data[i].type == AV_PKT_DATA_PALETTE) {
- for (j = 0; j < pkt->side_data[i].size; j += sizeof(uint32_t)) {
+ for (size_t j = 0; j < pkt->side_data[i].size; j += sizeof(uint32_t)) {
uint32_t data = AV_RL32(pkt->side_data[i].data + j);
av_hash_update(c->hashes[0], (uint8_t *)&data, sizeof(uint32_t));
}
} else
av_hash_update(c->hashes[0], pkt->side_data[i].data, pkt->side_data[i].size);
- snprintf(buf, sizeof(buf) - (AV_HASH_MAX_SIZE * 2 + 1), ", %8d, ", pkt->side_data[i].size);
+ snprintf(buf, sizeof(buf) - (AV_HASH_MAX_SIZE * 2 + 1),
+ ", %8"SIZE_SPECIFIER", ", pkt->side_data[i].size);
len = strlen(buf);
av_hash_final_hex(c->hashes[0], buf + len, sizeof(buf) - len);
avio_write(s->pb, buf, strlen(buf));
}
avio_printf(s->pb, "\n");
- avio_flush(s->pb);
return 0;
}
-
-static void framehash_free(struct AVFormatContext *s)
-{
- struct HashContext *c = s->priv_data;
- if (c->hashes)
- av_hash_freep(&c->hashes[0]);
- av_freep(&c->hashes);
-}
#endif
#if CONFIG_FRAMEHASH_MUXER
.version = LIBAVUTIL_VERSION_INT,
};
-AVOutputFormat ff_framehash_muxer = {
+const AVOutputFormat ff_framehash_muxer = {
.name = "framehash",
.long_name = NULL_IF_CONFIG_SMALL("Per-frame hash testing"),
.priv_data_size = sizeof(struct HashContext),
.init = framehash_init,
.write_header = framehash_write_header,
.write_packet = framehash_write_packet,
- .deinit = framehash_free,
+ .deinit = hash_free,
.flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT |
AVFMT_TS_NEGATIVE,
.priv_class = &framehash_class,
.version = LIBAVUTIL_VERSION_INT,
};
-AVOutputFormat ff_framemd5_muxer = {
+const AVOutputFormat ff_framemd5_muxer = {
.name = "framemd5",
.long_name = NULL_IF_CONFIG_SMALL("Per-frame MD5 testing"),
.priv_data_size = sizeof(struct HashContext),
.init = framehash_init,
.write_header = framehash_write_header,
.write_packet = framehash_write_packet,
- .deinit = framehash_free,
+ .deinit = hash_free,
.flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT |
AVFMT_TS_NEGATIVE,
.priv_class = &framemd5_class,