- NUT-devel - lists.mplayerhq.hu

[nut]: r682 - docs/nut.txt
by michael 24 Dec '13

24 Dec '13

Author: michael Date: Tue Dec 24 14:59:42 2013 New Revision: 682 Log: nut: add a minor version field 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 Sat Nov 9 18:31:48 2013 (r681) +++ docs/nut.txt Tue Dec 24 14:59:42 2013 (r682) @@ -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

3 2

[PATCH] libnut: fix building on i686-pc-mingw32
by Timothy Gu 09 Nov '13

09 Nov '13

Signed-off-by: Timothy Gu <timothygu99(a)gmail.com> --- src/trunk/libnut/priv.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/trunk/libnut/priv.h b/src/trunk/libnut/priv.h index 5183503..aac2952 100644 --- a/src/trunk/libnut/priv.h +++ b/src/trunk/libnut/priv.h @@ -44,6 +44,10 @@ #define MAX(a,b) ((a) > (b) ? (a) : (b)) #define ABS(a) ((a) > 0 ? (a) : -(a)) +#if (defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)) +#define ftello(a) (off_t)(_ftelli64(a)) +#endif + typedef struct { nut_input_stream_tt isc; int is_mem; -- 1.8.1.2

2 2

[nut]: r681 - in src/trunk/libnut: Doxyfile libnut.h
by michael 09 Nov '13

09 Nov '13

