February 2008 - NUT-devel - lists.mplayerhq.hu

[nut]: r623 - docs/nut.txt
by michael 13 Feb '08

13 Feb '08

Author: michael Date: Wed Feb 13 15:14:01 2008 New Revision: 623 Log: Header elision support Sizes of tables are limited to allow demuxers with little memory. Headers are stored in a seprate table instead of straight in the frame code table to avoid <max header size>*256 size problems. And to allow elision headers to be selected through an index in the frame header. New demuxers should be able to read old files. Old demuxers can read new files as long as the index is not coded in the frame header, though they will of course be missing the header in the outputed frames if a non empty one has been used. Modified: docs/nut.txt Modified: docs/nut.txt ============================================================================== --- docs/nut.txt (original) +++ docs/nut.txt Wed Feb 13 15:14:01 2008 @@ -248,6 +248,7 @@ main_header: tmp_mul=1 tmp_stream=0 tmp_match=1-(1<<62) + tmp_head_idx= 0; for(i=0; i<256; ){ tmp_flag v tmp_fields v @@ -261,7 +262,8 @@ main_header: if(tmp_fields>5) count v else count= tmp_mul - tmp_size if(tmp_fields>6) tmp_match s - for(j=7; j<tmp_fields; j++){ + if(tmp_fields>7) tmp_head_idx v + for(j=8; j<tmp_fields; j++){ tmp_reserved[i] v } for(j=0; j<count && i<256; j++, i++){ @@ -277,8 +279,12 @@ main_header: pts_delta[i]= tmp_pts; reserved_count[i]= tmp_res; match_time_delta[i]= tmp_match; + header_idx[i]= tmp_head_idx; } } + header_count_minus1 v + for(i=0; i<header_count_minus1; i++) + elision_header[i+1] vb reserved_bytes stream_header: @@ -326,6 +332,9 @@ frame: if(frame_flags&FLAG_MATCH_TIME){ match_time_delta s } + if(frame_flags&FLAG_HEADER_IDX){ + header_idx v + } if(frame_flags&FLAG_RESERVED) frame_res v for(i=0; i<frame_res; i++) @@ -618,6 +627,7 @@ flags[frame_code], frame_flags (v) otherwise data_size_msb is 0. 6 FLAG_CHECKSUM If set, the frame header contains a checksum. 7 FLAG_RESERVED If set, reserved_count is coded in the frame header. + 10 FLAG_HEADER_IDX If set, header_idx is coded in the frame header. 11 FLAG_MATCH_TIME If set, match_time_delta is coded in the frame header 12 FLAG_CODED If set, coded_flags are stored in the frame header. @@ -693,6 +703,23 @@ match_time_delta[frame_code] (s) match_time_delta, otherwise this value is ignored. MUST be <32768 and >-32768 or =1-(1<<62) +header_idx[frame_code] (v) + The index into the elision_header table. + MUST by <128 + +header_count_minus1 (v) + The number of distinct non empty elision headers. + MUST be <128 + +elision_header[header_idx] (vb) + For frames with a final size <= 4096 this header is prepended to the + frame data. That is if the stored frame is 4000 bytes and the + elision_header is 96 bytes then it is prepended, if it is 97 byte then it + is not. + elision_header[0] is fixed to a length 0 header + The length of each elision_header except header 0 MUST be < 256 and >0 + The sum of the lengthes of all elision_headers MUST be <=1024 + lsb_pts Least significant bits of the pts in time_base precision. Example: IBBP display order

1 0

[nut]: r621 - docs/nut.txt
by cladisch 13 Feb '08

13 Feb '08

Author: cladisch Date: Wed Feb 13 13:31:05 2008 New Revision: 621 Log: fix typo Modified: docs/nut.txt Modified: docs/nut.txt ============================================================================== --- docs/nut.txt (original) +++ docs/nut.txt Wed Feb 13 13:31:05 2008 @@ -691,7 +691,7 @@ match_time_delta (s) match_time_delta[frame_code] (s) If FLAG_MATCH_TIME is not set then this value shall be used for match_time_delta, otherwise this value is ignored. - MUST be <32786 and >-32768 or =1-(1<<62) + MUST be <32768 and >-32768 or =1-(1<<62) lsb_pts Least significant bits of the pts in time_base precision.

1 0

[nut]: r620 - docs/nut4cc.txt
by michael 13 Feb '08

13 Feb '08

Author: michael Date: Wed Feb 13 13:25:03 2008 New Revision: 620 Log: clarify mp4v Modified: docs/nut4cc.txt Modified: docs/nut4cc.txt ============================================================================== --- docs/nut4cc.txt (original) +++ docs/nut4cc.txt Wed Feb 13 13:25:03 2008 @@ -33,6 +33,8 @@ MPG4 MS MPEG4v1 (!NOT ISO MPEG4!) MP42 MS MPEG4v2 MP43 MS MPEG4v3 MP4V ISO MPEG4 Part 2 Video + !for non compliant mpeg4 like old divx4/odivx use the respective + fourcc, this fourcc is only for fully comliant mpeg4! mpg1 ISO MPEG1 Video mpg2 ISO MPEG2 Video MRLE MS RLE

1 0

[nut]: r617 - src/trunk/Makefile
by cladisch 13 Feb '08

13 Feb '08

Author: cladisch Date: Wed Feb 13 09:01:58 2008 New Revision: 617 Log: Fix the nutmerge dependencies to prevent nutmerge.h from being treated as a source file. Modified: src/trunk/Makefile Modified: src/trunk/Makefile ============================================================================== --- src/trunk/Makefile (original) +++ src/trunk/Makefile Wed Feb 13 09:01:58 2008 @@ -2,6 +2,7 @@ include config.mak LIBNUT_OBJS = libnut/muxer.o libnut/demuxer.o libnut/reorder.o libnut/framecode.o NUTUTILS_PROGS = nututils/nutmerge nututils/nutindex nututils/nutparse +NUTMERGE_OBJS = nututils/nutmerge.o nututils/demux_avi.o nututils/demux_ogg.o nututils/framer_mp3.o nututils/framer_mpeg4.o nututils/framer_vorbis.o all: libnut nututils @@ -19,7 +20,8 @@ $(LIBNUT_OBJS): libnut/priv.h libnut/lib nututils: $(NUTUTILS_PROGS) -nututils/nutmerge: nututils/demux_avi.c nututils/demux_ogg.c nututils/framer_mp3.c nututils/framer_mpeg4.c nututils/framer_vorbis.c nututils/nutmerge.h libnut/libnut.a +$(NUTMERGE_OBJS): nututils/nutmerge.h +nututils/nutmerge: $(NUTMERGE_OBJS) libnut/libnut.a $(NUTUTILS_PROGS): CFLAGS += -Ilibnut

4 4

[nut]: r618 - src/trunk/nututils/nutparse.c
by cladisch 13 Feb '08

13 Feb '08

Author: cladisch Date: Wed Feb 13 09:03:14 2008 New Revision: 618 Log: Do not print the unneeded intermediate value of the sync point back pointer calculation. Modified: src/trunk/nututils/nutparse.c Modified: src/trunk/nututils/nutparse.c ============================================================================== --- src/trunk/nututils/nutparse.c (original) +++ src/trunk/nututils/nutparse.c Wed Feb 13 09:03:14 2008 @@ -490,7 +490,7 @@ static void parse_syncpoint(uint64_t pos for (i = 0; i < stream_count; ++i) streams[i].last_pts = convert_ts(pts, tbid, streams[i].time_base_id); value = read_var(); - printf(" back_ptr_div16: %"PRIu64" (%"PRIu64") -> 0x%"PRIx64"\n", value, value * 16 + 15, pos - (value * 16 + 15)); + printf(" back_ptr_div16: %"PRIu64" (0x%"PRIx64")\n", value, pos - (value * 16 + 15)); } static void parse_index(void)

1 0

[nut]: r616 - docs/nutissues.txt
by michael 12 Feb '08

12 Feb '08

Author: michael Date: Tue Feb 12 23:04:46 2008 New Revision: 616 Log: Mention last consensus about raw and stream headers. Modified: docs/nutissues.txt Modified: docs/nutissues.txt ============================================================================== --- docs/nutissues.txt (original) +++ docs/nutissues.txt Tue Feb 12 23:04:46 2008 @@ -167,3 +167,5 @@ D. Only allow 1 standard interleaving What about the interleaving of non raw codecs, do all specify the interleaving, or does any leave it to the container? If so, our options would be down to only C. + +Also a field specific to just raw does not belong in the stream headers.

1 0

[nut]: r609 - docs/nutissues.txt
by michael 12 Feb '08

12 Feb '08

Author: michael Date: Tue Feb 12 13:54:02 2008 New Revision: 609 Log: 3rd option Modified: docs/nutissues.txt Modified: docs/nutissues.txt ============================================================================== --- docs/nutissues.txt (original) +++ docs/nutissues.txt Tue Feb 12 13:54:02 2008 @@ -152,6 +152,7 @@ How do we identify the sample format A. fourcc B. extradata +C. New field in the stream header Issue pcm-interleaving @@ -160,3 +161,4 @@ How do we identify the interleaving A. fourcc B. extradata +C. New field in the stream header

3 3

[nut]: r611 - docs/nut4cc.txt
by michael 12 Feb '08

12 Feb '08

Author: michael Date: Tue Feb 12 15:50:38 2008 New Revision: 611 Log: PCM audio comments welcome Modified: docs/nut4cc.txt Modified: docs/nut4cc.txt ============================================================================== --- docs/nut4cc.txt (original) +++ docs/nut4cc.txt Tue Feb 12 15:50:38 2008 @@ -82,5 +82,16 @@ ARGB Packed RGBA 8:8:8:8, 32bpp, ARGB RGB[24] Packed RGB 8:8:8, 24bpp RGB [NOT in AVI] BGR[24] Packed RGB 8:8:8, 24bpp BGR [NOT in AVI] +Raw audio: [x] is an byte with value x, [NOT in AVI] +ALAW A-LAW +ULAW MU-LAW +<sign><type><interleaving><bits> little endian PCM +<bits><interleaving><type><sign> big endian PCM + <sign> is S for signed, U for unsigned + <type> is I for integer, F for IEEE float + <interleaving> is D for default (left, right) + <bits> is 8/16/24/32 +SFD[32] would for example be signed 32 bit little endian IEEE float -FIXME mpeg4/dv/gray16/audio codecs + +FIXME mpeg4/dv/gray16/audio codecs/multi chan interleaving

3 2

[nut]: r612 - docs/nut4cc.txt
by michael 12 Feb '08

12 Feb '08

Author: michael Date: Tue Feb 12 15:55:53 2008 New Revision: 612 Log: simpler Modified: docs/nut4cc.txt Modified: docs/nut4cc.txt ============================================================================== --- docs/nut4cc.txt (original) +++ docs/nut4cc.txt Tue Feb 12 15:55:53 2008 @@ -85,13 +85,12 @@ BGR[24] Packed RGB 8:8:8, 24bpp BGR [NOT Raw audio: [x] is an byte with value x, [NOT in AVI] ALAW A-LAW ULAW MU-LAW -<sign><type><interleaving><bits> little endian PCM -<bits><interleaving><type><sign> big endian PCM - <sign> is S for signed, U for unsigned - <type> is I for integer, F for IEEE float +P<type><interleaving><bits> little endian PCM +<bits><interleaving><type>P big endian PCM + <type> is S for signed integer, U for unsigned integer, F for IEEE float <interleaving> is D for default (left, right) <bits> is 8/16/24/32 -SFD[32] would for example be signed 32 bit little endian IEEE float +PFD[32] would for example be signed 32 bit little endian IEEE float FIXME mpeg4/dv/gray16/audio codecs/multi chan interleaving

1 0

[nut]: r610 - docs/nut4cc.txt
by michael 12 Feb '08

12 Feb '08

Author: michael Date: Tue Feb 12 15:24:48 2008 New Revision: 610 Log: fourcc list. Added: docs/nut4cc.txt Added: docs/nut4cc.txt ============================================================================== --- (empty file) +++ docs/nut4cc.txt Tue Feb 12 15:24:48 2008 @@ -0,0 +1,86 @@ +This list lists fourcc codes and the codecs they identify. + +Codecs which are not in this list but have a standard fourcc in avi can be +used with the AVI fourcc in nut as well. +Codecs which are in this list but are not used with the same fourcc in avi +should be reported to us! (these maybe a typo) +Codecs which are in this list and in avi with the same fourcc as well as +other fourccs, SHOULD use the fourcc specified here. +For codecs which do not have a fourcc in AVI nor this list, please contact +us so we can add them to the list. + + +ASV1 Asus Video +ASV2 Asus Video 2 +CVID Cinepak +CYUV Creative YUV +DUCK Truemotion 1 +FFV1 FFmpeg video 1 +FFVH FFmpeg Huffyuv +H261 ITU H.261 +H262 ITU H.262 +H263 ITU H.263 +H264 ITU H.264 +HFYU Huffyuv +I263 Intel H.263 +IV31 Indeo 3.1 +IV32 Indeo 3.2 +IV50 Indeo 5.0 +LJPG ITU JPEG (lossless) +MJLS ITU JPEG-LS +MJPG ITU JPEG +MPG4 MS MPEG4v1 (!NOT ISO MPEG4!) +MP42 MS MPEG4v2 +MP43 MS MPEG4v3 +mpg1 ISO MPEG1 Video +mpg2 ISO MPEG2 Video +MRLE MS RLE +MSVC MS Video 1 +RT21 Indeo 2.1 +RV10 Real Video 1.0 +RV20 Real Video 2.0 +RV30 Real Video 3.0 +RV40 Real Video 4.0 +SNOW FFmpeg snow +SVQ1 Sorenson Video 1 +SVQ3 Sorenson Video 3 +theo Xiph theora +TM20 Truemotion 2.0 +VCR1 ATI VCR1 +VP30 VP 3.0 +VP31 VP 3.1 +VP50 VP 5.0 +VP60 VP 6.0 +VP61 VP 6.1 +VP61 VP 6.2 +WMV1 MS WMV7 +WMV2 MS WMV8 +WMV3 MS WMV9 +WVC1 VC-1 + +Raw video: [x] is a byte with value x +YV12 Planar 4:2:0 YUV +YUV9 Planar 4:1:0 YUV +Y800 8bit Gray +411P Planar 4:1:1 YUV +422P Planar 4:2:2 YUV +444P Planar 4:4:4 YUV +UYVY Packed 4:2:2 YUV (UYVY) +YUY2 Packed 4:2:2 YUV (YUYV) +RGB[15] Packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little endian [NOT in AVI] +BGR[15] Packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little endian [NOT in AVI] +RGB[16] Packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), little endian [NOT in AVI] +BGR[16] Packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb), little endian [NOT in AVI] +[15]BGR Packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big endian [NOT in AVI] +[15]RGB Packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big endian [NOT in AVI] +[16]BGR Packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), big endian [NOT in AVI] +[16]RGB Packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb), big endian [NOT in AVI] +RGBA Packed RGBA 8:8:8:8, 32bpp, RGBA [NOT in AVI] +BGRA Packed RGBA 8:8:8:8, 32bpp, BGRA [NOT in AVI] +ABGR Packed RGBA 8:8:8:8, 32bpp, ABGR [NOT in AVI] +ARGB Packed RGBA 8:8:8:8, 32bpp, ARGB [NOT in AVI] +RGB[24] Packed RGB 8:8:8, 24bpp RGB [NOT in AVI] +BGR[24] Packed RGB 8:8:8, 24bpp BGR [NOT in AVI] + + +FIXME mpeg4/dv/gray16/audio codecs

1 0