- NUT-devel - lists.mplayerhq.hu

fourcc for raw PCM data?
by Clemens Ladisch 13 Feb '07

13 Feb '07

According to the spec, the fourcc for raw PCM data would be the same as in .avi, i.e., 0x0001. However, this fourcc does not specify how many bits the samples have. Raw PCM does not seem to have any codec specific data that could be used for this purpose. Should I use one of the .mov fourccs instead? Regards, Clemens

1 0

r22192 - trunk/DOCS/tech/nut.txt
by michael 10 Feb '07

10 Feb '07

Author: michael Date: Sat Feb 10 18:00:03 2007 New Revision: 22192 Modified: trunk/DOCS/tech/nut.txt Log: clarify description of reserved_count in frame header patch by (Clemens Ladisch cladisch,fastmail,net) Modified: trunk/DOCS/tech/nut.txt ============================================================================== --- trunk/DOCS/tech/nut.txt (original) +++ trunk/DOCS/tech/nut.txt Sat Feb 10 18:00:03 2007 @@ -301,6 +301,7 @@ frame: frame_code f(8) frame_flags= flags[frame_code] + frame_res= reserved_count[frame_code] if(frame_flags&FLAG_CODED){ coded_flags v frame_flags ^= coded_flags @@ -315,8 +316,8 @@ data_size_msb v } if(frame_flags&FLAG_RESERVED) - reserved_count[frame_code] v - for(i=0; i<reserved_count[frame_code]; i++) + frame_res v + for(i=0; i<frame_res; i++) reserved v if(frame_flags&FLAG_CHECKSUM){ checksum u(32)

1 0

[MPlayer-dev-eng] [PATCH] nut.txt: clarify description of reserved_count in frame header
by Clemens Ladisch 09 Feb '07

09 Feb '07

The pseudocode for the coded reserved_count in a frame header says "reserved_count[frame_code]". This could be interpreted as meaning that the coded value resets the value for this frame_code, i.e., that the coded value would also be the default value for all further occurrences of this frame code. The patch introduces a temporary variable to avoid that interpretation.

2 1

[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