From patchwork Tue Feb 21 23:53:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 2634 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.149 with SMTP id x21csp627036vsf; Tue, 21 Feb 2017 15:54:58 -0800 (PST) X-Received: by 10.223.163.81 with SMTP id d17mr21715649wrb.93.1487721298323; Tue, 21 Feb 2017 15:54:58 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p26si29801142wrp.311.2017.02.21.15.54.57; Tue, 21 Feb 2017 15:54:58 -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; 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 99F3D688324; Wed, 22 Feb 2017 01:54:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg278.qq.com (unknown [113.108.11.203]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9AF196882C0 for ; Wed, 22 Feb 2017 01:54:38 +0200 (EET) X-QQ-mid: bizesmtp8t1487721233tuz9cu89o Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Wed, 22 Feb 2017 07:53:53 +0800 (CST) X-QQ-SSF: 01100000002000F0F830B00A0000000 X-QQ-FEAT: 9NFkmNiL4hejtORNWVON7Mcz4dm7aDH8B5+JZOaBMWLYakyguTRODZTlsGASW hdysLHfJhxXrbRk8kXTKf50WzZZ4I8wcMEiER2EW5IAJW52cJTkVGkzjt4lrXXi9ime4C8o zy/fPkqldRXTCWbz9FAWpjNh8lFMIGTTt4UC66goaQLxZ4Pm2EjchnLoxakfZdJHXvR3Ggu x/M1rWenPkcA850MW2P40Uh/64+YWBintoy7EQJ6wVmpFDbSJbtlWoTursRFQACiQF5Q/B4 7aJcnWpUgox+rW X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Feb 2017 07:53:50 +0800 Message-Id: <20170221235350.19112-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH v2] avformat/hlsenc: fix hls_flags temp_file bug 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" refer to ticket id: #6170 rename file from temp to origin name after complete current segment Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 55 ++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 86a3b05..118aef2 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -691,6 +691,17 @@ static void write_m3u8_head_block(HLSContext *hls, AVIOContext *out, int version av_log(hls, AV_LOG_VERBOSE, "EXT-X-MEDIA-SEQUENCE:%"PRId64"\n", sequence); } +static void hls_rename_temp_file(AVFormatContext *s, AVFormatContext *oc) +{ + size_t len = strlen(oc->filename); + char final_filename[sizeof(oc->filename)]; + + av_strlcpy(final_filename, oc->filename, len); + final_filename[len-4] = '\0'; + ff_rename(oc->filename, final_filename, s); + oc->filename[len-4] = '\0'; +} + static int hls_window(AVFormatContext *s, int last) { HLSContext *hls = s->priv_data; @@ -833,15 +844,6 @@ static int hls_start(AVFormatContext *s) char *filename, iv_string[KEYSIZE*2 + 1]; int err = 0; - if ((c->flags & HLS_TEMP_FILE) && oc->filename[0] != 0) { - size_t len = strlen(oc->filename); - char final_filename[sizeof(oc->filename)]; - av_strlcpy(final_filename, oc->filename, len); - final_filename[len-4] = '\0'; - ff_rename(oc->filename, final_filename, s); - oc->filename[len-4] = '\0'; - } - if (c->flags & HLS_SINGLE_FILE) { av_strlcpy(oc->filename, c->basename, sizeof(oc->filename)); @@ -1325,6 +1327,17 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) new_start_pos = avio_tell(hls->avf->pb); hls->size = new_start_pos - hls->start_pos; + + if ((hls->flags & HLS_TEMP_FILE) && oc->filename[0]) { + if (!(hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size <= 0)) + if (hls->avf->oformat->priv_class && hls->avf->priv_data) + av_opt_set(hls->avf->priv_data, "mpegts_flags", "resend_headers", 0); + ff_format_io_close(s, &oc->pb); + if (hls->vtt_avf) + ff_format_io_close(s, &hls->vtt_avf->pb); + hls_rename_temp_file(s, oc); + } + ret = hls_append_segment(s, hls, hls->duration, hls->start_pos, hls->size); hls->start_pos = new_start_pos; if (ret < 0) { @@ -1336,21 +1349,14 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) hls->duration = 0; if (hls->flags & HLS_SINGLE_FILE) { - if (hls->avf->oformat->priv_class && hls->avf->priv_data) - av_opt_set(hls->avf->priv_data, "mpegts_flags", "resend_headers", 0); hls->number++; } else if (hls->max_seg_size > 0) { - if (hls->avf->oformat->priv_class && hls->avf->priv_data) - av_opt_set(hls->avf->priv_data, "mpegts_flags", "resend_headers", 0); if (hls->start_pos >= hls->max_seg_size) { hls->sequence++; - ff_format_io_close(s, &oc->pb); if ((hls->flags & (HLS_SECOND_LEVEL_SEGMENT_SIZE | HLS_SECOND_LEVEL_SEGMENT_DURATION)) && strlen(hls->current_segment_final_filename_fmt)) { ff_rename(old_filename, hls->avf->filename, hls); } - if (hls->vtt_avf) - ff_format_io_close(s, &hls->vtt_avf->pb); ret = hls_start(s); hls->start_pos = 0; /* When split segment by byte, the duration is short than hls_time, @@ -1359,13 +1365,10 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) } hls->number++; } else { - ff_format_io_close(s, &oc->pb); if ((hls->flags & (HLS_SECOND_LEVEL_SEGMENT_SIZE | HLS_SECOND_LEVEL_SEGMENT_DURATION)) && strlen(hls->current_segment_final_filename_fmt)) { ff_rename(old_filename, hls->avf->filename, hls); } - if (hls->vtt_avf) - ff_format_io_close(s, &hls->vtt_avf->pb); ret = hls_start(s); } @@ -1402,6 +1405,11 @@ static int hls_write_trailer(struct AVFormatContext *s) if (oc->pb) { hls->size = avio_tell(hls->avf->pb) - hls->start_pos; ff_format_io_close(s, &oc->pb); + + if ((hls->flags & HLS_TEMP_FILE) && oc->filename[0]) { + hls_rename_temp_file(s, oc); + } + /* after av_write_trailer, then duration + 1 duration per packet */ hls_append_segment(s, hls, hls->duration + hls->dpp, hls->start_pos, hls->size); } @@ -1411,15 +1419,6 @@ static int hls_write_trailer(struct AVFormatContext *s) ff_rename(old_filename, hls->avf->filename, hls); } - if ((hls->flags & HLS_TEMP_FILE) && oc->filename[0] != 0) { - size_t len = strlen(oc->filename); - char final_filename[sizeof(oc->filename)]; - av_strlcpy(final_filename, oc->filename, len); - final_filename[len-4] = '\0'; - ff_rename(oc->filename, final_filename, s); - oc->filename[len-4] = '\0'; - } - if (vtt_oc) { if (vtt_oc->pb) av_write_trailer(vtt_oc);