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,