[FFmpeg-cvslog] lavf/segment: add support to segment list file entries sliding window listing
Stefano Sabatini
git at videolan.org
Sat Jan 19 00:25:51 CET 2013
ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Dec 20 14:20:19 2012 +0100| [d4890c10680edaeccd7a186467b59930ef922d26] | committer: Stefano Sabatini
lavf/segment: add support to segment list file entries sliding window listing
In particular, should fix trac ticket #1842.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d4890c10680edaeccd7a186467b59930ef922d26
---
doc/muxers.texi | 6 +++--
libavformat/segment.c | 69 ++++++++++++++++++++++++++++++++++++-------------
libavformat/version.h | 2 +-
3 files changed, 56 insertions(+), 21 deletions(-)
diff --git a/doc/muxers.texi b/doc/muxers.texi
index c3e4e63..fcb51da 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -545,8 +545,10 @@ the specified @var{segment_time}.
Default value is @code{cache}.
@item segment_list_size @var{size}
-Overwrite the listfile once it reaches @var{size} entries. If 0
-the listfile is never overwritten. Default value is 0.
+Update the list file so that it contains at most the last @var{size}
+segments. If 0 the list file will contain all the segments. Default
+value is 0.
+
@item segment_list type @var{type}
Specify the format for the segment list file.
diff --git a/libavformat/segment.c b/libavformat/segment.c
index 7408223..7f11bd2 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -95,6 +95,9 @@ typedef struct {
int reference_stream_index;
SegmentListEntry cur_entry;
+ SegmentListEntry *segment_list_entries;
+ SegmentListEntry *segment_list_entries_end;
+
int is_first_pkt; ///< tells if it is the first packet in the segment
} SegmentContext;
@@ -211,15 +214,19 @@ static int segment_list_open(AVFormatContext *s)
return ret;
seg->list_max_segment_time = 0;
- if (seg->list_type == LIST_TYPE_M3U8) {
+ if (seg->list_type == LIST_TYPE_M3U8 && seg->segment_list_entries) {
+ SegmentListEntry *entry;
+ double max_duration = 0;
+
avio_printf(seg->list_pb, "#EXTM3U\n");
avio_printf(seg->list_pb, "#EXT-X-VERSION:3\n");
- avio_printf(seg->list_pb, "#EXT-X-MEDIA-SEQUENCE:%d\n", seg->segment_idx);
+ avio_printf(seg->list_pb, "#EXT-X-MEDIA-SEQUENCE:%d\n", seg->segment_list_entries->index);
avio_printf(seg->list_pb, "#EXT-X-ALLOWCACHE:%d\n",
!!(seg->list_flags & SEGMENT_LIST_FLAG_CACHE));
- if (seg->list_flags & SEGMENT_LIST_FLAG_LIVE)
- avio_printf(seg->list_pb,
- "#EXT-X-TARGETDURATION:%"PRId64"\n", seg->time / 1000000);
+
+ for (entry = seg->segment_list_entries; entry; entry = entry->next)
+ max_duration = FFMAX(max_duration, entry->end_time - entry->start_time);
+ avio_printf(seg->list_pb, "#EXT-X-TARGETDURATION:%"PRId64"\n", (int64_t)ceil(max_duration));
}
return ret;
@@ -228,14 +235,6 @@ static int segment_list_open(AVFormatContext *s)
static void segment_list_close(AVFormatContext *s)
{
SegmentContext *seg = s->priv_data;
-
- if (seg->list_type == LIST_TYPE_M3U8) {
- if (!(seg->list_flags & SEGMENT_LIST_FLAG_LIVE))
- avio_printf(seg->list_pb, "#EXT-X-TARGETDURATION:%d\n",
- (int)ceil(seg->list_max_segment_time));
- avio_printf(seg->list_pb, "#EXT-X-ENDLIST\n");
- }
-
avio_close(seg->list_pb);
}
@@ -276,15 +275,40 @@ static int segment_end(AVFormatContext *s, int write_trailer)
oc->filename);
if (seg->list) {
- if (seg->list_size && !(seg->segment_count % seg->list_size)) {
+ if (seg->list_size || seg->list_type == LIST_TYPE_M3U8) {
+ SegmentListEntry *entry = av_mallocz(sizeof(*entry));
+ if (!entry) {
+ ret = AVERROR(ENOMEM);
+ goto end;
+ }
+
+ /* append new element */
+ memcpy(entry, &seg->cur_entry, sizeof(*entry));
+ if (!seg->segment_list_entries)
+ seg->segment_list_entries = seg->segment_list_entries_end = entry;
+ else
+ seg->segment_list_entries_end->next = entry;
+ seg->segment_list_entries_end = entry;
+
+ /* drop first item */
+ if (seg->list_size && seg->segment_count > seg->list_size) {
+ entry = seg->segment_list_entries;
+ seg->segment_list_entries = seg->segment_list_entries->next;
+ av_freep(&entry);
+ }
+
segment_list_close(s);
if ((ret = segment_list_open(s)) < 0)
goto end;
+ for (entry = seg->segment_list_entries; entry; entry = entry->next)
+ segment_list_print_entry(seg->list_pb, seg->list_type, entry);
+ if (seg->list_type == LIST_TYPE_M3U8)
+ avio_printf(seg->list_pb, "#EXT-X-ENDLIST\n");
+ } else {
+ segment_list_print_entry(seg->list_pb, seg->list_type, &seg->cur_entry);
+ seg->list_max_segment_time =
+ FFMAX(seg->cur_entry.end_time - seg->cur_entry.start_time, seg->list_max_segment_time);
}
-
- segment_list_print_entry(seg->list_pb, seg->list_type, &seg->cur_entry);
- seg->list_max_segment_time =
- FFMAX(seg->cur_entry.end_time - seg->cur_entry.start_time, seg->list_max_segment_time);
avio_flush(seg->list_pb);
}
@@ -694,6 +718,8 @@ static int seg_write_trailer(struct AVFormatContext *s)
{
SegmentContext *seg = s->priv_data;
AVFormatContext *oc = seg->avf;
+ SegmentListEntry *cur, *next;
+
int ret;
if (!seg->write_header_trailer) {
if ((ret = segment_end(s, 0)) < 0)
@@ -712,6 +738,13 @@ fail:
av_freep(&seg->times);
av_freep(&seg->frames);
+ cur = seg->segment_list_entries;
+ while (cur) {
+ next = cur->next;
+ av_free(cur);
+ cur = next;
+ }
+
avformat_free_context(oc);
return ret;
}
diff --git a/libavformat/version.h b/libavformat/version.h
index 5262948..7039601 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 54
#define LIBAVFORMAT_VERSION_MINOR 61
-#define LIBAVFORMAT_VERSION_MICRO 100
+#define LIBAVFORMAT_VERSION_MICRO 101
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
More information about the ffmpeg-cvslog
mailing list