From patchwork Tue Mar 13 10:05:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 7960 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp568507jad; Tue, 13 Mar 2018 03:05:39 -0700 (PDT) X-Google-Smtp-Source: AG47ELuyE1SW7famKpOj4SevbgdRtu+2/NPqWjqmAP3gQ0x0RVDImB47isCFKfMusBKGrrcAvw4Y X-Received: by 10.28.183.195 with SMTP id h186mr241957wmf.66.1520935539198; Tue, 13 Mar 2018 03:05:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520935539; cv=none; d=google.com; s=arc-20160816; b=pgFuxvi+ETkkP4SrFmWlmAqFK8O99yR24L1jQjlQJkKBPryAxQPLNV+0g2RwLhyAVk zV+3B2cLBFTEpucP3z1KI7HXvLAAJdqRySEcEJVjT4kc21iIymMmnr5drkXJlj3sU0hH VcwlCiWdZSRYPb501dPtGu1E4RH04LKkq68xqBS3G57e2OwDgzo8l7N9GpZ1+NuCKiVJ AzeY4DVrf6VgxcpBQumolXCDt+V7Al/8SlDiQ1PGxCOcccAYeX1o7t0AOPP7VUtJYJt0 hT7YNx0VyQBLcB85CE40LQhlAxEQ4yF7h9VXxX+bXCSuTzrdvWe+oaT6+dbd3BQ0JFNu bsiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:message-id:date:to:from :delivered-to:arc-authentication-results; bh=fx68a1XZRota8nd4oi0BmtAiRGkXv4eLNRw40wcIjy4=; b=z4GRVktG9/y3LneSRnCdKG+DG0rdOG3h2X+IP8G8pHJD6jyuFPFAs3yDvg523Sh91r G1Xe6/fRSEdTIaCwNEG4E1LEozLUz1x/gw4wy5DMNxTmVtSGQHZ6X2QTadKY6+2SxoAj ZlZ9ijfa1B2dAJGIKZ4ZQu0m7weIrYYyLw+FYWxHRgrqhwr4r5J2tjvIMCOg2VBTj0ss bsP5BksydgoV8QY6kMBa+Qfc7LwRLRkZdRa8VvBiyBw4wnoX7x9PKmM8LdLddhn9ZpVg 9kbsTJdZZ8dfL+T8Z+/8TeOiuzmihx6PDIXRFHoHBZLR7fzR842ai4kkD5SOYM/ipooQ CrJQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h66si105022wmf.47.2018.03.13.03.05.38; Tue, 13 Mar 2018 03:05:39 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8B766689E5E; Tue, 13 Mar 2018 12:05:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgbr2.qq.com (smtpbgbr2.qq.com [54.207.22.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 04148689A40 for ; Tue, 13 Mar 2018 12:05:18 +0200 (EET) X-QQ-mid: bizesmtp3t1520935509t3po5jny2 Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Tue, 13 Mar 2018 18:05:08 +0800 (CST) X-QQ-SSF: 01600000004000F0FKF0000A0000000 X-QQ-FEAT: oHiIVEz9/LEjgK0uZlnXmzh/pbdg//6VQvuZv+xRvDF+IYAyNPB/hv1OL5dQq 4AGfdt49ZIP1/gpaMZu/hbXPVYDPr/Ai2wO2AqJUD0E6HIMrYkDEW8QCKt35xU0c0AmT5KJ dOlBoIUc42u2rpBe8XhHrqmU2aIssLh3/5LLRTxJberOmoOAzanVSIwUNBb7uQ4L9evl4bX 8GOK1Vsr4+yeX7fD2IjOq6O6PlAot31gziWIPcZnQl2wqhQA6DZLTUfnwG+zAFb36xiUoi4 ZyxY2IC46iXGy8LIhu9tRnZ3I= X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Mar 2018 18:05:04 +0800 Message-Id: <20180313100505.2563-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign4 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/hlsenc: remove unnecessary variate and logic 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" write init file and first segment at the same time, so remove the unnecessary variate and logic. Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index d319cba764..185e3442f6 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -111,7 +111,6 @@ typedef struct VariantStream { AVOutputFormat *oformat; AVOutputFormat *vtt_oformat; AVIOContext *out; - int packets_written; int init_range_length; AVFormatContext *avf; @@ -745,7 +744,6 @@ static int hls_mux_init(AVFormatContext *s, VariantStream *vs) av_dict_copy(&st->metadata, vs->streams[i]->metadata, 0); } - vs->packets_written = 1; vs->start_pos = 0; vs->new_start = 1; vs->fmp4_init_mode = 0; @@ -756,7 +754,6 @@ static int hls_mux_init(AVFormatContext *s, VariantStream *vs) return AVERROR_PATCHWELCOME; } - vs->packets_written = 0; vs->init_range_length = 0; vs->fmp4_init_mode = !byterange_mode; set_http_options(s, &options, hls); @@ -2170,7 +2167,7 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) } - if (vs->packets_written && can_split && av_compare_ts(pkt->pts - vs->start_pts, st->time_base, + if (can_split && av_compare_ts(pkt->pts - vs->start_pts, st->time_base, end_pts, AV_TIME_BASE_Q) >= 0) { int64_t new_start_pos; char *old_filename = NULL; @@ -2192,7 +2189,6 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) avio_write(vs->out, buffer, range_length); vs->init_range_length = range_length; avio_open_dyn_buf(&oc->pb); - vs->packets_written = 0; vs->start_pos = range_length; if (!byterange_mode) { ff_format_io_close(s, &vs->out); @@ -2216,10 +2212,6 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) hls_rename_temp_file(s, oc); } - if (vs->fmp4_init_mode) { - vs->number--; - } - if (hls->segment_type == SEGMENT_TYPE_FMP4) { if (hls->flags & HLS_SINGLE_FILE) { ret = flush_dynbuf(vs, &range_length); @@ -2295,7 +2287,6 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) } } - vs->packets_written++; ret = ff_write_chained(oc, stream_index, pkt, s, 0); return ret;