Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Resync mpc to r476 of svn.musepack.org. Improves error handling after seek.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31093 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2011-11-29 19:48:57 +00:00
parent 16d736d3c7
commit 3c63cb29e9
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/codecs/libmusepack/mpc_demux.c
View file

@ -625,10 +625,15 @@ static mpc_status mpc_demux_decode_inner(mpc_demux * d, mpc_frame_info * i)
}
mpc_status mpc_demux_decode(mpc_demux * d, mpc_frame_info * i) {
mpc_status s = mpc_demux_decode_inner(d, i);
if (MPC_IS_FAILURE(s))
i->bits = -1; // we pretend it's end of file
return s;
for(;;) {
// mpc_demux_decode_inner may return 0 samples and require repeated calls after a seek. Loop over until we have data to return.
mpc_status s = mpc_demux_decode_inner(d, i);
if (MPC_IS_FAILURE(s))
i->bits = -1; // we pretend it's end of file
if (MPC_IS_FAILURE(s) || i->samples > 0)
return s;
}
}
/* rockbox: not used