From patchwork Sun Jul 2 23:26:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42388 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1e:b0:12b:9ae3:586d with SMTP id c30csp3986280pzh; Sun, 2 Jul 2023 16:28:06 -0700 (PDT) X-Google-Smtp-Source: APBJJlFYRiKyExjrUcAyRjUC4x5Lr9dQjIStrmfYHFzflr9m9YXNsGPxD+AUbRA47M5/aBFfZcG2 X-Received: by 2002:aa7:c60c:0:b0:51d:d5f2:1222 with SMTP id h12-20020aa7c60c000000b0051dd5f21222mr6588311edq.5.1688340486743; Sun, 02 Jul 2023 16:28:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688340486; cv=none; d=google.com; s=arc-20160816; b=eANJYvbvyAKAV7L2Gweeqey8lSS6XEP3NBXHUFKOj7t4Cu6K3ii7PPpzMTBICneKfb ELpVJa5am/KvFyU6OIPstRpCU84yiGN+739iRExxfkrXIXbfF2P8lB92ptqTnQ0TOg1S nALq0R71NIwKCwdafjUaAIBpdQACVxRZLM0S09gN5E0TnDdZyTrWlSnd328cmSIKuprI C33YFSbdQ5MJUPkcF/k/CrPHL3686yYKJwM4b5T8oKANOHyCEVf0Dy4PDDKemq+NRxNo CdDlq/mFgA1hjz/Dk17C/YgafkclbpYHWXOpSStxVLaJEICR5+BrJqzGx2RV4mpI96do 2Bfw== 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:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=koUTHy2NHjMtsxqq0SXjFYyZ8BNt9m0l9/LT3rW0Rlw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=M30So6VU1bGKxxyjN0XJfsUv7EGtXqORsTt9xvonQn4t105G7wjXAXCEP656q7PvHQ ZyBE6goUKojW1sHlTTzMr3mCgkkrRXqo4D5uY6l2WgcRC3TNl1iSo3hu1IsrLB41xkKB dcX2REno6layE/t7jPn1oHfTKFNZoMu2wZDt4E3QfWl9RFHGSMtRMgZKr8bOQRR8Cx1z pmzNs4JUVxxob6QzQcrQX5pr2BZlW3M5w+7ZvwjnZUR7m1XNyzhCxZdMIQ74VakOGWcs Yd0T5YYhnQIgT83iRAp4nKhl0VQZSojLKt7L3FPtEA/saEkkX99h8nTM+kWTUZW8GCII PFnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=OZr+38Qj; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n2-20020aa7c782000000b0051df8ee23f5si2518762eds.175.2023.07.02.16.28.06; Sun, 02 Jul 2023 16:28:06 -0700 (PDT) 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=@gmail.com header.s=20221208 header.b=OZr+38Qj; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1DFF568C4C7; Mon, 3 Jul 2023 02:28:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f42.google.com (mail-oa1-f42.google.com [209.85.160.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 30EBF68016E for ; Mon, 3 Jul 2023 02:27:55 +0300 (EEST) Received: by mail-oa1-f42.google.com with SMTP id 586e51a60fabf-1b3a4c51ec2so282879fac.0 for ; Sun, 02 Jul 2023 16:27:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688340473; x=1690932473; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=aDCcXGKUQCZD3dvKJh4mkdcFJ6Qty+YxFjI4kgifrVQ=; b=OZr+38Qj4t3R/6pqbueYFaeCnh6CLO+99EZd0EsjwwlgnO2U3vqBYOHjjuHmHJvKSg 9XMxlidhtCk5wLXGuaCOy8iHSBVowUvekcB5axOLgXMlbRslObVCIOQrYP8T4dvidiPw R0y6bXIXIw/0E854FUQ92w4xEkCcUT4nUhZQkrvmTzLPH/S6dNjQSFK4yKNkGTT+x4PU TB68Rh+VK/A48e+xIyjXltvYriEE25v8k/s94OjP4Ohfa8ZX7lHjHmKNYBwyGh8uiGSf iKuxVQUW3L6/xroaESvRyqW2nDpHuQ8BzjN/GUot25IdVioAUYz9lLe0b5vwdUqEYWCr 2gSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688340473; x=1690932473; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=aDCcXGKUQCZD3dvKJh4mkdcFJ6Qty+YxFjI4kgifrVQ=; b=SSE9SCeLF1tPm+yXxATD6hp1jrdpG0113IgHUiOPdwo/3uLeE5DbBJ3A1DGbT1QdGH IeUMC1qmoHNQGLZhdo4BL1b/xLyMLI9y1adqTp5IfOlEFKslhkRhxvMe7ZC5JQW+W+iO otqu1JPLjTdsluIMws/rcj7ypax+RyN3oAdj5VMXHo1uE/TCBqsdykFUIJiRU0d8T+4v bOIlB4iF7+V1meBGw5fpPPywmYKGZX5CU8n5+wJd1WYoKU0ilzzwE1blWyid7NMdD44s L3Sw1y9kKS1rZgfP/p+ScoxXioGPJ+TYFMoSLyKQRATLwAFT5P/VguX3wDg/lDDV10ZB vaDg== X-Gm-Message-State: AC+VfDyKjL2MH4MAffPmGRt+wbU1mevZxXAT+4VDGVSTAU80Etb7Rr7m i3r6fpzuXRVN8elCwhFuIVfxMZwn2zY= X-Received: by 2002:a05:6870:2193:b0:1b0:1dcb:e706 with SMTP id l19-20020a056870219300b001b01dcbe706mr6826670oae.26.1688340472755; Sun, 02 Jul 2023 16:27:52 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id f17-20020a9d7b51000000b006b89596bc61sm3265098oto.61.2023.07.02.16.27.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 16:27:52 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Jul 2023 20:26:19 -0300 Message-ID: <20230702232622.6870-1-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/cbs_h266: add support for Operating point information NALU type 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: cx+0SklSqSqH Signed-off-by: James Almer --- libavcodec/cbs_h2645.c | 18 ++++++++++++++++++ libavcodec/cbs_h266.h | 11 +++++++++++ libavcodec/cbs_h266_syntax_template.c | 27 +++++++++++++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index 68ccf6a7eb..8dc9ae471d 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -1059,6 +1059,14 @@ static int cbs_h266_read_nal_unit(CodedBitstreamContext *ctx, return err; switch (unit->type) { + case VVC_OPI_NUT: + { + err = cbs_h266_read_opi(ctx, &gbc, unit->content); + + if (err < 0) + return err; + } + break; case VVC_VPS_NUT: { H266RawVPS *vps = unit->content; @@ -1593,6 +1601,15 @@ static int cbs_h266_write_nal_unit(CodedBitstreamContext *ctx, int err; switch (unit->type) { + case VVC_OPI_NUT: + { + H266RawOPI *opi = unit->content; + + err = cbs_h266_write_opi(ctx, pbc, opi); + if (err < 0) + return err; + } + break; case VVC_VPS_NUT: { H266RawVPS *vps = unit->content; @@ -1965,6 +1982,7 @@ static void cbs_h266_free_sei(void *opaque, uint8_t *content) } static const CodedBitstreamUnitTypeDescriptor cbs_h266_unit_types[] = { + CBS_UNIT_TYPE_INTERNAL_REF(VVC_OPI_NUT, H266RawOPI, extension_data.data), CBS_UNIT_TYPE_INTERNAL_REF(VVC_VPS_NUT, H266RawVPS, extension_data.data), CBS_UNIT_TYPE_INTERNAL_REF(VVC_SPS_NUT, H266RawSPS, extension_data.data), CBS_UNIT_TYPE_INTERNAL_REF(VVC_PPS_NUT, H266RawPPS, extension_data.data), diff --git a/libavcodec/cbs_h266.h b/libavcodec/cbs_h266.h index e33d08a0f5..693d1ca1fd 100644 --- a/libavcodec/cbs_h266.h +++ b/libavcodec/cbs_h266.h @@ -230,6 +230,17 @@ typedef struct H266RawVUI { H266RawExtensionData extension_data; } H266RawVUI; +typedef struct H266RawOPI { + H266RawNALUnitHeader nal_unit_header; + + uint8_t opi_ols_info_present_flag; + uint8_t opi_htid_info_present_flag; + uint16_t opi_ols_idx; + uint8_t opi_htid_plus1; + uint8_t opi_extension_flag; + H266RawExtensionData extension_data; +} H266RawOPI; + typedef struct H266RawVPS { H266RawNALUnitHeader nal_unit_header; diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 957735056f..d9c8e0afbe 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -623,6 +623,33 @@ static int FUNC(ols_timing_hrd_parameters) (CodedBitstreamContext *ctx, return 0; } +static int FUNC(opi)(CodedBitstreamContext *ctx, RWContext *rw, + H266RawOPI *current) +{ + int err; + + HEADER("Operating point information"); + + CHECK(FUNC(nal_unit_header)(ctx, rw, + ¤t->nal_unit_header, VVC_OPI_NUT)); + + flag(opi_ols_info_present_flag); + flag(opi_htid_info_present_flag); + + if(current->opi_ols_info_present_flag) + ue(opi_ols_idx, 0, VVC_MAX_TOTAL_NUM_OLSS - 1); + + if(current->opi_htid_info_present_flag) + ub(3, opi_htid_plus1); + + flag(opi_extension_flag); + if (current->opi_extension_flag) + CHECK(FUNC(extension_data) (ctx, rw, ¤t->extension_data)); + CHECK(FUNC(rbsp_trailing_bits) (ctx, rw)); + + return 0; +} + static int FUNC(vps) (CodedBitstreamContext *ctx, RWContext *rw, H266RawVPS *current) { From patchwork Sun Jul 2 23:26:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42389 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1e:b0:12b:9ae3:586d with SMTP id c30csp3986344pzh; Sun, 2 Jul 2023 16:28:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ42g2TyCUk/kYsP6R5HC9+lWwGt0WnQJFIEvbrrevYbHeLv/BvlQokZWnLJ9qDjmg47O/uR X-Received: by 2002:a7b:c315:0:b0:3f4:d18f:b2fb with SMTP id k21-20020a7bc315000000b003f4d18fb2fbmr8498893wmj.8.1688340497052; Sun, 02 Jul 2023 16:28:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688340497; cv=none; d=google.com; s=arc-20160816; b=I3+WUTHbTXvXg+veytflRuQIQCRKq922GEop5+2dwrrwshoMILIs3CmGecp2DEXgf1 TOt++F4SUPpPMhSlEhIFSPtmaMTJRPEuwqC6G1MzAETHxcP5X/CU9qsNc7LhHkjJGZGT JIEviVwFqok1l44vOTND6BvRBORpX6R5c3z4p3nIWuijgIKTwOYQuHhYec/LIscGIN9t ZLnVjsgJfhPVBgjSZfxtrwRCfqTAURaRzgoEu7bwCcfXRaN1lVcNSjiTz89SvmFIRHOq 3d2iRE4h08qTvocnmLkqFYPV5+aRrV1ihCRRbcZE2yhkHRDsoRugGj3jJFyKTBZQEPTr FSMA== 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:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=LDdWsrqg7cB6LpmWxL1qnChigf/dPCsnhl9PoMTlhDg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=g50SS8VQ/3AHxIZI0BlM4rAgwrUIVd3iCVwl/krMbCJQl1u0wiUBqEvDtE9imrD5Fn vKxHwgtv85ytBOlsxE0eU+3O8CEpVVgkcCju63UWJjN90rhZaeq2keex5++JJ4mRoln/ dYkogxLOn7Mszmt2I3+nlrZX51lb/AImTeUs1rAiF8Tcz3+gVpkEFymzcczC9eunrEAe +PHtM392iV3ZHjhiRUODcMKxrdanp242VqqNwf20/en9ScP++8V3Gdz9+kCCS0HREAGF X3DdtomIbcTQ4tzKVRqsxy/Zclqqj9vWpwFjrfZarOcQfl+NPmDg6esQWVnyfVOO0oDE uBdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=jS4wzdXk; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z26-20020a1709067e5a00b00992f1a3b9dcsi2890290ejr.845.2023.07.02.16.28.16; Sun, 02 Jul 2023 16:28:17 -0700 (PDT) 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=@gmail.com header.s=20221208 header.b=jS4wzdXk; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3D7EE68C4F3; Mon, 3 Jul 2023 02:28:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f51.google.com (mail-ot1-f51.google.com [209.85.210.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C04E68016E for ; Mon, 3 Jul 2023 02:27:55 +0300 (EEST) Received: by mail-ot1-f51.google.com with SMTP id 46e09a7af769-6b73741a632so2972738a34.3 for ; Sun, 02 Jul 2023 16:27:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688340474; x=1690932474; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=6lbFjLr9MsrXR7jooJtMYnVj98+NDt89eutiGEwdQe4=; b=jS4wzdXkHWhz82vgJnXtPFQ16R6AvtuevD8aQKq6bdMCaiRmzKR+XKI3VLsaLcNYi2 Pw50L0wpD4Z7GlNensqfsvyEXFxrR6OpDETOXF0ra2rsa7wZwcO5HzUMJBLZ6YI9zIHX IVeWp3OnQZwqiD86a//oAC9YmlOiukqdVH1Ti6W+SuSKigUS6y8c6PUPs1j8P/aWmE8F lF6Lv7c0NZkMOByAUuQcBAckN89g4CFfSBmGvEjq7THMEqvHVnq3SX3aLjex23M5R1Qe gTWeAfvN/khDKSdMvZs94q3vi4byCT2Y2X9X/tP+i78ds+6VkI/vMluNuA+WQwNFKJZ+ Kpqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688340474; x=1690932474; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6lbFjLr9MsrXR7jooJtMYnVj98+NDt89eutiGEwdQe4=; b=E9R8i7/RexAOLxrO/YdOND0ovFTBn4D2HSJPbRD/o8JS5NXWXOvXtMyBTDN1KxpsOU KgPY8MRkmR9zlU3cIV1WndUfcqDnIBBuUFGrci+qOlihPaukUyjdzp0TbUrAKFVF90EE Co3OPkG6ayPLvzjUw2JN+8fWo1KMUdei+IQ2SZByIf6cX49Ke7nviBVEcCR7jDE3Boz3 xyGQlFtNkyUdLy1slx8gX0xRSe9Dk4EejATXoNM6Tl8uEGnkN1xyYEh7jxuakomWcRzQ C5f6u7+sVfYeQ/LQ7YdkfoVbqCWgtyLx7PkS1RSMtd8wibivCcJKGymkDxFsR9A4mWBQ cT9w== X-Gm-Message-State: AC+VfDxi6Qp3AhmR1RaE1L7yMmKW6KX+Pa0/OLw2NbzeYO044mBZgwfb b+1Yct95p7ccYmGoJ1IpkfVeK94jIVI= X-Received: by 2002:a9d:4d13:0:b0:6b3:d369:9c0a with SMTP id n19-20020a9d4d13000000b006b3d3699c0amr7393341otf.19.1688340473815; Sun, 02 Jul 2023 16:27:53 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id f17-20020a9d7b51000000b006b89596bc61sm3265098oto.61.2023.07.02.16.27.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 16:27:53 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Jul 2023 20:26:20 -0300 Message-ID: <20230702232622.6870-2-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230702232622.6870-1-jamrial@gmail.com> References: <20230702232622.6870-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/cbs_h266: add support for Decoding capability information NALU type 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: 1SyVWTbyobEU Signed-off-by: James Almer --- libavcodec/cbs_h2645.c | 18 ++++++++++++++++++ libavcodec/cbs_h266.h | 10 ++++++++++ libavcodec/cbs_h266_syntax_template.c | 24 ++++++++++++++++++++++++ libavcodec/vvc.h | 3 +++ 4 files changed, 55 insertions(+) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index 8dc9ae471d..95da597427 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -1059,6 +1059,14 @@ static int cbs_h266_read_nal_unit(CodedBitstreamContext *ctx, return err; switch (unit->type) { + case VVC_DCI_NUT: + { + err = cbs_h266_read_dci(ctx, &gbc, unit->content); + + if (err < 0) + return err; + } + break; case VVC_OPI_NUT: { err = cbs_h266_read_opi(ctx, &gbc, unit->content); @@ -1601,6 +1609,15 @@ static int cbs_h266_write_nal_unit(CodedBitstreamContext *ctx, int err; switch (unit->type) { + case VVC_DCI_NUT: + { + H266RawDCI *dci = unit->content; + + err = cbs_h266_write_dci(ctx, pbc, dci); + if (err < 0) + return err; + } + break; case VVC_OPI_NUT: { H266RawOPI *opi = unit->content; @@ -1982,6 +1999,7 @@ static void cbs_h266_free_sei(void *opaque, uint8_t *content) } static const CodedBitstreamUnitTypeDescriptor cbs_h266_unit_types[] = { + CBS_UNIT_TYPE_INTERNAL_REF(VVC_DCI_NUT, H266RawDCI, extension_data.data), CBS_UNIT_TYPE_INTERNAL_REF(VVC_OPI_NUT, H266RawOPI, extension_data.data), CBS_UNIT_TYPE_INTERNAL_REF(VVC_VPS_NUT, H266RawVPS, extension_data.data), CBS_UNIT_TYPE_INTERNAL_REF(VVC_SPS_NUT, H266RawSPS, extension_data.data), diff --git a/libavcodec/cbs_h266.h b/libavcodec/cbs_h266.h index 693d1ca1fd..87aa2d849d 100644 --- a/libavcodec/cbs_h266.h +++ b/libavcodec/cbs_h266.h @@ -241,6 +241,16 @@ typedef struct H266RawOPI { H266RawExtensionData extension_data; } H266RawOPI; +typedef struct H266RawDCI { + H266RawNALUnitHeader nal_unit_header; + + uint8_t dci_reserved_zero_4bits; + uint8_t dci_num_ptls_minus1; + H266RawProfileTierLevel dci_profile_tier_level[VVC_MAX_DCI_PTLS]; + uint8_t dci_extension_flag; + H266RawExtensionData extension_data; +} H266RawDCI; + typedef struct H266RawVPS { H266RawNALUnitHeader nal_unit_header; diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index d9c8e0afbe..4ea29ec789 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -650,6 +650,30 @@ static int FUNC(opi)(CodedBitstreamContext *ctx, RWContext *rw, return 0; } +static int FUNC(dci)(CodedBitstreamContext *ctx, RWContext *rw, + H266RawDCI *current) +{ + int err, i; + + HEADER("Decoding capability information"); + + CHECK(FUNC(nal_unit_header)(ctx, rw, + ¤t->nal_unit_header, VVC_DCI_NUT)); + + ub(4, dci_reserved_zero_4bits); + ub(4, dci_num_ptls_minus1); + for (i = 0; i <= current->dci_num_ptls_minus1; i++) + CHECK(FUNC(profile_tier_level)(ctx, rw, + current->dci_profile_tier_level + i, 1, 0)); + + flag(dci_extension_flag); + if (current->dci_extension_flag) + CHECK(FUNC(extension_data)(ctx, rw, ¤t->extension_data)); + CHECK(FUNC(rbsp_trailing_bits)(ctx, rw)); + + return 0; +} + static int FUNC(vps) (CodedBitstreamContext *ctx, RWContext *rw, H266RawVPS *current) { diff --git a/libavcodec/vvc.h b/libavcodec/vvc.h index 099d2fc2ad..eda1b40eef 100644 --- a/libavcodec/vvc.h +++ b/libavcodec/vvc.h @@ -76,6 +76,9 @@ enum { //7.4.3.3 The value of vps_max_sublayers_minus1 shall be in the range of 0 to 6, inclusive VVC_MAX_SUBLAYERS = 7, + //7.3.2.1 dci_num_ptls_minus1 is u(4) + VVC_MAX_DCI_PTLS = 16, + //7.4.3.3 vps_num_ptls_minus1 is u(8) VVC_MAX_PTLS = 256, From patchwork Sun Jul 2 23:26:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42390 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1e:b0:12b:9ae3:586d with SMTP id c30csp3986378pzh; Sun, 2 Jul 2023 16:28:25 -0700 (PDT) X-Google-Smtp-Source: APBJJlHM5X35gBHYNJI1vWuvdeYmFVOPV2gCLYLRxZ2SxC2ssQG727L7wUSLjSk2X/99xli3zQ46 X-Received: by 2002:a17:906:f98c:b0:993:330a:d925 with SMTP id li12-20020a170906f98c00b00993330ad925mr3660381ejb.34.1688340505051; Sun, 02 Jul 2023 16:28:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688340505; cv=none; d=google.com; s=arc-20160816; b=0ttdg5G1GXo6jLBHL2PXHugxD1ngwOTr+gj+9NIIEJLrDaTPR3QTQFKPnl2ytIfqby pOYP/lEdojJ3d0YN838B6tNwWwWmncwaLVhIftccBi1KanNo+kZwpZSdcDL9EtL20kFo WG598cyjHoP7cexey4vU8Q02xDeOacG98GTFWJJouMGpGjJh8HlaxM+aTGKepM9vvdbm alWpnF1PnSDzxbCZJMLsnsRlJFYgOsOANxJM8y6mC3Ynu+UJFGV1AHsNW8ICRH9pzeNP t7aZdXLEp6Hpoi/+Y2zn1m1iPN4J0IgPQVkNd1bkNc8EwmLPE2xFtFquMoupQJDPcGjp sYmQ== 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:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=iscWbR+9xT6O2mkE6ql9AW3BQijpP6g3MYr5itJcq9Q=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=qHbsH59Bx3Ul+Y8iluNrB1HMHVP5I4Zbt1XSosmGGLVqvbkQk1DnT5ETj3zBrsSyrH Z4BCo8ntd7k0HJhix/bfsp3f2+3zv5i/wTDEjwIq31EEx6p93DIp/CC5feyrbkMWLtG9 gprwS/NcnsLpRoQY/FmKs4XOkE3tIrvv5Anh5CWPN5orto9M6meQ9ppisprGBaAIEqN/ uvIllJe2F6a/VQM6SYzIHxC6zj9ngRgx2SbOJHpHNDNUIT2OJ84fKbbEVn/FANZd+x0V z1Di1itbAke017OZ8X4ZODPhmyZFNl81HFDZpdsa4BXG5WgI9YGVhFHP05vUtuW07HfQ Mbkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=H93tACeL; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id os5-20020a170906af6500b00992d262f9f7si4123119ejb.933.2023.07.02.16.28.24; Sun, 02 Jul 2023 16:28:25 -0700 (PDT) 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=@gmail.com header.s=20221208 header.b=H93tACeL; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5FB9D68C4F9; Mon, 3 Jul 2023 02:28:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f47.google.com (mail-ot1-f47.google.com [209.85.210.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F67A68C2EE for ; Mon, 3 Jul 2023 02:27:56 +0300 (EEST) Received: by mail-ot1-f47.google.com with SMTP id 46e09a7af769-6b74e2d8c98so3327518a34.2 for ; Sun, 02 Jul 2023 16:27:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688340475; x=1690932475; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=VC3LmHA/H88fxeO5EUWVeetYrhrSPq/l/enR5Me9E/4=; b=H93tACeLw3GF8NQYTofIPCm5Zjou6StQA2GBndqrxiDJYGHHfWNoJkrbxD6h0OKMlj OwnkPyOPe1wNxYKLt6UOQZoCSpFj6qlFyAD8PvwNeNLvkGaIWprAI//sqpGnLnv3wiHs D6ibKZtsLVEx+iXIx9mJHaJKdQeLbp0oatd9ssOOTWz0kAFKQGL0vE5OJY7Ot9rO0oNY kigOeW37OZ5GXEX8vgwbzwF9ge9mzarjlgY2RCM9ve5nthnbIjmZnEV5qJA8yMNYZ8Fg yilhss7yxkNV0++MMQd6cJYYhONqMQZRfsLsDgrCmP0diWIieBCduflYAfKQYJwxCiMs BF7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688340475; x=1690932475; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VC3LmHA/H88fxeO5EUWVeetYrhrSPq/l/enR5Me9E/4=; b=d0Z8rv6cpfjjn5GVBkemSJFdIWgRLvw/93b8uykMtqtXTxctjPALHAK4KVGIKipaAW GhdnIeWMofmWn8/XsMP1n2opHzNkqPoKqZV0U2y0ueca/+49ty9VstQSNP2B39BYaO14 tGQD1Xtvm1HLuG505AmMs+7AltzgbFr05mla+hwZpYQkK8c2jVvZHQm9DFAT8SYmXSpj 283kak2c6UFHlPwDAeM8Xi3hZU3qFI/tS7pcEvcGFf8zhAgrgwtSHYMA/sSovrWjXZuP XA2qpYYAO5Ky4rII66AXJvP7SnGB9bclbFb1L4mZQ8juHj5Uw6xmYbsWJNTAC+IGre7z ikOA== X-Gm-Message-State: AC+VfDzCkOoWBtvvpsfIhN0veAPFEMN4pxoVxR6O9EG2oXVzXdGmjAy2 aJN5Snj2JqTgjsQl/RTp1SDY3cp5CKE= X-Received: by 2002:a05:6830:44a:b0:6b8:7e53:e7c3 with SMTP id d10-20020a056830044a00b006b87e53e7c3mr8833433otc.31.1688340474837; Sun, 02 Jul 2023 16:27:54 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id f17-20020a9d7b51000000b006b89596bc61sm3265098oto.61.2023.07.02.16.27.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 16:27:54 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Jul 2023 20:26:21 -0300 Message-ID: <20230702232622.6870-3-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230702232622.6870-1-jamrial@gmail.com> References: <20230702232622.6870-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/cbs_h266: add support for Adaptation parameter set NALU type 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: 2cnvjxN69R9h Signed-off-by: James Almer --- libavcodec/cbs_h2645.c | 21 +++ libavcodec/cbs_h266.h | 46 ++++++ libavcodec/cbs_h266_syntax_template.c | 201 ++++++++++++++++++++++++++ libavcodec/vvc.h | 10 ++ 4 files changed, 278 insertions(+) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index 95da597427..34c5d1d372 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -1116,6 +1116,16 @@ static int cbs_h266_read_nal_unit(CodedBitstreamContext *ctx, } break; + case VVC_PREFIX_APS_NUT: + case VVC_SUFFIX_APS_NUT: + { + err = cbs_h266_read_aps(ctx, &gbc, unit->content, + unit->type == VVC_PREFIX_APS_NUT); + + if (err < 0) + return err; + } + break; case VVC_PH_NUT: { H266RawPH *ph = unit->content; @@ -1668,6 +1678,15 @@ static int cbs_h266_write_nal_unit(CodedBitstreamContext *ctx, } break; + case VVC_PREFIX_APS_NUT: + case VVC_SUFFIX_APS_NUT: + { + err = cbs_h266_write_aps(ctx, pbc, unit->content, + unit->type == VVC_PREFIX_APS_NUT); + if (err < 0) + return err; + } + break; case VVC_PH_NUT: { H266RawPH *ph = unit->content; @@ -2004,6 +2023,8 @@ static const CodedBitstreamUnitTypeDescriptor cbs_h266_unit_types[] = { CBS_UNIT_TYPE_INTERNAL_REF(VVC_VPS_NUT, H266RawVPS, extension_data.data), CBS_UNIT_TYPE_INTERNAL_REF(VVC_SPS_NUT, H266RawSPS, extension_data.data), CBS_UNIT_TYPE_INTERNAL_REF(VVC_PPS_NUT, H266RawPPS, extension_data.data), + CBS_UNIT_TYPE_INTERNAL_REF(VVC_PREFIX_APS_NUT, H266RawAPS, extension_data.data), + CBS_UNIT_TYPE_INTERNAL_REF(VVC_SUFFIX_APS_NUT, H266RawAPS, extension_data.data), CBS_UNIT_TYPE_POD(VVC_PH_NUT , H266RawPH), CBS_UNIT_TYPE_POD(VVC_AUD_NUT, H266RawAUD), diff --git a/libavcodec/cbs_h266.h b/libavcodec/cbs_h266.h index 87aa2d849d..d068ffa87a 100644 --- a/libavcodec/cbs_h266.h +++ b/libavcodec/cbs_h266.h @@ -576,6 +576,52 @@ typedef struct H266RawPPS { uint16_t sub_pic_id_val[VVC_MAX_SLICES]; } H266RawPPS; +typedef struct H266RawAPS { + H266RawNALUnitHeader nal_unit_header; + uint8_t aps_params_type; + uint8_t aps_adaptation_parameter_set_id; + uint8_t aps_chroma_present_flag; + + uint8_t alf_luma_filter_signal_flag; + uint8_t alf_chroma_filter_signal_flag; + uint8_t alf_cc_cb_filter_signal_flag; + uint8_t alf_cc_cr_filter_signal_flag; + uint8_t alf_luma_clip_flag; + uint8_t alf_luma_num_filters_signalled_minus1; + uint8_t alf_luma_coeff_delta_idx[VVC_NUM_ALF_FILTERS]; + uint8_t alf_luma_coeff_abs[VVC_NUM_ALF_FILTERS][12]; + uint8_t alf_luma_coeff_sign[VVC_NUM_ALF_FILTERS][12]; + uint8_t alf_luma_clip_idx[VVC_NUM_ALF_FILTERS][12]; + uint8_t alf_chroma_clip_flag; + uint8_t alf_chroma_num_alt_filters_minus1; + uint8_t alf_chroma_coeff_abs[8][6]; + uint8_t alf_chroma_coeff_sign[8][6]; + uint8_t alf_chroma_clip_idx[8][6]; + uint8_t alf_cc_cb_filters_signalled_minus1; + uint8_t alf_cc_cb_mapped_coeff_abs[4][7]; + uint8_t alf_cc_cb_coeff_sign[4][7]; + uint8_t alf_cc_cr_filters_signalled_minus1; + uint8_t alf_cc_cr_mapped_coeff_abs[4][7]; + uint8_t alf_cc_cr_coeff_sign[4][7]; + + uint8_t scaling_list_copy_mode_flag[28]; + uint8_t scaling_list_pred_mode_flag[28]; + uint8_t scaling_list_pred_id_delta[28]; + int8_t scaling_list_dc_coef[28]; + int8_t scaling_list_delta_coef[28][64]; + + uint8_t lmcs_min_bin_idx; + uint8_t lmcs_delta_max_bin_idx; + uint8_t lmcs_delta_cw_prec_minus1; + uint16_t lmcs_delta_abs_cw[16]; + uint8_t lmcs_delta_sign_cw_flag[16]; + uint8_t lmcs_delta_abs_crs; + uint8_t lmcs_delta_sign_crs_flag; + + uint8_t aps_extension_flag; + H266RawExtensionData extension_data; +} H266RawAPS; + typedef struct H266RawAUD { H266RawNALUnitHeader nal_unit_header; uint8_t aud_irap_or_gdr_flag; diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 4ea29ec789..61a7237978 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -2183,6 +2183,207 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, return 0; } +static int FUNC(alf_data)(CodedBitstreamContext *ctx, RWContext *rw, + H266RawAPS *current) +{ + int err, j, k; + + flag(alf_luma_filter_signal_flag); + + if (current->aps_chroma_present_flag) { + flag(alf_chroma_filter_signal_flag); + flag(alf_cc_cb_filter_signal_flag); + flag(alf_cc_cr_filter_signal_flag); + } else { + infer(alf_chroma_filter_signal_flag, 0); + infer(alf_cc_cb_filter_signal_flag, 0); + infer(alf_cc_cr_filter_signal_flag, 0); + } + + if (current->alf_luma_filter_signal_flag) { + flag(alf_luma_clip_flag); + ue(alf_luma_num_filters_signalled_minus1, 0, VVC_NUM_ALF_FILTERS - 1); + if (current->alf_luma_num_filters_signalled_minus1 > 0) { + unsigned int bits = av_ceil_log2(current->alf_luma_num_filters_signalled_minus1 + 1); + for (int filt_idx = 0; filt_idx < VVC_NUM_ALF_FILTERS; filt_idx++) + us(bits, alf_luma_coeff_delta_idx[filt_idx], + 0, current->alf_luma_num_filters_signalled_minus1, + 1, filt_idx); + } + for (int sf_idx = 0; sf_idx <= current->alf_luma_num_filters_signalled_minus1; sf_idx++) + for (j = 0; j < 12; j++) { + ues(alf_luma_coeff_abs[sf_idx][j], 0, 128, 2, sf_idx, j); + if (current->alf_luma_coeff_abs[sf_idx][j]) + ubs(1, alf_luma_coeff_sign[sf_idx][j], 2, sf_idx, j); + else + infer(alf_luma_coeff_sign[sf_idx][j], 0); + } + if (current->alf_luma_clip_flag) + for (int sf_idx = 0; sf_idx <= current->alf_luma_num_filters_signalled_minus1; sf_idx++) + for (j = 0; j < 12; j++) + ubs(2, alf_luma_clip_idx[sf_idx][j], 2, sf_idx, j); + } + + if (current->alf_chroma_filter_signal_flag) { + flag(alf_chroma_clip_flag); + ue(alf_chroma_num_alt_filters_minus1, 0, 7); + for (int alt_idx = 0; alt_idx <= current->alf_chroma_num_alt_filters_minus1; alt_idx++) { + for (j = 0; j < 6; j++) { + ues(alf_chroma_coeff_abs[alt_idx][j], 0, 128, 2, alt_idx, j); + if (current->alf_chroma_coeff_abs[alt_idx][j] > 0) + ubs(1, alf_chroma_coeff_sign[alt_idx][j], 2, alt_idx, j); + else + infer(alf_chroma_coeff_sign[alt_idx][j], 0); + } + if (current->alf_chroma_clip_flag) + for(j = 0; j < 6; j++) + ubs(2, alf_chroma_clip_idx[alt_idx][j], 2, alt_idx, j); + } + } + + if (current->alf_cc_cb_filter_signal_flag) { + ue(alf_cc_cb_filters_signalled_minus1, 0, 3); + for (k = 0; k <= current->alf_cc_cb_filters_signalled_minus1; k++) { + for (j = 0; j < 7; j++) { + ubs(3, alf_cc_cb_mapped_coeff_abs[k][j], 2, k, j); + if (current->alf_cc_cb_mapped_coeff_abs[k][j]) + ubs(1, alf_cc_cb_coeff_sign[k][j], 2, k, j); + else + infer(alf_cc_cb_coeff_sign[k][j], 0); + } + } + } + + if (current->alf_cc_cr_filter_signal_flag) { + ue(alf_cc_cr_filters_signalled_minus1, 0, 3); + for (k = 0; k < current->alf_cc_cr_filters_signalled_minus1 + 1; k++) { + for (j = 0; j < 7; j++) { + ubs(3, alf_cc_cr_mapped_coeff_abs[k][j], 2, k, j); + if (current->alf_cc_cr_mapped_coeff_abs[k][j]) + ubs(1, alf_cc_cr_coeff_sign[k][j], 2, k, j); + else + infer(alf_cc_cr_coeff_sign[k][j], 0); + } + } + } + + return 0; +} + +static int FUNC(lmcs_data)(CodedBitstreamContext *ctx, RWContext *rw, + H266RawAPS *current) +{ + int err, i, lmcs_max_bin_idx; + + ue(lmcs_min_bin_idx, 0, 15); + ue(lmcs_delta_max_bin_idx, 0, 15); + ue(lmcs_delta_cw_prec_minus1, 0, 14); + + lmcs_max_bin_idx = 15 - current->lmcs_delta_max_bin_idx; + + if (lmcs_max_bin_idx < current->lmcs_min_bin_idx) + return AVERROR_INVALIDDATA; + + for (i = current->lmcs_min_bin_idx; i <= lmcs_max_bin_idx; i++) { + ubs(current->lmcs_delta_cw_prec_minus1 + 1, lmcs_delta_abs_cw[i], 1, i); + if (current->lmcs_delta_abs_cw[i] > 0) + flags(lmcs_delta_sign_cw_flag[i], 1, i); + else + infer(lmcs_delta_sign_cw_flag[i], 0); + } + + if (current->aps_chroma_present_flag) { + ub(3, lmcs_delta_abs_crs); + if (current->lmcs_delta_abs_crs > 0) + flag(lmcs_delta_sign_crs_flag); + else + infer(lmcs_delta_sign_crs_flag, 0); + } else { + infer(lmcs_delta_abs_crs, 0); + infer(lmcs_delta_sign_crs_flag, 0); + } + + return 0; +} + +static int FUNC(scaling_list_data)(CodedBitstreamContext *ctx, RWContext *rw, + H266RawAPS *current) +{ + // 7.4.3.4, deriving DiagScanOrder + static const uint8_t diag_scan_order[64][2] = { + { 0, 0, }, { 0, 1, }, { 1, 0, }, { 0, 2, }, { 1, 1, }, { 2, 0, }, { 0, 3, }, { 1, 2, }, + { 2, 1, }, { 3, 0, }, { 0, 4, }, { 1, 3, }, { 2, 2, }, { 3, 1, }, { 4, 0, }, { 0, 5, }, + { 1, 4, }, { 2, 3, }, { 3, 2, }, { 4, 1, }, { 5, 0, }, { 0, 6, }, { 1, 5, }, { 2, 4, }, + { 3, 3, }, { 4, 2, }, { 5, 1, }, { 6, 0, }, { 0, 7, }, { 1, 6, }, { 2, 5, }, { 3, 4, }, + { 4, 3, }, { 5, 2, }, { 6, 1, }, { 7, 0, }, { 1, 7, }, { 2, 6, }, { 3, 5, }, { 4, 4, }, + { 5, 3, }, { 6, 2, }, { 7, 1, }, { 2, 7, }, { 3, 6, }, { 4, 5, }, { 5, 4, }, { 6, 3, }, + { 7, 2, }, { 3, 7, }, { 4, 6, }, { 5, 5, }, { 6, 4, }, { 7, 3, }, { 4, 7, }, { 5, 6, }, + { 6, 5, }, { 7, 4, }, { 5, 7, }, { 6, 6, }, { 7, 5, }, { 6, 7, }, { 7, 6, }, { 7, 7, }, }; + int err; + + for (int id = 0; id < 28; id ++) { + if (current->aps_chroma_present_flag || id % 3 == 2 || id == 27) { + flags(scaling_list_copy_mode_flag[id], 1, id); + if (!current->scaling_list_copy_mode_flag[id]) + flags(scaling_list_pred_mode_flag[id], 1, id); + if ((current->scaling_list_copy_mode_flag[id] || + current->scaling_list_pred_mode_flag[id]) && + id != 0 && id != 2 && id != 8) { + int max_id_delta = (id < 2) ? id : ((id < 8) ? (id - 2) : (id - 8)); + ues(scaling_list_pred_id_delta[id], 0, max_id_delta, 1, id); + } + if (!current->scaling_list_copy_mode_flag[id]) { + int matrix_size = id < 2 ? 2 : (id < 8 ? 4 : 8); + if (id > 13) { + int idx = id - 14; + ses(scaling_list_dc_coef[idx], -128, 127, 1, idx); + } else + infer(scaling_list_dc_coef[id], 0); + for (int i = 0; i < matrix_size * matrix_size; i++) { + int x = diag_scan_order[i][0]; + int y = diag_scan_order[i][1]; + if (!(id > 25 && x >= 4 && y >= 4)) + ses(scaling_list_delta_coef[id][i], -128, 127, 2, id, i); + } + } else + infer(scaling_list_dc_coef[id], 0); + } + } + + return 0; +} + +static int FUNC(aps)(CodedBitstreamContext *ctx, RWContext *rw, + H266RawAPS *current, int prefix) +{ + int err; + + if (prefix) + HEADER("Prefix Adaptation parameter set"); + else + HEADER("Suffix Adaptation parameter set"); + + CHECK(FUNC(nal_unit_header)(ctx, rw, ¤t->nal_unit_header, + prefix ? VVC_PREFIX_APS_NUT + : VVC_SUFFIX_APS_NUT)); + + ub(3, aps_params_type); + ub(5, aps_adaptation_parameter_set_id); + flag(aps_chroma_present_flag); + if (current->aps_params_type == VVC_ASP_TYPE_ALF) + CHECK(FUNC(alf_data)(ctx, rw, current)); + else if(current->aps_params_type == VVC_ASP_TYPE_LMCS) + CHECK(FUNC(lmcs_data)(ctx, rw, current)); + else if (current->aps_params_type == VVC_ASP_TYPE_SCALING) + CHECK(FUNC(scaling_list_data)(ctx, rw, current)); + flag(aps_extension_flag); + if (current->aps_extension_flag) + CHECK(FUNC(extension_data) (ctx, rw, ¤t->extension_data)); + CHECK(FUNC(rbsp_trailing_bits) (ctx, rw)); + + return 0; +} + static int FUNC(aud) (CodedBitstreamContext *ctx, RWContext *rw, H266RawAUD *current) { diff --git a/libavcodec/vvc.h b/libavcodec/vvc.h index eda1b40eef..49822ecc84 100644 --- a/libavcodec/vvc.h +++ b/libavcodec/vvc.h @@ -66,6 +66,12 @@ enum VVCSliceType { VVC_SLICE_TYPE_I = 2, }; +enum VVCAPSType { + VVC_ASP_TYPE_ALF = 0, + VVC_ASP_TYPE_LMCS = 1, + VVC_ASP_TYPE_SCALING = 2, +}; + enum { //6.2 we can have 3 sample arrays VVC_MAX_SAMPLE_ARRAYS = 3, @@ -95,6 +101,10 @@ enum { // 7.4.4.1: ptl_num_sub_profiles is u(8) VVC_MAX_SUB_PROFILES = 256, + // 7.4.3.18: The variable NumAlfFilters specifying the number of different adaptive loop + // filters is set equal to 25. + VVC_NUM_ALF_FILTERS = 25, + // A.4.2: according to (1577), MaxDpbSize is bounded above by 2 * maxDpbPicBuf(8) VVC_MAX_DPB_SIZE = 16, From patchwork Sun Jul 2 23:26:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42391 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1e:b0:12b:9ae3:586d with SMTP id c30csp3986408pzh; Sun, 2 Jul 2023 16:28:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlE2ADo29LVXlmD8qeE8MueBx91P/FxZn6qMx0SwMi/GtNybmWWo3TMq8gXe9lpnh5NlDirt X-Received: by 2002:a05:6402:5155:b0:51d:fff2:dda4 with SMTP id n21-20020a056402515500b0051dfff2dda4mr3403863edd.21.1688340513512; Sun, 02 Jul 2023 16:28:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688340513; cv=none; d=google.com; s=arc-20160816; b=vKCpN3l0qHTDdsklxXkkuiP/N1K38lY1FE1c2uUGkvUPiDzRTYn3/gqR1yLGBdP2Qp bzxHXFf01gfkUcq8yPXzjQgwyNrZ9jxafdPy8CAlPHbshPX5v8aSMP1BB9Iixoipuuik krpPcy4pjV1ZFOn/rK+AGHQETSTtHWJqEafDMNdiyBSgsUNemQ7RQ8BbAmMRSp02dnd/ +jcqdSpdLCAAeSVS+gMpy7MEcBNquteFjhpKRtqXnC5GVMqw5xTdg/t1r63uAyOl5qP0 PjUbB0HrOeDabphQLsIH+U/Denf+O9CSXHBzn4rXjavUd+UWZWyYvcCfDwU00kFwnvwN +Wlw== 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:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=pB+B3NIhYheadVcIgqjcBE/cgWMJs10EeWvaxtKM75U=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=VKm/Rkr1fdl6bMm35a4u9TCsgF07kmsN1q9SWibINzHwvtCohvFnRRmytqFpTO/XkA kxlff/EH+oTHngp3+fiIAK4ge6u30gkOd8b/2K/bdHjdueqnQA0jyIIbQt/e0q4wIroR w7gKVomqGUSkfgHJlus0iojzKWAwmqRqfBlc17x7r44hcJ0j9sCdsUqAbIsHxHCi3X2l v/ilB6afYK3BhA7S8aUQ7oGqIB6HacFdTMHcfm2wrLILIbIjW+ppt+gPwDr70/7QJjph fwBefmn62a3oHQi0xZVhHZ1bbesAMpIV48TsL+3F/n7uEegDBCE4vmYHPptSKqRZo2bB RQ1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=i3h9Cnyj; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n21-20020aa7c455000000b0051a4b972b70si7397209edr.686.2023.07.02.16.28.33; Sun, 02 Jul 2023 16:28:33 -0700 (PDT) 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=@gmail.com header.s=20221208 header.b=i3h9Cnyj; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8663D68C4FF; Mon, 3 Jul 2023 02:28:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f44.google.com (mail-ot1-f44.google.com [209.85.210.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A208668C4CB for ; Mon, 3 Jul 2023 02:27:57 +0300 (EEST) Received: by mail-ot1-f44.google.com with SMTP id 46e09a7af769-6b5ef64bca6so3431299a34.3 for ; Sun, 02 Jul 2023 16:27:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688340476; x=1690932476; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=cg+kbbm79rZJ6h38Ts3CoHOIGphqfJB8+pELrVa+qQE=; b=i3h9CnyjruvRuma8lCyPmOMXjN/O/ysot03Zjc2vq2uyENnJ817rlDtWfV6bOhIUVf PpiniOK8GDt+IAaxmyTEK1DS0vTU2vAv6LbRC2OwSCHmCmb50yNDi2aO2FJwGUChnqL9 AzAW+R2Dy6suWjjALRG6pBot6cD0S/+iWmiJp3XUIPvZrPGB5RH2EUj4Jj2npA3OnCxQ Fef/C9BR4JqVA1fntoQHVCqnz7eJzvLIJe7QzVuGPf7DfTlu72Jw1CEp1COGGoLTVLV6 Y7edQ1OlDzGDQVWsJ0Kup55+2Lc8atZai58Jzakgju7tQS4E9Jw6EdmJ1vaeYhKUp/Xv xcbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688340476; x=1690932476; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cg+kbbm79rZJ6h38Ts3CoHOIGphqfJB8+pELrVa+qQE=; b=MWLKIee27+5QXy2TBRcuxVPOuphrwzpgrVS5YUFpwR3Qc1WDak/fyvRmrYNYRTOX2n qLKNmarJL9jH91EVemzShdBKkwjbCu7Iy/vkn9OCmJUFzTjo1MO+ROV+wsT4AcWqJ/cE ALyFAvIRWANkPJ+zri/fKFIk59SoyzhIzZLBfHgo50kT2nT57wLzIjmSWrnc6yoKDnfv ddbmjE2nXfjXi9zEUmH+5LRefnlp2DU0qG0cz5pmMvg3PCvMLtb5RiN/xslGKKVR1bvI fMhvOM/MTIXJMLIJXuXorpYXArZq8rXswHkCS/Qgm+RS14xpsGnljSMxWVvj6cjatjX8 GqHw== X-Gm-Message-State: AC+VfDxanWqYJ9dG6lNxFzdXIxUrhFRogXIM3nVw9Vqmo+cjOrGAns5H YDGTBhApOMHownyIvrQEhwoOjXAer/E= X-Received: by 2002:a9d:6f85:0:b0:6b8:8a3b:86be with SMTP id h5-20020a9d6f85000000b006b88a3b86bemr8776094otq.26.1688340476036; Sun, 02 Jul 2023 16:27:56 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id f17-20020a9d7b51000000b006b89596bc61sm3265098oto.61.2023.07.02.16.27.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 16:27:55 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Jul 2023 20:26:22 -0300 Message-ID: <20230702232622.6870-4-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230702232622.6870-1-jamrial@gmail.com> References: <20230702232622.6870-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] fate/cbs: add more VVC tests 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: YNWGyRG1nYpz Signed-off-by: James Almer --- tests/fate/cbs.mak | 5 +++++ tests/ref/fate/cbs-vvc-APSALF_A_2 | 1 + tests/ref/fate/cbs-vvc-APSLMCS_D_1 | 1 + tests/ref/fate/cbs-vvc-APSMULT_A_4 | 1 + tests/ref/fate/cbs-vvc-DCI_A_3 | 1 + tests/ref/fate/cbs-vvc-OPI_B_3 | 1 + 6 files changed, 10 insertions(+) create mode 100644 tests/ref/fate/cbs-vvc-APSALF_A_2 create mode 100644 tests/ref/fate/cbs-vvc-APSLMCS_D_1 create mode 100644 tests/ref/fate/cbs-vvc-APSMULT_A_4 create mode 100644 tests/ref/fate/cbs-vvc-DCI_A_3 create mode 100644 tests/ref/fate/cbs-vvc-OPI_B_3 diff --git a/tests/fate/cbs.mak b/tests/fate/cbs.mak index 4d8742d99c..802b0351a3 100644 --- a/tests/fate/cbs.mak +++ b/tests/fate/cbs.mak @@ -167,12 +167,17 @@ fate-cbs-hevc: $(FATE_CBS_HEVC-yes) # H.266 read/write FATE_CBS_VVC_SAMPLES = \ + APSALF_A_2.bit \ + APSLMCS_D_1.bit \ + APSMULT_A_4.bit \ AUD_A_3.bit \ BOUNDARY_A_3.bit \ BUMP_A_2.bit \ CodingToolsSets_A_2.bit \ CROP_B_4.bit \ + DCI_A_3.bit \ HRD_A_3.bit \ + OPI_B_3.bit \ PHSH_B_1.bit \ POC_A_1.bit \ PPS_B_1.bit \ diff --git a/tests/ref/fate/cbs-vvc-APSALF_A_2 b/tests/ref/fate/cbs-vvc-APSALF_A_2 new file mode 100644 index 0000000000..eb2fc02a5e --- /dev/null +++ b/tests/ref/fate/cbs-vvc-APSALF_A_2 @@ -0,0 +1 @@ +c981a00e28e51adde1654850935a889d diff --git a/tests/ref/fate/cbs-vvc-APSLMCS_D_1 b/tests/ref/fate/cbs-vvc-APSLMCS_D_1 new file mode 100644 index 0000000000..430dc934b7 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-APSLMCS_D_1 @@ -0,0 +1 @@ +e2e3407885d84e0dee5ec5d51dd4a3a6 diff --git a/tests/ref/fate/cbs-vvc-APSMULT_A_4 b/tests/ref/fate/cbs-vvc-APSMULT_A_4 new file mode 100644 index 0000000000..79f29373b9 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-APSMULT_A_4 @@ -0,0 +1 @@ +66dc3dba5c25bcaab231007bc059c331 diff --git a/tests/ref/fate/cbs-vvc-DCI_A_3 b/tests/ref/fate/cbs-vvc-DCI_A_3 new file mode 100644 index 0000000000..fec635afa5 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-DCI_A_3 @@ -0,0 +1 @@ +2b0eb33eb66078a3454619c5612e7bc2 diff --git a/tests/ref/fate/cbs-vvc-OPI_B_3 b/tests/ref/fate/cbs-vvc-OPI_B_3 new file mode 100644 index 0000000000..99c85165aa --- /dev/null +++ b/tests/ref/fate/cbs-vvc-OPI_B_3 @@ -0,0 +1 @@ +c35066104c7cf9be0e7b9aad5b576256