From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C317B44D6D for ; Mon, 21 Nov 2022 19:51:15 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C244E68B8C5; Mon, 21 Nov 2022 21:51:11 +0200 (EET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2072.outbound.protection.outlook.com [40.107.244.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E948068B6D3 for ; Mon, 21 Nov 2022 21:51:04 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=el2QYmraVUkNVu0CRvFM42r1fa+38Oc12g6UEQyFPDg9bQMOlDEIk/UNMpH4oe+XnJXHv6pfOBuW+h5AVzDW0phtawXa4Vsy53baPld9uB7YfO5mJ1tntSxHL4TiZ7KaEuQ18sa8FCn7b/CGauHb5uziWLHgoAttNJZFNzkEiOsGEAM4ZM7GwaENeFkyJUM2MOZyMWCj4wOXGN9MyS36EIzkdazgv/pOHXnwr80H0KgeuRoOr/BAot15yjPqBqPIKS2pxkDH112jc9UjfwHgGh4oKKEqVrZJGJiNdyfy680xsE051bVaatxU5XbABznIWBP2mrEOk+234KnJACZHFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+jp5p/P1Co7WonxNd4AisIRK8jPZVd7sSuak/pDl7NM=; b=YVdL3ltcD3c6HurvUHMD69BMOpcD+1Wt641qO+fe/Cy0AXGfpEP6yCmbSn56HWf/s/JoGCuLA5xH2/kay9cQM6Bn8XPpUJXD166msodn6veKDQERuaSX/r5Is+Fm/l8Xe4+/QUP/xWQgimeUDSViTEzXOkmXi91uY9BSjmYO2MnJByYz5ZEBsKPdlvkFNKveddzWIHm+Hwg94oseMTwnoMYkLDlKPQi03Nj1vknIm4srdEjzYPr6CqbZU0oOh30CFMfTJZKg+lMSZ3ipXeUyjSmWk4nmi5w64PHzmsXTzPPevRti1RHf6ekCZRBDYF/EHU6UHz9Oyp+SsmkeTFxAQQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=ffmpeg.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+jp5p/P1Co7WonxNd4AisIRK8jPZVd7sSuak/pDl7NM=; b=k129xbhhv9yFMGs+mr9Y22nYgjYRdLs6SfsFbsnN1UeAJsETmyOaIXQn16nElrj19+Kwufm1XQg8OU5M8Eei3Xev7NvZJlO5+bASfAdQvlBr2N6b+d/+WzzScijLle2VMa9hWuMBGrjxRMV59OCRFQ6i+CJO9Q8B1UIJEAss1FU= Received: from MW4PR04CA0053.namprd04.prod.outlook.com (2603:10b6:303:6a::28) by SA1PR12MB7037.namprd12.prod.outlook.com (2603:10b6:806:24c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.20; Mon, 21 Nov 2022 19:51:01 +0000 Received: from CO1PEPF00001A62.namprd05.prod.outlook.com (2603:10b6:303:6a:cafe::b1) by MW4PR04CA0053.outlook.office365.com (2603:10b6:303:6a::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.15 via Frontend Transport; Mon, 21 Nov 2022 19:51:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1PEPF00001A62.mail.protection.outlook.com (10.167.241.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5813.11 via Frontend Transport; Mon, 21 Nov 2022 19:51:00 +0000 Received: from ruijing-ubuntu-pc.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 21 Nov 2022 13:50:59 -0600 From: Ruijing Dong To: Date: Mon, 21 Nov 2022 14:50:48 -0500 Message-ID: <20221121195048.240417-1-ruijing.dong@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221118153422.67632-1-ruijing.dong@amd.com> References: <20221118153422.67632-1-ruijing.dong@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF00001A62:EE_|SA1PR12MB7037:EE_ X-MS-Office365-Filtering-Correlation-Id: a4b16216-9238-461c-9e9e-08dacbf9b72c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 663ubv5TfuG2xsA354e1iXNKRrF57IRnahWR9WEYs24Pyk0dCvCVEu6ylK3smUwUIwhSmwpIOKiVSYP83o0CaiOZcj004lhUvdwk5hGYZBaZ6APmPqHmqxeE0hsOy6KGv8P9EihmlMayY4cxanYoqP8Y+o4LTKstl5x5zRAPkteit1B6jgTBiRsxWcRcpQHYWx0vjaiUUbjj3XmxRW23PE3WzDmsRlmGbGcO1V238Mh17TgP5d83g/bxiwJH8osfqq2UnVns9IpBPbf+4ecYGaRxH4e9vnb/74OSpwGmKC+c9j3OZq1MYWPTSB642ia3+2DBLgETDKj1EqoQ1Y07tfSrOvqOCSY/u6k/43ddHf954uxdSuq7eQqjo9zzrRTgO6HPfekDOSGpx9DYnEUBM/ZRumErxhKTcSvJe4IdtbM06DZLE6HwAMqsPR3SvJ7yfEI8Nib5ur5RXZqM0mQXbuJKzUpIf+L/Il+tbiO7DNZEWRxzGAXK7CGmdjTJaY7if50/5R61dwlRh71b617/mgmjXJj482EjVwwx3jdV3WY6t5Y0wWnFCfwGO9WoVkYuxBKaErztnQbRm70gkkC7laePYbtEUiHMCkXz1E9cOJmljTkIYo2tvSgbsyegIIy2yZwjobXkBWV8ifGq5T7F/0Pj9icUO4nmXBSmyAJrmNWbKpkgI7D5OaeMrB2z0mA7 X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230022)(4636009)(346002)(136003)(39860400002)(376002)(396003)(451199015)(36840700001)(46966006)(40470700004)(82310400005)(70206006)(40460700003)(54906003)(16526019)(70586007)(336012)(47076005)(44832011)(82740400003)(4326008)(41300700001)(36756003)(5660300002)(8676002)(478600001)(966005)(316002)(6666004)(26005)(7696005)(1076003)(6916009)(426003)(186003)(86362001)(8936002)(81166007)(40480700001)(356005)(2906002)(36860700001)(2616005)(83380400001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Nov 2022 19:51:00.5233 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a4b16216-9238-461c-9e9e-08dacbf9b72c X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF00001A62.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7037 Subject: [FFmpeg-devel] [PATCH v3] avcodec/av1_vaapi: add direct film grain mode 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: ruijing.dong@amd.com, fei.w.wang@intel.com, nyanmisaka Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Add flag AV_VAAPI_DRIVER_QUIRK_DIRCT_FILM_GRAIN_ATTRIBUTES to specify a direct film grain mode for AMD av1 decoder. issue: By using AMD av1 decoder via VAAPI, when used with film grain content, the output displays black screen with incorrect frame order. The issue being discussed in here: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6903#note_1613807 Signed-off-by: Ruijing Dong Signed-off-by: nyanmisaka --- update: using driver_quirks to identify AMD driver instead of extra AV_HWACCEL_FLAG. libavcodec/avcodec.h | 1 - libavcodec/vaapi_av1.c | 6 ++++-- libavutil/hwcontext_vaapi.c | 5 +++++ libavutil/hwcontext_vaapi.h | 6 ++++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 3edd8e2636..51adb8a1dc 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2252,7 +2252,6 @@ typedef struct AVHWAccel { * while indicating success. */ #define AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH (1 << 2) - /** * @} */ diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c index d0339b2705..1eb6b87264 100644 --- a/libavcodec/vaapi_av1.c +++ b/libavcodec/vaapi_av1.c @@ -127,6 +127,7 @@ static int vaapi_av1_start_frame(AVCodecContext *avctx, int8_t bit_depth_idx; int err = 0; int apply_grain = !(avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN) && film_grain->apply_grain; + int direct_film_grain = ctx->base.hwctx->driver_quirks & AV_VAAPI_DRIVER_QUIRK_DIRECT_FILM_GRAIN_ATTRIBUTES; 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, @@ -136,7 +137,7 @@ static int vaapi_av1_start_frame(AVCodecContext *avctx, if (bit_depth_idx < 0) goto fail; - if (apply_grain) { + if (apply_grain && !direct_film_grain) { if (ctx->tmp_frame->buf[0]) ff_thread_release_buffer(avctx, ctx->tmp_frame); err = ff_thread_get_buffer(avctx, ctx->tmp_frame, AV_GET_BUFFER_FLAG_REF); @@ -375,6 +376,7 @@ static int vaapi_av1_end_frame(AVCodecContext *avctx) VAAPIAV1DecContext *ctx = avctx->internal->hwaccel_priv_data; int apply_grain = !(avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN) && film_grain->apply_grain; + int direct_film_grain = ctx->base.hwctx->driver_quirks & AV_VAAPI_DRIVER_QUIRK_DIRECT_FILM_GRAIN_ATTRIBUTES; int ret; ret = ff_vaapi_decode_issue(avctx, pic); if (ret < 0) @@ -385,7 +387,7 @@ static int vaapi_av1_end_frame(AVCodecContext *avctx) if (ctx->ref_tab[i].frame->buf[0]) ff_thread_release_buffer(avctx, ctx->ref_tab[i].frame); - if (apply_grain) { + if (apply_grain && !direct_film_grain) { ret = av_frame_ref(ctx->ref_tab[i].frame, ctx->tmp_frame); if (ret < 0) return ret; diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 4bcde74f62..dced6e9401 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -371,6 +371,11 @@ static const struct { "Splitted-Desktop Systems VDPAU backend for VA-API", AV_VAAPI_DRIVER_QUIRK_SURFACE_ATTRIBUTES, }, + { + "AMD Radeon", + "AMD Radeon", + AV_VAAPI_DRIVER_QUIRK_DIRECT_FILM_GRAIN_ATTRIBUTES, + } }; static int vaapi_device_init(AVHWDeviceContext *hwdev) diff --git a/libavutil/hwcontext_vaapi.h b/libavutil/hwcontext_vaapi.h index 0b2e071cb3..b93d676423 100644 --- a/libavutil/hwcontext_vaapi.h +++ b/libavutil/hwcontext_vaapi.h @@ -58,6 +58,12 @@ enum { * and the results of the vaQuerySurfaceAttributes() call will be faked. */ AV_VAAPI_DRIVER_QUIRK_SURFACE_ATTRIBUTES = (1 << 3), + + /** + * The identified driver which suppports film grain direct output mode. + * and this is to avoid av1 decoding film grain corruption. + */ + AV_VAAPI_DRIVER_QUIRK_DIRECT_FILM_GRAIN_ATTRIBUTES = (1 << 4), }; /** -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".