Musepack SV8 demuxer and decoder

Originally committed as revision 10938 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 files changed, 1317 insertions, 5 deletions

diff --git a/doc/general.texi b/doc/general.texi
index cd0f7e7455..4ff292181f 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -314,7 +314,7 @@ following image formats are supported:
 @tab Codec used in Delphine Software games.
 @item Intel Music Coder      @tab      @tab X
 @item Musepack               @tab      @tab X
-@tab Only SV7 is supported
+@tab SV7 and SV8 are supported
 @item DT$ Coherent Audio     @tab      @tab X
 @item ATRAC 3                @tab      @tab X
 @item Monkey's Audio         @tab      @tab X @tab Only versions 3.97-3.99 are supported
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 0265506327..dcd837d5ed 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -115,6 +115,7 @@ OBJS-$(CONFIG_MP3_DECODER)             += mpegaudiodec.o mpegaudiodecheader.o mp
 OBJS-$(CONFIG_MP3ADU_DECODER)          += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
 OBJS-$(CONFIG_MP3ON4_DECODER)          += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
 OBJS-$(CONFIG_MPC7_DECODER)            += mpc7.o mpc.o mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
+OBJS-$(CONFIG_MPC8_DECODER)            += mpc8.o mpc.o mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
 OBJS-$(CONFIG_MPEG1VIDEO_ENCODER)      += mpeg12enc.o mpeg12data.o mpegvideo_enc.o motion_est.o ratecontrol.o
 OBJS-$(CONFIG_MPEG2VIDEO_ENCODER)      += mpeg12enc.o mpeg12data.o mpegvideo_enc.o motion_est.o ratecontrol.o
 OBJS-$(CONFIG_MPEG4_DECODER)           += h263dec.o h263.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 7813cf3914..bb1c293baa 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -187,6 +187,7 @@ void avcodec_register_all(void)
     REGISTER_DECODER (MP3ADU, mp3adu);
     REGISTER_DECODER (MP3ON4, mp3on4);
     REGISTER_DECODER (MPC7, mpc7);
+    REGISTER_DECODER (MPC8, mpc8);
     REGISTER_DECODER (NELLYMOSER, nellymoser);
     REGISTER_DECODER (QDM2, qdm2);
     REGISTER_DECODER (RA_144, ra_144);
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 202f9e8aa1..a1ee6691af 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -33,8 +33,8 @@
 #define AV_STRINGIFY(s)         AV_TOSTRING(s)
 #define AV_TOSTRING(s) #s
 
-#define LIBAVCODEC_VERSION_INT  ((51<<16)+(47<<8)+2)
-#define LIBAVCODEC_VERSION      51.47.2
+#define LIBAVCODEC_VERSION_INT  ((51<<16)+(48<<8)+0)
+#define LIBAVCODEC_VERSION      51.48.0
 #define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
 
 #define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
