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 C4DDE4ABE0 for ; Fri, 14 Jun 2024 08:18:04 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9911468D5B1; Fri, 14 Jun 2024 11:18:01 +0300 (EEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A73C68D45F for ; Fri, 14 Jun 2024 11:17:54 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718353079; x=1749889079; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=Gc03O74qGjTEvu5c6PeNDFOrKT1H+QDiyBLMVjyhAw4=; b=h8HdXVyeiySWT4btT0O0F8PDvvDhLQ6i6Mbc20JQhp62MT/151LHEcVW 7SY8nJ1M+HuTxFuAXe8/fos+4NMXl0kTYsNPj5nYsKoKpsHnWxNyHw/Oq ThuYDV93TB6QJXjKEGVsnIjIMeiNHQGYmtTtZNDXgGyyA0tUi/WmL3COC NIhaZMVlIywhOE17KGJdjAragPpStaD/91LuQsh3ThG/qK80SG7hU8/PJ rQ3NtWAN/wGCjUCjiAYnhGfQ/5QrznmjZi+Zo0HVPtypoqRLRfgDywqIL iOQThmNynfF1/hFrQZAmkUtxYlEsCDeQCAUpz3n2w7byeQtSwvxvgSeWq A==; X-CSE-ConnectionGUID: H7Hin9HzQa2y5uorbtZQtA== X-CSE-MsgGUID: fQME7hjASb6XgJuerMMeqw== X-IronPort-AV: E=McAfee;i="6700,10204,11102"; a="26345296" X-IronPort-AV: E=Sophos;i="6.08,237,1712646000"; d="scan'208";a="26345296" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2024 01:17:51 -0700 X-CSE-ConnectionGUID: l2xuSq3fTEqSoZ7dVWD/yg== X-CSE-MsgGUID: vLG8HkGRRcGvH0pVBzuvzQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,237,1712646000"; d="scan'208";a="40532233" Received: from unknown (HELO t-dg2.sh.intel.com) ([10.239.159.57]) by fmviesa009.fm.intel.com with ESMTP; 14 Jun 2024 01:17:51 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Jun 2024 16:18:19 +0800 Message-Id: <20240614081819.695936-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1] 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".