From patchwork Thu Aug 5 05:42:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29260 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp97077ioh; Wed, 4 Aug 2021 22:43:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxU+A7MIVTN85zURtpvjEF3yCsBFlKTeMARrGBDRXjz5XbLGNDrMsHWJjflyyw+KobOetoP X-Received: by 2002:a05:6402:31a4:: with SMTP id dj4mr4260234edb.350.1628142230238; Wed, 04 Aug 2021 22:43:50 -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 y4si5154859ede.590.2021.08.04.22.43.27; Wed, 04 Aug 2021 22:43:50 -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=Wq2yPN18; 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 2A31C68A2BD; Thu, 5 Aug 2021 08:43:16 +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-oln040092074080.outbound.protection.outlook.com [40.92.74.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F90C68A199 for ; Thu, 5 Aug 2021 08:43:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JZYjTMSJYAqqYxMm8EOKM2TLplmScMgB/WNdX1s5wlBqB4yPPmBEGB4Pk4lW4Zn0pHsCwZpLDjsTuKXpn0LceNvtw6dz1QaueZZLflrsoDvxxVHoEzrK1ps8/I98Hs/gf6uhMfpsicDkOoEY0j+CWdkYdhLAsVDrtNcq+m4+XN16gThYh+IoxiY3/i80UwbwydFsW//qRSAvHwLGCLoN+KBVepYOJJZbs8vcGnGlGFCbSHCbyCG6Siw4xBjZ11oV3KTiZPCCCQ3fOef8TByhpA3KfCFyueBlTsoXA1JabID8lITX56Mt9HN2GF3Nv2nLsk271tCXFNCHwQP833Rpbg== 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=lD7V4FIq0d8M79E5KYDfMTyg9ZqIeJnxgOXy7gdm1X8=; b=TjAyvPcO0l2EKDzT15DISsS2Pa2rX7PHPtZIPEnEU1jf6Xaq352wK/Y3oJKDMptEuLVzGbuOdkF/reOrBs/DEULY/oza3BaW1q8vPIip55Pa1Mnk3MtI1YN4xEW3BTAMCkklYQI8SF7JVnxrFGE7E1OgG5Edb31Tw7MMIPFZhOJnFXfxYKpbbD3Gg3ypUH6AkHRmguoePiqk27miqN+AKh11NZJOLdP1UAMMUqCpmuKw73GPdJb1Jz08xkdm/LlKIhASbFaRIblm5sd4qLSugp3uwB/4mqQ3YYu+zniSY8JyjDPLrwnAlbDJDn74JP++BvnC5EQSpKU4UnVLDpLUog== 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=lD7V4FIq0d8M79E5KYDfMTyg9ZqIeJnxgOXy7gdm1X8=; b=Wq2yPN18SNxUJBISEXmfonwBXNqwgdIzbbBk9J69stXW4n/cgPwb8eQPqK4qgAn2ZCG66AtXfOiHwZuakNIuDkVkpoJVVSgkJgKhs/ve+WVlexQu7LTzrjsYb1/KKNiqbAz0PmsWt4UoOMZOOQvJKZclq2uChhFTo/Y3cAc2dT72lxxmI24LCy0PrrnC+FRAmiM8hWpmzwm8YtHAMrPhMqY8l6crTy6+2RlHkvBvOh9pNm7naizj1UULsT62x2DJamMsnk6fi7e7VF/UTYjs9N6+JCuqZ0P/LW8Kom6WHIeccdfDAxyDTobqfiT+cPb4dU667UGf0L9MuVH/ZOHQew== 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:12 +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:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Aug 2021 07:42:39 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [PQD8Ih+wIjHCeqDw6RLIOV+VMHnPKt06] 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-3-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:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8d8723f2-ab3d-4efd-5943-08d957d3e9ea X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNW/g7RXT9bbJ0eAVVYsx4fIQcSVqciVGbe1nQCwUu4mgzeySSkWnjdNyEdU85rG37t3jDHd+NHlKcJ6Hx/Jt10KfKc/jA0o5kwws32ZbqbIZDgCKYrNL4XwDbgiG47xbSNiUjwB4CD/hnX19eg7ocPQeOgN/qz2sy810SFD5tarP2c2+haPyh8IBFSDYuLNaMpVHYxjssZVDrXdVLH4hr5JbVENHLLNtJloEGXMvFH/pmF6ejHm+Wr18XZdmAUGyULQM1SmLt4c06sNlBcVanfLva8VvSagm3Y3wZQJF/uaL2NMMgaTCJ7Wv3x7Gf6UDP9Pgc5h7ds2UAYMYDt5VNoHNwqG9KuhFb+N2DuQ2oJe+Ozb9oldul4M5I0zZVwiyFK/hwXk92mMODAbT1cP5ZejdbldhrbadyoX4CBfUnNKAyHXtqS1vX+1F3Ls/1yr4s+mos9jw/gbftHXEHOSoi/Fds3dMGKFkW5s7/aNCF18dybpEA355/8ygd3dZXuVdO/b1U9zrXQtOyAQNCJdu6iWDB32gzzWiv2Ff2Xw0fCV17lqlQYQDQQ17eGPWNmRH2h09PI/Yihw3BBE9uMOJmK7v3lmJ5TQDNuFrle47lOHSQK+k1jKXPqfcvMsGW6WQSMO6/Cy4av92DCV60JME/WgLXeuY3ZSujnwyLqdQhu6AhGKTUcyObc3f4KFEgFFzbnMLXT2Qe5cq1U5NAyVHj+gMvtcokqGzEo= X-MS-TrafficTypeDiagnostic: AS8PR03MB6888: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2sNa6TD0bymPIRKMdtEddHyQROm/zEdbqrRcLAYXzpH6q9Xs6cSUCcsQxjiFBFiyA7Lw83mHAaKRUsjVsKGM1sH0IWD8s+1gFFrwsiUBGccTycijo99C2o2zK6XP+dQIujdq5ushRqHH6zb4i/Mhs7VMsQj5nskSiXAzIJhf0j3Y96kDoYixYkNPF90QmyEVnFHZysg+rZZW2I9aimZG4N/6ZtDUMkpt/2nGT7C8Yie0oy7Ds52p1qEqmwyECwCeNTo2v8viH+7PsVZWsCeNf9f29dG1dkMv6brL0pj3lDSMHuLaIpswvm+TVOsHXPX05KN2XUGcpCqD6CmnkTu4xY9fWgViGdiOOluYEnjPOH6ZFC1v8fFKQ/vknxP/y3kVjoykvnBTlALtffXT/zqsfpv3M+VGufXiTL1rMAJmjpkIZALQ3sKb2Znay3RfA6Pc X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CcbPwSYRZIRkblMrO176hyEVqkXe/uArPRXrcxlL8ExaTMljnurfWQQqBcQleq/IEC0YL60AG8fuSjYw7l/Av+xok1oTIGYci/Yc6KeyDosai9BclX3lIaL7st2oZ3UCvgMU5dfgynWHh881vZ0Z7g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d8723f2-ab3d-4efd-5943-08d957d3e9ea 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:12.5932 (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 4/9] avformat/aviobuf: Make ffio_set_buf_size() static 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: aIZkqwrMNN2F Possible since 9c3adb7ce23522dcceb264bc0bffd3592dd3e1a5. Signed-off-by: Andreas Rheinhardt --- It seems that despite the warning this function is called after having performed I/O; and that this is intended. Btw: Shall I move the functions around to avoid the forward declarations? libavformat/avio_internal.h | 3 --- libavformat/aviobuf.c | 8 +++++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index 2c6d00b5ff..de95b43bdb 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -83,9 +83,6 @@ uint64_t ffio_read_varlen(AVIOContext *bc); */ int ffio_read_size(AVIOContext *s, unsigned char *buf, int size); -/** @warning must be called before any I/O */ -int ffio_set_buf_size(AVIOContext *s, int buf_size); - /** * Reallocate a given buffer for AVIOContext. * diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 9322ed38bc..1f0819b328 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -74,6 +74,8 @@ const AVClass ff_avio_class = { static void fill_buffer(AVIOContext *s); static int url_resetbuf(AVIOContext *s, int flags); +/** @warning must be called before any I/O */ +static int set_buf_size(AVIOContext *s, int buf_size); int ffio_init_context(AVIOContext *s, unsigned char *buffer, @@ -543,7 +545,7 @@ static void fill_buffer(AVIOContext *s) /* make buffer smaller in case it ended up large after probing */ if (s->read_packet && s->orig_buffer_size && s->buffer_size > s->orig_buffer_size && len >= s->orig_buffer_size) { if (dst == s->buffer && s->buf_ptr != dst) { - int ret = ffio_set_buf_size(s, s->orig_buffer_size); + int ret = set_buf_size(s, s->orig_buffer_size); if (ret < 0) av_log(s, AV_LOG_WARNING, "Failed to decrease buffer size\n"); @@ -1040,7 +1042,7 @@ int ffio_limit(AVIOContext *s, int size) return size; } -int ffio_set_buf_size(AVIOContext *s, int buf_size) +static int set_buf_size(AVIOContext *s, int buf_size) { uint8_t *buffer; buffer = av_malloc(buf_size); @@ -1062,7 +1064,7 @@ int ffio_realloc_buf(AVIOContext *s, int buf_size) int data_size; if (!s->buffer_size) - return ffio_set_buf_size(s, buf_size); + return set_buf_size(s, buf_size); if (buf_size <= s->buffer_size) return 0;