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

[nut]: r202 - in trunk: libnut/Makefile libnut/demuxer.c libnut/libnut.h libnut/muxer.c libnut/nut.h libnut/reorder.c nututils/nutmerge.h
by ods15 14 Nov '06

14 Nov '06

Author: ods15 Date: Tue Nov 14 07:01:28 2006 New Revision: 202 Added: trunk/libnut/libnut.h - copied unchanged from r201, /trunk/libnut/nut.h Removed: trunk/libnut/nut.h Modified: trunk/libnut/Makefile trunk/libnut/demuxer.c trunk/libnut/muxer.c trunk/libnut/reorder.c trunk/nututils/nutmerge.h Log: rename nut.h->libnut.h Modified: trunk/libnut/Makefile ============================================================================== --- trunk/libnut/Makefile (original) +++ trunk/libnut/Makefile Tue Nov 14 07:01:28 2006 @@ -6,11 +6,11 @@ install -d $(prefix)/lib install -m 644 libnut.a $(prefix)/lib install -d $(prefix)/include - install -m 644 nut.h $(prefix)/include + install -m 644 libnut.h $(prefix)/include uninstall: rm -f $(prefix)/lib/libnut.a - rm -f $(prefix)/include/nut.h + rm -f $(prefix)/include/libnut.h libnut.a: muxer.o demuxer.o reorder.o rm -f $@ Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Tue Nov 14 07:01:28 2006 @@ -4,7 +4,7 @@ #include <inttypes.h> #include <stdlib.h> #include <stdio.h> -#include "nut.h" +#include "libnut.h" #include "priv.h" static size_t stream_read(void * priv, size_t len, uint8_t * buf) { Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Tue Nov 14 07:01:28 2006 @@ -4,7 +4,7 @@ #include <inttypes.h> #include <stdlib.h> #include <stdio.h> -#include "nut.h" +#include "libnut.h" #include "priv.h" static int stream_write(void * priv, size_t len, const uint8_t * buf) { Modified: trunk/libnut/reorder.c ============================================================================== --- trunk/libnut/reorder.c (original) +++ trunk/libnut/reorder.c Tue Nov 14 07:01:28 2006 @@ -4,7 +4,7 @@ #include <inttypes.h> #include <stdlib.h> #include <stdio.h> -#include "nut.h" +#include "libnut.h" #include "priv.h" static void shift_frames(nut_context_t * nut, stream_context_t * s, int amount) { Modified: trunk/nututils/nutmerge.h ============================================================================== --- trunk/nututils/nutmerge.h (original) +++ trunk/nututils/nutmerge.h Tue Nov 14 07:01:28 2006 @@ -6,7 +6,7 @@ #include <stdio.h> //#define NDEBUG #include <assert.h> -#include <nut.h> +#include <libnut.h> #define MIN(a,b) ((a) > (b) ? (b) : (a)) #define MAX(a,b) ((a) < (b) ? (b) : (a))

1 0

[nut]: r201 - in trunk/libnut: demuxer.c muxer.c priv.h reorder.c
by ods15 13 Nov '06

13 Nov '06

