From patchwork Mon Jul 5 08:26:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 28777 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3944705ios; Mon, 5 Jul 2021 01:29:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzcOJNmxBKsJ1J5aSWuvardmJUmDLCI2e5Jie9NuDafLRAQbrWcx2g3OgFMFsYKsKnajje2 X-Received: by 2002:aa7:d554:: with SMTP id u20mr14956470edr.50.1625473742297; Mon, 05 Jul 2021 01:29:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625473742; cv=none; d=google.com; s=arc-20160816; b=UOL1PqCBuKFJIwXdfTm63f1rdP44mv+9L13zA+99D8QLT4D1TxbXtkjb3rTdIMqoQx dL0Uaa4wR1o7m8QAFhaze+TKtq9twWP2R6JxyJSv1GV+1B/JLV9siWzlimGDJJaxBpBr CcX2n9EhRO3i9gRUiuCU0u/OlUMtj1CGmQuVpAJs45QbxVoAktDqdotiAEAif/Sk4tSn APoKgAR1farENz6GC46NB3Q4BNYleOTjBjeTWC52GCigCKpEuKO/z8bf+k4e3feU7gsP Np41Hm5BoWOhJz+rmVt41hq/OL9lJLugwx9tF0dWYyRfz2B4eKVRn+2nHnQkzFQKSpsE Z+GA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=PGowjithCpcdaytua5V5fYRixp4NYWCvgDLyZmU2b28=; b=sEOLC3f9TIWjBVq05VnL118WqtdLlwShhFjHE1wM+R5okdMB7K45koF5vzPaNkhdBN STd8JndeS79JjD2hilZv2X0U6b+v0T8X+jASNYfYYxmuQ+ywz7pvzPFqqOIZmtPPO98u 3ADuzoy2RlgTkqfSsQO/N1BCgoPGHKNCTrn0ONyYcgSQQ1YzXso3cC+u4UPaQiqQDKEV //Gy/0yDk6BunIsNfp2opuot84Eu87uNuDEd/Kf2+m043ZG4OOBapF2dl66Ei/pCaEIF VnB22NbtxuerF3IXhn8jdq8W7Pn41pxrfliP3mJfmFgofH7XrbZZw8qz6uolGV+JSlFF rc/Q== ARC-Authentication-Results: i=1; mx.google.com; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 23si11762728ejg.238.2021.07.05.01.29.01; Mon, 05 Jul 2021 01:29:02 -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; 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=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 34DFF68A64A; Mon, 5 Jul 2021 11:28:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E1FE968A28B for ; Mon, 5 Jul 2021 11:28:49 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10035"; a="230662720" X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="230662720" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2021 01:28:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="496045677" Received: from f.sh.intel.com ([10.239.159.147]) by fmsmga002.fm.intel.com with ESMTP; 05 Jul 2021 01:28:42 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jul 2021 16:26:35 +0800 Message-Id: <20210705082643.28259-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v3 1/9] cbs_av1: fix incorrect data type 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 Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZaLcOB1L4DEC Since order_hint_bits_minus_1 range is 0~7, cur_frame_hint can be most 128. And similar return value for cbs_av1_get_relative_dist. So if plus them and use int8_t for the result may lose its precision. Signed-off-by: Fei Wang --- libavcodec/cbs_av1_syntax_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index 6fe6e9a4f3..d98d3d42de 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -355,7 +355,7 @@ static int FUNC(set_frame_refs)(CodedBitstreamContext *ctx, RWContext *rw, AV1_REF_FRAME_ALTREF2, AV1_REF_FRAME_ALTREF }; int8_t ref_frame_idx[AV1_REFS_PER_FRAME], used_frame[AV1_NUM_REF_FRAMES]; - int8_t shifted_order_hints[AV1_NUM_REF_FRAMES]; + int16_t shifted_order_hints[AV1_NUM_REF_FRAMES]; int cur_frame_hint, latest_order_hint, earliest_order_hint, ref; int i, j; From patchwork Mon Jul 5 08:26:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 28771 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3944837ios; Mon, 5 Jul 2021 01:29:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzwM+uYCtO+PDPEtMx0R7j9djB1m0sWyDqe0vgzpGSs8U1eiWO0inArHMikP38brd55nUOZ X-Received: by 2002:a05:6402:430a:: with SMTP id m10mr14692586edc.201.1625473754640; Mon, 05 Jul 2021 01:29:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625473754; cv=none; d=google.com; s=arc-20160816; b=PWqO9/W3vbJHD19+mCjgCYdUcX5pTRirItQSfy5C9rShcRXvfPvutItmwCVFFXvqql TPRVXh+xTb/VvOjb7YEwKTrYWdzW7eyD4Ilo1m3xek+4oKu0lsMCAjVOrnbOMBJ/gntn PPvLlEp8stXUxotMS00tzYGW5/jdgrYoMzA8cVAuR7JXMrlRriyuOHrL93c1UrhPebWL FeaiEYJDYX8SzQ5o9FGgRBWLEWGTXjEWfDRw2HqoNkFaFysWrFMqJY1/ai4BY+0qECal +PUw+eJRpwF1l6QqWh78265BNr0Pb80Vk3akdceFIy3Fkff8q/87W5qPESbTpIR5oL4H dt5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=TWn4LBRR0nxaKZOgkWrjhFrMRil6ja+rR9pC4RN5xBA=; b=ZtczkIkCe1xirjfi7mFUZ/2oe1wzfAW+kisrU/4DeAr1Ljdgiq/wMH6xSKChkOpWjP x0qw8XtCYjFrtZqjf8Nwj+zpI/mLOiGAisPYNfwh7ToLFsMZX8YMPe+AFvOYsxUkBglY +TaofXVIUUjv0w0+dUWF8MB3pxSxn3AL/s6HY+Z8N5Ia/OlE4KOWDIUZbHdWx4x9bMhL r1fM0E0KimHZF8o6L/jnhxZ7WD0GIvYP0k7JktmAcSKf6cfrRFlZCezujuKbOZTnoWU2 g4PvlVhGvsvnxfFuaHQNLyTUQpHhWwHwEeVTd4rJzLe5Nwf1ZfAFue78Gx7VtF4hgBL7 7mZw== ARC-Authentication-Results: i=1; mx.google.com; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y1si9731608edq.201.2021.07.05.01.29.14; Mon, 05 Jul 2021 01:29:14 -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; 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=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 64D5968A5F8; Mon, 5 Jul 2021 11:28:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E9D5A68A630 for ; Mon, 5 Jul 2021 11:28:51 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10035"; a="230662723" X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="230662723" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2021 01:28:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="496045685" Received: from f.sh.intel.com ([10.239.159.147]) by fmsmga002.fm.intel.com with ESMTP; 05 Jul 2021 01:28:44 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jul 2021 16:26:36 +0800 Message-Id: <20210705082643.28259-2-fei.w.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210705082643.28259-1-fei.w.wang@intel.com> References: <20210705082643.28259-1-fei.w.wang@intel.com> Subject: [FFmpeg-devel] [PATCH v3 2/9] avcodec/av1: extend some definitions in spec section 3 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 Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +IocKEm5km16 Signed-off-by: Fei Wang --- libavcodec/av1.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/av1.h b/libavcodec/av1.h index 0f99ae4829..951a18ecb2 100644 --- a/libavcodec/av1.h +++ b/libavcodec/av1.h @@ -114,6 +114,13 @@ enum { AV1_WARP_MODEL_TRANSLATION = 1, AV1_WARP_MODEL_ROTZOOM = 2, AV1_WARP_MODEL_AFFINE = 3, + AV1_WARP_PARAM_REDUCE_BITS = 6, + + AV1_DIV_LUT_BITS = 8, + AV1_DIV_LUT_PREC_BITS = 14, + AV1_DIV_LUT_NUM = 257, + + AV1_MAX_LOOP_FILTER = 63, }; From patchwork Mon Jul 5 08:26:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 28778 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3944897ios; Mon, 5 Jul 2021 01:29:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyoJB4+xGeiKK7/vDHqa4WxUJvxKYzG0d4UeW0xWhOzIr2ZhT5cl7wkzNbg4UeeqwCGeXdy X-Received: by 2002:a50:b2c5:: with SMTP id p63mr14519924edd.5.1625473764544; Mon, 05 Jul 2021 01:29:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625473764; cv=none; d=google.com; s=arc-20160816; b=qbgW8GYX7o9eLkzW3ojw+HnM3S+JIbRS8RP4nY0oW1BRgcbFywvTJkYBTMxafgNRFD XieVv/ZA/7rqqbRT6lQtXGjyW3D+VU8Er9whcLKVKp55b5SzC5mmNWlCTU0JDb1tm33z 2CBhWR3MMhkXYrh/ImHB1Hih/s9hxBMZV/74gnJSIlSC2NwogCkELbxclW2DwTzoU6Ng 2mm0u/Wz953BWKD80Dg2YyVUlB8UwPaNz6Z9iLdPI/Sf5LYZXe9yHO5LzTuIfoYGMWKd ETuL1w4J3Qz4I9vJpFAbQq/RL7rtxDAglIEl/VRb7dDOiNEXar4gly2biYSUorL2jNl6 fcBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=8//w8xgCUemwryET/dsekJpmKhaw7K43IkhiFE0q1EA=; b=LW3M9wXmlpzm553R4bW8nmP7fmIQyvXPkOU4fjk1uoVswakwaLT4EbAXSgOjsidNPn 3FDvuKlhAwOPY1fASgnY+bayTo3VjncwcjA1ZFCoj4m+Dlhov7NWVCFvA7gmstu4SGtB 9YyhhRASBhCowwoCnV5XzEwS++XlbAZGADnoL89t8+VA4TmF7ZaZFZGaWMan3X7cTeBG 2XHzPTS04DTtS6peGzf08Y7SXofe5Taqo8q1JhZcZBcXFAxzKTJ9tZwOTSxSQeHpZsbV qfTM5aEQETorHv3rk9JKlIoSjbWGHzxvOUvaKExNFAnbZ5xwvgC4TPe94a53UkiTy+Pc GIuw== ARC-Authentication-Results: i=1; mx.google.com; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h4si10934997edr.283.2021.07.05.01.29.24; Mon, 05 Jul 2021 01:29:24 -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; 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=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8D89D689CE2; Mon, 5 Jul 2021 11:29:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CBED468A682 for ; Mon, 5 Jul 2021 11:28:52 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10035"; a="230662724" X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="230662724" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2021 01:28:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="496045690" Received: from f.sh.intel.com ([10.239.159.147]) by fmsmga002.fm.intel.com with ESMTP; 05 Jul 2021 01:28:45 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jul 2021 16:26:37 +0800 Message-Id: <20210705082643.28259-3-fei.w.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210705082643.28259-1-fei.w.wang@intel.com> References: <20210705082643.28259-1-fei.w.wang@intel.com> Subject: [FFmpeg-devel] [PATCH v3 3/9] avcodec/av1dec: support setup shear process 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 Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: PcL5PI9hd6ic Defined in spec 7.11.3.6/7.11.3.7. Signed-off-by: Fei Wang --- update: 1. add the comment for table div_lut. libavcodec/av1dec.c | 98 +++++++++++++++++++++++++++++++++++++++++++++ libavcodec/av1dec.h | 1 + 2 files changed, 99 insertions(+) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 1dda0f9160..9cf25e3409 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -28,6 +28,34 @@ #include "internal.h" #include "profiles.h" +/**< same with Div_Lut defined in spec 7.11.3.7 */ +static const uint16_t div_lut[AV1_DIV_LUT_NUM] = { + 16384, 16320, 16257, 16194, 16132, 16070, 16009, 15948, 15888, 15828, 15768, + 15709, 15650, 15592, 15534, 15477, 15420, 15364, 15308, 15252, 15197, 15142, + 15087, 15033, 14980, 14926, 14873, 14821, 14769, 14717, 14665, 14614, 14564, + 14513, 14463, 14413, 14364, 14315, 14266, 14218, 14170, 14122, 14075, 14028, + 13981, 13935, 13888, 13843, 13797, 13752, 13707, 13662, 13618, 13574, 13530, + 13487, 13443, 13400, 13358, 13315, 13273, 13231, 13190, 13148, 13107, 13066, + 13026, 12985, 12945, 12906, 12866, 12827, 12788, 12749, 12710, 12672, 12633, + 12596, 12558, 12520, 12483, 12446, 12409, 12373, 12336, 12300, 12264, 12228, + 12193, 12157, 12122, 12087, 12053, 12018, 11984, 11950, 11916, 11882, 11848, + 11815, 11782, 11749, 11716, 11683, 11651, 11619, 11586, 11555, 11523, 11491, + 11460, 11429, 11398, 11367, 11336, 11305, 11275, 11245, 11215, 11185, 11155, + 11125, 11096, 11067, 11038, 11009, 10980, 10951, 10923, 10894, 10866, 10838, + 10810, 10782, 10755, 10727, 10700, 10673, 10645, 10618, 10592, 10565, 10538, + 10512, 10486, 10460, 10434, 10408, 10382, 10356, 10331, 10305, 10280, 10255, + 10230, 10205, 10180, 10156, 10131, 10107, 10082, 10058, 10034, 10010, 9986, + 9963, 9939, 9916, 9892, 9869, 9846, 9823, 9800, 9777, 9754, 9732, + 9709, 9687, 9664, 9642, 9620, 9598, 9576, 9554, 9533, 9511, 9489, + 9468, 9447, 9425, 9404, 9383, 9362, 9341, 9321, 9300, 9279, 9259, + 9239, 9218, 9198, 9178, 9158, 9138, 9118, 9098, 9079, 9059, 9039, + 9020, 9001, 8981, 8962, 8943, 8924, 8905, 8886, 8867, 8849, 8830, + 8812, 8793, 8775, 8756, 8738, 8720, 8702, 8684, 8666, 8648, 8630, + 8613, 8595, 8577, 8560, 8542, 8525, 8508, 8490, 8473, 8456, 8439, + 8422, 8405, 8389, 8372, 8355, 8339, 8322, 8306, 8289, 8273, 8257, + 8240, 8224, 8208, 8192 +}; + static uint32_t inverse_recenter(int r, uint32_t v) { if (v > 2 * r) @@ -97,6 +125,70 @@ static void read_global_param(AV1DecContext *s, int type, int ref, int idx) -mx, mx + 1, r) << prec_diff) + round; } +static uint64_t round_two(uint64_t x, uint16_t n) +{ + if (n == 0) + return x; + return ((x + (1 << (n - 1))) >> n); +} + +static int64_t round_two_signed(int64_t x, uint16_t n) +{ + return ((x<0) ? -round_two(-x, n) : round_two(x, n)); +} + +/** + * Resolve divisor process. + * see spec 7.11.3.7 + */ +static int16_t resolve_divisor(uint32_t d, uint16_t *shift) +{ + int32_t e, f; + + *shift = av_log2(d); + e = d - (1 << (*shift)); + if (*shift > AV1_DIV_LUT_BITS) + f = round_two(e, *shift - AV1_DIV_LUT_BITS); + else + f = e << (AV1_DIV_LUT_BITS - (*shift)); + + *shift += AV1_DIV_LUT_PREC_BITS; + + return div_lut[f]; +} + +/** + * check if global motion params is valid. + * see spec 7.11.3.6 + */ +static uint8_t get_shear_params_valid(AV1DecContext *s, int idx) +{ + int16_t alpha, beta, gamma, delta, divf, divs; + int64_t v, w; + int32_t *param = &s->cur_frame.gm_params[idx][0]; + if (param[2] < 0) + return 0; + + alpha = av_clip_int16(param[2] - (1 << AV1_WARPEDMODEL_PREC_BITS)); + beta = av_clip_int16(param[3]); + divf = resolve_divisor(abs(param[2]), &divs); + v = param[4] * (1 << AV1_WARPEDMODEL_PREC_BITS); + w = param[3] * param[4]; + gamma = av_clip_int16(round_two_signed((v * divf), divs)); + delta = av_clip_int16(param[5] - round_two_signed((w * divf), divs) - (1 << AV1_WARPEDMODEL_PREC_BITS)); + + alpha = round_two_signed(alpha, AV1_WARP_PARAM_REDUCE_BITS) << AV1_WARP_PARAM_REDUCE_BITS; + beta = round_two_signed(beta, AV1_WARP_PARAM_REDUCE_BITS) << AV1_WARP_PARAM_REDUCE_BITS; + gamma = round_two_signed(gamma, AV1_WARP_PARAM_REDUCE_BITS) << AV1_WARP_PARAM_REDUCE_BITS; + delta = round_two_signed(delta, AV1_WARP_PARAM_REDUCE_BITS) << AV1_WARP_PARAM_REDUCE_BITS; + + if ((4 * abs(alpha) + 7 * abs(beta)) >= (1 << AV1_WARPEDMODEL_PREC_BITS) || + (4 * abs(gamma) + 4 * abs(delta)) >= (1 << AV1_WARPEDMODEL_PREC_BITS)) + return 0; + + return 1; +} + /** * update gm type/params, since cbs already implemented part of this funcation, * so we don't need to full implement spec. @@ -144,6 +236,9 @@ static void global_motion_params(AV1DecContext *s) read_global_param(s, type, ref, 0); read_global_param(s, type, ref, 1); } + if (type <= AV1_WARP_MODEL_AFFINE) { + s->cur_frame.gm_invalid[ref] = !get_shear_params_valid(s, ref); + } } } @@ -509,6 +604,9 @@ static int av1_frame_ref(AVCodecContext *avctx, AV1Frame *dst, const AV1Frame *s dst->spatial_id = src->spatial_id; dst->temporal_id = src->temporal_id; + memcpy(dst->gm_invalid, + src->gm_invalid, + AV1_NUM_REF_FRAMES * sizeof(uint8_t)); memcpy(dst->gm_type, src->gm_type, AV1_NUM_REF_FRAMES * sizeof(uint8_t)); diff --git a/libavcodec/av1dec.h b/libavcodec/av1dec.h index 248a68750f..4e140588b9 100644 --- a/libavcodec/av1dec.h +++ b/libavcodec/av1dec.h @@ -42,6 +42,7 @@ typedef struct AV1Frame { int temporal_id; int spatial_id; + uint8_t gm_invalid[AV1_NUM_REF_FRAMES]; uint8_t gm_type[AV1_NUM_REF_FRAMES]; int32_t gm_params[AV1_NUM_REF_FRAMES][6]; From patchwork Mon Jul 5 08:26:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 28774 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3944981ios; Mon, 5 Jul 2021 01:29:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwHdjKUT3D0M9NAUbKxsQ93Ex2nEQzcEtsy4l99G59fIB7KtCShhaZOGAhH58DQ1iccVwrM X-Received: by 2002:a05:6402:cb1:: with SMTP id cn17mr14599838edb.76.1625473775501; Mon, 05 Jul 2021 01:29:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625473775; cv=none; d=google.com; s=arc-20160816; b=Z0Ze+MeSDjf2DL+9aKrXLMNPVcmlstD27TsfDFFMkk5vHq9118jijjBF3BWrmmiEDT 0NBDWh/UhYywkHiTYbzFGkKjfgEGXOELf7ist7hCfLMoqg4Vj82BPoEiMIYzbUfCZwIR JmJGQ2Rwwev5aTButFVmOp35Hv8MKpRWahibQb1dwpb4S36htbLuLdjNphYmyGpLHymH m8qZjXDd83JtglpTlzbgc5MwusP2nfrYcJV4HM2IUpJ4BdQM0h/IGHt7agbC7SO4MVc2 YMUySKyJAnIb9VvP/cMXvPrGFOukOCfATSkkabkAv0SoL3cCslINKI8dLD4IOGalydd5 CtXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=bkVozSZ7hVmtNxG61PIGhx2/oS+J/tYDetO40/PSLeE=; b=b3ebZuWZaGs2ru5sm4emnp5o1DBou3Ca3so8CXJLCpfGxWtfayllugFaEScdUDir9U oZpfznUlLUiDhbW086ZvyreDaWdJlFNCU+qvYZjFkazz0GzE4SonJpfo+f4TW68zaDkx sr+WRUPLmDZ3G7oNgEmJ9fmhNzY81IhAfQ/tRlCIowE6vLt3UcjTSbE2TmruEDrFuIr1 W4a3fnkHwiEeMkQQDfMezmSmorAIfqwyVpY7oTCrlJV4/sdxXgI6sl5qIHez7ltk/9VO A1/fI/77t5l8gmKIU6id1H4SoHtS3hzVvuQqfdX0Wn2+mYCuJbt0XYDHxHYS18U93FZ/ QKOQ== ARC-Authentication-Results: i=1; mx.google.com; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cb9si11321849edb.435.2021.07.05.01.29.35; Mon, 05 Jul 2021 01:29:35 -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; 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=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AED9B68A6D0; Mon, 5 Jul 2021 11:29:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ECED568A6B6 for ; Mon, 5 Jul 2021 11:28:55 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10035"; a="230662728" X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="230662728" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2021 01:28:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="496045698" Received: from f.sh.intel.com ([10.239.159.147]) by fmsmga002.fm.intel.com with ESMTP; 05 Jul 2021 01:28:46 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jul 2021 16:26:38 +0800 Message-Id: <20210705082643.28259-4-fei.w.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210705082643.28259-1-fei.w.wang@intel.com> References: <20210705082643.28259-1-fei.w.wang@intel.com> Subject: [FFmpeg-devel] [PATCH v3 4/9] avcodec/av1_vaapi: add gm params valid check 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 Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +5y7pH9ua410 Signed-off-by: Fei Wang --- libavcodec/vaapi_av1.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c index 16b7e35747..f577447be4 100644 --- a/libavcodec/vaapi_av1.c +++ b/libavcodec/vaapi_av1.c @@ -213,7 +213,8 @@ static int vaapi_av1_start_frame(AVCodecContext *avctx, frame_header->height_in_sbs_minus_1[i]; } for (int i = AV1_REF_FRAME_LAST; i <= AV1_REF_FRAME_ALTREF; i++) { - pic_param.wm[i - 1].wmtype = s->cur_frame.gm_type[i]; + pic_param.wm[i - 1].invalid = s->cur_frame.gm_invalid[i]; + pic_param.wm[i - 1].wmtype = s->cur_frame.gm_type[i]; for (int j = 0; j < 6; j++) pic_param.wm[i - 1].wmmat[j] = s->cur_frame.gm_params[i][j]; } From patchwork Mon Jul 5 08:26:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 28773 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3945093ios; Mon, 5 Jul 2021 01:29:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxyCgNZmrynHkAJxJ9c2FZfUE9ER7qJMO6JaLCShm1+yBXSYH5jWNqJq8l1IK2G7AYBpMby X-Received: by 2002:a05:6402:6:: with SMTP id d6mr2826137edu.236.1625473787526; Mon, 05 Jul 2021 01:29:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625473787; cv=none; d=google.com; s=arc-20160816; b=hcoUUUp3rQqQF+m5BCs0waUQhK9KTpTlRssFZT4JL9gIxyLrUApFgLLb+Tf3MhQVDJ B4PrmmtSO46iO3HLprWhBz7ZByVyZfAqd/tlB3LCOjP0VbRwVXtNAUY03/6lUViK/vIY 5Safs3eQ0BZ3LiHnYFXZpapLxrbZ72CIRstPEb5C4qa9xeoq6Uvllt4kpffn78H/4K3J aDvKc1Y8s2CG5CEm8J2T9BAnWJU94Ylv6RJWt3Ems3PHGG/iRSGO7ctT434+K/32vwZo hlfy/GSJfZidS5qAhjYiAcN+7NWW53RX++jq4NA/HhO0TG/LO0dhnCgOYQnQ4FsQrA0m 7mCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=aLwA2lVUAxkbfiLCFhcrExLJpOWJyOga98Ng6z43CjU=; b=t4ruhsVnmfsVG+BupLo8hu83o3DPZ9znQ9HdRJwj/xLbQVhDi9CbMWCRFNASNhXNjC 8d7BldXOZ7ExdMl8B2TaJFiRusBxPbdu40WEzxnLTCWXMMF7gezpXZ6If5whisli0YGp p9OB30nOC6vDfP9X1jhSXljWRrPQEDxj7QDPYKbe0WZ+KBA3lOxQnV4p+neLcmFk30sm 8C8bLDakM0NIw6n9jYSanw571Q6pzItanaJDyd6scK/wtLnmgETLZs6VpcFh5IH2WAKp 52H09/0i3MBo0nQvFPEbs/s4XazgPoy1btTD9SV4uJ84ITQzbsKcbyhV+DDqENsEZ8NM yFmw== ARC-Authentication-Results: i=1; mx.google.com; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id oz36si7049005ejc.144.2021.07.05.01.29.47; Mon, 05 Jul 2021 01:29:47 -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; 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=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BEDCD68A6EB; Mon, 5 Jul 2021 11:29:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CEDB668A6D2 for ; Mon, 5 Jul 2021 11:28:57 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10035"; a="230662729" X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="230662729" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2021 01:28:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="496045704" Received: from f.sh.intel.com ([10.239.159.147]) by fmsmga002.fm.intel.com with ESMTP; 05 Jul 2021 01:28:48 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jul 2021 16:26:39 +0800 Message-Id: <20210705082643.28259-5-fei.w.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210705082643.28259-1-fei.w.wang@intel.com> References: <20210705082643.28259-1-fei.w.wang@intel.com> Subject: [FFmpeg-devel] [PATCH v3 5/9] avcodec/vaapi: increase av1 decode pool size 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 Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: dGyZGOcO7VhK For film grain clip, vaapi_av1 decoder will cache additional 8 surfaces that will be used to store frames which apply film grain. So increase the pool size by plus 8 to avoid leak of surface. Signed-off-by: Fei Wang --- libavcodec/vaapi_decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index 958ddf49da..665af370ed 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -577,10 +577,10 @@ static int vaapi_decode_make_config(AVCodecContext *avctx, switch (avctx->codec_id) { case AV_CODEC_ID_H264: case AV_CODEC_ID_HEVC: + case AV_CODEC_ID_AV1: frames->initial_pool_size += 16; break; case AV_CODEC_ID_VP9: - case AV_CODEC_ID_AV1: frames->initial_pool_size += 8; break; case AV_CODEC_ID_VP8: From patchwork Mon Jul 5 08:26:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 28776 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3945176ios; Mon, 5 Jul 2021 01:29:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxG8Wd0zt/6s/LJDZtk15WhMs1hx6o3EZQOJ4SXj35x/uYOQqGM9DwY0NwhFURJ4Xv3h/K0 X-Received: by 2002:a17:907:397:: with SMTP id ss23mr6480358ejb.120.1625473797727; Mon, 05 Jul 2021 01:29:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625473797; cv=none; d=google.com; s=arc-20160816; b=nlOVS1US6t77N4C2+fdv3SWXxa989YYEde3ns4qkbkolJszwb039QrsHfwQWqSRCu0 JU4Ml+lHK5isqaaGFeaIaw1zSMHFs+8OWdAQOCD+V3D6mhScHEWY5Bs7+e8UssRBoicv SuGCMWPqGjDxVhUAkT4dndcCzSPT73cNwya6uCiN3bsAeaJ3DJR849TwZgfTPLOrVcOe ViWjVcIpTG20TXorGsxzHMD1+B3tjlnQSSa8K+myUdKWsKUcRLXukz729wZh6itsF9x+ CaXxcKs4KXeRE3JAz1k+nXHANtFQaxvRw88uFW8XBXgxnUYYdG/iMr7Jd8JZ+qXdF+HL KAMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=WiEy5wlN2MCegx/Vp31TB50wCFUrKfRfvMmJPZT+sb0=; b=J93z566S0QqOUTSYa2+IjWhXGnJIPk3fgUgPrnzzBjH5oWjwUN561W51XeUivanSeA 4x7g8BF+NPlaNeaw0ck1aB10vYfK+3XktDUCLbyya7z6LTB6cD4nPBcew2foaz6kXSBk fXcatixwJQ0T0ZphofXNQ+MtYRO7B9vZeed58B+XFxO+h1D20oTZxSSQuVLT7IIk2ysc 4z+lc/3CueYsA7+5evhHhHksZxrnNn2JysiQwEsn5wgaNHBmHQ4SzNYhVBHbhWDplGb0 Dp4OO8hd7fy5oRlX+L7r6SCeGSfx3DI/y2pr3FdZCGBSf3UgXEH/P86n7dIExV4AT6ca sucw== ARC-Authentication-Results: i=1; mx.google.com; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dt16si10919936ejc.556.2021.07.05.01.29.57; Mon, 05 Jul 2021 01:29:57 -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; 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=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ED1EE68A6F6; Mon, 5 Jul 2021 11:29:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2B3168A6CC for ; Mon, 5 Jul 2021 11:28:58 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10035"; a="230662732" X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="230662732" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2021 01:28:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="496045713" Received: from f.sh.intel.com ([10.239.159.147]) by fmsmga002.fm.intel.com with ESMTP; 05 Jul 2021 01:28:49 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jul 2021 16:26:40 +0800 Message-Id: <20210705082643.28259-6-fei.w.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210705082643.28259-1-fei.w.wang@intel.com> References: <20210705082643.28259-1-fei.w.wang@intel.com> Subject: [FFmpeg-devel] [PATCH v3 6/9] avcodec/av1dec: add display frame for film grain usage 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 Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: sP2J78Crg+FR Make it flexible if decode frame(without apply film grain) and display frame(applied film grain) both needed when decode film grain clips. Signed-off-by: Fei Wang --- libavcodec/av1dec.c | 43 ++++++++++++++++++++++++++++++++++++++++++- libavcodec/av1dec.h | 3 +++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 9cf25e3409..10ee6c6084 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -570,6 +570,8 @@ static int get_pixel_format(AVCodecContext *avctx) static void av1_frame_unref(AVCodecContext *avctx, AV1Frame *f) { ff_thread_release_buffer(avctx, &f->tf); + if (f->tf_display.f->buf[0]) + ff_thread_release_buffer(avctx, &f->tf_display); av_buffer_unref(&f->hwaccel_priv_buf); f->hwaccel_picture_private = NULL; av_buffer_unref(&f->header_ref); @@ -589,6 +591,12 @@ static int av1_frame_ref(AVCodecContext *avctx, AV1Frame *dst, const AV1Frame *s if (ret < 0) return ret; + if (src->tf_display.f->buf[0]) { + ret = ff_thread_ref_frame(&dst->tf_display, &src->tf_display); + if (ret < 0) + return ret; + } + dst->header_ref = av_buffer_ref(src->header_ref); if (!dst->header_ref) goto fail; @@ -635,9 +643,11 @@ static av_cold int av1_decode_free(AVCodecContext *avctx) for (int i = 0; i < FF_ARRAY_ELEMS(s->ref); i++) { av1_frame_unref(avctx, &s->ref[i]); av_frame_free(&s->ref[i].tf.f); + av_frame_free(&s->ref[i].tf_display.f); } av1_frame_unref(avctx, &s->cur_frame); av_frame_free(&s->cur_frame.tf.f); + av_frame_free(&s->cur_frame.tf_display.f); av_buffer_unref(&s->seq_ref); av_buffer_unref(&s->header_ref); @@ -739,6 +749,13 @@ static av_cold int av1_decode_init(AVCodecContext *avctx) "Failed to allocate reference frame buffer %d.\n", i); return AVERROR(ENOMEM); } + + s->ref[i].tf_display.f = av_frame_alloc(); + if (!s->ref[i].tf_display.f) { + av_log(avctx, AV_LOG_ERROR, + "Failed to allocate display frame buffer %d.\n", i); + return AVERROR(ENOMEM); + } } s->cur_frame.tf.f = av_frame_alloc(); @@ -748,6 +765,13 @@ static av_cold int av1_decode_init(AVCodecContext *avctx) return AVERROR(ENOMEM); } + s->cur_frame.tf_display.f = av_frame_alloc(); + if (!s->cur_frame.tf_display.f) { + av_log(avctx, AV_LOG_ERROR, + "Failed to allocate current display frame buffer.\n"); + return AVERROR(ENOMEM); + } + ret = ff_cbs_init(&s->cbc, AV_CODEC_ID_AV1, avctx); if (ret < 0) return ret; @@ -820,6 +844,16 @@ static int av1_frame_alloc(AVCodecContext *avctx, AV1Frame *f) break; } + if (header->film_grain.apply_grain && + (avctx->pix_fmt == AV_PIX_FMT_VAAPI) && + !(avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN)) { + if ((ret = ff_thread_get_buffer(avctx, &f->tf_display, AV_GET_BUFFER_FLAG_REF)) < 0) + goto fail; + + f->tf_display.f->key_frame = frame->key_frame; + f->tf_display.f->pict_type = frame->pict_type; + } + if (avctx->hwaccel) { const AVHWAccel *hwaccel = avctx->hwaccel; if (hwaccel->frame_priv_data_size) { @@ -903,9 +937,16 @@ static int set_output_frame(AVCodecContext *avctx, AVFrame *frame, const AVPacket *pkt, int *got_frame) { AV1DecContext *s = avctx->priv_data; - const AVFrame *srcframe = s->cur_frame.tf.f; + const AVFrame *srcframe; int ret; + /* Use tf_display as output when it is available. */ + if (s->cur_frame.tf_display.f->buf[0]) { + srcframe = s->cur_frame.tf_display.f; + } else { + srcframe= s->cur_frame.tf.f; + } + // TODO: all layers if (s->operating_point_idc && av_log2(s->operating_point_idc >> 8) > s->cur_frame.spatial_id) diff --git a/libavcodec/av1dec.h b/libavcodec/av1dec.h index 4e140588b9..5af3dfc867 100644 --- a/libavcodec/av1dec.h +++ b/libavcodec/av1dec.h @@ -33,6 +33,9 @@ typedef struct AV1Frame { ThreadFrame tf; + /** current tf_display is only used for VA-API to apply film grain */ + ThreadFrame tf_display; + AVBufferRef *hwaccel_priv_buf; void *hwaccel_picture_private; From patchwork Mon Jul 5 08:26:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 28772 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3945341ios; Mon, 5 Jul 2021 01:30:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyV1MyboZ1AtvinAMiNT4ocbsSw8/yv/CW5y4TafWrxT0g4GubuX/7lpdfWrDttDD6/KojZ X-Received: by 2002:aa7:d14f:: with SMTP id r15mr15138744edo.350.1625473816926; Mon, 05 Jul 2021 01:30:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625473816; cv=none; d=google.com; s=arc-20160816; b=BKN6IEvB5Hj65thi5VVWYD7VBEaU1fvfUCfh31k0D1kHyspE4DGK+BT/oQZOtvhxNE tdnuwgWIJ4S+Jo6walDFuRWS+8qNiaN9buckkZQGA6WdJC7xMhgdM5X71TgBeFXBxVWA pNTCZExQnaCNjyqhXaXDq4scA4RJ03n1H9IKD12By9gj9t/JSrTQqsWRv/d02xlSu3yA LfPvZiTSmu6UzCuqub0Rw6ff8QTv/oa0LNVemNyLSWm3330A8D1Mx3I3pm5G5RFG3b2e lsNtyleF8IMZMnGNtxiipwIbYqm1+to1BL3bkGkTy0cTL+d7xN3AX+YU6iZ/tJ0nDT2Z j3Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=/gOZcqdnHPr6pRClQYZNb+oJzRVEW5jAeyl3cgjmKaM=; b=uAWuPZNj99EqWEqh1XtwAgySsWdW2wJ1ys90irHVnghJkMMNdcauOe8r+jcUpE9flt coxeJfDTG/yUIab7LDUWoIiX/w6tRCtWdrZd/BGOCXQ9VqU37oNAmgOABapr6hqsGNZ/ Jqn+HzmzECxKp0aeq6ASCG+jR2EJfZtwJ+tEw842PnIlMPMttIFChpz15dZ+qgbNzQ5p j2TKgOzDBmS6JvHeFl77Xp/aS7ZJvn/N84QflNMxqovADfSBZCUrT7CEb2qf6oNPzxdO 5ae67L9L9KnM8fmTgjCV8SyhlhpwFmgt5/3JHC1mbYfzGleZqsr+hmGQZXRKoy8zsgHs F4aA== ARC-Authentication-Results: i=1; mx.google.com; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v8si10970056edt.425.2021.07.05.01.30.16; Mon, 05 Jul 2021 01:30: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; 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=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 209CF68A6F9; Mon, 5 Jul 2021 11:29:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D27EC68A708 for ; Mon, 5 Jul 2021 11:29:01 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10035"; a="230662734" X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="230662734" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2021 01:28:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="496045725" Received: from f.sh.intel.com ([10.239.159.147]) by fmsmga002.fm.intel.com with ESMTP; 05 Jul 2021 01:28:50 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jul 2021 16:26:41 +0800 Message-Id: <20210705082643.28259-7-fei.w.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210705082643.28259-1-fei.w.wang@intel.com> References: <20210705082643.28259-1-fei.w.wang@intel.com> Subject: [FFmpeg-devel] [PATCH v3 7/9] avcodec/av1_vaapi: set display surface when apply film grain 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 Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: CKWSfB1TEF/q Signed-off-by: Fei Wang --- libavcodec/vaapi_av1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c index f577447be4..81b13bb1aa 100644 --- a/libavcodec/vaapi_av1.c +++ b/libavcodec/vaapi_av1.c @@ -76,7 +76,7 @@ static int vaapi_av1_start_frame(AVCodecContext *avctx, .order_hint_bits_minus_1 = seq->order_hint_bits_minus_1, .bit_depth_idx = bit_depth_idx, .current_frame = pic->output_surface, - .current_display_picture = pic->output_surface, + .current_display_picture = apply_grain ? ff_vaapi_get_surface_id(s->cur_frame.tf_display.f) : pic->output_surface, .frame_width_minus1 = frame_header->frame_width_minus_1, .frame_height_minus1 = frame_header->frame_height_minus_1, .primary_ref_frame = frame_header->primary_ref_frame, From patchwork Mon Jul 5 08:26:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 28779 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3945443ios; Mon, 5 Jul 2021 01:30:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLxxQY2ZruhLQsDYKlRGemRSGfpQMC3DVxMPpIX969788iPKbAfKjlQbwZ+KKakfYmqZoe X-Received: by 2002:a05:6402:487:: with SMTP id k7mr14738337edv.315.1625473827722; Mon, 05 Jul 2021 01:30:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625473827; cv=none; d=google.com; s=arc-20160816; b=zm8cgePIt0BvHJaem7g06+VVkHux7tL5Q0SQ27reYFVWxjKSnNm/TkaRoU0BaYtnuc +CETOdrWihNYw6HWTGkTZj3Qp55H7gGwYABv934HOaO2KVQlU60fPmqe74/THEU6DwEg o23yruWQFmapNC/ECztXg4YD22YBtStKMh9AoG/BvPUrrU6nCiKKDnn7U45IwQPM2nzK w7F3QjpqPVV4RM9OtkVFSXb+gp7y0ALj/6oNTVq1qb8JksyP1lIV5VKohpwTtMcQ676E w8fvWzhZ/HUuUHCh5y+rYrUjlTlUy5Od+EfUYLbU9sl3Z/cAfg3asncQRn9/A4xYZynM gf6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=YfVIkzUvXvNk9CIV/t0Htd4miK+F2WonzgeTn6YZSUY=; b=vXk0aSyP7qWpysIlqBMjyu4GWva7S44nzu77p3kNqWY790hZES/WgBMIv7ymDuwlKr MDQrPaavtLwbaxQaVFAI8/FIrmjS5g4iGKz+3yyWCFpSGM9PZSHt2NbY0nqrWoNnaYXT W/Me+xScEYfAZInkABSi9mEdOWLgFG8kBmDtlKUmyf5Q5x8HxGZAaYr4j/9XYSZ0qzVB qClEPdaX5Hjt+/uoSMFmTMykpijQrwfU0viMgkha6yPwxxlsN5817+7UddAw9JRWNU6J D/sTJAaYG6tiBcZAfS+bYQGOUxEZJ9atu12HTv9a9wgPyVFSnxRBQpOXhxo5theG51Yj feRA== ARC-Authentication-Results: i=1; mx.google.com; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c16si11465186edw.370.2021.07.05.01.30.27; Mon, 05 Jul 2021 01:30:27 -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; 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=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 443A668A716; Mon, 5 Jul 2021 11:29:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2C5868A6D2 for ; Mon, 5 Jul 2021 11:29:03 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10035"; a="230662737" X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="230662737" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2021 01:28:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="496045736" Received: from f.sh.intel.com ([10.239.159.147]) by fmsmga002.fm.intel.com with ESMTP; 05 Jul 2021 01:28:51 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jul 2021 16:26:42 +0800 Message-Id: <20210705082643.28259-8-fei.w.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210705082643.28259-1-fei.w.wang@intel.com> References: <20210705082643.28259-1-fei.w.wang@intel.com> Subject: [FFmpeg-devel] [PATCH v3 8/9] avcodec/av1_vaapi: enable segmentation features 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 Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HRi/fqKyhiHB Signed-off-by: Fei Wang --- libavcodec/vaapi_av1.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c index 81b13bb1aa..6aaabed2c1 100644 --- a/libavcodec/vaapi_av1.c +++ b/libavcodec/vaapi_av1.c @@ -63,6 +63,9 @@ static int vaapi_av1_start_frame(AVCodecContext *avctx, int err = 0; int apply_grain = !(avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN) && film_grain->apply_grain; uint8_t remap_lr_type[4] = {AV1_RESTORE_NONE, AV1_RESTORE_SWITCHABLE, AV1_RESTORE_WIENER, AV1_RESTORE_SGRPROJ}; + uint8_t segmentation_feature_signed[AV1_SEG_LVL_MAX] = {1, 1, 1, 1, 1, 0, 0, 0}; + uint8_t segmentation_feature_max[AV1_SEG_LVL_MAX] = {255, AV1_MAX_LOOP_FILTER, + AV1_MAX_LOOP_FILTER, AV1_MAX_LOOP_FILTER, AV1_MAX_LOOP_FILTER, 7 , 0 , 0 }; pic->output_surface = vaapi_av1_surface_id(&s->cur_frame); @@ -218,6 +221,17 @@ static int vaapi_av1_start_frame(AVCodecContext *avctx, for (int j = 0; j < 6; j++) pic_param.wm[i - 1].wmmat[j] = s->cur_frame.gm_params[i][j]; } + for (int i = 0; i < AV1_MAX_SEGMENTS; i++) { + for (int j = 0; j < AV1_SEG_LVL_MAX; j++) { + pic_param.seg_info.feature_mask[i] |= (frame_header->feature_enabled[i][j] << j); + if (segmentation_feature_signed[j]) + pic_param.seg_info.feature_data[i][j] = av_clip(frame_header->feature_value[i][j], + -segmentation_feature_max[j], segmentation_feature_max[j]); + else + pic_param.seg_info.feature_data[i][j] = av_clip(frame_header->feature_value[i][j], + 0, segmentation_feature_max[j]); + } + } if (apply_grain) { for (int i = 0; i < film_grain->num_y_points; i++) { pic_param.film_grain_info.point_y_value[i] = From patchwork Mon Jul 5 08:26:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 28775 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3945246ios; Mon, 5 Jul 2021 01:30:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmOwTimUYpsMzpSaQ77dwToXqODsVsq2cmKYe8md/0xw07GXP9wNHV4DuzPecZ1ewwG3Ji X-Received: by 2002:a17:907:60d6:: with SMTP id hv22mr9100684ejc.80.1625473806824; Mon, 05 Jul 2021 01:30:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625473806; cv=none; d=google.com; s=arc-20160816; b=yQbJfkfruK69tKdOZXzJsOAlmZV5cj4oGPPbh8nAbMK34hzA7W0gKjXeN0nrfZOmMj MMXXetZwZY1Z0qHL9fLF2cRDafBFS4nSSdS7DIDW5yLF3GWfD7Q5IzZwd8GSdx8m4O8b ZD9Sx+KZL/Ns72JO+R2pAd7ZGo6jmVyunCLjf9Peakkjlsj48BYJl/SeKKZuEFLE6Mw6 wmVz95vAP/o1LzgJt0PJzeC2tKzC0RraOFwji3qmV3u+L5paZLAGlZde1Kf0CsMXLHPE RjeNmcXpMfkUcS4KiMMpW/auz5JfafFt68+rOkru45KeY9aXgpsnfnT67ts+MKc64ZXf CM8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=OpfGIDCK5557UGMLGOBCZvRcpcuvXtlfavyw47RbHJw=; b=LWMfrQ3+cArYY3Ee85DXnUHrtbxAmgN/3/l9outHErYeL5TeZrxbMFu7bzxwHpjx6r YPSCX6YomZJQB/XnK2Zj6195i5gb09+nMeMQAegEeGtsFQf15ahoDg+YjVIyDTgxu00s oXoaZEzyrMLqrvZAdEXZ0KpDCzrgWBwp8EECNZDMuKn20brlvVNUzVUD/3TkY74lF8vP uiOj0pg5UIri3VIacMOrhG+TQ2Aibpu6Dto1CgumsuXvRj1dU036WaYO0NKORYjaJKTR FkugnNhoGqhRXeBGUglj6pAdWgXX+iqYKOXZO60R/262FgiNRJt/CS4NIrW0JGMjkKLX n5Zw== ARC-Authentication-Results: i=1; mx.google.com; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l8si9926305edw.470.2021.07.05.01.30.06; Mon, 05 Jul 2021 01:30: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; 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=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0895968A70F; Mon, 5 Jul 2021 11:29:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A70EB68A6EA for ; Mon, 5 Jul 2021 11:29:04 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10035"; a="230662741" X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="230662741" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2021 01:28:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="496045750" Received: from f.sh.intel.com ([10.239.159.147]) by fmsmga002.fm.intel.com with ESMTP; 05 Jul 2021 01:28:52 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jul 2021 16:26:43 +0800 Message-Id: <20210705082643.28259-9-fei.w.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210705082643.28259-1-fei.w.wang@intel.com> References: <20210705082643.28259-1-fei.w.wang@intel.com> Subject: [FFmpeg-devel] [PATCH v3 9/9] avcodec/av1_vaapi: improve decode quality 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 Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: zybR3NEA8p0j - quantizer delta and matrix level specific. - support loop filter delta. - support use superres. Signed-off-by: Fei Wang --- libavcodec/vaapi_av1.c | 67 ++++++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 26 deletions(-) diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c index 6aaabed2c1..2d0f0a76ad 100644 --- a/libavcodec/vaapi_av1.c +++ b/libavcodec/vaapi_av1.c @@ -75,26 +75,35 @@ static int vaapi_av1_start_frame(AVCodecContext *avctx, memset(&pic_param, 0, sizeof(VADecPictureParameterBufferAV1)); pic_param = (VADecPictureParameterBufferAV1) { - .profile = seq->seq_profile, - .order_hint_bits_minus_1 = seq->order_hint_bits_minus_1, - .bit_depth_idx = bit_depth_idx, - .current_frame = pic->output_surface, - .current_display_picture = apply_grain ? ff_vaapi_get_surface_id(s->cur_frame.tf_display.f) : pic->output_surface, - .frame_width_minus1 = frame_header->frame_width_minus_1, - .frame_height_minus1 = frame_header->frame_height_minus_1, - .primary_ref_frame = frame_header->primary_ref_frame, - .order_hint = frame_header->order_hint, - .tile_cols = frame_header->tile_cols, - .tile_rows = frame_header->tile_rows, - .context_update_tile_id = frame_header->context_update_tile_id, - .interp_filter = frame_header->interpolation_filter, - .filter_level[0] = frame_header->loop_filter_level[0], - .filter_level[1] = frame_header->loop_filter_level[1], - .filter_level_u = frame_header->loop_filter_level[2], - .filter_level_v = frame_header->loop_filter_level[3], - .base_qindex = frame_header->base_q_idx, - .cdef_damping_minus_3 = frame_header->cdef_damping_minus_3, - .cdef_bits = frame_header->cdef_bits, + .profile = seq->seq_profile, + .order_hint_bits_minus_1 = seq->order_hint_bits_minus_1, + .bit_depth_idx = bit_depth_idx, + .matrix_coefficients = seq->color_config.matrix_coefficients, + .current_frame = pic->output_surface, + .current_display_picture = apply_grain ? ff_vaapi_get_surface_id(s->cur_frame.tf_display.f) : pic->output_surface, + .frame_width_minus1 = frame_header->frame_width_minus_1, + .frame_height_minus1 = frame_header->frame_height_minus_1, + .primary_ref_frame = frame_header->primary_ref_frame, + .order_hint = frame_header->order_hint, + .tile_cols = frame_header->tile_cols, + .tile_rows = frame_header->tile_rows, + .context_update_tile_id = frame_header->context_update_tile_id, + .superres_scale_denominator = frame_header->use_superres ? + frame_header->coded_denom + AV1_SUPERRES_DENOM_MIN : + AV1_SUPERRES_NUM, + .interp_filter = frame_header->interpolation_filter, + .filter_level[0] = frame_header->loop_filter_level[0], + .filter_level[1] = frame_header->loop_filter_level[1], + .filter_level_u = frame_header->loop_filter_level[2], + .filter_level_v = frame_header->loop_filter_level[3], + .base_qindex = frame_header->base_q_idx, + .y_dc_delta_q = frame_header->delta_q_y_dc, + .u_dc_delta_q = frame_header->delta_q_u_dc, + .u_ac_delta_q = frame_header->delta_q_u_ac, + .v_dc_delta_q = frame_header->delta_q_v_dc, + .v_ac_delta_q = frame_header->delta_q_v_ac, + .cdef_damping_minus_3 = frame_header->cdef_damping_minus_3, + .cdef_bits = frame_header->cdef_bits, .seq_info_fields.fields = { .still_picture = seq->still_picture, .use_128x128_superblock = seq->use_128x128_superblock, @@ -165,12 +174,15 @@ static int vaapi_av1_start_frame(AVCodecContext *avctx, .mode_ref_delta_update = frame_header->loop_filter_delta_update, }, .mode_control_fields.bits = { - .delta_q_present_flag = frame_header->delta_q_present, - .log2_delta_q_res = frame_header->delta_q_res, - .tx_mode = frame_header->tx_mode, - .reference_select = frame_header->reference_select, - .reduced_tx_set_used = frame_header->reduced_tx_set, - .skip_mode_present = frame_header->skip_mode_present, + .delta_q_present_flag = frame_header->delta_q_present, + .log2_delta_q_res = frame_header->delta_q_res, + .delta_lf_present_flag = frame_header->delta_lf_present, + .log2_delta_lf_res = frame_header->delta_lf_res, + .delta_lf_multi = frame_header->delta_lf_multi, + .tx_mode = frame_header->tx_mode, + .reference_select = frame_header->reference_select, + .reduced_tx_set_used = frame_header->reduced_tx_set, + .skip_mode_present = frame_header->skip_mode_present, }, .loop_restoration_fields.bits = { .yframe_restoration_type = remap_lr_type[frame_header->lr_type[0]], @@ -181,6 +193,9 @@ static int vaapi_av1_start_frame(AVCodecContext *avctx, }, .qmatrix_fields.bits = { .using_qmatrix = frame_header->using_qmatrix, + .qm_y = frame_header->qm_y, + .qm_u = frame_header->qm_u, + .qm_v = frame_header->qm_v, } };