From patchwork Tue Jun 28 17:29:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36515 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp2789752pzh; Tue, 28 Jun 2022 10:29:28 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uNnMFExiKu8WIevjvKUmHSD0vofGc7XMuOAR8ZPJTfDodUf9Vg9ozzEZ11ciYG8iYMPnBD X-Received: by 2002:a17:906:ce2a:b0:723:1587:9021 with SMTP id sd10-20020a170906ce2a00b0072315879021mr19217644ejb.725.1656437368383; Tue, 28 Jun 2022 10:29:28 -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 s10-20020aa7d78a000000b00435201d9705si4044399edq.602.2022.06.28.10.29.27; Tue, 28 Jun 2022 10:29:28 -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=Jb0JywvX; 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 C892668B97A; Tue, 28 Jun 2022 20:29:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073037.outbound.protection.outlook.com [40.92.73.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9EFDE68B760 for ; Tue, 28 Jun 2022 20:29:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h+QRZcf8KDhAdrRnWyRteOUOSer2VMkytpIbPkD5d6CHZwU3Kg/D9nZJv7ch/v/AowAx31TDgtHy7dyBMyB5NhpCgTAPh6zWHuYmpyTUibKZY5lo5e6j8IRriemo66ufahYsG0ES7niNIVp9qOkkC3dYvRuK67O0ras/Q3IpL71bhDf3hgCUT7ZW1URledgqiXWE0+n/LOaFWmGr42ytuYtnEx8QAUTp6TkY8W33Pm/VnMPAqBYhdGXRJNCXUVU2RZbSjCb6MYKYRdOYdBQ87kI7IdS88eEsxbDJVc0/KYp7ft3PZpXK9YD3lsbNuFQcQlxHwUy5hPnlaT/Gt8VIEQ== 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=Uj999hqRi1ebmocwludif5Xo+k1H5wqsMy8e/bEamnc=; b=AXGjcx0XL/xQG1rRDzzJpzP9GRXgO7iGYs9vr41x4TXHZoR/+TVy74gOZeI1cQSW1UcSkX24BIFVAc8+bispIjS8wu8ihML3JCS51q5YNxuJXe1Wutgs7XHQ/Jr27vGtAt0utlmxCZMJsiNJddn7CtzQha0i5cFW1ZC4H9U1/hj+1h5GnK4/ppHqGhSzATEYekq7vYcqS8pQAjh89TgTQEf9KTbz9dDMgRK2x0eG6SEVaNf9F/l7eaySmChuzwNlVxr+9MaI6ySLKhtv0JaWVGBR83vO1+3GYSPHfDsO84VE7zpRkwKQI2W99k4fvI1BmJL1QQiIlj5hXuA6V6I4yA== 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=Uj999hqRi1ebmocwludif5Xo+k1H5wqsMy8e/bEamnc=; b=Jb0JywvXUdwRMKOaVA1Afl4tR8oWo0pUIUAIXcXoxQuSZ/L7QxF32yAP2fcNwKXxg6uYssZRBJGOyHf7pamjrxXbxUD3yToC567oVAkqrxaXL7KRnaPjkx+JAvo6/RR6qhy56p/ODNkZEIHhws5VJ++WDG+DQa9lMo8tzW2lzSMqkn5Hwk1i9nzXC2zE042wx+jWDPNGTiI4rJ7yd4AQZD7jIaDttLzzurP/zLTDYlcVnihgkYMmjN2sIQ2wQ7m9TalPrwys0/khbJxM3OF4p8Qnzw1eA0FOosiKahoh4TpHio22jYOt7Qfg9ZnxkQW8gZHf/lIb/zIcAB2IyGsMSg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB7PR01MB3993.eurprd01.prod.exchangelabs.com (2603:10a6:5:2d::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15; Tue, 28 Jun 2022 17:29:13 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5373.018; Tue, 28 Jun 2022 17:29:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Jun 2022 19:29:06 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [qvZ5TZBHrU8JMda7gCWrKod5AgYuQ2TD] X-ClientProxiedBy: AM5PR04CA0014.eurprd04.prod.outlook.com (2603:10a6:206:1::27) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220628172906.1152565-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 35b3857d-acd9-4fe3-979d-08da592bb808 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/ULrxFA++I2EGbEmmMUM4rY746gIeuTzpoefzKT6IU3H+xDxCgztRt7xjyTlIfk9mTohC90qhrKt5JsW7lRIcWo4KXKpgxEhTgNqJ2cEdRSm4jP7QoaP2ukzBH6X+x7I5O9GONnlGA6SnJSmGHPSWi6iVfCFAE1AE3YCzb01ZddPkhKUf0FkIC0OhFwAcHte2lbg5ltM8u+iKf1PFIZCsxP77QxJyTL+zQtOVxReTom8SB7WHpdmnyscezUUW8JYhDj7bLtq8DAIUm1KgR/j6w+TMV77tiFqIjRxiAgXsglT8BTnHwg8m3mF130QHD3B2XQBImqkJ2+F3ywV+LhgQRpJTyGwyTJknsWbJ+8FiJpDjioTor2wv42rcOAJsWLYU19PwFi6LWy4dOivFca5eMAUrRMTwobdLJgA2m/9ccwbC/7lhSjvPlWYkmYatNKxGXH1qJwrcnea9q1XFp4ZuYyhtpOFvLfLx5V9wik9JnOhuaejjtH0HQ/XUARuajpwmtcPpN1XojEMy6ZVSme04+1QR80GDlSGl1aW2nD8Zc0Zt2DsT3CECxJj6pXbMZwNRDqBAL6IDA2HDQnB1AgRTw3gpRm/gqMdYITyLQ0FePopJB1GCk7KCvtYvZDrYiEgMfdPFL+rrtca1MEV3ensXE1Lfh4cOE4CgQosehwfp2y2BcX8fM9iOWqq5fUIFNW7117u65XJre/MVA== X-MS-TrafficTypeDiagnostic: DB7PR01MB3993:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TcfoN5XmTOFfADC497UCuANn/gWoFYJfDbUBBIBhihk54o8M447AzqD5KJTpBO3Yt8UWZJbbb2wOvio213/QCMudfWXSxEr6aRQHRMXN+Z1let+28gPGU0c4M64hqYV/BQcbnDdsoAIrpxFJrIlaxA5YCRhagGpZ5UxNBTYRdK4c0axsiNXPVhFrOqPO/veafqfL2P5bBm42ob4aUgX7l6JLfzuBK5tEd/BSYD4vM43r1IKdk2BBWiVIieJLhvIhaHTRaAmm5w6SLmfxCwNui2QU4ZfgWzKX33UTNioE8/OgxAT2nyFRpWTTCkKf8opGuN/rP74Lefa+yi4mlmrAt05FN/+ufTm/GQHvmc9gwysyrBsBEpPOKRhQhvIM5Av2TNSoKUtV/xpq9n/4QyHHYVJeG+z4nX2+jHCRFVJ5psaqfa2qn4d8bBkur5Thq6YmNVLLDjVfwj1hNGR7gzjISUUNWMmb5SF9Olzr4WJplE23YPtbFm+hSPGiPpBZPjDWrqVz01CCs5gZzi5/NFgADF+kuVgMLYtuFWb6u0ZKJFkxa80UyrltiA/kB6aXK7Ur6RN22P6pm3dgUGELVH/1NZEwaMU+UWu5naaWyjYPKQw3fG1GQnNaZZfBlNDvD/B6fYgjEECUhTIvu9Fq5L/XNA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fhv2bFljfJpMixm8Nltqcn0Su/3NRPR3H9CWwvZ6F8hwoG5jBompfUHtd1KnbAzQ67yYkjNpPG987SO+xlg7iJBwLTGRdkjK8+1N0bP2+AP9TDheK79SLuCUBZmltcKBbMoIhxV7HXg5bY3rCf7JXvrh1IQ/ADV94Lq82xP8mtFAVLWLUnTlyMZZvQBGO5bTL9GmaBc4esMEIliFSTADgoinA3CoZswLbK8qU0J1JtI+pwAA7ab24uEV00HrqdW0MR1kfxO3BkQSOeKZTt8q/Gd0D863UTMG4UtJZVwcHxMDs4321enl3RkkwXRt4T/bbO4zWhlGjOnN0BVCTzVdcJlciwrOT18NstibcK8j+5w6aRepPCCBbqGNxsGJmXvE7R4QoHGgTFr1rr6Wu3xtNREa9bdN7qxefgVtUTy0QAcy1oJKaVvWvR7zuIPkuNFt44+gJD5LoFCm1SW3HRC785nhwZXS3YcTRE9gWe0PCuTQqA8iCPIKt5q+AdAbnLTITDDkGnwZBz9ywqWq3sY1IHnlCbBWaCY3CUvXIc7BNlYDTnIxoQyZTh5pi/X+frV2wM8TIVEurxCUOCe+eaHs8ehOlaUsM0Sc5a4E6lnUkT85ZTtXomIEx5QcX9/f/IFfFsBUA2ukQ/lSLyRJAbQNMfXWHV9QPzHMH6Ow15jkz9ZiH453syCH8vLfAsYzom6A0/4ygY2hTGbygFYiKWGr/vbaI0aIlDECEMHZY306HckGEP8gixWTDbvHNulTbU5b1LVWcTCaJNMI8MbmXt3GAgzZkuuVXAm/pdfcyKtNeKQ/bqulFeq6kmB6yAxfKqM2+Q5CQcN9EcSPsCTp5pPuFjd/JHs3dFcsC+w0gs4x9ns/c9AP2dbWyTuyfiFTwKU12ap2BP2HjJoYTrZB1r21pa81K0dVQGCGYM9TvBUrr2xAb2KjvhH9o+vpJeBukw26VaeNUcDPwDRNRf4q4i5T5YExYQLi7Pq+hFeXzzaHnHX5nah4bSuNVvAbIaQh7CLptcLiL//uIscaFtXQWJCg4ociLfZ4xiFKWBhEKttDw1sqMxiBwY+C3d6aPpVna78A7qtWoszVk8iLW5BYxpdD5T005xHUHPGJVy8q9mhPE9ye7v80zp5nV6KSYEudnBy/suTJRS9JdR2+jQVU/9/eaeSvdClogi8dahRw4oi7iaZjn8kMBayIvHxtJhC0/UU4MpipAfhaMfgOk4ya/JGIRByKY3D2Ms7yZvz6t0PX5vGpoJQMH7h2gGqGVGfk44PXKN0WAE8XQr+viPdQf2XsCQf57EOUzLmYYIXaYp4qPsQ= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 35b3857d-acd9-4fe3-979d-08da592bb808 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2022 17:29:13.6601 (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: DB7PR01MB3993 Subject: [FFmpeg-devel] [PATCH] avcodec/encode: Avoid check whose result is known in advance 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: pO4h22OYpN2h encode_send_frame_internal() is always only called if the buffer packet is empty and except when we are dealing with an audio codec that does not allow variable frame size it stays that way until a call to av_frame_ref() at the end of encode_send_frame_internal(). In case we are dealing with the small last frame of an audio encoder requiring constant frame size the frame will be allocated by pad_last_frame() and this the only case where this is so. So by returning directly after pad_last_frame(), we can avoid having to recheck whether the frame is still empty before av_frame_ref(). Signed-off-by: Andreas Rheinhardt --- libavcodec/encode.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavcodec/encode.c b/libavcodec/encode.c index b68bf1e184..1f39ab1a2f 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -339,6 +339,7 @@ static int encode_send_frame_internal(AVCodecContext *avctx, const AVFrame *src) return ret; avctx->internal->last_audio_frame = 1; + return 0; } else if (src->nb_samples > avctx->frame_size) { av_log(avctx, AV_LOG_ERROR, "nb_samples (%d) != frame_size (%d)\n", src->nb_samples, avctx->frame_size); return AVERROR(EINVAL); @@ -346,11 +347,9 @@ static int encode_send_frame_internal(AVCodecContext *avctx, const AVFrame *src) } } - if (!dst->data[0]) { - ret = av_frame_ref(dst, src); - if (ret < 0) - return ret; - } + ret = av_frame_ref(dst, src); + if (ret < 0) + return ret; return 0; }