From patchwork Tue Sep 5 13:01:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 43559 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp1825375pzb; Tue, 5 Sep 2023 06:02:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHTf+MN9uBcMySGLAHot7jOtJ23pXtRlEt0D09FIsaPR3FQGlNof0gdbFS48VuXj3xWqlqK X-Received: by 2002:a17:906:3147:b0:9a6:1560:42e8 with SMTP id e7-20020a170906314700b009a6156042e8mr10191520eje.55.1693918916167; Tue, 05 Sep 2023 06:01:56 -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 ty22-20020a170907c71600b009a6189dfe4fsi6212776ejc.173.2023.09.05.06.01.53; Tue, 05 Sep 2023 06:01:56 -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=Es+6sMS5; 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 E8D2868BA18; Tue, 5 Sep 2023 16:01:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01olkn2020.outbound.protection.outlook.com [40.92.52.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E772E68BA18 for ; Tue, 5 Sep 2023 16:01:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DYN/LfEaQHGIoAApdrI8pqKJAeGg9ouS7n9hWz65wzoVRxamL89H9Cm8+Elb9J+LP3Oc94pTKh27VqBJ2uxi1Z9VHujhMI1PH0GINh3J5tn1XQji6yuAhmmDcKg3e4BMJaf014OnjEx1aj4J/4dTOK4dnF8Xm8C8K9YLvcP6WHUWtfbYUGqH564TmzJ5uVJHg+p1ajXMtoTJjy8xIsaHu1SC+L43qP9eWF+oRxNgy8Gi/m4JHKQ8cGsdcPquyDlRCh/UCJ2UZlm8C8koblKV5A2a2Wj5NrY8c/yZpEVmO36qSgTTTj/GVe29te8pSujVdvw5/If8p1i5QpdZo/sogA== 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=X8j18dkvwj7NYaLboj7gx0iTI5C3vMWuQGqQeHsQZ6w=; b=gwgV9g6LOOOK8inEvhu8xRWTnvQn5pO7HQO3hUmg/WLrmzOBS3Qez7FHFLQl2tOKI4X0Q8iJr4Af85ef1DQgADiKJZ5+YQInrXI1J5/MkFB/ukJ4IM+HT6cSK2Fvzsof6TyeW/JmAiYb4h14G7JKas4ZGOR/LiBhYEuM7sHp9uspNKbfESD2mVveOBQB/kFlQ9cE5VY9mvJtMYoqQBAq9HpnaN9za0sQb2NYRgMkVPFMmwi5Cyin3tP27hKp2RpR1YHctJd9LN2uQ49nJhgwCJk036tcly3P2Agq9XY/CeN2oNYZLR6g3ANWSDnO4ZYbraIhaPphRpX8gXutPdjKyA== 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=X8j18dkvwj7NYaLboj7gx0iTI5C3vMWuQGqQeHsQZ6w=; b=Es+6sMS5FdPAac1Bmb66Yk1gmxFRFcL6A7zMyBDDzaEYig/cpLd3U6RR1WPXtpDHHjGLy8ksZxdVN13rSKghLS70MlYEBoTWsxJGuIjxXIHuVhqQgOXlhsA4j6ePNy8RAqPULwXY0UaHJCcR4PmfAfL+34Unesgyo9HLn1gkwBnBXmJl14atS0iPQHtVPvBW1TE0ZVZrP3I9kvxLTlti0qapyBaf12P9Yh20Rr+25f4R9GXlY7BHsL9ktNWAde67OvXYAQrBbAUX7hD3a/ByQkAVn0Z+n3mFkQKhRubqVXo4BfFxHw6IuRdpQeusEcx93YoiTY6X76L94NJKNcyt+g== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by KL1PR06MB6790.apcprd06.prod.outlook.com (2603:1096:820:ff::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.32; Tue, 5 Sep 2023 13:01:38 +0000 Received: from TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::f1a4:bbff:7592:ee31]) by TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::f1a4:bbff:7592:ee31%5]) with mapi id 15.20.6745.030; Tue, 5 Sep 2023 13:01:37 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Sep 2023 21:01:22 +0800 Message-ID: X-Mailer: git-send-email 2.25.1 X-TMN: [XG6Aepg0xTmOQyDuI+aS0ZRpwILe+Zq8] X-ClientProxiedBy: TYAPR01CA0155.jpnprd01.prod.outlook.com (2603:1096:404:7e::23) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20230905130122.2164-1-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|KL1PR06MB6790:EE_ X-MS-Office365-Filtering-Correlation-Id: 0d1c2369-27cd-4c95-b61e-08dbae103cfd X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XPoPTPHVf9sMKEK5P3iMx+JVJ8yN2VjQu5nQl+pthBHQwyResdv5UronN94wkMVc0IM3SYFSeRSVR9s3hsmXJXUC09zDwc0A5NervEG9R+lH+WiR0ehkq+U80HRi3+qUWu0/8a5Nz+tBWhh9HnYhIJUUHG6w+ijHfi6XYtMd+x8UOS25axPsBCK/tPMpCFCa1Uhf1btve3MzHryhNuUqY5Yac+t3yFuqJuCWF95O1e4lLlIIBPP9MiO1uIw6lzmatR23mt444HnnFq1KeCPf2zpPBklNlG5hvHLgFUO94PCqbLl5dI1vkMUcov2TIGN5Pj5NLOBv1sX0veJNKqqM7Ux9P9FdLL+dk3KymsYCHn/JcAoXs5EHI3jhv5bd04ztzWIwCsbV8HShYahVNCLEekS8tOS75v502lHralH5C+GCbkZiT6RfHfQUmdg/RUDY9q1MdZhsUT8A2ZBPYWvQiUTgGtDnDkEs8E7/o3OdVcNCEtueP9ObZUTOIuFHSEd/VT3/Kr1MATuZtxW4GmdwQfERX50pZ2R/sGzXjbK9J6K36xuHUIa79EmkDSeRGENQbpXt0HNqgbXuthHOvphP1Lag4Szw6dhEf0xl+8GtapQpeamGLfmhh1NmOVbisSIH X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Js9wLmTayIE4oG5qZy9pSLDsebj5i1OMVExOx7/l0JYcu1xm1jYOzQ9JYlq/Wg+pRtjK1wx+hp7kpmQ65h32pwuNCYgGPCJFP5Fg1r8JVHAGvCyPulf51r6LOWDsaGeiaxfGY+uH3T+bkOTboUMw1icbsu4sailo8KXDEDK9N0IZE3/W4jBUHV3eInYF4FQkG+VTSSXwhzHJj+ooHtKpaJoXuuwKI5dzCkfoLBV43HQQ9RH6QcxhLitQPEYLOQ2WQ3ey/DhJGti04afmbbck15s2t37PWXUjfiM2c+9SnMqv3wQiMfQ769Fty2Ir0z0o/GfN9ZQmzSuaovz4l8o/rrWWDpT5IToiByHqCjJxSBXmzpesWCt3jzrxs5AE3+E4ajPkmlwRrBakCzfw/9o7GzcJufa5RA3j7TuVg/z8a2E= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d1c2369-27cd-4c95-b61e-08dbae103cfd X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2023 13:01:37.3882 (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: KL1PR06MB6790 Subject: [FFmpeg-devel] [PATCH] cbs_h266: H266RawSliceHeader, expose curr_subpic_idx 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: FDnRGtoPbRNZ --- libavcodec/cbs_h266.h | 1 + libavcodec/cbs_h266_syntax_template.c | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/cbs_h266.h b/libavcodec/cbs_h266.h index 3a6f6d96b5..a263e898bf 100644 --- a/libavcodec/cbs_h266.h +++ b/libavcodec/cbs_h266.h @@ -832,6 +832,7 @@ typedef struct H266RawSliceHeader { uint32_t sh_entry_point_offset_minus1[VVC_MAX_ENTRY_POINTS]; // derived values + uint16_t curr_subpic_idx; ///< CurrSubpicIdx uint32_t num_entry_points; ///< NumEntryPoints uint8_t num_ref_idx_active[2]; ///< NumRefIdxActive[] diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 4075897b9a..f0d428a478 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -3010,7 +3010,6 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw, const H266RefPicLists *ref_pic_lists; int err, i; uint8_t nal_unit_type, qp_bd_offset; - uint16_t curr_subpic_idx; uint16_t num_slices_in_subpic; HEADER("Slice Header"); @@ -3048,7 +3047,7 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw, ub(sps->sps_subpic_id_len_minus1 + 1, sh_subpic_id); for (i = 0; i <= sps->sps_num_subpics_minus1; i++) { if (pps->sub_pic_id_val[i] == current->sh_subpic_id) { - curr_subpic_idx = i; + current->curr_subpic_idx = i; break; } } @@ -3057,10 +3056,10 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw, return AVERROR_INVALIDDATA; } } else { - curr_subpic_idx = 0; + current->curr_subpic_idx = 0; } - num_slices_in_subpic = pps->num_slices_in_subpic[curr_subpic_idx]; + num_slices_in_subpic = pps->num_slices_in_subpic[current->curr_subpic_idx]; if ((pps->pps_rect_slice_flag && num_slices_in_subpic > 1) || (!pps->pps_rect_slice_flag && pps->num_tiles_in_pic > 1)) { @@ -3377,7 +3376,7 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw, if (pps->pps_rect_slice_flag) { int width_in_tiles; int slice_idx = current->sh_slice_address; - for (i = 0; i < curr_subpic_idx; i++) { + for (i = 0; i < current->curr_subpic_idx; i++) { slice_idx += pps->num_slices_in_subpic[i]; } width_in_tiles =