Index: /libmpcdec/trunk/include/mpcdec/decoder.h =================================================================== --- /libmpcdec/trunk/include/mpcdec/decoder.h (revision 36) +++ /libmpcdec/trunk/include/mpcdec/decoder.h (revision 37) @@ -46,4 +46,10 @@ #define MPC_SUPPORT_SV456 +#define SEEKING_TABLE_SIZE 256 +// set it to SLOW_SEEKING_WINDOW to not use fast seeking +#define FAST_SEEKING_WINDOW 32 +// set it to FAST_SEEKING_WINDOW to only use fast seeking +#define SLOW_SEEKING_WINDOW 0x80000000 + enum { MPC_V_MEM = 2304, @@ -69,8 +75,4 @@ mpc_uint32_t samples_to_skip; - mpc_uint32_t FwdJumpInfo; - mpc_uint32_t ActDecodePos; - - mpc_uint32_t DecodedFrames; mpc_uint32_t OverallFrames; @@ -91,4 +93,10 @@ mpc_uint32_t __r2; + // seeking + mpc_uint32_t seeking_table[SEEKING_TABLE_SIZE]; + mpc_uint32_t seeking_pwr; // distance between 2 frames in seeking_table = 2^seeking_pwr + mpc_uint32_t seeking_table_frames; // last frame in seaking table + mpc_uint32_t seeking_window; // number of frames to look for scalefactors + mpc_int32_t SCF_Index_L [32] [3]; mpc_int32_t SCF_Index_R [32] [3]; // holds scalefactor-indices @@ -100,6 +108,4 @@ mpc_int32_t SCFI_L [32]; mpc_int32_t SCFI_R [32]; // describes order of transmitted SCF - mpc_int32_t DSCF_Reference_L [32]; - mpc_int32_t DSCF_Reference_R [32]; // holds last frames SCF mpc_bool_t MS_Flag[32]; // MS used? #ifdef MPC_FIXED_POINT Index: /libmpcdec/trunk/include/mpcdec/mpcdec.h =================================================================== --- /libmpcdec/trunk/include/mpcdec/mpcdec.h (revision 36) +++ /libmpcdec/trunk/include/mpcdec/mpcdec.h (revision 37) @@ -101,4 +101,9 @@ mpc_bool_t mpc_decoder_initialize(mpc_decoder *d, mpc_streaminfo *si); +/// Call this next after calling mpc_decoder_setup. +/// \param si streaminfo structure indicating format of source stream +/// \param fast_seeking boolean 0 = use fast seeking if safe, 1 = force fast seeking +void mpc_decoder_set_seeking(mpc_decoder *d, mpc_streaminfo *si, mpc_bool_t fast_seeking); + void mpc_decoder_set_streaminfo(mpc_decoder *d, mpc_streaminfo *si); Index: /libmpcdec/trunk/include/mpcdec/streaminfo.h =================================================================== --- /libmpcdec/trunk/include/mpcdec/streaminfo.h (revision 36) +++ /libmpcdec/trunk/include/mpcdec/streaminfo.h (revision 37) @@ -82,4 +82,9 @@ mpc_streaminfo_off_t total_file_length; ///< total length of underlying file //@} + + /// @name fast seeking support + //@{ + mpc_uint32_t fast_seek; ///< support fast seeking ? (0: no, 1: yes) + //@} } mpc_streaminfo; Index: /libmpcdec/trunk/src/Makefile.am =================================================================== --- /libmpcdec/trunk/src/Makefile.am (revision 36) +++ /libmpcdec/trunk/src/Makefile.am (revision 37) @@ -20,2 +20,3 @@ sample_LDADD = libmpcdec.la +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src Index: /libmpcdec/trunk/src/mpc_decoder.c =================================================================== --- /libmpcdec/trunk/src/mpc_decoder.c (revision 36) +++ /libmpcdec/trunk/src/mpc_decoder.c (revision 37) @@ -59,4 +59,10 @@ #endif +#ifndef MPC_LITTLE_ENDIAN +#define SWAP(X) mpc_swap32(X) +#else +#define SWAP(X) (X) +#endif + //------------------------------------------------------------------------------ // types @@ -75,7 +81,6 @@ // forward declarations //------------------------------------------------------------------------------ -void mpc_decoder_read_bitstream_sv6(mpc_decoder *d); -void mpc_decoder_read_bitstream_sv7(mpc_decoder *d); -void mpc_decoder_update_buffer(mpc_decoder *d, mpc_uint32_t RING); +void mpc_decoder_read_bitstream_sv6(mpc_decoder *d, mpc_bool_t seeking); +void mpc_decoder_read_bitstream_sv7(mpc_decoder *d, mpc_bool_t seeking); mpc_bool_t mpc_decoder_seek_sample(mpc_decoder *d, mpc_int64_t destsample); void mpc_decoder_requantisierung(mpc_decoder *d, const mpc_int32_t Last_Band); @@ -96,12 +101,35 @@ static mpc_int32_t f_read_dword(mpc_decoder *d, mpc_uint32_t * ptr, mpc_uint32_t count) { - mpc_uint32_t n; - count = f_read(d, ptr, count << 2) >> 2; -#ifndef MPC_LITTLE_ENDIAN - for(n = 0; n< count; n++) { - ptr[n] = mpc_swap32(ptr[n]); - } -#endif - return count; + return f_read(d, ptr, count << 2) >> 2; +} + +static void mpc_decoder_seek(mpc_decoder *d, mpc_uint32_t bitpos) +{ + f_seek(d, (bitpos>>5) * 4 + d->MPCHeaderPos); + f_read_dword(d, d->Speicher, MEMSIZE); + d->dword = SWAP(d->Speicher[d->Zaehler = 0]); + d->pos = bitpos & 31; + d->WordsRead = bitpos >> 5; +} + +// jump desired number of bits out of the bitstream +static void mpc_decoder_bitstream_jump(mpc_decoder *d, const mpc_uint32_t bits) +{ + d->pos += bits; + + if (d->pos >= 32) { + d->Zaehler = (d->Zaehler + (d->pos >> 5)) & MEMMASK; + d->dword = SWAP(d->Speicher[d->Zaehler]); + d->WordsRead += d->pos >> 5; + d->pos &= 31; + } +} + +void mpc_decoder_update_buffer(mpc_decoder *d, mpc_uint32_t RING) +{ + if ((RING ^ d->Zaehler) & MEMSIZE2 ) { + // update buffer + f_read_dword(d, d->Speicher + (RING & MEMSIZE2), MEMSIZE2); + } } @@ -109,15 +137,4 @@ // huffman & bitstream functions //------------------------------------------------------------------------------ -static const mpc_uint32_t mask [33] = { - 0x00000000, 0x00000001, 0x00000003, 0x00000007, - 0x0000000F, 0x0000001F, 0x0000003F, 0x0000007F, - 0x000000FF, 0x000001FF, 0x000003FF, 0x000007FF, - 0x00000FFF, 0x00001FFF, 0x00003FFF, 0x00007FFF, - 0x0000FFFF, 0x0001FFFF, 0x0003FFFF, 0x0007FFFF, - 0x000FFFFF, 0x001FFFFF, 0x003FFFFF, 0x007FFFFF, - 0x00FFFFFF, 0x01FFFFFF, 0x03FFFFFF, 0x07FFFFFF, - 0x0FFFFFFF, 0x1FFFFFFF, 0x3FFFFFFF, 0x7FFFFFFF, - 0xFFFFFFFF -}; /* F U N C T I O N S */ @@ -140,5 +157,5 @@ } -// read desired number of bits out of the bitstream +// read desired number of bits out of the bitstream (max 31) static mpc_uint32_t mpc_decoder_bitstream_read(mpc_decoder *d, const mpc_uint32_t bits) @@ -150,7 +167,6 @@ if (d->pos < 32) { out >>= (32 - d->pos); - } - else { - d->dword = d->Speicher[d->Zaehler = (d->Zaehler + 1) & MEMMASK]; + } else { + d->dword = SWAP(d->Speicher[d->Zaehler = (d->Zaehler + 1) & MEMMASK]); d->pos -= 32; if (d->pos) { @@ -158,55 +174,28 @@ out |= d->dword >> (32 - d->pos); } - ++(d->WordsRead); - } - - return out & mask[bits]; -} - -// decode SCFI-bundle (sv4,5,6) -static void -mpc_decoder_scfi_bundle_read( - mpc_decoder *d, - const HuffmanTyp* Table, mpc_int32_t* SCFI, mpc_bool_t* DSCF) + d->WordsRead++; + } + + return out & ((1 << bits) - 1); +} + +// basic huffman decoding routine +// works with maximum lengths up to max_length +static mpc_int32_t +mpc_decoder_huffman_decode(mpc_decoder *d, const HuffmanTyp *Table, + const mpc_uint32_t max_length) { // load preview and decode - mpc_uint32_t code = d->dword << d->pos; - if (d->pos > 26) { - code |= d->Speicher[(d->Zaehler + 1) & MEMMASK] >> (32 - d->pos); - } - while (code < Table->Code) { - Table++; - } + mpc_uint32_t code = d->dword << d->pos; + if (32 - d->pos < max_length) + code |= SWAP(d->Speicher[(d->Zaehler + 1) & MEMMASK]) >> (32 - d->pos); + + while (code < Table->Code) Table++; // set the new position within bitstream without performing a dummy-read if ((d->pos += Table->Length) >= 32) { d->pos -= 32; - d->dword = d->Speicher[d->Zaehler = (d->Zaehler+1) & MEMMASK]; - ++(d->WordsRead); - } - - *SCFI = Table->Value >> 1; - *DSCF = Table->Value & 1; -} - -// basic huffman decoding routine -// works with maximum lengths up to 14 -static mpc_int32_t -mpc_decoder_huffman_decode(mpc_decoder *d, const HuffmanTyp *Table) -{ - // load preview and decode - mpc_uint32_t code = d->dword << d->pos; - if (d->pos > 18) { - code |= d->Speicher[(d->Zaehler + 1) & MEMMASK] >> (32 - d->pos); - } - while (code < Table->Code) { - Table++; - } - - // set the new position within bitstream without performing a dummy-read - if ((d->pos += Table->Length) >= 32) { - d->pos -= 32; - d->dword = d->Speicher[d->Zaehler = (d->Zaehler + 1) & MEMMASK]; - ++(d->WordsRead); + d->dword = SWAP(d->Speicher[d->Zaehler = (d->Zaehler + 1) & MEMMASK]); + d->WordsRead++; } @@ -214,50 +203,13 @@ } -// faster huffman through previewing less bits -// works with maximum lengths up to 10 -static mpc_int32_t -mpc_decoder_huffman_decode_fast(mpc_decoder *d, const HuffmanTyp* Table) -{ - // load preview and decode - mpc_uint32_t code = d->dword << d->pos; - if (d->pos > 22) { - code |= d->Speicher[(d->Zaehler + 1) & MEMMASK] >> (32 - d->pos); - } - while (code < Table->Code) { - Table++; - } - - // set the new position within bitstream without performing a dummy-read - if ((d->pos += Table->Length) >= 32) { - d->pos -= 32; - d->dword = d->Speicher[d->Zaehler = (d->Zaehler + 1) & MEMMASK]; - ++(d->WordsRead); - } - - return Table->Value; -} - -// even faster huffman through previewing even less bits -// works with maximum lengths up to 5 -static mpc_int32_t -mpc_decoder_huffman_decode_faster(mpc_decoder *d, const HuffmanTyp* Table) -{ - // load preview and decode - mpc_uint32_t code = d->dword << d->pos; - if (d->pos > 27) { - code |= d->Speicher[(d->Zaehler + 1) & MEMMASK] >> (32 - d->pos); - } - while (code < Table->Code) { - Table++; - } - - // set the new position within bitstream without performing a dummy-read - if ((d->pos += Table->Length) >= 32) { - d->pos -= 32; - d->dword = d->Speicher[d->Zaehler = (d->Zaehler + 1) & MEMMASK]; - ++(d->WordsRead); - } - - return Table->Value; +// decode SCFI-bundle (sv4,5,6) +static void +mpc_decoder_scfi_bundle_read(mpc_decoder *d, const HuffmanTyp* Table, + mpc_int32_t* SCFI, mpc_bool_t* DSCF) +{ + mpc_uint32_t value = mpc_decoder_huffman_decode(d, Table, 6); + + *SCFI = value >> 1; + *DSCF = value & 1; } @@ -301,8 +253,7 @@ memset(d->DSCF_Flag_L , 0, sizeof d->DSCF_Flag_L ); memset(d->DSCF_Flag_R , 0, sizeof d->DSCF_Flag_R ); - memset(d->DSCF_Reference_L, 0, sizeof d->DSCF_Reference_L ); - memset(d->DSCF_Reference_R, 0, sizeof d->DSCF_Reference_R ); memset(d->Q , 0, sizeof d->Q ); memset(d->MS_Flag , 0, sizeof d->MS_Flag ); + memset(d->seeking_table , 0, sizeof d->seeking_table ); } @@ -311,13 +262,8 @@ mpc_uint32_t in_len, MPC_SAMPLE_FORMAT *out_buffer) { - unsigned int i; mpc_decoder_reset_bitstream_decode(d); if (in_len > sizeof(d->Speicher)) in_len = sizeof(d->Speicher); memcpy(d->Speicher, in_buffer, in_len); -#ifdef MPC_LITTLE_ENDIAN - for (i = 0; i < (in_len + 3) / 4; i++) - d->Speicher[i] = mpc_swap32(d->Speicher[i]); -#endif - d->dword = d->Speicher[0]; + d->dword = SWAP(d->Speicher[0]); switch (d->StreamVersion) { #ifdef MPC_SUPPORT_SV456 @@ -325,10 +271,10 @@ case 0x05: case 0x06: - mpc_decoder_read_bitstream_sv6(d); + mpc_decoder_read_bitstream_sv6(d, FALSE); break; #endif case 0x07: case 0x17: - mpc_decoder_read_bitstream_sv7(d); + mpc_decoder_read_bitstream_sv7(d, FALSE); break; default: @@ -344,5 +290,5 @@ { mpc_uint32_t output_frame_length = MPC_FRAME_LENGTH; - + mpc_uint32_t FwdJumpInfo = 0; mpc_uint32_t FrameBitCnt = 0; @@ -351,8 +297,13 @@ } + // add seeking info + if (d->seeking_table_frames < d->DecodedFrames && + (d->DecodedFrames & ((1 << d->seeking_pwr) - 1)) == 0) { + d->seeking_table[d->DecodedFrames >> d->seeking_pwr] = mpc_decoder_bits_read(d); + d->seeking_table_frames = d->DecodedFrames; + } + // read jump-info for validity check of frame - d->FwdJumpInfo = mpc_decoder_bitstream_read(d, 20); - - d->ActDecodePos = (d->Zaehler << 5) + d->pos; + FwdJumpInfo = mpc_decoder_bitstream_read(d, 20); // decode data and check for validity of frame @@ -363,22 +314,18 @@ case 0x05: case 0x06: - mpc_decoder_read_bitstream_sv6(d); + mpc_decoder_read_bitstream_sv6(d, FALSE); break; #endif case 0x07: case 0x17: - mpc_decoder_read_bitstream_sv7(d); + mpc_decoder_read_bitstream_sv7(d, FALSE); break; default: return (mpc_uint32_t)(-1); } - d->FrameWasValid = mpc_decoder_bits_read(d) - FrameBitCnt == d->FwdJumpInfo; + d->FrameWasValid = mpc_decoder_bits_read(d) - FrameBitCnt == FwdJumpInfo; // synthesize signal mpc_decoder_requantisierung(d, d->Max_Band); - - //if ( d->EQ_activated && PluginSettings.EQbyMPC ) - // perform_EQ (); - mpc_decoder_synthese_filter_float(d, buffer); @@ -403,5 +350,5 @@ } else { mpc_decoder_bitstream_read(d, 20); - mpc_decoder_read_bitstream_sv7(d); + mpc_decoder_read_bitstream_sv7(d, FALSE); mpc_decoder_requantisierung(d, d->Max_Band); } @@ -673,5 +620,5 @@ /****************************************** SV 6 ******************************************/ void -mpc_decoder_read_bitstream_sv6(mpc_decoder *d) +mpc_decoder_read_bitstream_sv6(mpc_decoder *d, mpc_bool_t seeking) { mpc_int32_t n,k; @@ -694,9 +641,9 @@ else /*if (n>=23)*/ Table = mpc_table_Region_C; - *ResL = Q_res[n][mpc_decoder_huffman_decode(d, Table)]; + *ResL = Q_res[n][mpc_decoder_huffman_decode(d, Table, 14)]; if (d->MS_used) { d->MS_Flag[n] = mpc_decoder_bitstream_read(d, 1); } - *ResR = Q_res[n][mpc_decoder_huffman_decode(d, Table)]; + *ResR = Q_res[n][mpc_decoder_huffman_decode(d, Table, 14)]; // only perform the following procedure up to the maximum non-zero subband @@ -724,31 +671,35 @@ if (d->DSCF_Flag_L[n]==1) { - L[2] = d->DSCF_Reference_L[n]; switch (d->SCFI_L[n]) { case 3: - L[0] = L[2] + mpc_decoder_huffman_decode_fast(d, mpc_table_DSCF_Entropie); + L[0] = L[2] + mpc_decoder_huffman_decode(d, mpc_table_DSCF_Entropie, 6); L[1] = L[0]; L[2] = L[1]; break; case 1: - L[0] = L[2] + mpc_decoder_huffman_decode_fast(d, mpc_table_DSCF_Entropie); - L[1] = L[0] + mpc_decoder_huffman_decode_fast(d, mpc_table_DSCF_Entropie); + L[0] = L[2] + mpc_decoder_huffman_decode(d, mpc_table_DSCF_Entropie, 6); + L[1] = L[0] + mpc_decoder_huffman_decode(d, mpc_table_DSCF_Entropie, 6); L[2] = L[1]; break; case 2: - L[0] = L[2] + mpc_decoder_huffman_decode_fast(d, mpc_table_DSCF_Entropie); + L[0] = L[2] + mpc_decoder_huffman_decode(d, mpc_table_DSCF_Entropie, 6); L[1] = L[0]; - L[2] = L[1] + mpc_decoder_huffman_decode_fast(d, mpc_table_DSCF_Entropie); + L[2] = L[1] + mpc_decoder_huffman_decode(d, mpc_table_DSCF_Entropie, 6); break; case 0: - L[0] = L[2] + mpc_decoder_huffman_decode_fast(d, mpc_table_DSCF_Entropie); - L[1] = L[0] + mpc_decoder_huffman_decode_fast(d, mpc_table_DSCF_Entropie); - L[2] = L[1] + mpc_decoder_huffman_decode_fast(d, mpc_table_DSCF_Entropie); + L[0] = L[2] + mpc_decoder_huffman_decode(d, mpc_table_DSCF_Entropie, 6); + L[1] = L[0] + mpc_decoder_huffman_decode(d, mpc_table_DSCF_Entropie, 6); + L[2] = L[1] + mpc_decoder_huffman_decode(d, mpc_table_DSCF_Entropie, 6); break; default: return; - break; } + if (L[0] > 1024) + L[0] = 0x8080; + if (L[1] > 1024) + L[1] = 0x8080; + if (L[2] > 1024) + L[2] = 0x8080; } /************ SCF ************/ @@ -779,13 +730,9 @@ default: return; - break; } } - // update Reference for DSCF - d->DSCF_Reference_L[n] = L[2]; } if (*ResR) { - R[2] = d->DSCF_Reference_R[n]; /*********** DSCF ************/ if (d->DSCF_Flag_R[n]==1) @@ -794,27 +741,32 @@ { case 3: - R[0] = R[2] + mpc_decoder_huffman_decode_fast(d, mpc_table_DSCF_Entropie); + R[0] = R[2] + mpc_decoder_huffman_decode(d, mpc_table_DSCF_Entropie, 6); R[1] = R[0]; R[2] = R[1]; break; case 1: - R[0] = R[2] + mpc_decoder_huffman_decode_fast(d, mpc_table_DSCF_Entropie); - R[1] = R[0] + mpc_decoder_huffman_decode_fast(d, mpc_table_DSCF_Entropie); + R[0] = R[2] + mpc_decoder_huffman_decode(d, mpc_table_DSCF_Entropie, 6); + R[1] = R[0] + mpc_decoder_huffman_decode(d, mpc_table_DSCF_Entropie, 6); R[2] = R[1]; break; case 2: - R[0] = R[2] + mpc_decoder_huffman_decode_fast(d, mpc_table_DSCF_Entropie); + R[0] = R[2] + mpc_decoder_huffman_decode(d, mpc_table_DSCF_Entropie, 6); R[1] = R[0]; - R[2] = R[1] + mpc_decoder_huffman_decode_fast(d, mpc_table_DSCF_Entropie); + R[2] = R[1] + mpc_decoder_huffman_decode(d, mpc_table_DSCF_Entropie, 6); break; case 0: - R[0] = R[2] + mpc_decoder_huffman_decode_fast(d, mpc_table_DSCF_Entropie); - R[1] = R[0] + mpc_decoder_huffman_decode_fast(d, mpc_table_DSCF_Entropie); - R[2] = R[1] + mpc_decoder_huffman_decode_fast(d, mpc_table_DSCF_Entropie); + R[0] = R[2] + mpc_decoder_huffman_decode(d, mpc_table_DSCF_Entropie, 6); + R[1] = R[0] + mpc_decoder_huffman_decode(d, mpc_table_DSCF_Entropie, 6); + R[2] = R[1] + mpc_decoder_huffman_decode(d, mpc_table_DSCF_Entropie, 6); break; default: return; - break; } + if (R[0] > 1024) + R[0] = 0x8080; + if (R[1] > 1024) + R[1] = 0x8080; + if (R[2] > 1024) + R[2] = 0x8080; } /************ SCF ************/ @@ -848,8 +800,9 @@ } } - // update Reference for DSCF - d->DSCF_Reference_R[n] = R[2]; - } - } + } + } + + if (seeking == TRUE) + return; /**************************** Samples ****************************/ @@ -867,6 +820,6 @@ for (k=0; k<36; ++k) { - if (x1 != NULL) *L++ = mpc_decoder_huffman_decode_fast(d, x1); - if (x2 != NULL) *R++ = mpc_decoder_huffman_decode_fast(d, x2); + if (x1 != NULL) *L++ = mpc_decoder_huffman_decode(d, x1, 8); + if (x2 != NULL) *R++ = mpc_decoder_huffman_decode(d, x2, 8); } @@ -882,12 +835,12 @@ /****************************************** SV 7 ******************************************/ void -mpc_decoder_read_bitstream_sv7(mpc_decoder *d) +mpc_decoder_read_bitstream_sv7(mpc_decoder *d, mpc_bool_t seeking) { // these arrays hold decoding results for bundled quantizers (3- and 5-step) - /*static*/ mpc_int32_t idx30[] = { -1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1}; - /*static*/ mpc_int32_t idx31[] = { -1,-1,-1, 0, 0, 0, 1, 1, 1,-1,-1,-1, 0, 0, 0, 1, 1, 1,-1,-1,-1, 0, 0, 0, 1, 1, 1}; - /*static*/ mpc_int32_t idx32[] = { -1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1}; - /*static*/ mpc_int32_t idx50[] = { -2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2}; - /*static*/ mpc_int32_t idx51[] = { -2,-2,-2,-2,-2,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2}; + static const mpc_int32_t idx30[] = { -1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1}; + static const mpc_int32_t idx31[] = { -1,-1,-1, 0, 0, 0, 1, 1, 1,-1,-1,-1, 0, 0, 0, 1, 1, 1,-1,-1,-1, 0, 0, 0, 1, 1, 1}; + static const mpc_int32_t idx32[] = { -1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1}; + static const mpc_int32_t idx50[] = { -2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2}; + static const mpc_int32_t idx51[] = { -2,-2,-2,-2,-2,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2}; mpc_int32_t n,k; @@ -914,8 +867,8 @@ for (n=1; n <= d->Max_Band; ++n, ++ResL, ++ResR) { - idx = mpc_decoder_huffman_decode_fast(d, mpc_table_HuffHdr); + idx = mpc_decoder_huffman_decode(d, mpc_table_HuffHdr, 9); *ResL = (idx!=4) ? *(ResL-1) + idx : (int) mpc_decoder_bitstream_read(d, 4); - idx = mpc_decoder_huffman_decode_fast(d, mpc_table_HuffHdr); + idx = mpc_decoder_huffman_decode(d, mpc_table_HuffHdr, 9); *ResR = (idx!=4) ? *(ResR-1) + idx : (int) mpc_decoder_bitstream_read(d, 4); @@ -935,6 +888,6 @@ ResR = d->Res_R; for (n=0; n <= Max_used_Band; ++n, ++L, ++R, ++ResL, ++ResR) { - if (*ResL) *L = mpc_decoder_huffman_decode_faster(d, mpc_table_HuffSCFI); - if (*ResR) *R = mpc_decoder_huffman_decode_faster(d, mpc_table_HuffSCFI); + if (*ResL) *L = mpc_decoder_huffman_decode(d, mpc_table_HuffSCFI, 3); + if (*ResR) *R = mpc_decoder_huffman_decode(d, mpc_table_HuffSCFI, 3); } @@ -947,16 +900,15 @@ if (*ResL) { - L[2] = d->DSCF_Reference_L[n]; switch (d->SCFI_L[n]) { case 1: - idx = mpc_decoder_huffman_decode_fast(d, mpc_table_HuffDSCF); + idx = mpc_decoder_huffman_decode(d, mpc_table_HuffDSCF, 6); L[0] = (idx!=8) ? L[2] + idx : (int) mpc_decoder_bitstream_read(d, 6); - idx = mpc_decoder_huffman_decode_fast(d, mpc_table_HuffDSCF); + idx = mpc_decoder_huffman_decode(d, mpc_table_HuffDSCF, 6); L[1] = (idx!=8) ? L[0] + idx : (int) mpc_decoder_bitstream_read(d, 6); L[2] = L[1]; break; case 3: - idx = mpc_decoder_huffman_decode_fast(d, mpc_table_HuffDSCF); + idx = mpc_decoder_huffman_decode(d, mpc_table_HuffDSCF, 6); L[0] = (idx!=8) ? L[2] + idx : (int) mpc_decoder_bitstream_read(d, 6); L[1] = L[0]; @@ -964,39 +916,41 @@ break; case 2: - idx = mpc_decoder_huffman_decode_fast(d, mpc_table_HuffDSCF); + idx = mpc_decoder_huffman_decode(d, mpc_table_HuffDSCF, 6); L[0] = (idx!=8) ? L[2] + idx : (int) mpc_decoder_bitstream_read(d, 6); L[1] = L[0]; - idx = mpc_decoder_huffman_decode_fast(d, mpc_table_HuffDSCF); + idx = mpc_decoder_huffman_decode(d, mpc_table_HuffDSCF, 6); L[2] = (idx!=8) ? L[1] + idx : (int) mpc_decoder_bitstream_read(d, 6); break; case 0: - idx = mpc_decoder_huffman_decode_fast(d, mpc_table_HuffDSCF); + idx = mpc_decoder_huffman_decode(d, mpc_table_HuffDSCF, 6); L[0] = (idx!=8) ? L[2] + idx : (int) mpc_decoder_bitstream_read(d, 6); - idx = mpc_decoder_huffman_decode_fast(d, mpc_table_HuffDSCF); + idx = mpc_decoder_huffman_decode(d, mpc_table_HuffDSCF, 6); L[1] = (idx!=8) ? L[0] + idx : (int) mpc_decoder_bitstream_read(d, 6); - idx = mpc_decoder_huffman_decode_fast(d, mpc_table_HuffDSCF); + idx = mpc_decoder_huffman_decode(d, mpc_table_HuffDSCF, 6); L[2] = (idx!=8) ? L[1] + idx : (int) mpc_decoder_bitstream_read(d, 6); break; default: return; - break; - } - // update Reference for DSCF - d->DSCF_Reference_L[n] = L[2]; + } + if (L[0] > 1024) + L[0] = 0x8080; + if (L[1] > 1024) + L[1] = 0x8080; + if (L[2] > 1024) + L[2] = 0x8080; } if (*ResR) { - R[2] = d->DSCF_Reference_R[n]; switch (d->SCFI_R[n]) { case 1: - idx = mpc_decoder_huffman_decode_fast(d, mpc_table_HuffDSCF); + idx = mpc_decoder_huffman_decode(d, mpc_table_HuffDSCF, 6); R[0] = (idx!=8) ? R[2] + idx : (int) mpc_decoder_bitstream_read(d, 6); - idx = mpc_decoder_huffman_decode_fast(d, mpc_table_HuffDSCF); + idx = mpc_decoder_huffman_decode(d, mpc_table_HuffDSCF, 6); R[1] = (idx!=8) ? R[0] + idx : (int) mpc_decoder_bitstream_read(d, 6); R[2] = R[1]; break; case 3: - idx = mpc_decoder_huffman_decode_fast(d, mpc_table_HuffDSCF); + idx = mpc_decoder_huffman_decode(d, mpc_table_HuffDSCF, 6); R[0] = (idx!=8) ? R[2] + idx : (int) mpc_decoder_bitstream_read(d, 6); R[1] = R[0]; @@ -1004,26 +958,33 @@ break; case 2: - idx = mpc_decoder_huffman_decode_fast(d, mpc_table_HuffDSCF); + idx = mpc_decoder_huffman_decode(d, mpc_table_HuffDSCF, 6); R[0] = (idx!=8) ? R[2] + idx : (int) mpc_decoder_bitstream_read(d, 6); R[1] = R[0]; - idx = mpc_decoder_huffman_decode_fast(d, mpc_table_HuffDSCF); + idx = mpc_decoder_huffman_decode(d, mpc_table_HuffDSCF, 6); R[2] = (idx!=8) ? R[1] + idx : (int) mpc_decoder_bitstream_read(d, 6); break; case 0: - idx = mpc_decoder_huffman_decode_fast(d, mpc_table_HuffDSCF); + idx = mpc_decoder_huffman_decode(d, mpc_table_HuffDSCF, 6); R[0] = (idx!=8) ? R[2] + idx : (int) mpc_decoder_bitstream_read(d, 6); - idx = mpc_decoder_huffman_decode_fast(d, mpc_table_HuffDSCF); + idx = mpc_decoder_huffman_decode(d, mpc_table_HuffDSCF, 6); R[1] = (idx!=8) ? R[0] + idx : (int) mpc_decoder_bitstream_read(d, 6); - idx = mpc_decoder_huffman_decode_fast(d, mpc_table_HuffDSCF); + idx = mpc_decoder_huffman_decode(d, mpc_table_HuffDSCF, 6); R[2] = (idx!=8) ? R[1] + idx : (int) mpc_decoder_bitstream_read(d, 6); break; default: return; - break; - } - // update Reference for DSCF - d->DSCF_Reference_R[n] = R[2]; - } - } + } + if (R[0] > 1024) + R[0] = 0x8080; + if (R[1] > 1024) + R[1] = 0x8080; + if (R[2] > 1024) + R[2] = 0x8080; + } + } + + if (seeking == TRUE) + return; + /***************************** Samples ****************************/ ResL = d->Res_L; @@ -1053,5 +1014,5 @@ for (k=0; k<12; ++k) { - idx = mpc_decoder_huffman_decode_fast(d, Table); + idx = mpc_decoder_huffman_decode(d, Table, 9); *L++ = idx30[idx]; *L++ = idx31[idx]; @@ -1063,5 +1024,5 @@ for (k=0; k<18; ++k) { - idx = mpc_decoder_huffman_decode_fast(d, Table); + idx = mpc_decoder_huffman_decode(d, Table, 10); *L++ = idx50[idx]; *L++ = idx51[idx]; @@ -1072,10 +1033,10 @@ Table = mpc_table_HuffQ[mpc_decoder_bitstream_read(d, 1)][*ResL]; for (k=0; k<36; ++k) - *L++ = mpc_decoder_huffman_decode_faster(d, Table); + *L++ = mpc_decoder_huffman_decode(d, Table, 5); break; case 5: Table = mpc_table_HuffQ[mpc_decoder_bitstream_read(d, 1)][*ResL]; for (k=0; k<36; ++k) - *L++ = mpc_decoder_huffman_decode_fast(d, Table); + *L++ = mpc_decoder_huffman_decode(d, Table, 8); break; case 6: @@ -1083,5 +1044,5 @@ Table = mpc_table_HuffQ[mpc_decoder_bitstream_read(d, 1)][*ResL]; for (k=0; k<36; ++k) - *L++ = mpc_decoder_huffman_decode(d, Table); + *L++ = mpc_decoder_huffman_decode(d, Table, 14); break; case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15: case 16: case 17: @@ -1113,5 +1074,5 @@ for (k=0; k<12; ++k) { - idx = mpc_decoder_huffman_decode_fast(d, Table); + idx = mpc_decoder_huffman_decode(d, Table, 9); *R++ = idx30[idx]; *R++ = idx31[idx]; @@ -1123,5 +1084,5 @@ for (k=0; k<18; ++k) { - idx = mpc_decoder_huffman_decode_fast(d, Table); + idx = mpc_decoder_huffman_decode(d, Table, 10); *R++ = idx50[idx]; *R++ = idx51[idx]; @@ -1132,10 +1093,10 @@ Table = mpc_table_HuffQ[mpc_decoder_bitstream_read(d, 1)][*ResR]; for (k=0; k<36; ++k) - *R++ = mpc_decoder_huffman_decode_faster(d, Table); + *R++ = mpc_decoder_huffman_decode(d, Table, 5); break; case 5: Table = mpc_table_HuffQ[mpc_decoder_bitstream_read(d, 1)][*ResR]; for (k=0; k<36; ++k) - *R++ = mpc_decoder_huffman_decode_fast(d, Table); + *R++ = mpc_decoder_huffman_decode(d, Table, 8); break; case 6: @@ -1143,5 +1104,5 @@ Table = mpc_table_HuffQ[mpc_decoder_bitstream_read(d, 1)][*ResR]; for (k=0; k<36; ++k) - *R++ = mpc_decoder_huffman_decode(d, Table); + *R++ = mpc_decoder_huffman_decode(d, Table, 14); break; case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15: case 16: case 17: @@ -1163,6 +1124,4 @@ d->StreamVersion = 0; d->MS_used = 0; - d->FwdJumpInfo = 0; - d->ActDecodePos = 0; d->FrameWasValid = 0; d->OverallFrames = 0; @@ -1175,10 +1134,8 @@ d->__r2 = 1; - d->dword = 0; - d->pos = 0; - d->Zaehler = 0; - d->WordsRead = 0; d->Max_Band = 0; - + d->seeking_window = FAST_SEEKING_WINDOW; + + mpc_decoder_reset_bitstream_decode(d); mpc_decoder_initialisiere_quantisierungstabellen(d, 1.0f); #if 0 @@ -1186,4 +1143,17 @@ mpc_decoder_init_huffman_sv7(d); #endif +} + +static mpc_uint32_t get_initial_fpos(mpc_decoder *d) +{ + mpc_uint32_t fpos = 0; + switch ( d->StreamVersion ) { // setting position to the beginning of the data-bitstream + case 0x04: fpos = 48; break; + case 0x05: + case 0x06: fpos = 64; break; + case 0x07: + case 0x17: fpos = 200; break; + } + return fpos; } @@ -1209,71 +1179,20 @@ // AB: setting position to the beginning of the data-bitstream - switch (d->StreamVersion) { - case 0x04: f_seek(d, 4 + d->MPCHeaderPos); d->pos = 16; break; // Geht auch über eine der Helperfunktionen - case 0x05: - case 0x06: f_seek(d, 8 + d->MPCHeaderPos); d->pos = 0; break; - case 0x07: - case 0x17: /*f_seek ( 24 + d->MPCHeaderPos );*/ d->pos = 8; break; - default: return FALSE; - } - - // AB: fill buffer and initialize decoder - f_read_dword(d, d->Speicher, MEMSIZE ); - d->dword = d->Speicher[d->Zaehler = 0]; + mpc_decoder_seek(d, get_initial_fpos(d)); + + d->seeking_pwr = 0; + while (d->OverallFrames > (SEEKING_TABLE_SIZE << d->seeking_pwr)) + d->seeking_pwr++; + d->seeking_table_frames = 0; + d->seeking_table[0] = get_initial_fpos(d); return TRUE; } -//--------------------------------------------------------------- -// will seek from the beginning of the file to the desired -// position in ms (given by seek_needed) -//--------------------------------------------------------------- -#if 0 -static void -helper1(mpc_decoder *d, mpc_uint32_t bitpos) -{ - f_seek(d, (bitpos >> 5) * 4 + d->MPCHeaderPos); - f_read_dword(d, d->Speicher, 2); - d->dword = d->Speicher[d->Zaehler = 0]; - d->pos = bitpos & 31; -} -#endif - -static void -helper2(mpc_decoder *d, mpc_uint32_t bitpos) -{ - f_seek(d, (bitpos>>5) * 4 + d->MPCHeaderPos); - f_read_dword(d, d->Speicher, MEMSIZE); - d->dword = d->Speicher[d->Zaehler = 0]; - d->pos = bitpos & 31; -} - -#if 0 -static void -helper3(mpc_decoder *d, mpc_uint32_t bitpos, mpc_uint32_t* buffoffs) -{ - d->pos = bitpos & 31; - bitpos >>= 5; - if ((mpc_uint32_t)(bitpos - *buffoffs) >= MEMSIZE - 2) { - *buffoffs = bitpos; - f_seek(d, bitpos * 4L + d->MPCHeaderPos); - f_read_dword(d, d->Speicher, MEMSIZE ); - } - d->dword = d->Speicher[d->Zaehler = bitpos - *buffoffs ]; -} -#endif - -static mpc_uint32_t get_initial_fpos(mpc_decoder *d, mpc_uint32_t StreamVersion) -{ - mpc_uint32_t fpos = 0; - (void) StreamVersion; - switch ( d->StreamVersion ) { // setting position to the beginning of the data-bitstream - case 0x04: fpos = 48; break; - case 0x05: - case 0x06: fpos = 64; break; - case 0x07: - case 0x17: fpos = 200; break; - } - return fpos; +void mpc_decoder_set_seeking(mpc_decoder *d, mpc_streaminfo *si, mpc_bool_t fast_seeking) +{ + d->seeking_window = FAST_SEEKING_WINDOW; + if (si->fast_seek == 0 && fast_seeking == 0) + d->seeking_window = SLOW_SEEKING_WINDOW; } @@ -1291,19 +1210,4 @@ d->samples_to_skip = MPC_DECODER_SYNTH_DELAY + (mpc_uint32_t)(destsample % MPC_FRAME_LENGTH); - memset(d->Y_L , 0, sizeof d->Y_L ); - memset(d->Y_R , 0, sizeof d->Y_R ); - memset(d->SCF_Index_L , 0, sizeof d->SCF_Index_L ); - memset(d->SCF_Index_R , 0, sizeof d->SCF_Index_R ); - memset(d->Res_L , 0, sizeof d->Res_L ); - memset(d->Res_R , 0, sizeof d->Res_R ); - memset(d->SCFI_L , 0, sizeof d->SCFI_L ); - memset(d->SCFI_R , 0, sizeof d->SCFI_R ); - memset(d->DSCF_Flag_L , 0, sizeof d->DSCF_Flag_L ); - memset(d->DSCF_Flag_R , 0, sizeof d->DSCF_Flag_R ); - memset(d->DSCF_Reference_L, 0, sizeof d->DSCF_Reference_L ); - memset(d->DSCF_Reference_R, 0, sizeof d->DSCF_Reference_R ); - memset(d->Q , 0, sizeof d->Q ); - memset(d->MS_Flag , 0, sizeof d->MS_Flag ); - // resetting synthesis filter to avoid "clicks" mpc_decoder_reset_synthesis(d); @@ -1312,55 +1216,50 @@ fwd = fwd < d->OverallFrames ? fwd : d->OverallFrames; - // reset number of decoded frames - d->DecodedFrames = 0; - - fpos = get_initial_fpos(d, d->StreamVersion); - if (fpos == 0) { - return FALSE; - } - - helper2(d, fpos); + if (fwd > d->DecodedFrames + d->seeking_window || fwd < d->DecodedFrames) { + memset(d->SCF_Index_L, 1, sizeof d->SCF_Index_L ); + memset(d->SCF_Index_R, 1, sizeof d->SCF_Index_R ); + } + + if (d->seeking_table_frames > d->DecodedFrames || fwd < d->DecodedFrames) { + d->DecodedFrames = 0; + if (fwd > d->seeking_window) + d->DecodedFrames = (fwd - d->seeking_window) & (-1 << d->seeking_pwr); + if (d->DecodedFrames > d->seeking_table_frames) + d->DecodedFrames = d->seeking_table_frames; + fpos = d->seeking_table[d->DecodedFrames >> d->seeking_pwr]; + mpc_decoder_seek(d, fpos); + } // read the last 32 frames before the desired position to scan the scalefactors (artifactless jumping) for ( ; d->DecodedFrames < fwd; d->DecodedFrames++ ) { - mpc_uint32_t FrameBitCnt; - mpc_uint32_t RING; - RING = d->Zaehler; - d->FwdJumpInfo = mpc_decoder_bitstream_read(d, 20); // read jump-info - d->ActDecodePos = (d->Zaehler << 5) + d->pos; - FrameBitCnt = mpc_decoder_bits_read(d); // scanning the scalefactors and check for validity of frame - if (d->StreamVersion >= 7) { - mpc_decoder_read_bitstream_sv7(d); - } - else { + mpc_uint32_t RING = d->Zaehler; + mpc_uint32_t FwdJumpInfo; + + // add seeking info + if (d->seeking_table_frames < d->DecodedFrames && + (d->DecodedFrames & ((1 << d->seeking_pwr) - 1)) == 0) { + d->seeking_table[d->DecodedFrames >> d->seeking_pwr] = mpc_decoder_bits_read(d); + d->seeking_table_frames = d->DecodedFrames; + } + + FwdJumpInfo = mpc_decoder_bitstream_read(d, 20) + mpc_decoder_bits_read(d); // read jump-info + + if (fwd <= d->DecodedFrames + d->seeking_window) { + if (d->StreamVersion >= 7) { + mpc_decoder_read_bitstream_sv7(d, TRUE); + } else { #ifdef MPC_SUPPORT_SV456 - mpc_decoder_read_bitstream_sv6(d); + mpc_decoder_read_bitstream_sv6(d, TRUE); #else - return FALSE; + return FALSE; #endif - } - if (mpc_decoder_bits_read(d) - FrameBitCnt != d->FwdJumpInfo ) { - // Box ("Bug in perform_jump"); - return FALSE; - } + } + } + mpc_decoder_bitstream_jump(d, FwdJumpInfo - mpc_decoder_bits_read(d)); + // update buffer - if ((RING ^ d->Zaehler) & MEMSIZE2) { - f_read_dword(d, d->Speicher + (RING & MEMSIZE2), MEMSIZE2); - } - } - - // LastBitsRead = BitsRead (); - // LastFrame = d->DecodedFrames; + mpc_decoder_update_buffer(d, RING); + } return TRUE; } - -void mpc_decoder_update_buffer(mpc_decoder *d, mpc_uint32_t RING) -{ - if ((RING ^ d->Zaehler) & MEMSIZE2 ) { - // update buffer - f_read_dword(d, d->Speicher + (RING & MEMSIZE2), MEMSIZE2); - } -} - - Index: /libmpcdec/trunk/src/streaminfo.c =================================================================== --- /libmpcdec/trunk/src/streaminfo.c (revision 36) +++ /libmpcdec/trunk/src/streaminfo.c (revision 37) @@ -96,4 +96,5 @@ si->is_true_gapless = (HeaderData[5] >> 31) & 0x0001; // true gapless: used? si->last_frame_samples = (HeaderData[5] >> 20) & 0x07FF; // true gapless: valid samples for last frame + si->fast_seek = (HeaderData[5] >> 19) & 0x0001; // fast seeking si->encoder_version = (HeaderData[6] >> 24) & 0x00FF;