diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 01:09:51 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 01:13:59 +0200 |
commit | a8499cbbe87d00456c391f41207e1981bd7f746a (patch) | |
tree | fdfc491b412384196ec02fcf305db586a92d2c83 /libavformat/nutenc.c | |
parent | d858ee717bed6307b8e772bd5039ab001aeae03f (diff) | |
parent | c94e2e85cb6af8a570d8542a830556243bd32873 (diff) | |
download | ffmpeg-a8499cbbe87d00456c391f41207e1981bd7f746a.tar.gz |
Merge commit 'c94e2e85cb6af8a570d8542a830556243bd32873'
* commit 'c94e2e85cb6af8a570d8542a830556243bd32873':
nut: Support experimental NUT 4 features
Conflicts:
doc/nut.texi
libavformat/nut.h
libavformat/nutdec.c
libavformat/nutenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nutenc.c')
-rw-r--r-- | libavformat/nutenc.c | 45 |
1 files changed, 42 insertions, 3 deletions
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 8c371586ee..237b501d8c 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -26,6 +26,8 @@ #include "libavutil/tree.h" #include "libavutil/dict.h" #include "libavutil/avassert.h" +#include "libavutil/time.h" +#include "libavutil/opt.h" #include "libavcodec/bytestream.h" #include "libavcodec/mpegaudiodata.h" #include "nut.h" @@ -338,7 +340,7 @@ static void write_mainheader(NUTContext *nut, AVIOContext *bc) tmp_head_idx; int64_t tmp_match; - ff_put_v(bc, nut->version = NUT_VERSION); + ff_put_v(bc, nut->version); if (nut->version > 3) ff_put_v(bc, nut->minor_version); ff_put_v(bc, nut->avf->nb_streams); @@ -407,6 +409,9 @@ static void write_mainheader(NUTContext *nut, AVIOContext *bc) ff_put_v(bc, nut->header_len[i]); avio_write(bc, nut->header[i], nut->header_len[i]); } + // flags had been effectively introduced in version 4 + if (nut->version > NUT_STABLE_VERSION) + ff_put_v(bc, nut->flags); } static int write_streamheader(AVFormatContext *avctx, AVIOContext *bc, @@ -692,6 +697,16 @@ static int nut_write_header(AVFormatContext *s) nut->avf = s; + nut->version = NUT_STABLE_VERSION + !!nut->flags; + if (nut->flags && s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { + av_log(s, AV_LOG_ERROR, + "The additional syncpoint modes require version %d, " + "that is currently not finalized, " + "please set -f_strict experimental in order to enable it.\n", + nut->version); + return AVERROR_EXPERIMENTAL; + } + nut->stream = av_calloc(s->nb_streams, sizeof(*nut->stream )); nut->chapter = av_calloc(s->nb_chapters, sizeof(*nut->chapter)); nut->time_base= av_calloc(s->nb_streams + @@ -974,7 +989,8 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt) //FIXME: Ensure store_sp is 1 in the first place. - if (store_sp) { + if (store_sp && + (!(nut->flags & NUT_PIPE) || nut->last_syncpoint_pos == INT_MIN)) { Syncpoint *sp, dummy = { .pos = INT64_MAX }; ff_nut_reset_ts(nut, *nus->time_base, pkt->dts); @@ -1000,6 +1016,11 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt) return ret; put_tt(nut, nus->time_base, dyn_bc, pkt->dts); ff_put_v(dyn_bc, sp ? (nut->last_syncpoint_pos - sp->pos) >> 4 : 0); + + if (nut->flags & NUT_BROADCAST) { + put_tt(nut, nus->time_base, dyn_bc, + av_rescale_q(av_gettime(), AV_TIME_BASE_Q, *nus->time_base)); + } put_packet(nut, bc, dyn_bc, 1, SYNCPOINT_STARTCODE); if ((ret = ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0 /*unused*/, pkt->dts)) < 0) @@ -1110,7 +1131,7 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt) nus->last_pts = pkt->pts; //FIXME just store one per syncpoint - if (flags & FLAG_KEY) { + if (flags & FLAG_KEY && !(nut->flags & NUT_PIPE)) { av_add_index_entry( s->streams[pkt->stream_index], nut->last_syncpoint_pos, @@ -1156,6 +1177,23 @@ static int nut_write_trailer(AVFormatContext *s) return 0; } +#define OFFSET(x) offsetof(NUTContext, x) +#define E AV_OPT_FLAG_ENCODING_PARAM +static const AVOption options[] = { + { "syncpoints", "NUT syncpoint behaviour", OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, E, "syncpoints" }, + { "default", "", 0, AV_OPT_TYPE_CONST, {.i64 = 0}, INT_MIN, INT_MAX, E, "syncpoints" }, + { "none", "Disable syncpoints, low overhead and unseekable", 0, AV_OPT_TYPE_CONST, {.i64 = NUT_PIPE}, INT_MIN, INT_MAX, E, "syncpoints" }, + { "timestamped", "Extend syncpoints with a wallclock timestamp", 0, AV_OPT_TYPE_CONST, {.i64 = NUT_BROADCAST}, INT_MIN, INT_MAX, E, "syncpoints" }, + { NULL }, +}; + +static const AVClass class = { + .class_name = "nutenc", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + AVOutputFormat ff_nut_muxer = { .name = "nut", .long_name = NULL_IF_CONFIG_SMALL("NUT"), @@ -1170,4 +1208,5 @@ AVOutputFormat ff_nut_muxer = { .write_trailer = nut_write_trailer, .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, .codec_tag = ff_nut_codec_tags, + .priv_class = &class, }; |