From patchwork Sun Oct 1 14:40:43 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: 44086 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1204:b0:15d:8365:d4b8 with SMTP id v4csp899079pzf; Sun, 1 Oct 2023 07:40:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFFQEFwIiCluErSkBznbj/yf6Jo16KsY5qKfB2z4mkF/mCxa4pERtiv8iqzaAbOTQU6XVA+ X-Received: by 2002:a05:6402:1647:b0:523:b37e:b83b with SMTP id s7-20020a056402164700b00523b37eb83bmr8071690edx.13.1696171256526; Sun, 01 Oct 2023 07:40:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696171256; cv=none; d=google.com; s=arc-20160816; b=NXgK0P8JZ8Km9OO2ltRUHhd0n7uMRFBCeghaGryj9mv/BBm9iOiDJkkbIdNvjdiZOS F8y1kpdrU4yw68Tcl5/QWLRUxwRMRXbvR3cI1J70O8L5KMHcX5MXWxbyfjSTzlFqOfTK nYLa3w/ck0LSQNyJdqIDr2BI1LcnWnzhAh5WQfSHc1CphayxRaVmRiPBlwfrHVzgDLzK 7vOYD581TFqvfkqdjNPdckiucFDr5yhs8IVRcb6U/5ah82pJYS8bDLbZr7U41sfDPtQn 1KlYvmEjZLu79Rywun4w1MQi0V1SFIQl4mpjZ/Qw+TAGmduSoRfR2+maeGHZqBXtmCJn VMvg== 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=oCp4FfN7KaxmxKTguFuER8xP3iJaerU4XgdwDxqGk+w=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=X3R+ELdVrMWl16jlY2Usbd5HGj2MWUTk6gFDROzkfzMvzUwpkZNVggaI2mXnCajgfp /zY67mR6KPrWSP8hdDUD38BJK1PblB4WWtLtxhy+LEGz27buRUT2adYSHeaZ41cdgMhl Kf1KpoOOAol6tfVDTZT2kqwwzJ1g6KRzNAZ96/QXvzE1AzrZl1HM7GMOPUXmTmsIqimP e3bcWD96vgkdaJ10JrgWxHjqHbdmxi9q39TIcTAX9OQOGz8k0p0Wva3VVH5F5d6yd+3S no5a2+3HeJicW6yMW5AvUD0TYw0Eu8kXbm5p4Kjwc6OYVjM3jXzIsE5XmpRD93oIj6iP fxuw== 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=i1CTsBQO; 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 n14-20020aa7c68e000000b0053475d07d00si6631273edq.426.2023.10.01.07.40.55; Sun, 01 Oct 2023 07:40:56 -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=i1CTsBQO; 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 3483A68CDBA; Sun, 1 Oct 2023 17:40:52 +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 322C368CD15 for ; Sun, 1 Oct 2023 17:40:46 +0300 (EEST) Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-51e28cac164so4914544a12.1 for ; Sun, 01 Oct 2023 07:40:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gridpoint-nl.20230601.gappssmtp.com; s=20230601; t=1696171245; x=1696776045; 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=fKaG/yRwhqP5BhrkDa7gyvcQk+LN31BpTt96oZBCPBc=; b=i1CTsBQOJe82Mc6CreBUy40V66xLUv6PtzXDXs366MahU8tEM4HWAWLsiUDt+5eNRV CuSa3f9C5/d15OkSvQoD4qrjYnJR8qWsmA8F0e7B9r8zy97z0662AxZmhnNdGTnBRoHP /1pGCZppJD0boFHWkvKtMVsb8LDvQgWxCrZoyK00dVYX0UXFTwgF8qRvn5WswZGq12HV Z1H/pQ/fJIFA3DmAQLQ7VY4QfxkXwt+qaSj3JjdLP9io3Q1mmTeUgpTGKs7+XTEvB1os dS0oLnMmH0lQ46vPKj8JXNIf44Tmf0TozJau0zI0mnTLFX0Y1TYcM+Pn/S6FLPxlOjvr PwFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696171245; x=1696776045; 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=fKaG/yRwhqP5BhrkDa7gyvcQk+LN31BpTt96oZBCPBc=; b=BZt49Pl/rtZSC2tXnabUOGF6Tm056qwGpHKWPJFuviFXfevBuDK+4S6jvrDnSuv6Ab JSkgCpKvaVt6376d6HlIl9UDCeY01FGZg9uGewNUAgJPqVme4BrPNexQrItfVVAYjknS BHA4jC8SWxYBJGuW9nI64xy8hkbIVSZnGfTihmcipweMzWZAuBpacufQI4m6Su584uKR 3GEzvnhLo1n39gaAFc999luEXERwgogZqlAGsnV+qMyFdnLQdVJB72VHDYd6q9d8EhRn RDbdEJM5hbaRL/+cZjAIm+p6dE880m5I7kxY3BP1uytEIRWJKyZJIXWPqhJ1Yk3GheQD RWtw== X-Gm-Message-State: AOJu0Yy1NsRBvWAn1TVNIOuUXvJZc7e3nipO7QIl20dkFXRB6aLULvTt I/hAvH0RvrDqlcn6RG4O7zZ4m92ScQ9EmOiBOMGb3g== X-Received: by 2002:a17:906:225c:b0:9a1:f1b2:9f2e with SMTP id 28-20020a170906225c00b009a1f1b29f2emr8103730ejr.2.1696171245177; Sun, 01 Oct 2023 07:40:45 -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 fu22-20020a170907b01600b009a1a5a7ebacsm14188936ejc.201.2023.10.01.07.40.44 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 01 Oct 2023 07:40:44 -0700 (PDT) Message-ID: Date: Sun, 1 Oct 2023 16:40:43 +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: 2pn/HbpuZNlx Fixes: Erroneous HTTP POST instead of HTTP PUT for WebVTT HLS variant playlists. Signed-off-by: Léon Spaans --- libavformat/hlsenc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) if (hls->ignore_io_errors) ret = 0; goto fail; diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 08f3746ce7..150320a880 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,8 +1636,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->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) {