From patchwork Thu Feb 16 01:32:41 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: 40400 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp115655pzk; Wed, 15 Feb 2023 17:35:46 -0800 (PST) X-Google-Smtp-Source: AK7set+mVXTQLDl6IRWV5cw8O50+aI39Uo0OK/WbDCEJPsM24F+Lq+Uq7nAcMTQ7vdw2LWtEV/9S X-Received: by 2002:a05:6402:399:b0:4ab:ec2:3cd1 with SMTP id o25-20020a056402039900b004ab0ec23cd1mr4099137edv.25.1676511346044; Wed, 15 Feb 2023 17:35:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676511346; cv=none; d=google.com; s=arc-20160816; b=vWVebUODeuoaiiNU4N1aopmpEPG2F62XAVSC7iKPeS7/LKrtrrYh96y5ub3FL4LEvJ +F4sb6yTEla7c6dB6RCaHsKH3036ay4QSprT/zDqsnPOopmFc95u25lNnNwlZOodT2Iz VwS/vnMUbQ0ew2ZOarlDg5PKGk1yY0SOGWxZmiliwTA7AX8GEx8YBLb/pffJPgo/A/2W Y3MmyHXn3Q7kaHXyRNpGHCRKya7NrdzDywQj/Tmai5Z/RiHa78w1nvXgCi/G6kzgJKMr IYkXlI+frzI6RPM22nT9AlAWGxVWN5yIJnJgf2El3z2XrQp4xXMzLt+lYwVJx9LOrc0b 7awQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=6l8A7ve5KWyU8+SvxMiKz4V3g9HtINN/ZuINpLAIBVI=; b=cZC+1iY1vye9cJJmrBBdEMohvQXuxD9kWf3kmBg5xkMcmRNGNA8fFYFASZZ08tBV/8 KuInVXB3JrKI1SQh0m4W/ndnD1moVlixtGWO5YqvPP0e/bN1nx/L7oXvaTsnBvjxPwvY RWHQQXPq6iX2Bt/+8YTWZDA2lP56vujIW22TL9R3Jvm7naL5ihQfl3/0Cglo4nIQ0zQl tDvm8QNtNfnkHh2c+ncc7METciQRdwN4ZqlFUXMZqvzwNbtKLs2ZE1k5TNQ208AJCxaB +buYhWs5sKT0wE2ToS4Y9gQhS6j5/A4tRygtxmxaOh1fL5GqZKbLvPIVwSBtVbQBi4En 9sYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=bWV34vQC; 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 i16-20020aa7c9d0000000b004acbbc70421si452590edt.366.2023.02.15.17.35.45; Wed, 15 Feb 2023 17:35:46 -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=bWV34vQC; 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 58DE968BEBE; Thu, 16 Feb 2023 03:35:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 22AB768BEAD for ; Thu, 16 Feb 2023 03:35:19 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676511325; x=1708047325; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=1JoWN+YMZatoxBLjbA+BOa3Y8+4nDxD8bQqzdOPG82o=; b=bWV34vQCUwLfATwi9Gj14LyCxUR7O+6TACjZvFCsB8XO4zZiS2SZdJ1+ d7n1sp3ZXCSfh/jL0zkceLV2YD3Db7LwI+hqqzr37/Yeb30RcYgkauuos sX9V9B4UXmgi+TTcauUgKef7xSpUbo1re4vuEPaxEP3AVugB35N3f5mw0 P/i4OtNcX3ZkRIEkMUGBT+aARhtlFbVTin2vqwJz2kxHHDODK8Rb342uj mSj9TrWkS49qBbfb8vNSHaNut9LXH9IS3oeYp/As78XQ+C6YROkEd6h0b 6eF+mYlA+GmWj+gqKPK8w9/vho58fSCsAmLLv1lpjryZl776Uhr3KuFOt w==; X-IronPort-AV: E=McAfee;i="6500,9779,10622"; a="311223801" X-IronPort-AV: E=Sophos;i="5.97,301,1669104000"; d="scan'208";a="311223801" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2023 17:35:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10622"; a="779168802" X-IronPort-AV: E=Sophos;i="5.97,301,1669104000"; d="scan'208";a="779168802" Received: from t.sh.intel.com ([10.239.159.159]) by fmsmga002.fm.intel.com with ESMTP; 15 Feb 2023 17:35:14 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Feb 2023 09:32:41 +0800 Message-Id: <20230216013248.23044-3-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230216013248.23044-1-fei.w.wang@intel.com> References: <20230216013248.23044-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 03/10] lavc/hevcdec: Add slice parse support for HEVC SCC extension 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: pu/HorBYjGrV From: Linjie Fu Signed-off-by: Linjie Fu Signed-off-by: Fei Wang --- libavcodec/hevcdec.c | 6 ++++++ libavcodec/hevcdec.h | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 567e8d81d4..f9a97ac7f5 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -856,6 +856,12 @@ static int hls_slice_header(HEVCContext *s) sh->slice_cr_qp_offset = 0; } + if (s->ps.pps->pps_slice_act_qp_offsets_present_flag) { + sh->slice_act_y_qp_offset = get_se_golomb(gb); + sh->slice_act_cb_qp_offset = get_se_golomb(gb); + sh->slice_act_cr_qp_offset = get_se_golomb(gb); + } + if (s->ps.pps->chroma_qp_offset_list_enabled_flag) sh->cu_chroma_qp_offset_enabled_flag = get_bits1(gb); else diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index 9d3f4adbb3..7841ba8565 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -295,6 +295,10 @@ typedef struct SliceHeader { int slice_cb_qp_offset; int slice_cr_qp_offset; + int slice_act_y_qp_offset; + int slice_act_cb_qp_offset; + int slice_act_cr_qp_offset; + uint8_t cu_chroma_qp_offset_enabled_flag; int beta_offset; ///< beta_offset_div2 * 2