From patchwork Mon Mar 29 17:12:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26642 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 6A9B444ACAD for ; Mon, 29 Mar 2021 20:12:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F06A688162; Mon, 29 Mar 2021 20:12:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069029.outbound.protection.outlook.com [40.92.69.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A1BB680942 for ; Mon, 29 Mar 2021 20:12:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W37dThAEhDaRjsmIjACCgVkEW+0JuN95bdf/gtiei/1dreWkmQ+hvzaz5f4A1Gbpdby7UNYDlGSYiB4hUKPDR2nRNYxigzIR0bFxeADWtjjH7z7TSEVfFX4b+7zx6V1/pOMgTeSaA7jPQ7zMVePxqMYfaMvS8m8SkNy/2tRK7z3ugrOVTeBki3O+ezSRzM/CUc+OsLPLaDUOI2UX4E9aPdSUm/rRPetfARPGn3v2QluJx0gjAipoONjCqvAy5zvJPitmz+UFfZDPRyGVwUFscGyRDapYQiCuK2XR8gktZGi681NStBdOz48aF5hTm0PP0OoCe+vs7W10d4kxYZm4ng== 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-SenderADCheck; bh=RrbEIR6MbS71mNQ67IPL9gnnlyiunHQGR3emRaLhrcU=; b=PK8IY0s28Sx8Kr6V+KI4SC0ESrQWY2sp4j5e/vzlY1lHpWPe1j/W2+wE4YV0nFtOONkNhIQA6K2QVwAvpd2wEHbR/yis3vhb+j46CE0SvmDxy1eIpnmZmwOJrYscDdWFAZbcac9cRhZi8b/4ncFV2H8/KeUvJCiGIOcOmOq5cA9eY6Doo8KcfTp6coWHOh5AlP47UprT3ZU54vO2AEuF1R1M8Wql05Q6z7Rv7d/LjCyUAF0hMBlEpfncI3Kd+elJ4zHgx26/I1V3kgLsqkns2Aw68zR2qaDmxDtaTjS2D3fUKtzD8Ip111GZzrf150+06v1txbBAp+1BJEOlzG0z9Q== 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=RrbEIR6MbS71mNQ67IPL9gnnlyiunHQGR3emRaLhrcU=; b=fI155ja78S7Apvv2kR+/uAquXeL6Zz12LQcw/ejzCYAKSZAWWYzAOWQQ6I4zyk5F1K9E/VuddEkqgP5Ep+Iq6LS3EXHrPZDDXRUHmcPqV+mk5jm45WFRA0ycZmaRu7l7r4sjudJFSdbKAKhnC8GotXZksyeiudQx/AEZYNVN0un0RIoPkurD89URp/5buYElCBoANEqLwbTFyr8V3c323H0ll7sy8CxsvXSVpLcD6XGNWNDIgV00394+jah3we7WkVJQzxn/hw3Xhxv00IhkHBjtOTv4qoH4h3CsTOhmnBoIAdGvooYuCe6mci3YSzLVAv7+M6vp2r1yvtWtqzjGoQ== Received: from VE1EUR02FT052.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1e::52) by VE1EUR02HT128.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1e::409) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.29; Mon, 29 Mar 2021 17:12:40 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1e::53) by VE1EUR02FT052.mail.protection.outlook.com (2a01:111:e400:7e1e::402) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.25 via Frontend Transport; Mon, 29 Mar 2021 17:12:40 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:8532AF9D6C065CA010A153D8286DFCEAB5D20A94059E2F71EF3C65A328C43960; UpperCasedChecksum:924293A98651C3EDD0C87725A044BB2256810E4C2576F44F810131652104AF9D; SizeAsReceived:7599; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.3977.033; Mon, 29 Mar 2021 17:12:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Mar 2021 19:12:28 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [67/TyZvjFUZR3kmWkPbkcBpfJCYk8Fht] X-ClientProxiedBy: ZR0P278CA0111.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::8) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210329171228.754337-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by ZR0P278CA0111.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.25 via Frontend Transport; Mon, 29 Mar 2021 17:12:39 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 35743c93-f26e-4c23-b590-08d8f2d5dba6 X-MS-Exchange-SLBlob-MailProps: mBRmoEB1kyJI6Ri+2w4enWz2jr7dr09BHRkODM4jaNitN0lg9+1q/VUX0T4/TDd29hTCdfrWwa7Xw4R7JeOV32PGRwq8rvy49bZaK0ywv6cirYPOSuiNySx2+3sHXzTwkbcpxiK7Vniwp9bsJ6fvZMgnC2wxxYCD+q7hePX1+AUxduvDVuCGm/jsTT0XIX58yZCp4MsTGTJMNFqYzT/pRmcFUvBtNxcSS26sI4w5KsAcNWOd3SREvg9arFoqGuJWinrNNlTA6VRFBfX9NOZVVV2jfuKzA2i46eFyvgZfhVKqHu733Vl81fISI2uE3SpB6yuvU9DwjZq8i1Q0u/sV78WlP8N/v/Jo5GVld7XtfkYd1nIX6KjclwZI5Xv26+X3LQ+pDFl6SqFXaW6gPrb8/4U41W8cV9SFCXXlHyy1GO+J1wrabmuDB3KhjKRdcqAOjFhocnkdsOQX6IVe4MvhKxCBVJOOaG5GuD3/xlZD5owS+SBZeJ2qI9JfH9AkcM/PTOxPZ89NYtoBwJlZq0Ftxc0/QGuAk1IvboVQbDXpwL/YvNvuWDK7a1KbTYkbvtIX7uH8Hn979xJTOWO3YaYdfxKHgs6P+CdRIIVmX5mrkoyeVYfGFVTfrlkYGostnbm8PWln4ZoVNyZcfCoPizMzYeSFfaAy03Oraug8I82KzXPDyD+IBsx2dfTBoi4MjOtQAKtpnOc5SGOhgZq+i54wXTBy+C1gYvvOpXFVyOlDtSc1VxSfJeTweuiJpqBxpGyVAe9QS0I/peo= X-MS-TrafficTypeDiagnostic: VE1EUR02HT128: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4Y4E2SwZEulqlzYB4fqay7aXBmCe+Cix52NCvYF+UyMVVnE0uSQJoNs+1oWwuBXnAyIfxLIDEYv9KMJBufNe/zaJnQPxq2bzGT4PZ0mI0A5+ViOIDEQZHk5ZJncW7pA2YPi+Y/HftVtPyRbM07xiEDBs0JuUsoRmZHNJO96N8tenF3YnsC6KbFqr5w9mcTrLJoYLqVpJMJluGgqsnO+yyQbKMUQG6M+MSpyV0ebrHPgWdlV+IZpTc1EQcVrpi7VpDpXxpKmCDQm2cFY0yrO2JHPp+VIU9F3AhFtnvcEUwy2JamGL1K1Vdv5ipZFkedyJVhJ/htSmdXZNfZWN7Oo/X8H+bTM0/tAy0u/Pzrg9izJPfFqAKDcB47jdykq/kvauoDo4zHjcBuzcNyM4UvqGPQ== X-MS-Exchange-AntiSpam-MessageData: rAypz5qzzFDx6kBBc1G/+3gwufbaMUBvgmYCCxPX6j4DVFVju5WbFuQA+wSPZyHu862ee5N2gBX8DsRnNjrht7Gv39IM+BEVcc3K5h9jr4G5tCi0sQqsvkCqiewCMirXQBTLBgSyGUJltZPiLm1+8g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 35743c93-f26e-4c23-b590-08d8f2d5dba6 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2021 17:12:40.2175 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VE1EUR02FT052.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1EUR02HT128 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/ac3enc: Avoid needlessly copying encoded packets around X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" AC-3 and EAC-3 are codecs whose packet sizes are known in advance, so one can use the min_size parameter of ff_alloc_packet2() to allocate exactly this amount. This avoids a memcpy later in av_packet_make_refcounted() in encode_simple_internal(). Signed-off-by: Andreas Rheinhardt --- Is there actually a reason not to use av_new_packet() (or ff_get_encode_buffer()) directly? libavcodec/ac3enc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index 4cfd0afe12..fc4d45651d 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -1759,7 +1759,8 @@ int ff_ac3_encode_frame_common_end(AVCodecContext *avctx, AVPacket *avpkt, ac3_quantize_mantissas(s); - if ((ret = ff_alloc_packet2(avctx, avpkt, s->frame_size, 0)) < 0) + ret = ff_alloc_packet2(avctx, avpkt, s->frame_size, s->frame_size); + if (ret < 0) return ret; ac3_output_frame(s, avpkt->data);