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

[nut]: r198 - in trunk: libnut/muxer.c nututils/demux_avi.c nututils/demux_ogg.c nututils/framer_vorbis.c
by ods15 10 Nov '06

10 Nov '06

Author: ods15 Date: Fri Nov 10 13:35:55 2006 New Revision: 198 Modified: trunk/libnut/muxer.c trunk/nututils/demux_avi.c trunk/nututils/demux_ogg.c trunk/nututils/framer_vorbis.c Log: shut up some gcc 4.0 pointer-sign warnings Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Fri Nov 10 13:35:55 2006 @@ -95,7 +95,7 @@ else put_v(bc, 2*val-1); } -static void put_data(output_buffer_t * bc, int len, const uint8_t * data) { +static void put_data(output_buffer_t * bc, int len, const void * data) { if (!len) return; assert(data); if (bc->write_len - (bc->buf_ptr - bc->buf) > len || bc->is_mem) { @@ -108,7 +108,7 @@ } } -static void put_vb(output_buffer_t * bc, int len, uint8_t * data) { +static void put_vb(output_buffer_t * bc, int len, const void * data) { put_v(bc, len); put_data(bc, len, data); } Modified: trunk/nututils/demux_avi.c ============================================================================== --- trunk/nututils/demux_avi.c (original) +++ trunk/nututils/demux_avi.c Fri Nov 10 13:35:55 2006 @@ -342,7 +342,7 @@ }; int j; for (j = sizeof(fourccs)/sizeof(fourccs[0]); j--; ) { - if (!strncmp(avi->stream[i].video->biCompression, fourccs[j], 4)) break; + if (!strncmp((char*)avi->stream[i].video->biCompression, fourccs[j], 4)) break; } if (j == -1) return err_avi_no_video_codec; } else { @@ -379,7 +379,7 @@ avi->s[i].sh.colorspace_type = 0; } else { // audio avi->s[i].sh.fourcc_len = 4; - avi->s[i].sh.fourcc = "mp3 "; + avi->s[i].sh.fourcc = (uint8_t*)"mp3 "; avi->s[i].codec_id = e_mp3; avi->s[i].sh.decode_delay = 0; Modified: trunk/nututils/demux_ogg.c ============================================================================== --- trunk/nututils/demux_ogg.c (original) +++ trunk/nututils/demux_ogg.c Fri Nov 10 13:35:55 2006 @@ -25,7 +25,7 @@ }; static struct { enum nutmerge_codecs id; uint8_t * magic; int magic_len; } codecs[] = { - { e_vorbis, "\001vorbis", 7 }, + { e_vorbis, (uint8_t*)"\001vorbis", 7 }, { 0, NULL, 0 } }; Modified: trunk/nututils/framer_vorbis.c ============================================================================== --- trunk/nututils/framer_vorbis.c (original) +++ trunk/nututils/framer_vorbis.c Fri Nov 10 13:35:55 2006 @@ -101,7 +101,7 @@ s->type = NUT_AUDIO_CLASS; s->fourcc_len = 4; - s->fourcc = "vrbs"; + s->fourcc = (uint8_t*)"vrbs"; s->time_base.den = sample_rate / gcd(sample_rate, i); s->time_base.nom = i / gcd(sample_rate, i); s->fixed_fps = 0;

1 0

[nut]: r197 - in trunk/libnut: demuxer.c nut.h
by ods15 10 Nov '06

10 Nov '06

Author: ods15 Date: Fri Nov 10 08:29:26 2006 New Revision: 197 Modified: trunk/libnut/demuxer.c trunk/libnut/nut.h Log: make demuxer read info packets after main header. API change. Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Fri Nov 10 08:29:26 2006 @@ -778,7 +778,7 @@ return err; } -int nut_read_headers(nut_context_t * nut, nut_stream_header_t * s []) { +int nut_read_headers(nut_context_t * nut, nut_stream_header_t * s [], nut_info_packet_t * info []) { int i, err = 0; *s = NULL; if (!nut->seek_status) { // we already have headers, we were called just for index @@ -830,6 +830,21 @@ nut->sc[i].pts_cache[j] = -1; } } + if (info) { + uint64_t tmp; + CHECK(get_bytes(nut->i, 8, &tmp)); + while (tmp == INFO_STARTCODE) { + nut->info_count++; + ERROR(SIZE_MAX/sizeof(nut_info_packet_t) < nut->info_count + 1, -ERR_OUT_OF_MEM); + nut->info = nut->alloc->realloc(nut->info, sizeof(nut_info_packet_t) * (nut->info_count + 1)); + ERROR(!nut->info, -ERR_OUT_OF_MEM); + memset(&nut->info[nut->info_count - 1], 0, sizeof(nut_info_packet_t)); + nut->info[nut->info_count].count = -1; + CHECK(get_info_header(nut, &nut->info[nut->info_count - 1])); + CHECK(get_bytes(nut->i, 8, &tmp)); + } + nut->i->buf_ptr -= 8; + } if (nut->dopts.read_index) { uint64_t tmp; CHECK(get_bytes(nut->i, 8, &tmp)); @@ -871,6 +886,7 @@ ERROR(!*s, -ERR_OUT_OF_MEM); for (i = 0; i < nut->stream_count; i++) (*s)[i] = nut->sc[i].sh; (*s)[i].type = -1; + if (info) *info = nut->info; err_out: if (err && err != 2 && !nut->seek_status) { if (nut->sc) for (i = 0; i < nut->stream_count; i++) { @@ -1340,8 +1356,10 @@ nut->sc = NULL; nut->tb = NULL; + nut->info = NULL; nut->last_headers = 0; nut->stream_count = 0; + nut->info_count = 0; nut->dopts = *dopts; nut->seek_status = 0; nut->before_seek = 0; Modified: trunk/libnut/nut.h ============================================================================== --- trunk/libnut/nut.h (original) +++ trunk/libnut/nut.h Fri Nov 10 08:29:26 2006 @@ -179,8 +179,9 @@ /** Read headers, must be called at begginning @brief "s" is malloced and needs to be free'd. +@brief "info" is malloced and needs to be free'd using nut_free_info() for each packet! can be NULL though. */ -int nut_read_headers(nut_context_t * nut, nut_stream_header_t * s []); +int nut_read_headers(nut_context_t * nut, nut_stream_header_t * s [], nut_info_packet_t * info []); /** Just reads the frame DATA. all it's header has already been read by nut_read_next_packet. buf must be allocated and big enough.

1 0

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

10 Nov '06

Author: ods15 Date: Fri Nov 10 08:06:57 2006 New Revision: 196 Modified: trunk/libnut/muxer.c Log: 10l forgot flush_buf in nut_write_info Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Fri Nov 10 08:06:57 2006 @@ -518,6 +518,7 @@ nut->last_headers = bctello(nut->o); // to force syncpoint writing after the info header put_info(nut, info); + if (nut->mopts.realtime_stream) flush_buf(nut->o); } nut_context_t * nut_muxer_init(const nut_muxer_opts_t * mopts, const nut_stream_header_t s[], const nut_info_packet_t info[]) {

1 0

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

10 Nov '06

Author: ods15 Date: Fri Nov 10 08:02:20 2006 New Revision: 195 Modified: trunk/libnut/muxer.c Log: add ability in muxer to clear syncpoint cache if possible, allows for very long streams to be muxed with no "memleak". Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Fri Nov 10 08:02:20 2006 @@ -313,6 +313,12 @@ if (n) { i--; break; } } back_ptr = (nut->last_syncpoint - s->s[i].pos) / 16; + if (!nut->mopts.write_index) { // clear some syncpoit cache if possible + s->len -= i; + memmove(s->s, s->s + i, s->len * sizeof(syncpoint_t)); + memmove(s->pts, s->pts + i * nut->stream_count, s->len * nut->stream_count * sizeof(uint64_t)); + memmove(s->eor, s->eor + i * nut->stream_count, s->len * nut->stream_count * sizeof(uint64_t)); + } for (i = 0; i < nut->stream_count; i++) { nut->sc[i].last_pts = convert_ts(nut, pts, nut->tb[timebase], TO_TB(i));

1 0

r20796 - trunk/DOCS/tech/nut.txt
by michael 08 Nov '06

08 Nov '06

Author: michael Date: Wed Nov 8 20:04:48 2006 New Revision: 20796 Modified: trunk/DOCS/tech/nut.txt Log: dts, width/height explanation Modified: trunk/DOCS/tech/nut.txt ============================================================================== --- trunk/DOCS/tech/nut.txt (original) +++ trunk/DOCS/tech/nut.txt Wed Nov 8 20:04:48 2006 @@ -644,6 +644,11 @@ all pts's of keyframes of a single stream MUST be monotone dts + decoding timestamp + the dts of a frame is the timestamp of the first sample which is + output by a decoder when it is feeded with the frame, note that the + data output is not neccesarily what is coded in the frame, but may + be data from previous frames dts is calculated by using a decode_delay+1 sized buffer for each stream, into which the current pts is inserted and the element with the smallest value is removed, this is then the current dts @@ -654,6 +659,7 @@ frames are NOT exempt from this rule) width/height + width and height of the video in pixels MUST be set to the coded width/height, MUST NOT be 0 sample_width/sample_height (aspect ratio)

1 0

r20794 - trunk/DOCS/tech/nut.txt
by michael 08 Nov '06

08 Nov '06

Author: michael Date: Wed Nov 8 19:50:58 2006 New Revision: 20794 Modified: trunk/DOCS/tech/nut.txt Log: size and stream_id docs Modified: trunk/DOCS/tech/nut.txt ============================================================================== --- trunk/DOCS/tech/nut.txt (original) +++ trunk/DOCS/tech/nut.txt Wed Nov 8 19:50:58 2006 @@ -588,12 +588,22 @@ frame then the syncpoint timestamp is used, see global_key_pts stream_id[frame_code] + if FLAG_STREAM_ID is not set then this is the stream number for the + frame following this frame_code + if FLAG_STREAM_ID is set then this value has no meaning MUST be <250 data_size_mul[frame_code] + if FLAG_SIZE_MSB is set then data_size_msb which is stored after the + frame code is multiplied with it and forms the more significant part + of the size of the following frame + if FLAG_SIZE_MSB is not set then this field has no meaning MUST be <16384 data_size_lsb[frame_code] + the less significant part of the size of the following frame + this added together with data_size_mul*data_size_msb is the size of + the following frame MUST be <16384 pts_delta[frame_code] @@ -606,6 +616,7 @@ MUST be <256 data_size + the size of the following frame data_size= data_size_lsb + data_size_msb*data_size_mul; coded_pts

1 0

r20791 - trunk/DOCS/tech/nut.txt
by michael 08 Nov '06

08 Nov '06

Author: michael Date: Wed Nov 8 19:40:08 2006 New Revision: 20791 Modified: trunk/DOCS/tech/nut.txt Log: clearer frame_code explanation Modified: trunk/DOCS/tech/nut.txt ============================================================================== --- trunk/DOCS/tech/nut.txt (original) +++ trunk/DOCS/tech/nut.txt Wed Nov 8 19:40:08 2006 @@ -548,7 +548,11 @@ (with 00 00 01 prefixes) frame_code - the meaning of this byte is stored in the main header + frame_code is a 8bit field which exists before every frame, it can + store part of the size of the frame, the stream number, the timestamp + and some flags amongth other things, what is not directly stored + in it but is needed is stored in various fields immedeatly after it + the values stored in it can be found in the main header the value 78 ('N') is forbidden to ensure that the byte is always different from the first byte of any startcode a muxer SHOULD mark 0x00 and 0xFF as invalid to improve error

1 0

r20788 - trunk/DOCS/tech/nut.txt
by michael 08 Nov '06

08 Nov '06

Author: michael Date: Wed Nov 8 19:32:54 2006 New Revision: 20788 Modified: trunk/DOCS/tech/nut.txt Log: simple 1 line definition of what a keyframe is Modified: trunk/DOCS/tech/nut.txt ============================================================================== --- trunk/DOCS/tech/nut.txt (original) +++ trunk/DOCS/tech/nut.txt Wed Nov 8 19:32:54 2006 @@ -51,6 +51,8 @@ SHOULD it is recommended to be done that way, but not strictly required keyframe + A keyframe is a frame from which you can start decoding, a more + exact definition is below 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

1 0

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

07 Nov '06

Author: ods15 Date: Tue Nov 7 19:29:29 2006 New Revision: 194 Modified: trunk/libnut/muxer.c Log: just for the assert, init to NULL Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Tue Nov 7 19:29:29 2006 @@ -42,6 +42,7 @@ bc->is_mem = 1; bc->file_pos = 0; bc->buf_ptr = bc->buf = alloc->malloc(bc->write_len); + bc->osc.write = NULL; return bc; }

1 0

[nut]: r193 - in trunk: libnut/muxer.c libnut/nut.h nututils/nutmerge.c
by ods15 07 Nov '06

07 Nov '06

Author: ods15 Date: Tue Nov 7 19:28:25 2006 New Revision: 193 Modified: trunk/libnut/muxer.c trunk/libnut/nut.h trunk/nututils/nutmerge.c Log: add realtime_stream option for muxer. Effect is allowed use of nut_write_info(), writing of each NUT packet individually, and writing the entire NUT headers only once, at init, in the first packet to write() function. No index writing. Cost - memcpy for ALL frame data in order too prepend to it the frame headers. Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Tue Nov 7 19:28:25 2006 @@ -12,7 +12,7 @@ } static void flush_buf(output_buffer_t * bc) { - assert(!bc->is_mem); + assert(bc->osc.write); bc->file_pos += bc->osc.write(bc->osc.priv, bc->buf_ptr - bc->buf, bc->buf); bc->buf_ptr = bc->buf; } @@ -457,6 +457,7 @@ } static void check_header_repetition(nut_context_t * nut) { + if (nut->mopts.realtime_stream) return; if (bctello(nut->o) >= (1 << 23)) { int i; // ### magic value for header repetition for (i = 24; bctello(nut->o) >= (1 << i); i++); @@ -501,9 +502,13 @@ if ((fd->flags & NUT_FLAG_KEY) && !sc->last_key) sc->last_key = fd->pts + 1; if (fd->flags & NUT_FLAG_EOR) sc->eor = fd->pts + 1; else sc->eor = 0; + + if (nut->mopts.realtime_stream) flush_buf(nut->o); } void nut_write_info(nut_context_t * nut, const nut_info_packet_t * info) { + if (!nut->mopts.realtime_stream) return; + nut->last_headers = bctello(nut->o); // to force syncpoint writing after the info header put_info(nut, info); } @@ -517,6 +522,7 @@ else nut = malloc(sizeof(nut_context_t)); nut->mopts = *mopts; + if (nut->mopts.realtime_stream) nut->mopts.write_index = 0; nut->alloc = &nut->mopts.alloc; @@ -531,6 +537,8 @@ nut->tmp_buffer2 = new_mem_buffer(nut->alloc); // for packet_headers nut->max_distance = mopts->max_distance; + if (nut->mopts.realtime_stream) nut->o->is_mem = 1; + if (nut->max_distance > 65536) nut->max_distance = 65536; { @@ -649,6 +657,8 @@ put_headers(nut); + if (nut->mopts.realtime_stream) flush_buf(nut->o); + return nut; } @@ -657,8 +667,10 @@ int total = 0; if (!nut) return; - while (nut->headers_written < 2) put_headers(nut); // force 3rd copy of main headers - put_headers(nut); + if (!nut->mopts.realtime_stream) { + 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); for (i = 0; i < nut->stream_count; i++) { Modified: trunk/libnut/nut.h ============================================================================== --- trunk/libnut/nut.h (original) +++ trunk/libnut/nut.h Tue Nov 7 19:28:25 2006 @@ -75,6 +75,7 @@ nut_output_stream_t output; nut_alloc_t alloc; int write_index; + int realtime_stream; // implies no write_index int max_distance; frame_table_input_t * fti; } nut_muxer_opts_t; Modified: trunk/nututils/nutmerge.c ============================================================================== --- trunk/nututils/nutmerge.c (original) +++ trunk/nututils/nutmerge.c Tue Nov 7 19:28:25 2006 @@ -127,6 +127,7 @@ mopts.output = (nut_output_stream_t){ .priv = out, .write = NULL }; mopts.write_index = 1; + mopts.realtime_stream = 0; mopts.fti = ft_default; mopts.max_distance = 32768; mopts.alloc.malloc = NULL;

1 0