From patchwork Thu Apr 29 23:56:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27517 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a11:4023:0:0:0:0 with SMTP id ky35csp2015387pxb; Thu, 29 Apr 2021 16:59:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrA0lDpTejKPeV2Gj+zx/qUVgiEvbijxrOoIr34pwGK+doQe0hlIC6Q52LiwOoIMI/qit5 X-Received: by 2002:a17:906:31c6:: with SMTP id f6mr1127356ejf.446.1619740769309; Thu, 29 Apr 2021 16:59:29 -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 jl6si1475130ejc.751.2021.04.29.16.59.29; Thu, 29 Apr 2021 16:59:29 -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="KPGt5h/Z"; 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 1FC9D68A27E; Fri, 30 Apr 2021 02:59:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-AM7-obe.outbound.protection.outlook.com (mail-am7eur06olkn2057.outbound.protection.outlook.com [40.92.16.57]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D400C689923 for ; Fri, 30 Apr 2021 02:59:05 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fedUcHDxV62vDudJLd1FA4PoU1LuqQ/cDb9wLRGSLshSviCPyZiZtg99JebJDD2Q1UfcuhR5FwALsJZ+C8d8waE+2ORqcoFegzXFCFFXiaQSQmyMyVZBDvjtRbvot+lLoa+ZL3EPA9Uv8F0uRVqxBvvRGVnibexToHtCySxGh7s7Jb2SrMLcgoFLiopEUQZemrTfk5QwNLKmpu5X6f7aG6kpjtbXQwRIgWiZGQrmUDkUn1OLrw+RoohJfpgSom8OAibpARP2iLHKgu1xiFiIN7pC8KUHw8HQLWdj3dXk02tmhWNUX2S1XsQUAOf99xtJW7AXoLTgJ+NmN0WGSm5Mfw== 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=6enY6bvHuEGxssJ1yR89dxOsLW/WyK5gCENK0Ubxco4=; b=WC1Bw95ZI1WN44EkwkfXece+gP9nr7XK/weRPX3zLOnBkv3CSvOCkYx0kkjVg7ntAr+bPdeJ7/Phusp5xXlIOJnw+XAz/bu4thcVpzl3Qrqfv9l2pL4glHMD7I3Tc9cvVh4L5peLCZIIEBUfGH9Fw3D1Lq6xDn+if1ZuhIwaPiTZiTl/9DAYSKxZTOutrUPsm7xDTSksT3cGtvW1wCBKQ29NmqODt2Buxed/CUfRPQstmpu9KaMFlpUvfeitZCzMp9SBUq43PP38TgsPx6kkCH5uFrTZebvWr4jualGJ2zxgM0yXZEsCBX9I6dp+4uK1tMpBw31GOyRGuMmh4+4Czw== 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=6enY6bvHuEGxssJ1yR89dxOsLW/WyK5gCENK0Ubxco4=; b=KPGt5h/ZEtFxnoGXGZZBCeq13pLR6ZOtDCoUP0gXKtvLSMQ/osE4cmc9Bp+peSa8fE4AvA58KcLFLrVg5NiTsGpEkumEDyXpJmVKWFZPvGYhXYXZBGKJi4XZo5WynzMWmAx3gg68SwTBp3BX4PZHgkj4tpuH9AGGqYagh9pfxaTyQvQEaHEJcyaWrwZc43CDiaoI2VRK7g6hCouDt6h8RHo/QdK1AK8eu9RhqADQeijw9fCDbpIMtM7j+z0YYFNbm65IZ/BCyTkEdYvu2+K/axmjpdNhkX1TJ8PyZqMyaWXzkM56z2gA2TF+i+OQ/DWWSzexQNYNtTJ4GKGGw4zE7A== Received: from AM7EUR06FT005.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc36::4b) by AM7EUR06HT161.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc36::231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.27; Thu, 29 Apr 2021 23:59:02 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc36::4c) by AM7EUR06FT005.mail.protection.outlook.com (2a01:111:e400:fc36::397) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.27 via Frontend Transport; Thu, 29 Apr 2021 23:59:02 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:2158E5BC58692CF2403B2059FC83EF11906FE965E86DF1652D90BCE02FA0550F; UpperCasedChecksum:A0BE9C187CCFC5EB6CF07E4EAA22F6B385DBA7A325EEDD242782EB7953E2C355; SizeAsReceived:7584; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4065.027; Thu, 29 Apr 2021 23:59:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Apr 2021 01:56:43 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [v6vUMEwg3JvIe46zNwDniNbi1EEa69gS] X-ClientProxiedBy: ZR0P278CA0088.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::21) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210429235717.2067041-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.248.86) by ZR0P278CA0088.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.27 via Frontend Transport; Thu, 29 Apr 2021 23:59:01 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 0d7d6258-5d9c-4f37-1768-08d90b6ac31d X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNU6XUx7q8EQ5McclV510mdN6KDHjc5pS3uOisJjw15TVI9JpOTYqbzmSAohjGKFiqonkdgQ0kMC/BmgYZ4tAyci0hD9h3+HGEr0yFJEqIUv2WL1ls8UxfA3pU07m9ucvwA2U/JJeJO/vh5tfeqOqMl3Jm/gJz4k8e9l9vwTvGXafv0IxH+bpt29mxboQwZXKQrAU408N+4fKjEpXSqfn22CauyK2CbW2Oa4n6ro0ek+K6BNOITlq22ATgDL9glyAWuJFN6LIXRw96xbJmI49QslWm1xZKKnI0uVkN44jAYxo7TMM4aZ+5R53wdZJ+0W1nCnbe/sTGLaVtsP9dExFBj3l0h5Y4VI0bUp29gE/bUvRVfp7/y3+KKn8ipHf1d2adTqbjZ9n+OrGFyFGiU6PvX4Wm7FLnWLX4xn1W5jPqI1o5kmSF9iOTGXL2PqyOGLtzJDGk1HpaxC3KdOF1p8vqsAvzi5RddIZlHDRFxn2JjH0hEPPG81EqDDSui9Lgjekv4SgwIQE/qFcMDRoV+ynvWBF5Zpa7KRVt5cY6NolEA33m8NuLbXtymqEoCaglmJkPd5YTxPmx+lCGPJA6MA4SOEZZBYtlFC/+khM31+9thuMDboaqc0WrzBrQQQJK9mWy2gMvSv2AAKmReN/OTg/eBbS/hQE7hPOYcOf5mVcjhnrAACKYi0qhXj5hF8D+vIUHEBfGrPgR07cfRXhpIkf85RbhTJf7lDH8Q= X-MS-TrafficTypeDiagnostic: AM7EUR06HT161: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VF7dmJWYhpFlHGJpAiXyguj84blnlSb2+vv+/P7se5ya+GfqZmaj5g5jvX/OthizlLSh9uKaHKpIlgThtQIa6AmH6sM1RlL+Pr8aNM4c4S+qZIW3/3FMP+gkbaNgnkzZMce6UUW0oEHk0LDmPXy7+Ayw7ACqc/vIfNPga3c8GR0wIfnkzye/7czxOAC946Dh9AgZsTF8Itp5/vrydDZ00OIh25TMjcosgWfE3ITwWuZ8s9BB9h1PKLDemeidjixf+CenUAIMRS59UQYVxn5D+iNDK8hCGzUCt5IZXh5CpyzH4O5N/IJvfGGuoL9YdssL4k8v/lC23tvlFgb/xje6RClWxwwJ+cA6hVObY5bY7jyptrZfTcghSWu/U7geiOV43iskTjPR7oVxOdfPZYxVmg== X-MS-Exchange-AntiSpam-MessageData: 9Rrcb8zfC92yu7D3DsHHLCAM8PGU/Iom+1M6Rv076iXKFcNJk1LlqnPHfoVBsfK9cZArNrbJMQC2pjtJtcAtQ7XnLEj3BSQcdgpYG4JMYEaDVHbnG1J52g1Dg+7Ug2bqcbD69kEbNwVtiKA5glG2dQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d7d6258-5d9c-4f37-1768-08d90b6ac31d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2021 23:59:01.9797 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: AM7EUR06FT005.eop-eur06.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: AM7EUR06HT161 Subject: [FFmpeg-devel] [PATCH 12/46] avcodec/cngenc: Allow user-supplied buffers 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: fIxxkNftcee4 Trivial for an encoder that knows the size of the output packet in advance. Signed-off-by: Andreas Rheinhardt --- libavcodec/cngenc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/cngenc.c b/libavcodec/cngenc.c index 55826c75be..f37d586744 100644 --- a/libavcodec/cngenc.c +++ b/libavcodec/cngenc.c @@ -23,6 +23,7 @@ #include "libavutil/common.h" #include "avcodec.h" +#include "encode.h" #include "internal.h" #include "lpc.h" @@ -73,7 +74,7 @@ static int cng_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, int qdbov; int16_t *samples = (int16_t*) frame->data[0]; - if ((ret = ff_alloc_packet2(avctx, avpkt, 1 + p->order, 1 + p->order))) { + if ((ret = ff_get_encode_buffer(avctx, avpkt, 1 + p->order, 0))) { av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n"); return ret; } @@ -105,6 +106,7 @@ const AVCodec ff_comfortnoise_encoder = { .long_name = NULL_IF_CONFIG_SMALL("RFC 3389 comfort noise generator"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_COMFORT_NOISE, + .capabilities = AV_CODEC_CAP_DR1, .priv_data_size = sizeof(CNGContext), .init = cng_encode_init, .encode2 = cng_encode_frame,