January 2007 - NUT-devel - lists.mplayerhq.hu

Fourcc spec
by Oded Shimon 31 May '07

31 May '07

This specification is normative to demuxers, informative to muxers. It does not need to be actively maintained, because it does NOT list all legal fourcc's, only the ones noted by the specification. I'd like to commit it to nut/docs/fourcc.txt . - ods15

5 39

[PATCH] libnut muxer: write at least one timebase
by Clemens Ladisch 05 Feb '07

05 Feb '07

This patch adds code to make sure that there is at least one timebase. Otherwise, creating a file without any stream would result in an invalid file, or the muxer would crash when trying to write max_pts in the index.

3 4

[nut]: r279 - trunk/libnut/priv.h
by ods15 30 Jan '07

30 Jan '07

Author: ods15 Date: Tue Jan 30 20:07:05 2007 New Revision: 279 Modified: trunk/libnut/priv.h Log: slightly simpler TO_DOUBLE_PTS Modified: trunk/libnut/priv.h ============================================================================== --- trunk/libnut/priv.h (original) +++ trunk/libnut/priv.h Tue Jan 30 20:07:05 2007 @@ -231,7 +231,7 @@ #define TO_DOUBLE(t, pts) ((double)(pts) / nut->tb[t].den * nut->tb[t].num) -#define TO_DOUBLE_PTS(pts) ((double)((pts) / nut->timebase_count) / nut->tb[(pts) % nut->timebase_count].den * nut->tb[(pts) % nut->timebase_count].num) +#define TO_DOUBLE_PTS(pts) TO_DOUBLE((pts) / nut->timebase_count, (pts) % nut->timebase_count) #define TO_TB(i) nut->tb[nut->sc[i].timebase_id]

1 0

[nut]: r278 - trunk/README
by ods15 30 Jan '07

30 Jan '07

Author: ods15 Date: Tue Jan 30 19:44:21 2007 New Revision: 278 Modified: trunk/README Log: update the horrible out of date readme Modified: trunk/README ============================================================================== --- trunk/README (original) +++ trunk/README Tue Jan 30 19:44:21 2007 @@ -1,45 +1,29 @@ -DO NOT USE NUTMERGE FOR _ANYTHING_ EXCEPT TESTING!! -IT CREATES COMPLETELY INVALID BROKEN FILES, WHICH JUST "HAPPEN" TO WORK! - - -instructions: -tar jfx nut.tar.bz2 -cvs -z9 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/mplayer co main -make -C nut -cd main -ln -s ../../nut/demux_nut.c libmpdemux/ -patch -p0 --no-backup-if-mismatch < ../nut/mplayer.diff -make mplayer - -In words: -have your main nut/ directory in the same level as your CVS mplayer main/ -directory, copy demux_nut.c to libmpdemux/, apply the mplayer.diff, and -first run make in nut directory, and then make in mplayer directory. +to compile: +make +make install to use: -./nutmerge bla.avi bla.nut # only mpeg-4 ! -./nutmerge bla.ogg bla.nut # only vorbis, not theora - +./nutmerge bla.avi bla.nut # only mpeg-4 with mp3 +./nutmerge bla.ogg bla.nut # only vorbis -to debug: -Always look at $? ! -./avireader bla.avi -./oggreader bla.ogg +to play with mplayer: +./configure # libnut should be auto detected after make install here +make +./mplayer bla.nut -to play: -mplayer bla.nut -auto detction should work fine. +to play with ffmpeg: +./configure --enable-libnut +make +./ffplay bla.nut to copy index to begginning of file: -./nutindex old.nut new.nut +./nutindex bla.nut new.nut -If you have weird endianess, You'll need to compile with -'-DWORDS_BIGENDIAN', just uncomment the appropriate file in config.mak . -- ods15 +Oded Shimon <ods15(a)ods15.dyndns.org>

1 0

[nut]: r277 - trunk/Makefile
by ods15 30 Jan '07

30 Jan '07

Author: ods15 Date: Tue Jan 30 19:39:33 2007 New Revision: 277 Modified: trunk/Makefile Log: add make install to top level directory Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Tue Jan 30 19:39:33 2007 @@ -7,6 +7,9 @@ nututils: libnut FORCE ${MAKE} -C nututils +install: + ${MAKE} -C libnut install + distclean: clean