Author: michael Date: Sat Nov 9 18:31:48 2013 New Revision: 681 Log: libnut: fix Doxygen warnings Signed-off-by: Timothy Gu <timothygu99(a)gmail.com> Patch-by: Timothy Gu <timothygu99(a)gmail.com> Reviewed-by: Oded Shimon Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> Modified: src/trunk/libnut/Doxyfile src/trunk/libnut/libnut.h Modified: src/trunk/libnut/Doxyfile ============================================================================== --- src/trunk/libnut/Doxyfile Sat Nov 9 18:31:47 2013 (r680) +++ src/trunk/libnut/Doxyfile Sat Nov 9 18:31:48 2013 (r681) @@ -2,7 +2,6 @@ PROJECT_NAME = libnut OUTPUT_DIRECTORY = doxygen CREATE_SUBDIRS = NO REPEAT_BRIEF = YES -DETAILS_AT_TOP = YES OPTIMIZE_OUTPUT_FOR_C = YES EXTRACT_ALL = NO SORT_MEMBER_DOCS = NO Modified: src/trunk/libnut/libnut.h ============================================================================== --- src/trunk/libnut/libnut.h Sat Nov 9 18:31:47 2013 (r680) +++ src/trunk/libnut/libnut.h Sat Nov 9 18:31:48 2013 (r681) @@ -48,7 +48,7 @@ typedef struct { /// stream header struct \ingroup demuxer muxer typedef struct { - int type; ///< Possible values are enum ::nut_stream_class_t. A value of -1 terminates a stream header array. + int type; ///< Possible values are enum ::nut_stream_class_tt. A value of -1 terminates a stream header array. int fourcc_len; ///< fourcc length uint8_t * fourcc; ///< fourcc in big-endian format nut_timebase_tt time_base; ///< stream timebase @@ -99,7 +99,7 @@ typedef struct { int len; ///< Length of frame in bytes, \b must be zero if #NUT_FLAG_EOR is set. int stream; ///< stream index of frame uint64_t pts; ///< presentation timestamp of frame - int flags; ///< frame flags from #nut_frame_flags_t + int flags; ///< frame flags from #nut_frame_flags_tt int64_t next_pts; ///< Only used in muxer. Only necessary if nut_write_frame_reorder() is used. } nut_packet_tt; @@ -256,19 +256,19 @@ int nut_seek(nut_context_tt * nut, doubl * \verbinclude COPYING */ -/*! \struct nut_alloc_t +/*! \struct nut_alloc_tt * libc semantics are assumed for all functions (realloc must work with NULL or zero size). * - * #malloc function pointer may be NULL. This indicates using libc malloc, realloc and free functions. + * malloc function pointer may be NULL. This indicates using libc malloc, realloc and free functions. * - * If #malloc is not NULL, #realloc and #free \b must \b not be NULL. + * If malloc is not NULL, realloc and free \b must \b not be NULL. */ -/*! \struct nut_timebase_t +/*! \struct nut_timebase_tt * The example shown is if fps is 23.976 (24000/1001). Timebase is the opposite of fps. */ -/*! \struct nut_info_field_t +/*! \struct nut_info_field_tt * \par Example: * \code * char * text = "The Foobar Adventure"; @@ -322,7 +322,7 @@ int nut_seek(nut_context_tt * nut, doubl */ /*! \var int nut_info_packet_tt::count - * For arrays of #nut_info_packet_t, the packet with a #count of \a -1 + * For arrays of #nut_info_packet_tt, the packet with a #count of \a -1 * terminates the array. */

1 0

[nut]: r680 - src/trunk/libnut/priv.h
by michael 09 Nov '13

09 Nov '13

Author: michael Date: Sat Nov 9 18:31:47 2013 New Revision: 680 Log: libnut: fix building on i686-pc-mingw32 Patch-by: Timothy Gu <timothygu99(a)gmail.com> Reviewed-by: Oded Shimon Signed-off-by: Timothy Gu <timothygu99(a)gmail.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> Modified: src/trunk/libnut/priv.h Modified: src/trunk/libnut/priv.h ============================================================================== --- src/trunk/libnut/priv.h Sun Oct 20 15:25:10 2013 (r679) +++ src/trunk/libnut/priv.h Sat Nov 9 18:31:47 2013 (r680) @@ -44,6 +44,10 @@ #define MAX(a,b) ((a) > (b) ? (a) : (b)) #define ABS(a) ((a) > 0 ? (a) : -(a)) +#if (defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)) +#define ftello(a) ((off_t)(_ftelli64(a))) +#endif + typedef struct { nut_input_stream_tt isc; int is_mem;

1 0

Git vs. SVN
by Timothy Gu 20 Oct '13

20 Oct '13

Hi all, I would like to send a patch about the Doxygen syntax, but it seems that there are two main developing repo, git://git.ffmpeg.org/nut and svn://svn.mplayerhq.hu/nut. It looks like the git one is the mirror of the svn one, but git is a few commits behind svn (at r673, where svn is r678). Which one should I base the patch on and, how am I going to send it (svn diff or git format-patch)? Timothy

2 1

Re: [NUT-devel] [PATCH] nut4cc: add XYZ 4cc
by Timothy Gu 20 Oct '13

20 Oct '13

LGTM assuming XYZ works. Timothy

2 1

[nut]: r679 - docs/nut4cc.txt
by michael 20 Oct '13

20 Oct '13

Author: michael Date: Sun Oct 20 15:25:10 2013 New Revision: 679 Log: nut4cc: add XYZ 4cc Reviewed-by: Timothy Gu <timothygu99(a)gmail.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> Modified: docs/nut4cc.txt Modified: docs/nut4cc.txt ============================================================================== --- docs/nut4cc.txt Tue Jul 23 01:55:30 2013 (r678) +++ docs/nut4cc.txt Sun Oct 20 15:25:10 2013 (r679) @@ -120,6 +120,8 @@ ABR[64] Packed ABGR 16:16:16:16, 64bpp, [64]ARB Packed ARGB 16:16:16:16, 64bpp, 16A, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian [NOT in AVI] [64]BRA Packed BGRA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B component is stored as big-endian [NOT in AVI] [64]ABR Packed ABGR 16:16:16:16, 64bpp, 16A, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian [NOT in AVI] +XYZ[36] Packed XYZ 12:12:12, 48bpp, 12X, 4, 12Y, 4, 12Z, 4, the 2-byte value for each XYZ+4bit component is stored as little-endian [NOT in AVI] +[36]ZYX Packed XYZ 12:12:12, 48bpp, 12X, 4, 12Y, 4, 12Z, 4, the 2-byte value for each XYZ+4bit component is stored as 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 0

[nut] [propchange]: r678 - svn:log
by michael 23 Jul '13

23 Jul '13

Author: michael Revision: 678 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1,3 @@ -Add definition and some examples for planar GBR fourCCs. \ No newline at end of file +Add definition and some examples for planar GBR fourCCs. + +Author: Carl Eugen Hoyos <cehoyos(a)ag.or.at>

1 0

[PATCH]Add Planar RGB fourCCs
by Carl Eugen Hoyos 22 Jul '13

22 Jul '13

Hi! Related to FFmpeg ticket #2274. Please review and apply, Carl Eugen

3 5

[nut]: r678 - docs/nut4cc.txt
by michael 22 Jul '13

22 Jul '13

Author: michael Date: Tue Jul 23 01:55:30 2013 New Revision: 678 Log: Add definition and some examples for planar GBR fourCCs. Modified: docs/nut4cc.txt Modified: docs/nut4cc.txt ============================================================================== --- docs/nut4cc.txt Mon Aug 20 03:20:40 2012 (r677) +++ docs/nut4cc.txt Tue Jul 23 01:55:30 2013 (r678) @@ -131,6 +131,10 @@ Y2 = Y+A Y3 = YUV Y4 = YUVA +Similar for planar RGB formats: +G3 = Planar GBR +G4 = Planar GBRA + The third byte represents the width and height chroma subsampling values for the UV planes, that is the amount to shift the luma width/height right to find the chroma width/height. @@ -140,7 +144,7 @@ The fourth byte is the number of bits us If the order of bytes is inverted, that means that each component has to be read big-endian. -Follows the list of the supported YUVA planar format FourCCs created +Follows the list of the supported YUVA and GBR planar format FourCCs created using this scheme: Y1[00][16] Planar gray, 16bpp, little-endian [NOT in AVI] @@ -153,6 +157,17 @@ Y3[00][16] Planar YUV 4:4:4, 48bpp, (1 [16][00]3Y Planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian [NOT in AVI] Y4[11][ 8] Planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples) [NOT in AVI] Y2[00][ 8] 8bit gray, 8bit alpha [NOT in AVI] +G3[00][ 8] Planar GBR, 24bpp [NOT in AVI] +G3[00][ 9] Planar GBR, 27bpp, 7 unused MSB per 16bit value, little-endian [NOT in AVI] +[ 9][00]3G Planar GBR, 27bpp, 7 unused MSB per 16bit value, big-endian [NOT in AVI] +G3[00][10] Planar GBR, 30bpp, 6 unused MSB per 16bit value, little-endian [NOT in AVI] +[10][00]3G Planar GBR, 30bpp, 6 unused MSB per 16bit value, big-endian [NOT in AVI] +G3[00][12] Planar GBR, 36bpp, 4 unused MSB per 16bit value, little-endian [NOT in AVI] +[12][00]3G Planar GBR, 36bpp, 4 unused MSB per 16bit value, big-endian [NOT in AVI] +G3[00][14] Planar GBR, 42bpp, 2 unused MSB per 16bit value, little-endian [NOT in AVI] +[14][00]3G Planar GBR, 42bpp, 2 unused MSB per 16bit value, big-endian [NOT in AVI] +G3[00][16] Planar GBR, 48bpp, little-endian [NOT in AVI] +[16][00]3G Planar GBR, 48bpp, big-endian [NOT in AVI] Raw audio: [x] is an byte with value x, [NOT in AVI] ALAW A-LAW

1 0