From patchwork Wed Aug 12 21:32:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 21617 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id F2BDF44B1A0 for ; Thu, 13 Aug 2020 01:31:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CB08A68B55B; Thu, 13 Aug 2020 01:31:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f66.google.com (mail-ej1-f66.google.com [209.85.218.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A923F68B4C0 for ; Thu, 13 Aug 2020 01:31:39 +0300 (EEST) Received: by mail-ej1-f66.google.com with SMTP id o23so4043118ejr.1 for ; Wed, 12 Aug 2020 15:31:39 -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:mime-version :content-transfer-encoding; bh=YAUeqirQQhTl2Kt5ZTaYSoL6KXn6OQTicoa5L6F6tU8=; b=rKPU/N5IMYDDM6SYa15RJvCTKTwv6wcVDjFSQk81d9YO0qClEGtSzKuD28L6ZgFA7S pXWz6R4KlBmuvQMcg0CXPas86flNYX8M9GXjgHYJPifX5WWap+Lh1KB8i9g25sO9sGJC O7WKmmL6CaWniQMhi9RXO/AkfCHAi7aztnAX4BworDGINf/FsKL+5eh5Hk4FQkT+z9Hd nsiRgpGGrNL5v0hoBIa/Q+Ot+KdFwLyGH83jccN1vkeWCOkAL6sBZEzQLxguU2iPjWkZ V5Qr3BmDE0D+1e52oRMbI7RiO/a8e2XqAk/Fkfe2kjr3kO/0EftYozRZlT4Xeo5PrhkM 0Mtg== 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:mime-version:content-transfer-encoding; bh=YAUeqirQQhTl2Kt5ZTaYSoL6KXn6OQTicoa5L6F6tU8=; b=g74UfbhQtaQaYf/xzgkb4GLjTDaoWo1mM0X9Z5/YjYhafcCEMgVJ20YLpX3Tw+BGkm HUAt9HwLdWs1y9U5zYiFhzdmTzYeBqeTwbnQ+WiJI6nKVbOkMN5nTnrob8HuEIZSxUc8 O8P/1lG5Fg3nu1vXO58IXXqv/pfJlSll5iYVbj8RH6mDlZDrCYSGOS8Jv+13ddpTb3SQ Sli0IGiTWRpSrw10IB+ckRHNi6DzJqx+gPxNvDyoLu7gJRPezWUuDCT68eD9hTKPIJGG 5LsamvQzYRjOd3bAy5vy6iBw3kR14FT5Q+eb/BWGAb8V+bgnpEEZvg3zDtai8vReMWgR T32w== X-Gm-Message-State: AOAM5336Vb2obIlUYU3E9fNec/rUDPfdkut9ZvRoAm1BFh/0gvrW3LFo KXddPP9B5sUHllR2n8Fyh7gNm8IfulU= X-Google-Smtp-Source: ABdhPJy29gmxTz35ZFg/3DESD7bakha6FBXfftn1ce3MF2OfYu1LI0aPqnJeH/7Edxy0e7RX/tqcJg== X-Received: by 2002:a5d:54c8:: with SMTP id x8mr947462wrv.405.1597268069865; Wed, 12 Aug 2020 14:34:29 -0700 (PDT) Received: from localhost.localdomain (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id 128sm5836836wmz.43.2020.08.12.14.34.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2020 14:34:29 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Aug 2020 22:32:12 +0100 Message-Id: <20200812213213.429536-1-sw@jkqxz.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <393747f0-4b65-2213-01b0-a4cdacbe6ff3@gmail.com> References: <393747f0-4b65-2213-01b0-a4cdacbe6ff3@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 19.1/23] cbs_h265: Remove restrictions on MDCV values 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Since this was originally written H.265 has changed to allow arbitrary values here, but leaves their meaning unspecified. --- On 12/08/2020 00:03, Andreas Rheinhardt wrote: > Obviously, the code for reading/writing the mastering display colour > volume SEI needs to be updated, too. Yeah. I don't think there is any verification we can now do here, so this just removes all restrictions. libavcodec/cbs_h265_syntax_template.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c index 48fae82d04..1b0a31b575 100644 --- a/libavcodec/cbs_h265_syntax_template.c +++ b/libavcodec/cbs_h265_syntax_template.c @@ -2030,17 +2030,15 @@ static int FUNC(sei_mastering_display)(CodedBitstreamContext *ctx, RWContext *rw HEADER("Mastering Display Colour Volume"); for (c = 0; c < 3; c++) { - us(16, display_primaries_x[c], 0, 50000, 1, c); - us(16, display_primaries_y[c], 0, 50000, 1, c); + ubs(16, display_primaries_x[c], 1, c); + ubs(16, display_primaries_y[c], 1, c); } - u(16, white_point_x, 0, 50000); - u(16, white_point_y, 0, 50000); + ub(16, white_point_x); + ub(16, white_point_y); - u(32, max_display_mastering_luminance, - 1, MAX_UINT_BITS(32)); - u(32, min_display_mastering_luminance, - 0, current->max_display_mastering_luminance - 1); + ub(32, max_display_mastering_luminance); + ub(32, min_display_mastering_luminance); return 0; } From patchwork Wed Aug 12 21:32:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 21615 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D6329449EAC for ; Thu, 13 Aug 2020 00:34:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B338168B0F4; Thu, 13 Aug 2020 00:34:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 39A0768AE86 for ; Thu, 13 Aug 2020 00:34:32 +0300 (EEST) Received: by mail-wr1-f48.google.com with SMTP id z18so3357596wrm.12 for ; Wed, 12 Aug 2020 14:34:32 -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:mime-version :content-transfer-encoding; bh=oRfhKxVFzY7S/yjcBQd2sXhF6M3mBFp8Bqc/nFCZ66I=; b=aqpKbZSo40PHV8tDNuhu+ST2CN3bwvzZjCvkheaPb598I5FOFVvkBwE1xAwEEkzWAE 4Kpms3sovM7LlhbHU0e4/yxFmUrDUMSXUTuBe/0/KT/VNpOXCjsvSqJgmUmBvKe7HWUf 7KUIRCCHxYzXeopW3uNoTt7jUrsqlnpG9TmiGPvzqG5AEEM0zQMhO+C4kfMgR30hm+9n EqoWJyJRzVcYIsWFqSYsNxftjxsI1UmjzMdApkyRwZCFzHbv21PL9EkRkqty9vxerlqY OEc/buS5tIzi16NOPEgZhFhQX6HTHvgVqraqlrHMUPus0l7bpGUVnckzAhgUbRf+hwhp To+A== 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:mime-version:content-transfer-encoding; bh=oRfhKxVFzY7S/yjcBQd2sXhF6M3mBFp8Bqc/nFCZ66I=; b=bmXx72qsx0Whvfm+ktyYfGs1UopFJK/z/5CnO0/sbnwy5QwKyF4FiDfFzI7YefVdiL PRuLxWSol8zzCm6plWJKXeVyYCh8V5smsuwLsGMXj/c2JHDR1PN1CL0WQ+3t2Zhr1mJc rwQ7ajlvXX60H2gmBv2IjTWPt7YPSMaJAjL7V65+LdYLU4P5tlCiyfPHgESZbXkcpde2 8OmVEg2k2L3Q2D0BrKrezOZstFuS5Ouq66k7LT+8jfjm2K2Rb67RHZFdiVXUaeY7j/CE OXUE9odtsp8ul8EQKMRM+Jx5GDWSQx9TEVsPm3yIruyRqRumgShsFpmFkhBsSg9Y8Feo CAjQ== X-Gm-Message-State: AOAM532Zr6+HCJEI0TGb6zl2cBkY3QJdG4Met5zxflUq2i7o5dzxUQHv 8pJ1TOWYwlx2+XNg2+EyGReVomTUHDY= X-Google-Smtp-Source: ABdhPJwByzMA9TU3WxfR+JqUwzTe1hO7XxC25XsIFdIxPQOfPI1XoVnTKp0KsWtJsidcBOnYp9xU2w== X-Received: by 2002:adf:90d1:: with SMTP id i75mr962233wri.278.1597268071028; Wed, 12 Aug 2020 14:34:31 -0700 (PDT) Received: from localhost.localdomain (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id 128sm5836836wmz.43.2020.08.12.14.34.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2020 14:34:30 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Aug 2020 22:32:13 +0100 Message-Id: <20200812213213.429536-2-sw@jkqxz.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200812213213.429536-1-sw@jkqxz.net> References: <393747f0-4b65-2213-01b0-a4cdacbe6ff3@gmail.com> <20200812213213.429536-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 19.2/23] cbs_h265: Add functions to turn HDR metadata into SEI 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- On 12/08/2020 00:03, Andreas Rheinhardt wrote: > ... Yep, all changed as you suggest. libavcodec/Makefile | 2 +- libavcodec/cbs_h265.c | 95 +++++++++++++++++++++++++++++++++++++++++++ libavcodec/cbs_h265.h | 18 ++++++++ 3 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 libavcodec/cbs_h265.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 5fc969e00d..72b363117e 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -71,7 +71,7 @@ OBJS-$(CONFIG_CABAC) += cabac.o OBJS-$(CONFIG_CBS) += cbs.o OBJS-$(CONFIG_CBS_AV1) += cbs_av1.o OBJS-$(CONFIG_CBS_H264) += cbs_h2645.o cbs_h264.o h2645_parse.o -OBJS-$(CONFIG_CBS_H265) += cbs_h2645.o h2645_parse.o +OBJS-$(CONFIG_CBS_H265) += cbs_h2645.o cbs_h265.o h2645_parse.o OBJS-$(CONFIG_CBS_JPEG) += cbs_jpeg.o OBJS-$(CONFIG_CBS_MPEG2) += cbs_mpeg2.o OBJS-$(CONFIG_CBS_VP9) += cbs_vp9.o diff --git a/libavcodec/cbs_h265.c b/libavcodec/cbs_h265.c new file mode 100644 index 0000000000..f6226d8743 --- /dev/null +++ b/libavcodec/cbs_h265.c @@ -0,0 +1,95 @@ +/* + * 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/mathematics.h" +#include "libavutil/mastering_display_metadata.h" + +#include "cbs_h265.h" + + +static uint32_t rescale_clip(AVRational value, uint32_t scale, + uint32_t min, uint32_t max) +{ + int64_t scaled = av_rescale(scale, value.num, value.den); + return av_clip64(scaled, min, max); +} + +void ff_cbs_h265_fill_sei_mastering_display(H265RawSEIMasteringDisplayColourVolume *mdcv, + const AVMasteringDisplayMetadata *mdm) +{ + memset(mdcv, 0, sizeof(*mdcv)); + + if (mdm->has_primaries) { + // The values in the metadata structure are fractions between 0 and 1, + // while the SEI message contains fixed-point values with an increment + // of 0.00002. So, scale up by 50000 to convert between them and clip + // to the allowed range ([5, 37000] for x, [5, 42000] for y). + + for (int a = 0; a < 3; a++) { + // The metadata structure stores this in RGB order, but the SEI + // wants it in GBR order. + static const uint8_t mapping[] = { 1, 2, 0 }; + int b = mapping[a]; + mdcv->display_primaries_x[a] = + rescale_clip(mdm->display_primaries[b][0], 50000, 5, 37000); + mdcv->display_primaries_y[a] = + rescale_clip(mdm->display_primaries[b][1], 50000, 5, 42000); + } + + mdcv->white_point_x = + rescale_clip(mdm->white_point[0], 50000, 5, 37000); + mdcv->white_point_y = + rescale_clip(mdm->white_point[1], 50000, 5, 42000); + } + + if (mdm->has_luminance) { + // Metadata are rational values in candelas per square metre, SEI + // contains fixed point in units of 0.0001 candelas per square + // metre. So scale up by 10000 to convert between them, and clip to + // the allowed ranges. + + mdcv->max_display_mastering_luminance = + rescale_clip(mdm->max_luminance, 10000, 50000, 100000000); + mdcv->min_display_mastering_luminance = + rescale_clip(mdm->min_luminance, 10000, 1, 50000); + + // The spec requires that they are not equal when in the normal + // range. + if (mdcv->min_display_mastering_luminance >= + mdcv->max_display_mastering_luminance) { + mdcv->min_display_mastering_luminance = + mdcv->max_display_mastering_luminance - 1; + } + } else { + mdcv->max_display_mastering_luminance = 0; + mdcv->min_display_mastering_luminance = 0; + } +} + +void ff_cbs_h265_fill_sei_content_light_level(H265RawSEIContentLightLevelInfo *cll, + const AVContentLightMetadata *clm) +{ + memset(cll, 0, sizeof(*cll)); + + // Both the metadata and the SEI are in units of candelas per square + // metre, so we only need to clip to ensure that they are in the valid + // range. + + cll->max_content_light_level = av_clip_uintp2(clm->MaxCLL, 16); + cll->max_pic_average_light_level = av_clip_uintp2(clm->MaxFALL, 16); +} diff --git a/libavcodec/cbs_h265.h b/libavcodec/cbs_h265.h index c14cd4cd66..999353f607 100644 --- a/libavcodec/cbs_h265.h +++ b/libavcodec/cbs_h265.h @@ -747,4 +747,22 @@ typedef struct CodedBitstreamH265Context { } CodedBitstreamH265Context; +struct AVMasteringDisplayMetadata; +struct AVContentLightMetadata; + +/** + * Fill an SEI Mastering Display Colour Volume structure with values derived + * from the AVMasteringDisplayMetadata side-data structure. + */ +void ff_cbs_h265_fill_sei_mastering_display(H265RawSEIMasteringDisplayColourVolume *mdcv, + const struct AVMasteringDisplayMetadata *mdm); + +/** + * Fill an SEI Content Light Level Info structure with values derived from + * the AVContentLightMetadata side-data structure. + */ +void ff_cbs_h265_fill_sei_content_light_level(H265RawSEIContentLightLevelInfo *cll, + const struct AVContentLightMetadata *clm); + + #endif /* AVCODEC_CBS_H265_H */