From patchwork Fri Nov 3 17:33:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Johansen X-Patchwork-Id: 44501 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:181:818d:5e7f with SMTP id q28csp717709pzh; Fri, 3 Nov 2023 10:33:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGE3wzA5BlFekr56ey4LXvwMpyXeL7ah7XIX4bx9gQOtCdwAOxcl2QFCQjMfybjm2gOCHNx X-Received: by 2002:a17:907:2cc3:b0:9bd:7f40:caa5 with SMTP id hg3-20020a1709072cc300b009bd7f40caa5mr6472510ejc.77.1699032832683; Fri, 03 Nov 2023 10:33:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699032832; cv=none; d=google.com; s=arc-20160816; b=l01E91IgfynfVPSSYmroLW9cViDKMABI9EUzM9v1uXAiobqb7+G8ONXjxeVraDhkfS +w3X+bWe3Zdbk7KnaD46/wT+ynNcC9EUahHHlFDz78p2XqLRZSbt/p+mQg3cFZ5uc/0m jpHZn0P1iGME9zUE6pPpPPckOSwnvtkunghK6KkHPDpZY/l9PiQZ0WANIDLSBBRg8fwO uCEtDZHNJxhEP/2D5sE+EKORxa5VTR5LOZ0L7feE0Mq/vONRQfDoiS/uEpkCqTPUv0Yd NqyJElWNAohIShsutOh3Z6zuSdKVvFZYB/saQhJbnu2IeloeRKQ/a3bD4uDyf4Eg5EN3 9rsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=nLIPdBuscO31BXsNsc8syn5IITxZQ/xBaAvbbbqmFpQ=; fh=BNczk7MtTFTHa4uMdKY29AxmcfAa404kNGyDf0xbsP0=; b=u8AlA4PgiSwm4tlSsVfkrp9YXXGDHoveaBAJ+BZyJR+9a3J+iBoNfGxyuC6iD0uVDO Jn0I/tiPRvUK8JbK2FfGLtyn6mES1GCiYk5r5iSPNaLLw8eYP4G7U7oJeSAB9GZfFfgd ZHCJP2XDu6P/x6Pz4+o6j/MD23FArgn+M705PbCTD4crO3bcbO/FrgjkP/Ny5gwPrUpa agRCNHfyi7zjmjI7r6KwXJZ1YfnzUAIjxF+aB1PpJLiZtNEfcK2xf8xxUSfqu4gy41BW l41FqCqH0L8MPMxLemXFYCVSnSGEFnQrQ9RcMBTdNzXNbTgu4S8GNPIpRYsdbiLZID8l /6iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=dnCIxyid; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ho17-20020a1709070e9100b009b2f6b330b9si1242381ejc.353.2023.11.03.10.33.52; Fri, 03 Nov 2023 10:33:52 -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=dnCIxyid; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5452868CDAA; Fri, 3 Nov 2023 19:33:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD86F68CD8F for ; Fri, 3 Nov 2023 19:33:36 +0200 (EET) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1cc68c1fac2so20961675ad.0 for ; Fri, 03 Nov 2023 10:33:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699032814; x=1699637614; 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=MRRJSTvul1t9/Zwt6TnQs/+3RXKVJXPBX1eNFaEkGR0=; b=dnCIxyid6mKaYByFqaVoB49aUFudEZ0riFUsVRnSURGrtYGG0MC8c6t6fsvpnMwKFO 7eB2CaBUh55wUgD0voZjTKPm0QE3XHBNKmr50uponsIjVyzYXoSzdP0G7QYAtSEn+Rpv oqSOUonwuWbvWdvtAfvGavL8vs3XfKsKHYAKXek3bzD97OOLS91/CClou6tBn7GceH4h XMBBppbCq0NJxzhY+r8NtXXLE/EiDbYGPwb/H1wivUlYFu/ctn5PCAXb9pcg8aRbkwlK MgwbhzNG0bcvmxxgYW7xFAmN5LEKECw5TIIWvgqDqDluZBn2Y2gTSvcsbgL4Gz+NzpME WeCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699032814; x=1699637614; 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=MRRJSTvul1t9/Zwt6TnQs/+3RXKVJXPBX1eNFaEkGR0=; b=j4AslxJ30fE1e/GOLWDPq6Y3mznJOvZN9xTb85nXGJ+8AEn7+5KeYcZ2uAj2t3Trco GIHP3QXtnUXJnQQSbcwM5bE8W5CW63EsNoYiNB2X3Bu7aouG2NZ/bPFEurrQ3jBr27PH mbniCNRfi5ddovGuZSY+qN166clr7Re21k76MYW7zGboZ3TeLcCdqNgXUoNM105UZvq+ XM/m1umrmj9EgwdHweSUSc6q+3i7IJrHRVIKFYPr+3b66yA3/VzLnZJbFuANnGkFQKW1 EDluldeucORNobPiGsTQkTUaWJSxvzfly9WGigCW2PYIZ+vnQ7hqhB+iHSY466VIFrvz sZcg== X-Gm-Message-State: AOJu0Yw1K9gakMoYHlTibjVMoNK9ExiDb7F2LSq59HwpDr0tweiXb5XL zvy8JNYbiL8AopZ3Lr/YI4GrVpeVj/q+8w== X-Received: by 2002:a17:903:1104:b0:1c9:dfb8:a5a0 with SMTP id n4-20020a170903110400b001c9dfb8a5a0mr26350478plh.10.1699032813970; Fri, 03 Nov 2023 10:33:33 -0700 (PDT) Received: from localhost.localdomain ([2605:a601:a98f:6200:c4f9:710f:191:99f]) by smtp.gmail.com with ESMTPSA id be4-20020a170902aa0400b001c736b0037fsm1637729plb.231.2023.11.03.10.33.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 10:33:33 -0700 (PDT) From: Dave Johansen To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Nov 2023 11:33:32 -0600 Message-Id: <20231103173332.94028-1-davejohansen@gmail.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: Allow setting master_pl_publish_rate to a negative value to have it write immediately 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: Dave Johansen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: XZedmMI4UhWs --- libavformat/hlsenc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 4ef84c05c1..76d8094de6 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -245,7 +245,7 @@ typedef struct HLSContext { char *var_stream_map; /* user specified variant stream map string */ char *cc_stream_map; /* user specified closed caption streams map string */ char *master_pl_name; - unsigned int master_publish_rate; + int master_publish_rate; int http_persistent; AVIOContext *m3u8_out; AVIOContext *sub_m3u8_out; @@ -1388,7 +1388,9 @@ static int create_master_playlist(AVFormatContext *s, char temp_filename[MAX_URL_SIZE]; input_vs->m3u8_created = 1; - if (!hls->master_m3u8_created) { + if (hls->master_publish_rate < 0) { + hls->master_publish_rate = 0; + } else if (!hls->master_m3u8_created) { /* For the first time, wait until all the media playlists are created */ for (i = 0; i < hls->nb_varstreams; i++) if (!hls->var_streams[i].m3u8_created) @@ -3162,7 +3164,7 @@ static const AVOption options[] = { {"var_stream_map", "Variant stream map string", OFFSET(var_stream_map), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E}, {"cc_stream_map", "Closed captions stream map string", OFFSET(cc_stream_map), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E}, {"master_pl_name", "Create HLS master playlist with this name", OFFSET(master_pl_name), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E}, - {"master_pl_publish_rate", "Publish master play list every after this many segment intervals", OFFSET(master_publish_rate), AV_OPT_TYPE_INT, {.i64 = 0}, 0, UINT_MAX, E}, + {"master_pl_publish_rate", "Publish master play list every after this many segment intervals", OFFSET(master_publish_rate), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, E}, {"http_persistent", "Use persistent HTTP connections", OFFSET(http_persistent), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E }, {"timeout", "set timeout for socket I/O operations", OFFSET(timeout), AV_OPT_TYPE_DURATION, { .i64 = -1 }, -1, INT_MAX, .flags = E }, {"ignore_io_errors", "Ignore IO errors for stable long-duration runs with network output", OFFSET(ignore_io_errors), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E },