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 34AD549725 for ; Wed, 19 Jun 2024 02:27:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7ECFB68C0E3; Wed, 19 Jun 2024 05:27:00 +0300 (EEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7605B68D1F9 for ; Wed, 19 Jun 2024 05:26:53 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718764018; x=1750300018; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=Gc03O74qGjTEvu5c6PeNDFOrKT1H+QDiyBLMVjyhAw4=; b=kANe2c09vcdIzDwGyIY7p85SmL2MIva64xadqoNNuuB5G43CxAcLFmhP kmfJRbfX2fXbuxxGE9LUjb5pC+MqIKZmCkgVNxFuvq/rTamkdr4234OFp QyZGQwl65rzAnoyiDiY5rs5y0AHVxQkpphu2trhRNiqRpotUo/1L4LsuR s92DIqbVrkxg8ZXyZDyrlK/hMaH1e67/a3LaqhHg78tgaRsDFAU1/LIOp /DbG7T0V7sUFEXEz56wf/Nh13GDJSL6JVkpKm5fS5vXyHnfrT/Bm0njD6 BZiBS1GNdxCRwCTsA5Q7G+lerPK6aXUZIhGQOyOYnaCg16BVVbY0PQBUx w==; X-CSE-ConnectionGUID: 4hn5He5YTlutHtrZVERyrg== X-CSE-MsgGUID: d4AnMEhPQQK/1artqf8smA== X-IronPort-AV: E=McAfee;i="6700,10204,11107"; a="15648509" X-IronPort-AV: E=Sophos;i="6.08,249,1712646000"; d="scan'208";a="15648509" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jun 2024 19:26:50 -0700 X-CSE-ConnectionGUID: gKBVjMfARI29vaLfo65dmg== X-CSE-MsgGUID: qfyUJCevQ2WCpH3ZGOGMfQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,249,1712646000"; d="scan'208";a="42471515" Received: from unknown (HELO t-dg2.sh.intel.com) ([10.239.159.57]) by orviesa007.jf.intel.com with ESMTP; 18 Jun 2024 19:26:49 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Jun 2024 10:27:21 +0800 Message-Id: <20240619022722.1054455-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/2] lavc/hevcdec: Put slice address checking after hwaccel decode slice 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.w.wang@intel.com 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: Fei Wang Slice address tab only been updated in software decode slice data. Fixes hwaccel decoding after d725c737fe2a19091b481d4d115fd939e0a674b2. Signed-off-by: Fei Wang --- libavcodec/hevc/hevcdec.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index 1d2e53afc3..39beb7e4dc 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -2770,15 +2770,6 @@ static int decode_slice_data(HEVCContext *s, const H2645NAL *nal, GetBitContext const HEVCPPS *pps = s->pps; int ret; - if (s->sh.dependent_slice_segment_flag) { - int ctb_addr_ts = pps->ctb_addr_rs_to_ts[s->sh.slice_ctb_addr_rs]; - int prev_rs = pps->ctb_addr_ts_to_rs[ctb_addr_ts - 1]; - if (s->tab_slice_address[prev_rs] != s->sh.slice_addr) { - av_log(s->avctx, AV_LOG_ERROR, "Previous slice segment missing\n"); - return AVERROR_INVALIDDATA; - } - } - if (!s->sh.dependent_slice_segment_flag && s->sh.slice_type != HEVC_SLICE_I) { ret = ff_hevc_slice_rpl(s); if (ret < 0) { @@ -2799,6 +2790,15 @@ static int decode_slice_data(HEVCContext *s, const H2645NAL *nal, GetBitContext return AVERROR_PATCHWELCOME; } + if (s->sh.dependent_slice_segment_flag) { + int ctb_addr_ts = pps->ctb_addr_rs_to_ts[s->sh.slice_ctb_addr_rs]; + int prev_rs = pps->ctb_addr_ts_to_rs[ctb_addr_ts - 1]; + if (s->tab_slice_address[prev_rs] != s->sh.slice_addr) { + av_log(s->avctx, AV_LOG_ERROR, "Previous slice segment missing\n"); + return AVERROR_INVALIDDATA; + } + } + s->local_ctx[0].first_qp_group = !s->sh.dependent_slice_segment_flag; if (!pps->cu_qp_delta_enabled_flag) -- 2.25.1 _______________________________________________ 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".