avformat/hlsenc.c: fix the output's duration smaller than input's in sub-range mode.
authorCharles Liu <liuchh83@gmail.com>
Tue, 30 Oct 2018 03:11:27 +0000 (11:11 +0800)
committerSteven Liu <lq@chinaffmpeg.org>
Tue, 30 Oct 2018 03:11:27 +0000 (11:11 +0800)
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@gmail.com>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
libavformat/hlsenc.c

index 8b3a9b7..f8f060d 100644 (file)
@@ -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);