From patchwork Wed Jan 18 20:35:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 40076 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp402783pzj; Wed, 18 Jan 2023 12:35:59 -0800 (PST) X-Google-Smtp-Source: AMrXdXsAvzh5hc2y/TggjEVStPPQGSCgvFLw0p0JJ15JDmKBnB50Hl2ryPXW8E4q/yPjQkdesf+t X-Received: by 2002:a17:906:b78b:b0:877:60aa:7081 with SMTP id dt11-20020a170906b78b00b0087760aa7081mr3229654ejb.22.1674074159694; Wed, 18 Jan 2023 12:35:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674074159; cv=none; d=google.com; s=arc-20160816; b=FC/EHoZHnFDCPG4iZFUnnPePmAUh2ASo6eSqrOvwyLr1s66EcimJv0VMKgNE/65ExE xdnjUF7bgWF+4s/Rq4VJQN9NnF23ohk3w6Vg5XUjKuDUZl74+lcUTe5PGAWqcZ2PhuGv 6JSn/HMcaNd7tflejbEL5fjk7mwaslYqaGA6Tn/IWGVPE5xirjLCK235W9RFJVqPZyn5 861KUlyi1STy37nDof2Xxwmeb1xoeg8mAispFVRhQgvAPxWccRFC8cyoxV16r+JReBQ0 wyYEUekVhqnvYSOJeoqlM8a0GA85Ld2BsI4bCz3jh2Erc/xCRNCY6JH1uAR3LiOLSKf2 0bcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:in-reply-to:references:to:from:content-language :user-agent:mime-version:date:message-id:dkim-signature:delivered-to; bh=cZiMy2Y0ujrWEZ/EbIYh89MW2m2PlF3SgkvmZipKX1o=; b=dKwfNXPSbY7SBfj6YIfxzjwIcK4N2yTRhmDmL25qOI+hZBmYtYPRjIFkw9eX9IT3gG UpjLHrPKMaJXfduy2rf7MGaoIpxKUBRhjpJY+XpDW40sXkLqvUTEJhulqkyPNLlxMBxz SE3hREqG7bvKcsZBJwnvDlSJywATzyGN8ooFdYe1lxWecRHJ6YjOEGqCo8eEhqs5t3wb 4qsT8uSU0fKlX4bPMK5SLLPYHSG36zzTo8b0rCQ3vW5v6sVXCbmcZXp1fqMCMBs2FyDt CDWV+L14I+Kfit1ekb84X+ZYBjB5EbLELwLX3kQiu86+7/q9lIdKpXIzZ0zJRcqrJ4t0 9PDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20210112.gappssmtp.com header.s=20210112 header.b="uW/NqScH"; 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 qk9-20020a1709077f8900b0086f53c24d8esi13234829ejc.422.2023.01.18.12.35.58; Wed, 18 Jan 2023 12:35:59 -0800 (PST) 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.20210112.gappssmtp.com header.s=20210112 header.b="uW/NqScH"; 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 83AEB680103; Wed, 18 Jan 2023 22:35:55 +0200 (EET) 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 7283B680103 for ; Wed, 18 Jan 2023 22:35:48 +0200 (EET) Received: by mail-wr1-f48.google.com with SMTP id r2so35184320wrv.7 for ; Wed, 18 Jan 2023 12:35:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:in-reply-to:references:to:from :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Aqo3smCewNWnu1VjpzICLG5cv2H5wmif4Pg5tKYAzmU=; b=uW/NqScHGwLP5Xbzj0k4lf/jwGpqUyQwzZ5d4WfobdwB00dtmcOyOkWVJOrUPJdVoi XjW+1AkCSMST+TQtDe3wK4Y+QKfo+8RwY7aEzdX9n3OhGCqgT+zo6R0/DTMvmgsezrcz bw7HfI7xE9v+AM04Z7qCKKilVZKuUpVIuXeVehufBZlB5ZWerKwQeTDNqktx4zLv2Dr+ gFiw3fMIT/2lIHFL+OnI+eK/u9N/658jxEO13qyf0qBjGYeehBE2w8ydT6Yq2GaRaZUl YxgfaoUW/ELGdvUv886v2jycd54iAPTjnPJbp6pDdg1utuxx6r1bPp55jNeE6moshaKx LGVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:references:to:from :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Aqo3smCewNWnu1VjpzICLG5cv2H5wmif4Pg5tKYAzmU=; b=brXcSvhZtk7U+nIpTMw2npijWpqBZcgBonX2IdRSxAY+ZuJHxqSIXiPvFK53w9nAx4 In5Rw0dx6wbV/M2YktWm2Oc6D4slh3X6IGdCWfb+SXpfs4lT+MmaKn36+Dw0eaJBEVF9 7ELRRQ4HpPiFywkMpNlIhH7H8jHvBitCRYbHvJVEFVIJybQyfWzjKCvIiRzjReeHAE64 HeAZK4R5xmzr4OhBK9IS38zfhD9wIwf/LkAUz95+lLTKPyV8XV4siCpEHHfeBa+iICYf BmjDx4ThfrjdvjtEIf2tLWE4VgGtwhG7StYWrtvmMnSSV5Q4vKp05apVbc4p4Z2B6geM muOA== X-Gm-Message-State: AFqh2kqmDwjWFiVKu/+DZkRz6HCeJlREqpTJr5HrKz05BUc/mPyJeKUt jTz5pzfgzdZiLits/dYayYDJfFJz8C7W+/J7 X-Received: by 2002:a5d:62c7:0:b0:2bb:dbde:bde4 with SMTP id o7-20020a5d62c7000000b002bbdbdebde4mr6803004wrv.30.1674074147569; Wed, 18 Jan 2023 12:35:47 -0800 (PST) Received: from [192.168.0.14] (cpc91224-cmbg18-2-0-cust209.5-4.cable.virginm.net. [81.106.228.210]) by smtp.gmail.com with ESMTPSA id f2-20020adfdb42000000b0024274a5db0asm32118110wrj.2.2023.01.18.12.35.46 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 Jan 2023 12:35:46 -0800 (PST) Message-ID: Date: Wed, 18 Jan 2023 20:35:32 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Content-Language: en-US From: Mark Thompson To: FFmpeg development discussions and patches References: <9f33d721-b3a5-dc8d-6048-4bc096d9abfe@jkqxz.net> In-Reply-To: <9f33d721-b3a5-dc8d-6048-4bc096d9abfe@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 3/2] cbs_av1: Remove constraint on MDCV luminance values X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: ie3Bf+uREeg3 While desiring min to be less than max feels entirely sensible, unfortunately the standard does not actually have this requirement. --- Some of the Argon coverage streams test this. libavcodec/cbs_av1_syntax_template.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index 3cab02bdd9..dc6724cb59 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -1866,11 +1866,8 @@ static int FUNC(metadata_hdr_mdcv)(CodedBitstreamContext *ctx, RWContext *rw, fb(16, white_point_chromaticity_x); fb(16, white_point_chromaticity_y); - fc(32, luminance_max, 1, MAX_UINT_BITS(32)); - // luminance_min must be lower than luminance_max. Convert luminance_max from - // 24.8 fixed point to 18.14 fixed point in order to compare them. - fc(32, luminance_min, 0, FFMIN(((uint64_t)current->luminance_max << 6) - 1, - MAX_UINT_BITS(32))); + fb(32, luminance_max); + fb(32, luminance_min); return 0; }