From patchwork Mon Sep 30 17:27:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Baecker X-Patchwork-Id: 51946 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:a303:0:b0:48e:c0f8:d0de with SMTP id v3csp31033vqm; Mon, 30 Sep 2024 15:46:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXxufsJEKldZ63qV5m6qpmPiQL9SmxFCjANnbdZ2iFt9iLBno5z7eFlwxBm66cMy+BkPijd0vlmqPfaa61AB4Wp@gmail.com X-Google-Smtp-Source: AGHT+IFMaHTcqvrHjknEq8xNkkRlfnbhjs9QoXc2ZCl6yb8CvfQVSHg9Eu4BjSpzjQOm01pgoZQI X-Received: by 2002:a05:6512:1396:b0:536:562d:dd11 with SMTP id 2adb3069b0e04-5389fc32acamr7559321e87.11.1727736373433; Mon, 30 Sep 2024 15:46:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727736373; cv=none; d=google.com; s=arc-20240605; b=Lvsdg0BqPZGDem6x7Vz60r4P2m7T4RaYsXzRYsx+2qrCml7F/TjHZAZm4g9NlUCPib L6jlS2ods4mSOzYUHkI/HS9ZfzYZq1zxWrURxMEAdcuZsNqw43KuH+RpM+vOLwNjynrd 2ML/E8FjCjtIclxlI641kjWOTCKD2ER2ZH9D9BLqWAT8Ci6iNuLMXQ2Qq3o6WMxGEr16 uL6q1fTvDTyZWt2Vx1gLFOQFboDenUCq7Rv4jl5ojcrQ6fu9p4eyAgNPkTIQP1HkWSNe p7QI6BucPvFyrJEbv1wOtkM5C1/TGuvPNoH6ZGWUEB94NEsYLZENOIoemN5eQv3NKnEX CvAA== 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=n5bdzfsXD4V9Lx5Kccy0KbYsbr/1o2fg4RAq+m10pN4=; fh=lQBCBVZ2KMTOWC5s3Vc1cNHB+9rtn7YWTj1usTHC3ZU=; b=A/JFHE63TMx1uC1Rbrw1j0VaIyZMTJPZzEKYd03dWGedJuRi4m+d2Opn2IJ12IoiF/ 3PMaFl4k1LcoeF9jONA5P5pWNAeCf/amxZwDnAhvNUH9XLJu9B3LY4iMwiJOT6U2e2uT WKDM9YJY07H+izBkLPnR87XLboAniJjXLDvgo8k2FGWV2OyhwQd0Rkgd5oCBGjqczvUP oFJ7gxtOZub8rrG0/U9FH+BC/AK667b8lBBzUomBQMw1tw4qep+TlvsOsVbidM/KoYFV LljgOu+LoaQ2MC0poQT4hKnqBTcjqRYhrjI/9asoz2U0WIVPr5DdVgj3OStSu9EF2Ue7 lviw==; 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="aC/nLXC/"; 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-5c88249ba8fsi6519236a12.406.2024.09.30.15.46.12; Mon, 30 Sep 2024 15:46: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="aC/nLXC/"; 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 C209F68DD31; Mon, 30 Sep 2024 20:28:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 505C868DD22 for ; Mon, 30 Sep 2024 20:28:02 +0300 (EEST) Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-5398e3f43f3so2275103e87.2 for ; Mon, 30 Sep 2024 10:28:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727717281; x=1728322081; 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=OFagl7D9XqWbl7/uRUpxs2TwtFljn9PpTagxLduYbpk=; b=aC/nLXC/uCHKIzblDggmK+8bILFyKSq7O+1wQ5fDYnNUu5Fm2P+eku2XoLof7tV3r0 IF117WWbq1aoL++hfZu+f3CFfwH+1oi8f1yHYvredqwaSxompeGdh1+/LX29xnLmzGs7 0i/ezpHTIIaNccXRLnnYyuiYfbkVTvqed9Amo8IKxJnQpct9ze5nZJSsOnlM0p9A9d06 0bZImjHjTYUOPOZvBM8IRv9mBUDtfrFTln2X8ZUMLQcg00DIBiKKDNCT7x0pINKj650S Cq78MiPHugJ/qOYE1bhRB6vBAqQxXY4zaEddBcTcvGta6lzgd6c8Ku/J4pGX7enTY1gI 08ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727717281; x=1728322081; 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=OFagl7D9XqWbl7/uRUpxs2TwtFljn9PpTagxLduYbpk=; b=uNUL8KLewJTG+Z7bBH9M4NV1MS7qBBzX/C/upgOCeWvWwVJeCIhNZ857I8H4yyoDmM ipysnvlg1ty08oe6r06horhQ0PCsbE1EJwpCdqUAv/3WpvXenTg6rNIH+ljxYFtizjxi 39aE8FRF4wLWZXMEL9Nv0PqPu4pkpe6bEoQNvQoaHgc87oP1ZRfJWJfEjOn7VFGQmJV4 +DXev3SP+VzsWnwq83+Y7soQG4Eta1rM3LGXt4xpobkJFhTy2DYZFD67pGkBUTz6BAfi 1orUfhU8prQm4OarClAtD80hhpbmK2Jf7U50EidMPH6L6MO9tQ0ewrBlQy0j0Yb1b3ZQ BgGQ== X-Gm-Message-State: AOJu0YxOoKDdM0eCnyTwIretaO8BFn0RIOAi3+BfxOz6eQeE8T2CoXdO dTOMV0mI+xZ9nOQujW5zYVnm7ishLY32VZRkoEAIEyIeCAv2RRh4ZGfmfA== X-Received: by 2002:a05:6512:3e0f:b0:539:8f68:e032 with SMTP id 2adb3069b0e04-5398f68e06amr3436363e87.43.1727717281021; Mon, 30 Sep 2024 10:28:01 -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 4fb4d7f45d1cf-5c882494870sm4732254a12.90.2024.09.30.10.28.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2024 10:28:00 -0700 (PDT) From: Jonathan Baecker To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Sep 2024 19:27:49 +0200 Message-ID: <20240930172749.16364-1-jonbae77@gmail.com> X-Mailer: git-send-email 2.46.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] avformat/hlsenc: Respect `omit_endlist` 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: oGZubHL2OjOy This modification applies Steven's suggestion. Original description was: Ensure that when the `-hls_flags omit_endlist` option is set, the `#EXT-X-ENDLIST` tag is also omitted from the `stream_vtt.m3u8` subtitle playlist. This maintains consistency with the behavior in other playlists when `omit_endlist` is specified. --- libavformat/hlsenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.46.2 diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 571d6b2752..c258fc812d 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1676,7 +1676,7 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs) } } - if (last) + if (last && !(hls->flags & HLS_OMIT_ENDLIST)) ff_hls_write_end_list(hls->sub_m3u8_out); }