From patchwork Mon Dec 5 06:09:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 39600 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp3010232pzb; Sun, 4 Dec 2022 22:10:26 -0800 (PST) X-Google-Smtp-Source: AA0mqf7VlXGbiPUtAc4u10ClxuQ5psvlqcHmWa2xEro5hN3mq+HbxARlPL6IGWMvIgCTYKYbNcBf X-Received: by 2002:aa7:cad7:0:b0:459:443a:faf4 with SMTP id l23-20020aa7cad7000000b00459443afaf4mr73083374edt.297.1670220625926; Sun, 04 Dec 2022 22:10:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670220625; cv=none; d=google.com; s=arc-20160816; b=HsnvUnHc5B/+J0cP/Z7gBmK//DvFQ4zB9yJoFqI5PQ63jhNHiPhnb87GVAwa55dMNh xVllaXjR8zzVA0R9KDFV8xOdEkiz7GkYr1SfvDaxocM3aM8uDXkZjAuzzy6F+S3iS7rj xaBnbRY1g6myq1qMUB9/KebKBVn89XF2w8EnVjIPHHUmMb/ycZCU19Z+cO8QqyXbANXr Ki88pKnqJrrpAm3tc9DuW5M+zU99qhx64q7XuXywFoO4Ps6NKD87Sx6RImxM9QCPq1xQ EWIHb6g13AxaYOeqTLruC3KOQQgxoBLZBqY6bHX8Efnz15EPcHuBi1n/L45L7lZyr3+E U4ng== 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=6l8A7ve5KWyU8+SvxMiKz4V3g9HtINN/ZuINpLAIBVI=; b=SdYNH5Zwklekzr/JVa2IRqvg1f2gn+wwT1gnUChbjg+Ue2/28RfgDEdeDdcTJ7riR9 DHgmcn5F/KN05DcKy9DkGVvet6lv8Z5C7ke9w3oBO4lrGCMKU0/V8mNb4VhIeHNaL/rj D8OLb/Ec+Bv92Sl6v06COQssgwyNpX3ngm+m/lMCavvrh9DHKMMrjyd/R/xtyNF0gLFF gGwihNTab+5qnY0SnTF/8tYM7Uf0Ehh94nogqQjjeQ7j+kXXM2agj1g0RuQ3kMPmpjly HDdhte8/mIgN3cm0kao4LFdpy4uPUboyg+qQ5SlsLKEHYn7ydaENyyhwyK0zaQUkx9oD gjnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=cQgilH6h; 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 hr37-20020a1709073fa500b007ba89a4fd85si10588445ejc.487.2022.12.04.22.10.25; Sun, 04 Dec 2022 22:10:25 -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=cQgilH6h; 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 AA19D68BC2D; Mon, 5 Dec 2022 08:10:03 +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 01B0468B3E1 for ; Mon, 5 Dec 2022 08:09:54 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670220600; x=1701756600; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1JoWN+YMZatoxBLjbA+BOa3Y8+4nDxD8bQqzdOPG82o=; b=cQgilH6h6JqN7r0sNX1qV6fq/QJgxmatN4k4NDyBOR6WK1HkNFYld22M sEgCD0QW00+S1J745684sN/t7U4bXCTd2nHouu1uxGeIfQTpX8Qrtwcyz tuxeRaHD5X2nj2AV61iHEQ+3uicUS0bnxFMofcNq8GmV7gVyn0coAxuzu O+ldZF0H09xu3AQXOB4EDoajiRgpVTVeir/zb1k+FzhT/83JEjXK+ci2c Rhnsa8GZqyA/xTZSvFT+JY3pugV1iHTiE8X5Sulc37rhY5JbyAz2nxISu /EGwhj8HLee4ikwslQdW55y/mRdn7qklpNXghgxvWPe28mC//EjbEtuqa w==; X-IronPort-AV: E=McAfee;i="6500,9779,10551"; a="295971359" X-IronPort-AV: E=Sophos;i="5.96,218,1665471600"; d="scan'208";a="295971359" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Dec 2022 22:09:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10551"; a="645700073" X-IronPort-AV: E=Sophos;i="5.96,218,1665471600"; d="scan'208";a="645700073" Received: from t.sh.intel.com ([10.239.159.159]) by orsmga002.jf.intel.com with ESMTP; 04 Dec 2022 22:09:49 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Dec 2022 14:09:20 +0800 Message-Id: <20221205060929.2511871-4-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221205060929.2511871-1-fei.w.wang@intel.com> References: <20221205060929.2511871-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 04/13] 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 Cc: Linjie Fu , Fei Wang , Linjie Fu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: EOkXTdO0HHs/ 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