From patchwork Sun Oct 1 09:38:05 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: 44076 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1204:b0:15d:8365:d4b8 with SMTP id v4csp777835pzf; Sun, 1 Oct 2023 02:38:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHabEe/AdfOt5xr/BsIrkm6t4yVMDqZSfVgA1HePjg6Ynx2iJ7RfTkkYUlKxGagAbbNUcHc X-Received: by 2002:a17:906:5f94:b0:9ae:674e:1dc2 with SMTP id a20-20020a1709065f9400b009ae674e1dc2mr6972051eju.67.1696153099108; Sun, 01 Oct 2023 02:38:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696153099; cv=none; d=google.com; s=arc-20160816; b=pscwNnAD49Na+j9CL8d4bVw+u2q16DG1N4l2EvRoG3VU9vGGIrq1ew1MN1gj7CgBJc MpA4LSbRA+yv5vj9WMyWoNTkoOO/KxlP5/pqd4aqMtugKkH4E7bkdgS/xnb2yFowKN2q vuZWDj2Uf7i3/Y9JB9e4zzxX5aRZX+IcpSXwj8y01T8FHL4gvJLnMBtofSFkW+rTKurN BimLKMukqiX1hnErJlMSfPKD4MGai1YCyh46CAuTv2lDp4Km1bkLjqRVsGKpwdyyHTog seSnBoLBKmFKDGE9lOzSv8KTsN+r8BEwvmSeLhmAvgADvgx9Ots4Bycii7AF8m9NNDQD 7Zeg== 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:content-language:to:from:user-agent:mime-version :date:message-id:dkim-signature:delivered-to; bh=kdnzwTkzIlLEBFR8cybRCa2TcklXAsccE2u6KfIEC2s=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=sOqk5FYXJQioLv3j2UcuaHmWuwIheJxQfv2PSvcB/NJPt7pNyS/KNm8r5wU55wJWsT H90I8Slhxgqmulb/TjLbnlIIsRE4naWCTwdIJ/V1e1TWA4TI8v2spDor21HjNSj5Yj/v Up8QFrjMYdFyv4PuXPKZdkkRqJBjQgdoshY9DjzR/keeZFWlNG+4oamge02xNlJ8Vd1p R+uOJ4LMWzHNQVUpsoaLF8rb9m2E0OUUvwGQT4Fo4SBvxmc7/KkBnpZyJHEZeM94hgHN hWc8qpT3nddqPulugpUNw4hYD1dJvJnot/gMursqfWdfqL06fVO+JefocF0muNxC1CRT cong== 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=fONNR097; 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 kl1-20020a170907994100b009ad8da45ecesi18811005ejc.293.2023.10.01.02.38.18; Sun, 01 Oct 2023 02:38:19 -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=fONNR097; 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 D5E5668CCFD; Sun, 1 Oct 2023 12:38:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A95768CCFD for ; Sun, 1 Oct 2023 12:38:07 +0300 (EEST) Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-53639fb0ba4so5039911a12.0 for ; Sun, 01 Oct 2023 02:38:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gridpoint-nl.20230601.gappssmtp.com; s=20230601; t=1696153087; x=1696757887; darn=ffmpeg.org; h=content-transfer-encoding:content-language:to:subject:from :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=iO+Fg9Ujf5Feh9BL9vYbssXjyW3AG7vH4ZDzXVa+5uk=; b=fONNR097IOizzy5SKkgOCQlK8mdZyqsFCPC9UHD85ZLL9zfibuuuEZoZDfeRETH3eC rZDCBKjpDRz9gb9pim1gpgabiVNb9hNV6mUREBhVEWXZ2q2dZrmvffhedyXJAlX6JJU8 mF5GgEpx7jh90zLIS14+IN6I88WJBEE2j5/s9uDjhnM30yhWAM3NE7ezb4nKd5ufvY/v lFB2VD0xoSr9Pn1Uz1X/DK7WrZUgIbsVUnjC6OTOOb6z9cJtJPJbXUR1SlnHdxmM0vVs HJ8qs+Yira82RHEuvtYKoC945+rk0RgXy2oDwuxeLwXOaFiyfVK4XCXYPrSYh1aBzt8R ukcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696153087; x=1696757887; h=content-transfer-encoding:content-language:to:subject:from :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=iO+Fg9Ujf5Feh9BL9vYbssXjyW3AG7vH4ZDzXVa+5uk=; b=Gpc7T+vNJtzUZn60OFIgwQ5xsx4BeNMfP1gF1xms1noOtT7CeIGNF71kGtdbjQQGfZ mltgoj6n9P5VgcXKtVaUZ8AFg9JCwuZGkSu9FEJsjMuROhNEc06jL4z1MGtQhzXe8b0C pqgdhceCxWZQL2FPEX/6RYx5C/e+uKlkDAxm6EbaHaSkIBdwMvf4ZJmK2bc4Oz+WFqdn OailEyNpfbz+mQUEIa1mDVmKaFGlS24NcX+QE8Ziy7qmxn8G3jZqb0Hi3qhz6Rp1vpNN bRigFH1iX3eVbAib98fkBs+hRTaxWUObV0x/xhscfBOEgmFiidy2HS41efRLZcsl93ik Zolw== X-Gm-Message-State: AOJu0Yw5hEurJkHnMoxDo8lVKmp2+IqbsHYeax1w61zzdHBK9AJ/Oe31 MdlnFBqrjyZmPh3Fgoq5rDpO8WnEVJ1kFLzGZz5tnA== X-Received: by 2002:a17:906:5190:b0:9b2:d554:da15 with SMTP id y16-20020a170906519000b009b2d554da15mr5300137ejk.38.1696153086688; Sun, 01 Oct 2023 02:38:06 -0700 (PDT) Received: from [10.6.69.117] (82-72-240-117.cable.dynamic.v4.ziggo.nl. [82.72.240.117]) by smtp.gmail.com with ESMTPSA id vw7-20020a170907058700b009b27d4153cfsm8562885ejb.176.2023.10.01.02.38.05 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 01 Oct 2023 02:38:06 -0700 (PDT) Message-ID: <7d4f1cb8-2b1a-4d21-8466-e3319f0f43b0@gridpoint.nl> Date: Sun, 1 Oct 2023 11:38:05 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: =?utf-8?q?L=C3=A9on_Spaans?= To: ffmpeg-devel@ffmpeg.org Content-Language: en-US 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: 5TVb8P9R4Pwx Fixes: Erroneous HTTP POST instead of HTTP PUT for WebVTT HLS variant playlists. Signed-off-by: Léon Spaans --- libavformat/hlsenc.c | 3 +++ 1 file changed, 3 insertions(+) hls->allowcache, target_duration, sequence, PLAYLIST_TYPE_NONE, 0); for (en = vs->segments; en; en = en->next) { diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 08f3746ce7..c956f11ed5 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1585,6 +1585,7 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs) ret = 0; goto fail; } + av_dict_free(&options); for (en = vs->segments; en; en = en->next) { if (target_duration <= en->duration) @@ -1635,12 +1636,14 @@ 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->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) { if (hls->ignore_io_errors) ret = 0; goto fail; } + av_dict_free(&options); ff_hls_write_playlist_header(hls->sub_m3u8_out, hls->version,