From patchwork Tue Nov 1 02:32:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dong, Ruijing" X-Patchwork-Id: 39099 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8e01:b0:a3:a294:714c with SMTP id y1csp1279780pzj; Mon, 31 Oct 2022 19:33:00 -0700 (PDT) X-Google-Smtp-Source: AMsMyM67Us91YSOlerDcz9aqQjIrUDLktqvA0tQrsqA5Kh18sDS3ZkfJ7cpc7Wb4ReJxSmHQ8VLT X-Received: by 2002:a17:907:3f98:b0:7ad:8bc6:4cee with SMTP id hr24-20020a1709073f9800b007ad8bc64ceemr16384738ejc.328.1667269980663; Mon, 31 Oct 2022 19:33:00 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sd23-20020a1709076e1700b0078dce38525asi9927338ejc.896.2022.10.31.19.33.00; Mon, 31 Oct 2022 19:33:00 -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; dkim=neutral (body hash did not verify) header.i=@amd.com header.s=selector1 header.b="XFpx/Bg5"; arc=fail (body hash mismatch); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 98F3E68BE5B; Tue, 1 Nov 2022 04:32:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM02-DM3-obe.outbound.protection.outlook.com (unknown [40.107.95.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1EC5E68BC4A for ; Tue, 1 Nov 2022 04:32:50 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LwnJ8U/21ugaWz49x+WCJFDeoIWmCW2EbjTeM4Kh8zV0qiAgHUbMnBENPyzoTWEGi8wIhDb+1u0nfgb5aQVtDnRXGZh3/IU7k2Q3mOBYt8bwucU/lilJEmRFScUnsOIfBY6JX5XJbzTUo6Z9QdIcFCSV5Tk4//7PTkX2W1Kmc5tiR+OjOujXV9F3NX2ZdEt5vg1lD8Jb94o/k1z9phljY85LFbpCWAjYWqeSR1uTgtcwN/0zNMLpYf5mi4WAfU1Cn2siOqYMHp/9ZQPOCqXvQRMPC1stX6phAUXXxVrkM286fPtcb16OFwXTvnh75AI9M+oHVpxaDtUJD8aZqqzy1g== 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=GSYSJv9Yh9/dkGnfqX6Nq0j9zOG/j1GJOEdH133m15s=; b=P2m1W7ritPfGmyqZRm+Ce4+pwnZHfwe/dbBW1u9DBrz/m5ryX6F+z4tzTwFox4Lj8C9ef2fVuAZxxVIV7J83Lw65dBprn8Bzdrv56805zXS9+0styil/tqCSXC9+RPonPCJL5NfVN1YNh107b5mHBtI9gAVKscZmLm/dOTmLJ1szZ15w/vGOJB2ezSKIEWq1od2MGSbFps0oA4lUffwU9omjPDgd4RqkfOG8JmZjcdWM98ugjwPq3T8P5B1O9QoEM8dEGQ4gfXh4Bwmm04FiK3fKKz15HQQaAgEzn6wGeSHYN6XYkqK+GQ0u/gvwbdNE/LTmsVlrklDmy6tsOe9ncw== 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=GSYSJv9Yh9/dkGnfqX6Nq0j9zOG/j1GJOEdH133m15s=; b=XFpx/Bg5fo2xEmW3NS3dnQEFLtzl/K0YsB1KUQTCw0qtxXIR3jpLZFSdjfDRkjA47vqhJs4ULndY9nCh068dzWRf3JuBR/tF2Awuzls46SoVFeZKTxvyBdw/r+F/k929yEQ6NPorv2uu3xMEJBWAmMebiQnWeRbw/zzZ5E2SKUI= Received: from DM6PR14CA0063.namprd14.prod.outlook.com (2603:10b6:5:18f::40) by LV2PR12MB5968.namprd12.prod.outlook.com (2603:10b6:408:14f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.16; Tue, 1 Nov 2022 02:32:46 +0000 Received: from DM6NAM11FT048.eop-nam11.prod.protection.outlook.com (2603:10b6:5:18f:cafe::94) by DM6PR14CA0063.outlook.office365.com (2603:10b6:5:18f::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.19 via Frontend Transport; Tue, 1 Nov 2022 02:32:46 +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 DM6NAM11FT048.mail.protection.outlook.com (10.13.173.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5769.14 via Frontend Transport; Tue, 1 Nov 2022 02:32:45 +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.31; Mon, 31 Oct 2022 21:32:45 -0500 From: Ruijing Dong To: Date: Mon, 31 Oct 2022 22:32:18 -0400 Message-ID: <20221101023218.667352-1-ruijing.dong@amd.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT048:EE_|LV2PR12MB5968:EE_ X-MS-Office365-Filtering-Correlation-Id: bf153999-6f7e-47e7-e10e-08dabbb15c6b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UrXIM+lGvgrhhS/6Kbe2xxXWdoBgfo6Wb65t1z9SqGsPaCjuJIjEVe8tkzulu1wNCheCW0So8dnwCT8fth7Ebsjm5l+txGPcfwwUyR/j+MTcI88JpNICX5ViPFsbxSyNUthvTJXkNbGw0BwV6ssyHaR1NVjA3txvacMCLE45WOCEoUa7MxP7lIp8FI73XNwVCVZxkL1LpdtIXXAgjAPgEJZTlxNmsIQX3qgr7QWk+P+YnUijcEI6RfK7VTQ+XZVcwNYZSBQOuGS5Rcs2aWrxmZZQDWtM6CxeI1yeoaCAOvbzKH8P+/o77FHC8MQ60CD/qjbBxrcLiaYFR7E7ExopPsGYZOlWpP7i+KtOJlTwORtQMw/iQ1dWCh5+zE5z5gUd7xCoadKYFRDg43grB23i0JWiok3MQZOzE6oHCifb6ivShKNLsSxXTHUHI8z2Eiuz61MH9AwElhVMp/FbRh0jAJA/JxyGgvBJca73qrL79WwDSlUe1ue2oZUAhr6iyxahs8k5t0mv2JY7rgbL8Lfxh9JgW5WyOrQLlaHQiiKYYRsuV/rYCy24DAgB89YjDhQ6xJaKPebDjV2dlHgbrsZLa+qL7Jor8dIVfrecocKPR40XTaz/HRQcZ4U3lnlxCXiNutszNfBf02mJaUqd3CkbUlUpaqHZXOKP9xJ0v6QUi9XcAb1IICBkdBvKfktqdFGYWemWO6ubXRIDZj1x/T/HVb0XGc0IUPQyiG6xrCUNnySbl1iFsIOtei0KNrPyA2+5AKUY6hh7kWNOBCKnKYAI2ionlmHJcb4coxQ3y0HS95w= 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)(376002)(346002)(136003)(39860400002)(396003)(451199015)(46966006)(40470700004)(36840700001)(356005)(81166007)(82310400005)(4326008)(316002)(40480700001)(36756003)(41300700001)(26005)(40460700003)(8676002)(7696005)(966005)(186003)(1076003)(8936002)(2616005)(44832011)(36860700001)(5660300002)(478600001)(6916009)(70586007)(70206006)(16526019)(426003)(82740400003)(6666004)(54906003)(47076005)(86362001)(336012)(83380400001)(2906002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Nov 2022 02:32:45.9588 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bf153999-6f7e-47e7-e10e-08dabbb15c6b 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: DM6NAM11FT048.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB5968 Subject: [FFmpeg-devel] [PATCH] avcodec/av1_vaapi: fixed a decoding corruption issue 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KgE7AyphXCmG v2: update commit message In av1_spec.pdf page 38/669, there is a sentence below: if ( frame_type == KEY_FRAME && show_frame ) { for ( i = 0; i < NUM_REF_FRAMES; i++) { RefValid[ i ] = 0 ...... } ...... } This shows that the condition of invalidating current DPB frames should be the coming frame_type is KEY_FRAME plus show_frame is equal to 1. Otherwise, some of the frames in sequence after KEY_FRAME still refer to the reference frames before KEY_FRAME, and if these before KEY_FRAME reference frames were invalidated, these frames could not find their reference frames, and it could cause image corruption. Mesa fix is in https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19386 cc: Fei Wang Signed-off-by: Ruijing Dong --- 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 63374c31c9..d0339b2705 100644 --- a/libavcodec/vaapi_av1.c +++ b/libavcodec/vaapi_av1.c @@ -274,7 +274,7 @@ static int vaapi_av1_start_frame(AVCodecContext *avctx, }; for (int i = 0; i < AV1_NUM_REF_FRAMES; i++) { - if (pic_param.pic_info_fields.bits.frame_type == AV1_FRAME_KEY) + if (pic_param.pic_info_fields.bits.frame_type == AV1_FRAME_KEY && frame_header->show_frame) pic_param.ref_frame_map[i] = VA_INVALID_ID; else pic_param.ref_frame_map[i] = ctx->ref_tab[i].valid ?