From patchwork Fri Jan 1 21:35:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 24758 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 3782D44878B for ; Fri, 1 Jan 2021 23:58:51 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0CC3268A878; Fri, 1 Jan 2021 23:58:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CAFC68A878 for ; Fri, 1 Jan 2021 23:58:44 +0200 (EET) Received: by mail-lf1-f46.google.com with SMTP id a12so50769695lfl.6 for ; Fri, 01 Jan 2021 13:58:44 -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=LoSx2tiF4NodIRE2/FNkQgvJepeenfc1KnVyjGpZyvM=; b=toz8L5nZtQcfP8uHYVP76qmqKnwtipOQS4WYctR5ffvPDyfb3tZqyEvd+YPkCRotEi oQXKY69bCR4bXqfQ6/9DycshSi3jynayVHjDStC/ejtgcbW1kxjn/XDidqPOqJk/8y+C SyoPRvnCvAOiVSe+9jtQ9p1lpIQqczU2aMAznsrCZoXWbaBH3V38jy0B0QPI0xD7D8bY 3/UnmHxAzJbUGGDiWzzdSQWZn73jC7OX+MVyWfmxX6/WlE6jTVV1vhr6rgrqxo5DljVS jm2D7SGzk+bQY2mYMacsiNcg3FrGYyv9smQx2mQlMG/tEqpvzfrs2oiTSLB2qJxahs6s y0wQ== 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=LoSx2tiF4NodIRE2/FNkQgvJepeenfc1KnVyjGpZyvM=; b=aB+ER2WEp2u0YZS5zp3Zw+6oIkdpitkK/z2dJM/OXN1Fm8AAQescrrUmJ3NejfoDFI g1VTVgQ9dGzlAD6nD8/4rz9lEKuRRwyfGE2MA5y94hvX8LxsT7535S1YXfDUknKDYTaZ rYsF/o73GXYp0kH72W0/5OSp8Ayo+6tfRniUNhcufPiA9GwVLkWowXpNnnkM62zk637w YhPidBOpLlndjsjjOANqPcAeF2j5pVNakUb9A2CL9gLGOU8i9VFFQQfshrNawFZWNm6i 56Asxnybo4f3bgrBeYfe9Q7SkP0SRdli9ZVd3NpED47QbumiSOTkZokXYyypVO0YeKqq wvVg== X-Gm-Message-State: AOAM5338y+oeSz9oLhhIlq6VtaNn0kaqmdKCo1Dc8SVZbU1LW2MaChoO 3pBdoKbqIwM2dU/cnOpPWj1xxm++BueMuQ== X-Google-Smtp-Source: ABdhPJwevnOa1oig6MA2kHYPm0ED4Vx3b1p53o56JUEwdmDwbsLHRKryaY2vAVMU+VWJrvt8+JkwJQ== X-Received: by 2002:adf:ded1:: with SMTP id i17mr69376598wrn.190.1609537073283; Fri, 01 Jan 2021 13:37:53 -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 v20sm18784595wml.34.2021.01.01.13.37.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Jan 2021 13:37:52 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Jan 2021 21:35:14 +0000 Message-Id: <20210101213537.169546-5-sw@jkqxz.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210101213537.169546-1-sw@jkqxz.net> References: <20210101213537.169546-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/27] 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 1a0516acce..55377ea5a9 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; }