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

Fourcc spec
by Oded Shimon 31 May '07

31 May '07

This specification is normative to demuxers, informative to muxers. It does not need to be actively maintained, because it does NOT list all legal fourcc's, only the ones noted by the specification. I'd like to commit it to nut/docs/fourcc.txt . - ods15

5 39

[nut]: r274 - trunk/libnut/demuxer.c
by ods15 24 Dec '06

24 Dec '06

Author: ods15 Date: Sun Dec 24 07:52:08 2006 New Revision: 274 Modified: trunk/libnut/demuxer.c Log: forgotten CHECK's for memory errors Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sun Dec 24 07:52:08 2006 @@ -912,7 +912,7 @@ ERROR(!(nut->dopts.cache_syncpoints & 1) || !sl->len, -1); - flush_syncpoint_queue(nut); + CHECK(flush_syncpoint_queue(nut)); if (i) i--; else { @@ -1421,7 +1421,7 @@ for (i = 0; i < nut->stream_count; i++) nut->sc[i].state.pts = (uint64_t)(time_pos / TO_TB(i).num * TO_TB(i).den); nut->seek_time_pos = time_pos; nut->dopts.cache_syncpoints |= 2; - flush_syncpoint_queue(nut); + CHECK(flush_syncpoint_queue(nut)); } else { time_pos = nut->seek_time_pos; }

1 0

[nut]: r273 - trunk/libnut/demuxer.c
by ods15 23 Dec '06

23 Dec '06

