devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Place a limit on the estimate fudging when searching timestamps in mpegplayer. It doesn't have to be very much.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16907 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2008-04-01 06:09:12 +00:00
parent 3c8d93e091
commit d64c82776f
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
apps/plugins/mpegplayer/mpeg_parser.c
View file

@ -378,6 +378,8 @@ static off_t mpeg_parser_seek_PTS(uint32_t time, unsigned id)
if (currpts != INVALID_TIMESTAMP) if (currpts != INVALID_TIMESTAMP)
{ {
ssize_t pos_adj; /* Adjustment to over or under-estimate */
/* Found a valid timestamp - see were it lies in relation to /* Found a valid timestamp - see were it lies in relation to
* target */ * target */
if (currpts < time) if (currpts < time)
@ -401,10 +403,14 @@ static off_t mpeg_parser_seek_PTS(uint32_t time, unsigned id)
pos_new = muldiv_uint32(time - time_left, pos_new = muldiv_uint32(time - time_left,
pos_right - pos_left, pos_right - pos_left,
time_right - time_left) + pos_left; time_right - time_left);
/* Point is ahead of us - fudge estimate a bit high */ /* Point is ahead of us - fudge estimate a bit high */
pos_new = muldiv_uint32(11, pos_new - pos_left, 10) pos_adj = pos_new / 10;
+ pos_left;
if (pos_adj > 512*1024)
pos_adj = 512*1024;
pos_new += pos_left + pos_adj;
if (pos_new >= pos_right) if (pos_new >= pos_right)
{ {
@ -431,9 +437,14 @@ static off_t mpeg_parser_seek_PTS(uint32_t time, unsigned id)
pos_new = muldiv_uint32(time - time_left, pos_new = muldiv_uint32(time - time_left,
pos_right - pos_left, pos_right - pos_left,
time_right - time_left) + pos_left; time_right - time_left);
/* Overshot the seek point - fudge estimate a bit low */ /* Overshot the seek point - fudge estimate a bit low */
pos_new = muldiv_uint32(9, pos_new - pos_left, 10) + pos_left; pos_adj = pos_new / 10;
if (pos_adj > 512*1024)
pos_adj = 512*1024;
pos_new += pos_left - pos_adj;
state = state3; /* Last scan was late */ state = state3; /* Last scan was late */
sk.dir = SSCAN_REVERSE; sk.dir = SSCAN_REVERSE;