- NUT-devel - lists.mplayerhq.hu

[nut]: r255 - trunk/libnut/libnut.h
by ods15 19 Nov '06

19 Nov '06

Author: ods15 Date: Sun Nov 19 17:18:33 2006 New Revision: 255 Modified: trunk/libnut/libnut.h Log: Add example to nut_read_frame() in libnut.h Modified: trunk/libnut/libnut.h ============================================================================== --- trunk/libnut/libnut.h (original) +++ trunk/libnut/libnut.h Sun Nov 19 17:18:33 2006 @@ -191,7 +191,11 @@ /** 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. len will be non-zero in the case of EAGAIN or EOF -len is the amount of bytes that are LEFT, not the ones read. */ +len is the amount of bytes that are LEFT, not the ones read. +example: +len = pd.len; +while((err = nut_read_frame(nut, &len, buf+pd.len-len)) == NUT_ERR_EAGAIN); +*/ int nut_read_frame(nut_context_t * nut, int * len, uint8_t * buf); /** "Can't find start code" "invalid frame code" "bad checksum" "bleh" */

1 0

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

19 Nov '06

Author: ods15 Date: Sun Nov 19 07:00:12 2006 New Revision: 254 Modified: trunk/libnut/demuxer.c Log: slightly better bounds checking for smart_find_syncpoint Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sun Nov 19 07:00:12 2006 @@ -863,15 +863,17 @@ if (sp->seen_next) { // failure int begin = fss->begin ? fss->begin - 1 : i; + int o = backwards ? -1 : 1; fss->begin = begin + 1; - while (i < backwards*2 || sl->s[i-backwards*2].seen_next) { - int o = backwards ? -1 : +1; + while (sp->seen_next) { + if ((unsigned)(i+o) >= sl->len) break; // bounds check + if (i > o && !sl->s[i+o-1].seen_next) break; // no seen_next, nothing to check + if (stop && sl->s[i+o].pos > stop) break; // passed stop condition if (!fss->seeked) seek_buf(nut->i, sl->s[i+o].pos, SEEK_SET); fss->seeked = 1; CHECK(find_syncpoint(nut, sp, 0, sl->s[i+o].pos + 15 + 8)); fss->seeked = 0; fss->i = (i+=o) + 1; - if (!sp->seen_next || !i || (stop && sl->s[i+o].pos > stop)) break; } if (sp->seen_next) { // still nothing! let's linear search the whole area if (!fss->seeked) {

1 0

Re: [theora-dev] Theora in Matroska
by Ralph Giles 18 Nov '06

18 Nov '06

Forgive the cross posting, this affects several projects. On Fri, Nov 03, 2006 at 12:50:27AM -0800, Unga wrote: > Currently Theora video in Matroska is not supported by > Mplayer. To enable the support Michael Niedermayer has > made the following proposal sometime back: > http://article.gmane.org/gmane.comp.video.mplayer.nut.devel/214 The proposal is that we add a recommendation to the ogg vorbis spec to just concatenate the headers when embedding in a container that needs to store them in a blob, and that readers skip leading and trailing data based on known packet lengths and magic strings. As Michael says, this works, and is just the sort of hacky spec wrangling ogg is (in)famous for. :) I guess my only comment is that this isn't particularly general. While vorbis has a fixed set of header packets with "easy" to determine lengths, it's possible to do a codec with external framing in mind where this wouldn't work. The theora spec, for example, allows additional application-defined header packets after the initial required three. It also means a cross-encapsulator has to understand a codec's header packet format to put the data in an ogg stream, which is something many implementors have complained loudly about. Therefore I'd like to counterpropose something with explicit packet lengths, like matroska has, or the "packed header" format the vorbis and theora rtp drafts use. If we're going to add this to the vorbis and theora specs, I'd like to see it used as broadly as possible, but luca dislikes the metadata header and omitted it from his packed header design for rtp. Luca, what do you think about adding the metadata header back as an optionally empty field? -r

5 7

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

18 Nov '06

Author: ods15 Date: Sat Nov 18 20:46:24 2006 New Revision: 253 Modified: trunk/libnut/demuxer.c Log: add 'stop' capability to smart_find_syncpoint and migrate binary_search to from old find_syncpoint Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Nov 18 20:46:24 2006 @@ -780,7 +780,7 @@ return err; } -static int find_syncpoint(nut_context_t * nut, int backwards, syncpoint_t * res, off_t stop) { +static int find_syncpoint(nut_context_t * nut, syncpoint_t * res, int backwards, off_t stop) { int read; int err = 0; uint64_t tmp; @@ -839,7 +839,7 @@ return err; } -static int smart_find_syncpoint(nut_context_t * nut, syncpoint_t * sp, int backwards) { +static int smart_find_syncpoint(nut_context_t * nut, syncpoint_t * sp, int backwards, off_t stop) { struct find_syncpoint_state_s * fss = &nut->find_syncpoint_state; syncpoint_list_t * sl = &nut->syncpoints; int i = fss->i, err = 0; @@ -847,17 +847,18 @@ ERROR(!(nut->dopts.cache_syncpoints & 1) || !sl->len, -1); - if (!i) { + if (i) i--; + else { for (i = 0; i < sl->len; i++) if (sl->s[i].pos+15 > pos) break; ERROR(i == sl->len || (i && !sl->s[i-1].seen_next), -1); - if (pos < sl->s[i].pos) // trust the caller if it gave more percise syncpoint location - seek_buf(nut->i, sl->s[i].pos, SEEK_SET); - } else i--; + // trust the caller if it gave more percise syncpoint location + if (pos < sl->s[i].pos) seek_buf(nut->i, sl->s[i].pos, SEEK_SET); + } fss->i = i + 1; fss->pos = pos; - if (!fss->begin) CHECK(find_syncpoint(nut, 0, sp, sl->s[i].pos + 15 + 8)); + if (!fss->begin) CHECK(find_syncpoint(nut, sp, 0, sl->s[i].pos + 15 + 8)); else sp->seen_next = 1; if (sp->seen_next) { // failure @@ -867,10 +868,10 @@ int o = backwards ? -1 : +1; if (!fss->seeked) seek_buf(nut->i, sl->s[i+o].pos, SEEK_SET); fss->seeked = 1; - CHECK(find_syncpoint(nut, 0, sp, sl->s[i+o].pos + 15 + 8)); + CHECK(find_syncpoint(nut, sp, 0, sl->s[i+o].pos + 15 + 8)); fss->seeked = 0; fss->i = (i+=o) + 1; - if (!sp->seen_next || !i) break; + if (!sp->seen_next || !i || (stop && sl->s[i+o].pos > stop)) break; } if (sp->seen_next) { // still nothing! let's linear search the whole area if (!fss->seeked) { @@ -878,7 +879,7 @@ else seek_buf(nut->i, begin > 0 ? sl->s[begin-1].pos+15 : 0, SEEK_SET); } fss->seeked = 1; - CHECK(find_syncpoint(nut, backwards, sp, 0)); + CHECK(find_syncpoint(nut, sp, backwards, stop)); fss->seeked = 0; } CHECK(add_syncpoint(nut, *sp, NULL, NULL, &i)); @@ -899,7 +900,7 @@ if (sp->pos < pos && !backwards) { // wow, how silly! fss->pos = fss->i = fss->begin = fss->seeked = 0; seek_buf(nut->i, pos, SEEK_SET); - return smart_find_syncpoint(nut, sp, backwards); + return smart_find_syncpoint(nut, sp, backwards, stop); } } fss->pos = fss->i = fss->begin = fss->seeked = 0; @@ -907,12 +908,12 @@ err_out: if (err == -1) { if (backwards && !fss->seeked) { - CHECK(find_syncpoint(nut, 0, sp, pos + 15 + 8)); + CHECK(find_syncpoint(nut, sp, 0, pos + 15 + 8)); if (!sp->seen_next) return 0; seek_buf(nut->i, -nut->max_distance, SEEK_CUR); } fss->seeked = 1; - CHECK(find_syncpoint(nut, backwards, sp, 0)); + CHECK(find_syncpoint(nut, sp, backwards, stop)); fss->seeked = 0; err = 0; } @@ -923,7 +924,7 @@ int err = 0; if (nut->seek_status) { // in error mode! syncpoint_t s; - CHECK(smart_find_syncpoint(nut, &s, 0)); + CHECK(smart_find_syncpoint(nut, &s, 0, 0)); nut->i->buf_ptr = get_buf(nut->i, s.pos); // go back to begginning of syncpoint flush_buf(nut->i); clear_dts_cache(nut); @@ -1038,7 +1039,7 @@ seek_buf(nut->i, 0, SEEK_SET); nut->seek_status = 1; } - CHECK(smart_find_syncpoint(nut, &sp, 0)); + CHECK(smart_find_syncpoint(nut, &sp, 0, 0)); CHECK(add_syncpoint(nut, sp, NULL, NULL, NULL)); nut->i->buf_ptr = get_buf(nut->i, sp.pos); // rewind to the syncpoint, this is where playback starts... nut->seek_status = 0; @@ -1100,7 +1101,7 @@ // searching bakwards from EOF if (!nut->seek_status) seek_buf(nut->i, -nut->max_distance, SEEK_END); nut->seek_status = 1; - CHECK(find_syncpoint(nut, 1, &s, 0)); + CHECK(find_syncpoint(nut, &s, 1, 0)); CHECK(add_syncpoint(nut, s, NULL, NULL, &i)); assert(i == sl->len-1); sl->s[i].seen_next = 1; @@ -1142,7 +1143,7 @@ if (!nut->seek_status) seek_buf(nut->i, guess, SEEK_SET); nut->seek_status = fake_hi; // so we know where to continue off... - CHECK(find_syncpoint(nut, 0, &s, fake_hi)); + CHECK(smart_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' @@ -1179,7 +1180,7 @@ if (!nut->seek_status) seek_buf(nut->i, start, SEEK_SET); nut->seek_status = 1; // find closest syncpoint by linear search, SHOULD be one pointed by back_ptr... - CHECK(smart_find_syncpoint(nut, &s, !!end)); + CHECK(smart_find_syncpoint(nut, &s, !!end, 0)); clear_dts_cache(nut); nut->last_syncpoint = 0; // last_key is invalid seek_buf(nut->i, s.pos, SEEK_SET); // go back to syncpoint. This will not need a seek.

1 0

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

18 Nov '06

Author: ods15 Date: Sat Nov 18 20:33:11 2006 New Revision: 252 Modified: trunk/libnut/muxer.c Log: remove some more old comments Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Sat Nov 18 20:33:11 2006 @@ -189,7 +189,7 @@ output_buffer_t * tmp = clear_buffer(nut->tmp_buffer); stream_context_t * sc = &nut->sc[id]; - put_v(tmp, id); // ### is stream_id staying in spec + put_v(tmp, id); put_v(tmp, sc->sh.type); put_vb(tmp, sc->sh.fourcc_len, sc->sh.fourcc); put_v(tmp, sc->timebase_id); @@ -205,12 +205,12 @@ put_v(tmp, sc->sh.height); put_v(tmp, sc->sh.sample_width); put_v(tmp, sc->sh.sample_height); - put_v(tmp, sc->sh.colorspace_type); // TODO understand this + 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_denom); - put_v(tmp, sc->sh.channel_count); // ### is channel count staying in spec + put_v(tmp, sc->sh.channel_count); break; }

1 0

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

18 Nov '06

Author: ods15 Date: Sat Nov 18 20:32:14 2006 New Revision: 251 Modified: trunk/libnut/demuxer.c Log: remove old FIXME's/TODO's/###'s Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Nov 18 20:32:14 2006 @@ -27,7 +27,7 @@ static int ready_read_buf(input_buffer_t * bc, int amount) { int pos = (bc->buf_ptr - bc->buf); if (bc->read_len - pos < amount && !bc->is_mem) { - amount += 10; // ### + PREALLOC_SIZE ? + amount += 10; if (!bc->alloc) return 0; // there was a previous memory error if (bc->write_len - pos < amount) { int new_len = amount + pos + PREALLOC_SIZE; @@ -332,12 +332,12 @@ GET_V(tmp, sc->sh.height); GET_V(tmp, sc->sh.sample_width); GET_V(tmp, sc->sh.sample_height); - GET_V(tmp, sc->sh.colorspace_type); // TODO understand this + 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_denom); - GET_V(tmp, sc->sh.channel_count); // ### is channel count staying in spec + GET_V(tmp, sc->sh.channel_count); break; } @@ -1204,7 +1204,7 @@ nut_packet_t pd; buf_before = bctello(nut->i); - err = get_packet(nut, &pd, &saw_syncpoint); // FIXME we're counting on syncpoint cache!! for the good_key later, and stopper_syncpoint + err = get_packet(nut, &pd, &saw_syncpoint); // we're counting on syncpoint cache!! for the good_key later, and stopper_syncpoint if (err == -1) continue; CHECK(err); @@ -1278,7 +1278,6 @@ // after ALL this, we ended up in a worse position than where we were... ERROR(!backwards && min_pos < nut->before_seek, NUT_ERR_NOT_SEEKABLE); - // FIXME we're counting on syncpoint cache dopts.cache_syncpoints for (i = 1; i < sl->len; i++) if (sl->s[i].pos > min_pos) break; i--; if (!(nut->seek_status & 1)) seek_buf(nut->i, sl->s[i].pos, SEEK_SET);

1 0

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

18 Nov '06

Author: ods15 Date: Sat Nov 18 20:24:35 2006 New Revision: 250 Modified: trunk/libnut/demuxer.c Log: remove unused var Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Nov 18 20:24:35 2006 @@ -861,7 +861,7 @@ else sp->seen_next = 1; if (sp->seen_next) { // failure - int j, begin = fss->begin ? fss->begin - 1 : i; + int begin = fss->begin ? fss->begin - 1 : i; fss->begin = begin + 1; while (i < backwards*2 || sl->s[i-backwards*2].seen_next) { int o = backwards ? -1 : +1;

1 0

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

18 Nov '06

Author: ods15 Date: Sat Nov 18 20:24:02 2006 New Revision: 249 Modified: trunk/libnut/demuxer.c Log: store back_ptr in syncpoint cache even with index, makes it possible to find out if a syncpoint position is real Don't remove the pts_valid flag for damaged syncpoints, it just causes more unncessary seeks and incorrect binary searches Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Nov 18 20:24:02 2006 @@ -420,6 +420,8 @@ 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].back_ptr = sp.back_ptr; if (pts) { for (j = 0; j < nut->stream_count; j++) { assert(!sl->s[i].pts_valid || sl->pts[i * nut->stream_count + j] == pts[j]); @@ -887,11 +889,6 @@ begin = i + 1; i = tmp + 1; } - sl->s[i].pts_valid = 0; - for (j = 0; j < nut->stream_count; j++) { - sl->pts[i * nut->stream_count + j] = 0; - sl->eor[i * nut->stream_count + j] = 0; - } memmove(sl->s + begin, sl->s + i, (sl->len - i) * sizeof(syncpoint_t)); memmove(sl->pts + begin * nut->stream_count, sl->pts + i * nut->stream_count, (sl->len - i) * nut->stream_count * sizeof(uint64_t));

1 0

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

18 Nov '06

Author: ods15 Date: Sat Nov 18 20:15:51 2006 New Revision: 248 Modified: trunk/libnut/demuxer.c Log: some fixes to prevent too many seeks and searches Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Nov 18 20:15:51 2006 @@ -843,13 +843,14 @@ int i = fss->i, err = 0; off_t pos = fss->i ? fss->pos : bctello(nut->i); - if (!(nut->dopts.cache_syncpoints & 1) || !sl->len) return find_syncpoint(nut, 0, sp, 0); + ERROR(!(nut->dopts.cache_syncpoints & 1) || !sl->len, -1); if (!i) { for (i = 0; i < sl->len; i++) if (sl->s[i].pos+15 > pos) break; - if (i == sl->len || (i && !sl->s[i-1].seen_next)) return find_syncpoint(nut, 0, sp, 0); + ERROR(i == sl->len || (i && !sl->s[i-1].seen_next), -1); - seek_buf(nut->i, sl->s[i].pos, SEEK_SET); + if (pos < sl->s[i].pos) // trust the caller if it gave more percise syncpoint location + seek_buf(nut->i, sl->s[i].pos, SEEK_SET); } else i--; fss->i = i + 1; fss->pos = pos; @@ -887,7 +888,6 @@ i = tmp + 1; } sl->s[i].pts_valid = 0; - sl->s[i].seen_next = 0; for (j = 0; j < nut->stream_count; j++) { sl->pts[i * nut->stream_count + j] = 0; sl->eor[i * nut->stream_count + j] = 0; @@ -908,6 +908,17 @@ fss->pos = fss->i = fss->begin = fss->seeked = 0; err_out: + if (err == -1) { + if (backwards && !fss->seeked) { + CHECK(find_syncpoint(nut, 0, sp, pos + 15 + 8)); + if (!sp->seen_next) return 0; + seek_buf(nut->i, -nut->max_distance, SEEK_CUR); + } + fss->seeked = 1; + CHECK(find_syncpoint(nut, backwards, sp, 0)); + fss->seeked = 0; + err = 0; + } return err; } @@ -1145,7 +1156,7 @@ } CHECK(add_syncpoint(nut, s, NULL, NULL, timebases[s.pts%nut->timebase_count] < s.pts/nut->timebase_count ? NULL : &i)); - fake_hi = HI.pos; + if (HI.pos < fake_hi) fake_hi = HI.pos; } fprintf(stderr, "\n[ (%d,%d) .. %d .. (%d,%d) ] => %d (%d seeks) %d\n",

1 0

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

18 Nov '06

Author: ods15 Date: Sat Nov 18 19:33:58 2006 New Revision: 247 Modified: trunk/libnut/demuxer.c Log: Add backwards ability to smart_find_syncpoint, for backwards seeks Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Nov 18 19:33:58 2006 @@ -837,20 +837,20 @@ return err; } -static int smart_find_syncpoint(nut_context_t * nut, syncpoint_t * sp) { +static int smart_find_syncpoint(nut_context_t * nut, syncpoint_t * sp, int backwards) { struct find_syncpoint_state_s * fss = &nut->find_syncpoint_state; syncpoint_list_t * sl = &nut->syncpoints; int i = fss->i, err = 0; - off_t pos = i ? fss->pos : bctello(nut->i); + off_t pos = fss->i ? fss->pos : bctello(nut->i); if (!(nut->dopts.cache_syncpoints & 1) || !sl->len) return find_syncpoint(nut, 0, sp, 0); if (!i) { for (i = 0; i < sl->len; i++) if (sl->s[i].pos+15 > pos) break; - if (i && !sl->s[i-1].seen_next) return find_syncpoint(nut, 0, sp, 0); + if (i == sl->len || (i && !sl->s[i-1].seen_next)) return find_syncpoint(nut, 0, sp, 0); seek_buf(nut->i, sl->s[i].pos, SEEK_SET); - } + } else i--; fss->i = i + 1; fss->pos = pos; @@ -860,23 +860,32 @@ if (sp->seen_next) { // failure int j, begin = fss->begin ? fss->begin - 1 : i; fss->begin = begin + 1; - while (sl->s[i].seen_next) { - if (!fss->seeked) seek_buf(nut->i, sl->s[i+1].pos, SEEK_SET); + while (i < backwards*2 || sl->s[i-backwards*2].seen_next) { + int o = backwards ? -1 : +1; + if (!fss->seeked) seek_buf(nut->i, sl->s[i+o].pos, SEEK_SET); fss->seeked = 1; - CHECK(find_syncpoint(nut, 0, sp, sl->s[i+1].pos + 15 + 8)); + CHECK(find_syncpoint(nut, 0, sp, sl->s[i+o].pos + 15 + 8)); fss->seeked = 0; - fss->i = ++i + 1; - if (!sp->seen_next) break; + fss->i = (i+=o) + 1; + if (!sp->seen_next || !i) break; } if (sp->seen_next) { // still nothing! let's linear search the whole area - if (!fss->seeked) seek_buf(nut->i, begin > 0 ? sl->s[begin-1].pos+15 : 0, SEEK_SET); + if (!fss->seeked) { + if (backwards) seek_buf(nut->i, sl->s[begin].pos - nut->max_distance, SEEK_SET); + else seek_buf(nut->i, begin > 0 ? sl->s[begin-1].pos+15 : 0, SEEK_SET); + } fss->seeked = 1; - CHECK(find_syncpoint(nut, 0, sp, 0)); + CHECK(find_syncpoint(nut, backwards, sp, 0)); fss->seeked = 0; } CHECK(add_syncpoint(nut, *sp, NULL, NULL, &i)); - assert(i >= begin); + assert((i >= begin && !backwards) || (i <= begin && backwards)); + if (backwards) { // swap vars + int tmp = begin; + begin = i + 1; + i = tmp + 1; + } sl->s[i].pts_valid = 0; sl->s[i].seen_next = 0; for (j = 0; j < nut->stream_count; j++) { @@ -890,10 +899,10 @@ sl->len -= i-begin; - if (sp->pos < pos) { // wow, how silly! + if (sp->pos < pos && !backwards) { // wow, how silly! fss->pos = fss->i = fss->begin = fss->seeked = 0; seek_buf(nut->i, pos, SEEK_SET); - return smart_find_syncpoint(nut, sp); + return smart_find_syncpoint(nut, sp, backwards); } } fss->pos = fss->i = fss->begin = fss->seeked = 0; @@ -906,7 +915,7 @@ int err = 0; if (nut->seek_status) { // in error mode! syncpoint_t s; - CHECK(smart_find_syncpoint(nut, &s)); + CHECK(smart_find_syncpoint(nut, &s, 0)); nut->i->buf_ptr = get_buf(nut->i, s.pos); // go back to begginning of syncpoint flush_buf(nut->i); clear_dts_cache(nut); @@ -918,8 +927,8 @@ if (err > NUT_ERR_OUT_OF_MEM) { // some error occured! fprintf(stderr, "NUT: %s\n", nut_error(err)); // rewind as much as possible - if (nut->i->isc.seek) seek_buf(nut->i, nut->last_syncpoint + 8, SEEK_SET); - else nut->i->buf_ptr = nut->i->buf; + if (nut->i->isc.seek) seek_buf(nut->i, nut->last_syncpoint + 16, SEEK_SET); + else nut->i->buf_ptr = nut->i->buf + MIN(16, nut->i->read_len); nut->seek_status = 1; // enter error mode return nut_read_next_packet(nut, pd); @@ -1021,7 +1030,7 @@ seek_buf(nut->i, 0, SEEK_SET); nut->seek_status = 1; } - CHECK(smart_find_syncpoint(nut, &sp)); + CHECK(smart_find_syncpoint(nut, &sp, 0)); CHECK(add_syncpoint(nut, sp, NULL, NULL, NULL)); nut->i->buf_ptr = get_buf(nut->i, sp.pos); // rewind to the syncpoint, this is where playback starts... nut->seek_status = 0; @@ -1162,8 +1171,7 @@ if (!nut->seek_status) seek_buf(nut->i, start, SEEK_SET); nut->seek_status = 1; // find closest syncpoint by linear search, SHOULD be one pointed by back_ptr... - buf_before = bctello(nut->i); - CHECK(smart_find_syncpoint(nut, &s)); + CHECK(smart_find_syncpoint(nut, &s, !!end)); clear_dts_cache(nut); nut->last_syncpoint = 0; // last_key is invalid seek_buf(nut->i, s.pos, SEEK_SET); // go back to syncpoint. This will not need a seek. @@ -1294,10 +1302,8 @@ clear_dts_cache(nut); } nut->seek_status = 0; - } else if (buf_before) { - if (buf_before >= nut->i->file_pos) nut->i->buf_ptr = get_buf(nut->i, buf_before); // rewind - else nut->i->buf_ptr = nut->i->buf; // special case, possible with smart_/find_syncpoint - } + } else if (buf_before) nut->i->buf_ptr = get_buf(nut->i, buf_before); // rewind smart + else nut->i->buf_ptr = nut->i->buf; // just rewind return err; }

1 0