From patchwork Mon Dec 16 00:04:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16824 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 7B35044A08A for ; Mon, 16 Dec 2019 02:06:47 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 276DF68ACF7; Mon, 16 Dec 2019 02:05:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC5E168A9F4 for ; Mon, 16 Dec 2019 02:04:53 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id b19so4827459wmj.4 for ; Sun, 15 Dec 2019 16:04:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KAP2MCYS5ElESyW1LZjbHFOEN+BbnWz5FpKdPR0NBQs=; b=fRhYaujCyGc63RX9euAdiDanCiwR9yLvc6V0gXUYXUaveAET4yMnrgdKqcKR8NS2/J jQcSe5tQsOiVUAo0fGLZawY2zwShigoMQd4w1RzcRxQ2UCQdImC5S7WBHd9tbPS8SXGA bffx5D95qxx171ccwcjJh3j/5VT1RcqmcnhwpDCiKx1+Ed3tY05wnp7HziRqITDL+5d9 Yzp7hFUhSyCYRJJZZRgUsN6DSepM6sIEjn/eMdahq6GKvCc0A5hjpVrXfNnD2VQBowwY e2wcd771LubjPAg1oRr6E51pFtl2pFvQxphe1ar1XdCCkteFXpAP/dCkNwHSit+zFOdK ookg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KAP2MCYS5ElESyW1LZjbHFOEN+BbnWz5FpKdPR0NBQs=; b=iDw9X6YacYtN/0p+eas/ivwfMkoVPHAo8CoFDoNDA6Kgybr0dRKUrzLpXHE28t01yh CcxoTzfLbyFHhhjWaGSlVAgJw8pqRKA+QkOPuhSqjHMK0l/HP9H48Zdr6vq9A7QPCWnU 0Kk0LHUhwksMKag2/44TTdnfFRmGq2MwquSNLXvytyI2wo/YVhOGvAN1R5HDRiv4N1Ka rKnGKXdzefykJWay8RCvzAeGwWgbiYP/Oa+7IzOyiBvt8+ARspYK4F0mRVaMH3C7GDiK 8g+P0nI2v61PF+MUGgAFxMQiRz6KweSRwbf0PpymWfDK5/eEQJK4Kl0k7DQc4pqAr9kQ hV0A== X-Gm-Message-State: APjAAAXYFosB9FdDftFIxlHoL8pEXaLtvh0A6IUN8O80kOLNImpJyoAs RuszecmquPWVtiDtMmMU44QRIL0f X-Google-Smtp-Source: APXvYqzNfVcjf1laf/kVN8TSW4LQqTAE3KmTP4n7VasI0MDmbIACrg6zepEuYjptxqBWYrM78Dk2tQ== X-Received: by 2002:a1c:7f0c:: with SMTP id a12mr27041402wmd.159.1576454692969; Sun, 15 Dec 2019 16:04:52 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id s1sm19214442wmc.23.2019.12.15.16.04.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2019 16:04:52 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Dec 2019 01:04:17 +0100 Message-Id: <20191216000418.24707-16-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191216000418.24707-1-andreas.rheinhardt@gmail.com> References: <20191216000418.24707-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 15/16] avformat/hlsenc: Factor check out of loop X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The check will be true at most once anyway. Signed-off-by: Andreas Rheinhardt --- libavformat/hlsenc.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 16595f02cd..62a52b176f 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2759,6 +2759,15 @@ static int hls_init(AVFormatContext *s) } hls->recording_time = (hls->init_time ? hls->init_time : hls->time) * AV_TIME_BASE; + + if (hls->flags & HLS_SPLIT_BY_TIME && hls->flags & HLS_INDEPENDENT_SEGMENTS) { + // Independent segments cannot be guaranteed when splitting by time + hls->flags &= ~HLS_INDEPENDENT_SEGMENTS; + av_log(s, AV_LOG_WARNING, + "'split_by_time' and 'independent_segments' cannot be enabled together. " + "Disabling 'independent_segments' flag\n"); + } + for (i = 0; i < hls->nb_varstreams; i++) { vs = &hls->var_streams[i]; @@ -2771,14 +2780,6 @@ static int hls_init(AVFormatContext *s) vs->end_pts = AV_NOPTS_VALUE; vs->current_segment_final_filename_fmt[0] = '\0'; - if (hls->flags & HLS_SPLIT_BY_TIME && hls->flags & HLS_INDEPENDENT_SEGMENTS) { - // Independent segments cannot be guaranteed when splitting by time - hls->flags &= ~HLS_INDEPENDENT_SEGMENTS; - av_log(s, AV_LOG_WARNING, - "'split_by_time' and 'independent_segments' cannot be enabled together. " - "Disabling 'independent_segments' flag\n"); - } - if (hls->flags & HLS_PROGRAM_DATE_TIME) { time_t now0; time(&now0);