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

Submitted by Charles Liu on Oct. 11, 2018, 8:56 a.m.

Details

Message ID 20181011085647.81329-5-liuchh83@gmail.com
State New
Headers show

Commit Message

Charles Liu Oct. 11, 2018, 8:56 a.m.
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>
---
 libavformat/hlsenc.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Steven Liu Oct. 16, 2018, 3:17 a.m.
> 在 2018年10月11日,下午4:56,Charles Liu <liuchh83@gmail.com> 写道:
> 
> 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>
> ---
> 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);
> -- 
> 2.19.1
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Patchset will be pushed if there have no objections :)

Patch hide | download patch | download mbox

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);