From patchwork Tue Feb 1 13:05:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33976 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp600153iov; Tue, 1 Feb 2022 05:07:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJwUW8eRJaASyPYdcPrBY17kOATDVg7Lavrm4ZA5LiibjgNXhHUGEhP7Z3kbtwdBU12sOXgl X-Received: by 2002:a50:bf4f:: with SMTP id g15mr25532450edk.362.1643720845619; Tue, 01 Feb 2022 05:07:25 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k27si9459581edk.389.2022.02.01.05.07.25; Tue, 01 Feb 2022 05:07:25 -0800 (PST) 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=@outlook.com header.s=selector1 header.b="Yy05nlI/"; 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=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A8A4768B297; Tue, 1 Feb 2022 15:07:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2062.outbound.protection.outlook.com [40.92.89.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9925168B06E for ; Tue, 1 Feb 2022 15:07:15 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xlf2103FbRqwiHiGGvDSI1fT7tCBSUmNSrXmx9lS8ycz8mFbIKK86/pFhF1dw+QW3JCDk063RioCrby26yNO9jAOBIos9yp7gEeQKfBauVgIKpztpBYoXYjT/IOs+MTyEFZic+BTZxMesqO8bJDTOSv1PZVHKMqF+XsHAQ6HuvX37/cppRdbJBSzii8ZZwdIZ9VjwGgM39e+Mk4qo9t7uyBZziP0tyYrfX3if2Bx2UVFS5Bi3CtoA9IBZt7E67nLjNKWvads2yEvlQb0ISd1/vtHzQ9fhFx6B6IwCQvReSyt98IW183IVipgR3avGHwWVDlioFIqAhbh9JP8+0SAPw== 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=oiHuhLnojEMWE8uij5W/D+xipkCqbNbr8/gjls1O1js=; b=aaWiGPxTAEWBrp7AXeUJM5/kKPHFRbW5m95gDiJuBBiGBd1NGfVymehceDJo5DMwSQ5HTcUDjv8TcyeTvFIBcmlJ/s58bzR0qqmenpsTPNo7swVrAWy98inYvg7uw9wDmcory7pcU0rnxooVLcIpzn0nBTZEMFPUHF0NdWRfhrENLltbvG6DNwxZkl4a/AXFVvt8lUt2YfH6ysOiqIPtIW+zbsoFy/7VBu9dho/AB136aHAt9IDr1WyCfWPkyR+HuF3hqbzK2KTXdZH++MYCUzQPn9X4N6j5brVRpNljjQHgxhDG/+lT7WDSf28YOdScArSyWU5I4Gne0wU0HsG3VQ== 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=oiHuhLnojEMWE8uij5W/D+xipkCqbNbr8/gjls1O1js=; b=Yy05nlI/lt5itAFiBvQp1ZehKqUc3VkioHARlLa/Wx9aU2vqkMulsLfpQpAepQOaBd1hr9BG4+nMtEsky6jT3NdEmwrL4i8isvzFh7y5h80bNSs7zoW2QS6dmDI9bRB/2KbGxyhDTaDsOUBWc87/+5xl5rKZWec03+ZXqz/xtJOteUOqDZlk5mrYXQBLDAWidIjTT01KGasklCL8qK96wDZc1pDs8qyR0+WL4ERkt0r9BPksKE20Q2Gwzl8n3oLcr7JrDlak43GXSiRi12SE54iIew87qeRbVEjaQGLfeSQ+lF93tDUh7ND+xszsOLMEcvckJRBLc6ClkRlus3f5lw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB6PR03MB3046.eurprd03.prod.outlook.com (2603:10a6:6:34::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.21; Tue, 1 Feb 2022 13:07:13 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4951.011; Tue, 1 Feb 2022 13:07:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 14:05:59 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [w1DyglD7AsIEQaMv9UBe9I0w6InkBVD0] X-ClientProxiedBy: AM6P195CA0092.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:86::33) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220201130706.1420875-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 62ba908a-52cb-49cc-6863-08d9e583c395 X-MS-TrafficTypeDiagnostic: DB6PR03MB3046:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BcPCLZnXKmBxvTtIHAhs1HP6L26ygWuMYqzMKzZmc/Nm9oNQR4fS/ZMNY2oqKfnhwysZMoT1IHiq5tJ7l1nUe0xb+id9LbiltsuyxWBTSd9a4WB5HTaea2HjleJZzqyR0NWdf2Ahi1Matjdq2SvfLjZbj9otfeyhuvyCTr0+tN/2MYmJ3I3Rq7YpwtFzSLI7QdC17DBTxz7zyNrfTjRWhD8os43CvrrwvFfUrJzQfLLywVb2WK6/tII5UeZt5c19yQICBQg4hXgjCuhHJcXvLD5A2gc6ael0s6H5vesrJtyJ76ZQwROVVziHoOR0LTVUPzL4WnRZPjgux97n/UlZ23IjDF8iOy0/fIhrnks3LTAs9PKGxkNa4H3l2s+aVTh9N7i886WuDUGWUyjXUupuqlv2E6vI46TWh1M7WAHOtRUwDVkM8jorrUx0kztkT8FLVO3sZOB6KdDQt5H5W1nr5VvPPwRRJ/g844IqL6kGBz7mZUuyGnNWrqp5xUWe9+0spqhh4OiJM7sP84zKaXCF0VVuHnuu2JnsGNvq+/rcGf8XChp0Qo++hixBqOWvB8Zf X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FqRTG4w5GVNbsYCVVeDsyBWki1/q1TVwj5GZKg765p6e/bwBXPz6cjOpVThPTNeb41a2Bqkqo+B0Spe2ruxBAfrJ60+dhS+mAAeyzzTjGphl+T53RbvmPoW2XVZoxMxdbwzy23uGE2eBK9M5EMLykf2crGLqvpOFrdbZnT//EgWbEdrE/2uzP4zyIya9Qsc0imImLqPXok/A2hp11syyQRb1IzFKmeCJqyRFMvqApwDQYe5nqb0GG27TKVvNHvgJ+F85VllIX5stS32EOJfOJcSN9RJNBmA8mRIFMspgRZHlrXnlAljDLaLZikRiA1bUlmRxwCX33wyBmnpvfLRqX+dJdthrK8oxdwxzWBl1EVAqH0zqLE7JHI350un13r2G3kiXDP7hUPKs8DDzxEOxyBhlUS32SDPgND504Vwhr3Csj1m2wYVtsz8olc09cSCkzlo8cpAp8cPcVYaLztKMKfBYGnjJ03IvPDk8TUSmzbOiQAfzEZeO0rugBx6wEJw6bb6lzr17EP1Vwrkl35d80GU7UAy/SUujrumpjo1CHJgRZJ7yWEnvvwTnHEQgC9uMv6tt+4gvGkEpKtaYAgoWdgB27CCWjU7tmq8wsgR2p18pwvu9ArgZPyNICIQ0Ba53WmNSeTzkOCQfD2/0rd2rqKXQnUCqiqFqhpKRnuqSFjruFU+DEZhqhgT1JtOAEeMEcLkP7i1TiFByZn9nmUARK8FQofnIYjiShpETC8l94YKYXO60g8OJCEIDNsQLTcrLsI3EetYD4fMrmNnhNukK1hc8r+9EENhWSGcj9IELBeGxcLZ3Ypw7vavrQx+rhQR5l6c/OYlKaiFAP6689CAf9YjptnG7ZKELjD0ogduV5gspVmr+3iok1v7KifWeFlqqR6ziYAIQmGnQXN/VWnrLk+aYTwQvsqN3M491o+fR5Hwqwiy1VuTI0Lnk3INe2QdYorSenMitGJNxvSNGRu7vuw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 62ba908a-52cb-49cc-6863-08d9e583c395 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2022 13:07:13.5879 (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: DB6PR03MB3046 Subject: [FFmpeg-devel] [PATCH v2 02/69] avcodec/mpegvideo_enc: Allow slices only for slice-thread-able codecs 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bMRgllUvqASy One can use slices without slice-threading. The results for mpegvideo-encoders are abysmal: AMV, SpeedHQ, H.263, RV10, RV20, MSMPEG4v2, MSMPEG4v3 and WMV1 produce broken files. WMV2 meanwhile expects the MpegEncContext given to ff_wmv2_encode_mb() to be at the beginning of a Wmv2Context (a structure that this encoder shares with the WMV2 decoder), yet this is only true for the main context and not for the slice contexts, leading to segfaults. SpeedHQ additionally triggers an av_assert2, because it is not byte-aligned at a position where it ought to be byte-aligned. Given that no codec not supporting slice threading works this commit disallows using slices unless the encoder supports slice threading. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 33f2937217..6df2a46eaa 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -599,7 +599,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) } if (avctx->slices > 1 && - (avctx->codec_id == AV_CODEC_ID_FLV1 || avctx->codec_id == AV_CODEC_ID_H261)) { + !(avctx->codec->capabilities & AV_CODEC_CAP_SLICE_THREADS)) { av_log(avctx, AV_LOG_ERROR, "Multiple slices are not supported by this codec\n"); return AVERROR(EINVAL); }