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

[PATCH] fourcc spec
by Oded Shimon 06 May '06

06 May '06

yes yes I know, disgusting, but for f--'s sake, it's a start. can someone who has a clue help me here and we can freeze the damn spec? (So I can present NUT in linuxtag...) - ods15

7 24

NUT samples / NUT muxer?
by Måns Rullgård 08 Apr '06

08 Apr '06

Hi all, I thought it would be a good test of the NUT spec to see if I, not having followed the design discussions at all, could implement a demuxer (and later a muxer) only reading the spec. To test whether I got it right, I'd need some samples or a way of creating some. The muxer in the libnut repo tells me it creates broken files, and the lavf implementation is badly outdated. Is there anything that does create proper NUT files? -- Måns Rullgård mru(a)inprovide.com

4 17

[NUT] (ods15): r121 - in /trunk: README nututils/ nututils/Makefile nututils/demux_avi.c
by syncmail＠mplayerhq.hu 02 Apr '06

02 Apr '06

Author: ods15 Date: Sun Apr 2 20:02:52 2006 New Revision: 121 Log: merge riffreader and avireader Modified: trunk/README trunk/nututils/ (props changed) trunk/nututils/Makefile trunk/nututils/demux_avi.c Modified: trunk/README ============================================================================== --- trunk/README (original) +++ trunk/README Sun Apr 2 20:02:52 2006 @@ -24,7 +24,7 @@ to debug: Always look at $? ! -./riffreader bla.avi; ./avireader bla.avi +./avireader bla.avi ./oggreader bla.ogg Modified: trunk/nututils/Makefile ============================================================================== --- trunk/nututils/Makefile (original) +++ trunk/nututils/Makefile Sun Apr 2 20:02:52 2006 @@ -2,10 +2,8 @@ CFLAGS += -I../libnut -lm -all: riffreader avireader nutmerge nutindex # oggreader +all: avireader nutmerge nutindex # oggreader -riffreader: demux_avi.c - ${CC} ${CFLAGS} -DRIFF_PROG $^ -o $@ avireader: demux_avi.c ${CC} ${CFLAGS} -DAVI_PROG $^ -o $@ oggreader: demux_ogg.c @@ -16,4 +14,4 @@ ${CC} ${CFLAGS} $^ -o $@ clean: - rm -f *\~ nutmerge nutindex avireader oggreader riffreader *.o + rm -f *\~ nutmerge nutindex avireader oggreader *.o Modified: trunk/nututils/demux_avi.c ============================================================================== --- trunk/nututils/demux_avi.c (original) +++ trunk/nututils/demux_avi.c Sun Apr 2 20:02:52 2006 @@ -477,56 +477,31 @@ }; -#ifdef RIFF_PROG -void ready_stream(stream_t * streams){} -void push_packet(stream_t * stream, packet_t * p){} -void free_streams(stream_t * streams){} -int get_stream_packet(stream_t * stream, packet_t * p){return 0;} -void print_riff_tree(riff_tree_t * tree, int indent) { - char ind[indent + 1]; - int i; - memset(ind, ' ', indent); - ind[indent] = 0; - - if (tree->type == 0) { - printf("%s%4.4s: offset: %d name: `%4.4s', len: %u (amount: %d)\n", - ind, tree->name, tree->offset, tree->listname, tree->len, tree->amount); - for (i = 0; i < tree->amount; i++) { - print_riff_tree(&tree->tree[i], indent + 4); - } - } else { - printf("%sDATA: offset: %d name: `%4.4s', len: %u\n", - ind, tree->offset, tree->name, tree->len); - } -} - -FILE * stats = NULL; -int main(int argc, char * argv []) { - FILE * in; - full_riff_tree_t * full = init_riff(); - int err = 0; - int i; - if (argc < 2) { printf("bleh, more params you fool...\n"); return 1; } - in = fopen(argv[1], "r"); - - if ((err = get_full_riff_tree(in, full))) goto err_out; - for (i = 0; i < full->amount; i++) { - print_riff_tree(&full->tree[i], 0); - } - -err_out: - uninit_riff(full); - fclose(in); - return err; -} -#endif - #ifdef AVI_PROG void ready_stream(stream_t * streams){} void push_packet(stream_t * stream, packet_t * p){} void free_streams(stream_t * streams){} int get_stream_packet(stream_t * stream, packet_t * p){return 0;} FILE * stats = NULL; + +void print_riff_tree(riff_tree_t * tree, int indent) { + char ind[indent + 1]; + int i; + memset(ind, ' ', indent); + ind[indent] = 0; + + if (tree->type == 0) { + printf("%s%4.4s: offset: %d name: `%4.4s', len: %u (amount: %d)\n", + ind, tree->name, tree->offset, tree->listname, tree->len, tree->amount); + for (i = 0; i < tree->amount; i++) { + print_riff_tree(&tree->tree[i], indent + 4); + } + } else { + printf("%sDATA: offset: %d name: `%4.4s', len: %u\n", + ind, tree->offset, tree->name, tree->len); + } +} + int main(int argc, char * argv []) { FILE * in; demuxer_priv_t * avi = NULL; @@ -539,6 +514,11 @@ if ((err = avi_read_headers(avi))) goto err_out; + for (i = 0; i < avi->riff->amount; i++) { + print_riff_tree(&avi->riff->tree[i], 0); + } + + printf("\n"); printf("Main AVI Header:\n"); printf("dwMicroSecPerFrame: %u\n", avi->avih->dwMicroSecPerFrame); printf("dwMaxBytesPerSec: %u\n", avi->avih->dwMaxBytesPerSec);

