From patchwork Fri Feb 28 09:53:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17959 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6214:1865:0:0:0:0 with SMTP id eh5csp1913253qvb; Fri, 28 Feb 2020 01:54:37 -0800 (PST) X-Google-Smtp-Source: APXvYqx/IuVIWREbSCVbBpQW7VVkSVWJ0a7kmuHifExfcVxR5r3K4rZZnpycBSsPM0RmbH5JyCo7 X-Received: by 2002:a50:ed0a:: with SMTP id j10mr3328086eds.215.1582883676939; Fri, 28 Feb 2020 01:54:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582883676; cv=none; d=google.com; s=arc-20160816; b=CBld4R42b6ZffHtXvxMCkKY6KqSQtp59IgBq7cjPFpuS7URkaZquRIfe6y4CIA12Qg lIUdMG0TS+5JntonmJLWEZjqS9N+608t3mHmk8y6vXqUfhsqmL1VZAhUQ1sMQyYH+djU WsMTllPu80vCBPJ4Vw7uIKLsHPGmetpkGU+iMpuqwM0O4WK1ze+piEWaVKxuqX5q9Rxb vOB5d2HD9U8SfTGiluJAgiUqaAzA5tDNTL1B4MlUXIhb4Go+tUZqiXFwO2sdzLvZ6bre Pp43w3n1JyeSIIs+KIiSncBf2xoPcAzxhzf45wtPCoCwpv1gsQA8h3E5yxDTfUINisc2 JUWQ== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=UEkpDZpjUPxNVpxUBLlfqxi6Rl1aLXTalCuIs9W45Ws=; b=up49ZyjD9Jt6AJOEea5C33xnYvlCfj2cvNPnh//1PSa/JwO5WTWbPRZR6Yl1S8GtwO ipTZLWcW39G7LzY8KeBaigrYVOCXIuwH8kKJOIWZHG6ssDlnlFfZdVsgx+xfrfwJy0WO Jp550RAHJ3aeaHmBrj1rxxMlFgTE6QRxVb4quKm/0ZU7UdhDfQiern7ZdpjCd+CYJUum M4HIOfj2CGqJ+f4g+i+0sAckJEgb+8FdG153sZa/1ngt3PWicWcre0AqPpnNDVhc/rlG xL+Q4kixDrw4CdG38QcggDao5R4U7GeZeT8w3n9pDlalQpsvnMoijtcGmStd7wzbexyD LnYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ew9Fr6yQ; 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 t12si1558456edr.504.2020.02.28.01.54.36; Fri, 28 Feb 2020 01:54:36 -0800 (PST) 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=20161025 header.b=ew9Fr6yQ; 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 C8A1668B581; Fri, 28 Feb 2020 11:54:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3071768B4E6 for ; Fri, 28 Feb 2020 11:53:56 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id j16so2241464wrt.3 for ; Fri, 28 Feb 2020 01:53:56 -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=KZggaLlVRmQ/aa46ut8YhKc9nnVcAFFxr/2WCttZpUM=; b=ew9Fr6yQy4v1N7UK2nJ6qhVPsosmhmS7nck8Lhr1acuXe4H0KcLSmqWfr7CmH7Ya9r yQRAywu+HkaspS6QBeccEvfNXkZYG4JZ9+wzaTc2ccRgRCdEzhPOob5HAp0FP/64QwxV WI1CRJRaKpVwLT+CqOhCjirEl83QYqJAS2kZTRHKzG652AcEP4HthO7JfIFFXoRhJ2K+ F0mOq2Q/N1r6EM25/QJOCF0h4IxSYgg2XIS/61dUgb/3SrAOmozvk2SZMVbI6vsWp9xq qNlGYCQApaHW+Yw8KpbRAnIY1nRKwwdldLAfYLq4Ob3fjpbnS5feZlQ1oRhif8yP4esq wj4Q== 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=KZggaLlVRmQ/aa46ut8YhKc9nnVcAFFxr/2WCttZpUM=; b=erRXi+TJTTAJhY3LdrhlEIBCOtKByk/52TkxqFze2YVelwORYhGpUOe/HGjOVSO9oR gP2j1wqvqJr3pjVYGqs6j6nAOfUbG+JcZZs4PKiBueeQUMDbenpQbUI6C0hVRzBYuviY wXwhrxN/wG7DgTqexCVMcjcLWXhu8KbeQ+JjgvJ72zPqSktL8ZVH8t+bZWpZw0CLT90D tlk45Ly5Atve8IH8RmbGsSNT9pdAjLVmSvNBzCGiS8TlzuNOkad2V1bmn1lLYNV6FNi2 6w4sPQhvnNfGBXB+e0vKkQiFt7KFq0S0xyQxfAYzjZTkvVGKFle8xGlsLXLCMcrxphOv UobQ== X-Gm-Message-State: APjAAAWvFAwOnYPevBaW+dbbnb1NbmGw4lYG0N2si3j2WDX6NAa+YcG9 GRe1X8m8C2mPtGMOLLeyi7v+Ki1Z X-Received: by 2002:a5d:568f:: with SMTP id f15mr4157009wrv.202.1582883635451; Fri, 28 Feb 2020 01:53:55 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1ab4b.dynamic.kabel-deutschland.de. [188.193.171.75]) by smtp.gmail.com with ESMTPSA id c8sm1453360wru.7.2020.02.28.01.53.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2020 01:53:54 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Feb 2020 10:53:20 +0100 Message-Id: <20200228095321.7222-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200228095321.7222-1-andreas.rheinhardt@gmail.com> References: <20200228095321.7222-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 6/7] 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" X-TUID: jN4h9EyK8m/o Content-Length: 2708 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 e3a310dbc1..317b1a6f5e 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2749,6 +2749,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]; @@ -2761,14 +2770,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);