From patchwork Fri Oct 6 02:46:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44169 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b1d:b0:15d:8365:d4b8 with SMTP id s29csp116836pzh; Thu, 5 Oct 2023 19:46:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGZJea1+scgMCV2hY5Z/mrT+VecTEzeLQDX53FLyFUx+xOfTWk0/UqhrO7T+5yC5kI0fIJz X-Received: by 2002:a50:ee1a:0:b0:530:a0a9:ee36 with SMTP id g26-20020a50ee1a000000b00530a0a9ee36mr6194038eds.38.1696560361219; Thu, 05 Oct 2023 19:46:01 -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 q17-20020aa7d451000000b00536751c859asi1220278edr.443.2023.10.05.19.45.36; Thu, 05 Oct 2023 19:46:01 -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=Bu8YzfXs; 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 D971568CAEC; Fri, 6 Oct 2023 05:45:33 +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-he1eur01olkn2029.outbound.protection.outlook.com [40.92.65.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 06E8D68CA22 for ; Fri, 6 Oct 2023 05:45:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bd083SuEhaTENUkcFG+eTIirYZHGlIwh+BxxVUjTTEtjjMnot0lcXFBO5OHr5PW9SjCLnYUKVOA1QtdKAYeHIt6x02mYOQ49C96lCAE5C9g6jDkagN2x/kczEpyqWHqNrvODBPkK7V4QiSYNOqScQM0wubqN3Teb/2WzpaWWOzIPwio3iFU/Zu3pkEXwPUVlrOUtSQQyCXUBeTeHbg6AjmXSaKzeOswV1GxVM8Mv96RFbKcNQYRzvfTiQZCIEk7mT6cEhHmLpXP9XQHOikEQpiN9l/A4oOQuUJU54+fqvwtao81UwOFtlVyr1Zv4cM8rPazlLHynfQ1Bko9qOZ6y1A== 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=aC5BYZgwsaas4pcUeEh8G0LCD5QAx7DdAFUTW7WD8p0=; b=CtFu3bXzZiDXs5hXu1h1mzYpDpqiGnVX4Fny3t2lqgYqIMTxw829MOkVGRvM4P0q53BGTYh+YDfdWYZyPKp/1pw03FTpdSy2eLm0KDID+eIXVmGfpq5UIn60VdxNtX/Q2Y5quRxKsoqqf2D1bd5aRhmyr77k1utfToFPwZmC0qO6SlrvjPJP1jh8dV7K71QqrWPW6bXCT47BcodbU6+SzbLZnTXIgkRS7EAV6wxNGwkvRQQvycmGPNbRwzW8An0U91HdWGo0g2kWNjeYett4G1YoxAv+rC1ekXA5N/OUR8oiwrRs4+DEZm9/Q8ZzyDJDYEn2sW25i8rxZUhfmGwKjA== 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=aC5BYZgwsaas4pcUeEh8G0LCD5QAx7DdAFUTW7WD8p0=; b=Bu8YzfXsDF89dxwyc4lR28BfjWoMbI/7sJCshqFlsgyqUKbDi03caGQriGzEX4HGLEmfUbgwFDfJTehii3O+SgPl7lvwIg1cVaAon5IdhMJq0vYsdS7OD6Yn9ntMM1ULCVpyU/WJiAIJ9Da0y/Bt0kzfQJ9l+vE+QXCOVfXmylJAW68j8yKdFOqeVAU0AEVWm0M50sMfKaiOw9aufuzchGm6HD48fPGn0QBLGy6+kc9F40RqZUvdsHuusUH4xLlrfx7RsLw3nQk5/j4Thz37pceR0PHiumUvc+PnTB2UeXrDbkWfrKbMo7c2aa/kSUHIPoZmkiJVJZLutMDR7Blb8Q== 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:26 +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:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 Oct 2023 04:46:25 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [AIYArofS1qqsZoPTrywRFcoby9tZmoaQ] 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-1-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: 5dfe4a7c-401a-4bc6-6674-08dbc6164b64 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b1zpVJngeJzQp+IHtJeEiglY25Mw/UKAfnkj5GS0GuZUFNKn2qJvj2D81yvO0oq4nuudZtOuLR2rHV98Tk/qKPUIIkJZig21zQLzjvGvtNULpS/VKXiMFPbkZyiDOOyv37Th/UE7yjJuAA4FM23/mL3oXQJgCPYH1IL78JyMm+KK7/Kdi95ew/wrdCdup1SDbGAPpjT1b6oILAD0tGl1hyNFuhTDmLh5h7h2hmRTD5R1vb37JilASSLEa3Wosjs9/0ZbqQv+FFFkTMUpdObTjix+Lsy2g9LXMfmJb5iPC1vMAVys9riMt+3sJBEeBHe0h+A0TSPo0tDecnJGKbo2qdbFtfXbQELwauSacad2mwmwnu/CVMnIML18WxEPcEOj9wiSO06rP66PsbJHuR9/1VTpG96nFGcBF2q/9JA1mAm86mLYJL/gh1L7urCRlft6NEepVNqsUTSTcVnRfKUcLiO5InACRjPIEls+ZMJZVLPkbrkTiNR2ymHmY0JiZfb7oN2cUdM77MDwUbw12tZciaiU0yh57cPdkXk4p2wDWrO2yRDvTQrXlk3iJosUBVmud271EknP7wxQGr+AwVVc8eQS4FzzPcpQyQm+MtWl6Mmjp+jFhHsm456rxoSHR/t7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vqvcnxY4Ld3+b0lQCFFRW3IS9hsFh7eIj2HOITyuaxKzf5vRj16yX+1CSUI1t7cQ+RCBDW47FqBeFubYBcPUe1cTwsY36mJU1WpRMAdfufZWh1zIBCNkQ+KGbioZPYjDFC1OCh2Um7GwBGRCZe06K1ic0Khiyru2bJwhUuewB6BllbjPUsRnurTF+zIqMs8ePCe3qlHtL7VxomDRMLDcSdHxpD+bFVNNN4YvXCgf5OeuVKo+aPkif88aVFN4oKOZB+JNfF8axHHdKBIIfddHdBI8emIvtFyXNmTht+VzsPzm8kDDeZv0WDGGaOoDMsm+qDG2T3QfHST6nLgGtiSRnGrxN/IUpTVSPva9LzemdrnbzgukD8PgGy8hzcr/zAlYZxKl7hseI9sX43yYqhWsj1KtAMKyCGcBvu8B40Kr2H+6UHdRxadxygew9m1sVzhyiocQ93EVVe0yixhlGGU+5sAKsOQVMdP8wNZ1meGnn2ipWd/mKXIrutpOaGheUVBqr4XOx54i3mq53UilYEPotY9YppbLJaRUeMION3fQBMhV6OCvfyIiCd2KQg0qNIHHtkAgYUiDw9WpdavC+NlBS8PBpu7ThpJGlTAH3wVLhDSFy79WFaLDOZ2SGRkfqNAgBuOEwfOcFQ9Xz3kkS1z4LOny9TMCuRbNGVufOq2IFiIwwbBt1rlDtYjmpNbSEqr9+GI1di7mxwDAPEYYztLVYcA2ALCSh6RVBzCH9U/gj+lsfcxVoVExL0uV0E9/b/IMw/i1Dy5XKsCXxg1mgvQJQ/B1pJG7s5to8+CBAmL/ocmAiqj7QLpHpvv402bXo+20pp2u3o/zyFTUv6kml1m+RB6oz5b6AWcN4TcKt/1on/b0WAxT7jNCyyYGnEKTa7eiRZY/Yc87gn5sqVYnHds0waG8KIapNqSqHz4cKZV0vYHe+6NQLe79IMfcOAXZ8m2KT624AM3ByCedtGpF0LUA51H2UKQzLXDGxZEfWC4dnWQmql03GAkjPT39Cy4AuytsvR2hssbsfd+Awzor/gc81TDsKufQdXWPA82wTZeNgvcWPND+KkGtMEQOOsALPaas0T6y4eoyAG0Aa17lczpT9/8jfKqmPsvWBtKTciSGrWlc80bl7NkFcL3hmwXEqc04eh7orSPe0bpwy8ppCQUYCNuZltqPXA1ZGWyfgxWfy+npk1EL1f0th3JRqNYAbNsiIgKjuTCwa2fFK2+Dk4cWWSgZlNANX0jnMGnl1JcEjQaFokv/Zio4G86UYvZDXD/N X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5dfe4a7c-401a-4bc6-6674-08dbc6164b64 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:26.1961 (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 02/13] avcodec/mpegvideo_enc: Remove always-false checks 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: cabBNGAzr64n In case "!direct" we are not reusing the input buffers (due to e.g. insufficient alignment), but allocating new ones. These of course do not alias with the ones provided by the user, so these checks are always-false. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 6cd9d89e1b..3be6c1f928 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1171,11 +1171,6 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg) return ret; if (!direct) { - if (pic->f->data[0] + INPLACE_OFFSET == pic_arg->data[0] && - pic->f->data[1] + INPLACE_OFFSET == pic_arg->data[1] && - pic->f->data[2] + INPLACE_OFFSET == pic_arg->data[2]) { - // empty - } else { int h_chroma_shift, v_chroma_shift; av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt, &h_chroma_shift, @@ -1220,7 +1215,6 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg) } } emms_c(); - } } ret = av_frame_copy_props(pic->f, pic_arg); if (ret < 0) {