virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

hlsenc: Append the last incomplete segment when closing the output

Browse Source 
Also avoid comparing NOPTS values.

Bug-id: 551
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Stefano Sabatini 2013-08-15 12:33:20 +03:00 committed by Martin Storsjö
parent c9031c7c14
commit 09c93b1b95
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/hlsenc.c
View File

@ -49,6 +49,7 @@ typedef struct HLSContext {
int has_video;
int64_t start_pts;
int64_t end_pts;
int64_t duration; // last segment duration computed so far, in seconds
int nb_entries;
ListEntry *list;
ListEntry *end_list;
@ -261,16 +262,20 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt)
can_split = st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
pkt->flags & AV_PKT_FLAG_KEY;
}
if (pkt->pts == AV_NOPTS_VALUE)
can_split = 0;
else
hls->duration = av_rescale(pkt->pts - hls->end_pts,
st->time_base.num, st->time_base.den);
if (can_split && av_compare_ts(pkt->pts - hls->start_pts, st->time_base,
end_pts, AV_TIME_BASE_Q) >= 0) {
ret = append_entry(hls, av_rescale(pkt->pts - hls->end_pts,
st->time_base.num,
st->time_base.den));
ret = append_entry(hls, hls->duration);
if (ret)
return ret;
hls->end_pts = pkt->pts;
hls->duration = 0;
av_write_frame(oc, NULL); /* Flush any buffered data */
avio_close(oc->pb);
@ -300,6 +305,7 @@ static int hls_write_trailer(struct AVFormatContext *s)
avio_closep(&oc->pb);
avformat_free_context(oc);
av_free(hls->basename);
append_entry(hls, hls->duration);
hls_window(s, 1);
free_entries(hls);