March 2006 - NUT-devel - lists.mplayerhq.hu

CVS: main/DOCS/tech mpcf.txt,1.144,1.145
by syncmail＠mplayerhq.hu 12 Mar '06

12 Mar '06

CVS change done by Oded Shimon CVS Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var2/tmp/cvs-serv491/DOCS/tech Modified Files: mpcf.txt Log Message: revert last change Index: mpcf.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/mpcf.txt,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- mpcf.txt 12 Mar 2006 13:30:45 -0000 1.144 +++ mpcf.txt 12 Mar 2006 17:35:51 -0000 1.145 @@ -516,17 +516,17 @@ its pts differs by more then max_pts_distance from the last frame stream_id_plus1[frame_code] - MUST be <256 + MUST be <250 if it is 0, then the stream_id is coded in the frame data_size_mul[frame_code] - MUST be <65536 + MUST be <16384 data_size_lsb[frame_code] - MUST be <65536 + MUST be <16384 pts_delta[frame_code] - MUST be <32768 and >-32768 + MUST be <16384 and >-16384 reserved_count[frame_code] MUST be <256

1 0

[NUT] (ods15): r104 - /trunk/nututils/nutmerge.c
by syncmail＠mplayerhq.hu 12 Mar '06

12 Mar '06

Author: ods15 Date: Sun Mar 12 18:34:16 2006 New Revision: 104 Log: slightly better frame code table... Modified: trunk/nututils/nutmerge.c Modified: trunk/nututils/nutmerge.c ============================================================================== --- trunk/nututils/nutmerge.c (original) +++ trunk/nututils/nutmerge.c Sun Mar 12 18:34:16 2006 @@ -20,9 +20,10 @@ //{ 4128, 3, 0, 1, 0, 0, 0 }, //{ flag, fields, pts, mul, stream, size, count } { 8192, 0, 0, 1, 0, 0, 0 }, // invalid 0x00 - { 32, 1, 0, 1, 0, 0, 0 }, // safety net non key frame + { 32, 0, 0, 1, 0, 0, 0 }, // safety net non key frame { 33, 0, 0, 1, 0, 0, 0 }, // safety net key frame { 4128, 0, 0, 1, 0, 0, 0 }, // one more safety net + { 3, 0, 0, 1, 0, 0, 0 }, // EOR frame { 1, 4, 1, 337, 2, 336, 0 }, // used 82427 times { 1, 4, 1, 385, 2, 384, 0 }, // used 56044 times { 0, 4, 2, 7, 1, 6, 0 }, // used 20993 times @@ -34,7 +35,7 @@ { 1, 4, 1, 769, 2, 768, 0 }, // used 433 times { 1, 4, 1, 961, 2, 960, 0 }, // used 191 times { 32, 3, 2, 101, 1, 0, 0 }, // "1.2.0" => 14187 - { 32, 3, -1, 41, 1, 0, 0 }, // "1.-1.0" => 5707 + { 32, 3, -1, 40, 1, 0, 0 }, // "1.-1.0" => 5707 { 32, 3, 1, 81, 1, 0, 0 }, // "1.1.0" => 11159 { 33, 3, 1, 11, 1, 0, 0 }, // "1.1.1" => 1409 { 97, 3, 0, 6, 1, 0, 0 }, // checksum for video

1 0

[NUT] (ods15): r103 - in /trunk/libnut: demuxer.c muxer.c
by syncmail＠mplayerhq.hu 12 Mar '06

12 Mar '06

