Changeset 459

Timestamp:

05/15/10 20:42:54 (14 years ago)

Author:

r2d

Message:

• fix cmake libmpcdec build
• do not flush the demux buffer when seek position is in the buffer

Location:

libmpc/trunk/libmpcdec

Files:

• CMakeLists.txt (modified) (1 diff)
• mpc_demux.c (modified) (1 diff)

libmpc/trunk/libmpcdec/CMakeLists.txt

@@ -1 +1 @@
 include_directories(${libmpc_SOURCE_DIR}/include)
-add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
+if(SHARED)
+  add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
+else(SHARED)
+  add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
+endif(SHARED)
+

libmpc/trunk/libmpcdec/mpc_demux.c

@@ -122 +122 @@
 static void
 mpc_demux_seek(mpc_demux * d, mpc_seek_t fpos, mpc_uint32_t min_bytes) {
-        mpc_seek_t next_pos;
+        mpc_seek_t start_pos, end_pos;
         mpc_int_t bit_offset;
 
-        // FIXME : do not flush the buffer if fpos is in the current buffer
-
-        next_pos = fpos >> 3;
-        if (d->si.stream_version == 7)
-                next_pos = ((next_pos - d->si.header_position) & (-1 << 2)) + d->si.header_position;
-        bit_offset = (int) (fpos - (next_pos << 3));
-
-        d->r->seek(d->r, (mpc_int32_t) next_pos);
-        mpc_demux_clear_buff(d);
+        // get current buffer position
+        end_pos = ((mpc_seek_t)(d->r->tell(d->r))) << 3;
+        start_pos =     end_pos - (d->bytes_total << 3);
+
+        if (fpos >= start_pos && fpos < end_pos) {
+                d->bits_reader.buff = d->buffer + ((fpos - start_pos) >> 3);
+                bit_offset = fpos & 7;
+        } else {
+                mpc_seek_t next_pos = fpos >> 3;
+                if (d->si.stream_version == 7)
+                        next_pos = ((next_pos - d->si.header_position) & (-1 << 2)) + d->si.header_position;
+                bit_offset = (int) (fpos - (next_pos << 3));
+
+                d->r->seek(d->r, (mpc_int32_t) next_pos);
+                mpc_demux_clear_buff(d);
+        }
+
         if (d->si.stream_version == 7)
                 mpc_demux_fill(d, (min_bytes + ((bit_offset + 7) >> 3) + 3) & (~3), MPC_BUFFER_SWAP);