From patchwork Fri Apr 5 12:41:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47816 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp936024pzd; Fri, 5 Apr 2024 05:42:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVqR6S+vYBNdVke8R8EJjkEoF7gAX62CViVk4Wd02OWj8Zu5iFmJZ01BV4gMHWKl5sq8aKoWZ39NbF5KOgzRt5d4+adv4KWrHoX1w== X-Google-Smtp-Source: AGHT+IGtbeGBfsZVVh7BrzhbwarTvxVFAtc7/qjXgiZpVSccAzDGsx/cVqvepGqhQNfTWIuFQWzM X-Received: by 2002:a17:906:f18b:b0:a4e:6a49:c09b with SMTP id gs11-20020a170906f18b00b00a4e6a49c09bmr997360ejb.29.1712320955908; Fri, 05 Apr 2024 05:42:35 -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 hd30-20020a170907969e00b00a51a6b52948si588645ejc.245.2024.04.05.05.42.35; Fri, 05 Apr 2024 05:42:35 -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=@outlook.com header.s=selector1 header.b=IcaGO05D; 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 4A3FB68D19C; Fri, 5 Apr 2024 15:42:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2091.outbound.protection.outlook.com [40.92.91.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD35C68D170 for ; Fri, 5 Apr 2024 15:42:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RRdHbYUC0pW21ekSXuTtXYMVTGSx1jPNi8uOOf6M7EnlyLi/Y7Iyv6wnogOh1ECSByfG4a7xoeBhHlx1jVvLhFzXToCN9u8FizXvYTtVROjXO1UgK/3wPKq7dK0cMd5xbUGd6wa5YStNS60ljtok9pyC9wM2mKVnZiowBXsbH2OLpGNXgUliQ6ukmvH+/5D+Y5CzYkFgZfxZeD9KHK1/8LvxW/noSPQgUlis7BDodVxc6p/5O/D0tsdua5MeZbYHLGt3XdSXIfU92vPu5XpyqEJ7rTmpjm5TGohSG7sRvhnUxYPDkhMrmh2c/UNNf4jx4AINwNNiY5HotXXNN6BB4g== 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=qBMYY22aK2gSLoUnL/x7TRfeH7X1lQZSZs54lygMLJY=; b=ZfUR9VJ0LTDR16Ps7RP+EGpiQV2VZJoh9ule6OfYeEgen8SI88hKNF4UsdQYu9M95grqjQ0CZpJKKaWSr7nPBPTgM2bZNO4PJjqYOoiuf2ckzwxMXczgHjuqFVepdNqnsKjBEFengIzRTf0f1Sb2pioTws8LE4/LX4sjFv2V7wAoolmcEfafz36DOdItXko5XUyr1Nx/Sp1gpc1WJbZrPQJq6jvzJIviAcNJoid0lmdGV3CnjoZGh36xDjGcOPEN6mGa7Ww+AN/dOW4uk2EN3l8rq+9tdb3mogPzp9qCqdlMiOFpmD+BSuhTgwoT7XVDNhw5Phjjh6+N4Kw1owKfyw== 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=qBMYY22aK2gSLoUnL/x7TRfeH7X1lQZSZs54lygMLJY=; b=IcaGO05DGR1aLBndCLTtBMfNFjMDwJ/r22lqf1CCTnKUSl+ybNFxLQpkuUk/xbrp2xk6cKLIhDdKymfs5Ro/dizQ7LtYuHpdgAuLGva20amwgSQh+cTU/rfIAdPM0Wn4SGuaePMSsFnUGi//beAIboUilr/bjr/brHvaVnWG2v6ca9uCvUAmMddTWO9G5//YhEBdqyr7DAQDo3RIUqVQtdchtvS0Hsm+TVtK8Hdx28Qdb5aACOtcBQX7Nzmf7/n0LGaL/a1Ms98FeWeG0w/Qws3eFxMKiK4ridXhWdkNFwSWt6+CJ08ctYcZX7ApVyU+OMYmM7eDFM0szKRInc5RTA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0002.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.53; Fri, 5 Apr 2024 12:42:01 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Fri, 5 Apr 2024 12:42:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 14:41:29 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [8Y4cfu1M5QxJ/NGrI1OQk/4TFKIu5AeZRh7vWTyjsTE=] X-ClientProxiedBy: ZR2P278CA0074.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240405124138.2343725-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0002:EE_ X-MS-Office365-Filtering-Correlation-Id: 81a663e3-a779-47f8-b780-08dc556dca56 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qVvH9XlXl3rVt3SZA60qi5A/k9vX7WiRCTPovm5eAgHLa2rhXgpVFjKJ+vKXYa0pZStkUrJxlBYgY+x0DraSe+ywDrUTxpjhXqotMgoWPLsvh6TTckH2Ej1uzsBcQfJvSmAgGhZgp0qm8iue792bshJpb2V026pIWj/KKjXG3jKODaVrqmOalBiIUx5tJOyxiMZLGAwqt1wCX/SY2lUM5PYkIEvzehnTIMcWQgLi0wwflX/EPLQDulO0q3bDnYyuKGiF/ec7Ou4tripUNGcf8LgRkUa+NbnEWQKacliUnyr29oinkWlwiKSu8TVK5G7nTUpEZraM/MkqHkQeE5uJixCI8qPvGoOr+Ws6Per84mPja9+hEJtr9nj13Y+RFFU9QOsO9ytgzDKJPHQSW7KOqSA/pkIry/rcS7ufWofVAfBRrbEVcfH7bUr6ZWAS3Hk2NqRzYbck1oFNBUHBap1yfEf8LIANLcD7XLo4XA2g3dksxWjHAX+V+WTiFVaYmNsGN5dxlj2Rqfaa6v/K3EoSQUjFUpuOnbbVTsw4Fw1Soag+gD/sERIqSbyhgHvMjUJ7CeDCL9TuOp3C4PGsTMG62scS+OrVvZ3EOqJHG2ThTCV/NCawkSyZvMjfqx0glGR1 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EwLswozmKcRDG3oDiIvRqacjcL/c+kE+53dShHGxCVxnXsFYZiDoeTul6J0zvB9PGbgjtYNgq+p0I0NGhpP9ihwEcFixhffpS+UO8i8cfnHOVuCM0xODWJ5na20tF54xUq77f78VcRTgf84DUfn67y67voctrW8cfZUjvB3LpuoTCGlB2gtbcPOI7pblTX1l4uhZYJupH8lQCTjJK8UdnyT4SbJtnOLBvEyVsmkDHLD96Xk+qDehuKEVm8HVqbYrKwt7UzQzGPPtET4YFvb37MDgWS/kHjqE9+ojlbvE0ZEtEYTbzZ5px73UZEylpHn0iGvluvzLRWHV1zJWR+RkxLp7RP+AF0yCeCssWs3zmbZwgK94VtoSSMegaa3FovvnAzZIRXw3yhg8Ge6VU6wedw/qQxydjqgbRGOumdcBSXKIgEDV9OKaUcvIdveMiGysNFjSIgLcdoBEGejL2cFgcghaw0ZO2b/GG/BoHmKI1/rD16CpyKIdel0IP84PDv1ONa2d9f+w8V1wz6tLAr6rbC7LiRlL+I/EgESdg/DRNl2004dof76NshemZM1Ik+8cZYmWLobRIPnzWMG6MSyZplHic8XGeEBVyZPGqGigjGD2Vgbp7WbTYYJwLdgV230VGBJG3NnneMoTxtHpDK6MRyKXzS3eov+pJut39sbmr0Md3pI45dsqp0CVK6jKZ1mQ6TgXW5/kmRYsJSWkaMqShzXQ7JcqHbGAI+99yxxYMgKNFCXPjVx7ehnFgjC6uSI7HYbS+4VV5fiUyM1jKRWc5o7NhJct5oFUiZsF/0WWJPLoZ2AgVBBmdsvJeicyp7I1Em9OqFCIuJD7kKJ6euSC1m22sTrhIYt4iqIII6Kvw9L/JNPR19Ag9DvU3JEaMN5A6Aog/DV7Pd8djp2VjJD2tbqy3io51/hvh3oV5EfrkEfnhHdKq1272WTIAUN1JDtcKLhYqvMZAjLH2wCrJPj8fsRWvV6Asjc9zO7C8qW5tx0+frDLIvJfhulFpX18DngI5516L7hUm3lROk5DsMOvBR7nnKZWTLyj1+xRjjfYIJj3plpMnBZCreWO2zSXJBzUI3r8X+oBjdnMLYt7VgZ3C6OWFAqhrQtINKVse6cOUYdZ/Udhl8+mrwApuPwryaDWlE0cz7a8mLC0/hVUPfDy/YcGFL4LcHqlX8q5qxJyE2RpoQw8DK6zQ8LOkJKr1l1ZuClW+PyHPsA7I3zamYqimVC2LOA8pr7+dot4io4WSSALOMm1vHR755m9guFP4Tx9QG+qbq8BcrW6YH/J1mKaMg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 81a663e3-a779-47f8-b780-08dc556dca56 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2024 12:42:01.6405 (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: PR3P250MB0002 Subject: [FFmpeg-devel] [PATCH 06/15] avcodec/mpeg12dec: Don't pretend MPEG-1/2 to support alpha 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: JO4btPGnnnbL (FF_PTR_ADD has to be kept although MPEG-1/2 only supports YUV pixel formats because our decoder also supports decoding to AV_PIX_FMT_GRAY8 depending upon CONFIG_GRAY.) Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12dec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 83ff40d237..337654c88d 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1303,7 +1303,7 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) s->current_picture_ptr->f->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST * (s->picture_structure == PICT_TOP_FIELD); - for (int i = 0; i < 4; i++) { + for (int i = 0; i < 3; i++) { if (s->picture_structure == PICT_BOTTOM_FIELD) { s->current_picture.f->data[i] = FF_PTR_ADD(s->current_picture.f->data[i], s->current_picture.f->linesize[i]); @@ -1368,8 +1368,6 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) if (HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_FRAME)) ff_thread_finish_setup(avctx); } else { // second field - int i; - if (!s->current_picture_ptr) { av_log(s->avctx, AV_LOG_ERROR, "first field missing\n"); return AVERROR_INVALIDDATA; @@ -1383,7 +1381,7 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) } } - for (i = 0; i < 4; i++) { + for (int i = 0; i < 3; i++) { s->current_picture.f->data[i] = s->current_picture_ptr->f->data[i]; if (s->picture_structure == PICT_BOTTOM_FIELD) s->current_picture.f->data[i] +=