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 ESMTPS id 76F154CAC4 for ; Tue, 11 Feb 2025 10:40:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 396AF68BCCE; Tue, 11 Feb 2025 12:40:20 +0200 (EET) Received: from out162-62-57-64.mail.qq.com (out162-62-57-64.mail.qq.com [162.62.57.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4ED4A68BB1D for ; Tue, 11 Feb 2025 12:40:10 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1739270397; bh=l7bks95V5jNFqOlDv/St/Ej5/voveQFDDeCOjrHf+tw=; h=From:To:Cc:Subject:Date; b=ZfN7ylGSNaOwKGrBuxX3d8YgDYaokDbBIN+1Fcv/SEE5OBQiAzrJ3QZeI63e27jKO rx2KIodRv4FIQl2Q5CC1JnPn8UcUMrwMhPWwaD5ucEsNe3WI1fiMOXSkOs+PUSX5lm 5d/PQNolgwWPuWwx1Ny3BTC+/beCVnLy9N0NVku0= Received: from ZHILIZHAO-MB1.tencent.com ([113.108.77.57]) by newxmesmtplogicsvrszb21-0.qq.com (NewEsmtp) with SMTP id 9F7B56D6; Tue, 11 Feb 2025 18:39:55 +0800 X-QQ-mid: xmsmtpt1739270395tgpxw8wad Message-ID: X-QQ-XMAILINFO: NDz66ktblfzJCSE4dkkf7XUqY+CCSyqbfeowur/zXCANiGs+gJDVF858oO703L gcM/G48D2/5oz3WPZKyL0a11Rs+546vf4Mj77X3oTryPWqHCoQO1pzUzGgaRrXGqSTgQNQEOP2Zv ZGQfRhc/TzxkNtMXTdkX1kbmdWw936CefLDLMEPwG899/HXXWGLpH+qUfvSYE9OsAtdyAPsxnb0I MgoTkcQvq2GjikpXCKmPW3zKD2kywqUatz4UC0rC2TrKU+30uCc942UtgWPWthzp6Fb/Rx7IGNzC TIb1W70WrBH8oUYO5a9fdgPBAsKEIhMdGvHS0R+rZCialhajlcIYlTrFG9g27QknHTP6U5CGRdBi lyqhPhh+OjK6ap62tXmEe+l1PtiEmCOo8W7Uj3E6+EEC72F199fWE363SdV5r/yxQxU/oPJd9abW m+69Tcq9Y74hz/8iYD89VMrvg0g0/rqpn+HaMIwoYD27+uPat8D8w8GI/ls7xYwstAV3WUllUC8d aj8uXZkT5X086igHnrRJvxe/KNBZoMDUmgDnsaLVu+xwRPV9g3tdpkCeESyP5Sebtz4Po78QrPhd +9jlthyBT/hRetUpThV0Uhcdxda/nXS2SBKyKfu5eyy9bfuf3FelppKiUVS6pP9vGp9GTpkrAjcn cBEibufb0cHVApUXVtrc/sog1GTNO1vMnyHHr6CEmCkv7+W6YbKyNHHIUizon0H32zNqxxB3EdxF +PWDURs80ssc3VjebYQArAeWQMmAn7lien49H2S1ITW3jJ7lzEMvlynFnjmXRNYA3n+eSPCnMwvS k6vpF7MaRFgq/+2NxCsBgQKcddoWMJqT6rLbuV56Mpz3FtGJ5tD4Un4kmuMWYRcjHnyKMie5iXBs B/dmYV0hnNuOGZNgb2JoA2kwSKL8+OkR/QO9wh5f5+iXzXU/3E3sm340MK4z7YHaqm7Ex20CMPO7 jJ2pYCS7d0ZXn4txt+NA== X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Feb 2025 18:39:55 +0800 X-OQ-MSGID: <20250211103955.89796-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 1/3] avcodec/hevc: Rewrite scalability_mask_flag parse in decode_vps_ext 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: Zhao Zhili 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: From: Zhao Zhili Remove a for loop and make it easy to extend to support other types of scalability. Move ScalabilityMask to hevc header file so it can be used in hevc decoder. Signed-off-by: Zhao Zhili --- libavcodec/hevc/hevc.h | 7 +++++++ libavcodec/hevc/ps.c | 33 +++++++++++++++------------------ libavcodec/hevc/ps.h | 2 ++ 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/libavcodec/hevc/hevc.h b/libavcodec/hevc/hevc.h index 8bd59142db..b2229fda40 100644 --- a/libavcodec/hevc/hevc.h +++ b/libavcodec/hevc/hevc.h @@ -162,5 +162,12 @@ enum { HEVC_MAX_PALETTE_PREDICTOR_SIZE = 128, }; +enum HEVCScalabilityMask { + HEVC_SCALABILITY_DEPTH = 1 << (15 - 0), + HEVC_SCALABILITY_MULTIVIEW = 1 << (15 - 1), + HEVC_SCALABILITY_SPATIAL = 1 << (15 - 2), + HEVC_SCALABILITY_AUXILIARY = 1 << (15 - 3), + HEVC_SCALABILITY_MASK_MAX = 0xFFFF, +}; #endif /* AVCODEC_HEVC_HEVC_H */ diff --git a/libavcodec/hevc/ps.c b/libavcodec/hevc/ps.c index 285084685b..861a6bb0a2 100644 --- a/libavcodec/hevc/ps.c +++ b/libavcodec/hevc/ps.c @@ -450,14 +450,6 @@ static void hevc_vps_free(AVRefStructOpaque opaque, void *obj) av_freep(&vps->data); } -enum ScalabilityMask { - HEVC_SCALABILITY_DEPTH = 0, - HEVC_SCALABILITY_MULTIVIEW = 1, - HEVC_SCALABILITY_SPATIAL = 2, - HEVC_SCALABILITY_AUXILIARY = 3, - HEVC_SCALABILITY_MASK_MAX = 15, -}; - enum DependencyType { HEVC_DEP_TYPE_SAMPLE = 0, HEVC_DEP_TYPE_MV = 1, @@ -532,17 +524,22 @@ static int decode_vps_ext(GetBitContext *gb, AVCodecContext *avctx, HEVCVPS *vps return AVERROR_INVALIDDATA; splitting_flag = get_bits1(gb); - num_scalability_types = 0; - for (int i = 0; i <= HEVC_SCALABILITY_MASK_MAX; i++) { - int scalability_mask_flag = get_bits1(gb); - if (scalability_mask_flag && (i != HEVC_SCALABILITY_MULTIVIEW)) { - av_log(avctx, AV_LOG_ERROR, "Scalability type %d not supported\n", i); - return AVERROR_PATCHWELCOME; - } - num_scalability_types += scalability_mask_flag; - } - if (num_scalability_types != 1) + vps->scalability_mask_flag = get_bits(gb, 16); + num_scalability_types = av_popcount(vps->scalability_mask_flag); + if (!num_scalability_types) { + av_log(avctx, AV_LOG_ERROR, "Missing scalability mask\n"); return AVERROR_INVALIDDATA; + } else if (num_scalability_types > 1) { + av_log(avctx, AV_LOG_ERROR, "Scalability number %d not supported\n", + num_scalability_types); + return AVERROR_PATCHWELCOME; + } + + if (!(vps->scalability_mask_flag & HEVC_SCALABILITY_MULTIVIEW)) { + av_log(avctx, AV_LOG_ERROR, "Scalability type %d not supported\n", + 15 - ff_ctz(vps->scalability_mask_flag)); + return AVERROR_PATCHWELCOME; + } if (!splitting_flag) dimension_id_len = get_bits(gb, 3) + 1; diff --git a/libavcodec/hevc/ps.h b/libavcodec/hevc/ps.h index 6f5b1f8755..d3465e3d27 100644 --- a/libavcodec/hevc/ps.h +++ b/libavcodec/hevc/ps.h @@ -205,6 +205,8 @@ typedef struct HEVCVPS { */ int nb_layers; + uint16_t scalability_mask_flag; + // LayerIdxInVps[nuh_layer_id], i.e. a mapping of nuh_layer_id to VPS layer // indices. Valid values are between 0 and HEVC_VPS_MAX_LAYERS. Entries for // unmapped values of nuh_layer_id are set to -1. -- 2.46.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".