- NUT-devel - lists.mplayerhq.hu

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

[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