- NUT-devel - lists.mplayerhq.hu

[nut]: r246 - in trunk/libnut: demuxer.c priv.h
by ods15 18 Nov '06

18 Nov '06

Author: ods15 Date: Sat Nov 18 18:34:18 2006 New Revision: 246 Modified: trunk/libnut/demuxer.c trunk/libnut/priv.h Log: add smart_find_syncpoint(), find syncpoint by index entries Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Nov 18 18:34:18 2006 @@ -47,7 +47,7 @@ if (whence != SEEK_END) { // don't do anything when already in seeked position. but still flush_buf off_t req = pos + (whence == SEEK_CUR ? bctello(bc) : 0); - if (req >= bc->file_pos && req < bc->file_pos + bc->read_len) { + if (req >= bc->file_pos && req <= bc->file_pos + bc->read_len) { bc->buf_ptr = bc->buf + (req - bc->file_pos); flush_buf(bc); return; @@ -837,11 +837,66 @@ return err; } -static int smart_find_syncpoint(nut_context_t * nut, syncpoint_t * res) { - int err = 0; - if (!(nut->dopts.cache_syncpoints & 1)) return find_syncpoint(nut, 0, res, 0); +static int smart_find_syncpoint(nut_context_t * nut, syncpoint_t * sp) { + 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); + + 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); + + 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)); + else sp->seen_next = 1; + + 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); + fss->seeked = 1; + CHECK(find_syncpoint(nut, 0, sp, sl->s[i+1].pos + 15 + 8)); + fss->seeked = 0; + fss->i = ++i + 1; + if (!sp->seen_next) 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); + fss->seeked = 1; + CHECK(find_syncpoint(nut, 0, sp, 0)); + fss->seeked = 0; + } + CHECK(add_syncpoint(nut, *sp, NULL, NULL, &i)); + assert(i >= begin); + + 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; + } + + 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)); + memmove(sl->eor + begin * nut->stream_count, sl->eor + i * nut->stream_count, (sl->len - i) * nut->stream_count * sizeof(uint64_t)); - return find_syncpoint(nut, 0, res, 0); + sl->len -= i-begin; + + if (sp->pos < pos) { // 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); + } + } + fss->pos = fss->i = fss->begin = fss->seeked = 0; err_out: return err; @@ -1380,6 +1435,7 @@ nut->seek_status = 0; nut->before_seek = 0; nut->last_syncpoint = 0; + nut->find_syncpoint_state = (struct find_syncpoint_state_s){0,0,0,0}; nut->alloc = &nut->dopts.alloc; Modified: trunk/libnut/priv.h ============================================================================== --- trunk/libnut/priv.h (original) +++ trunk/libnut/priv.h Sat Nov 18 18:34:18 2006 @@ -149,6 +149,10 @@ double seek_time_pos; syncpoint_list_t syncpoints; + struct find_syncpoint_state_s { + int i, begin, seeked; + off_t pos; + } find_syncpoint_state; // debug int sync_overhead;

1 0

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

18 Nov '06

Author: ods15 Date: Sat Nov 18 16:37:32 2006 New Revision: 245 Modified: trunk/libnut/demuxer.c Log: ERROR(err, err) => CHECK(err) Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Nov 18 16:37:32 2006 @@ -738,7 +738,7 @@ // EOF is a legal error here - when reading the last headers in file if ((err = get_bytes(nut->i, 8, &tmp)) == NUT_ERR_EOF) { err = 0; tmp = SYNCPOINT_STARTCODE; } - ERROR(err, err); // if get_bytes returns EAGAIN or a memory error, check for that + CHECK(err); // if get_bytes returns EAGAIN or a memory error, check for that } while (tmp != SYNCPOINT_STARTCODE); if (tmp == SYNCPOINT_STARTCODE) { // success! nut->last_syncpoint = nut->before_seek = nut->seek_status = 0; @@ -907,7 +907,7 @@ } // EOF is a legal error here - when reading the last headers in file if ((err = get_bytes(nut->i, 8, &tmp)) == NUT_ERR_EOF) { tmp = err = 0; break; } - ERROR(err, err); // it's just barely possible for get_bytes to return a memory error, check for that + CHECK(err); // it's just barely possible for get_bytes to return a memory error, check for that } if (tmp == SYNCPOINT_STARTCODE) nut->i->buf_ptr -= 8;

1 0

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

18 Nov '06

Author: ods15 Date: Sat Nov 18 16:36:37 2006 New Revision: 244 Modified: trunk/libnut/demuxer.c Log: slight change in EAGAIN rewind in linear_search Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Nov 18 16:36:37 2006 @@ -1240,8 +1240,8 @@ } nut->seek_status = 0; } else if (buf_before) { - nut->i->buf_ptr -= bctello(nut->i) - buf_before; // rewind - if (nut->i->buf_ptr < nut->i->buf) nut->i->buf_ptr = nut->i->buf; // special case, possible with find_syncpoint + 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 } return err; }

1 0

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

18 Nov '06

Author: ods15 Date: Sat Nov 18 16:28:46 2006 New Revision: 243 Modified: trunk/libnut/demuxer.c Log: 10l typo Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Nov 18 16:28:46 2006 @@ -839,7 +839,7 @@ static int smart_find_syncpoint(nut_context_t * nut, syncpoint_t * res) { int err = 0; - if (!nut->dopts.cache_syncpoints & 1) return find_syncpoint(nut, 0, res, 0); + if (!(nut->dopts.cache_syncpoints & 1)) return find_syncpoint(nut, 0, res, 0); return find_syncpoint(nut, 0, res, 0);

1 0

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

18 Nov '06

Author: ods15 Date: Sat Nov 18 16:27:54 2006 New Revision: 242 Modified: trunk/libnut/demuxer.c Log: placeholder for smart_find_syncpoint(), index based find_syncpoint Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Nov 18 16:27:54 2006 @@ -837,11 +837,21 @@ return err; } +static int smart_find_syncpoint(nut_context_t * nut, syncpoint_t * res) { + int err = 0; + if (!nut->dopts.cache_syncpoints & 1) return find_syncpoint(nut, 0, res, 0); + + return find_syncpoint(nut, 0, res, 0); + +err_out: + return err; +} + int nut_read_next_packet(nut_context_t * nut, nut_packet_t * pd) { int err = 0; if (nut->seek_status) { // in error mode! syncpoint_t s; - CHECK(find_syncpoint(nut, 0, &s, 0)); + CHECK(smart_find_syncpoint(nut, &s)); nut->i->buf_ptr = get_buf(nut->i, s.pos); // go back to begginning of syncpoint flush_buf(nut->i); clear_dts_cache(nut); @@ -956,7 +966,7 @@ seek_buf(nut->i, 0, SEEK_SET); nut->seek_status = 1; } - CHECK(find_syncpoint(nut, 0, &sp, 0)); + CHECK(smart_find_syncpoint(nut, &sp)); 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; @@ -1098,7 +1108,7 @@ nut->seek_status = 1; // find closest syncpoint by linear search, SHOULD be one pointed by back_ptr... buf_before = bctello(nut->i); - CHECK(find_syncpoint(nut, 0, &s, 0)); + CHECK(smart_find_syncpoint(nut, &s)); 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]: r241 - trunk/libnut/demuxer.c
by ods15 18 Nov '06

18 Nov '06

Author: ods15 Date: Sat Nov 18 16:23:53 2006 New Revision: 241 Modified: trunk/libnut/demuxer.c Log: somewhat cosmetic to interpolate function Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Nov 18 16:23:53 2006 @@ -991,14 +991,12 @@ return 0; } -#define INTERPOLATE_WEIGHT (19./20) static off_t seek_interpolate(int max_distance, double time_pos, off_t lo, off_t hi, double lo_pd, double hi_pd) { + double weight = 19./20.; off_t guess; if (hi - lo < max_distance) guess = lo + 16; else { // linear interpolation - double a = (double)(hi - lo) / (hi_pd - lo_pd); - guess = lo + a * (time_pos - lo_pd); - guess = guess * INTERPOLATE_WEIGHT + (lo+hi)/2. * (1 - INTERPOLATE_WEIGHT); + 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 (guess < lo + 16) guess = lo + 16;

1 0

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

18 Nov '06

Author: ods15 Date: Sat Nov 18 16:11:23 2006 New Revision: 240 Modified: trunk/libnut/demuxer.c Log: some fixes, report if index was read, don't read it again, and don't infinite loop when reaching EOF... Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Nov 18 16:11:23 2006 @@ -750,7 +750,7 @@ } // failure - if (len == -1 && (nut->before_seek += read_data) < 512*1024) { + if (len == -1 && (nut->before_seek += read_data) < 512*1024 && read_data > 0) { nut->i->buf_ptr -= 7; // rewind 7 bytes, try again flush_buf(nut->i); return find_main_headers(nut); @@ -889,8 +889,9 @@ memset(&nut->info[nut->info_count - 1], 0, sizeof(nut_info_packet_t)); CHECK(get_info_header(nut, &nut->info[nut->info_count - 1])); nut->info[nut->info_count].count = -1; - } else if (tmp == INDEX_STARTCODE && nut->dopts.read_index) { + } else if (tmp == INDEX_STARTCODE && nut->dopts.read_index&1) { CHECK(get_index(nut)); // usually you don't care about get_index() errors, but nothing except a memory error can happen here + nut->dopts.read_index = 2; } else { CHECK(get_header(nut->i, NULL)); }

1 0

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

18 Nov '06

Author: ods15 Date: Sat Nov 18 15:45:19 2006 New Revision: 239 Modified: trunk/libnut/demuxer.c Log: don't check the EOF area twice... Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Nov 18 15:45:19 2006 @@ -759,8 +759,10 @@ if (!nut->seek_status) { nut->seek_status = 18; // start search at 512kb // but first, let's check EOF - seek_buf(nut->i, -512*1024, SEEK_END); - return find_main_headers(nut); + if (!nut->last_syncpoint) { // unless we've checked it already + seek_buf(nut->i, -512*1024, SEEK_END); + return find_main_headers(nut); + } } seek_buf(nut->i, 1 << ++nut->seek_status, SEEK_SET); // evantually we'll hit EOF and give up

1 0

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

18 Nov '06

Author: ods15 Date: Sat Nov 18 15:44:12 2006 New Revision: 238 Modified: trunk/libnut/demuxer.c Log: add a last resort in main header search - not stop search at syncpoints Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Nov 18 15:44:12 2006 @@ -726,7 +726,7 @@ tmp = (tmp << 8) | *(nut->i->buf_ptr++); if (tmp == MAIN_STARTCODE) break; // give up if we reach a syncpoint, unless we're searching the file end - if (tmp == SYNCPOINT_STARTCODE && nut->seek_status != 18) break; + if (tmp == SYNCPOINT_STARTCODE && nut->seek_status != 18 && !nut->last_syncpoint) break; } if (tmp == MAIN_STARTCODE) { off_t pos = bctello(nut->i) - 8; @@ -741,7 +741,7 @@ ERROR(err, err); // if get_bytes returns EAGAIN or a memory error, check for that } while (tmp != SYNCPOINT_STARTCODE); if (tmp == SYNCPOINT_STARTCODE) { // success! - nut->before_seek = nut->seek_status = 0; + nut->last_syncpoint = nut->before_seek = nut->seek_status = 0; nut->last_headers = pos; nut->i->buf_ptr = get_buf(nut->i, nut->last_headers); flush_buf(nut->i); @@ -766,6 +766,13 @@ // evantually we'll hit EOF and give up return find_main_headers(nut); err_out: + if (err == NUT_ERR_EOF && !nut->last_syncpoint && nut->seek_status) { + // last resort: after checking whole file, try again, this time don't stop at syncpoints. + nut->last_syncpoint = 1; + nut->before_seek = nut->seek_status = 0; + seek_buf(nut->i, 0, SEEK_SET); + return find_main_headers(nut); + } return err; }

1 0

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

18 Nov '06

Author: ods15 Date: Sat Nov 18 15:38:19 2006 New Revision: 237 Modified: trunk/libnut/demuxer.c Log: make the search for main header in 4kb chunks instead of 0.5mb chunks to save memory, while still keeping same effectiveness... Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Nov 18 15:38:19 2006 @@ -714,17 +714,15 @@ static int find_main_headers(nut_context_t * nut) { int err = 0; uint64_t tmp; - int read_data = 512*1024; + int len = PREALLOC_SIZE; + int read_data = ready_read_buf(nut->i, len); // don't waste cpu by running this check every damn time for EAGAIN - // Except for the first time, to not waste memory - if (!nut->seek_status && ready_read_buf(nut->i, read_data) < read_data && buf_eof(nut->i) == NUT_ERR_EAGAIN) - return NUT_ERR_EAGAIN; - - CHECK(get_bytes(nut->i, 7, &tmp)); - read_data -= 7; - while (read_data--) { - ERROR(ready_read_buf(nut->i, 30) < 1, buf_eof(nut->i)); + if (read_data < len && buf_eof(nut->i) != NUT_ERR_EOF) return buf_eof(nut->i); + + CHECK(get_bytes(nut->i, 7, &tmp)); // true EOF will fail here + len = (read_data -= 7); + while (len--) { tmp = (tmp << 8) | *(nut->i->buf_ptr++); if (tmp == MAIN_STARTCODE) break; // give up if we reach a syncpoint, unless we're searching the file end @@ -743,6 +741,7 @@ ERROR(err, err); // if get_bytes returns EAGAIN or a memory error, check for that } while (tmp != SYNCPOINT_STARTCODE); if (tmp == SYNCPOINT_STARTCODE) { // success! + nut->before_seek = nut->seek_status = 0; nut->last_headers = pos; nut->i->buf_ptr = get_buf(nut->i, nut->last_headers); flush_buf(nut->i); @@ -751,6 +750,11 @@ } // failure + if (len == -1 && (nut->before_seek += read_data) < 512*1024) { + nut->i->buf_ptr -= 7; // rewind 7 bytes, try again + flush_buf(nut->i); + return find_main_headers(nut); + } else nut->before_seek = 0; if (!nut->i->isc.seek) return NUT_ERR_NO_HEADERS; if (!nut->seek_status) { nut->seek_status = 18; // start search at 512kb

1 0