Author: ods15 Date: Mon Nov 13 19:29:02 2006 New Revision: 201 Modified: trunk/libnut/demuxer.c trunk/libnut/muxer.c trunk/libnut/priv.h trunk/libnut/reorder.c Log: removed unused param Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Mon Nov 13 19:29:02 2006 @@ -454,7 +454,7 @@ TO_PTS(timestamp, pts) for (i = 0; i < nut->stream_count; i++) { - nut->sc[i].last_pts = convert_ts(nut, timestamp_p, nut->tb[timestamp_t], TO_TB(i)); + nut->sc[i].last_pts = convert_ts(timestamp_p, nut->tb[timestamp_t], TO_TB(i)); } } @@ -518,7 +518,7 @@ GET_V(tmp, x); for (i = 0; i < nut->stream_count; i++) { TO_PTS(max, x) - nut->sc[i].sh.max_pts = convert_ts(nut, max_p, nut->tb[max_t], TO_TB(i)); + nut->sc[i].sh.max_pts = convert_ts(max_p, nut->tb[max_t], TO_TB(i)); } GET_V(tmp, x); @@ -669,11 +669,11 @@ // error checking - out of order dts for (i = 0; i < nut->stream_count; i++) { if (nut->sc[i].last_dts == -1) continue; - if (compare_ts(nut, pd->pts, TO_TB(pd->stream), nut->sc[i].last_dts, TO_TB(i)) < 0) + if (compare_ts(pd->pts, TO_TB(pd->stream), nut->sc[i].last_dts, TO_TB(i)) < 0) fprintf(stderr, "%lld %d (%f) %lld %d (%f) \n", pd->pts, pd->stream, TO_DOUBLE(pd->stream, pd->pts), nut->sc[i].last_dts, i, TO_DOUBLE(i, nut->sc[i].last_dts)); - ERROR(compare_ts(nut, pd->pts, TO_TB(pd->stream), nut->sc[i].last_dts, TO_TB(i)) < 0, -ERR_OUT_OF_ORDER); + ERROR(compare_ts(pd->pts, TO_TB(pd->stream), nut->sc[i].last_dts, TO_TB(i)) < 0, -ERR_OUT_OF_ORDER); } if (saw_syncpoint) *saw_syncpoint = !!after_sync; @@ -1164,7 +1164,7 @@ off_t back_ptr = stopper->pos - stopper->back_ptr; TO_PTS(stopper, stopper->pts) // only relavent if pts is smaller than stopper, and we passed stopper's back_ptr - if (compare_ts(nut, pd.pts, TO_TB(pd.stream), stopper_p, nut->tb[stopper_t]) < 0 && buf_before >= back_ptr) { + if (compare_ts(pd.pts, TO_TB(pd.stream), stopper_p, nut->tb[stopper_t]) < 0 && buf_before >= back_ptr) { if (!stopper_syncpoint) state[pd.stream].good_key = 1; else if (state[pd.stream].good_key) { int n = 1; @@ -1262,7 +1262,7 @@ for (i = 0; i < nut->stream_count; i++) { uint64_t dts = nut->sc[i].last_dts != -1 ? nut->sc[i].last_dts : nut->sc[i].last_pts; if (!state[i].active) continue; - if (compare_ts(nut, orig_pts, nut->tb[orig_timebase], dts, TO_TB(i)) < 0) { + if (compare_ts(orig_pts, nut->tb[orig_timebase], dts, TO_TB(i)) < 0) { orig_pts = dts; orig_timebase = nut->sc[i].timebase_id; } Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Mon Nov 13 19:29:02 2006 @@ -223,7 +223,7 @@ put_v(tmp, info->stream_id_plus1); 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; + for (i = 0; i < nut->timebase_count; i++) if (compare_ts(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); put_v(tmp, info->count); @@ -238,7 +238,7 @@ put_s(tmp, field->val); } else if (!strcmp(field->type, "t")) { int j; - for (j = 0; j < nut->timebase_count; j++) if (compare_ts(nut, 1, field->tb, 1, nut->tb[j]) == 0) break; + for (j = 0; j < nut->timebase_count; j++) if (compare_ts(1, field->tb, 1, nut->tb[j]) == 0) break; put_s(tmp, -4); put_v(tmp, field->val * nut->timebase_count + j); } else if (!strcmp(field->type, "r")) { @@ -280,7 +280,7 @@ nut->last_syncpoint = bctello(nut->o); for (i = 0; i < nut->stream_count; i++) { - if (nut->sc[i].last_dts > 0 && compare_ts(nut, nut->sc[i].last_dts, TO_TB(i), pts, nut->tb[timebase]) > 0) { + if (nut->sc[i].last_dts > 0 && compare_ts(nut->sc[i].last_dts, TO_TB(i), pts, nut->tb[timebase]) > 0) { pts = nut->sc[i].last_dts; timebase = nut->sc[i].timebase_id; } @@ -307,7 +307,7 @@ for (j = 0; j < nut->stream_count; j++) { if (keys[j]) continue; if (!s->pts[i * nut->stream_count + j]) continue; - if (compare_ts(nut, s->pts[i * nut->stream_count + j] - 1, TO_TB(j), pts, nut->tb[timebase]) <= 0) keys[j] = 1; + if (compare_ts(s->pts[i * nut->stream_count + j] - 1, TO_TB(j), pts, nut->tb[timebase]) <= 0) keys[j] = 1; } for (j = 0; j < nut->stream_count; j++) n &= keys[j]; if (n) { i--; break; } @@ -321,7 +321,7 @@ } for (i = 0; i < nut->stream_count; i++) { - nut->sc[i].last_pts = convert_ts(nut, pts, nut->tb[timebase], TO_TB(i)); + nut->sc[i].last_pts = convert_ts(pts, nut->tb[timebase], TO_TB(i)); nut->sc[i].last_key = 0; if (nut->sc[i].eor) nut->sc[i].eor = -1; // so we know to ignore this stream in future syncpoints } @@ -342,7 +342,7 @@ int timebase = 0; for (i = 0; i < nut->stream_count; i++) { - if (compare_ts(nut, nut->sc[i].sh.max_pts, TO_TB(i), max_pts, nut->tb[timebase]) > 0) { + if (compare_ts(nut->sc[i].sh.max_pts, TO_TB(i), max_pts, nut->tb[timebase]) > 0) { max_pts = nut->sc[i].sh.max_pts; timebase = nut->sc[i].timebase_id; } @@ -455,7 +455,7 @@ 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; + for (i = 0; i < nut->timebase_count; i++) if (compare_ts(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; @@ -495,11 +495,11 @@ for (i = 0; i < nut->stream_count; i++) { if (nut->sc[i].last_dts == -1) continue; - if (compare_ts(nut, fd->pts, TO_TB(fd->stream), nut->sc[i].last_dts, TO_TB(i)) < 0) + if (compare_ts(fd->pts, TO_TB(fd->stream), nut->sc[i].last_dts, TO_TB(i)) < 0) fprintf(stderr, "%lld %d (%f) %lld %d (%f) \n", fd->pts, fd->stream, TO_DOUBLE(fd->stream, fd->pts), nut->sc[i].last_dts, i, TO_DOUBLE(i, nut->sc[i].last_dts)); - assert(compare_ts(nut, fd->pts, TO_TB(fd->stream), nut->sc[i].last_dts, TO_TB(i)) >= 0); + assert(compare_ts(fd->pts, TO_TB(fd->stream), nut->sc[i].last_dts, TO_TB(i)) >= 0); } sc->last_pts = fd->pts; Modified: trunk/libnut/priv.h ============================================================================== --- trunk/libnut/priv.h (original) +++ trunk/libnut/priv.h Mon Nov 13 19:29:02 2006 @@ -188,7 +188,7 @@ return crc; } -static inline uint64_t convert_ts(nut_context_t * nut, uint64_t sn, nut_timebase_t from, nut_timebase_t to) { +static inline uint64_t convert_ts(uint64_t sn, nut_timebase_t from, nut_timebase_t to) { uint64_t ln, d1, d2; ln = (uint64_t)from.nom * to.den; d1 = from.den; @@ -196,9 +196,9 @@ return (ln / d1 * sn + (ln%d1) * sn / d1) / d2; } -static inline int compare_ts(nut_context_t * nut, uint64_t a, nut_timebase_t at, uint64_t b, nut_timebase_t bt) { - if (convert_ts(nut, a, at, bt) < b) return -1; - if (convert_ts(nut, b, bt, at) < a) return 1; +static inline int compare_ts(uint64_t a, nut_timebase_t at, uint64_t b, nut_timebase_t bt) { + if (convert_ts(a, at, bt) < b) return -1; + if (convert_ts(b, bt, at) < a) return 1; return 0; } Modified: trunk/libnut/reorder.c ============================================================================== --- trunk/libnut/reorder.c (original) +++ trunk/libnut/reorder.c Mon Nov 13 19:29:02 2006 @@ -41,7 +41,7 @@ else pts = nut->sc[j].next_pts; if (pts >= 0) { - pts = convert_ts(nut, pts, TO_TB(j), TO_TB(i)); + pts = convert_ts(pts, TO_TB(j), TO_TB(i)); if (min > pts || min == -1) min = pts; } }

