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

[nut]: r178 - trunk/nututils/demux_ogg.c
by ods15 04 Nov '06

04 Nov '06

Author: ods15 Date: Sat Nov 4 13:27:51 2006 New Revision: 178 Modified: trunk/nututils/demux_ogg.c Log: cosmetic consistency :) Modified: trunk/nututils/demux_ogg.c ============================================================================== --- trunk/nututils/demux_ogg.c (original) +++ trunk/nututils/demux_ogg.c Sat Nov 4 13:27:51 2006 @@ -165,10 +165,7 @@ nut_packet_t p; uint8_t * buf; - if (argc < 2) { - printf("bleh, more params you fool...\n"); - return 1; - } + if (argc < 2) { printf("bleh, more params you fool...\n"); return 1; } in = fopen(argv[1], "r"); ogg = init(in);

1 0

[nut]: r177 - in trunk/libnut: muxer.c priv.h
by ods15 04 Nov '06

04 Nov '06

Author: ods15 Date: Sat Nov 4 13:19:21 2006 New Revision: 177 Modified: trunk/libnut/muxer.c trunk/libnut/priv.h Log: as required by spec, make timebase relatively prime in muxer Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Sat Nov 4 13:19:21 2006 @@ -617,6 +617,12 @@ nut->info = NULL; } + for (i = 0; i < nut->timebase_count; i++) { + int t = gcd(nut->tb[i].nom, nut->tb[i].den); + nut->tb[i].nom /= t; + nut->tb[i].den /= t; + } + put_data(nut->o, strlen(ID_STRING) + 1, ID_STRING); put_headers(nut); Modified: trunk/libnut/priv.h ============================================================================== --- trunk/libnut/priv.h (original) +++ trunk/libnut/priv.h Sat Nov 4 13:19:21 2006 @@ -217,6 +217,15 @@ return pts; } +static inline int gcd(int a, int b) { + while (b != 0) { + int t = b; + b = a % b; + a = t; + } + return a; +} + #define bctello(bc) ((bc)->file_pos + ((bc)->buf_ptr - (bc)->buf)) #define TO_PTS(prefix, pts) \

1 0

[nut]: r176 - in trunk/nututils: Makefile demux_avi.c framer_mp3.c nutmerge.c nutmerge.h
by ods15 04 Nov '06

04 Nov '06

