Merge commit 'c94e2e85cb6af8a570d8542a830556243bd32873'

* commit 'c94e2e85cb6af8a570d8542a830556243bd32873': nut: Support experimental NUT 4 features Conflicts: doc/nut.texi libavformat/nut.h libavformat/nutdec.c libavformat/nutenc.c

Michael Niedermayer committed 12 years ago

Commit a8499cb2 parents d858ee7 c94e2e85 files · +111 −9Browse files

Unified · Split

5 files

doc/muxers.texi +17 −0
doc/nut.texi +21 −0
libavformat/nut.h +8 −2
libavformat/nutdec.c +23 −4
libavformat/nutenc.c +42 −3

doc/muxers.texi+17−0

@@ -706,6 +706,23 @@ Alternatively you can write the command as: · 705 unmodified lines
706	ffmpeg -benchmark -i INPUT -f null -	706	ffmpeg -benchmark -i INPUT -f null -
707	@end example	707	@end example
708		708
		709	@section nut
		710
		711	@table @option
		712	@item -syncpoints @var{flags}
		713	Change the syncpoint usage in nut:
		714	@table @option
		715	@item @var{default} use the normal low-overhead seeking aids.
		716	@item @var{none} do not use the syncpoints at all, reducing the overhead but making the stream non-seekable;
		717	@item @var{timestamped} extend the syncpoint with a wallclock field.
		718	@end table
		719	The @var{none} and @var{timestamped} flags are experimental.
		720	@end table
		721
		722	@example
		723	ffmpeg -i INPUT -f_strict experimental -syncpoints none - \| processor
		724	@end example
		725
709	@section ogg	726	@section ogg
710		727
711	Ogg container muxer.	728	Ogg container muxer.

doc/nut.texi+21−0

@@ -21,6 +21,27 @@ The official nut specification is at svn://svn.mplayerhq.hu/nut · 20 unmodified lines
21	In case of any differences between this text and the official specification,	21	In case of any differences between this text and the official specification,
22	the official specification shall prevail.	22	the official specification shall prevail.
23		23
		24	@chapter Modes
		25	NUT has some variants signaled by using the flags field in its main header.
		26
		27	@multitable @columnfractions .4 .4
		28	@item BROADCAST @tab Extend the syncpoint to report the sender wallclock
		29	@item PIPE @tab Omit completely the syncpoint
		30	@end multitable
		31
		32	@section BROADCAST
		33
		34	The BROADCAST variant provides a secondary time reference to facilitate
		35	detecting endpoint latency and network delays.
		36	It assumes all the endpoint clocks are syncronized.
		37	To be used in real-time scenarios.
		38
		39	@section PIPE
		40
		41	The PIPE variant assumes NUT is used as non-seekable intermediate container,
		42	by not using syncpoint removes unneeded overhead and reduces the overall
		43	memory usage.
		44
24	@chapter Container-specific codec tags	45	@chapter Container-specific codec tags
25		46
26	@section Generic raw YUVA formats	47	@section Generic raw YUVA formats

libavformat/nut.h+8−2

 #define MAX_DISTANCE (1024*32-1)
-#define NUT_VERSION 3
+#define NUT_MAX_VERSION 4
+#define NUT_STABLE_VERSION 3
+#define NUT_MIN_VERSION 2
 typedef enum{
     FLAG_KEY        =   1, ///<if set, frame is keyframe
 } ChapterContext;
 typedef struct NUTContext {
+    const AVClass *av_class;
     AVFormatContext *avf;
 //    int written_packet_size;
 //    int64_t packet_start;
     int sp_count;
     int64_t max_pts;
     AVRational *max_pts_tb;
-    int version;
+#define NUT_BROADCAST 1 // use extended syncpoints
+#define NUT_PIPE 2      // do not write syncpoints
+    int flags;
+    int version; // version currently in use
     int minor_version;
 } NUTContext;

libavformat/nutdec.c+23−4

     end += avio_tell(bc);
     tmp = ffio_read_varlen(bc);
-    if (tmp < 2 && tmp > 4) {
+    if (tmp < NUT_MIN_VERSION && tmp > NUT_MAX_VERSION) {
         av_log(s, AV_LOG_ERROR, "Version %"PRId64" not supported.\n",
                tmp);
         return AVERROR(ENOSYS);
         av_assert0(nut->header_len[0] == 0);
     }
+    // flags had been effectively introduced in version 4
+    if (nut->version > NUT_STABLE_VERSION) {
+        nut->flags = ffio_read_varlen(bc);
+    }
     if (skip_reserved(bc, end) || ffio_get_checksum(bc)) {
         av_log(s, AV_LOG_ERROR, "main header checksum mismatch\n");
         return AVERROR_INVALIDDATA;
     ff_nut_reset_ts(nut, nut->time_base[tmp % nut->time_base_count],
                     tmp / nut->time_base_count);
+    if (nut->flags & NUT_BROADCAST) {
+        tmp = ffio_read_varlen(bc);
+        av_log(s, AV_LOG_VERBOSE, "Syncpoint wallclock %"PRId64"\n",
+               av_rescale_q(tmp / nut->time_base_count,
+                            nut->time_base[tmp % nut->time_base_count],
+                            AV_TIME_BASE_Q));
+    }
     if (skip_reserved(bc, end) || ffio_get_checksum(bc)) {
         av_log(s, AV_LOG_ERROR, "sync point checksum mismatch\n");
         return AVERROR_INVALIDDATA;
     int size, flags, size_mul, pts_delta, i, reserved_count;
     uint64_t tmp;
-    if (avio_tell(bc) > nut->last_syncpoint_pos + nut->max_distance) {
+    if (!(nut->flags & NUT_PIPE) &&
+        avio_tell(bc) > nut->last_syncpoint_pos + nut->max_distance) {
         av_log(s, AV_LOG_ERROR,
                "Last frame must have been damaged %"PRId64" > %"PRId64" + %d\n",
                avio_tell(bc), nut->last_syncpoint_pos, nut->max_distance);
     if (flags & FLAG_CHECKSUM) {
         avio_rb32(bc); // FIXME check this
-    } else if (size > 2 * nut->max_distance || FFABS(stc->last_pts - *pts) >
+    } else if (!(nut->flags & NUT_PIPE) &&
-               stc->max_pts_distance) {
+               size > 2 * nut->max_distance ||
+               FFABS(stc->last_pts - *pts) > stc->max_pts_distance) {
         av_log(s, AV_LOG_ERROR, "frame size > 2max_distance and no checksum\n");
         return AVERROR_INVALIDDATA;
     }
     int64_t pos, pos2, ts;
     int i;
+    if (nut->flags & NUT_PIPE) {
+        return AVERROR(ENOSYS);
+    }
     if (st->index_entries) {
         int index = av_index_search_timestamp(st, pts, flags);
         if (index < 0)

libavformat/nutenc.c+42−3

 #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"
         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);
         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,
     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 +
 //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);
             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)
     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,
     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"),
     .write_trailer  = nut_write_trailer,
     .flags          = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
     .codec_tag      = ff_nut_codec_tags,
+    .priv_class     = &class,
 };

Merge commit 'c94e2e85cb6af8a570d8542a830556243bd32873'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code