From 308b989e0cf14d5b33b7d4cd546a94230a1423c2 Mon Sep 17 00:00:00 2001 From: Mark Thompson Date: Mon, 2 Apr 2018 02:38:03 +0100 Subject: lavc: Add VP9 metadata bitstream filter Can adjust the colour information. --- libavcodec/Makefile | 1 + libavcodec/bitstream_filters.c | 1 + libavcodec/vp9_metadata_bsf.c | 162 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 164 insertions(+) create mode 100644 libavcodec/vp9_metadata_bsf.c (limited to 'libavcodec') diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 15e8c87385..663bdce4e4 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1066,6 +1066,7 @@ OBJS-$(CONFIG_NULL_BSF) += null_bsf.o OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o OBJS-$(CONFIG_TEXT2MOVSUB_BSF) += movsub_bsf.o OBJS-$(CONFIG_TRACE_HEADERS_BSF) += trace_headers_bsf.o +OBJS-$(CONFIG_VP9_METADATA_BSF) += vp9_metadata_bsf.o OBJS-$(CONFIG_VP9_RAW_REORDER_BSF) += vp9_raw_reorder_bsf.o OBJS-$(CONFIG_VP9_SUPERFRAME_BSF) += vp9_superframe_bsf.o OBJS-$(CONFIG_VP9_SUPERFRAME_SPLIT_BSF) += vp9_superframe_split_bsf.o diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c index 18b698a85f..c21373621c 100644 --- a/libavcodec/bitstream_filters.c +++ b/libavcodec/bitstream_filters.c @@ -49,6 +49,7 @@ extern const AVBitStreamFilter ff_null_bsf; extern const AVBitStreamFilter ff_remove_extradata_bsf; extern const AVBitStreamFilter ff_text2movsub_bsf; extern const AVBitStreamFilter ff_trace_headers_bsf; +extern const AVBitStreamFilter ff_vp9_metadata_bsf; extern const AVBitStreamFilter ff_vp9_raw_reorder_bsf; extern const AVBitStreamFilter ff_vp9_superframe_bsf; extern const AVBitStreamFilter ff_vp9_superframe_split_bsf; diff --git a/libavcodec/vp9_metadata_bsf.c b/libavcodec/vp9_metadata_bsf.c new file mode 100644 index 0000000000..be010edc3f --- /dev/null +++ b/libavcodec/vp9_metadata_bsf.c @@ -0,0 +1,162 @@ +/* + * 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/avstring.h" +#include "libavutil/common.h" +#include "libavutil/opt.h" + +#include "bsf.h" +#include "cbs.h" +#include "cbs_vp9.h" + +typedef struct VP9MetadataContext { + const AVClass *class; + + CodedBitstreamContext *cbc; + CodedBitstreamFragment fragment; + + int color_space; + int color_range; + + int color_range_rgb_warned; +} VP9MetadataContext; + + +static int vp9_metadata_filter(AVBSFContext *bsf, AVPacket *out) +{ + VP9MetadataContext *ctx = bsf->priv_data; + AVPacket *in = NULL; + CodedBitstreamFragment *frag = &ctx->fragment; + int err, i; + + err = ff_bsf_get_packet(bsf, &in); + if (err < 0) + return err; + + err = ff_cbs_read_packet(ctx->cbc, frag, in); + if (err < 0) { + av_log(bsf, AV_LOG_ERROR, "Failed to read packet.\n"); + goto fail; + } + + for (i = 0; i < frag->nb_units; i++) { + VP9RawFrame *frame = frag->units[i].content; + VP9RawFrameHeader *header = &frame->header; + + if (ctx->color_space >= 0) { + header->color_space = ctx->color_space; + } + if (ctx->color_range >= 0) { + if (ctx->color_range == 0 && + header->color_space == VP9_CS_RGB && + !ctx->color_range_rgb_warned) { + av_log(bsf, AV_LOG_WARNING, "Warning: color_range cannot " + "be set to limited in RGB streams.\n"); + ctx->color_range_rgb_warned = 1; + } else { + header->color_range = ctx->color_range; + } + } + } + + err = ff_cbs_write_packet(ctx->cbc, out, frag); + if (err < 0) { + av_log(bsf, AV_LOG_ERROR, "Failed to write packet.\n"); + goto fail; + } + + err = av_packet_copy_props(out, in); + if (err < 0) + goto fail; + + err = 0; +fail: + ff_cbs_fragment_uninit(ctx->cbc, frag); + + if (err < 0) + av_packet_unref(out); + av_packet_free(&in); + + return err; +} + +static int vp9_metadata_init(AVBSFContext *bsf) +{ + VP9MetadataContext *ctx = bsf->priv_data; + + return ff_cbs_init(&ctx->cbc, AV_CODEC_ID_VP9, bsf); +} + +static void vp9_metadata_close(AVBSFContext *bsf) +{ + VP9MetadataContext *ctx = bsf->priv_data; + ff_cbs_close(&ctx->cbc); +} + +#define OFFSET(x) offsetof(VP9MetadataContext, x) +#define FLAGS (AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_BSF_PARAM) +static const AVOption vp9_metadata_options[] = { + { "color_space", "Set colour space (section 7.2.2)", + OFFSET(color_space), AV_OPT_TYPE_INT, + { .i64 = -1 }, -1, VP9_CS_RGB, FLAGS, "cs" }, + { "unknown", "Unknown/unspecified", 0, AV_OPT_TYPE_CONST, + { .i64 = VP9_CS_UNKNOWN }, .flags = FLAGS, .unit = "cs" }, + { "bt601", "ITU-R BT.601-7", 0, AV_OPT_TYPE_CONST, + { .i64 = VP9_CS_BT_601 }, .flags = FLAGS, .unit = "cs" }, + { "bt709", "ITU-R BT.709-6", 0, AV_OPT_TYPE_CONST, + { .i64 = VP9_CS_BT_709 }, .flags = FLAGS, .unit = "cs" }, + { "smpte170", "SMPTE-170", 0, AV_OPT_TYPE_CONST, + { .i64 = VP9_CS_SMPTE_170 }, .flags = FLAGS, .unit = "cs" }, + { "smpte240", "SMPTE-240", 0, AV_OPT_TYPE_CONST, + { .i64 = VP9_CS_SMPTE_240 }, .flags = FLAGS, .unit = "cs" }, + { "bt2020", "ITU-R BT.2020-2", 0, AV_OPT_TYPE_CONST, + { .i64 = VP9_CS_BT_2020 }, .flags = FLAGS, .unit = "cs" }, + { "rgb", "sRGB / IEC 61966-2-1", 0, AV_OPT_TYPE_CONST, + { .i64 = VP9_CS_RGB }, .flags = FLAGS, .unit = "cs" }, + + { "color_range", "Set colour range (section 7.2.2)", + OFFSET(color_range), AV_OPT_TYPE_INT, + { .i64 = -1 }, -1, 1, FLAGS, "cr" }, + { "tv", "TV (limited) range", 0, AV_OPT_TYPE_CONST, + { .i64 = 0 }, .flags = FLAGS, .unit = "cr" }, + { "pc", "PC (full) range", 0, AV_OPT_TYPE_CONST, + { .i64 = 1 }, .flags = FLAGS, .unit = "cr" }, + + { NULL } +}; + +static const AVClass vp9_metadata_class = { + .class_name = "vp9_metadata_bsf", + .item_name = av_default_item_name, + .option = vp9_metadata_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +static const enum AVCodecID vp9_metadata_codec_ids[] = { + AV_CODEC_ID_VP9, AV_CODEC_ID_NONE, +}; + +const AVBitStreamFilter ff_vp9_metadata_bsf = { + .name = "vp9_metadata", + .priv_data_size = sizeof(VP9MetadataContext), + .priv_class = &vp9_metadata_class, + .init = &vp9_metadata_init, + .close = &vp9_metadata_close, + .filter = &vp9_metadata_filter, + .codec_ids = vp9_metadata_codec_ids, +}; -- cgit v1.2.3