From patchwork Mon Jan 18 22:44:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 25018 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 2438544B11C for ; Tue, 19 Jan 2021 00:52:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DE1346881BB; Tue, 19 Jan 2021 00:52:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C7C56881EE for ; Tue, 19 Jan 2021 00:52:35 +0200 (EET) Received: by mail-wm1-f52.google.com with SMTP id i63so14913701wma.4 for ; Mon, 18 Jan 2021 14:52:35 -0800 (PST) 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=t01PA4qKugH1SHB1rtzLSwfrJsl1ouu69/Tka23MGiI=; b=syXVe4X36r4Qj1dTJjWcJxfgfESETdWTK7kuLb3n8DYXtKT7eHGeru/xon0wqnG4OO +zefHp3rcR6tTgBPfbuRR8ezlYoqbEoSnkRzLlATlWQ9THpcCZ+0XCzWIp+9KYKC1rp5 wd/HJUCqe/p2AxWOxi62lKVqDA5z4E5/EUb6y5mxVJtupKMeAxy6RSrmJmcNCIKm9LV+ N7XZfG5Rx0aDeCOmK13JtM35vM9ZpWdlFDRlttdzNPEEA38n8b5nzvBupAXcU0lZ7HfB jsUhJIo1UddSRz7ZHyXfkTm+xkN74erHGdAlCn/wzkVahIwqZKY/Ya4pi8Plu/0OTLXT wMhg== 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=t01PA4qKugH1SHB1rtzLSwfrJsl1ouu69/Tka23MGiI=; b=EQRnBmqg5RTT5C6RaHRckFRdleFvl5iZMI2q2nqfAPawWJhI4zUkt4e7psNK0LKu8f WTAKW6WHyssHsclpqSps7llvytXRno1P513V/2KWoku0OzSMwE2bAeWKnh345z9pK/Ev VRg0df8bSZZAH7m++1T2RmaJu+//jJWJqjMS+umcffMtdBw9iVDdCp7XaIhyU11LADnn 5YwvfTlbTKNvdzRrl8gJsIDvA7FXFXFuCU7cbJuuvGij8bMD7wSH5TQ+iDSOe+VdiK6Z RDrvWXHqSG3ctV9XJM+fTyiKeCntP5pKXFRCqYXOxFoz8NsalpKVrJ0krvjQT1/noSfW nqfg== X-Gm-Message-State: AOAM532JWYqHJeMgTxWMQ6MbOjCVkS8pLRhh20LQjpFXVnIlBurA1iSt rFC5XreZzkSlYnXFWPPrvgSv6gfIoNlC/g== X-Google-Smtp-Source: ABdhPJxzdmxxllNlFna2YJFEYcLkwT+ClgGFlawC29ek3tHf988ewOBT9iI3h5fOt+i05fczdN2t8g== X-Received: by 2002:a1c:e919:: with SMTP id q25mr1288669wmc.57.1611010026450; Mon, 18 Jan 2021 14:47:06 -0800 (PST) Received: from localhost.localdomain (cpc91226-cmbg18-2-0-cust7.5-4.cable.virginm.net. [82.0.29.8]) by smtp.gmail.com with ESMTPSA id b3sm1525898wme.32.2021.01.18.14.47.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 14:47:05 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Jan 2021 22:44:46 +0000 Message-Id: <20210118224455.750030-5-sw@jkqxz.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210118224455.750030-1-sw@jkqxz.net> References: <20210118224455.750030-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 04/13] cbs_sei: 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 the standards have changed to allow arbitrary values here, but leaves their meaning unspecified. --- libavcodec/cbs_sei_syntax_template.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/libavcodec/cbs_sei_syntax_template.c b/libavcodec/cbs_sei_syntax_template.c index 5f84246663..9114e61ff6 100644 --- a/libavcodec/cbs_sei_syntax_template.c +++ b/libavcodec/cbs_sei_syntax_template.c @@ -103,17 +103,15 @@ static int FUNC(mastering_display_colour_volume) 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; }