From patchwork Fri Oct 6 02:46:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44175 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b1d:b0:15d:8365:d4b8 with SMTP id s29csp117011pzh; Thu, 5 Oct 2023 19:46:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IElNxmkXGfxH4ZEMVAbT1W9N2qA8h55Fw7v1+q5oufLTbAv3HnmzMDhbWlwdYWP5ZmWj0Dd X-Received: by 2002:a05:6402:2547:b0:531:14c4:ae30 with SMTP id l7-20020a056402254700b0053114c4ae30mr2952193edb.0.1696560393056; Thu, 05 Oct 2023 19:46:33 -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 c24-20020aa7d618000000b00534993e2c95si1295694edr.513.2023.10.05.19.46.32; Thu, 05 Oct 2023 19:46:33 -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=MWtlsKBr; 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 3943568CBE8; Fri, 6 Oct 2023 05:45:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2011.outbound.protection.outlook.com [40.92.65.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 89F8068CBDF for ; Fri, 6 Oct 2023 05:45:53 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OoGTzGFFwUukw5OWyPsf5p7bsSXM+myOMYiLEHfmeQ38+NiloetEQra51jCUHbF2obWx7mDFwph5FsjlxfN1k9dnXBI6ml1tuIQZGOldlcUgvqv/PW9Qvd9X5tBL00Dz8DWIMcAPPllwP8IdkE8rGvrd/bFrUa10iX6N2cGdQOeMc0l3aUKg6ZRdX1plpPWYBo/oT/SKjWofgCHLMSM7GoVtx4k+D8ycpY42ru2mgncft0V/Rq7+vtJCcRQCtPgFanRqiO0NDWMX0XDW0Kk+OU7KIqv682adtYbsePCoG9hqR/JBw0/0jGjqRIRRsIlBpMXG1QhkvFPkWqa8KvClDg== 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=y5SjIjJTynKEBSwy7NuT7jTmI1jzrxO2FtzkuiUoAYc=; b=hdZo/2yAGOmLun4zD+z/cd0aE9a0N/B41jrsFLZeGHLF9B6D4Wvp4qEHss1jD4s8rQnibDHAQMjvL0LP5cn/0Mx3Yo66KQe7AH2b6EQIPjOY8KQ3Zem1mJ0eO0vw8+seeiMVUo1Dzbwb49ig8oWh2QqdVMS2gV8n5jfRia5AboyUzdrL8yMh72bkRzGozCo/fHtvre8luEL2/3AfTHVvXzurBOXOEk88UkClINpW9XlNqjFfma7j+kxkVBGW/aUlhRDVdIJtqPqDYBowcpy24qZ6LmeMJbi8I1RaXSIR16WkjKZ+Cb/XSN11s2kOQWo2svoroHLxScAioOUYDNGrvg== 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=y5SjIjJTynKEBSwy7NuT7jTmI1jzrxO2FtzkuiUoAYc=; b=MWtlsKBrocraWY5NNxabuJwLUDi2vozyvNbgX9K1RunpsP3pRU+ncPM0rebyciZWoQvCxYpNIRFXoUS7P1WcE34K9jw5dOJ+1HHCqOB3ujeZ+JWtkl+GfAXGF03Euk77ZZPIRsVYWaozYeaPz0o6YJrmPFxTHrO57cIFR3n990mjIHdxd2YfOq/VF2kB2mYUt5GIGHmvC2EhWI4L1T9bAVjswDjvAmMIN/ZsdBPwWQUGhTyR86vcHrredqynk6/SwpXbuO/evEFLT/gFO9atkpGJPzqoWzBs9aJARkkK1noM3ZD3qudpVl+MATojv8r4+duzhqYI/HgDSyv2ORZ8+g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0148.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:275::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.37; Fri, 6 Oct 2023 02:45:51 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Fri, 6 Oct 2023 02:45:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 Oct 2023 04:46:31 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [sZi650+2t51Vea6cheWlJmoAqXDgDccD] X-ClientProxiedBy: FR4P281CA0094.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:cb::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20231006024636.1005349-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0148:EE_ X-MS-Office365-Filtering-Correlation-Id: 191649db-da04-464c-3232-08dbc6165aa0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vvcVbZ5c7KgyFCAb9AofeCChvUUzxigiRx6vycIHGWixq4D9u4U3lryHE5xbXhthiPoBo4o2eZDIwu+xzw8lJHfagR3001+6GMcZ/Sgo98+kbMzSJsLY/o9MlBEKWDVyUMRgQKakls3LdEo4ZI/jWL9W8U8YqFbpGmXPIc6fdFEd5lnOacG4PnaFiJFaMQhLjl5s2UD/bKxU2dMwL4pZJ+8JFlQ0/a/gwn+U0uMDrCPgYINeESUUDBgvGNh5fQbUGEoqoZibzJ+NHHb4uCgcbqJOTvtNE0xpWV0elmYxyM21P0C6E6pEZT4hpGzrk4bQb5Ck21d6D6b4Wis4WPeVsUO71JBQ8gvmbol+PlhIc2M0DcxNuu5DMKtsbufeLpHVHy4f4mZihnBf1wU1bF6EGqZM5U8VV0DHLYRcx7cXLQlIc/otJxQkpa9qyjTC/67ERSGvFAjurbDJDK5D6orN84mBoZgwQx80jm4G/qh9iYqu+02WxuUVovpltZch06lR66u8SBnisGhuSH4Y9ZtZEMiMUIWIkXwv6siCRLFJadJ0W5zcNTt2y3X8I2ZOoJa9zZxZQrg0c6X5iHRIpPzsCQK7EkBEQlzZzhkHC10IiXh7nmMgVsfOfh1t0ieX0TIX X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XVtvdZs8wFysQBBeMdgseiUT8F/09rkn2Hyhac5fVALlmZR1h80eC8B8FF8cLJKX+cN5kKiyDKcddxPL+BCmsKSuj2En+AIyCUqB0Bme6dUt9+UHPd+68ILkURR4Fr0W7QjeGpAMPnOs1jk+XkDSyunDMV/gbqiLqa02Lv7Pimr7HMxO92Km0OBls3hU9d5QopV+V5mLr2MdpwoXfkAhUITs+aFM/Tdw3eOQ1rJwCUv9+vP67nVECMrBw0DQ0TVOo8BYCKnjUrf1vv2Us9KvdYys2XqbFRO4devJiupRNa0qcE8Z1R+dHT+qPuL3p1FgCdrd/JaeKCTiTCd9IagjlYO3o12KtYkiWUDEuerDPzS+Ad3O4rEnmPyimLwe7Q7JU+doB88cGBJF4yiOtoOBNVCRxcpkn00kja/kIJ/TznxvD6FGfMoakP7oPQ+88VQR3JvqRQ2kHMz7EO4MWLIh2/ZvBuKv6ZwGYyg5pRshUGh+v5f3+qy/RP8c/8zEhijJdGZm1lUkBNAi9Olz3LxnuxUcyMsXuWOjA80dXYKiy80GQzo6V+0CaCzegEGErIPCnwYrwZDTjIcjFVgZ40sTawUUPjQYtjSzHNZo9YGXadUETNFNuAnNL3ebeoLdjrxee0DSNy4d52jk4MCAHPetpdfECpULrsGGajQGP81DZFgxfOv7pcKYi2rOWDqBu3n7YvOdNRPx/Is1j99OHu24pin7ItgaKVrRpIyuxgOrbz7SgCsnx1KR6NqTEB/eg6K6iWuBtY5NdnN/BuQjAR9YcEF0B3H20JgAB45nk6YZCNv4PHCinJ3TFQxZhgSexT7O49uvqXFCCm3cTAokone/t+re4IgPchu+oKrZkrbyK00/3agwe6Hii5s3aEvWjw+7TKX7NX/V19Vuw8Zu+pRvQnfpGUIuMj0LRz8w49+Dn05dnT9hVXI3O3HLCq7ipcIvBjNn7zFm9G5oDOjkmHhlUnzkKU9p5qlAF7jh/Z8Jh4qsWSiOVOx0HEcI/P7j83Td3kYASZxhV9Nz5h3zsLp02yFr4hBmFeMG2fxWsb9BhpnVnrc5xNcweA2rEnehRZaudTH4G5yHJZSVNOFV7DEP9w98jge6quPqfcrrAkGEASkM2KXqmMWL/OunQ0CtvDtzNCcgMkDoGfralz6Z5K5WAN26s8gBxpexi0JL0j9n6mOZ7kVKLcLIMQw5gQmcNJ8NF1a//FB/dPrVsCuTjyVNd0/wfnNoizgHzYsxT+P6QtjvSXwV4MqoPQB0SHJ/jMLH X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 191649db-da04-464c-3232-08dbc6165aa0 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2023 02:45:51.7461 (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: DU2P250MB0148 Subject: [FFmpeg-devel] [PATCH 08/13] avcodec/mpegvideo_enc: Remove dead block 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: /CmbRPvg8La1 None of the mpegvideo encoders support anything but coded frames; and if this were to change, it is unclear whether they would need the adjustment here. So remove it. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 9e28304554..5dc95ef309 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1724,19 +1724,6 @@ static int frame_start(MpegEncContext *s) return ret; } - if (s->picture_structure!= PICT_FRAME) { - int i; - for (i = 0; i < 4; i++) { - if (s->picture_structure == PICT_BOTTOM_FIELD) { - s->current_picture.f->data[i] += - s->current_picture.f->linesize[i]; - } - s->current_picture.f->linesize[i] *= 2; - s->last_picture.f->linesize[i] *= 2; - s->next_picture.f->linesize[i] *= 2; - } - } - if (s->dct_error_sum) { av_assert2(s->noise_reduction && s->encoding); update_noise_reduction(s);