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 EFDE648B95 for ; Mon, 5 Feb 2024 23:48:56 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 32EB968CF4C; Tue, 6 Feb 2024 01:48:53 +0200 (EET) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2087.outbound.protection.outlook.com [40.92.91.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 38EF768C7B6 for ; Tue, 6 Feb 2024 01:48:47 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CvHpQBX2OuVfWm/PgvFcO5tfO8LUYjmLKwH7eHCeNxWxbl3sD04OFhskv1qdNyN8um2xD3wMof6Oj0pajEaveaKgvwUV5DqOFooH6uQ+XgyfBL133GLH6E4EIRLymn7Yh3gC1DyHJFP3KrLcWliTjSl77stpb5h5YPXPIUiHhCjsESRIqPOQvR+ldgw501E/xJHnGYD+zZAEVe2MoDYQyJvLbvS/Tv13h1QFA3SgLW8r4ZVU68KHBXT1ssJSiljNpNaJieEs36FcX6oq6SSPQCoE4pVAcO/TgdconWCfAU0OrgY1+BKfZJ2mhnf/bdqDD74k6hcuwdzDZuNQF9bZhQ== 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=mctGtv1N5mB24W3q2M+C5i99OxIq3IjLv9i0IY+jm6A=; b=nouYYSxHJo3H5IfmNGN207kX2jQDyBpGAcH+J/A8oludMj0nMVQw4SwmZPZI8Jkx47M4Y2wCfSbtKMrYNPWsvfXvGnQ3ij0YJxYdrxZdLJTnOnmKFXvAJNO26/l6UJ76H6FQaoRddF3S7Yp1MCxEPQr0kO2NhZsQKO+JKfxgsQBHtMmTc0qIQITF0vNH8WlcDNw5E5eeQcFbO3h09kTQc7KNMi9EFPLBj28U3wIfHKR9nIqWgHvelsp3IrfU97g3GChoB7Puk7dvMab6nG/tmb6sn2J1B3qifNV9157ETiYgQFmPpAae8XKmlW3GMHyWebsOewe9Jud8vjIVs2LcFg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mctGtv1N5mB24W3q2M+C5i99OxIq3IjLv9i0IY+jm6A=; b=YtO01G+va2ytt52EWPAAqdX5EZf2QW+EM5Eo8xrQEQya+kftMTHNtNlZToKpQ7c5jI8u5DUStjVL1rVVh4i1jiHN94IdcglWtKADwSGl0Q/oyopIAp9YjnDplG/4gvhaph0C3fWucYnOzxeJyQwMs0VBR19FVRqV5zuddgwajWkkxktAp+qoHxiHcTKsE7UpdWqvHhxSQaYY9de+kxUuP9cJfUMP7gjCgtSi3LqOvBAE5h7kW5wjzVFGXlZomIiKaqCrgxuHkMjsy+TczYuObZmdt6ndjgmL1W/Ej20/iUVnkaVLiIAsA3eXR3NSULuVCzJT8fO99hAenNAIvSf7Zg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0213.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:324::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.36; Mon, 5 Feb 2024 23:34:31 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7249.032; Mon, 5 Feb 2024 23:34:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Feb 2024 00:36:11 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [h4KOfJMcMsVaicLFIyA6EMvbZX02sfOm] X-ClientProxiedBy: ZR0P278CA0160.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240205233614.3950767-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0213:EE_ X-MS-Office365-Filtering-Correlation-Id: fc28ac0c-9217-4315-7014-08dc26a3006b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: f+hehb7nW/FCbCNLojU7F4r4KmxYYViul57H9CjuVLgIcUhZsVekFk2H0yTJpw5hc2WHNJ362pyexKl1Tzs2rqMrCJPN5I/utL+Y+VikvpytCMVAYsmQScsCvtvvp7P9vqV+S6uUKF5zHMHoXaPNyAjSsqUlHQk/Avj2+lYCbKWKQJmSTpVrP4uKX52JV0r5yaNknwvfeJUJvx92N3dUbif5bWUkg8Hag7VXIa3M3jEIt2XtuG9b6kZBS9qv9W+58eakEUel+YdGYK6Upm2XsSbFlXeGhLybxECR26Sm5khy+EA7zxEzorGrO6YUY3HOyAekOzBrNWdbG803ieFxekDUZ2/dRydYngRQnG2icb/8FRdttjz1WaGfREKxkDV71fZ66lvYuuynHZ7dGDeb02SX9vd0v8RGljxKiIGPaHe6D15BWVWzH1Ga6opkmIs+K8BeuF6lSqYK1Mahu9qM+oqZDgX5djqUZjTblDjDhLlDPQqbs9+VyZ18reEU0XryEU2xQDVMDZVo2fEaLJEiI7b9BlrtcnwNiF6SFBPG/1/Zmgxu1hPa0p3zryWeUQ9B424lrw4yCBJF0m+5hgOB/1rUrvaiPniZj9cXr79PeQ+kO+nBMAgr5P/0rLsfl7eF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?95a5yK5DkfMZYgPjhf+wEgCRqgPsEE+RatIKvCKj2chDSYaxISyA8joKjzJl?= =?us-ascii?Q?S7v9kg9Kj4/dnzJSfw+GQJKD+opqZAFMkSfqZgE7a2ldxlen2JZplkWSzbGg?= =?us-ascii?Q?+9e/EF+Teq1kMs2oB2F2LciLxwJjCNQnOXYs2mlKPxcVqEpJ0Xyo44A310me?= =?us-ascii?Q?uWp1XBfVngVSynS66R8T+WDcDFvZaSTOhpmqJLkprbHYQVHDSkh9W2oMhXON?= =?us-ascii?Q?xjkDZfkqIeAXxWsbGsh6E6EYmlhrMzf0yj2wi8oSW6IzxflT7ZcryhZrXsY5?= =?us-ascii?Q?rHl2fbZ4Xubtu95+JeDlD/3TkprXtprxd8s7F4hAWFalxKyMCCivqBUfoSFw?= =?us-ascii?Q?k5Y0HY0IRJjoqB7CW7M9W4OotwfMizsCFF/elzr7q2xptUVdGG9l9V3g4xqH?= =?us-ascii?Q?psMXOXSKZ6qxV2X5Ul9CshcXz3+IT+t0tlRTnCj9XXPAL8LLxHetXV9c8A8m?= =?us-ascii?Q?6wq1wAtLuSVPUJD5+1jE3exN7ZjmESRM3aaai7gtEXp7mm1JnSmb93uIz6On?= =?us-ascii?Q?IziyBFNn3Hj4nEDwp/MafPO7zMSwoMkSbaHUgcfShOP9txqDrWbHbci2b9I9?= =?us-ascii?Q?j5OUlVpqOo/BT7NE4cRj4DUVOC21GW9mB+fhl6WTpj8z68xxp8NUVv9LywYK?= =?us-ascii?Q?Ysj3TXcdN3974em0QQRJif/+nVRve6r1ZFfFNwhisk99BJdA9qcV89p9BENw?= =?us-ascii?Q?QuNgGZbHaTLg8xe5WKpnH6kAeKaszcm8l7UpcDyd92EP/qB3mCZ3SFuoS0Sc?= =?us-ascii?Q?L8iq99XwvjzHnvTknaPqIPMrkk2huZTDFiO1uEtjjXbvijBGRqZnwMMNNu+k?= =?us-ascii?Q?dFo1a72InTbD4ZS1oOtV3DilX4tMuz/2DNKZKEcYGNwZGskbcLFmGw+d0gW6?= =?us-ascii?Q?R81gkmMu6SsAIHBCkFAgSgW3NEn4kip53ER8wCa1rGUy87RKMOdgSAV2Jxk5?= =?us-ascii?Q?BIw7lLaayuSPR6BFos7Ms6La1NU/UUvW09+0PY5nWuBWuNkiGHlK6s1JHd2m?= =?us-ascii?Q?6i0L2vVyiHpOjPuJ44hiRnWNC3eiKnc3J56BLftCnH+DejZOzOwYqVuOcyk5?= =?us-ascii?Q?TcPF3QWMYYoHiRzrk2UAN+98NjNc/ExBEMxO6IWqgEMpocqdmwmJNYvzivNH?= =?us-ascii?Q?FyKShYZtJlTZJhYRZ6nNmd7Q33T/LI6YmW2OXb4o+L+gRE5257Z7FKkwmG+/?= =?us-ascii?Q?vK7RCwJ7YsYJuwOEj9cZC9Z+Hs2F8KRU/dhRDOLNgrH6mkv1/Itp8lWnYxDC?= =?us-ascii?Q?2C01fLrutD5XTFvtD5WM?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc28ac0c-9217-4315-7014-08dc26a3006b X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 23:34:31.0189 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P250MB0213 Subject: [FFmpeg-devel] [PATCH 3/6] avcodec/vc1dec: Set pointers for hwaccel even without hwaccel 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: Andreas Rheinhardt 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: VC-1 uses a 0x03 escaping scheme like H.26x and our decoder unescapes data for this purpose, but hardware accelerations just want the data as-is and therefore get fed the original data. The pointers to the actual data are only setcorrectly if avctx->hwaccel is set (after all, they are only used in this case). There are two problems with this: The first is that the branch is pointless; the second is that it is harmful, because a hardware acceleration may be added after the packet has been parsed (in case there is a reconfiguration e.g. due to frame size changes) in which case decoding the first few frames won't work. So delete these branches. Signed-off-by: Andreas Rheinhardt --- libavcodec/vc1dec.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 6eff2ec04c..6462a40fd3 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -846,14 +846,12 @@ static int vc1_decode_frame(AVCodecContext *avctx, AVFrame *pict, if (size <= 0) continue; switch (AV_RB32(start)) { case VC1_CODE_FRAME: - if (avctx->hwaccel) - buf_start = start; + buf_start = start; buf_size2 = v->vc1dsp.vc1_unescape_buffer(start + 4, size, buf2); break; case VC1_CODE_FIELD: { int buf_size3; - if (avctx->hwaccel) - buf_start_second_field = start; + buf_start_second_field = start; av_size_mult(sizeof(*slices), n_slices+1, &next_allocated); tmp = next_allocated ? av_fast_realloc(slices, &slices_allocated, next_allocated) : NULL; if (!tmp) { @@ -918,8 +916,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, AVFrame *pict, ret = AVERROR_INVALIDDATA; goto err; } else { // found field marker, unescape second field - if (avctx->hwaccel) - buf_start_second_field = divider; + buf_start_second_field = divider; av_size_mult(sizeof(*slices), n_slices+1, &next_allocated); tmp = next_allocated ? av_fast_realloc(slices, &slices_allocated, next_allocated) : NULL; if (!tmp) { -- 2.34.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".