Author: ods15 Date: Sat Nov 4 13:05:13 2006 New Revision: 176 Added: trunk/nututils/framer_mp3.c Modified: trunk/nututils/Makefile trunk/nututils/demux_avi.c trunk/nututils/nutmerge.c trunk/nututils/nutmerge.h Log: make demux_avi more strict on what it accepts add framer_mp3 Modified: trunk/nututils/Makefile ============================================================================== --- trunk/nututils/Makefile (original) +++ trunk/nututils/Makefile Sat Nov 4 13:05:13 2006 @@ -8,7 +8,7 @@ ${CC} ${CFLAGS} -DAVI_PROG $^ -o $@ oggreader: demux_ogg.c ${CC} ${CFLAGS} -DOGG_PROG $^ -o $@ -nutmerge: demux_ogg.c demux_avi.c framer_vorbis.c framer_mpeg4.c nutmerge.c ../libnut/libnut.a # demux_nut.c +nutmerge: demux_ogg.c demux_avi.c framer_vorbis.c framer_mp3.c framer_mpeg4.c nutmerge.c ../libnut/libnut.a # demux_nut.c ${CC} ${CFLAGS} $^ -o $@ nutindex: nutindex.c ${CC} ${CFLAGS} $^ -o $@ Modified: trunk/nututils/demux_avi.c ============================================================================== --- trunk/nututils/demux_avi.c (original) +++ trunk/nututils/demux_avi.c Sat Nov 4 13:05:13 2006 @@ -332,6 +332,25 @@ static int read_headers(demuxer_priv_t * avi, stream_t ** streams) { int i; if ((i = avi_read_headers(avi))) return i; + for (i = 0; i < avi->avih->dwStreams; i++) { + if (avi->stream[i].type == 0) { // video + char * fourccs[] = {"FMP4","fmp4","DIVX","divx", + "DIV1","div1","MP4S","mp4s", + "xvid","XVID","XviD","XVIX", + "M4S2","m4s2","mp4v","MP4V" + "DX50","dx50","BLZ0", + }; + int j; + for (j = sizeof(fourccs)/sizeof(fourccs[0]); j--; ) { + if (!strncmp(avi->stream[i].video->biCompression, fourccs[j], 4)) break; + } + if (j == -1) return 18; + } else { + if (avi->stream[i].audio->wFormatTag[0] != 0x55 || + avi->stream[i].audio->wFormatTag[1] != 0x00) return 19; + } + } + *streams = avi->s = malloc(sizeof(stream_t) * (avi->avih->dwStreams + 1)); for (i = 0; i < avi->avih->dwStreams; i++) { extern demuxer_t avi_demuxer; @@ -340,19 +359,18 @@ avi->s[i].demuxer.priv = avi; avi->s[i].packets_alloc = avi->s[i].npackets = 0; avi->s[i].packets = NULL; - if (i == 0) avi->s[i].codec_id = e_mpeg4; - else avi->s[i].codec_id = e_null; avi->s[i].sh.type = avi->stream[i].type; avi->s[i].sh.time_base.den = avi->stream[i].strh->dwRate; avi->s[i].sh.time_base.nom = avi->stream[i].strh->dwScale; avi->s[i].sh.fixed_fps = 1; - avi->s[i].sh.decode_delay = !i; // FIXME avi->s[i].sh.codec_specific_len = avi->stream[i].extra_len; avi->s[i].sh.codec_specific = avi->stream[i].extra; if (avi->stream[i].type == 0) { // video avi->s[i].sh.fourcc_len = 4; avi->s[i].sh.fourcc = avi->stream[i].video->biCompression; + avi->s[i].codec_id = e_mpeg4; + avi->s[i].sh.decode_delay = 1; avi->s[i].sh.width = avi->stream[i].video->biWidth; avi->s[i].sh.height = avi->stream[i].video->biHeight; @@ -360,8 +378,10 @@ avi->s[i].sh.sample_height = 0; avi->s[i].sh.colorspace_type = 0; } else { // audio - avi->s[i].sh.fourcc_len = 2; - avi->s[i].sh.fourcc = avi->stream[i].audio->wFormatTag; + avi->s[i].sh.fourcc_len = 4; + avi->s[i].sh.fourcc = "mp3 "; + avi->s[i].codec_id = e_mp3; + avi->s[i].sh.decode_delay = 0; avi->s[i].sh.samplerate_nom = 1; avi->s[i].sh.samplerate_denom = avi->stream[i].audio->nSamplesPerSec; @@ -449,36 +469,6 @@ uninit }; -struct framer_priv_s { stream_t * stream; }; - -static int n_get_packet(framer_priv_t * mc, packet_t * p) { - return get_stream_packet(mc->stream, p); -} - -static int n_setup_headers(framer_priv_t * mc, nut_stream_header_t * s) { - *s = mc->stream->sh; - return 0; // nothing to do -} - -static framer_priv_t * n_init(stream_t * s) { - framer_priv_t * mc = malloc(sizeof(framer_priv_t)); - mc->stream = s; - return mc; -} - -static void n_uninit(framer_priv_t * mc) { - free(mc); -} - -framer_t null_framer = { - e_null, - n_init, - n_setup_headers, - n_get_packet, - n_uninit, - NULL -}; - #ifdef AVI_PROG void ready_stream(stream_t * streams){} Added: trunk/nututils/framer_mp3.c ============================================================================== --- (empty file) +++ trunk/nututils/framer_mp3.c Sat Nov 4 13:05:13 2006 @@ -0,0 +1,36 @@ +// (C) 2005-2006 Oded Shimon +// This file is available under the MIT/X license, see COPYING + +#include "nutmerge.h" + +struct framer_priv_s { + stream_t * stream; +}; + +static int get_packet(framer_priv_t * mp, packet_t * p) { + return get_stream_packet(mp->stream, p); +} + +static int setup_headers(framer_priv_t * mp, nut_stream_header_t * s) { + *s = mp->stream->sh; + return 0; // nothing to do +} + +static framer_priv_t * init(stream_t * s) { + framer_priv_t * mp = malloc(sizeof(framer_priv_t)); + mp->stream = s; + return mp; +} + +static void uninit(framer_priv_t * mp) { + free(mp); +} + +framer_t mp3_framer = { + e_mp3, + init, + setup_headers, + get_packet, + uninit, + NULL +}; Modified: trunk/nututils/nutmerge.c ============================================================================== --- trunk/nututils/nutmerge.c (original) +++ trunk/nututils/nutmerge.c Sat Nov 4 13:05:13 2006 @@ -20,12 +20,12 @@ extern framer_t vorbis_framer; extern framer_t mpeg4_framer; -extern framer_t null_framer; +extern framer_t mp3_framer; framer_t * nframers[] = { &vorbis_framer, &mpeg4_framer, - &null_framer, + &mp3_framer, NULL }; Modified: trunk/nututils/nutmerge.h ============================================================================== --- trunk/nututils/nutmerge.h (original) +++ trunk/nututils/nutmerge.h Sat Nov 4 13:05:13 2006 @@ -20,7 +20,7 @@ enum nutmerge_codecs { e_vorbis, e_mpeg4, - e_null, + e_mp3, }; typedef struct {

