struct HashContext {
const AVClass *avclass;
- struct AVHashContext *hash;
+ struct AVHashContext **hashes;
char *hash_name;
+ int per_stream;
int format_version;
};
#define OFFSET(x) offsetof(struct HashContext, x)
#define ENC AV_OPT_FLAG_ENCODING_PARAM
-#if CONFIG_HASH_MUXER || CONFIG_FRAMEHASH_MUXER
-static const AVOption hash_options[] = {
- { "hash", "set hash to use", OFFSET(hash_name), AV_OPT_TYPE_STRING, {.str = "sha256"}, 0, 0, ENC },
- { "format_version", "file format version", OFFSET(format_version), AV_OPT_TYPE_INT, {.i64 = 2}, 1, 2, ENC },
+#define HASH_OPT(defaulttype) \
+ { "hash", "set hash to use", OFFSET(hash_name), AV_OPT_TYPE_STRING, {.str = defaulttype}, 0, 0, ENC }
+#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 || CONFIG_STREAMHASH_MUXER
+static const AVOption hash_streamhash_options[] = {
+ HASH_OPT("sha256"),
+ { NULL },
+};
+#endif
+
+#if CONFIG_FRAMEHASH_MUXER
+static const AVOption framehash_options[] = {
+ HASH_OPT("sha256"),
+ FORMAT_VERSION_OPT,
{ NULL },
};
#endif
-#if CONFIG_MD5_MUXER || CONFIG_FRAMEMD5_MUXER
+#if CONFIG_MD5_MUXER
static const AVOption md5_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 = 2}, 1, 2, ENC },
+ HASH_OPT("md5"),
+ { NULL },
+};
+#endif
+
+#if CONFIG_FRAMEMD5_MUXER
+static const AVOption framemd5_options[] = {
+ HASH_OPT("md5"),
+ FORMAT_VERSION_OPT,
{ NULL },
};
#endif
#if CONFIG_HASH_MUXER || CONFIG_MD5_MUXER
-static int hash_write_header(struct AVFormatContext *s)
+static int hash_init(struct AVFormatContext *s)
{
+ int res;
struct HashContext *c = s->priv_data;
- int res = av_hash_alloc(&c->hash, c->hash_name);
+ c->per_stream = 0;
+ c->hashes = av_mallocz_array(1, sizeof(*c->hashes));
+ if (!c->hashes)
+ return AVERROR(ENOMEM);
+ res = av_hash_alloc(&c->hashes[0], c->hash_name);
if (res < 0)
return res;
- av_hash_init(c->hash);
+ av_hash_init(c->hashes[0]);
+ return 0;
+}
+#endif
+
+#if CONFIG_STREAMHASH_MUXER
+static int streamhash_init(struct AVFormatContext *s)
+{
+ int res, i;
+ struct HashContext *c = s->priv_data;
+ c->per_stream = 1;
+ c->hashes = av_mallocz_array(s->nb_streams, sizeof(*c->hashes));
+ if (!c->hashes)
+ return AVERROR(ENOMEM);
+ for (i = 0; i < s->nb_streams; i++) {
+ res = av_hash_alloc(&c->hashes[i], c->hash_name);
+ if (res < 0) {
+ return res;
+ }
+ av_hash_init(c->hashes[i]);
+ }
return 0;
}
+#endif
+
+#if CONFIG_HASH_MUXER || CONFIG_MD5_MUXER || CONFIG_STREAMHASH_MUXER
+static char get_media_type_char(enum AVMediaType type)
+{
+ switch (type) {
+ case AVMEDIA_TYPE_VIDEO: return 'v';
+ case AVMEDIA_TYPE_AUDIO: return 'a';
+ case AVMEDIA_TYPE_DATA: return 'd';
+ case AVMEDIA_TYPE_SUBTITLE: return 's';
+ case AVMEDIA_TYPE_ATTACHMENT: return 't';
+ default: return '?';
+ }
+}
static int hash_write_packet(struct AVFormatContext *s, AVPacket *pkt)
{
struct HashContext *c = s->priv_data;
- av_hash_update(c->hash, pkt->data, pkt->size);
+ av_hash_update(c->hashes[c->per_stream ? pkt->stream_index : 0], pkt->data, pkt->size);
return 0;
}
static int hash_write_trailer(struct AVFormatContext *s)
{
struct HashContext *c = s->priv_data;
- char buf[AV_HASH_MAX_SIZE*2+128];
- snprintf(buf, sizeof(buf) - 200, "%s=", av_hash_get_name(c->hash));
-
- av_hash_final_hex(c->hash, buf + strlen(buf), sizeof(buf) - strlen(buf));
- av_strlcatf(buf, sizeof(buf), "\n");
- avio_write(s->pb, buf, strlen(buf));
- avio_flush(s->pb);
+ int num_hashes = c->per_stream ? s->nb_streams : 1;
+ for (int i = 0; i < num_hashes; i++) {
+ char buf[AV_HASH_MAX_SIZE*2+128];
+ if (c->per_stream) {
+ AVStream *st = s->streams[i];
+ snprintf(buf, sizeof(buf) - 200, "%d,%c,%s=", i, get_media_type_char(st->codecpar->codec_type),
+ av_hash_get_name(c->hashes[i]));
+ } else {
+ snprintf(buf, sizeof(buf) - 200, "%s=", av_hash_get_name(c->hashes[i]));
+ }
+ 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));
+ }
- av_hash_freep(&c->hash);
return 0;
}
#endif
+static void hash_free(struct AVFormatContext *s)
+{
+ struct HashContext *c = s->priv_data;
+ if (c->hashes) {
+ int num_hashes = c->per_stream ? s->nb_streams : 1;
+ for (int i = 0; i < num_hashes; i++) {
+ av_hash_freep(&c->hashes[i]);
+ }
+ }
+ av_freep(&c->hashes);
+}
+
#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),
.audio_codec = AV_CODEC_ID_PCM_S16LE,
.video_codec = AV_CODEC_ID_RAWVIDEO,
- .write_header = hash_write_header,
+ .init = hash_init,
.write_packet = hash_write_packet,
.write_trailer = hash_write_trailer,
+ .deinit = hash_free,
.flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT |
AVFMT_TS_NEGATIVE,
.priv_class = &hashenc_class,
.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),
.audio_codec = AV_CODEC_ID_PCM_S16LE,
.video_codec = AV_CODEC_ID_RAWVIDEO,
- .write_header = hash_write_header,
+ .init = hash_init,
.write_packet = hash_write_packet,
.write_trailer = hash_write_trailer,
+ .deinit = hash_free,
.flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT |
AVFMT_TS_NEGATIVE,
.priv_class = &md5enc_class,
};
#endif
+#if CONFIG_STREAMHASH_MUXER
+static const AVClass streamhashenc_class = {
+ .class_name = "stream hash muxer",
+ .item_name = av_default_item_name,
+ .option = hash_streamhash_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+const AVOutputFormat ff_streamhash_muxer = {
+ .name = "streamhash",
+ .long_name = NULL_IF_CONFIG_SMALL("Per-stream hash testing"),
+ .priv_data_size = sizeof(struct HashContext),
+ .audio_codec = AV_CODEC_ID_PCM_S16LE,
+ .video_codec = AV_CODEC_ID_RAWVIDEO,
+ .init = streamhash_init,
+ .write_packet = hash_write_packet,
+ .write_trailer = hash_write_trailer,
+ .deinit = hash_free,
+ .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT |
+ AVFMT_TS_NEGATIVE,
+ .priv_class = &streamhashenc_class,
+};
+#endif
+
#if CONFIG_FRAMEHASH_MUXER || CONFIG_FRAMEMD5_MUXER
static void framehash_print_extradata(struct AVFormatContext *s)
{
char buf[AV_HASH_MAX_SIZE*2+1];
avio_printf(s->pb, "#extradata %d, %31d, ", i, par->extradata_size);
- av_hash_init(c->hash);
- av_hash_update(c->hash, par->extradata, par->extradata_size);
- av_hash_final_hex(c->hash, buf, sizeof(buf));
+ av_hash_init(c->hashes[0]);
+ av_hash_update(c->hashes[0], par->extradata, par->extradata_size);
+ av_hash_final_hex(c->hashes[0], buf, sizeof(buf));
avio_write(s->pb, buf, strlen(buf));
avio_printf(s->pb, "\n");
}
}
}
-static int framehash_write_header(struct AVFormatContext *s)
+static int framehash_init(struct AVFormatContext *s)
{
+ int res;
struct HashContext *c = s->priv_data;
- int res = av_hash_alloc(&c->hash, c->hash_name);
+ c->per_stream = 0;
+ c->hashes = av_mallocz_array(1, sizeof(*c->hashes));
+ if (!c->hashes)
+ return AVERROR(ENOMEM);
+ res = av_hash_alloc(&c->hashes[0], c->hash_name);
if (res < 0)
return res;
+ return 0;
+}
+
+static int framehash_write_header(struct AVFormatContext *s)
+{
+ struct HashContext *c = s->priv_data;
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));
+ avio_printf(s->pb, "#hash: %s\n", av_hash_get_name(c->hashes[0]));
framehash_print_extradata(s);
ff_framehash_write_header(s);
avio_printf(s->pb, "#stream#, dts, pts, duration, size, hash\n");
struct HashContext *c = s->priv_data;
char buf[AV_HASH_MAX_SIZE*2+128];
int len;
- av_hash_init(c->hash);
- av_hash_update(c->hash, pkt->data, pkt->size);
+ av_hash_init(c->hashes[0]);
+ av_hash_update(c->hashes[0], pkt->data, pkt->size);
snprintf(buf, sizeof(buf) - (AV_HASH_MAX_SIZE * 2 + 1), "%d, %10"PRId64", %10"PRId64", %8"PRId64", %8d, ",
pkt->stream_index, pkt->dts, pkt->pts, pkt->duration, pkt->size);
len = strlen(buf);
- av_hash_final_hex(c->hash, buf + len, sizeof(buf) - len);
+ av_hash_final_hex(c->hashes[0], buf + len, sizeof(buf) - len);
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->hash);
+ 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->hash, (uint8_t *)&data, sizeof(uint32_t));
+ av_hash_update(c->hashes[0], (uint8_t *)&data, sizeof(uint32_t));
}
} else
- av_hash_update(c->hash, 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);
+ 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),
+ ", %8"SIZE_SPECIFIER", ", pkt->side_data[i].size);
len = strlen(buf);
- av_hash_final_hex(c->hash, buf + len, sizeof(buf) - len);
+ 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 int framehash_write_trailer(struct AVFormatContext *s)
-{
- struct HashContext *c = s->priv_data;
- av_hash_freep(&c->hash);
return 0;
}
#endif
static const AVClass framehash_class = {
.class_name = "frame hash muxer",
.item_name = av_default_item_name,
- .option = hash_options,
+ .option = framehash_options,
.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),
.audio_codec = AV_CODEC_ID_PCM_S16LE,
.video_codec = AV_CODEC_ID_RAWVIDEO,
+ .init = framehash_init,
.write_header = framehash_write_header,
.write_packet = framehash_write_packet,
- .write_trailer = framehash_write_trailer,
+ .deinit = hash_free,
.flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT |
AVFMT_TS_NEGATIVE,
.priv_class = &framehash_class,
static const AVClass framemd5_class = {
.class_name = "frame MD5 muxer",
.item_name = av_default_item_name,
- .option = md5_options,
+ .option = framemd5_options,
.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),
.audio_codec = AV_CODEC_ID_PCM_S16LE,
.video_codec = AV_CODEC_ID_RAWVIDEO,
+ .init = framehash_init,
.write_header = framehash_write_header,
.write_packet = framehash_write_packet,
- .write_trailer = framehash_write_trailer,
+ .deinit = hash_free,
.flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT |
AVFMT_TS_NEGATIVE,
.priv_class = &framemd5_class,
projects / ffmpeg / blobdiff