Author: ods15 Date: Sat Dec 23 13:37:31 2006 New Revision: 273 Modified: trunk/libnut/demuxer.c Log: cosmetic Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Dec 23 13:37:31 2006 @@ -535,7 +535,6 @@ return err; } - static void set_global_pts(nut_context_t * nut, uint64_t pts) { int i; TO_PTS(timestamp, pts)

1 0

[nut]: r272 - in trunk: libnut/demuxer.c libnut/libnut.h libnut/muxer.c libnut/priv.h nututils/demux_avi.c nututils/framer_vorbis.c
by ods15 23 Dec '06

23 Dec '06

Author: ods15 Date: Sat Dec 23 13:33:00 2006 New Revision: 272 Modified: trunk/libnut/demuxer.c trunk/libnut/libnut.h trunk/libnut/muxer.c trunk/libnut/priv.h trunk/nututils/demux_avi.c trunk/nututils/framer_vorbis.c Log: sync to spec :), nom->num Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Dec 23 13:33:00 2006 @@ -265,7 +265,7 @@ nut->tb = nut->alloc->malloc(nut->timebase_count * sizeof(nut_timebase_t)); ERROR(!nut->tb, NUT_ERR_OUT_OF_MEM); for (i = 0; i < nut->timebase_count; i++) { - GET_V(tmp, nut->tb[i].nom); + GET_V(tmp, nut->tb[i].num); GET_V(tmp, nut->tb[i].den); } @@ -335,7 +335,7 @@ GET_V(tmp, sc->sh.colorspace_type); break; case NUT_AUDIO_CLASS: - GET_V(tmp, sc->sh.samplerate_nom); + GET_V(tmp, sc->sh.samplerate_num); GET_V(tmp, sc->sh.samplerate_denom); GET_V(tmp, sc->sh.channel_count); break; @@ -1163,7 +1163,7 @@ uint64_t timebases[nut->timebase_count]; syncpoint_list_t * sl = &nut->syncpoints; int a = 0; - for (i = 0; i < nut->timebase_count; i++) timebases[i] = (uint64_t)(time_pos / nut->tb[i].nom * nut->tb[i].den); + for (i = 0; i < nut->timebase_count; i++) timebases[i] = (uint64_t)(time_pos / nut->tb[i].num * nut->tb[i].den); assert(sl->len); // it is impossible for the first syncpoint to not have been read // find last syncpoint if it's not already found @@ -1419,7 +1419,7 @@ } if (time_pos < 0.) time_pos = 0.; - for (i = 0; i < nut->stream_count; i++) nut->sc[i].state.pts = (uint64_t)(time_pos / TO_TB(i).nom * TO_TB(i).den); + for (i = 0; i < nut->stream_count; i++) nut->sc[i].state.pts = (uint64_t)(time_pos / TO_TB(i).num * TO_TB(i).den); nut->seek_time_pos = time_pos; nut->dopts.cache_syncpoints |= 2; flush_syncpoint_queue(nut); Modified: trunk/libnut/libnut.h ============================================================================== --- trunk/libnut/libnut.h (original) +++ trunk/libnut/libnut.h Sat Dec 23 13:33:00 2006 @@ -37,7 +37,7 @@ /// Timebase struct \ingroup demuxer muxer typedef struct { - int nom; ///< Example: 1001 + int num; ///< Example: 1001 int den; ///< Example: 24000 } nut_timebase_t; @@ -63,7 +63,7 @@ /// \name audio /// Only used if type is #NUT_AUDIO_CLASS @{ - int samplerate_nom; ///< Sample rate of audio. Example: 44100 + int samplerate_num; ///< Sample rate of audio. Example: 44100 int samplerate_denom; ///< Sample rate denominator of audio. Example: 1 int channel_count; ///< Amount of audio channels } nut_stream_header_t; Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Sat Dec 23 13:33:00 2006 @@ -147,7 +147,7 @@ put_v(tmp, nut->max_distance); put_v(tmp, nut->timebase_count); for (i = 0; i < nut->timebase_count; i++) { - put_v(tmp, nut->tb[i].nom); + put_v(tmp, nut->tb[i].num); put_v(tmp, nut->tb[i].den); } for (i = 0; i < 256; ) { @@ -208,7 +208,7 @@ put_v(tmp, sc->sh.colorspace_type); break; case NUT_AUDIO_CLASS: - put_v(tmp, sc->sh.samplerate_nom); + put_v(tmp, sc->sh.samplerate_num); put_v(tmp, sc->sh.samplerate_denom); put_v(tmp, sc->sh.channel_count); break; @@ -598,7 +598,7 @@ nut->sc[i].last_pts = 0; nut->sc[i].last_dts = -1; nut->sc[i].msb_pts_shift = 7; // TODO - nut->sc[i].max_pts_distance = (s[i].time_base.den + s[i].time_base.nom - 1) / s[i].time_base.nom; // TODO + nut->sc[i].max_pts_distance = (s[i].time_base.den + s[i].time_base.num - 1) / s[i].time_base.num; // TODO nut->sc[i].eor = 0; nut->sc[i].sh = s[i]; nut->sc[i].sh.max_pts = 0; @@ -651,8 +651,8 @@ } for (i = 0; i < nut->timebase_count; i++) { - int t = gcd(nut->tb[i].nom, nut->tb[i].den); - nut->tb[i].nom /= t; + int t = gcd(nut->tb[i].num, nut->tb[i].den); + nut->tb[i].num /= t; nut->tb[i].den /= t; } Modified: trunk/libnut/priv.h ============================================================================== --- trunk/libnut/priv.h (original) +++ trunk/libnut/priv.h Sat Dec 23 13:33:00 2006 @@ -185,9 +185,9 @@ 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; + ln = (uint64_t)from.num * to.den; d1 = from.den; - d2 = to.nom; + d2 = to.num; return (ln / d1 * sn + (ln%d1) * sn / d1) / d2; } @@ -228,9 +228,9 @@ int prefix##_t = (pts) % nut->timebase_count; \ uint64_t prefix##_p = (pts) / nut->timebase_count; -#define TO_DOUBLE(t, pts) ((double)(pts) / nut->tb[t].den * nut->tb[t].nom) +#define TO_DOUBLE(t, pts) ((double)(pts) / nut->tb[t].den * nut->tb[t].num) -#define TO_DOUBLE_PTS(pts) ((double)((pts) / nut->timebase_count) / nut->tb[(pts) % nut->timebase_count].den * nut->tb[(pts) % nut->timebase_count].nom) +#define TO_DOUBLE_PTS(pts) ((double)((pts) / nut->timebase_count) / nut->tb[(pts) % nut->timebase_count].den * nut->tb[(pts) % nut->timebase_count].num) #define TO_TB(i) nut->tb[nut->sc[i].timebase_id] Modified: trunk/nututils/demux_avi.c ============================================================================== --- trunk/nututils/demux_avi.c (original) +++ trunk/nututils/demux_avi.c Sat Dec 23 13:33:00 2006 @@ -362,7 +362,7 @@ avi->s[i].sh.type = avi->stream[i].type; avi->s[i].sh.time_base.den = avi->stream[i].strh->dwRate; - avi->s[i].sh.time_base.nom = avi->stream[i].strh->dwScale; + avi->s[i].sh.time_base.num = avi->stream[i].strh->dwScale; avi->s[i].sh.fixed_fps = 1; avi->s[i].sh.codec_specific_len = avi->stream[i].extra_len; avi->s[i].sh.codec_specific = avi->stream[i].extra; @@ -385,7 +385,7 @@ avi->s[i].sh.codec_specific_len = 0; - avi->s[i].sh.samplerate_nom = avi->stream[i].audio->nSamplesPerSec; + avi->s[i].sh.samplerate_num = avi->stream[i].audio->nSamplesPerSec; avi->s[i].sh.samplerate_denom = 1; avi->s[i].sh.channel_count = avi->stream[i].audio->nChannels; } Modified: trunk/nututils/framer_vorbis.c ============================================================================== --- trunk/nututils/framer_vorbis.c (original) +++ trunk/nututils/framer_vorbis.c Sat Dec 23 13:33:00 2006 @@ -103,12 +103,12 @@ s->fourcc_len = 4; 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->time_base.num = i / gcd(sample_rate, i); s->fixed_fps = 0; s->decode_delay = 0; s->codec_specific_len = codec_specific_len; s->codec_specific = vc->codec_specific; - s->samplerate_nom = sample_rate; + s->samplerate_num = sample_rate; s->samplerate_denom = 1; s->channel_count = channels;