1 0

[nut]: r175 - trunk/libnut/Makefile
by ods15 04 Nov '06

04 Nov '06

Author: ods15 Date: Sat Nov 4 13:00:26 2006 New Revision: 175 Modified: trunk/libnut/Makefile Log: libnut.so -> libnut.a typo -m 644 for both nut.h and libnut.a Modified: trunk/libnut/Makefile ============================================================================== --- trunk/libnut/Makefile (original) +++ trunk/libnut/Makefile Sat Nov 4 13:00:26 2006 @@ -4,12 +4,12 @@ install: install -d $(prefix)/lib - install libnut.so $(prefix)/lib + install -m 644 libnut.a $(prefix)/lib install -d $(prefix)/include - install nut.h $(prefix)/include + install -m 644 nut.h $(prefix)/include uninstall: - rm -f $(prefix)/lib/libnut.so + rm -f $(prefix)/lib/libnut.a rm -f $(prefix)/include/nut.h libnut.a: muxer.o demuxer.o reorder.o

1 0

[nut]: r174 - in trunk: config.mak libnut/Makefile
by ods15 04 Nov '06

04 Nov '06

Author: ods15 Date: Sat Nov 4 11:12:35 2006 New Revision: 174 Modified: trunk/config.mak trunk/libnut/Makefile Log: Add install routine Please comment on this, I've never written a "politically correct" makefile install. Modified: trunk/config.mak ============================================================================== --- trunk/config.mak (original) +++ trunk/config.mak Sat Nov 4 11:12:35 2006 @@ -1,3 +1,6 @@ +PREFIX = /usr/local +prefix = $(DESTDIR)$(PREFIX) + CFLAGS = -Os -Wall -g #CFLAGS = -fomit-frame-pointer -g -Wall Modified: trunk/libnut/Makefile ============================================================================== --- trunk/libnut/Makefile (original) +++ trunk/libnut/Makefile Sat Nov 4 11:12:35 2006 @@ -2,6 +2,16 @@ all: libnut.a +install: + install -d $(prefix)/lib + install libnut.so $(prefix)/lib + install -d $(prefix)/include + install nut.h $(prefix)/include + +uninstall: + rm -f $(prefix)/lib/libnut.so + rm -f $(prefix)/include/nut.h + libnut.a: muxer.o demuxer.o reorder.o rm -f $@ ${AR} rc $@ $^

2 1

r20649 - trunk/DOCS/tech/nut.txt
by michael 03 Nov '06

03 Nov '06

