From patchwork Tue Jan 3 12:59:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 39840 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp8048984pzb; Tue, 3 Jan 2023 05:00:49 -0800 (PST) X-Google-Smtp-Source: AMrXdXtaMKHC2b/nVPqp2WVeBJm1fEFABhEUBUONI9VoFEWbbdQNtMYAralEmj+Mq1VtO/zjdE8/ X-Received: by 2002:a05:6402:4141:b0:469:ee22:d97a with SMTP id x1-20020a056402414100b00469ee22d97amr39216971eda.32.1672750849049; Tue, 03 Jan 2023 05:00:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672750849; cv=none; d=google.com; s=arc-20160816; b=dZtP0Pn85wy4eUJC1W3izoq5vZG6sYWvgt8dik6Lj2/hlr2YEuOmtEdd2lfycXNKtG 7FXsAEAwowdZGJLCYLCVKE63fR/CKrcgXo8RsrqksAn+zAtQIRRkRcor1Kejr6yCwsCe dUv2LjIUQbguHQ/m9EHNh+bXIVeJo4CY2/NdX7jFAh4LFCV04xD45SgnAtx3jUB7kX2J brtKAln/c+dlFAswwQGrQvJtyoGs9vPkYEnLsHRwfRi2LoGrQhrEr4/D/u5vzfHibRK/ x8MJ6wyVgtdWtW2x91g96bwb1shAdURHf5MFzNL9JSCCdBORAklFoT7lFZDC0dpKLiIH CotQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=vjprSWUrSBxcyZu2JOhhG0eug71PFC1Gr5ml6IbZWUc=; b=SAPSOAw8/YO2oOEqMJo2mDsQbv0MZh1PAyqFU1LOuMkmnvGgrzTjRn3219ITR//ehe AJ78y9FFAeIjXiZzj4pd4ycXi6w7BvmX5yCevf60XhpWgLhxTCayuMYM9aLGtXTiV4sC Q2EQSw5plqAH9rJQQ/WFt/QidQx1mUbogIeW5HPpsemvfSzGlkkt/ufCVTveYU0mXUEv OXdFbjki8oLBogR4K7CQb1QqdLCfs/FCigZZcUWFhwOk3msFb6fek1jneMjUPj4WInu4 8fa6HWuoqm/mD2cWm3vg0gBZ/LbkmElYg6+1lBC4QgZw5OgW+bNiHXlTDILWLfNDWtqx LGoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=k8xR+yoA; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z13-20020aa7cf8d000000b0046ff38a9345si24485195edx.587.2023.01.03.05.00.46; Tue, 03 Jan 2023 05:00:49 -0800 (PST) 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=@intel.com header.s=Intel header.b=k8xR+yoA; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C5B1468BD2D; Tue, 3 Jan 2023 15:00:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4173A68B914 for ; Tue, 3 Jan 2023 15:00:34 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672750839; x=1704286839; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=LJG03BccpHuwQ6DmC1xDb7yswicel95Pd9mISD+qreY=; b=k8xR+yoA+gDs9dii9IJB+64/0LSY7gTbMG7qzL7Hds2w+z5lIUQuK4Iv gVaVS8WIAwgRJXlO7J0DOCU+tIaI7eD5x/Z/r4Qx4iLYVUaAMZ2iJL+Aw /TEtB8o1/4NNj1O7fPYC88hvvrQnLGKvM9jBURidWXxHbjRKthseluEkY lLM6og8p+Gz28QJW+7DqpOcgRkml/sJypYDm8LvLkJ7Tei3iKP9lEWUvq 5Du1z1FgNThNkowr7nGMelq53xyAf5Nvd5TM0N8YdriPHNFwH8BSAw4RL LULzwAU3WQ1joIbssqwDIejCotE8MH5E4dOAfIRBRdSad6i6DrpWzDp24 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10579"; a="302026260" X-IronPort-AV: E=Sophos;i="5.96,297,1665471600"; d="scan'208";a="302026260" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jan 2023 05:00:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10578"; a="718091783" X-IronPort-AV: E=Sophos;i="5.96,297,1665471600"; d="scan'208";a="718091783" Received: from t.sh.intel.com ([10.239.159.159]) by fmsmga008.fm.intel.com with ESMTP; 03 Jan 2023 05:00:30 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Jan 2023 20:59:42 +0800 Message-Id: <20230103125952.2707824-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 01/11] lavc/hevc_ps: remove profile limitation of pps_range_extensions() 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: Fei Wang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: T5x7TMJcGVUZ Follow spec 7.3.2.3.1. Signed-off-by: Fei Wang --- update: 1. fix some code style. 2. seperate patchset into 2. libavcodec/hevc_ps.c | 2 +- tests/ref/fate/hevc-conformance-PS_A_VIDYO_3 | 50 ++++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 5fe62ec35b..537a3ff99b 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -1658,7 +1658,7 @@ int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx, if (get_bits1(gb)) { // pps_extension_present_flag pps->pps_range_extensions_flag = get_bits1(gb); skip_bits(gb, 7); // pps_extension_7bits - if (sps->ptl.general_ptl.profile_idc == FF_PROFILE_HEVC_REXT && pps->pps_range_extensions_flag) { + if (pps->pps_range_extensions_flag) { if ((ret = pps_range_extensions(gb, avctx, pps, sps)) < 0) goto err; } diff --git a/tests/ref/fate/hevc-conformance-PS_A_VIDYO_3 b/tests/ref/fate/hevc-conformance-PS_A_VIDYO_3 index 59b82b72bb..d1d86b2dc9 100644 --- a/tests/ref/fate/hevc-conformance-PS_A_VIDYO_3 +++ b/tests/ref/fate/hevc-conformance-PS_A_VIDYO_3 @@ -3,28 +3,28 @@ #codec_id 0: rawvideo #dimensions 0: 416x240 #sar 0: 0/1 -0, 0, 0, 1, 149760, 0x88619f80 -0, 1, 1, 1, 149760, 0x550bdaf0 -0, 2, 2, 1, 149760, 0x4121f7a2 -0, 3, 3, 1, 149760, 0x210b1d07 -0, 4, 4, 1, 149760, 0x731b7758 -0, 5, 5, 1, 149760, 0x17adb789 -0, 6, 6, 1, 149760, 0x98b2f080 -0, 7, 7, 1, 149760, 0xc0be1f2a -0, 8, 8, 1, 149760, 0xc01e387a -0, 9, 9, 1, 149760, 0xd932822b -0, 10, 10, 1, 149760, 0x16c0a1df -0, 11, 11, 1, 149760, 0x5aa6c005 -0, 12, 12, 1, 149760, 0xd3aab602 -0, 13, 13, 1, 149760, 0x4e6ecab1 -0, 14, 14, 1, 149760, 0x8a86f1f2 -0, 15, 15, 1, 149760, 0x2ed21e1b -0, 16, 16, 1, 149760, 0x80892f24 -0, 17, 17, 1, 149760, 0xb8a952ef -0, 18, 18, 1, 149760, 0x557e57fb -0, 19, 19, 1, 149760, 0x2b825b2c -0, 20, 20, 1, 149760, 0x30b69b5e -0, 21, 21, 1, 149760, 0x802ebf08 -0, 22, 22, 1, 149760, 0x95aadc8e -0, 23, 23, 1, 149760, 0x4d4c02b7 -0, 24, 24, 1, 149760, 0x3fdd1762 +0, 0, 0, 1, 149760, 0x5c4f70f4 +0, 1, 1, 1, 149760, 0xf4628e59 +0, 2, 2, 1, 149760, 0xa28e5bdc +0, 3, 3, 1, 149760, 0xda0e53d7 +0, 4, 4, 1, 149760, 0x42dd334a +0, 5, 5, 1, 149760, 0x25ba9dfe +0, 6, 6, 1, 149760, 0x8854d8ca +0, 7, 7, 1, 149760, 0xc04505d4 +0, 8, 8, 1, 149760, 0xd3fce146 +0, 9, 9, 1, 149760, 0x8bfd88bd +0, 10, 10, 1, 149760, 0x33d965b2 +0, 11, 11, 1, 149760, 0x12746b7a +0, 12, 12, 1, 149760, 0xb7642694 +0, 13, 13, 1, 149760, 0x32b5035f +0, 14, 14, 1, 149760, 0x7bea0af1 +0, 15, 15, 1, 149760, 0x577d4fc8 +0, 16, 16, 1, 149760, 0x023a9c66 +0, 17, 17, 1, 149760, 0x9abe76c4 +0, 18, 18, 1, 149760, 0x2b14dba5 +0, 19, 19, 1, 149760, 0x7b8affcf +0, 20, 20, 1, 149760, 0x21e4c323 +0, 21, 21, 1, 149760, 0xf0b7d9cd +0, 22, 22, 1, 149760, 0x4db0c5bc +0, 23, 23, 1, 149760, 0xf455f752 +0, 24, 24, 1, 149760, 0x569fec99