X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fsegment.c;h=fd5283560e5c73b0e5b13e3d0d0666f4adb8f544;hb=87199d34db5d79ad85c0801b29db0709c08f458c;hp=3d55e4cbaa70c302cd68403df7e0e3257bde434e;hpb=0177b7d23aadeab218601893953f0a05209d037c;p=ffmpeg diff --git a/libavformat/segment.c b/libavformat/segment.c index 3d55e4cbaa7..fd5283560e5 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -33,24 +33,95 @@ typedef struct { const AVClass *class; /**< Class for private options. */ int number; + AVOutputFormat *oformat; AVFormatContext *avf; char *format; /**< Set by a private option. */ char *list; /**< Set by a private option. */ + int list_type; /**< Set by a private option. */ float time; /**< Set by a private option. */ int size; /**< Set by a private option. */ int wrap; /**< Set by a private option. */ + int individual_header_trailer; /**< Set by a private option. */ + int write_header_trailer; /**< Set by a private option. */ int64_t offset_time; int64_t recording_time; int has_video; AVIOContext *pb; } SegmentContext; -static int segment_start(AVFormatContext *s) +enum { + LIST_FLAT, + LIST_HLS +}; + +static int segment_mux_init(AVFormatContext *s) +{ + SegmentContext *seg = s->priv_data; + AVFormatContext *oc; + int i; + + seg->avf = oc = avformat_alloc_context(); + if (!oc) + return AVERROR(ENOMEM); + + oc->oformat = seg->oformat; + oc->interrupt_callback = s->interrupt_callback; + + for (i = 0; i < s->nb_streams; i++) { + AVStream *st; + if (!(st = avformat_new_stream(oc, NULL))) + return AVERROR(ENOMEM); + avcodec_copy_context(st->codec, s->streams[i]->codec); + st->sample_aspect_ratio = s->streams[i]->sample_aspect_ratio; + } + + return 0; +} + +static int segment_hls_window(AVFormatContext *s, int last) +{ + SegmentContext *seg = s->priv_data; + int i, ret = 0; + char buf[1024]; + + if ((ret = avio_open2(&seg->pb, seg->list, AVIO_FLAG_WRITE, + &s->interrupt_callback, NULL)) < 0) + goto fail; + + avio_printf(seg->pb, "#EXTM3U\n"); + avio_printf(seg->pb, "#EXT-X-VERSION:3\n"); + avio_printf(seg->pb, "#EXT-X-TARGETDURATION:%d\n", (int)seg->time); + avio_printf(seg->pb, "#EXT-X-MEDIA-SEQUENCE:%d\n", + FFMAX(0, seg->number - seg->size)); + + for (i = FFMAX(0, seg->number - seg->size); + i < seg->number; i++) { + avio_printf(seg->pb, "#EXTINF:%d,\n", (int)seg->time); + av_get_frame_filename(buf, sizeof(buf), s->filename, i); + avio_printf(seg->pb, "%s\n", buf); + } + + if (last) + avio_printf(seg->pb, "#EXT-X-ENDLIST\n"); +fail: + avio_closep(&seg->pb); + return ret; +} + +static int segment_start(AVFormatContext *s, int write_header) { SegmentContext *c = s->priv_data; AVFormatContext *oc = c->avf; int err = 0; + if (write_header) { + avformat_free_context(oc); + c->avf = NULL; + if ((err = segment_mux_init(s)) < 0) + return err; + oc = c->avf; + } + if (c->wrap) c->number %= c->wrap; @@ -62,67 +133,67 @@ static int segment_start(AVFormatContext *s) &s->interrupt_callback, NULL)) < 0) return err; - if (!oc->priv_data && oc->oformat->priv_data_size > 0) { - oc->priv_data = av_mallocz(oc->oformat->priv_data_size); - if (!oc->priv_data) { - avio_close(oc->pb); - return AVERROR(ENOMEM); - } - if (oc->oformat->priv_class) { - *(const AVClass**)oc->priv_data = oc->oformat->priv_class; - av_opt_set_defaults(oc->priv_data); - } - } + if (oc->oformat->priv_class && oc->priv_data) + av_opt_set(oc->priv_data, "resend_headers", "1", 0); /* mpegts specific */ - if ((err = oc->oformat->write_header(oc)) < 0) { - goto fail; + if (write_header) { + if ((err = avformat_write_header(oc, NULL)) < 0) + return err; } return 0; - -fail: - avio_close(oc->pb); - av_freep(&oc->priv_data); - - return err; } -static int segment_end(AVFormatContext *oc) +static int segment_end(AVFormatContext *oc, int write_trailer) { int ret = 0; - if (oc->oformat->write_trailer) - ret = oc->oformat->write_trailer(oc); - + av_write_frame(oc, NULL); /* Flush any buffered data (fragmented mp4) */ + if (write_trailer) + av_write_trailer(oc); avio_close(oc->pb); - if (oc->oformat->priv_class) - av_opt_free(oc->priv_data); - av_freep(&oc->priv_data); return ret; } +static int open_null_ctx(AVIOContext **ctx) +{ + int buf_size = 32768; + uint8_t *buf = av_malloc(buf_size); + if (!buf) + return AVERROR(ENOMEM); + *ctx = avio_alloc_context(buf, buf_size, AVIO_FLAG_WRITE, NULL, NULL, NULL, NULL); + if (!*ctx) { + av_free(buf); + return AVERROR(ENOMEM); + } + return 0; +} + +static void close_null_ctx(AVIOContext *pb) +{ + av_free(pb->buffer); + av_free(pb); +} + static int seg_write_header(AVFormatContext *s) { SegmentContext *seg = s->priv_data; - AVFormatContext *oc; + AVFormatContext *oc = NULL; int ret, i; seg->number = 0; seg->offset_time = 0; seg->recording_time = seg->time * 1000000; + if (!seg->write_header_trailer) + seg->individual_header_trailer = 0; - oc = avformat_alloc_context(); - - if (!oc) - return AVERROR(ENOMEM); - - if (seg->list) + if (seg->list && seg->list_type != LIST_HLS) if ((ret = avio_open2(&seg->pb, seg->list, AVIO_FLAG_WRITE, &s->interrupt_callback, NULL)) < 0) goto fail; - for (i = 0; i< s->nb_streams; i++) + for (i = 0; i < s->nb_streams; i++) seg->has_video += (s->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO); @@ -131,23 +202,22 @@ static int seg_write_header(AVFormatContext *s) "More than a single video stream present, " "expect issues decoding it.\n"); - oc->oformat = av_guess_format(seg->format, s->filename, NULL); + seg->oformat = av_guess_format(seg->format, s->filename, NULL); - if (!oc->oformat) { + if (!seg->oformat) { ret = AVERROR_MUXER_NOT_FOUND; goto fail; } - if (oc->oformat->flags & AVFMT_NOFILE) { + if (seg->oformat->flags & AVFMT_NOFILE) { av_log(s, AV_LOG_ERROR, "format %s not supported.\n", oc->oformat->name); ret = AVERROR(EINVAL); goto fail; } - seg->avf = oc; - - oc->streams = s->streams; - oc->nb_streams = s->nb_streams; + if ((ret = segment_mux_init(s)) < 0) + goto fail; + oc = seg->avf; if (av_get_frame_filename(oc->filename, sizeof(oc->filename), s->filename, seg->number++) < 0) { @@ -155,27 +225,43 @@ static int seg_write_header(AVFormatContext *s) goto fail; } - if ((ret = avio_open2(&oc->pb, oc->filename, AVIO_FLAG_WRITE, - &s->interrupt_callback, NULL)) < 0) - goto fail; + if (seg->write_header_trailer) { + if ((ret = avio_open2(&oc->pb, oc->filename, AVIO_FLAG_WRITE, + &s->interrupt_callback, NULL)) < 0) + goto fail; + } else { + if ((ret = open_null_ctx(&oc->pb)) < 0) + goto fail; + } if ((ret = avformat_write_header(oc, NULL)) < 0) { avio_close(oc->pb); goto fail; } + if (!seg->write_header_trailer) { + close_null_ctx(oc->pb); + if ((ret = avio_open2(&oc->pb, oc->filename, AVIO_FLAG_WRITE, + &s->interrupt_callback, NULL)) < 0) + goto fail; + } + if (seg->list) { - avio_printf(seg->pb, "%s\n", oc->filename); - avio_flush(seg->pb); + if (seg->list_type == LIST_HLS) { + if ((ret = segment_hls_window(s, 0)) < 0) + goto fail; + } else { + avio_printf(seg->pb, "%s\n", oc->filename); + avio_flush(seg->pb); + } } fail: if (ret) { - oc->streams = NULL; - oc->nb_streams = 0; if (seg->list) avio_close(seg->pb); - avformat_free_context(oc); + if (seg->avf) + avformat_free_context(seg->avf); } return ret; } @@ -184,7 +270,7 @@ static int seg_write_packet(AVFormatContext *s, AVPacket *pkt) { SegmentContext *seg = s->priv_data; AVFormatContext *oc = seg->avf; - AVStream *st = oc->streams[pkt->stream_index]; + AVStream *st = s->streams[pkt->stream_index]; int64_t end_pts = seg->recording_time * seg->number; int ret; @@ -196,32 +282,37 @@ static int seg_write_packet(AVFormatContext *s, AVPacket *pkt) av_log(s, AV_LOG_DEBUG, "Next segment starts at %d %"PRId64"\n", pkt->stream_index, pkt->pts); - ret = segment_end(oc); + ret = segment_end(oc, seg->individual_header_trailer); if (!ret) - ret = segment_start(s); + ret = segment_start(s, seg->individual_header_trailer); if (ret) goto fail; + oc = seg->avf; + if (seg->list) { - avio_printf(seg->pb, "%s\n", oc->filename); - avio_flush(seg->pb); - if (seg->size && !(seg->number % seg->size)) { - avio_close(seg->pb); - if ((ret = avio_open2(&seg->pb, seg->list, AVIO_FLAG_WRITE, - &s->interrupt_callback, NULL)) < 0) + if (seg->list_type == LIST_HLS) { + if ((ret = segment_hls_window(s, 0)) < 0) goto fail; + } else { + avio_printf(seg->pb, "%s\n", oc->filename); + avio_flush(seg->pb); + if (seg->size && !(seg->number % seg->size)) { + avio_closep(&seg->pb); + if ((ret = avio_open2(&seg->pb, seg->list, AVIO_FLAG_WRITE, + &s->interrupt_callback, NULL)) < 0) + goto fail; + } } } } - ret = oc->oformat->write_packet(oc, pkt); + ret = ff_write_chained(oc, pkt->stream_index, pkt, s); fail: if (ret < 0) { - oc->streams = NULL; - oc->nb_streams = 0; if (seg->list) avio_close(seg->pb); avformat_free_context(oc); @@ -234,11 +325,27 @@ static int seg_write_trailer(struct AVFormatContext *s) { SegmentContext *seg = s->priv_data; AVFormatContext *oc = seg->avf; - int ret = segment_end(oc); - if (seg->list) - avio_close(seg->pb); - oc->streams = NULL; - oc->nb_streams = 0; + int ret; + if (!seg->write_header_trailer) { + if ((ret = segment_end(oc, 0)) < 0) + goto fail; + open_null_ctx(&oc->pb); + ret = av_write_trailer(oc); + close_null_ctx(oc->pb); + } else { + ret = segment_end(oc, 1); + } + + if (ret < 0) + goto fail; + + if (seg->list && seg->list_type == LIST_HLS) { + if ((ret = segment_hls_window(s, 1) < 0)) + goto fail; + } + +fail: + avio_close(seg->pb); avformat_free_context(oc); return ret; } @@ -249,8 +356,13 @@ static const AVOption options[] = { { "segment_format", "container format used for the segments", OFFSET(format), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E }, { "segment_time", "segment length in seconds", OFFSET(time), AV_OPT_TYPE_FLOAT, {.dbl = 2}, 0, FLT_MAX, E }, { "segment_list", "output the segment list", OFFSET(list), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E }, - { "segment_list_size", "maximum number of playlist entries", OFFSET(size), AV_OPT_TYPE_INT, {.dbl = 5}, 0, INT_MAX, E }, - { "segment_wrap", "number after which the index wraps", OFFSET(wrap), AV_OPT_TYPE_INT, {.dbl = 0}, 0, INT_MAX, E }, + { "segment_list_size", "maximum number of playlist entries", OFFSET(size), AV_OPT_TYPE_INT, {.i64 = 5}, 0, INT_MAX, E }, + { "segment_list_type", "segment list format", OFFSET(list_type), AV_OPT_TYPE_INT, {.i64 = LIST_FLAT}, 0, 2, E, "list_type" }, + { "flat", "plain list (default)", 0, AV_OPT_TYPE_CONST, {.i64 = LIST_FLAT}, 0, 0, E, "list_type" }, + { "hls", "Apple HTTP Live Streaming compatible", 0, AV_OPT_TYPE_CONST, {.i64 = LIST_HLS}, 0, 0, E, "list_type" }, + { "segment_wrap", "number after which the index wraps", OFFSET(wrap), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, E }, + { "individual_header_trailer", "write header/trailer to each segment", OFFSET(individual_header_trailer), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, E }, + { "write_header_trailer", "write a header to the first segment and a trailer to the last one", OFFSET(write_header_trailer), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, E }, { NULL }, }; @@ -266,7 +378,7 @@ AVOutputFormat ff_segment_muxer = { .name = "segment", .long_name = NULL_IF_CONFIG_SMALL("segment"), .priv_data_size = sizeof(SegmentContext), - .flags = AVFMT_GLOBALHEADER | AVFMT_NOFILE, + .flags = AVFMT_NOFILE, .write_header = seg_write_header, .write_packet = seg_write_packet, .write_trailer = seg_write_trailer,