From patchwork Wed Jun 19 02:27:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 50012 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp2925761vqg; Tue, 18 Jun 2024 19:27:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUSQOI5HqTG+sLcrTyRSsDsBhdyzRkXNIofLhUXyCDJhzd5cjU7P8Th863xBRVNh+O/qLfHiD0nsonsYmFNL85Wwyox010Ir7QQrw== X-Google-Smtp-Source: AGHT+IHXv81iAI4m1GZtgnSU+oBWgJvfifAzjGbC//GUz/v7QDn4fNtPAvFdptB3eupRfhhXHGFJ X-Received: by 2002:a2e:b04a:0:b0:2eb:fc0b:247e with SMTP id 38308e7fff4ca-2ec3cff3021mr6603651fa.39.1718764026140; Tue, 18 Jun 2024 19:27:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718764026; cv=none; d=google.com; s=arc-20160816; b=EnprrHv57JxRC56BGX19KBeQWMYZQzWQHhAARX6BTHddW6qWD0S4yaytu3fbv127Y8 WCoxXylGz2YDIv1reaUFy4IsnWPYe5sy7lyiFLBq5h4MFXk43HGtfmobxea7KH8QqtuL oXeCPSraGr5WepmuBWCx7HuDYI9goOzis1JQyqhWvW0Xcbw5qRhrEmn7rdfJLQVk1bf6 7lBvEc2+KrECV/uUS8lECxFTp2x4p3dfwWfXKiQIkPhFL3lKcoAGle34phiNbCnO4Bkk 461GZDIekmYFH7s/PFL2+LLsHCWi/DQ9EwrKN2LkBWHLicjrAgjoWMM1MNaXkJVZF2SI HaXg== 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=GiVS2Li+kO1Gcdcj8LtyoopXtj9iOtf3Vs1AWK/Y00M=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=AtE7YvDVowA0VMxWlIR7vLCslUaADq+PPcvOyj2n1b1Lwsn1Z7vp6mClgkVXNiFv2k 7WWUZHoe2lcQTByz62P+l0X3jJRvwJzuq7WBb4FVKaU1c1n8eMT2P/AB887yRsHVq22c rtZSSmxVK5nZUu5vn6Ekw6iTuzOs9pKhbeCsJseAQ4jZJc49n+QbGUizjd3qMi1yCLEh LPJw10NkRL77F5KEeYqH0VmaJtU6n05kBQn6fTGoxcwGjhD8uvX9a+r3FUFVxujVpYwC 4Q/G45qafdK3V5Cw8JntARxrGywthiOSNBq3eUJCKEDIE+YR7HfeWYzUI67R1MwoDwqX mLzg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=kANe2c09; 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 38308e7fff4ca-2ec05bc1842si34274061fa.28.2024.06.18.19.27.05; Tue, 18 Jun 2024 19:27:06 -0700 (PDT) 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=kANe2c09; 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 CDA1868D1F9; Wed, 19 Jun 2024 05:27:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TJaAFQ8z1B4e 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) From patchwork Wed Jun 19 02:27:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 50013 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp2925800vqg; Tue, 18 Jun 2024 19:27:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW83hOeL8GmJZcd6GS/+rWPK84fKJ7EhJv2eblTgZF6ovcz4uOPRtFXNpbHkSZLEq9FeQPuZflmAqWwkC70yJrxaoFulZZOrHFjEQ== X-Google-Smtp-Source: AGHT+IHaEU7H46pUXSgsHYJDBKFRm97k7sKbVhq9ZQyGH6ZIJpUAqoerpcbbyePf5MW9qe5pLYmF X-Received: by 2002:a17:906:9c86:b0:a6f:ac35:4933 with SMTP id a640c23a62f3a-a6fac35498fmr58692566b.24.1718764036031; Tue, 18 Jun 2024 19:27:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718764036; cv=none; d=google.com; s=arc-20160816; b=Ckk6YKT2rWJaec3ReL75BhgUkk9ofUib7/Luyw6TL/MkkDILMWzkMJcx5HhIdPbNUW 55jt1O/TlaDmIYrrvgbk4GsmO09jvEtj4xqmneEZK7x4fIme/Iih33s1LwLXCRpJ6+ef /o1/Rj5PIFhcJZVnNvegOgHZs3vtF4rEUQAwX7cgAv2donGIByHdq4B+Z71jLgfF3uvK oTnbkpZWX3jL4JF97BNQ0n6L13rlGVvd3fHdtjqGEkuAGiigLJtp8Ghicvc0mq5RjC2o t7jt1fy4gw1uAfWWQ+a654iCWzNwQuL7mynzRJofQhgu7iMAmMd/5LSSdSeXaEcrYcrw Dbgg== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=lyEKNmCw5lRo4en+ieWBJOZDiEj4ktNCnV8EJgE8vw0=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=A6YzTq/iLNq9qDRKqLqA4+Mv6JqZTQQ+AlgSSghIT++Ye02Afp5ujmEXlCZ1/ra54d ZgDGwU+foAx0TfTJK7SPiyRwivP1GhsSRPZb8Zjl134zW4T1YKtzyhG2TWO39v7Rrube 7PHzzH5WU0xSRR+07AYX64GL2h7OgmoHiyDsqC1Fks/aUOwI6qJCdzDur+aWq/g3TB2f SI9auC19qignn0moU0MGnCIYMOBhwrLtzkEBozLNVfM126nowRwthtHazqPZ8bdeDaoi zdhuXNyoegHsWY+pdjst5CX4aRp97OCtIFntV8z9cuWlP4h+VAzjoSPgys/iW/DHB7ih oHUQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=aG5Vjlze; 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 a640c23a62f3a-a6f57d601dcsi597838766b.644.2024.06.18.19.27.15; Tue, 18 Jun 2024 19:27:16 -0700 (PDT) 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=aG5Vjlze; 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 0547068D6B6; Wed, 19 Jun 2024 05:27:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8945C68D68F for ; Wed, 19 Jun 2024 05:26:59 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718764024; x=1750300024; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7XJo7QwgdRfiaMsGUTFQ6s9Y1y7xORnF68yHV7jvW9k=; b=aG5Vjlzemd0IDRNykKYP1Z5MyDQvN7ET8GOsuLEopfPlvCouhlF3I5eS e7uv3BzE7q9YvRRPoHnt5aZ+ixBLz708PT72z10pMO3SwtKXh2jDLU3bn VT3c3zFAdPk0X2a/hPbKus4SRsoEyVjBKFKkZMlxnAAr0c1hDB/RcAA0E MGt8V70wiDkHTPJzckAlyupJxXuFMj1M3bOgpvvhz++TFH6Xk4SS+WBsL gRRU9FDcFjymEX6eobMsbwR4OPohbpP8FsMkfsSo9S+uT/Om62js6V/n8 Fp8270+Aeirzu9g8Y+9mwnxcs8mbeWm6JyePckNKvL4czmQdrjowfncaK A==; X-CSE-ConnectionGUID: /DaxWAMZTTa9QgyBYFXMYw== X-CSE-MsgGUID: b5HN1PwDQ0OUm965Askl0Q== X-IronPort-AV: E=McAfee;i="6700,10204,11107"; a="15648510" X-IronPort-AV: E=Sophos;i="6.08,249,1712646000"; d="scan'208";a="15648510" 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:52 -0700 X-CSE-ConnectionGUID: MAgrJjhXQfupvRfI+3T/vg== X-CSE-MsgGUID: 4ZtnTkbNTYaK5pM25QllAA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,249,1712646000"; d="scan'208";a="42471518" 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:50 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Jun 2024 10:27:22 +0800 Message-Id: <20240619022722.1054455-2-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240619022722.1054455-1-fei.w.wang@intel.com> References: <20240619022722.1054455-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/2] lavc/hevcdec: Update slice index before use it to construct slice RPL 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: M4RHCCvQG04I From: Fei Wang Fixes regression from 47d34ba7fbb81 Signed-off-by: Fei Wang --- libavcodec/hevc/hevcdec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index 39beb7e4dc..8bb564f1b3 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -2770,6 +2770,9 @@ static int decode_slice_data(HEVCContext *s, const H2645NAL *nal, GetBitContext const HEVCPPS *pps = s->pps; int ret; + if (!s->sh.first_slice_in_pic_flag) + s->slice_idx += !s->sh.dependent_slice_segment_flag; + if (!s->sh.dependent_slice_segment_flag && s->sh.slice_type != HEVC_SLICE_I) { ret = ff_hevc_slice_rpl(s); if (ret < 0) { @@ -2807,8 +2810,6 @@ static int decode_slice_data(HEVCContext *s, const H2645NAL *nal, GetBitContext s->local_ctx[0].tu.cu_qp_offset_cb = 0; s->local_ctx[0].tu.cu_qp_offset_cr = 0; - s->slice_idx += !s->sh.dependent_slice_segment_flag; - if (s->avctx->active_thread_type == FF_THREAD_SLICE && s->sh.num_entry_point_offsets > 0 && pps->num_tile_rows == 1 && pps->num_tile_columns == 1)