diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2013-01-13 17:22:59 +0100 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2013-01-21 19:21:21 +0100 |
| commit | 4630dfd1ebb6550f352ea69ce7150aaaba96d413 (patch) | |
| tree | 4662b2db48f2c68c1b04c6a283caa8ecceb3c52c /libavformat/hlsenc.c | |
| parent | aeef76b3837129267d4ffda58e8824497e29e8a8 (diff) | |
| download | ffmpeg-streaming-4630dfd1ebb6550f352ea69ce7150aaaba96d413.zip ffmpeg-streaming-4630dfd1ebb6550f352ea69ce7150aaaba96d413.tar.gz | |
lavf/hlsenc: append last incomplete segment when closing the output
Also introduce missing check on PTS value in case of NOPTS value.
Diffstat (limited to 'libavformat/hlsenc.c')
| -rw-r--r-- | libavformat/hlsenc.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index df74c3e..18914c0 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -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; @@ -252,7 +253,7 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) AVFormatContext *oc = hls->avf; AVStream *st = s->streams[pkt->stream_index]; int64_t end_pts = hls->recording_time * hls->number; - int ret; + int ret, is_ref_pkt = 0; if (hls->start_pts == AV_NOPTS_VALUE) { hls->start_pts = pkt->pts; @@ -260,17 +261,23 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) } if ((hls->has_video && st->codec->codec_type == AVMEDIA_TYPE_VIDEO) && + pkt->pts != AV_NOPTS_VALUE) { + is_ref_pkt = 1; + hls->duration = av_rescale(pkt->pts - hls->end_pts, + st->time_base.num, st->time_base.den); + } + + if (is_ref_pkt && av_compare_ts(pkt->pts - hls->start_pts, st->time_base, end_pts, AV_TIME_BASE_Q) >= 0 && pkt->flags & AV_PKT_FLAG_KEY) { - 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 +307,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); |
