From patchwork Mon Nov 28 17:43:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Basel Sayeh X-Patchwork-Id: 39528 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp7832287pzb; Mon, 28 Nov 2022 09:59:07 -0800 (PST) X-Google-Smtp-Source: AA0mqf5jY/oROtm+3TBW9U0eu1uA1V4BPNJPyK9qY8HteQTO5bskvNQ3cgaAg8H7ZtyIxtkJDljn X-Received: by 2002:a05:6402:54:b0:46a:c420:6da7 with SMTP id f20-20020a056402005400b0046ac4206da7mr15335642edu.202.1669658346851; Mon, 28 Nov 2022 09:59:06 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t13-20020a170906178d00b007adf3ed5d20si7401895eje.376.2022.11.28.09.59.06; Mon, 28 Nov 2022 09:59:06 -0800 (PST) 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=@hotmail.com header.s=selector1 header.b=BG+s1OzT; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 75CB168A708; Mon, 28 Nov 2022 19:59:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2070.outbound.protection.outlook.com [40.92.59.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7A22268A708 for ; Mon, 28 Nov 2022 19:58:56 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dTUwmUFeMrx0j30aRZh43nVq1UCoDLs9BkxuV1cC2D17ulbF7RsxvHyYAs4kXa8PV5yeewy9Vk9lf0LpF80Y8tfNRRtILnexvkQ3L51i0UkDENkt5OYrkXyXtgNmAeyXHxcAo3gDXj/avqCnE6+jj3CbjHD941lewMdcnIMErcF2FO2+Q2z0jGFU3XvXfefgPwNsYQiwz5+/Ai7VjTXXdueItnnqOk3T65wQbaHgf5puUvn/zC0N6xRe3NAPvqAM1Vzf6UISPkC2y9jiuificIuavJWB7cofWaFGVLQhaO8C1EF8ZYeUNgqxgeH8xRuC+jKNMj7gA6cRYczxXQ6gew== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mFZwsBZKp5tNALhpgMz2neL0Ab9AgRKExajkh+uLU0M=; b=Wq+z8wYYfBnRD13H0/umus747pDLKzVP8OX6rRsKl2ONov+EJLqepypDm+5Hp/A7WG0zgv4mJVWQwsnFmWyFjrbhINjINue13iOMQDZ6y/xgc/V2iLnoGcKFUiZ8kDdRx3u+uZ+YVfYWIfa0L/sYe1Q2XnXX/hkqsQe97xJoIAaGKHr7/XnUbn3QeLUmpjRT+vK9716UiGgXFtfbtwkBkJQOaiZVIjmbGHYVAVR/2jdWS7U1yO54a6LlC95suHXyGw+NpUfYRcXxFgPbCq2by12JIzVai1U/PIFiBf1MmOien4i7N79ew8JDdXzqauwsdHY7S+n0uv4d/ITeUkLSbw== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mFZwsBZKp5tNALhpgMz2neL0Ab9AgRKExajkh+uLU0M=; b=BG+s1OzTGuNbAJx80xa05ui9a4rx+VLqFIDnQ+489zi/T53JFW5YfBM6FOSP+kztIxJA24thtYVm3KzFHQJy042iPxkgYf+yeLuNe5poDo9trqPpJq6pJ1Pf3ttz45y94Ypx/JJW+JPssGyqqOEJTx9IQzRTqMW1qhicriDFyzinkG+3kz0lDexM3KzLQMOvMIL/EwV3qcSWXoj1C2yx6sA8Q/pwgLzhwyTJ3QjHEH22jj5XMUkbA/N+SJS3/DPCzvWCAkyd+4YI92UtjQGnnF/xXhnxMKO7rx/fDao6WIQbQBrUBJ+wJK5NnTbMmYgHHrAOeoEXaWCHte/FxIXepg== Received: from DB9P191MB1482.EURP191.PROD.OUTLOOK.COM (2603:10a6:10:224::19) by PRAP191MB2067.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:29e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.23; Mon, 28 Nov 2022 17:44:05 +0000 Received: from DB9P191MB1482.EURP191.PROD.OUTLOOK.COM ([fe80::5e68:48d2:6fc6:5443]) by DB9P191MB1482.EURP191.PROD.OUTLOOK.COM ([fe80::5e68:48d2:6fc6:5443%7]) with mapi id 15.20.5857.023; Mon, 28 Nov 2022 17:44:05 +0000 Message-ID: Date: Mon, 28 Nov 2022 20:43:59 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 From: Basel Sayeh To: ffmpeg-devel@ffmpeg.org Content-Language: en-US X-TMN: [B8gtz4Vuga7bIyhvUQxU77lI7SMppjglDu6T4Vej2ByLUa5qzZrkMg7u+cSDTOzE] X-ClientProxiedBy: DX2P273CA0008.AREP273.PROD.OUTLOOK.COM (2603:1086:300:8::20) To DB9P191MB1482.EURP191.PROD.OUTLOOK.COM (2603:10a6:10:224::19) X-Microsoft-Original-Message-ID: <9a7fb888-d28b-b587-498e-9f80070814ad@hotmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P191MB1482:EE_|PRAP191MB2067:EE_ X-MS-Office365-Filtering-Correlation-Id: afcf76e5-1815-4734-5312-08dad16824ad X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oD0aX6NFutNBFCkRGNufurgNkMi5RkQsYdToS9MfWNdaU/AC5GsbVEr8tRDNgprONQLVxN+1WUp0+vMTQjj+7AOirjr1A4x9Dx6asLoZgdoLL4q83muuFTeEEVhxfBe3LaievgzSx9JtIY/BLF9dXsz2mbS3XUGWQ0k+mtQBADdVoxHI/V71Fy39DwIMxKPg25rMH/xEDfbwo9U2Xjaj3dcofVPUAQkZymIsYdjBWr7Dmsz4rxppNbJ5avoyT+p6UtxHPfq4JOWEHi6qT7HqSn6c88Yt09Q8lf3w1+HdDF7s+pzArfKn1Sne5ZQf0xKEM9t/rbHyFRoLWPz+7jmMAhxqsM2Uh+A2d5r+eJlfi4GQJwgm9lSWf/GsUNDtZkg8sUhg4m41hW+UtNrj3OoTadGRgdcOvebQvlwk4Qxngn5BHTW/bluGXxs8fOEECUr7hhVhlpGYp3E/O865Y83K2f60r+6EChSj4T/luPU1KnrK6BzQV4dGlVI2LkrGEr1rkaRaXmAxgPS7MrwbsiMHLJ2dXZ9C0Cg8BouW6oImg3Ik90Ki4/6Li+06O4McP5utT/SvN3pha142DGHWKik24mg9mAnF14es/ub2F9lGEL4= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Y7Og/5gOIhNt3RTBleE4Eob5OJbg?= =?utf-8?q?K6tV0Je9gZps8U4w6Bi8fDjh2x0GO8o+0GHQRTkwpETRSllZtIkgTJg6U0JpBYgt3?= =?utf-8?q?I73gr4uPu8wSLentIDZamE9xLYF8QlfaQsRaFF7nEydOpKedlhY50Q8kye9vdSEv6?= =?utf-8?q?/Mm+sdEkkbxntbzNLvsDTU8YBa58pewgkUohV2JRYetMgzN8GixdPFPaUxIvggSCo?= =?utf-8?q?IUV7L/SPVCujEbPlQgU1/jfkn3ztwBQ8H4o2whKAniRV9XTUrz1Zax1PFge7bttnZ?= =?utf-8?q?PAYo1Q5+cvQ3kZVdvZlMNrs9xf9Ls8qgUxzpPoWsfi42hyu1gYERL4siWx/9EN8Zl?= =?utf-8?q?A7LiRGRN5ivxGglzhHRfiQmY1rrOwmwwKt9GEQmtKNPaQV11yXuOxJUQlcqKvqwZS?= =?utf-8?q?07hzIcK6viMkYBml+1ON3eZrhnwkBc0pjRaxt7tC/wIJB8dqjJieZLmK0tTExlEZg?= =?utf-8?q?FjP+XqZnAYpR6Rjy73UeD0W/Z18BguIwzAil1r1oA/Cv+qe7VYmQJVMqw0Cc3B8fz?= =?utf-8?q?C60hl0k4Lp3FlbZx9+KNtY6W9pXKA4Lpq3+QrXxbLXaWg9Whk5u+dVbeVhzPMeUYx?= =?utf-8?q?mzKKdVMU+Dk0yQUU0wHjODOl29AujbfD22KgZrVTfA89KTQxD5Ye1sKWbrK3E+s6D?= =?utf-8?q?fUf8RJvC0pJbsUothLRgOZdWfXg8t/RukIAgwalhqU9a8B4yjY9SIhby3yexNSXMz?= =?utf-8?q?NHBh00XkZBDDxv6mVFGAFObgCpeTIyhLbE4fOyQ2KL8VLczEYp1a+KtUyV2VNpnF+?= =?utf-8?q?1moRI6SSzpc1WCExDQbxVt/WM1zs7ftJobbZALT6Ea74fwv9mjx+nSKttAo7oqvRW?= =?utf-8?q?ZGH5UGI//az5+Uoqe864BZTgQlOgOSkum+yDSFR45sXXcG405gOrew8ap5cGjGd0C?= =?utf-8?q?wEi3Ox3UQvceS0qMXh+tud+Dy3YaE4hwEiMr1JFDjBBR58RxRs8oelGm3xnjlGF0S?= =?utf-8?q?s19ut/sBm0Wgqy3f/Amj1UUw6fLJ5Yp2Grc8oDL5/TrbZjZjIsnHpRzOt2ALCs8/r?= =?utf-8?q?zHhTvSi7iGwO4h4jr46Z6BX3mxI1zV5KaEjgq4lhCe5ZLZ+jBGYTfRJJeH4jwHoWa?= =?utf-8?q?jAWCtvQl0U/wCn9jHPNZWqh99IoYYujrvlL6FxGmXmlMsb7OI8OSlQwMBATA1r6pe?= =?utf-8?q?N0LSboYLKlQUA15pDFvdXh+LW7nFVgnZ7VJuiB3/YbBy+ZNC+Z4ulSfs1uMPgSi+u?= =?utf-8?q?StSX6xMQqNlF7BdZcvak9jl8ZV39ehFBJOa6tDMlQkppTvC8YikNOWR35jPKERazK?= =?utf-8?q?4aN1x9NjD2uEzkmI42k8b1hNfLRWxf9wefPz7g=3D=3D?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-50200.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: afcf76e5-1815-4734-5312-08dad16824ad X-MS-Exchange-CrossTenant-AuthSource: DB9P191MB1482.EURP191.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2022 17:44:05.3344 (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: PRAP191MB2067 Subject: [FFmpeg-devel] [PATCH 1/2] libavformat/hlsenc: Enable HTTP persistent connections for hls_delete_file 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: raGanmpqn49A Signed-off-by: Basel Sayeh --- libavformat/hlsenc.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) path, strerror(errno)); @@ -662,7 +668,7 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls, } proto = avio_find_protocol_name(s->url); - if (ret = hls_delete_file(hls, vs->avf, path.str, proto)) + if (ret = hls_delete_file(hls, s, path.str, proto)) goto fail; if ((segment->sub_filename[0] != '\0')) { @@ -679,7 +685,7 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls, goto fail; } - if (ret = hls_delete_file(hls, vs->vtt_avf, path.str, proto)) + if (ret = hls_delete_file(hls, s, path.str, proto)) goto fail; } av_bprint_clear(&path); @@ -2707,6 +2713,7 @@ static void hls_deinit(AVFormatContext *s) ff_format_io_close(s, &hls->m3u8_out); ff_format_io_close(s, &hls->sub_m3u8_out); + ff_format_io_close(s, &hls->http_delete); av_freep(&hls->key_basename); av_freep(&hls->var_streams); av_freep(&hls->cc_streams); diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index a86fc8907f..e4749aad87 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -252,6 +252,7 @@ typedef struct HLSContext { int http_persistent; AVIOContext *m3u8_out; AVIOContext *sub_m3u8_out; + AVIOContext *http_delete; int64_t timeout; int ignore_io_errors; char *headers; @@ -569,15 +570,20 @@ static int hls_delete_file(HLSContext *hls, AVFormatContext *avf, { if (hls->method || (proto && !av_strcasecmp(proto, "http"))) { AVDictionary *opt = NULL; - AVIOContext *out = NULL; int ret; + set_http_options(avf, &opt, hls); av_dict_set(&opt, "method", "DELETE", 0); - ret = avf->io_open(avf, &out, path, AVIO_FLAG_WRITE, &opt); + ret = hlsenc_io_open(avf, &hls->http_delete, path, &opt); av_dict_free(&opt); if (ret < 0) return hls->ignore_io_errors ? 1 : ret; - ff_format_io_close(avf, &out); + + //Nothing to write + avio_flush(hls->http_delete); + hlsenc_io_close(avf, &hls->http_delete, path); + if (!hls->http_persistent) + ff_format_io_close(avf, &hls->http_delete); } else if (unlink(path) < 0) { av_log(hls, AV_LOG_ERROR, "failed to delete old segment %s: %s\n",