Author: ods15 Date: Sun Mar 12 18:32:33 2006 New Revision: 103 Log: sync to spec again, back to 64kb for syncpoints and 2* for frame size Modified: trunk/libnut/demuxer.c trunk/libnut/muxer.c Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sun Mar 12 18:32:33 2006 @@ -236,7 +236,7 @@ ERROR(i != NUT_VERSION, -ERR_BAD_VERSION); GET_V(tmp, nut->stream_count); GET_V(tmp, nut->max_distance); - if (nut->max_distance > 131072) nut->max_distance = 131072; + if (nut->max_distance > 65536) nut->max_distance = 65536; for(i = 0; i < 256; ) { int scrap; @@ -553,7 +553,7 @@ // error checking - max distance ERROR(!after_sync && bctello(nut->i) + pd->len - nut->last_syncpoint > nut->max_distance, -ERR_MAX_SYNCPOINT_DISTANCE); - ERROR(!checksum && pd->len > nut->max_distance, -ERR_MAX_DISTANCE); + ERROR(!checksum && pd->len > 2*nut->max_distance, -ERR_MAX_DISTANCE); // error checking - max pts distance ERROR(!checksum && ABS((int64_t)pd->pts - (int64_t)nut->sc[pd->stream].last_pts) > nut->sc[pd->stream].max_pts_distance, -ERR_MAX_PTS_DISTANCE); // error checking - out of order dts Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Sun Mar 12 18:32:33 2006 @@ -390,7 +390,7 @@ if (ABS(pts_delta) < (msb_pts/2) - 1) coded_pts = fd->pts & (msb_pts - 1); else coded_pts = fd->pts + msb_pts; - if (fd->len > nut->max_distance) checksum = 1; + if (fd->len > 2*nut->max_distance) checksum = 1; if (ABS(pts_delta) > sc->max_pts_distance) { fprintf(stderr, "%d > %d || %d - %d > %d \n", fd->len, nut->max_distance, (int)fd->pts, (int)sc->last_pts, sc->max_pts_distance); checksum = 1; @@ -488,7 +488,7 @@ nut->max_distance = mopts->max_distance; nut->mopts = *mopts; - if (nut->max_distance > 131072) nut->max_distance = 131072; + if (nut->max_distance > 65536) nut->max_distance = 65536; { int j, n;

1 0

CVS: main/DOCS/tech mpcf.txt,1.142,1.143
by syncmail＠mplayerhq.hu 12 Mar '06

12 Mar '06

CVS change done by Oded Shimon CVS Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var2/tmp/cvs-serv29354/DOCS/tech Modified Files: mpcf.txt Log Message: 10l to me, misarrangment of flags Index: mpcf.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/mpcf.txt,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- mpcf.txt 12 Mar 2006 13:08:10 -0000 1.142 +++ mpcf.txt 12 Mar 2006 13:21:04 -0000 1.143 @@ -500,10 +500,10 @@ Bit Name Description 1 FLAG_KEY if set, frame is keyframe 2 FLAG_EOR if set, stream has no relevance on + presentation. (EOR) 32 FLAG_SIZE_MSB if set, data_size_msb is at frame header, otherwise data_size_msb is 0 64 FLAG_CHECKSUM if set then the frame header contains a checksum - presentation. (EOR) 4096 FLAG_CODED if set, coded_flags are stored in the frame header. 8192 FLAG_INVALID if set, frame_code is invalid.

1 0

CVS: main/DOCS/tech mpcf.txt,1.141,1.142
by syncmail＠mplayerhq.hu 12 Mar '06

12 Mar '06

CVS change done by Oded Shimon CVS Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var2/tmp/cvs-serv26634/DOCS/tech Modified Files: mpcf.txt Log Message: change max_distance back to 64kb and set max frame size to 2*max_distance. If anyone is against, speak up... Index: mpcf.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/mpcf.txt,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- mpcf.txt 11 Mar 2006 19:47:05 -0000 1.141 +++ mpcf.txt 12 Mar 2006 13:08:10 -0000 1.142 @@ -399,9 +399,10 @@ non-keyframe - keyframe transitions are very frequent SHOULD be set to <=32768 - if the stored value is >131072 then max_distance MUST be set to 131072 + if the stored value is >65536 then max_distance MUST be set to 65536 - this is also the max frame size without a checksum after the frameheader. + This is also half the max frame size without a checksum after the + frameheader. max_pts_distance @@ -511,7 +512,7 @@ end presentation time of the final frame. An EOR set stream is unset by the first content frames. EOR can only be unset in streams with zero decode_delay . - FLAG_CHECKSUM MUST be set if the frame is larger than max_distance or + FLAG_CHECKSUM MUST be set if the frame is larger than 2*max_distance or its pts differs by more then max_pts_distance from the last frame stream_id_plus1[frame_code]

1 0

[NUT] (ods15): r102 - /trunk/nututils/nutindex.c
by syncmail＠mplayerhq.hu 12 Mar '06

12 Mar '06

Author: ods15 Date: Sun Mar 12 06:07:10 2006 New Revision: 102 Log: some more memory optimizations to nutindex Modified: trunk/nututils/nutindex.c Modified: trunk/nututils/nutindex.c ============================================================================== --- trunk/nututils/nutindex.c (original) +++ trunk/nututils/nutindex.c Sun Mar 12 06:07:10 2006 @@ -72,17 +72,16 @@ } } -static output_buffer_t * new_mem_buffer() { - output_buffer_t * bc = malloc(sizeof(output_buffer_t)); - bc->write_len = PREALLOC_SIZE; +static output_buffer_t * new_mem_buffer(output_buffer_t * bc) { + bc->write_len = 0; bc->is_mem = 1; bc->file_pos = 0; - bc->buf_ptr = bc->buf = malloc(bc->write_len); + bc->buf_ptr = bc->buf = NULL; return bc; } -static output_buffer_t * new_output_buffer(FILE * out) { - output_buffer_t * bc = new_mem_buffer(); +static output_buffer_t * new_output_buffer(output_buffer_t * bc, FILE * out) { + new_mem_buffer(bc); bc->is_mem = 0; bc->out = out; return bc; @@ -105,7 +104,7 @@ } static void put_data(output_buffer_t * bc, int len, const uint8_t * data) { - if (len < PREALLOC_SIZE || bc->is_mem) { + if (len + (bc->buf_ptr - bc->buf) < bc->write_len || bc->is_mem) { ready_write_buf(bc, len); memcpy(bc->buf_ptr, data, len); bc->buf_ptr += len; @@ -119,7 +118,6 @@ if (!bc) return; if (!bc->is_mem) flush_out_buf(bc); free(bc->buf); - free(bc); } // ============ INPUT BUFFER ============== @@ -164,8 +162,7 @@ if (whence == SEEK_END) bc->filesize = bc->file_pos - pos; } -static input_buffer_t * new_input_buffer(FILE * in) { - input_buffer_t * bc = malloc(sizeof(input_buffer_t)); +static input_buffer_t * new_input_buffer(input_buffer_t * bc, FILE * in) { bc->read_len = 0; bc->write_len = 0; bc->file_pos = 0; @@ -184,7 +181,6 @@ static void free_buffer(input_buffer_t * bc) { if (!bc) return; free(bc->buf); - free(bc); } static int get_bytes(input_buffer_t * bc, int count, uint64_t * val) { @@ -296,6 +292,8 @@ (v_len(forward_ptr + new_idx_len-idx_len) - v_len(forward_ptr)) > new_idx_len - idx_len) new_idx_len += 16; + ready_write_buf(out, new_idx_len); // prealloc + put_bytes(out, 8, INDEX_STARTCODE); put_v(out, forward_ptr + new_idx_len-idx_len); if (forward_ptr + new_idx_len-idx_len > 4096) put_bytes(out, 4, crc32(out->buf, bctello(out))); @@ -310,7 +308,6 @@ printf("%d => %d (%d)\n", (int)tmp, (int)(tmp + new_idx_len/16), new_idx_len); idx_len = (in->filesize - 12) - bctello(in); // from where we are, until the index_ptr and checksum, copy everything - ready_write_buf(out, idx_len); if (get_data(in, idx_len, out->buf_ptr)) return 1; out->buf_ptr += idx_len; @@ -323,22 +320,26 @@ int main(int argc, char * argv[]) { FILE * fin = argc>2 ? fopen(argv[1], "rb") : NULL; FILE * fout = argc>2 ? fopen(argv[2], "wb") : NULL; - input_buffer_t * in; - output_buffer_t * out, * mem = new_mem_buffer(); + input_buffer_t iin, * in; + output_buffer_t oout, * out, omem, * mem = new_mem_buffer(&omem); off_t end; if (!fin || !fout) { fprintf(stderr, "bleh\n"); return 1; } - in = new_input_buffer(fin); - out = new_output_buffer(fout); + in = new_input_buffer(&iin, fin); + out = new_output_buffer(&oout, fout); CHECK(find_copy_index(in, mem, &end)); seek_buf(in, 0, SEEK_SET); CHECK(read_headers(in)); + printf("headers: %d\n", (int)bctello(in)); + put_data(out, bctello(in), in->buf); // write headers put_data(out, bctello(mem), mem->buf); // write index + + flush_buf(in); // copy all data while (bctello(in) < end) {

1 0

[NUT] (ods15): r101 - /trunk/demux_nut.c
by syncmail＠mplayerhq.hu 12 Mar '06

12 Mar '06

Author: ods15 Date: Sun Mar 12 05:15:39 2006 New Revision: 101 Log: fix mplayer demux_nut Modified: trunk/demux_nut.c Modified: trunk/demux_nut.c ============================================================================== --- trunk/demux_nut.c (original) +++ trunk/demux_nut.c Sun Mar 12 05:15:39 2006 @@ -205,7 +205,7 @@ dp->pts = pts; dp->pos = demuxer->filepos; - dp->flags= (pd.flags & NUT_KEY_STREAM_FLAG) ? 0x10 : 0; + dp->flags= (pd.flags & NUT_FLAG_KEY) ? 0x10 : 0; while ((ret = nut_read_frame(nut, &pd.len, dp->buffer))) { if (ret < 0) { @@ -218,7 +218,7 @@ return 1; } -static void demux_seek_nut(demuxer_t * demuxer, float time_pos, int flags) { +static void demux_seek_nut(demuxer_t * demuxer, float time_pos, float audio_delay, int flags) { nut_context_t * nut = ((nut_priv_t*)demuxer->priv)->nut; nut_priv_t * priv = demuxer->priv; sh_audio_t * sh_audio = demuxer->audio->sh;

1 0

max pts/distance stuff
by Michael Niedermayer 11 Mar '06

11 Mar '06

Hi currenbtly we have " max_distance max distance of syncpoints, the distance may only be larger if there is no more than a single frame between the two syncpoints. This can be used by the demuxer to detect damaged frame headers if the damage results in too long of a chain syncpoints SHOULD be placed immediately before a keyframe if the previous frame of the same stream was a non-keyframe, unless such non-keyframe - keyframe transitions are very frequent SHOULD be set to <=32768 if the stored value is >65536 then max_distance MUST be set to 65536 max_pts_distance max absoloute difference of pts of new frame from last_pts in the timebase of the stream, without a checksum after the frameheader Note that last_pts is not necessarily the pts of the last frame on the same stream, as it is altered by syncpoint timestamps. max_frame_size max frame size without a checksum after the frameheader. MUST be <=4*max_distance. If stored value is bigger then max_frame_size MUST be set to 4*max_distance " in the spec, there are several issues which need disscussion 1. no limit for max_pts_distance, users could set it to insane values and cause troubble on the demuxer side, yes theres the time rescaling issue 2. max_frame_size limit is too large, its practically 256k, i think 64k or less is more reasonable 3. what about droping one varaible and max_distance=max_frame_size? -- Michael

3 6

[NUT] (ods15): r100 - in /trunk/libnut: demuxer.c muxer.c
by syncmail＠mplayerhq.hu 11 Mar '06

11 Mar '06

Author: ods15 Date: Sat Mar 11 20:49:07 2006 New Revision: 100 Log: sync to spec, 128kb for max_distance instead of 64kb Modified: trunk/libnut/demuxer.c trunk/libnut/muxer.c Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Mar 11 20:49:07 2006 @@ -236,7 +236,7 @@ ERROR(i != NUT_VERSION, -ERR_BAD_VERSION); GET_V(tmp, nut->stream_count); GET_V(tmp, nut->max_distance); - if (nut->max_distance > 65536) nut->max_distance = 65536; + if (nut->max_distance > 131072) nut->max_distance = 131072; for(i = 0; i < 256; ) { int scrap; Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Sat Mar 11 20:49:07 2006 @@ -488,7 +488,7 @@ nut->max_distance = mopts->max_distance; nut->mopts = *mopts; - if (nut->max_distance > 65536) nut->max_distance = 65536; + if (nut->max_distance > 131072) nut->max_distance = 131072; { int j, n;

1 0

[NUT] (ods15): r99 - /trunk/README
by syncmail＠mplayerhq.hu 11 Mar '06

11 Mar '06

Author: ods15 Date: Sat Mar 11 20:26:24 2006 New Revision: 99 Log: document nutindex Modified: trunk/README Modified: trunk/README ============================================================================== --- trunk/README (original) +++ trunk/README Sat Mar 11 20:26:24 2006 @@ -34,6 +34,10 @@ auto detction should work fine. +to copy index to begginning of file: +./nutindex old.nut new.nut + + If you have weird endianess, You'll need to compile with '-DWORDS_BIGENDIAN', just uncomment the appropriate file in config.mak .

1 0