From patchwork Fri Sep 27 06:32:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Baecker X-Patchwork-Id: 51889 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d8ca:0:b0:48e:c0f8:d0de with SMTP id dy10csp807102vqb; Fri, 27 Sep 2024 21:51:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVFcnfPuZmWEmrR17eq9j5Dr3qhoTV6d5X9ItwrhlA0dRL7J/4kHQxwycAr6GetKrAT5NpygSw/QoreOYPAUvte@gmail.com X-Google-Smtp-Source: AGHT+IGE7XJDK1Ri203CxFXl0BxlT3rwBwvgNIdSPXDQgyPSCdirogZkOCFp/ydg4S+jGedImQYJ X-Received: by 2002:a05:6402:1f13:b0:5c3:c51b:9bdd with SMTP id 4fb4d7f45d1cf-5c8824e5217mr4156901a12.18.1727499073052; Fri, 27 Sep 2024 21:51:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727499073; cv=none; d=google.com; s=arc-20240605; b=Q+XoZcw2+AVXJv/Y7cLxmudY50FHKKwoDBgeEgr96KNjrN7D7TjnInI5w1m7NVYWbJ 3mkf293+flPuEl/vic66SEV+cNZ4E+0atvFoqgp2cRC+2Qsd8l1I4INKG31ERxlZAU6x tsS3XgUG8nJdmiSAkyT3+mdmxvUefrRfN30r8d1b8cZXL9brq3fqRdopkybl3/4+cfSF YlDDW5JkI+tpwRg/GCmugT6WJd1VM/cJTdZykc5pWKG6KAjabFdu3lF517WF/HE/vf1p KD8RX1bfmPreIS8cvfN1YVUatlM5aoD7MUGyt7Stn/kEMfTSxBepXg2vuDpmtpRNIgka 3sgQ== 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=4J/V9oLI+PAE0OQJeN8Wn2cPefY36gQua326AKQp9a4=; fh=lQBCBVZ2KMTOWC5s3Vc1cNHB+9rtn7YWTj1usTHC3ZU=; b=e37BTaMp4+2y1dIk7XoeqcL7m91fui5M5NGLia9r9rSD6KoEuY2MQ9NyAZkIMczIjg 3rbL5cuSfkiRSbPFtwrRfaQMpTwqJywFjaDTDuA/F0bNbyy3tizi/Z27gRw0hwK9mJAQ 2CzYmHvick4OzHBhLGI0fwvf/169H/L6nMOEjMW5c045l+6erv6y+8i+hwRCyOZ4G4yT Pkn1jN710WyRfutBubOspGfRb/F6hrgIFk3v8L+MrOH0+0IjW36oOjMD1aOjblOeA7FY UIgDShrrBsR6/v/XyWR9Pl14IiOceealdxdH1FlnRxj4P8kFLPcOm4QElt0NqxF4yQNn cltQ==; 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=TKiG00Ic; 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 4fb4d7f45d1cf-5c8824a63ebsi2589789a12.535.2024.09.27.21.51.12; Fri, 27 Sep 2024 21: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=TKiG00Ic; 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 42B4568DBB5; Fri, 27 Sep 2024 09:33:07 +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 EE99468D9B4 for ; Fri, 27 Sep 2024 09:33:00 +0300 (EEST) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-42e5e1e6d37so16291625e9.3 for ; Thu, 26 Sep 2024 23:33:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727418780; x=1728023580; 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=w/8u1yCpyyQ0ASWDhuJjKke2v8YguY00Cz+8O2i6gUI=; b=TKiG00Ic7PyhUnIZzDEmm2flFT6/f0EbaLHPieAPvnG3iOfw1TAiYf9lD5Vtqc8mCo pM0/DFZ+xFun4AiE48PD4H4QPX4Te/3ci3LYFqpQsbfWdErK+jHcwhPCyoDricWL9OPo nAzNZq5/DqLqMb3Y9nYIutYp1EODpCHvwnHJfxVBE/Th6AjLYNKcxQevPdRtvzBkBtPO z7CVgSnMptG7nSIArnihmX6qemLlumltO3XbyvkkYbj4P5ZCKXUciVUfNQoAvRwqtSzv uWWHTYXekEreClBWO0kPuHVUSo9PO6KsFfOl5cUqs2nKcgqRe9x/xsiy7VLBRZkC0iwr OTlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727418780; x=1728023580; 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=w/8u1yCpyyQ0ASWDhuJjKke2v8YguY00Cz+8O2i6gUI=; b=AUEBWAET27HHa719r5my+rXJPEgTWF4d+p11CipVTHIdbDg3wut5l7JOLkH5msODb8 JeaxCTjLM0tv0/xYyM5IiKD786+fd+fhIIWAY4ykGsvZHX4pbhsTh3a+ENJyyRZnj6hB C2xydpySG2AjolsboxOaqlNrHOoWiotPnR6l+Ld0BCUPjtY7UOVNsSJi2ejH1vdBJ8QB EQVGEiE10wS9x4pscmjxN/xNlNpKMuGpLPPqiZxBCLQ6Yxz26sp/jbGMvG58ehGDtjyG 8Wd/agg+6Kjmae0rJbdyTdQ+7lIYHn/Qv7kLPl2zHPpV4rr5lvfDIvHWk+l6yXeb8hRC aQLA== X-Gm-Message-State: AOJu0Yym0S1HQ/GIJG+McQSB8izrQBNe9M7GOz2YKKgGdmafd/QCb2/8 uoHUSXHO3iQ/hU/6LXNn61poyoQ2VrJvr0CCavDq7c+DEn8tzmidCb5GBQ== X-Received: by 2002:adf:fd87:0:b0:374:c8e0:d76b with SMTP id ffacd0b85a97d-37cd5a60937mr1373791f8f.6.1727418779877; Thu, 26 Sep 2024 23:32:59 -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 ffacd0b85a97d-37cd56e665asm1586430f8f.64.2024.09.26.23.32.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Sep 2024 23:32:59 -0700 (PDT) From: Jonathan Baecker To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Sep 2024 08:32:54 +0200 Message-ID: <20240927063254.196901-1-jonbae77@gmail.com> X-Mailer: git-send-email 2.46.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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: ynQch9SqZoJY 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 This is a bit of an ugly fix, let me know what you think. --- libavformat/hlsenc.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) 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);