From patchwork Fri Oct 6 21:40:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?L=C3=A9on_Spaans?= X-Patchwork-Id: 44185 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e24:b0:15d:8365:d4b8 with SMTP id gk36csp94114pzb; Fri, 6 Oct 2023 14:41:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF8lUd6B2KM1rHKNViuG9dQjPkRiotXiGGjX61ClC9VFfgWThCZApPFofFlvRxyCKTpLNNx X-Received: by 2002:a17:907:2722:b0:9b2:92b7:fb95 with SMTP id d2-20020a170907272200b009b292b7fb95mr8506069ejl.42.1696628484329; Fri, 06 Oct 2023 14:41:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696628484; cv=none; d=google.com; s=arc-20160816; b=f286r73608p25sPIuQIuAtVDZ5K+R7PV3CLrd9JoSbr/MvIstbWbJZBlROI1IpGaiX 3H0H6xbL+W+cp6b5XqTxHgbVUjhLOSlwPu/JnupGzYjcAp3/GQrN7LV1rpNB9/dI0TUl /aJntTYDwga+t2Rgz/GmZ0xGBOJS1pnKhJeIoR87VM95BOn/Ncgz9cDvOeobKjejO5Nm bb6iGzhgD5LM5sluTJa85PNriO+gDp0QBSwGIPf1/dXDualK58nWGDiZ+eHoXaIwro4M Ocjj71/M8QTKBVz3FqvsS28k+ydjQt4ogajFtm2GWg/axeTPSaD4ZnhEqotMPILoEHJn VEJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:to:date:message-id:mime-version:from :dkim-signature:delivered-to; bh=z6kcyHReNA2+KznDdHaPt3YA8d1jmOArq5/LUrNdsmI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=k9BUQfQi1RDyHkZEaGIJG/DhEKLgkMuuntZrlwvkIfFrf24tv8ahmFoPs+vpxMRZg9 6H5LYYMdgyXEP0GAIy3ZkS2S9HHvIMPnurdb/nlgDORcyLqvqG+pBW2GhLZbNksFgJ69 qbYvRRnFNHdk+wDUeoWo+VlsUupHW+LKy4urrBejpm0JhltCGk9XWj5J5L8d74NxhZl3 9iL/DG6PaHSw2kn7L3sGJ0uLHm430SuqPHQsxW9kWclZsAjrbWdyV/OPFUMn8JsM2w3P W6mXw5pRRH0xnSOosGjKmtEfkMMm5wvy0CTOl99r4topLUpc9IhAdQDVqfYDRLhyTazh +MDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gridpoint-nl.20230601.gappssmtp.com header.s=20230601 header.b=vgGec9AV; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cd16-20020a170906b35000b009b637e88103si2060733ejb.379.2023.10.06.14.41.23; Fri, 06 Oct 2023 14:41:24 -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=@gridpoint-nl.20230601.gappssmtp.com header.s=20230601 header.b=vgGec9AV; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6510868CA74; Sat, 7 Oct 2023 00:41:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7A46768C93E for ; Sat, 7 Oct 2023 00:41:13 +0300 (EEST) Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-5334f9a56f6so4622618a12.3 for ; Fri, 06 Oct 2023 14:41:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gridpoint-nl.20230601.gappssmtp.com; s=20230601; t=1696628472; x=1697233272; darn=ffmpeg.org; h=to:date:message-id:subject:mime-version:content-transfer-encoding :from:from:to:cc:subject:date:message-id:reply-to; bh=afYAL5cLRbOcGZaGA+GsR4lSyvHWfS6md6BkUfroksM=; b=vgGec9AV3dWcDBzBlzeFWO92H4tpK6v04ueapSxFhkj5UOrHvupTzuTwn/8ufPcESC Eoqhx1RoRpbrn9nXml5fr3UEQW7s07oPWZ0WRawrTzxwb4Vzw1/Zq/xyO39rCX6IaYkU v+M9UERVR9M/nuGe5tOpgF6D1RipcH7mW0FSjQYzRlbYtSW6jluIyD+jKYsbpQhPeOW4 yqvp7D7HepY1VsJmA3Ljq/1ZFjrOhh6W4WUpolqvtQdySzDTdXlppKaqhi4vT7R5Q1MK dXePWjHY3ZKkuNacyHt5LRIFg+l4hrxWoF/o4Nh5A5QsIbexYY98hCjiXeE7Dp8ImeQm Geuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696628472; x=1697233272; h=to:date:message-id:subject:mime-version:content-transfer-encoding :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=afYAL5cLRbOcGZaGA+GsR4lSyvHWfS6md6BkUfroksM=; b=HVE2b5D/FaGmWmxUYDUU8TAIT3s67HX3gL5JKjr/B68VyO4Vk5KwTI6k8MzotQmpcj rQ9YUYmoxOk1dOYjqD5DCx6gqxxzz5ff54N3VvugHajHi3hclQZ07JzXLFqVLoCMmbHm 6Vhd87zTYscUIg5BxRPmSY5gFHVEcBYRwQ7PUblFH3375Yq2nWDtWgFT5lwnShDAF9Ey EUgE8FVZf9zgmMDMUBB9r1KpCLNbfg8DXznGIRl7B0V7gWPy6kB5RSUVwY/HlQexx2x5 ScZf393wqCNHcRNhR3Nu3qdhGsL9aSmU/zx/bswEI0eXcEMUJx5O1zdnNkWTWu7vGHm5 lqFg== X-Gm-Message-State: AOJu0YwU57bch6IhXM00/WpKDsRtxd81fJS1LGWomT88EE3BxJfqR7eD yORdZq8uh/VKLouKRJpa5xQVDLf9/+KvT3BHF1+fPQ== X-Received: by 2002:a05:6402:1296:b0:523:41e1:705e with SMTP id w22-20020a056402129600b0052341e1705emr7914991edv.21.1696628472316; Fri, 06 Oct 2023 14:41:12 -0700 (PDT) Received: from smtpclient.apple (82-72-240-117.cable.dynamic.v4.ziggo.nl. [82.72.240.117]) by smtp.gmail.com with ESMTPSA id y20-20020aa7d514000000b00537708be5c6sm3131232edq.73.2023.10.06.14.41.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Oct 2023 14:41:11 -0700 (PDT) From: =?utf-8?q?L=C3=A9on_Spaans?= Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.500.231\)) Message-Id: Date: Fri, 6 Oct 2023 23:40:59 +0200 To: ffmpeg-devel@ffmpeg.org X-Mailer: Apple Mail (2.3731.500.231) Subject: [FFmpeg-devel] [PATCH] libavformat/hlsenc: set HTTP options before writing WebVTT HLS playlists 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: pY9hksABZEQo Fixes: Erroneous HTTP POST instead of HTTP PUT for WebVTT HLS variant playlists. Signed-off-by: Léon Spaans --- libavformat/hlsenc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 08f3746ce7..8f7eee202e 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1580,7 +1580,9 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs) set_http_options(s, &options, hls); snprintf(temp_filename, sizeof(temp_filename), use_temp_file ? "%s.tmp" : "%s", vs->m3u8_name); - if ((ret = hlsenc_io_open(s, byterange_mode ? &hls->m3u8_out : &vs->out, temp_filename, &options)) < 0) { + ret = hlsenc_io_open(s, byterange_mode ? &hls->m3u8_out : &vs->out, temp_filename, &options); + av_dict_free(&options); + if (ret < 0) { if (hls->ignore_io_errors) ret = 0; goto fail; @@ -1635,8 +1637,11 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs) ff_hls_write_end_list(byterange_mode ? hls->m3u8_out : vs->out); if (vs->vtt_m3u8_name) { + set_http_options(vs->vtt_avf, &options, hls); snprintf(temp_vtt_filename, sizeof(temp_vtt_filename), use_temp_file ? "%s.tmp" : "%s", vs->vtt_m3u8_name); - if ((ret = hlsenc_io_open(s, &hls->sub_m3u8_out, temp_vtt_filename, &options)) < 0) { + ret = hlsenc_io_open(s, &hls->sub_m3u8_out, temp_vtt_filename, &options); + av_dict_free(&options); + if (ret < 0) { if (hls->ignore_io_errors) ret = 0; goto fail;