- NUT-devel - lists.mplayerhq.hu

[nut]: r275 - in trunk/libnut: demuxer.c priv.h
by ods15 26 Jan '07

26 Jan '07

Author: ods15 Date: Fri Jan 26 17:28:56 2007 New Revision: 275 Modified: trunk/libnut/demuxer.c trunk/libnut/priv.h Log: improovements to binary search to prevent searching the same damaged area twice seek backwards to look for syncpoint before damaged data and mark the area between as scanned Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Fri Jan 26 17:28:56 2007 @@ -1143,13 +1143,13 @@ return 0; } -static off_t seek_interpolate(int max_distance, double time_pos, off_t lo, off_t hi, double lo_pd, double hi_pd) { +static off_t seek_interpolate(int max_distance, double time_pos, off_t lo, off_t hi, double lo_pd, double hi_pd, off_t fake_hi) { double weight = 19./20.; off_t guess; - if (hi - lo < max_distance) guess = lo + 16; + if (fake_hi - lo < max_distance) guess = lo + 16; else { // linear interpolation guess = (lo + (double)(hi-lo)/(hi_pd-lo_pd) * (time_pos-lo_pd))*weight + (lo+hi)/2.*(1.-weight); - if (hi - guess < max_distance) guess = hi - max_distance; //(lo + hi)/2; + if (fake_hi - guess < max_distance) guess = fake_hi - max_distance; //(lo + hi)/2; } if (guess < lo + 16) guess = lo + 16; return guess; @@ -1158,7 +1158,7 @@ static int binary_search_syncpoint(nut_context_t * nut, double time_pos, off_t * start, off_t * end, syncpoint_t * stopper) { int i, err = 0; syncpoint_t s; - off_t fake_hi; + off_t fake_hi, * guess = &nut->binary_guess; uint64_t timebases[nut->timebase_count]; syncpoint_list_t * sl = &nut->syncpoints; int a = 0; @@ -1200,34 +1200,53 @@ #define LO (sl->s[i]) #define HI (sl->s[i+1]) - fake_hi = nut->seek_status ? nut->seek_status : HI.pos; + fake_hi = nut->seek_status ? (nut->seek_status >> 1) : HI.pos; while (!LO.seen_next) { // start binary search between LO (sl->s[i].pos) to HI (sl->s[i+1].pos) ... - off_t guess = seek_interpolate(nut->max_distance*2, time_pos, LO.pos, fake_hi, TO_DOUBLE_PTS(LO.pts), TO_DOUBLE_PTS(HI.pts)); + if (!*guess) *guess = seek_interpolate(nut->max_distance*2, time_pos, LO.pos, HI.pos, TO_DOUBLE_PTS(LO.pts), TO_DOUBLE_PTS(HI.pts), fake_hi); - fprintf(stderr, "\n%d [ (%d,%.3f) .. (%d,%.3f) .. (%d,%.3f) ] ", i, (int)LO.pos, TO_DOUBLE_PTS(LO.pts), (int)guess, time_pos, - (int)fake_hi, TO_DOUBLE_PTS(HI.pts)); + fprintf(stderr, "\n%d [ (%d,%.3f) .. (%d,%.3f) .. (%d(%d),%.3f) ] ", i, (int)LO.pos, TO_DOUBLE_PTS(LO.pts), (int)*guess, time_pos, + (int)HI.pos, (int)fake_hi, TO_DOUBLE_PTS(HI.pts)); a++; - if (!nut->seek_status) seek_buf(nut->i, guess, SEEK_SET); - nut->seek_status = fake_hi; // so we know where to continue off... - CHECK(smart_find_syncpoint(nut, &s, 0, fake_hi)); - nut->seek_status = 0; + if (!(nut->seek_status & 1)) { + if (!nut->seek_status) seek_buf(nut->i, *guess, SEEK_SET); + nut->seek_status = fake_hi << 1; + CHECK(find_syncpoint(nut, &s, 0, fake_hi)); + nut->seek_status = 0; + } - if (s.seen_next == 1 || s.pos >= fake_hi) { // we got back to 'HI' - // either we scanned everything from LO to HI, or we keep trying - if (guess <= LO.pos + 16) LO.seen_next = 1; // we are done! - else fake_hi = guess; - continue; +scan_backwards: + if (nut->seek_status & 1 || s.seen_next == 1 || s.pos >= fake_hi) { // we got back to 'HI' + if (*guess == LO.pos + 16) { // we are done! + LO.seen_next = 1; + break; + } + // Now let's scan backwards from 'guess' to 'LO' - after this, we can set s.seen_next + if (!nut->seek_status) seek_buf(nut->i, *guess - nut->max_distance + 7, SEEK_SET); + nut->seek_status = (fake_hi << 1) + 1; + CHECK(find_syncpoint(nut, &s, 1, 0)); + nut->seek_status = 0; + s.seen_next = 1; // now this can cause LO.seen_next to be set after add_syncpoint(), it's magic } CHECK(add_syncpoint(nut, s, NULL, NULL, timebases[s.pts%nut->timebase_count] < s.pts/nut->timebase_count ? NULL : &i)); - if (HI.pos < fake_hi) fake_hi = HI.pos; + + if (s.pos - *guess > nut->max_distance * 100) { + // we just scanned a very large area of (probably) damaged data + // let's avoid scanning it again by caching the syncpoint right before it with seen_next + s.seen_next = 1; + goto scan_backwards; + } + + if (HI.pos < fake_hi) fake_hi = MIN(HI.pos, *guess); + *guess = 0; } + *guess = 0; fprintf(stderr, "\n[ (%d,%d) .. %d .. (%d,%d) ] => %d (%d seeks) %d\n", - (int)LO.pos, (int)LO.pts, (int)timebases[0], (int)fake_hi, (int)HI.pts, (int)(LO.pos - LO.back_ptr), a, LO.back_ptr); + (int)LO.pos, (int)LO.pts, (int)timebases[0], (int)HI.pos, (int)HI.pts, (int)(LO.pos - LO.back_ptr), a, LO.back_ptr); // at this point, s[i].pts < P < s[i+1].pts, and s[i].seen_next is set *start = LO.pos - LO.back_ptr; *end = HI.pos; @@ -1520,6 +1539,7 @@ nut->dopts = *dopts; nut->seek_status = 0; nut->before_seek = 0; + nut->binary_guess = 0; nut->last_syncpoint = 0; nut->find_syncpoint_state = (struct find_syncpoint_state_s){0,0,0,0}; Modified: trunk/libnut/priv.h ============================================================================== --- trunk/libnut/priv.h (original) +++ trunk/libnut/priv.h Fri Jan 26 17:28:56 2007 @@ -155,6 +155,7 @@ off_t before_seek; // position before any seek mess off_t seek_status; + off_t binary_guess; double seek_time_pos; syncpoint_list_t syncpoints;

1 0

max number of streams?
by Clemens Ladisch 23 Jan '07

23 Jan '07

nut.txt doesn't specify a limit for the number of streams: | stream_count (v) | number of streams in this file | ... | stream_id (v) | Stream identifier | stream_id MUST be < stream_count but a stream id in the frame type table must be less than 250: | stream_id[frame_code] (v) | 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 Does this imply that NUT files can have _any_ number of streams, but stream_id values of 250 or greater must be explicitly coded in frame headers? Regards, Clemens

2 1

[PATCH] add header dependencies to libnut.h
by Clemens Ladisch 23 Jan '07

23 Jan '07

libnut.h uses types like size_t, uint64_t and off_t that are defined in other headers. This patch makes sure that these headers are included.

4 8

[PATCH] increase NUT_VERSION to 3
by Clemens Ladisch 23 Jan '07

23 Jan '07

nutlib's implementation looks kind of version-3-ish to me. Is there any reason to leave the version at 2?

1 0

[PATCH] nutparse.c
by Clemens Ladisch 23 Jan '07

23 Jan '07

Looking at hexdumps sucks, so I wrote this little tool to show a .nut file as text.

1 1

"NUT"?
by Clemens Ladisch 22 Jan '07

22 Jan '07

What does "NUT" stand for? I hope it's not "Nobody Uses This"? ;-) Regards, Clemens

2 1

[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