Message ID | 20171218084724.13928-1-lq@chinaffmpeg.org |
---|---|
State | Accepted |
Commit | 7feae7be5b08916e1d563ad16388a3dd6d40114b |
Headers | show |
On 12/18/17 2:17 PM, Steven Liu wrote: > Signed-off-by: Steven Liu <lq@chinaffmpeg.org> > --- > libavformat/hlsenc.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c > index f51fec1030..0eebcb4462 100644 > --- a/libavformat/hlsenc.c > +++ b/libavformat/hlsenc.c > @@ -1806,14 +1806,14 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) > if (!byterange_mode) { > if (hls->segment_type == SEGMENT_TYPE_FMP4) { > if (!vs->init_range_length) { > - avio_flush(oc->pb); > - range_length = avio_close_dyn_buf(oc->pb, &buffer); > - avio_write(vs->out, buffer, range_length); > - vs->init_range_length = range_length; > - avio_open_dyn_buf(&oc->pb); > - vs->packets_written = 0; > - ff_format_io_close(s, &vs->out); > - hlsenc_io_close(s, &vs->out, vs->base_output_dirname); > + avio_flush(oc->pb); > + range_length = avio_close_dyn_buf(oc->pb, &buffer); > + avio_write(vs->out, buffer, range_length); > + vs->init_range_length = range_length; > + avio_open_dyn_buf(&oc->pb); > + vs->packets_written = 0; > + ff_format_io_close(s, &vs->out); > + hlsenc_io_close(s, &vs->out, vs->base_output_dirname); > } > } else { > hlsenc_io_close(s, &oc->pb, oc->filename); > @@ -1847,7 +1847,7 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) > } > ff_format_io_close(s, &vs->out); > } > - ret = hls_append_segment(s, hls, vs, vs->duration, vs->start_pos, vs->size); > + ret = hls_append_segment(s, hls, vs, vs->duration, vs->start_pos, vs->size); > vs->start_pos = new_start_pos; > if (ret < 0) { > av_free(old_filename); > @@ -1932,7 +1932,7 @@ static int hls_write_trailer(struct AVFormatContext *s) > if (oc->pb) { > vs->size = avio_tell(vs->avf->pb) - vs->start_pos; > if (hls->segment_type != SEGMENT_TYPE_FMP4) > - ff_format_io_close(s, &oc->pb); > + ff_format_io_close(s, &oc->pb); > > if ((hls->flags & HLS_TEMP_FILE) && oc->filename[0]) { > hls_rename_temp_file(s, oc); > @@ -2292,8 +2292,8 @@ static int hls_init(AVFormatContext *s) > } > } > > - if ((ret = hls_start(s, vs)) < 0) > - goto fail; > + if ((ret = hls_start(s, vs)) < 0) > + goto fail; > } > > fail: LGTM
> On 19 Dec 2017, at 11:43, Karthick Jeyapal <kjeyapal@akamai.com> wrote: > > > > On 12/18/17 2:17 PM, Steven Liu wrote: >> Signed-off-by: Steven Liu <lq@chinaffmpeg.org> >> --- >> libavformat/hlsenc.c | 24 ++++++++++++------------ >> 1 file changed, 12 insertions(+), 12 deletions(-) >> >> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c >> index f51fec1030..0eebcb4462 100644 >> --- a/libavformat/hlsenc.c >> +++ b/libavformat/hlsenc.c >> @@ -1806,14 +1806,14 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) >> if (!byterange_mode) { >> if (hls->segment_type == SEGMENT_TYPE_FMP4) { >> if (!vs->init_range_length) { >> - avio_flush(oc->pb); >> - range_length = avio_close_dyn_buf(oc->pb, &buffer); >> - avio_write(vs->out, buffer, range_length); >> - vs->init_range_length = range_length; >> - avio_open_dyn_buf(&oc->pb); >> - vs->packets_written = 0; >> - ff_format_io_close(s, &vs->out); >> - hlsenc_io_close(s, &vs->out, vs->base_output_dirname); >> + avio_flush(oc->pb); >> + range_length = avio_close_dyn_buf(oc->pb, &buffer); >> + avio_write(vs->out, buffer, range_length); >> + vs->init_range_length = range_length; >> + avio_open_dyn_buf(&oc->pb); >> + vs->packets_written = 0; >> + ff_format_io_close(s, &vs->out); >> + hlsenc_io_close(s, &vs->out, vs->base_output_dirname); >> } >> } else { >> hlsenc_io_close(s, &oc->pb, oc->filename); >> @@ -1847,7 +1847,7 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) >> } >> ff_format_io_close(s, &vs->out); >> } >> - ret = hls_append_segment(s, hls, vs, vs->duration, vs->start_pos, vs->size); >> + ret = hls_append_segment(s, hls, vs, vs->duration, vs->start_pos, vs->size); >> vs->start_pos = new_start_pos; >> if (ret < 0) { >> av_free(old_filename); >> @@ -1932,7 +1932,7 @@ static int hls_write_trailer(struct AVFormatContext *s) >> if (oc->pb) { >> vs->size = avio_tell(vs->avf->pb) - vs->start_pos; >> if (hls->segment_type != SEGMENT_TYPE_FMP4) >> - ff_format_io_close(s, &oc->pb); >> + ff_format_io_close(s, &oc->pb); >> if ((hls->flags & HLS_TEMP_FILE) && oc->filename[0]) { >> hls_rename_temp_file(s, oc); >> @@ -2292,8 +2292,8 @@ static int hls_init(AVFormatContext *s) >> } >> } >> - if ((ret = hls_start(s, vs)) < 0) >> - goto fail; >> + if ((ret = hls_start(s, vs)) < 0) >> + goto fail; >> } >> fail: > LGTM Pushed Thanks Steven > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index f51fec1030..0eebcb4462 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1806,14 +1806,14 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) if (!byterange_mode) { if (hls->segment_type == SEGMENT_TYPE_FMP4) { if (!vs->init_range_length) { - avio_flush(oc->pb); - range_length = avio_close_dyn_buf(oc->pb, &buffer); - avio_write(vs->out, buffer, range_length); - vs->init_range_length = range_length; - avio_open_dyn_buf(&oc->pb); - vs->packets_written = 0; - ff_format_io_close(s, &vs->out); - hlsenc_io_close(s, &vs->out, vs->base_output_dirname); + avio_flush(oc->pb); + range_length = avio_close_dyn_buf(oc->pb, &buffer); + avio_write(vs->out, buffer, range_length); + vs->init_range_length = range_length; + avio_open_dyn_buf(&oc->pb); + vs->packets_written = 0; + ff_format_io_close(s, &vs->out); + hlsenc_io_close(s, &vs->out, vs->base_output_dirname); } } else { hlsenc_io_close(s, &oc->pb, oc->filename); @@ -1847,7 +1847,7 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) } ff_format_io_close(s, &vs->out); } - ret = hls_append_segment(s, hls, vs, vs->duration, vs->start_pos, vs->size); + ret = hls_append_segment(s, hls, vs, vs->duration, vs->start_pos, vs->size); vs->start_pos = new_start_pos; if (ret < 0) { av_free(old_filename); @@ -1932,7 +1932,7 @@ static int hls_write_trailer(struct AVFormatContext *s) if (oc->pb) { vs->size = avio_tell(vs->avf->pb) - vs->start_pos; if (hls->segment_type != SEGMENT_TYPE_FMP4) - ff_format_io_close(s, &oc->pb); + ff_format_io_close(s, &oc->pb); if ((hls->flags & HLS_TEMP_FILE) && oc->filename[0]) { hls_rename_temp_file(s, oc); @@ -2292,8 +2292,8 @@ static int hls_init(AVFormatContext *s) } } - if ((ret = hls_start(s, vs)) < 0) - goto fail; + if ((ret = hls_start(s, vs)) < 0) + goto fail; } fail:
Signed-off-by: Steven Liu <lq@chinaffmpeg.org> --- libavformat/hlsenc.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)