From patchwork Thu Jan 12 16:55:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Liu X-Patchwork-Id: 2198 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1364783vsb; Thu, 12 Jan 2017 08:56:06 -0800 (PST) X-Received: by 10.223.150.84 with SMTP id c20mr7846384wra.178.1484240166497; Thu, 12 Jan 2017 08:56:06 -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 f1si1679091wmf.72.2017.01.12.08.56.05; Thu, 12 Jan 2017 08:56:06 -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 2721D68A1BA; Thu, 12 Jan 2017 18:55:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpproxy19.qq.com (smtpproxy19.qq.com [184.105.206.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EDACB68A0E6 for ; Thu, 12 Jan 2017 18:55:47 +0200 (EET) X-QQ-mid: bizesmtp16t1484240138t5sa4vwr Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Fri, 13 Jan 2017 00:55:38 +0800 (CST) X-QQ-SSF: 01100000002000F0F721B00A0000000 X-QQ-FEAT: 7CkBtP9O/BKMlyWQCEMc2hHPGShT5NExZcqZUutI9OsRmNLEfNFLW0mU0HDcl u15+NJ+lx2lWmtY9+haz/oYeURWMeOrDQdAdmBVO2wznI0yKqBFlcEMmZmqxsGHInstpFPS e/PoAuwnG2VkhHwX8QqXGBzuBaGLFvqh/SKeQZkq4n3HdXoW2S4orGxtPFkg6b/rmZeTIdb +MwdEAk8on5DkRAQiPKXBaQY0BaBgStQPESj29iBZ6GdvPS1hV3a+BR5GwRg4yH6D+d238F 3YbBkIxeEvOJ1F X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 Jan 2017 00:55:31 +0800 Message-Id: <20170112165531.3495-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 hlsenc bug at windows system 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" when hlsenc use flag second_level_segment_index, second_level_segment_size and second_level_segment_duration, the rename is ok but the output filename always use the old filename so move the rename operation after the close the ts file and before open new segment Reported-by: Christian Johannesen Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 49 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index a2c606c..f662913 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -453,16 +453,10 @@ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, double if ((hls->flags & (HLS_SECOND_LEVEL_SEGMENT_SIZE | HLS_SECOND_LEVEL_SEGMENT_DURATION)) && strlen(hls->current_segment_final_filename_fmt)) { - char * old_filename = av_strdup(hls->avf->filename); // %%s will be %s after strftime - if (!old_filename) { - av_free(en); - return AVERROR(ENOMEM); - } av_strlcpy(hls->avf->filename, hls->current_segment_final_filename_fmt, sizeof(hls->avf->filename)); if (hls->flags & HLS_SECOND_LEVEL_SEGMENT_SIZE) { char * filename = av_strdup(hls->avf->filename); // %%s will be %s after strftime if (!filename) { - av_free(old_filename); av_free(en); return AVERROR(ENOMEM); } @@ -473,7 +467,6 @@ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, double "you can try to remove second_level_segment_size flag\n", filename); av_free(filename); - av_free(old_filename); av_free(en); return AVERROR(EINVAL); } @@ -482,7 +475,6 @@ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, double if (hls->flags & HLS_SECOND_LEVEL_SEGMENT_DURATION) { char * filename = av_strdup(hls->avf->filename); // %%t will be %t after strftime if (!filename) { - av_free(old_filename); av_free(en); return AVERROR(ENOMEM); } @@ -493,14 +485,11 @@ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, double "you can try to remove second_level_segment_time flag\n", filename); av_free(filename); - av_free(old_filename); av_free(en); return AVERROR(EINVAL); } av_free(filename); } - ff_rename(old_filename, hls->avf->filename, hls); - av_free(old_filename); } @@ -1239,14 +1228,22 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) if (can_split && av_compare_ts(pkt->pts - hls->start_pts, st->time_base, end_pts, AV_TIME_BASE_Q) >= 0) { int64_t new_start_pos; + char *old_filename = av_strdup(hls->avf->filename); + + if (!old_filename) { + return AVERROR(ENOMEM); + } + av_write_frame(oc, NULL); /* Flush any buffered data */ new_start_pos = avio_tell(hls->avf->pb); hls->size = new_start_pos - hls->start_pos; ret = hls_append_segment(s, hls, hls->duration, hls->start_pos, hls->size); hls->start_pos = new_start_pos; - if (ret < 0) + if (ret < 0) { + av_free(old_filename); return ret; + } hls->end_pts = pkt->pts; hls->duration = 0; @@ -1261,6 +1258,10 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) 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); @@ -1272,22 +1273,30 @@ 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); } - if (ret < 0) + if (ret < 0) { + av_free(old_filename); return ret; + } if( st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE ) oc = hls->vtt_avf; else oc = hls->avf; - if ((ret = hls_window(s, 0)) < 0) + if ((ret = hls_window(s, 0)) < 0) { + av_free(old_filename); return ret; + } } ret = ff_write_chained(oc, stream_index, pkt, s, 0); @@ -1300,6 +1309,12 @@ static int hls_write_trailer(struct AVFormatContext *s) HLSContext *hls = s->priv_data; AVFormatContext *oc = hls->avf; AVFormatContext *vtt_oc = hls->vtt_avf; + char *old_filename = av_strdup(hls->avf->filename); + + if (!old_filename) { + return AVERROR(ENOMEM); + } + av_write_trailer(oc); if (oc->pb) { @@ -1309,6 +1324,11 @@ static int hls_write_trailer(struct AVFormatContext *s) hls_append_segment(s, hls, hls->duration + hls->dpp, hls->start_pos, hls->size); } + 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 (vtt_oc) { if (vtt_oc->pb) av_write_trailer(vtt_oc); @@ -1329,6 +1349,7 @@ static int hls_write_trailer(struct AVFormatContext *s) hls_free_segments(hls->segments); hls_free_segments(hls->old_segments); + av_free(old_filename); return 0; }