[FFmpeg-cvslog] avformat/hlsenc.c: fix the output's duration smaller than input's in sub-range mode.

Charles Liu git at videolan.org
Tue Oct 30 05:13:55 EET 2018


ffmpeg | branch: master | Charles Liu <liuchh83 at gmail.com> | Tue Oct 30 11:11:27 2018 +0800| [1ff4bd59dfcea26b584e8c82a6cd7c3ee87fc8a7] | committer: Steven Liu

avformat/hlsenc.c: fix the output's duration smaller than input's in sub-range mode.

In fmp4 & sub-range mode, the output's duration always smaller than expected,
because the size of the last #EXT-X-BYTERANGE is too small.

Signed-off-by: Charles Liu <liuchh83 at gmail.com>
Signed-off-by: Steven Liu <lq at chinaffmpeg.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ff4bd59dfcea26b584e8c82a6cd7c3ee87fc8a7
---

 libavformat/hlsenc.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 8b3a9b78f4..f8f060d065 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -2380,6 +2380,7 @@ static int hls_write_trailer(struct AVFormatContext *s)
             if (ret < 0) {
                 goto failed;
             }
+            vs->size = range_length;
             ff_format_io_close(s, &vs->out);
         }
 
@@ -2388,8 +2389,6 @@ failed:
         if (oc->pb) {
             if (hls->segment_type != SEGMENT_TYPE_FMP4) {
                 vs->size = avio_tell(vs->avf->pb) - vs->start_pos;
-            } else {
-                vs->size = avio_tell(vs->avf->pb);
             }
             if (hls->segment_type != SEGMENT_TYPE_FMP4)
                 ff_format_io_close(s, &oc->pb);



More information about the ffmpeg-cvslog mailing list