1 0

r22069 - trunk/DOCS/tech/nut.txt
by michael 30 Jan '07

30 Jan '07

Author: michael Date: Tue Jan 30 01:47:28 2007 New Revision: 22069 Modified: trunk/DOCS/tech/nut.txt Log: better back_ptr_div16 description by (Clemens Ladisch ((( cladisch ( fastmail (( net Modified: trunk/DOCS/tech/nut.txt ============================================================================== --- trunk/DOCS/tech/nut.txt (original) +++ trunk/DOCS/tech/nut.txt Tue Jan 30 01:47:28 2007 @@ -736,10 +736,11 @@ back_ptr_div16 (v) back_ptr = back_ptr_div16 * 16 + 15 - back_ptr must point to a position within 16 bytes of a syncpoint - startcode. This syncpoint MUST be the closest syncpoint such that at - least one keyframe with a pts lower or equal to the original syncpoint's - global_key_pts for all streams lies between it and the current syncpoint. + back_ptr must point to a position up to 15 bytes before a syncpoint + startcode. Relative to position of current syncpoint. The syncpoint + pointed to MUST be the closest syncpoint such that at least one keyframe + with a pts lower or equal to the current syncpoint's global_key_pts for + all streams lies between it and the current syncpoint. A stream where EOR is set is to be ignored for back_ptr.

1 0

back_ptr description unclear
by Clemens Ladisch 30 Jan '07

30 Jan '07

nut.txt says: | back_ptr_div16 (v) | back_ptr = back_ptr_div16 * 16 + 15 | back_ptr must point to a position within 16 bytes of a syncpoint | startcode. [...] Does "within 16 bytes" mean before or after the syncpoint startcode? This description also doesn't mention that this value is relative. I think the semantics were intended to be similar to syncpoint_pos_div16 in the index, so probably that description can be copied and adapted: | syncpoint_pos_div16 (v) | offset from beginning of file to up to 15 bytes before the syncpoint | referred to in this index entry. Relative to position of last | syncpoint. Regards, Clemens

3 3

[nut]: r276 - trunk/libnut/demuxer.c
by ods15 26 Jan '07

26 Jan '07

Author: ods15 Date: Fri Jan 26 18:44:31 2007 New Revision: 276 Modified: trunk/libnut/demuxer.c Log: Improovements to linear_search_seek, not to bail out completely if an error is found Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Fri Jan 26 18:44:31 2007 @@ -1273,7 +1273,7 @@ nut->last_syncpoint = 0; // last_key is invalid seek_buf(nut->i, s.pos, SEEK_SET); // go back to syncpoint. This will not need a seek. nut->seek_status = s.pos << 1; - if (s.pos > start + 15) goto err_out; // error condition, we didn't get the syncpoint we wanted + ERROR(s.pos < start || s.pos > start + 15, 0); // error condition, we didn't get the syncpoint we wanted } if (stopper) { @@ -1288,6 +1288,7 @@ if (stopper_syncpoint > bctello(nut->i)) stopper_syncpoint = 0; // don't premature } +#define CHECK_break(expr) { if ((err = (expr))) { if (end && err != NUT_ERR_EAGAIN) break; else goto err_out; } } if (!(nut->seek_status & 1)) while (bctello(nut->i) < end || !end) { int saw_syncpoint; nut_packet_t pd; @@ -1295,7 +1296,7 @@ buf_before = bctello(nut->i); err = get_packet(nut, &pd, &saw_syncpoint); // we're counting on syncpoint cache!! for the good_key later, and stopper_syncpoint if (err == -1) continue; - CHECK(err); + CHECK_break(err); if (saw_syncpoint) { if (stopper && !stopper_syncpoint && buf_before > stopper->pos - stopper->back_ptr + 15) { @@ -1349,7 +1350,7 @@ // dts higher than requested pts if (end && peek_dts(nut->sc[pd.stream].sh.decode_delay, nut->sc[pd.stream].pts_cache, pd.pts) > (int64_t)nut->sc[pd.stream].state.pts) break; - CHECK(skip_buffer(nut->i, pd.len)); + CHECK_break(skip_buffer(nut->i, pd.len)); push_frame(nut, &pd); } if (!end) goto err_out; // forward seek @@ -1359,7 +1360,7 @@ if (nut->sc[i].state.good_key && (!min_pos || nut->sc[i].state.good_key < min_pos)) min_pos = nut->sc[i].state.good_key; } if (!min_pos) { - fprintf(stderr, "BIG FAT WARNING\n"); + fprintf(stderr, "BIG FAT WARNING (Possibly caused by `%s')", nut_error(err)); for (i = 0; i < nut->stream_count; i++) fprintf(stderr, "%d: %d\n", i, (int)nut->sc[i].state.good_key); min_pos = nut->seek_status >> 1; } @@ -1383,6 +1384,7 @@ push_frame(nut, &pd); CHECK(skip_buffer(nut->i, pd.len)); } + err = 0; err_out: if (err != NUT_ERR_EAGAIN) { // unless EAGAIN

1 0

[nut]: r275 - in trunk/libnut: demuxer.c priv.h
by ods15 26 Jan '07

26 Jan '07

Author: ods15 Date: Fri Jan 26 17:28:56 2007 New Revision: 275 Modified: trunk/libnut/demuxer.c trunk/libnut/priv.h Log: improovements to binary search to prevent searching the same damaged area twice seek backwards to look for syncpoint before damaged data and mark the area between as scanned Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Fri Jan 26 17:28:56 2007 @@ -1143,13 +1143,13 @@ return 0; } -static off_t seek_interpolate(int max_distance, double time_pos, off_t lo, off_t hi, double lo_pd, double hi_pd) { +static off_t seek_interpolate(int max_distance, double time_pos, off_t lo, off_t hi, double lo_pd, double hi_pd, off_t fake_hi) { double weight = 19./20.; off_t guess; - if (hi - lo < max_distance) guess = lo + 16; + if (fake_hi - lo < max_distance) guess = lo + 16; else { // linear interpolation guess = (lo + (double)(hi-lo)/(hi_pd-lo_pd) * (time_pos-lo_pd))*weight + (lo+hi)/2.*(1.-weight); - if (hi - guess < max_distance) guess = hi - max_distance; //(lo + hi)/2; + if (fake_hi - guess < max_distance) guess = fake_hi - max_distance; //(lo + hi)/2; } if (guess < lo + 16) guess = lo + 16; return guess; @@ -1158,7 +1158,7 @@ static int binary_search_syncpoint(nut_context_t * nut, double time_pos, off_t * start, off_t * end, syncpoint_t * stopper) { int i, err = 0; syncpoint_t s; - off_t fake_hi; + off_t fake_hi, * guess = &nut->binary_guess; uint64_t timebases[nut->timebase_count]; syncpoint_list_t * sl = &nut->syncpoints; int a = 0; @@ -1200,34 +1200,53 @@ #define LO (sl->s[i]) #define HI (sl->s[i+1]) - fake_hi = nut->seek_status ? nut->seek_status : HI.pos; + fake_hi = nut->seek_status ? (nut->seek_status >> 1) : HI.pos; while (!LO.seen_next) { // start binary search between LO (sl->s[i].pos) to HI (sl->s[i+1].pos) ... - off_t guess = seek_interpolate(nut->max_distance*2, time_pos, LO.pos, fake_hi, TO_DOUBLE_PTS(LO.pts), TO_DOUBLE_PTS(HI.pts)); + if (!*guess) *guess = seek_interpolate(nut->max_distance*2, time_pos, LO.pos, HI.pos, TO_DOUBLE_PTS(LO.pts), TO_DOUBLE_PTS(HI.pts), fake_hi); - fprintf(stderr, "\n%d [ (%d,%.3f) .. (%d,%.3f) .. (%d,%.3f) ] ", i, (int)LO.pos, TO_DOUBLE_PTS(LO.pts), (int)guess, time_pos, - (int)fake_hi, TO_DOUBLE_PTS(HI.pts)); + fprintf(stderr, "\n%d [ (%d,%.3f) .. (%d,%.3f) .. (%d(%d),%.3f) ] ", i, (int)LO.pos, TO_DOUBLE_PTS(LO.pts), (int)*guess, time_pos, + (int)HI.pos, (int)fake_hi, TO_DOUBLE_PTS(HI.pts)); a++; - if (!nut->seek_status) seek_buf(nut->i, guess, SEEK_SET); - nut->seek_status = fake_hi; // so we know where to continue off... - CHECK(smart_find_syncpoint(nut, &s, 0, fake_hi)); - nut->seek_status = 0; + if (!(nut->seek_status & 1)) { + if (!nut->seek_status) seek_buf(nut->i, *guess, SEEK_SET); + nut->seek_status = fake_hi << 1; + CHECK(find_syncpoint(nut, &s, 0, fake_hi)); + nut->seek_status = 0; + } - if (s.seen_next == 1 || s.pos >= fake_hi) { // we got back to 'HI' - // either we scanned everything from LO to HI, or we keep trying - if (guess <= LO.pos + 16) LO.seen_next = 1; // we are done! - else fake_hi = guess; - continue; +scan_backwards: + if (nut->seek_status & 1 || s.seen_next == 1 || s.pos >= fake_hi) { // we got back to 'HI' + if (*guess == LO.pos + 16) { // we are done! + LO.seen_next = 1; + break; + } + // Now let's scan backwards from 'guess' to 'LO' - after this, we can set s.seen_next + if (!nut->seek_status) seek_buf(nut->i, *guess - nut->max_distance + 7, SEEK_SET); + nut->seek_status = (fake_hi << 1) + 1; + CHECK(find_syncpoint(nut, &s, 1, 0)); + nut->seek_status = 0; + s.seen_next = 1; // now this can cause LO.seen_next to be set after add_syncpoint(), it's magic } CHECK(add_syncpoint(nut, s, NULL, NULL, timebases[s.pts%nut->timebase_count] < s.pts/nut->timebase_count ? NULL : &i)); - if (HI.pos < fake_hi) fake_hi = HI.pos; + + if (s.pos - *guess > nut->max_distance * 100) { + // we just scanned a very large area of (probably) damaged data + // let's avoid scanning it again by caching the syncpoint right before it with seen_next + s.seen_next = 1; + goto scan_backwards; + } + + if (HI.pos < fake_hi) fake_hi = MIN(HI.pos, *guess); + *guess = 0; } + *guess = 0; fprintf(stderr, "\n[ (%d,%d) .. %d .. (%d,%d) ] => %d (%d seeks) %d\n", - (int)LO.pos, (int)LO.pts, (int)timebases[0], (int)fake_hi, (int)HI.pts, (int)(LO.pos - LO.back_ptr), a, LO.back_ptr); + (int)LO.pos, (int)LO.pts, (int)timebases[0], (int)HI.pos, (int)HI.pts, (int)(LO.pos - LO.back_ptr), a, LO.back_ptr); // at this point, s[i].pts < P < s[i+1].pts, and s[i].seen_next is set *start = LO.pos - LO.back_ptr; *end = HI.pos; @@ -1520,6 +1539,7 @@ nut->dopts = *dopts; nut->seek_status = 0; nut->before_seek = 0; + nut->binary_guess = 0; nut->last_syncpoint = 0; nut->find_syncpoint_state = (struct find_syncpoint_state_s){0,0,0,0}; Modified: trunk/libnut/priv.h ============================================================================== --- trunk/libnut/priv.h (original) +++ trunk/libnut/priv.h Fri Jan 26 17:28:56 2007 @@ -155,6 +155,7 @@ off_t before_seek; // position before any seek mess off_t seek_status; + off_t binary_guess; double seek_time_pos; syncpoint_list_t syncpoints;

1 0

max number of streams?
by Clemens Ladisch 23 Jan '07

23 Jan '07

nut.txt doesn't specify a limit for the number of streams: | stream_count (v) | number of streams in this file | ... | stream_id (v) | Stream identifier | stream_id MUST be < stream_count but a stream id in the frame type table must be less than 250: | stream_id[frame_code] (v) | if FLAG_STREAM_ID is not set then this is the stream number for the | frame following this frame_code | if FLAG_STREAM_ID is set then this value has no meaning | MUST be <250 Does this imply that NUT files can have _any_ number of streams, but stream_id values of 250 or greater must be explicitly coded in frame headers? Regards, Clemens

2 1