- NUT-devel - lists.mplayerhq.hu

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

15 Mar '06

CVS change done by Oded Shimon CVS Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var2/tmp/cvs-serv227/DOCS/tech Modified Files: mpcf.txt Log Message: bump neglected date more consistent notation (usually in specs there are only arrays, no structs...) Index: mpcf.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/mpcf.txt,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- mpcf.txt 12 Mar 2006 17:35:51 -0000 1.145 +++ mpcf.txt 12 Mar 2006 17:40:32 -0000 1.146 @@ -1,5 +1,5 @@ ======================================== -NUT Open Container Format DRAFT 20060207 +NUT Open Container Format DRAFT 20060312 ======================================== @@ -106,7 +106,7 @@ t (v coded universal timestamp) tmp v stream_id= tmp % stream_count - value= (tmp / stream_count) * stream[ stream_id ].timebase + value= (tmp / stream_count) * timebase[stream_id] Bitstream syntax:

4 7

CVS: main/DOCS/tech mpcf.txt,1.148,1.149
by syncmail＠mplayerhq.hu 15 Mar '06

15 Mar '06

CVS change done by Oded Shimon CVS Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var2/tmp/cvs-serv29724/DOCS/tech Modified Files: mpcf.txt Log Message: timebase table Index: mpcf.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/mpcf.txt,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- mpcf.txt 13 Mar 2006 06:50:55 -0000 1.148 +++ mpcf.txt 15 Mar 2006 16:24:24 -0000 1.149 @@ -107,8 +107,8 @@ t (v coded universal timestamp) tmp v - stream_id= tmp % stream_count - value= (tmp / stream_count) * timebase[stream_id] + id= tmp % time_base_count + value= (tmp / time_base_count) * time_base[id] Bitstream syntax: @@ -151,6 +151,11 @@ version v stream_count v max_distance v + time_base_count v + for(i=0; i<time_base_count; i++) + time_base_nom v + time_base_denom v + time_base[i]= time_base_nom/time_base_denom tmp_pts=0 tmp_mul=1 tmp_stream=0 @@ -188,8 +193,7 @@ stream_id v stream_class v fourcc vb - time_base_nom v - time_base_denom v + time_base_id v msb_pts_shift v max_pts_distance v decode_delay v @@ -444,6 +448,9 @@ 29.97 1001 30000 23.976 1001 24000 +time_base_id + id to time_base table + convert_ts To switch from 2 different timebases, the following calculation is defined: @@ -616,7 +623,7 @@ global_key_pts After a syncpoint, last_pts of each stream is to be set to: - last_pts[i] = convert_ts(global_key_pts, timebase[stream], timebase[i]) + last_pts[i] = convert_ts(global_key_pts, time_base[id], time_base[i]) global_key_pts MUST be bigger or equal to dts of all past frames across all streams, and smaller or equal to pts of all future frames.

1 0

CVS: main/DOCS/tech mpcf.txt,1.147,1.148
by syncmail＠mplayerhq.hu 13 Mar '06

13 Mar '06

CVS change done by Oded Shimon CVS Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var2/tmp/cvs-serv4271/DOCS/tech Modified Files: mpcf.txt Log Message: cosmetic, move stuff around Index: mpcf.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/mpcf.txt,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- mpcf.txt 12 Mar 2006 20:44:22 -0000 1.147 +++ mpcf.txt 13 Mar 2006 06:50:55 -0000 1.148 @@ -125,6 +125,26 @@ impossible to add new fields at the end of packets in the future in a compatible way] +packet_header + startcode f(64) + forward_ptr v + if(forward_ptr > 4096) + header_checksum u(32) + +packet_footer + reserved_bytes + checksum u(32) + +reserved_headers + while(next_byte == 'N' && next_code != main_startcode + && next_code != stream_startcode + && next_code != info_startcode + && next_code != index_startcode + && next_code != syncpoint_startcode){ + packet_header + packet_footer + } + Headers: main header: @@ -313,26 +333,6 @@ above is a better loop in practice (not to mention its simpler) note, demuxers MUST be able to deal with new and unknown headers -packet_header - startcode f(64) - forward_ptr v - if(forward_ptr > 4096) - header_checksum u(32) - -packet_footer - reserved_bytes - checksum u(32) - -reserved_headers - while(next_byte == 'N' && next_code != main_startcode - && next_code != stream_startcode - && next_code != info_startcode - && next_code != index_startcode - && next_code != syncpoint_startcode){ - packet_header - packet_footer - } - file: file_id_string while(!eof){

1 0

CVS: main/DOCS/tech mpcf.txt,1.143,1.144
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-serv5137/DOCS/tech Modified Files: mpcf.txt Log Message: better max for frame code values, still allowing compact implementation Index: mpcf.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/mpcf.txt,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- mpcf.txt 12 Mar 2006 13:21:04 -0000 1.143 +++ mpcf.txt 12 Mar 2006 13:30:45 -0000 1.144 @@ -516,20 +516,20 @@ its pts differs by more then max_pts_distance from the last frame stream_id_plus1[frame_code] - must be <250 + MUST be <256 if it is 0, then the stream_id is coded in the frame data_size_mul[frame_code] - must be <16384 + MUST be <65536 data_size_lsb[frame_code] - must be <16384 + MUST be <65536 pts_delta[frame_code] - must be <16384 and >-16384 + MUST be <32768 and >-32768 reserved_count[frame_code] - must be <256 + MUST be <256 data_size data_size= data_size_lsb + data_size_msb*data_size_mul;

4 6

CVS: main/DOCS/tech mpcf.txt,1.146,1.147
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-serv30575/DOCS/tech Modified Files: mpcf.txt Log Message: strings without terminating NUL Index: mpcf.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/mpcf.txt,v retrieving revision 1.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- mpcf.txt 12 Mar 2006 17:40:32 -0000 1.146 +++ mpcf.txt 12 Mar 2006 20:44:22 -0000 1.147 @@ -98,6 +98,8 @@ data[i] u(8) } [Note: strings MUST be encoded in UTF-8] + [Note: the character NUL (U+0000) is not legal within + or at the end of a string.] vb (variable length binary data or string) length v

1 0

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