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

[nut]: r192 - trunk/libnut/demuxer.c
by ods15 06 Nov '06

06 Nov '06

Author: ods15 Date: Mon Nov 6 21:26:25 2006 New Revision: 192 Modified: trunk/libnut/demuxer.c Log: add get_info_header(), not used yet Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Mon Nov 6 21:26:25 2006 @@ -333,6 +333,67 @@ return err; } +static int get_info_header(nut_context_t * nut, nut_info_packet_t * info) { + input_buffer_t itmp, * tmp = new_mem_buffer(&itmp); + int i, err = 0; + CHECK(get_header(nut->i, tmp)); + + GET_V(tmp, info->stream_id_plus1); + GET_V(tmp, info->chapter_id); + GET_V(tmp, info->chapter_start); + info->chapter_tb = nut->tb[info->chapter_start % nut->timebase_count]; + info->chapter_start /= nut->timebase_count; + GET_V(tmp, info->chapter_len); + + GET_V(tmp, info->count); + if (!info->fields) { + ERROR(SIZE_MAX/sizeof(nut_info_field_t) < info->count, -ERR_OUT_OF_MEM); + info->fields = nut->alloc->malloc(info->count * sizeof(nut_info_field_t)); + ERROR(!nut->tb, -ERR_OUT_OF_MEM); + memset(info->fields, 0, info->count * sizeof(nut_info_field_t)); // initialize pointer to NULL... + } + + for (i = 0; i < info->count; i++) { + int len; + nut_info_field_t * field = &info->fields[i]; + + len = sizeof(field->name) - 1; + CHECK(get_vb(nut->alloc, tmp, &len, (uint8_t**)&field->name)); + field->name[len] = 0; + + GET_S(tmp, field->val); + + if (field->val == -1) { + strcpy(field->type, "UTF-8"); + CHECK(get_vb(nut->alloc, tmp, &field->den, &field->data)); + field->val = field->den; + } else if (field->val == -2) { + len = sizeof(field->type) - 1; + CHECK(get_vb(nut->alloc, tmp, &len, (uint8_t**)&field->type)); + field->type[len] = 0; + CHECK(get_vb(nut->alloc, tmp, &field->den, &field->data)); + field->val = field->den; + } else if (field->val == -3) { + strcpy(field->type, "s"); + GET_S(tmp, field->val); + } else if (field->val == -4) { + strcpy(field->type, "t"); + GET_V(tmp, field->val); + field->tb = nut->tb[field->val % nut->timebase_count]; + field->val /= nut->timebase_count; + } else if (field->val < -4) { + strcpy(field->type, "r"); + field->den = -field->val - 4; + GET_S(tmp, field->val); + } else { + strcpy(field->type, "v"); + } + } + +err_out: + return err; +} + static int add_syncpoint(nut_context_t * nut, syncpoint_t sp, uint64_t * pts, uint64_t * eor, int * out) { syncpoint_list_t * sl = &nut->syncpoints; int i, j;

1 0

[nut]: r191 - trunk/libnut/demuxer.c
by ods15 06 Nov '06

06 Nov '06

Author: ods15 Date: Mon Nov 6 21:17:50 2006 New Revision: 191 Modified: trunk/libnut/demuxer.c Log: make get_vb() work by mallocing only once and also work if buffer is static. change header init to just memset all fields to zero as now *_len will have to be zero Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Mon Nov 6 21:17:50 2006 @@ -205,9 +205,11 @@ uint64_t tmp; int err; if ((err = get_v(in, &tmp))) return err; + if (!*len) { + *buf = alloc->malloc(tmp); + if (!*buf) return -ERR_OUT_OF_MEM; + } else if (*len < tmp) return -ERR_OUT_OF_MEM; *len = tmp; - *buf = alloc->realloc(*buf, *len); - if (!*buf) return -ERR_OUT_OF_MEM; if (get_data(in, *len, *buf) != *len) return buf_eof(in); return 0; } @@ -746,16 +748,7 @@ ERROR(SIZE_MAX/sizeof(stream_context_t) < nut->stream_count+1, -ERR_OUT_OF_MEM); nut->sc = nut->alloc->malloc(sizeof(stream_context_t) * nut->stream_count); ERROR(!nut->sc, -ERR_OUT_OF_MEM); - for (i = 0; i < nut->stream_count; i++) { - nut->sc[i].last_pts = 0; - nut->sc[i].last_dts = 0; - nut->sc[i].last_key = 0; - nut->sc[i].eor = 0; - nut->sc[i].sh.max_pts = 0; - nut->sc[i].sh.fourcc = NULL; - nut->sc[i].sh.codec_specific = NULL; - nut->sc[i].pts_cache = NULL; - } + memset(nut->sc, 0, sizeof(stream_context_t) * nut->stream_count); } for (i = 0; i < nut->stream_count; i++) {

1 0

NUT?
by Charles Iliya Krempeaux 06 Nov '06

06 Nov '06

Hello, I was doing some reading and came across NUT. I was wondering if I could get more info about NUT. (I am familiar with Ogg and becoming familiar with Matroska, so perhaps I can ask a question in terms of those. So that I can understand NUT too.) I understand that the Ogg team and Matroska team had different design goals. (The Ogg team seems to hold "streaming" as their design goal. Where Matroska seems want to create a DVD-like format.) What are NUT's design goals? See ya -- Charles Iliya Krempeaux, B.Sc. charles @ reptile.ca supercanadian @ gmail.com developer weblog: http://ChangeLog.ca/

6 15

[nut]: r190 - trunk/libnut/muxer.c
by ods15 06 Nov '06

06 Nov '06

Author: ods15 Date: Mon Nov 6 09:55:49 2006 New Revision: 190 Modified: trunk/libnut/muxer.c Log: don't check for header repetition before writing an "independant" info packet, to avoid the info packet being mistaken as part of the main headers Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Mon Nov 6 09:55:49 2006 @@ -504,7 +504,6 @@ } void nut_write_info(nut_context_t * nut, const nut_info_packet_t * info) { - check_header_repetition(nut); nut->last_headers = bctello(nut->o); // to force syncpoint writing after the info header put_info(nut, info); }

1 0

[nut]: r189 - trunk/libnut/muxer.c
by ods15 06 Nov '06

06 Nov '06

Author: ods15 Date: Mon Nov 6 09:54:38 2006 New Revision: 189 Modified: trunk/libnut/muxer.c Log: cosmetic relocate Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Mon Nov 6 09:54:38 2006 @@ -66,16 +66,6 @@ return bc; } -static int add_timebase(nut_context_t * nut, nut_timebase_t tb) { - int i; - for (i = 0; i < nut->timebase_count; i++) if (compare_ts(nut, 1, nut->tb[i], 1, tb) == 0) break; - if (i == nut->timebase_count) { - nut->tb = nut->alloc->realloc(nut->tb, sizeof(nut_timebase_t) * ++nut->timebase_count); - nut->tb[i] = tb; - } - return i; -} - static void put_bytes(output_buffer_t * bc, int count, uint64_t val) { ready_write_buf(bc, count); for(count--; count >= 0; count--){ @@ -456,6 +446,16 @@ return size; } +static int add_timebase(nut_context_t * nut, nut_timebase_t tb) { + int i; + for (i = 0; i < nut->timebase_count; i++) if (compare_ts(nut, 1, nut->tb[i], 1, tb) == 0) break; + if (i == nut->timebase_count) { + nut->tb = nut->alloc->realloc(nut->tb, sizeof(nut_timebase_t) * ++nut->timebase_count); + nut->tb[i] = tb; + } + return i; +} + static void check_header_repetition(nut_context_t * nut) { if (bctello(nut->o) >= (1 << 23)) { int i; // ### magic value for header repetition

1 0

[nut]: r188 - trunk/libnut/muxer.c
by ods15 06 Nov '06

06 Nov '06

Author: ods15 Date: Mon Nov 6 09:48:41 2006 New Revision: 188 Modified: trunk/libnut/muxer.c Log: cosmetic Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Mon Nov 6 09:48:41 2006 @@ -474,7 +474,7 @@ check_header_repetition(nut); // distance syncpoints - if (nut->last_syncpoint < nut->last_headers || + if (nut->last_syncpoint < nut->last_headers || bctello(nut->o) - nut->last_syncpoint + fd->len + frame_header(nut, NULL, fd) > nut->max_distance) put_syncpoint(nut); tmp = clear_buffer(nut->tmp_buffer);

1 0

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

06 Nov '06

Author: ods15 Date: Mon Nov 6 09:48:21 2006 New Revision: 187 Modified: trunk/libnut/muxer.c trunk/libnut/priv.h Log: slight change in header repetition method Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Mon Nov 6 09:48:21 2006 @@ -270,6 +270,7 @@ static void put_headers(nut_context_t * nut) { int i; nut->last_headers = bctello(nut->o); + nut->headers_written++; put_main_header(nut); for (i = 0; i < nut->stream_count; i++) put_stream_header(nut, i); @@ -456,12 +457,10 @@ } static void check_header_repetition(nut_context_t * nut) { - if (bctello(nut->o) > (1 << 23)) { - int i = 23; // ### magic value for header repetition - if (bctello(nut->o) > (1 << 25)) { - for (i = 26; bctello(nut->o) > (1 << i); i++); - i--; - } + if (bctello(nut->o) >= (1 << 23)) { + int i; // ### magic value for header repetition + for (i = 24; bctello(nut->o) >= (1 << i); i++); + i--; if (nut->last_headers < (1 << i)) { put_headers(nut); } @@ -575,6 +574,7 @@ nut->syncpoints.pts = NULL; nut->syncpoints.eor = NULL; nut->last_syncpoint = 0; + nut->headers_written = 0; for (nut->stream_count = 0; s[nut->stream_count].type >= 0; nut->stream_count++); @@ -658,7 +658,7 @@ int total = 0; if (!nut) return; - if (nut->last_headers < (1<<23)) put_headers(nut); // force 3rd copy of main headers + while (nut->headers_written < 2) put_headers(nut); // force 3rd copy of main headers put_headers(nut); if (nut->mopts.write_index) put_index(nut); Modified: trunk/libnut/priv.h ============================================================================== --- trunk/libnut/priv.h (original) +++ trunk/libnut/priv.h Mon Nov 6 09:48:21 2006 @@ -159,6 +159,7 @@ off_t last_syncpoint; // for checking corruption and putting syncpoints, also for back_ptr off_t last_headers; // for header repetition and state for demuxer + int headers_written; // for muxer header repetition off_t before_seek; // position before any seek mess off_t seek_status;

1 0

[nut]: r186 - in trunk/nututils: framer_mp3.c nutmerge.c nutmerge.h
by ods15 06 Nov '06

06 Nov '06

Author: ods15 Date: Mon Nov 6 09:34:06 2006 New Revision: 186 Modified: trunk/nututils/framer_mp3.c trunk/nututils/nutmerge.c trunk/nututils/nutmerge.h Log: promper mp3 framer for nutmerge! Modified: trunk/nututils/framer_mp3.c ============================================================================== --- trunk/nututils/framer_mp3.c (original) +++ trunk/nututils/framer_mp3.c Mon Nov 6 09:34:06 2006 @@ -8,7 +8,58 @@ }; static int get_packet(framer_priv_t * mp, packet_t * p) { - return get_stream_packet(mp->stream, p); + static const int tabsel_123[2][3][16] = { + { {0,32,64,96,128,160,192,224,256,288,320,352,384,416,448,0}, + {0,32,48,56, 64, 80, 96,112,128,160,192,224,256,320,384,0}, + {0,32,40,48, 56, 64, 80, 96,112,128,160,192,224,256,320,0} }, + { {0,32,48,56, 64, 80, 96,112,128,144,160,176,192,224,256,0}, + {0, 8,16,24, 32, 40, 48, 56, 64, 80, 96,112,128,144,160,0}, + {0, 8,16,24, 32, 40, 48, 56, 64, 80, 96,112,128,144,160,0} } + }; + static const int freqs[9] = { 44100, 48000, 32000, // MPEG 1.0 + 22050, 24000, 16000, // MPEG 2.0 + 11025, 12000, 8000}; // MPEG 2.5 + static const int mult[3] = { 12000, 144000, 144000 }; + int lsf,framesize,padding,freq,bitrate,layer; + uint32_t newhead; + int err; + + if ((err = get_stream_packet(mp->stream, p))) return err; + if (p->p.len < 4) return err_mp3_bad_packet; + + newhead = p->buf[0]<<24 | p->buf[1]<<16 | p->buf[2]<<8 | p->buf[3]; + + if ((newhead & 0xffe00000) != 0xffe00000) return err_mp3_bad_packet; + + layer = 4-((newhead>>17)&0x3); // valid: 1..3 + freq = (newhead>>10)&0x3; // valid: 0..2 + bitrate = (newhead>>12)&0xf; // valid: 1..14 + padding = (newhead>> 9)&0x1; + + if (layer==4) return err_mp3_bad_packet; + if (freq==3) return err_mp3_bad_packet; + + //>>19&0x3 + if (newhead & (1<<20)) { // MPEG 1.0 (lsf==0) or MPEG 2.0 (lsf==1) + lsf = (newhead & (1<<19)) ? 0 : 1; + if (lsf) freq += 3; + } else { // MPEG 2.5 + lsf = 1; + freq += 6; + } + + bitrate = tabsel_123[lsf][layer-1][bitrate]; + framesize = bitrate * mult[layer-1]; + + if(!framesize) return err_mp3_bad_packet; + + framesize /= (layer == 3 ? (freqs[freq] << lsf) : freqs[freq]); + framesize += padding; + if(layer==1) framesize *= 4; + + if (p->p.len != framesize) return err_mp3_bad_packet; + + return 0; } static int setup_headers(framer_priv_t * mp, nut_stream_header_t * s) { Modified: trunk/nututils/nutmerge.c ============================================================================== --- trunk/nututils/nutmerge.c (original) +++ trunk/nututils/nutmerge.c Mon Nov 6 09:34:06 2006 @@ -217,6 +217,7 @@ ERR_CASE(err_avi_no_audio_codec) ERR_CASE(err_avi_bad_packet) ERR_CASE(err_mpeg4_no_frame_type) + ERR_CASE(err_mp3_bad_packet) ERR_CASE(err_bad_oggs_magic) ERR_CASE(err_ogg_no_codec) ERR_CASE(err_ogg_non_interleaved) Modified: trunk/nututils/nutmerge.h ============================================================================== --- trunk/nututils/nutmerge.h (original) +++ trunk/nututils/nutmerge.h Mon Nov 6 09:34:06 2006 @@ -89,6 +89,7 @@ err_avi_no_audio_codec, err_avi_bad_packet, err_mpeg4_no_frame_type, + err_mp3_bad_packet, err_bad_oggs_magic, err_ogg_no_codec, err_ogg_non_interleaved,

1 0

Main file loop
by Oded Shimon 05 Nov '06

05 Nov '06

In my opinion it is all wrong. This loop deals with legality of file, not how the demuxer reads the file. Current: > file: > file_id_string > while(!eof){ > packet_header, main_header, packet_footer > reserved_headers > for(i=0; i<stream_count; i++){ > packet_header, stream_header, packet_footer > reserved_headers > } > while(next_code == info_startcode){ > packet_header, info_packet, packet_footer > reserved_headers > } > if(next_code == index_startcode){ > packet_header, index_packet, packet_footer > } > if (!eof) while(next_code != main_startcode){ > if(next_code == syncpoint_startcode){ > packet_header, syncpoint, packet_footer > } > frame > reserved_headers > } > } The way it should be in my opinion: file: file_id_string while(!eof){ packet_header, main_header, packet_footer for(i=0; i<stream_count; i++){ packet_header, stream_header, packet_footer } reserved_headers while(next_code == info_startcode){ packet_header, info_packet, packet_footer } reserved_headers if(next_code == index_startcode){ packet_header, index_packet, packet_footer } if (!eof) while(next_code != main_startcode){ packet_header, syncpoint, packet_footer do { frame } while (next_code == framecode) reserved_headers if (realtime_stream) { while(next_code == info_startcode){ packet_header, info_packet, packet_footer } reserved_headers } } } 1. no reserved headers allowed until end of stream headers this offers absoloutely no disadvantage in extendibility: a. new packets can still be written afterwards. b. if it is so important that it needs to be written either next to the main header or next to the streams, it can be written inside the main header or inside the stream headers (reserved_bytes) 2. no reserved headers allowed after index - only either an eof or a syncpoint and frames. no reserved headers inbetween info packets. 3. syncpoints must be written after any non frame packets, before any frame packets. 4. it is illegal to write a syncpoint without a following frame.. 5. without a main header set, only reserved headers, info packets, and syncpoints can be written (this solves the question i had in previous mail). Rational: a demuxer will give all info packets after the main header set togther with reading the main header set to the caller, ONCE. Any info packets seen after a main header set afterwards are ignored. Any info packets seen OUTSIDE of a main header set are "new information" packets and given to the caller on sight... These packets would have a manditory chapter_id!=0, and are illegal in non-realtime streams. 6. as before, main headers can be written again after main headers.. I'm sorry for bringing up this issue so late :( - ods15

2 2

[nut]: r185 - trunk/libnut/muxer.c
by ods15 04 Nov '06

04 Nov '06

Author: ods15 Date: Sat Nov 4 23:04:07 2006 New Revision: 185 Modified: trunk/libnut/muxer.c Log: update to spec :) Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Sat Nov 4 23:04:07 2006 @@ -231,7 +231,7 @@ int i; put_v(tmp, info->stream_id_plus1); - put_v(tmp, info->chapter_id); + put_s(tmp, info->chapter_id); for (i = 0; i < nut->timebase_count; i++) if (compare_ts(nut, 1, info->chapter_tb, 1, nut->tb[i]) == 0) break; put_v(tmp, info->chapter_start * nut->timebase_count + i); put_v(tmp, info->chapter_len);

1 0