@@ -272,6 +272,7 @@ enum CodecID {
     CODEC_ID_VOXWARE,
     CODEC_ID_APE,
     CODEC_ID_NELLYMOSER,
+    CODEC_ID_MUSEPACK8,
 
     /* subtitle codecs */
     CODEC_ID_DVD_SUBTITLE= 0x17000,
diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c
new file mode 100644
index 0000000000..c6c62f6611
--- /dev/null
+++ b/libavcodec/mpc8.c
@@ -0,0 +1,364 @@
+/*
+ * Musepack SV8 decoder
+ * Copyright (c) 2007 Konstantin Shishkov
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file mpc8.c Musepack SV8 decoder
+ * MPEG Audio Layer 1/2 -like codec with frames of 1152 samples
+ * divided into 32 subbands.
+ */
+
+#include "avcodec.h"
+#include "bitstream.h"
+#include "dsputil.h"
+#include "random.h"
+
+#ifdef CONFIG_MPEGAUDIO_HP
+#define USE_HIGHPRECISION
+#endif
+#include "mpegaudio.h"
+
+#include "mpc.h"
+#include "mpcdata.h"
+#include "mpc8data.h"
+#include "mpc8huff.h"
+
+static VLC band_vlc, scfi_vlc[2], dscf_vlc[2], res_vlc[2];
+static VLC q1_vlc, q2_vlc[2], q3_vlc[2], quant_vlc[4][2], q9up_vlc;
+
+static const int q3_offsets[2] = { MPC8_Q3_OFFSET, MPC8_Q4_OFFSET };
+static const int quant_offsets[6] = { MPC8_Q5_OFFSET, MPC8_Q6_OFFSET, MPC8_Q7_OFFSET, MPC8_Q8_OFFSET };
+
+static inline int mpc8_dec_base(GetBitContext *gb, int k, int n)
+{
+    int code = get_bits(gb, mpc8_cnk_len[k-1][n-1] - 1);
+
+    if (code >= mpc8_cnk_lost[k-1][n-1])
+        code = ((code << 1) | get_bits1(gb)) - mpc8_cnk_lost[k-1][n-1];
+
+    return code;
+}
+
+static inline int mpc8_dec_enum(GetBitContext *gb, int k, int n)
+{
+    int bits = 0;
+    const uint32_t * C = mpc8_cnk[k-1];
+    int code = mpc8_dec_base(gb, k, n);
+
+    do {
+        n--;
+        if (code >= C[n]) {
+            bits |= 1 << n;
+            code -= C[n];
+            C -= 32;
+            k--;
+        }
+    } while(k > 0);
+
+    return bits;
+}
+
+static inline int mpc8_get_mod_golomb(GetBitContext *gb, int m)
+{
+    if(mpc8_cnk_len[0][m] < 1) return 0;
+    return mpc8_dec_base(gb, 1, m+1);
+}
+
+static int mpc8_get_mask(GetBitContext *gb, int size, int t)
+{
+    int mask = 0;
+
+    if(t && t != size)
+         mask = mpc8_dec_enum(gb, FFMIN(t, size - t), size);
+    if((t << 1) > size) mask = ~mask;
+
+    return mask;
+}
+
+static int mpc8_decode_init(AVCodecContext * avctx)
+{
+    int i;
+    MPCContext *c = avctx->priv_data;
+    GetBitContext gb;
+    static int vlc_inited = 0;
+
+    if(avctx->extradata_size < 2){
+        av_log(avctx, AV_LOG_ERROR, "Too small extradata size (%i)!\n", avctx->extradata_size);
+        return -1;
+    }
+    memset(c->oldDSCF, 0, sizeof(c->oldDSCF));
+    av_init_random(0xDEADBEEF, &c->rnd);
+    dsputil_init(&c->dsp, avctx);
+
+    ff_mpc_init();
+
+    init_get_bits(&gb, avctx->extradata, 16);
+
+    skip_bits(&gb, 3);//sample rate
+    c->maxbands = get_bits(&gb, 5) + 1;
+    skip_bits(&gb, 4);//channels
+    c->MSS = get_bits1(&gb);
+    c->frames = 1 << (get_bits(&gb, 3) * 2);
+
+    if(vlc_inited) return 0;
+    av_log(avctx, AV_LOG_DEBUG, "Initing VLC\n");
+
+    init_vlc(&band_vlc, MPC8_BANDS_BITS, MPC8_BANDS_SIZE,
+             mpc8_bands_bits,  1, 1,
+             mpc8_bands_codes, 1, 1, INIT_VLC_USE_STATIC);
+
+    init_vlc(&q1_vlc, MPC8_Q1_BITS, MPC8_Q1_SIZE,
+             mpc8_q1_bits,  1, 1,
+             mpc8_q1_codes, 1, 1, INIT_VLC_USE_STATIC);
+    init_vlc(&q9up_vlc, MPC8_Q9UP_BITS, MPC8_Q9UP_SIZE,
+             mpc8_q9up_bits,  1, 1,
+             mpc8_q9up_codes, 1, 1, INIT_VLC_USE_STATIC);
+
+    init_vlc(&scfi_vlc[0], MPC8_SCFI0_BITS, MPC8_SCFI0_SIZE,
+             mpc8_scfi0_bits,  1, 1,
+             mpc8_scfi0_codes, 1, 1, INIT_VLC_USE_STATIC);
+    init_vlc(&scfi_vlc[1], MPC8_SCFI1_BITS, MPC8_SCFI1_SIZE,
+             mpc8_scfi1_bits,  1, 1,
+             mpc8_scfi1_codes, 1, 1, INIT_VLC_USE_STATIC);
+
+    init_vlc(&dscf_vlc[0], MPC8_DSCF0_BITS, MPC8_DSCF0_SIZE,
+             mpc8_dscf0_bits,  1, 1,
+             mpc8_dscf0_codes, 1, 1, INIT_VLC_USE_STATIC);
+    init_vlc(&dscf_vlc[1], MPC8_DSCF1_BITS, MPC8_DSCF1_SIZE,
+             mpc8_dscf1_bits,  1, 1,
+             mpc8_dscf1_codes, 1, 1, INIT_VLC_USE_STATIC);
+
+    init_vlc_sparse(&q3_vlc[0], MPC8_Q3_BITS, MPC8_Q3_SIZE,
+             mpc8_q3_bits,  1, 1,
+             mpc8_q3_codes, 1, 1,
+             mpc8_q3_syms,  1, 1, INIT_VLC_USE_STATIC);
+    init_vlc_sparse(&q3_vlc[1], MPC8_Q4_BITS, MPC8_Q4_SIZE,
+             mpc8_q4_bits,  1, 1,
+             mpc8_q4_codes, 1, 1,
+             mpc8_q4_syms,  1, 1, INIT_VLC_USE_STATIC);
+
+    for(i = 0; i < 2; i++){
+        init_vlc(&res_vlc[i], MPC8_RES_BITS, MPC8_RES_SIZE,
+                 &mpc8_res_bits[i],  1, 1,
+                 &mpc8_res_codes[i], 1, 1, INIT_VLC_USE_STATIC);
+
+        init_vlc(&q2_vlc[i], MPC8_Q2_BITS, MPC8_Q2_SIZE,
+                 &mpc8_q2_bits[i],  1, 1,
+                 &mpc8_q2_codes[i], 1, 1, INIT_VLC_USE_STATIC);
+
+        init_vlc(&quant_vlc[0][i], MPC8_Q5_BITS, MPC8_Q5_SIZE,
+                 &mpc8_q5_bits[i],  1, 1,
+                 &mpc8_q5_codes[i], 1, 1, INIT_VLC_USE_STATIC);
+        init_vlc(&quant_vlc[1][i], MPC8_Q6_BITS, MPC8_Q6_SIZE,
+                 &mpc8_q6_bits[i],  1, 1,
+                 &mpc8_q6_codes[i], 1, 1, INIT_VLC_USE_STATIC);
+        init_vlc(&quant_vlc[2][i], MPC8_Q7_BITS, MPC8_Q7_SIZE,
+                 &mpc8_q7_bits[i],  1, 1,
+                 &mpc8_q7_codes[i], 1, 1, INIT_VLC_USE_STATIC);
+        init_vlc(&quant_vlc[3][i], MPC8_Q8_BITS, MPC8_Q8_SIZE,
+                 &mpc8_q8_bits[i],  1, 1,
+                 &mpc8_q8_codes[i], 1, 1, INIT_VLC_USE_STATIC);
+    }
+    vlc_inited = 1;
+    return 0;
+}
+
+static int mpc8_decode_frame(AVCodecContext * avctx,
+                            void *data, int *data_size,
+                            uint8_t * buf, int buf_size)
+{
+    MPCContext *c = avctx->priv_data;
+    GetBitContext gb2, *gb = &gb2;
+    int i, j, k, ch, cnt, res, t;
+    Band *bands = c->bands;
+    int off;
+    int maxband, keyframe;
+    int last[2];
+
+    keyframe = c->cur_frame == 0;
+
+    if(keyframe){
+        memset(c->Q, 0, sizeof(c->Q));
+        c->last_bits_used = 0;
+    }
+    init_get_bits(gb, buf, buf_size * 8);
+    skip_bits(gb, c->last_bits_used & 7);
+
+    if(keyframe)
+        maxband = mpc8_get_mod_golomb(gb, c->maxbands + 1);
+    else{
+        maxband = c->last_max_band + get_vlc2(gb, band_vlc.table, MPC8_BANDS_BITS, 2);
+        if(maxband > 32) maxband -= 33;
+    }
+    c->last_max_band = maxband;
+
+    /* read subband indexes */
+    if(maxband){
+        last[0] = last[1] = 0;
+        for(i = maxband - 1; i >= 0; i--){
+            for(ch = 0; ch < 2; ch++){
+                last[ch] = get_vlc2(gb, res_vlc[last[ch] > 2].table, MPC8_RES_BITS, 2) + last[ch];
+                if(last[ch] > 15) last[ch] -= 17;
+                bands[i].res[ch] = last[ch];
+            }
+        }
+        if(c->MSS){
+            int mask;
+
+            cnt = 0;
+            for(i = 0; i < maxband; i++)
+                if(bands[i].res[0] || bands[i].res[1])
+                    cnt++;
+            t = mpc8_get_mod_golomb(gb, cnt);
+            mask = mpc8_get_mask(gb, cnt, t);
+            for(i = maxband - 1; i >= 0; i--)
+                if(bands[i].res[0] || bands[i].res[1]){
+                    bands[i].msf = mask & 1;
+                    mask >>= 1;
+                }
+        }
+    }
+    for(i = maxband; i < c->maxbands; i++)
+        bands[i].res[0] = bands[i].res[1] = 0;
+
+    if(keyframe){
+        for(i = 0; i < 32; i++)
+            c->oldDSCF[0][i] = c->oldDSCF[1][i] = 1;
+    }
+
+    for(i = 0; i < maxband; i++){
+        if(bands[i].res[0] || bands[i].res[1]){
+            cnt = !!bands[i].res[0] + !!bands[i].res[1] - 1;
+            if(cnt >= 0){
+                t = get_vlc2(gb, scfi_vlc[cnt].table, scfi_vlc[cnt].bits, 1);
+                if(bands[i].res[0]) bands[i].scfi[0] = t >> (2 * cnt);
+                if(bands[i].res[1]) bands[i].scfi[1] = t & 3;
+            }
+        }
+    }
+
+    for(i = 0; i < maxband; i++){
+        for(ch = 0; ch < 2; ch++){
+            if(!bands[i].res[ch]) continue;
+
+            if(c->oldDSCF[ch][i]){
+                bands[i].scf_idx[ch][0] = get_bits(gb, 7) - 6;
+                c->oldDSCF[ch][i] = 0;
+            }else{
+                t = get_vlc2(gb, dscf_vlc[1].table, MPC8_DSCF1_BITS, 2);
+                if(t == 64)
+                    t += get_bits(gb, 6);
+                bands[i].scf_idx[ch][0] = ((bands[i].scf_idx[ch][2] + t - 25) & 0x7F) - 6;
+            }
+            for(j = 0; j < 2; j++){
+                if((bands[i].scfi[ch] << j) & 2)
+                    bands[i].scf_idx[ch][j + 1] = bands[i].scf_idx[ch][j];
+                else{
+                    t = get_vlc2(gb, dscf_vlc[0].table, MPC8_DSCF0_BITS, 2);
+                    if(t == 31)
+                        t = 64 + get_bits(gb, 6);
+                    bands[i].scf_idx[ch][j + 1] = ((bands[i].scf_idx[ch][j] + t - 25) & 0x7F) - 6;
+                }
+            }
+        }
+    }
+
+    for(i = 0, off = 0; i < maxband; i++, off += SAMPLES_PER_BAND){
+        for(ch = 0; ch < 2; ch++){
+            res = bands[i].res[ch];
+            switch(res){
+            case -1:
+                for(j = 0; j < SAMPLES_PER_BAND; j++)
+                    c->Q[ch][off + j] = (av_random(&c->rnd) & 0x3FC) - 510;
+                break;
+            case 0:
+                break;
+            case 1:
+                for(j = 0; j < SAMPLES_PER_BAND; j += SAMPLES_PER_BAND / 2){
+                    cnt = get_vlc2(gb, q1_vlc.table, MPC8_Q1_BITS, 2);
+                    t = mpc8_get_mask(gb, 18, cnt);
+                    for(k = 0; k < SAMPLES_PER_BAND / 2; k++, t <<= 1)
+                        c->Q[ch][off + j + k] = (t & 0x20000) ? (get_bits1(gb) << 1) - 1 : 0;
+                }
+                break;
+            case 2:
+                cnt = 6;//2*mpc8_thres[res]
+                for(j = 0; j < SAMPLES_PER_BAND; j += 3){
+                    t = get_vlc2(gb, q2_vlc[cnt > 3].table, MPC8_Q2_BITS, 2);
+                    c->Q[ch][off + j + 0] = mpc8_idx50[t];
+                    c->Q[ch][off + j + 1] = mpc8_idx51[t];
+                    c->Q[ch][off + j + 2] = mpc8_idx52[t];
+                    cnt = (cnt >> 1) + mpc8_huffq2[t];
+                }
+                break;
+            case 3:
+            case 4:
+                for(j = 0; j < SAMPLES_PER_BAND; j += 2){
+                    t = get_vlc2(gb, q3_vlc[res - 3].table, MPC8_Q3_BITS, 2) + q3_offsets[res - 3];
+                    c->Q[ch][off + j + 1] = t >> 4;
+                    c->Q[ch][off + j + 0] = (t & 8) ? (t & 0xF) - 16 : (t & 0xF);
+                }
+                break;
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+                cnt = 2 * mpc8_thres[res];
+                for(j = 0; j < SAMPLES_PER_BAND; j++){
+                    t = get_vlc2(gb, quant_vlc[res - 5][cnt > mpc8_thres[res]].table, quant_vlc[res - 5][cnt > mpc8_thres[res]].bits, 2) + quant_offsets[res - 5];
+                    c->Q[ch][off + j] = t;
+                    cnt = (cnt >> 1) + FFABS(c->Q[ch][off + j]);
+                }
+                break;
+            default:
+                for(j = 0; j < SAMPLES_PER_BAND; j++){
+                    c->Q[ch][off + j] = get_vlc2(gb, q9up_vlc.table, MPC8_Q9UP_BITS, 2);
+                    if(res != 9){
+                        c->Q[ch][off + j] <<= res - 9;
+                        c->Q[ch][off + j] |= get_bits(gb, res - 9);
+                    }
+                    c->Q[ch][off + j] -= (1 << (res - 2)) - 1;
+                }
+            }
+        }
+    }
+
+    ff_mpc_dequantize_and_synth(c, maxband, data);
+
+    c->cur_frame++;
+
+    c->last_bits_used = get_bits_count(gb);
+    if(c->cur_frame >= c->frames)
+        c->cur_frame = 0;
+    *data_size =  MPC_FRAME_SIZE * 4;
+
+    return c->cur_frame ? c->last_bits_used >> 3 : buf_size;
+}
+
+AVCodec mpc8_decoder = {
+    "mpc sv8",
+    CODEC_TYPE_AUDIO,
+    CODEC_ID_MUSEPACK8,
+    sizeof(MPCContext),
+    mpc8_decode_init,
+    NULL,
+    NULL,
+    mpc8_decode_frame,
+};
diff --git a/libavcodec/mpc8data.h b/libavcodec/mpc8data.h
new file mode 100644
index 0000000000..280dd6ffd0
--- /dev/null
+++ b/libavcodec/mpc8data.h
@@ -0,0 +1,121 @@
+/*
+ * Musepack SV8 decoder
+ * Copyright (c) 2007 Konstantin Shishkov
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef FFMPEG_MPC8DATA_H
+#define FFMPEG_MPC8DATA_H
+
+#include <stdint.h>
+
+static const int8_t mpc8_idx50[125] = {
+    -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,
+    -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,
+    -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,
+    -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,
+    -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 int8_t mpc8_idx51[125] = {
+    -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,
+    -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,
+    -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,
+    -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,
+    -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 int8_t mpc8_idx52[125] = {
+    -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+};
+
+static const unsigned int mpc8_thres[] = {0, 0, 3, 0, 0, 1, 3, 4, 8};
+static const int8_t mpc8_huffq2[5*5*5] = {
+    6, 5, 4, 5, 6, 5, 4, 3, 4, 5, 4, 3, 2, 3, 4, 5, 4, 3, 4, 5, 6, 5, 4, 5,
+    6, 5, 4, 3, 4, 5, 4, 3, 2, 3, 4, 3, 2, 1, 2, 3, 4, 3, 2, 3, 4, 5, 4, 3,
+    4, 5, 4, 3, 2, 3, 4, 3, 2, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 2, 3, 4, 3,
+    2, 3, 4, 5, 4, 3, 4, 5, 4, 3, 2, 3, 4, 3, 2, 1, 2, 3, 4, 3, 2, 3, 4, 5,
+    4, 3, 4, 5, 6, 5, 4, 5, 6, 5, 4, 3, 4, 5, 4, 3, 2, 3, 4, 5, 4, 3, 4, 5,
+    6, 5, 4, 5, 6
+};
+
+
+static const uint32_t mpc8_cnk[16][32] =
+{
+    {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31},
+    {0, 0, 1, 3, 6, 10, 15, 21, 28, 36, 45, 55, 66, 78, 91, 105, 120, 136, 153, 171, 190, 210, 231, 253, 276, 300, 325, 351, 378, 406, 435, 465},
+    {0, 0, 0, 1, 4, 10, 20, 35, 56, 84, 120, 165, 220, 286, 364, 455, 560, 680, 816, 969, 1140, 1330, 1540, 1771, 2024, 2300, 2600, 2925, 3276, 3654, 4060, 4495},
+    {0, 0, 0, 0, 1, 5, 15, 35, 70, 126, 210, 330, 495, 715, 1001, 1365, 1820, 2380, 3060, 3876, 4845, 5985, 7315, 8855, 10626, 12650, 14950, 17550, 20475, 23751, 27405, 31465},
+    {0, 0, 0, 0, 0, 1, 6, 21, 56, 126, 252, 462, 792, 1287, 2002, 3003, 4368, 6188, 8568, 11628, 15504, 20349, 26334, 33649, 42504, 53130, 65780, 80730, 98280, 118755, 142506, 169911},
+    {0, 0, 0, 0, 0, 0, 1, 7, 28, 84, 210, 462, 924, 1716, 3003, 5005, 8008, 12376, 18564, 27132, 38760, 54264, 74613, 100947, 134596, 177100, 230230, 296010, 376740, 475020, 593775, 736281},
+    {0, 0, 0, 0, 0, 0, 0, 1, 8, 36, 120, 330, 792, 1716, 3432, 6435, 11440, 19448, 31824, 50388, 77520, 116280, 170544, 245157, 346104, 480700, 657800, 888030, 1184040, 1560780, 2035800, 2629575},
+    {0, 0, 0, 0, 0, 0, 0, 0, 1, 9, 45, 165, 495, 1287, 3003, 6435, 12870, 24310, 43758, 75582, 125970, 203490, 319770, 490314, 735471, 1081575, 1562275, 2220075, 3108105, 4292145, 5852925, 7888725},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 10, 55, 220, 715, 2002, 5005, 11440, 24310, 48620, 92378, 167960, 293930, 497420, 817190, 1307504, 2042975, 3124550, 4686825, 6906900, 10015005, 14307150, 20160075},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 11, 66, 286, 1001, 3003, 8008, 19448, 43758, 92378, 184756, 352716, 646646, 1144066, 1961256, 3268760, 5311735, 8436285, 13123110, 20030010, 30045015, 44352165},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 12, 78, 364, 1365, 4368, 12376, 31824, 75582, 167960, 352716, 705432, 1352078, 2496144, 4457400, 7726160, 13037895, 21474180, 34597290, 54627300, 84672315},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 13, 91, 455, 1820, 6188, 18564, 50388, 125970, 293930, 646646, 1352078, 2704156, 5200300, 9657700, 17383860, 30421755, 51895935, 86493225, 141120525},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 14, 105, 560, 2380, 8568, 27132, 77520, 203490, 497420, 1144066, 2496144, 5200300, 10400600, 20058300, 37442160, 67863915, 119759850, 206253075},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 15, 120, 680, 3060, 11628, 38760, 116280, 319770, 817190, 1961256, 4457400, 9657700, 20058300, 40116600, 77558760, 145422675, 265182525},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 16, 136, 816, 3876, 15504, 54264, 170544, 490314, 1307504, 3268760, 7726160, 17383860, 37442160, 77558760, 155117520, 300540195},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 153, 969, 4845, 20349, 74613, 245157, 735471, 2042975, 5311735, 13037895, 30421755, 67863915, 145422675, 300540195}
+};
+
+const static uint8_t mpc8_cnk_len[16][33] =
+{
+    {0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6},
+    {0, 0, 2, 3, 4, 4, 5, 5, 6, 6, 6, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0},
+    {0, 0, 0, 2, 4, 5, 6, 6, 7, 7, 8, 8, 9, 9, 9, 10, 10, 10, 10, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 13, 13, 0},
+    {0, 0, 0, 0, 3, 4, 6, 7, 7, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 15, 16, 0},
+    {0, 0, 0, 0, 0, 3, 5, 6, 7, 8, 9, 10, 11, 11, 12, 13, 13, 14, 14, 14, 15, 15, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 0},
+    {0, 0, 0, 0, 0, 0, 3, 5, 7, 8, 9, 10, 11, 12, 13, 13, 14, 15, 15, 16, 16, 17, 17, 18, 18, 18, 19, 19, 19, 20, 20, 20, 0},
+    {0, 0, 0, 0, 0, 0, 0, 3, 6, 7, 9, 10, 11, 12, 13, 14, 15, 15, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 21, 22, 22, 0},
+    {0, 0, 0, 0, 0, 0, 0, 0, 4, 6, 8, 9, 11, 12, 13, 14, 15, 16, 17, 17, 18, 19, 19, 20, 21, 21, 22, 22, 23, 23, 23, 24, 0},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 6, 8, 10, 11, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 21, 22, 23, 23, 24, 24, 25, 25, 0},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 7, 9, 10, 12, 13, 15, 16, 17, 18, 19, 20, 21, 21, 22, 23, 24, 24, 25, 25, 26, 26, 0},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 7, 9, 11, 13, 14, 15, 17, 18, 19, 20, 21, 22, 23, 23, 24, 25, 26, 26, 27, 27, 0},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 7, 9, 11, 13, 15, 16, 17, 19, 20, 21, 22, 23, 24, 25, 25, 26, 27, 28, 28, 0},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 7, 10, 12, 14, 15, 17, 18, 19, 21, 22, 23, 24, 25, 26, 27, 27, 28, 29, 0},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 7, 10, 12, 14, 16, 17, 19, 20, 21, 23, 24, 25, 26, 27, 28, 28, 29, 0},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 8, 10, 12, 14, 16, 18, 19, 21, 22, 23, 25, 26, 27, 28, 29, 30, 0},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 8, 10, 13, 15, 17, 18, 20, 21, 23, 24, 25, 27, 28, 29, 30, 0}
+
+};
+
+const static uint32_t mpc8_cnk_lost[16][33] =
+{
+    {0, 0, 1, 0, 3, 2, 1, 0, 7, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 31},
+    {0, 0, 1, 2, 6, 1, 11, 4, 28, 19, 9, 62, 50, 37, 23, 8, 120, 103, 85, 66, 46, 25, 3, 236, 212, 187, 161, 134, 106, 77, 47, 16, 0},
+    {0, 0, 0, 0, 6, 12, 29, 8, 44, 8, 91, 36, 226, 148, 57, 464, 344, 208, 55, 908, 718, 508, 277, 24, 1796, 1496, 1171, 820, 442, 36, 3697, 3232, 0},
+    {0, 0, 0, 0, 3, 1, 29, 58, 2, 46, 182, 17, 309, 23, 683, 228, 1716, 1036, 220, 3347, 2207, 877, 7529, 5758, 3734, 1434, 15218, 12293, 9017, 5363, 1303, 29576, 0},
+    {0, 0, 0, 0, 0, 2, 11, 8, 2, 4, 50, 232, 761, 46, 1093, 3824, 2004, 7816, 4756, 880, 12419, 6434, 31887, 23032, 12406, 65292, 50342, 32792, 12317, 119638, 92233, 60768, 0},
+    {0, 0, 0, 0, 0, 0, 1, 4, 44, 46, 50, 100, 332, 1093, 3187, 184, 4008, 14204, 5636, 26776, 11272, 56459, 30125, 127548, 85044, 31914, 228278, 147548, 49268, 454801, 312295, 142384, 0},
+    {0, 0, 0, 0, 0, 0, 0, 0, 28, 8, 182, 232, 332, 664, 1757, 4944, 13320, 944, 15148, 53552, 14792, 91600, 16987, 178184, 43588, 390776, 160546, 913112, 536372, 61352, 1564729, 828448, 0},
+    {0, 0, 0, 0, 0, 0, 0, 0, 7, 19, 91, 17, 761, 1093, 1757, 3514, 8458, 21778, 55490, 5102, 58654, 204518, 33974, 313105, 1015577, 534877, 1974229, 1086199, 4096463, 2535683, 499883, 6258916, 0},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 9, 36, 309, 46, 3187, 4944, 8458, 16916, 38694, 94184, 230358, 26868, 231386, 789648, 54177, 1069754, 3701783, 1481708, 6762211, 2470066, 13394357, 5505632, 0},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 62, 226, 23, 1093, 184, 13320, 21778, 38694, 77388, 171572, 401930, 953086, 135896, 925544, 3076873, 8340931, 3654106, 13524422, 3509417, 22756699, 2596624, 0},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 50, 148, 683, 3824, 4008, 944, 55490, 94184, 171572, 343144, 745074, 1698160, 3931208, 662448, 3739321, 12080252, 32511574, 12481564, 49545413, 5193248, 0},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 37, 57, 228, 2004, 14204, 15148, 5102, 230358, 401930, 745074, 1490148, 3188308, 7119516, 16170572, 3132677, 15212929, 47724503, 127314931, 42642616, 0},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 23, 464, 1716, 7816, 5636, 53552, 58654, 26868, 953086, 1698160, 3188308, 6376616, 13496132, 29666704, 66353813, 14457878, 62182381, 189497312, 0},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 8, 344, 1036, 4756, 26776, 14792, 204518, 231386, 135896, 3931208, 7119516, 13496132, 26992264, 56658968, 123012781, 3252931, 65435312, 0},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 120, 208, 220, 880, 11272, 91600, 33974, 789648, 925544, 662448, 16170572, 29666704, 56658968, 113317936, 236330717, 508019104, 0},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 103, 55, 3347, 12419, 56459, 16987, 313105, 54177, 3076873, 3739321, 3132677, 66353813, 123012781, 236330717, 0}
+};
+
+#endif /* FFMPEG_MPC8DATA_H */
diff --git a/libavcodec/mpc8huff.h b/libavcodec/mpc8huff.h
new file mode 100644
index 0000000000..21e7730ce6
--- /dev/null
+++ b/libavcodec/mpc8huff.h
@@ -0,0 +1,578 @@
+/*
+ * Musepack SV8 decoder
+ * Copyright (c) 2007 Konstantin Shishkov
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef FFMPEG_MPC8HUFF_H
+#define FFMPEG_MPC8HUFF_H
+
+#include <stdint.h>
+
+#define MPC8_BANDS_SIZE 33
+#define MPC8_BANDS_BITS 9
+
+static const uint8_t mpc8_bands_codes[MPC8_BANDS_SIZE] = {
+ 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04,
+ 0x05, 0x06, 0x01, 0x02, 0x03, 0x00, 0x04, 0x05,
+ 0x06, 0x07, 0x08, 0x01, 0x09, 0x0A, 0x0B, 0x07,
+ 0x08, 0x09, 0x06, 0x07, 0x05, 0x05, 0x03, 0x03,
+ 0x01,
+};
+static const int8_t mpc8_bands_bits[MPC8_BANDS_SIZE] = {
+  1,  3,  5,  6,  7,  8,  8,  9,
+ 10, 11, 12, 12, 12, 13, 12, 12,
+ 12, 12, 12, 13, 12, 12, 12, 11,
+ 11, 11, 10, 10,  9,  8,  6,  5,
+  2,
+};
+
+#define MPC8_SCFI0_SIZE 4
+#define MPC8_SCFI0_BITS 3
+
+static const uint8_t mpc8_scfi0_codes[MPC8_SCFI0_SIZE] = {
+ 0x00, 0x01, 0x01, 0x01,
+};
+static const int8_t mpc8_scfi0_bits[MPC8_SCFI0_SIZE] = {
+  3,  3,  1,  2,
+};
+
+#define MPC8_SCFI1_SIZE 16
+#define MPC8_SCFI1_BITS 7
+
+static const uint8_t mpc8_scfi1_codes[MPC8_SCFI1_SIZE] = {
+ 0x01, 0x00, 0x02, 0x03, 0x01, 0x03, 0x04, 0x05,
+ 0x04, 0x06, 0x02, 0x02, 0x05, 0x07, 0x03, 0x03,
+
+};
+static const int8_t mpc8_scfi1_bits[MPC8_SCFI1_SIZE] = {
+  6,  7,  6,  6,  7,  5,  5,  5,
+  6,  5,  2,  3,  6,  5,  3,  2,
+
+};
+
+#define MPC8_DSCF0_SIZE 64
+#define MPC8_DSCF0_BITS 9
+
+static const uint8_t mpc8_dscf0_codes[MPC8_DSCF0_SIZE] = {
+ 0x03, 0x04, 0x05, 0x04, 0x05, 0x06, 0x05, 0x06,
+ 0x07, 0x08, 0x09, 0x07, 0x08, 0x09, 0x0A, 0x07,
+ 0x08, 0x09, 0x0A, 0x07, 0x08, 0x09, 0x0A, 0x06,
+ 0x07, 0x05, 0x04, 0x05, 0x06, 0x06, 0x07, 0x0A,
+ 0x08, 0x05, 0x06, 0x07, 0x09, 0x07, 0x08, 0x09,
+ 0x0B, 0x0B, 0x0C, 0x0D, 0x0B, 0x0C, 0x0D, 0x0B,
+ 0x0C, 0x0D, 0x07, 0x08, 0x09, 0x06, 0x07, 0x03,
+ 0x04, 0x05, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
+};
+static const int8_t mpc8_dscf0_bits[MPC8_DSCF0_SIZE] = {
+ 12, 12, 12, 11, 11, 11, 10, 10,
+ 10, 10, 10,  9,  9,  9,  9,  8,
+  8,  8,  8,  7,  7,  7,  7,  6,
+  6,  5,  4,  4,  5,  4,  4, 10,
+  4,  3,  3,  3,  4,  5,  6,  6,
+  7,  8,  8,  8,  9,  9,  9, 10,
+ 10, 10, 11, 11, 11, 12, 12, 13,
+ 13, 13, 14, 14, 14, 14, 14, 14,
+
+};
+
+#define MPC8_DSCF1_SIZE 65
+#define MPC8_DSCF1_BITS 9
+
+static const uint8_t mpc8_dscf1_codes[MPC8_DSCF1_SIZE] = {
+ 0x00, 0x03, 0x04, 0x04, 0x05, 0x06, 0x05, 0x06,
+ 0x07, 0x08, 0x07, 0x08, 0x09, 0x0A, 0x07, 0x08,
+ 0x09, 0x0A, 0x07, 0x08, 0x09, 0x06, 0x07, 0x05,
+ 0x06, 0x04, 0x03, 0x03, 0x04, 0x03, 0x04, 0x05,
+ 0x06, 0x07, 0x05, 0x04, 0x05, 0x05, 0x07, 0x08,
+ 0x09, 0x0A, 0x0B, 0x0B, 0x0C, 0x0D, 0x0B, 0x0C,
+ 0x0D, 0x09, 0x0A, 0x0B, 0x0C, 0x07, 0x08, 0x09,
+ 0x05, 0x06, 0x07, 0x01, 0x02, 0x03, 0x04, 0x05,
+ 0x0D,
+};
+static const int8_t mpc8_dscf1_bits[MPC8_DSCF1_SIZE] = {
+ 15, 14, 14, 13, 13, 13, 12, 12,
+ 12, 12, 11, 11, 11, 11, 10, 10,
+ 10, 10,  9,  9,  9,  8,  8,  7,
+  7,  6,  5,  4,  4,  3,  3,  3,
+  3,  3,  4,  5,  5,  6,  7,  8,
+  8,  9,  9, 10, 10, 10, 11, 11,
+ 11, 12, 12, 12, 12, 13, 13, 13,
+ 14, 14, 14, 15, 15, 15, 15, 15,
+ 12,
+};
+
+#define MPC8_RES_SIZE 17
+#define MPC8_RES_BITS 9
+
+static const uint8_t mpc8_res_codes[2][MPC8_RES_SIZE] = {
+  {
+    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01,
+    0x01,
+  },
+  {
+    0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x00, 0x01, 0x02, 0x03, 0x01, 0x01, 0x01, 0x01,
+    0x03,
+  }
+};
+static const int8_t mpc8_res_bits[2][MPC8_RES_SIZE] = {
+  {
+     1,  2,  4,  5,  6,  7,  9, 10,
+    11, 12, 13, 14, 15, 16, 16,  8,
+     3,
+  },
+  {
+     2,  2,  3,  5,  7,  8, 10, 12,
+    14, 14, 14, 14, 11,  9,  6,  4,
+     2,
+  }
+};
+
+#define MPC8_Q1_SIZE 19
+#define MPC8_Q1_BITS 9
+
+static const uint8_t mpc8_q1_codes[MPC8_Q1_SIZE] = {
+ 0x01, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+ 0x03, 0x04, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01,
+ 0x01, 0x00, 0x01,
+};
+static const int8_t mpc8_q1_bits[MPC8_Q1_SIZE] = {
+  6,  4,  4,  3,  3,  3,  3,  3,
+  4,  4,  4,  5,  7,  8,  9, 10,
+ 11, 12, 12,
+};
+
+#define MPC8_Q9UP_SIZE 256
+#define MPC8_Q9UP_BITS 9
+
+static const uint8_t mpc8_q9up_codes[MPC8_Q9UP_SIZE] = {
+ 0x01, 0x02, 0x03, 0x04, 0x05, 0x05, 0x06, 0x07,
+ 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+ 0x10, 0x11, 0x12, 0x26, 0x27, 0x13, 0x14, 0x15,
+ 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D,
+ 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25,
+ 0x28, 0x26, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E,
+ 0x2F, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
+ 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E,
+ 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46,
+ 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E,
+ 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56,
+ 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E,
+ 0x5F, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66,
+ 0x67, 0x68, 0x69, 0x6A, 0x56, 0x57, 0x58, 0x59,
+ 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, 0x60, 0x61,
+ 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x3E,
+ 0x3F, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
+ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+ 0x78, 0x79, 0x7A, 0x6B, 0x7B, 0x6C, 0x6D, 0x6E,
+ 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76,
+ 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E,
+ 0x7F, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86,
+ 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E,
+ 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96,
+ 0x97, 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E,
+ 0x9F, 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6,
+ 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0x27, 0x28, 0x29,
+ 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31,
+ 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
+ 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x41,
+ 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
+ 0x4A, 0x4B, 0x06, 0x07, 0x08, 0x09, 0x00, 0x01,
+};
+static const int8_t mpc8_q9up_bits[MPC8_Q9UP_SIZE] = {
+ 10, 10, 10, 10, 10,  9,  9,  9,
+  9,  9,  9,  9,  9,  9,  9,  9,
+  9,  9,  9,  8,  8,  9,  9,  9,
+  9,  9,  9,  9,  9,  9,  9,  9,
+  9,  9,  9,  9,  9,  9,  9,  9,
+  8,  9,  8,  8,  8,  8,  8,  8,
+  8,  8,  8,  8,  8,  8,  8,  8,
+  8,  8,  8,  8,  8,  8,  8,  8,
+  8,  8,  8,  8,  8,  8,  8,  8,
+  8,  8,  8,  8,  8,  8,  8,  8,
+  8,  8,  8,  8,  8,  8,  8,  8,
+  8,  8,  8,  8,  8,  8,  8,  8,
+  8,  8,  8,  8,  8,  8,  8,  8,
+  8,  8,  8,  8,  7,  7,  7,  7,
+  7,  7,  7,  7,  7,  7,  7,  7,
+  7,  7,  7,  7,  7,  7,  7,  6,
+  6,  7,  7,  7,  7,  7,  7,  7,
+  7,  7,  7,  7,  7,  7,  7,  7,
+  7,  7,  7,  8,  7,  8,  8,  8,
+  8,  8,  8,  8,  8,  8,  8,  8,
+  8,  8,  8,  8,  8,  8,  8,  8,
+  8,  8,  8,  8,  8,  8,  8,  8,
+  8,  8,  8,  8,  8,  8,  8,  8,
+  8,  8,  8,  8,  8,  8,  8,  8,
+  8,  8,  8,  8,  8,  8,  8,  8,
+  8,  8,  8,  8,  8,  8,  8,  8,
+  8,  8,  8,  8,  8,  9,  9,  9,
+  9,  9,  9,  9,  9,  9,  9,  9,
+  9,  9,  9,  9,  9,  9,  9,  9,
+  9,  9,  9,  9,  9,  9,  9,  9,
+  9,  9,  9,  9,  9,  9,  9,  9,
+  9,  9, 10, 10, 10, 10, 11, 11,
+};
+
+#define MPC8_Q2_SIZE 125
+#define MPC8_Q2_BITS 9
+
+static const uint8_t mpc8_q2_codes[2][MPC8_Q2_SIZE] = {
+{
+ 0x02, 0x03, 0x0F, 0x04, 0x00, 0x05, 0x0C, 0x12,
+ 0x0D, 0x06, 0x07, 0x13, 0x15, 0x14, 0x08, 0x09,
+ 0x0E, 0x15, 0x0F, 0x0A, 0x03, 0x0B, 0x10, 0x0C,
+ 0x01, 0x0D, 0x10, 0x16, 0x11, 0x0E, 0x12, 0x0F,
+ 0x10, 0x16, 0x13, 0x17, 0x11, 0x08, 0x12, 0x18,
+ 0x14, 0x13, 0x14, 0x17, 0x15, 0x0F, 0x16, 0x19,
+ 0x17, 0x10, 0x11, 0x1A, 0x18, 0x1B, 0x12, 0x1C,
+ 0x15, 0x09, 0x16, 0x1D, 0x19, 0x0A, 0x07, 0x0B,
+ 0x1A, 0x1E, 0x17, 0x0C, 0x18, 0x1F, 0x13, 0x20,
+ 0x1B, 0x21, 0x14, 0x11, 0x18, 0x22, 0x19, 0x12,
+ 0x1A, 0x19, 0x1A, 0x1B, 0x1B, 0x23, 0x1C, 0x0D,
+ 0x1D, 0x24, 0x1C, 0x1C, 0x1E, 0x1F, 0x1D, 0x13,
+ 0x1E, 0x25, 0x1F, 0x14, 0x02, 0x15, 0x15, 0x16,
+ 0x04, 0x17, 0x20, 0x26, 0x21, 0x18, 0x16, 0x27,
+ 0x1D, 0x28, 0x19, 0x1A, 0x22, 0x29, 0x23, 0x1B,
+ 0x03, 0x1C, 0x17, 0x1D, 0x05,
+},
+{
+ 0x02, 0x03, 0x0F, 0x04, 0x00, 0x05, 0x0C, 0x0D,
+ 0x0E, 0x06, 0x07, 0x0F, 0x1E, 0x10, 0x10, 0x08,
+ 0x11, 0x12, 0x13, 0x09, 0x03, 0x0A, 0x11, 0x0B,
+ 0x01, 0x0C, 0x14, 0x15, 0x16, 0x0D, 0x17, 0x12,
+ 0x0E, 0x13, 0x18, 0x19, 0x14, 0x0F, 0x10, 0x1A,
+ 0x1B, 0x15, 0x11, 0x16, 0x1C, 0x0E, 0x1D, 0x1E,
+ 0x1F, 0x0F, 0x12, 0x20, 0x1F, 0x21, 0x13, 0x22,
+ 0x12, 0x13, 0x14, 0x23, 0x20, 0x15, 0x0F, 0x16,
+ 0x21, 0x24, 0x17, 0x18, 0x19, 0x25, 0x14, 0x26,
+ 0x22, 0x27, 0x15, 0x10, 0x28, 0x29, 0x2A, 0x11,
+ 0x2B, 0x17, 0x1A, 0x18, 0x2C, 0x2D, 0x1B, 0x1C,
+ 0x19, 0x2E, 0x2F, 0x1A, 0x1D, 0x1B, 0x30, 0x12,
+ 0x31, 0x32, 0x33, 0x13, 0x02, 0x14, 0x15, 0x16,
+ 0x04, 0x17, 0x34, 0x35, 0x36, 0x18, 0x16, 0x37,
+ 0x23, 0x38, 0x19, 0x1A, 0x39, 0x3A, 0x3B, 0x1B,
+ 0x03, 0x1C, 0x17, 0x1D, 0x05,
+}
+};
+static const int8_t mpc8_q2_bits[2][MPC8_Q2_SIZE] = {
+{
+ 12, 11, 10, 11, 13, 11,  9,  8,
+  9, 11, 11,  8,  7,  8, 11, 11,
+  9,  8,  9, 11, 12, 11, 10, 11,
+ 13, 11,  9,  8,  9, 11,  9,  6,
+  6,  7,  9,  8,  6,  4,  6,  8,
+  9,  6,  6,  7,  9, 11,  9,  8,
+  9, 11, 10,  8,  7,  8, 10,  8,
+  6,  4,  6,  8,  7,  4,  3,  4,
+  7,  8,  6,  4,  6,  8, 10,  8,
+  7,  8, 10, 11,  9,  8,  9, 11,
+  9,  6,  6,  6,  9,  8,  6,  4,
+  6,  8,  9,  7,  6,  6,  9, 11,
+  9,  8,  9, 11, 13, 11, 10, 11,
+ 12, 11,  9,  8,  9, 11, 10,  8,
+  7,  8, 11, 11,  9,  8,  9, 11,
+ 13, 11, 10, 11, 12,
+},
+{
+ 11, 10,  9, 10, 12, 10,  8,  8,
+  8, 10, 10,  8,  7,  8,  9, 10,
+  8,  8,  8, 10, 11, 10,  9, 10,
+ 12, 10,  8,  8,  8, 10,  8,  6,
+  5,  6,  8,  8,  6,  5,  5,  8,
+  8,  6,  5,  6,  8, 10,  8,  8,
+  8, 10,  9,  8,  7,  8,  9,  8,
+  5,  5,  5,  8,  7,  5,  4,  5,
+  7,  8,  5,  5,  5,  8,  9,  8,
+  7,  8,  9, 10,  8,  8,  8, 10,
+  8,  6,  5,  6,  8,  8,  5,  5,
+  6,  8,  8,  6,  5,  6,  8, 10,
+  8,  8,  8, 10, 12, 10, 10, 10,
+ 11, 10,  8,  8,  8, 10,  9,  8,
+  7,  8, 10, 10,  8,  8,  8, 10,
+ 12, 10,  9, 10, 11,
+}
+};
+
+#define MPC8_Q3_SIZE 49
+#define MPC8_Q3_BITS 9
+#define MPC8_Q3_OFFSET -48
+
+static const uint8_t mpc8_q3_codes[MPC8_Q3_SIZE] = {
+ 0x07, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x0F,
+ 0x0E, 0x0D, 0x0C, 0x0B, 0x0A, 0x13, 0x12, 0x11,
+ 0x10, 0x0F, 0x0E, 0x0D, 0x0C, 0x0B, 0x0A, 0x09,
+ 0x11, 0x10, 0x0F, 0x0E, 0x0D, 0x0C, 0x0B, 0x0A,
+ 0x09, 0x08, 0x07, 0x06, 0x05, 0x09, 0x08, 0x07,
+ 0x06, 0x05, 0x04, 0x03, 0x02, 0x03, 0x02, 0x01,
+ 0x00,
+};
+static const int8_t mpc8_q3_bits[MPC8_Q3_SIZE] = {
+  3,  4,  4,  4,  4,  4,  4,  5,
+  5,  5,  5,  5,  5,  6,  6,  6,
+  6,  6,  6,  6,  6,  6,  6,  6,
+  7,  7,  7,  7,  7,  7,  7,  7,
+  7,  7,  7,  7,  7,  8,  8,  8,
+  8,  8,  8,  8,  8,  9,  9,  9,
+  9,
+};
+static const int8_t mpc8_q3_syms[MPC8_Q3_SIZE] = {
+   48,    65,    64,    49,    63,    32,    47,    80,
+   79,    50,    62,    33,    16,    82,    81,    95,
+   94,    66,    78,    34,    46,    17,    31,    30,
+   97,    96,   111,    67,    77,    51,    61,    35,
+   45,    18,     1,     0,    15,    98,   110,    83,
+   93,    19,    29,     2,    14,    99,   109,     3,
+   13,
+};
+
+#define MPC8_Q4_SIZE 81
+#define MPC8_Q4_BITS 9
+#define MPC8_Q4_OFFSET -64
+
+static const uint8_t mpc8_q4_codes[MPC8_Q4_SIZE] = {
+ 0x0F, 0x1D, 0x1C, 0x1B, 0x1A, 0x19, 0x18, 0x17,
+ 0x16, 0x15, 0x14, 0x13, 0x12, 0x23, 0x22, 0x21,
+ 0x20, 0x1F, 0x1E, 0x1D, 0x1C, 0x1B, 0x1A, 0x19,
+ 0x18, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11,
+ 0x10, 0x0F, 0x0E, 0x0D, 0x19, 0x18, 0x17, 0x16,
+ 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0F, 0x0E,
+ 0x0D, 0x0C, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12,
+ 0x11, 0x10, 0x0F, 0x0E, 0x0D, 0x0C, 0x0B, 0x0A,
+ 0x09, 0x08, 0x07, 0x06, 0x05, 0x09, 0x08, 0x07,
+ 0x06, 0x05, 0x04, 0x03, 0x02, 0x03, 0x02, 0x01,
+ 0x00,
+};
+static const int8_t mpc8_q4_bits[MPC8_Q4_SIZE] = {
+  4,  5,  5,  5,  5,  5,  5,  5,
+  5,  5,  5,  5,  5,  6,  6,  6,
+  6,  6,  6,  6,  6,  6,  6,  6,
+  6,  6,  6,  6,  6,  6,  6,  6,
+  6,  6,  6,  6,  7,  7,  7,  7,
+  7,  7,  7,  7,  7,  7,  7,  7,
+  7,  7,  8,  8,  8,  8,  8,  8,
+  8,  8,  8,  8,  8,  8,  8,  8,
+  8,  8,  8,  8,  8,  9,  9,  9,
+  9,  9,  9,  9,  9, 10, 10, 10,
+ 10,
+};
+static const int8_t mpc8_q4_syms[MPC8_Q4_SIZE] = {
+   64,    96,    81,    80,    95,    66,    65,    79,
+   78,    49,    48,    63,    32,   113,   112,    98,
+   97,   111,   110,    83,    82,    94,    93,    67,
+   77,    51,    50,    62,    61,    34,    33,    47,
+   46,    17,    16,    31,   128,   114,   127,   126,
+   99,   109,    68,    76,    35,    45,    18,    30,
+    0,    15,   130,   129,   143,   142,   115,   125,
+  100,   108,    84,    92,    52,    60,    36,    44,
+   19,    29,     2,     1,    14,   131,   141,   116,
+  124,    20,    28,     3,    13,   132,   140,     4,
+   12,
+};
+
+#define MPC8_Q5_SIZE 15
+#define MPC8_Q5_BITS 7
+#define MPC8_Q5_OFFSET -7
+
+static const uint8_t mpc8_q5_codes[2][MPC8_Q5_SIZE] = {
+{
+ 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03,
+ 0x04, 0x05, 0x03, 0x03, 0x03, 0x02, 0x03,
+},
+{
+ 0x00, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x05,
+ 0x06, 0x07, 0x04, 0x05, 0x03, 0x02, 0x03,
+}
+};
+static const int8_t mpc8_q5_bits[2][MPC8_Q5_SIZE] = {
+{
+  7,  7,  6,  5,  4,  3,  3,  2,
+  3,  3,  4,  5,  6,  7,  7,
+},
+{
+  6,  6,  5,  4,  4,  3,  3,  3,
+  3,  3,  4,  4,  5,  6,  6,
+}
+};
+
+#define MPC8_Q6_SIZE 31
+#define MPC8_Q6_BITS 9
+#define MPC8_Q6_OFFSET -15
+
+static const uint8_t mpc8_q6_codes[2][MPC8_Q6_SIZE] = {
+{
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x04, 0x03,
+ 0x04, 0x05, 0x05, 0x06, 0x04, 0x05, 0x04, 0x03,
+ 0x05, 0x06, 0x07, 0x07, 0x06, 0x07, 0x08, 0x09,
+ 0x05, 0x06, 0x07, 0x04, 0x05, 0x06, 0x07,
+},
+{
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x04, 0x05, 0x04,
+ 0x05, 0x06, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A,
+ 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x07, 0x08, 0x09,
+ 0x06, 0x07, 0x05, 0x06, 0x07, 0x02, 0x03,
+}
+};
+static const int8_t mpc8_q6_bits[2][MPC8_Q6_SIZE] = {
+{
+  9,  9,  9,  9,  8,  8,  7,  6,
+  6,  6,  5,  5,  4,  4,  3,  2,
+  3,  4,  4,  5,  6,  6,  6,  6,
+  7,  8,  8,  9,  9,  9,  9,
+},
+{
+  8,  8,  7,  7,  7,  6,  6,  5,
+  5,  5,  4,  4,  4,  4,  4,  4,
+  4,  4,  4,  4,  4,  5,  5,  5,
+  6,  6,  7,  7,  7,  8,  8,
+}
+};
+
+#define MPC8_Q7_SIZE 63
+#define MPC8_Q7_BITS 9
+#define MPC8_Q7_OFFSET -31
+
+static const uint8_t mpc8_q7_codes[2][MPC8_Q7_SIZE] = {
+{
+ 0x00, 0x01, 0x02, 0x08, 0x09, 0x03, 0x04, 0x05,
+ 0x06, 0x07, 0x0A, 0x0B, 0x0C, 0x0D, 0x0A, 0x0B,
+ 0x0C, 0x0D, 0x0E, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E,
+ 0x0A, 0x0B, 0x0C, 0x08, 0x09, 0x06, 0x04, 0x03,
+ 0x05, 0x07, 0x0A, 0x0B, 0x0D, 0x0E, 0x0F, 0x0F,
+ 0x10, 0x11, 0x12, 0x0F, 0x13, 0x10, 0x11, 0x12,
+ 0x13, 0x0E, 0x0F, 0x10, 0x11, 0x08, 0x09, 0x0A,
+ 0x0B, 0x0C, 0x12, 0x13, 0x0D, 0x0E, 0x0F,
+},
+{
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+ 0x08, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x09, 0x0A,
+ 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x0C, 0x0D,
+ 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
+ 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D,
+ 0x1E, 0x1F, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,
+ 0x17, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x09, 0x0A,
+ 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x02, 0x03,
+}
+};
+static const int8_t mpc8_q7_bits[2][MPC8_Q7_SIZE] = {
+{
+ 10, 10, 10,  9,  9, 10, 10, 10,
+ 10, 10,  9,  9,  9,  9,  8,  8,
+  8,  8,  8,  7,  7,  7,  7,  7,
+  6,  6,  6,  5,  5,  4,  3,  2,
+  3,  4,  5,  5,  6,  6,  6,  7,
+  7,  7,  7,  8,  7,  8,  8,  8,
+  8,  9,  9,  9,  9, 10, 10, 10,
+ 10, 10,  9,  9, 10, 10, 10,
+},
+{
+  9,  9,  8,  8,  8,  8,  8,  8,
+  8,  7,  7,  7,  7,  7,  6,  6,
+  6,  6,  6,  6,  6,  6,  5,  5,
+  5,  5,  5,  5,  5,  5,  5,  5,
+  5,  5,  5,  5,  5,  5,  5,  5,
+  5,  5,  6,  6,  6,  6,  6,  6,
+  6,  7,  7,  7,  7,  7,  8,  8,
+  8,  8,  8,  8,  8,  9,  9,
+}
+};
+
+#define MPC8_Q8_SIZE 127
+#define MPC8_Q8_BITS 9
+#define MPC8_Q8_OFFSET -63
+
+static const uint8_t mpc8_q8_codes[2][MPC8_Q8_SIZE] = {
+{
+ 0x03, 0x04, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x1A,
+ 0x0F, 0x1B, 0x10, 0x00, 0x01, 0x05, 0x06, 0x07,
+ 0x08, 0x09, 0x0A, 0x0B, 0x11, 0x0C, 0x12, 0x13,
+ 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1C, 0x1A,
+ 0x1B, 0x1C, 0x1D, 0x1E, 0x1D, 0x1E, 0x1F, 0x20,
+ 0x21, 0x22, 0x23, 0x24, 0x19, 0x25, 0x1A, 0x1B,
+ 0x1C, 0x1D, 0x1E, 0x1F, 0x14, 0x15, 0x16, 0x17,
+ 0x0E, 0x0F, 0x10, 0x11, 0x0B, 0x07, 0x04, 0x03,
+ 0x05, 0x0C, 0x0D, 0x12, 0x13, 0x14, 0x15, 0x18,
+ 0x19, 0x1A, 0x1B, 0x20, 0x21, 0x22, 0x23, 0x24,
+ 0x25, 0x26, 0x27, 0x26, 0x27, 0x28, 0x29, 0x2A,
+ 0x2B, 0x2C, 0x2D, 0x2E, 0x1F, 0x20, 0x2F, 0x21,
+ 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29,
+ 0x0D, 0x0E, 0x2A, 0x0F, 0x10, 0x11, 0x12, 0x02,
+ 0x13, 0x03, 0x04, 0x05, 0x2B, 0x2C, 0x30, 0x31,
+ 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33,
+},
+{
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+ 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x15, 0x16,
+ 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E,
+ 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26,
+ 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E,
+ 0x2F, 0x30, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B,
+ 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33,
+ 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B,
+ 0x3C, 0x3D, 0x3E, 0x31, 0x3F, 0x32, 0x33, 0x34,
+ 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C,
+ 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44,
+ 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x16,
+ 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E,
+ 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26,
+ 0x27, 0x28, 0x29, 0x04, 0x05, 0x06, 0x07,
+}
+};
+static const int8_t mpc8_q8_bits[2][MPC8_Q8_SIZE] = {
+{
+ 11, 11, 10, 10, 10, 10, 10,  9,
+ 10,  9, 10, 12, 12, 11, 11, 11,
+ 11, 11, 11, 11, 10, 11, 10, 10,
+ 10, 10, 10, 10, 10, 10,  9, 10,
+ 10, 10, 10, 10,  9,  9,  9,  9,
+  9,  9,  9,  9,  8,  9,  8,  8,
+  8,  8,  8,  8,  7,  7,  7,  7,
+  6,  6,  6,  6,  5,  4,  3,  2,
+  3,  5,  5,  6,  6,  6,  6,  7,
+  7,  7,  7,  8,  8,  8,  8,  8,
+  8,  8,  8,  9,  9,  9,  9,  9,
+  9,  9,  9,  9, 10, 10,  9, 10,
+ 10, 10, 10, 10, 10, 10, 10, 10,
+ 11, 11, 10, 11, 11, 11, 11, 12,
+ 11, 12, 12, 12, 10, 10,  9,  9,
+ 10, 10, 10, 10, 10, 10, 10,
+},
+{
+  9,  9,  9,  9,  8,  8,  8,  8,
+  8,  8,  8,  8,  8,  8,  8,  8,
+  8,  8,  8,  8,  8,  8,  7,  7,
+  7,  7,  7,  7,  7,  7,  7,  7,
+  7,  7,  7,  7,  7,  7,  7,  7,
+  7,  7,  7,  7,  7,  7,  7,  7,
+  7,  7,  6,  6,  6,  6,  6,  6,
+  6,  6,  6,  6,  6,  6,  6,  6,
+  6,  6,  6,  6,  6,  6,  6,  6,
+  6,  6,  6,  7,  6,  7,  7,  7,
+  7,  7,  7,  7,  7,  7,  7,  7,
+  7,  7,  7,  7,  7,  7,  7,  7,
+  7,  7,  7,  7,  7,  7,  7,  8,
+  8,  8,  8,  8,  8,  8,  8,  8,
+  8,  8,  8,  8,  8,  8,  8,  8,
+  8,  8,  8,  9,  9,  9,  9,
+}
+};
+
+#endif /* FFMPEG_MPC8HUFF_H */
diff --git a/libavformat/Makefile b/libavformat/Makefile
index eafa6c0e04..45a8a4889d 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -86,6 +86,7 @@ OBJS-$(CONFIG_MP3_DEMUXER)               += mp3.o
 OBJS-$(CONFIG_MP3_MUXER)                 += mp3.o
 OBJS-$(CONFIG_MP4_MUXER)                 += movenc.o riff.o isom.o
 OBJS-$(CONFIG_MPC_DEMUXER)               += mpc.o
+OBJS-$(CONFIG_MPC8_DEMUXER)              += mpc8.o
 OBJS-$(CONFIG_MPEG1SYSTEM_MUXER)         += mpegenc.o
 OBJS-$(CONFIG_MPEG1VCD_MUXER)            += mpegenc.o
 OBJS-$(CONFIG_MPEG2DVD_MUXER)            += mpegenc.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 27aa253d63..eab29f460b 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -104,6 +104,7 @@ void av_register_all(void)
     REGISTER_MUXDEMUX (MP3, mp3);
     REGISTER_MUXER    (MP4, mp4);
     REGISTER_DEMUXER  (MPC, mpc);
+    REGISTER_DEMUXER  (MPC8, mpc8);
     REGISTER_MUXER    (MPEG1SYSTEM, mpeg1system);
     REGISTER_MUXER    (MPEG1VCD, mpeg1vcd);
     REGISTER_MUXER    (MPEG1VIDEO, mpeg1video);
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index d99fb2ace3..93eee3531f 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -21,8 +21,8 @@
 #ifndef FFMPEG_AVFORMAT_H
 #define FFMPEG_AVFORMAT_H
 
-#define LIBAVFORMAT_VERSION_INT ((51<<16)+(17<<8)+1)
-#define LIBAVFORMAT_VERSION     51.17.1
+#define LIBAVFORMAT_VERSION_INT ((51<<16)+(18<<8)+0)
+#define LIBAVFORMAT_VERSION     51.18.0
 #define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
 
 #define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c
new file mode 100644
index 0000000000..b6840b00d6
--- /dev/null
+++ b/libavformat/mpc8.c
@@ -0,0 +1,244 @@
+/*
+ * Musepack SV8 demuxer
+ * Copyright (c) 2007 Konstantin Shishkov
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#include "avformat.h"
+#include "bitstream.h"
+#include "unary.h"
+
+/// Two-byte MPC tag
+#define MKMPCTAG(a, b) (a | (b << 8))
+
+#define TAG_MPCK MKTAG('M','P','C','K')
+
+/// Reserved MPC tags
+enum MPCPacketTags{
+    TAG_STREAMHDR   = MKMPCTAG('S','H'),
+    TAG_STREAMEND   = MKMPCTAG('S','E'),
+
+    TAG_AUDIOPACKET = MKMPCTAG('A','P'),
+
+    TAG_SEEKTBLOFF  = MKMPCTAG('S','O'),
+    TAG_SEEKTABLE   = MKMPCTAG('S','T'),
+
+    TAG_REPLAYGAIN  = MKMPCTAG('R','G'),
+    TAG_ENCINFO     = MKMPCTAG('E','I'),
+};
+
+static const int mpc8_rate[8] = { 44100, 48000, 37800, 32000, -1, -1, -1, -1 };
+
+typedef struct {
+    int ver;
+    int frame;
+    int64_t header_pos;
+    int64_t samples;
+} MPCContext;
+
+static int mpc8_probe(AVProbeData *p)
+{
+    if (AV_RL32(p->buf) == TAG_MPCK)
+        return AVPROBE_SCORE_MAX;
+    return 0;
+}
+
+static inline int64_t gb_get_v(GetBitContext *gb)
+{
+    int64_t v = 0;
+    int bits = 0;
+    while(get_bits1(gb) && bits < 64-7){
+        v <<= 7;
+        v |= get_bits(gb, 7);
+        bits += 7;
+    }
+    v <<= 7;
+    v |= get_bits(gb, 7);
+
+    return v;
+}
+
+static void mpc8_get_chunk_header(ByteIOContext *pb, int *tag, int64_t *size)
+{
+    int64_t pos;
+    pos = url_ftell(pb);
+    *tag = get_le16(pb);
+    *size = ff_get_v(pb);
+    *size -= url_ftell(pb) - pos;
+}
+
+static void mpc8_parse_seektable(AVFormatContext *s, int64_t off)
+{
+    MPCContext *c = s->priv_data;
+    int tag;
+    int64_t size, pos, ppos[2];
+    uint8_t *buf;
+    int i, t, seekd;
+    GetBitContext gb;
+
+    url_fseek(&s->pb, off, SEEK_SET);
+    mpc8_get_chunk_header(&s->pb, &tag, &size);
+    if(tag != TAG_SEEKTABLE){
+        av_log(s, AV_LOG_ERROR, "No seek table at given position\n");
+        return;
+    }
+    if(!(buf = av_malloc(size)))
+        return;
+    get_buffer(&s->pb, buf, size);
+    init_get_bits(&gb, buf, size * 8);
+    size = gb_get_v(&gb);
+    if(size > UINT_MAX/4 || size > c->samples/1152){
+        av_log(s, AV_LOG_ERROR, "Seek table is too big\n");
+        return;
+    }
+    seekd = get_bits(&gb, 4);
+    for(i = 0; i < 2; i++){
+        pos = gb_get_v(&gb) + c->header_pos;
+        ppos[1 - i] = pos;
+        av_add_index_entry(s->streams[0], pos, i, 0, 0, AVINDEX_KEYFRAME);
+    }
+    for(; i < size; i++){
+        t = get_unary(&gb, 1, 33) << 12;
+        t += get_bits(&gb, 12);
+        if(t & 1)
+            t = -(t & ~1);
+        pos = (t >> 1) + ppos[0]*2 - ppos[1];
+        av_add_index_entry(s->streams[0], pos, i << seekd, 0, 0, AVINDEX_KEYFRAME);
+        ppos[1] = ppos[0];
+        ppos[0] = pos;
+    }
+    av_free(buf);
+}
+
+static void mpc8_handle_chunk(AVFormatContext *s, int tag, int64_t chunk_pos, int64_t size)
+{
+    ByteIOContext *pb = &s->pb;
+    int64_t pos, off;
+
+    switch(tag){
+    case TAG_SEEKTBLOFF:
+        pos = url_ftell(pb) + size;
+        off = ff_get_v(pb);
+        mpc8_parse_seektable(s, chunk_pos + off);
+        url_fseek(pb, pos, SEEK_SET);
+        break;
+    default:
+        url_fskip(pb, size);
+    }
+}
+
+static int mpc8_read_header(AVFormatContext *s, AVFormatParameters *ap)
+{
+    MPCContext *c = s->priv_data;
+    ByteIOContext *pb = &s->pb;
+    AVStream *st;
+    int tag = 0;
+    int64_t size, pos;
+
+    c->header_pos = url_ftell(pb);
+    if(get_le32(pb) != TAG_MPCK){
+        av_log(s, AV_LOG_ERROR, "Not a Musepack8 file\n");
+        return -1;
+    }
+
+    while(!url_feof(pb)){
+        pos = url_ftell(pb);
+        mpc8_get_chunk_header(pb, &tag, &size);
+        if(tag == TAG_STREAMHDR)
+            break;
+        mpc8_handle_chunk(s, tag, pos, size);
+    }
+    if(tag != TAG_STREAMHDR){
+        av_log(s, AV_LOG_ERROR, "Stream header not found\n");
+        return -1;
+    }
+    pos = url_ftell(pb);
+    url_fskip(pb, 4); //CRC
+    c->ver = get_byte(pb);
+    if(c->ver != 8){
+        av_log(s, AV_LOG_ERROR, "Unknown stream version %d\n", c->ver);
+        return -1;
+    }
+    c->samples = ff_get_v(pb);
+    ff_get_v(pb); //silence samples at the beginning
+
+    st = av_new_stream(s, 0);
+    if (!st)
+        return AVERROR(ENOMEM);
+    st->codec->codec_type = CODEC_TYPE_AUDIO;
+    st->codec->codec_id = CODEC_ID_MUSEPACK8;
+    st->codec->bits_per_sample = 16;
+
+    st->codec->extradata_size = 2;
+    st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
+    get_buffer(pb, st->codec->extradata, st->codec->extradata_size);
+
+    st->codec->channels = (st->codec->extradata[1] >> 4) + 1;
+    st->codec->sample_rate = mpc8_rate[st->codec->extradata[0] >> 5];
+    av_set_pts_info(st, 32, 1152  << (st->codec->extradata[1]&3)*2, st->codec->sample_rate);
+    st->duration = c->samples / (1152 << (st->codec->extradata[1]&3)*2);
+    size -= url_ftell(pb) - pos;
+
+    return 0;
+}
+
+static int mpc8_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+    MPCContext *c = s->priv_data;
+    int tag;
+    int64_t pos, size;
+
+    while(!url_feof(&s->pb)){
+        pos = url_ftell(&s->pb);
+        mpc8_get_chunk_header(&s->pb, &tag, &size);
+        if(tag == TAG_AUDIOPACKET){
+            if(av_get_packet(&s->pb, pkt, size) < 0)
+                return AVERROR(ENOMEM);
+            pkt->stream_index = 0;
+            pkt->pts = c->frame;
+            return 0;
+        }
+        if(tag == TAG_STREAMEND)
+            return AVERROR(EIO);
+        mpc8_handle_chunk(s, tag, pos, size);
+    }
+    return 0;
+}
+
+static int mpc8_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags)
+{
+    AVStream *st = s->streams[stream_index];
+    MPCContext *c = s->priv_data;
+    int index = av_index_search_timestamp(st, timestamp, flags);
+
+    if(index < 0) return -1;
+    url_fseek(&s->pb, st->index_entries[index].pos, SEEK_SET);
+    c->frame = st->index_entries[index].timestamp;
+    return 0;
+}
+
+
+AVInputFormat mpc8_demuxer = {
+    "mpc8",
+    "musepack8",
+    sizeof(MPCContext),
+    mpc8_probe,
+    mpc8_read_header,
+    mpc8_read_packet,
+    NULL,
+    mpc8_read_seek,
+};