From patchwork Fri May 8 10:33:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 19552 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 BA7CB44A321 for ; Fri, 8 May 2020 13:34:19 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9B0CD6880F3; Fri, 8 May 2020 13:34:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgeu1.qq.com (smtpbgeu1.qq.com [52.59.177.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F083C6880F3 for ; Fri, 8 May 2020 13:34:12 +0300 (EEST) X-QQ-mid: bizesmtp22t1588934048tn1bz42u Received: from localhost (unknown [103.107.216.231]) by esmtp6.qq.com (ESMTP) with id ; Fri, 08 May 2020 18:34:07 +0800 (CST) X-QQ-SSF: 01100000002000Y0ZXF0B00A0000000 X-QQ-FEAT: EsXzJ1DdTXIyIzIr4FxR25snerteieOeymmYKT6z3f7QvN86ZpaGsGRKBznK5 s7O0tzCw8rNpHNeFaqncKvi8YMJ3qkzUu9V4CTkTzG83rdziJzrYvvhHNirbVsFl++26fhf xXfpaDBfGCT/rJkMG+5wwG73ACoJhcFOMdPDbBFD8MrcRTpGcMy/7r78A/uxA0cNTJQaDI8 eom4X4C88XkAzKaMish9s3AaR2Zf3hEIkr8LnPwB/kZmcEZPJBM/tDVavNsih1XwTXflNNM Y+7J5jl8N1Uhu6mGQyNPf7NOclRUvi7BUriab190YHMq4+kbk+MUL81IU= X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 May 2020 18:33:57 +0800 Message-Id: <20200508103359.65143-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign7 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/hlsenc: move number out of hls_start 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: Steven Liu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index a1eddade7b..bcc67b1159 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1679,7 +1679,6 @@ static int hls_start(AVFormatContext *s, VariantStream *vs) ff_format_set_url(vtt_oc, filename); } } - vs->number++; proto = avio_find_protocol_name(oc->url); use_temp_file = proto && !strcmp(proto, "file") && (c->flags & HLS_TEMP_FILE); @@ -2515,7 +2514,6 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) } if (hls->flags & HLS_SINGLE_FILE) { - vs->number++; vs->start_pos += vs->size; } else if (hls->max_seg_size > 0) { vs->start_pos = new_start_pos; @@ -2526,14 +2524,13 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) vs->start_pos = 0; /* When split segment by byte, the duration is short than hls_time, * so it is not enough one segment duration as hls_time, */ - vs->number--; } - vs->number++; } else { vs->start_pos = new_start_pos; sls_flag_file_rename(hls, vs, old_filename); ret = hls_start(s, vs); } + vs->number++; av_freep(&old_filename); if (ret < 0) { @@ -3028,6 +3025,7 @@ static int hls_init(AVFormatContext *s) if ((ret = hls_start(s, vs)) < 0) goto fail; + vs->number++; } fail: