OSDN Git Service

sbc: Declare and implement sbc_init_msbc
[android-x86/external-bluetooth-sbc.git] / sbc / sbc.c
index b349090..cea2dd1 100644 (file)
--- a/sbc/sbc.c
+++ b/sbc/sbc.c
@@ -2,9 +2,11 @@
  *
  *  Bluetooth low-complexity, subband codec (SBC) library
  *
- *  Copyright (C) 2004-2009  Marcel Holtmann <marcel@holtmann.org>
+ *  Copyright (C) 2008-2010  Nokia Corporation
+ *  Copyright (C) 2004-2010  Marcel Holtmann <marcel@holtmann.org>
  *  Copyright (C) 2004-2005  Henryk Ploetz <henryk@ploetzli.ch>
  *  Copyright (C) 2005-2008  Brad Midgley <bmidgley@xmission.com>
+ *  Copyright (C) 2012-2013  Intel Corporation
  *
  *
  *  This library is free software; you can redistribute it and/or
@@ -39,6 +41,7 @@
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <sys/types.h>
 #include <limits.h>
 
 #include "sbc_tables.h"
 
 #include "sbc.h"
+#include "sbc_private.h"
+#include "sbc_primitives.h"
 
 #define SBC_SYNCWORD   0x9C
 
+#define MSBC_SYNCWORD  0xAD
+#define MSBC_BLOCKS    15
+
 /* This structure contains an unpacked SBC frame.
    Yes, there is probably quite some unused space herein */
 struct sbc_frame {
@@ -69,20 +77,23 @@ struct sbc_frame {
        uint8_t subband_mode;
        uint8_t subbands;
        uint8_t bitpool;
-       uint8_t codesize;
+       uint16_t codesize;
        uint8_t length;
 
        /* bit number x set means joint stereo has been used in subband x */
        uint8_t joint;
 
        /* only the lower 4 bits of every element are to be used */
-       uint8_t scale_factor[2][8];
+       uint32_t SBC_ALIGNED scale_factor[2][8];
 
        /* raw integer subband samples in the frame */
+       int32_t SBC_ALIGNED sb_sample_f[16][2][8];
+
+       /* modified subband samples */
+       int32_t SBC_ALIGNED sb_sample[16][2][8];
 
-       int32_t sb_sample_f[16][2][8];
-       int32_t sb_sample[16][2][8];    /* modified subband samples */
-       int16_t pcm_sample[2][16*8];    /* original pcm audio samples */
+       /* original pcm audio samples */
+       int16_t SBC_ALIGNED pcm_sample[2][16*8];
 };
 
 struct sbc_decoder_state {
@@ -91,16 +102,6 @@ struct sbc_decoder_state {
        int offset[2][16];
 };
 
-struct sbc_encoder_state {
-       int subbands;
-       int position[2];
-       int16_t X[2][256];
-       void (*sbc_analyze_4b_4s)(int16_t *pcm, int16_t *x,
-                                 int32_t *out, int out_stride);
-       void (*sbc_analyze_4b_8s)(int16_t *pcm, int16_t *x,
-                                 int32_t *out, int out_stride);
-};
-
 /*
  * Calculates the CRC-8 of the first len bits in data
  */
@@ -165,7 +166,8 @@ static uint8_t sbc_crc8(const uint8_t *data, size_t len)
  * Takes a pointer to the frame in question, a pointer to the bits array and
  * the sampling frequency (as 2 bit integer)
  */
-static void sbc_calculate_bits(const struct sbc_frame *frame, int (*bits)[8])
+static SBC_ALWAYS_INLINE void sbc_calculate_bits_internal(
+               const struct sbc_frame *frame, int (*bits)[8], int subbands)
 {
        uint8_t sf = frame->frequency;
 
@@ -176,17 +178,17 @@ static void sbc_calculate_bits(const struct sbc_frame *frame, int (*bits)[8])
                for (ch = 0; ch < frame->channels; ch++) {
                        max_bitneed = 0;
                        if (frame->allocation == SNR) {
-                               for (sb = 0; sb < frame->subbands; sb++) {
+                               for (sb = 0; sb < subbands; sb++) {
                                        bitneed[ch][sb] = frame->scale_factor[ch][sb];
                                        if (bitneed[ch][sb] > max_bitneed)
                                                max_bitneed = bitneed[ch][sb];
                                }
                        } else {
-                               for (sb = 0; sb < frame->subbands; sb++) {
+                               for (sb = 0; sb < subbands; sb++) {
                                        if (frame->scale_factor[ch][sb] == 0)
                                                bitneed[ch][sb] = -5;
                                        else {
-                                               if (frame->subbands == 4)
+                                               if (subbands == 4)
                                                        loudness = frame->scale_factor[ch][sb] - sbc_offset4[sf][sb];
                                                else
                                                        loudness = frame->scale_factor[ch][sb] - sbc_offset8[sf][sb];
@@ -207,7 +209,7 @@ static void sbc_calculate_bits(const struct sbc_frame *frame, int (*bits)[8])
                                bitslice--;
                                bitcount += slicecount;
                                slicecount = 0;
-                               for (sb = 0; sb < frame->subbands; sb++) {
+                               for (sb = 0; sb < subbands; sb++) {
                                        if ((bitneed[ch][sb] > bitslice + 1) && (bitneed[ch][sb] < bitslice + 16))
                                                slicecount++;
                                        else if (bitneed[ch][sb] == bitslice + 1)
@@ -220,7 +222,7 @@ static void sbc_calculate_bits(const struct sbc_frame *frame, int (*bits)[8])
                                bitslice--;
                        }
 
-                       for (sb = 0; sb < frame->subbands; sb++) {
+                       for (sb = 0; sb < subbands; sb++) {
                                if (bitneed[ch][sb] < bitslice + 2)
                                        bits[ch][sb] = 0;
                                else {
@@ -230,7 +232,8 @@ static void sbc_calculate_bits(const struct sbc_frame *frame, int (*bits)[8])
                                }
                        }
 
-                       for (sb = 0; bitcount < frame->bitpool && sb < frame->subbands; sb++) {
+                       for (sb = 0; bitcount < frame->bitpool &&
+                                                       sb < subbands; sb++) {
                                if ((bits[ch][sb] >= 2) && (bits[ch][sb] < 16)) {
                                        bits[ch][sb]++;
                                        bitcount++;
@@ -240,7 +243,8 @@ static void sbc_calculate_bits(const struct sbc_frame *frame, int (*bits)[8])
                                }
                        }
 
-                       for (sb = 0; bitcount < frame->bitpool && sb < frame->subbands; sb++) {
+                       for (sb = 0; bitcount < frame->bitpool &&
+                                                       sb < subbands; sb++) {
                                if (bits[ch][sb] < 16) {
                                        bits[ch][sb]++;
                                        bitcount++;
@@ -256,7 +260,7 @@ static void sbc_calculate_bits(const struct sbc_frame *frame, int (*bits)[8])
                max_bitneed = 0;
                if (frame->allocation == SNR) {
                        for (ch = 0; ch < 2; ch++) {
-                               for (sb = 0; sb < frame->subbands; sb++) {
+                               for (sb = 0; sb < subbands; sb++) {
                                        bitneed[ch][sb] = frame->scale_factor[ch][sb];
                                        if (bitneed[ch][sb] > max_bitneed)
                                                max_bitneed = bitneed[ch][sb];
@@ -264,11 +268,11 @@ static void sbc_calculate_bits(const struct sbc_frame *frame, int (*bits)[8])
                        }
                } else {
                        for (ch = 0; ch < 2; ch++) {
-                               for (sb = 0; sb < frame->subbands; sb++) {
+                               for (sb = 0; sb < subbands; sb++) {
                                        if (frame->scale_factor[ch][sb] == 0)
                                                bitneed[ch][sb] = -5;
                                        else {
-                                               if (frame->subbands == 4)
+                                               if (subbands == 4)
                                                        loudness = frame->scale_factor[ch][sb] - sbc_offset4[sf][sb];
                                                else
                                                        loudness = frame->scale_factor[ch][sb] - sbc_offset8[sf][sb];
@@ -291,7 +295,7 @@ static void sbc_calculate_bits(const struct sbc_frame *frame, int (*bits)[8])
                        bitcount += slicecount;
                        slicecount = 0;
                        for (ch = 0; ch < 2; ch++) {
-                               for (sb = 0; sb < frame->subbands; sb++) {
+                               for (sb = 0; sb < subbands; sb++) {
                                        if ((bitneed[ch][sb] > bitslice + 1) && (bitneed[ch][sb] < bitslice + 16))
                                                slicecount++;
                                        else if (bitneed[ch][sb] == bitslice + 1)
@@ -306,7 +310,7 @@ static void sbc_calculate_bits(const struct sbc_frame *frame, int (*bits)[8])
                }
 
                for (ch = 0; ch < 2; ch++) {
-                       for (sb = 0; sb < frame->subbands; sb++) {
+                       for (sb = 0; sb < subbands; sb++) {
                                if (bitneed[ch][sb] < bitslice + 2) {
                                        bits[ch][sb] = 0;
                                } else {
@@ -330,7 +334,8 @@ static void sbc_calculate_bits(const struct sbc_frame *frame, int (*bits)[8])
                        if (ch == 1) {
                                ch = 0;
                                sb++;
-                               if (sb >= frame->subbands) break;
+                               if (sb >= subbands)
+                                       break;
                        } else
                                ch = 1;
                }
@@ -345,7 +350,8 @@ static void sbc_calculate_bits(const struct sbc_frame *frame, int (*bits)[8])
                        if (ch == 1) {
                                ch = 0;
                                sb++;
-                               if (sb >= frame->subbands) break;
+                               if (sb >= subbands)
+                                       break;
                        } else
                                ch = 1;
                }
@@ -354,6 +360,14 @@ static void sbc_calculate_bits(const struct sbc_frame *frame, int (*bits)[8])
 
 }
 
+static void sbc_calculate_bits(const struct sbc_frame *frame, int (*bits)[8])
+{
+       if (frame->subbands == 4)
+               sbc_calculate_bits_internal(frame, bits, 4);
+       else
+               sbc_calculate_bits_internal(frame, bits, 8);
+}
+
 /*
  * Unpacks a SBC frame at the beginning of the stream in data,
  * which has at most len bytes into frame.
@@ -366,16 +380,16 @@ static void sbc_calculate_bits(const struct sbc_frame *frame, int (*bits)[8])
  *  -4   Bitpool value out of bounds
  */
 static int sbc_unpack_frame(const uint8_t *data, struct sbc_frame *frame,
-                               size_t len)
+                                                               size_t len)
 {
-       int consumed;
+       unsigned int consumed;
        /* Will copy the parts of the header that are relevant to crc
         * calculation here */
        uint8_t crc_header[11] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
        int crc_pos = 0;
        int32_t temp;
 
-       int audio_sample;
+       uint32_t audio_sample;
        int ch, sb, blk, bit;   /* channel, subband, block and bit standard
                                   counters */
        int bits[2][8];         /* bits distribution */
@@ -485,23 +499,30 @@ static int sbc_unpack_frame(const uint8_t *data, struct sbc_frame *frame,
        for (blk = 0; blk < frame->blocks; blk++) {
                for (ch = 0; ch < frame->channels; ch++) {
                        for (sb = 0; sb < frame->subbands; sb++) {
-                               if (levels[ch][sb] > 0) {
-                                       audio_sample = 0;
-                                       for (bit = 0; bit < bits[ch][sb]; bit++) {
-                                               if (consumed > len * 8)
-                                                       return -1;
+                               uint32_t shift;
+
+                               if (levels[ch][sb] == 0) {
+                                       frame->sb_sample[blk][ch][sb] = 0;
+                                       continue;
+                               }
 
-                                               if ((data[consumed >> 3] >> (7 - (consumed & 0x7))) & 0x01)
-                                                       audio_sample |= 1 << (bits[ch][sb] - bit - 1);
+                               shift = frame->scale_factor[ch][sb] +
+                                               1 + SBCDEC_FIXED_EXTRA_BITS;
 
-                                               consumed++;
-                                       }
+                               audio_sample = 0;
+                               for (bit = 0; bit < bits[ch][sb]; bit++) {
+                                       if (consumed > len * 8)
+                                               return -1;
 
-                                       frame->sb_sample[blk][ch][sb] =
-                                               (((audio_sample << 1) | 1) << frame->scale_factor[ch][sb]) /
-                                               levels[ch][sb] - (1 << frame->scale_factor[ch][sb]);
-                               } else
-                                       frame->sb_sample[blk][ch][sb] = 0;
+                                       if ((data[consumed >> 3] >> (7 - (consumed & 0x7))) & 0x01)
+                                               audio_sample |= 1 << (bits[ch][sb] - bit - 1);
+
+                                       consumed++;
+                               }
+
+                               frame->sb_sample[blk][ch][sb] = (int32_t)
+                                       (((((uint64_t) audio_sample << 1) | 1) << shift) /
+                                       levels[ch][sb]) - (1 << shift);
                        }
                }
        }
@@ -528,7 +549,7 @@ static int sbc_unpack_frame(const uint8_t *data, struct sbc_frame *frame,
 }
 
 static void sbc_decoder_init(struct sbc_decoder_state *state,
-                               const struct sbc_frame *frame)
+                                       const struct sbc_frame *frame)
 {
        int i, ch;
 
@@ -540,6 +561,16 @@ static void sbc_decoder_init(struct sbc_decoder_state *state,
                        state->offset[ch][i] = (10 * i + 10);
 }
 
+static SBC_ALWAYS_INLINE int16_t sbc_clip16(int32_t s)
+{
+       if (s > 0x7FFF)
+               return 0x7FFF;
+       else if (s < -0x8000)
+               return -0x8000;
+       else
+               return s;
+}
+
 static inline void sbc_synthesize_four(struct sbc_decoder_state *state,
                                struct sbc_frame *frame, int ch, int blk)
 {
@@ -568,7 +599,7 @@ static inline void sbc_synthesize_four(struct sbc_decoder_state *state,
                k = (i + 4) & 0xf;
 
                /* Store in output, Q0 */
-               frame->pcm_sample[ch][blk * 4 + i] = SCALE4_STAGED1(
+               frame->pcm_sample[ch][blk * 4 + i] = sbc_clip16(SCALE4_STAGED1(
                        MULA(v[offset[i] + 0], sbc_proto_4_40m0[idx + 0],
                        MULA(v[offset[k] + 1], sbc_proto_4_40m1[idx + 0],
                        MULA(v[offset[i] + 2], sbc_proto_4_40m0[idx + 1],
@@ -578,7 +609,7 @@ static inline void sbc_synthesize_four(struct sbc_decoder_state *state,
                        MULA(v[offset[i] + 6], sbc_proto_4_40m0[idx + 3],
                        MULA(v[offset[k] + 7], sbc_proto_4_40m1[idx + 3],
                        MULA(v[offset[i] + 8], sbc_proto_4_40m0[idx + 4],
-                       MUL( v[offset[k] + 9], sbc_proto_4_40m1[idx + 4])))))))))));
+                       MUL( v[offset[k] + 9], sbc_proto_4_40m1[idx + 4]))))))))))));
        }
 }
 
@@ -613,8 +644,8 @@ static inline void sbc_synthesize_eight(struct sbc_decoder_state *state,
        for (idx = 0, i = 0; i < 8; i++, idx += 5) {
                k = (i + 8) & 0xf;
 
-               /* Store in output */
-               frame->pcm_sample[ch][blk * 8 + i] = SCALE8_STAGED1( // Q0
+               /* Store in output, Q0 */
+               frame->pcm_sample[ch][blk * 8 + i] = sbc_clip16(SCALE8_STAGED1(
                        MULA(state->V[ch][offset[i] + 0], sbc_proto_8_80m0[idx + 0],
                        MULA(state->V[ch][offset[k] + 1], sbc_proto_8_80m1[idx + 0],
                        MULA(state->V[ch][offset[i] + 2], sbc_proto_8_80m0[idx + 1],
@@ -624,12 +655,12 @@ static inline void sbc_synthesize_eight(struct sbc_decoder_state *state,
                        MULA(state->V[ch][offset[i] + 6], sbc_proto_8_80m0[idx + 3],
                        MULA(state->V[ch][offset[k] + 7], sbc_proto_8_80m1[idx + 3],
                        MULA(state->V[ch][offset[i] + 8], sbc_proto_8_80m0[idx + 4],
-                       MUL( state->V[ch][offset[k] + 9], sbc_proto_8_80m1[idx + 4])))))))))));
+                       MUL( state->V[ch][offset[k] + 9], sbc_proto_8_80m1[idx + 4]))))))))))));
        }
 }
 
 static int sbc_synthesize_audio(struct sbc_decoder_state *state,
-                               struct sbc_frame *frame)
+                                               struct sbc_frame *frame)
 {
        int ch, blk;
 
@@ -653,180 +684,43 @@ static int sbc_synthesize_audio(struct sbc_decoder_state *state,
        }
 }
 
-static inline void _sbc_analyze_four(const int16_t *in, int32_t *out)
-{
-       FIXED_A t1[4];
-       FIXED_T t2[4];
-       int i = 0, hop = 0;
-
-       /* rounding coefficient */
-       t1[0] = t1[1] = t1[2] = t1[3] =
-               (FIXED_A) 1 << (SBC_PROTO_FIXED4_SCALE - 1);
-
-       /* low pass polyphase filter */
-       for (hop = 0; hop < 40; hop += 8) {
-               t1[0] += (FIXED_A) in[hop] * _sbc_proto_fixed4[hop];
-               t1[1] += (FIXED_A) in[hop + 1] * _sbc_proto_fixed4[hop + 1];
-               t1[2] += (FIXED_A) in[hop + 2] * _sbc_proto_fixed4[hop + 2];
-               t1[1] += (FIXED_A) in[hop + 3] * _sbc_proto_fixed4[hop + 3];
-               t1[0] += (FIXED_A) in[hop + 4] * _sbc_proto_fixed4[hop + 4];
-               t1[3] += (FIXED_A) in[hop + 5] * _sbc_proto_fixed4[hop + 5];
-               t1[3] += (FIXED_A) in[hop + 7] * _sbc_proto_fixed4[hop + 7];
-       }
-
-       /* scaling */
-       t2[0] = t1[0] >> SBC_PROTO_FIXED4_SCALE;
-       t2[1] = t1[1] >> SBC_PROTO_FIXED4_SCALE;
-       t2[2] = t1[2] >> SBC_PROTO_FIXED4_SCALE;
-       t2[3] = t1[3] >> SBC_PROTO_FIXED4_SCALE;
-
-       /* do the cos transform */
-       for (i = 0, hop = 0; i < 4; hop += 8, i++) {
-               out[i] = ((FIXED_A) t2[0] * cos_table_fixed_4[0 + hop] +
-                         (FIXED_A) t2[1] * cos_table_fixed_4[1 + hop] +
-                         (FIXED_A) t2[2] * cos_table_fixed_4[2 + hop] +
-                         (FIXED_A) t2[3] * cos_table_fixed_4[5 + hop]) >>
-                       (SBC_COS_TABLE_FIXED4_SCALE - SCALE_OUT_BITS);
-       }
-}
-
-static void sbc_analyze_4b_4s(int16_t *pcm, int16_t *x,
-                             int32_t *out, int out_stride)
-{
-       int i;
-
-       /* Input 4 x 4 Audio Samples */
-       for (i = 0; i < 16; i += 4) {
-               x[64 + i] = x[0 + i] = pcm[15 - i];
-               x[65 + i] = x[1 + i] = pcm[14 - i];
-               x[66 + i] = x[2 + i] = pcm[13 - i];
-               x[67 + i] = x[3 + i] = pcm[12 - i];
-       }
-
-       /* Analyze four blocks */
-       _sbc_analyze_four(x + 12, out);
-       out += out_stride;
-       _sbc_analyze_four(x + 8, out);
-       out += out_stride;
-       _sbc_analyze_four(x + 4, out);
-       out += out_stride;
-       _sbc_analyze_four(x, out);
-}
-
-static inline void _sbc_analyze_eight(const int16_t *in, int32_t *out)
-{
-       FIXED_A t1[8];
-       FIXED_T t2[8];
-       int i, hop;
-
-       /* rounding coefficient */
-       t1[0] = t1[1] = t1[2] = t1[3] = t1[4] = t1[5] = t1[6] = t1[7] =
-               (FIXED_A) 1 << (SBC_PROTO_FIXED8_SCALE-1);
-
-       /* low pass polyphase filter */
-       for (hop = 0; hop < 80; hop += 16) {
-               t1[0] += (FIXED_A) in[hop] * _sbc_proto_fixed8[hop];
-               t1[1] += (FIXED_A) in[hop + 1] * _sbc_proto_fixed8[hop + 1];
-               t1[2] += (FIXED_A) in[hop + 2] * _sbc_proto_fixed8[hop + 2];
-               t1[3] += (FIXED_A) in[hop + 3] * _sbc_proto_fixed8[hop + 3];
-               t1[4] += (FIXED_A) in[hop + 4] * _sbc_proto_fixed8[hop + 4];
-               t1[3] += (FIXED_A) in[hop + 5] * _sbc_proto_fixed8[hop + 5];
-               t1[2] += (FIXED_A) in[hop + 6] * _sbc_proto_fixed8[hop + 6];
-               t1[1] += (FIXED_A) in[hop + 7] * _sbc_proto_fixed8[hop + 7];
-               t1[0] += (FIXED_A) in[hop + 8] * _sbc_proto_fixed8[hop + 8];
-               t1[5] += (FIXED_A) in[hop + 9] * _sbc_proto_fixed8[hop + 9];
-               t1[6] += (FIXED_A) in[hop + 10] * _sbc_proto_fixed8[hop + 10];
-               t1[7] += (FIXED_A) in[hop + 11] * _sbc_proto_fixed8[hop + 11];
-               t1[7] += (FIXED_A) in[hop + 13] * _sbc_proto_fixed8[hop + 13];
-               t1[6] += (FIXED_A) in[hop + 14] * _sbc_proto_fixed8[hop + 14];
-               t1[5] += (FIXED_A) in[hop + 15] * _sbc_proto_fixed8[hop + 15];
-       }
-
-       /* scaling */
-       t2[0] = t1[0] >> SBC_PROTO_FIXED8_SCALE;
-       t2[1] = t1[1] >> SBC_PROTO_FIXED8_SCALE;
-       t2[2] = t1[2] >> SBC_PROTO_FIXED8_SCALE;
-       t2[3] = t1[3] >> SBC_PROTO_FIXED8_SCALE;
-       t2[4] = t1[4] >> SBC_PROTO_FIXED8_SCALE;
-       t2[5] = t1[5] >> SBC_PROTO_FIXED8_SCALE;
-       t2[6] = t1[6] >> SBC_PROTO_FIXED8_SCALE;
-       t2[7] = t1[7] >> SBC_PROTO_FIXED8_SCALE;
-
-       /* do the cos transform */
-       for (i = 0, hop = 0; i < 8; hop += 16, i++) {
-               out[i] = ((FIXED_A) t2[0] * cos_table_fixed_8[0 + hop] +
-                         (FIXED_A) t2[1] * cos_table_fixed_8[1 + hop] +
-                         (FIXED_A) t2[2] * cos_table_fixed_8[2 + hop] +
-                         (FIXED_A) t2[3] * cos_table_fixed_8[3 + hop] +
-                         (FIXED_A) t2[4] * cos_table_fixed_8[4 + hop] +
-                         (FIXED_A) t2[5] * cos_table_fixed_8[9 + hop] +
-                         (FIXED_A) t2[6] * cos_table_fixed_8[10 + hop] +
-                         (FIXED_A) t2[7] * cos_table_fixed_8[11 + hop]) >>
-                       (SBC_COS_TABLE_FIXED8_SCALE - SCALE_OUT_BITS);
-       }
-}
-
-static void sbc_analyze_4b_8s(int16_t *pcm, int16_t *x,
-                             int32_t *out, int out_stride)
-{
-       int i;
-
-       /* Input 4 x 8 Audio Samples */
-       for (i = 0; i < 32; i += 8) {
-               x[128 + i] = x[0 + i] = pcm[31 - i];
-               x[129 + i] = x[1 + i] = pcm[30 - i];
-               x[130 + i] = x[2 + i] = pcm[29 - i];
-               x[131 + i] = x[3 + i] = pcm[28 - i];
-               x[132 + i] = x[4 + i] = pcm[27 - i];
-               x[133 + i] = x[5 + i] = pcm[26 - i];
-               x[134 + i] = x[6 + i] = pcm[25 - i];
-               x[135 + i] = x[7 + i] = pcm[24 - i];
-       }
-
-       /* Analyze four blocks */
-       _sbc_analyze_eight(x + 24, out);
-       out += out_stride;
-       _sbc_analyze_eight(x + 16, out);
-       out += out_stride;
-       _sbc_analyze_eight(x + 8, out);
-       out += out_stride;
-       _sbc_analyze_eight(x, out);
-}
-
 static int sbc_analyze_audio(struct sbc_encoder_state *state,
-                               struct sbc_frame *frame)
+                                               struct sbc_frame *frame)
 {
        int ch, blk;
+       int16_t *x;
 
        switch (frame->subbands) {
        case 4:
-               for (ch = 0; ch < frame->channels; ch++)
-                       for (blk = 0; blk < frame->blocks; blk += 4) {
-                               state->sbc_analyze_4b_4s(
-                                       &frame->pcm_sample[ch][blk * 4],
-                                       &state->X[ch][state->position[ch]],
+               for (ch = 0; ch < frame->channels; ch++) {
+                       x = &state->X[ch][state->position - 4 *
+                                       state->increment + frame->blocks * 4];
+                       for (blk = 0; blk < frame->blocks;
+                                               blk += state->increment) {
+                               state->sbc_analyze_4s(
+                                       state, x,
                                        frame->sb_sample_f[blk][ch],
                                        frame->sb_sample_f[blk + 1][ch] -
                                        frame->sb_sample_f[blk][ch]);
-                               state->position[ch] -= 16;
-                               if (state->position[ch] < 0)
-                                       state->position[ch] = 64 - 16;
+                               x -= 4 * state->increment;
                        }
+               }
                return frame->blocks * 4;
 
        case 8:
-               for (ch = 0; ch < frame->channels; ch++)
-                       for (blk = 0; blk < frame->blocks; blk += 4) {
-                               state->sbc_analyze_4b_8s(
-                                       &frame->pcm_sample[ch][blk * 8],
-                                       &state->X[ch][state->position[ch]],
+               for (ch = 0; ch < frame->channels; ch++) {
+                       x = &state->X[ch][state->position - 8 *
+                                       state->increment + frame->blocks * 8];
+                       for (blk = 0; blk < frame->blocks;
+                                               blk += state->increment) {
+                               state->sbc_analyze_8s(
+                                       state, x,
                                        frame->sb_sample_f[blk][ch],
                                        frame->sb_sample_f[blk + 1][ch] -
                                        frame->sb_sample_f[blk][ch]);
-                               state->position[ch] -= 32;
-                               if (state->position[ch] < 0)
-                                       state->position[ch] = 128 - 32;
+                               x -= 8 * state->increment;
                        }
+               }
                return frame->blocks * 8;
 
        default:
@@ -836,23 +730,31 @@ static int sbc_analyze_audio(struct sbc_encoder_state *state,
 
 /* Supplementary bitstream writing macros for 'sbc_pack_frame' */
 
-#define PUT_BITS(v, n)\
-       bits_cache = (v) | (bits_cache << (n));\
-       bits_count += (n);\
-       if (bits_count >= 16) {\
-               bits_count -= 8;\
-               *data_ptr++ = (uint8_t) (bits_cache >> bits_count);\
-               bits_count -= 8;\
-               *data_ptr++ = (uint8_t) (bits_cache >> bits_count);\
-       }\
-
-#define FLUSH_BITS()\
-       while (bits_count >= 8) {\
-               bits_count -= 8;\
-               *data_ptr++ = (uint8_t) (bits_cache >> bits_count);\
-       }\
-       if (bits_count > 0)\
-           *data_ptr++ = (uint8_t) (bits_cache << (8 - bits_count));\
+#define PUT_BITS(data_ptr, bits_cache, bits_count, v, n)               \
+       do {                                                            \
+               bits_cache = (v) | (bits_cache << (n));                 \
+               bits_count += (n);                                      \
+               if (bits_count >= 16) {                                 \
+                       bits_count -= 8;                                \
+                       *data_ptr++ = (uint8_t)                         \
+                               (bits_cache >> bits_count);             \
+                       bits_count -= 8;                                \
+                       *data_ptr++ = (uint8_t)                         \
+                               (bits_cache >> bits_count);             \
+               }                                                       \
+       } while (0)
+
+#define FLUSH_BITS(data_ptr, bits_cache, bits_count)                   \
+       do {                                                            \
+               while (bits_count >= 8) {                               \
+                       bits_count -= 8;                                \
+                       *data_ptr++ = (uint8_t)                         \
+                               (bits_cache >> bits_count);             \
+               }                                                       \
+               if (bits_count > 0)                                     \
+                       *data_ptr++ = (uint8_t)                         \
+                               (bits_cache << (8 - bits_count));       \
+       } while (0)
 
 /*
  * Packs the SBC frame from frame into the memory at data. At most len
@@ -869,7 +771,10 @@ static int sbc_analyze_audio(struct sbc_encoder_state *state,
  * -99 not implemented
  */
 
-static int sbc_pack_frame(uint8_t *data, struct sbc_frame *frame, size_t len)
+static SBC_ALWAYS_INLINE ssize_t sbc_pack_frame_internal(uint8_t *data,
+                                       struct sbc_frame *frame, size_t len,
+                                       int frame_subbands, int frame_channels,
+                                       int joint)
 {
        /* Bitstream writer starts from the fourth byte */
        uint8_t *data_ptr = data + 4;
@@ -880,13 +785,12 @@ static int sbc_pack_frame(uint8_t *data, struct sbc_frame *frame, size_t len)
        uint8_t crc_header[11] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
        int crc_pos = 0;
 
-       uint16_t audio_sample;
+       uint32_t audio_sample;
 
        int ch, sb, blk;        /* channel, subband, block and bit counters */
        int bits[2][8];         /* bits distribution */
-       int levels[2][8];       /* levels are derived from that */
-
-       u_int32_t scalefactor[2][8];    /* derived from frame->scale_factor */
+       uint32_t levels[2][8];  /* levels are derived from that */
+       uint32_t sb_sample_delta[2][8];
 
        data[0] = SBC_SYNCWORD;
 
@@ -898,7 +802,7 @@ static int sbc_pack_frame(uint8_t *data, struct sbc_frame *frame, size_t len)
 
        data[1] |= (frame->allocation & 0x01) << 1;
 
-       switch (frame->subbands) {
+       switch (frame_subbands) {
        case 4:
                /* Nothing to do */
                break;
@@ -913,11 +817,11 @@ static int sbc_pack_frame(uint8_t *data, struct sbc_frame *frame, size_t len)
        data[2] = frame->bitpool;
 
        if ((frame->mode == MONO || frame->mode == DUAL_CHANNEL) &&
-                       frame->bitpool > frame->subbands << 4)
+                       frame->bitpool > frame_subbands << 4)
                return -5;
 
        if ((frame->mode == STEREO || frame->mode == JOINT_STEREO) &&
-                       frame->bitpool > frame->subbands << 5)
+                       frame->bitpool > frame_subbands << 5)
                return -5;
 
        /* Can't fill in crc yet */
@@ -926,82 +830,17 @@ static int sbc_pack_frame(uint8_t *data, struct sbc_frame *frame, size_t len)
        crc_header[1] = data[2];
        crc_pos = 16;
 
-       for (ch = 0; ch < frame->channels; ch++) {
-               for (sb = 0; sb < frame->subbands; sb++) {
-                       frame->scale_factor[ch][sb] = 0;
-                       scalefactor[ch][sb] = 2 << SCALE_OUT_BITS;
-                       for (blk = 0; blk < frame->blocks; blk++) {
-                               while (scalefactor[ch][sb] < fabs(frame->sb_sample_f[blk][ch][sb])) {
-                                       frame->scale_factor[ch][sb]++;
-                                       scalefactor[ch][sb] *= 2;
-                               }
-                       }
-               }
-       }
-
        if (frame->mode == JOINT_STEREO) {
-               /* like frame->sb_sample but joint stereo */
-               int32_t sb_sample_j[16][2];
-               /* scalefactor and scale_factor in joint case */
-               u_int32_t scalefactor_j[2];
-               uint8_t scale_factor_j[2];
-
-               uint8_t joint = 0;
-               frame->joint = 0;
-
-               for (sb = 0; sb < frame->subbands - 1; sb++) {
-                       scale_factor_j[0] = 0;
-                       scalefactor_j[0] = 2 << SCALE_OUT_BITS;
-                       scale_factor_j[1] = 0;
-                       scalefactor_j[1] = 2 << SCALE_OUT_BITS;
-
-                       for (blk = 0; blk < frame->blocks; blk++) {
-                               /* Calculate joint stereo signal */
-                               sb_sample_j[blk][0] =
-                                       ASR(frame->sb_sample_f[blk][0][sb], 1) +
-                                       ASR(frame->sb_sample_f[blk][1][sb], 1);
-                               sb_sample_j[blk][1] =
-                                       ASR(frame->sb_sample_f[blk][0][sb], 1) -
-                                       ASR(frame->sb_sample_f[blk][1][sb], 1);
-
-                               /* calculate scale_factor_j and scalefactor_j for joint case */
-                               while (scalefactor_j[0] < fabs(sb_sample_j[blk][0])) {
-                                       scale_factor_j[0]++;
-                                       scalefactor_j[0] *= 2;
-                               }
-                               while (scalefactor_j[1] < fabs(sb_sample_j[blk][1])) {
-                                       scale_factor_j[1]++;
-                                       scalefactor_j[1] *= 2;
-                               }
-                       }
-
-                       /* decide whether to join this subband */
-                       if ((frame->scale_factor[0][sb] +
-                                       frame->scale_factor[1][sb]) >
-                                       (scale_factor_j[0] +
-                                       scale_factor_j[1])) {
-                               /* use joint stereo for this subband */
-                               joint |= 1 << (frame->subbands - 1 - sb);
-                               frame->joint |= 1 << sb;
-                               frame->scale_factor[0][sb] = scale_factor_j[0];
-                               frame->scale_factor[1][sb] = scale_factor_j[1];
-                               for (blk = 0; blk < frame->blocks; blk++) {
-                                       frame->sb_sample_f[blk][0][sb] =
-                                                       sb_sample_j[blk][0];
-                                       frame->sb_sample_f[blk][1][sb] =
-                                                       sb_sample_j[blk][1];
-                               }
-                       }
-               }
-
-               PUT_BITS(joint, frame->subbands);
+               PUT_BITS(data_ptr, bits_cache, bits_count,
+                       joint, frame_subbands);
                crc_header[crc_pos >> 3] = joint;
-               crc_pos += frame->subbands;
+               crc_pos += frame_subbands;
        }
 
-       for (ch = 0; ch < frame->channels; ch++) {
-               for (sb = 0; sb < frame->subbands; sb++) {
-                       PUT_BITS(frame->scale_factor[ch][sb] & 0x0F, 4);
+       for (ch = 0; ch < frame_channels; ch++) {
+               for (sb = 0; sb < frame_subbands; sb++) {
+                       PUT_BITS(data_ptr, bits_cache, bits_count,
+                               frame->scale_factor[ch][sb] & 0x0F, 4);
                        crc_header[crc_pos >> 3] <<= 4;
                        crc_header[crc_pos >> 3] |= frame->scale_factor[ch][sb] & 0x0F;
                        crc_pos += 4;
@@ -1016,57 +855,83 @@ static int sbc_pack_frame(uint8_t *data, struct sbc_frame *frame, size_t len)
 
        sbc_calculate_bits(frame, bits);
 
-       for (ch = 0; ch < frame->channels; ch++) {
-               for (sb = 0; sb < frame->subbands; sb++)
-                       levels[ch][sb] = (1 << bits[ch][sb]) - 1;
+       for (ch = 0; ch < frame_channels; ch++) {
+               for (sb = 0; sb < frame_subbands; sb++) {
+                       levels[ch][sb] = ((1 << bits[ch][sb]) - 1) <<
+                               (32 - (frame->scale_factor[ch][sb] +
+                                       SCALE_OUT_BITS + 2));
+                       sb_sample_delta[ch][sb] = (uint32_t) 1 <<
+                               (frame->scale_factor[ch][sb] +
+                                       SCALE_OUT_BITS + 1);
+               }
        }
 
        for (blk = 0; blk < frame->blocks; blk++) {
-               for (ch = 0; ch < frame->channels; ch++) {
-                       for (sb = 0; sb < frame->subbands; sb++) {
+               for (ch = 0; ch < frame_channels; ch++) {
+                       for (sb = 0; sb < frame_subbands; sb++) {
 
                                if (bits[ch][sb] == 0)
                                        continue;
 
                                audio_sample = ((uint64_t) levels[ch][sb] *
-                                       (((uint32_t) 1 <<
-                                       (frame->scale_factor[ch][sb] +
-                                       SCALE_OUT_BITS + 1)) +
-                                       frame->sb_sample_f[blk][ch][sb])) >>
-                                               (frame->scale_factor[ch][sb] +
-                                               SCALE_OUT_BITS + 2);
-
-                               PUT_BITS(audio_sample, bits[ch][sb]);
+                                       (sb_sample_delta[ch][sb] +
+                                       frame->sb_sample_f[blk][ch][sb])) >> 32;
+
+                               PUT_BITS(data_ptr, bits_cache, bits_count,
+                                       audio_sample, bits[ch][sb]);
                        }
                }
        }
 
-       FLUSH_BITS();
+       FLUSH_BITS(data_ptr, bits_cache, bits_count);
 
        return data_ptr - data;
 }
 
-static void sbc_encoder_init(struct sbc_encoder_state *state,
-                               const struct sbc_frame *frame)
+static ssize_t sbc_pack_frame(uint8_t *data, struct sbc_frame *frame, size_t len,
+                                                               int joint)
+{
+       if (frame->subbands == 4) {
+               if (frame->channels == 1)
+                       return sbc_pack_frame_internal(
+                               data, frame, len, 4, 1, joint);
+               else
+                       return sbc_pack_frame_internal(
+                               data, frame, len, 4, 2, joint);
+       } else {
+               if (frame->channels == 1)
+                       return sbc_pack_frame_internal(
+                               data, frame, len, 8, 1, joint);
+               else
+                       return sbc_pack_frame_internal(
+                               data, frame, len, 8, 2, joint);
+       }
+}
+
+static void sbc_encoder_init(bool msbc, struct sbc_encoder_state *state,
+                                               const struct sbc_frame *frame)
 {
        memset(&state->X, 0, sizeof(state->X));
-       state->subbands = frame->subbands;
-       state->position[0] = state->position[1] = 12 * frame->subbands;
+       state->position = (SBC_X_BUFFER_SIZE - frame->subbands * 9) & ~7;
+       if (msbc)
+               state->increment = 1;
+       else
+               state->increment = 4;
 
-       /* Default implementation for analyze function */
-       state->sbc_analyze_4b_4s = sbc_analyze_4b_4s;
-       state->sbc_analyze_4b_8s = sbc_analyze_4b_8s;
+       sbc_init_primitives(state);
 }
 
 struct sbc_priv {
        int init;
-       struct sbc_frame frame;
-       struct sbc_decoder_state dec_state;
-       struct sbc_encoder_state enc_state;
+       bool msbc;
+       struct SBC_ALIGNED sbc_frame frame;
+       struct SBC_ALIGNED sbc_decoder_state dec_state;
+       struct SBC_ALIGNED sbc_encoder_state enc_state;
 };
 
 static void sbc_set_defaults(sbc_t *sbc, unsigned long flags)
 {
+       sbc->flags = flags;
        sbc->frequency = SBC_FREQ_44100;
        sbc->mode = SBC_MODE_STEREO;
        sbc->subbands = SBC_SB_8;
@@ -1081,17 +946,20 @@ static void sbc_set_defaults(sbc_t *sbc, unsigned long flags)
 #endif
 }
 
-int sbc_init(sbc_t *sbc, unsigned long flags)
+SBC_EXPORT int sbc_init(sbc_t *sbc, unsigned long flags)
 {
        if (!sbc)
                return -EIO;
 
        memset(sbc, 0, sizeof(sbc_t));
 
-       sbc->priv = malloc(sizeof(struct sbc_priv));
-       if (!sbc->priv)
+       sbc->priv_alloc_base = malloc(sizeof(struct sbc_priv) + SBC_ALIGN_MASK);
+       if (!sbc->priv_alloc_base)
                return -ENOMEM;
 
+       sbc->priv = (void *) (((uintptr_t) sbc->priv_alloc_base +
+                       SBC_ALIGN_MASK) & ~((uintptr_t) SBC_ALIGN_MASK));
+
        memset(sbc->priv, 0, sizeof(struct sbc_priv));
 
        sbc_set_defaults(sbc, flags);
@@ -1099,19 +967,52 @@ int sbc_init(sbc_t *sbc, unsigned long flags)
        return 0;
 }
 
-int sbc_parse(sbc_t *sbc, void *input, int input_len)
+SBC_EXPORT int sbc_init_msbc(sbc_t *sbc, unsigned long flags)
+{
+       struct sbc_priv *priv;
+
+       if (!sbc)
+               return -EIO;
+
+       memset(sbc, 0, sizeof(sbc_t));
+
+       sbc->priv_alloc_base = malloc(sizeof(struct sbc_priv) + SBC_ALIGN_MASK);
+       if (!sbc->priv_alloc_base)
+               return -ENOMEM;
+
+       sbc->priv = (void *) (((uintptr_t) sbc->priv_alloc_base +
+                       SBC_ALIGN_MASK) & ~((uintptr_t) SBC_ALIGN_MASK));
+
+       memset(sbc->priv, 0, sizeof(struct sbc_priv));
+
+       priv = sbc->priv;
+       priv->msbc = true;
+
+       sbc_set_defaults(sbc, flags);
+
+       sbc->frequency = SBC_FREQ_16000;
+       sbc->blocks = MSBC_BLOCKS;
+       sbc->subbands = SBC_SB_8;
+       sbc->mode = SBC_MODE_MONO;
+       sbc->allocation = SBC_AM_LOUDNESS;
+       sbc->bitpool = 26;
+
+       return 0;
+}
+
+SBC_EXPORT ssize_t sbc_parse(sbc_t *sbc, const void *input, size_t input_len)
 {
        return sbc_decode(sbc, input, input_len, NULL, 0, NULL);
 }
 
-int sbc_decode(sbc_t *sbc, void *input, int input_len, void *output,
-               int output_len, int *written)
+SBC_EXPORT ssize_t sbc_decode(sbc_t *sbc, const void *input, size_t input_len,
+                       void *output, size_t output_len, size_t *written)
 {
        struct sbc_priv *priv;
        char *ptr;
        int i, ch, framelen, samples;
 
-       if (!sbc && !input)
+       if (!sbc || !input)
                return -EIO;
 
        priv = sbc->priv;
@@ -1130,7 +1031,10 @@ int sbc_decode(sbc_t *sbc, void *input, int input_len, void *output,
                sbc->bitpool = priv->frame.bitpool;
 
                priv->frame.codesize = sbc_get_codesize(sbc);
-               priv->frame.length = sbc_get_frame_length(sbc);
+               priv->frame.length = framelen;
+       } else if (priv->frame.bitpool != sbc->bitpool) {
+               priv->frame.length = framelen;
+               sbc->bitpool = priv->frame.bitpool;
        }
 
        if (!output)
@@ -1146,7 +1050,7 @@ int sbc_decode(sbc_t *sbc, void *input, int input_len, void *output,
 
        ptr = output;
 
-       if (output_len < samples * priv->frame.channels * 2)
+       if (output_len < (size_t) (samples * priv->frame.channels * 2))
                samples = output_len / (priv->frame.channels * 2);
 
        for (i = 0; i < samples; i++) {
@@ -1154,13 +1058,7 @@ int sbc_decode(sbc_t *sbc, void *input, int input_len, void *output,
                        int16_t s;
                        s = priv->frame.pcm_sample[ch][i];
 
-#if __BYTE_ORDER == __LITTLE_ENDIAN
                        if (sbc->endian == SBC_BE) {
-#elif __BYTE_ORDER == __BIG_ENDIAN
-                       if (sbc->endian == SBC_LE) {
-#else
-#error "Unknown byte order"
-#endif
                                *ptr++ = (s & 0xff00) >> 8;
                                *ptr++ = (s & 0x00ff);
                        } else {
@@ -1176,14 +1074,17 @@ int sbc_decode(sbc_t *sbc, void *input, int input_len, void *output,
        return framelen;
 }
 
-int sbc_encode(sbc_t *sbc, void *input, int input_len, void *output,
-               int output_len, int *written)
+SBC_EXPORT ssize_t sbc_encode(sbc_t *sbc, const void *input, size_t input_len,
+                       void *output, size_t output_len, ssize_t *written)
 {
        struct sbc_priv *priv;
-       char *ptr;
-       int i, ch, framelen, samples;
+       int samples;
+       ssize_t framelen;
+       int (*sbc_enc_process_input)(int position,
+                       const uint8_t *pcm, int16_t X[2][SBC_X_BUFFER_SIZE],
+                       int nsamples, int nchannels);
 
-       if (!sbc && !input)
+       if (!sbc || !input)
                return -EIO;
 
        priv = sbc->priv;
@@ -1199,13 +1100,19 @@ int sbc_encode(sbc_t *sbc, void *input, int input_len, void *output,
                priv->frame.subband_mode = sbc->subbands;
                priv->frame.subbands = sbc->subbands ? 8 : 4;
                priv->frame.block_mode = sbc->blocks;
-               priv->frame.blocks = 4 + (sbc->blocks * 4);
+               if (priv->msbc)
+                       priv->frame.blocks = MSBC_BLOCKS;
+               else
+                       priv->frame.blocks = 4 + (sbc->blocks * 4);
                priv->frame.bitpool = sbc->bitpool;
                priv->frame.codesize = sbc_get_codesize(sbc);
                priv->frame.length = sbc_get_frame_length(sbc);
 
-               sbc_encoder_init(&priv->enc_state, &priv->frame);
+               sbc_encoder_init(priv->msbc, &priv->enc_state, &priv->frame);
                priv->init = 1;
+       } else if (priv->frame.bitpool != sbc->bitpool) {
+               priv->frame.length = sbc_get_frame_length(sbc);
+               priv->frame.bitpool = sbc->bitpool;
        }
 
        /* input must be large enough to encode a complete frame */
@@ -1216,29 +1123,42 @@ int sbc_encode(sbc_t *sbc, void *input, int input_len, void *output,
        if (!output || output_len < priv->frame.length)
                return -ENOSPC;
 
-       ptr = input;
-
-       for (i = 0; i < priv->frame.subbands * priv->frame.blocks; i++) {
-               for (ch = 0; ch < priv->frame.channels; ch++) {
-                       int16_t s;
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-                       if (sbc->endian == SBC_BE)
-#elif __BYTE_ORDER == __BIG_ENDIAN
-                       if (sbc->endian == SBC_LE)
-#else
-#error "Unknown byte order"
-#endif
-                               s = (ptr[0] & 0xff) << 8 | (ptr[1] & 0xff);
-                       else
-                               s = (ptr[0] & 0xff) | (ptr[1] & 0xff) << 8;
-                       ptr += 2;
-                       priv->frame.pcm_sample[ch][i] = s;
-               }
+       /* Select the needed input data processing function and call it */
+       if (priv->frame.subbands == 8) {
+               if (sbc->endian == SBC_BE)
+                       sbc_enc_process_input =
+                               priv->enc_state.sbc_enc_process_input_8s_be;
+               else
+                       sbc_enc_process_input =
+                               priv->enc_state.sbc_enc_process_input_8s_le;
+       } else {
+               if (sbc->endian == SBC_BE)
+                       sbc_enc_process_input =
+                               priv->enc_state.sbc_enc_process_input_4s_be;
+               else
+                       sbc_enc_process_input =
+                               priv->enc_state.sbc_enc_process_input_4s_le;
        }
 
+       priv->enc_state.position = sbc_enc_process_input(
+               priv->enc_state.position, (const uint8_t *) input,
+               priv->enc_state.X, priv->frame.subbands * priv->frame.blocks,
+               priv->frame.channels);
+
        samples = sbc_analyze_audio(&priv->enc_state, &priv->frame);
 
-       framelen = sbc_pack_frame(output, &priv->frame, output_len);
+       if (priv->frame.mode == JOINT_STEREO) {
+               int j = priv->enc_state.sbc_calc_scalefactors_j(
+                       priv->frame.sb_sample_f, priv->frame.scale_factor,
+                       priv->frame.blocks, priv->frame.subbands);
+               framelen = sbc_pack_frame(output, &priv->frame, output_len, j);
+       } else {
+               priv->enc_state.sbc_calc_scalefactors(
+                       priv->frame.sb_sample_f, priv->frame.scale_factor,
+                       priv->frame.blocks, priv->frame.channels,
+                       priv->frame.subbands);
+               framelen = sbc_pack_frame(output, &priv->frame, output_len, 0);
+       }
 
        if (written)
                *written = framelen;
@@ -1246,49 +1166,46 @@ int sbc_encode(sbc_t *sbc, void *input, int input_len, void *output,
        return samples * priv->frame.channels * 2;
 }
 
-void sbc_finish(sbc_t *sbc)
+SBC_EXPORT void sbc_finish(sbc_t *sbc)
 {
        if (!sbc)
                return;
 
-       if (sbc->priv)
-               free(sbc->priv);
+       free(sbc->priv_alloc_base);
 
        memset(sbc, 0, sizeof(sbc_t));
 }
 
-int sbc_get_frame_length(sbc_t *sbc)
+SBC_EXPORT size_t sbc_get_frame_length(sbc_t *sbc)
 {
        int ret;
-       uint8_t subbands, channels, blocks, joint;
+       uint8_t subbands, channels, blocks, joint, bitpool;
        struct sbc_priv *priv;
 
        priv = sbc->priv;
-       if (!priv->init) {
-               subbands = sbc->subbands ? 8 : 4;
+       if (priv->init && priv->frame.bitpool == sbc->bitpool)
+               return priv->frame.length;
+
+       subbands = sbc->subbands ? 8 : 4;
+       if (priv->msbc)
+               blocks = MSBC_BLOCKS;
+       else
                blocks = 4 + (sbc->blocks * 4);
-               channels = sbc->mode == SBC_MODE_MONO ? 1 : 2;
-               joint = sbc->mode == SBC_MODE_JOINT_STEREO ? 1 : 0;
-       } else {
-               subbands = priv->frame.subbands;
-               blocks = priv->frame.blocks;
-               channels = priv->frame.channels;
-               joint = priv->frame.joint;
-       }
+       channels = sbc->mode == SBC_MODE_MONO ? 1 : 2;
+       joint = sbc->mode == SBC_MODE_JOINT_STEREO ? 1 : 0;
+       bitpool = sbc->bitpool;
 
        ret = 4 + (4 * subbands * channels) / 8;
-
        /* This term is not always evenly divide so we round it up */
        if (channels == 1)
-               ret += ((blocks * channels * sbc->bitpool) + 7) / 8;
+               ret += ((blocks * channels * bitpool) + 7) / 8;
        else
-               ret += (((joint ? subbands : 0) + blocks * sbc->bitpool) + 7)
-                       / 8;
+               ret += (((joint ? subbands : 0) + blocks * bitpool) + 7) / 8;
 
        return ret;
 }
 
-int sbc_get_frame_duration(sbc_t *sbc)
+SBC_EXPORT unsigned sbc_get_frame_duration(sbc_t *sbc)
 {
        uint8_t subbands, blocks;
        uint16_t frequency;
@@ -1297,7 +1214,10 @@ int sbc_get_frame_duration(sbc_t *sbc)
        priv = sbc->priv;
        if (!priv->init) {
                subbands = sbc->subbands ? 8 : 4;
-               blocks = 4 + (sbc->blocks * 4);
+               if (priv->msbc)
+                       blocks = MSBC_BLOCKS;
+               else
+                       blocks = 4 + (sbc->blocks * 4);
        } else {
                subbands = priv->frame.subbands;
                blocks = priv->frame.blocks;
@@ -1326,15 +1246,18 @@ int sbc_get_frame_duration(sbc_t *sbc)
        return (1000000 * blocks * subbands) / frequency;
 }
 
-int sbc_get_codesize(sbc_t *sbc)
+SBC_EXPORT size_t sbc_get_codesize(sbc_t *sbc)
 {
-       uint8_t subbands, channels, blocks;
+       uint16_t subbands, channels, blocks;
        struct sbc_priv *priv;
 
        priv = sbc->priv;
        if (!priv->init) {
                subbands = sbc->subbands ? 8 : 4;
-               blocks = 4 + (sbc->blocks * 4);
+               if (priv->msbc)
+                       blocks = MSBC_BLOCKS;
+               else
+                       blocks = 4 + (sbc->blocks * 4);
                channels = sbc->mode == SBC_MODE_MONO ? 1 : 2;
        } else {
                subbands = priv->frame.subbands;
@@ -1345,7 +1268,21 @@ int sbc_get_codesize(sbc_t *sbc)
        return subbands * blocks * channels * 2;
 }
 
-int sbc_reinit(sbc_t *sbc, unsigned long flags)
+SBC_EXPORT const char *sbc_get_implementation_info(sbc_t *sbc)
+{
+       struct sbc_priv *priv;
+
+       if (!sbc)
+               return NULL;
+
+       priv = sbc->priv;
+       if (!priv)
+               return NULL;
+
+       return priv->enc_state.implementation_info;
+}
+
+SBC_EXPORT int sbc_reinit(sbc_t *sbc, unsigned long flags)
 {
        struct sbc_priv *priv;