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 D60264C1D7 for ; Thu, 6 Feb 2025 03:50:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5D0E568BA0E; Thu, 6 Feb 2025 05:50:19 +0200 (EET) Received: from out203-205-221-190.mail.qq.com (out203-205-221-190.mail.qq.com [203.205.221.190]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2E7868B9A5 for ; Thu, 6 Feb 2025 05:50:11 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1738813803; bh=l7bks95V5jNFqOlDv/St/Ej5/voveQFDDeCOjrHf+tw=; h=From:To:Cc:Subject:Date; b=FTKEFNv61ch/EiMJ43QTzBRDcVsHvoPPmBPtTFbri4hZgsN1cBMZ8T+B1GH00QV5u D+S+4zQIlrKRYlChf2UKtiltjk2ogtzhbro6r8uBJirhBNdpBiO/wetSoPq3+XHSLM hbNCJlMrUEY5tucrjpZbb5U3uTNmKXRncaDuzwmI= Received: from ZHILIZHAO-MB1.tencent.com ([119.147.10.183]) by newxmesmtplogicsvrszc13-0.qq.com (NewEsmtp) with SMTP id C820B4CA; Thu, 06 Feb 2025 11:50:02 +0800 X-QQ-mid: xmsmtpt1738813802tceh1yvxc Message-ID: X-QQ-XMAILINFO: NY/MPejODIJV6nNo9Tr+L81LlW7zQWu9VRZX4PaQc9tqc4uHA3abxak3ukwC19 qffOabAASnwIFnPqDqFMIL5amcjwJyyQNUy0hJOQLHQvvfEeigG4AHqgZqhtpxsB1qZW1Tpodhut UR4tu+PqaX0hCFNkBVSQDiLO8qmdxtFcY6g0ER2OVGe3ZG8WpkSYK/ytqS4r8z7geJ9VLb6qQrx2 duo1IAGTkobTfx22bobEyv3ROzpr0GiiZBycX10cLb/fLOv7j+r8jDyHo6JX1FUPBqMpMFXiHMCn iVMb4ZWlJdLC646WkfDFINEUUXQwT4kHcKz83Mao+d4zu5+jTiSlzRxTDwW0fUDV5RyQrHNiBdVl OXese0Q+CdTjqI+Soxgi0RkfS27Z9p3VccNylN3n5G4PBMU/Fro5T4A4jHvkhTbvIcuGeKY/rovo gNxXCWyjYzO4LFcCi/93iK9LJj6NgQkDdYX0osRrQ22geZAFsu0vmt8yjUwozvLskm6PRlwjDGs4 mI6YuYvVEEJbETiLfe+qmWCukns8Q6rwlBZoFP+DdepUqpZMyoBFrRrIAd141tbZGTTS63Sjomuq 2Rf9RKPn8BrVShVmadxu0csFIbVui6LmjnatkYfw9bZhssaTuLS5NVcZnws6gLM/8LJMN91loI1y IPv1A1cngwR8CR91Y5qpb//QSav6mKkM7+lGUPeU30XSC9EGFYYnBtWSt9g6mNgVS8FpYIEPiY9A jR6JrmFdqWU/kKaOLzWOeg71TJIsG8ZkEEysP1yOLO9rdB42xevS3oqjgH5IkPUHJat8NyJv2M1E pjvKLRb0Et1Y0r4Msab3O7NqbHi6LghbDYCiL3xwVsRmva7j+OJKPWGUdWy0O9bxFbohNP6ZxOVv 0KQLt0cZLNKu25ig8yQe9NXkgq6fSS/t0UwwXv5Ds/zKKinQVB87gkUtQQDiZiBpPMLgYRRetsxz SyFvav+wbHWDN8/P/5COqdtUC6EW/EZxqD3g05mcQ= X-QQ-XMRINFO: MSVp+SPm3vtS1Vd6Y4Mggwc= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Feb 2025 11:50:01 +0800 X-OQ-MSGID: <20250206035001.59940-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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".