From patchwork Mon Sep 30 19:40:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Baecker X-Patchwork-Id: 51943 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d8ca:0:b0:48e:c0f8:d0de with SMTP id dy10csp2194822vqb; Mon, 30 Sep 2024 12:40:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXXDw3CZ6rWbhoZIHD3uRxi15kMoju5I6QoD8OMdQeopBcamcQS12nToxgPCOA16abKqpYWdZdYtJMj/hbHhopc@gmail.com X-Google-Smtp-Source: AGHT+IHwM2KcQYmHdxdz+5IFFdD/EW0YBeWiHcidYQvTdqYglNAmm0rDLgKSpgVpmEVpgAtuaVmB X-Received: by 2002:a17:906:7950:b0:a77:c30c:341 with SMTP id a640c23a62f3a-a93c47d7b84mr1506738666b.0.1727725234745; Mon, 30 Sep 2024 12:40:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727725234; cv=none; d=google.com; s=arc-20240605; b=bcc/ulvInOIYmKdFPjo7ajxDEt4zg0ey75ZtnzECY5oW1OGcDv1/YwxnAAtK+7xZXS GumqOZsjEFC8A+4te0HoDoHNrnCVy7tafAWubooHl14y6qT/dIXrX+BBBit/xuVsGk36 ClvzdvDRLEVa02ZlNZWsDA3FYX+tXBtdUEEvJfRabruP2U4faQhWruzqnowjlWM6BMLB KtMaxOxqqg+ExLxNrW1yWNc2512tNZyMzFDNd+PHmcE/WRe0wYyPcwKJUyvwA93Amtdz Us0ELXegdQ0gdWa/v0/DBaGxy69ghuzKRYPULkYWpkxCl3Tj1B0UiPFzNXHm0jWZQdG6 tyJw== 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=9FWGr9iyLS4kUaxCii8e2omOdTXuqYCoRqVSkTh9jIs=; fh=lQBCBVZ2KMTOWC5s3Vc1cNHB+9rtn7YWTj1usTHC3ZU=; b=HWGDeUikHVgW68nqldZcGbhlZ12loPuuXU42GqBdhzkBOVlHkUwFO9mu5aY7alEVY8 pBl9VnrMpCv5JQ398X6dEsYZaC1/kQ8W8bijhcQazYEgq1M6iBBxHK48Ks9OJ+vGbuyA DYColKWWkAdczrVyLqbSdXL6vPI6bBRz6Sd1ooGFCUEKO20GflhCE4CZ1GPIrCBgGMLX qN9vjafyaeY6Rpqsiq09ugHQyLQNTDxSuld9KwFbJXH+e5ytqJpqbrvb+UCd5LyBKYJe KSEvPlHCGsCtWXuf7vAEHmRZoSP58LXhHWUIxFBYo8ptoUnPDKNW1tjjGb6tZw63g6ll qXjg==; 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=V8OTpu8W; 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-a93c29e734fsi605221866b.580.2024.09.30.12.40.34; Mon, 30 Sep 2024 12:40:34 -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=V8OTpu8W; 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 BC60668DDC6; Mon, 30 Sep 2024 22:40:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D1BA68D4E5 for ; Mon, 30 Sep 2024 22:40:24 +0300 (EEST) Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-5c87c7d6ad4so4635962a12.3 for ; Mon, 30 Sep 2024 12:40:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727725223; x=1728330023; 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=E8MRtwrGvVHLjvv4Ier7+KyuUamGB1s/OsDt+QO08XU=; b=V8OTpu8WbVNChteOQnisV9X0PYFT1Wp/e/lQ/UyZnS5Kd8qo/6IPmwXlkYQqr2IjrG CXl7wHXA344UVIrf4Z6DNIwcGdhyzOBJpe5ulvaO2+sOpToARYuM4M+cVEex8mNCnsSB lhoctjGo1q2BXYho1ZSG58KdAp9PfeEFJ+a9MLTCJatRc2uM8Z/ejL4z349Y2UFDLHcp YReG5/i8d4855GNZYk+BsVD5fhROhTbfHewjcI1pWhQi3cDeXBYo0shF0A29wo3cj84I r+Zy2anHlS4hO5UjbdKDDmttQg7jktV2d4/nA6iIEOzUD0fdq3a23+2+gPm0BDWXbiF+ kKbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727725223; x=1728330023; 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=E8MRtwrGvVHLjvv4Ier7+KyuUamGB1s/OsDt+QO08XU=; b=Oh9YYc3jFsd1x82wYUO1sbSDsPInzMWHmLUSsQyVtvno55S21w4iAjklh6Ce9MwyCV 0dZAsL1ghhQ5Ffc4Ppm0VbRkUu1VDuDF5iTVJsEiCcCE0n9DdT+s+eNkUB0GSa4qWEE4 QPgxQzG7ObMEkyIkocVECJXLHqqjH3m5kKjdjN1rb1Jv9esIpIfpKa/n29HFTCijar9d JvifsysQgVBLsdISdMI4/bNwhiADOEe3ugOUj/VPrEKm+0/G7kKJ/tVie4akJhz+qWrL Y+zgM1yqBoCppa9Z14ZoLv6j87LM0J5IMEfmxZbMnkgV0fkPcwi8nBeujp1PYJprKJWl ddTA== X-Gm-Message-State: AOJu0Yy8kVVS4NDsSE5ZBsEj+Ry8aBwUBKO6mlixzIEzAUoA3OqpexEw WukFMz598L3U6jPlUHVoP5MRivybxIHjnbtA7hw4SWfEjp8MUcx2eJ9b8g== X-Received: by 2002:a17:907:e9e:b0:a72:750d:ab08 with SMTP id a640c23a62f3a-a93c4908ac3mr1413351166b.14.1727725223241; Mon, 30 Sep 2024 12:40:23 -0700 (PDT) Received: from jb-fedora-fritz-box.fritz.box ([2001:9e8:83ed:3300:193f:f662:c0d3:9c40]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a93c29481f8sm570981766b.109.2024.09.30.12.40.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2024 12:40:22 -0700 (PDT) From: Jonathan Baecker To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Sep 2024 21:40:20 +0200 Message-ID: <20240930194020.80185-1-jonbae77@gmail.com> X-Mailer: git-send-email 2.46.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] avformat/hlsenc: Respect `append_list` flag in subtitle 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: 9dEAUojVj6WZ Apply Stevens suggestion. Original description: 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 --- libavformat/hlsenc.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) -- 2.46.2 diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 571d6b2752..8d4322796d 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_segment_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; @@ -1295,6 +1311,20 @@ static int parse_playlist(AVFormatContext *s, const char *url, VariantStream *vs goto fail; } ff_format_set_url(vs->avf, new_file); + + if (vs->has_subtitle) { + int vtt_index = extract_segment_number(line); + const char *vtt_basename = av_basename(vs->vtt_basename); + int len = strlen(vtt_basename) + 11; + char *vtt_file = av_mallocz(len); + if (!vtt_file) { + ret = AVERROR(ENOMEM); + goto fail; + } + snprintf(vtt_file, len, vtt_basename, vtt_index); + ff_format_set_url(vs->vtt_avf, vtt_file); + } + is_segment = 0; new_start_pos = avio_tell(vs->avf->pb); vs->size = new_start_pos - vs->start_pos;