From patchwork Mon Jul 5 02:29:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 28769 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3736255ios; Sun, 4 Jul 2021 19:32:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZy5JotEDeZycorHXvHKRsDvGC9evysRij2T320GFWjmV2uUW/cwd+1qYuMBsuu/fbdj2j X-Received: by 2002:a17:906:9745:: with SMTP id o5mr11326700ejy.344.1625452322404; Sun, 04 Jul 2021 19:32:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625452322; cv=none; d=google.com; s=arc-20160816; b=lhr+1KRLQAPL5riQ1SEsIhq5QUMsh7QsG6Ya50E6JHQBKLKR33U2Ky6qBI4xluemiL KHkuqdjHfHoD9IyXmORbKQvwPe14I9tZptluex5Z1yGUrHitUlZdZCsNlGSQkHd13m3e Pnj22yZxL1H5UyyZAiVIxUveUZImNNwYp28Xf2eeQxMpQhHptTfyYJM2n6kpthV6gRYO Sm3iN90XmuO4GZ+ofQdagv9aTrf1iOYk+th7I87rFUSHSLM9q1CPAkUPvv1J10BPMe+D 5drKCO9TgTii/H60EiqO2JN0wSYeqxYSs6cGPO73ZVi5DQuYsvMTVid2wAERmk9Opd8p Ea+g== 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=QqQ8VsybTg6BIk/duuRA+Edl7tDJ1o/zKD6QOi4sgAs=; b=kgfBTPgJbMkALcgSBNzyu3KMPTVC7idwtmlBo78ybm7OTqxoqyyGY8zxrFRcSxMAg2 +vUkHS/nOLF1/Af34Tt8ry3t+BsEwyKnk5v6abQxSpMfne3b61pB2a1Q6r5zYJBujFP1 xsI/YfpRq6W8Ctpnfert/w6ZTNKUrNZTJvxP6jdZtOLfnuK9UgW1iXHulIlQ8RnBva9x XG+7GsxKlhseFlSevRtqjNp+8TrRdWQbYjzxP0pkGvYvM4rQiHvecp46MWsJSi8aABc9 L63nAPIT1+iAf/eE8dm68hKL/bBh/T+NEYWuIosyOEs9XzImESCHmwVn85JV+5cIrgeE m7XQ== 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 f22si10287301edf.183.2021.07.04.19.32.02; Sun, 04 Jul 2021 19:32: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 BE7E368A62B; Mon, 5 Jul 2021 05:31:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5BAFF68A5DE for ; Mon, 5 Jul 2021 05:31:40 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10035"; a="208869447" X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="208869447" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jul 2021 19:31:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="456571421" Received: from f.sh.intel.com ([10.239.159.147]) by orsmga008.jf.intel.com with ESMTP; 04 Jul 2021 19:31:34 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jul 2021 10:29:25 +0800 Message-Id: <20210705022933.29068-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v2 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: mzWnWB0MiHOU 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 --- v2 update: 1. use int16_t instead of int. 2. updated commit message. 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 02:29:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 28764 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3736172ios; Sun, 4 Jul 2021 19:31:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzhBI6RIwqQuXcWWBDjNkmTLHOSzrD/C53okNYdcq/KyU8lAcO+RHYWeD1eXnFshkabyxjG X-Received: by 2002:a17:907:1b29:: with SMTP id mp41mr11179614ejc.459.1625452312387; Sun, 04 Jul 2021 19:31:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625452312; cv=none; d=google.com; s=arc-20160816; b=hxe9fcHfy4i5fyOOuExa1eF9O7VG8beiNLiRgGaRg90DIFW8Hl7BBGAlnnxPJbLc+g ZExIFqdJewL+830FgW9eGqE4bEcUQSChF3swn4UM5Yui0eIZ+i5/OKDxNtILF/fD/PUm jU5ArxiIa0/P2kn65AH+HrKFWJvmdyRbO9A9rxp/0uc0pzBxc4lGWw5uWj/71beojZv9 PA53VMPFFh5WTgQtxD4xINUzCGldYCxI4ZtV0zlnYSCfCBs9bjnIeGoYAevDIbD/a1jj 6/PZAaII1NbiwPnMi4mdaazlqx21uS4isdLvX7vBBh5FAdZPqi5gsnG7WCOacCuWZhtC KU4Q== 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=KmXK8EAMVsI9XAMQlZornEIe28rPaoAjjxnXkdk+B5kWZZ537gxOaeEQWeTQCgTcsK 397n0KmGKtmesbKoFsSTdJqV3jze7bLBRDvJvKAr4S+h89mRyfyX6rRX7NywAY6Run1V fKcauEmXsfSGRoxCj3Yn3qwXeuaN5kEF+bqDZg6YS5PBHodsBsOVUxSQrhbNjsITTeZP EJ12V+hTfpvnRU6yT+UDVYtAeqwCWxld6KNvwXAQJRMlWQ5kPn5FDtjJsEwIo2Yifcms HB9HtA6aUpfw5T8ro6ZP9WJ6cyPHrXD4MmNZo4OzdS2bhjbr+7JERyXCfmdJ6xZZ+Jz4 pDFQ== 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 bj22si10207899ejb.53.2021.07.04.19.31.51; Sun, 04 Jul 2021 19:31:52 -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 93C9C68A61E; Mon, 5 Jul 2021 05:31:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 590AE68A5B8 for ; Mon, 5 Jul 2021 05:31:40 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10035"; a="208869449" X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="208869449" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jul 2021 19:31:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="456571427" Received: from f.sh.intel.com ([10.239.159.147]) by orsmga008.jf.intel.com with ESMTP; 04 Jul 2021 19:31:35 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jul 2021 10:29:26 +0800 Message-Id: <20210705022933.29068-2-fei.w.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210705022933.29068-1-fei.w.wang@intel.com> References: <20210705022933.29068-1-fei.w.wang@intel.com> Subject: [FFmpeg-devel] [PATCH v2 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: 2e7tRX+vz4gP 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 02:29:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 28766 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3736333ios; Sun, 4 Jul 2021 19:32:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzr47JfIFzVGty0cVhLRyjnn+NfKJz/dIvs5CdVrdfanB4vdd9MkA3j5b29Glvy/aaWQuZI X-Received: by 2002:a17:907:3e17:: with SMTP id hp23mr10831738ejc.259.1625452332227; Sun, 04 Jul 2021 19:32:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625452332; cv=none; d=google.com; s=arc-20160816; b=PLDTmWXPNiTzaj/hmmYxmG+Q+reiFYvANU5VEuIQ/HzkkMD6m/peTPUBOLH2dlUW3E 0YPB29uu4jgcwTks2DhNJGWxidPi/767Qc4VUu/m4XHFlPAWcZh1TKUEMD/AoQa6EnTg 6LQBdCyM1uAGfmrAwFhUmi5wUfcCnDPMegngYzp6CsH9YC9sIBZUvaWc+Ltu76qO+TSN SEw5NzroNHVUHbZ/bdG5Tif/gZD9Qpko48K/+hoq8mWQbOnu42u9q/cRVb955Z4ooz16 kTVvbPAeGugY2w6xQUwdIlw2netV3dYrFhON7xU3AsA9JgYh8zA2pDUK5an0JZdAc5Nz //Cg== 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=0BHF2f8Yzp/4Xrr+K5OzB+TMr027iaXmeAmfl3lqxEs=; b=OgaMTxnue70RD0L//DSbUVYzFSdBlNOeE53Z79FsuYCUpZ5RqRQdnnztU0HdfAMLUj 68qSnvkuZqjlHSQGRh/XXNXx7PoEptby3mMdUiXjjsDRCejF471lvCftx9ElE2k61CLo Q7SS3jCTu9Mpkx7FheYB9z69JjScnTkqb+Uu3ZUdA/yrqSRvuzVxZLRNLDix4ogBv3Qb 7THl8bXD+4p9IIWiXoNxOZKjKixY6EAhBmhsGBVe56B855YPXNQUlNArDvOxz0CV+s1g oqZAAD0ETzUfAQAef32biN8F/zDIp1nTSvA9e22gnhz/6OD76zhh63u8jVZnnt9b2/Bz JPlA== 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 i5si3440371edx.267.2021.07.04.19.32.11; Sun, 04 Jul 2021 19:32:12 -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 AECB368A636; Mon, 5 Jul 2021 05:31:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D570868A609 for ; Mon, 5 Jul 2021 05:31:40 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10035"; a="208869451" X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="208869451" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jul 2021 19:31:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="456571436" Received: from f.sh.intel.com ([10.239.159.147]) by orsmga008.jf.intel.com with ESMTP; 04 Jul 2021 19:31:36 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jul 2021 10:29:27 +0800 Message-Id: <20210705022933.29068-3-fei.w.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210705022933.29068-1-fei.w.wang@intel.com> References: <20210705022933.29068-1-fei.w.wang@intel.com> Subject: [FFmpeg-devel] [PATCH v2 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: aLyf0zn8bv0N Defined in spec 7.11.3.6/7.11.3.7. Signed-off-by: Fei Wang --- libavcodec/av1dec.c | 97 +++++++++++++++++++++++++++++++++++++++++++++ libavcodec/av1dec.h | 1 + 2 files changed, 98 insertions(+) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 1dda0f9160..3fca17e84b 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -28,6 +28,33 @@ #include "internal.h" #include "profiles.h" +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 +124,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 +235,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 +603,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 02:29:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 28768 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3736419ios; Sun, 4 Jul 2021 19:32:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/RcNljX1J/x2fqizX41LBsvrm5nr7gA3wpeFsEJ54IkGBSeHDikCmBzJmGhK53yqgOdIi X-Received: by 2002:a50:fc90:: with SMTP id f16mr11082001edq.320.1625452342654; Sun, 04 Jul 2021 19:32:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625452342; cv=none; d=google.com; s=arc-20160816; b=Gdy/+Cc/Na+xeP5HJ6I80H8YgjaCCYcmepIN7UYsxHnE8+5/bLgNJZ9U70O1dxAvie Qu9taBvsStJUJ1aRBeP8/C+eSBgxyvJU4EW7OnSezKNykj98UIzOZwkHWoekau+jDGQZ mkXZewKUpLbXGNGkdphm0D+TmvK1XLKESwpCJ76K+EnbMxnVcpMc7X3FPKfFTQAE//fK +hhdWW/rwhHqC33XLapvudU7DJJDQkgp1vLKr7zQ0vkjcaqTMulEVIpMXppgu2XGPDK+ y2MR1qDOn+JoFSYMXkJZP7KoUB1xIulM0IZ5Ek28Btmfv0jveXbtHN4my7BUox/n9y2I dnUQ== 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=GUGbAanrOYbDk7sotx911zAkICy03H61DfkxzUOhrs8b7yUyAqNUYJ7YmGFXbT1bYj 0UhrqjC2uZsDBWSH1ryk+kSNs4xHgok0NWrM49oEfCpZpbQwmRMbYQOk+dhGBv2XN3Xb Km3drh2Uw9WfiWyERPgwECXuuqvZpMGklPe3K06tX+IH6flQRmJz+eG8iDczqSqEn+Fl 1zzrtR4UOrevSIVy87SP+pwz9CWTd9Czqx3DFtfNmL7pZ+V9aoT5lZCXlWk6xZCEUGyg aBq2fAwJjhfn7e+D9zKKno0w3FwdjgJcv5sILx5CfQwG5MQ2LIr5qBNAJiC1jIWeC8RW m2hg== 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 x11si9978128ejf.550.2021.07.04.19.32.22; Sun, 04 Jul 2021 19:32:22 -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 AF56A68A642; Mon, 5 Jul 2021 05:31:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4590668A5B8 for ; Mon, 5 Jul 2021 05:31:46 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10035"; a="208869453" X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="208869453" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jul 2021 19:31:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="456571442" Received: from f.sh.intel.com ([10.239.159.147]) by orsmga008.jf.intel.com with ESMTP; 04 Jul 2021 19:31:38 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jul 2021 10:29:28 +0800 Message-Id: <20210705022933.29068-4-fei.w.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210705022933.29068-1-fei.w.wang@intel.com> References: <20210705022933.29068-1-fei.w.wang@intel.com> Subject: [FFmpeg-devel] [PATCH v2 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: Pf4X9bJgQ/eG 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 02:29:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 28767 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3736498ios; Sun, 4 Jul 2021 19:32:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGU73TTEQeHLtKGllxmSRBLQ4nMxEmCRs6pGE5ElDpwQx5lP5vvx3G19COpenqMyJiWpCh X-Received: by 2002:aa7:c857:: with SMTP id g23mr13117856edt.100.1625452353319; Sun, 04 Jul 2021 19:32:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625452353; cv=none; d=google.com; s=arc-20160816; b=QGoa9TB2TF1Xe9jcDqhItcwFu2JJot9yUKQDLVbPl171Ik5YVyxJGOybbVjIKJ5f0s gukl/N4eR6d674h4mBUOt5ULs6f8Jci4pKjyhqmR9OCD+InFRpq2xEnCKUG1Z21fFOmS FO9KSk6Rrme0iL/fwzoKfbb/8W0QElVdI1kmN9Kn1BSO+LhsXxJPTTPtCU/sHu0h0kV3 3U4lunpzd8sacsn013Zn5NLUqPyGt8hcv6toksc97yr1c2QsbhW2YruRcYHbPhfJsmlf 7hBpxcVOryIsh2rdw7Z/Yn48bt30krs9D6PsEnSGvWzBmIIrIXAhFyvk4iwBg6Eb6S88 VljQ== 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=nTylKRrpKAUE/ZowT2hUTZOkBBmPbFW19D7gyQjbO0OtuIarmA8g7iLos5893mWMLB GlGcndD24gDBsMKsjOlN3j/aLqZ9jZ7MK40l6TnjLOcW/DnXIVw/eBBbGlT3obfInAfk s5FVuxAOfBxnxDYpR+uS/lAfNgvZ/dKiVsS4gakgMmLgpRNi8qwbdRniPEvXy0Cjy21m n3W+XZnafqtrMQ0UyprC7izQa74ZYiNjZSDNmujMa9YeesSSvB48/gkvGRFF7ywp1G/K zsZ3rm0WWrffXGSkWUzd/5BbVRS6rvnbjN+wqeyf611gHkzJfo7dA1Ot7NzhVyKXywgA BSlA== 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 dk22si10045697edb.6.2021.07.04.19.32.33; Sun, 04 Jul 2021 19:32:33 -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 AF85A68A67E; Mon, 5 Jul 2021 05:31:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 46F8E68A60B for ; Mon, 5 Jul 2021 05:31:46 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10035"; a="208869456" X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="208869456" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jul 2021 19:31:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="456571449" Received: from f.sh.intel.com ([10.239.159.147]) by orsmga008.jf.intel.com with ESMTP; 04 Jul 2021 19:31:39 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jul 2021 10:29:29 +0800 Message-Id: <20210705022933.29068-5-fei.w.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210705022933.29068-1-fei.w.wang@intel.com> References: <20210705022933.29068-1-fei.w.wang@intel.com> Subject: [FFmpeg-devel] [PATCH v2 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: 1v6cu69tqBgb 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 02:29:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 28763 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3736590ios; Sun, 4 Jul 2021 19:32:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4k8sPSJ34RaGgSWumYmDkZAR+9nqyM2Tc20cqrEl0axmrsgew1HslcjkQrCARJblP02mK X-Received: by 2002:a17:906:b298:: with SMTP id q24mr10807630ejz.69.1625452364733; Sun, 04 Jul 2021 19:32:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625452364; cv=none; d=google.com; s=arc-20160816; b=pl2GyEqzwj3AoX8VJO1IMabeGQEKua7KA6ggMxqLXw78pYJ5Eydn+cHn1AeQRgiZZS mkT+9Xs5GlkzDd1QIhAMCK/WpOB+yRBVAiT9+VB98WXugcIkSYqxl79qvDhuU5WtLi2U dD/Dha9pdoGzoxjwCh8cx3N0gihqM25RToS3Voct2w1ZzvljSeEcNekK2VldevnLW+gq nZ4rMJHwEASsSh4pZOQgENMtbBXL26LeiZA76fbr5HxCCN1Yxal+0r6gZF9QrAuQ3ki6 G0XnCkEixwEivS3oNzEwQmYcc6e/rjb1PF8CQq/LOHykn677cajrjKrUjkYsIVFlpnt9 g5OA== 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=pswVKK2ik6I5+4gyjrSXM3LXnGxIybk9plEgtn2R+Qs=; b=ccenaSOVriWwoqjXiwQcIsOXPcJqzSwnrMe0XQi2NAlAl7sAAHyvjjb/MeThBlQf9v OtHN0wj90YXAtbQPRyg8fJogqDeuKdl6QjOmCTIKGZUjW1zUaSz9tkwE63+8fHltS+V3 3JKTch0G63JOaT97tBbjx/8X4KgW+4p6Y74Bgqg3FwBj0ECv2Y4y4wLsxu5U/7S6+Kp/ p/vs4wZLw8nfE4Ph+oCe9erU8a8ytCJzCHgOKmtXa6UaZmBlvr8LZvq5gwjlEyJZPUQB 2cFP1yBh7Y7LWKP9Qbjlx3F9UQRE9QdXpRAWdf4JZZBi3QjFrYe6ckdQvvAJyxR3o9Lh nl1A== 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 w6si10015123edd.335.2021.07.04.19.32.44; Sun, 04 Jul 2021 19:32:44 -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 A373A68A5DE; Mon, 5 Jul 2021 05:31:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C607168A642 for ; Mon, 5 Jul 2021 05:31:46 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10035"; a="208869458" X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="208869458" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jul 2021 19:31:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="456571458" Received: from f.sh.intel.com ([10.239.159.147]) by orsmga008.jf.intel.com with ESMTP; 04 Jul 2021 19:31:40 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jul 2021 10:29:30 +0800 Message-Id: <20210705022933.29068-6-fei.w.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210705022933.29068-1-fei.w.wang@intel.com> References: <20210705022933.29068-1-fei.w.wang@intel.com> Subject: [FFmpeg-devel] [PATCH v2 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: fRAfP4JAyTyr 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 3fca17e84b..af2ecb4f0c 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -569,6 +569,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); @@ -588,6 +590,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; @@ -634,9 +642,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); @@ -738,6 +748,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(); @@ -747,6 +764,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; @@ -819,6 +843,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) { @@ -902,9 +936,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 02:29:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 28765 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3736677ios; Sun, 4 Jul 2021 19:32:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEbwHJMMfCXFOm0rFagwFVa7znOmtYueFiKEmiO63TRyDau5EKYrTixt53xPCZLO2HqPS1 X-Received: by 2002:a17:907:3e09:: with SMTP id hp9mr11267242ejc.37.1625452376556; Sun, 04 Jul 2021 19:32:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625452376; cv=none; d=google.com; s=arc-20160816; b=PD6rhdzbo0aldTyLnFD2GR14pdMOkDQtOCsNi8XGwpvIPZVrhNh35X4KSqLxuIvxaY p/5I7GJIzHssd0ejpRMi0U9EoMdwxVFWdxuu7ohq2xuCXH5RmVJkT2/9c9PUNx/LTysS t2eN7WaHMzR7P1qvUI1fqaeBJlnkKr2kg8RojbNu0BrjqE/s7o1fN87oIBwPdPY4Pqp4 txMZRMBtt7Tr8/ASbenkUoQmGezD/msieF8cxrTfMgd0cPKoFeO9ZPI8NAAze7NvFgB5 DepSUPXAggU8Q/pEjPPsDWv8FsXZ17pZffYmmrMIKO1dgquzPJW2QOHYilOifKIEuUqn UhDg== 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=HNkK6MXxhGak+TLH72cEnrsB75KXDu9iKRqhKd0nSf8hTiTiQeZvWk4oNZnyfran2n TNAZ4ZxbNnJXntwNZqSWlLVHFKiiszyyyRFR6dnDLsepRxJYbAHHEBFa2joFQKNetqM6 vcOegbdfyomwv3uNYdcDTy2pi3XHafJWQcBLgsA6x59lJdAcmc7dkETLbOeUyysjmUPp xBwb7Q5yqgzduWm1OYTSuZc4bxSEo3OzWyvM1HqFT+7vNtwzf9npHR5Gx5ZCOIivVA6n oQufv2NfbL6pveXg/KzWKxL8d6x/1N5do9uT9NTBtjqna2ZyQGG8kCgOFRl6GJ+OhX6T DqTA== 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 ay3si9195030edb.142.2021.07.04.19.32.56; Sun, 04 Jul 2021 19:32:56 -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 9270F68A6A3; Mon, 5 Jul 2021 05:31:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D40468A609 for ; Mon, 5 Jul 2021 05:31:52 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10035"; a="208869464" X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="208869464" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jul 2021 19:31:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="456571467" Received: from f.sh.intel.com ([10.239.159.147]) by orsmga008.jf.intel.com with ESMTP; 04 Jul 2021 19:31:41 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jul 2021 10:29:31 +0800 Message-Id: <20210705022933.29068-7-fei.w.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210705022933.29068-1-fei.w.wang@intel.com> References: <20210705022933.29068-1-fei.w.wang@intel.com> Subject: [FFmpeg-devel] [PATCH v2 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: 1lBtkha4L5yV 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 02:29:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 28762 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3736783ios; Sun, 4 Jul 2021 19:33:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxM2XUDuZ7jmjMldeSt6u4+n5lt/Xt70TkwyRZI5sjO+QhSzGk8IjdOBM6UrENYMuALa2il X-Received: by 2002:aa7:cb84:: with SMTP id r4mr13175393edt.205.1625452388623; Sun, 04 Jul 2021 19:33:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625452388; cv=none; d=google.com; s=arc-20160816; b=wsxinuMpSaehwSucIUijhw5YWh2fbqCJWTdHFp95NiVdehfuyqC0nJcj1oWu2c4gDX kw56hHO8/emCPkK4D2PC0q3VP9yXteQO4RFystJBbWwRQD3mA0AZfHL9IDEx3j0fJwk/ PAGzIv1X+htxEfM2ax/f6ng1OIb5O0+G0sXCrl0ffyiv/Hv6+j5n5YZC3Iaw2HStqWx2 j91pzFnu0gCsUhsal/6JFzCUCGSprRm9AGXtylcr4Nvg2VsBfboNbT1XGlJY2pFn/tLd isLhikqw8srtpYQC0MjUtTETzoBXmAjdcDV61lEk5DlshaJBJPmm+DsbdetlX/bsom1m SdUg== 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=OF1iaNGfRr5yapXfHgRM7wNBiFh3kxhXs8yyjauC4fG+GeUQA47Ysm4pN6inwAkr/c R1lZXJhDpHY8dxdkov02eZYB5FuzZW+OFHbExfCcsCzoUT921BmhYprc9UfFe0Bqu+0G kJD7ynIXkx8SxOj2a1hyFnCsLUxFBxmOs3CzTZ2kVXG+Sihm4+WelZ4u83/kUgnnDwYh A2UNz56fxGsgnszzUzurmTP8d5HY+1zua2fN6K/labe9DkFGFGXhK2hbFt9VgnOW+YqG V6vYtjecFDI7qdNkEO61j71kqPKQCArokw5mpQiubHVhxZWFvzz2C9WgSp/W9qjZ9ZA4 ShDQ== 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 ia8si10312582ejc.187.2021.07.04.19.33.08; Sun, 04 Jul 2021 19:33:08 -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 BC94D68A613; Mon, 5 Jul 2021 05:31:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D1F968A5B8 for ; Mon, 5 Jul 2021 05:31:52 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10035"; a="208869471" X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="208869471" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jul 2021 19:31:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="456571473" Received: from f.sh.intel.com ([10.239.159.147]) by orsmga008.jf.intel.com with ESMTP; 04 Jul 2021 19:31:43 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jul 2021 10:29:32 +0800 Message-Id: <20210705022933.29068-8-fei.w.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210705022933.29068-1-fei.w.wang@intel.com> References: <20210705022933.29068-1-fei.w.wang@intel.com> Subject: [FFmpeg-devel] [PATCH v2 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: R5j+3qM7MMGN 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 02:29:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 28770 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3736896ios; Sun, 4 Jul 2021 19:33:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyQvtN+kRQk9r8trFMdoo00jGuMNaQzmuq6hDuVMis4dGypUjTlswTsSUfkquvjXco/zrCq X-Received: by 2002:a05:6402:35cd:: with SMTP id z13mr13324364edc.2.1625452401528; Sun, 04 Jul 2021 19:33:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625452401; cv=none; d=google.com; s=arc-20160816; b=yJ2HhvYzNSbLsXlNVhujxZW3FH+bOng9FPKSyLFjMqCuc4vx97aX3Jw/TYVODVQOSZ sujFcg7hLzIjKMVBg2jNH7ItkPsg9rjo2J/4xw2xDSgq2u6MLtauYgcG42+ZcPzpJ1E3 gfbFM91PkYFFuECv0QbgSNSWi+YJd4OG+8fVXMZ6ovMTm341jll5MKy5R32+QJ5uCgLz E+eE+m7vyorzDM4dm1UoiW89bdPRHIPZq1O1RNoZcoEbkR7F6HVdsxpZyTfxG2HKPo4h /LdOqrXNOiR1I74UaGqSHlQ/nIZQ/53PLHkDhL0WsyOpujCqmTjnI5B4nwFZpxYxAnpY 0S0w== 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=vqqxhFHTfn3fMuwqjhTqUdGjo2PRk39XH3CwVQiEo0DFJNiZwS39r5oLci1BjkIEc0 nz0wBSdAvNQilguqbidg1HaAfNOR+Blj+H1P1aucAGrSV3EY+KxqfXJu5xdS/FBzOZsu SaGUaiGRLmez8ax6xSKQQQbXuu/3fAOYvy14FGSYQ69+AuxgMUUMioMO5h+7J/160xjy HNeFANOSFnwyoQ7xoyXSo3UJqZXhiTabCjKll86lYqvSwlQs1smf9ZZ4kUp9Aalydnss LvzJFjdAAuUPZ/JjtLe8n8qnyKY1vUG6mlC7G/vkqP/YmMGw8Ik3qoLjlnodDzGE3AHB PpUA== 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 f2si10952846edl.338.2021.07.04.19.33.21; Sun, 04 Jul 2021 19:33:21 -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 C7C2068A6C5; Mon, 5 Jul 2021 05:31:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B10B268A60B for ; Mon, 5 Jul 2021 05:31:52 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10035"; a="208869486" X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="208869486" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jul 2021 19:31:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="456571481" Received: from f.sh.intel.com ([10.239.159.147]) by orsmga008.jf.intel.com with ESMTP; 04 Jul 2021 19:31:44 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jul 2021 10:29:33 +0800 Message-Id: <20210705022933.29068-9-fei.w.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210705022933.29068-1-fei.w.wang@intel.com> References: <20210705022933.29068-1-fei.w.wang@intel.com> Subject: [FFmpeg-devel] [PATCH v2 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: bq8gTSwUj34n - 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, } };