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; }