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 AE26A4C948 for ; Mon, 10 Feb 2025 05:02:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8FB3268BD7D; Mon, 10 Feb 2025 07:02:29 +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 ECC4E68B654 for ; Mon, 10 Feb 2025 07:02:21 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1739163739; bh=l7bks95V5jNFqOlDv/St/Ej5/voveQFDDeCOjrHf+tw=; h=From:To:Cc:Subject:Date; b=cfLIAJTYqhGgmYpdAYk8OzwV9VReTvh7sRyvZ/XR4XVyLR0HiiVc+FTNg4eMsewGu QbMwzF5Qgl24oZ3TF1wWsfFyOOY9WnS4Ab7w4olQ+4/fCzijB7x5U2BQTsiZImC2JS OewMbbOF/3jYaXC1QoK0vHjssy18jbVGTmTGU++Y= Received: from ZHILIZHAO-MB1.tencent.com ([113.108.77.72]) by newxmesmtplogicsvrszb20-0.qq.com (NewEsmtp) with SMTP id 422A66A; Mon, 10 Feb 2025 13:01:02 +0800 X-QQ-mid: xmsmtpt1739163662tykdk4l2o Message-ID: X-QQ-XMAILINFO: Nk0wNRo+N4X7IB4022DurUP5vV2xAFWdHy3sqLFIz2dfkxEsiShRqIguanHLFS /x2kPev+leEJ+xAFomsZE+dJ4EKrZGGEbecnhNQU3aeSZvjD1JJSam3eKjL2v895USkW5xB1wUDO OVij1idyLOEGSssZTIEYKOasN9F73XMqz3ipRXtLVhFEdCXnSWpPGwqjhSA0PGFm7fbvbuDDi5xC 8tETXfh/RGL+NdkcZr5pMTjHE1h/LgXSxZuuWudZizCLwcFGJEUyJ0qnusyC+LeJttl0JQmloLT+ owgzAMltziV97hJAko/FusDsf1gJDSt0jwa2IOGZimi/c0TpQXYpxT+zSoO0sw4zN1eH1h6s3GTO 86wdJ5lmmGZgxud6QNIf3VNDLTi6fAOjmCjMWRrRD5HDkpa9zNv5w2AOCcjaZQEC63n6vbmP/GBU UCDuxivAHH9uHhDF806XURqKV4Azpqyf1QenB9xYzgdkk0Aer6a/FcG46K/5JO2UTTF3cb8lrxXG E/jO8NQgmp1nyaUvhK4CLAKeTEKPVMLwwL09+NHwUKtK7Zk8eIqj+wx/4Uxc+oPzvCW/Ab7COWEz 2Bno1qdMXCf+jWMaEulHfRaSHfbRo0+iPgdIAhCxDD3YktD4Gb8rj/65Ua3UxHus1Mt6/NHZ0pL4 UlUpiFStiSvRlYmLUq8okmWj5n+sjL9tJU+dEBVzvnDVJIoeDfURxgF5B2XJYb+w9q3ypAwu83oC Jgd25HyHwIvOVwutYinqdtQd01G2tGSdntGwhuMvSc4/LtaYofNJ2IaSaNToWMDJuzzUb7Z2yre+ MAzrEWaOE+u62McdVmvHNOj1X2B0o+ChHLas8skLQ4NC78fE/Tx4o9NCI1RIyYO8oG1Y5mvzyg5g f2vaw6SMANbXmBqElskt4zoA2uIgpcCQ2fxVg5Fy3Q26KNZaCio/UohSrgfCp53wLKXMZD2Adv76 R1MKxJXs2zCDezjA912dps03gxVs7t X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Feb 2025 13:00:57 +0800 X-OQ-MSGID: <20250210050059.39181-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 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".