From patchwork Sun Apr 8 17:48:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 8358 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1671305jad; Sun, 8 Apr 2018 10:55:09 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+gKwCkAYq0A9S5QQn+1sn6mrrtTUO8FC7nDCMJ/TK72bDz//QfvWIGk1yfFX4UVqKIWMbP X-Received: by 10.223.201.3 with SMTP id m3mr25704748wrh.137.1523210109095; Sun, 08 Apr 2018 10:55:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523210109; cv=none; d=google.com; s=arc-20160816; b=dybEMP/cWH7B6mgy88PSVtoBp+tYZRUkDToaGkQ3pE/dm4/UGmlH1vZT9jLjXbOHaR /st7g0bhCWI8C1EDhfsRFhszUxMAp8Dm99vtBqK6zVpT9LxBhRsf2yex7vsHTruZ3yKJ AU2xf7IgzbfxcYZOF4PI/6i/sjMgTsVEr2pwyYKA2RzHU+8/ybBvA6LR3Jr7Z2x/Ed2c OFzZHNnHESkH7Dl5OA1ywir0UI8qEFSbxviwyuKdPhxvPXxRN8VQItVyDfl+pBLP1rG7 ZJ/K14h7MMbGZ2m5tOMbCK1wqNHYo8UBUhi7YdJK21Zn+eo8diL2w71dRxSZ2LluX6ln EBwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=ISWTjIOjl+77/wcdyfyiGU4QBGziVxgrrpyqhgwfA9M=; b=KbjW/xYCYPBxpnZjWpWfZN0wcTjJUpzgqU/FVy8is4nev9/lFmUTtjwOWvoYr6Wsw0 9E6oeX+slMz19/GC2Aj/7WYl6cKGizMDqAUxrvtexgYhKeJirGTiprRmmVbRnoBVRC64 r1XZWnd2Xj1UAQ559luXqgg63+JdN+4NfD70q6t/t8yCmnKqRmZNoTqKvtKkVj7pRolX VhqEw4EUv04UmcW8xFJldDI9oiiVqvdiGHTNaNktDTJCx3UM8r/ICEwT4Lwv41PEZyZz goFITs3EABTeDTtPTqG9PqpUHbpz7bRPCMhAB/2I4KOh97z3RiknsZd9sm2dSwVjE1X9 5Lng== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=T+o0e94r; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o24si8206444wmf.54.2018.04.08.10.55.08; Sun, 08 Apr 2018 10:55:09 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=T+o0e94r; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A5C2C689DB4; Sun, 8 Apr 2018 20:54:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6861B689CDA for ; Sun, 8 Apr 2018 20:54:37 +0300 (EEST) Received: by mail-wm0-f44.google.com with SMTP id r191so13314904wmg.4 for ; Sun, 08 Apr 2018 10:55:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=lROBXovd/L1NfnkDQoQcu2P2G1YilBXc3TZ8e2/CgLM=; b=T+o0e94r0MOpmr8ZZ2KEnY+uJsoMAVDvq4DDTI/m3brEf6WQGUPyuNUaDgs9L7qrYM Bs0tDfIcsh/GEGaKhNzzuFoYeumMUZMQbxnPJ3OxUi2TM2/LZwUDQyp+o6gilFdA6OB+ upwvz0bIPjQZhy7mtNQjnzsa/O2gG4JXE+R5vWfV+0QqbVc41h3wrDvM+fW3DUEQSAUZ ZIj0xyxwyifLYMEdeij6b8WVeVUR9XaxHBMEHeG52LVKsI1cTAH6jUPEnBqOtJWHwxQ1 voPfhlL6vJ3kUB2j919mf9sIYyJkqLAKwbBfVgfN4sK4aW7e+Gird8MIkFT6i7LSmw5c BPhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=lROBXovd/L1NfnkDQoQcu2P2G1YilBXc3TZ8e2/CgLM=; b=a6j845ICYFDgcM9STmmet55CU5Tyq+Tey1RVOAcQJOZF+6PRtDOvaS8VellT+d2UOM VxWtbmcYWjsPfF6uxG7kgo5jbgAaB1jtrrNphkB7b2ec76KBA8Il0SUDbtPiCRimu34R 3PtdimivKfbNWy2zIO7i1JYIFVLp9DA0ZEq2FAzTJ2OsEGTRHPI4K2XJpKNqtJ2LJjef DVVyw88s2APqir0kHt/oJMOuirxfjU0H7vwiJ5MQgF0CuL7rHXTC51154afQg/ZdNRQC a9smyykibN88ZdmqXlj8gPSh0+O9Wy/YMZZXx0NJdmo0tzBRK4YMWv6fh546GFWxT98C e+EA== X-Gm-Message-State: ALQs6tC4IQ2p+quNe65f0QWXzc44qCmxoUkf6qAgAAKORwGJ5meRGAR/ UV8jKi5TSNiR/ciRi8o0rQkm1P30 X-Received: by 10.28.230.91 with SMTP id d88mr17430687wmh.67.1523209712380; Sun, 08 Apr 2018 10:48:32 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id p25sm8463845wmi.14.2018.04.08.10.48.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Apr 2018 10:48:31 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 8 Apr 2018 18:48:23 +0100 Message-Id: <20180408174824.3737-2-sw@jkqxz.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180408174824.3737-1-sw@jkqxz.net> References: <20180408174824.3737-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 2/3] lavc: Add VP9 metadata bitstream filter X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Can adjust the colour information. --- configure | 1 + libavcodec/Makefile | 1 + libavcodec/bitstream_filters.c | 1 + libavcodec/vp9_metadata_bsf.c | 162 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 165 insertions(+) create mode 100644 libavcodec/vp9_metadata_bsf.c diff --git a/configure b/configure index 890de64ab4..28970cbdf8 100755 --- a/configure +++ b/configure @@ -2986,6 +2986,7 @@ hevc_metadata_bsf_select="cbs_h265" mjpeg2jpeg_bsf_select="jpegtables" mpeg2_metadata_bsf_select="cbs_mpeg2" trace_headers_bsf_select="cbs" +vp9_metadata_bsf_select="cbs_vp9" # external libraries aac_at_decoder_deps="audiotoolbox" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 6ee16d855b..1a172f5597 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1067,6 +1067,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, +};