Author: michael Date: Fri Nov 3 22:40:13 2006 New Revision: 20649 Modified: trunk/DOCS/tech/nut.txt Log: attempt to fix the unbound future frame issue with keyframes on the muxer side Modified: trunk/DOCS/tech/nut.txt ============================================================================== --- trunk/DOCS/tech/nut.txt (original) +++ trunk/DOCS/tech/nut.txt Fri Nov 3 22:40:13 2006 @@ -51,6 +51,11 @@ by droping n out of the set of frames which must be decodable, if this is still insufficient then n+1 shall be droped, and so on until there is a keyframe + every frame which is marked as a keyframe MUST be a keyframe according to + the defintion above, a muxer MUST mark every frame it knows is a keyframe + as such, a muxer SHOULD NOT analyze future frames to determine the + keyframe status of the current frame but instead just set the frame as + non keyframe (FIXME maybe move somewhere else?)

1 0

r20638 - trunk/DOCS/tech/nut.txt
by michael 03 Nov '06

03 Nov '06

Author: michael Date: Fri Nov 3 15:10:58 2006 New Revision: 20638 Modified: trunk/DOCS/tech/nut.txt Log: keyframe definition Modified: trunk/DOCS/tech/nut.txt ============================================================================== --- trunk/DOCS/tech/nut.txt (original) +++ trunk/DOCS/tech/nut.txt Fri Nov 3 15:10:58 2006 @@ -41,6 +41,13 @@ MUST the specific part must be done to conform to this standard SHOULD it is recommended to be done that way, but not strictly required +keyframe + a frame which can be decoded correctly on its own (=without using + information from any other frames) + if no such frames exist in a codec (for example due to use of overlapped + transforms like the MDCT in an audio codec) then a keyframe shall be any + frame from which onward all frames can be decoded correctly + (FIXME maybe move somewhere else?) Syntax:

3 2

r20647 - trunk/DOCS/tech/nut.txt
by michael 03 Nov '06

03 Nov '06

Author: michael Date: Fri Nov 3 22:13:50 2006 New Revision: 20647 Modified: trunk/DOCS/tech/nut.txt Log: 2nd try for a keyframe definition based on richs comment Modified: trunk/DOCS/tech/nut.txt ============================================================================== --- trunk/DOCS/tech/nut.txt (original) +++ trunk/DOCS/tech/nut.txt Fri Nov 3 22:13:50 2006 @@ -42,11 +42,15 @@ SHOULD it is recommended to be done that way, but not strictly required keyframe - a frame which can be decoded correctly on its own (=without using - information from any other frames) - if no such frames exist in a codec (for example due to use of overlapped - transforms like the MDCT in an audio codec) then a keyframe shall be any - frame from which onward all frames can be decoded correctly + The nth frame is a keyframe if and only if frames n, n+1, ... in + presentation order (that are all frames with a pts >= frame[n].pts) can + be decoded successfully without reference to frames prior n in storeage + order (that are all frames with a dts < frame[n].dts) + if no such frames exist (for example due to use of overlapped transforms + like the MDCT in an audio codec) then the definition shall be extended + by droping n out of the set of frames which must be decodable, if this + is still insufficient then n+1 shall be droped, and so on until there is + a keyframe (FIXME maybe move somewhere else?)

1 0

NUT spec and Keyframes
by Charles Iliya Krempeaux 03 Nov '06

03 Nov '06

Hello, I know most people who read the spec will know what keyframes are... but I'd suggest defining it in the spec too. See ya -- Charles Iliya Krempeaux, B.Sc. charles @ reptile.ca supercanadian @ gmail.com developer weblog: http://ChangeLog.ca/

3 2

r20635 - trunk/DOCS/tech/nut.txt
by michael 03 Nov '06

03 Nov '06

Author: michael Date: Fri Nov 3 14:53:29 2006 New Revision: 20635 Modified: trunk/DOCS/tech/nut.txt Log: main header typo Modified: trunk/DOCS/tech/nut.txt ============================================================================== --- trunk/DOCS/tech/nut.txt (original) +++ trunk/DOCS/tech/nut.txt Fri Nov 3 14:53:29 2006 @@ -198,7 +198,7 @@ Headers: -main header: +main_header: version v stream_count v max_distance v

1 0