From patchwork Sat Sep 28 17:33:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Baecker X-Patchwork-Id: 51919 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d8ca:0:b0:48e:c0f8:d0de with SMTP id dy10csp1136124vqb; Sat, 28 Sep 2024 12:51:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW/Ywnw0Mp+qggLcuf2w/HfWlsbd7fg7mJLNjpimT9AGw3+dQj+IBShRTmD0x9bmNm62QCv1iR8XJPqj+rXcTQl@gmail.com X-Google-Smtp-Source: AGHT+IGrqDETzW9sMePfx8yBdaU8+E4FzH22lxk38qopunKF+WaoIY1ZUSV64N7wOLAyu2nfGs1x X-Received: by 2002:a17:907:7d8a:b0:a86:7ba9:b061 with SMTP id a640c23a62f3a-a93c4c41287mr825935166b.64.1727553073299; Sat, 28 Sep 2024 12:51:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727553073; cv=none; d=google.com; s=arc-20240605; b=NzVaOwkfCnq0nqJE4kUN5KE2t+jXdrFxcGyRWc6dpw3Qxv8giGZRMgep3aTKKA4O6J 9HW8ozrO7lqnl8I+emBaPaVuEX2wxZvi55LQevDGWkyhFwldlRq4/fWR0LXYv45nrAGw tStkXZaz3Ihbrlz341CRZvmSGwZdRQC63besTCGIX8QtZpN8gYbFOayIxiuL8Qc0AM3R aGn1rfgQM+S5Vhl/nqcOcj80g0zxyhkHEc2cXLcFpdJFxf1cSvFxLjYMGLuwCUBgYSAr MycWZMfeYcKcds3DwX3/wt0PzLtOuDYJSb3WEZCKzYU/rPuQnwZ4s0H2KH0BY6FD4Dpj /vuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=qZY2XWWlBmyvsBL5G22w7SrMipgBYkks7p2qENHQY54=; fh=lQBCBVZ2KMTOWC5s3Vc1cNHB+9rtn7YWTj1usTHC3ZU=; b=SB7sy2nw4RhH5+L8pjQoLd+TU60tkX6h3N7z/MfJ3gBHIEZe6xASsy9w2bSbfVGOA+ gfIR7nWO3ZqR0o80cc1vHYyc5fDiacQMThH0RvJFjAxy1l3zLTxVcMeCts0sJStWfDPc bSYUyzrpis1vtcHQ0Ior0SCVFWT34rwUK8T/oEGkuNaGw2uMyzg9jfKrhIk6ljPcWR28 mFW5wdM4l8+9oY6fCq2agYb0DnVYXauIT+8wEI0QswmkstdM3lbN0IEVOY955vZIzzil GE04wVa+90wA6+8SfVqnIRbHGPY9+SGXgWTwJxQURrHa3xpcBtBIsCaseWQ8pDnp2k2J akdQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=WVWBileo; 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=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a93c29ab3d8si362457266b.433.2024.09.28.12.51.12; Sat, 28 Sep 2024 12:51:13 -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=@gmail.com header.s=20230601 header.b=WVWBileo; 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=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 626AA68D9CC; Sat, 28 Sep 2024 20:33:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D99F68D812 for ; Sat, 28 Sep 2024 20:33:12 +0300 (EEST) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-42cb1e623d1so29156805e9.0 for ; Sat, 28 Sep 2024 10:33:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727544791; x=1728149591; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=FM419YEqQWRvIB43ReuKj+eam7NEqmdUoigovWxVz34=; b=WVWBileoRa8AojHv9CjAfhIezAWKD+ws5B9SZBjRrG9tGQPWXrifJEeYkmb6M0UJad RAGDj+HbaVtKAWqbdzLgpvvyMvUtyX+RYCu+mjodQyCfVMGPAgkK7yGs1lql1echIt/Z viGtu8fnGmdksb7MmVhikLOCUx+yinifZ/oPAcZXW3VTxJj11rCrKApus4rHhSXNl6fB aJZFNmJ9ZTPL8z78hpRyJ+M+PClH2D7A8s8DRK53LA2/L9XKqmCPXFIHq2UFGP4kT98b Nn+Rj9KW0w8zzyCQcB0bHxUcdBH+F69XWYiGHpjxInj46lITkDAY7eNgZebgWDUgScd0 klpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727544791; x=1728149591; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=FM419YEqQWRvIB43ReuKj+eam7NEqmdUoigovWxVz34=; b=jCnQYQz7/Jwun9clmGV/DvBoUJQrDgakCJB6iFJK3HIA/3EPQvDh7J8+PfuxTUrPTj zdh3sCfcyF5rnWySpKT7nHQ+9uH5vcXOs30PSmNq+NVDRcvSYyrN9BncmV/sOCr6ovil LhGnqRsZhuFxtxeTzN3Rb8dv5YC3ZXXxjlCpgUhsjjWieyXbkUgeGovKuU7Mj7Dd67Fi 3CBrK0+uCx1KkiVWsmiDw2qpa2DCiE84AiccvLj9aFZ+poei/CUUfDqlAKu4OCsGhgox TAF77TbN+3JZoE/LI6DKljCAvmCMITy1y8uPoBqP1XONyb+yOUfwnx4F9YQssYcf8rYH 0yaQ== X-Gm-Message-State: AOJu0YwhV3advIFDok8asHUeXnvL9ZEjWACcsek+XVAd10PFJTHM9Y9j 8Newajb3RLin1YD+mSllvrhyu/ocNzzA0OZ91aTsTWDuL6dMQ7yefk9sig== X-Received: by 2002:a05:600c:354c:b0:42c:b5f1:44ff with SMTP id 5b1f17b1804b1-42f58498092mr49880795e9.24.1727544791252; Sat, 28 Sep 2024 10:33:11 -0700 (PDT) Received: from jonathan-nix-lan-daswort-media.. (p509896f1.dip0.t-ipconnect.de. [80.152.150.241]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f57dd2d3bsm58837435e9.2.2024.09.28.10.33.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Sep 2024 10:33:10 -0700 (PDT) From: Jonathan Baecker To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Sep 2024 19:33:07 +0200 Message-ID: <20240928173307.59656-1-jonbae77@gmail.com> X-Mailer: git-send-email 2.46.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avformat/hlsenc: Respect `append_list` flag in subtitle 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 Cc: Jonathan Baecker Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lDIIRuYW72Hl Ensure that when the `-hls_flags append_list` option is set, that *.vtt files in stream_vtt.m3u8 are correctly updated. This fixes https://trac.ffmpeg.org/ticket/11208 Is a bit of an ugly fix, let me know what you think. --- libavformat/hlsenc.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) -- 2.46.1 diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 1e932b7..e93af4c 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1202,6 +1202,22 @@ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, return 0; } +static int extract_number(const char *filename) { + const char *dot = strrchr(filename, '.'); + const char *num_start = dot - 1; + + while (num_start > filename && *num_start >= '0' && *num_start <= '9') { + num_start--; + } + + num_start++; + + if (num_start == dot) + return -1; + + return atoi(num_start); +} + static int parse_playlist(AVFormatContext *s, const char *url, VariantStream *vs) { HLSContext *hls = s->priv_data; @@ -1294,6 +1310,27 @@ static int parse_playlist(AVFormatContext *s, const char *url, VariantStream *vs ret = AVERROR(ENOMEM); goto fail; } + if (vs->has_subtitle) { + int vtt_index = extract_number(line); + char *vtt_file = av_asprintf(av_basename(vs->vtt_basename), vtt_index); + char *new_vtt; + + if (!vtt_file) { + ret = AVERROR(ENOMEM); + goto fail; + } + + new_vtt = av_strdup(vtt_file); + av_free(vtt_file); + + if (!new_vtt) { + ret = AVERROR(ENOMEM); + goto fail; + } + + ff_format_set_url(vs->vtt_avf, new_vtt); + } + ff_format_set_url(vs->avf, new_file); is_segment = 0; new_start_pos = avio_tell(vs->avf->pb);