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

[RFC] add Bayer fourccs
by Peter Ross 22 Feb '14

22 Feb '14

--- Hi. Here is my stab at assigning fourcs for Bayer pixel formats. I've used character 0xBA to identify Bayer formats, followed by the top component order and bit-depth. A 7-bit ASCII value would probably be better. Ideas/suggestions welcome. docs/nut4cc.txt | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/docs/nut4cc.txt b/docs/nut4cc.txt index e28de7b..a111a0a 100644 --- a/docs/nut4cc.txt +++ b/docs/nut4cc.txt @@ -112,6 +112,18 @@ RBA[64] Packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for ARB[64] Packed ARGB 16:16:16:16, 64bpp, 16A, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian [NOT in AVI] BRA[64] Packed BGRA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B component is stored as little-endian [NOT in AVI] ABR[64] Packed ABGR 16:16:16:16, 64bpp, 16A, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian [NOT in AVI] +[0xBA]BG[8] Bayer, BGBG..(odd line), GRGR..(even line), 8-bit samples [NOT in AVI] +[0xBA]BG[16] Bayer, BGBG..(odd line), GRGR..(even line), 16-bit samples, little-endian [NOT in AVI] +[16]GB[0xBA] Bayer, BGBG..(odd line), GRGR..(even line), 16-bit samples, big-endian [NOT in AVI] +[0xBA]RG[8] Bayer, RGRG..(odd line), GBGB..(even line), 8-bit samples [NOT in AVI] +[0xBA]RG[16] Bayer, RGRG..(odd line), GBGB..(even line), 16-bit samples, little-endian [NOT in AVI] +[16]GR[0xBA] Bayer, RGRG..(odd line), GBGB..(even line), 16-bit samples, big-endian [NOT in AVI] +[0xBA]GB[8] Bayer, GBGB..(odd line), RGRG..(even line), 8-bit samples [NOT in AVI] +[0xBA]GB[16] Bayer, GBGB..(odd line), RGRG..(even line), 16-bit samples, little-endian [NOT in AVI] +[16]BG[0xBA] Bayer, GBGB..(odd line), RGRG..(even line), 16-bit samples, big-endian [NOT in AVI] +[0xBA]GR[8] Bayer, GRGR..(odd line), BGBG..(even line), 8-bit samples [NOT in AVI] +[0xBA]GR[16] Bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, little-endian [NOT in AVI] +[16]RG[0xBA] Bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, big-endian [NOT in AVI] Since many exotic planar YUVA pixel formats are not contemplated by the AVI/QuickTime FourCC lists, the following scheme is adopted for -- 1.7.4.1 -- Peter (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)

2 3

[PATCH 1/2] nut: add a minor version field
by Michael Niedermayer 04 Jan '14

04 Jan '14

Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> --- docs/nut.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/nut.txt b/docs/nut.txt index 7969e3c..44198c1 100644 --- a/docs/nut.txt +++ b/docs/nut.txt @@ -1,5 +1,5 @@ ================================== -NUT Open Container Format 20080202 +NUT Open Container Format 20131223 ================================== @@ -243,6 +243,8 @@ reserved_headers main_header: version v + if (version > 3) + minor_version v stream_count v max_distance v time_base_count v @@ -463,6 +465,12 @@ info_startcode (f(64)) version (v) NUT version. The current value is 3. All lower values are pre-freeze. +minor_version (v) + NUT minor_version. This represents minor changes in the specification + which do not affect compatibility. Demuxers MUST NOT reject files + based on this value. + The current value is 0 + stream_count (v) number of streams in this file -- 1.7.9.5

3 7

[nut]: r683 - docs/nut.txt
by michael 04 Jan '14

04 Jan '14

Author: michael Date: Sat Jan 4 14:11:50 2014 New Revision: 683 Log: nut: per frame side and meta data support This variant is simpler and has less overhead than the previous It is not compatible with existing demuxers though, the reasoning here is that as side data is essential for presentation of a stream demuxer support is neccessary anyway. Reviewed-by: Luca Barbato <lu_zero(a)gentoo.org> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> Modified: docs/nut.txt Modified: docs/nut.txt ============================================================================== --- docs/nut.txt Tue Dec 24 14:59:42 2013 (r682) +++ docs/nut.txt Sat Jan 4 14:11:50 2014 (r683) @@ -353,6 +353,46 @@ frame: } data +data: + if (frame_flags&FLAG_SM_DATA) { + side_data + meta_data + } + frame_data + +sm_data: + count v + for(i=0; i<count; i++){ + name vb + value s + if (value==-1){ + type= "UTF-8" + value vb + }else if (value==-2){ + type vb + value vb + }else if (value==-3){ + type= "s" + value s + }else if (value==-4){ + type= "t" + value t + }else if (value<-4){ + type= "r" + value.den= -value-4 + value.num s + }else{ + type= "v" + } + } + +side_data + sm_data + +meta_data + sm_data + + index: max_pts t syncpoints v @@ -401,30 +441,7 @@ info_packet: until 2006-11-04.) chapter_start t chapter_len v - count v - for(i=0; i<count; i++){ - name vb - value s - if (value==-1){ - type= "UTF-8" - value vb - }else if (value==-2){ - type vb - value vb - }else if (value==-3){ - type= "s" - value s - }else if (value==-4){ - type= "t" - value t - }else if (value<-4){ - type= "r" - value.den= -value-4 - value.num s - }else{ - type= "v" - } - } + meta_data reserved_bytes syncpoint: @@ -651,6 +668,8 @@ 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. + 8 FLAG_SM_DATA If set, side/meta data is stored with the frame data. + This flag MUST NOT be set in version < 4 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 @@ -700,6 +719,37 @@ pts_delta[frame_code] (s) reserved_count[frame_code] (v) MUST be <256. +sm_data / side_data / meta_data + This data structure is used both in frames for per frame side and metadata + as well as info tags for metadata covering the whole file, a stream + chapter or other. + Metadata is data that is about the actual data and generally not essential + for correct presentation + Sidedata is semantically part of the data and essential for its correct + presentation. The same syntax is used by both for simplicity. + Types of per frame side data: + "Channels", "ChannelLayout", "SampleRate", "Width", "Height" + This frame changes the number of channels, the channel layout, ... to + the given value (ChannelLayout vb, else v) + If used in any frame of a stream then every keyframe of the stream + SHOULD carry such sidedata to allow seeking. + "Extradata", "Palette" + This frame changes the codec_specific_data or palette to the given + value (vb) + If used in any frame of a stream then every keyframe of the stream + SHOULD carry such sidedata to allow seeking. + "CodecSpecificSide<num>" + Codec specific side data, equivalent to matroskas BlockAdditional (vb) + the "<num>" should be replaced by a number identifying the type of + side data, it is equivalent/equal to BlockAddId in matroska. + "SkipStart", "SkipEnd" + The decoder should skip/drop the specified number of samples at the + start/end of this frame (v) + "UserData<identifer here>" + User specific side data, the "<identifer here>" should be replaced + by a globally unique identifer of the project that + uses/creates/understands the side data. For example "UserDataFFmpeg" + data_size data_size = data_size_lsb + data_size_msb * data_size_mul ; The size of the following frame, including a possible elision header.

1 0