From 8b7da7a8e50764e750a0507cc4b72687203bba89 Mon Sep 17 00:00:00 2001 From: TheAMM Date: Sat, 16 Dec 2017 14:21:18 +0200 Subject: encode: implement --oset-metadata, and --oremove-metadata This commit introduces a new --oset-metadata key-value-list option, allowing the user to specify output metadata when encoding (eg. --oset-metadata=title="Hello",comment="World"). A second option --oremove-metadata is added to exclude existing metadata from the output file (assuming --ocopy-metadata is enabled). Not all output formats support all tags, but luckily libavcodec simply discards unsupported keys. --- common/encode.h | 2 ++ common/encode_lavc.c | 26 +++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) (limited to 'common') diff --git a/common/encode.h b/common/encode.h index ce5d06873d..047207eea4 100644 --- a/common/encode.h +++ b/common/encode.h @@ -50,6 +50,8 @@ struct encode_opts { int video_first; int audio_first; int copy_metadata; + char **set_metadata; + char **remove_metadata; }; // interface for mplayer.c diff --git a/common/encode_lavc.c b/common/encode_lavc.c index 9c994bfdce..747323878f 100644 --- a/common/encode_lavc.c +++ b/common/encode_lavc.c @@ -56,6 +56,8 @@ const struct m_sub_options encode_config = { OPT_FLAG("ovfirst", video_first, M_OPT_FIXED), OPT_FLAG("oafirst", audio_first, M_OPT_FIXED), OPT_FLAG("ocopy-metadata", copy_metadata, M_OPT_FIXED), + OPT_KEYVALUELIST("oset-metadata", set_metadata, M_OPT_FIXED), + OPT_STRINGLIST("oremove-metadata", remove_metadata, M_OPT_FIXED), {0} }, .size = sizeof(struct encode_opts), @@ -278,8 +280,30 @@ struct encode_lavc_context *encode_lavc_init(struct encode_opts *options, void encode_lavc_set_metadata(struct encode_lavc_context *ctx, struct mp_tags *metadata) { - if (ctx->options->copy_metadata) + if (ctx->options->copy_metadata) { ctx->metadata = metadata; + } else { + ctx->metadata = talloc_zero(ctx, struct mp_tags); + } + + if (ctx->options->set_metadata) { + char **kv = ctx->options->set_metadata; + // Set all user-provided metadata tags + for (int n = 0; kv[n * 2]; n++) { + MP_VERBOSE(ctx, "setting metadata value '%s' for key '%s'\n", + kv[n*2 + 0], kv[n*2 +1]); + mp_tags_set_str(ctx->metadata, kv[n*2 + 0], kv[n*2 +1]); + } + } + + if (ctx->options->remove_metadata) { + char **k = ctx->options->remove_metadata; + // Remove all user-provided metadata tags + for (int n = 0; k[n]; n++) { + MP_VERBOSE(ctx, "removing metadata key '%s'\n", k[n]); + mp_tags_remove_str(ctx->metadata, k[n]); + } + } } int encode_lavc_start(struct encode_lavc_context *ctx) -- cgit v1.2.3