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 07E3144DB7 for ; Tue, 22 Nov 2022 16:32:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2396068BAE8; Tue, 22 Nov 2022 18:32:28 +0200 (EET) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2070.outbound.protection.outlook.com [40.107.101.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E8EE6899CC for ; Tue, 22 Nov 2022 18:32:21 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=my47kJpGsOTgrvbmitjyaCZMXhKKEY0Gw+CHCp7jLwG88F5VQm8QZM5NDjvSg7AKE3gjQMcdw1Bsg4vntwJgJG8kyiaER94DvzgTspHz69BBPgECwl/fdtcwI34nau4i6RyPjSNXDgJYLnJ9PrBpQwNZaQURNQj2imI/3IZGtRaqcFRL89xybTcBJEtQlG2DQk2mYb1WlL8820Wz4sgbfvM4EjaGSWKZGvfWf9OiknnOVylHwVmxY2MwFPTYovFukZZM3xTlXw7v/4u9y4ru4kWhlYgDC1CaJtrd7YedcdMjWeJe36QJclD+4sDx2psT3Q7jzLbkJNYT/x2dH8+QHg== 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=9od87yS4iI3Y+kR58vSVXNpOOZjTyKptNRDeFknhiNk=; b=ZO73Omf/nacaQHhU4t/1IYDmgWuujjfi4QiMMAPu2IGcLVC2V+w0j3XIV4uLErrasUQ705t3nOlMdRmv4LSZWQgXNnZlHhisaG1B5ZgREsvoPeGUcxc5kiNdWod/lrXKxM3kk5XCkV9vdD2HGcLaD6yoB8vh/YOM5xaUFlh3Fn346e7w9OW5TRGdykVWnmDBMMN5osknGaPlYHfq3wCUnXquUo7AvsL0z6pYMPD4DQZPtxh7G7Zk3sDd6gqbbBbZMq/7xk4OqL0d3nGPnJk6Y+MbgC5kNMU8YCD2pxzMh0VhJ/gX6ZA8kN6v8R5RImMiyO6ievtjmIYAPg8qfWHG0A== 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=9od87yS4iI3Y+kR58vSVXNpOOZjTyKptNRDeFknhiNk=; b=dZfRK0axZS4F6zNYOI2jSc0AOBq+q4+t6cnembxEymayEvLSoSMQ1v392/YI2GClaIv9ozdVuvBMt+3Vi0caZFETwu0F6Z8b16KcOqYXLC4VKOWLxxZa3JlB1Qvjy4S91s1IioM6cmpMVdCOsef3Bwr80SBA91JU6OY4k/Wk//4= Received: from MW4PR04CA0383.namprd04.prod.outlook.com (2603:10b6:303:81::28) by CH2PR12MB4937.namprd12.prod.outlook.com (2603:10b6:610:64::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.15; Tue, 22 Nov 2022 16:32:16 +0000 Received: from CO1NAM11FT018.eop-nam11.prod.protection.outlook.com (2603:10b6:303:81:cafe::b0) by MW4PR04CA0383.outlook.office365.com (2603:10b6:303:81::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; Tue, 22 Nov 2022 16:32:16 +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 CO1NAM11FT018.mail.protection.outlook.com (10.13.175.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5834.8 via Frontend Transport; Tue, 22 Nov 2022 16:32:15 +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; Tue, 22 Nov 2022 10:32:14 -0600 From: Ruijing Dong To: Date: Tue, 22 Nov 2022 11:28:45 -0500 Message-ID: <20221122162845.35520-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: CO1NAM11FT018:EE_|CH2PR12MB4937:EE_ X-MS-Office365-Filtering-Correlation-Id: 0f786b61-1222-47f0-a45a-08dacca71db4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: q8vhUvSXih7bfm24IXk1PmWSAyCKpQ7hCmmNmts4i1MR6QqmPeHcGVql4Le32siWu+fcWi9vUlf+gtmlBJNuZ8VQ4NfLT3jwNgjaXJKSyPllp+b0rhVHdfXXEUQGUwlHBP6KH3hIs/pLnVfyFSOI3uUdIBOmuxJwfmwLmiFevHpXwRpDrA9gceW7teXgAxQFGqSMAGAsmJmG4ZYdkbWfbsAMIr+I8EmFcKS6pXiHFGsd27hXXZf0p+tmyq1XXPWXVL5GHCpjKG9zJKFW+m2vbCkpbOEcQkYitKLdItk5yzpy37ld2841U0SOoevi9Ng1NG66gWCe+VJ+JM9pdMpUxEPIREBQ1cEpP1OSOxLO2HRKkDglB4U6ckEkWFSeoXap18SJGGr3luNaXSbNI631jim7f611Jfg62x/2hUsZ6xJwXHtXcywMkQk6rnio7sr8dMevQmSFZ5c28M6I08YEMl3gUHbpWgj937lU8Vobg6n1uWuxAwpBPhZr4N/HLNxsHPdcJL43mpjZpephadvLOTRjOSKuWoFzx1Sz5T4Oh+vX5oYc90og5vcv3CPeOE20SCOvGGxPwwEZ2BmjLRxSfnTOzKxuHBVDhd5D+/zTZdfTvRUILefJtn4XDKwbxU84PXB0RzfNbj8RdnVMT7+gqWWei+NfGQdkCJrBOzb7regzxoSP50f/3zY+DOJcMW4S 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)(376002)(396003)(39860400002)(451199015)(36840700001)(40470700004)(46966006)(86362001)(82310400005)(36756003)(1076003)(40460700003)(40480700001)(2616005)(70586007)(70206006)(41300700001)(81166007)(8676002)(82740400003)(44832011)(47076005)(26005)(8936002)(16526019)(4326008)(426003)(5660300002)(336012)(186003)(316002)(478600001)(966005)(6666004)(7696005)(6916009)(54906003)(356005)(83380400001)(2906002)(36860700001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Nov 2022 16:32:15.4610 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0f786b61-1222-47f0-a45a-08dacca71db4 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: CO1NAM11FT018.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4937 Subject: [FFmpeg-devel] [PATCH v4] 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: haihao.xiang@intel.com, 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 --- updates: 1. revert unintended file 2. update matched string from "AMD Radeon" to "Mesa Gallium" to cover more AMD hardwares 3. correct a typo libavcodec/vaapi_av1.c | 6 ++++-- libavutil/hwcontext_vaapi.c | 5 +++++ libavutil/hwcontext_vaapi.h | 6 ++++++ 3 files changed, 15 insertions(+), 2 deletions(-) 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..d14ccba084 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", + "Mesa Gallium", + 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..2750148233 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 supports 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".