1 0

possible error in the spec for the index
by Michael Niedermayer 23 Dec '06

23 Dec '06

Hi when trying to read the index from a libnut generated file i stumbled across a odd problem in how the index is stored, the problem is that from nut.txt: has_keyframe indicates whether this stream has a keyframe between this syncpoint and the last syncpoint. what is "this syncpoint", libnut seems to use syncpoint[0] for has_keyframe[0] as "this" but with that definition has_keyframe[0]=0 (which is harmless) more problematic is for(; j<n && j<syncpoints; j++){ a keyframe after the last syncpoint would be has_keyframe[syncpoints] and so the pts/eor loop wouldnt be run on it -> we would know there is a keyframe but we dont not know its pts obvious solutions (assuiming i didnt miss something) 1. ignore it, its just one keyframe per stream which isnt in the index 2. redefine has_keyframe so [0] is for sp[0] ... sp[1] 3. change j<syncpoints to j<syncpoints+1 comments? -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB In the past you could go to a library and read, borrow or copy any book Today you'd get arrested for mere telling someone where the library is

2 2

[nut]: r271 - in trunk/libnut: demuxer.c priv.h
by ods15 23 Dec '06

23 Dec '06

Author: ods15 Date: Sat Dec 23 11:36:52 2006 New Revision: 271 Modified: trunk/libnut/demuxer.c trunk/libnut/priv.h Log: queue syncpoints to a linked list to avoid CPU cache trashing during playback Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Dec 23 11:36:52 2006 @@ -409,6 +409,30 @@ return err; } +static void add_existing_syncpoint(nut_context_t * nut, syncpoint_t sp, uint64_t * pts, uint64_t * eor, int i) { + syncpoint_list_t * sl = &nut->syncpoints; + int j; + int pts_cache = nut->dopts.cache_syncpoints & 1; + + assert(sl->s[i].pos <= sp.pos && sp.pos < sl->s[i].pos + 16); // code sanity + + assert(!sl->s[i].pts || sl->s[i].pts == sp.pts); + assert(!sl->s[i].back_ptr || sl->s[i].back_ptr == sp.back_ptr); + sl->s[i].pos = sp.pos; + sl->s[i].pts = sp.pts; + sl->s[i].back_ptr = sp.back_ptr; + if (pts_cache && sp.pts_valid) { + for (j = 0; j < nut->stream_count; j++) { + assert(!sl->s[i].pts_valid || sl->pts[i * nut->stream_count + j] == pts[j]); + assert(!sl->s[i].pts_valid || sl->eor[i * nut->stream_count + j] == eor[j]); + sl->pts[i * nut->stream_count + j] = pts[j]; + sl->eor[i * nut->stream_count + j] = eor[j]; + } + sl->s[i].pts_valid = 1; + } + if (sp.pts_valid && i) sl->s[i-1].seen_next = 1; +} + 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, err = 0; @@ -419,21 +443,7 @@ for (i = sl->len; i--; ) { // more often than not, we're adding at end of list if (sl->s[i].pos > sp.pos) continue; if (sp.pos < sl->s[i].pos + 16) { // syncpoint already in list - assert(!sl->s[i].pts || sl->s[i].pts == sp.pts); - assert(!sl->s[i].back_ptr || sl->s[i].back_ptr == sp.back_ptr); - sl->s[i].pos = sp.pos; - sl->s[i].pts = sp.pts; - sl->s[i].back_ptr = sp.back_ptr; - if (pts_cache && sp.pts_valid) { - for (j = 0; j < nut->stream_count; j++) { - assert(!sl->s[i].pts_valid || sl->pts[i * nut->stream_count + j] == pts[j]); - assert(!sl->s[i].pts_valid || sl->eor[i * nut->stream_count + j] == eor[j]); - sl->pts[i * nut->stream_count + j] = pts[j]; - sl->eor[i * nut->stream_count + j] = eor[j]; - } - sl->s[i].pts_valid = 1; - } - if (sp.pts_valid && i) sl->s[i-1].seen_next = 1; + add_existing_syncpoint(nut, sp, pts, eor, i); if (out) *out = i; return 0; } @@ -470,6 +480,62 @@ return err; } +static int queue_add_syncpoint(nut_context_t * nut, syncpoint_t sp, uint64_t * pts, uint64_t * eor) { + syncpoint_list_t * sl = &nut->syncpoints; + syncpoint_linked_t * s; + size_t malloc_size; + int pts_cache = nut->dopts.cache_syncpoints & 1; + int err = 0; + int i = sl->cached_pos; + + if (i >= sl->len) i = sl->len - 1; + + while (sl->s[i].pos > sp.pos && i) i--; + while (sl->s[i+1].pos <= sp.pos && i < sl->len-1) i++; + // Result: sl->s[i].pos <= sp.pos < sl->s[i+1].pos + sl->cached_pos = i; + + if (sl->s[i].pos <= sp.pos && sp.pos < sl->s[i].pos + 16) { // syncpoint already in list + add_existing_syncpoint(nut, sp, pts, eor, i); + return 0; + } + + malloc_size = sizeof(syncpoint_linked_t) - sizeof(uint64_t); + if (pts_cache && sp.pts_valid) { + assert(pts && eor); // code sanity check + malloc_size += (nut->stream_count*2) * sizeof(uint64_t); + } + + SAFE_CALLOC(nut->alloc, s, 1, malloc_size); + + s->s = sp; + if (pts_cache && sp.pts_valid) { + for (i = 0; i < nut->stream_count; i++) { + s->pts_eor[i] = pts[i]; + s->pts_eor[i+nut->stream_count] = eor[i]; + } + } + + s->prev = sl->linked; + sl->linked = s; +err_out: + return err; +} + +static int flush_syncpoint_queue(nut_context_t * nut) { + syncpoint_list_t * sl = &nut->syncpoints; + int err = 0; + while (sl->linked) { + syncpoint_linked_t * s = sl->linked; + CHECK(add_syncpoint(nut, s->s, s->pts_eor, s->pts_eor + nut->stream_count, NULL)); + sl->linked = s->prev; + nut->alloc->free(s); + } +err_out: + return err; +} + + static void set_global_pts(nut_context_t * nut, uint64_t pts) { int i; TO_PTS(timestamp, pts) @@ -510,7 +576,10 @@ nut->sc[i].last_key = 0; nut->sc[i].eor = 0; } - CHECK(add_syncpoint(nut, s, pts, eor, NULL)); + if (nut->dopts.cache_syncpoints & 2) // during seeking, syncpoints go into cache immediately + CHECK(add_syncpoint(nut, s, pts, eor, NULL)); + else // otherwise, queue to a linked list to avoid CPU cache trashing during playback + CHECK(queue_add_syncpoint(nut, s, pts, eor)); } err_out: return err; @@ -844,6 +913,8 @@ ERROR(!(nut->dopts.cache_syncpoints & 1) || !sl->len, -1); + flush_syncpoint_queue(nut); + if (i) i--; else { for (i = 0; i < sl->len; i++) if (sl->s[i].pos+15 > pos) break; @@ -1351,6 +1422,7 @@ for (i = 0; i < nut->stream_count; i++) nut->sc[i].state.pts = (uint64_t)(time_pos / TO_TB(i).nom * TO_TB(i).den); nut->seek_time_pos = time_pos; nut->dopts.cache_syncpoints |= 2; + flush_syncpoint_queue(nut); } else { time_pos = nut->seek_time_pos; } @@ -1436,6 +1508,8 @@ nut->syncpoints.s = NULL; nut->syncpoints.pts = NULL; nut->syncpoints.eor = NULL; + nut->syncpoints.cached_pos = 0; + nut->syncpoints.linked = NULL; nut->sc = NULL; nut->tb = NULL; @@ -1490,6 +1564,11 @@ nut->alloc->free(nut->syncpoints.s); nut->alloc->free(nut->syncpoints.pts); nut->alloc->free(nut->syncpoints.eor); + while (nut->syncpoints.linked) { + syncpoint_linked_t * s = nut->syncpoints.linked; + nut->syncpoints.linked = s->prev; + nut->alloc->free(s); + } nut->alloc->free(nut->sc); nut->alloc->free(nut->tmp_buffer); // the caller's allocated stream list nut->alloc->free(nut->info); Modified: trunk/libnut/priv.h ============================================================================== --- trunk/libnut/priv.h (original) +++ trunk/libnut/priv.h Sat Dec 23 11:36:52 2006 @@ -75,12 +75,21 @@ unsigned int pts_valid:1; } syncpoint_t; +typedef struct syncpoint_linked_s syncpoint_linked_t; +struct syncpoint_linked_s { + syncpoint_linked_t * prev; + syncpoint_t s; + uint64_t pts_eor[1]; +}; + typedef struct { int len; int alloc_len; syncpoint_t * s; uint64_t * pts; // each elem is stream_count items, +1 to real pts, 0 means there is no key uint64_t * eor; // same as pts, is the pts of last eor in syncpoint region _IF_ eor is set by syncpoint. + int cached_pos; + syncpoint_linked_t * linked; // entires are entered in reverse order for speed, points to END of list } syncpoint_list_t; typedef struct {

1 0

[nut]: r270 - trunk/libnut/demuxer.c
by ods15 23 Dec '06

23 Dec '06

Author: ods15 Date: Sat Dec 23 10:33:36 2006 New Revision: 270 Modified: trunk/libnut/demuxer.c Log: some cosmetics and code-reorginazation/readability Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Dec 23 10:33:36 2006 @@ -412,23 +412,23 @@ 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, err = 0; + int pts_cache = nut->dopts.cache_syncpoints & 1; - assert(nut->dopts.cache_syncpoints & 1 || !pts); // pts information is never stored with no syncpoint cache - if (nut->dopts.cache_syncpoints & 1 && sp.pts_valid) assert(pts && eor); // code sanity check + if (pts_cache && sp.pts_valid) assert(pts && eor); // code sanity check for (i = sl->len; i--; ) { // more often than not, we're adding at end of list if (sl->s[i].pos > sp.pos) continue; if (sp.pos < sl->s[i].pos + 16) { // syncpoint already in list - sl->s[i].pos = sp.pos; assert(!sl->s[i].pts || sl->s[i].pts == sp.pts); - sl->s[i].pts = sp.pts; assert(!sl->s[i].back_ptr || sl->s[i].back_ptr == sp.back_ptr); + sl->s[i].pos = sp.pos; + sl->s[i].pts = sp.pts; sl->s[i].back_ptr = sp.back_ptr; - if (nut->dopts.cache_syncpoints & 1 && sp.pts_valid) { + if (pts_cache && sp.pts_valid) { for (j = 0; j < nut->stream_count; j++) { assert(!sl->s[i].pts_valid || sl->pts[i * nut->stream_count + j] == pts[j]); - sl->pts[i * nut->stream_count + j] = pts[j]; assert(!sl->s[i].pts_valid || sl->eor[i * nut->stream_count + j] == eor[j]); + sl->pts[i * nut->stream_count + j] = pts[j]; sl->eor[i * nut->stream_count + j] = eor[j]; } sl->s[i].pts_valid = 1; @@ -443,7 +443,7 @@ if (sl->len + 1 > sl->alloc_len) { sl->alloc_len += PREALLOC_SIZE/4; SAFE_REALLOC(nut->alloc, sl->s, sizeof(syncpoint_t), sl->alloc_len); - if (nut->dopts.cache_syncpoints & 1) { + if (pts_cache) { SAFE_REALLOC(nut->alloc, sl->pts, nut->stream_count * sizeof(uint64_t), sl->alloc_len); SAFE_REALLOC(nut->alloc, sl->eor, nut->stream_count * sizeof(uint64_t), sl->alloc_len); } @@ -451,11 +451,11 @@ memmove(sl->s + i + 1, sl->s + i, (sl->len - i) * sizeof(syncpoint_t)); sl->s[i] = sp; if (sl->s[i].pts_valid) { - if (!(nut->dopts.cache_syncpoints & 1)) sl->s[i].pts_valid = 0; // pts_valid is not really true, only used for seen_next + if (!pts_cache) sl->s[i].pts_valid = 0; // pts_valid is not really true, only used for seen_next if (i) sl->s[i-1].seen_next = 1; } - if (nut->dopts.cache_syncpoints & 1) { + if (pts_cache) { memmove(sl->pts + (i + 1) * nut->stream_count, sl->pts + i * nut->stream_count, (sl->len - i) * nut->stream_count * sizeof(uint64_t)); memmove(sl->eor + (i + 1) * nut->stream_count, sl->eor + i * nut->stream_count, (sl->len - i) * nut->stream_count * sizeof(uint64_t)); for (j = 0; j < nut->stream_count; j++) { @@ -500,19 +500,17 @@ s.seen_next = 0; s.pts_valid = !after_seek; - if (nut->dopts.cache_syncpoints & 1) { + if (nut->dopts.cache_syncpoints) { // either we're using syncpoint cache, or we're seeking and we need the cache int i; uint64_t pts[nut->stream_count]; uint64_t eor[nut->stream_count]; for (i = 0; i < nut->stream_count; i++) { pts[i] = nut->sc[i].last_key; - nut->sc[i].last_key = 0; eor[i] = nut->sc[i].eor; + nut->sc[i].last_key = 0; nut->sc[i].eor = 0; } CHECK(add_syncpoint(nut, s, pts, eor, NULL)); - } else if (nut->dopts.cache_syncpoints) { // we're seeking, we need syncpoint cache - CHECK(add_syncpoint(nut, s, NULL, NULL, NULL)); } err_out: return err;

1 0

[nut]: r269 - trunk/libnut/demuxer.c
by ods15 23 Dec '06

23 Dec '06

Author: ods15 Date: Sat Dec 23 10:02:48 2006 New Revision: 269 Modified: trunk/libnut/demuxer.c Log: make add_syncpoint() handle seen_next via pts_valid flag. Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Dec 23 10:02:48 2006 @@ -414,6 +414,8 @@ int i, j, err = 0; assert(nut->dopts.cache_syncpoints & 1 || !pts); // pts information is never stored with no syncpoint cache + if (nut->dopts.cache_syncpoints & 1 && sp.pts_valid) assert(pts && eor); // code sanity check + for (i = sl->len; i--; ) { // more often than not, we're adding at end of list if (sl->s[i].pos > sp.pos) continue; if (sp.pos < sl->s[i].pos + 16) { // syncpoint already in list @@ -422,7 +424,7 @@ sl->s[i].pts = sp.pts; assert(!sl->s[i].back_ptr || sl->s[i].back_ptr == sp.back_ptr); sl->s[i].back_ptr = sp.back_ptr; - if (pts) { + if (nut->dopts.cache_syncpoints & 1 && sp.pts_valid) { for (j = 0; j < nut->stream_count; j++) { assert(!sl->s[i].pts_valid || sl->pts[i * nut->stream_count + j] == pts[j]); sl->pts[i * nut->stream_count + j] = pts[j]; @@ -431,6 +433,7 @@ } sl->s[i].pts_valid = 1; } + if (sp.pts_valid && i) sl->s[i-1].seen_next = 1; if (out) *out = i; return 0; } @@ -447,14 +450,17 @@ } memmove(sl->s + i + 1, sl->s + i, (sl->len - i) * sizeof(syncpoint_t)); sl->s[i] = sp; - assert(sl->s[i].pts_valid == !!pts); + if (sl->s[i].pts_valid) { + if (!(nut->dopts.cache_syncpoints & 1)) sl->s[i].pts_valid = 0; // pts_valid is not really true, only used for seen_next + if (i) sl->s[i-1].seen_next = 1; + } if (nut->dopts.cache_syncpoints & 1) { memmove(sl->pts + (i + 1) * nut->stream_count, sl->pts + i * nut->stream_count, (sl->len - i) * nut->stream_count * sizeof(uint64_t)); memmove(sl->eor + (i + 1) * nut->stream_count, sl->eor + i * nut->stream_count, (sl->len - i) * nut->stream_count * sizeof(uint64_t)); for (j = 0; j < nut->stream_count; j++) { - sl->pts[i * nut->stream_count + j] = pts ? pts[j] : 0; - sl->eor[i * nut->stream_count + j] = eor ? eor[j] : 0; + sl->pts[i * nut->stream_count + j] = sl->s[i].pts_valid ? pts[j] : 0; + sl->eor[i * nut->stream_count + j] = sl->s[i].pts_valid ? eor[j] : 0; } } @@ -493,7 +499,7 @@ set_global_pts(nut, s.pts); s.seen_next = 0; - s.pts_valid = 0; + s.pts_valid = !after_seek; if (nut->dopts.cache_syncpoints & 1) { int i; uint64_t pts[nut->stream_count]; @@ -504,16 +510,9 @@ eor[i] = nut->sc[i].eor; nut->sc[i].eor = 0; } - if (after_seek) CHECK(add_syncpoint(nut, s, NULL, NULL, NULL)); - else { - s.pts_valid = 1; - CHECK(add_syncpoint(nut, s, pts, eor, &i)); - nut->syncpoints.s[i - 1].seen_next = 1; - } + CHECK(add_syncpoint(nut, s, pts, eor, NULL)); } else if (nut->dopts.cache_syncpoints) { // we're seeking, we need syncpoint cache - int i; - CHECK(add_syncpoint(nut, s, NULL, NULL, &i)); - if (!after_seek) nut->syncpoints.s[i - 1].seen_next = 1; + CHECK(add_syncpoint(nut, s, NULL, NULL, NULL)); } err_out: return err;

1 0

[nut]: r268 - trunk/libnut/libnut.h
by ods15 22 Dec '06

22 Dec '06

Author: ods15 Date: Fri Dec 22 11:26:03 2006 New Revision: 268 Modified: trunk/libnut/libnut.h Log: typo fix Modified: trunk/libnut/libnut.h ============================================================================== --- trunk/libnut/libnut.h (original) +++ trunk/libnut/libnut.h Fri Dec 22 11:26:03 2006 @@ -54,7 +54,7 @@ uint64_t max_pts; ///< Only used in demuxer. If non-zero, then it is the highest value in stream /// \name Video - /// Only used is type is #NUT_VIDEO_CLASS @{ + /// Only used if type is #NUT_VIDEO_CLASS @{ int width; ///< Width of video in pixels int height; ///< Height of video in pixels int sample_width; ///< Ratio to stretch the video. May only be zero if #sample_height is zero @@ -62,7 +62,7 @@ int colorspace_type; /// \name audio - /// Only used is type is #NUT_AUDIO_CLASS @{ + /// Only used if type is #NUT_AUDIO_CLASS @{ int samplerate_nom; ///< Sample rate of audio. Example: 44100 int samplerate_denom; ///< Sample rate denominator of audio. Example: 1 int channel_count; ///< Amount of audio channels

1 0

[nut]: r267 - trunk/libnut/libnut.h
by ods15 22 Dec '06

22 Dec '06

Author: ods15 Date: Fri Dec 22 11:25:04 2006 New Revision: 267 Modified: trunk/libnut/libnut.h Log: small doxygen simplify Modified: trunk/libnut/libnut.h ============================================================================== --- trunk/libnut/libnut.h (original) +++ trunk/libnut/libnut.h Fri Dec 22 11:25:04 2006 @@ -61,14 +61,11 @@ int sample_height; ///< Ratio to stretch the video. May only be zero if #sample_width is zero int colorspace_type; - /// @} /// \name audio /// Only used is type is #NUT_AUDIO_CLASS @{ int samplerate_nom; ///< Sample rate of audio. Example: 44100 int samplerate_denom; ///< Sample rate denominator of audio. Example: 1 int channel_count; ///< Amount of audio channels - - /// @} } nut_stream_header_t; /// Single info field struct \ingroup demuxer muxer

1 0