From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 4EB8C450D7 for ; Sat, 7 Jan 2023 00:22:20 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E056E68BD16; Sat, 7 Jan 2023 02:22:16 +0200 (EET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2067.outbound.protection.outlook.com [40.92.74.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD91F68B964 for ; Sat, 7 Jan 2023 02:22:10 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qt02YXhErCtmGfW7313jQGMrqHuviUwwuR76DrS2qfIIaWdMjc4OD1oKVbYIGy9moe+s49h3WGfk9ZrfoYZwb0GeHP8xejOPkAw0uwexrKyrQaORpYjS5CP2Qgt8mqeygYrxSqglaVYX+Sdp2nud7F3rBjwgSHxK0gfAjPOvX1jLsIi0JIAcpEDtZp85Iy1Wde/oQKTWtN/3DjvexbZ3MGnzFOhPDko+/epv7G6TR9Mrzcptx3HWZZRpYFL1BmBjFEJr2+I/fahIKHst+3EUlDf0r5qN114e0CCg8fbarZfR4520haW26p7S+jJQm0c/wRZAxglWQASoSdItW8ttvg== 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=SF2ogRNULsz6DTtOXaduFk+FkVhKHXT8G99oapNu1dk=; b=nGjz+TXTxo4ZweEW21MQS9G/ECynZzFPAgodDZSSwqp6GMIxPNTR1MvmmUXMzqOZIFORx8T1WWklv5Pg55BuSYga48SwVZtgWIafik0Jd0R90IMguK1YlIJ9sv5fhSCAqlyrGHX+h9xFw357g9LXlUmAEL8LQ+FdiUCLpc7ofTt22g0PNsKJqI1oM2aXwA5tOYaGJLcY5FAoBt7oe9t0RDzDzETx+8NKYMmE4bzhAG8BykyRT5yzJES33UZ3X7Bvna5GYPMGbZrhGqAr1Tg3SnSJb5Mg8RYRCNOSVPhOSFq5Lp7RFhgdAziUYkeRg3RouQ2bJGVR7BaA6XlgQ/h5pQ== 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=SF2ogRNULsz6DTtOXaduFk+FkVhKHXT8G99oapNu1dk=; b=Meg3Y3OZvjOalhIlpepphq4xUM5Iej/sAeyRv+ko/8nbgFrobUySFzqMe7ZhKFXGu+Hu/6AHpwmbev7lhx7AMiMbAcrRggvnoaM3vS2ZoCAV7DJAdRm8wewjJKHChP6CjRpwG7G/f6HJoEpZAWAKLWS3ZcC27QfZBzf5twr2wualwc8NIlAFEhPUfQil3M99vx5Y/kcuwXXoYck+YX449B69PAxKvJlGdpZhkL0s4Oc71udmO4IuNzf126YbjVQOSquZ+fg4Gyp81dhI8mRseyr5/ZLoaOCate4lt65eBVNGey9AdvQyTNPb0alYK5HMKnWmPN1lfP1XD1pnxx4TDA== Received: from DB9P191MB1482.EURP191.PROD.OUTLOOK.COM (2603:10a6:10:224::19) by GV2P191MB2233.EURP191.PROD.OUTLOOK.COM (2603:10a6:150:aa::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.19; Sat, 7 Jan 2023 00:22:08 +0000 Received: from DB9P191MB1482.EURP191.PROD.OUTLOOK.COM ([fe80::bada:6a73:3b1:7977]) by DB9P191MB1482.EURP191.PROD.OUTLOOK.COM ([fe80::bada:6a73:3b1:7977%4]) with mapi id 15.20.5944.019; Sat, 7 Jan 2023 00:22:01 +0000 From: Basel Sayeh To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Jan 2023 03:15:40 +0300 Message-ID: X-Mailer: git-send-email 2.30.2 X-Unsent: 1 X-TMN: [xuYVboZASx9+Q5KydeBfzUsQBhl9+ezNrix0PTG9z/QLzsrzNBUCfmd5/5YMAPVwH/7+q/jZBvs=] X-ClientProxiedBy: DX2P273CA0009.AREP273.PROD.OUTLOOK.COM (2603:1086:300:8::21) To DB9P191MB1482.EURP191.PROD.OUTLOOK.COM (2603:10a6:10:224::19) X-Microsoft-Original-Message-ID: <20230107001539.25829-1-basel.sayeh@hotmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P191MB1482:EE_|GV2P191MB2233:EE_ X-MS-Office365-Filtering-Correlation-Id: 440b3a86-43fd-41f8-f708-08daf0453267 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmprmgsd3neaXpaZe98ScsfU62Vat6PtUtAsepz+VvAznS4JaL1sC+iqD11TLFpYjIw5SR3OsL9Ye7jc3woYyI4n6f4m4Uivr6SFDSOi3qk8+UTXgrMKPN2khb0GCcmwxBoFyJyjzr5aySLWbtXxFnKp1to5qfLLPLY4PSZU/R9c5n7UM5miYWtsvMA7x3r9ReM2DX6du+hCe2XVl+CJDFMebUAzL4cNkNiqr/UTcWg80Fs6MqbsdAsyw+ocuqS+/rbBQTvlCFwF+9PtYsOpK8c+kJ6Ixa6yAaakvzDEovjRU/AARHObi9U6AHslGRwBYf4otzkLhC/8HsEciclyJwakIT3mSFgcX2nY1vgJ7uEN8PB03b53Ij7CDdfDCetIHZAqZ//ygxS0LKdb8q7qCrU2dIKS0YTMGBX0K3ha3yysJlq2JK/sUwuupxHKzEAje6O5aTL3nSj2wcG60+g4n0RL5sCg3EKpTpCl9heEBDMhE3v2JlZxnsSD9oyae7STQofG8JclRvNdsxC2iXCzzVl51v6CQApgeigI6a+F64StFAOX4qtUVecJhEeQ0gMkhm6Q3h/k3/T0l6zm7v5mztaQ+mh6UBWfSvEkD6DGQf85YuEQIrCMtH4DIXTcUfvGxagKZz6/QGE8IE3piQyHd2maPw+1hvlijj4fvR6d0sGdwsiYoBiWE5/o7T3AxzdRxLVz4lRdKysbfRg+XwFLeO6kwWcF8jbHazepnmPHFZfMOOhT2fD6bV+K5NVJ2UNVQ+c= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ktWhKu5wRiUjQR/3Yj9QSmNFSai8MgfP9U3JU+Kbmywf2nh9LBBv/dQXZgfKZ8ltdgapqDxEgD6a4sUGMybiczJAYm5bcerxvTF0FIxi0CK2FxO2HRNah1rb2k0+eaWNrXSmg0pRRSJjN1n/2V+ysQ/GwKEA9IJWlMb6INSk4B3vuc2VMdeKCRjNPzGaXap/ownxItuD5YD/qsAoLKOFndhFxCuF3LZv4VQBQn0oftdYLQlZlVTht12CZvreLnGIi+h4ncP+CKVUwqVQhLnTFFrOem4bsXplq2vr0OaYD74fxqfBGz0sp3qe+x7ipAaNCyDvQ/sw45ixEYqaI4Fru+sSb6PWzXuTDpBKfv9sa/9aNnOnTto3XLGtIkdmPBQOrPQWjXV0pH2duY0SpzLQQ675iph64YUDlvHSQw9LraIGCGsw9M3Djrf2Pd5tzevL2/I40PA4xfnQbiu2vv2ljqGloksMYznzWqVzGHjTmE79e6LITI8tsZoF21ti6MiULt8HE8FzkspopqfG3DotQC7dh7jIqaDfJMHRFC8qZUcsRM8+Ao9ERdzwi8cU6BHV6pA9UsEe2Z/mT7kiHhpWM4BrAfSkvYgEhAm0CxFTTsBJRFgw5TJGDjbKiet+0LbqMZk7QIpUlBX3ajXSNDsylCxbf7X2gbFPcKvPYHDSsYA= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?CEX9yUKW+Xjl9R8E0BYbUs9MDLHRuimqtTZfm7MvBFvYzCc/A9yj8PJhx8UK?= =?us-ascii?Q?ggXHiL1tUjOMdEoMkV+BJ9pJXB2ZpKjN4NiLHFZ7F6fj9og2kawWS0D49lFz?= =?us-ascii?Q?zg31F+Gt8qjZzjKZr1zxjJm4+5NrG5H28jGeVgmzgCfa0vaMvP8YZLxNhIlI?= =?us-ascii?Q?joIcPzvwU3fycb+C39FIiPXXgLa2mug+Zu3yVhN9yJ7uexsHk06VNed7DMno?= =?us-ascii?Q?rmHxL0stuUz+Y4MCzFoTo1q1ckCBP+zPQpc3wD45kfu3D66cEmr/dH7F0q/W?= =?us-ascii?Q?bjsrjFlRC7CiF0ZGG0kJEHQARDoNGJwruX259r8Gdi15hCczDdjovOi9GAqe?= =?us-ascii?Q?0+puEfG0iV5q3GVRW0HYShDPedf5tNUTzdBT/OW1UtukjccrZLbQ3o8BxK1E?= =?us-ascii?Q?NWjP8BShxQT6xJMGBZ/h1BTP1Pq2FgnJIyqfV3y4SO590K8Li8sKgNFPcGtk?= =?us-ascii?Q?ninvQO+MWbAhTYrCy29hNT/RZPS+lW7CgZkKDmEgyJFZOPxpGTHdQNKSXO03?= =?us-ascii?Q?eoTDn0wD8xrih+wH0IlB7QpKEnDz1NdJBv/3t5URDaQBnAuMgzVgwQGTOIZi?= =?us-ascii?Q?v8evtwhKpXE3DMuzBDpnW3ZCGFQkqxE/tDmr8ok0USHUuj1KCTAMf2Q6rztd?= =?us-ascii?Q?QpFS0VZZQMVG90vtNrWh39+6k/dDfMqVijF7wZL5jUXrOzzS6otSGSk0SoXe?= =?us-ascii?Q?7yV7XJDxah4oGMSyMIJR24DqRtBC6XMPp96iRdAJMmMvB6pjNvDP4XqyZYvN?= =?us-ascii?Q?0z1V8eKje1MH2RQOQO4wgBVasA+JPP4jupI9gBN97fHs6kQuXyWnQM/49Icn?= =?us-ascii?Q?yzm9GkIR/wqJiI9QtH250YHD3nFu6ouCdjy14aGv6uZSmQVENRVdTZNt+5VC?= =?us-ascii?Q?HdQHK+GCbCgPP9TbIkrawgP6nteeFZ/Z4PNx5AsGDe6Gx/+9Kzn2tuFG2QKl?= =?us-ascii?Q?oFqb96NcUy8wB0hqET5TXqHtIlpRQYMFZWMSKScgNOWj2p6JhRw0ea5RreXL?= =?us-ascii?Q?BarZGtl37OONBw+kP9MrPyTDeZ1cXEXSwMWsq72KA7NqHMRj5BZhdpV6Prdg?= =?us-ascii?Q?QCR6wi8C61F5e8ie/N2yhQWMv++fpaHaP/I+EHwLERPatuO+Xu8L7cRzekYt?= =?us-ascii?Q?IP3Beyi3tteta9GQ4AurZatBhKRcD3H3DE4F9WZHwrRoK77NRSqAXBfRLk43?= =?us-ascii?Q?5HxFQAO8vn7PpUI+B1e20Mqv9kqlbhPUXLnLFhTAIbgLHPHMKgOhVSeGUtAX?= =?us-ascii?Q?GOqUG/sNt82QzGbOPVlx6jrn4aFTcnt9yJUxpgPkklVegKlo/NZsuRSzNAkO?= =?us-ascii?Q?4wOU9ZZvmjHhfvfehppuZVbNs453AZUlg6GgNA3xKC068Qymf9u9RxdFlMuN?= =?us-ascii?Q?gchKZ88=3D?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-50200.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 440b3a86-43fd-41f8-f708-08daf0453267 X-MS-Exchange-CrossTenant-AuthSource: DB9P191MB1482.EURP191.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2023 00:22:01.8241 (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: GV2P191MB2233 Subject: [FFmpeg-devel] [PATCH v6 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 Cc: Basel Sayeh Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: V6: - Removed the const for filename in "hls_delete_file" to fix compilation warnings - Removed the unnecessary calls to ff_format_io_close this patch introduced in hls_delete_file and in dashenc_delete_file V1-V5: hls_delete_file and dashenc_delete_file functions open a new HTTP connection regardless of the http_persistent value, So change their behaviour to keep http connections open if http_persistent is set Signed-off-by: Basel Sayeh --- libavformat/hlsenc.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index a86fc8907f..39df9becc7 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; @@ -565,19 +566,22 @@ static void reflush_dynbuf(VariantStream *vs, int *range_length) #endif static int hls_delete_file(HLSContext *hls, AVFormatContext *avf, - const char *path, const char *proto) + char *path, const char *proto) { 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 + hlsenc_io_close(avf, &hls->http_delete, path); } else if (unlink(path) < 0) { av_log(hls, AV_LOG_ERROR, "failed to delete old segment %s: %s\n", path, strerror(errno)); @@ -662,7 +666,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 +683,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 +2711,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); -- 2.30.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".