1 0

r20862 - trunk/DOCS/tech/nut.txt
by michael 13 Nov '06

13 Nov '06

Author: michael Date: Sun Nov 12 13:24:57 2006 New Revision: 20862 Modified: trunk/DOCS/tech/nut.txt Log: least restrictive dts ordering rule which ensures frames are in decoding order Modified: trunk/DOCS/tech/nut.txt ============================================================================== --- trunk/DOCS/tech/nut.txt (original) +++ trunk/DOCS/tech/nut.txt Sun Nov 12 13:24:57 2006 @@ -670,6 +670,8 @@ Pts of all frames in all streams MUST be bigger or equal to dts of all previous frames in all streams, compared in common timebase. (EOR frames are NOT exempt from this rule) + Dts of all frames MUST be bigger or equal to dts of all previous frames + in the same stream width/height width and height of the video in pixels

4 4

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

12 Nov '06

Author: ods15 Date: Sun Nov 12 07:41:00 2006 New Revision: 200 Modified: trunk/libnut/demuxer.c Log: safer reallocs in demuxer to prevent memleaks Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sun Nov 12 07:41:00 2006 @@ -252,8 +252,9 @@ if (nut->max_distance > 65536) nut->max_distance = 65536; GET_V(tmp, nut->timebase_count); + nut->alloc->free(nut->tb); nut->tb = NULL; ERROR(SIZE_MAX/sizeof(nut_timebase_t) < nut->timebase_count, -ERR_OUT_OF_MEM); - nut->tb = nut->alloc->realloc(nut->tb, nut->timebase_count * sizeof(nut_timebase_t)); + nut->tb = nut->alloc->malloc(nut->timebase_count * sizeof(nut_timebase_t)); ERROR(!nut->tb, -ERR_OUT_OF_MEM); for (i = 0; i < nut->timebase_count; i++) { GET_V(tmp, nut->tb[i].nom); @@ -507,6 +508,7 @@ syncpoint_list_t * sl = &nut->syncpoints; uint64_t x; int i; + void * a, * b, * c; CHECK(get_bytes(nut->i, 8, &x)); ERROR(x != INDEX_STARTCODE, -ERR_GENERAL_ERROR); @@ -523,10 +525,13 @@ ERROR(SIZE_MAX/x < sizeof(syncpoint_t) || SIZE_MAX/x < sizeof(uint64_t) * nut->stream_count, -ERR_OUT_OF_MEM); sl->alloc_len = sl->len = x; - sl->s = nut->alloc->realloc(sl->s, sl->alloc_len * sizeof(syncpoint_t)); - sl->pts = nut->alloc->realloc(sl->pts, sl->alloc_len * sizeof(uint64_t) * nut->stream_count); - sl->eor = nut->alloc->realloc(sl->eor, sl->alloc_len * sizeof(uint64_t) * nut->stream_count); - ERROR(!sl->s || !sl->pts || !sl->eor, -ERR_OUT_OF_MEM); + a = nut->alloc->realloc(sl->s, sl->alloc_len * sizeof(syncpoint_t)); + b = nut->alloc->realloc(sl->pts, sl->alloc_len * nut->stream_count * sizeof(uint64_t)); + c = nut->alloc->realloc(sl->eor, sl->alloc_len * nut->stream_count * sizeof(uint64_t)); + ERROR(!a || !b || !c, -ERR_OUT_OF_MEM); + sl->s = a; + sl->pts = b; + sl->eor = c; for (i = 0; i < sl->len; i++) { GET_V(tmp, sl->s[i].pos);

1 0

r20838 - trunk/DOCS/tech/nut.txt
by michael 12 Nov '06

12 Nov '06

Author: michael Date: Fri Nov 10 18:47:01 2006 New Revision: 20838 Modified: trunk/DOCS/tech/nut.txt Log: stream_count a few more words for forward_ptr and file_id_string Modified: trunk/DOCS/tech/nut.txt ============================================================================== --- trunk/DOCS/tech/nut.txt (original) +++ trunk/DOCS/tech/nut.txt Fri Nov 10 18:47:01 2006 @@ -401,6 +401,8 @@ file_id_string "nut/multimedia container\0" + the very first thing in every nut file, usefull for identifying nut + files *_startcode all startcodes start with 'N' @@ -423,9 +425,15 @@ version NUT version. The current value is 3. All lower values are pre-freeze +stream_count + number of streams in this file + forward_ptr size of the packet data (exactly the distance from the first byte after the packet_header to the first byte of the next packet) + every nut packet contains a forward_ptr immedeatly after its startcode + with the exception of frame_code based packets, the forward pointer + can be used to skip over the packet without decoding its contents max_distance max distance between startcodes. If p1 and p2 are the byte

4 4

[nut]: r199 - trunk/nututils/demux_avi.c
by ods15 11 Nov '06

11 Nov '06

Author: ods15 Date: Sat Nov 11 20:22:20 2006 New Revision: 199 Modified: trunk/nututils/demux_avi.c Log: "flipped" samplerate fix :) Modified: trunk/nututils/demux_avi.c ============================================================================== --- trunk/nututils/demux_avi.c (original) +++ trunk/nututils/demux_avi.c Sat Nov 11 20:22:20 2006 @@ -383,8 +383,8 @@ avi->s[i].codec_id = e_mp3; avi->s[i].sh.decode_delay = 0; - avi->s[i].sh.samplerate_nom = 1; - avi->s[i].sh.samplerate_denom = avi->stream[i].audio->nSamplesPerSec; + avi->s[i].sh.samplerate_nom = avi->stream[i].audio->nSamplesPerSec; + avi->s[i].sh.samplerate_denom = 1; avi->s[i].sh.channel_count = avi->stream[i].audio->nChannels; } }

