From patchwork Mon Sep 17 23:47:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10354 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp4069080jap; Mon, 17 Sep 2018 16:48:10 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYkeeIAn0KIvLrT9UdvhFG+Z74Y5r3DW7dH75DiZW077Lc1IemxDAoC5yTKUbejF2N0L996 X-Received: by 2002:a1c:f913:: with SMTP id x19-v6mr13828546wmh.63.1537228090690; Mon, 17 Sep 2018 16:48:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537228090; cv=none; d=google.com; s=arc-20160816; b=iSrz8p3kOYf+9ostCc2GzzGtvrdAxdeG08TvxejtbH2na4I6/nncb4i65RxNZY7Sd6 9AEO1sE7T8x1DAHUrMcPWtWwLQheAItYvr8ULCE3p28puTiGAqO440j7vuse06CEf9D4 P854PgzpJbUj3hFC/CUEGAEGerzlK56rk0nYQc4pafOcYUaIR0zaB6J2xq8HqKNXEyfV X4noD6VRuHHmz2K3d1LiJgK8gE4LhUOaAWoFa6d+FEz8KOxtAzz/pk0GbywrEvxqfPxg Ez44edG33uAfJrDoC3PgYdFsoWvOgt7KS+1YZZefuXsyu6nWNyptyBQ0nH9/dJNBHnwE 7BHQ== 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; bh=Z+w/S9imyA8IELFn+yg9U1uTfYEg3DY+H6tjjPJCV0w=; b=Hao5oPOTULgMaiMJSu7HaVr9YW5d2MXXOmUZPkxNURMfv2tVkmvnZsJtchfDhwMUN7 QTuhOH/CEdJd0dtKEqZUAI17CbZcp4xOHVdX21IIHLtsUYLv2Q5gUQ+ZzCbrIEwcaRCK b9Z1fliUCP39R/GbXFLly+YGoQZq7tg/raEB7WVs2ofZ8MUbGAmUX1KSs2OzoIV2IVDy 61ZfISV386w9UXZuWyid4mDQ/p3PvKDGXAW/RojhUQlw9hxTkbpADU2/mzwibK372ACW ibxfZWRqIfiWGWm4uwZ1gOyaEhuntOv6V4DfLohIDcYZ9QS61Jmb4s+jWfaoL/0st7ay nUqg== 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=CseapUpe; 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 t11-v6si15576306wrv.272.2018.09.17.16.48.10; Mon, 17 Sep 2018 16:48:10 -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=CseapUpe; 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 6D86D68A7F5; Tue, 18 Sep 2018 02:47:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5279E68A78C for ; Tue, 18 Sep 2018 02:47:43 +0300 (EEST) Received: by mail-wm1-f44.google.com with SMTP id 207-v6so485795wme.5 for ; Mon, 17 Sep 2018 16:47:56 -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=wJuo5pjiU3U5qO9Yl2HHruPDrqNZGosPL7NK4nUzsc8=; b=CseapUpe4JXdfA9SXt7bdY2cn99M0HTKp6AmRmc4dNzZRDC2ekE2qPNLPwtLiQkULn Togd1UUAI34c+H3MIgO93gUKK2doTJXJ/DDCiyMFVJD+bnD3fOORsJZKH+Obv8swFhO9 nkW6kJNlC/8pCZy53CpkeNsIDYIn0VYPgxW03c9mrfDYgMQ6qHmAWxICj9gFo7VBrDTe Ma3TtGDhsycmRhIb8C4rbVtu71P+gmjEH88l7jbTDeRGzgXAvO28dMuJgBvBpRcByEs4 YpJxszCnVK5cq6Vq7k8Eot8g0wjOGM0JnjUUU5WAbDYFIToF2giGAWeKA6OpEsKotB5e 5d/g== 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=wJuo5pjiU3U5qO9Yl2HHruPDrqNZGosPL7NK4nUzsc8=; b=aO+K8YYkmXX6yep1H/8l7S0ve93tk4Kkz52wJLh0BjfcWa49T92Q9P3BWEeiMCzW3G qBQ6fQmiy+y6090B47XWKqhaWwUj3xH0+64OqwvDC6nq/iU5wa5+C4TIAaGtKIdFcEhS 7usVunkhChSvwyMMZVch/CqhckXG8xMGXhJ5Q0/MO4Qh4ZRwKb87Veny0028A0ND2HMy bmhOtv7Bawq2aQF8i1lyDrVFAs9qggtDb2+b+/+VBRkKcRDP+QBCTlh0zyVwMr5d54VF 0w5DkV+B+0srOHXduTMivq1FQm1TF9SgXzMCMFMqsKRyNJk76fUIL6JUzgkEFtC9tG1q cZ2A== X-Gm-Message-State: APzg51AZjdBLFkdIJfySrWhyRWzYNbAAit8lERGPbJObjMbO+lz5l91J 7fc0NHRDnhdVVkYkcdtJOSrYoNhSq2U= X-Received: by 2002:a1c:b143:: with SMTP id a64-v6mr12559551wmf.114.1537228075101; Mon, 17 Sep 2018 16:47:55 -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 q5-v6sm926567wmd.29.2018.09.17.16.47.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Sep 2018 16:47:54 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Sep 2018 00:47:46 +0100 Message-Id: <20180917234746.27125-3-sw@jkqxz.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180917234746.27125-1-sw@jkqxz.net> References: <20180917234746.27125-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v2 3/3] lavc: Add AV1 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 colour and timing information. --- configure | 1 + libavcodec/Makefile | 1 + libavcodec/av1_metadata_bsf.c | 267 +++++++++++++++++++++++++++++++++ libavcodec/bitstream_filters.c | 1 + 4 files changed, 270 insertions(+) create mode 100644 libavcodec/av1_metadata_bsf.c diff --git a/configure b/configure index 4908831477..9ce6ddb825 100755 --- a/configure +++ b/configure @@ -3029,6 +3029,7 @@ vc1_parser_select="vc1dsp" # bitstream_filters aac_adtstoasc_bsf_select="adts_header" +av1_metadata_bsf_select="cbs_av1" eac3_core_bsf_select="ac3_parser" filter_units_bsf_select="cbs" h264_metadata_bsf_deps="const_nan" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index e8d5f74067..97b0bd6e17 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1051,6 +1051,7 @@ OBJS-$(CONFIG_XMA_PARSER) += xma_parser.o # bitstream filters OBJS-$(CONFIG_AAC_ADTSTOASC_BSF) += aac_adtstoasc_bsf.o mpeg4audio.o +OBJS-$(CONFIG_AV1_METADATA_BSF) += av1_metadata_bsf.o OBJS-$(CONFIG_CHOMP_BSF) += chomp_bsf.o OBJS-$(CONFIG_DUMP_EXTRADATA_BSF) += dump_extradata_bsf.o OBJS-$(CONFIG_DCA_CORE_BSF) += dca_core_bsf.o diff --git a/libavcodec/av1_metadata_bsf.c b/libavcodec/av1_metadata_bsf.c new file mode 100644 index 0000000000..ed2f018fb6 --- /dev/null +++ b/libavcodec/av1_metadata_bsf.c @@ -0,0 +1,267 @@ +/* + * 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/common.h" +#include "libavutil/opt.h" + +#include "bsf.h" +#include "cbs.h" +#include "cbs_av1.h" + +typedef struct AV1MetadataContext { + const AVClass *class; + + CodedBitstreamContext *cbc; + CodedBitstreamFragment access_unit; + + int color_primaries; + int transfer_characteristics; + int matrix_coefficients; + + int color_range; + int chroma_sample_position; + + AVRational tick_rate; + int num_ticks_per_picture; +} AV1MetadataContext; + + +static int av1_metadata_update_sequence_header(AVBSFContext *bsf, + AV1RawSequenceHeader *seq) +{ + AV1MetadataContext *ctx = bsf->priv_data; + AV1RawColorConfig *clc = &seq->color_config; + AV1RawTimingInfo *tim = &seq->timing_info; + + if (ctx->color_primaries >= 0 || + ctx->transfer_characteristics >= 0 || + ctx->matrix_coefficients >= 0) { + if (!clc->color_description_present_flag) { + clc->color_description_present_flag = 1; + clc->color_primaries = AVCOL_PRI_UNSPECIFIED; + clc->transfer_characteristics = AVCOL_TRC_UNSPECIFIED; + clc->matrix_coefficients = AVCOL_SPC_UNSPECIFIED; + } + + if (ctx->color_primaries >= 0) + clc->color_primaries = ctx->color_primaries; + if (ctx->transfer_characteristics >= 0) + clc->transfer_characteristics = ctx->transfer_characteristics; + if (ctx->matrix_coefficients >= 0) + clc->matrix_coefficients = ctx->matrix_coefficients; + } + + if (ctx->color_range >= 0) { + if (clc->color_primaries == AVCOL_PRI_BT709 && + clc->transfer_characteristics == AVCOL_TRC_IEC61966_2_1 && + clc->matrix_coefficients == AVCOL_SPC_RGB) { + av_log(bsf, AV_LOG_WARNING, "Warning: color_range cannot be set " + "on RGB streams encoded in BT.709 sRGB.\n"); + } else { + clc->color_range = ctx->color_range; + } + } + + if (ctx->chroma_sample_position >= 0) { + if (clc->mono_chrome) { + av_log(bsf, AV_LOG_WARNING, "Warning: chroma_sample_position " + "is not meaningful for monochrome streams.\n"); + } else if (clc->subsampling_x == 0 && + clc->subsampling_y == 0) { + av_log(bsf, AV_LOG_WARNING, "Warning: chroma_sample_position " + "is not meaningful for non-chroma-subsampled streams.\n"); + } else { + clc->chroma_sample_position = ctx->chroma_sample_position; + } + } + + if (ctx->tick_rate.num && ctx->tick_rate.den) { + int num, den; + + av_reduce(&num, &den, ctx->tick_rate.num, ctx->tick_rate.den, + UINT32_MAX > INT_MAX ? UINT32_MAX : INT_MAX); + + tim->time_scale = num; + tim->num_units_in_display_tick = den; + seq->timing_info_present_flag = 1; + + if (ctx->num_ticks_per_picture > 0) { + tim->equal_picture_interval = 1; + tim->num_ticks_per_picture_minus_1 = + ctx->num_ticks_per_picture - 1; + } + } + + return 0; +} + +static int av1_metadata_filter(AVBSFContext *bsf, AVPacket *out) +{ + AV1MetadataContext *ctx = bsf->priv_data; + AVPacket *in = NULL; + CodedBitstreamFragment *frag = &ctx->access_unit; + AV1RawOBU *obu; + 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++) { + if (frag->units[i].type == AV1_OBU_SEQUENCE_HEADER) { + obu = frag->units[i].content; + err = av1_metadata_update_sequence_header(bsf, &obu->obu.sequence_header); + if (err < 0) + goto fail; + } + } + + 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 av1_metadata_init(AVBSFContext *bsf) +{ + AV1MetadataContext *ctx = bsf->priv_data; + CodedBitstreamFragment *frag = &ctx->access_unit; + AV1RawOBU *obu; + int err, i; + + err = ff_cbs_init(&ctx->cbc, AV_CODEC_ID_AV1, bsf); + if (err < 0) + return err; + + if (bsf->par_in->extradata) { + err = ff_cbs_read_extradata(ctx->cbc, frag, bsf->par_in); + if (err < 0) { + av_log(bsf, AV_LOG_ERROR, "Failed to read extradata.\n"); + goto fail; + } + + for (i = 0; i < frag->nb_units; i++) { + if (frag->units[i].type == AV1_OBU_SEQUENCE_HEADER) { + obu = frag->units[i].content; + err = av1_metadata_update_sequence_header(bsf, &obu->obu.sequence_header); + if (err < 0) + goto fail; + } + } + + err = ff_cbs_write_extradata(ctx->cbc, bsf->par_out, frag); + if (err < 0) { + av_log(bsf, AV_LOG_ERROR, "Failed to write extradata.\n"); + goto fail; + } + } + + err = 0; +fail: + ff_cbs_fragment_uninit(ctx->cbc, frag); + return err; +} + +static void av1_metadata_close(AVBSFContext *bsf) +{ + AV1MetadataContext *ctx = bsf->priv_data; + ff_cbs_close(&ctx->cbc); +} + +#define OFFSET(x) offsetof(AV1MetadataContext, x) +#define FLAGS (AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_BSF_PARAM) +static const AVOption av1_metadata_options[] = { + { "color_primaries", "Set color primaries (section 6.4.2)", + OFFSET(color_primaries), AV_OPT_TYPE_INT, + { .i64 = -1 }, -1, 255, FLAGS }, + { "transfer_characteristics", "Set transfer characteristics (section 6.4.2)", + OFFSET(transfer_characteristics), AV_OPT_TYPE_INT, + { .i64 = -1 }, -1, 255, FLAGS }, + { "matrix_coefficients", "Set matrix coefficients (section 6.4.2)", + OFFSET(matrix_coefficients), AV_OPT_TYPE_INT, + { .i64 = -1 }, -1, 255, FLAGS }, + + { "color_range", "Set color range flag (section 6.4.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" }, + + { "chroma_sample_position", "Set chroma sample position (section 6.4.2)", + OFFSET(chroma_sample_position), AV_OPT_TYPE_INT, + { .i64 = -1 }, -1, 3, FLAGS, "csp" }, + { "unknown", "Unknown chroma sample position", 0, AV_OPT_TYPE_CONST, + { .i64 = AV1_CSP_UNKNOWN }, .flags = FLAGS, .unit = "csp" }, + { "vertical", "Left chroma sample position", 0, AV_OPT_TYPE_CONST, + { .i64 = AV1_CSP_VERTICAL }, .flags = FLAGS, .unit = "csp" }, + { "colocated", "Top-left chroma sample position", 0, AV_OPT_TYPE_CONST, + { .i64 = AV1_CSP_COLOCATED }, .flags = FLAGS, .unit = "csp" }, + + { "tick_rate", "Set display tick rate (num_units_in_display_tick / time_scale)", + OFFSET(tick_rate), AV_OPT_TYPE_RATIONAL, + { .dbl = 0.0 }, 0, UINT_MAX, FLAGS }, + { "num_ticks_per_picture", "Set display ticks per picture for CFR streams", + OFFSET(num_ticks_per_picture), AV_OPT_TYPE_INT, + { .i64 = -1 }, -1, INT_MAX, FLAGS }, + + { NULL } +}; + +static const AVClass av1_metadata_class = { + .class_name = "av1_metadata_bsf", + .item_name = av_default_item_name, + .option = av1_metadata_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +static const enum AVCodecID av1_metadata_codec_ids[] = { + AV_CODEC_ID_AV1, AV_CODEC_ID_NONE, +}; + +const AVBitStreamFilter ff_av1_metadata_bsf = { + .name = "av1_metadata", + .priv_data_size = sizeof(AV1MetadataContext), + .priv_class = &av1_metadata_class, + .init = &av1_metadata_init, + .close = &av1_metadata_close, + .filter = &av1_metadata_filter, + .codec_ids = av1_metadata_codec_ids, +}; diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c index 3433921554..96b1746a75 100644 --- a/libavcodec/bitstream_filters.c +++ b/libavcodec/bitstream_filters.c @@ -25,6 +25,7 @@ #include "bsf.h" extern const AVBitStreamFilter ff_aac_adtstoasc_bsf; +extern const AVBitStreamFilter ff_av1_metadata_bsf; extern const AVBitStreamFilter ff_chomp_bsf; extern const AVBitStreamFilter ff_dump_extradata_bsf; extern const AVBitStreamFilter ff_dca_core_bsf;