From patchwork Mon Dec 7 12:55:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linjie Fu X-Patchwork-Id: 24423 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:c00a:0:0:0:0:0 with SMTP id c10csp2580709ybf; Mon, 7 Dec 2020 05:04:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJwx7FYkKRfaW8NzQwWk/QF1ifttW6h6DH0VYWU85yBXBjYIGWmQ5KccKrsbjqS51jSUyFAu X-Received: by 2002:a1c:5506:: with SMTP id j6mr18891898wmb.30.1607346286725; Mon, 07 Dec 2020 05:04:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607346286; cv=none; d=google.com; s=arc-20160816; b=UygeDxjiKtOx1r31JBOUdEaBGP6s4czY+SjQwiRaO47JBrp350l9RWn6ZjZoKG6k0K EKfTuldcN4KSVO1tmbixL6Ckyql0X3D2AO9TaVpAWe1rh77rGP7SyXsgYj0Okwl7mnyc wIkxYXAVqVMklDnOgfz0QvoPviQst4sImDHlFnf8daZsAilIEiwPYelOucZ0P7/MU/+2 uudLgUAhNbLiZLSrG2g+9NXX30xdfwkHlkxTl/0OheZx1pwKodHjSAyZvN6VFebkjftu QeniHkp8cfQmEp7PVOQzNRWjyLXeYD80OlF/S5T8Hy5wThDzhLAIs98/QCe5UQe7cuVS DcBw== 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=IUKCJDJkYTpyDTZuvbMJGxDGbP0r0sTj7N39X6GPX8U=; b=i9CV1+lbkYjdZo3pP945cjGHyWJmpvNDnl+nTJUyCjh2iGAIiA8FLJI8dq8xOSzzSq MdwTpoDoPx38YLkVXEUwEnNGuUIjjM8l9HVDasThhTSlJxoFg6BT8dxAPb3rs3uTg9lW 0+YxRg//hRgZt4CnydlW/4rzEnbinWBxOZtclA065p1l+pbM05Gc/lpYrTy4GNIC2fNH GJiRyIViylgskxd+KxV7vOehlql1AaMg0beiWIC/lwYHsqGMAg2Yb5re1OpzN4tf+wEB 4qQzN4s62V9qBVFQZkM9iZQ2p6MBvNWPcJwdZ/wSD2NJbztR3CIdRosM0aafVbsh0zQ4 STCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="sJtJe/aP"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f15si10523792wrx.440.2020.12.07.05.04.46; Mon, 07 Dec 2020 05:04: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=@gmail.com header.s=20161025 header.b="sJtJe/aP"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 48C0C68A2BC; Mon, 7 Dec 2020 15:04:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 776A4688091 for ; Mon, 7 Dec 2020 15:04:37 +0200 (EET) Received: by mail-io1-f49.google.com with SMTP id i18so13279474ioa.1 for ; Mon, 07 Dec 2020 05:04:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MkkJjbB7nDed0lZqwuKmykxANjXLsCUs1NEBdwa5O1o=; b=sJtJe/aPBYxGEiibvv+ffer2QcZD604WObiWwzld4A3FW8Hle6RHddpdZR7aLaUwGp 559iEjswms6jusjWrxLVuBe/c6gNfF6FxW/dz3oKIWiukl9Li+s/Lt75e5ZxjBCwInUt bUmNc+TG9Ss4XXuNN5k6d+foJ3Why7k0etU8ipe2Uw/gEcIAlDABMFJDqVoj/N3Mzvqk BZxw/mzTUOT6vZK1iFst+saJ+J2hkbNnJodlcFVIADIeSvRQWU4NSD0rQm2Vfx8/hwUF 9oWdgCfRgG0saxWpMe7U+oVUtkBCwdubG/mRJStmSx+sTmiIMvAKNjEmFkH0wk4/c8nl Z1yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MkkJjbB7nDed0lZqwuKmykxANjXLsCUs1NEBdwa5O1o=; b=BCO2vMw5A46NDTx9VwVxD28Yxisz+1NkTgJbN1AF6BF1ENylSy2V5PzAf+wQPYA+iA 0SG5l6CLusKJOdpz0xYYYPbx5ZuO4cOeHpPqGSJho6szmJhvu5nJT30CTwibiKX7IR5s SkWqaf6zjnudbd/rq05EwlE8OlHvbea+UMyYNCflIfl/Ej8HoPmWCLcrSgxHT/B2z8cs 8qH4Zi8B5iU1aKdGA7YySuQ8O1P/ggx+sQKArwkI9ZGn767VBXF6iMP3EjGlUtA05kUV 1Y7jJLUk1IuW3IbfS+4FmIPURB3lq5Ykl1OHuFohRLVSCUEHJGoXLD4TZjIICaSXPEM5 IGnQ== X-Gm-Message-State: AOAM532veAHekQfoLRRQi8ItezAKqGEGcpKvzgsuQ8hVIHUyYhHNcdkp 1s1b9UxoPArVd7FptxPjxTe4dfDoXpxIvA== X-Received: by 2002:a05:620a:4113:: with SMTP id j19mr24291026qko.301.1607345784842; Mon, 07 Dec 2020 04:56:24 -0800 (PST) Received: from ip-172-31-39-116.us-east-2.compute.internal (ec2-52-14-134-25.us-east-2.compute.amazonaws.com. [52.14.134.25]) by smtp.gmail.com with ESMTPSA id w15sm1638489qta.95.2020.12.07.04.56.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 04:56:24 -0800 (PST) From: Linjie Fu To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Dec 2020 12:55:41 +0000 Message-Id: <20201207125545.621159-5-linjie.justin.fu@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201207125545.621159-1-linjie.justin.fu@gmail.com> References: <20201207125545.621159-1-linjie.justin.fu@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 4/8] lavc/hevc_ps: Add slice parse support for HEVC SCC extension X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 , Linjie Fu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rAjjrezXdRYI Content-Length: 2140 From: Linjie Fu Signed-off-by: Linjie Fu --- libavcodec/hevcdec.c | 6 ++++++ libavcodec/hevcdec.h | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 699c13bbcc..7074a0760a 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -825,6 +825,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 39c5c7f89f..6e22e044dd 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -292,6 +292,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