1 0

r20852 - trunk/DOCS/tech/nut.txt
by michael 11 Nov '06

11 Nov '06

Author: michael Date: Sat Nov 11 03:04:02 2006 New Revision: 20852 Modified: trunk/DOCS/tech/nut.txt Log: s/by/be/ Modified: trunk/DOCS/tech/nut.txt ============================================================================== --- trunk/DOCS/tech/nut.txt (original) +++ trunk/DOCS/tech/nut.txt Sat Nov 11 03:04:02 2006 @@ -505,7 +505,7 @@ time_base_id index into the time_base table - MUST by < time_base_count + MUST be < time_base_count convert_ts To switch from 2 different timebases, the following calculation is

1 0

r20846 - trunk/DOCS/tech/nut.txt
by michael 10 Nov '06

10 Nov '06

Author: michael Date: Fri Nov 10 19:46:20 2006 New Revision: 20846 Modified: trunk/DOCS/tech/nut.txt Log: within array MUST for time_base_id Modified: trunk/DOCS/tech/nut.txt ============================================================================== --- trunk/DOCS/tech/nut.txt (original) +++ trunk/DOCS/tech/nut.txt Fri Nov 10 19:46:20 2006 @@ -505,6 +505,7 @@ time_base_id index into the time_base table + MUST by < time_base_count convert_ts To switch from 2 different timebases, the following calculation is

