From patchwork Sat Jun 22 06:24:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 50074 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp957499vqz; Sat, 22 Jun 2024 00:42:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVDViLGLA2jlk7hVmjHr2s+LCpdpxSM3dyHxAtglK6XOzKpohMt2dz4a2zk9oVycyq1t0lDzEMSj0ccSHjU8W5nAbmA3z25XmucWg== X-Google-Smtp-Source: AGHT+IH6+Wu0fnxYI7kBkFP5Nvbs2pYAHYS7qNn4+e984wi2+z4WHqQzW9R4TGarFZ1LUCL6ef0a X-Received: by 2002:a17:907:31ca:b0:a6f:49b1:dec5 with SMTP id a640c23a62f3a-a6fab643faamr738626566b.46.1719042170578; Sat, 22 Jun 2024 00:42:50 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a6fcf4533dasi163110666b.136.2024.06.22.00.42.50; Sat, 22 Jun 2024 00:42:50 -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=@outlook.com header.s=selector1 header.b=Apu7RQwF; arc=fail (body hash mismatch); 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 65E4968D816; Sat, 22 Jun 2024 09:24:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01olkn2034.outbound.protection.outlook.com [40.92.53.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B9CF68D807 for ; Sat, 22 Jun 2024 09:24:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PewHqjuQd2xdhdZlAwtro5Hvn/RJTc2e1O/C+KlGL9VRDGxjdmpPtDEs3KZCjgl/Jwa2WzhcEcPrGqT7mGrnb3q1GHJJt68wzkiQwfyVPsD9JCYm58NfWRB6fYV0t4OIApjDD1mk8++iaJ3o3Hjegq1Dnz4GyekWy1x5M47G9kjbRAt7Sdb9+iWnJTltyV7HTPr5lpbPktotv4ci9LhWUm7LrJoID+gBufzQmwR8EFtmzg/qFsha0vKa5A7q2o40OHz+zFM0lngE8Zxop2I99JI0aBYNlkfCxl3t2vSB1VcPuSoQfItp1hB4JsTA7nWN8SZB6tlfQoyqGU0N+1pcUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=OnwlfDY7kP8skKFm71mDN8NrU0yB37ckomwBrjtq1IE=; b=aAvjW2VFY8gw49HG0+AjLSkOa9ZWobicVidYimvys27/m6D9grTyz2DjojtaqMHoEn5d1Z8bqLGzxqHek9ptsysDZ8C6Lp14NdzB/UdIoixPyxio9boAA/RTBCzewic7OfX1FsP8k4CCQDEtUwpyVwyAEQqbUm9Ok2tr7Zv5mV1tjB9ZYtZF4KhtGbjd/PGxQKqdkkkdh/8C8qCbkfNnT/+dLZesvlyNVB4rLuG2ZyjJALBg+/w83pOqbNc2CY4z7FFfqPwm/2rmeXESnDvJwkQrhqqUW2SkdKIMdkskJZlwSV9yzgakpL2jBaeRpt6IHhFHNsfsDUKuWvN7dPegBw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OnwlfDY7kP8skKFm71mDN8NrU0yB37ckomwBrjtq1IE=; b=Apu7RQwF9cy8X+rKUIQGEaTYoNxvqGbK0cC6df9x/JjRtiMHRZfnRXOo0YmvmOjRoAtSzhY+hG7WYAN3XnwxujWCbwIIKE+WNyXxpblKyin91cXOy3bBGpndwrPli8J0F/aa0WvAXC+44YIAGSusRkuWnHwckljsTHBT6US9hezQDNbWG/wOnyFjQdRQf/DRV+ctCYVasZj4jXjhnudX04bxX5WXR5+080ZbzH5IoWpAlNKvPE8SVEWvh2Wn6LI14lI0lIFjDPQrrpQzToBMfcFrpdRzDbyUmZz+DnYgGO09r2CAFeMzX80lbd03oGbE5u800gY8c+GUK/ZK43RukA== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by KL1PR06MB6258.apcprd06.prod.outlook.com (2603:1096:820:d8::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.25; Sat, 22 Jun 2024 06:24:24 +0000 Received: from TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::81f7:9125:583a:1cca]) by TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::81f7:9125:583a:1cca%3]) with mapi id 15.20.7698.017; Sat, 22 Jun 2024 06:24:24 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 14:24:02 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240622062405.285359-1-nuomi2021@gmail.com> References: <20240622062405.285359-1-nuomi2021@gmail.com> X-TMN: [iwkkYl8vJgSqcNcrFz4+sWsOxjUqmBhH] X-ClientProxiedBy: TY2PR04CA0023.apcprd04.prod.outlook.com (2603:1096:404:f6::35) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20240622062405.285359-15-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|KL1PR06MB6258:EE_ X-MS-Office365-Filtering-Correlation-Id: 89aa81c9-3be3-4494-36d2-08dc9283f5ee X-Microsoft-Antispam: BCL:0; ARA:14566002|461199025|440099025|3412199022|1710799023; X-Microsoft-Antispam-Message-Info: cg9AFNrvEI5ophK0CN44GLe1DfTkk47NeQu8eLYuD765nBS3UyyuxtCVQREwtLMWJBPRxSrrl2Dj7SqU0nZThsg3Y/k3juuFmY/jZmlXdJBw0J8Y75abahaWydDEUkNBYXCBDLi02b4+KPY05OFvbnyOWhGV2RCcjoiLVuQkr3nyLqcaMJARQCQXzHw8QoUvwsDvpr2hibaL1qO/Olx6AaVeYUUevRTBd5cDMi1I+/9rR5UZ16E3NonThLLYlxmQ9LdHfzBkCpJQ08y4luG0vGz1RnDvDsTUcPFfzUgQ9oxeEuHYRYncVC+WH2fW1/kN4xJ44qd/UNL2fxtICdqeKaX2fFBaGwRabC3OWU3KYFlRKZzXPmYUllQN/6iMViQRS/0Spdwg0TosRps0sp7VjcfNXe+jzauKhwBF/r1mp6fUryJxruUQ0HPXL5G1R7PqJAtks5+m1DXACis3qaFwEdfhtXwDHAW6LCh0bOidG+uGB3dWF3E7WifpQ6niTrkombv2ZE1Uxtc9OxT9+V6/tBBd7aIKuCRjUg5eQaYnQMcDSjdeE9mrTZLtEBIrCTY5QwkOSkRtZWjwGDlspCQmmrCfHE3CaGOkLsJLz82iIQGbgUi7w/Z22JHfABcJ74WG X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Lc0L5dqwrI4GHzKH80Znrzc5/EoGb31L1h/lg+puHrW2m4QOCNZZVmw98YDd3MRqA3rZbQ4lCpSbsBYFL1VRGHV4YUQr4oie7Ul52YXtxJtgn8+JB/hlMW+6DjFzEqJzZZ/d5PqnddNXl1dVofwEhz3l6gK2ChSO8DQm7Swm8W3H+iPb5pvAAf1ycAg3RGjHzNYNpUfrikT7pdXWJxxiNHvF/w/o2zL0oxafYPDs0xyfiPIXk2CFzYR7sZNcE7U7C2kvvcCCppIJEuNtcVVUqriFJ/9X5MnOewP/xFQAIA+KMmGMNth8hLkrvj/mPkbVvko8rDlwiZ+op8KY8SZJenTNKZ31d/hanlaJxGxuCgZ+yTR7/3yLheXwe27okxGFc1rlTBWwL3aUFMQKi3WZAWjpA2fGr0Opq6dWN4yjS85NPAVCVJ1BEeqC9q6v693Qxk6p2nsthu7MmZ6tE5VG3ecyIxjOR6ZU9m7cDM/r0jSf3hWq+J8k5f+R0xdmy3DA40ja7lL2WgP0T3TELGhoxgJuBZeYrTUJ1L7PKWOCuvDeCqYokCVknY7fdmpFddm3qiQZObXPTwbCQ0MVBaGu+zKRIXQS/vJ9jUUjRY97PgLFaXsDao2YfqaCcAVtX/dCLiyxWZfZCGHKg+N1NAXLaO3GGZgLUz+OGcbdQVPbU2CmVZ7csu5QgrIbi8ZcWnqar7GKXd2MLXSg6JK9SbC2/GhdtlFJis4nOONIWEig1gkVWJs5ZMVGOsf7SyYLW/ZQ02ghAiE0RNaGBgf30dJN+KzbpxPhJQT78SmqJ9DJ5xuS3jAas1WInQrOpSCvpldyVXVnuhLHdDw4AtI7+nGoHOKGR3BlZJ8cRVnVKwMfaCD28d6vvUOC1169mryPuxJefdUlO6Pz2BnTTW0LUWjWLNQemEe9mWX5UwSWeL9smyf9Fr9Lru0Iw0Gh+8sd4R3QPYihCKW7WPgBE7jAJnw9ur6XxWLqYHz10pQfUAH6Kx2iodDu2sSulmDGsE901stSMySbCH1S92x00IbIdPQwmhGPCX3LnPphWyzKsL4WgrcvMBqEMA5WtNIs6gjvVyX1VAobcqnOkyu+d320jktlZHk3z84O1SaPPwFvDa8IRNNRjJOEEzCP0N/ZwODcHOaOBzsYquSfajtagDIpQyVNXNpdGYZ9dg2Fjr53XiazEZvdr4EZPYFyyFyL145Pj1G/aO9wur8Gkwi6JsIrR8ZpzyHnpA9CkDXV5kcbLcCDgvW9q0pgx813KeblX1atl/4JHlDJIJ3tfNj+osZSE2rPTQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 89aa81c9-3be3-4494-36d2-08dc9283f5ee X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2024 06:24:24.5819 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR06MB6258 Subject: [FFmpeg-devel] [PATCH 15/18] avcodec/vvcdec: ps, derive virtual boundaries 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 Cc: Nuo Mi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: yOpVVZL7JzZ9 --- libavcodec/vvc/ps.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ libavcodec/vvc/ps.h | 6 ++++++ 2 files changed, 51 insertions(+) diff --git a/libavcodec/vvc/ps.c b/libavcodec/vvc/ps.c index 92368eafc2..58496c9fba 100644 --- a/libavcodec/vvc/ps.c +++ b/libavcodec/vvc/ps.c @@ -796,8 +796,49 @@ static int ph_max_num_subblock_merge_cand(const H266RawSPS *sps, const H266RawPi return sps->sps_sbtmvp_enabled_flag && ph->ph_temporal_mvp_enabled_flag; } +static int ph_vb_pos(uint16_t *vbs, uint8_t *num_vbs, const uint16_t *pos_minus_1, const uint8_t num_pos, uint16_t max, const int ctb_size_y) +{ + max = FF_CEIL_RSHIFT(max, 3) - 2; + for (int i = 0; i < num_pos; i++) { + if (pos_minus_1[i] > max) + return AVERROR_INVALIDDATA; + + vbs[i] = (pos_minus_1[i] + 1) << 3; + + // The distance between any two vertical virtual boundaries shall be greater than or equal to CtbSizeY luma samples + if (i && vbs[i] < vbs[i - 1] + ctb_size_y) + return AVERROR_INVALIDDATA; + } + *num_vbs = num_pos; + + return 0; +} + +#define VBF(f) (sps->sps_virtual_boundaries_present_flag ? sps->sps_##f : ph->r->ph_##f) +#define VBFS(c, d) VBF(virtual_boundary_pos_##c##_minus1), VBF(num_##d##_virtual_boundaries) + +static int ph_vb(VVCPH *ph, const H266RawSPS *sps, const H266RawPPS *pps) +{ + const int ctb_size_y = 1 << (sps->sps_log2_ctu_size_minus5 + 5); + int ret; + + if (!sps->sps_virtual_boundaries_enabled_flag) + return 0; + + ret = ph_vb_pos(ph->vb_pos_x, &ph->num_ver_vbs, VBFS(x, ver), pps->pps_pic_width_in_luma_samples, ctb_size_y); + if (ret < 0) + return ret; + + ret = ph_vb_pos(ph->vb_pos_y, &ph->num_hor_vbs, VBFS(y, hor), pps->pps_pic_height_in_luma_samples, ctb_size_y); + if (ret < 0) + return ret; + + return 0; +} + static int ph_derive(VVCPH *ph, const H266RawSPS *sps, const H266RawPPS *pps, const int poc_tid0, const int is_clvss) { + int ret; ph->max_num_subblock_merge_cand = ph_max_num_subblock_merge_cand(sps, ph->r); ph->poc = ph_compute_poc(ph->r, sps, poc_tid0, is_clvss); @@ -805,6 +846,10 @@ static int ph_derive(VVCPH *ph, const H266RawSPS *sps, const H266RawPPS *pps, co if (pps->pps_wp_info_in_ph_flag) pred_weight_table(&ph->pwt, &ph->r->ph_pred_weight_table); + ret = ph_vb(ph, sps, pps); + if (ret < 0) + return ret; + return 0; } diff --git a/libavcodec/vvc/ps.h b/libavcodec/vvc/ps.h index 6656a06320..9203e2c57f 100644 --- a/libavcodec/vvc/ps.h +++ b/libavcodec/vvc/ps.h @@ -151,6 +151,12 @@ typedef struct VVCPH { //derived values uint32_t max_num_subblock_merge_cand; ///< MaxNumSubblockMergeCand int32_t poc; ///< PicOrderCntVal + + uint8_t num_ver_vbs; ///< NumVerVirtualBoundaries + uint16_t vb_pos_x[VVC_MAX_VBS]; ///< VirtualBoundaryPosX + uint8_t num_hor_vbs; ///< NumHorVirtualBoundaries + uint16_t vb_pos_y[VVC_MAX_VBS]; ///< VirtualBoundaryPosY + PredWeightTable pwt; } VVCPH;