From patchwork Fri May 21 09:17:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27884 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp342194iof; Fri, 21 May 2021 02:22:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYmvL4/fnxUrnBU4Dn6npJW9zJcRdPEHd3K9yThI8TkGyFUvNRaMpxrUGOzIB89d2dUu8N X-Received: by 2002:a17:906:3042:: with SMTP id d2mr9479822ejd.234.1621588941588; Fri, 21 May 2021 02:22:21 -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 j22si5757929eds.591.2021.05.21.02.22.21; Fri, 21 May 2021 02:22:21 -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=B9R0NcKW; 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 7013C689DE8; Fri, 21 May 2021 12:18:35 +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-oln040092073071.outbound.protection.outlook.com [40.92.73.71]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 818D9689F22 for ; Fri, 21 May 2021 12:18:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UKJJfeD4pTIymIAJowEZko6kyyHxMCEEgvMqaFG1hoamL/Sy7EDbVCv5FuxB6CHYhTzF456BKSxD+3tKLR/Abj9R6067ln/UjDzADSCTWzsGBMnP2yrqwLqDac7R+dCmcLi7xplumX1W7Z7qHNGttRV+VMP60zWRoIwO1sWTDlbrOFIvvXekZFFIdWj4yBa+3x95KyQDGZc7JxMx8z4sBmh1y2aKqCFSWWN8rRHRBqgioIHbPBt50ZqEVmS4NzrlkXj75W20vtwoVRMgL5sUoi7+dRXyO++Bp1WhzLedFprBph3Gi+Miw/lljSOhIakXLvOPRLggRRDpJR8qUScApA== 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=qQVkSBt/jjNJAW6p9tmJfYcHcnFIg5n0amcXdg3KYXY=; b=LXgFe8D3QHEiXlebRkfyIcxdyhO/n+fcHuR9X0otq7SbMYjqeg7VK72/JgzJCylrfz2QRkJdMSPxVfm7nWM/f5oKJuxiN+zLbXFN/OMf17WuNh26yL+O9J+X77DekbxOBWJYzDEgL/3ll4fhfoFmuDRQFfzmDvbvRe6rj2NF+URqFYxxCwkXRtq9m4vjnfR5ZLaplPGKyKH89lc4wWpDcLd0uN5ZmauWHsmJcyCgMjOnCkmk0zVTgIDJ/fBQU/gS78fGC0bVdxYQo50JaDc6n6qnM0vyPnEw6CNiPzh2j48972jjSqeNRQHThmNWnDsaPTJhT9gn0StPs1bLTzT1nA== 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=qQVkSBt/jjNJAW6p9tmJfYcHcnFIg5n0amcXdg3KYXY=; b=B9R0NcKWlgShqAeSKc4mOXwwtoVr2wMzA/j+qsgM/GF4SV3s+lKOsW6JZ6PUhhTpLBR+piXM2GOlCwiSiJiNQdAUYq4CyFxQN5ZECUxJGeIccoriVi/iPHIwsq9PXCDRkQRsPYYD/OqOd4+F9icezZnUJHpXDvGcrTBnJ3F3qXDlssSox025pX/yJ68g8fMLMfu/gM3pu44z/z0q8FrOCDVFpm+kJ/+MUGEM4qSnRUVw7R/6P5NnOggaR1i/HvmcoqktXj/sb3spWm7xG6EdVKJEDl8JLywbaU/lDn5fFJ8PSgR1g0/2WQPF3ItTNeMdPqYTaF4CwV/dKax2yQht9g== Received: from DB3EUR04FT030.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::42) by DB3EUR04HT103.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::343) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Fri, 21 May 2021 09:18:32 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::41) by DB3EUR04FT030.mail.protection.outlook.com (2a01:111:e400:7e0c::99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Fri, 21 May 2021 09:18:32 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:18D22824B95B29B1B4E1E034AC230BC9CB94A4B8736478CD4B5EDEDEAEE7E73E; UpperCasedChecksum:25D2146AC5C3B96991AB7E9B2E70352416330AE42909E7A8CE96512D6F774438; SizeAsReceived:7593; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb%6]) with mapi id 15.20.4150.025; Fri, 21 May 2021 09:18:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 11:17:30 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [Gjd27SnZL3GQTKfDF95wu37gW/uRCf8I] X-ClientProxiedBy: PR0P264CA0070.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1d::34) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210521091742.184902-26-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.95.27) by PR0P264CA0070.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1d::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.23 via Frontend Transport; Fri, 21 May 2021 09:18:31 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 9b14afcc-b103-41fc-8b15-08d91c396716 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSiYaxVAPXjtBLAGaAm06UeMR5OLzsfL7em8PMXfYAtJKfODzAQRXioQSGo7zTYOMD48JR4vKcU3llCcXvrKqCU6MO25VOTxcUMGnKy19sY51jTZtnwgwnjg8/vI1JoWsobo34E/yBvDiE7KYaRZ4XN6TdYTAtCr1qWHUsiwItoMre4yQNpaegKrgz/zA3NzYW+FOAIYZn9CRAhAh/uwzPSY2VfPWK9y0znNg+eCRQWPT1Mj7u1LIwPKH3nMI6HYnKzTmJKRnw2BO8SQLLEpwlverM/plHk1Rr8Eka+IWbcnTX9rIw8i9L36518+vKZXahEJwmjPr8iToQOaHV05QaiBdaIMFMMduUVnLXAJUDPLcj4aRZlutOZlprlYufoA1ilURmdu8gmi0MgkNkA3uRU8xZQs1whl66DtmA25ybNCoCp4bzP+itOeIa9gqqG2bP4nLpMofGVA/e5jLoQDmXHF2qjPKrDpztXxlpzMyq7+EGh+Ua14XkR/na3NavaKGDcXCTwv3wqC9j1qX527HithfIxucmOhRaru3AuiKDWEWSV01OkSS3T26ekFPsK5eNuy2f76RpOoLdEAa02IN0EDS/j0v+vdFRB2ZI2MryJLA9l+oGAOolvT9gXQFbExXYu0TVZBHWIBR1WdmXwoydhB81Z7XoR9IRSN1gnVmRX7ySzaAYNA2f8vF+7PwrN4e2nRQVvrDUK0Td05+8zwbKkNYTQliuL40+JMR7s25AkvEb3SjLKqoztiNACEvVHfJk= X-MS-TrafficTypeDiagnostic: DB3EUR04HT103: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: k6l2FOih940c5yUOHNPn5G7HOZkwx8E4T2NLQVyu/7QxBFEZzm5pRg3VUjj4WHimi+wQdfjp94AqbMGM/C8BPqZbDY47aDpDi38KyCVLJQyYc6J2DK3zKuq51uFg8oKRgdm4dFzqjSdIkGraSkbmk9PXFjSN0gXV1ZpMt7hYyF6cOi9wShzbCEDRVMPVZii695u731z4hcKc5Ig6vFH425vj8S/iefcfMve2rHMbNtiBbn2LFhYxd7PTBHEMLD8WzSzD3hyEKk9Grq22u45w63Nar1pmYWLa/jbw+eAAVOhAITSqMKwWk+ioepOk+tWariOaiVwacZL5pqS8qtzDq/M5g3w2qoerNiPU72qLRBfyFWrMLtIaNtw2AfoqWk8yjqUC6wAxHtkxjda5lW1LYw== X-MS-Exchange-AntiSpam-MessageData: ZwxKDO/Rp5PP5MaHF4Ja3jsV/AO3uQcTKNpQjV6uw7eV2nMikuJ7ZVGkCJfayUjtOPjsSBsqgbmf8+l99SPzWzsitWwZzPsLkvHZs1tJuaehGdM/AbYfKmzw5k6WAOHE3Ss37VJAvZgOBcQbKc85KQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9b14afcc-b103-41fc-8b15-08d91c396716 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 May 2021 09:18:32.0189 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT030.eop-eur04.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: DB3EUR04HT103 Subject: [FFmpeg-devel] [PATCH 27/39] avcodec/omx: Remove remnants of old preallocated 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: S6K994s3RKxI There are no preallocated buffer packets any more; this feature only worked with the old encode API and only until said API was turned into a wrapper for the new API in 93016f5d1d280f9cb7856883af287fa66affc04c. So remove its remnants. Signed-off-by: Andreas Rheinhardt --- libavcodec/omx.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/libavcodec/omx.c b/libavcodec/omx.c index 3a113723d3..1e48579d4b 100644 --- a/libavcodec/omx.c +++ b/libavcodec/omx.c @@ -863,9 +863,6 @@ static int omx_encode_frame(AVCodecContext *avctx, AVPacket *pkt, avctx->extradata_size += buffer->nFilledLen; memset(avctx->extradata + avctx->extradata_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); } else { - if (!(buffer->nFlags & OMX_BUFFERFLAG_ENDOFFRAME) || !pkt->data) { - // If the output packet isn't preallocated, just concatenate everything in our - // own buffer int newsize = s->output_buf_size + buffer->nFilledLen + AV_INPUT_BUFFER_PADDING_SIZE; if ((ret = av_reallocp(&s->output_buf, newsize)) < 0) { s->output_buf_size = 0; @@ -885,18 +882,6 @@ static int omx_encode_frame(AVCodecContext *avctx, AVPacket *pkt, #if CONFIG_OMX_RPI had_partial = 1; #endif - } else { - // End of frame, and the caller provided a preallocated frame - if ((ret = ff_alloc_packet2(avctx, pkt, s->output_buf_size + buffer->nFilledLen, 0)) < 0) { - av_log(avctx, AV_LOG_ERROR, "Error getting output packet of size %d.\n", - (int)(s->output_buf_size + buffer->nFilledLen)); - goto end; - } - memcpy(pkt->data, s->output_buf, s->output_buf_size); - memcpy(pkt->data + s->output_buf_size, buffer->pBuffer + buffer->nOffset, buffer->nFilledLen); - av_freep(&s->output_buf); - s->output_buf_size = 0; - } if (buffer->nFlags & OMX_BUFFERFLAG_ENDOFFRAME) { pkt->pts = av_rescale_q(from_omx_ticks(buffer->nTimeStamp), AV_TIME_BASE_Q, avctx->time_base); // We don't currently enable B-frames for the encoders, so set