From patchwork Thu Aug 5 05:42:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29264 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp96974ioh; Wed, 4 Aug 2021 22:43:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz3u97sI3CJk9YIdpdsbiNqfR7oVRyowm9iifgzW+lNnq6noWW0pzv2yMuGD6VMakDvvHJ1 X-Received: by 2002:a17:907:3e1b:: with SMTP id hp27mr3144699ejc.116.1628142218359; Wed, 04 Aug 2021 22:43:38 -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 s18si5337038ejh.110.2021.08.04.22.43.15; Wed, 04 Aug 2021 22:43:38 -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=MXfAlfQY; 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 277CA68A212; Thu, 5 Aug 2021 08:43:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074083.outbound.protection.outlook.com [40.92.74.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B976B689D84 for ; Thu, 5 Aug 2021 08:43:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HPrLVcuPFWw6Ri7pkRbQeW7U/CPYSskkgcNfkuwM9/r5Y9rdYWsVn9oNYZuTKeg4u8IHWsEGBVh2xVoC+CSsPSgtVVSoueGHrrsI40VGHRgK0l4KxrNYhYy+/1bIuCzGU9Bi2qhHkCMg5kZtdbmN9rhGfNT0MKjUgfa9TmVUby76+E5mUU3UF6djLqh8PHK9vn5vg5+GlCpsLB6j+IjNlvpJsqN7qoSRmaRfOjd+BnwJdga6JAXNnrI4WZ4dk4EIIBFDORfN9hU7efAMBzuSfsvNn3ID7lA4zgaiu0/RlJulstTyHxEYDzYojneBIFIejmWL8HL5CWoU/0amjbFOeA== 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=GKVlaFw/SukbgHNapOQ6qp51NjIz9Kk2sWdz9dz1+4E=; b=D1q4ppqGkPtpuPrz0p791Hi0cBjNxxTSHADvHnefnzRWjfhY0ttaVewfmGVSX3c9u1yrEDlso46izftB0mY9jI1WywjTUeIggioryfr8rXOIFH11Bih9YWm6L0BiLz0Udvb2Pt7ydpYurSfDAxqkfwsp1+QawRhdJTGQCGHCLSMx9Q2EA75wCDHXX337wDmynsLK8ysgp+hP/0P/srsYsfPmx1figgR4RCWbu70mLLA9toxmzMwfjr9e/PMaqFO/OkfXFn2nsIIAZd1cLrYgzNhcRwy8XxFj31cClPrqahRn6eLaPT6xWifT8K82nFimSbKbdxJjZAQ3C7+7YEUZ4A== 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=GKVlaFw/SukbgHNapOQ6qp51NjIz9Kk2sWdz9dz1+4E=; b=MXfAlfQYDXOLIf+eTI2OjrGaze1p9uPDj+hxHJVubUi6m98IYgkAblMqMAVAjd5STaE9I5+17yU8O31e9ZRfIhHSgoa22yicopnNecSCARvhGuVcVfbdLB/t9bwtII1AAXIbxfk1da83cLu6QaKmFHy+EWzkNCQhOlX1AnYmxjYgGHs3wHFQHXMY5mZ5FAWmfT6niv8t1M5z65lsiWbgYxi+P5LWI4HA+J0VoawwYKsMbZuUVzqF3B7yTlYoxQ82pZkl7lc/GwGfqZygJe+o/k1sodJZxp0euTVwkElfz37bJNOGrwOuFuLB4TKUU9KnHxknXHGAHY1yPuc4Ohq+yQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6888.eurprd03.prod.outlook.com (2603:10a6:20b:294::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18; Thu, 5 Aug 2021 05:43:02 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d%8]) with mapi id 15.20.4373.026; Thu, 5 Aug 2021 05:43:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Aug 2021 07:42:38 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [WUpQSi2WON6kWVMiR0AA66Thlc7w+DLe] X-ClientProxiedBy: AM0PR01CA0164.eurprd01.prod.exchangelabs.com (2603:10a6:208:aa::33) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210805054244.2094251-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.94.230) by AM0PR01CA0164.eurprd01.prod.exchangelabs.com (2603:10a6:208:aa::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.16 via Frontend Transport; Thu, 5 Aug 2021 05:43:02 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e781218d-f480-48b5-acd4-08d957d3e40b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTzvpWxvWYRCiBlmWjUmirgHa8co4T1+1z/TSITuJeCkE+uJQ86iSWweedFxlJZGglA6YoY9JskdEUf0C9t3D0ICOl/JSb4uyo/qGiumGzQ1Tb4/SMRj4wiZBdLd8n/gvBfhZN1mYi8YGnMdH5+UF5n3NZ2qoIuOxdXRFbkSekezKmMtC1Y/RPCXeZhWWjucQkZg313geMnIzLWGxt9k1V04CeBBJt2yrSscd0eY2fwQsfCeiXugU+Y2vm0qVxf3PfDel1OMm1A38IXSCsRR+pD3IAqaWQrACERT0QdeooTbztCPR7DGYFD2xEtkZ2IIMl2AAw8mcywgHBj00HRZu0zdTAy6W+HxL+aPyrNaKLHf+lFnLe0hwHYG/EkMEa4+deZmzksrkOmnCRViuTSk32GIzLKB63/535Scvj7U1cKB3NRSSIxY2p/98xBHDDv9NIk+N9XTUaK7V0FRJgbcP9eNx1TNq25YvZHZ6qVHvbMrNk4exs+CY0dktxVhJHdgpen/ro6oPVYJyYjSd10grByDjCA8lbPHVKtTvJl3/V8yNJ+lwaCgR1nwnqjj5J4YCReefJ3U/chXp879V4Lz96KqOLpyQIRuacnsRYmhglrhqps0wNdjV8zAYzJvVPue5qR8X2bPhD2ZzNP6WexzqLl8CJ6Fxmd1fWlXmJt6JUOeTolucjUgkwcsOYbu0LRufoUf2k1kYTUknFMCKg3IP/tB+lvC4BBm8CnpP58CUVUToXGmJGxatdyOqBje5nAN6o= X-MS-TrafficTypeDiagnostic: AS8PR03MB6888: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MU0iwghPbVrzv/1MOOrdQj0LaKKZqIYX7n4OMHt9cXuYH8TeYWDN7TYugOVO4wilcfXNT0/7ZRwKxLsg6nKQ/seEMxEDYu1WIq5Z9Ad9fs+HrhAFQbLzN0BuAcGVwWYl6a7kpReXoBIAiMEV8pE4tFF865V0xEr52pUyI0kX4VIwksd7rJGrSSWn/fLEqrQx8EM7tnClpRDOftiivXuYmN3SqBeJw2odYkJn5u6fp9pajNW1s5jPkKcqYsVuGYJRWrU+pJhJ0ReCSp0NU3D96FfUDT3GFeCiaHVcgDZnVLkG5gxORfR4DvEASqKSRBtETXo/tEhGXH7fVx1Q96E8sRl0CLdNrO0MeE0NC5Or5BJf9UYSDk9kQzjigbVK85rWRbf6j0jCogslNm6c5Ayoze6lazjT9hJwWZop6JjCdsaUmkFclfUNMt77fxnJ//iz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QaFjw3hcxe9aJRhpK/aSTWIlsW9rRWzxB5WHJiVcDhrEbF7T86WO/h6C4nXYiW6prarR0wuHgkjkOa29lGTAeNCK+ujpQctEpasKPFPyNqMJAN4sJWVA4EdsZV+JoCnLAKCrTzTYZJzcORPp0gBP8A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e781218d-f480-48b5-acd4-08d957d3e40b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2021 05:43:02.7233 (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: AS8PR03MB6888 Subject: [FFmpeg-devel] [PATCH 3/9] avformat/utils: Move ffio_limit() to aviobuf 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: uY+kW/fM2Zvh It is the more natural place for it given that it only deals with I/O; in fact, the function already has the ffio prefix and its declaration already is in avio_internal.h. Signed-off-by: Andreas Rheinhardt --- libavformat/aviobuf.c | 25 +++++++++++++++++++++++++ libavformat/utils.c | 25 ------------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 164b07ae6a..9322ed38bc 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -1015,6 +1015,31 @@ int ffio_ensure_seekback(AVIOContext *s, int64_t buf_size) return 0; } +int ffio_limit(AVIOContext *s, int size) +{ + if (s->maxsize>= 0) { + int64_t pos = avio_tell(s); + int64_t remaining = s->maxsize - pos; + if (remaining < size) { + int64_t newsize = avio_size(s); + if (!s->maxsize || s->maxsizemaxsize = newsize - !newsize; + if (pos > s->maxsize && s->maxsize >= 0) + s->maxsize = AVERROR(EIO); + if (s->maxsize >= 0) + remaining = s->maxsize - pos; + } + + if (s->maxsize >= 0 && remaining < size && size > 1) { + av_log(NULL, remaining ? AV_LOG_ERROR : AV_LOG_DEBUG, + "Truncating packet of size %d to %"PRId64"\n", + size, remaining + !remaining); + size = remaining + !remaining; + } + } + return size; +} + int ffio_set_buf_size(AVIOContext *s, int buf_size) { uint8_t *buffer; diff --git a/libavformat/utils.c b/libavformat/utils.c index 60d7364018..8d1b76f590 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -213,31 +213,6 @@ static const AVCodec *find_probe_decoder(AVFormatContext *s, const AVStream *st, /* an arbitrarily chosen "sane" max packet size -- 50M */ #define SANE_CHUNK_SIZE (50000000) -int ffio_limit(AVIOContext *s, int size) -{ - if (s->maxsize>= 0) { - int64_t pos = avio_tell(s); - int64_t remaining= s->maxsize - pos; - if (remaining < size) { - int64_t newsize = avio_size(s); - if (!s->maxsize || s->maxsizemaxsize = newsize - !newsize; - if (pos > s->maxsize && s->maxsize >= 0) - s->maxsize = AVERROR(EIO); - if (s->maxsize >= 0) - remaining = s->maxsize - pos; - } - - if (s->maxsize >= 0 && remaining < size && size > 1) { - av_log(NULL, remaining ? AV_LOG_ERROR : AV_LOG_DEBUG, - "Truncating packet of size %d to %"PRId64"\n", - size, remaining + !remaining); - size = remaining + !remaining; - } - } - return size; -} - /* Read the data in sane-sized chunks and append to pkt. * Return the number of bytes read or an error. */ static int append_packet_chunked(AVIOContext *s, AVPacket *pkt, int size)