1 0

[NUT] (ods15): r120 - /trunk/demux_nut.c
by syncmail＠mplayerhq.hu 01 Apr '06

01 Apr '06

Author: ods15 Date: Sat Apr 1 17:29:09 2006 New Revision: 120 Log: endian safe fourcc's for mplayer demux_nut Modified: trunk/demux_nut.c Modified: trunk/demux_nut.c ============================================================================== --- trunk/demux_nut.c (original) +++ trunk/demux_nut.c Sat Apr 1 17:29:09 2006 @@ -87,18 +87,19 @@ case NUT_AUDIO_CLASS: { WAVEFORMATEX *wf= calloc(sizeof(WAVEFORMATEX) + s[i].codec_specific_len, 1); sh_audio_t* sh_audio=new_sh_audio(demuxer, i); + int j; sh_audio->wf= wf; sh_audio->ds = demuxer->audio; sh_audio->audio.dwSampleSize = 0; // FIXME sh_audio->audio.dwScale = s[i].time_base.nom; sh_audio->audio.dwRate = s[i].time_base.den; - if (s[i].fourcc_len == 4) sh_audio->format = *(uint32_t*)s[i].fourcc; - else sh_audio->format = *(uint16_t*)s[i].fourcc; // FIXME + sh_audio->format = 0; + for (j = 0; j < s[i].fourcc_len && j < 4; j++) sh_audio->format |= s[i].fourcc[j]<<(j*8); sh_audio->channels = s[i].channel_count; sh_audio->samplerate = s[i].samplerate_nom / s[i].samplerate_denom; sh_audio->i_bps = 0; // FIXME - wf->wFormatTag = *(uint16_t*)s[i].fourcc; // FIXME + wf->wFormatTag = sh_audio->format; wf->nChannels = s[i].channel_count; wf->nSamplesPerSec = s[i].samplerate_nom / s[i].samplerate_denom; wf->nAvgBytesPerSec = 0; // FIXME @@ -115,6 +116,7 @@ case NUT_VIDEO_CLASS: { BITMAPINFOHEADER * bih = calloc(sizeof(BITMAPINFOHEADER) + s[i].codec_specific_len, 1); sh_video_t * sh_video = new_sh_video(demuxer, i); + int j; sh_video->bih = bih; sh_video->ds = demuxer->video; @@ -125,7 +127,8 @@ sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale; sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; - sh_video->format = *(uint32_t*)s[i].fourcc; // FIXME + sh_video->format = 0; + for (j = 0; j < s[i].fourcc_len && j < 4; j++) sh_video->format |= s[i].fourcc[j]<<(j*8); if (!s[i].sample_height) sh_video->aspect = 0; else sh_video->aspect = (float)s[i].sample_width / s[i].sample_height; sh_video->i_bps = 0; // FIXME @@ -135,7 +138,7 @@ bih->biHeight = s[i].height; bih->biBitCount = 0; // FIXME bih->biSizeImage = 0; // FIXME - bih->biCompression = *(uint32_t*)s[i].fourcc; // FIXME + bih->biCompression = sh_video->format; if (s[i].codec_specific_len) memcpy(bih + 1, s[i].codec_specific, s[i].codec_specific_len);

1 0

[NUT] (ods15): r119 - /trunk/nututils/nutmerge.c
by syncmail＠mplayerhq.hu 01 Apr '06

01 Apr '06

Author: ods15 Date: Sat Apr 1 14:47:31 2006 New Revision: 119 Log: give back err from convert() Modified: trunk/nututils/nutmerge.c Modified: trunk/nututils/nutmerge.c ============================================================================== --- trunk/nututils/nutmerge.c (original) +++ trunk/nututils/nutmerge.c Sat Apr 1 14:47:31 2006 @@ -184,7 +184,7 @@ for (i = 0; streams[i].stream_id >= 0; i++); - convert(out, &demuxer, streams, i); + err = convert(out, &demuxer, streams, i); err_out: if (demuxer.priv) demuxer.uninit(demuxer.priv);

1 0