Changeset 476 for libmpc/trunk/libmpcdec/mpc_demux.c

Timestamp:

11/25/11 00:45:02 (13 years ago)

Author:

r2d

Message:

changes a seeking behavior that confused some people using the library.
mpc_demux_decode() would return zero samples a couple of times requiring the caller to loop over.
patch by DEATH

File:

• libmpc/trunk/libmpcdec/mpc_demux.c (modified) (1 diff)

libmpc/trunk/libmpcdec/mpc_demux.c

@@ -638 +638 @@
 
 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;
+        }
 }