From patchwork Mon Dec 16 00:04:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16817 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 E435244A07A for ; Mon, 16 Dec 2019 02:04:54 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CC29668AC9C; Mon, 16 Dec 2019 02:04:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 89BFB68A6D5 for ; Mon, 16 Dec 2019 02:04:45 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id t14so4789170wmi.5 for ; Sun, 15 Dec 2019 16:04:45 -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=+8qM3D6q3YQ84XRL4Szp9rbYLLABU8ahe+zEoTkHWRE=; b=afAMjIc5rwJ/13iKtPSDndyxCPj85cgOF6L4MmfxFRZNaTSiSlDqXkgdDJXDfvgAHd FTMzxlpybqpvKhy5+Ii0Oydl2p2RGCQvk4RrZmvtZMZw2V9KRqmRnI/34yGFTh0hAsCE M7dqBmYV8qFy/UyP24JP201vTF0BGKfGnyw9aMUlWCKJcdswnB6QpA1x6GCtXSfXSLQ1 +C//wG+eqyvx26FBD5nLbQlbCsAww9utjCPbTjCTo7J1wQ8Iy1R9Tz3LBub/LiCyL3If i7vci156o2ZVVjec6MYSnpBaiEsE58DB6lcsSQJt5+8TJGQrri7TEfob5ztobYtH7siF M1Mg== 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=+8qM3D6q3YQ84XRL4Szp9rbYLLABU8ahe+zEoTkHWRE=; b=Q8zZi9oacQ++EeDLH/JaK7VpkKhLLn4JP+n4n+p2SGM9zQ/AjDcKu1pYFk29N+IwrW lpmZi4XkUEVVtcVVd5IGkjkL8EhRoWw76dBWwTOALErXXOlX6GPb5iBIsYWZQkfzNVWt j2RRzfcSSynnVm3sOB3Omdhd8zENtktbT/KFN9Imuqf6WqGWFhFcpnkK/E5266nQUH13 H30WRiViqPGpXzQgRYHRMOTX9kuHEbRNLftg/+2cnbBs/AK6xg2uz9XRQbUGS+nul7XG k4J9GPPeL0vkHEsiRvDJB47Je+2Sqic91hE7qPMy4FMLf+RPNF9BLiwVXb7cXm4u6voW vx1Q== X-Gm-Message-State: APjAAAVsPwncrjqrYkF52gsF7YYMyLGu8XfUr9ENSRD0BohdS7+KefYz PrAd5n+nleBxvBi+gJFCnLORf6pT X-Google-Smtp-Source: APXvYqzHCcPpIK4qPLbsVIqjhADM1Mq0tR1Lv5jqdgpoAO4oMZDzZvGUGffuRSN7d0tJm2DtgO5r7Q== X-Received: by 2002:a05:600c:2050:: with SMTP id p16mr22636065wmg.176.1576454684862; Sun, 15 Dec 2019 16:04:44 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2019 16:04:44 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Dec 2019 01:04:08 +0100 Message-Id: <20191216000418.24707-7-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 06/16] avformat/hlsenc: Use smaller scope for some variables 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" Several variables which are only used when the HLS_SINGLE_FILE bit is not set have nevertheless been set regardless of whether this bit is set. This has been changed; futhermore, these variables have been moved into a smaller scope. Signed-off-by: Andreas Rheinhardt --- libavformat/hlsenc.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 5b3856099c..62f66c4c65 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2237,8 +2237,6 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) int ret = 0, can_split = 1, i, j; int stream_index = 0; int range_length = 0; - const char *proto = NULL; - int use_temp_file = 0; uint8_t *buffer = NULL; VariantStream *vs = NULL; char *old_filename = NULL; @@ -2337,11 +2335,6 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) } } - if (oc->url[0]) { - proto = avio_find_protocol_name(oc->url); - use_temp_file = proto && !strcmp(proto, "file") && (hls->flags & HLS_TEMP_FILE); - } - if (hls->flags & HLS_SINGLE_FILE) { ret = flush_dynbuf(vs, &range_length); av_freep(&vs->temp_buffer); @@ -2350,6 +2343,14 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) } vs->size = range_length; } else { + int use_temp_file = 0; + + if (oc->url[0]) { + const char *proto = avio_find_protocol_name(oc->url); + use_temp_file = proto && !strcmp(proto, "file") + && (hls->flags & HLS_TEMP_FILE); + } + if ((hls->max_seg_size > 0 && (vs->size >= hls->max_seg_size)) || !byterange_mode) { AVDictionary *options = NULL; char *filename = NULL; @@ -2399,10 +2400,9 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) av_freep(&vs->temp_buffer); av_freep(&filename); } - } - if (use_temp_file && !(hls->flags & HLS_SINGLE_FILE)) { - hls_rename_temp_file(s, oc); + if (use_temp_file) + hls_rename_temp_file(s, oc); } old_filename = av_strdup(oc->url);