From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 5AEDC466C7 for ; Sat, 1 Jul 2023 01:37:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6ADE468BE51; Sat, 1 Jul 2023 04:37:06 +0300 (EEST) Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 587DC68AFA8 for ; Sat, 1 Jul 2023 04:36:59 +0300 (EEST) Received: by mail-oi1-f178.google.com with SMTP id 5614622812f47-3a1c162cdfeso1800805b6e.2 for ; Fri, 30 Jun 2023 18:36:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688175417; x=1690767417; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=+FWVNxjwpe4epc3XZEqg2hk3L90HlY9LH8XD2UbIEbI=; b=eGo3cbJ00SgzW1HPV8tQK5emMl2xg78lNgtq3pT54BKJpQM3ixDGbRIp8EXcatINPa 91sgRNIUZP9N9Ya2oleU7cqrfQW2MLoMuA8v0gGlmi1SfuLReJSQKE7M5rTjqoaQGwVt Mgv0S9nzpj4vZiqvG5OuQ9VgkkJYbcFRM0PPN80RQmP9D/RXl4usc7sgruXGpGMYytGj Et22kusQc+IaU1l+u4SoCBHC1k6tkPfrnNX8xYHU8SWAe4h3wLrHhk3mwPJtiXNJQ4gY wDrfb6dfvqy8qyD86wn9E41d/YIl4IAKQMifnJHDs1Ix0hWaVXKawu90lmRdoGrYcQSm RFXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688175417; x=1690767417; 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=+FWVNxjwpe4epc3XZEqg2hk3L90HlY9LH8XD2UbIEbI=; b=Z3vAeBQU3rNT4Q49Mjh6I5ksiESPW/VR2Vornj6CT+8dDiQgPIwqbGqb7EPVajIBXO 6ffN3RKwvCS2ZjzeeMuudyAv2QL8GLW3LBlzTEknxR2GTMvBf0pLSNtVMLQPyEerKn1y eDuhHkevsCWz32EdD0SdvydSrUAqbBzgDO6wQpruxKbhykDjjgLWVXfybRVxVFWMjK9x TUf2Fv8PubM54dVKxcB8rvmIfYLhZNp7GiLVM2/qx05LRwAOE0pIAUPtxuwdrXRF7JEp 0SpvkcxWE8UP1T+YaQPI+j0NcSoIv9k6CIRzoJok6rmN8FcDoTDwI/lI5Tx/vvfzXnCM s3xA== X-Gm-Message-State: AC+VfDx3NMcUn4wvJ1wRGsnONOB4r54DAb5y6IBUyP24Z20HZGcn+x4k okeVpSBEo3ki1B83yL0o2yB07bh5SqY= X-Google-Smtp-Source: ACHHUZ6lFTaKUOFeSYREXYkmjLfjqhbxv/IV1sNPxd1/TlNI2GjtzM2pgqNCO42chVFBoZhCdPTuhg== X-Received: by 2002:a05:6808:191c:b0:3a3:6e43:e681 with SMTP id bf28-20020a056808191c00b003a36e43e681mr5120003oib.58.1688175417329; Fri, 30 Jun 2023 18:36:57 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id h19-20020a056808015300b003a0619d78ebsm3037240oie.55.2023.06.30.18.36.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 18:36:56 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Jun 2023 22:36:50 -0300 Message-ID: <20230701013651.30004-1-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/cbs_h266: store SubpicIdVal in the context 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: And use it to derive CurrSubpicIdx Signed-off-by: James Almer --- libavcodec/cbs_h266.h | 2 ++ libavcodec/cbs_h266_syntax_template.c | 34 +++++++++++++-------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/libavcodec/cbs_h266.h b/libavcodec/cbs_h266.h index be3c744426..edcb5ad0e3 100644 --- a/libavcodec/cbs_h266.h +++ b/libavcodec/cbs_h266.h @@ -552,6 +552,8 @@ typedef struct H266RawPPS { uint16_t num_tiles_in_pic; uint16_t slice_height_in_ctus[VVC_MAX_SLICES]; uint16_t num_slices_in_subpic[VVC_MAX_SLICES]; + uint16_t sub_pic_id_val[VVC_MAX_SLICES]; + uint16_t row_height_val[VVC_MAX_TILE_ROWS]; } H266RawPPS; typedef struct H266RawAUD { diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 863fecdefa..ec2bb1ccc3 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -1706,6 +1706,15 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, } } + for (i = 0; i <= sps->sps_num_subpics_minus1; i++) { + if (sps->sps_subpic_id_mapping_explicitly_signalled_flag) + current->sub_pic_id_val[i] = current->pps_subpic_id_mapping_present_flag + ? current->pps_subpic_id[i] + : sps->sps_subpic_id[i]; + else + current->sub_pic_id_val[i] = i; + } + pic_width_in_ctbs_y = AV_CEIL_RSHIFT (current->pps_pic_width_in_luma_samples, (sps->sps_log2_ctu_size_minus5 + 5)); pic_height_in_ctbs_y = AV_CEIL_RSHIFT( @@ -2697,25 +2706,16 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw, if (sps->sps_subpic_info_present_flag) { ub(sps->sps_subpic_id_len_minus1 + 1, sh_subpic_id); - if (sps->sps_subpic_id_mapping_explicitly_signalled_flag) { - for (i = 0; i <= sps->sps_num_subpics_minus1; i++) { - uint16_t subpic_id_val = - pps->pps_subpic_id_mapping_present_flag ? - pps->pps_subpic_id[i] : sps->sps_subpic_id[i]; - if (subpic_id_val == current->sh_subpic_id) { - curr_subpic_idx = i; - break; - } - } - } else { - curr_subpic_idx = current->sh_subpic_id; - if (curr_subpic_idx > sps->sps_num_subpics_minus1) { - av_log(ctx->log_ctx, AV_LOG_ERROR, - "sh_subpic_id(%d) should in range [0, %d]\n", - curr_subpic_idx, sps->sps_num_subpics_minus1); - return AVERROR_INVALIDDATA; + 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; + break; } } + if (i > sps->sps_num_subpics_minus1) { + av_log(ctx->log_ctx, AV_LOG_ERROR, "invalid CurrSubpicIdx %d\n", i); + return AVERROR_INVALIDDATA; + } } else { curr_subpic_idx = 0; } -- 2.41.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".