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

[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

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

18 Nov '06

Author: ods15 Date: Sat Nov 18 14:31:03 2006 New Revision: 236 Modified: trunk/libnut/demuxer.c Log: clean up some of binary_search Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Nov 18 14:31:03 2006 @@ -977,17 +977,28 @@ 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) { + 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); + if (hi - guess < max_distance) guess = hi - max_distance; //(lo + hi)/2; + } + if (guess < lo + 16) guess = lo + 16; + return guess; +} + 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 hi, lo; - uint64_t hip, lop; + off_t fake_hi; 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); - assert(sl->len); // it is impossible for the first syncpoint to not have been read // find last syncpoint if it's not already found @@ -1023,60 +1034,40 @@ i--; - lo = sl->s[i].pos; - lop = sl->s[i].pts; - hi = sl->s[i+1].pos; - hip = sl->s[i+1].pts; - if (nut->seek_status) hi = nut->seek_status; - - while (!sl->s[i].seen_next) { - // start binary search between sl->s[i].pos (lo) to sl->s[i+1].pos (hi) ... - off_t guess; - int res, tmp; - double hi_pd = TO_DOUBLE_PTS(hip); - double lo_pd = TO_DOUBLE_PTS(lop); +#define LO (sl->s[i]) +#define HI (sl->s[i+1]) + fake_hi = nut->seek_status ? nut->seek_status : 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)); + + 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)); a++; - if (hi - lo < nut->max_distance*2) guess = lo + 16; - else { // linear interpolation -#define INTERPOLATE_WEIGHT (19./20) - 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); - if (hi - guess < nut->max_distance*2) guess = hi - nut->max_distance*2; //(lo + hi)/2; - } - if (guess < lo + 8) guess = lo + 16; - fprintf(stderr, "\n%d [ (%d,%.3f) .. (%d,%.3f) .. (%d,%.3f) ] ", i, (int)lo, lo_pd, (int)guess, time_pos, (int)hi, hi_pd); + if (!nut->seek_status) seek_buf(nut->i, guess, SEEK_SET); - nut->seek_status = hi; // so we know where to continue off... - CHECK(find_syncpoint(nut, 0, &s, hi)); + nut->seek_status = fake_hi; // so we know where to continue off... + CHECK(find_syncpoint(nut, 0, &s, fake_hi)); nut->seek_status = 0; - if (s.seen_next == 1 || s.pos >= hi) { // we got back to 'hi' - // either we scanned everything from lo to hi, or we keep trying - if (guess <= lo + 16) sl->s[i].seen_next = 1; // we are done! - else hi = guess; + 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; } - res = (s.pts / nut->timebase_count > timebases[s.pts % nut->timebase_count]); - if (res) { - hi = s.pos; - hip = s.pts; - } else { - lo = s.pos; - lop = s.pts; - } - CHECK(add_syncpoint(nut, s, NULL, NULL, &tmp)); // unconditionally even without syncpoint cache - if (!res) i = tmp; + CHECK(add_syncpoint(nut, s, NULL, NULL, timebases[s.pts%nut->timebase_count] < s.pts/nut->timebase_count ? NULL : &i)); + fake_hi = HI.pos; } fprintf(stderr, "\n[ (%d,%d) .. %d .. (%d,%d) ] => %d (%d seeks) %d\n", - (int)lo, (int)lop, (int)timebases[0], (int)hi, (int)hip, (int)(lo - sl->s[i].back_ptr), a, sl->s[i].back_ptr); - // at this point, s[i].pts < P < s[i+1].pts, and s[i].flag is set - // meaning, there are no more syncpoints between s[i] to s[i+1] - *start = sl->s[i].pos - sl->s[i].back_ptr; - *end = sl->s[i+1].pos; - *stopper = sl->s[i+1]; + (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); + // 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; + *stopper = HI; err_out: if (err == NUT_ERR_EAGAIN) nut->i->buf_ptr = nut->i->buf; return err;

1 0

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

18 Nov '06

Author: ods15 Date: Sat Nov 18 13:43:51 2006 New Revision: 235 Modified: trunk/libnut/demuxer.c Log: avoid using buf_ptr directly, use get_buf() instead Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Nov 18 13:43:51 2006 @@ -231,14 +231,15 @@ CHECK(skip_buffer(in, 4)); // header_checksum ERROR(crc32(get_buf(in, start), bctello(in) - start), NUT_ERR_BAD_CHECKSUM); } + start = bctello(in); CHECK(skip_buffer(in, forward_ptr)); - ERROR(crc32(in->buf_ptr - forward_ptr, forward_ptr), NUT_ERR_BAD_CHECKSUM); + ERROR(crc32(get_buf(in, start), forward_ptr), NUT_ERR_BAD_CHECKSUM); if (out) { assert(out->is_mem); assert(out->buf == out->buf_ptr); - out->buf_ptr = out->buf = in->buf_ptr - forward_ptr; + out->buf_ptr = out->buf = get_buf(in, start); out->write_len = out->read_len = forward_ptr - 4; // not including checksum } err_out: @@ -676,7 +677,7 @@ if (flags & FLAG_CHECKSUM) { CHECK(skip_buffer(nut->i, 4)); // header_checksum - ERROR(crc32(nut->i->buf_ptr - (bctello(nut->i) - start), bctello(nut->i) - start), NUT_ERR_BAD_CHECKSUM); + ERROR(crc32(get_buf(nut->i, start), bctello(nut->i) - start), NUT_ERR_BAD_CHECKSUM); checksum = 1; } @@ -828,7 +829,7 @@ if (nut->seek_status) { // in error mode! syncpoint_t s; CHECK(find_syncpoint(nut, 0, &s, 0)); - nut->i->buf_ptr -= bctello(nut->i) - s.pos; // go back to begginning of syncpoint + nut->i->buf_ptr = get_buf(nut->i, s.pos); // go back to begginning of syncpoint flush_buf(nut->i); clear_dts_cache(nut); nut->last_syncpoint = 0; @@ -1152,7 +1153,7 @@ if (pd.flags & NUT_FLAG_EOR) nut->sc[pd.stream].state.good_key = 0; } if (!end && pd.pts >= nut->sc[pd.stream].state.pts) { // forward seek end - nut->i->buf_ptr -= bctello(nut->i) - buf_before; + nut->i->buf_ptr = get_buf(nut->i, buf_before); break; } }

1 0

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

18 Nov '06

Author: ods15 Date: Sat Nov 18 13:04:14 2006 New Revision: 234 Modified: trunk/libnut/demuxer.c Log: don't bother going into the big dynamic index mess if last syncpoint in file is not known Modified: trunk/libnut/demuxer.c ============================================================================== --- trunk/libnut/demuxer.c (original) +++ trunk/libnut/demuxer.c Sat Nov 18 13:04:14 2006 @@ -1273,7 +1273,7 @@ time_pos = nut->seek_time_pos; } - if (nut->syncpoints.len) { + if (nut->syncpoints.s[nut->syncpoints.len-1].seen_next) { syncpoint_list_t * sl = &nut->syncpoints; int i; int sync[nut->stream_count]; @@ -1304,7 +1304,7 @@ } if (good_sync == -2) good_sync = backup; // all active streams are eor, just pick a random point, sort of. - if (sl->s[sl->len-1].seen_next && last_sync && good_sync >= 0) { + if (last_sync && good_sync >= 0) { for (i = good_sync; i <= last_sync; i++) if (!sl->s[i].pts_valid) break; if (i != last_sync+1 && good_sync <= last_sync) good_sync = -1; } else good_sync = -1;

1 0