2 1

r20845 - trunk/DOCS/tech/nut.txt
by michael 10 Nov '06

10 Nov '06

Author: michael Date: Fri Nov 10 19:45:10 2006 New Revision: 20845 Modified: trunk/DOCS/tech/nut.txt Log: clearer time_base_id description Modified: trunk/DOCS/tech/nut.txt ============================================================================== --- trunk/DOCS/tech/nut.txt (original) +++ trunk/DOCS/tech/nut.txt Fri Nov 10 19:45:10 2006 @@ -504,7 +504,7 @@ There SHOULD NOT be more timebases than streams. time_base_id - id to time_base table + index into the time_base table convert_ts To switch from 2 different timebases, the following calculation is

1 0

r20839 - trunk/DOCS/tech/nut.txt
by michael 10 Nov '06

10 Nov '06

Author: michael Date: Fri Nov 10 18:51:44 2006 New Revision: 20839 Modified: trunk/DOCS/tech/nut.txt Log: time_base_count Modified: trunk/DOCS/tech/nut.txt ============================================================================== --- trunk/DOCS/tech/nut.txt (original) +++ trunk/DOCS/tech/nut.txt Fri Nov 10 18:51:44 2006 @@ -428,6 +428,10 @@ stream_count number of streams in this file +time_base_count + number of different time bases in this file + this MUST NOT be 0 + forward_ptr size of the packet data (exactly the distance from the first byte after the packet_header to the first byte of the next packet)

1 0