- NUT-devel - lists.mplayerhq.hu

[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

r20674 - trunk/DOCS/tech/nut.txt
by michael 04 Nov '06

04 Nov '06

Author: michael Date: Sat Nov 4 23:01:51 2006 New Revision: 20674 Modified: trunk/DOCS/tech/nut.txt Log: Corrigendum 1 change chapter_id from v to s to allow negative chapter_id as required by the spec text change was unanimously accepted (rich, oded, myself) this change should not break any existing muxers or demuxers, with the exception of assumtations about (non)overlapping chapters Modified: trunk/DOCS/tech/nut.txt ============================================================================== --- trunk/DOCS/tech/nut.txt (original) +++ trunk/DOCS/tech/nut.txt Sat Nov 4 23:01:51 2006 @@ -1,5 +1,5 @@ ================================== -NUT Open Container Format 20060713 +NUT Open Container Format 20061104 ================================== @@ -358,7 +358,8 @@ info_packet: stream_id_plus1 v - chapter_id v + chapter_id s (Note due to a typo this was v + until 2006-11-04) chapter_start t chapter_len v count v

1 0

r20665 - trunk/DOCS/tech/nut.txt
by michael 04 Nov '06

04 Nov '06

Author: michael Date: Sat Nov 4 14:33:35 2006 New Revision: 20665 Modified: trunk/DOCS/tech/nut.txt Log: intro Modified: trunk/DOCS/tech/nut.txt ============================================================================== --- trunk/DOCS/tech/nut.txt (original) +++ trunk/DOCS/tech/nut.txt Sat Nov 4 14:33:35 2006 @@ -7,6 +7,15 @@ Intro: ====== +NUT is a Free multimedia container format for storeage of audio, video, +subtitles and related user defined streams, it provides exact timestamps for +synchronization and seeking, is simple, has low overhead and can recover +in case of errors in the stream + +other common multimedia container formats are AVI, OGG, Matroska, MP4, MOV +ASF, MPEG-PS, MPEG-TS + + Features / goals: (supported by the format, not necessarily by a specific implementation)

2 1

NUT spec intro?
by Charles Iliya Krempeaux 04 Nov '06

04 Nov '06

Hello, IMO, the NUT spec intro needs a bit of work. It just kind of jumps into things without even saying what it is all about. How about adding something like the following at the beginning... ------- BEGIN ------- NUT is a Free multimedia container data format used for synchronizing video, audio, text, and user defined streams. NUT is similar to Ogg, Matroska, 3GP, MOV, and AVI. -------- END -------- I'd suggest adding it between the... Intro: ====== and the... Features / goals: See ya -- Charles Iliya Krempeaux, B.Sc. charles @ reptile.ca supercanadian @ gmail.com developer weblog: http://ChangeLog.ca/

2 1

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

04 Nov '06

Author: ods15 Date: Sat Nov 4 15:39:02 2006 New Revision: 184 Modified: trunk/libnut/muxer.c Log: make sure there are 3 copies of main headers Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Sat Nov 4 15:39:02 2006 @@ -658,6 +658,7 @@ int total = 0; if (!nut) return; + if (nut->last_headers < (1<<23)) put_headers(nut); // force 3rd copy of main headers put_headers(nut); if (nut->mopts.write_index) put_index(nut);

1 0

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

04 Nov '06

Author: ods15 Date: Sat Nov 4 15:03:54 2006 New Revision: 183 Modified: trunk/libnut/muxer.c trunk/libnut/nut.h Log: implement nut_write_info() in muxer, though spec is unclear about legality... Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Sat Nov 4 15:03:54 2006 @@ -226,7 +226,7 @@ put_header(nut->o, tmp, nut->tmp_buffer2, STREAM_STARTCODE, 0); } -static void put_info(nut_context_t * nut, nut_info_packet_t * info) { +static void put_info(nut_context_t * nut, const nut_info_packet_t * info) { output_buffer_t * tmp = clear_buffer(nut->tmp_buffer); int i; @@ -455,13 +455,9 @@ return size; } -void nut_write_frame(nut_context_t * nut, const nut_packet_t * fd, const uint8_t * buf) { - stream_context_t * sc = &nut->sc[fd->stream]; - output_buffer_t * tmp; - int i; - - if (bctello(nut->o) > (1 << 23)) { // main header repetition - i = 23; // ### magic value for header repetition +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--; @@ -470,6 +466,14 @@ put_headers(nut); } } +} + +void nut_write_frame(nut_context_t * nut, const nut_packet_t * fd, const uint8_t * buf) { + stream_context_t * sc = &nut->sc[fd->stream]; + output_buffer_t * tmp; + int i; + + check_header_repetition(nut); // distance syncpoints 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); @@ -500,6 +504,12 @@ else sc->eor = 0; } +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); +} + nut_context_t * nut_muxer_init(const nut_muxer_opts_t * mopts, const nut_stream_header_t s[], const nut_info_packet_t info[]) { nut_context_t * nut; int i; Modified: trunk/libnut/nut.h ============================================================================== --- trunk/libnut/nut.h (original) +++ trunk/libnut/nut.h Sat Nov 4 15:03:54 2006 @@ -129,6 +129,7 @@ /** nut_write_frame does magic, it writes headers */ void nut_write_frame(nut_context_t * nut, const nut_packet_t * p, const uint8_t * buf); +/** the use of this function is illegal in non realtime streams!! */ void nut_write_info(nut_context_t * nut, const nut_info_packet_t * info); /** do the same as the above function, but deal with frame reordering */

1 0

r20666 - trunk/DOCS/tech/nut.txt
by ods15 04 Nov '06

04 Nov '06

Author: ods15 Date: Sat Nov 4 14:56:55 2006 New Revision: 20666 Modified: trunk/DOCS/tech/nut.txt Log: SHOULD not -> SHOULD NOT Modified: trunk/DOCS/tech/nut.txt ============================================================================== --- trunk/DOCS/tech/nut.txt (original) +++ trunk/DOCS/tech/nut.txt Sat Nov 4 14:56:55 2006 @@ -843,7 +843,7 @@ stream_id then it MUST ignore all but the one with the highest position in the file -demxuxers SHOULD not search the whole file for info packets +demxuxers SHOULD NOT search the whole file for info packets demuxer (non-normative): ------------------------

1 0

[nut]: r182 - trunk/libnut/nut.h
by ods15 04 Nov '06

04 Nov '06

Author: ods15 Date: Sat Nov 4 14:36:30 2006 New Revision: 182 Modified: trunk/libnut/nut.h Log: more logical function decleration Modified: trunk/libnut/nut.h ============================================================================== --- trunk/libnut/nut.h (original) +++ trunk/libnut/nut.h Sat Nov 4 14:36:30 2006 @@ -129,7 +129,7 @@ /** nut_write_frame does magic, it writes headers */ void nut_write_frame(nut_context_t * nut, const nut_packet_t * p, const uint8_t * buf); -void nut_write_info(nut_context_t * nut, const nut_info_packet_t info []); +void nut_write_info(nut_context_t * nut, const nut_info_packet_t * info); /** do the same as the above function, but deal with frame reordering */ void nut_muxer_uninit_reorder(nut_context_t * nut);

1 0